Tue Jun 2 14:53:10 2015 UTC ()
Version 9.38.1
- bug 145 "p7zip crashes while moving memory in MoveItems

Version 9.38
- patch 23 fixes "7z with unicode file name with surrogate pair is not handled well in Linux"

- bug 139 "password from commanline is visible in processes list"
    Now the characters of the password are replaced with *.

- From Windows version of 7-zip
   - bug138 If you extract the password with # program crashes
     7z now supports long password in RAR 3 and 4.


(adam)
diff -r1.57 -r1.58 pkgsrc/archivers/p7zip/Makefile
diff -r1.18 -r1.19 pkgsrc/archivers/p7zip/PLIST
diff -r1.42 -r1.43 pkgsrc/archivers/p7zip/distinfo
diff -r1.1 -r1.2 pkgsrc/archivers/p7zip/patches/patch-CPP_Windows_DLL.cpp
diff -r1.19 -r1.20 pkgsrc/archivers/p7zip/patches/patch-aa
diff -r1.11 -r1.12 pkgsrc/archivers/p7zip/patches/patch-ab
diff -r1.7 -r1.8 pkgsrc/archivers/p7zip/patches/patch-ac
cvs diff -r1.57 -r1.58 pkgsrc/archivers/p7zip/Makefile (expand / switch to unified diff)

