Update to 2.31:

New things in Zip 2.31

- Crypt now part of source distribution (see Readme.cr)
- Bug fixes:
  - Debian patch 001 - Converted quoted strings
  - Debian patch 002 - Makefile changes
  - Debian patch 003 - Build changes
  - Debian patch 004 - Changes to unix/configure
  - Debian patch 005 - Fix for FNMAX path bug
- Split VMS -V into -V and -VV (see Manual)
- New VC6 project files thanks to Cosmin
- AtheOS port (thanks to Ruslan Nickolaev)
- Add api.c kluge for zip32.dll to support Visual Basic
- Binary detection changed from 20% binary to new algorithm
  that should better detect word processing files as binary
  and should accept UTF-8 files as text.  This flags the file
  in the archive as TEXT or BINARY for use by UnZip for line
  end conversion (see proginfo/txtvsbin.txt)
- License update
- DJGPP fixes
- Many Makefile updates
- Fixes to ZipSplit, ZipNotes, and ZipCloak

11 files changed, 20 insertions, 156 deletions

diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index 68670511ffc..e107fedaede 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -1,22 +1,23 @@
-# $NetBSD: Makefile,v 1.44 2005/05/24 13:25:22 rillig Exp $
+# $NetBSD: Makefile,v 1.45 2005/08/03 18:54:31 wiz Exp $
 
-DISTNAME=	zip-2.3
-PKGREVISION=	3
+DISTNAME=	zip231
+PKGNAME=	zip-2.31
 CATEGORIES=	archivers
-MASTER_SITES=	ftp://ftp.info-zip.org/pub/infozip/src/
-DISTFILES=	zip23.tar.gz zcrypt29.zip
+MASTER_SITES=	ftp://ftp.info-zip.org/pub/infozip/src/ \
+		http://ftp.info-zip.org/pub/infozip/src/ \
+		http://sunsite.cnlab-switch.ch/ftp/mirror/infozip/src/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/infozip/src/ \
+		http://www.mirrorservice.org/sites/ftp.info-zip.org/pub/infozip/src/
 
 MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.info-zip.org/pub/infozip/Zip.html
 COMMENT=	Create/update ZIP files compatible with pkzip
 
-BUILD_DEPENDS=	unzip-[0-9]*:../../archivers/unzip
-
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-EXTRACT_ONLY=	zip23.tar.gz
 MAKEFILE=	unix/Makefile
 MAKE_FLAGS=	LOCAL_ZIP="${CFLAGS}" LFLAGS1="${_STRIPFLAG_CC}"
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -39,9 +40,6 @@ CFLAGS+=	-DHAVE_DIRENT_H
 
 INSTALLATION_DIRS=	bin man/man1
 
-post-extract:
-	@cd ${WRKSRC} && ${LOCALBASE}/bin/unzip -qo ${DISTDIR}/zcrypt29.zip
-
 do-install:
 	cd ${WRKSRC} && \
 	    ${INSTALL_PROGRAM} zip zipnote zipsplit zipcloak ${PREFIX}/bin
diff --git a/archivers/zip/PLIST b/archivers/zip/PLIST
index c0445337f37..83126b211e5 100644
--- a/archivers/zip/PLIST
+++ b/archivers/zip/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:24:48 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/08/03 18:54:31 wiz Exp $
 bin/zip
+bin/zipcloak
 bin/zipnote
 bin/zipsplit
-bin/zipcloak
 man/man1/zip.1
-man/man1/zipnote.1
 man/man1/zipcloak.1
+man/man1/zipnote.1
 man/man1/zipsplit.1
diff --git a/archivers/zip/distinfo b/archivers/zip/distinfo
index 6b5103bdc47..77962284832 100644
--- a/archivers/zip/distinfo
+++ b/archivers/zip/distinfo
@@ -1,16 +1,6 @@
-$NetBSD: distinfo,v 1.6 2005/03/28 18:08:12 wiz Exp $
+$NetBSD: distinfo,v 1.7 2005/08/03 18:54:31 wiz Exp $
 
