From c5b84af93ae2250b42337e7f5e1721cee2983b71 Mon Sep 17 00:00:00 2001
From: adam <adam>
Date: Sat, 27 Jan 2007 21:50:11 +0000
Subject: Changes 4.44: - From Windows version of 7-zip 4.43 :   - 7za : Cab
 support   - Speed optimizations for LZMA, Deflate, BZip2 and unRAR.   - fix :
 now, updating a crypted header archive keeps the crypted header - fixes in
 the help displayed by 7za/7z/7zr. - code cleanup   - remove of
 mySetModuleFileNameA (and its memory leak), GetModuleFileName ... - fixed :
 p7zip for DJGPP can now update an archive (thanks stranix) - fixed : in the
 plugins of 7z, the "Utf16" state was always off. - fixed : support for
 directory names that are not encoded with the current locale.   (ex :
 directory name is in "iso 8859-15" whereas the locale is "utf8") - patch
 1581907 : fix for FreeBSD in contrib/gzip-like_CLI_wrapper_for_7z/p7zip -
 fixed : p7zip can now restore a symbolic link from a Zip archive (archive.zip
 made with "zip -y")     remark/todo : p7zip stores, in a zip archive, the
 linked file instead of the symbolic link - fixed 1630452 : small fix in the
 output of the script install.sh - fixed 632912 : Extracting large directories
 takes quadratic time - preliminary support of HP-UX : remove of RTLD_GROUP
 for dlopen in DLL.cpp     makefile.hpux-acc should be able to build 7za for
 HP-UX (thanks to furiol) - Client7z added.

---
 archivers/p7zip/Makefile         | 20 +++++++++++---------
 archivers/p7zip/distinfo         | 10 +++++-----
 archivers/p7zip/patches/patch-ab |  8 ++++----
 3 files changed, 20 insertions(+), 18 deletions(-)

(limited to 'archivers')

diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile
index 0b3cb3b2e79..0fd690f5f4a 100644
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2006/10/01 10:39:21 adam Exp $
+# $NetBSD: Makefile,v 1.26 2007/01/27 21:50:11 adam Exp $
 
-DISTNAME=	p7zip_4.43_src_all
-PKGNAME=	p7zip-4.43
+DISTNAME=	p7zip_4.44_src_all
+PKGNAME=	p7zip-4.44
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=p7zip/}
 EXTRACT_SUFX=	.tar.bz2
@@ -31,6 +31,14 @@ WRKSRC=			${WRKDIR}/${PKGNAME_NOREV:S/-/_/}
 GCC_REQD+=		3.0
 
 INSTALLATION_DIRS=	bin
+.if !empty(DYNAMIC_7Z:MYES)
+INSTALLATION_DIRS+=	lib/7z
+INSTALLATION_DIRS+=	lib/7z/Codecs
+INSTALLATION_DIRS+=	lib/7z/Formats
+.endif
+INSTALLATION_DIRS+=	share/doc/p7zip
+INSTALLATION_DIRS+=	share/doc/p7zip/commands
+INSTALLATION_DIRS+=	share/doc/p7zip/switches
 
 .include "../../mk/endian.mk"
 
@@ -43,9 +51,6 @@ CFLAGS+=		-DLITTLE_ENDIAN
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/7za ${PREFIX}/bin
 .if !empty(DYNAMIC_7Z:MYES)
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/7z
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/7z/Codecs
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/7z/Formats
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/7z ${PREFIX}/lib/7z
 	${INSTALL_LIB} ${WRKSRC}/bin/Codecs/* ${PREFIX}/lib/7z/Codecs
 	${INSTALL_LIB} ${WRKSRC}/bin/Formats/* ${PREFIX}/lib/7z/Formats
@@ -53,9 +58,6 @@ do-install:
 .else
 	ln -s 7za ${PREFIX}/bin/7z
 .endif
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/p7zip
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/p7zip/commands
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/p7zip/switches
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/p7zip
 	${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/*.* ${PREFIX}/share/doc/p7zip
 	${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/commands/*.* ${PREFIX}/share/doc/p7zip/commands
diff --git a/archivers/p7zip/distinfo b/archivers/p7zip/distinfo
index 9c2e39ceaa5..3b15b694ba0 100644
--- a/archivers/p7zip/distinfo
+++ b/archivers/p7zip/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.22 2006/10/01 10:39:21 adam Exp $
+$NetBSD: distinfo,v 1.23 2007/01/27 21:50:11 adam Exp $
 
-SHA1 (p7zip_4.43_src_all.tar.bz2) = 010f549b35a8ded8163c04e438c9ff01ca49c50d
-RMD160 (p7zip_4.43_src_all.tar.bz2) = 227741c37e1c69260898ef7a4aa827835cac8a6c
-Size (p7zip_4.43_src_all.tar.bz2) = 1482271 bytes
+SHA1 (p7zip_4.44_src_all.tar.bz2) = 474e2479a7ceb19fcf75e61784e2c4ecf2d2f7e7
+RMD160 (p7zip_4.44_src_all.tar.bz2) = a04f13c55ce21781c463debc578fd4819f171adf
+Size (p7zip_4.44_src_all.tar.bz2) = 1518820 bytes
 SHA1 (patch-aa) = f10ed94ca53f07a57f6c7875c67d6bbb51d9d0e8
-SHA1 (patch-ab) = 9a42ad2edb7a415bec90f6d08c0a3f488bdda6d0
+SHA1 (patch-ab) = 98578e58d3abf4e0fe0615f10c563cac78ceb047
 SHA1 (patch-ac) = ed38fe44c9b1ee3fb502edef47cf28ed5852a95b
diff --git a/archivers/p7zip/patches/patch-ab b/archivers/p7zip/patches/patch-ab
index cce0aa49585..8992269aeaf 100644
--- a/archivers/p7zip/patches/patch-ab
+++ b/archivers/p7zip/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2006/04/03 19:13:21 adam Exp $
+$NetBSD: patch-ab,v 1.8 2007/01/27 21:50:11 adam Exp $
 
---- Windows/FileFind.cpp.orig	2006-03-19 01:56:00.000000000 +0100
-+++ Windows/FileFind.cpp
-@@ -197,7 +197,8 @@ bool CFindFile::FindFirst(LPCTSTR wildca
+--- CPP/Windows/FileFind.cpp.orig	2007-01-20 18:06:40.000000000 +0100
++++ CPP/Windows/FileFind.cpp
+@@ -264,7 +264,8 @@ bool CFindFile::FindFirst(LPCTSTR wildca
    }
  
    TRACEN((printf("CFindFile::FindFirst : closedir-2(dirp=%p)\n",_dirp)))
-- 
cgit v1.2.3