net-mgmt/collectd5: Update to version 5.7.1.

Other Changes:
  - Remove unnecessary global BUILD_DEPENDS, LIB_DEPENDS and RUN_DEPENDS.
  - Redo patches to fix portlint warnings.
  - Fix linked library errors reported by poudriere.

Remaining issue:
  - When the XMMS option is selected, xmms.so is linked to libraries in
    devel/glib12 and x11-toolkits/gtk12, but adding
    XMMS_USE=GNOME=glib12,gtk12 causes a build error.

PR:	216670
Submitted by:	ports@bsdserwis.com (maintainer)
Approved by:	swills (mentor)
Differential Revision:	https://reviews.freebsd.org/D9444

5 files changed, 20 insertions, 24 deletions

diff --git a/net-mgmt/collectd5/files/patch-src__daemon__collectd.h b/net-mgmt/collectd5/files/patch-src__daemon__collectd.h
index a67e2e19ed54..4c2e39643fd2 100644
--- a/net-mgmt/collectd5/files/patch-src__daemon__collectd.h
+++ b/net-mgmt/collectd5/files/patch-src__daemon__collectd.h
@@ -1,6 +1,6 @@
---- src/daemon/collectd.h.orig	2016-12-12 03:03:36.704279144 -0500
-+++ src/daemon/collectd.h	2017-01-03 07:53:41.101884000 -0500
-@@ -243,15 +243,15 @@
+--- src/daemon/collectd.h.orig	2017-01-23 07:53:57 UTC
++++ src/daemon/collectd.h
+@@ -243,15 +243,15 @@ typedef int _Bool;
  #endif
  
  #ifndef LOCALSTATEDIR
diff --git a/net-mgmt/collectd5/files/patch-src__dns.c b/net-mgmt/collectd5/files/patch-src__dns.c
index 3dec2136c6c6..ca6efc56501d 100644
--- a/net-mgmt/collectd5/files/patch-src__dns.c
+++ b/net-mgmt/collectd5/files/patch-src__dns.c
@@ -1,6 +1,6 @@
---- src/dns.c.orig	2016-12-12 03:03:36.708279115 -0500
-+++ src/dns.c	2017-01-03 08:10:33.137711000 -0500
-@@ -198,6 +198,15 @@
+--- src/dns.c.orig	2017-01-23 07:53:57 UTC
++++ src/dns.c
+@@ -198,6 +198,15 @@ static int dns_run_pcap_loop(void) {
      pthread_sigmask(SIG_SETMASK, &sigmask, NULL);
    }
  
diff --git a/net-mgmt/collectd5/files/patch-src__modbus.c b/net-mgmt/collectd5/files/patch-src__modbus.c
index fb8b965d0604..f11dfac63902 100644
--- a/net-mgmt/collectd5/files/patch-src__modbus.c
+++ b/net-mgmt/collectd5/files/patch-src__modbus.c
@@ -1,5 +1,5 @@
---- src/modbus.c.orig	2016-12-12 03:03:36.712279086 -0500
-+++ src/modbus.c	2017-01-03 08:12:39.318883000 -0500
+--- src/modbus.c.orig	2017-01-23 07:53:57 UTC
++++ src/modbus.c
 @@ -26,6 +26,9 @@
  #include "configfile.h"
  #include "plugin.h"
diff --git a/net-mgmt/collectd5/files/patch-src_zfs__arc.c b/net-mgmt/collectd5/files/patch-src_zfs__arc.c
index 2e89d8f30f05..667d63d5e181 100644
--- a/net-mgmt/collectd5/files/patch-src_zfs__arc.c
+++ b/net-mgmt/collectd5/files/patch-src_zfs__arc.c
@@ -1,6 +1,6 @@
---- src/zfs_arc.c.orig	2016-12-12 03:03:36.728278972 -0500
-+++ src/zfs_arc.c	2017-01-03 08:15:23.751003000 -0500
-@@ -286,8 +286,6 @@
+--- src/zfs_arc.c.orig	2017-01-23 07:53:57 UTC
++++ src/zfs_arc.c
+@@ -286,8 +286,6 @@ static int za_read(void) {
    za_read_derive(ksp, "prefetch_metadata_hits", "cache_result",
                   "prefetch_metadata-hit");
    za_read_derive(ksp, "demand_data_misses", "cache_result", "demand_data-miss");
diff --git a/net-mgmt/collectd5/files/patch-version-gen.sh b/net-mgmt/collectd5/files/patch-version-gen.sh
index 9aaa7e079131..3b25a7416170 100644
--- a/net-mgmt/collectd5/files/patch-version-gen.sh
+++ b/net-mgmt/collectd5/files/patch-version-gen.sh
@@ -1,17 +1,13 @@
---- version-gen.sh.orig	2017-01-03 08:18:24.963614000 -0500
-+++ version-gen.sh	2017-01-03 08:19:07.743161000 -0500
-@@ -1,13 +1,2 @@
- #!/bin/sh
--
--DEFAULT_VERSION="5.7.0.git"
--
+--- version-gen.sh.orig	2017-02-03 20:46:49 UTC
++++ version-gen.sh
+@@ -2,10 +2,6 @@
+ 
+ DEFAULT_VERSION="5.7.1.git"
+ 
 -if [ -d .git ]; then
 -	VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | grep collectd | sed -e 's/^collectd-//' -e 's/-/./g'`"
 -fi
 -
--if test -z "$VERSION"; then
--	VERSION="$DEFAULT_VERSION"
--fi
--
--printf "%s" "$VERSION"
-+echo -n '5.7.0.git'
+ if test -z "$VERSION"; then
+ 	VERSION="$DEFAULT_VERSION"
+ fi