Update to unzip-5.41. Includes decryption support by default. Other

changes include some bugfixes, a new BSD-like license, as well as
support for archives with more than 2^16-1 files.
Zlib support still broken, so we use the one coming with the distribution.

3 files changed, 18 insertions, 35 deletions

diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index 540e1c65a87..391f12998d7 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.21 1999/12/28 03:59:00 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2000/04/20 03:13:55 wiz Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/06/19 05:30:04 ache Exp 
 #
 
-DISTNAME=	unzip-5.40
+DISTNAME=	unzip541
+PKGNAME=	unzip-5.41
+WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	archivers
-MASTER_SITES=	ftp://ftp.cdrom.com/pub/infozip/src/ \
+MASTER_SITES=	ftp://ftp.info-zip.org/pub/infozip/src/ \
 		ftp://ftp.icce.rug.nl/infozip/src/
-DISTFILES=	unzip540.tar.gz
 
 MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.cdrom.com/pub/infozip/
+HOMEPAGE=	ftp://ftp.info-zip.org/pub/infozip/UnZip.html
 
 MAKEFILE=	unix/Makefile
 ALL_TARGET=	unzips
@@ -20,32 +21,14 @@ BUILD_DEFS+=	ZIP_ENCRYPTION
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(ZIP_ENCRYPTION)
-DISTFILES+=	zcrypt28.zip
-EXTRACT_ONLY=	unzip540.tar.gz
-RESTRICTED=	crypto
-MIRROR_DISTFILE=no
-
-# This bootstrap is ugly, but zcrypt is only shipped as a zipfile.
-pre-build:
-	@cd ${WRKSRC}; ${TEST} -f README.CR || ( \
-		${ECHO} '*** Building stage 1 of 2--unzip without encryption.' && \
-		${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} unzip && \
-		./unzip -qo ${DISTDIR}/zcrypt28.zip && \
-		${RM} -f *.o unzip )
-	@${ECHO} '*** Building stage 2 of 2--unzip with encryption.'
-.endif
-
 do-install:
-	cd ${WRKSRC} && \
-		${INSTALL_PROGRAM} unzip funzip unzipsfx ${PREFIX}/bin
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} unzip funzip unzipsfx ${PREFIX}/bin
 	${LN} -sf unzip ${PREFIX}/bin/zipinfo
-	cd ${WRKSRC}/unix && \
-		${INSTALL_SCRIPT} zipgrep ${PREFIX}/bin
-	cd ${WRKSRC}/unix && \
-		${INSTALL_MAN} funzip.1 unzip.1 unzipsfx.1 zipgrep.1 zipinfo.1 ${PREFIX}/man/man1
+	cd ${WRKSRC}/unix && ${INSTALL_SCRIPT} zipgrep ${PREFIX}/bin
+	cd ${WRKSRC}/man && ${INSTALL_MAN} funzip.1 unzip.1 unzipsfx.1 \
+		zipgrep.1 zipinfo.1 ${PREFIX}/man/man1
 	${INSTALL_DATA_DIR}  ${PREFIX}/share/doc/unzip
-	cd ${WRKSRC} && \
-		${INSTALL_DATA} README WHERE COPYING ${PREFIX}/share/doc/unzip
+	cd ${WRKSRC} && ${INSTALL_DATA} COPYING LICENSE README WHERE \
+		${PREFIX}/share/doc/unzip
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/unzip/files/md5 b/archivers/unzip/files/md5
index 5d14349dc23..5908a92cf58 100644
--- a/archivers/unzip/files/md5
+++ b/archivers/unzip/files/md5
@@ -1,4 +1,3 @@
-$NetBSD: md5,v 1.7 1998/12/30 04:06:35 tv Exp $
+$NetBSD: md5,v 1.8 2000/04/20 03:13:55 wiz Exp $
 
-MD5 (unzip540.tar.gz) = 062a9a8ad80f0bf8a307063958f1de2a
-MD5 (zcrypt28.zip) = 87ece6fe69c8cb71eec0e1a945542f37
+MD5 (unzip541.tar.gz) = d5fb7ca068da949765abb8c6bc71666e
diff --git a/archivers/unzip/pkg/PLIST b/archivers/unzip/pkg/PLIST
index 91f2ecb9265..c55d0e92839 100644
--- a/archivers/unzip/pkg/PLIST
+++ b/archivers/unzip/pkg/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 1998/06/20 23:26:06 tv Exp $
-bin/unzip
+@comment $NetBSD: PLIST,v 1.7 2000/04/20 03:13:55 wiz Exp $
 bin/funzip
+bin/unzip
 bin/unzipsfx
 bin/zipgrep
 bin/zipinfo
@@ -9,7 +9,8 @@ man/man1/unzip.1
 man/man1/unzipsfx.1
 man/man1/zipgrep.1
 man/man1/zipinfo.1
-share/doc/unzip/README
 share/doc/unzip/COPYING
+share/doc/unzip/LICENSE
+share/doc/unzip/README
 share/doc/unzip/WHERE
 @dirrm share/doc/unzip