[pkgsrc/trunk]: pkgsrc/net/net-snmp make net-snmp build on darwin 8.2.0.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/932f91c52581
branches:  trunk
changeset: 497584:932f91c52581
user:      rtr <rtr%pkgsrc.org@localhost>
date:      Sun Jul 31 02:30:17 2005 +0000

description:
make net-snmp build on darwin 8.2.0.
these patches shouldn't break netbsd.

diffstat:

 net/net-snmp/Makefile         |   4 ++--
 net/net-snmp/distinfo         |   8 ++++++--
 net/net-snmp/patches/patch-ag |  12 ++++++------
 3 files changed, 14 insertions(+), 10 deletions(-)

diffs (67 lines):

diff -r a537eb9dde97 -r 932f91c52581 net/net-snmp/Makefile
--- a/net/net-snmp/Makefile     Sun Jul 31 01:07:20 2005 +0000
+++ b/net/net-snmp/Makefile     Sun Jul 31 02:30:17 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/07/16 19:10:40 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2005/07/31 02:30:18 rtr Exp $
 
 DISTNAME=      net-snmp-5.2.1.2
 CATEGORIES=    net
@@ -39,7 +39,7 @@
 
 CONFIGURE_ARGS+=       --enable-shared
 # net-snmp doesn't do IPv6 on Solaris
-.if (defined(USE_INET6) && (${USE_INET6} == "YES")) && ${OPSYS} != "SunOS"
+.if (defined(USE_INET6) && (${USE_INET6} == "YES")) && ${OPSYS} != "SunOS" && ${OPSYS} != "Darwin"
 CONFIGURE_ARGS+=       --enable-ipv6
 PLIST_SUBST+=          IPV6H=
 .else
diff -r a537eb9dde97 -r 932f91c52581 net/net-snmp/distinfo
--- a/net/net-snmp/distinfo     Sun Jul 31 01:07:20 2005 +0000
+++ b/net/net-snmp/distinfo     Sun Jul 31 02:30:17 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2005/07/08 07:49:27 adam Exp $
+$NetBSD: distinfo,v 1.17 2005/07/31 02:30:18 rtr Exp $
 
 SHA1 (net-snmp-5.2.1.2.tar.gz) = e93a76e081df0bfb5aa126dbad5f182176f9579e
 RMD160 (net-snmp-5.2.1.2.tar.gz) = 30abfbde24caa7d04990bd111822b98b012f4a0c
@@ -9,6 +9,10 @@
 SHA1 (patch-ad) = 9703dc9451f3fa7a61bae9c8d13b916aa52c0a6b
 SHA1 (patch-ae) = 750412088b9ccd5fb50bd6e7fc049903f6113a39
 SHA1 (patch-af) = 09c60f20179f0cadf116aa31335e9ec4ef54c4c8
-SHA1 (patch-ag) = bdb76aecc3a301871c990db1440dc3d78f480bf4
+SHA1 (patch-ag) = 12455e8adc88b1c6b1b14ca1513c4753ead0e932
 SHA1 (patch-ai) = 8255b8ebfea1242076c87f879169d5f24b0f83e1
 SHA1 (patch-aj) = 495d2c2b409c5957a9baaa29ecd699a4d6946332
+SHA1 (patch-ak) = f0ad557de72a3c63f91911cd81e1dc01824a1d29
+SHA1 (patch-al) = 8e4a11f7d2dcd437565e45ba7552eaf0543c34e5
+SHA1 (patch-am) = e4affa1c4c2365496d5a3b44e63d5c75c2e32f34
+SHA1 (patch-an) = 76c8996667b95bbdc0ccbe4a257d614e638c66fa
diff -r a537eb9dde97 -r 932f91c52581 net/net-snmp/patches/patch-ag
--- a/net/net-snmp/patches/patch-ag     Sun Jul 31 01:07:20 2005 +0000
+++ b/net/net-snmp/patches/patch-ag     Sun Jul 31 02:30:17 2005 +0000
@@ -1,11 +1,10 @@
-$NetBSD: patch-ag,v 1.2 2004/08/13 11:28:50 adam Exp $
-
---- agent/mibgroup/host/hr_storage.c.orig      2004-06-18 18:39:14.000000000 +0000
-+++ agent/mibgroup/host/hr_storage.c
-@@ -164,6 +164,13 @@ extern int      fscount;
+--- agent/mibgroup/host/hr_storage.c.orig      2004-10-17 11:59:14.000000000 +1000
++++ agent/mibgroup/host/hr_storage.c   2005-07-30 19:04:20.000000000 +1000
+@@ -164,7 +164,14 @@
  #define HRFS_mount    f_mntonname
  #define HRFS_HAS_FRSIZE STRUCT_STATVFS_HAS_F_FRSIZE
  
+-#elif defined(HAVE_STATVFS)
 +#elif defined(HAVE_STATVFS) && defined(__NetBSD__)
 +
 +extern struct statvfs *HRFS_entry;
@@ -13,6 +12,7 @@
 +#define HRFS_statfs   statvfs
 +#define HRFS_mount    f_mntonname
 +
- #elif defined(HAVE_STATVFS)
++#elif defined(HAVE_STATVFS) && defined(STRUCT_STATVFS_HAS_MNT_DIR)
  
  extern struct mntent *HRFS_entry;
+ extern int      fscount;