- Update to 0.2.1

- Respsct NOPORTDOCS

PR:		152153
Submitted by:	Sofian Brabez <sbrabez AT gmail.com> (maintainer)

3 files changed, 28 insertions, 27 deletions

diff --git a/sysutils/pax-utils/Makefile b/sysutils/pax-utils/Makefile
index 2e54b3bfd46a..3a1e4f2e0845 100644
--- a/sysutils/pax-utils/Makefile
+++ b/sysutils/pax-utils/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	pax-utils
-PORTVERSION=	0.1.15
+PORTVERSION=	0.2.1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GENTOO} \
-		http://dev.gentoo.org/~solar/pax/ \
 		http://dev.gentoo.org/~vapier/dist/
 MASTER_SITE_SUBDIR=	distfiles
 
@@ -19,16 +18,18 @@ COMMENT=	Various ELF related utils for ELF32, ELF64 binaries
 USE_BZIP2=	true
 USE_GMAKE=	true
 
-PLIST_FILES=	bin/dumpelf bin/pspax bin/scanelf
+PLIST_FILES=	bin/dumpelf bin/pspax bin/scanelf bin/scanmacho
 
-DOCS=		BUGS README TODO
+PORTDOCS=	BUGS README TODO
 
-MAN1=		dumpelf.1 pspax.1 scanelf.1
+MAN1=		${PLIST_FILES:S,bin/,,:S,$,.1,}
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/dumpelf ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/pspax ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/scanelf ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/* ${PREFIX}/man/man1
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
+.endif
+	${INSTALL_SCRIPT} ${PLIST_FILES:S,bin/,,:S,^,${WRKSRC}/,} ${PREFIX}/bin
+	${INSTALL_MAN} ${MAN1:S,^,${WRKSRC}/man/,} ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/sysutils/pax-utils/distinfo b/sysutils/pax-utils/distinfo
index 39502f6ffa57..7ce95be9c79b 100644
--- a/sysutils/pax-utils/distinfo
+++ b/sysutils/pax-utils/distinfo
@@ -1,3 +1,2 @@
-MD5 (pax-utils-0.1.15.tar.bz2) = acf0e368cb33bc2f6a335ba3f5e4fd2b
-SHA256 (pax-utils-0.1.15.tar.bz2) = e20f47cd64f2749cfee5b313b7a0439d8ad5df921c66a1b8384140e5e76fc055
-SIZE (pax-utils-0.1.15.tar.bz2) = 53850
+SHA256 (pax-utils-0.2.1.tar.bz2) = 6a5beefb686e425eb6829bc716d2b32b64c2e854287c212c9853bc2beb705c3a
+SIZE (pax-utils-0.2.1.tar.bz2) = 80580
diff --git a/sysutils/pax-utils/files/patch-Makefile b/sysutils/pax-utils/files/patch-Makefile
index 79dff9601994..6d7d85f5bfd6 100644
--- a/sysutils/pax-utils/files/patch-Makefile
+++ b/sysutils/pax-utils/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	Wed May 17 23:48:10 2006
-+++ Makefile	Thu Jul 20 20:51:39 2006
-@@ -20,7 +20,7 @@
+--- ./Makefile.orig	2010-02-14 19:14:16.000000000 +0100
++++ ./Makefile	2010-11-12 00:49:47.000000000 +0100
+@@ -21,7 +21,7 @@
  LDFLAGS   +=
  LIBS      :=
  DESTDIR    =
@@ -9,21 +9,22 @@
  STRIP     := strip
  MKDIR     := mkdir -p
  CP        := cp
-@@ -98,7 +98,7 @@
+@@ -97,15 +97,15 @@
  	$(STRIP) --strip-unneeded $(TARGETS)
  
  install: all
--	-$(MKDIR) $(PREFIX)/bin/ $(PREFIX)/share/man/man1/
-+	-$(MKDIR) $(PREFIX)/bin/ $(MANPREFIX)/man/man1/
- 	$(CP) $(TARGETS) $(PREFIX)/bin/
+-	$(MKDIR) $(PREFIX)/bin/ $(PREFIX)/share/man/man1/
++	$(MKDIR) $(PREFIX)/bin/ $(MANPREFIX)/share/man/man1/
+ 	for sh in *.sh ; do $(INS_EXE) $$sh $(PREFIX)/bin/$${sh%.sh} || exit $$? ; done
+ 	$(INS_EXE) $(TARGETS) $(PREFIX)/bin/
  ifeq ($(S),)
- 	-$(MKDIR) $(PREFIX)/share/doc/pax-utils/
-@@ -106,7 +106,7 @@
+ 	$(MKDIR) $(PREFIX)/share/doc/pax-utils/
+ 	$(CP) README BUGS TODO $(PREFIX)/share/doc/pax-utils/
+-	-$(INS_DATA) $(MPAGES) $(PREFIX)/share/man/man1/
++	-$(INS_DATA) $(MPAGES) $(MANPREFIX)/share/man/man1/
+ else
+-	$(INS_DATA) $(MPAGES) $(PREFIX)/share/man/man1/
++	$(INS_DATA) $(MPAGES) $(MANPREFIX)/share/man/man1/
  endif
- 	for mpage in $(MPAGES) ; do \
- 		[ -e $$mpage ] \
--			&& cp $$mpage $(PREFIX)/share/man/man1/ || : ;\
-+			&& cp $$mpage $(MANPREFIX)/man/man1/ || : ;\
- 	done
  
- dist: distclean
+ dist: