From 975b2cbac2b6feca75d11ca4756e12400db8ea5e Mon Sep 17 00:00:00 2001
From: ache <ache@FreeBSD.org>
Date: Sat, 19 Feb 2000 03:27:44 +0000
Subject: upgrade to 2.3

PR:		16730
Submitted by:	"KATO Tsuguru" <tkato@prontomail.ne.jp>
---
 archivers/zip/Makefile       | 33 ++++++++++++++++-----------------
 archivers/zip/distinfo       |  2 +-
 archivers/zip/files/patch-ab | 15 ++++++++++++---
 archivers/zip/pkg-descr      |  2 +-
 archivers/zip/pkg-plist      |  2 +-
 5 files changed, 31 insertions(+), 23 deletions(-)

(limited to 'archivers/zip')

diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index 4322ad058bb..5f82325d2f2 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -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$
 #
 
-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 --git a/archivers/zip/distinfo b/archivers/zip/distinfo
index 0e772b01708..464bc7b760e 100644
--- a/archivers/zip/distinfo
+++ b/archivers/zip/distinfo
@@ -1 +1 @@
-MD5 (zip22.tar.gz) = abfa0cfa13a4813aea02b0414a99ad37
+MD5 (zip23.tar.gz) = 5206a99541f3b0ab90f1baa167392c4f
diff --git a/archivers/zip/files/patch-ab b/archivers/zip/files/patch-ab
index 1002aa1d9b8..a0d1602d7cd 100644
--- a/archivers/zip/files/patch-ab
+++ b/archivers/zip/files/patch-ab
@@ -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 --git a/archivers/zip/pkg-descr b/archivers/zip/pkg-descr
index 155ab6a0028..38ac9ad56df 100644
--- a/archivers/zip/pkg-descr
+++ b/archivers/zip/pkg-descr
@@ -3,4 +3,4 @@ PKZIP 2.04g (Phil Katz ZIP) for MSDOS systems.  There is a companion to zip
 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 --git a/archivers/zip/pkg-plist b/archivers/zip/pkg-plist
index 2cad6c957e8..104333e1b1e 100644
--- a/archivers/zip/pkg-plist
+++ b/archivers/zip/pkg-plist
@@ -1,4 +1,4 @@
 bin/zip
+bin/zipcloak
 bin/zipnote
 bin/zipsplit
-bin/zipcloak
-- 
cgit