net-mgmt/collectd5: update to 5.9.0 [1]

While here, improve formatting

PR:		238745 [1]
Submitted by:	Krzysztof <ports@bsdserwis.com> (maintainer) [1]

8 files changed, 165 insertions, 167 deletions

diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index e90e88185816..7fdfd9b49fa3 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	collectd
-PORTVERSION=	5.8.1
-PORTREVISION=	2
+PORTVERSION=	5.9.0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://storage.googleapis.com/collectd-tarballs/
 PKGNAMESUFFIX=	5
@@ -15,19 +14,19 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		autoreconf gmake libtool pkgconfig shebangfix tar:bzip2
+
 GNU_CONFIGURE=	yes
 
-OPTIONS_DEFINE=		CGI JAVA LOGGING GCRYPT LOGSTASH VIRT
+OPTIONS_DEFINE=		CGI GCRYPT JAVA LOGGING LOGSTASH VIRT
 OPTIONS_GROUP=		INPUT OUTPUT
-OPTIONS_GROUP_OUTPUT=	KAFKA MONGODB NOTIFYDESKTOP NOTIFYEMAIL PROMETHEUS RIEMANN \
-			RRDTOOL TSDB
-OPTIONS_GROUP_INPUT=	CHRONY CURL CURL_JSON CURL_XML DBI IPMI JSON \
-			MEMCACHEC MODBUS MQTT MYSQL NUTUPS OLSRD ONEWIRE OPENLDAP \
-			PERL PGSQL PINBA PING PYTHON RABBITMQ REDIS ROUTEROS \
-			SIGROK SNMP STATSD TOKYOTYRANT VARNISH XML \
-			ZOOKEEPER
+OPTIONS_GROUP_OUTPUT=	KAFKA MONGODB NOTIFYDESKTOP NOTIFYEMAIL PROMETHEUS \
+			RIEMANN RRDTOOL TSDB
+OPTIONS_GROUP_INPUT=	CHRONY CURL CURL_JSON CURL_XML DBI IPMI JSON MEMCACHEC \
+			MODBUS MQTT MYSQL NUTUPS OLSRD ONEWIRE OPENLDAP PERL \
+			PGSQL PINBA PING PYTHON RABBITMQ REDIS ROUTEROS SIGROK \
+			SNMP STATSD TOKYOTYRANT VARNISH XML ZOOKEEPER
 
-OPTIONS_DEFAULT=	LOGGING GCRYPT PING
+OPTIONS_DEFAULT=	GCRYPT LOGGING PING
 
 CGI_DESC=		Install collection.cgi (requires rrdtool)
 CHRONY_DESC=		Enable chronyd plugin
@@ -56,7 +55,7 @@ PERL_DESC=		Enable libperl plugin and binding
 PGSQL_DESC=		Enable postgresql-based plugins
 PINBA_DESC=		Enable pinba plugin (via protobuf-c)
 PING_DESC=		Enable ping plugin
-PROMETHEUS_DESC=		Enable write prometheus plugin
+PROMETHEUS_DESC=	Enable write prometheus plugin
 PYTHON_DESC=		Enable python-based plugins
 RABBITMQ_DESC=		Enable rabbitmq-based plugins
 REDIS_DESC=		Enable redis-based plugins
@@ -83,41 +82,41 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
 # NOTE: Plugins without dependencies are defined further down.
-CONFIGURE_ARGS=	--localstatedir=/var \
-		--disable-all-plugins \
-		--disable-static \
-		--without-amqp \
+CONFIGURE_ARGS=	--disable-all-plugins \
 		--disable-ceph \
 		--disable-cgroups \
 		--disable-fhcount \
+		--disable-static \
+		--disable-turbostat \
+		--enable-disk \
+		--localstatedir=/var \
+		--without-amqp \
 		--without-libaquaero5 \
 		--without-libganglia \
 		--without-libiptc \
-		--without-liblvm2app \
 		--without-libkstat \
 		--without-libldap \
