From 7ddffbeb4174dba5cddf96b48c17b3946aff0505 Mon Sep 17 00:00:00 2001
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Sun, 8 Mar 2015 13:16:25 +0000
Subject: [PATCH] Update to 9.38.1.

---
 archivers/p7zip-codec-rar/Makefile |  2 +-
 archivers/p7zip/Makefile           |  9 +++++----
 archivers/p7zip/distinfo           |  4 ++--
 archivers/p7zip/pkg-plist          | 11 ++++++++++-
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/archivers/p7zip-codec-rar/Makefile b/archivers/p7zip-codec-rar/Makefile
index 420b2f46d54c..f9f6c0ae69d8 100644
--- a/archivers/p7zip-codec-rar/Makefile
+++ b/archivers/p7zip-codec-rar/Makefile
@@ -8,7 +8,7 @@ COMMENT=	RAR decoder codec for p7zip
 LICENSE=		LGPL21 UNRAR
 LICENSE_COMB=		multi
 LICENSE_NAME_UNRAR=	unRAR usage restriction license
-LICENSE_FILE_UNRAR=	${WRKSRC}/DOCS/unRarLicense.txt
+LICENSE_FILE_UNRAR=	${WRKSRC}/DOC/unRarLicense.txt
 LICENSE_PERMS_UNRAR=	auto-accept dist-mirror dist-sell pkg-mirror pkg-sell
 
 MASTERDIR=	${.CURDIR}/../p7zip
diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile
index f26dac08ef3a..aeb644b15a8f 100644
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	p7zip
-PORTVERSION=	9.20.1
-PORTREVISION?=	2
+PORTVERSION=	9.38.1
+PORTREVISION?=	0
 CATEGORIES=	archivers
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_${DISTVERSION}_src_all
@@ -27,12 +27,13 @@ OPTIONS_DEFINE=	DOCS
 post-patch:
 	${SED} -e 's!g\+\+!${CXX}!' \
 	       -e 's!gcc!${CC}!' \
+	       -e 's/ -s //' \
 	       -e 's/-D_LARGEFILE_SOURCE//' \
 	       -e 's/-D_FILE_OFFSET_BITS=64//' \
 	       ${WRKSRC}/makefile.freebsd6 > ${WRKSRC}/makefile.machine
 	${REINPLACE_CMD} -e 's|{DEST_SHARE_DOC}|${DOCSDIR}|' \
 		${WRKSRC}/man1/*
-	${MV} ${WRKSRC}/README ${WRKSRC}/DOCS/readme.unix
+	${MV} ${WRKSRC}/README ${WRKSRC}/DOC/readme.unix
 
 .if ! defined(PKGNAMESUFFIX)
 do-install:
@@ -46,7 +47,7 @@ do-install:
 	${LN} -sf 7z ${STAGEDIR}${PREFIX}/bin/7za
 	${LN} -sf 7z ${STAGEDIR}${PREFIX}/bin/7zr
 
-	(cd ${WRKSRC}/DOCS && \
+	(cd ${WRKSRC}/DOC && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 	(cd ${WRKSRC}/man1 && \
 		${INSTALL_MAN} 7z*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1)
diff --git a/archivers/p7zip/distinfo b/archivers/p7zip/distinfo
index 7de6d3060203..c6f6e2b136f3 100644
--- a/archivers/p7zip/distinfo
+++ b/archivers/p7zip/distinfo
@@ -1,2 +1,2 @@
-SHA256 (p7zip_9.20.1_src_all.tar.bz2) = 49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782
-SIZE (p7zip_9.20.1_src_all.tar.bz2) = 3835235
+SHA256 (p7zip_9.38.1_src_all.tar.bz2) = fd5019109c9a1bf34ad3257d37a6853eae8151ff50345f0a3ffba7d8c5fdb995
+SIZE (p7zip_9.38.1_src_all.tar.bz2) = 3917925
diff --git a/archivers/p7zip/pkg-plist b/archivers/p7zip/pkg-plist
index b16183284551..d96e9f28bb04 100644
--- a/archivers/p7zip/pkg-plist
+++ b/archivers/p7zip/pkg-plist
@@ -17,8 +17,10 @@ man/man1/7zr.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/delete.htm
 %%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/extract.htm
 %%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/extract_full.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/hash.htm
 %%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/index.htm
 %%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/list.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/rename.htm
 %%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/style.css
 %%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/test.htm
 %%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/update.htm
@@ -39,10 +41,17 @@ man/man1/7zr.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/overwrite.htm
 %%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/password.htm
 %%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/recurse.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/sa.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/scrc.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/sdel.htm
 %%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/sfx.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/sni.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/sns.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/spf.htm
 %%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/ssc.htm
 %%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/stdin.htm
 %%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/stdout.htm
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/stl.htm
 %%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/stop_switch.htm
 %%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/style.css
 %%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/type.htm
@@ -53,8 +62,8 @@ man/man1/7zr.1.gz
 %%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%%/src-history.txt
 %%PORTDOCS%%%%DOCSDIR%%/unRarLicense.txt