Index: head/archivers/zip/Makefile
===================================================================
--- head/archivers/zip/Makefile	(revision 148097)
+++ head/archivers/zip/Makefile	(revision 148098)
@@ -1,39 +1,30 @@
 # New ports collection makefile for:    zip
 # ftp://ftp.info-zip.org/pub/infozip/Info-ZIP.html
 # Date created:		22 Dec 1994
 # Whom:			ache
 #
 # $FreeBSD$
 #
 
 PORTNAME=	zip
-PORTVERSION=	2.3
-PORTREVISION=	2
+PORTVERSION=	2.31
 CATEGORIES=	archivers
-MASTER_SITES=	ftp://ftp.uu.net/pub/archiving/zip/src/ \
+MASTER_SITES=	http://ftp.info-zip.org/pub/infozip/src/ \
 		${MASTER_SITE_TEX_CTAN:S,%SUBDIR%,tools/zip/info-zip/src/,}
-DISTFILES=	zip23${EXTRACT_SUFX} ${ZCRYPT_SRC}
-EXTRACT_ONLY=	zip23${EXTRACT_SUFX}
+DISTFILES=	zip231${EXTRACT_SUFX}
 
 MAINTAINER=	ache@FreeBSD.org
 COMMENT=	Create/update ZIP files compatible with pkzip
 
-EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
-
-ZCRYPT_SRC=	zcrypt29-exportable.zip
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 MAKEFILE=	unix/Makefile
-MAKE_FLAGS=	LOCAL_ZIP="-DUSE_CRYPT" -f
 ALL_TARGET=	generic
 MAN1=		zip.1
-
-post-extract:
-	unzip -q -aa -o ${_DISTDIR}${ZCRYPT_SRC} -d ${WRKSRC} -x WHERE
 
 do-install:
 .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>

Property changes on: head/archivers/zip/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.30
\ No newline at end of property
+1.31
\ No newline at end of property
Index: head/archivers/zip/distinfo
===================================================================
--- head/archivers/zip/distinfo	(revision 148097)
+++ head/archivers/zip/distinfo	(revision 148098)
@@ -1,4 +1,3 @@
-MD5 (zip23.tar.gz) = 5206a99541f3b0ab90f1baa167392c4f
-SIZE (zip23.tar.gz) = 723283
-MD5 (zcrypt29-exportable.zip) = 0c969ba1661183b041a142945ed2710e
-SIZE (zcrypt29-exportable.zip) = 20248
+MD5 (zip231.tar.gz) = 6bfc076664416251d7624ab3538d1cb9
+SHA256 (zip231.tar.gz) = 2d21c0ed60346bcaa47ff0c3369219602dca1733b83ec503e9e8108dc119f719
+SIZE (zip231.tar.gz) = 781641

Property changes on: head/archivers/zip/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property
Index: head/archivers/zip/files/patch-over
===================================================================
--- head/archivers/zip/files/patch-over	(revision 148097)
+++ head/archivers/zip/files/patch-over	(nonexistent)
@@ -1,25 +0,0 @@
---- zip-2.3/unix/unix.c.orig    2004-11-05 15:44:41.000000000 -0500
-+++ unix/unix.c 2004-11-05 15:50:28.000000000 -0500
-@@ -319,8 +319,8 @@ iztimes *t;             /* return value:
-    a file size of -1 */
- {
-   struct stat s;        /* results of stat() */
--  char name[FNMAX];
--  int len = strlen(f);
-+  char *name;
-+  size_t len = strlen(f);
- 
-   if (f == label) {
-     if (a != NULL)
-@@ -331,6 +331,11 @@ iztimes *t;             /* return value:
-       t->atime = t->mtime = t->ctime = label_utim;
-     return label_time;
-   }
-+
-+  name = malloc(len+1);
-+  if (!name)
-+    return 0;
-+
-   strcpy(name, f);
-   if (name[len - 1] == '/')
-     name[len - 1] = '\0';

Property changes on: head/archivers/zip/files/patch-over
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property