diff options
| author | grant <grant@pkgsrc.org> | 2005-10-18 04:48:51 +0000 |
|---|---|---|
| committer | grant <grant@pkgsrc.org> | 2005-10-18 04:48:51 +0000 |
| commit | 938e7f98432d5a8b0e4067e172aed628f7f620bc (patch) | |
| tree | 0bcf489bce0ea0b1b681637e6554ed2e95826b7e /net | |
| parent | f796168323f340471f6e1f0bd834405ffd5275fd (diff) | |
| download | pkgsrc-938e7f98432d5a8b0e4067e172aed628f7f620bc.tar.gz | |
fix a couple of broken #ifdefs, making this build on Solaris.
Diffstat (limited to 'net')
| -rw-r--r-- | net/net-snmp/distinfo | 4 | ||||
| -rw-r--r-- | net/net-snmp/patches/patch-al | 24 |
2 files changed, 10 insertions, 18 deletions
diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo index a01b42e0470..e3aaf5ae971 100644 --- a/net/net-snmp/distinfo +++ b/net/net-snmp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2005/07/31 02:30:18 rtr Exp $ +$NetBSD: distinfo,v 1.18 2005/10/18 04:48:51 grant Exp $ SHA1 (net-snmp-5.2.1.2.tar.gz) = e93a76e081df0bfb5aa126dbad5f182176f9579e RMD160 (net-snmp-5.2.1.2.tar.gz) = 30abfbde24caa7d04990bd111822b98b012f4a0c @@ -13,6 +13,6 @@ SHA1 (patch-ag) = 12455e8adc88b1c6b1b14ca1513c4753ead0e932 SHA1 (patch-ai) = 8255b8ebfea1242076c87f879169d5f24b0f83e1 SHA1 (patch-aj) = 495d2c2b409c5957a9baaa29ecd699a4d6946332 SHA1 (patch-ak) = f0ad557de72a3c63f91911cd81e1dc01824a1d29 -SHA1 (patch-al) = 8e4a11f7d2dcd437565e45ba7552eaf0543c34e5 +SHA1 (patch-al) = 9eb788cd5a55823fad125744c91a6dd0bd70d5b3 SHA1 (patch-am) = e4affa1c4c2365496d5a3b44e63d5c75c2e32f34 SHA1 (patch-an) = 76c8996667b95bbdc0ccbe4a257d614e638c66fa diff --git a/net/net-snmp/patches/patch-al b/net/net-snmp/patches/patch-al index 23a8a46cd53..a523e0acb9b 100644 --- a/net/net-snmp/patches/patch-al +++ b/net/net-snmp/patches/patch-al @@ -1,7 +1,8 @@ -$NetBSD: patch-al,v 1.2 2005/08/01 11:56:54 wiz Exp $ ---- agent/mibgroup/host/hr_network.c.orig 2005-07-30 19:20:48.000000000 +1000 -+++ agent/mibgroup/host/hr_network.c 2005-07-30 19:21:25.000000000 +1000 -@@ -189,6 +189,10 @@ +$NetBSD: patch-al,v 1.3 2005/10/18 04:48:52 grant Exp $ + +--- agent/mibgroup/host/hr_network.c.orig 2004-01-30 00:54:01.000000000 +1100 ++++ agent/mibgroup/host/hr_network.c +@@ -189,6 +189,10 @@ static short HRN_index; static char HRN_name[MAX_PHYSADDR_LEN]; static nmapi_phystat HRN_ifnet; #define M_Interface_Scan_Next(a, b, c, d) Interface_Scan_Next(a, b, c) @@ -12,25 +13,16 @@ $NetBSD: patch-al,v 1.2 2005/08/01 11:56:54 wiz Exp $ #else /* hpux11 */ static char HRN_name[16]; static struct ifnet HRN_ifnet; -@@ -207,7 +211,7 @@ - void - Init_HR_Network(void) - { --#ifndef solaris2 -+#ifndef solaris2 && - Interface_Scan_Init(); - #endif - } -@@ -215,7 +219,7 @@ +@@ -215,7 +219,7 @@ Init_HR_Network(void) int Get_Next_HR_Network(void) { -#ifndef solaris2 -+#if !(defined solaris2 && defined darwin) ++#if (!defined solaris2 && !defined darwin) if (M_Interface_Scan_Next(&HRN_index, HRN_name, &HRN_ifnet, NULL)) return (HRDEV_NETWORK << HRDEV_TYPE_SHIFT) + HRN_index; else -@@ -231,7 +235,11 @@ +@@ -231,7 +235,11 @@ Save_HR_Network_Info(void) HRN_savedFlags = HRN_ifnet.if_entry.ifOper; HRN_savedErrors = HRN_ifnet.if_entry.ifInErrors + HRN_ifnet.if_entry.ifOutErrors; |