Update to 15.14

* Convert to use option framework

Changelog:
Version 15.14
=============

  - patch #26 : Patch to correctly set permissions for docs that permits non-sudo deletion of docs

  - patch #27 : Update Mac OS X LLVM 64bits Makefile

  - patch #28 : p7zip version 15.09 fails to build on s390

  - patch #29 : please fix incorrect fsf address

  - patch #31 : p7zip 15.09 fails to build on mips

  - bug :  "7za a -p ..." was fixed

  - bug #172 : Impossible to create archive with some unicode symbols in filename

  - From Windows version of 7-Zip 15.13:
    - The BUG in 15.13 in CAB code was fixed.

  - From Windows version of 7-Zip 15.12:
    - Some bugs were fixed.
    - New localization: Yoruba.

  - test_emul becomes test_lib  (tests libraries)

  - cross building added :
		makefile.linux_cross_mipsel

  - support for android 5+ (-fPIE -pie)

Version 15.12 (never published)
=============
  - From Windows version of 7-Zip 15.12 :
    - "There are no errors" string after "Test" operation inside archive.
    - The bugs in LZMA SDK were fixed (but these bugs are not related directly to 7-Zip's code).


  - From Windows version of 7-Zip 15.11 :
        - Some bugs were fixed.
        - 7-Zip 15.10 showed incorrect error message about missing volume for multivolume RAR archives.

   - ..../LZHAM added



Version 15.10 beta
==================

  - bug #147 Directory traversal through symlinks
    Bug-Debian: https://bugs.debian.org/774660
    Delay creation of symlinks to prevent arbitrary file writes (CVE-2015-1038)
    Fix given by Ben Hutchings

  - From Windows version of 7-zip 15.10 beta:
    - The BUG in 9.21 - 15.09 was fixed:
      7-Zip could ignore some parameters, specified for archive creation operation
	  for gzip and bzip2 formats in "Add to Archive" window and in command line
	  version (-m switch).
    - Some bugs were fixed.
      - extracting from solid wim archives worked incorrectly in some cases,
    - Also there are some minor changes.
      - 7-Zip can show the name of missing volume for multivolume RAR and VMDK archives.
      - Some internal changes with 7-Zip Benchmark.

archivers/p7zip/Makefile

@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2016/02/14 08:39:47 ryoon Exp $
+# $NetBSD: Makefile,v 1.61 2016/04/07 14:41:34 ryoon Exp $
 
-DISTNAME=	p7zip_15.09_src_all
-PKGNAME=	p7zip-15.09
-PKGREVISION=	1
+DISTNAME=	p7zip_15.14_src_all
+PKGNAME=	p7zip-15.14
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=p7zip/}
 EXTRACT_SUFX=	.tar.bz2
@@ -18,26 +17,14 @@ MAKE_FILE=		makefile
 MAKE_JOBS_SAFE=		no # missing header when compiling sfx
 NO_CONFIGURE=		yes
 PTHREAD_OPTS+=		require
-PLIST_VARS=		dll
 
-# compiles, but does not recognize any archives as supported
-DYNAMIC_7Z?=		NO
-.if !empty(DYNAMIC_7Z:MYES)
-BUILD_TARGET=		all2
-PLIST.dll=		yes
-CFLAGS+=		-fPIC
-.endif
+.include "options.mk"
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV:S/-/_/}
 
 GCC_REQD+=		3.0
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
-.if !empty(DYNAMIC_7Z:MYES)
-INSTALLATION_DIRS+=	lib/7z
-INSTALLATION_DIRS+=	lib/7z/Codecs
-INSTALLATION_DIRS+=	lib/7z/Formats
-.endif
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 INSTALLATION_DIRS+=	share/doc/p7zip
 INSTALLATION_DIRS+=	share/doc/p7zip/commands
 INSTALLATION_DIRS+=	share/doc/p7zip/switches
@@ -58,17 +45,9 @@ CFLAGS+=		-DBIG_ENDIAN
 CFLAGS+=		-DLITTLE_ENDIAN
 .endif
 