--- pkgsrc/archivers/p7zip/Makefile 2014/12/01 12:43:43 1.57
+++ pkgsrc/archivers/p7zip/Makefile 2015/06/02 14:53:10 1.58
@@ -1,88 +1,87 @@ @@ -1,88 +1,87 @@
1# $NetBSD: Makefile,v 1.57 2014/12/01 12:43:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.58 2015/06/02 14:53:10 adam Exp $
2 2
3DISTNAME= p7zip_9.20.1_src_all 3DISTNAME= p7zip_9.38.1_src_all
4PKGNAME= p7zip-9.20.1 4PKGNAME= p7zip-9.38.1
5PKGREVISION= 2 
6CATEGORIES= archivers 5CATEGORIES= archivers
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=p7zip/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=p7zip/}
8EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://p7zip.sourceforge.net/ 10HOMEPAGE= http://p7zip.sourceforge.net/
12COMMENT= File archiver with high compression 11COMMENT= File archiver with high compression
13LICENSE= gnu-lgpl-v2.1 AND unrar-license 12LICENSE= gnu-lgpl-v2.1 AND unrar-license
14 13
15USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
16USE_TOOLS+= gmake 15USE_TOOLS+= gmake
17MAKE_FILE= makefile 16MAKE_FILE= makefile
18MAKE_JOBS_SAFE= no # missing header when compiling sfx 17MAKE_JOBS_SAFE= no # missing header when compiling sfx
19NO_CONFIGURE= yes 18NO_CONFIGURE= yes
20PTHREAD_OPTS+= require 19PTHREAD_OPTS+= require
21PLIST_VARS= dll 20PLIST_VARS= dll
22 21
23# compiles, but does not recognize any archives as supported 22# compiles, but does not recognize any archives as supported
24DYNAMIC_7Z= YES 23DYNAMIC_7Z?= NO
25.if !empty(DYNAMIC_7Z:MYES) 24.if !empty(DYNAMIC_7Z:MYES)
26BUILD_TARGET= all2 25BUILD_TARGET= all2
27PLIST.dll= yes 26PLIST.dll= yes
28CFLAGS+= -fPIC 27CFLAGS+= -fPIC
29.endif 28.endif
30 29
31WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/-/_/} 30WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/-/_/}
32 31
33GCC_REQD+= 3.0 32GCC_REQD+= 3.0
34 33
35INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 34INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
36.if !empty(DYNAMIC_7Z:MYES) 35.if !empty(DYNAMIC_7Z:MYES)
37INSTALLATION_DIRS+= lib/7z 36INSTALLATION_DIRS+= lib/7z
38INSTALLATION_DIRS+= lib/7z/Codecs 37INSTALLATION_DIRS+= lib/7z/Codecs
39INSTALLATION_DIRS+= lib/7z/Formats 38INSTALLATION_DIRS+= lib/7z/Formats
40.endif 39.endif
41INSTALLATION_DIRS+= share/doc/p7zip 40INSTALLATION_DIRS+= share/doc/p7zip
42INSTALLATION_DIRS+= share/doc/p7zip/commands 41INSTALLATION_DIRS+= share/doc/p7zip/commands
43INSTALLATION_DIRS+= share/doc/p7zip/switches 42INSTALLATION_DIRS+= share/doc/p7zip/switches
44 43
45SUBST_CLASSES+= lib 44SUBST_CLASSES+= lib
46SUBST_FILES.lib+= CPP/7zip/UI/Common/LoadCodecs.cpp 45SUBST_FILES.lib+= CPP/7zip/UI/Common/LoadCodecs.cpp
47SUBST_SED.lib+= -e "s,getenv(.P7ZIP_HOME_DIR.),\"${PREFIX}/lib/\"," 46SUBST_SED.lib+= -e "s,getenv(.P7ZIP_HOME_DIR.),\"${PREFIX}/lib/\","
48SUBST_STAGE.lib= post-patch 47SUBST_STAGE.lib= post-patch
49 48
50.include "../../mk/dlopen.buildlink3.mk" 49.include "../../mk/dlopen.buildlink3.mk"
51BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*} 50BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
52 51
53.include "../../mk/endian.mk" 52.include "../../mk/endian.mk"
54 53
55.if !empty(MACHINE_ENDIAN:Mbig) 54.if !empty(MACHINE_ENDIAN:Mbig)
56CFLAGS+= -DBIG_ENDIAN 55CFLAGS+= -DBIG_ENDIAN
57.else 56.else
58CFLAGS+= -DLITTLE_ENDIAN 57CFLAGS+= -DLITTLE_ENDIAN
59.endif 58.endif
60 59
61do-install: 60do-install:
62 ${INSTALL_PROGRAM} ${WRKSRC}/bin/7za ${DESTDIR}${PREFIX}/bin 61 ${INSTALL_PROGRAM} ${WRKSRC}/bin/7za ${DESTDIR}${PREFIX}/bin
63.if !empty(DYNAMIC_7Z:MYES) 62.if !empty(DYNAMIC_7Z:MYES)
64 ${INSTALL_LIB} ${WRKSRC}/bin/7z.so ${DESTDIR}${PREFIX}/lib/ 63 ${INSTALL_LIB} ${WRKSRC}/bin/7z.so ${DESTDIR}${PREFIX}/lib/
65 ${INSTALL_PROGRAM} ${WRKSRC}/bin/7z ${DESTDIR}${PREFIX}/lib/7z 64 ${INSTALL_PROGRAM} ${WRKSRC}/bin/7z ${DESTDIR}${PREFIX}/lib/7z
66 ln -f -s ${PREFIX}/lib/7z/7z ${DESTDIR}${PREFIX}/bin 65 ln -f -s ${PREFIX}/lib/7z/7z ${DESTDIR}${PREFIX}/bin
67 ${INSTALL_LIB} ${WRKSRC}/bin/Codecs/* \ 66 ${INSTALL_LIB} ${WRKSRC}/bin/Codecs/* \
68 ${DESTDIR}${PREFIX}/lib/7z/Codecs 67 ${DESTDIR}${PREFIX}/lib/7z/Codecs
69.else 68.else
70 ln -f -s 7za ${DESTDIR}${PREFIX}/bin/7z 69 ln -f -s 7za ${DESTDIR}${PREFIX}/bin/7z
71.endif 70.endif
72 ${INSTALL_DATA} ${WRKSRC}/README \ 71 ${INSTALL_DATA} ${WRKSRC}/README \
73 ${DESTDIR}${PREFIX}/share/doc/p7zip 72 ${DESTDIR}${PREFIX}/share/doc/p7zip
74 ${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/*.* \ 73 ${INSTALL_DATA} ${WRKSRC}/DOC/MANUAL/*.* \
75 ${DESTDIR}${PREFIX}/share/doc/p7zip 74 ${DESTDIR}${PREFIX}/share/doc/p7zip
76 ${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/commands/*.* \ 75 ${INSTALL_DATA} ${WRKSRC}/DOC/MANUAL/commands/*.* \
77 ${DESTDIR}${PREFIX}/share/doc/p7zip/commands 76 ${DESTDIR}${PREFIX}/share/doc/p7zip/commands
78 ${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/switches/*.* \ 77 ${INSTALL_DATA} ${WRKSRC}/DOC/MANUAL/switches/*.* \
79 ${DESTDIR}${PREFIX}/share/doc/p7zip/switches 78 ${DESTDIR}${PREFIX}/share/doc/p7zip/switches
80 ${INSTALL_MAN} ${WRKSRC}/man1/7z.1 \ 79 ${INSTALL_MAN} ${WRKSRC}/man1/7z.1 \
81 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 80 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
82 ${INSTALL_MAN} ${WRKSRC}/man1/7za.1 \ 81 ${INSTALL_MAN} ${WRKSRC}/man1/7za.1 \
83 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 82 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
84 ${INSTALL_MAN} ${WRKSRC}/man1/7zr.1 \ 83 ${INSTALL_MAN} ${WRKSRC}/man1/7zr.1 \
85 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 84 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
86 85
87.include "../../mk/pthread.buildlink3.mk" 86.include "../../mk/pthread.buildlink3.mk"
88.include "../../mk/bsd.pkg.mk" 87.include "../../mk/bsd.pkg.mk"
cvs diff -r1.18 -r1.19 pkgsrc/archivers/p7zip/PLIST (expand / switch to unified diff)

--- pkgsrc/archivers/p7zip/PLIST 2013/10/04 21:51:57 1.18
+++ pkgsrc/archivers/p7zip/PLIST 2015/06/02 14:53:10 1.19
@@ -1,49 +1,58 @@ @@ -1,49 +1,58 @@
1@comment $NetBSD: PLIST,v 1.18 2013/10/04 21:51:57 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.19 2015/06/02 14:53:10 adam Exp $
2bin/7z 2bin/7z
3bin/7za 3bin/7za
4${PLIST.dll}lib/7z.so 4${PLIST.dll}lib/7z.so
5${PLIST.dll}lib/7z/7z 5${PLIST.dll}lib/7z/7z
6${PLIST.dll}lib/7z/Codecs/Rar29.so 6${PLIST.dll}lib/7z/Codecs/Rar29.so
7man/man1/7z.1 7man/man1/7z.1
8man/man1/7za.1 8man/man1/7za.1
9man/man1/7zr.1 9man/man1/7zr.1
10share/doc/p7zip/README 10share/doc/p7zip/README
11share/doc/p7zip/commands/add.htm 11share/doc/p7zip/commands/add.htm
12share/doc/p7zip/commands/bench.htm 12share/doc/p7zip/commands/bench.htm
13share/doc/p7zip/commands/delete.htm 13share/doc/p7zip/commands/delete.htm
14share/doc/p7zip/commands/extract.htm 14share/doc/p7zip/commands/extract.htm
15share/doc/p7zip/commands/extract_full.htm 15share/doc/p7zip/commands/extract_full.htm
 16share/doc/p7zip/commands/hash.htm
16share/doc/p7zip/commands/index.htm 17share/doc/p7zip/commands/index.htm
17share/doc/p7zip/commands/list.htm 18share/doc/p7zip/commands/list.htm
 19share/doc/p7zip/commands/rename.htm
18share/doc/p7zip/commands/style.css 20share/doc/p7zip/commands/style.css
19share/doc/p7zip/commands/test.htm 21share/doc/p7zip/commands/test.htm
20share/doc/p7zip/commands/update.htm 22share/doc/p7zip/commands/update.htm
21share/doc/p7zip/exit_codes.htm 23share/doc/p7zip/exit_codes.htm
22share/doc/p7zip/index.htm 24share/doc/p7zip/index.htm
23share/doc/p7zip/style.css 25share/doc/p7zip/style.css
24share/doc/p7zip/switches/ar_exclude.htm 26share/doc/p7zip/switches/ar_exclude.htm
25share/doc/p7zip/switches/ar_include.htm 27share/doc/p7zip/switches/ar_include.htm
26share/doc/p7zip/switches/ar_no.htm 28share/doc/p7zip/switches/ar_no.htm
27share/doc/p7zip/switches/charset.htm 29share/doc/p7zip/switches/charset.htm
28share/doc/p7zip/switches/exclude.htm 30share/doc/p7zip/switches/exclude.htm
29share/doc/p7zip/switches/include.htm 31share/doc/p7zip/switches/include.htm
30share/doc/p7zip/switches/index.htm 32share/doc/p7zip/switches/index.htm
31share/doc/p7zip/switches/large_pages.htm 33share/doc/p7zip/switches/large_pages.htm
32share/doc/p7zip/switches/list_tech.htm 34share/doc/p7zip/switches/list_tech.htm
33share/doc/p7zip/switches/method.htm 35share/doc/p7zip/switches/method.htm
34share/doc/p7zip/switches/output_dir.htm 36share/doc/p7zip/switches/output_dir.htm
35share/doc/p7zip/switches/overwrite.htm 37share/doc/p7zip/switches/overwrite.htm
36share/doc/p7zip/switches/password.htm 38share/doc/p7zip/switches/password.htm
37share/doc/p7zip/switches/recurse.htm 39share/doc/p7zip/switches/recurse.htm
 40share/doc/p7zip/switches/sa.htm
 41share/doc/p7zip/switches/scrc.htm
 42share/doc/p7zip/switches/sdel.htm
38share/doc/p7zip/switches/sfx.htm 43share/doc/p7zip/switches/sfx.htm
 44share/doc/p7zip/switches/sni.htm
 45share/doc/p7zip/switches/sns.htm
 46share/doc/p7zip/switches/spf.htm
39share/doc/p7zip/switches/ssc.htm 47share/doc/p7zip/switches/ssc.htm
40share/doc/p7zip/switches/stdin.htm 48share/doc/p7zip/switches/stdin.htm
41share/doc/p7zip/switches/stdout.htm 49share/doc/p7zip/switches/stdout.htm
 50share/doc/p7zip/switches/stl.htm
42share/doc/p7zip/switches/stop_switch.htm 51share/doc/p7zip/switches/stop_switch.htm
43share/doc/p7zip/switches/style.css 52share/doc/p7zip/switches/style.css
44share/doc/p7zip/switches/type.htm 53share/doc/p7zip/switches/type.htm
45share/doc/p7zip/switches/update.htm 54share/doc/p7zip/switches/update.htm
46share/doc/p7zip/switches/volume.htm 55share/doc/p7zip/switches/volume.htm
47share/doc/p7zip/switches/working_dir.htm 56share/doc/p7zip/switches/working_dir.htm
48share/doc/p7zip/switches/yes.htm 57share/doc/p7zip/switches/yes.htm
49share/doc/p7zip/syntax.htm 58share/doc/p7zip/syntax.htm
cvs diff -r1.42 -r1.43 pkgsrc/archivers/p7zip/distinfo (expand / switch to unified diff)

--- pkgsrc/archivers/p7zip/distinfo 2014/12/01 12:43:07 1.42
+++ pkgsrc/archivers/p7zip/distinfo 2015/06/02 14:53:10 1.43
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.42 2014/12/01 12:43:07 wiz Exp $ 1$NetBSD: distinfo,v 1.43 2015/06/02 14:53:10 adam Exp $
2 2
3SHA1 (p7zip_9.20.1_src_all.tar.bz2) = 1cd567e043ee054bf08244ce15f32cb3258306b7 3SHA1 (p7zip_9.38.1_src_all.tar.bz2) = 6b1eccf272d8b141a94758f80727ae633568ba69
4RMD160 (p7zip_9.20.1_src_all.tar.bz2) = c3ff2dd12459282b46d9a68ab4af7800ff46039f 4RMD160 (p7zip_9.38.1_src_all.tar.bz2) = df76939ed67f3835fe4f8e92f2fec1ab4e4328c6
5Size (p7zip_9.20.1_src_all.tar.bz2) = 3835235 bytes 5Size (p7zip_9.38.1_src_all.tar.bz2) = 3917925 bytes
6SHA1 (patch-CPP_Windows_DLL.cpp) = 212140b873058eb838a1eb97befebb90512cd7e4 6SHA1 (patch-CPP_Windows_DLL.cpp) = 12fb3f3cf4d32b8848f741dde6bcb0e56a9c6745
7SHA1 (patch-aa) = 6031e4a571c890b6620627989d056ba606c2e0ca 7SHA1 (patch-aa) = 91917c8cfc9638444a32924570067a4298c82105
8SHA1 (patch-ab) = a9bd9ab50f6c2d5964de9b2c4e5d9d75e3c29b79 8SHA1 (patch-ab) = c680fb037b9ef5e19e4c8dc71dd710598277a61b
9SHA1 (patch-ac) = f5f0acd488a7c524b692b5660042baa79f9937ce 9SHA1 (patch-ac) = 245f93d2a250b0e2f17e7828a82787ac05652800
cvs diff -r1.1 -r1.2 pkgsrc/archivers/p7zip/patches/patch-CPP_Windows_DLL.cpp (expand / switch to unified diff)

--- pkgsrc/archivers/p7zip/patches/patch-CPP_Windows_DLL.cpp 2014/12/01 12:43:07 1.1
+++ pkgsrc/archivers/p7zip/patches/patch-CPP_Windows_DLL.cpp 2015/06/02 14:53:10 1.2
@@ -1,51 +1,51 @@ @@ -1,51 +1,51 @@
1$NetBSD: patch-CPP_Windows_DLL.cpp,v 1.1 2014/12/01 12:43:07 wiz Exp $ 1$NetBSD: patch-CPP_Windows_DLL.cpp,v 1.2 2015/06/02 14:53:10 adam Exp $
2 2
3Adapt for pkgsrc on OS X. 3Adapt for pkgsrc on OS X.
4 4
5--- CPP/Windows/DLL.cpp.orig 2010-02-28 12:44:52.000000000 +0000 5--- CPP/Windows/DLL.cpp.orig 2011-07-09 16:25:31.000000000 +0000
6+++ CPP/Windows/DLL.cpp 6+++ CPP/Windows/DLL.cpp
7@@ -2,7 +2,7 @@ 7@@ -2,7 +2,7 @@
8  8
9 #include "StdAfx.h" 9 #include "StdAfx.h"
10  10
11-#ifdef __APPLE_CC__ 11-#ifdef __APPLE_CC__
12+#if defined(USE_APPLE_BUNDLE) 12+#if defined(USE_APPLE_BUNDLE)
13 #include <mach-o/dyld.h> 13 #include <mach-o/dyld.h>
14 #elif ENV_BEOS 14 #elif ENV_BEOS
15 #include <kernel/image.h> 15 #include <kernel/image.h>
16@@ -39,7 +39,7 @@ TRACEN((printf("CLibrary::Free(%p)\n",(v 16@@ -34,7 +34,7 @@ TRACEN((printf("CLibrary::Free(this=%p,%
17 if (_module == 0) 17 if (_module == 0)
18 return true; 18 return true;
19  19
20-#ifdef __APPLE_CC__ 20-#ifdef __APPLE_CC__
21+#if defined(USE_APPLE_BUNDLE) 21+#if defined(USE_APPLE_BUNDLE)
22 int ret = NSUnLinkModule ((NSModule)_module, 0); 22 int ret = NSUnLinkModule ((NSModule)_module, 0);
23 #elif ENV_BEOS 23 #elif ENV_BEOS
24 int ret = unload_add_on((image_id)_module); 24 int ret = unload_add_on((image_id)_module);
25@@ -57,7 +57,7 @@ static FARPROC local_GetProcAddress(HMOD 25@@ -52,7 +52,7 @@ static FARPROC local_GetProcAddress(HMOD
26 void *ptr = 0; 26 void *ptr = 0;
27 TRACEN((printf("local_GetProcAddress(%p,%s)\n",(void *)module,lpProcName))) 27 TRACEN((printf("local_GetProcAddress(%p,%s)\n",(void *)module,lpProcName)))
28 if (module) { 28 if (module) {
29-#ifdef __APPLE_CC__ 29-#ifdef __APPLE_CC__
30+#if defined(USE_APPLE_BUNDLE) 30+#if defined(USE_APPLE_BUNDLE)
31 char name[MAX_PATHNAME_LEN]; 31 char name[MAX_PATHNAME_LEN];
32 snprintf(name,sizeof(name),"_%s",lpProcName); 32 snprintf(name,sizeof(name),"_%s",lpProcName);
33 name[sizeof(name)-1] = 0; 33 name[sizeof(name)-1] = 0;
34@@ -115,7 +115,7 @@ bool CLibrary::Load(LPCTSTR lpLibFileNam 34@@ -103,7 +103,7 @@ bool CLibrary::Load(LPCTSTR lpLibFileNam
35  35
36 TRACEN((printf("CLibrary::Load(%ls) => %s\n",lpLibFileName,name))) 36 TRACEN((printf("CLibrary::Load(this=%p,%ls) => %s\n",(void *)this,lpLibFileName,name)))
37  37
38-#ifdef __APPLE_CC__ 38-#ifdef __APPLE_CC__
39+#if defined(USE_APPLE_BUNDLE) 39+#if defined(USE_APPLE_BUNDLE)
40 NSObjectFileImage image; 40 NSObjectFileImage image;
41 NSObjectFileImageReturnCode nsret; 41 NSObjectFileImageReturnCode nsret;
42  42
43@@ -173,7 +173,7 @@ TRACEN((printf("load_add_on(%s)=%d\n",p. 43@@ -161,7 +161,7 @@ TRACEN((printf("load_add_on(%s)=%d\n",p.
44 if (fctTest) fctTest(); 44 if (fctTest) fctTest();
45  45
46 } else { 46 } else {
47-#ifdef __APPLE_CC__ 47-#ifdef __APPLE_CC__
48+#if defined(USE_APPLE_BUNDLE) 48+#if defined(USE_APPLE_BUNDLE)
49 NSLinkEditErrors c; 49 NSLinkEditErrors c;
50 int num_err; 50 int num_err;
51 const char *file,*err; 51 const char *file,*err;
cvs diff -r1.19 -r1.20 pkgsrc/archivers/p7zip/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/archivers/p7zip/patches/patch-aa 2014/04/26 01:16:54 1.19
+++ pkgsrc/archivers/p7zip/patches/patch-aa 2015/06/02 14:53:10 1.20
@@ -1,32 +1,30 @@ @@ -1,32 +1,30 @@
1$NetBSD: patch-aa,v 1.19 2014/04/26 01:16:54 dsainty Exp $ 1$NetBSD: patch-aa,v 1.20 2015/06/02 14:53:10 adam Exp $
2 2
3--- makefile.machine.orig 2010-05-30 08:33:48.000000000 +0000 3--- makefile.machine.orig 2015-02-25 20:12:06.000000000 +0000
4+++ makefile.machine 4+++ makefile.machine
5@@ -2,20 +2,20 @@ 5@@ -2,20 +2,18 @@
6 # makefile for Linux (x86, PPC, alpha ...) 6 # makefile for Linux (x86, PPC, alpha ...)
7 # 7 #
8  8
9-OPTFLAGS=-O 9-OPTFLAGS=-O
10+OPTFLAGS= 10+OPTFLAGS=
11  11
12-ALLFLAGS=${OPTFLAGS} -pipe -s \ 12-ALLFLAGS=${OPTFLAGS} -pipe -s \
13+ALLFLAGS=${OPTFLAGS} -Wall \ 13+ALLFLAGS=${OPTFLAGS} -Wall \
14 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ 14 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
15 -DNDEBUG -D_REENTRANT -DENV_UNIX \ 15 -DNDEBUG -D_REENTRANT -DENV_UNIX \
16 -D_7ZIP_LARGE_PAGES \ 16 -D_7ZIP_LARGE_PAGES \
17 $(LOCAL_FLAGS) 17 $(LOCAL_FLAGS)
18  18
19-CXX=g++ $(ALLFLAGS) 19-CXX=g++
20-CC=gcc $(ALLFLAGS) 20-CC=gcc
21-CC_SHARED=-fPIC 21-CC_SHARED=-fPIC
22-LINK_SHARED=-fPIC -shared 22-LINK_SHARED=-fPIC -shared
23+CXX+=$(ALLFLAGS) 
24+CC+=$(ALLFLAGS) 
25+CC_SHARED= 23+CC_SHARED=
26+LINK_SHARED=-shared 24+LINK_SHARED=-shared
27  25
28-LOCAL_LIBS=-lpthread 26-LOCAL_LIBS=-lpthread
29+LOCAL_LIBS=${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} 27+LOCAL_LIBS=${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
30 LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl 28 LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl
31  29
32 OBJ_CRC32=$(OBJ_CRC32_C) 30 OBJ_CRC32=$(OBJ_CRC32_C)
cvs diff -r1.11 -r1.12 pkgsrc/archivers/p7zip/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/archivers/p7zip/patches/patch-ab 2011/03/14 12:36:43 1.11
+++ pkgsrc/archivers/p7zip/patches/patch-ab 2015/06/02 14:53:10 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ab,v 1.11 2011/03/14 12:36:43 adam Exp $ 1$NetBSD: patch-ab,v 1.12 2015/06/02 14:53:10 adam Exp $
2 2
3--- CPP/Windows/FileFind.cpp.orig 2009-06-03 19:40:16.000000000 +0200 3--- CPP/Windows/FileFind.cpp.orig 2009-06-03 19:40:16.000000000 +0200
4+++ CPP/Windows/FileFind.cpp 4+++ CPP/Windows/FileFind.cpp
5@@ -311,7 +311,8 @@ bool CFindFile::FindFirst(LPCSTR wildcar 5@@ -350,7 +350,8 @@ bool CFindFile::FindFirst(LPCSTR wildcar
6 } 6 }
7  7
8 TRACEN((printf("CFindFile::FindFirst : closedir-2(dirp=%p)\n",_dirp))) 8 TRACEN((printf("CFindFile::FindFirst : closedir-2(dirp=%p)\n",_dirp)))
9- closedir(_dirp); 9- closedir(_dirp);
10+ if (_dirp) 10+ if (_dirp)
11+ closedir(_dirp); 11+ closedir(_dirp);
12 _dirp = 0; 12 _dirp = 0;
13 SetLastError( ERROR_NO_MORE_FILES ); 13 SetLastError( ERROR_NO_MORE_FILES );
14 return false; 14 return false;
cvs diff -r1.7 -r1.8 pkgsrc/archivers/p7zip/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/archivers/p7zip/patches/patch-ac 2010/06/16 08:30:09 1.7
+++ pkgsrc/archivers/p7zip/patches/patch-ac 2015/06/02 14:53:10 1.8
@@ -1,19 +1,21 @@ @@ -1,19 +1,21 @@
1$NetBSD: patch-ac,v 1.7 2010/06/16 08:30:09 adam Exp $ 1$NetBSD: patch-ac,v 1.8 2015/06/02 14:53:10 adam Exp $
2 2
3--- makefile.glb.orig 2009-07-03 20:44:21.000000000 +0000 3--- makefile.glb.orig 2015-02-19 14:56:02.000000000 +0000
4+++ makefile.glb 4+++ makefile.glb
5@@ -1,12 +1,12 @@ 5@@ -1,14 +1,14 @@
6  6
7 RM=rm -f 7 RM=rm -f
 8
8-CFLAGS=-c -I. \ 9-CFLAGS=-c -I. \
9+CFLAGS+=-c -I. \ 10+CFLAGS+=-c -I. \
10 -I../../../../C \ 11 -I../../../../C \
11 -I../../../myWindows \ 12 -I../../../myWindows \
12 -I../../../include_windows \ 13 -I../../../include_windows \
13 -I../../.. 14 -I../../.. \
 15 $(ALLFLAGS) $(ALLFLAGS_C)
14  16
15-CXXFLAGS=-c -I. \ 17-CXXFLAGS=-c -I. \
16+CXXFLAGS+=-c -I. \ 18+CXXFLAGS+=-c -I. \
17 -I../../../myWindows \ 19 -I../../../myWindows \
18 -I../../../ \ 20 -I../../../ \
19 -I../../../include_windows 21 -I../../../include_windows \