Fix build on NetBSD -current.

5 files changed, 72 insertions, 12 deletions

diff --git a/databases/gnats/distinfo b/databases/gnats/distinfo
index 1736f017bb6..248b8fe6119 100644
--- a/databases/gnats/distinfo
+++ b/databases/gnats/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.2 2003/06/29 12:54:58 seb Exp $
+$NetBSD: distinfo,v 1.3 2004/01/20 17:37:58 seb Exp $
 
 SHA1 (gnats-3.113.1.tar.gz) = ad4dbafae3e643c61dbcacb721a1e11a803c67aa
 Size (gnats-3.113.1.tar.gz) = 1120985 bytes
 SHA1 (patch-aa) = f9fda77cd1d7bd3fc320ce70c258ed199201cd6f
 SHA1 (patch-ab) = 2622209755ad5a23f59c816fc949df9260bd16bf
-SHA1 (patch-ac) = a31e14d97ff797ee1934612091e86da9aed60832
+SHA1 (patch-ac) = 350a1a408b6a50604978e085f7363be30d3d7c50
 SHA1 (patch-ad) = 84e99baec317293d902bc684ca49f290c4e1272a
+SHA1 (patch-ae) = 65bf94093274397e857a4138d48ff98cbd9be38a
+SHA1 (patch-af) = 5ef643f2f5d3c7b3f124afcb7a7ffe69ef748bb1
+SHA1 (patch-ag) = ae8f5cbd1b5bc71fb6c6a88992c66d3e9d21534a
diff --git a/databases/gnats/patches/patch-ac b/databases/gnats/patches/patch-ac
index c039c32d004..1e975196703 100644
--- a/databases/gnats/patches/patch-ac
+++ b/databases/gnats/patches/patch-ac
@@ -1,13 +1,16 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/10/11 11:42:26 martti Exp $
+$NetBSD: patch-ac,v 1.2 2004/01/20 17:37:58 seb Exp $
 
---- libiberty/strerror.c.orig	Thu Jun 28 10:32:06 2001
-+++ libiberty/strerror.c	Thu Jun 28 10:34:12 2001
-@@ -7,6 +7,8 @@
+--- libiberty/strerror.c.orig	1998-11-05 19:54:16.000000000 +0000
++++ libiberty/strerror.c
+@@ -462,8 +464,11 @@ static const char **sys_errlist;
  
- #include "config.h"
+ #else
+ 
++#include <sys/param.h>
++#ifndef __NetBSD__
+ extern int sys_nerr;
+ extern char *sys_errlist[];
++#endif
+ 
+ #endif
  
-+#undef NEED_sys_errlist
-+
- #ifndef NEED_sys_errlist
- /* Note that errno.h (not sure what OS) or stdio.h (BSD 4.4, at least)
-    might declare sys_errlist in a way that the compiler might consider
diff --git a/databases/gnats/patches/patch-ae b/databases/gnats/patches/patch-ae
new file mode 100644
index 00000000000..d7758807416
--- /dev/null
+++ b/databases/gnats/patches/patch-ae
@@ -0,0 +1,24 @@
+$NetBSD: patch-ae,v 1.1 2004/01/20 17:37:58 seb Exp $
+
+--- libiberty/functions.def.orig	1998-11-05 19:54:15.000000000 +0000
++++ libiberty/functions.def
+@@ -34,15 +34,15 @@ DEF(strncasecmp, int, (s1, s2, n), char 
+ DEF(strchr, char*, (s, c), CONST char *s AND int c)
+ DEF(strdup, char*, (s1), char * s1)
+ DEF(strrchr, char*, (s, c), CONST char *s AND int c)
+-DEF(strstr, char*, (), NOTHING)
++DEF(strstr, char*, (s1, s2), CONST char *s1 AND CONST char *s2)
+ DEF(strtod, double, (), NOTHING)
+ DEF(strtol, long, (), NOTHING)
+ DEF(strtoul, unsigned long, (), NOTHING)
+ DEF(tmpnam, char *, (s), char * s)
+ DEF(vfork, int, (), NOTHING)
+-DEF(vfprintf, int, (), NOTHING)
+-DEF(vprintf, int, (), NOTHING)
+-DEF(vsprintf, int, (), NOTHING)
++DEF(vfprintf, int, (s, f), PTR s AND CONST char *f)
++DEF(vprintf, int, (f), CONST char *f)
++DEF(vsprintf, int, (s, f), char *s AND CONST char *f)
+ DEF(sigsetmask, int, (), NOTHING)
+ DEF(alloca, PTR, (size), size_t size)
+ DEF(waitpid, int, (pid, statp, opts), int pid AND int* statp AND int opts )
diff --git a/databases/gnats/patches/patch-af b/databases/gnats/patches/patch-af
new file mode 100644
index 00000000000..e7a5da41946
--- /dev/null
+++ b/databases/gnats/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2004/01/20 17:37:58 seb Exp $
+
+--- libiberty/Makefile.in.orig	1998-11-05 19:54:14.000000000 +0000
++++ libiberty/Makefile.in
+@@ -236,7 +236,7 @@ needed2.awk: $(srcdir)/functions.def Mak
+ 	echo "# !Automatically generated from $(srcdir)/functions.def"\
+ 	  "- DO NOT EDIT!" >needed2.awk
+ 	grep '^DEFVAR(' < $(srcdir)/functions.def \
+-	 | sed -e '/DEFVAR/s|DEFVAR.\([^,]*\).*|/\1/ { printf "#ifndef NEED_\1\\n#define NEED_\1\\n#endif\\n" }|' \
++	 | sed -e '/DEFVAR/s|DEFVAR.\([^,]*\).*|/\1/ \&\& $$0 !~ /warning: reference to compatibility .*; include .* for correct reference/ { printf "#ifndef NEED_\1\\n#define NEED_\1\\n#endif\\n" }|' \
+ 	 >>needed2.awk
+ 	grep '^DEFFUNC(' < $(srcdir)/functions.def \
+ 	 | sed -e '/DEFFUNC/s|DEFFUNC.\([^,]*\).*|/\1/ { printf "#ifndef NEED_\1\\n#define NEED_\1\\n#endif\\n" }|' \
diff --git a/databases/gnats/patches/patch-ag b/databases/gnats/patches/patch-ag
new file mode 100644
index 00000000000..8b6fa463694
--- /dev/null
+++ b/databases/gnats/patches/patch-ag
@@ -0,0 +1,17 @@
+$NetBSD: patch-ag,v 1.1 2004/01/20 17:37:58 seb Exp $
+
+--- libiberty/strsignal.c.orig	1998-11-05 19:54:16.000000000 +0000
++++ libiberty/strsignal.c
+@@ -243,8 +243,12 @@ static const char **sys_siglist;
+ 
+ #else
+ 
++#include <sys/param.h>
++
++#ifndef __NetBSD__
+ static int sys_nsig = NSIG;
+ extern const char * const sys_siglist[];
++#endif
+ 
+ #endif
+