+		--without-liblvm2app \
 		--without-libmnl \
-		--without-libnetlink \
 		--without-libnetapp \
+		--without-libnetlink \
 		--without-libowcapi \
 		--without-libperfstat \
 		--without-libsensors \
 		--without-lvm \
 		--without-mic \
-		--without-oracle \
-		--disable-turbostat \
-		--enable-disk
+		--without-oracle
 
-CGI_RUN_DEPENDS=		p5-URI>=0:net/p5-URI \
-				p5-CGI>=0:www/p5-CGI \
-				p5-HTML-Parser>=0:www/p5-HTML-Parser
-CGI_IMPLIES=			RRDTOOL
+CGI_RUN_DEPENDS=	p5-CGI>=0:www/p5-CGI \
+			p5-HTML-Parser>=0:www/p5-HTML-Parser \
+			p5-URI>=0:net/p5-URI
+CGI_IMPLIES=		RRDTOOL
 
 CHRONY_CONFIGURE_ENABLE=	chrony
 
-CURL_LIB_DEPENDS=		libcurl.so:ftp/curl
-CURL_CONFIGURE_ENABLE=		apache curl nginx write_http
-CURL_CONFIGURE_WITH=		libcurl=${LOCALBASE}
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
+CURL_CONFIGURE_ENABLE=	apache curl nginx write_http
+CURL_CONFIGURE_WITH=	libcurl=${LOCALBASE}
 
 CURL_JSON_IMPLIES=		CURL JSON
 CURL_JSON_CONFIGURE_ENABLE=	curl_json
@@ -125,28 +124,28 @@ CURL_JSON_CONFIGURE_ENABLE=	curl_json
 CURL_XML_IMPLIES=		CURL XML
 CURL_XML_CONFIGURE_ENABLE=	ascent bind curl_xml
 
-JAVA_USE=			java
-JAVA_CONFIGURE_ENABLE=		java
-JAVA_CONFIGURE_WITH=		java=${LOCALBASE} libjvm
+JAVA_USE=		java
+JAVA_CONFIGURE_ENABLE=	java
+JAVA_CONFIGURE_WITH=	java=${LOCALBASE} libjvm
 
-DBI_LIB_DEPENDS=		libdbi.so:databases/libdbi
-DBI_CONFIGURE_WITH=		libdbi=${LOCALBASE}
-DBI_CONFIGURE_ENABLE=		dbi
-DBI_CFLAGS=			-Wno-deprecated-declarations
+DBI_LIB_DEPENDS=	libdbi.so:databases/libdbi
+DBI_CONFIGURE_WITH=	libdbi=${LOCALBASE}
+DBI_CONFIGURE_ENABLE=	dbi
+DBI_CFLAGS=		-Wno-deprecated-declarations
 
-GCRYPT_LIB_DEPENDS=		libgcrypt.so:security/libgcrypt \
-				libgpg-error.so:security/libgpg-error
-GCRYPT_CONFIGURE_WITH=		-with-libgcrypt=${LOCALBASE}
-GCRYPT_LIBS=			-lgcrypt
+GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
+			libgpg-error.so:security/libgpg-error
+GCRYPT_CONFIGURE_WITH=	-with-libgcrypt=${LOCALBASE}
+GCRYPT_LIBS=		-lgcrypt
 
-IPMI_LIB_DEPENDS=		libOpenIPMI.so:sysutils/openipmi
-IPMI_CONFIGURE_ENABLE=		ipmi
+IPMI_LIB_DEPENDS=	libOpenIPMI.so:sysutils/openipmi
+IPMI_CONFIGURE_ENABLE=	ipmi
 
-JSON_LIB_DEPENDS=		libyajl.so:devel/yajl
-JSON_CONFIGURE_WITH=		libyajl=${LOCALBASE}
+JSON_LIB_DEPENDS=	libyajl.so:devel/yajl
+JSON_CONFIGURE_WITH=	libyajl=${LOCALBASE}
 
