5 files changed, 37 insertions, 78 deletions

diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index 8716674ab43f..ba7d2ced00bf 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -6,19 +6,21 @@
 #
 
 PORTNAME=	zip
-PORTVERSION=	2.32
+PORTVERSION=	3.0
 CATEGORIES=	archivers
-MASTER_SITES=	http://ftp.info-zip.org/pub/infozip/src/ ${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR=	tools/zip/info-zip/src
-DISTFILES=	zip232${EXTRACT_SUFX}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	infozip
+EXTRACT_SUFX=	.zip
+DISTFILES=	${PORTNAME}30${EXTRACT_SUFX}
+USE_ZIP=	yes
 
 MAINTAINER=	ache@FreeBSD.org
 COMMENT=	Create/update ZIP files compatible with pkzip
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}30
 MAKEFILE=	unix/Makefile
 ALL_TARGET=	generic
-MAN1=		zip.1
+MAN1=		zip.1 zipcloak.1 zipnote.1 zipsplit.1
 
 PLIST_FILES=	\
 	bin/zip \
@@ -29,7 +31,7 @@ PLIST_FILES=	\
 do-install:
 .for file in zip zipcloak zipnote zipsplit
 	${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/${file}.1 ${PREFIX}/man/man1
 .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 f046863168a2..05c2f6ad9fda 100644
--- a/archivers/zip/distinfo
+++ b/archivers/zip/distinfo
@@ -1,3 +1,3 @@
-MD5 (zip232.tar.gz) = 8a4da4460386e324debe97f3b7fe4d96
-SHA256 (zip232.tar.gz) = d0d3743f732a9baa162f80d0c4567b9c545b41a3385825042113810f2a56eb2f
-SIZE (zip232.tar.gz) = 807180
+MD5 (zip30.zip) = e88492c8abd68fa9cfba72bc08757dba
+SHA256 (zip30.zip) = 7061ceac0407682b6dc54bb480347205f680f4e56cf34fe1423df2309f18968a
+SIZE (zip30.zip) = 1287223
diff --git a/archivers/zip/files/patch-aa b/archivers/zip/files/patch-aa
index 310edfb271c4..adcc2c41e3cf 100644
--- a/archivers/zip/files/patch-aa
+++ b/archivers/zip/files/patch-aa
@@ -1,6 +1,22 @@
---- unix/configure.orig	Tue Apr 27 12:49:05 1999
-+++ unix/configure	Tue Jun 24 17:47:35 2003
-@@ -23,7 +23,6 @@
+--- unix/configure.orig	2008-06-19 23:32:20.000000000 +0400
++++ unix/configure	2008-08-03 06:35:03.000000000 +0400
+@@ -98,7 +98,6 @@
+ _EOF_
+       $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null
+       if test $? -eq 0; then
+-        CFLAGS_OPT='-O3'
+         echo "  GNU C ($CFLAGS_OPT)"
+         # Special Mac OS X shared library "ld" option?
+         if test ` uname -s 2> /dev/null ` = 'Darwin'; then
+@@ -110,7 +109,6 @@
+           rm -f conftest
+         fi
+       else
+-        CFLAGS_OPT='-O'
+         echo "  Other-unknown C ($CFLAGS_OPT)"
+       fi
+     fi
+@@ -224,7 +222,6 @@
  [ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P"
  [ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp
  [ -f /lib/cpp ] && CPP=/lib/cpp
@@ -8,7 +24,7 @@
  [ -f /xenix ] && CPP="${CC} -E"
  [ -f /lynx.os ] && CPP="${CC} -E"
  
-@@ -38,7 +37,7 @@
+@@ -244,7 +241,7 @@
      echo "int foo() { return 0;}" > conftest.c
      $CC -c conftest.c >/dev/null 2>/dev/null
      echo Check if compiler generates underlines
diff --git a/archivers/zip/files/patch-ab b/archivers/zip/files/patch-ab
index c5c89caf6fce..c466c97973f2 100644
--- a/archivers/zip/files/patch-ab
+++ b/archivers/zip/files/patch-ab
@@ -1,14 +1,14 @@
---- unix/Makefile.orig	Sun Apr 23 03:52:18 2006
-+++ unix/Makefile	Fri Jul  7 05:15:13 2006
-@@ -17,7 +17,6 @@
+--- unix/Makefile.orig	2008-05-07 02:33:56.000000000 +0400
++++ unix/Makefile	2008-08-03 06:36:20.000000000 +0400
+@@ -22,7 +22,6 @@
  LN = ln -s
  
- # (to use the Gnu compiler, change cc to gcc in CC)
+ # (to use the GNU compiler, change cc to gcc in CC)
 -CC = cc
  BIND = $(CC)
  AS = $(CC) -c
  CPP = /lib/cpp
-@@ -46,8 +45,7 @@
+@@ -57,8 +56,7 @@
  #   CFLAGS    flags for C compile
  #   LFLAGS1   flags after output file spec, before obj file list
  #   LFLAGS2   flags after obj file list (libraries, etc)
diff --git a/archivers/zip/files/patch-negfseek b/archivers/zip/files/patch-negfseek
deleted file mode 100644
index 32471538823b..000000000000
--- a/archivers/zip/files/patch-negfseek
+++ /dev/null
@@ -1,59 +0,0 @@
---- zipfile.c.orig	Sun Nov  7 13:30:11 1999
-+++ zipfile.c	Fri May 31 13:58:36 2002
-@@ -14,6 +14,10 @@
- #include "zip.h"
- #include "revision.h"
- 
-+#ifdef __FreeBSD__
-+#include <sys/param.h>
-+#endif
-+
- #ifdef VMS
- #  include <rms.h>
- #  include <starlet.h>
-@@ -628,6 +632,18 @@
- 
- #endif /* !UTIL */
- 
-+#ifdef __FreeBSD__
-+#if __FreeBSD_version < 500028
-+local off_t fsize(FILE *f) {
-+    struct stat s;
-+
-+    if (f == NULL) return 0;
-+    if (fstat(fileno(f), &s) < 0) return 0;
-+    return s.st_size;
-+}
-+#endif
-+#endif
-+
- /*
-  * scanzipf_reg starts searching for the End Signature at the end of the file
-  * The End Signature points to the Central Directory Signature which points
-@@ -667,7 +683,13 @@
-     t[1] = '\0';
-     t[2] = '\0';
-     t[3] = '\0';
--    if (fseek(f, -4096L, SEEK_END) == 0) {
-+    if (
-+#ifdef __FreeBSD__
-+#if __FreeBSD_version < 500028
-+	fsize(f) >= 4096L &&
-+#endif
-+#endif
-+	fseek(f, -4096L, SEEK_END) == 0) {
-       zipbeg = (ulg) (ftell(f) + 4096L);
-       while (!found && zipbeg >= 4096) {
-         zipbeg -= 4096L;
-@@ -678,6 +700,11 @@
-  * XXX error check ??
-  */
-         fread(buf, 1, 4096, f);
-+#ifdef __FreeBSD__
-+#if __FreeBSD_version < 500028
-+	if (ftell(f) >= 8192L)
-+#endif
-+#endif
-         fseek(f, -8192L, SEEK_CUR);
-         t = &buf[4095];
- /*