Upgrade devel/epm to version 4.1 (patch)

Maho NAKATA chat95 at mac.com
Tue Nov 17 00:27:15 UTC 2009 

Hi 

approved, please commit it. 
thanks for your patch!

From: "Mikhail T." <mi at aldan.algebra.com>
Subject: Upgrade devel/epm to version 4.1 (patch)
Date: Mon, 16 Nov 2009 17:02:52 -0500 (EST)

> ? epm-3.7
> ? epm-4.1.tbz
> ? op
> ? work
> Index: Makefile
> ===================================================================
> RCS file: /home/pcvs/ports/devel/epm/Makefile,v
> retrieving revision 1.7
> diff -U 2 -r1.7 Makefile
> --- Makefile	20 Aug 2008 00:56:36 -0000	1.7
> +++ Makefile	16 Nov 2009 22:02:51 -0000
> @@ -7,21 +7,13 @@
>  
>  PORTNAME=	epm
> -PORTVERSION=	3.7
> -PORTREVISION=	2
> +PORTVERSION=	4.1
>  CATEGORIES=	devel
> -MASTER_SITES=	${MASTER_SITE_LOCAL}
> -MASTER_SITE_SUBDIR=     maho/openoffice.org
> -DISTNAME=	${PORTNAME}-${PORTVERSION}-source
> -EXTRACT_SUFX=	.tar.bz2
> -
> -PATCH_DIST_STRIP=       -p2
> +MASTER_SITES=	${MASTER_SITE_EASYSW}
> +MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}
> +EXTRACT_SUFX=	-source.tar.bz2
>  
>  MAINTAINER=	openoffice at FreeBSD.org
>  COMMENT=	A free UNIX software/file packaging program
>  
> -PATCHFILES+=    epm-3.7.patch
> -PATCH_SITES+=   http://installation.openoffice.org/
> -
> -WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>  USE_BZIP2=	yes
>  GNU_CONFIGURE=	yes
> Index: distinfo
> ===================================================================
> RCS file: /home/pcvs/ports/devel/epm/distinfo,v
> retrieving revision 1.3
> diff -U 2 -r1.3 distinfo
> --- distinfo	22 Jan 2006 08:28:07 -0000	1.3
> +++ distinfo	16 Nov 2009 22:02:51 -0000
> @@ -1,6 +1,3 @@
> -MD5 (epm-3.7-source.tar.bz2) = d1fd62aa8e38b8dcd32b821822cb29a8
> -SHA256 (epm-3.7-source.tar.bz2) = 72faaa32679bb2ce2a6b776410a53c6c2a272e405b72e607c011da2d9a0214b7
> -SIZE (epm-3.7-source.tar.bz2) = 401222
> -MD5 (epm-3.7.patch) = 45b782d55e0545355cb5ffe5292e13cc
> -SHA256 (epm-3.7.patch) = c92828565f3b081a35243cf6418bde3acddcb911886d7fe4fa2c70d68ac47014
> -SIZE (epm-3.7.patch) = 4013
> +MD5 (epm-4.1-source.tar.bz2) = 658385d63e81bfd0989f8f9b8a956c2c
> +SHA256 (epm-4.1-source.tar.bz2) = 960ce17836040dc64f5058186c71032c2c9c9b5f8a31b790e820900e130cb8a3
> +SIZE (epm-4.1-source.tar.bz2) = 452818
> Index: pkg-descr
> ===================================================================
> RCS file: /home/pcvs/ports/devel/epm/pkg-descr,v
> retrieving revision 1.1
> diff -U 2 -r1.1 pkg-descr
> --- pkg-descr	21 Nov 2004 00:22:10 -0000	1.1
> +++ pkg-descr	16 Nov 2009 22:02:51 -0000
> @@ -9,3 +9,3 @@
>    your applications.
>  
> -WWW: http://www.easysw.com/epm/
> +WWW: http://www.epmhome.org/
> Index: pkg-plist
> ===================================================================
> RCS file: /home/pcvs/ports/devel/epm/pkg-plist,v
> retrieving revision 1.4
> diff -U 2 -r1.4 pkg-plist
> --- pkg-plist	20 Jul 2008 23:29:23 -0000	1.4
> +++ pkg-plist	16 Nov 2009 22:02:51 -0000
> @@ -4,5 +4,4 @@
>  %%DOCSDIR%%/COPYING
>  %%DOCSDIR%%/README
> -%%DOCSDIR%%/epm-manual.html
> -%%DOCSDIR%%/epm-manual.pdf
> +%%DOCSDIR%%/epm-book.html
>  @dirrm %%DOCSDIR%%
> Index: files/patch-Makefile.in
> ===================================================================
> RCS file: files/patch-Makefile.in
> diff -N files/patch-Makefile.in
> --- files/patch-Makefile.in	24 Nov 2004 07:27:46 -0000	1.1
> +++ /dev/null	1 Jan 1970 00:00:00 -0000
> @@ -1,40 +0,0 @@
> ---- Makefile.in~	Thu Jul 24 10:20:54 2003
> -+++ Makefile.in	Wed Nov 24 16:15:46 2004
> -@@ -142,14 +142,14 @@
> - 	$(CP) mkepmlist $(bindir)
> - 	echo Installing EPM manpages in $(mandir)/cat1 and $(mandir)/man1
> - 	-$(MKDIR) $(mandir)/cat1
> --	$(RM) $(mandir)/cat1/epm.$(CAT1EXT)
> --	$(CP) $(srcdir)/doc/epm.1 $(mandir)/cat1/epm.$(CAT1EXT)
> --	$(RM) $(mandir)/cat1/epminstall.$(CAT1EXT)
> --	$(CP) $(srcdir)/doc/epminstall.1 $(mandir)/cat1/epminstall.$(CAT1EXT)
> --	$(RM) $(mandir)/cat1/mkepmlist.$(CAT1EXT)
> --	$(CP) $(srcdir)/doc/mkepmlist.1 $(mandir)/cat1/mkepmlist.$(CAT1EXT)
> --	$(RM) $(mandir)/cat1/setup.$(CAT1EXT)
> --	$(CP) $(srcdir)/doc/setup.1 $(mandir)/cat1/setup.$(CAT1EXT)
> -+#	$(RM) $(mandir)/cat1/epm.$(CAT1EXT)
> -+#	$(CP) $(srcdir)/doc/epm.1 $(mandir)/cat1/epm.$(CAT1EXT)
> -+#	$(RM) $(mandir)/cat1/epminstall.$(CAT1EXT)
> -+#	$(CP) $(srcdir)/doc/epminstall.1 $(mandir)/cat1/epminstall.$(CAT1EXT)
> -+#	$(RM) $(mandir)/cat1/mkepmlist.$(CAT1EXT)
> -+#	$(CP) $(srcdir)/doc/mkepmlist.1 $(mandir)/cat1/mkepmlist.$(CAT1EXT)
> -+#	$(RM) $(mandir)/cat1/setup.$(CAT1EXT)
> -+#	$(CP) $(srcdir)/doc/setup.1 $(mandir)/cat1/setup.$(CAT1EXT)
> - 	-$(MKDIR) $(mandir)/man1
> - 	$(RM) $(mandir)/man1/epm.1
> - 	$(CP) $(srcdir)/doc/epm.man $(mandir)/man1/epm.1
> -@@ -161,10 +161,10 @@
> - 	$(CP) $(srcdir)/doc/setup.man $(mandir)/man1/setup.1
> - 	echo Installing EPM manpages in $(mandir)/cat5 and $(mandir)/man5
> - 	-$(MKDIR) $(mandir)/cat5
> --	$(RM) $(mandir)/cat5/epm.list.$(CAT5EXT)
> --	$(CP) $(srcdir)/doc/epm.list.5 $(mandir)/cat5/epm.list.$(CAT5EXT)
> --	$(RM) $(mandir)/cat5/setup.types.$(CAT5EXT)
> --	$(CP) $(srcdir)/doc/setup.types.5 $(mandir)/cat5/setup.types.$(CAT5EXT)
> -+#	$(RM) $(mandir)/cat5/epm.list.$(CAT5EXT)
> -+#	$(CP) $(srcdir)/doc/epm.list.5 $(mandir)/cat5/epm.list.$(CAT5EXT)
> -+#	$(RM) $(mandir)/cat5/setup.types.$(CAT5EXT)
> -+#	$(CP) $(srcdir)/doc/setup.types.5 $(mandir)/cat5/setup.types.$(CAT5EXT)
> - 	-$(MKDIR) $(mandir)/man5
> - 	$(RM) $(mandir)/man5/epm.list.5
> - 	$(CP) $(srcdir)/doc/epm.list.man $(mandir)/man5/epm.list.5
> Index: files/patch-configure.in
> ===================================================================
> RCS file: files/patch-configure.in
> diff -N files/patch-configure.in
> --- files/patch-configure.in	2 Feb 2005 07:58:09 -0000	1.1
> +++ /dev/null	1 Jan 1970 00:00:00 -0000
> @@ -1,18 +0,0 @@
> ---- configure.in.orig	Wed Feb  2 16:54:27 2005
> -+++ configure.in	Wed Feb  2 16:55:09 2005
> -@@ -174,13 +174,13 @@
> - 		AC_MSG_RESULT(no)
> -  	fi
> - 
> --	CXX="$CC"
> -+#	CXX="$CC"
> - 
> - 	if test -z "$OPTIM"; then
> -         	OPTIM="-O2 -fforce-mem -fforce-addr -fcaller-saves"
> - 	fi
> - 
> --	CXX="$CC"
> -+#	CXX="$CC"
> - 	OPTIM="-Wall -Wno-return-type $OPTIM"
> - 
> - 	# See if GCC supports -fno-rtti...
>

More information about the freebsd-openoffice mailing list