diff options
| -rw-r--r-- | archivers/zip/Makefile | 8 | ||||
| -rw-r--r-- | archivers/zip/distinfo | 9 | ||||
| -rw-r--r-- | archivers/zip/patches/patch-ah | 25 |
3 files changed, 8 insertions, 34 deletions
diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile index 244a4f465ac..6b402101b5a 100644 --- a/archivers/zip/Makefile +++ b/archivers/zip/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.53 2007/06/05 06:02:46 wiz Exp $ +# $NetBSD: Makefile,v 1.54 2009/08/26 22:33:15 wiz Exp $ -DISTNAME= zip232 -PKGNAME= zip-2.32 +DISTNAME= zip30 +PKGNAME= zip-3.0 CATEGORIES= archivers MASTER_SITES= ftp://ftp.info-zip.org/pub/infozip/src/ EXTRACT_SUFX= .tgz @@ -14,7 +14,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir MAKE_FILE= unix/Makefile -WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} .include "../../mk/bsd.prefs.mk" @@ -48,4 +47,5 @@ do-install: ${LN} -f -s zip.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/zipnote.1 ${LN} -f -s zip.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/zipsplit.1 +.include "../../archivers/bzip2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/archivers/zip/distinfo b/archivers/zip/distinfo index c3b026ca31d..04b0e292d0c 100644 --- a/archivers/zip/distinfo +++ b/archivers/zip/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.9 2007/06/05 06:02:46 wiz Exp $ +$NetBSD: distinfo,v 1.10 2009/08/26 22:33:15 wiz Exp $ -SHA1 (zip232.tgz) = 5bc562bf95d9aee0cb6625e6038898e1f191a4aa -RMD160 (zip232.tgz) = 6b9326c8a60bc6bf08825e416140fd0ca8a6a7f1 -Size (zip232.tgz) = 807180 bytes -SHA1 (patch-ah) = 1591f12b9b8593b7a51e0dde865c05f92fed61b0 +SHA1 (zip30.tgz) = c9f4099ecf2772b53c2dd4a8e508064ce015d182 +RMD160 (zip30.tgz) = 1fc99daf3e36494ba392c7514a714fe3d258d232 +Size (zip30.tgz) = 1118845 bytes diff --git a/archivers/zip/patches/patch-ah b/archivers/zip/patches/patch-ah deleted file mode 100644 index dd598f5352f..00000000000 --- a/archivers/zip/patches/patch-ah +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ah,v 1.2 2005/08/03 18:54:31 wiz Exp $ - ---- unix/Makefile.orig 2005-02-28 08:33:50.000000000 +0100 -+++ unix/Makefile -@@ -12,7 +12,6 @@ all: - - list: all - --MAKE = make -f unix/Makefile - SHELL = /bin/sh - LN = ln -s - -@@ -155,10 +154,10 @@ flags: unix/configure - # Generic targets: - - generic: flags -- eval $(MAKE) zips `cat flags` -+ eval $(MAKE) -f unix/Makefile zips `cat flags` - - generic_gcc: -- $(MAKE) generic CC=gcc CPP="gcc -E" -+ $(MAKE) -f unix/Makefile generic CC=gcc CPP="gcc -E" - - # AT&T 6300 PLUS (don't know yet how to allocate 64K bytes): - att6300nodir: |