3 files changed, 70 insertions, 49 deletions

diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile
index b1e9d4bcb88f..abb36c39788e 100644
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	p7zip
-PORTVERSION=	4.44
+PORTVERSION=	4.45
 CATEGORIES=	archivers
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_${PORTVERSION}_src_all
@@ -17,12 +17,9 @@ COMMENT=	File archiver with high compression ratio
 USE_BZIP2=	yes
 MAKEFILE=	makefile
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
-PORTDOCS=	*
 MAN1=		7z.1 7za.1 7zr.1
-MANCOMPRESSED=	no
 
 DLLDIR=		${PREFIX}/libexec/p7zip
-
 PLIST_SUB=	MODULES=""
 ALL_TARGET=	7z 7za 7zr Client7z sfx
 7ZBIN=		7z 7za 7zr Client7z 7zCon.sfx
@@ -49,29 +46,26 @@ post-patch:
 	       ${WRKSRC}/makefile.freebsd > ${WRKSRC}/makefile.machine
 	${REINPLACE_CMD} -e 's|/usr/share/doc/p7zip/DOCS|${DOCSDIR}|' \
 		${WRKSRC}/man1/*
+	${MV} ${WRKSRC}/README ${WRKSRC}/DOCS/readme.unix
 
 do-install:
-	${INSTALL} -d ${DLLDIR}
-.for f in ${7ZBIN}
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${DLLDIR}/
-.endfor
+	${INSTALL} -d ${DLLDIR}/
+	${INSTALL_PROGRAM} ${7ZBIN:S|^|${WRKSRC}/bin/|} ${DLLDIR}/
 	${INSTALL_SCRIPT} ${FILESDIR}/7z ${PREFIX}/bin/
 	${LN} -sf 7z ${PREFIX}/bin/7za
 	${LN} -sf 7z ${PREFIX}/bin/7zr
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/gzip-like_CLI_wrapper_for_7z/p7zip ${PREFIX}/bin/
 .if !defined(WITHOUT_MODULES)
-.for f in Codecs Formats
-	${INSTALL} -d ${DLLDIR}/${f}
-	${INSTALL_DATA} ${WRKSRC}/bin/${f}/* ${DLLDIR}/${f}/
-.endfor
+	${INSTALL} -d ${DLLDIR}/Codecs/
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/Codecs/Rar29.so ${DLLDIR}/Codecs/
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/7z.so ${DLLDIR}/
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/7za.so ${DLLDIR}/
 .endif
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${PAX} -rw -s,${WRKSRC}/DOCS,, ${WRKSRC}/DOCS ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/readme.unix
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
-	${FIND} ${DOCSDIR} -type d | ${XARGS} ${CHMOD} 755
-	${FIND} ${DOCSDIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
+	@${INSTALL} -d ${DOCSDIR}/
+	${CP} -R ${WRKSRC}/DOCS/ ${DOCSDIR}/
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}/
+	${CHMOD} -R u=rwX,go=rX ${DOCSDIR}/
 .endif
 	${INSTALL_MAN} ${MAN1:S,^,${WRKSRC}/man1/,} ${MAN1PREFIX}/man/man1/
 
diff --git a/archivers/p7zip/distinfo b/archivers/p7zip/distinfo
index feb45ff9844b..a94507dc027f 100644
--- a/archivers/p7zip/distinfo
+++ b/archivers/p7zip/distinfo
@@ -1,3 +1,3 @@
-MD5 (p7zip_4.44_src_all.tar.bz2) = 78b04bed16a1e7e91b5bf2f1f84ab811
-SHA256 (p7zip_4.44_src_all.tar.bz2) = cb87304f682e7176ab95ce73d3ce2b7b65384e051272fc34ef934e2427bbd3af
-SIZE (p7zip_4.44_src_all.tar.bz2) = 1518820
+MD5 (p7zip_4.45_src_all.tar.bz2) = b7eb7a92b1bf0e73a2feae95cd3184f7
+SHA256 (p7zip_4.45_src_all.tar.bz2) = 3a2902d532a7673113609232b46c868e6c55dbce0e7ef73d8ef944fb295c7984
+SIZE (p7zip_4.45_src_all.tar.bz2) = 1458299
diff --git a/archivers/p7zip/pkg-plist b/archivers/p7zip/pkg-plist
index 1aba1595ea0f..2f887e8320dd 100644
--- a/archivers/p7zip/pkg-plist
+++ b/archivers/p7zip/pkg-plist
@@ -3,38 +3,65 @@ bin/7za
 bin/7zr
 bin/p7zip
 %%MODULES%%libexec/p7zip/7z
+%%MODULES%%libexec/p7zip/7z.so
+%%MODULES%%libexec/p7zip/7za.so
 %%MODULES%%libexec/p7zip/Client7z
 libexec/p7zip/7za
 libexec/p7zip/7zr
 libexec/p7zip/7zCon.sfx
-%%MODULES%%libexec/p7zip/Codecs/7zAES.so
-%%MODULES%%libexec/p7zip/Codecs/AES.so
-%%MODULES%%libexec/p7zip/Codecs/BZip2.so
-%%MODULES%%libexec/p7zip/Codecs/Branch.so
-%%MODULES%%libexec/p7zip/Codecs/Copy.so
-%%MODULES%%libexec/p7zip/Codecs/Deflate.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/7za.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
-%%MODULES%%libexec/p7zip/Formats/arj.so
-%%MODULES%%libexec/p7zip/Formats/bz2.so
-%%MODULES%%libexec/p7zip/Formats/cab.so
-%%MODULES%%libexec/p7zip/Formats/cpio.so
-%%MODULES%%libexec/p7zip/Formats/deb.so
-%%MODULES%%libexec/p7zip/Formats/gz.so
-%%MODULES%%libexec/p7zip/Formats/nsis.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%%libexec/p7zip/Formats/iso.so
-%%MODULES%%@dirrm libexec/p7zip/Formats
 %%MODULES%%@dirrm libexec/p7zip/Codecs
 @dirrm libexec/p7zip
+%%PORTDOCS%%%%DOCSDIR%%/7zC.txt
+%%PORTDOCS%%%%DOCSDIR%%/7zFormat.txt
+%%PORTDOCS%%%%DOCSDIR%%/License.txt
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/add.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/bench.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/delete.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/extract.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/extract_full.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/index.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/list.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/style.css
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/test.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/update.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/exit_codes.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/index.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/style.css
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/ar_exclude.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/ar_include.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/ar_no.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/charset.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/email.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/exclude.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/include.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/index.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/large_pages.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/list_tech.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/method.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/output_dir.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/overwrite.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/password.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/recurse.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/sfx.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/stdin.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/stdout.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/stop_switch.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/style.css
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/type.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/update.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/volume.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/working_dir.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/yes.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/syntax.htm
+%%PORTDOCS%%%%DOCSDIR%%/Methods.txt
+%%PORTDOCS%%%%DOCSDIR%%/copying.txt
+%%PORTDOCS%%%%DOCSDIR%%/history.txt
+%%PORTDOCS%%%%DOCSDIR%%/lzma.txt
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%%%DOCSDIR%%/readme.unix
+%%PORTDOCS%%%%DOCSDIR%%/unRarLicense.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/MANUAL/commands
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/MANUAL/switches
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/MANUAL
+%%PORTDOCS%%@dirrm %%DOCSDIR%%