-KAFKA_LIB_DEPENDS=		librdkafka.so:net/librdkafka
-KAFKA_CONFIGURE_ENABLE=		write_kafka
+KAFKA_LIB_DEPENDS=	librdkafka.so:net/librdkafka
+KAFKA_CONFIGURE_ENABLE=	write_kafka
 
 LOGGING_CONFIGURE_ENABLE=	debug
 
@@ -161,19 +160,19 @@ MODBUS_LIB_DEPENDS=		libmodbus.so:comms/libmodbus
 MODBUS_CONFIGURE_ENABLE=	modbus
 MODBUS_CONFIGURE_WITH=		libmodbus=use_pkgconfig
 
-MONGODB_LIB_DEPENDS=		libmongoc-1.0.so:devel/mongo-c-driver
-MONGODB_LIB_DEPENDS+=		libbson-1.0.so:devel/libbson
+MONGODB_LIB_DEPENDS+=		libbson-1.0.so:devel/libbson \
+				libmongoc-1.0.so:devel/mongo-c-driver
 MONGODB_CONFIGURE_ENABLE=	write_mongodb
 MONGODB_CONFIGURE_WITH=		libmongoc=${LOCALBASE}
 MONGODB_BROKEN=			fails to configure with write_mongodb option
 
-MQTT_LIB_DEPENDS=		libmosquitto.so:net/mosquitto
-MQTT_CONFIGURE_ENABLE=		mqtt
-MQTT_CONFIGURE_WITH=		libmosquitto=${LOCALBASE}
+MQTT_LIB_DEPENDS=	libmosquitto.so:net/mosquitto
+MQTT_CONFIGURE_ENABLE=	mqtt
+MQTT_CONFIGURE_WITH=	libmosquitto=${LOCALBASE}
 
-MYSQL_USES=			mysql ssl
-MYSQL_CONFIGURE_ENABLE=		mysql
-MYSQL_CONFIGURE_WITH=		libmysql=${LOCALBASE}
+MYSQL_USES=		mysql ssl
+MYSQL_CONFIGURE_ENABLE=	mysql
+MYSQL_CONFIGURE_WITH=	libmysql=${LOCALBASE}
 
 NOTIFYDESKTOP_LIB_DEPENDS=	libnotify.so:devel/libnotify
 NOTIFYDESKTOP_CONFIGURE_ENABLE=	notify_desktop
@@ -189,34 +188,34 @@ NUTUPS_LIB_DEPENDS=		libupsclient.so:sysutils/nut
 NUTUPS_CONFIGURE_ENABLE=	nut
 NUTUPS_CONFIGURE_WITH=		upsclient=${LOCALBASE}
 
-OLSRD_CONFIGURE_ENABLE=		olsrd
+OLSRD_CONFIGURE_ENABLE=	olsrd
 
 ONEWIRE_LIB_DEPENDS=		libow.so:comms/owfs
 ONEWIRE_CONFIGURE_ENABLE=	onewire
 ONEWIRE_CONFIGURE_WITH=		libowcapi=${LOCALBASE}
 
-OPENLDAP_USE=			openldap=yes
+OPENLDAP_USE=			OPENLDAP=yes
 OPENLDAP_CONFIGURE_ENABLE=	openldap
 OPENLDAP_CONFIGURE_WITH=	libldap=${LOCALBASE}
 
-PERL_USES=			perl5
-PERL_CONFIGURE_ENABLE=		perl
-PERL_CONFIGURE_WITH=		perl=${PERL} perl-bindings libperl
+PERL_USES=		perl5
+PERL_CONFIGURE_ENABLE=	perl
+PERL_CONFIGURE_WITH=	libperl perl-bindings perl=${PERL}
 
-PGSQL_USES=			pgsql
-PGSQL_CONFIGURE_ENABLE=		postgresql
-PGSQL_CONFIGURE_WITH=		postgresql=${LOCALBASE} libpq
+PGSQL_USES=		pgsql
+PGSQL_CONFIGURE_ENABLE=	postgresql
+PGSQL_CONFIGURE_WITH=	libpq postgresql=${LOCALBASE}
 
