1 files changed, 105 insertions, 81 deletions

diff --git a/net-mgmt/collectd5/pkg-plist b/net-mgmt/collectd5/pkg-plist
index f8dec079d2c5..1cd747a3dd6d 100644
--- a/net-mgmt/collectd5/pkg-plist
+++ b/net-mgmt/collectd5/pkg-plist
@@ -16,126 +16,150 @@ include/collectd/client.h
 include/collectd/lcc_features.h
 include/collectd/network.h
 include/collectd/network_buffer.h
-lib/collectd/aggregation.la
 lib/collectd/aggregation.so
-%%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
-lib/collectd/cpu.la
+lib/collectd/aggregation.la
+%%CURL%%lib/collectd/apache.so
+%%CURL%%lib/collectd/apache.la
+lib/collectd/apcups.so
+lib/collectd/apcups.la
+%%CURL_XML%%lib/collectd/ascent.so
+%%CURL_XML%%lib/collectd/ascent.la
+%%CURL_XML%%lib/collectd/bind.so
+%%CURL_XML%%lib/collectd/bind.la
+lib/collectd/contextswitch.so
+lib/collectd/contextswitch.la
 lib/collectd/cpu.so
-lib/collectd/csv.la
+lib/collectd/cpu.la
 lib/collectd/csv.so
-%%CURL%%lib/collectd/curl.la
+lib/collectd/csv.la
 %%CURL%%lib/collectd/curl.so
-%%CURL_JSON%%lib/collectd/curl_json.la
+%%CURL%%lib/collectd/curl.la
 %%CURL_JSON%%lib/collectd/curl_json.so
-%%CURL_XML%%lib/collectd/curl_xml.la
+%%CURL_JSON%%lib/collectd/curl_json.la
 %%CURL_XML%%lib/collectd/curl_xml.so
-%%DBI%%lib/collectd/dbi.la
+%%CURL_XML%%lib/collectd/curl_xml.la
 %%DBI%%lib/collectd/dbi.so
-%%DISK%%lib/collectd/disk.la
-%%DISK%%lib/collectd/disk.so
-lib/collectd/df.la
+%%DBI%%lib/collectd/dbi.la
 lib/collectd/df.so
-lib/collectd/dns.la
+lib/collectd/df.la
+%%STATGRAB%%lib/collectd/disk.so
+%%STATGRAB%%lib/collectd/disk.la
 lib/collectd/dns.so
-lib/collectd/email.la
+lib/collectd/dns.la
 lib/collectd/email.so
-lib/collectd/exec.la
+lib/collectd/email.la
 lib/collectd/exec.so
-lib/collectd/filecount.la
+lib/collectd/exec.la
 lib/collectd/filecount.so
-%%INTERFACE%%lib/collectd/interface.la
-%%INTERFACE%%lib/collectd/interface.so
-%%IPMI%%lib/collectd/ipmi.la
-%%IPMI%%lib/collectd/ipmi.so
-lib/collectd/load.la
+lib/collectd/filecount.la
+%%STATGRAB%%lib/collectd/interface.so
+%%STATGRAB%%lib/collectd/interface.la
 lib/collectd/load.so
-lib/collectd/logfile.la
+lib/collectd/load.la
 lib/collectd/logfile.so
-%%MODBUS%%lib/collectd/modbus.la
-%%MODBUS%%lib/collectd/modbus.so
-%%MBMON%%lib/collectd/mbmon.la
-%%MBMON%%lib/collectd/mbmon.so
-%%MEMCACHED%%lib/collectd/memcached.la
-%%MEMCACHED%%lib/collectd/memcached.so
-lib/collectd/memory.la
+lib/collectd/logfile.la
+lib/collectd/match_empty_counter.so
+lib/collectd/match_empty_counter.la
+lib/collectd/match_hashed.so
+lib/collectd/match_hashed.la
+lib/collectd/match_regex.so
+lib/collectd/match_regex.la
+lib/collectd/match_timediff.so
+lib/collectd/match_timediff.la
+lib/collectd/match_value.so
+lib/collectd/match_value.la
+lib/collectd/mbmon.so
+lib/collectd/mbmon.la
+%%MEMCACHEC%%lib/collectd/memcachec.so
+%%MEMCACHEC%%lib/collectd/memcachec.la
+lib/collectd/memcached.so
+lib/collectd/memcached.la
 lib/collectd/memory.so
-%%MYSQL%%lib/collectd/mysql.la
+lib/collectd/memory.la
 %%MYSQL%%lib/collectd/mysql.so
-%%NOTIFYEMAIL%%lib/collectd/notify_email.la
-%%NOTIFYEMAIL%%lib/collectd/notify_email.so
-%%NGINX%%lib/collectd/nginx.la
-%%NGINX%%lib/collectd/nginx.so
-lib/collectd/network.la
+%%MYSQL%%lib/collectd/mysql.la
 lib/collectd/network.so
-%%NUTUPS%%lib/collectd/nut.la
-%%NUTUPS%%lib/collectd/nut.so
-lib/collectd/ntpd.la
+lib/collectd/network.la
+%%CURL%%lib/collectd/nginx.so
+%%CURL%%lib/collectd/nginx.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
+lib/collectd/ntpd.la
+%%NUTUPS%%lib/collectd/nut.so
+%%NUTUPS%%lib/collectd/nut.la
+lib/collectd/openvpn.so
+lib/collectd/openvpn.la
 %%PING%%lib/collectd/ping.so
