From 4829595696fb4c51fce969275452934063727194 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Tue, 26 Feb 2013 11:01:32 +0000
Subject: NetBSD/current needs _KMEMUSER and a few additional includes.

---
 parallel/ganglia-monitor-core/distinfo         |  4 ++--
 parallel/ganglia-monitor-core/patches/patch-ac | 26 +++++++++++++++++++++-----
 2 files changed, 23 insertions(+), 7 deletions(-)

(limited to 'parallel')

diff --git a/parallel/ganglia-monitor-core/distinfo b/parallel/ganglia-monitor-core/distinfo
index b1c28fd19cd..25b82f17e04 100644
--- a/parallel/ganglia-monitor-core/distinfo
+++ b/parallel/ganglia-monitor-core/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2012/03/13 12:36:25 fhajny Exp $
+$NetBSD: distinfo,v 1.12 2013/02/26 11:01:32 joerg Exp $
 
 SHA1 (ganglia-3.1.2.tar.gz) = be5db246eb755d8c450140d1c80afef4f1179fe1
 RMD160 (ganglia-3.1.2.tar.gz) = 1f78cf1019759e12c3c65901fd74ac65dfddf4e3
 Size (ganglia-3.1.2.tar.gz) = 1213196 bytes
 SHA1 (patch-aa) = e258e4efb1ae012db51901de87e614cede78812c
 SHA1 (patch-ab) = 260a78711c2c7f1111ce8c4b0d54d2edd60dde08
-SHA1 (patch-ac) = d7fa7c4509589a88a568717296b1c7ea0b09fb1e
+SHA1 (patch-ac) = a7d4251eed047cb6ffb89c23d87b0db1dbe7b5f4
 SHA1 (patch-lib__gm_protocol_dr.c) = 9d17d79bb1a6426a2547c00006819483aff47363
diff --git a/parallel/ganglia-monitor-core/patches/patch-ac b/parallel/ganglia-monitor-core/patches/patch-ac
index b5c3a456e47..71737b34480 100644
--- a/parallel/ganglia-monitor-core/patches/patch-ac
+++ b/parallel/ganglia-monitor-core/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.4 2010/11/18 13:50:09 wiz Exp $
+$NetBSD: patch-ac,v 1.5 2013/02/26 11:01:32 joerg Exp $
 
 First chunk: update sysctl name for changes in NetBSD.
 
@@ -14,7 +14,23 @@ change, I got around 30 running processes on an idle machine.
 
 --- libmetrics/netbsd/metrics.c.orig	2009-01-28 23:23:20.000000000 +0000
 +++ libmetrics/netbsd/metrics.c
-@@ -134,7 +134,10 @@ cpu_speed_func ( void )
+@@ -9,10 +9,15 @@
+  *  Tested on NetBSD 2.0.2 (i386)
+  */
+ 
++#define _KMEMUSER
++
+ #include <kvm.h>
+ 
+ #include <sys/param.h> 
++#include <sys/proc.h>
+ #include <sys/mount.h>
++#include <sys/vmmeter.h>
++#include <uvm/uvm_extern.h>
+ #if __NetBSD_Version__ > 299000000
+ #include <sys/statvfs.h>
+ #define statfs statvfs
+@@ -134,7 +139,10 @@ cpu_speed_func ( void )
  
     cpu_speed = 0;
  
@@ -26,7 +42,7 @@ change, I got around 30 running processes on an idle machine.
     if (sysctlbyname("machdep.est.frequency.target", &cpu_speed, &len, NULL, 0) == -1)
        val.uint32 = 0;
  #endif
-@@ -559,44 +562,40 @@ proc_total_func ( void )
+@@ -559,44 +567,40 @@ proc_total_func ( void )
  g_val_t
  proc_run_func( void )
  {
@@ -95,7 +111,7 @@ change, I got around 30 running processes on an idle machine.
  
  output:
     return val;
-@@ -1135,36 +1134,41 @@ get_netbw(double *in_bytes, double *out_
+@@ -1135,36 +1139,41 @@ get_netbw(double *in_bytes, double *out_
  
  	next = buf;
  	while (next < lim) {
@@ -145,7 +161,7 @@ change, I got around 30 running processes on an idle machine.
  
  		/* If we don't have a previous value yet, make a slot. */
  		if (index >= indexes) {
-@@ -1187,25 +1191,25 @@ get_netbw(double *in_bytes, double *out_
+@@ -1187,25 +1196,25 @@ get_netbw(double *in_bytes, double *out_
  		 */
  		if (!seen[index]) {
  			seen[index] = 1;
-- 
cgit v1.2.3