diff options
| author | he <he> | 2015-08-16 08:01:58 +0000 |
|---|---|---|
| committer | he <he> | 2015-08-16 08:01:58 +0000 |
| commit | ab18321be6284ae27be59976ccf3bb364f6108b2 (patch) | |
| tree | ce19bdae6503f8f6ce56e34ae26ac75c100dccb0 /sysutils/collectd | |
| parent | ab15bda01a9fae114ca365b6f70af7fa98db4227 (diff) | |
| download | pkgsrc-ab18321be6284ae27be59976ccf3bb364f6108b2.tar.gz | |
Do an explicit include of <uvm/uvm_extern.h> so this has a hope
of building on newer NetBSD. Build fix, so no PKGREVISION bump.
Diffstat (limited to 'sysutils/collectd')
| -rw-r--r-- | sysutils/collectd/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/collectd/patches/patch-src_memory.c | 21 |
2 files changed, 18 insertions, 7 deletions
diff --git a/sysutils/collectd/distinfo b/sysutils/collectd/distinfo index bcec54da9c8..22c96a45602 100644 --- a/sysutils/collectd/distinfo +++ b/sysutils/collectd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2015/08/14 15:39:28 he Exp $ +$NetBSD: distinfo,v 1.13 2015/08/16 08:01:58 he Exp $ SHA1 (collectd-5.5.0.tar.gz) = d24e284c1eae20c5e75b846c8b2612ab65bd5565 RMD160 (collectd-5.5.0.tar.gz) = 2197758942a5fe56e4eabda3786f09d4138e943a @@ -14,7 +14,7 @@ SHA1 (patch-src_df.c) = 19cca888b183a90759b359702e4d65c8afa6e58d SHA1 (patch-src_disk.c) = 159862e8ca1e841e3c4013c03ba03f059fdbbab5 SHA1 (patch-src_entropy.c) = d9bfa1bd4d045f2218105eaadf2dda90b7fc4646 SHA1 (patch-src_libcollectclient_network__buffer.c) = e07d403d299613fa0885a0e7285849eb85510253 -SHA1 (patch-src_memory.c) = 7bbf24481e2ad6bb8b11a5e6bddd8145e1b2a6ef +SHA1 (patch-src_memory.c) = f48d50245176426e26af7fa1b1f4ff6fbf0b1d95 SHA1 (patch-src_processes.c) = 32ca0414efaf57cb0b95b51d98b904008b5fe306 SHA1 (patch-src_swap.c) = e7602eb83eed6b90752b8293b9666b94bdd42493 SHA1 (patch-src_tcpconns.c) = 712af1b821d62217283df884dd283d5b1218ab7c diff --git a/sysutils/collectd/patches/patch-src_memory.c b/sysutils/collectd/patches/patch-src_memory.c index 742ee58aab5..706a35e1508 100644 --- a/sysutils/collectd/patches/patch-src_memory.c +++ b/sysutils/collectd/patches/patch-src_memory.c @@ -1,4 +1,4 @@ -$NetBSD: patch-src_memory.c,v 1.1 2015/08/11 13:19:21 he Exp $ +$NetBSD: patch-src_memory.c,v 1.2 2015/08/16 08:01:58 he Exp $ Add a port for NetBSD using VM_UVMEXP2, and preferring sysctl over sysctlbyname. @@ -27,7 +27,18 @@ sysctl over sysctlbyname. #elif HAVE_LIBSTATGRAB /* no global variables */ /* endif HAVE_LIBSTATGRAB */ -@@ -121,6 +121,15 @@ static int memory_init (void) +@@ -92,6 +92,10 @@ static int pagesize; + # error "No applicable input method." + #endif + ++#if KERNEL_NETBSD ++# include <uvm/uvm_extern.h> ++#endif ++ + static _Bool values_absolute = 1; + static _Bool values_percentage = 0; + +@@ -121,6 +125,15 @@ static int memory_init (void) host_page_size (port_host, &pagesize); /* #endif HAVE_HOST_STATISTICS */ @@ -43,7 +54,7 @@ sysctl over sysctlbyname. #elif HAVE_SYSCTLBYNAME /* no init stuff */ /* #endif HAVE_SYSCTLBYNAME */ -@@ -139,15 +148,6 @@ static int memory_init (void) +@@ -139,15 +152,6 @@ static int memory_init (void) } /* #endif HAVE_LIBKSTAT */ @@ -59,7 +70,7 @@ sysctl over sysctlbyname. #elif HAVE_LIBSTATGRAB /* no init stuff */ /* #endif HAVE_LIBSTATGRAB */ -@@ -221,6 +221,46 @@ static int memory_read_internal (value_l +@@ -221,6 +225,46 @@ static int memory_read_internal (value_l /* #endif HAVE_HOST_STATISTICS */ #elif HAVE_SYSCTLBYNAME @@ -106,7 +117,7 @@ sysctl over sysctlbyname. /* * vm.stats.vm.v_page_size: 4096 * vm.stats.vm.v_page_count: 246178 -@@ -272,6 +312,8 @@ static int memory_read_internal (value_l +@@ -272,6 +316,8 @@ static int memory_read_internal (value_l "active", (gauge_t) sysctl_vals[4], "inactive", (gauge_t) sysctl_vals[5], "cache", (gauge_t) sysctl_vals[6]); |