[pkgsrc/trunk]: pkgsrc/net/net-snmp DiskIO fix, courtesy of Jan Andres

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/abc65ea0f32b
branches:  trunk
changeset: 517488:abc65ea0f32b
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri Aug 11 20:40:36 2006 +0000

description:
DiskIO fix, courtesy of Jan Andres

diffstat:

 net/net-snmp/distinfo         |   4 ++--
 net/net-snmp/patches/patch-ab |  12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diffs (43 lines):

diff -r d6bd776b2d5c -r abc65ea0f32b net/net-snmp/distinfo
--- a/net/net-snmp/distinfo     Fri Aug 11 18:07:33 2006 +0000
+++ b/net/net-snmp/distinfo     Fri Aug 11 20:40:36 2006 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.26 2006/07/30 06:38:10 adam Exp $
+$NetBSD: distinfo,v 1.27 2006/08/11 20:40:36 adam Exp $
 
 SHA1 (net-snmp-5.3.1.tar.gz) = 8ddb5122769814f04a7d3d352dcc640df7c89d41
 RMD160 (net-snmp-5.3.1.tar.gz) = 7bcdd213fb2517d0927b030deab5146522b58b3d
 Size (net-snmp-5.3.1.tar.gz) = 4210843 bytes
 SHA1 (patch-aa) = 30a4d1546fe7022a0578d01004fc3f284e45c392
-SHA1 (patch-ab) = cdc455989f9d7abb6cad9256a42e2008b6c0f2ee
+SHA1 (patch-ab) = 3227eeb8b54b37813d8b6949f8c6ddc446038bf2
 SHA1 (patch-ae) = 750412088b9ccd5fb50bd6e7fc049903f6113a39
 SHA1 (patch-af) = d2a38e024bd5da572fc898674907eef8f84d4f43
 SHA1 (patch-ag) = c6c355a48c28ae43ee96bff5d5b4b0f1fa9d69b8
diff -r d6bd776b2d5c -r abc65ea0f32b net/net-snmp/patches/patch-ab
--- a/net/net-snmp/patches/patch-ab     Fri Aug 11 18:07:33 2006 +0000
+++ b/net/net-snmp/patches/patch-ab     Fri Aug 11 20:40:36 2006 +0000
@@ -1,15 +1,19 @@
-$NetBSD: patch-ab,v 1.8 2006/06/19 13:46:02 christos Exp $
+$NetBSD: patch-ab,v 1.9 2006/08/11 20:40:36 adam Exp $
 
---- agent/mibgroup/ucd-snmp/diskio.c.orig      2005-12-04 09:25:54.000000000 -0500
-+++ agent/mibgroup/ucd-snmp/diskio.c   2006-06-19 09:44:25.000000000 -0400
-@@ -419,6 +419,151 @@
+--- agent/mibgroup/ucd-snmp/diskio.c.orig      2006-08-11 22:32:57.000000000 +0200
++++ agent/mibgroup/ucd-snmp/diskio.c
+@@ -419,6 +419,155 @@ var_diskio(struct variable * vp,
  }
  #endif                          /* bsdi */
  
 +#ifdef __NetBSD__
 +#include <sys/sysctl.h>
 +static int      ndisk;
++#ifdef HW_IOSTATNAMES
++static int nmib[2] = {CTL_HW, HW_IOSTATNAMES};
++#else
 +static int nmib[2] = {CTL_HW, HW_DISKNAMES};
++#endif
 +#ifdef HW_DISKSTATS
 +#include <sys/disk.h>
 +static int dmib[3] = {CTL_HW, HW_DISKSTATS, sizeof(struct disk_sysctl)};