Don't define errno locally. Thread DragonFly like Linux and Darwin for

defines.

4 files changed, 36 insertions, 12 deletions

diff --git a/archivers/zip1/Makefile b/archivers/zip1/Makefile
index 0e5b2f777c6..9a3f98d6b35 100644
--- a/archivers/zip1/Makefile
+++ b/archivers/zip1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/05/24 13:24:52 rillig Exp $
+# $NetBSD: Makefile,v 1.35 2005/10/03 20:34:56 joerg Exp $
 #
 
 DISTNAME=	zip1-1.1
@@ -25,7 +25,7 @@ BUILD_TARGET=	zip zipcloak
 .include "../../mk/bsd.prefs.mk"
 
 MAKE_FLAGS+=	CFLAGS=${CFLAGS:Q}
-.if ${OPSYS} == "Linux" || ${OPSYS} == "Interix" || ${OPSYS} == "Darwin"
+.if ${OPSYS} == "Linux" || ${OPSYS} == "Interix" || ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly"
 CFLAGS+=	-DSYSV -DMODERN -DTERMIOS
 .else
 CFLAGS+=	-DDIRENT
diff --git a/archivers/zip1/distinfo b/archivers/zip1/distinfo
index b56cf772cb8..b889e0252d3 100644
--- a/archivers/zip1/distinfo
+++ b/archivers/zip1/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 14:45:28 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/10/03 20:34:56 joerg Exp $
 
 SHA1 (zip11.zip) = 71c84e82593d8ee3dd9189bf712524ceb93cc1bb
 RMD160 (zip11.zip) = 964753913220106757fcbb2d449efb4463a3275d
@@ -6,8 +6,9 @@ Size (zip11.zip) = 158736 bytes
 SHA1 (zcrypt10.zip) = e1638d3c5af1081789948518177c173df9f6e50f
 RMD160 (zcrypt10.zip) = 40b6910a7831cb5c8bb069deef8bd11b0fdf603e
 Size (zcrypt10.zip) = 14674 bytes
-SHA1 (patch-aa) = 6ea300fb79167d3d1f32cde9407ff967aac35894
+SHA1 (patch-aa) = 2fdbff4e159d58229d2f0841077a9ebae2a46031
 SHA1 (patch-ab) = d81a0b000e96bd0c09b7817e7572390aa173ef2c
 SHA1 (patch-ac) = 0d0301ee6aafb271e97c45eac44164c7430ab084
 SHA1 (patch-ad) = 63882bc4380af7b6f5277ba15a94b95f2dc68447
 SHA1 (patch-ae) = 2c3db9728a7dc5f88349eb077b24f69794415956
+SHA1 (patch-af) = ce00e3835e0dea4d4367db97c3f24f0b51f411b6
diff --git a/archivers/zip1/patches/patch-aa b/archivers/zip1/patches/patch-aa
index 953bcfc0304..c68f1ec1a92 100644
--- a/archivers/zip1/patches/patch-aa
+++ b/archivers/zip1/patches/patch-aa
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.3 2004/11/23 02:42:10 tv Exp $
+$NetBSD: patch-aa,v 1.4 2005/10/03 20:34:56 joerg Exp $
 
---- fileio.c.orig	Sat Aug 29 21:51:00 1992
+--- fileio.c.orig	1992-08-29 21:51:00.000000000 +0000
 +++ fileio.c
-@@ -59,16 +59,6 @@
+@@ -38,7 +38,6 @@
+ #    define MATCH dosmatch
+ #  endif /* ?OS2 */
+ #else /* !MSDOS */
+-   extern int errno;    /* error number from system functions */
+ #  ifdef VMS
+ #    define RMDIR
+ #    define link rename
+@@ -59,16 +58,6 @@
  #endif /* ?VMS */
  
  
@@ -19,7 +27,7 @@ $NetBSD: patch-aa,v 1.3 2004/11/23 02:42:10 tv Exp $
  #ifndef EXPORT
  #  ifdef MSVMS
  #    ifdef MSDOS
-@@ -77,7 +67,13 @@
+@@ -77,7 +66,13 @@
  #      define getch() getc(stderr)
  #    endif /* ?MSDOS */
  #  else /* !MSVMS */
@@ -34,7 +42,7 @@ $NetBSD: patch-aa,v 1.3 2004/11/23 02:42:10 tv Exp $
  #      ifdef CONVEX
  #        include <sys/termios.h>
  #        include <sgtty.h>
-@@ -99,11 +95,16 @@
+@@ -99,11 +94,16 @@
  #      define GTTY gtty
  #      define STTY stty
  #    endif /* ?TERMIO */
@@ -51,7 +59,7 @@ $NetBSD: patch-aa,v 1.3 2004/11/23 02:42:10 tv Exp $
  #  endif /* ?MSVMS */
  #endif /* !EXPORT */
  
-@@ -197,6 +198,9 @@
+@@ -197,6 +197,9 @@
  #endif /* !UTIL */
  
  
@@ -61,7 +69,7 @@ $NetBSD: patch-aa,v 1.3 2004/11/23 02:42:10 tv Exp $
  /* Library functions not in (most) header files */
  char *mktemp OF((char *));
  int link OF((char *, char *));
-@@ -207,6 +211,7 @@ int unlink OF((char *));
+@@ -207,6 +210,7 @@ int unlink OF((char *));
      * parameter is an unsigned long.
      */
  #endif /* !CONVEX */
@@ -69,7 +77,7 @@ $NetBSD: patch-aa,v 1.3 2004/11/23 02:42:10 tv Exp $
  
  
  #ifndef UTIL    /* the companion #endif is a bit of ways down ... */
-@@ -215,11 +220,15 @@ int unlink OF((char *));
+@@ -215,11 +219,15 @@ int unlink OF((char *));
     int utime OF((char *, time_t *));
  #endif /* !__TURBOC__ */
  #ifndef MSDOS
diff --git a/archivers/zip1/patches/patch-af b/archivers/zip1/patches/patch-af
new file mode 100644
index 00000000000..2d3b1927f20
--- /dev/null
+++ b/archivers/zip1/patches/patch-af
@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.1 2005/10/03 20:34:56 joerg Exp $
+
+--- implode.h.orig	2005-07-22 15:19:13.000000000 +0000
++++ implode.h
+@@ -98,10 +98,6 @@ struct  match
+  */
+ 
+ extern FDATA fd;                /* file data */
+-#ifndef MSDOS
+-extern int errno;               /* system error code */
+-#endif  /* MSDOS */
+-
+ extern MATCH *ma_buf;           /* match info buffer */
+ #define MA_BUFSIZE 512
+ /* MA_BUFSIZE must be such that