3 files changed, 34 insertions, 58 deletions

diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index 703d28fb2ea2..593f679515c8 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	collectd
-PORTVERSION=	4.10.3
-PORTREVISION=	4
+PORTVERSION=	5.0.0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://collectd.org/files/
 
@@ -43,14 +42,16 @@ OPTIONS=	CGI		"Install collection.cgi (requires RRDTOOL)" 	Off \
 		XMMS		"Input: XMMS" 					Off \
 		RRDTOOL		"Output: RRDTool" 				On
 
-MAN1=		collectd.1 collectd-nagios.1 collectdmon.1
+MAN1=		collectd.1 collectd-nagios.1 collectdmon.1 collectdctl.1
 MAN5=		collectd.conf.5 collectd-email.5 collectd-exec.5 \
 		collectd-snmp.5 collectd-unixsock.5 collectd-perl.5 \
-		collectd-java.5 collectd-python.5 types.db.5
+		collectd-java.5 collectd-python.5 types.db.5 collectd-threshold.5
 USE_RC_SUBR=	collectd collectdmon
 
 USE_LDCONFIG=	yes
 
+CONFLICTS=	collectd-4.[0-9]*
+
 CPPFLAGS=	-I${LOCALBASE}/include
 
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net-mgmt/collectd5/distinfo b/net-mgmt/collectd5/distinfo
index 7d330eacfb21..ef6d9b81bcfb 100644
--- a/net-mgmt/collectd5/distinfo
+++ b/net-mgmt/collectd5/distinfo
@@ -1,2 +1,2 @@
-SHA256 (collectd-4.10.3.tar.gz) = 69797d19f1782b243d8737072171611ebb16f972dc0021402df66905b8746033
-SIZE (collectd-4.10.3.tar.gz) = 1743443
+SHA256 (collectd-5.0.0.tar.gz) = d2106b2c85d16292b6b8bb9693c99f5659eced35b406da3c67e852100fdee2db
+SIZE (collectd-5.0.0.tar.gz) = 1784800
diff --git a/net-mgmt/collectd5/pkg-plist b/net-mgmt/collectd5/pkg-plist
index 28264480642c..3d11631b4ecc 100644
--- a/net-mgmt/collectd5/pkg-plist
+++ b/net-mgmt/collectd5/pkg-plist
@@ -10,29 +10,15 @@ etc/collectd.conf.sample
 %%CGI%%@exec if [ ! -f %B/collection.conf ] ; then cp -p %B/%f %B/collection.conf; fi
 %%CGI%%@dirrmtry %%WWWDIR%%
 bin/collectd-nagios
-lib/libcollectdclient.la
-lib/libcollectdclient.so
-lib/libcollectdclient.so.0
-%%APACHE%%lib/collectd/apache.la
-%%APACHE%%lib/collectd/apache.so
-%%APCUPS%%lib/collectd/apcups.la
-%%APCUPS%%lib/collectd/apcups.so
-%%BIND%%lib/collectd/bind.la
-%%BIND%%lib/collectd/bind.so
+bin/collectdctl
+include/collectd/client.h
+include/collectd/lcc_features.h
+lib/collectd/bind.la
+lib/collectd/bind.so
 lib/collectd/cpu.la
 lib/collectd/cpu.so
 lib/collectd/csv.la
 lib/collectd/csv.so
-%%CURL%%lib/collectd/curl.la
-%%CURL%%lib/collectd/curl.so
-%%CURL_JSON%%lib/collectd/curl_json.la
-%%CURL_JSON%%lib/collectd/curl_json.so
-%%CURL_XML%%lib/collectd/curl_xml.la
-%%CURL_XML%%lib/collectd/curl_xml.so
-%%DBI%%lib/collectd/dbi.la
-%%DBI%%lib/collectd/dbi.so
-%%DISK%%lib/collectd/disk.la
-%%DISK%%lib/collectd/disk.so
 lib/collectd/df.la
 lib/collectd/df.so
 lib/collectd/dns.la
@@ -41,63 +27,52 @@ lib/collectd/email.la
 lib/collectd/email.so
 lib/collectd/exec.la
 lib/collectd/exec.so
-lib/collectd/filecount.so
 lib/collectd/filecount.la
-%%INTERFACE%%lib/collectd/interface.la
-%%INTERFACE%%lib/collectd/interface.so
+lib/collectd/filecount.so
+lib/collectd/interface.la
+lib/collectd/interface.so
 lib/collectd/load.la
 lib/collectd/load.so
 lib/collectd/logfile.la
 lib/collectd/logfile.so
-%%MBMON%%lib/collectd/mbmon.la
-%%MBMON%%lib/collectd/mbmon.so
-lib/collectd/memcached.so
 lib/collectd/memcached.la
+lib/collectd/memcached.so
 lib/collectd/memory.la
 lib/collectd/memory.so
-%%MYSQL%%lib/collectd/mysql.la
-%%MYSQL%%lib/collectd/mysql.so
-%%NGINX%%lib/collectd/nginx.la
-%%NGINX%%lib/collectd/nginx.so
 lib/collectd/network.la
 lib/collectd/network.so
-%%NUTUPS%%lib/collectd/nut.la
-%%NUTUPS%%lib/collectd/nut.so
 lib/collectd/ntpd.la
 lib/collectd/ntpd.so
-%%OPENVPN%%lib/collectd/openvpn.la
-%%OPENVPN%%lib/collectd/openvpn.so
-%%PGSQL%%lib/collectd/postgresql.la
-%%PGSQL%%lib/collectd/postgresql.so
-%%PING%%lib/collectd/ping.la
-%%PING%%lib/collectd/ping.so
-%%PDNS%%lib/collectd/powerdns.so
-%%PDNS%%lib/collectd/powerdns.la
-lib/collectd/processes.so
+lib/collectd/ping.la
+lib/collectd/ping.so
 lib/collectd/processes.la
-%%RRD%%lib/collectd/rrdtool.la
-%%RRD%%lib/collectd/rrdtool.so
-%%SNMP%%lib/collectd/snmp.la
-%%SNMP%%lib/collectd/snmp.so
+lib/collectd/processes.so
+lib/collectd/rrdtool.la
+lib/collectd/rrdtool.so
+lib/collectd/snmp.la
+lib/collectd/snmp.so
 lib/collectd/swap.la
 lib/collectd/swap.so
 lib/collectd/syslog.la
 lib/collectd/syslog.so
-lib/collectd/tail.so
 lib/collectd/tail.la
-lib/collectd/tcpconns.so
+lib/collectd/tail.so
+lib/collectd/target_v5upgrade.la
+lib/collectd/target_v5upgrade.so
 lib/collectd/tcpconns.la
+lib/collectd/tcpconns.so
+lib/collectd/threshold.la
+lib/collectd/threshold.so
 lib/collectd/unixsock.la
 lib/collectd/unixsock.so
-lib/collectd/uptime.so
 lib/collectd/uptime.la
-lib/collectd/uuid.so
+lib/collectd/uptime.so
 lib/collectd/uuid.la
-include/collectd/client.h
-include/collectd/lcc_features.h
+lib/collectd/uuid.so
+lib/libcollectdclient.la
+lib/libcollectdclient.so
+lib/libcollectdclient.so.0
 libdata/pkgconfig/libcollectdclient.pc
-%%XMMS%%lib/collectd/xmms.la
-%%XMMS%%lib/collectd/xmms.so
 %%DATADIR%%/postgresql_default.conf
 %%DATADIR%%/types.db
 @dirrm lib/collectd