Requires _KMEMUSER and uvm/uvm_extern.h on NetBSD/current.

3 files changed, 34 insertions, 8 deletions

diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo
index 00fb84ee1d3..e670f399e3c 100644
--- a/net/net-snmp/distinfo
+++ b/net/net-snmp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.66 2012/05/17 14:37:07 marino Exp $
+$NetBSD: distinfo,v 1.67 2013/01/11 13:34:46 joerg Exp $
 
 SHA1 (net-snmp-5.6.1.1.tar.gz) = ec88ba3e0dff4d1b3d342ccebb48ea84c9fa6fa9
 RMD160 (net-snmp-5.6.1.1.tar.gz) = 9a4a83f7fe9431a0694b5fee33866ccea80fcab4
@@ -10,6 +10,7 @@ SHA1 (patch-ae) = 54541bffecdbf4c526280bc82ffd370a59963d88
 SHA1 (patch-af) = d7641e502fd0a2969fa838fc67244cdfc6995369
 SHA1 (patch-ag) = 8f9dedcf741c4b0ea2c0150c8b0a22747ca8a313
 SHA1 (patch-agent_mibgroup_agent_extend.c) = b3b04c51e7059426963fdb4712a711e2da053a28
+SHA1 (patch-agent_mibgroup_host_data__access_swrun__kinfo.c) = ef82011e34f61e0bd606ee497647a605d9c81d23
 SHA1 (patch-ah) = 7cea4194c858d7a8a9093eaf4426404e9202c3f1
 SHA1 (patch-ai) = 1eb3b72dcfff90c8e973590265bdb1c07b717eaa
 SHA1 (patch-aj) = e3337d01e96cc0739dbf3b1c7bde44d1126c32ae
@@ -51,4 +52,4 @@ SHA1 (patch-ez) = a2d8ed3f0895b1f5908b8f311ad86dd79a7ffe04
 SHA1 (patch-fa) = f0102bf99b003b143fa3279e2187616b89e3b678
 SHA1 (patch-fb) = 64d97a51d82488ef4d3ea5dd40278501975d58fb
 SHA1 (patch-fc) = 4e0b9841cbff0da02748efc9105096ffcbe58e81
-SHA1 (patch-fd) = 6411ba28f0e9a9b66e22f3fbc71ca207cfd6bdd7
+SHA1 (patch-fd) = efab8fe5cb1e6bdc7799dbdfd27e88d734d843ad
diff --git a/net/net-snmp/patches/patch-agent_mibgroup_host_data__access_swrun__kinfo.c b/net/net-snmp/patches/patch-agent_mibgroup_host_data__access_swrun__kinfo.c
new file mode 100644
index 00000000000..6c0b0c9f311
--- /dev/null
+++ b/net/net-snmp/patches/patch-agent_mibgroup_host_data__access_swrun__kinfo.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-agent_mibgroup_host_data__access_swrun__kinfo.c,v 1.1 2013/01/11 13:34:46 joerg Exp $
+
+--- agent/mibgroup/host/data_access/swrun_kinfo.c.orig	2013-01-11 11:01:25.000000000 +0000
++++ agent/mibgroup/host/data_access/swrun_kinfo.c
+@@ -5,6 +5,10 @@
+  *
+  * NB: later FreeBSD uses a different kinfo_proc structure
+  */
++#ifdef __NetBSD__
++#define _KMEMUSER
++#endif
++
+ #include <net-snmp/net-snmp-config.h>
+ 
+ #include <stdio.h>
diff --git a/net/net-snmp/patches/patch-fd b/net/net-snmp/patches/patch-fd
index bb17fdd7e94..0a7fa81ead1 100644
--- a/net/net-snmp/patches/patch-fd
+++ b/net/net-snmp/patches/patch-fd
@@ -1,8 +1,18 @@
-$NetBSD: patch-fd,v 1.1 2010/12/26 09:23:49 sekiya Exp $
+$NetBSD: patch-fd,v 1.2 2013/01/11 13:34:46 joerg Exp $
 
---- agent/mibgroup/hardware/cpu/cpu_sysctl.c.orig	2010-12-26 16:45:27.000000000 +0900
-+++ agent/mibgroup/hardware/cpu/cpu_sysctl.c	2010-12-26 17:14:36.000000000 +0900
-@@ -49,7 +49,11 @@
+--- agent/mibgroup/hardware/cpu/cpu_sysctl.c.orig	2010-06-12 21:33:30.000000000 +0000
++++ agent/mibgroup/hardware/cpu/cpu_sysctl.c
+@@ -19,6 +19,9 @@
+ #else
+ #include <sys/sched.h>
+ #endif
++#if defined(__NetBSD__)
++#include <uvm/uvm_extern.h>
++#endif
+ 
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
+@@ -49,7 +52,11 @@ void init_cpu_sysctl( void ) {
      if ( n <= 0 )
          n = 1;   /* Single CPU system */
      i = sizeof(descr);
@@ -14,7 +24,7 @@ $NetBSD: patch-fd,v 1.1 2010/12/26 09:23:49 sekiya Exp $
      for ( i = 0; i < n; i++ ) {
          cpu = netsnmp_cpu_get_byIdx( i, 1 );
          cpu->status = 2;  /* running */
-@@ -59,26 +63,22 @@
+@@ -59,26 +66,22 @@ void init_cpu_sysctl( void ) {
      cpu_num = n;
  }
  
@@ -46,7 +56,7 @@ $NetBSD: patch-fd,v 1.1 2010/12/26 09:23:49 sekiya Exp $
  
  /*
     Need to check details before enabling this!
-@@ -159,7 +159,7 @@
+@@ -159,7 +162,7 @@ int netsnmp_cpu_arch_load( netsnmp_cache
      size_t         mem_size  = sizeof(NETSNMP_VM_STATS_TYPE);
      netsnmp_cpu_info *cpu = netsnmp_cpu_get_byIdx( -1, 0 );