[pkgsrc/trunk]: pkgsrc/net/net-snmp fix a couple of broken #ifdefs, making th...

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4239cde793a7
branches:  trunk
changeset: 501170:4239cde793a7
user:      grant <grant%pkgsrc.org@localhost>
date:      Tue Oct 18 04:48:51 2005 +0000

description:
fix a couple of broken #ifdefs, making this build on Solaris.

diffstat:

 net/net-snmp/distinfo         |   4 ++--
 net/net-snmp/patches/patch-al |  24 ++++++++----------------
 2 files changed, 10 insertions(+), 18 deletions(-)

diffs (62 lines):

diff -r 010c5478406f -r 4239cde793a7 net/net-snmp/distinfo
--- a/net/net-snmp/distinfo     Tue Oct 18 04:47:05 2005 +0000
+++ b/net/net-snmp/distinfo     Tue Oct 18 04:48:51 2005 +0000
@@ -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-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 -r 010c5478406f -r 4239cde793a7 net/net-snmp/patches/patch-al
--- a/net/net-snmp/patches/patch-al     Tue Oct 18 04:47:05 2005 +0000
+++ b/net/net-snmp/patches/patch-al     Tue Oct 18 04:48:51 2005 +0000
@@ -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 @@
  #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;