-%%PDNS%%lib/collectd/powerdns.so
-%%PDNS%%lib/collectd/powerdns.la
-%%PYTHON%%lib/collectd/python.la
-%%PYTHON%%lib/collectd/python.so
-lib/collectd/processes.la
+%%PING%%lib/collectd/ping.la
+%%PGSQL%%lib/collectd/postgresql.so
+%%PGSQL%%lib/collectd/postgresql.la
+lib/collectd/powerdns.so
+lib/collectd/powerdns.la
+lib/collectd/pf.so
+lib/collectd/pf.la
 lib/collectd/processes.so
-%%ROUTEROS%%lib/collectd/routeros.la
+lib/collectd/processes.la
+%%REDIS%%lib/collectd/redis.so
+%%REDIS%%lib/collectd/redis.la
 %%ROUTEROS%%lib/collectd/routeros.so
-%%RRD%%lib/collectd/rrdtool.la
-%%RRD%%lib/collectd/rrdtool.so
-%%RRDCACHED%%lib/collectd/rrdcached.la
-%%RRDCACHED%%lib/collectd/rrdcached.so
-%%SNMP%%lib/collectd/snmp.la
+%%ROUTEROS%%lib/collectd/routeros.la
+%%RRDTOOL%%lib/collectd/rrdcached.so
+%%RRDTOOL%%lib/collectd/rrdcached.la
+%%RRDTOOL%%lib/collectd/rrdtool.so
+%%RRDTOOL%%lib/collectd/rrdtool.la
 %%SNMP%%lib/collectd/snmp.so
-lib/collectd/swap.la
+%%SNMP%%lib/collectd/snmp.la
 lib/collectd/swap.so
-lib/collectd/syslog.la
+lib/collectd/swap.la
 lib/collectd/syslog.so
-lib/collectd/tail.la
+lib/collectd/syslog.la
+lib/collectd/table.so
+lib/collectd/table.la
 lib/collectd/tail.so
-lib/collectd/target_v5upgrade.la
+lib/collectd/tail.la
+lib/collectd/target_notification.so
+lib/collectd/target_notification.la
+lib/collectd/target_replace.so
+lib/collectd/target_replace.la
+lib/collectd/target_scale.so
+lib/collectd/target_scale.la
+lib/collectd/target_set.so
+lib/collectd/target_set.la
 lib/collectd/target_v5upgrade.so
-lib/collectd/tcpconns.la
+lib/collectd/target_v5upgrade.la
 lib/collectd/tcpconns.so
-lib/collectd/threshold.la
+lib/collectd/tcpconns.la
+lib/collectd/teamspeak2.so
+lib/collectd/teamspeak2.la
+lib/collectd/ted.so
+lib/collectd/ted.la
 lib/collectd/threshold.so
-%%TABLE%%lib/collectd/table.la
-%%TABLE%%lib/collectd/table.so
-%%TOKYOTYRANT%%lib/collectd/tokyotyrant.la
+lib/collectd/threshold.la
 %%TOKYOTYRANT%%lib/collectd/tokyotyrant.so
-lib/collectd/unixsock.la
+%%TOKYOTYRANT%%lib/collectd/tokyotyrant.la
 lib/collectd/unixsock.so
-lib/collectd/uptime.la
+lib/collectd/unixsock.la
 lib/collectd/uptime.so
-lib/collectd/users.la
+lib/collectd/uptime.la
 lib/collectd/users.so
-lib/collectd/uuid.la
+lib/collectd/users.la
 lib/collectd/uuid.so
-%%VARNISH%%lib/collectd/varnish.la
-%%VARNISH%%lib/collectd/varnish.so
-%%VIRT%%lib/collectd/libvirt.la
+lib/collectd/uuid.la
 %%VIRT%%lib/collectd/libvirt.so
-%%WRITE_GRAPHITE%%lib/collectd/write_graphite.so
-%%WRITE_GRAPHITE%%lib/collectd/write_graphite.la
-lib/collectd/zfs_arc.la
+%%VIRT%%lib/collectd/libvirt.la
+lib/collectd/write_graphite.so
+lib/collectd/write_graphite.la
+%%CURL%%lib/collectd/write_http.so
+%%CURL%%lib/collectd/write_http.la
+%%REDIS%%lib/collectd/write_redis.so
+%%REDIS%%lib/collectd/write_redis.la
+%%XMMS%%lib/collectd/xmms.so
+%%XMMS%%lib/collectd/xmms.la
 lib/collectd/zfs_arc.so
+lib/collectd/zfs_arc.la
 lib/libcollectdclient.la
 lib/libcollectdclient.so
 lib/libcollectdclient.so.1
 libdata/pkgconfig/libcollectdclient.pc
-%%WRITE_HTTP%%lib/collectd/write_http.la
-%%WRITE_HTTP%%lib/collectd/write_http.so
-%%XMMS%%lib/collectd/xmms.la
-%%XMMS%%lib/collectd/xmms.so
 %%DATADIR%%/postgresql_default.conf
 %%DATADIR%%/types.db
 @dirrm lib/collectd