From 692c2a10d91a10668fa705c0ebd5cf5412aa0ecb Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Sat, 21 Oct 2000 20:10:18 +0000
Subject: Build with encryption support by default (since crypto code is freely
 exportable now), using latest crypto add-on sources. Update main distribution
 site and homepage. Remove CRYPTO line (not strong cryptography). Bump to
 2.3nb1.

---
 archivers/zip/Makefile  | 27 ++++++++++-----------------
 archivers/zip/files/md5 |  4 ++--
 2 files changed, 12 insertions(+), 19 deletions(-)

(limited to 'archivers/zip')

diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index 0bf45404259..2ea77593982 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -1,33 +1,26 @@
-# $NetBSD: Makefile,v 1.19 2000/09/09 19:40:17 fredb Exp $
+# $NetBSD: Makefile,v 1.20 2000/10/21 20:10:18 wiz Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/04/27 16:06:15 ache Exp 
 #
 
 DISTNAME=	zip-2.3
+PKGNAME=	${DISTNAME}nb1
 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=	zip23.tar.gz
+DISTFILES=	zip23.tar.gz zcrypt29.zip
+EXTRACT_ONLY=	zip23.tar.gz
+
+MAINTAINER=	wiz@netbsd.org
+HOMEPAGE=	http://www.info-zip.org/pub/infozip/Zip.html
 
-MAINTAINER=	wiz@danbala.tuwien.ac.at
-HOMEPAGE=	http://www.cdrom.com/pub/infozip/
+BUILD_DEPENDS=	unzip:../../archivers/unzip
 
 MAKEFILE=	unix/Makefile
 MAKE_FLAGS=	LOCAL_ZIP="${CFLAGS}"
 ALL_TARGET=	generic
 
-BUILD_DEFS+=	ZIP_ENCRYPTION
-
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(ZIP_ENCRYPTION)
-DISTFILES+=	zcrypt28.zip
-EXTRACT_ONLY=	zip23.tar.gz
-BUILD_DEPENDS=	unzip:../../archivers/unzip
-CRYPTO=		yes
-
 post-extract:
-	@cd ${WRKSRC} && unzip -qo ${DISTDIR}/zcrypt28.zip
-.endif
+	@cd ${WRKSRC} && unzip -qo ${DISTDIR}/zcrypt29.zip
 
 do-install:
 	cd ${WRKSRC} && \
diff --git a/archivers/zip/files/md5 b/archivers/zip/files/md5
index 499e5294a89..1e51add1559 100644
--- a/archivers/zip/files/md5
+++ b/archivers/zip/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.6 1999/12/20 17:58:43 wiz Exp $
+$NetBSD: md5,v 1.7 2000/10/21 20:10:19 wiz Exp $
 
 MD5 (zip23.tar.gz) = 5206a99541f3b0ab90f1baa167392c4f
-MD5 (zcrypt28.zip) = 87ece6fe69c8cb71eec0e1a945542f37
+MD5 (zcrypt29.zip) = 0c969ba1661183b041a142945ed2710e
-- 
cgit v1.2.3