Changes 9.20.1:

- "p7zip 9.20 - "unsupported method" with RAR files - " fixed
  "install.sh" installs again "bin/Codecs/Rar29.so"

3 files changed, 12 insertions, 35 deletions

diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile
index 3193aafb48d..2135194cce8 100644
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2011/03/14 18:18:33 abs Exp $
+# $NetBSD: Makefile,v 1.50 2011/03/21 13:45:51 adam Exp $
 
-DISTNAME=	p7zip_9.20_src_all
-PKGNAME=	p7zip-9.20
+DISTNAME=	p7zip_9.20.1_src_all
+PKGNAME=	p7zip-9.20.1
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=p7zip/}
 EXTRACT_SUFX=	.tar.bz2
@@ -15,12 +15,12 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake
 MAKE_FILE=		makefile
 MAKE_JOBS_SAFE=		no # missing header when compiling sfx
 NO_CONFIGURE=		yes
 PTHREAD_OPTS+=		require
 PLIST_VARS=		dll
-USE_TOOLS=		gmake
 
 # compiles, but does not recognize any archives as supported
 DYNAMIC_7Z=		NO
@@ -55,13 +55,11 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/7za ${DESTDIR}${PREFIX}/bin
 .if !empty(DYNAMIC_7Z:MYES)
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/7z ${DESTDIR}${PREFIX}/lib/7z
-	ln -s ${PREFIX}/lib/7z/7z ${DESTDIR}${PREFIX}/bin
+	ln -f -s ${PREFIX}/lib/7z/7z ${DESTDIR}${PREFIX}/bin
 	${INSTALL_LIB} ${WRKSRC}/bin/Codecs/* \
 		${DESTDIR}${PREFIX}/lib/7z/Codecs
-	${INSTALL_LIB} ${WRKSRC}/bin/Formats/* \
-		${DESTDIR}${PREFIX}/lib/7z/Formats
 .else
-	ln -s 7za ${DESTDIR}${PREFIX}/bin/7z
+	ln -f -s 7za ${DESTDIR}${PREFIX}/bin/7z
 .endif
 	${INSTALL_DATA} ${WRKSRC}/README \
 		${DESTDIR}${PREFIX}/share/doc/p7zip
diff --git a/archivers/p7zip/PLIST b/archivers/p7zip/PLIST
index 92b72952f5d..01a0edefd4d 100644
--- a/archivers/p7zip/PLIST
+++ b/archivers/p7zip/PLIST
@@ -1,29 +1,8 @@
-@comment $NetBSD: PLIST,v 1.16 2010/06/16 08:30:09 adam Exp $
+@comment $NetBSD: PLIST,v 1.17 2011/03/21 13:45:51 adam Exp $
 bin/7z
 bin/7za
 ${PLIST.dll}lib/7z/7z
-${PLIST.dll}lib/7z/Codecs/7zAES.dll
-${PLIST.dll}lib/7z/Codecs/AES.dll
-${PLIST.dll}lib/7z/Codecs/BZip2.dll
-${PLIST.dll}lib/7z/Codecs/Branch.dll
-${PLIST.dll}lib/7z/Codecs/Copy.dll
-${PLIST.dll}lib/7z/Codecs/Deflate.dll
-${PLIST.dll}lib/7z/Codecs/Implode.dll
-${PLIST.dll}lib/7z/Codecs/LZMA.dll
-${PLIST.dll}lib/7z/Codecs/PPMD.dll
-${PLIST.dll}lib/7z/Codecs/Swap.dll
-${PLIST.dll}lib/7z/Formats/7z.dll
-${PLIST.dll}lib/7z/Formats/Rar.dll
-${PLIST.dll}lib/7z/Formats/Tar.dll
-${PLIST.dll}lib/7z/Formats/Zip.dll
-${PLIST.dll}lib/7z/Formats/arj.dll
-${PLIST.dll}lib/7z/Formats/bz2.dll
-${PLIST.dll}lib/7z/Formats/cab.dll
-${PLIST.dll}lib/7z/Formats/cpio.dll
-${PLIST.dll}lib/7z/Formats/deb.dll
-${PLIST.dll}lib/7z/Formats/gz.dll
-${PLIST.dll}lib/7z/Formats/rpm.dll
-${PLIST.dll}lib/7z/Formats/split.dll
+${PLIST.dll}lib/7z/Codecs/Rar29.so
 man/man1/7z.1
 man/man1/7za.1
 man/man1/7zr.1
diff --git a/archivers/p7zip/distinfo b/archivers/p7zip/distinfo
index a52c1e54493..e60f31e1013 100644
--- a/archivers/p7zip/distinfo
+++ b/archivers/p7zip/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.39 2011/03/14 12:36:42 adam Exp $
+$NetBSD: distinfo,v 1.40 2011/03/21 13:45:51 adam Exp $
 
-SHA1 (p7zip_9.20_src_all.tar.bz2) = c976df4543ea946a65bc3f5e3d4e9baa417e5f12
-RMD160 (p7zip_9.20_src_all.tar.bz2) = ab7675c4ca87ce855acc05855328081c1b365d1c
-Size (p7zip_9.20_src_all.tar.bz2) = 3836127 bytes
+SHA1 (p7zip_9.20.1_src_all.tar.bz2) = 1cd567e043ee054bf08244ce15f32cb3258306b7
+RMD160 (p7zip_9.20.1_src_all.tar.bz2) = c3ff2dd12459282b46d9a68ab4af7800ff46039f
+Size (p7zip_9.20.1_src_all.tar.bz2) = 3835235 bytes
 SHA1 (patch-aa) = 6df31ad2f391b7f1b5220f05ff0142ee258a92e7
 SHA1 (patch-ab) = a9bd9ab50f6c2d5964de9b2c4e5d9d75e3c29b79
 SHA1 (patch-ac) = f5f0acd488a7c524b692b5660042baa79f9937ce