-do-install:
+do-install: dynamic-7z-install
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/7za ${DESTDIR}${PREFIX}/bin
-.if !empty(DYNAMIC_7Z:MYES)
-	${INSTALL_LIB} ${WRKSRC}/bin/7z.so ${DESTDIR}${PREFIX}/lib/
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/7z ${DESTDIR}${PREFIX}/lib/7z
-	ln -f -s ${PREFIX}/lib/7z/7z ${DESTDIR}${PREFIX}/bin
-	${INSTALL_LIB} ${WRKSRC}/bin/Codecs/* \
-		${DESTDIR}${PREFIX}/lib/7z/Codecs
-.else
 	ln -f -s 7za ${DESTDIR}${PREFIX}/bin/7z
-.endif
 	${INSTALL_DATA} ${WRKSRC}/README \
 		${DESTDIR}${PREFIX}/share/doc/p7zip
 	${INSTALL_DATA} ${WRKSRC}/DOC/MANUAL/cmdline/*.* \

archivers/p7zip/PLIST

@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.20 2015/12/29 19:39:21 adam Exp $
+@comment $NetBSD: PLIST,v 1.21 2016/04/07 14:41:34 ryoon Exp $
 bin/7z
 bin/7za
 ${PLIST.dll}lib/7z.so
 ${PLIST.dll}lib/7z/7z
-${PLIST.dll}lib/7z/Codecs/Rar29.so
+${PLIST.dll}lib/7z/Codecs/Rar.so
 man/man1/7z.1
 man/man1/7za.1
 man/man1/7zr.1
@@ -26,6 +26,8 @@ share/doc/p7zip/style.css
 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/bb.htm
+share/doc/p7zip/switches/bs.htm
 share/doc/p7zip/switches/charset.htm
 share/doc/p7zip/switches/email.htm
 share/doc/p7zip/switches/exclude.htm
@@ -52,6 +54,7 @@ share/doc/p7zip/switches/stdin.htm
 share/doc/p7zip/switches/stdout.htm
 share/doc/p7zip/switches/stl.htm
 share/doc/p7zip/switches/stop_switch.htm
+share/doc/p7zip/switches/stx.htm
 share/doc/p7zip/switches/style.css
 share/doc/p7zip/switches/type.htm
 share/doc/p7zip/switches/update.htm

archivers/p7zip/distinfo

@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.47 2016/02/24 13:03:04 wiz Exp $
+$NetBSD: distinfo,v 1.48 2016/04/07 14:41:34 ryoon Exp $
 
-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 (p7zip_15.14_src_all.tar.bz2) = 97f719c55e6f3b1134aff2a4b5ac3a6accb5492f
+RMD160 (p7zip_15.14_src_all.tar.bz2) = 85278ca8dc47cce2d07d8582213bbd0380eb2992
+SHA512 (p7zip_15.14_src_all.tar.bz2) = 3053647cbcb3b8efd7f41b6bc122e984b999d31720f9b22387c52ccfe8a71d73899b1fb3a269854fd43bc1ca656c7d53457aca1cb5e2c90a2d0fb8f084bdebc5
+Size (p7zip_15.14_src_all.tar.bz2) = 4147609 bytes
 SHA1 (patch-CPP_Windows_DLL.cpp) = 12fb3f3cf4d32b8848f741dde6bcb0e56a9c6745
-SHA1 (patch-CVE-2015-1038) = 21d196e5c840597a17bba3e835c5adc3ecc77bb4
 SHA1 (patch-aa) = 9c103fa831cc6ff099e3a604c763ff416f1b48ec
 SHA1 (patch-ab) = c680fb037b9ef5e19e4c8dc71dd710598277a61b
-SHA1 (patch-ac) = a7afeded4aeb5ef230d006d1556ee601a6190063
+SHA1 (patch-ac) = 747d8ab9ba3b4069227efcfce9a4b26096e68b9b

archivers/p7zip/options.mk

@@ -0,0 +1,27 @@
+# $NetBSD: options.mk,v 1.1 2016/04/07 14:41:34 ryoon Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.p7zip
+PKG_SUPPORTED_OPTIONS+=	dll
+PLIST_VARS+=		dll
+
+.include "../../mk/bsd.options.mk"
+
+PHONY: dynamic-7z-install
+.if !empty(PKG_OPTIONS:Mdll)
+BUILD_TARGET=		all2
+PLIST.dll=		yes
+CFLAGS+=		-fPIC
+
+INSTALLATION_DIRS+=	lib/7z
+INSTALLATION_DIRS+=	lib/7z/Codecs
+INSTALLATION_DIRS+=	lib/7z/Formats
+
+dynamic-7z-install:
+	${INSTALL_LIB} ${WRKSRC}/bin/7z.so ${DESTDIR}${PREFIX}/lib/
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/7z ${DESTDIR}${PREFIX}/lib/7z
+	ln -f -s ${PREFIX}/lib/7z/7z ${DESTDIR}${PREFIX}/bin
+	${INSTALL_LIB} ${WRKSRC}/bin/Codecs/* \
+		${DESTDIR}${PREFIX}/lib/7z/Codecs
+.else
+dynamic-7z-install:
+.endif