Try to fix the build on SunOS, report_bytes isn't used there.

PKGREVISION++.

3 files changed, 13 insertions, 11 deletions

diff --git a/sysutils/collectd/Makefile b/sysutils/collectd/Makefile
index a911deb4c1a..e5aa8cd6f3c 100644
--- a/sysutils/collectd/Makefile
+++ b/sysutils/collectd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2015/08/11 13:19:21 he Exp $
+# $NetBSD: Makefile,v 1.8 2015/08/11 14:15:00 he Exp $
 
-PKGREVISION= 2
+PKGREVISION= 3
 .include "../../sysutils/collectd/Makefile.common"
 
 COMMENT=	Statistics collection daemon base
diff --git a/sysutils/collectd/distinfo b/sysutils/collectd/distinfo
index 8fbbecb3dad..481f8f9a60b 100644
--- a/sysutils/collectd/distinfo
+++ b/sysutils/collectd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2015/08/11 13:19:21 he Exp $
+$NetBSD: distinfo,v 1.10 2015/08/11 14:15:00 he Exp $
 
 SHA1 (collectd-5.5.0.tar.gz) = d24e284c1eae20c5e75b846c8b2612ab65bd5565
 RMD160 (collectd-5.5.0.tar.gz) = 2197758942a5fe56e4eabda3786f09d4138e943a
@@ -15,7 +15,7 @@ SHA1 (patch-src_disk.c) = 159862e8ca1e841e3c4013c03ba03f059fdbbab5
 SHA1 (patch-src_entropy.c) = 51551cb758115e5fd7f099e787cfa7758a5f1ea9
 SHA1 (patch-src_libcollectclient_network__buffer.c) = e07d403d299613fa0885a0e7285849eb85510253
 SHA1 (patch-src_memory.c) = 7bbf24481e2ad6bb8b11a5e6bddd8145e1b2a6ef
-SHA1 (patch-src_swap.c) = d7d214184db790bebfe70dfc5084a164c50f6892
+SHA1 (patch-src_swap.c) = e7602eb83eed6b90752b8293b9666b94bdd42493
 SHA1 (patch-src_tcpconns.c) = 712af1b821d62217283df884dd283d5b1218ab7c
 SHA1 (patch-src_utils__dns.c) = c3782dc9127f42da30e3142b853aa2cb2259af94
 SHA1 (patch-version-gen.sh) = 07d830019e22ac651514b75acf299b1f50c4632d
diff --git a/sysutils/collectd/patches/patch-src_swap.c b/sysutils/collectd/patches/patch-src_swap.c
index af0b9f203d6..dbac98a1ec3 100644
--- a/sysutils/collectd/patches/patch-src_swap.c
+++ b/sysutils/collectd/patches/patch-src_swap.c
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_swap.c,v 1.1 2015/08/11 13:19:21 he Exp $
+$NetBSD: patch-src_swap.c,v 1.2 2015/08/11 14:15:00 he Exp $
 
 Extend support for NetBSD, and add per-swap-device
 reporting for HAVE_SWAPCTL_THREE_ARGS.
 
 --- src/swap.c.orig	2015-05-20 12:04:47.000000000 +0000
 +++ src/swap.c
-@@ -76,9 +76,10 @@ static _Bool report_bytes = 0;
+@@ -76,9 +76,12 @@ static _Bool report_bytes = 0;
  static _Bool report_by_device = 0;
  /* #endif KERNEL_LINUX */
  
@@ -13,11 +13,13 @@ reporting for HAVE_SWAPCTL_THREE_ARGS.
 +#elif HAVE_SWAPCTL && (HAVE_SWAPCTL_TWO_ARGS || HAVE_SWAPCTL_THREE_ARGS)
  # define SWAP_HAVE_REPORT_BY_DEVICE 1
  static derive_t pagesize;
++#if KERNEL_NETBSD
 +static _Bool report_bytes = 0;
++#endif
  static _Bool report_by_device = 0;
  /* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS */
  
-@@ -114,7 +115,7 @@ static int swap_config (oconfig_item_t *
+@@ -114,7 +117,7 @@ static int swap_config (oconfig_item_t *
  	{
  		oconfig_item_t *child = ci->children + i;
  		if (strcasecmp ("ReportBytes", child->key) == 0)
@@ -26,7 +28,7 @@ reporting for HAVE_SWAPCTL_THREE_ARGS.
  			cf_util_get_boolean (child, &report_bytes);
  #else
  			WARNING ("swap plugin: The \"ReportBytes\" option "
-@@ -147,7 +148,7 @@ static int swap_init (void) /* {{{ */
+@@ -147,7 +150,7 @@ static int swap_init (void) /* {{{ */
  	pagesize = (derive_t) sysconf (_SC_PAGESIZE);
  /* #endif KERNEL_LINUX */
  
@@ -35,7 +37,7 @@ reporting for HAVE_SWAPCTL_THREE_ARGS.
  	/* getpagesize(3C) tells me this does not fail.. */
  	pagesize = (derive_t) getpagesize ();
  /* #endif HAVE_SWAPCTL */
-@@ -213,7 +214,7 @@ static void swap_submit_usage (char cons
+@@ -213,7 +216,7 @@ static void swap_submit_usage (char cons
  				other_name, other_value, NULL);
  } /* }}} void swap_submit_usage */
  
@@ -44,7 +46,7 @@ reporting for HAVE_SWAPCTL_THREE_ARGS.
  __attribute__((nonnull(1)))
  static void swap_submit_derive (char const *type_instance, /* {{{ */
  		derive_t value)
-@@ -614,6 +615,43 @@ static int swap_read (void) /* {{{ */
+@@ -614,6 +617,43 @@ static int swap_read (void) /* {{{ */
  /* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS */
  
  #elif HAVE_SWAPCTL && HAVE_SWAPCTL_THREE_ARGS
@@ -88,7 +90,7 @@ reporting for HAVE_SWAPCTL_THREE_ARGS.
  static int swap_read (void) /* {{{ */
  {
  	struct swapent *swap_entries;
-@@ -660,23 +698,53 @@ static int swap_read (void) /* {{{ */
+@@ -660,23 +700,53 @@ static int swap_read (void) /* {{{ */
  	 * swap_entries[i].se_path */
  	for (i = 0; i < swap_num; i++)
  	{