CVS commit: pkgsrc/sysutils/collectd

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Fri Jun 23 16:52:45 UTC 2017

Modified Files:
        pkgsrc/sysutils/collectd: distinfo
        pkgsrc/sysutils/collectd/patches: patch-src_processes.c

Log Message:
Correct build failure of collectd on NetBSD 8.99.1

Address <sys/user.h> removal fallout.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/sysutils/collectd/distinfo
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/sysutils/collectd/patches/patch-src_processes.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/collectd/distinfo
diff -u pkgsrc/sysutils/collectd/distinfo:1.36 pkgsrc/sysutils/collectd/distinfo:1.37
--- pkgsrc/sysutils/collectd/distinfo:1.36      Wed Jun 14 13:42:53 2017
+++ pkgsrc/sysutils/collectd/distinfo   Fri Jun 23 16:52:45 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2017/06/14 13:42:53 fhajny Exp $
+$NetBSD: distinfo,v 1.37 2017/06/23 16:52:45 kamil Exp $
 
 SHA1 (collectd-5.7.2.tar.bz2) = b27074fc363d942c8aee2f05baed0395a20c86d0
 RMD160 (collectd-5.7.2.tar.bz2) = 81860b4fba7cf05b8eca19913ffe05d06b37e1a2
@@ -17,7 +17,7 @@ SHA1 (patch-src_irq.c) = 78f1757ff2ed6db
 SHA1 (patch-src_libcollectclient_network__buffer.c) = 62924943831e6d0585b103e567888f9af5c46f9e
 SHA1 (patch-src_memory.c) = 2934cd50e454fc14d0ec952854c88b0a830fa9a7
 SHA1 (patch-src_netstat__udp.c) = 30cb12d25f56c60959658dbd181783212e00cc61
-SHA1 (patch-src_processes.c) = 1a75fdaa42f37eef1a968d299c3549e640fb68b2
+SHA1 (patch-src_processes.c) = 3dd8510bfd0d25051f30519f62d638536c45a6e2
 SHA1 (patch-src_statsd.c) = 35f4349d2d2c9bddc0f4770344f969157cd012f6
 SHA1 (patch-src_swap.c) = 24da6e04e3006639311e8111f26f72e4fab4054a
 SHA1 (patch-src_tcpconns.c) = b85de1d0eb03989df12d9688b38d61733a13c028

Index: pkgsrc/sysutils/collectd/patches/patch-src_processes.c
diff -u pkgsrc/sysutils/collectd/patches/patch-src_processes.c:1.6 pkgsrc/sysutils/collectd/patches/patch-src_processes.c:1.7
--- pkgsrc/sysutils/collectd/patches/patch-src_processes.c:1.6  Tue Feb 14 21:23:13 2017
+++ pkgsrc/sysutils/collectd/patches/patch-src_processes.c      Fri Jun 23 16:52:45 2017
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_processes.c,v 1.6 2017/02/14 21:23:13 joerg Exp $
+$NetBSD: patch-src_processes.c,v 1.7 2017/06/23 16:52:45 kamil Exp $
 
 Add a port to NetBSD.
 
---- src/processes.c.orig       2017-01-23 07:53:57.000000000 +0000
+--- src/processes.c.orig       2017-06-06 18:13:54.693164693 +0000
 +++ src/processes.c
-@@ -95,14 +95,14 @@
+@@ -95,14 +95,16 @@
  /* #endif KERNEL_LINUX */
  
  #elif HAVE_LIBKVM_GETPROCS &&                                                  \
@@ -14,14 +14,16 @@ Add a port to NetBSD.
  #include <sys/param.h>
  #include <sys/proc.h>
  #include <sys/sysctl.h>
++#if defined(__FreeBSD__) || defined(__DragonFly__)
  #include <sys/user.h>
++#endif
  /* #endif HAVE_LIBKVM_GETPROCS && (HAVE_STRUCT_KINFO_PROC_FREEBSD ||
 - * HAVE_STRUCT_KINFO_PROC_OPENBSD) */
 + * HAVE_STRUCT_KINFO_PROC_OPENBSD || HAVE_STRUCT_KINFO_PROC2_NETBSD) */
  
  #elif HAVE_PROCINFO_H
  #include <procinfo.h>
-@@ -244,10 +244,15 @@ static void ps_fill_details(const procst
+@@ -244,10 +246,15 @@ static void ps_fill_details(const procst
  /* #endif KERNEL_LINUX */
  
  #elif HAVE_LIBKVM_GETPROCS &&                                                  \
@@ -39,7 +41,7 @@ Add a port to NetBSD.
  
  #elif HAVE_PROCINFO_H
  static struct procentry64 procentry[MAXPROCENTRY];
-@@ -601,10 +606,21 @@ static int ps_init(void) {
+@@ -601,10 +608,21 @@ static int ps_init(void) {
  /* #endif KERNEL_LINUX */
  
  #elif HAVE_LIBKVM_GETPROCS &&                                                  \
@@ -63,7 +65,7 @@ Add a port to NetBSD.
  
  #elif HAVE_PROCINFO_H
    pagesize = getpagesize();
-@@ -1896,6 +1912,187 @@ static int ps_read(void) {
+@@ -1896,6 +1914,187 @@ static int ps_read(void) {
      ps_submit_proc_list(ps_ptr);
  /* #endif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD */