Update to 4.13:

  - new port of 7za from the source of 7za 4.13Beta for Windows

  - From Windows version of 7-zip 4.13 :
    - Switch "--" stops switches parsing
    - Some bugs were fixed
    - User's manual updated (DOCS/MANUAL/index.htm)

  - makefile.netbsd_x86 added [Bug #1069055].

  - new method to install 7z and its plugins (the "link" method do no work)

  - installer added (install.sh).

  - makefile.macosx_with_fink becomes makefile.macosx
    and makefile.macosx uses c++ instead of CC
    (on some MacOSX, CC is a link to gcc instead of g++)

  - new flag "-utf16" to enable "utf16" conversion [Bug #1075229].

  - new logic to automatically enable or disable "utf16" conversion :
    no locale, locale=="C" or locale=="POSIX" implies utf16=off
    else  utf16=on
    uses "-utf16" or "-no-utf16" to change this behaviour.
    [Bug #1075229]

  - 7z (compiled with -O2) works now on Sparc Solaris.

4 files changed, 37 insertions, 30 deletions

diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile
index 0b562a63fee..838d4c38682 100644
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2004/12/03 15:14:50 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/12/26 02:43:38 wiz Exp $
 #
 
-DISTNAME=		p7zip_4.12_src
-PKGNAME=		p7zip-4.12
+DISTNAME=		p7zip_4.13_src
+PKGNAME=		p7zip-4.13
 CATEGORIES=		archivers
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=p7zip/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/archivers/p7zip/PLIST b/archivers/p7zip/PLIST
index 7e3e715fe2c..eeb4f59ff95 100644
--- a/archivers/p7zip/PLIST
+++ b/archivers/p7zip/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/11/23 14:57:52 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/12/26 02:43:38 wiz Exp $
 bin/7z
 bin/7za
 ${DYNAMIC_7Z}lib/7z/7z
@@ -25,32 +25,38 @@ ${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/extract.htm
+share/doc/p7zip/commands/extract_full.htm
+share/doc/p7zip/commands/index.htm
 share/doc/p7zip/commands/list.htm
+share/doc/p7zip/commands/style.css
 share/doc/p7zip/commands/test.htm
-share/doc/p7zip/style.css
-share/doc/p7zip/syntax.htm
+share/doc/p7zip/commands/update.htm
 share/doc/p7zip/index.htm
-share/doc/p7zip/switches/output_dir.htm
-share/doc/p7zip/switches/style.css
+share/doc/p7zip/style.css
+share/doc/p7zip/switches/ar_exclude.htm
+share/doc/p7zip/switches/ar_include.htm
+share/doc/p7zip/switches/ar_no.htm
+share/doc/p7zip/switches/exclude.htm
 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/output_dir.htm
+share/doc/p7zip/switches/overwrite.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
+share/doc/p7zip/switches/sfx.htm
+share/doc/p7zip/switches/stdin.htm
+share/doc/p7zip/switches/stdout.htm
+share/doc/p7zip/switches/stop_switch.htm
+share/doc/p7zip/switches/style.css
+share/doc/p7zip/switches/type.htm
+share/doc/p7zip/switches/update.htm
+share/doc/p7zip/switches/working_dir.htm
+share/doc/p7zip/switches/yes.htm
+share/doc/p7zip/syntax.htm
 @dirrm share/doc/p7zip/switches
 @dirrm share/doc/p7zip/commands
 @dirrm share/doc/p7zip
diff --git a/archivers/p7zip/distinfo b/archivers/p7zip/distinfo
index 0b9902e7cf3..08a26285df1 100644
--- a/archivers/p7zip/distinfo
+++ b/archivers/p7zip/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2004/11/23 14:57:52 wiz Exp $
+$NetBSD: distinfo,v 1.5 2004/12/26 02:43:38 wiz Exp $
 
-SHA1 (p7zip_4.12_src.tar.bz2) = badd4aa3da555cd9a8915eec7b872db635744d9e
-Size (p7zip_4.12_src.tar.bz2) = 454996 bytes
-SHA1 (patch-aa) = 66ddc3b9e43c7bb1f56369c599cec4871919069e
+SHA1 (p7zip_4.13_src.tar.bz2) = 06130422be198666267b0b3fc730a92ab621eefd
+Size (p7zip_4.13_src.tar.bz2) = 457094 bytes
+SHA1 (patch-aa) = a59d10e31cbf86fecdc73c97bcacf36b9b8ac7e8
 SHA1 (patch-ab) = f081769651f551d01b608e79e3e963eaaaf35d5c
diff --git a/archivers/p7zip/patches/patch-aa b/archivers/p7zip/patches/patch-aa
index e7897ef6b01..37e9cd7313b 100644
--- a/archivers/p7zip/patches/patch-aa
+++ b/archivers/p7zip/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2004/11/23 14:57:52 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2004/12/26 02:43:38 wiz Exp $
 
---- makefile.machine.orig	2004-11-18 22:50:19.000000000 +0100
+--- makefile.machine.orig	2004-12-03 22:00:37.000000000 +0100
 +++ makefile.machine
-@@ -1,15 +1,14 @@
+@@ -1,8 +1,7 @@
  
 -ALLFLAGS=-Wall -O2 -s -fPIC \
 +ALLFLAGS=-Wall -s -fPIC \
@@ -12,11 +12,12 @@ $NetBSD: patch-aa,v 1.3 2004/11/23 14:57:52 wiz Exp $
  	$(LOCAL_FLAGS)
  
  CXX=g++ $(ALLFLAGS)
- CC=gcc $(ALLFLAGS)
+@@ -10,7 +9,7 @@ CC=gcc $(ALLFLAGS)
  LINK_SHARED=-shared
  
--LOCAL_LIBS=-lpthread -ldl
-+LOCAL_LIBS=-lpthread
+ LOCAL_LIBS=-lpthread
+-LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl
++LOCAL_LIBS_DLL=$(LOCAL_LIBS)
  # static linkage
  # LOCAL_LIBS=-static -lpthread