-SHA1 (zip23.tar.gz) = 0600c93218e6acf1be75dd79da4244eabc8e16cf
-RMD160 (zip23.tar.gz) = e84f0ec91807e7f213ba28bac51499b9995191b9
-Size (zip23.tar.gz) = 723283 bytes
-SHA1 (zcrypt29.zip) = 04223ea88ba3cf5d0f8d6a5fc9c1a4cd8c568f56
-RMD160 (zcrypt29.zip) = 701aa47d910b76c85a868b343912ebd2d849bdc3
-Size (zcrypt29.zip) = 20248 bytes
-SHA1 (patch-aa) = c667d263bbc87e3f3daf7c80f68b915ac2706c9c
-SHA1 (patch-ab) = ce481fbcf0d4c602e64251b0bc6a1c0dbc17578c
-SHA1 (patch-ac) = 7454650d1c9252a7062c9d9225cd47064dc167b5
-SHA1 (patch-ad) = 3204a7769d0ba73b0eae5de3292e30bf23f485d3
-SHA1 (patch-ae) = 7cb6cddb875af63dac6cfd9fe03b785f55f442ff
-SHA1 (patch-af) = 0c52e3619b304993ae190112e99b58235c283d0e
-SHA1 (patch-ag) = 2249ed52aa9c1f2bad5ef284247a031264b90f78
-SHA1 (patch-ah) = 99f2884b83747f1ed54a28b4284faa3be2e6b40f
+SHA1 (zip231.tar.gz) = 34ba126eb3344b0a35ee1a00fff9639994c7aba4
+RMD160 (zip231.tar.gz) = 4b58e5b4b00ce03ff47b967f4f4c32b205b67751
+Size (zip231.tar.gz) = 781641 bytes
+SHA1 (patch-ah) = 1591f12b9b8593b7a51e0dde865c05f92fed61b0
diff --git a/archivers/zip/patches/patch-aa b/archivers/zip/patches/patch-aa
deleted file mode 100644
index 515710c4000..00000000000
--- a/archivers/zip/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2002/04/18 16:42:31 yyamano Exp $
-
---- unix/configure.orig	Sat Mar  2 19:33:13 2002
-+++ unix/configure
-@@ -13,7 +13,7 @@
- 
- CC=${1-cc}
- CFLAGS=${2-"-O2 -I. -DUNIX"}
--LFLAGS1="-s"
-+LFLAGS1=""
- LN="ln -s"
- 
- echo Check for the C preprocessor
diff --git a/archivers/zip/patches/patch-ab b/archivers/zip/patches/patch-ab
deleted file mode 100644
index 2adc8e0e178..00000000000
--- a/archivers/zip/patches/patch-ab
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/12/17 22:41:15 wiz Exp $
-
---- unix/unix.c.orig	1999-11-07 15:08:21.000000000 +0100
-+++ unix/unix.c
-@@ -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';
-@@ -698,7 +703,11 @@ void version_local()
- #ifdef __QNXNTO__
-       " (QNX Neutrino)",
- #else
-+#ifdef __APPLE__
-+      " (Mac OS X)",
-+#else
-       "",
-+#endif /* Mac OS X */
- #endif /* QNX Neutrino */
- #endif /* QNX 4 */
- #endif /* Convex */
diff --git a/archivers/zip/patches/patch-ac b/archivers/zip/patches/patch-ac
deleted file mode 100644
index 41731ba8e13..00000000000
--- a/archivers/zip/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2002/04/18 16:42:31 yyamano Exp $
-
---- zip.c.orig	Sat Mar  2 19:38:04 2002
-+++ zip.c
-@@ -248,7 +248,7 @@
-     if (PERR(c))
-       perror("zip I/O error");
-     fflush(mesg);
--    fprintf(stderr, "\nzip error: %s (%s)\n", errors[c-1], h);
-+    fprintf(stderr, "\nzip error: %s (%s)\n", ziperrors[c-1], h);
-   }
-   if (tempzip != NULL)
-   {
diff --git a/archivers/zip/patches/patch-ad b/archivers/zip/patches/patch-ad
deleted file mode 100644
index 1dde9a14791..00000000000
--- a/archivers/zip/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2002/04/18 16:42:31 yyamano Exp $
-
---- zipcloak.c.orig	Sat Mar  2 19:39:05 2002
-+++ zipcloak.c
-@@ -55,7 +55,7 @@
-     char *msg;              /* message about how it happened */
- {
-     if (PERR(code)) perror("zipcloak error");
--    fprintf(stderr, "zipcloak error: %s (%s)\n", errors[code-1], msg);
-+    fprintf(stderr, "zipcloak error: %s (%s)\n", ziperrors[code-1], msg);
-     if (tempzf != NULL) fclose(tempzf);
-     if (tempzip != NULL) {
-         destroy(tempzip);
diff --git a/archivers/zip/patches/patch-ae b/archivers/zip/patches/patch-ae
deleted file mode 100644
index d01f269f494..00000000000
--- a/archivers/zip/patches/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2002/04/18 16:42:31 yyamano Exp $
-
---- ziperr.h.orig	Sat Mar  2 19:39:27 2002
-+++ ziperr.h
-@@ -39,7 +39,7 @@
- 
- #ifdef GLOBALS
- /* Error messages for the ziperr() function in the zip programs */
--char *errors[ZE_MAXERR] = {
-+char *ziperrors[ZE_MAXERR] = {
- /*  1 */  "",
- /*  2 */  "Unexpected end of zip file",
- /*  3 */  "Zip file structure invalid",
-@@ -63,5 +63,5 @@
- #  endif
- };
- #else /* !GLOBALS */
--extern char *errors[ZE_MAXERR]; /* Error messages for ziperr() */
-+extern char *ziperrors[ZE_MAXERR]; /* Error messages for ziperr() */
- #endif /* ?GLOBALS */
diff --git a/archivers/zip/patches/patch-af b/archivers/zip/patches/patch-af
deleted file mode 100644
index f9d3cb8b64b..00000000000
--- a/archivers/zip/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2002/04/18 16:42:31 yyamano Exp $
-
---- zipnote.c.orig	Sat Mar  2 19:44:04 2002
-+++ zipnote.c
-@@ -59,7 +59,7 @@
- {
-   if (PERR(c))
-     perror("zipnote error");
--  fprintf(stderr, "zipnote error: %s (%s)\n", errors[c-1], h);
-+  fprintf(stderr, "zipnote error: %s (%s)\n", ziperrors[c-1], h);
-   if (tempzf != NULL)
-     fclose(tempzf);
-   if (tempzip != NULL)
diff --git a/archivers/zip/patches/patch-ag b/archivers/zip/patches/patch-ag
deleted file mode 100644
index 23ef6a5e5fe..00000000000
--- a/archivers/zip/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2002/04/18 16:42:31 yyamano Exp $
-
---- zipsplit.c.orig	Sat Mar  2 19:45:34 2002
-+++ zipsplit.c
-@@ -139,7 +139,7 @@
- {
-   if (PERR(c))
-     perror("zipsplit error");
--  fprintf(stderr, "zipsplit error: %s (%s)\n", errors[c-1], h);
-+  fprintf(stderr, "zipsplit error: %s (%s)\n", ziperrors[c-1], h);
-   if (indexmade)
-   {
-     strcpy(name, INDEX);
diff --git a/archivers/zip/patches/patch-ah b/archivers/zip/patches/patch-ah
index bcf62dfa438..dd598f5352f 100644
--- a/archivers/zip/patches/patch-ah
+++ b/archivers/zip/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.1 2005/03/28 18:08:12 wiz Exp $
+$NetBSD: patch-ah,v 1.2 2005/08/03 18:54:31 wiz Exp $
 
---- unix/Makefile.orig	1999-11-29 06:22:42.000000000 +0100
+--- unix/Makefile.orig	2005-02-28 08:33:50.000000000 +0100
 +++ unix/Makefile
 @@ -12,7 +12,6 @@ all:
  
@@ -10,7 +10,7 @@ $NetBSD: patch-ah,v 1.1 2005/03/28 18:08:12 wiz Exp $
  SHELL = /bin/sh
  LN = ln -s
  
-@@ -154,10 +153,10 @@ flags:  unix/configure
+@@ -155,10 +154,10 @@ flags:  unix/configure
  #               Generic targets:
  
  generic: flags