Disable the OS X hack for re_comp and friends on DragonFly, where it

breaks unistd.h. *sigh* Fix errno.

4 files changed, 51 insertions, 1 deletions

diff --git a/net/gopher/distinfo b/net/gopher/distinfo
index dc5f3514dc2..762d7ea95c7 100644
--- a/net/gopher/distinfo
+++ b/net/gopher/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/10/30 16:54:03 adrianp Exp $
+$NetBSD: distinfo,v 1.7 2006/03/22 21:22:09 joerg Exp $
 
 SHA1 (gopher_3.0.11.tar.gz) = 7f64d5fcfa8b92967f94276b1697fda127624f98
 RMD160 (gopher_3.0.11.tar.gz) = 197ee4263612901191e9c964a749586826e350c2
@@ -7,3 +7,6 @@ SHA1 (patch-aa) = 650c84593fb2c8b2fe7673f222f8409e3324f79d
 SHA1 (patch-ab) = 436aeab07e3c4d24e06fbe58b83182b330b7c0c4
 SHA1 (patch-ac) = 6fe32b527205649fb4d45618643ccd0815c55724
 SHA1 (patch-ad) = 84a286204f59828d1a70f8b7152b37b2d3ff5593
+SHA1 (patch-ae) = 56d3761699d455e73f8605e09cd1359fe11e4690
+SHA1 (patch-af) = 54b178e8099da5072b27cc82dc262fc78c4741f1
+SHA1 (patch-ag) = d1842e48272d401ae268cc3d54987210f3dfc845
diff --git a/net/gopher/patches/patch-ae b/net/gopher/patches/patch-ae
new file mode 100644
index 00000000000..842f3f5da11
--- /dev/null
+++ b/net/gopher/patches/patch-ae
@@ -0,0 +1,20 @@
+$NetBSD: patch-ae,v 1.1 2006/03/22 21:22:09 joerg Exp $
+
+--- object/Regex.h.orig	2006-03-22 19:30:38.000000000 +0000
++++ object/Regex.h
+@@ -171,6 +171,7 @@
+ #warning REGEX_POSIX defined but REG_EXTENDED not found.
+ #endif
+ 
++#if !defined(__DragonFly__)
+ /* These are named posix_re_comp and then #defined to the original names
+ because MacOS X is nice enough to typedef re_comp and re_exec differently
+ in unistd.h.  Eww. */
+@@ -179,6 +180,7 @@ char *posix_re_comp(char *regex);
+ int posix_re_exec(char *string);
+ #define re_comp(a) (posix_re_comp(a))
+ #define re_exec(a) (posix_re_exec(a))
++#endif
+ #else
+ 
+ /* ********** Try to figure out what else they have. */
diff --git a/net/gopher/patches/patch-af b/net/gopher/patches/patch-af
new file mode 100644
index 00000000000..360589678b8
--- /dev/null
+++ b/net/gopher/patches/patch-af
@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.1 2006/03/22 21:22:09 joerg Exp $
+
+--- gopher/globals.h.orig	2006-03-22 21:15:44.000000000 +0000
++++ gopher/globals.h
+@@ -156,10 +156,6 @@ EXTERN char *Gopenfile INIT(NULL);
+ EXTERN        GopherDirObj    *setlocale_LangDir INIT(NULL);
+ #endif
+ 
+-#ifndef VMS
+-extern int errno;
+-#endif
+-
+ /*** Externals ***/
+ 
+ #ifndef VMS
diff --git a/net/gopher/patches/patch-ag b/net/gopher/patches/patch-ag
new file mode 100644
index 00000000000..4defdfa76bb
--- /dev/null
+++ b/net/gopher/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1 2006/03/22 21:22:09 joerg Exp $
+
+--- gopher/gopher.c.orig	2006-03-22 21:17:00.000000000 +0000
++++ gopher/gopher.c
+@@ -1256,7 +1256,6 @@ extern int h_errno;
+ extern int sys_nerr;
+ extern char *sys_errlist[];
+ #endif
+-extern int  errno;
+ #endif
+ 
+ void check_sock(int sockfd, char *host, int port)