-PINBA_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
-PINBA_CONFIGURE_ENABLE=		pinba
+PINBA_LIB_DEPENDS=	libprotobuf-c.so:devel/protobuf-c
+PINBA_CONFIGURE_ENABLE=	pinba
 
-PING_LIB_DEPENDS=		liboping.so:net/liboping
-PING_CONFIGURE_ENABLE=		ping
-PING_CONFIGURE_WITH=		liboping=${LOCALBASE}
+PING_LIB_DEPENDS=	liboping.so:net/liboping
+PING_CONFIGURE_ENABLE=	ping
+PING_CONFIGURE_WITH=	liboping=${LOCALBASE}
 
-PROMETHEUS_LIB_DEPENDS=	libprotobuf-c.so:devel/protobuf-c
-PROMETHEUS_LIB_DEPENDS+=	libprotoc.so:devel/protobuf
-PROMETHEUS_LIB_DEPENDS+=	libmicrohttpd.so:www/libmicrohttpd
+PROMETHEUS_LIB_DEPENDS+=	libmicrohttpd.so:www/libmicrohttpd \
+				libprotobuf-c.so:devel/protobuf-c \
+				libprotoc.so:devel/protobuf
 PROMETHEUS_CONFIGURE_ENABLE=	write_prometheus
 
 PYTHON_USES=			python
@@ -228,17 +227,17 @@ RABBITMQ_LIB_DEPENDS=		librabbitmq.so:net/rabbitmq-c
 RABBITMQ_CONFIGURE_ENABLE=	rabbitmq
 RABBITMQ_CONFIGURE_WITH=	librabbitmq=${LOCALBASE}
 
-REDIS_LIB_DEPENDS=		libhiredis.so:databases/hiredis
-REDIS_CONFIGURE_ENABLE=		redis write_redis
-REDIS_CONFIGURE_WITH=		libhiredis=${LOCALBASE}
+REDIS_LIB_DEPENDS=	libhiredis.so:databases/hiredis
+REDIS_CONFIGURE_ENABLE=	redis write_redis
+REDIS_CONFIGURE_WITH=	libhiredis=${LOCALBASE}
 
-RIEMANN_LIB_DEPENDS=		libriemann-client.so:net-mgmt/riemann-c-client \
-				libltdl.so:devel/libltdl
+RIEMANN_LIB_DEPENDS=		libltdl.so:devel/libltdl \
+				libriemann-client.so:net-mgmt/riemann-c-client
 RIEMANN_CONFIGURE_ENABLE=	write_riemann
 
-ROUTEROS_LIB_DEPENDS=		librouteros.so:net/librouteros \
-				libgcrypt.so:security/libgcrypt \
-				libgpg-error.so:security/libgpg-error
+ROUTEROS_LIB_DEPENDS=		libgcrypt.so:security/libgcrypt \
+				libgpg-error.so:security/libgpg-error \
+				librouteros.so:net/librouteros
 ROUTEROS_CONFIGURE_ENABLE=	routeros
 ROUTEROS_CONFIGURE_WITH=	librouteros=${LOCALBASE}
 
@@ -253,93 +252,92 @@ SIGROK_CONFIGURE_ENABLE=	sigrok
 SIGROK_CONFIGURE_WITH=		libsigrok
 SIGROK_USES=			gettext-runtime
 
-SNMP_LIB_DEPENDS=		libnetsnmp.so:net-mgmt/net-snmp
-SNMP_CONFIGURE_ENABLE=		snmp
-SNMP_CONFIGURE_WITH=		libnetsnmp
+SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
+SNMP_CONFIGURE_ENABLE=	snmp
+SNMP_CONFIGURE_WITH=	libnetsnmp
 
 STATSD_CONFIGURE_ENABLE=	statsd
 
