Changes 9.13: - From Windows version of 7-zip 9.12 - Some bugs were fixed. - "Crash in Rar decoder on a corrupted file" fixed - "Dereferencing a zero pointer in cab handler" fixed - "Division by zero in cab decoder" fixed Changes 9.12: - From Windows version of 7-zip 9.12 - ZIP / PPMd compression ratio was improved in Maximum and Ultra modes. - The BUG in 7-Zip 9.* beta was fixed: LZMA2 codec didn't work, if more than 10 threads were used (or more than 20 threads in some modes). - makefile.openbsd is now compatible with OpenBSD ports tree. - cmake projects added. - 7zFM and 7zG can be built on MacOSX but these ports are in very alpha stage. make app to build p7zip.app (p7zip for MacOSX) Changes 9.11: - From Windows version of 7-zip 9.11 - 7-Zip now supports PPMd compression in .ZIP archives. - Speed optimizations in PPMd codec. - The support for archives in installers was improved. - Some bugs were fixed.diff -r1.46 -r1.47 pkgsrc/archivers/p7zip/Makefile
(adam)
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.46 2009/11/18 19:32:05 heinz Exp $ | 1 | # $NetBSD: Makefile,v 1.47 2010/06/16 08:30:09 adam Exp $ | |
2 | 2 | |||
3 | DISTNAME= p7zip_9.04_src_all | 3 | DISTNAME= p7zip_9.13_src_all | |
4 | PKGNAME= p7zip-9.04 | 4 | PKGNAME= p7zip-9.13 | |
5 | CATEGORIES= archivers | 5 | CATEGORIES= archivers | |
6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=p7zip/} | 6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=p7zip/} | |
7 | EXTRACT_SUFX= .tar.bz2 | 7 | EXTRACT_SUFX= .tar.bz2 | |
8 | 8 | |||
9 | MAINTAINER= wiz@NetBSD.org | 9 | MAINTAINER= wiz@NetBSD.org | |
10 | HOMEPAGE= http://p7zip.sourceforge.net/ | 10 | HOMEPAGE= http://p7zip.sourceforge.net/ | |
11 | COMMENT= File archiver with high compression | 11 | COMMENT= File archiver with high compression | |
12 | LICENSE= gnu-lgpl-v2.1 AND unrar-license | 12 | LICENSE= gnu-lgpl-v2.1 AND unrar-license | |
13 | 13 | |||
14 | PKG_INSTALLATION_TYPES= overwrite pkgviews | 14 | PKG_INSTALLATION_TYPES= overwrite pkgviews | |
15 | PKG_DESTDIR_SUPPORT= user-destdir | 15 | PKG_DESTDIR_SUPPORT= user-destdir | |
16 | 16 | |||
17 | USE_LANGUAGES= c c++ | 17 | USE_LANGUAGES= c c++ |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.15 2009/06/14 17:28:17 joerg Exp $ | 1 | @comment $NetBSD: PLIST,v 1.16 2010/06/16 08:30:09 adam Exp $ | |
2 | bin/7z | 2 | bin/7z | |
3 | bin/7za | 3 | bin/7za | |
4 | ${PLIST.dll}lib/7z/7z | 4 | ${PLIST.dll}lib/7z/7z | |
5 | ${PLIST.dll}lib/7z/Codecs/7zAES.dll | 5 | ${PLIST.dll}lib/7z/Codecs/7zAES.dll | |
6 | ${PLIST.dll}lib/7z/Codecs/AES.dll | 6 | ${PLIST.dll}lib/7z/Codecs/AES.dll | |
7 | ${PLIST.dll}lib/7z/Codecs/BZip2.dll | 7 | ${PLIST.dll}lib/7z/Codecs/BZip2.dll | |
8 | ${PLIST.dll}lib/7z/Codecs/Branch.dll | 8 | ${PLIST.dll}lib/7z/Codecs/Branch.dll | |
9 | ${PLIST.dll}lib/7z/Codecs/Copy.dll | 9 | ${PLIST.dll}lib/7z/Codecs/Copy.dll | |
10 | ${PLIST.dll}lib/7z/Codecs/Deflate.dll | 10 | ${PLIST.dll}lib/7z/Codecs/Deflate.dll | |
11 | ${PLIST.dll}lib/7z/Codecs/Implode.dll | 11 | ${PLIST.dll}lib/7z/Codecs/Implode.dll | |
12 | ${PLIST.dll}lib/7z/Codecs/LZMA.dll | 12 | ${PLIST.dll}lib/7z/Codecs/LZMA.dll | |
13 | ${PLIST.dll}lib/7z/Codecs/PPMD.dll | 13 | ${PLIST.dll}lib/7z/Codecs/PPMD.dll | |
14 | ${PLIST.dll}lib/7z/Codecs/Swap.dll | 14 | ${PLIST.dll}lib/7z/Codecs/Swap.dll | |
@@ -38,26 +38,27 @@ share/doc/p7zip/commands/list.htm | @@ -38,26 +38,27 @@ share/doc/p7zip/commands/list.htm | |||
38 | share/doc/p7zip/commands/style.css | 38 | share/doc/p7zip/commands/style.css | |
39 | share/doc/p7zip/commands/test.htm | 39 | share/doc/p7zip/commands/test.htm | |
40 | share/doc/p7zip/commands/update.htm | 40 | share/doc/p7zip/commands/update.htm | |
41 | share/doc/p7zip/exit_codes.htm | 41 | share/doc/p7zip/exit_codes.htm | |
42 | share/doc/p7zip/index.htm | 42 | share/doc/p7zip/index.htm | |
43 | share/doc/p7zip/style.css | 43 | share/doc/p7zip/style.css | |
44 | share/doc/p7zip/switches/ar_exclude.htm | 44 | share/doc/p7zip/switches/ar_exclude.htm | |
45 | share/doc/p7zip/switches/ar_include.htm | 45 | share/doc/p7zip/switches/ar_include.htm | |
46 | share/doc/p7zip/switches/ar_no.htm | 46 | share/doc/p7zip/switches/ar_no.htm | |
47 | share/doc/p7zip/switches/charset.htm | 47 | share/doc/p7zip/switches/charset.htm | |
48 | share/doc/p7zip/switches/exclude.htm | 48 | share/doc/p7zip/switches/exclude.htm | |
49 | share/doc/p7zip/switches/include.htm | 49 | share/doc/p7zip/switches/include.htm | |
50 | share/doc/p7zip/switches/index.htm | 50 | share/doc/p7zip/switches/index.htm | |
51 | share/doc/p7zip/switches/large_pages.htm | |||
51 | share/doc/p7zip/switches/list_tech.htm | 52 | share/doc/p7zip/switches/list_tech.htm | |
52 | share/doc/p7zip/switches/method.htm | 53 | share/doc/p7zip/switches/method.htm | |
53 | share/doc/p7zip/switches/output_dir.htm | 54 | share/doc/p7zip/switches/output_dir.htm | |
54 | share/doc/p7zip/switches/overwrite.htm | 55 | share/doc/p7zip/switches/overwrite.htm | |
55 | share/doc/p7zip/switches/password.htm | 56 | share/doc/p7zip/switches/password.htm | |
56 | share/doc/p7zip/switches/recurse.htm | 57 | share/doc/p7zip/switches/recurse.htm | |
57 | share/doc/p7zip/switches/sfx.htm | 58 | share/doc/p7zip/switches/sfx.htm | |
58 | share/doc/p7zip/switches/ssc.htm | 59 | share/doc/p7zip/switches/ssc.htm | |
59 | share/doc/p7zip/switches/stdin.htm | 60 | share/doc/p7zip/switches/stdin.htm | |
60 | share/doc/p7zip/switches/stdout.htm | 61 | share/doc/p7zip/switches/stdout.htm | |
61 | share/doc/p7zip/switches/stop_switch.htm | 62 | share/doc/p7zip/switches/stop_switch.htm | |
62 | share/doc/p7zip/switches/style.css | 63 | share/doc/p7zip/switches/style.css | |
63 | share/doc/p7zip/switches/type.htm | 64 | share/doc/p7zip/switches/type.htm |
@@ -1,8 +1,8 @@ | @@ -1,8 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.35 2009/06/08 05:54:51 adam Exp $ | 1 | $NetBSD: distinfo,v 1.36 2010/06/16 08:30:09 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (p7zip_9.04_src_all.tar.bz2) = 6430fcd3a5e16d0a30f1eebf34a085e5372b813b | 3 | SHA1 (p7zip_9.13_src_all.tar.bz2) = 81da0729561ce123c0a82656ec96a04ad5bfa522 | |
4 | RMD160 (p7zip_9.04_src_all.tar.bz2) = 2d9caf81dd3fc038441be7e1e592a972a1114df7 | 4 | RMD160 (p7zip_9.13_src_all.tar.bz2) = beb9181330f4dfa75aa4f473c68a462c76b7ab19 | |
5 | Size (p7zip_9.04_src_all.tar.bz2) = 3759021 bytes | 5 | Size (p7zip_9.13_src_all.tar.bz2) = 3753579 bytes | |
6 | SHA1 (patch-aa) = 44db7bc8ce6b03b44fe3aba223396d157b49e845 | 6 | SHA1 (patch-aa) = 6df31ad2f391b7f1b5220f05ff0142ee258a92e7 | |
7 | SHA1 (patch-ab) = fedaf15990d9c01bdefcd2a0bd9a740f965247b0 | 7 | SHA1 (patch-ab) = fedaf15990d9c01bdefcd2a0bd9a740f965247b0 | |
8 | SHA1 (patch-ac) = 1c72ee13e0e939d2e5fb58870be95796af0b7ff0 | 8 | SHA1 (patch-ac) = f5f0acd488a7c524b692b5660042baa79f9937ce |
@@ -1,28 +1,29 @@ | @@ -1,28 +1,29 @@ | |||
1 | $NetBSD: patch-aa,v 1.17 2007/09/05 20:37:08 adam Exp $ | 1 | $NetBSD: patch-aa,v 1.18 2010/06/16 08:30:09 adam Exp $ | |
2 | 2 | |||
3 | --- makefile.machine.orig 2007-09-01 10:26:00.000000000 +0200 | 3 | --- makefile.machine.orig 2010-05-30 08:33:48.000000000 +0000 | |
4 | +++ makefile.machine | 4 | +++ makefile.machine | |
5 | @@ -2,20 +2,20 @@ | 5 | @@ -2,21 +2,21 @@ | |
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} -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 | $(LOCAL_FLAGS) | 17 | $(LOCAL_FLAGS) | |
17 | 18 | |||
18 | -CXX=g++ $(ALLFLAGS) | 19 | -CXX=g++ $(ALLFLAGS) | |
19 | -CC=gcc $(ALLFLAGS) | 20 | -CC=gcc $(ALLFLAGS) | |
20 | -CC_SHARED=-fPIC | 21 | -CC_SHARED=-fPIC | |
21 | -LINK_SHARED=-fPIC -shared | 22 | -LINK_SHARED=-fPIC -shared | |
22 | +CXX+=$(ALLFLAGS) | 23 | +CXX+=$(ALLFLAGS) | |
23 | +CC+=$(ALLFLAGS) | 24 | +CC+=$(ALLFLAGS) | |
24 | +CC_SHARED= | 25 | +CC_SHARED= | |
25 | +LINK_SHARED=-shared | 26 | +LINK_SHARED=-shared | |
26 | 27 | |||
27 | -LOCAL_LIBS=-lpthread | 28 | -LOCAL_LIBS=-lpthread | |
28 | -LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl | 29 | -LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl |
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | $NetBSD: patch-ac,v 1.6 2009/02/18 07:19:06 adam Exp $ | 1 | $NetBSD: patch-ac,v 1.7 2010/06/16 08:30:09 adam Exp $ | |
2 | 2 | |||
3 | --- makefile.glb.orig 2009-02-09 21:20:12.000000000 +0100 | 3 | --- makefile.glb.orig 2009-07-03 20:44:21.000000000 +0000 | |
4 | +++ makefile.glb | 4 | +++ makefile.glb | |
5 | @@ -1,12 +1,12 @@ | 5 | @@ -1,12 +1,12 @@ | |
6 | 6 | |||
7 | RM=rm -f | 7 | RM=rm -f | |
8 | -CFLAGS=-c \ | 8 | -CFLAGS=-c -I. \ | |
9 | +CFLAGS+=-c \ | 9 | +CFLAGS+=-c -I. \ | |
10 | -I../../../../C \ | 10 | -I../../../../C \ | |
11 | -I../../../myWindows \ | 11 | -I../../../myWindows \ | |
12 | -I../../../include_windows \ | 12 | -I../../../include_windows \ | |
13 | -I../../.. | 13 | -I../../.. | |
14 | 14 | |||
15 | -CXXFLAGS=-c \ | 15 | -CXXFLAGS=-c -I. \ | |
16 | +CXXFLAGS+=-c \ | 16 | +CXXFLAGS+=-c -I. \ | |
17 | -I../../../myWindows \ | 17 | -I../../../myWindows \ | |
18 | -I../../../ \ | 18 | -I../../../ \ | |
19 | -I../../../include_windows | 19 | -I../../../include_windows |