Fix errno. Don't declare sys_nerr on FreeBSD and DragonFly.

8 files changed, 86 insertions, 4 deletions

diff --git a/security/netramet/distinfo b/security/netramet/distinfo
index 0747dbd53d3..b67998db097 100644
--- a/security/netramet/distinfo
+++ b/security/netramet/distinfo
@@ -1,8 +1,14 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 13:10:08 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/12/08 18:02:07 joerg Exp $
 
 SHA1 (NeTraMet44.tar.gz) = 7848d6aa81b29966127fc78afcd9375c60441a91
 RMD160 (NeTraMet44.tar.gz) = f10185263adedf4e8184741998482992a35098e1
 Size (NeTraMet44.tar.gz) = 634714 bytes
 SHA1 (patch-aa) = 5aa23af5263c719a53a453840646ddc3868d7461
 SHA1 (patch-ab) = 10fc930d9673556d7a856c70d3fdcb5be29f23fd
-SHA1 (patch-ac) = 28b5e94acbe3b0d35f05bc36f4008c4957a1c44b
+SHA1 (patch-ac) = dc61cc6db4cd5c7b0655c2003bcdea8e5ea745a8
+SHA1 (patch-ad) = 877610a172cbae7bc796f462a1f33b6a290d9c72
+SHA1 (patch-ae) = c20b2ca1d22330c71eee990d416ca01e7751ddac
+SHA1 (patch-af) = 426a678df83da70fc8c30a8955fca591d12d05c4
+SHA1 (patch-ag) = 84d37e1d61a915355816c24321d7b2ba0169b3e0
+SHA1 (patch-ah) = 9dc2a7095e4643076f56b3117d7ae733561334e3
+SHA1 (patch-ai) = 468f84420c3d49dc1503cbe5f279080b4546f2cc
diff --git a/security/netramet/patches/patch-ac b/security/netramet/patches/patch-ac
index 526303f4eef..32a86aa5643 100644
--- a/security/netramet/patches/patch-ac
+++ b/security/netramet/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1 2004/03/24 11:32:07 markd Exp $
+$NetBSD: patch-ac,v 1.2 2005/12/08 18:02:07 joerg Exp $
 
 --- src/bgp/types/types.h.orig	2004-03-24 23:07:49.000000000 +1200
 +++ src/bgp/types/types.h
@@ -6,7 +6,7 @@ $NetBSD: patch-ac,v 1.1 2004/03/24 11:32:07 markd Exp $
   * under UNIX
   */
  #define _sys_errlist    sys_errlist
-+#if !defined(NETBSD)
++#if !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__FreeBSD__)
  extern int sys_nerr;
 +#endif
  #if !defined(ALPHA) && !defined(IRIX) && !defined(NETBSD)
diff --git a/security/netramet/patches/patch-ad b/security/netramet/patches/patch-ad
new file mode 100644
index 00000000000..92c8da5299a
--- /dev/null
+++ b/security/netramet/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2005/12/08 18:02:07 joerg Exp $
+
+--- src/snmplib/snmpclnt.c.orig	2005-12-08 17:46:53.000000000 +0000
++++ src/snmplib/snmpclnt.c
+@@ -120,7 +120,6 @@ SOFTWARE.
+ extern char mc_buf[64];
+ #endif
+ 
+-extern int errno;
+ struct synch_state snmp_synch_state;
+ 
+ struct snmp_pdu *snmp_pdu_create(int command)
diff --git a/security/netramet/patches/patch-ae b/security/netramet/patches/patch-ae
new file mode 100644
index 00000000000..a58fdd5ed37
--- /dev/null
+++ b/security/netramet/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2005/12/08 18:02:07 joerg Exp $
+
+--- src/apps/snmptest.c.orig	2005-12-08 17:49:25.000000000 +0000
++++ src/apps/snmptest.c
+@@ -101,7 +101,6 @@ SOFTWARE.
+ #include "snmpapi.h"
+ #include "snmpclnt.h"
+ 
+-extern int  errno;
+ int command = GET_REQ_MSG;
+ int	snmp_dump_packet = 0;
+ 
diff --git a/security/netramet/patches/patch-af b/security/netramet/patches/patch-af
new file mode 100644
index 00000000000..a9f04dafae0
--- /dev/null
+++ b/security/netramet/patches/patch-af
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.1 2005/12/08 18:02:07 joerg Exp $
+
+--- src/bgp/integrat/readbgp.c.orig	2005-12-08 17:50:47.000000000 +0000
++++ src/bgp/integrat/readbgp.c
+@@ -119,7 +119,9 @@
+ #ifdef __unix__
+ #define min(a,b)    (((a) < (b)) ? (a) : (b))
+ #define _sys_errlist sys_errlist
++#if !defined(__DragonFly__) && !defined(__FreeBSD__)
+ int sys_nerr;
++#endif
+ #if !defined(ALPHA) && !defined(IRIX) && !defined(NETBSD)
+ extern const char *const sys_errlist[];
+ #endif
diff --git a/security/netramet/patches/patch-ag b/security/netramet/patches/patch-ag
new file mode 100644
index 00000000000..5c4b596ca2c
--- /dev/null
+++ b/security/netramet/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2005/12/08 18:02:07 joerg Exp $
+
+--- src/manager/nmc.h.orig	2005-12-08 17:54:12.000000000 +0000
++++ src/manager/nmc.h
+@@ -120,8 +120,6 @@
+ #define MXCIROWS 20
+ #define MXMIROWS 10
+ 
+-extern int errno;
+-
+ EXTERN int snmp_dump_packet INIT(0);
+ 
+ EXTERN int verbose, testing, listrules, standard, utc_time;
diff --git a/security/netramet/patches/patch-ah b/security/netramet/patches/patch-ah
new file mode 100644
index 00000000000..6f4a62ec5b1
--- /dev/null
+++ b/security/netramet/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2005/12/08 18:02:07 joerg Exp $
+
+--- src/manager/fd_data.h.orig	2005-12-08 17:55:38.000000000 +0000
++++ src/manager/fd_data.h
+@@ -89,8 +89,6 @@
+ #define INIT(v)  = v
+ #endif
+ 
+-extern int errno;
+-
+ EXTERN int snmp_dump_packet INIT(0);
+ 
+ EXTERN int verbose, testing, listrules, listformat, quiet;
diff --git a/security/netramet/patches/patch-ai b/security/netramet/patches/patch-ai
new file mode 100644
index 00000000000..f5e2b41d980
--- /dev/null
+++ b/security/netramet/patches/patch-ai
@@ -0,0 +1,12 @@
+$NetBSD: patch-ai,v 1.1 2005/12/08 18:02:07 joerg Exp $
+
+--- src/meter/meter_ux.c.orig	2005-12-08 17:57:11.000000000 +0000
++++ src/meter/meter_ux.c
+@@ -2327,7 +2327,6 @@ void show_meter_time()
+    display_msg(0,msg);
+    }
+ 
+-extern int errno;
+ int snmp_dump_packet = 0;
+ #define MXINTERFACES 4
+