Bug 87213 - [update] archivers/p7zip to 4.29
Summary: [update] archivers/p7zip to 4.29
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2005-10-10 16:50 UTC by Andrej Zverev
Modified: 2005-10-15 13:46 UTC (History)
0 users

See Also:


Attachments
p7zip.diff (2.12 KB, patch)
2005-10-10 16:50 UTC, Andrej Zverev
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Andrej Zverev 2005-10-10 16:50:17 UTC
	- Update to version 4.29
Comment 1 Andrej Zverev freebsd_committer freebsd_triage 2005-10-10 16:59:13 UTC
Responsible Changed
From-To: freebsd-ports-bugs->az

I'll take it.
Comment 2 Andrej Zverev freebsd_committer freebsd_triage 2005-10-10 18:22:11 UTC
State Changed
From-To: open->feedback

Asked maintainer for approval
Comment 3 Andrej Zverev freebsd_committer freebsd_triage 2005-10-10 19:09:52 UTC
Dear maintainer, do you approve this update ?

http://www.freebsd.org/cgi/query-pr.cgi?pr=87213
Comment 4 Juergen Lock 2005-10-10 21:32:19 UTC
On Mon, Oct 10, 2005 at 10:09:52PM +0400, Andrej Zverev wrote:
> Dear maintainer, do you approve this update ?
> 
> http://www.freebsd.org/cgi/query-pr.cgi?pr=87213
> 
I just merged sf@'s older update (add manpages, catch-up changes to
makefile.freebsd) and the INSTALL_DATA patch for the .so.s:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile	7 Jun 2005 12:05:26 -0000	1.11
+++ Makefile	10 Oct 2005 20:23:25 -0000
@@ -6,21 +6,23 @@
 #
 
 PORTNAME=	p7zip
-PORTVERSION=	4.20
+PORTVERSION=	4.29
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	p7zip
-DISTNAME=	${PORTNAME}_${PORTVERSION}_src
+DISTNAME=	${PORTNAME}_${PORTVERSION}_src_all
 
 MAINTAINER=	nox@jelal.kn-bremen.de
 COMMENT=	Command line versions of 7-zip
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 MAKEFILE=	makefile
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 PORTDOCS=	*
+MAN1=		7z.1 7za.1
 
 DLLDIR=		${PREFIX}/libexec/p7zip
 
@@ -44,7 +46,7 @@
 .endif
 
 post-patch:
-	${SED} -e 's/-O2/${CFLAGS} ${PTHREAD_CFLAGS}/' \
+	${SED} -e 's/-O/${CFLAGS} ${PTHREAD_CFLAGS}/' \
 	       -e 's!g\+\+!${CXX}!' \
 	       -e 's!gcc!${CC}!' \
 	       -e '/LITTLE_ENDIAN/d' \
@@ -52,6 +54,8 @@
 	       -e 's/-D_FILE_OFFSET_BITS=64//' \
 	       -e 's/-lc_r/${PTHREAD_LIBS}/' \
 	       ${WRKSRC}/makefile.freebsd > ${WRKSRC}/makefile.machine
+	${REINPLACE_CMD} -e 's|/usr/share/doc/p7zip/DOCS|${DOCSDIR}|' \
+		${WRKSRC}/man1/*
 
 do-install:
 	${MKDIR} ${DLLDIR}
@@ -63,7 +67,7 @@
 .if !defined(WITHOUT_MODULES)
 .for f in Codecs Formats
 	${MKDIR} ${DLLDIR}/${f}
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${f}/* ${DLLDIR}/${f}
+	${INSTALL_DATA} ${WRKSRC}/bin/${f}/* ${DLLDIR}/${f}
 .endfor
 .endif
 .if !defined(NOPORTDOCS)
@@ -74,5 +78,6 @@
 	${FIND} ${DOCSDIR} -type d | ${XARGS} ${CHMOD} 755
 	${FIND} ${DOCSDIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
 .endif
+	${INSTALL_MAN} ${WRKSRC}/man1/*.1 ${PREFIX}/man/man1
 
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo	7 Jun 2005 12:05:26 -0000	1.8
+++ distinfo	10 Oct 2005 20:13:17 -0000
@@ -1,2 +1,2 @@
-MD5 (p7zip_4.20_src.tar.bz2) = 91abf73ddfc92a0ed87dd5bb9fc3a38d
-SIZE (p7zip_4.20_src.tar.bz2) = 328976
+MD5 (p7zip_4.29_src_all.tar.bz2) = 1ea12d7e91c9c67fb6512a6a144b8431
+SIZE (p7zip_4.29_src_all.tar.bz2) = 416265
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/archivers/p7zip/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- pkg-plist	28 Apr 2005 22:49:04 -0000	1.4
+++ pkg-plist	10 Oct 2005 20:13:17 -0000
@@ -13,8 +13,10 @@
 %%MODULES%%libexec/p7zip/Codecs/Implode.so
 %%MODULES%%libexec/p7zip/Codecs/LZMA.so
 %%MODULES%%libexec/p7zip/Codecs/PPMD.so
+%%MODULES%%libexec/p7zip/Codecs/Rar29.so
 %%MODULES%%libexec/p7zip/Codecs/Swap.so
 %%MODULES%%libexec/p7zip/Formats/7z.so
+%%MODULES%%libexec/p7zip/Formats/chm.so
 %%MODULES%%libexec/p7zip/Formats/Rar.so
 %%MODULES%%libexec/p7zip/Formats/Tar.so
 %%MODULES%%libexec/p7zip/Formats/Zip.so
@@ -26,6 +28,7 @@
 %%MODULES%%libexec/p7zip/Formats/gz.so
 %%MODULES%%libexec/p7zip/Formats/rpm.so
 %%MODULES%%libexec/p7zip/Formats/split.so
+%%MODULES%%libexec/p7zip/Formats/lzh.so
 %%MODULES%%libexec/p7zip/Formats/z.so
 %%MODULES%%@dirrm libexec/p7zip/Formats
 %%MODULES%%@dirrm libexec/p7zip/Codecs
Comment 5 Andrej Zverev freebsd_committer freebsd_triage 2005-10-14 07:03:17 UTC
Responsible Changed
From-To: az->freebsd-ports-bugs

Back to spool, ENOTIME now :(
Comment 6 Sergey Matveychuk freebsd_committer freebsd_triage 2005-10-15 13:46:19 UTC
State Changed
From-To: feedback->closed

Committed, thanks!