What's new after p7zip 9.38.1 :

  - 7-Zip now can extract ext2 and multivolume VMDK images.
  - 7-Zip now can extract ext3 and ext4 (Linux file system) images.
  - support of cygwin 64 bits
  - support of cygwin 64 bits with asm
  - cygwin : fix in GetRamSize()
  - cross building added :
		makefile.linux_cross_aarch64
		makefile.linux_cross_arm
		makefile.linux_cross_ppc
		makefile.linux_cross_ppc64
		makefile.linux_cross_ppc64le
		makefile.linux_cross_s390x  (7za and 7zr pass tests, 7z does not pass tests)

  - 7-Zip now can extract GPT images and single file QCOW2, VMDK, VDI images.
  - 7-Zip now can extract solid WIM archives with LZMS compression.
  - 7-Zip now can extract RAR5 archives.
  - 7-Zip now doesn't sort files by type while adding to solid 7z archive.
      new -mqs switch to sort files by type while adding to solid 7z archive.
  - 7-Zip now can create 7z, xz and zip archives with 1536 MB dictionary for LZMA/LZMA2.
  - 7-Zip now can extract .zipx (WinZip) archives that use xz compression.

5 files changed, 23 insertions, 20 deletions

diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile
index e5e00c7a58b..076b1ee8e73 100644
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2015/06/02 14:53:10 adam Exp $
+# $NetBSD: Makefile,v 1.59 2015/12/29 19:39:21 adam Exp $
 
-DISTNAME=	p7zip_9.38.1_src_all
-PKGNAME=	p7zip-9.38.1
+DISTNAME=	p7zip_15.09_src_all
+PKGNAME=	p7zip-15.09
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=p7zip/}
 EXTRACT_SUFX=	.tar.bz2
@@ -70,11 +70,11 @@ do-install:
 .endif
 	${INSTALL_DATA} ${WRKSRC}/README \
 		${DESTDIR}${PREFIX}/share/doc/p7zip
