ports/96614: update archivers/p7zip to 4.39

[Andrew Pantyukhin]

>Number:         96614
>Category:       ports
>Synopsis:       update archivers/p7zip to 4.39
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 01 19:10:19 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Andrew Pantyukhin
>Release:        FreeBSD 6.1-RC i386
>Organization:
>Environment:
System: FreeBSD sat64.net17 6.1-RC FreeBSD 6.1-RC #15: Tue Apr 18 00:29:23 MSD 2006 sat at sat64.net17:/usr/obj/usr/src/sys/SATCUR32 i386


	
>Description:
Update to 4.39
Use 7zr
	
>How-To-Repeat:
	
>Fix:

	

--- p7zip.diff begins here ---
diff -urN /usr/ports/archivers/p7zip/Makefile p7zip/Makefile
--- /usr/ports/archivers/p7zip/Makefile	Mon Apr 17 19:48:17 2006
+++ p7zip/Makefile	Mon May  1 22:53:17 2006
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	p7zip
-PORTVERSION=	4.37
+PORTVERSION=	4.39
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,18 +19,18 @@
 MAKEFILE=	makefile
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 PORTDOCS=	*
-MAN1=		7z.1 7za.1
+MAN1=		7z.1 7za.1 7zr.1
 MANCOMPRESSED=	no
 
 DLLDIR=		${PREFIX}/libexec/p7zip
 
 PLIST_SUB=	MODULES=""
-ALL_TARGET=	7z 7za sfx
-7ZBIN=		7z 7za 7zCon.sfx
+ALL_TARGET=	7z 7za 7zr sfx
+7ZBIN=		7z 7za 7zr 7zCon.sfx
 .if defined(WITHOUT_MODULES)
 PLIST_SUB=	MODULES="@comment "
-ALL_TARGET=	7za sfx
-7ZBIN=		7za 7zCon.sfx
+ALL_TARGET=	7za 7zr sfx
+7ZBIN=		7za 7zr 7zCon.sfx
 .endif
 
 .include <bsd.port.pre.mk>
@@ -56,17 +56,18 @@
 		${WRKSRC}/man1/*
 
 do-install:
-	${MKDIR} ${DLLDIR}
+	${INSTALL} -d ${DLLDIR}
 .for f in ${7ZBIN}
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${DLLDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${DLLDIR}/
 .endfor
-	${INSTALL_SCRIPT} ${FILESDIR}/7z ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${FILESDIR}/7z ${PREFIX}/bin/
 	${LN} -sf 7z ${PREFIX}/bin/7za
-	${INSTALL_SCRIPT} ${FILESDIR}/p7zip ${PREFIX}/bin
+	${LN} -sf 7z ${PREFIX}/bin/7zr
+	${INSTALL_SCRIPT} ${FILESDIR}/p7zip ${PREFIX}/bin/
 .if !defined(WITHOUT_MODULES)
 .for f in Codecs Formats
-	${MKDIR} ${DLLDIR}/${f}
-	${INSTALL_DATA} ${WRKSRC}/bin/${f}/* ${DLLDIR}/${f}
+	${INSTALL} -d ${DLLDIR}/${f}
+	${INSTALL_DATA} ${WRKSRC}/bin/${f}/* ${DLLDIR}/${f}/
 .endfor
 .endif
 .if !defined(NOPORTDOCS)
@@ -77,8 +78,6 @@
 	${FIND} ${DOCSDIR} -type d | ${XARGS} ${CHMOD} 755
 	${FIND} ${DOCSDIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
 .endif
-.for m in ${MAN1}
-	${INSTALL} ${WRKSRC}/man1/${m} ${MAN1PREFIX}/man/man1
-.endfor
+	${INSTALL_MAN} ${MAN1:S,^,${WRKSRC}/man1/,} ${MAN1PREFIX}/man/man1/
 
 .include <bsd.port.post.mk>
diff -urN /usr/ports/archivers/p7zip/distinfo p7zip/distinfo
--- /usr/ports/archivers/p7zip/distinfo	Mon Apr 17 19:48:17 2006
+++ p7zip/distinfo	Mon May  1 21:36:25 2006
@@ -1,3 +1,3 @@
-MD5 (p7zip_4.37_src_all.tar.bz2) = a44cc192317c03e204821d6198e913df
-SHA256 (p7zip_4.37_src_all.tar.bz2) = b791f247f7662f1205ba0677144c41e1b68096eff40b1c506e0524d98574afee
-SIZE (p7zip_4.37_src_all.tar.bz2) = 1474144
+MD5 (p7zip_4.39_src_all.tar.bz2) = 081be9cfb67c9be4e526913b14dd6f86
+SHA256 (p7zip_4.39_src_all.tar.bz2) = 8eef1c3907f58a2fd2b15bce94334635d8199e21d5daab541057a828b7e7da0e
+SIZE (p7zip_4.39_src_all.tar.bz2) = 1445834
diff -urN /usr/ports/archivers/p7zip/pkg-plist p7zip/pkg-plist
--- /usr/ports/archivers/p7zip/pkg-plist	Mon Apr 17 19:48:17 2006
+++ p7zip/pkg-plist	Mon May  1 22:51:46 2006
@@ -1,9 +1,12 @@
 @unexec /bin/rm -f %D/bin/7za
+ at unexec /bin/rm -f %D/bin/7zr
 bin/7z
 bin/p7zip
 @exec /bin/ln -sf 7z %D/bin/7za
+ at exec /bin/ln -sf 7z %D/bin/7zr
 %%MODULES%%libexec/p7zip/7z
 libexec/p7zip/7za
+libexec/p7zip/7zr
 libexec/p7zip/7zCon.sfx
 %%MODULES%%libexec/p7zip/Codecs/7zAES.so
 %%MODULES%%libexec/p7zip/Codecs/AES.so
--- p7zip.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: