Upgrade from 3.7 to 4.1

6 files changed, 9 insertions, 79 deletions

diff --git a/devel/epm/Makefile b/devel/epm/Makefile
index d79e9c4144e2..dc8cfdb7b431 100644
--- a/devel/epm/Makefile
+++ b/devel/epm/Makefile
@@ -6,23 +6,15 @@
 #
 
 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@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
 USE_AUTOTOOLS=	autoconf:262
diff --git a/devel/epm/distinfo b/devel/epm/distinfo
index d5bafd8b6363..211b01024bde 100644
--- a/devel/epm/distinfo
+++ b/devel/epm/distinfo
@@ -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
diff --git a/devel/epm/files/patch-Makefile.in b/devel/epm/files/patch-Makefile.in
deleted file mode 100644
index d801b5e9510a..000000000000
--- a/devel/epm/files/patch-Makefile.in
+++ /dev/null
@@ -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
diff --git a/devel/epm/files/patch-configure.in b/devel/epm/files/patch-configure.in
deleted file mode 100644
index f9337cee4249..000000000000
--- a/devel/epm/files/patch-configure.in
+++ /dev/null
@@ -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...
diff --git a/devel/epm/pkg-descr b/devel/epm/pkg-descr
index 9b111b645c7b..ceb16fd9df3c 100644
--- a/devel/epm/pkg-descr
+++ b/devel/epm/pkg-descr
@@ -8,4 +8,4 @@ o Generate "native" distributions in AIX, BSD, Debian,  HP-UX, IRIX, MacOS X,
 o Provide a complete, cross-platform software  distribution solution for
   your applications.
 
-WWW: http://www.easysw.com/epm/
+WWW: http://www.epmhome.org/
diff --git a/devel/epm/pkg-plist b/devel/epm/pkg-plist
index b824d53acd96..4f06ca9a5d4f 100644
--- a/devel/epm/pkg-plist
+++ b/devel/epm/pkg-plist
@@ -3,6 +3,5 @@ bin/epminstall
 bin/mkepmlist
 %%DOCSDIR%%/COPYING
 %%DOCSDIR%%/README
-%%DOCSDIR%%/epm-manual.html
-%%DOCSDIR%%/epm-manual.pdf
+%%DOCSDIR%%/epm-book.html
 @dirrm %%DOCSDIR%%