Fix build on Darwin. All changes are taken from the latest betas of zip.

- Add MacOS X to version_local()
- unix/configure: Init LFLAGS1 to "", MacOS X doesn't like -s
- rename errors array to ziperrors to avoid MacOS X library clash

9 files changed, 112 insertions, 4 deletions

diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index de94af09900..082fd6db171 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2001/11/29 01:12:25 hubertf Exp $
+# $NetBSD: Makefile,v 1.27 2002/04/18 16:42:30 yyamano Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/04/27 16:06:15 ache Exp 
 #
 
 DISTNAME=	zip-2.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://ftp.info-zip.org/pub/infozip/src/ \
 		ftp://ftp.icce.rug.nl/infozip/src/
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	unzip-[0-9]*:../../archivers/unzip
 
 EXTRACT_ONLY=	zip23.tar.gz
 MAKEFILE=	unix/Makefile
-MAKE_FLAGS=	LOCAL_ZIP="${CFLAGS}"
+MAKE_FLAGS=	LOCAL_ZIP="${CFLAGS}" LFLAGS1="${_STRIPFLAG_CC}"
 ALL_TARGET=	generic
 
 USE_BUILDLINK_ONLY=	# defined
diff --git a/archivers/zip/distinfo b/archivers/zip/distinfo
index d25b80d5dc1..4a5122b95b3 100644
--- a/archivers/zip/distinfo
+++ b/archivers/zip/distinfo
@@ -1,6 +1,13 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 11:21:11 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/04/18 16:42:30 yyamano Exp $
 
 SHA1 (zip23.tar.gz) = 0600c93218e6acf1be75dd79da4244eabc8e16cf
 Size (zip23.tar.gz) = 723283 bytes
 SHA1 (zcrypt29.zip) = 04223ea88ba3cf5d0f8d6a5fc9c1a4cd8c568f56
 Size (zcrypt29.zip) = 20248 bytes
+SHA1 (patch-aa) = c667d263bbc87e3f3daf7c80f68b915ac2706c9c
+SHA1 (patch-ab) = 10f7bd6df4c455049c93d21dc2a1b9003eff8349
+SHA1 (patch-ac) = 7454650d1c9252a7062c9d9225cd47064dc167b5
+SHA1 (patch-ad) = 3204a7769d0ba73b0eae5de3292e30bf23f485d3
+SHA1 (patch-ae) = 7cb6cddb875af63dac6cfd9fe03b785f55f442ff
+SHA1 (patch-af) = 0c52e3619b304993ae190112e99b58235c283d0e
+SHA1 (patch-ag) = 2249ed52aa9c1f2bad5ef284247a031264b90f78
diff --git a/archivers/zip/patches/patch-aa b/archivers/zip/patches/patch-aa
new file mode 100644
index 00000000000..515710c4000
--- /dev/null
+++ b/archivers/zip/patches/patch-aa
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..93247052c21
--- /dev/null
+++ b/archivers/zip/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1 2002/04/18 16:42:31 yyamano Exp $
+
+--- unix/unix.c.orig	Sat Mar  2 20:12:55 2002
++++ unix/unix.c
+@@ -698,7 +698,11 @@
+ #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
new file mode 100644
index 00000000000..41731ba8e13
--- /dev/null
+++ b/archivers/zip/patches/patch-ac
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..1dde9a14791
--- /dev/null
+++ b/archivers/zip/patches/patch-ad
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..d01f269f494
--- /dev/null
+++ b/archivers/zip/patches/patch-ae
@@ -0,0 +1,20 @@
+$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
new file mode 100644
index 00000000000..f9d3cb8b64b
--- /dev/null
+++ b/archivers/zip/patches/patch-af
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..23ef6a5e5fe
--- /dev/null
+++ b/archivers/zip/patches/patch-ag
@@ -0,0 +1,13 @@
+$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);