Re: enable tsdb plugin in sysutils/collectd

Or you can just set REVISION to the highest number (4, here) rather than
evaluating all the subpackages. Either works. Ok.

--
Sent from a phone, apologies for poor formatting.

On 15 October 2022 16:50:54 Solene Rapenne <solene@perso.pw> wrote:

> On Sat, Oct 15, 2022 at 02:37:14PM +0000, Klemens Nanni wrote:
>> On Sat, Oct 15, 2022 at 04:26:59PM +0200, Solene Rapenne wrote:
>>> I've run update-plist which seems to have upgraded a few PLIST
>>> files while there
>>
>>> @@ -30,7 +30,7 @@ PKGNAME-redis = collectd-redis-$V
>>> PKGNAME-prometheus = collectd-prometheus-$V
>>> PKGNAME-ping = collectd-ping-$V
>>> CATEGORIES = sysutils
>>> -REVISION-main = 1
>>> +REVISION-main = 2
>>
>> Then you need to bump every REVISION-* for which you changed PLIST-*.
>
> indeed
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/collectd/Makefile,v
> retrieving revision 1.71
> diff -u -p -r1.71 Makefile
> --- Makefile 24 May 2022 18:51:25 -0000 1.71
> +++ Makefile 15 Oct 2022 15:49:28 -0000
> @@ -30,20 +30,20 @@ PKGNAME-redis = collectd-redis-$V
> PKGNAME-prometheus = collectd-prometheus-$V
> PKGNAME-ping = collectd-ping-$V
> CATEGORIES = sysutils
> -REVISION-main = 1
> -REVISION-memcachec = 1
> -REVISION-mqtt = 0
> -REVISION-mysql = 1
> -REVISION-nut = 2
> -REVISION-pgsql = 0
> -REVISION-ping = 0
> -REVISION-prometheus = 3
> -REVISION-python = 2
> -REVISION-redis = 0
> -REVISION-riemann = 3
> -REVISION-rrdtool = 3
> -REVISION-snmp = 0
> -REVISION-virt = 3
> +REVISION-main = 2
> +REVISION-memcachec = 2
> +REVISION-mqtt = 1
> +REVISION-mysql = 2
> +REVISION-nut = 3
> +REVISION-pgsql = 1
> +REVISION-ping = 1
> +REVISION-prometheus = 4
> +REVISION-python = 3
> +REVISION-redis = 1
> +REVISION-riemann = 4
> +REVISION-rrdtool = 4
> +REVISION-snmp = 1
> +REVISION-virt = 4
>
> HOMEPAGE = http://www.collectd.org/
> SHARED_LIBS += collectdclient 1.0
> @@ -156,7 +156,7 @@ ENABLED_PLUGINS = apache apcups ascent b
> target_set target_v5upgrade tcpconns teamspeak2 ted unixsock uptime \
> users uuid write_http write_graphite pf python virt memcachec nut \
> aggregation curl_json log_logstash memcached mqtt \
> - threshold write_log write_prometheus write_redis write_riemann
> + threshold write_log write_prometheus write_redis write_riemann write_tsdb
>
> .for _plugin in ${ENABLED_PLUGINS}
> CONFIGURE_ARGS += --enable-${_plugin}
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/sysutils/collectd/pkg/PLIST-main,v
> retrieving revision 1.15
> diff -u -p -r1.15 PLIST-main
> --- pkg/PLIST-main 11 Mar 2022 19:57:17 -0000 1.15
> +++ pkg/PLIST-main 15 Oct 2022 15:49:28 -0000
> @@ -13,62 +13,63 @@ include/collectd/network_parse.h
> include/collectd/server.h
> include/collectd/types.h
> lib/collectd/
> -lib/collectd/aggregation.so
> -lib/collectd/apache.so
> -lib/collectd/apcups.so
> -lib/collectd/ascent.so
> -lib/collectd/bind.so
> -lib/collectd/cpu.so
> -lib/collectd/csv.so
> -lib/collectd/curl.so
> -lib/collectd/curl_json.so
> -lib/collectd/curl_xml.so
> -lib/collectd/df.so
> -lib/collectd/disk.so
> -lib/collectd/dns.so
> -lib/collectd/email.so
> -lib/collectd/exec.so
> -lib/collectd/filecount.so
> -lib/collectd/interface.so
> -lib/collectd/load.so
> -lib/collectd/log_logstash.so
> -lib/collectd/logfile.so
> -lib/collectd/match_empty_counter.so
> -lib/collectd/match_hashed.so
> -lib/collectd/match_regex.so
> -lib/collectd/match_timediff.so
> -lib/collectd/match_value.so
> -lib/collectd/memcached.so
> -lib/collectd/memory.so
> -lib/collectd/network.so
> -lib/collectd/nginx.so
> -lib/collectd/ntpd.so
> -lib/collectd/olsrd.so
> -lib/collectd/openvpn.so
> -lib/collectd/pf.so
> -lib/collectd/powerdns.so
> -lib/collectd/processes.so
> -lib/collectd/swap.so
> -lib/collectd/syslog.so
> -lib/collectd/table.so
> -lib/collectd/tail.so
> -lib/collectd/tail_csv.so
> -lib/collectd/target_notification.so
> -lib/collectd/target_replace.so
> -lib/collectd/target_scale.so
> -lib/collectd/target_set.so
> -lib/collectd/target_v5upgrade.so
> -lib/collectd/tcpconns.so
> -lib/collectd/teamspeak2.so
> -lib/collectd/ted.so
> -lib/collectd/threshold.so
> -lib/collectd/unixsock.so
> -lib/collectd/uptime.so
> -lib/collectd/users.so
> -lib/collectd/uuid.so
> -lib/collectd/write_graphite.so
> -lib/collectd/write_http.so
> -lib/collectd/write_log.so
> +@so lib/collectd/aggregation.so
> +@so lib/collectd/apache.so
> +@so lib/collectd/apcups.so
> +@so lib/collectd/ascent.so
> +@so lib/collectd/bind.so
> +@so lib/collectd/cpu.so
> +@so lib/collectd/csv.so
> +@so lib/collectd/curl.so
> +@so lib/collectd/curl_json.so
> +@so lib/collectd/curl_xml.so
> +@so lib/collectd/df.so
> +@so lib/collectd/disk.so
> +@so lib/collectd/dns.so
> +@so lib/collectd/email.so
> +@so lib/collectd/exec.so
> +@so lib/collectd/filecount.so
> +@so lib/collectd/interface.so
> +@so lib/collectd/load.so
> +@so lib/collectd/log_logstash.so
> +@so lib/collectd/logfile.so
> +@so lib/collectd/match_empty_counter.so
> +@so lib/collectd/match_hashed.so
> +@so lib/collectd/match_regex.so
> +@so lib/collectd/match_timediff.so
> +@so lib/collectd/match_value.so
> +@so lib/collectd/memcached.so
> +@so lib/collectd/memory.so
> +@so lib/collectd/network.so
> +@so lib/collectd/nginx.so
> +@so lib/collectd/ntpd.so
> +@so lib/collectd/olsrd.so
> +@so lib/collectd/openvpn.so
> +@so lib/collectd/pf.so
> +@so lib/collectd/powerdns.so
> +@so lib/collectd/processes.so
> +@so lib/collectd/swap.so
> +@so lib/collectd/syslog.so
> +@so lib/collectd/table.so
> +@so lib/collectd/tail.so
> +@so lib/collectd/tail_csv.so
> +@so lib/collectd/target_notification.so
> +@so lib/collectd/target_replace.so
> +@so lib/collectd/target_scale.so
> +@so lib/collectd/target_set.so
> +@so lib/collectd/target_v5upgrade.so
> +@so lib/collectd/tcpconns.so
> +@so lib/collectd/teamspeak2.so
> +@so lib/collectd/ted.so
> +@so lib/collectd/threshold.so
> +@so lib/collectd/unixsock.so
> +@so lib/collectd/uptime.so
> +@so lib/collectd/users.so
> +@so lib/collectd/uuid.so
> +@so lib/collectd/write_graphite.so
> +@so lib/collectd/write_http.so
> +@so lib/collectd/write_log.so
> +@so lib/collectd/write_tsdb.so
> @comment lib/libcollectdclient.la
> @lib lib/libcollectdclient.so.${LIBcollectdclient_VERSION}
> lib/pkgconfig/libcollectdclient.pc
> Index: pkg/PLIST-memcachec
> ===================================================================
> RCS file: /cvs/ports/sysutils/collectd/pkg/PLIST-memcachec,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST-memcachec
> --- pkg/PLIST-memcachec 11 Mar 2022 19:57:17 -0000 1.3
> +++ pkg/PLIST-memcachec 15 Oct 2022 15:49:28 -0000
> @@ -1 +1 @@
> -lib/collectd/memcachec.so
> +@so lib/collectd/memcachec.so
> Index: pkg/PLIST-mqtt
> ===================================================================
> RCS file: /cvs/ports/sysutils/collectd/pkg/PLIST-mqtt,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST-mqtt
> --- pkg/PLIST-mqtt 11 Mar 2022 19:57:17 -0000 1.2
> +++ pkg/PLIST-mqtt 15 Oct 2022 15:49:28 -0000
> @@ -1 +1 @@
> -lib/collectd/mqtt.so
> +@so lib/collectd/mqtt.so
> Index: pkg/PLIST-mysql
> ===================================================================
> RCS file: /cvs/ports/sysutils/collectd/pkg/PLIST-mysql,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST-mysql
> --- pkg/PLIST-mysql 11 Mar 2022 19:57:17 -0000 1.4
> +++ pkg/PLIST-mysql 15 Oct 2022 15:49:28 -0000
> @@ -1 +1 @@
> -lib/collectd/mysql.so
> +@so lib/collectd/mysql.so
> Index: pkg/PLIST-nut
> ===================================================================
> RCS file: /cvs/ports/sysutils/collectd/pkg/PLIST-nut,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST-nut
> --- pkg/PLIST-nut 11 Mar 2022 19:57:17 -0000 1.3
> +++ pkg/PLIST-nut 15 Oct 2022 15:49:28 -0000
> @@ -1 +1 @@
> -lib/collectd/nut.so
> +@so lib/collectd/nut.so
> Index: pkg/PLIST-pgsql
> ===================================================================
> RCS file: /cvs/ports/sysutils/collectd/pkg/PLIST-pgsql,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST-pgsql
> --- pkg/PLIST-pgsql 11 Mar 2022 19:57:17 -0000 1.4
> +++ pkg/PLIST-pgsql 15 Oct 2022 15:49:28 -0000
> @@ -1 +1 @@
> -lib/collectd/postgresql.so
> +@so lib/collectd/postgresql.so
> Index: pkg/PLIST-ping
> ===================================================================
> RCS file: /cvs/ports/sysutils/collectd/pkg/PLIST-ping,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST-ping
> --- pkg/PLIST-ping 11 Mar 2022 19:57:17 -0000 1.2
> +++ pkg/PLIST-ping 15 Oct 2022 15:49:28 -0000
> @@ -1 +1 @@
> -lib/collectd/ping.so
> +@so lib/collectd/ping.so
> Index: pkg/PLIST-prometheus
> ===================================================================
> RCS file: /cvs/ports/sysutils/collectd/pkg/PLIST-prometheus,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST-prometheus
> --- pkg/PLIST-prometheus 11 Mar 2022 19:57:17 -0000 1.2
> +++ pkg/PLIST-prometheus 15 Oct 2022 15:49:28 -0000
> @@ -1 +1 @@
> -lib/collectd/write_prometheus.so
> +@so lib/collectd/write_prometheus.so
> Index: pkg/PLIST-python
> ===================================================================
> RCS file: /cvs/ports/sysutils/collectd/pkg/PLIST-python,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST-python
> --- pkg/PLIST-python 11 Mar 2022 19:57:17 -0000 1.3
> +++ pkg/PLIST-python 15 Oct 2022 15:49:28 -0000
> @@ -1 +1 @@
> -lib/collectd/python.so
> +@so lib/collectd/python.so
> Index: pkg/PLIST-redis
> ===================================================================
> RCS file: /cvs/ports/sysutils/collectd/pkg/PLIST-redis,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST-redis
> --- pkg/PLIST-redis 11 Mar 2022 19:57:17 -0000 1.2
> +++ pkg/PLIST-redis 15 Oct 2022 15:49:28 -0000
> @@ -1,2 +1,2 @@
> -lib/collectd/redis.so
> -lib/collectd/write_redis.so
> +@so lib/collectd/redis.so
> +@so lib/collectd/write_redis.so
> Index: pkg/PLIST-riemann
> ===================================================================
> RCS file: /cvs/ports/sysutils/collectd/pkg/PLIST-riemann,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST-riemann
> --- pkg/PLIST-riemann 11 Mar 2022 19:57:17 -0000 1.3
> +++ pkg/PLIST-riemann 15 Oct 2022 15:49:28 -0000
> @@ -1 +1 @@
> -lib/collectd/write_riemann.so
> +@so lib/collectd/write_riemann.so
> Index: pkg/PLIST-rrdtool
> ===================================================================
> RCS file: /cvs/ports/sysutils/collectd/pkg/PLIST-rrdtool,v
> retrieving revision 1.6
> diff -u -p -r1.6 PLIST-rrdtool
> --- pkg/PLIST-rrdtool 11 Mar 2022 19:57:17 -0000 1.6
> +++ pkg/PLIST-rrdtool 15 Oct 2022 15:49:28 -0000
> @@ -1,2 +1,2 @@
> -lib/collectd/rrdcached.so
> -lib/collectd/rrdtool.so
> +@so lib/collectd/rrdcached.so
> +@so lib/collectd/rrdtool.so
> Index: pkg/PLIST-snmp
> ===================================================================
> RCS file: /cvs/ports/sysutils/collectd/pkg/PLIST-snmp,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST-snmp
> --- pkg/PLIST-snmp 11 Mar 2022 19:57:17 -0000 1.4
> +++ pkg/PLIST-snmp 15 Oct 2022 15:49:28 -0000
> @@ -1,3 +1,3 @@
> -lib/collectd/snmp.so
> -lib/collectd/snmp_agent.so
> +@so lib/collectd/snmp.so
> +@so lib/collectd/snmp_agent.so
> @man man/man5/collectd-snmp.5
> Index: pkg/PLIST-virt
> ===================================================================
> RCS file: /cvs/ports/sysutils/collectd/pkg/PLIST-virt,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST-virt
> --- pkg/PLIST-virt 11 Mar 2022 19:57:17 -0000 1.4
> +++ pkg/PLIST-virt 15 Oct 2022 15:49:28 -0000
> @@ -1 +1 @@
> -lib/collectd/virt.so
> +@so lib/collectd/virt.so