[pkgsrc/trunk]: pkgsrc/parallel/ganglia-monitor-core Correct ganglia-monitor-...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/239aec19f1d7
branches:  trunk
changeset: 364582:239aec19f1d7
user:      kamil <kamil%pkgsrc.org@localhost>
date:      Fri Jun 30 00:52:44 2017 +0000

description:
Correct ganglia-monitor-core build failure on NetBSD 8.99.1

Address <sys/user.h> removal fallout

diffstat:

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

diffs (69 lines):

diff -r 3a4f688c0f76 -r 239aec19f1d7 parallel/ganglia-monitor-core/distinfo
--- a/parallel/ganglia-monitor-core/distinfo    Fri Jun 30 00:38:11 2017 +0000
+++ b/parallel/ganglia-monitor-core/distinfo    Fri Jun 30 00:52:44 2017 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.14 2016/02/16 12:48:18 fhajny Exp $
+$NetBSD: distinfo,v 1.15 2017/06/30 00:52:44 kamil Exp $
 
 SHA1 (ganglia-3.7.2.tar.gz) = 5ea23da8e5b85da53216dd7c742c8154e7aa576e
 RMD160 (ganglia-3.7.2.tar.gz) = 9b5c48bcf2aa489caea689713dabb12804d9cee2
 SHA512 (ganglia-3.7.2.tar.gz) = a88955e59421a447e5752a9bfe5f599d989a7a5a0141141ab3601d1ab250be4eebbede8bcef8baa151b2f9deaf3f56e30aef8ea709f3cc820a79fa3d3961e0df
 Size (ganglia-3.7.2.tar.gz) = 1302320 bytes
-SHA1 (patch-ac) = 5b9aaa5c8d5cb194e8c467e6e56ff5e235de7c69
+SHA1 (patch-ac) = 09a96c391f185ddd5f7a64a8b030f38c36ffbc76
 SHA1 (patch-configure) = d8f096263a8b2f04e30d4a053b4636ac5d1cd95f
 SHA1 (patch-gmetad_conf.c.in) = 75aa2d0c5d8af8a2864f7225444f1f263df4a60b
 SHA1 (patch-gmetad_data__thread.c) = 8dedb930e54872dab97d659f7d911a540171dbfd
diff -r 3a4f688c0f76 -r 239aec19f1d7 parallel/ganglia-monitor-core/patches/patch-ac
--- a/parallel/ganglia-monitor-core/patches/patch-ac    Fri Jun 30 00:38:11 2017 +0000
+++ b/parallel/ganglia-monitor-core/patches/patch-ac    Fri Jun 30 00:52:44 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.6 2016/02/16 12:48:18 fhajny Exp $
+$NetBSD: patch-ac,v 1.7 2017/06/30 00:52:44 kamil Exp $
 
 First chunk: update sysctl name for changes in NetBSD.
 
@@ -30,7 +30,15 @@
  #if __NetBSD_Version__ > 299000000
  #include <sys/statvfs.h>
  #define statfs statvfs
-@@ -134,7 +139,10 @@ cpu_speed_func ( void )
+@@ -21,7 +26,6 @@
+ #endif
+ #include <sys/sysctl.h>
+ #include <sys/time.h>
+-#include <sys/user.h>
+ #include <sys/resource.h>
+ #include <sys/sched.h>
+ #include <sys/stat.h>
+@@ -134,7 +138,10 @@ cpu_speed_func ( void )
  
     cpu_speed = 0;
  
@@ -42,7 +50,7 @@
     if (sysctlbyname("machdep.est.frequency.target", &cpu_speed, &len, NULL, 0) == -1)
        val.uint32 = 0;
  #endif
-@@ -559,49 +567,56 @@ proc_total_func ( void )
+@@ -559,49 +566,56 @@ proc_total_func ( void )
  g_val_t
  proc_run_func( void )
  {
@@ -127,7 +135,7 @@
  g_val_t
  mem_free_func ( void )
  {
-@@ -1135,36 +1150,41 @@ get_netbw(double *in_bytes, double *out_
+@@ -1135,36 +1149,41 @@ get_netbw(double *in_bytes, double *out_
  
        next = buf;
        while (next < lim) {
@@ -178,7 +186,7 @@
  
                /* If we don't have a previous value yet, make a slot. */
                if (index >= indexes) {
-@@ -1187,25 +1207,25 @@ get_netbw(double *in_bytes, double *out_
+@@ -1187,25 +1206,25 @@ get_netbw(double *in_bytes, double *out_
                 */
                if (!seen[index]) {
                        seen[index] = 1;