devel/epm: update to 4.5.1 release

5 files changed, 38 insertions, 103 deletions

diff --git a/devel/epm/Makefile b/devel/epm/Makefile
index 6de5e31712d9..b7409185b45b 100644
--- a/devel/epm/Makefile
+++ b/devel/epm/Makefile
@@ -1,10 +1,9 @@
 # Created by: NAKATA Maho <maho@FreeBSD.org>
 
 PORTNAME=	epm
-PORTVERSION=	4.3
+PORTVERSION=	4.5.1
 CATEGORIES=	devel
-MASTER_SITES=	https://github.com/michaelrsweet/epm/releases/download/release-${PORTVERSION}/
-EXTRACT_SUFX=	-source.tar.bz2
+MASTER_SITES=	https://github.com/michaelrsweet/epm/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Free UNIX software/file packaging program
@@ -13,12 +12,13 @@ LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 MAKE_JOBS_UNSAFE=	yes
-USES=		tar:bzip2
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/epm
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/epminstall
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mkepmlist
 
 .include <bsd.port.mk>
diff --git a/devel/epm/distinfo b/devel/epm/distinfo
index b839e54e2213..9476a43dc744 100644
--- a/devel/epm/distinfo
+++ b/devel/epm/distinfo
@@ -1,2 +1,3 @@
-SHA256 (epm-4.3-source.tar.bz2) = 03d2eafd509e224484ce6d03ff45d9ca8ff751c01868a09f0113b409b353f010
-SIZE (epm-4.3-source.tar.bz2) = 442672
+TIMESTAMP = 1640254589
+SHA256 (epm-4.5.1.tar.gz) = e839f6d8348913949092b60928d6f1660d48ffa95de8852f7d75989c3e141b9f
+SIZE (epm-4.5.1.tar.gz) = 2728402
diff --git a/devel/epm/files/patch-Makefile.in b/devel/epm/files/patch-Makefile.in
deleted file mode 100644
index bb2282d77631..000000000000
--- a/devel/epm/files/patch-Makefile.in
+++ /dev/null
@@ -1,96 +0,0 @@
---- Makefile.in.orig	2014-02-03 02:39:49 UTC
-+++ Makefile.in
-@@ -72,8 +72,6 @@ VPATH		=	$(srcdir)
- # Rules...
- #
- 
--.SILENT:
--
- .SUFFIXES:	.c .cxx .h .o
- .c.o:
- 	echo Compiling $<...
-@@ -171,48 +169,48 @@ clang-changes:
- 
- install: all @INSTALL_GUIS@ @INSTALL_OSX@
- 	echo Installing EPM programs in $(bindir)
--	-$(MKDIR) $(bindir)
--	$(RM) $(bindir)/epm
--	$(CP) epm $(bindir)
--	$(STRIP) $(bindir)/epm
--	$(RM) $(bindir)/epminstall
--	$(CP) epminstall $(bindir)
--	$(STRIP) $(bindir)/epminstall
--	$(RM) $(bindir)/mkepmlist
--	$(CP) mkepmlist $(bindir)
-+	-$(MKDIR) $(DESTDIR)$(bindir)
-+	$(RM) $(DESTDIR)$(bindir)/epm
-+	$(CP) epm $(DESTDIR)$(bindir)
-+	$(STRIP) $(DESTDIR)$(bindir)/epm
-+	$(RM) $(DESTDIR)$(bindir)/epminstall
-+	$(CP) epminstall $(DESTDIR)$(bindir)
-+	$(STRIP) $(DESTDIR)$(bindir)/epminstall
-+	$(RM) $(DESTDIR)$(bindir)/mkepmlist
-+	$(CP) mkepmlist $(DESTDIR)$(bindir)
- 	echo Installing EPM manpages in $(mandir)/man1
--	-$(MKDIR) $(mandir)/man1
--	$(RM) $(mandir)/man1/epm.1
--	$(CP) $(srcdir)/doc/epm.man $(mandir)/man1/epm.1
--	$(RM) $(mandir)/man1/epminstall.1
--	$(CP) $(srcdir)/doc/epminstall.man $(mandir)/man1/epminstall.1
--	$(RM) $(mandir)/man1/mkepmlist.1
--	$(CP) $(srcdir)/doc/mkepmlist.man $(mandir)/man1/mkepmlist.1
--	$(RM) $(mandir)/man1/setup.1
--	$(CP) $(srcdir)/doc/setup.man $(mandir)/man1/setup.1
-+	-$(MKDIR) $(DESTDIR)$(mandir)/man1
-+	$(RM) $(DESTDIR)$(mandir)/man1/epm.1
-+	$(CP) $(srcdir)/doc/epm.man $(DESTDIR)$(mandir)/man1/epm.1
-+	$(RM) $(DESTDIR)$(mandir)/man1/epminstall.1
-+	$(CP) $(srcdir)/doc/epminstall.man $(DESTDIR)$(mandir)/man1/epminstall.1
-+	$(RM) $(DESTDIR)$(mandir)/man1/mkepmlist.1
-+	$(CP) $(srcdir)/doc/mkepmlist.man $(DESTDIR)$(mandir)/man1/mkepmlist.1
-+	$(RM) $(DESTDIR)$(mandir)/man1/setup.1
-+	$(CP) $(srcdir)/doc/setup.man $(DESTDIR)$(mandir)/man1/setup.1
- 	echo Installing EPM manpages in $(mandir)/man5
--	-$(MKDIR) $(mandir)/man5
--	$(RM) $(mandir)/man5/epm.list.5
--	$(CP) $(srcdir)/doc/epm.list.man $(mandir)/man5/epm.list.5
--	$(RM) $(mandir)/man5/setup.types.5
--	$(CP) $(srcdir)/doc/setup.types.man $(mandir)/man5/setup.types.5
-+	-$(MKDIR) $(DESTDIR)$(mandir)/man5
-+	$(RM) $(DESTDIR)$(mandir)/man5/epm.list.5
-+	$(CP) $(srcdir)/doc/epm.list.man $(DESTDIR)$(mandir)/man5/epm.list.5
-+	$(RM) $(DESTDIR)$(mandir)/man5/setup.types.5
-+	$(CP) $(srcdir)/doc/setup.types.man $(DESTDIR)$(mandir)/man5/setup.types.5
- 	echo Installing EPM documentation in $(docdir)
--	-$(MKDIR) $(docdir)
--	$(RM) $(docdir)/COPYING
--	$(CP) $(srcdir)/COPYING $(docdir)
--	$(RM) $(docdir)/README
--	$(CP) $(srcdir)/README $(docdir)
--	$(RM) $(docdir)/epm-book.html
--	$(CP) $(srcdir)/doc/epm-book.html $(docdir)
-+	-$(MKDIR) $(DESTDIR)$(docdir)
-+	$(RM) $(DESTDIR)$(docdir)/COPYING
-+	$(CP) $(srcdir)/COPYING $(DESTDIR)$(docdir)
-+	$(RM) $(DESTDIR)$(docdir)/README
-+	$(CP) $(srcdir)/README $(DESTDIR)$(docdir)
-+	$(RM) $(DESTDIR)$(docdir)/epm-book.html
-+	$(CP) $(srcdir)/doc/epm-book.html $(DESTDIR)$(docdir)
- 
- install-guis:	setup uninst
- 	echo Installing EPM setup/uninst in $(libdir)/epm
--	$(RM) -r $(libdir)/epm
--	-$(MKDIR) $(libdir)/epm
--	$(CP) setup $(libdir)/epm
--	-$(STRIP) $(libdir)/epm/setup
--	$(CP) uninst $(libdir)/epm
--	-$(STRIP) $(libdir)/epm/uninst
-+	$(RM) -r $(DESTDIR)$(libdir)/epm
-+	-$(MKDIR) $(DESTDIR)$(libdir)/epm
-+	$(CP) setup $(DESTDIR)$(libdir)/epm
-+	-$(STRIP) $(DESTDIR)$(libdir)/epm/setup
-+	$(CP) uninst $(DESTDIR)$(libdir)/epm
-+	-$(STRIP) $(DESTDIR)$(libdir)/epm/uninst
- 
- install-osx:
- 	echo Installing EPM OSX data files in $(datadir)/epm
diff --git a/devel/epm/files/patch-doc_Makefile.in b/devel/epm/files/patch-doc_Makefile.in
new file mode 100644
index 000000000000..e88a1626e4c3
--- /dev/null
+++ b/devel/epm/files/patch-doc_Makefile.in
@@ -0,0 +1,28 @@
+--- doc/Makefile.in.orig	2020-11-18 13:58:37 UTC
++++ doc/Makefile.in
+@@ -35,6 +35,7 @@ OPTIM		=	@OPTIM@
+ bindir		=	@bindir@
+ datadir		=	@datadir@
+ datarootdir	=	@datarootdir@
++docdir		=	@docdir@
+ exec_prefix	=	@exec_prefix@
+ includedir	=	@includedir@
+ infodir		=	@infodir@
+@@ -82,7 +83,7 @@ clean:
+ install:
+ 	echo Installing EPM manpages in $(BUILDROOT)$(mandir)/man1
+ 	$(INSTALL) -d -m 755 $(BUILDROOT)$(mandir)/man1
+-	for file in epm.1 epminstall.1 mkepmlist. setup.1; do \
++	for file in epm.1 epminstall.1 mkepmlist.1 setup.1; do \
+ 		$(INSTALL) -c -m 644 $$file $(BUILDROOT)$(mandir)/man1; \
+ 	done
+ 	echo Installing EPM manpages in $(BUILDROOT)$(mandir)/man5
+@@ -92,7 +93,7 @@ install:
+ 	done
+ 	echo Installing EPM documentation in $(BUILDROOT)$(docdir)
+ 	$(INSTALL) -d -m 755 $(BUILDROOT)$(docdir)
+-	for file in $(srcdir)/COPYING $(srcdir)/README.md $(BOOKS); do \
++	for file in $(top_srcdir)/COPYING $(top_srcdir)/README.md $(BOOKS); do \
+ 		$(INSTALL) -c -m 644 $$file $(BUILDROOT)$(docdir); \
+ 	done
+ 
diff --git a/devel/epm/pkg-plist b/devel/epm/pkg-plist
index 13a90b1430b1..55ee3750f794 100644
--- a/devel/epm/pkg-plist
+++ b/devel/epm/pkg-plist
@@ -8,5 +8,7 @@ man/man1/setup.1.gz
 man/man5/epm.list.5.gz
 man/man5/setup.types.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/epm-book.epub
 %%PORTDOCS%%%%DOCSDIR%%/epm-book.html
+%%PORTDOCS%%%%DOCSDIR%%/epm-book.pdf