-TOKYOTYRANT_LIB_DEPENDS=	libtokyotyrant.so:databases/tokyotyrant \
-				libtokyocabinet.so:databases/tokyocabinet
+TOKYOTYRANT_LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet \
+				libtokyotyrant.so:databases/tokyotyrant
 TOKYOTYRANT_CONFIGURE_ENABLE=	tokyotyrant
 TOKYOTYRANT_CONFIGURE_WITH=	libtokyotyrant=${LOCALBASE}
 
-TSDB_CONFIGURE_ENABLE=		write_tsdb
+TSDB_CONFIGURE_ENABLE=	write_tsdb
 
 VARNISH_LIB_DEPENDS=		libvarnishapi.so:www/varnish4
 VARNISH_CONFIGURE_ENABLE=	varnish
 
-VIRT_IMPLIES=			XML
-VIRT_LIB_DEPENDS=		libvirt.so:devel/libvirt \
-				libgcrypt.so:security/libgcrypt \
-				libgpg-error.so:security/libgpg-error
-VIRT_CONFIGURE_ENABLE=		virt
-VIRT_CONFIGURE_WITH=		virt=${LOCALBASE}
+VIRT_IMPLIES=		XML
+VIRT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
+			libgpg-error.so:security/libgpg-error \
+			libvirt.so:devel/libvirt
+VIRT_CONFIGURE_ENABLE=	virt
+VIRT_CONFIGURE_WITH=	virt=${LOCALBASE}
 
-XML_LIB_DEPENDS=		libxml2.so:textproc/libxml2
-XML_CONFIGURE_WITH=		libxml2=${LOCALBASE}
+XML_LIB_DEPENDS=	libxml2.so:textproc/libxml2
+XML_CONFIGURE_WITH=	libxml2=${LOCALBASE}
 
 ZOOKEEPER_LIB_DEPENDS=		libzookeeper_mt.so:devel/libzookeeper
 ZOOKEEPER_CONFIGURE_ENABLE=	zookeeper
 ZOOKEEPER_CONFIGURE_WITH=	libzookeeper=${LOCALBASE}
 
 # NOTE: Plugins without external dependencies
-CONFIGURE_ARGS+=--enable-aggregation \
-		--enable-apcups \
-		--enable-contextswitch \
-		--enable-cpu \
-		--enable-csv \
-		--enable-df \
-		--enable-dns \
-		--enable-email \
-		--enable-exec \
-		--enable-filecount \
-		--enable-interface \
-		--enable-load \
-		--enable-logfile \
-		--enable-match_empty_counter \
-		--enable-match_hashed \
-		--enable-match_regex \
-		--enable-match_timediff \
-		--enable-match_value \
-		--enable-mbmon \
-		--enable-memcached \
-		--enable-memory \
-		--enable-network \
-		--enable-ntpd \
-		--enable-openvpn \
-		--enable-powerdns \
-		--enable-pf \
-		--enable-processes \
-		--enable-statsd \
-		--enable-swap \
-		--enable-syslog \
-		--enable-table \
-		--enable-tail \
-		--enable-tail_csv \
-		--enable-target_notification \
-		--enable-target_replace \
-		--enable-target_scale \
-		--enable-target_set \
-		--enable-target_v5upgrade \
-		--enable-tcpconns \
-		--enable-teamspeak2 \
-		--enable-ted \
-		--enable-threshold \
-		--enable-unixsock \
-		--enable-uptime \
-		--enable-users \
-		--enable-uuid \
-		--enable-write_graphite \
-		--enable-write_log \
-		--enable-zfs_arc \
-
-INSTALL_TARGET=	install-strip
-SHEBANG_FILES=	contrib/collection.cgi
+CONFIGURE_ARGS+=	--enable-aggregation \
+			--enable-apcups \
+			--enable-contextswitch \
+			--enable-cpu \
+			--enable-csv \
+			--enable-df \
+			--enable-dns \
+			--enable-email \
+			--enable-exec \
+			--enable-filecount \
+			--enable-interface \
+			--enable-load \
+			--enable-logfile \
+			--enable-match_empty_counter \
+			--enable-match_hashed \
+			--enable-match_regex \
+			--enable-match_timediff \
+			--enable-match_value \
+			--enable-mbmon \
+			--enable-memcached \
+			--enable-memory \
+			--enable-network \
+			--enable-ntpd \
+			--enable-openvpn \
+			--enable-pf \
+			--enable-powerdns \
+			--enable-processes \
+			--enable-statsd \
+			--enable-swap \
+			--enable-syslog \
+			--enable-table \
+			--enable-tail \
+			--enable-tail_csv \
+			--enable-target_notification \
+			--enable-target_replace \
+			--enable-target_scale \
+			--enable-target_set \
+			--enable-target_v5upgrade \
+			--enable-tcpconns \
+			--enable-teamspeak2 \
+			--enable-ted \
+			--enable-threshold \
+			--enable-unixsock \
+			--enable-uptime \
+			--enable-users \
+			--enable-uuid \
+			--enable-write_graphite \
+			--enable-write_log \
+			--enable-zfs_arc
+INSTALL_TARGET=		install-strip
+SHEBANG_FILES=		contrib/collection.cgi
 
 post-patch:
 	@${REINPLACE_CMD} 's/-Werror//' \