-	${INSTALL_DATA} ${WRKSRC}/DOC/MANUAL/*.* \
+	${INSTALL_DATA} ${WRKSRC}/DOC/MANUAL/cmdline/*.* \
 		${DESTDIR}${PREFIX}/share/doc/p7zip
-	${INSTALL_DATA} ${WRKSRC}/DOC/MANUAL/commands/*.* \
+	${INSTALL_DATA} ${WRKSRC}/DOC/MANUAL/cmdline/commands/*.* \
 		${DESTDIR}${PREFIX}/share/doc/p7zip/commands
-	${INSTALL_DATA} ${WRKSRC}/DOC/MANUAL/switches/*.* \
+	${INSTALL_DATA} ${WRKSRC}/DOC/MANUAL/cmdline/switches/*.* \
 		${DESTDIR}${PREFIX}/share/doc/p7zip/switches
 	${INSTALL_MAN} ${WRKSRC}/man1/7z.1 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
diff --git a/archivers/p7zip/PLIST b/archivers/p7zip/PLIST
index 6a17bb9c3c6..f385778944f 100644
--- a/archivers/p7zip/PLIST
+++ b/archivers/p7zip/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2015/06/02 14:53:10 adam Exp $
+@comment $NetBSD: PLIST,v 1.20 2015/12/29 19:39:21 adam Exp $
 bin/7z
 bin/7za
 ${PLIST.dll}lib/7z.so
@@ -27,6 +27,7 @@ share/doc/p7zip/switches/ar_exclude.htm
 share/doc/p7zip/switches/ar_include.htm
 share/doc/p7zip/switches/ar_no.htm
 share/doc/p7zip/switches/charset.htm
+share/doc/p7zip/switches/email.htm
 share/doc/p7zip/switches/exclude.htm
 share/doc/p7zip/switches/include.htm
 share/doc/p7zip/switches/index.htm
@@ -38,9 +39,11 @@ share/doc/p7zip/switches/overwrite.htm
 share/doc/p7zip/switches/password.htm
 share/doc/p7zip/switches/recurse.htm
 share/doc/p7zip/switches/sa.htm
+share/doc/p7zip/switches/scc.htm
 share/doc/p7zip/switches/scrc.htm
 share/doc/p7zip/switches/sdel.htm
 share/doc/p7zip/switches/sfx.htm
+share/doc/p7zip/switches/shared.htm
 share/doc/p7zip/switches/sni.htm
 share/doc/p7zip/switches/sns.htm
 share/doc/p7zip/switches/spf.htm
diff --git a/archivers/p7zip/distinfo b/archivers/p7zip/distinfo
index 241359e9286..f0ac9c5d1b2 100644
--- a/archivers/p7zip/distinfo
+++ b/archivers/p7zip/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.44 2015/11/03 00:56:24 agc Exp $
+$NetBSD: distinfo,v 1.45 2015/12/29 19:39:21 adam Exp $
 
-SHA1 (p7zip_9.38.1_src_all.tar.bz2) = 6b1eccf272d8b141a94758f80727ae633568ba69
-RMD160 (p7zip_9.38.1_src_all.tar.bz2) = df76939ed67f3835fe4f8e92f2fec1ab4e4328c6
-SHA512 (p7zip_9.38.1_src_all.tar.bz2) = f524ffae54e0d9563a509cc4b243e830d882a925e682eb2e15e2d19cb72c947fddecd72c8507d6c1538b997b240b0827046fc2fb4f5e3f7d49840257c92b9c04
-Size (p7zip_9.38.1_src_all.tar.bz2) = 3917925 bytes
+SHA1 (p7zip_15.09_src_all.tar.bz2) = d5d21ac15e7c197f8af0366694ab9a301cfce972
+RMD160 (p7zip_15.09_src_all.tar.bz2) = f9ca03529644f43893f1f1b7ef6d864549e53022
+SHA512 (p7zip_15.09_src_all.tar.bz2) = 4f020b13632ef7a85aa8a98586b59bef2dde3c1cbebdbd17e01f1d09b2e13a56ecfe82546d7efc677c45df67456a71cfdb67826b53ebea4c0fb4878f20c2f6dd
+Size (p7zip_15.09_src_all.tar.bz2) = 4048481 bytes
 SHA1 (patch-CPP_Windows_DLL.cpp) = 12fb3f3cf4d32b8848f741dde6bcb0e56a9c6745
-SHA1 (patch-aa) = 91917c8cfc9638444a32924570067a4298c82105
+SHA1 (patch-aa) = 9c103fa831cc6ff099e3a604c763ff416f1b48ec
 SHA1 (patch-ab) = c680fb037b9ef5e19e4c8dc71dd710598277a61b
-SHA1 (patch-ac) = 245f93d2a250b0e2f17e7828a82787ac05652800
+SHA1 (patch-ac) = a7afeded4aeb5ef230d006d1556ee601a6190063
diff --git a/archivers/p7zip/patches/patch-aa b/archivers/p7zip/patches/patch-aa
index 1ffd46c6514..6ecde578e02 100644
--- a/archivers/p7zip/patches/patch-aa
+++ b/archivers/p7zip/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.20 2015/06/02 14:53:10 adam Exp $
+$NetBSD: patch-aa,v 1.21 2015/12/29 19:39:21 adam Exp $
 
 --- makefile.machine.orig	2015-02-25 20:12:06.000000000 +0000
 +++ makefile.machine
@@ -6,10 +6,10 @@ $NetBSD: patch-aa,v 1.20 2015/06/02 14:53:10 adam Exp $
  # makefile for Linux (x86, PPC, alpha ...)
  #
  
--OPTFLAGS=-O
+-OPTFLAGS=-O -s
 +OPTFLAGS=
  
--ALLFLAGS=${OPTFLAGS} -pipe -s \
+-ALLFLAGS=${OPTFLAGS} -pipe \
 +ALLFLAGS=${OPTFLAGS} -Wall \
      	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
  	-DNDEBUG -D_REENTRANT -DENV_UNIX \
diff --git a/archivers/p7zip/patches/patch-ac b/archivers/p7zip/patches/patch-ac
index 522357e9e8f..f381223ee25 100644
--- a/archivers/p7zip/patches/patch-ac
+++ b/archivers/p7zip/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.8 2015/06/02 14:53:10 adam Exp $
+$NetBSD: patch-ac,v 1.9 2015/12/29 19:39:21 adam Exp $
 
---- makefile.glb.orig	2015-02-19 14:56:02.000000000 +0000
+--- makefile.glb.orig	2015-10-03 20:25:19.000000000 +0000
 +++ makefile.glb
 @@ -1,14 +1,14 @@
  
@@ -16,6 +16,6 @@ $NetBSD: patch-ac,v 1.8 2015/06/02 14:53:10 adam Exp $
  
 -CXXFLAGS=-c -I. \
 +CXXFLAGS+=-c -I. \
+ -I../../../../C \
  -I../../../myWindows \
  -I../../../ \
- -I../../../include_windows \