Bug 16730

- Update to version 2.3

Fix: 

Sent by Japanese ProntoMail--gVtEOKI87kgfjha3YNM0b1khcNJ7wCkkd6TLVL8FOBZJdM26
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

diff -urN /usr/ports/archivers/zip/Makefile archivers/zip/Makefile
--- /usr/ports/archivers/zip/Makefile	Tue Aug 31 19:12:37 1999
+++ archivers/zip/Makefile	Tue Feb 15 22:31:50 2000
@@ -1,30 +1,29 @@
-# New ports collection makefile for:    zip (without encryption)
-# Version required:     2.2
-# Date created:         22 Dec 1994
-# Whom:                 ache
+# New ports collection makefile for:	zip (without encryption)
+# Version required:	2.3
+# Date created:		22 Dec 1994
+# Whom:			ache
 #
 # $FreeBSD: ports/archivers/zip/Makefile,v 1.16 1999/08/31 06:40:23 mharo Exp $
 #
 
-DISTNAME=       zip22
-PKGNAME=        zip-2.2
+DISTNAME=	zip23
+PKGNAME=	zip-2.3
 CATEGORIES=	archivers
-MASTER_SITES=   ftp://ftp.cdrom.com/pub/infozip/src/
+MASTER_SITES=	ftp://ftp.cdrom.com/pub/infozip/src/
 
-MAINTAINER=     ache@FreeBSD.org
+MAINTAINER=	ache@FreeBSD.org
 
 Y2K=		http://www.cdrom.com/pub/infozip/FAQ.html#Y2K
 
-WRKSRC=         ${WRKDIR}/zip-2.2
-MAKEFILE=       unix/Makefile
-MAKE_FLAGS=     LOCAL_ZIP="${CFLAGS}" -f
-ALL_TARGET=     generic
-MAN1=           zip.1
+WRKSRC=		${WRKDIR}/zip-2.3
+MAKEFILE=	unix/Makefile
+ALL_TARGET=	generic
+MAN1=		zip.1
 
 do-install:
-	cd ${WRKSRC} && \
-	    ${INSTALL_PROGRAM} zip zipnote zipsplit zipcloak ${PREFIX}/bin
-	cd ${WRKSRC}/man && \
-	    ${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1
+.for file in zip zipcloak zipnote zipsplit
+	${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin
+.endfor
+	${INSTALL_MAN} ${WRKSRC}/man/zip.1 ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff -urN /usr/ports/archivers/zip/files/md5 archivers/zip/files/md5
--- /usr/ports/archivers/zip/files/md5	Wed Nov 26 08:19:40 1997
+++ archivers/zip/files/md5	Tue Feb 15 21:37:32 2000
@@ -1 +1 @@
-MD5 (zip22.tar.gz) = abfa0cfa13a4813aea02b0414a99ad37
+MD5 (zip23.tar.gz) = 5206a99541f3b0ab90f1baa167392c4f
diff -urN /usr/ports/archivers/zip/patches/patch-ab archivers/zip/patches/patch-ab
--- /usr/ports/archivers/zip/patches/patch-ab	Sun Jan 23 10:06:35 2000
+++ archivers/zip/patches/patch-ab	Tue Feb 15 21:43:46 2000
@@ -1,6 +1,6 @@
---- unix/Makefile.orig	Fri Oct 24 11:38:04 1997
-+++ unix/Makefile	Sat Jan 22 16:56:34 2000
-@@ -16,7 +16,7 @@
+--- unix/Makefile.orig	Mon Nov 29 14:22:42 1999
++++ unix/Makefile	Tue Feb 15 21:41:55 2000
+@@ -17,7 +17,7 @@
  LN = ln -s
  
  # (to use the Gnu compiler, change cc to gcc in CC)
@@ -9,3 +9,12 @@
  BIND = $(CC)
  AS = $(CC) -c
  E =
+@@ -45,7 +45,7 @@
+ #   CFLAGS    flags for C compile
+ #   LFLAGS1   flags after output file spec, before obj file list
+ #   LFLAGS2   flags after obj file list (libraries, etc)
+-CFLAGS = -O2 -I. -DUNIX $(LOCAL_ZIP)
++CFLAGS += -I. -DUNIX $(LOCAL_ZIP)
+ LFLAGS1 =
+ LFLAGS2 = -s
+ 
diff -urN /usr/ports/archivers/zip/pkg/DESCR archivers/zip/pkg/DESCR
--- /usr/ports/archivers/zip/pkg/DESCR	Wed Apr 14 19:26:12 1999
+++ archivers/zip/pkg/DESCR	Tue Feb 15 21:46:34 2000
@@ -3,4 +3,4 @@
 called unzip (of course) which you can also install from the ports/package
 system.
 
-WWW: http://infozip.cdrom.com/pub/infozip/
+WWW: http://www.cdrom.com/pub/infozip/Zip.html
diff -urN /usr/ports/archivers/zip/pkg/PLIST archivers/zip/pkg/PLIST
--- /usr/ports/archivers/zip/pkg/PLIST	Mon Aug 17 19:14:10 1998
+++ archivers/zip/pkg/PLIST	Tue Feb 15 22:32:00 2000
@@ -1,4 +1,4 @@
 bin/zip
+bin/zipcloak
 bin/zipnote
 bin/zipsplit
-bin/zipcloak