diff options
| author | tv <tv@pkgsrc.org> | 1998-12-30 04:06:35 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 1998-12-30 04:06:35 +0000 |
| commit | 4b21cf58fc31d4d62537338e3d0aa6a2cadc02fd (patch) | |
| tree | c4360cc0f64c6eaad6c8238d63af8fc7ec4be89c /archivers | |
| parent | 664c3f2678c5b22950c3fe5ab15fdf4a97eacc12 (diff) | |
| download | pkgsrc-4b21cf58fc31d4d62537338e3d0aa6a2cadc02fd.tar.gz | |
OK, bring it back to 5.40, but this time don't use libz -- use the
compression routines shipped with unzip.
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/unzip/Makefile | 15 | ||||
| -rw-r--r-- | archivers/unzip/files/md5 | 6 | ||||
| -rw-r--r-- | archivers/unzip/patches/patch-aa | 4 |
3 files changed, 12 insertions, 13 deletions
diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile index 209952fff61..4deab844a42 100644 --- a/archivers/unzip/Makefile +++ b/archivers/unzip/Makefile @@ -1,26 +1,25 @@ -# $NetBSD: Makefile,v 1.15 1998/12/30 03:20:50 tv Exp $ +# $NetBSD: Makefile,v 1.16 1998/12/30 04:06:35 tv Exp $ # FreeBSD Id: Makefile,v 1.14 1997/06/19 05:30:04 ache Exp # -DISTNAME= unzip-5.32 +DISTNAME= unzip-5.40 CATEGORIES= archivers MASTER_SITES= ftp://ftp.cdrom.com/pub/infozip/src/ \ ftp://ftp.icce.rug.nl/infozip/src/ -DISTFILES= unzip532.tar.gz +DISTFILES= unzip540.tar.gz MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.cdrom.com/pub/infozip/ MAKEFILE= unix/Makefile ALL_TARGET= unzips -MAKE_FLAGS= CF="${CFLAGS} -I. -DBSD -Dunix -DUSE_UNSHRINK -DUSE_ZLIB" \ - LF2=-lz +MAKE_FLAGS= CF="${CFLAGS} -I. -DBSD -DUNIX -Dunix -DUSE_UNSHRINK" .include "../../mk/bsd.prefs.mk" .if defined(ZIP_ENCRYPTION) -DISTFILES+= zcrypt27.zip -EXTRACT_ONLY= unzip532.tar.gz +DISTFILES+= zcrypt28.zip +EXTRACT_ONLY= unzip540.tar.gz RESTRICTED= crypto MIRROR_DISTFILE=no @@ -29,7 +28,7 @@ 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}/zcrypt27.zip && \ + ./unzip -qo ${DISTDIR}/zcrypt28.zip && \ ${RM} -f *.o unzip ) @${ECHO} '*** Building stage 2 of 2--unzip with encryption.' .endif diff --git a/archivers/unzip/files/md5 b/archivers/unzip/files/md5 index 1951e25eb61..5d14349dc23 100644 --- a/archivers/unzip/files/md5 +++ b/archivers/unzip/files/md5 @@ -1,4 +1,4 @@ -$NetBSD: md5,v 1.6 1998/12/30 03:20:50 tv Exp $ +$NetBSD: md5,v 1.7 1998/12/30 04:06:35 tv Exp $ -MD5 (unzip532.tar.gz) = 0481e4c1792de60d9fd70fcb16e2eb9b -MD5 (zcrypt27.zip) = 705945343dae4c9344b3c3cf9b2c5ded +MD5 (unzip540.tar.gz) = 062a9a8ad80f0bf8a307063958f1de2a +MD5 (zcrypt28.zip) = 87ece6fe69c8cb71eec0e1a945542f37 diff --git a/archivers/unzip/patches/patch-aa b/archivers/unzip/patches/patch-aa index 5d065c54980..e190c7b6cce 100644 --- a/archivers/unzip/patches/patch-aa +++ b/archivers/unzip/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 1998/08/07 10:35:51 agc Exp $ +$NetBSD: patch-aa,v 1.3 1998/12/30 04:06:35 tv Exp $ --- unzip.h.orig Sat Oct 18 18:58:07 1997 +++ unzip.h Sat Jun 20 18:33:18 1998 @@ -8,13 +8,13 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 10:35:51 agc Exp $ /* used to remove arguments in function prototypes for non-ANSI C */ +#ifdef USE_ZLIB +#include <zconf.h> ++#endif +#ifndef OF #ifdef PROTO # define OF(a) a #else # define OF(a) () +#endif -+#endif #endif /* enable the "const" keyword only if MODERN and if not otherwise instructed */ |