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

7 files changed, 101 insertions, 0 deletions

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);