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.

5 files changed, 22 insertions, 20 deletions

diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile
index e7b32bb5e6d..99ba7232a27 100644
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2009/11/18 19:32:05 heinz Exp $
+# $NetBSD: Makefile,v 1.47 2010/06/16 08:30:09 adam Exp $
 
-DISTNAME=	p7zip_9.04_src_all
-PKGNAME=	p7zip-9.04
+DISTNAME=	p7zip_9.13_src_all
+PKGNAME=	p7zip-9.13
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=p7zip/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/archivers/p7zip/PLIST b/archivers/p7zip/PLIST
index d76ac933420..92b72952f5d 100644
--- a/archivers/p7zip/PLIST
+++ b/archivers/p7zip/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2009/06/14 17:28:17 joerg Exp $
+@comment $NetBSD: PLIST,v 1.16 2010/06/16 08:30:09 adam Exp $
 bin/7z
 bin/7za
 ${PLIST.dll}lib/7z/7z
@@ -48,6 +48,7 @@ share/doc/p7zip/switches/charset.htm
 share/doc/p7zip/switches/exclude.htm
 share/doc/p7zip/switches/include.htm
 share/doc/p7zip/switches/index.htm
+share/doc/p7zip/switches/large_pages.htm
 share/doc/p7zip/switches/list_tech.htm
 share/doc/p7zip/switches/method.htm
 share/doc/p7zip/switches/output_dir.htm
diff --git a/archivers/p7zip/distinfo b/archivers/p7zip/distinfo
index 35fb9eee3ef..f54ad6ce814 100644
--- a/archivers/p7zip/distinfo
+++ b/archivers/p7zip/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.35 2009/06/08 05:54:51 adam Exp $
+$NetBSD: distinfo,v 1.36 2010/06/16 08:30:09 adam Exp $
 
-SHA1 (p7zip_9.04_src_all.tar.bz2) = 6430fcd3a5e16d0a30f1eebf34a085e5372b813b
-RMD160 (p7zip_9.04_src_all.tar.bz2) = 2d9caf81dd3fc038441be7e1e592a972a1114df7
-Size (p7zip_9.04_src_all.tar.bz2) = 3759021 bytes
-SHA1 (patch-aa) = 44db7bc8ce6b03b44fe3aba223396d157b49e845
+SHA1 (p7zip_9.13_src_all.tar.bz2) = 81da0729561ce123c0a82656ec96a04ad5bfa522
+RMD160 (p7zip_9.13_src_all.tar.bz2) = beb9181330f4dfa75aa4f473c68a462c76b7ab19
+Size (p7zip_9.13_src_all.tar.bz2) = 3753579 bytes
+SHA1 (patch-aa) = 6df31ad2f391b7f1b5220f05ff0142ee258a92e7
 SHA1 (patch-ab) = fedaf15990d9c01bdefcd2a0bd9a740f965247b0
-SHA1 (patch-ac) = 1c72ee13e0e939d2e5fb58870be95796af0b7ff0
+SHA1 (patch-ac) = f5f0acd488a7c524b692b5660042baa79f9937ce
diff --git a/archivers/p7zip/patches/patch-aa b/archivers/p7zip/patches/patch-aa
index 19c8ed4bcd9..cbc792dc92c 100644
--- a/archivers/p7zip/patches/patch-aa
+++ b/archivers/p7zip/patches/patch-aa
@@ -1,18 +1,19 @@
-$NetBSD: patch-aa,v 1.17 2007/09/05 20:37:08 adam Exp $
+$NetBSD: patch-aa,v 1.18 2010/06/16 08:30:09 adam Exp $
 
---- makefile.machine.orig	2007-09-01 10:26:00.000000000 +0200
+--- makefile.machine.orig	2010-05-30 08:33:48.000000000 +0000
 +++ makefile.machine
-@@ -2,20 +2,20 @@
+@@ -2,21 +2,21 @@
  # makefile for Linux (x86, PPC, alpha ...)
  #
  
 -OPTFLAGS=-O
 +OPTFLAGS=
  
--ALLFLAGS=${OPTFLAGS} -s \
+-ALLFLAGS=${OPTFLAGS} -pipe -s \
 +ALLFLAGS=${OPTFLAGS} -Wall \
      	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
  	-DNDEBUG -D_REENTRANT -DENV_UNIX \
+ 	-D_7ZIP_LARGE_PAGES \
  	$(LOCAL_FLAGS)
  
 -CXX=g++ $(ALLFLAGS)
diff --git a/archivers/p7zip/patches/patch-ac b/archivers/p7zip/patches/patch-ac
index c32b892abd4..ca7470f1cbd 100644
--- a/archivers/p7zip/patches/patch-ac
+++ b/archivers/p7zip/patches/patch-ac
@@ -1,19 +1,19 @@
-$NetBSD: patch-ac,v 1.6 2009/02/18 07:19:06 adam Exp $
+$NetBSD: patch-ac,v 1.7 2010/06/16 08:30:09 adam Exp $
 
---- makefile.glb.orig	2009-02-09 21:20:12.000000000 +0100
+--- makefile.glb.orig	2009-07-03 20:44:21.000000000 +0000
 +++ makefile.glb
 @@ -1,12 +1,12 @@
  
  RM=rm -f
--CFLAGS=-c \
-+CFLAGS+=-c \
+-CFLAGS=-c -I. \
++CFLAGS+=-c -I. \
  -I../../../../C \
  -I../../../myWindows \
  -I../../../include_windows \
  -I../../..
  
--CXXFLAGS=-c \
-+CXXFLAGS+=-c \
+-CXXFLAGS=-c -I. \
++CXXFLAGS+=-c -I. \
  -I../../../myWindows \
  -I../../../ \
  -I../../../include_windows