Changes 4.39:

- From Windows version of 7-zip 4.39 :
  - Bug in versions 4.33:4.38 was fixed:
    7-Zip could not correctly compress files larger than 2 GB
    to 7z archive in fast/fastest modes (HC4 match finder).

Changes 4.38:
- From Windows version of 7-zip 4.38 :
  - Some bugs were fixed.
- new manpage : 7zr.1
- update manpages : 7z.1 and 7za.1
- new switch : --help
- DosDateTimeToFileTime fixed (rar format)
- contrib/VirtualFileSystemForMidnightCommander/u7z updated

4 files changed, 20 insertions, 15 deletions

diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile
index aea3f11210a..c710a8e6b35 100644
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2006/04/03 19:13:21 adam Exp $
+# $NetBSD: Makefile,v 1.21 2006/04/15 12:24:35 adam Exp $
 
-DISTNAME=	p7zip_4.37_src_all
-PKGNAME=	p7zip-4.37
+DISTNAME=	p7zip_4.39_src_all
+PKGNAME=	p7zip-4.39
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=p7zip/}
 EXTRACT_SUFX=	.tar.bz2
@@ -62,6 +62,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/switches/*.* ${PREFIX}/share/doc/p7zip/switches
 	${INSTALL_MAN} ${WRKSRC}/man1/7z.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/man1/7za.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man1/7zr.1 ${PREFIX}/man/man1
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/p7zip/PLIST b/archivers/p7zip/PLIST
index 32e02d473a4..eb429098efd 100644
--- a/archivers/p7zip/PLIST
+++ b/archivers/p7zip/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2006/04/03 19:13:21 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/04/15 12:24:35 adam Exp $
 bin/7z
 bin/7za
 ${DYNAMIC_7Z}lib/7z/7z
@@ -26,6 +26,7 @@ ${DYNAMIC_7Z}lib/7z/Formats/rpm.dll
 ${DYNAMIC_7Z}lib/7z/Formats/split.dll
 man/man1/7z.1
 man/man1/7za.1
+man/man1/7zr.1
 share/doc/p7zip/README
 share/doc/p7zip/commands/add.htm
 share/doc/p7zip/commands/delete.htm
diff --git a/archivers/p7zip/distinfo b/archivers/p7zip/distinfo
index 5bc29501c09..b8e1e9b4b72 100644
--- a/archivers/p7zip/distinfo
+++ b/archivers/p7zip/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.18 2006/04/03 19:13:21 adam Exp $
+$NetBSD: distinfo,v 1.19 2006/04/15 12:24:35 adam Exp $
 
-SHA1 (p7zip_4.37_src_all.tar.bz2) = 1e92581d0684c7bd707d3e399da56e7da7dc055c
-RMD160 (p7zip_4.37_src_all.tar.bz2) = 828fbd6fb697d42de30061bd7701f7d93daa42a6
-Size (p7zip_4.37_src_all.tar.bz2) = 1474144 bytes
-SHA1 (patch-aa) = d9ef871ddccc2271167b2e36cac23a7113908309
+SHA1 (p7zip_4.39_src_all.tar.bz2) = c89f96df1e63d04449b58c066084e431d8fb5f8f
+RMD160 (p7zip_4.39_src_all.tar.bz2) = dafb84dbeb2010f8949440b402494af4f996c977
+Size (p7zip_4.39_src_all.tar.bz2) = 1447644 bytes
+SHA1 (patch-aa) = 52f7fd0d634191e829cebb91f567b506eb6f8cf7
 SHA1 (patch-ab) = 9a42ad2edb7a415bec90f6d08c0a3f488bdda6d0
 SHA1 (patch-ac) = ed38fe44c9b1ee3fb502edef47cf28ed5852a95b
diff --git a/archivers/p7zip/patches/patch-aa b/archivers/p7zip/patches/patch-aa
index b4e8191a139..e27be0d6901 100644
--- a/archivers/p7zip/patches/patch-aa
+++ b/archivers/p7zip/patches/patch-aa
@@ -1,18 +1,21 @@
-$NetBSD: patch-aa,v 1.12 2006/04/03 19:13:21 adam Exp $
+$NetBSD: patch-aa,v 1.13 2006/04/15 12:24:36 adam Exp $
 
---- makefile.machine.orig	2006-04-01 14:56:25.000000000 +0200
+--- makefile.machine.orig	2006-04-19 11:08:28.000000000 +0200
 +++ makefile.machine
-@@ -2,7 +2,7 @@
+@@ -2,15 +2,15 @@
  # makefile for Linux (x86, PPC, alpha ...)
  # LITTLE_ENDIAN and BIG_ENDIAN are already defined by the system headers
  #
 -ALLFLAGS=-O1 -s -fPIC \
 +ALLFLAGS=-Wall \
      	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
- 	-DHAVE_TIMEGM \
  	-DNDEBUG -D_REENTRANT -DENV_UNIX \
-@@ -12,6 +12,6 @@ CXX=g++ $(ALLFLAGS)
- CC=gcc $(ALLFLAGS)
+ 	$(LOCAL_FLAGS)
+ 
+-CXX=g++ $(ALLFLAGS)
+-CC=gcc $(ALLFLAGS)
++CXX+=$(ALLFLAGS)
++CC+=$(ALLFLAGS)
  LINK_SHARED=-shared
  
 -LOCAL_LIBS=-lpthread