-		${WRKSRC}/configure.ac 
+		${WRKSRC}/configure.ac
 	@${REINPLACE_CMD} \
 		-e 's;@prefix@/var/;/var/;' \
 		-e 's;/var/lib/;/var/db/;' \
diff --git a/net-mgmt/collectd5/distinfo b/net-mgmt/collectd5/distinfo
index 4f1b584441d5..f1d77e24e8ec 100644
--- a/net-mgmt/collectd5/distinfo
+++ b/net-mgmt/collectd5/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1511130105
-SHA256 (collectd-5.8.1.tar.bz2) = e796fda27ce06377f491ad91aa286962a68c2b54076aa77a29673d53204453da
-SIZE (collectd-5.8.1.tar.bz2) = 1789228
+SHA256 (collectd-5.9.0.tar.bz2) = 7b220f8898a061f6e7f29a8c16697d1a198277f813da69474a67911097c0626b
+SIZE (collectd-5.9.0.tar.bz2) = 1899573
diff --git a/net-mgmt/collectd5/files/patch-Makefile.am b/net-mgmt/collectd5/files/patch-Makefile.am
index 06e715146e15..499a88fa3610 100644
--- a/net-mgmt/collectd5/files/patch-Makefile.am
+++ b/net-mgmt/collectd5/files/patch-Makefile.am
@@ -1,15 +1,15 @@
---- Makefile.am.orig	2017-11-18 09:03:27 UTC
+--- Makefile.am.orig	2019-06-13 09:13:42 UTC
 +++ Makefile.am
-@@ -165,7 +165,7 @@ AM_CPPFLAGS = \
+@@ -187,7 +187,7 @@ AM_CPPFLAGS = \
  	-DPREFIX='"${prefix}"' \
  	-DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
  	-DLOCALSTATEDIR='"${localstatedir}"' \
--	-DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' \
+-	-DPKGLOCALSTATEDIR='"${cpkglocalstatedir}"' \
 +	-DPKGLOCALSTATEDIR='"/var/db/${PACKAGE_NAME}"' \
- 	-DPLUGINDIR='"${pkglibdir}"' \
- 	-DPKGDATADIR='"${pkgdatadir}"'
- 
-@@ -1964,15 +1964,10 @@ endif
+ 	-DPLUGINDIR='"${cpkglibdir}"' \
+ 	-DPKGDATADIR='"${cpkgdatadir}"'
+ if BUILD_WIN32
+@@ -2184,15 +2184,10 @@ endif
  
  install-exec-hook:
  	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
@@ -19,11 +19,11 @@
  	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
 -	if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \
 -	then \
