diff options
author | wiz <wiz> | 2004-11-23 14:57:52 +0000 |
---|---|---|
committer | wiz <wiz> | 2004-11-23 14:57:52 +0000 |
commit | ddb08fd0d833369cc261da6f9bc44b485bedd802 (patch) | |
tree | 5cd0285b9c8889785ec6969fec37a3e93e00e30f /archivers/p7zip | |
parent | e4545a8f2df0159c4ca075435381239d7c577745 (diff) | |
download | pkgsrc-ddb08fd0d833369cc261da6f9bc44b485bedd802.tar.gz |
Update to 4.12:
Version 4.12
============
- new port of 7za from the source of 7za 4.12Beta for Windows
- From Windows version of 7-zip 4.11 and 4.12 :
- 7-Zip now supports Zip64 extension of ZIP format. So now it's
possible to compress files bigger than 4 GB to ZIP archives.
- Some bugs were fixed
- fix "7za a archive.7z file" that added all the files and directories
with filename "file", "FILE", "File" ...
- p7zip now displays the locale (ex : en_US.UTF-8) in the banner.
- new flag "-no-utf16" to avoid lossly conversion in filenames.
CAUTION : use this flag when you do not plan to export your archive.
- support creation of self extracting archive.
- better support of symbolic link (now, an invalid symbolic link
do not stop archiving but displays a warning).
- better support of files that the user cannot read.
(now this kind of file is not added to the archive, and p7zip displays a warning).
- return of 7z and its plugins.
- support of listing/testing/extracting files from a splitted archive (only with 7z).
- support of MacOX X 10.X.
- creation of Gzip/Tar archives didn't work on Linux Alpha.
- see "contrib/VirtualFileSystemForMidnightCommander/readme" to use 7za with "mc".
Version 4.10
============
- new port of 7za from the source of 7za 4.10Beta for Windows
=> p7zip now work on big endian CPU.
- 7z for Unix is not maintain anymore (because as the source of unrar plugin for 7z
is not available, 7z is unless on Unix).
Version 0.91
============
- add support for FreeBSD 5.2.1
In Windows/Time.h add "#include <time.h>"
and prototype change for FileTimeToUnixTime()
- bug 990684 Corrected : support of filesystem
that support case sensitive filenames.
Example, since version 0.91 :
"7z a glibc -r glibc-2.3.2"
does not terminate with error :
Duplicate filename:
glibc-2.3.2\sysdeps\m88k\m88100\add_n.S
glibc-2.3.2\sysdeps\m88k\m88100\add_n.s
Version 0.90
============
- build of 7z.exe and its DLL.
7z.exe support more archive formats than 7za.exe
thanks to DLL in Formats and Codecs directories
- "#pragma once" is now in comments
- mainly For OpenBSD :
- add #include <wchar.h> in include_windows/winnt.h
- remove stuff for GUID_SECTION and GUID_SECT in include_windows/basetyps.h
and include_windows/initguid.h
- some changes in 7zip/Crypto/aesopt.h because of endian.h
Version 0.81
============
- add a copy of the help of 7-zip (see html directory)
- "7z a -r tmp.7z directory" works as expected.
no more need for commands like : 7z a -r tmp.7z "directory/*"
- 7z restores the date of each files (but not directories)
- 7z supports UNICODE filenames (version 0.80 supports only ASCII/Latin1 filenames)
- support of gcc 2.95
- support of gcc 3.4
- 7z needs no more libgen.h (dirname() and basename())
- less "Internal Error #7" during arguments parsing
- minor change in class CThread
Diffstat (limited to 'archivers/p7zip')
-rw-r--r-- | archivers/p7zip/Makefile | 45 | ||||
-rw-r--r-- | archivers/p7zip/PLIST | 57 | ||||
-rw-r--r-- | archivers/p7zip/distinfo | 12 | ||||
-rw-r--r-- | archivers/p7zip/patches/patch-aa | 36 | ||||
-rw-r--r-- | archivers/p7zip/patches/patch-ab | 24 | ||||
-rw-r--r-- | archivers/p7zip/patches/patch-ac | 13 | ||||
-rw-r--r-- | archivers/p7zip/patches/patch-ad | 13 |
7 files changed, 133 insertions, 67 deletions
diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile index 2125e43e6ae..c68aed41055 100644 --- a/archivers/p7zip/Makefile +++ b/archivers/p7zip/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2004/10/08 15:57:51 tv Exp $ +# $NetBSD: Makefile,v 1.5 2004/11/23 14:57:52 wiz Exp $ # -DISTNAME= p7zip_0.80 -PKGNAME= p7zip-0.80 +DISTNAME= p7zip_4.12_src +PKGNAME= p7zip-4.12 CATEGORIES= archivers MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=p7zip/} EXTRACT_SUFX= .tar.bz2 @@ -13,8 +13,6 @@ COMMENT= File archiver with high compression PKG_INSTALLATION_TYPES= overwrite pkgviews -NOT_FOR_PLATFORM= *-*-m68* *-*-mipseb* *-*-powerpc* *-*-sparc* - USE_BUILDLINK3= yes USE_LANGUAGES= c c++ MAKEFILE= makefile @@ -22,14 +20,49 @@ NO_CONFIGURE= yes USE_GNU_TOOLS+= make PTHREAD_OPTS+= require +# compiles, but does not recognize any archives as supported +DYNAMIC_7Z= NO +.if !empty(DYNAMIC_7Z:MYES) +ALL_TARGET= all2 +PLIST_SUBST+= DYNAMIC_7Z="" +.else +PLIST_SUBST+= DYNAMIC_7Z="@comment " +.endif + +WRKSRC= ${WRKDIR}/${DISTNAME:S/_src//} + GCC_REQD= 3.0 INSTALLATION_DIRS= bin +.include "../../mk/endian.mk" + +.if !empty(MACHINE_ENDIAN:Mbig) +CFLAGS+= -DBIG_ENDIAN +.else +CFLAGS+= -DLITTLE_ENDIAN +.endif + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/7z ${PREFIX}/bin + ${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 + ${LN} -s ${PREFIX}/lib/7z/7z ${PREFIX}/bin +.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 + ${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/switches/*.* ${PREFIX}/share/doc/p7zip/switches .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/archivers/p7zip/PLIST b/archivers/p7zip/PLIST index cefe7215a31..7e3e715fe2c 100644 --- a/archivers/p7zip/PLIST +++ b/archivers/p7zip/PLIST @@ -1,4 +1,59 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/06/25 13:56:12 wiz Exp $ +@comment $NetBSD: PLIST,v 1.2 2004/11/23 14:57:52 wiz Exp $ bin/7z +bin/7za +${DYNAMIC_7Z}lib/7z/7z +${DYNAMIC_7Z}lib/7z/Codecs/7zAES.dll +${DYNAMIC_7Z}lib/7z/Codecs/AES.dll +${DYNAMIC_7Z}lib/7z/Codecs/BZip2.dll +${DYNAMIC_7Z}lib/7z/Codecs/Branch.dll +${DYNAMIC_7Z}lib/7z/Codecs/Copy.dll +${DYNAMIC_7Z}lib/7z/Codecs/Deflate.dll +${DYNAMIC_7Z}lib/7z/Codecs/Implode.dll +${DYNAMIC_7Z}lib/7z/Codecs/LZMA.dll +${DYNAMIC_7Z}lib/7z/Codecs/PPMD.dll +${DYNAMIC_7Z}lib/7z/Codecs/Swap.dll +${DYNAMIC_7Z}lib/7z/Formats/7z.dll +${DYNAMIC_7Z}lib/7z/Formats/Rar.dll +${DYNAMIC_7Z}lib/7z/Formats/Tar.dll +${DYNAMIC_7Z}lib/7z/Formats/Zip.dll +${DYNAMIC_7Z}lib/7z/Formats/arj.dll +${DYNAMIC_7Z}lib/7z/Formats/bz2.dll +${DYNAMIC_7Z}lib/7z/Formats/cab.dll +${DYNAMIC_7Z}lib/7z/Formats/cpio.dll +${DYNAMIC_7Z}lib/7z/Formats/deb.dll +${DYNAMIC_7Z}lib/7z/Formats/gz.dll +${DYNAMIC_7Z}lib/7z/Formats/rpm.dll +${DYNAMIC_7Z}lib/7z/Formats/split.dll share/doc/p7zip/README +share/doc/p7zip/commands/extract_full.htm +share/doc/p7zip/commands/style.css +share/doc/p7zip/commands/update.htm +share/doc/p7zip/commands/extract.htm +share/doc/p7zip/commands/index.htm +share/doc/p7zip/commands/add.htm +share/doc/p7zip/commands/delete.htm +share/doc/p7zip/commands/list.htm +share/doc/p7zip/commands/test.htm +share/doc/p7zip/style.css +share/doc/p7zip/syntax.htm +share/doc/p7zip/index.htm +share/doc/p7zip/switches/output_dir.htm +share/doc/p7zip/switches/style.css +share/doc/p7zip/switches/include.htm +share/doc/p7zip/switches/update.htm +share/doc/p7zip/switches/index.htm +share/doc/p7zip/switches/yes.htm +share/doc/p7zip/switches/overwrite.htm +share/doc/p7zip/switches/method.htm +share/doc/p7zip/switches/sfx.htm +share/doc/p7zip/switches/working_dir.htm +share/doc/p7zip/switches/password.htm +share/doc/p7zip/switches/exclude.htm +share/doc/p7zip/switches/type.htm +share/doc/p7zip/switches/recurse.htm +@dirrm share/doc/p7zip/switches +@dirrm share/doc/p7zip/commands @dirrm share/doc/p7zip +${DYNAMIC_7Z}@dirrm lib/7z/Formats +${DYNAMIC_7Z}@dirrm lib/7z/Codecs +${DYNAMIC_7Z}@dirrm lib/7z diff --git a/archivers/p7zip/distinfo b/archivers/p7zip/distinfo index 52920e1dba4..0b9902e7cf3 100644 --- a/archivers/p7zip/distinfo +++ b/archivers/p7zip/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.3 2004/07/05 14:41:31 minskim Exp $ +$NetBSD: distinfo,v 1.4 2004/11/23 14:57:52 wiz Exp $ -SHA1 (p7zip_0.80.tar.bz2) = c87cda0a8a2cd1300272d71f4cd371db7ebb4b79 -Size (p7zip_0.80.tar.bz2) = 921896 bytes -SHA1 (patch-aa) = 943f6149b1a9ae8bd75e94e940976e1f8f21136e -SHA1 (patch-ab) = e438472f1eb6886dcaee0147ca5f9a2604a9abb1 -SHA1 (patch-ac) = 61dff04aca7b0c69ba8f12af40a4c27815a0bef2 -SHA1 (patch-ad) = 34197da6654226155b26bcea083801d241f348d4 +SHA1 (p7zip_4.12_src.tar.bz2) = badd4aa3da555cd9a8915eec7b872db635744d9e +Size (p7zip_4.12_src.tar.bz2) = 454996 bytes +SHA1 (patch-aa) = 66ddc3b9e43c7bb1f56369c599cec4871919069e +SHA1 (patch-ab) = f081769651f551d01b608e79e3e963eaaaf35d5c diff --git a/archivers/p7zip/patches/patch-aa b/archivers/p7zip/patches/patch-aa index c37529e1cdd..e7897ef6b01 100644 --- a/archivers/p7zip/patches/patch-aa +++ b/archivers/p7zip/patches/patch-aa @@ -1,18 +1,22 @@ -$NetBSD: patch-aa,v 1.2 2004/07/05 14:41:31 minskim Exp $ +$NetBSD: patch-aa,v 1.3 2004/11/23 14:57:52 wiz Exp $ ---- 7zip/Crypto/AES/aesopt.h.orig 2004-06-13 12:06:36.000000000 -0500 -+++ 7zip/Crypto/AES/aesopt.h -@@ -166,8 +166,11 @@ - // #if defined(__GNUC__) || defined(__GNU_LIBRARY__) - #if (defined(__GNUC__) || defined(__GNU_LIBRARY__)) && !defined(WIN32) && !defined(__CYGWIN__) +--- makefile.machine.orig 2004-11-18 22:50:19.000000000 +0100 ++++ makefile.machine +@@ -1,15 +1,14 @@ + +-ALLFLAGS=-Wall -O2 -s -fPIC \ ++ALLFLAGS=-Wall -s -fPIC \ + -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ + -DNDEBUG -D_REENTRANT -DENV_UNIX \ +- -DLITTLE_ENDIAN \ + $(LOCAL_FLAGS) + + CXX=g++ $(ALLFLAGS) + CC=gcc $(ALLFLAGS) + LINK_SHARED=-shared + +-LOCAL_LIBS=-lpthread -ldl ++LOCAL_LIBS=-lpthread + # static linkage + # LOCAL_LIBS=-static -lpthread --# include <endian.h> --# include <byteswap.h> -+# ifdef __linux__ -+# include <endian.h> -+# else -+# include <sys/endian.h> -+# endif - #elif defined(__CRYPTLIB__) - # if defined( INC_ALL ) - # include "crypt.h" diff --git a/archivers/p7zip/patches/patch-ab b/archivers/p7zip/patches/patch-ab index 12d05199d2d..2d9346a5b9c 100644 --- a/archivers/p7zip/patches/patch-ab +++ b/archivers/p7zip/patches/patch-ab @@ -1,12 +1,14 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/06/25 13:56:12 wiz Exp $ +$NetBSD: patch-ab,v 1.2 2004/11/23 14:57:52 wiz Exp $ ---- include_windows/winnt.h.orig 2004-06-10 21:44:46.000000000 +0200 -+++ include_windows/winnt.h -@@ -32,6 +32,7 @@ extern "C" { - #include <winerror.h> - - #include <string.h> -+#include <wchar.h> - - #ifndef VOID - #define VOID void +--- myWindows/myFindFile.cpp.orig 2004-11-11 21:03:42.000000000 +0100 ++++ myWindows/myFindFile.cpp +@@ -146,7 +146,8 @@ extern "C" HANDLE WINAPI FindFirstFileA( + } + } + TRACEN((printf("FindFirstFileA : closedir(dirp=%p)\n",retour->dirp))) +- closedir(retour->dirp); ++ if (retour->dirp) ++ closedir(retour->dirp); + delete retour; + SetLastError( ERROR_NO_MORE_FILES ); + return INVALID_HANDLE_VALUE; diff --git a/archivers/p7zip/patches/patch-ac b/archivers/p7zip/patches/patch-ac deleted file mode 100644 index d9f9c9bc035..00000000000 --- a/archivers/p7zip/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2004/06/25 13:56:12 wiz Exp $ - ---- myWindows/myEvents.cpp.orig 2004-06-13 18:47:40.000000000 +0200 -+++ myWindows/myEvents.cpp -@@ -12,7 +12,7 @@ static NWindows::NSynchronization::CCrit - - static void myYield() { - myLeave(); --#ifdef __CYGWIN__ -+#if 1 - usleep(10); - #else - int ret = pthread_yield(); diff --git a/archivers/p7zip/patches/patch-ad b/archivers/p7zip/patches/patch-ad deleted file mode 100644 index cf03c35b4d9..00000000000 --- a/archivers/p7zip/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2004/06/27 20:28:53 kristerw Exp $ - ---- makefile.orig Sun Jun 27 21:49:38 2004 -+++ makefile Sun Jun 27 21:51:54 2004 -@@ -71,7 +71,7 @@ - - REP=$(shell pwd) - ARCHIVE=$(shell basename $(REP)) --LIBS=-lpthread -+LIBS=-Wl,-R${LOCALBASE}/lib -lpthread - - all: test_emul 7z - |