--		$(INSTALL) -m 0640 $(srcdir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \
+-		$(INSTALL) -m 0640 $(builddir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \
 -	else \
--		$(INSTALL) -m 0640 $(srcdir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \
+-		$(INSTALL) -m 0640 $(builddir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \
 -	fi; \
 +	$(INSTALL) -m 0640 src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.sample
- 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- 	$(INSTALL) -m 0644 $(srcdir)/src/types.db $(DESTDIR)$(pkgdatadir)/types.db;
+ 	$(mkinstalldirs) $(DESTDIR)$(cpkgdatadir)
+ 	$(INSTALL) -m 0644 $(srcdir)/src/types.db $(DESTDIR)$(cpkgdatadir)/types.db;
  	$(INSTALL) -m 0644 $(srcdir)/src/postgresql_default.conf \
diff --git a/net-mgmt/collectd5/files/patch-src_daemon_collectd.h b/net-mgmt/collectd5/files/patch-src_daemon_collectd.h
index 7cef38729056..f7ee044bae13 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	2017-11-18 09:03:27 UTC
+--- src/daemon/collectd.h.orig	2019-06-13 09:13:42 UTC
 +++ src/daemon/collectd.h
-@@ -207,7 +207,7 @@
+@@ -213,7 +213,7 @@ typedef int uid_t;
  #endif
  
  #ifndef PKGLOCALSTATEDIR
diff --git a/net-mgmt/collectd5/files/patch-src_libcollectdclient_network.c b/net-mgmt/collectd5/files/patch-src_libcollectdclient_network.c
index 07f83d94d359..992704ea0e61 100644
--- a/net-mgmt/collectd5/files/patch-src_libcollectdclient_network.c
+++ b/net-mgmt/collectd5/files/patch-src_libcollectdclient_network.c
@@ -1,6 +1,6 @@
---- src/libcollectdclient/network.c.orig
+--- src/libcollectdclient/network.c.orig	2019-06-13 09:13:42 UTC
 +++ src/libcollectdclient/network.c
-@@ -174,6 +174,13 @@
+@@ -178,6 +178,13 @@ static int server_open_socket(lcc_server
        continue;
      }
  
diff --git a/net-mgmt/collectd5/files/patch-src_network.c b/net-mgmt/collectd5/files/patch-src_network.c
index 7b159123e621..49e7e892c78b 100644
--- a/net-mgmt/collectd5/files/patch-src_network.c
+++ b/net-mgmt/collectd5/files/patch-src_network.c
@@ -1,6 +1,6 @@
---- src/network.c.orig
+--- src/network.c.orig	2019-06-13 09:13:42 UTC
 +++ src/network.c
-@@ -2000,6 +2000,13 @@
+@@ -2013,6 +2013,13 @@ static int sockent_client_connect(socken
        continue;
      }
  
diff --git a/net-mgmt/collectd5/files/patch-src_zfs__arc.c b/net-mgmt/collectd5/files/patch-src_zfs__arc.c
index 4225ab16ed9f..bb6e79b7fb68 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	2017-11-18 09:03:27 UTC
+--- src/zfs_arc.c.orig	2019-06-13 09:13:42 UTC
 +++ src/zfs_arc.c
-@@ -301,8 +301,6 @@ static int za_read(void) {
+@@ -322,8 +322,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 6c0e6c9d5fba..bc0475c41e17 100644
--- a/net-mgmt/collectd5/files/patch-version-gen.sh
+++ b/net-mgmt/collectd5/files/patch-version-gen.sh
@@ -1,8 +1,8 @@
---- version-gen.sh.orig	2017-11-18 09:03:27 UTC
+--- version-gen.sh.orig	2019-06-13 09:32:35 UTC
 +++ version-gen.sh
 @@ -2,10 +2,6 @@
  
- DEFAULT_VERSION="5.8.0.git"
+ DEFAULT_VERSION="5.9.0.git"
  
 -if [ -d .git ]; then
 -	VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | grep collectd | sed -e 's/^collectd-//' -e 's/-/./g'`"