pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/sysutils
Module Name: pkgsrc
Committed By: wiz
Date: Sat Oct 24 22:39:49 UTC 2020
Modified Files:
pkgsrc/sysutils/collectd: Makefile Makefile.common PLIST distinfo
options.mk
pkgsrc/sysutils/collectd-amqp: Makefile
pkgsrc/sysutils/collectd-curl: DESCR Makefile
pkgsrc/sysutils/collectd-dbi: Makefile
pkgsrc/sysutils/collectd-dns: Makefile
pkgsrc/sysutils/collectd-lua: Makefile
pkgsrc/sysutils/collectd-mysql: Makefile
pkgsrc/sysutils/collectd-network: Makefile
pkgsrc/sysutils/collectd-notify-email: Makefile
pkgsrc/sysutils/collectd-postgresql: Makefile
pkgsrc/sysutils/collectd-riemann: Makefile
pkgsrc/sysutils/collectd-rrdtool: Makefile
pkgsrc/sysutils/collectd-snmp: Makefile
pkgsrc/sysutils/collectd-write_prometheus: Makefile
pkgsrc/sysutils/collectd/patches: patch-Makefile.am patch-configure.ac
patch-src_bind.c patch-src_collectd.conf.in patch-src_cpu.c
patch-src_df.c patch-src_entropy.c patch-src_irq.c
patch-src_memory.c patch-src_netstat__udp.c patch-src_processes.c
patch-src_swap.c patch-src_tcpconns.c
Added Files:
pkgsrc/sysutils/collectd-CGP: DESCR Makefile PLIST distinfo
pkgsrc/sysutils/collectd-gmond: DESCR Makefile
pkgsrc/sysutils/collectd-gps: DESCR Makefile
pkgsrc/sysutils/collectd-grpc: DESCR Makefile
pkgsrc/sysutils/collectd-haproxy: DESCR Makefile PLIST distinfo
pkgsrc/sysutils/collectd-kafka: DESCR Makefile
pkgsrc/sysutils/collectd-memcachec: DESCR Makefile
pkgsrc/sysutils/collectd-mongodb: DESCR Makefile
pkgsrc/sysutils/collectd-notify_desktop: DESCR Makefile
pkgsrc/sysutils/collectd-nut: DESCR Makefile
pkgsrc/sysutils/collectd-openldap: DESCR Makefile
pkgsrc/sysutils/collectd-pinba: DESCR Makefile
pkgsrc/sysutils/collectd-redis: DESCR Makefile
pkgsrc/sysutils/collectd-tokyotyrant: DESCR Makefile
pkgsrc/sysutils/collectd-varnish: DESCR Makefile
pkgsrc/sysutils/collectd-virt: DESCR Makefile
pkgsrc/sysutils/collectd-web: DESCR Makefile PLIST distinfo
pkgsrc/sysutils/collectd-xen: DESCR Makefile
pkgsrc/sysutils/collectd-xmms: DESCR Makefile
pkgsrc/sysutils/collectd-yajl: DESCR Makefile
pkgsrc/sysutils/collectd/patches:
patch-src_libcollectdclient_network__buffer.c patch-src_nfs.c
patch-src_utils_dns_dns.c
patch-src_utils_format__kairosdb_format__kairosdb.c
Removed Files:
pkgsrc/sysutils/collectd-memcached: DESCR Makefile
pkgsrc/sysutils/collectd/patches: patch-src_daemon_collectd.c
patch-src_daemon_common.h patch-src_disk.c
patch-src_libcollectclient_network__buffer.c patch-src_lua.c
patch-src_utils__dns.c patch-src_utils__format__kairosdb.c
Log Message:
collectd: update to 5.11.0
Provided by Edgar Fuß via pkgsrc-wip.
Changes not found, but more plugins added.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/sysutils/collectd/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/sysutils/collectd/Makefile.common
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/collectd/PLIST
cvs rdiff -u -r1.45 -r1.46 pkgsrc/sysutils/collectd/distinfo
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/collectd/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/collectd-CGP/DESCR \
pkgsrc/sysutils/collectd-CGP/Makefile pkgsrc/sysutils/collectd-CGP/PLIST \
pkgsrc/sysutils/collectd-CGP/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/collectd-amqp/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/collectd-curl/DESCR
cvs rdiff -u -r1.27 -r1.28 pkgsrc/sysutils/collectd-curl/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/collectd-dbi/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/collectd-dns/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/collectd-gmond/DESCR \
pkgsrc/sysutils/collectd-gmond/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/collectd-gps/DESCR \
pkgsrc/sysutils/collectd-gps/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/collectd-grpc/DESCR \
pkgsrc/sysutils/collectd-grpc/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/collectd-haproxy/DESCR \
pkgsrc/sysutils/collectd-haproxy/Makefile \
pkgsrc/sysutils/collectd-haproxy/PLIST \
pkgsrc/sysutils/collectd-haproxy/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/collectd-kafka/DESCR \
pkgsrc/sysutils/collectd-kafka/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/collectd-lua/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/collectd-memcachec/DESCR \
pkgsrc/sysutils/collectd-memcachec/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/sysutils/collectd-memcached/DESCR
cvs rdiff -u -r1.4 -r0 pkgsrc/sysutils/collectd-memcached/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/collectd-mongodb/DESCR \
pkgsrc/sysutils/collectd-mongodb/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/collectd-mysql/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/collectd-network/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/collectd-notify-email/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/collectd-notify_desktop/DESCR \
pkgsrc/sysutils/collectd-notify_desktop/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/collectd-nut/DESCR \
pkgsrc/sysutils/collectd-nut/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/collectd-openldap/DESCR \
pkgsrc/sysutils/collectd-openldap/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/collectd-pinba/DESCR \
pkgsrc/sysutils/collectd-pinba/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/collectd-postgresql/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/collectd-redis/DESCR \
pkgsrc/sysutils/collectd-redis/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/collectd-riemann/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/sysutils/collectd-rrdtool/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/collectd-snmp/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/collectd-tokyotyrant/DESCR \
pkgsrc/sysutils/collectd-tokyotyrant/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/collectd-varnish/DESCR \
pkgsrc/sysutils/collectd-varnish/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/collectd-virt/DESCR \
pkgsrc/sysutils/collectd-virt/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/collectd-web/DESCR \
pkgsrc/sysutils/collectd-web/Makefile pkgsrc/sysutils/collectd-web/PLIST \
pkgsrc/sysutils/collectd-web/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/sysutils/collectd-write_prometheus/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/collectd-xen/DESCR \
pkgsrc/sysutils/collectd-xen/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/collectd-xmms/DESCR \
pkgsrc/sysutils/collectd-xmms/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/collectd-yajl/DESCR \
pkgsrc/sysutils/collectd-yajl/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/collectd/patches/patch-Makefile.am \
pkgsrc/sysutils/collectd/patches/patch-src_cpu.c
cvs rdiff -u -r1.12 -r1.13 \
pkgsrc/sysutils/collectd/patches/patch-configure.ac
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/collectd/patches/patch-src_bind.c \
pkgsrc/sysutils/collectd/patches/patch-src_netstat__udp.c
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/sysutils/collectd/patches/patch-src_collectd.conf.in
cvs rdiff -u -r1.1 -r0 \
pkgsrc/sysutils/collectd/patches/patch-src_daemon_collectd.c \
pkgsrc/sysutils/collectd/patches/patch-src_daemon_common.h
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/collectd/patches/patch-src_df.c \
pkgsrc/sysutils/collectd/patches/patch-src_irq.c \
pkgsrc/sysutils/collectd/patches/patch-src_memory.c \
pkgsrc/sysutils/collectd/patches/patch-src_swap.c
cvs rdiff -u -r1.3 -r0 pkgsrc/sysutils/collectd/patches/patch-src_disk.c \
pkgsrc/sysutils/collectd/patches/patch-src_utils__dns.c
cvs rdiff -u -r1.10 -r1.11 \
pkgsrc/sysutils/collectd/patches/patch-src_entropy.c
cvs rdiff -u -r1.4 -r0 \
pkgsrc/sysutils/collectd/patches/patch-src_libcollectclient_network__buffer.c \
pkgsrc/sysutils/collectd/patches/patch-src_utils__format__kairosdb.c
cvs rdiff -u -r0 -r1.1 \
pkgsrc/sysutils/collectd/patches/patch-src_libcollectdclient_network__buffer.c \
pkgsrc/sysutils/collectd/patches/patch-src_nfs.c \
pkgsrc/sysutils/collectd/patches/patch-src_utils_dns_dns.c \
pkgsrc/sysutils/collectd/patches/patch-src_utils_format__kairosdb_format__kairosdb.c
cvs rdiff -u -r1.2 -r0 pkgsrc/sysutils/collectd/patches/patch-src_lua.c
cvs rdiff -u -r1.8 -r1.9 \
pkgsrc/sysutils/collectd/patches/patch-src_processes.c
cvs rdiff -u -r1.7 -r1.8 \
pkgsrc/sysutils/collectd/patches/patch-src_tcpconns.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/sysutils/collectd/Makefile
diff -u pkgsrc/sysutils/collectd/Makefile:1.27 pkgsrc/sysutils/collectd/Makefile:1.28
--- pkgsrc/sysutils/collectd/Makefile:1.27 Mon Aug 31 18:11:24 2020
+++ pkgsrc/sysutils/collectd/Makefile Sat Oct 24 22:39:45 2020
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2020/08/31 18:11:24 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2020/10/24 22:39:45 wiz Exp $
.include "../../sysutils/collectd/Makefile.common"
-PKGREVISION= 5
-
COMMENT= Statistics collection daemon base
RCD_SCRIPTS= collectd
@@ -11,21 +9,21 @@ RCD_SCRIPTS= collectd
.include "../../mk/bsd.prefs.mk"
# Simple plugins that have no dependencies
-DEFAULT_PLUGINS+= aggregation apcups csv email exec filecount \
- hddtemp logfile match_empty_counter match_hashed\
- match_regex match_timediff match_value mbmon \
- ntpd olsrd openvpn powerdns statsd table tail \
- tail_csv target_notification target_replace \
- target_scale target_set target_v5upgrade \
- teamspeak2 threshold unixsock uuid write_graphite
+DEFAULT_PLUGINS= aggregation apcups check_uptime chrony csv \
+ email exec filecount hddtemp logfile logparser \
+ match_empty_counter match_hashed match_regex \
+ match_timediff match_value mbmon memcached \
+ notify_nagios ntpd olsrd openvpn powerdns \
+ statsd table tail tail_csv target_notification \
+ target_replace target_scale target_set \
+ target_v5upgrade teamspeak2 threshold unixsock \
+ uuid write_graphite write_influxdb_udp write_log\
+ write_sensu write_syslog write_tsdb zookeeper
.for option in ${DEFAULT_PLUGINS}
CONFIGURE_ARGS+= --enable-${option}
.endfor
-# Several libs not generated in time for linking collectd
-MAKE_JOBS_SAFE= no
-
INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/collectd
.include "options.mk"
Index: pkgsrc/sysutils/collectd/Makefile.common
diff -u pkgsrc/sysutils/collectd/Makefile.common:1.24 pkgsrc/sysutils/collectd/Makefile.common:1.25
--- pkgsrc/sysutils/collectd/Makefile.common:1.24 Tue Jun 2 11:12:05 2020
+++ pkgsrc/sysutils/collectd/Makefile.common Sat Oct 24 22:39:45 2020
@@ -1,23 +1,40 @@
-# $NetBSD: Makefile.common,v 1.24 2020/06/02 11:12:05 nia Exp $
+# $NetBSD: Makefile.common,v 1.25 2020/10/24 22:39:45 wiz Exp $
#
# used by sysutils/collectd/Makefile
# used by sysutils/collectd-amqp/Makefile
# used by sysutils/collectd-curl/Makefile
# used by sysutils/collectd-dbi/Makefile
# used by sysutils/collectd-dns/Makefile
-# used by sysutils/collectd-memcached/Makefile
+# used by sysutils/collectd-gmond/Makefile
+# used by sysutils/collectd-gps/Makefile
+# used by sysutils/collectd-grpc/Makefile
+# used by sysutils/collectd-kafka/Makefile
+# used by sysutils/collectd-lua/Makefile
+# used by sysutils/collectd-memcachec/Makefile
+# used by sysutils/collectd-mongodb/Makefile
# used by sysutils/collectd-mysql/Makefile
# used by sysutils/collectd-network/Makefile
+# used by sysutils/collectd-notify_desktop/Makefile
# used by sysutils/collectd-notify-email/Makefile
+# used by sysutils/collectd-nut/Makefile
+# used by sysutils/collectd-openldap/Makefile
+# used by sysutils/collectd-pinba/Makefile
# used by sysutils/collectd-postgresql/Makefile
+# used by sysutils/collectd-redis/Makefile
# used by sysutils/collectd-riemann/Makefile
# used by sysutils/collectd-rrdtool/Makefile
# used by sysutils/collectd-snmp/Makefile
+# used by sysutils/collectd-tokyotyrant/Makefile
+# used by sysutils/collectd-varnish/Makefile
+# used by sysutils/collectd-virt/Makefile
# used by sysutils/collectd-write_prometheus/Makefile
+# used by sysutils/collectd-xen/Makefile
+# used by sysutils/collectd-xmms/Makefile
+# used by sysutils/collectd-yajl/Makefile
# used by sysutils/p5-collectd/Makefile
# used by sysutils/py-collectd/Makefile
-DISTNAME= collectd-5.8.0
+DISTNAME= collectd-5.11.0
MASTER_SITES= http://collectd.org/files/
CATEGORIES= sysutils
EXTRACT_SUFX= .tar.bz2
@@ -54,22 +71,29 @@ GENERATE_PLIST+= ${ECHO} "lib/collectd/$
BUILD_DEFS+= VARBASE
-# Disable all libs support by default
-DISABLED_LIBS= aquaero5 credis curl dbi esmtp ganglia gcrypt \
- iptc lvm2app memcached mnl modbus mongoc mysql \
- netsnmp notify oping owcapi pcap perl pq \
- rabbitmq routeros rrd sensors sigrok statgrab \
- tokyotyrant upsclient varnish xml2 xmms yajl
-CONFIGURE_ARGS+= --with-java=no --with-mic=no --with-oracle=no \
- --with-perl-bindings=no --with-python=no \
+# special case for grpc++ below
+COLLECTD_LIBS= aquaero5 atasmart curl dbi dpdk esmtp ganglia \
+ gcrypt gps hiredis iptc iptc jansson jevents \
+ ldap memcached microhttpd mnl modbus mongoc \
+ mosquitto mysql netapp netsnmp netsnmpagent \
+ oping owcapi pcap perl pq pqos protobuf \
+ protobuf-c python qpid-proton rabbitmq rdkafka \
+ routeros rrd sensors slurm ssl statgra \
+ tokyotyrant udev upsclient varnish xenctrl xmms \
+ yajl
+
+CONFIGURE_ARGS+= --with-cuda=no --with-java=no --with-mic=no \
+ --with-oracle=no --with-perl-bindings=no \
--disable-all-plugins
-.for lib in ${DISABLED_LIBS}
-CONFIGURE_ARGS+= --with-lib${lib}=no
+
+.for lib in ${COLLECTD_LIBS}
+CONFIGURE_ARGS+= --with-lib${lib}=${COLLECTD_LIB.${lib}:Uno}
.endfor
+# can't use ENABLE_LIB.grpc++ as a variable name
+CONFIGURE_ARGS+= --with-libgrpc++=${COLLECTD_LIB.grpcpp:Uno}
+
CONFIGURE_ARGS+= --disable-werror
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
-CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
-CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
CONFIGURE_ARGS.NetBSD+= ac_cv_func_getfsstat=no
# aarch64 accidentally had this function for a bit.
@@ -86,5 +110,4 @@ SUBST_SED.ver= -e 's,m4_esyscmd(./versi
pre-configure:
cd ${WRKSRC} && autoreconf
-.include "../../devel/libltdl/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
Index: pkgsrc/sysutils/collectd/PLIST
diff -u pkgsrc/sysutils/collectd/PLIST:1.8 pkgsrc/sysutils/collectd/PLIST:1.9
--- pkgsrc/sysutils/collectd/PLIST:1.8 Tue Nov 21 15:18:22 2017
+++ pkgsrc/sysutils/collectd/PLIST Sat Oct 24 22:39:45 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2017/11/21 15:18:22 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.9 2020/10/24 22:39:45 wiz Exp $
bin/collectd-nagios
bin/collectd-tg
bin/collectdctl
@@ -11,40 +11,46 @@ include/collectd/server.h
include/collectd/types.h
lib/collectd/aggregation.la
lib/collectd/apcups.la
-${PLIST.apple-sensors}lib/collectd/apple_sensors.la
-${PLIST.battery}lib/collectd/battery.la
-${PLIST.contextswitch}lib/collectd/contextswitch.la
-${PLIST.cpu}lib/collectd/cpu.la
+${PLIST.collectd-apple-sensors}lib/collectd/apple_sensors.la
+${PLIST.collectd-battery}lib/collectd/battery.la
+lib/collectd/check_uptime.la
+lib/collectd/chrony.la
+${PLIST.collectd-contextswitch}lib/collectd/contextswitch.la
+${PLIST.collectd-cpu}lib/collectd/cpu.la
lib/collectd/csv.la
-${PLIST.df}lib/collectd/df.la
-${PLIST.disk}lib/collectd/disk.la
+${PLIST.collectd-df}lib/collectd/df.la
+${PLIST.collectd-disk}lib/collectd/disk.la
lib/collectd/email.la
-${PLIST.entropy}lib/collectd/entropy.la
+${PLIST.collectd-entropy}lib/collectd/entropy.la
lib/collectd/exec.la
lib/collectd/filecount.la
lib/collectd/hddtemp.la
-${PLIST.interface}lib/collectd/interface.la
-${PLIST.irq}lib/collectd/irq.la
-${PLIST.load}lib/collectd/load.la
+${PLIST.collectd-interface}lib/collectd/interface.la
+${PLIST.collectd-irq}lib/collectd/irq.la
+${PLIST.collectd-load}lib/collectd/load.la
lib/collectd/logfile.la
+lib/collectd/logparser.la
lib/collectd/match_empty_counter.la
lib/collectd/match_hashed.la
lib/collectd/match_regex.la
lib/collectd/match_timediff.la
lib/collectd/match_value.la
lib/collectd/mbmon.la
-${PLIST.memory}lib/collectd/memory.la
-${PLIST.netstat_udp}lib/collectd/netstat_udp.la
-${PLIST.nfs}lib/collectd/nfs.la
+lib/collectd/memcached.la
+${PLIST.collectd-memory}lib/collectd/memory.la
+${PLIST.collectd-multimeter}lib/collectd/multimeter.la
+${PLIST.collectd-netstat-udp}lib/collectd/netstat_udp.la
+${PLIST.collectd-nfs}lib/collectd/nfs.la
+lib/collectd/notify_nagios.la
lib/collectd/ntpd.la
lib/collectd/olsrd.la
lib/collectd/openvpn.la
-${PLIST.pf}lib/collectd/pf.la
+${PLIST.collectd-pf}lib/collectd/pf.la
lib/collectd/powerdns.la
-${PLIST.processes}lib/collectd/processes.la
+${PLIST.collectd-processes}lib/collectd/processes.la
lib/collectd/statsd.la
-${PLIST.swap}lib/collectd/swap.la
-${PLIST.syslog}lib/collectd/syslog.la
+${PLIST.collectd-swap}lib/collectd/swap.la
+${PLIST.collectd-syslog}lib/collectd/syslog.la
lib/collectd/table.la
lib/collectd/tail.la
lib/collectd/tail_csv.la
@@ -53,16 +59,23 @@ lib/collectd/target_replace.la
lib/collectd/target_scale.la
lib/collectd/target_set.la
lib/collectd/target_v5upgrade.la
-${PLIST.tcpconns}lib/collectd/tcpconns.la
+${PLIST.collectd-tcpconns}lib/collectd/tcpconns.la
lib/collectd/teamspeak2.la
+${PLIST.collectd-ted}lib/collectd/ted.la
lib/collectd/threshold.la
lib/collectd/unixsock.la
-${PLIST.uptime}lib/collectd/uptime.la
-${PLIST.users}lib/collectd/users.la
+${PLIST.collectd-uptime}lib/collectd/uptime.la
+${PLIST.collectd-users}lib/collectd/users.la
lib/collectd/uuid.la
lib/collectd/write_graphite.la
-${PLIST.zfs-arc}lib/collectd/zfs_arc.la
-${PLIST.zone}lib/collectd/zone.la
+lib/collectd/write_influxdb_udp.la
+lib/collectd/write_log.la
+lib/collectd/write_sensu.la
+lib/collectd/write_syslog.la
+lib/collectd/write_tsdb.la
+${PLIST.collectd-zfs-arc}lib/collectd/zfs_arc.la
+${PLIST.collectd-zone}lib/collectd/zone.la
+lib/collectd/zookeeper.la
lib/libcollectdclient.la
lib/pkgconfig/libcollectdclient.pc
man/man1/collectd-nagios.1
Index: pkgsrc/sysutils/collectd/distinfo
diff -u pkgsrc/sysutils/collectd/distinfo:1.45 pkgsrc/sysutils/collectd/distinfo:1.46
--- pkgsrc/sysutils/collectd/distinfo:1.45 Sun Jul 5 13:57:32 2020
+++ pkgsrc/sysutils/collectd/distinfo Sat Oct 24 22:39:45 2020
@@ -1,27 +1,24 @@
-$NetBSD: distinfo,v 1.45 2020/07/05 13:57:32 he Exp $
+$NetBSD: distinfo,v 1.46 2020/10/24 22:39:45 wiz Exp $
-SHA1 (collectd-5.8.0.tar.bz2) = eb3567563de471e1950b7388e8883b911be3756a
-RMD160 (collectd-5.8.0.tar.bz2) = 7b812b1046d57a9047213bb182b8744d98606547
-SHA512 (collectd-5.8.0.tar.bz2) = 1b3d0cc44e2ca54e13eebf292074f1efa8b33d6800d04405e0eaaa2dd1cb2416c6eae580729fb5aead23a5039f41ffe8a9989a907a8c18be8f867f1099fc0008
-Size (collectd-5.8.0.tar.bz2) = 1686017 bytes
-SHA1 (patch-Makefile.am) = 0fb4b20d995cd63943b8a826cc166db1b4f36132
-SHA1 (patch-configure.ac) = a98505a285635e54810597604c610541f4cdb5e3
-SHA1 (patch-src_bind.c) = 4aa7742c8e24ee6bd7293abc56fc95a605d0a2c7
-SHA1 (patch-src_collectd.conf.in) = f0b35085cf0ddfd766e140b145177ab1f1326f5f
-SHA1 (patch-src_cpu.c) = e645ae6b05c051c3c878f88a493fbbd7d548bb66
-SHA1 (patch-src_daemon_collectd.c) = 155da2fde889e961719fe6be47aa7fc25199fbe7
-SHA1 (patch-src_daemon_common.h) = d1ef6a5257156a864bf896629870f0f83a858cff
-SHA1 (patch-src_df.c) = 5c6549cd9ec72efed5cdb7d8dd9297c50491426e
-SHA1 (patch-src_disk.c) = 6b51454f88ef728abd22cdae5fdd7a81289d502c
-SHA1 (patch-src_entropy.c) = f20ad4ce2e968ba0b20bb13aa00771fc424562fd
-SHA1 (patch-src_irq.c) = 18106e9051ec344b0d45a23814eae5ba3be2f908
-SHA1 (patch-src_libcollectclient_network__buffer.c) = a19e1658017279c35fd9860e2ab855081bad8327
-SHA1 (patch-src_lua.c) = 656934889976f489abb80a8244492f845a3bd9f8
-SHA1 (patch-src_memory.c) = 3276b09d0c09e0a9446519bd6c304d95c30b617a
-SHA1 (patch-src_netstat__udp.c) = 30cb12d25f56c60959658dbd181783212e00cc61
-SHA1 (patch-src_processes.c) = a22b1e9d7935c7924b65c57990b4212990acc6b7
+SHA1 (collectd-5.11.0.tar.bz2) = 18bfb0be0493ed4a1b5d73c8bcc3f28d37652480
+RMD160 (collectd-5.11.0.tar.bz2) = 12ac883a22828d0c181459fe95f4701bf74b4407
+SHA512 (collectd-5.11.0.tar.bz2) = 87671545e3d01770c204ba4439265d1c0add6a105bf04ff02dc04db3731fd933d32ecb9b0dc15f2e504d70c3e421a64cf19728c897aa4fb1fda86e393ffc15bf
+Size (collectd-5.11.0.tar.bz2) = 1851663 bytes
+SHA1 (patch-Makefile.am) = 2762640d219125e0aa85d3c5c5354af5e659b257
+SHA1 (patch-configure.ac) = 77874524ded19078356a303b984c19bc85a86647
+SHA1 (patch-src_bind.c) = ee9f6c5e7828010b4beecff4b2d3d8ff2aebc7ac
+SHA1 (patch-src_collectd.conf.in) = ee885263d5dca87857c8d56069952db0d4ffef37
+SHA1 (patch-src_cpu.c) = 099f04b0a156ae78f5f5809d6db639534d4556a1
+SHA1 (patch-src_df.c) = de699d221b003b70c22308cf43f4d61daa4071f7
+SHA1 (patch-src_entropy.c) = 77ddaf1df7ab898d3009f94bfcca82d16e22f9fe
+SHA1 (patch-src_irq.c) = 51f0e61a58b439f5e4e8de873e887700fc3dd67e
+SHA1 (patch-src_libcollectdclient_network__buffer.c) = 541332bcffcbcbb2e398275f93e2aa1ae8861598
+SHA1 (patch-src_memory.c) = ddfa79d68ebbaeed3bf1f35acbadda111d0387af
+SHA1 (patch-src_netstat__udp.c) = 4763c9c26a5639a84d1ed306b40c5b761110f632
+SHA1 (patch-src_nfs.c) = a38e2b2096b0b7c1d52bba18dcbb78f3cdc264a9
+SHA1 (patch-src_processes.c) = c1e4a5e45c2f489067b83164381b569f270b1a4e
SHA1 (patch-src_statsd.c) = 35f4349d2d2c9bddc0f4770344f969157cd012f6
-SHA1 (patch-src_swap.c) = 98984dc7c6eee4f17b2f291124431172b06aa6c2
-SHA1 (patch-src_tcpconns.c) = 0469ffe477ae96a79e4fd28c4428a1e7682e9461
-SHA1 (patch-src_utils__dns.c) = 68c34489f3c8dca4a57035df9a38076bf35f7c5f
-SHA1 (patch-src_utils__format__kairosdb.c) = 2f7bde47682d2b877f9bd2d2c794a21c297aa9e5
+SHA1 (patch-src_swap.c) = 4ef887e0eddf5c21c121c951f64262781f71e984
+SHA1 (patch-src_tcpconns.c) = dc6c1d361561f16623933b53ec127d88052236b2
+SHA1 (patch-src_utils_dns_dns.c) = aebb564540a51088fbd8ed56c031e7e0acc1b2e3
+SHA1 (patch-src_utils_format__kairosdb_format__kairosdb.c) = 9d6a1567645a5beafb22e3704866b0fcaa6b6c35
Index: pkgsrc/sysutils/collectd/options.mk
diff -u pkgsrc/sysutils/collectd/options.mk:1.11 pkgsrc/sysutils/collectd/options.mk:1.12
--- pkgsrc/sysutils/collectd/options.mk:1.11 Tue Nov 21 16:02:20 2017
+++ pkgsrc/sysutils/collectd/options.mk Sat Oct 24 22:39:45 2020
@@ -1,36 +1,45 @@
-# $NetBSD: options.mk,v 1.11 2017/11/21 16:02:20 he Exp $
+# $NetBSD: options.mk,v 1.12 2020/10/24 22:39:45 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.collectd
-PKG_SUPPORTED_OPTIONS= cpu df interface load memory syslog uptime
-PKG_SUGGESTED_OPTIONS+= cpu df interface load memory syslog uptime
+PKG_SUPPORTED_OPTIONS= collectd-cpu collectd-df collectd-interface collectd-load collectd-memory collectd-syslog collectd-uptime
+PKG_SUPPORTED_OPTIONS+= collectd-multimeter collectd-ted
+PKG_SUGGESTED_OPTIONS= collectd-cpu collectd-df collectd-interface collectd-load collectd-memory collectd-syslog collectd-uptime
+PKG_SUGGESTED_OPTIONS+= collectd-multimeter collectd-ted
+
+PKG_SUPPORTED_OPTIONS.NetBSD+= collectd-contextswitch collectd-disk collectd-entropy collectd-irq collectd-pf collectd-netstat-udp
+PKG_SUPPORTED_OPTIONS.NetBSD+= collectd-swap collectd-tcpconns collectd-users collectd-processes collectd-nfs
+PKG_SUGGESTED_OPTIONS.NetBSD+= collectd-contextswitch collectd-disk collectd-entropy collectd-irq collectd-pf collectd-netstat-udp
+PKG_SUGGESTED_OPTIONS.NetBSD+= collectd-swap collectd-tcpconns collectd-users collectd-processes collectd-nfs
+
+PKG_SUPPORTED_OPTIONS.FreeBSD+= collectd-contextswitch collectd-pf collectd-processes collectd-swap collectd-tcpconns collectd-zfs-arc
+PKG_SUGGESTED_OPTIONS.FreeBSD+= collectd-contextswitch collectd-pf collectd-processes collectd-swap collectd-tcpconns collectd-zfs-arc
+
+PKG_SUPPORTED_OPTIONS.Darwin+= collectd-apple-sensors collectd-battery collectd-contextswitch collectd-disk
+PKG_SUPPORTED_OPTIONS.Darwin+= collectd-processes collectd-swap collectd-tcpconns collectd-users
+PKG_SUGGESTED_OPTIONS.Darwin+= collectd-apple-sensors collectd-battery collectd-contextswitch collectd-disk
+PKG_SUGGESTED_OPTIONS.Darwin+= collectd-processes collectd-swap collectd-tcpconns collectd-users
-PKG_SUPPORTED_OPTIONS.NetBSD+= contextswitch disk entropy irq pf netstat_udp
-PKG_SUPPORTED_OPTIONS.NetBSD+= swap tcpconns users processes
-PKG_SUGGESTED_OPTIONS.NetBSD+= contextswitch disk entropy irq pf netstat_udp
-PKG_SUGGESTED_OPTIONS.NetBSD+= swap tcpconns users processes
-
-PKG_SUPPORTED_OPTIONS.FreeBSD+= contextswitch pf processes swap tcpconns zfs-arc
-PKG_SUGGESTED_OPTIONS.FreeBSD+= contextswitch pf processes swap tcpconns zfs-arc
-
-PKG_SUPPORTED_OPTIONS.Darwin+= apple-sensors battery contextswitch disk
-PKG_SUPPORTED_OPTIONS.Darwin+= processes swap tcpconns users
-PKG_SUGGESTED_OPTIONS.Darwin+= apple-sensors battery contextswitch disk
-PKG_SUGGESTED_OPTIONS.Darwin+= processes swap tcpconns users
+PKG_SUPPORTED_OPTIONS.SunOS+= collectd-disk collectd-nfs collectd-swap collectd-users collectd-zfs-arc collectd-zone
+PKG_SUGGESTED_OPTIONS.SunOS+= collectd-disk collectd-nfs collectd-swap collectd-users collectd-zfs-arc collectd-zone
-PKG_SUPPORTED_OPTIONS.SunOS+= disk nfs swap users zfs-arc zone
-PKG_SUGGESTED_OPTIONS.SunOS+= disk nfs swap users zfs-arc zone
+PKG_SUPPORTED_OPTIONS+= collectd-debug
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= apple-sensors battery contextswitch cpu entropy \
- df disk \
- interface irq load netstat_udp \
- memory nfs pf processes swap \
- syslog tcpconns uptime users zfs-arc zone
+PLIST_VARS+= collectd-apple-sensors collectd-battery collectd-contextswitch collectd-cpu collectd-entropy \
+ collectd-df collectd-disk \
+ collectd-interface collectd-irq collectd-load collectd-netstat-udp \
+ collectd-memory collectd-nfs collectd-pf collectd-processes collectd-swap \
+ collectd-syslog collectd-tcpconns collectd-uptime collectd-users collectd-zfs-arc collectd-zone \
+ collectd-multimeter collectd-ted
.for option in ${PLIST_VARS}
. if !empty(PKG_OPTIONS:M${option})
-CONFIGURE_ARGS+= --enable-${option:S/-/_/}
+CONFIGURE_ARGS+= --enable-${option:S/collectd-//:S/-/_/}
PLIST.${option}= yes
. endif
.endfor
+
+.if !empty(PKG_OPTIONS:Mcollectd-debug)
+CONFIGURE_ARGS+= --enable-debug
+.endif
Index: pkgsrc/sysutils/collectd-amqp/Makefile
diff -u pkgsrc/sysutils/collectd-amqp/Makefile:1.7 pkgsrc/sysutils/collectd-amqp/Makefile:1.8
--- pkgsrc/sysutils/collectd-amqp/Makefile:1.7 Mon Aug 31 18:11:25 2020
+++ pkgsrc/sysutils/collectd-amqp/Makefile Sat Oct 24 22:39:45 2020
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.7 2020/08/31 18:11:25 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2020/10/24 22:39:45 wiz Exp $
COLLECTD_PACKAGE= amqp
COMMENT= Statistics collection daemon - amqp plugin
-PKGREVISION= 4
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../net/rabbitmq-c/buildlink3.mk"
+COLLECTD_LIB.rabbitmq= ${BUILDLINK_PREFIX.rabbitmq-c}
-CONFIGURE_ARGS+= --with-librabbitmq=${BUILDLINK_PREFIX.rabbitmq-c}
+.include "../../sysutils/collectd/Makefile.common"
-.include "../../net/rabbitmq-c/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-curl/DESCR
diff -u pkgsrc/sysutils/collectd-curl/DESCR:1.1 pkgsrc/sysutils/collectd-curl/DESCR:1.2
--- pkgsrc/sysutils/collectd-curl/DESCR:1.1 Mon Feb 17 11:21:55 2014
+++ pkgsrc/sysutils/collectd-curl/DESCR Sat Oct 24 22:39:45 2020
@@ -1,2 +1,2 @@
CURL-based plugins for collectd (curl, curl_json, curl_xml,
-apache, bind, nginx, write_http).
+apache, bind, nginx, write_http, ascent).
Index: pkgsrc/sysutils/collectd-curl/Makefile
diff -u pkgsrc/sysutils/collectd-curl/Makefile:1.27 pkgsrc/sysutils/collectd-curl/Makefile:1.28
--- pkgsrc/sysutils/collectd-curl/Makefile:1.27 Mon Aug 31 18:11:25 2020
+++ pkgsrc/sysutils/collectd-curl/Makefile Sat Oct 24 22:39:45 2020
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.27 2020/08/31 18:11:25 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2020/10/24 22:39:45 wiz Exp $
COLLECTD_PACKAGE= curl
-COLLECTD_PLUGINS= curl curl_json curl_xml apache bind nginx write_http
+COLLECTD_PLUGINS= curl curl_json curl_xml apache bind nginx write_http ascent
COMMENT= Statistics collection daemon - curl-based plugins
-PKGREVISION= 16
-
-.include "../../sysutils/collectd/Makefile.common"
-
-CONFIGURE_ARGS+= --with-libcurl=${BUILDLINK_PREFIX.curl}
-CONFIGURE_ARGS+= --with-libyajl=${BUILDLINK_PREFIX.yajl}
.include "../../devel/yajl/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
+COLLECTD_LIB.curl= ${BUILDLINK_PREFIX.curl}
+COLLECTD_LIB.yajl= ${BUILDLINK_PREFIX.yajl}
+COLLECTD_LIB.xml2= ${BUILDLINK_PREFIX.libxml2}
+
+.include "../../sysutils/collectd/Makefile.common"
+
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-dbi/Makefile
diff -u pkgsrc/sysutils/collectd-dbi/Makefile:1.4 pkgsrc/sysutils/collectd-dbi/Makefile:1.5
--- pkgsrc/sysutils/collectd-dbi/Makefile:1.4 Mon Aug 31 18:11:25 2020
+++ pkgsrc/sysutils/collectd-dbi/Makefile Sat Oct 24 22:39:45 2020
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2020/08/31 18:11:25 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2020/10/24 22:39:45 wiz Exp $
COLLECTD_PACKAGE= dbi
COMMENT= Statistics collection daemon - dbi plugin
-PKGREVISION= 3
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../databases/libdbi/buildlink3.mk"
+COLLECTD_LIB.dbi= ${BUILDLINK_PREFIX.libdbi}
-CONFIGURE_ARGS+= --with-libdbi=${BUILDLINK_PREFIX.libdbi}
+.include "../../sysutils/collectd/Makefile.common"
-.include "../../databases/libdbi/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-dns/Makefile
diff -u pkgsrc/sysutils/collectd-dns/Makefile:1.6 pkgsrc/sysutils/collectd-dns/Makefile:1.7
--- pkgsrc/sysutils/collectd-dns/Makefile:1.6 Mon Aug 31 18:11:25 2020
+++ pkgsrc/sysutils/collectd-dns/Makefile Sat Oct 24 22:39:45 2020
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.6 2020/08/31 18:11:25 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2020/10/24 22:39:45 wiz Exp $
COLLECTD_PACKAGE= dns
COMMENT= Statistics collection daemon - dns plugin
-PKGREVISION= 4
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../net/libpcap/buildlink3.mk"
+COLLECTD_LIB.pcap= ${BUILDLINK_PREFIX.libpcap}
-CONFIGURE_ARGS+= --with-libpcap=${BUILDLINK_PREFIX.libpcap}
+.include "../../sysutils/collectd/Makefile.common"
# On NetBSD, built-in pcap lacks headers needed
.if ${OPSYS} == "NetBSD"
PREFER.libpcap= pkgsrc
.endif
-.include "../../net/libpcap/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-lua/Makefile
diff -u pkgsrc/sysutils/collectd-lua/Makefile:1.4 pkgsrc/sysutils/collectd-lua/Makefile:1.5
--- pkgsrc/sysutils/collectd-lua/Makefile:1.4 Mon Aug 31 18:11:25 2020
+++ pkgsrc/sysutils/collectd-lua/Makefile Sat Oct 24 22:39:46 2020
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2020/08/31 18:11:25 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2020/10/24 22:39:46 wiz Exp $
COLLECTD_PACKAGE= lua
COLLECTD_PLUGINS= lua
COMMENT= Statistics collection daemon - lua plugin
-PKGREVISION= 3
.include "../../sysutils/collectd/Makefile.common"
Index: pkgsrc/sysutils/collectd-mysql/Makefile
diff -u pkgsrc/sysutils/collectd-mysql/Makefile:1.4 pkgsrc/sysutils/collectd-mysql/Makefile:1.5
--- pkgsrc/sysutils/collectd-mysql/Makefile:1.4 Mon Aug 31 18:11:25 2020
+++ pkgsrc/sysutils/collectd-mysql/Makefile Sat Oct 24 22:39:47 2020
@@ -1,15 +1,13 @@
-# $NetBSD: Makefile,v 1.4 2020/08/31 18:11:25 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2020/10/24 22:39:47 wiz Exp $
COLLECTD_PACKAGE= mysql
PKGNAME= ${DISTNAME:S/collectd/collectd-${COLLECTD_PACKAGE}${MYSQL_VERSION}/}
-PKGREVISION= 3
COMMENT= Statistics collection daemon - mysql plugin
-.include "../../sysutils/collectd/Makefile.common"
-
+.include "../../mk/mysql.buildlink3.mk"
+COLLECTD_LIB.mysql= ${BUILDLINK_PREFIX.mysql-client}
-CONFIGURE_ARGS+= --with-libmysql=${BUILDLINK_PREFIX.mysql-client}
+.include "../../sysutils/collectd/Makefile.common"
-.include "../../mk/mysql.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-network/Makefile
diff -u pkgsrc/sysutils/collectd-network/Makefile:1.3 pkgsrc/sysutils/collectd-network/Makefile:1.4
--- pkgsrc/sysutils/collectd-network/Makefile:1.3 Wed Jun 14 13:42:53 2017
+++ pkgsrc/sysutils/collectd-network/Makefile Sat Oct 24 22:39:47 2020
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2017/06/14 13:42:53 fhajny Exp $
+# $NetBSD: Makefile,v 1.4 2020/10/24 22:39:47 wiz Exp $
COLLECTD_PACKAGE= network
COMMENT= Statistics collection daemon - network plugin
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../security/libgcrypt/buildlink3.mk"
+COLLECTD_LIB.gcrypt= ${BUILDLINK_PREFIX.libgcrypt}/bin/libgcrypt-config
-CONFIGURE_ARGS+= --with-libgcrypt=${BUILDLINK_PREFIX.libgcrypt}/bin/libgcrypt-config
+.include "../../sysutils/collectd/Makefile.common"
-.include "../../security/libgcrypt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-notify-email/Makefile
diff -u pkgsrc/sysutils/collectd-notify-email/Makefile:1.7 pkgsrc/sysutils/collectd-notify-email/Makefile:1.8
--- pkgsrc/sysutils/collectd-notify-email/Makefile:1.7 Mon Aug 31 18:11:25 2020
+++ pkgsrc/sysutils/collectd-notify-email/Makefile Sat Oct 24 22:39:47 2020
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.7 2020/08/31 18:11:25 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2020/10/24 22:39:47 wiz Exp $
COLLECTD_PACKAGE= notify-email
COMMENT= Statistics collection daemon - notify_email plugin
-PKGREVISION= 4
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../mail/libesmtp/buildlink3.mk"
+COLLECTD_LIB.esmtp= ${BUILDLINK_PREFIX.libesmtp}
-CONFIGURE_ARGS+= --with-libesmtp=${BUILDLINK_PREFIX.libesmtp}
+.include "../../sysutils/collectd/Makefile.common"
-.include "../../mail/libesmtp/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-postgresql/Makefile
diff -u pkgsrc/sysutils/collectd-postgresql/Makefile:1.8 pkgsrc/sysutils/collectd-postgresql/Makefile:1.9
--- pkgsrc/sysutils/collectd-postgresql/Makefile:1.8 Mon Aug 31 18:11:25 2020
+++ pkgsrc/sysutils/collectd-postgresql/Makefile Sat Oct 24 22:39:47 2020
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.8 2020/08/31 18:11:25 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2020/10/24 22:39:47 wiz Exp $
COLLECTD_PACKAGE= postgresql
PKGNAME= ${DISTNAME:S/collectd/collectd-${COLLECTD_PACKAGE}${PGSQL_VERSION}/}
-PKGREVISION= 3
COMMENT= Statistics collection daemon - postgresql plugin
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../mk/pgsql.buildlink3.mk"
+COLLECTD_LIB.pq= ${PGSQL_PREFIX}
-CONFIGURE_ARGS+= --with-libpq=${PGSQL_PREFIX}
+.include "../../sysutils/collectd/Makefile.common"
-.include "../../mk/pgsql.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-riemann/Makefile
diff -u pkgsrc/sysutils/collectd-riemann/Makefile:1.10 pkgsrc/sysutils/collectd-riemann/Makefile:1.11
--- pkgsrc/sysutils/collectd-riemann/Makefile:1.10 Mon Aug 31 18:11:26 2020
+++ pkgsrc/sysutils/collectd-riemann/Makefile Sat Oct 24 22:39:48 2020
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.10 2020/08/31 18:11:26 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2020/10/24 22:39:48 wiz Exp $
COLLECTD_PACKAGE= riemann
COLLECTD_PLUGINS= write_riemann
COMMENT= Statistics collection daemon - riemann plugin
-PKGREVISION= 8
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../sysutils/riemann-client/buildlink3.mk"
+COLLECTD_LIB.riemann-client=${BUILDLINK_PREFIX.riemann-client}
.include "../../devel/protobuf-c/buildlink3.mk"
-.include "../../sysutils/riemann-client/buildlink3.mk"
+
+.include "../../sysutils/collectd/Makefile.common"
+
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-rrdtool/Makefile
diff -u pkgsrc/sysutils/collectd-rrdtool/Makefile:1.19 pkgsrc/sysutils/collectd-rrdtool/Makefile:1.20
--- pkgsrc/sysutils/collectd-rrdtool/Makefile:1.19 Mon Aug 31 18:11:26 2020
+++ pkgsrc/sysutils/collectd-rrdtool/Makefile Sat Oct 24 22:39:48 2020
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.19 2020/08/31 18:11:26 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2020/10/24 22:39:48 wiz Exp $
COLLECTD_PACKAGE= rrdtool
COLLECTD_PLUGINS= rrdtool rrdcached
COMMENT= Statistics collection daemon - rrdtool plugins
-PKGREVISION= 11
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../databases/rrdtool/buildlink3.mk"
+COLLECTD_LIB.rrd= ${BUILDLINK_PREFIX.rrdtool}
-CONFIGURE_ARGS+= --with-librrd=${BUILDLINK_PREFIX.rrdtool}
+.include "../../sysutils/collectd/Makefile.common"
-.include "../../databases/rrdtool/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-snmp/Makefile
diff -u pkgsrc/sysutils/collectd-snmp/Makefile:1.7 pkgsrc/sysutils/collectd-snmp/Makefile:1.8
--- pkgsrc/sysutils/collectd-snmp/Makefile:1.7 Mon Aug 31 18:11:26 2020
+++ pkgsrc/sysutils/collectd-snmp/Makefile Sat Oct 24 22:39:48 2020
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.7 2020/08/31 18:11:26 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2020/10/24 22:39:48 wiz Exp $
COLLECTD_PACKAGE= snmp
COMMENT= Statistics collection daemon - snmp plugin
-PKGREVISION= 4
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../net/net-snmp/buildlink3.mk"
+COLLECTD_LIB.netsnmp= ${BUILDLINK_PREFIX.net-snmp}/bin/net-snmp-config
-CONFIGURE_ARGS+= --with-libnetsnmp=${BUILDLINK_PREFIX.net-snmp}/bin/net-snmp-config
+.include "../../sysutils/collectd/Makefile.common"
-.include "../../net/net-snmp/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-write_prometheus/Makefile
diff -u pkgsrc/sysutils/collectd-write_prometheus/Makefile:1.9 pkgsrc/sysutils/collectd-write_prometheus/Makefile:1.10
--- pkgsrc/sysutils/collectd-write_prometheus/Makefile:1.9 Mon Aug 31 18:11:26 2020
+++ pkgsrc/sysutils/collectd-write_prometheus/Makefile Sat Oct 24 22:39:48 2020
@@ -1,12 +1,16 @@
-# $NetBSD: Makefile,v 1.9 2020/08/31 18:11:26 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2020/10/24 22:39:48 wiz Exp $
COLLECTD_PACKAGE= write_prometheus
COMMENT= Statistics collection daemon - write_prometheus plugin
-PKGREVISION= 8
-
-.include "../../sysutils/collectd/Makefile.common"
.include "../../devel/protobuf-c/buildlink3.mk"
+COLLECTD_LIB.protobuf-c=${BUILDLINK_PREFIX.protobuf-c}
.include "../../www/libmicrohttpd/buildlink3.mk"
+COLLECTD_LIB.microhttpd=${BUILDLINK_PREFIX.libmicrohttpd}
+
+BUILD_DEPENDS+= protobuf-[0-9]*:../../devel/protobuf
+
+.include "../../sysutils/collectd/Makefile.common"
+
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd/patches/patch-Makefile.am
diff -u pkgsrc/sysutils/collectd/patches/patch-Makefile.am:1.3 pkgsrc/sysutils/collectd/patches/patch-Makefile.am:1.4
--- pkgsrc/sysutils/collectd/patches/patch-Makefile.am:1.3 Thu Jan 4 15:42:42 2018
+++ pkgsrc/sysutils/collectd/patches/patch-Makefile.am Sat Oct 24 22:39:45 2020
@@ -1,19 +1,19 @@
-$NetBSD: patch-Makefile.am,v 1.3 2018/01/04 15:42:42 jperkin Exp $
+$NetBSD: patch-Makefile.am,v 1.4 2020/10/24 22:39:45 wiz Exp $
Use other data directory.
---- Makefile.am.orig 2017-11-18 09:03:27.326751649 +0000
-+++ Makefile.am
-@@ -165,7 +165,7 @@ AM_CPPFLAGS = \
- -DPREFIX='"${prefix}"' \
- -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
- -DLOCALSTATEDIR='"${localstatedir}"' \
-- -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' \
-+ -DPKGLOCALSTATEDIR='"${localstatedir}/db/${PACKAGE_NAME}"' \
- -DPLUGINDIR='"${pkglibdir}"' \
- -DPKGDATADIR='"${pkgdatadir}"'
+--- Makefile.am.orig 2020-03-08 16:57:09.000000000 +0100
++++ Makefile.am 2020-07-06 19:13:59.289684798 +0200
+@@ -8,7 +8,7 @@
+ else
+ cpkgdatadir=$(pkgdatadir)
+ cpkglibdir=$(pkglibdir)
+-cpkglocalstatedir=${localstatedir}/lib/${PACKAGE_NAME}
++cpkglocalstatedir=${localstatedir}/db/${PACKAGE_NAME}
+ endif
-@@ -1205,6 +1205,12 @@ netlink_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+ BUILT_SOURCES = \
+@@ -1478,6 +1478,12 @@
netlink_la_LIBADD = $(BUILD_WITH_LIBMNL_LIBS)
endif
@@ -26,7 +26,7 @@ Use other data directory.
if BUILD_PLUGIN_NETWORK
pkglib_LTLIBRARIES += network.la
network_la_SOURCES = \
-@@ -1942,6 +1948,8 @@ endif
+@@ -2352,6 +2358,8 @@
if BUILD_PLUGIN_WRITE_PROMETHEUS
BUILT_SOURCES += prometheus.pb-c.c prometheus.pb-c.h
@@ -35,12 +35,3 @@ Use other data directory.
prometheus.pb-c.c prometheus.pb-c.h: $(srcdir)/proto/prometheus.proto
$(AM_V_PROTOC_C)$(PROTOC_C) -I$(srcdir)/proto --c_out=$(builddir) $(srcdir)/proto/prometheus.proto
endif
-@@ -1964,7 +1972,7 @@ endif
-
- install-exec-hook:
- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
-- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME)
-+ $(mkinstalldirs) $(DESTDIR)$(localstatedir)/db/$(PACKAGE_NAME)
- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/log
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
- if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \
Index: pkgsrc/sysutils/collectd/patches/patch-src_cpu.c
diff -u pkgsrc/sysutils/collectd/patches/patch-src_cpu.c:1.3 pkgsrc/sysutils/collectd/patches/patch-src_cpu.c:1.4
--- pkgsrc/sysutils/collectd/patches/patch-src_cpu.c:1.3 Wed Dec 7 17:28:39 2016
+++ pkgsrc/sysutils/collectd/patches/patch-src_cpu.c Sat Oct 24 22:39:45 2020
@@ -1,19 +1,29 @@
-$NetBSD: patch-src_cpu.c,v 1.3 2016/12/07 17:28:39 fhajny Exp $
+$NetBSD: patch-src_cpu.c,v 1.4 2020/10/24 22:39:45 wiz Exp $
Port this too to NetBSD.
---- src/cpu.c.orig 2016-11-30 08:52:01.308911943 +0000
-+++ src/cpu.c
-@@ -81,7 +81,7 @@
+--- src/cpu.c.orig 2020-03-08 16:57:09.000000000 +0100
++++ src/cpu.c 2020-07-07 12:08:28.927383000 +0200
+@@ -78,13 +78,16 @@
+ #endif
+ #endif /* HAVE_SYS_DKSTAT_H */
- #if HAVE_SYSCTL
+-#define CAN_USE_SYSCTL 0
+ #if (defined(HAVE_SYSCTL) && defined(HAVE_SYSCTLBYNAME)) || defined(__OpenBSD__)
+ /* Implies BSD variant */
#if defined(CTL_HW) && defined(HW_NCPU) && defined(CTL_KERN) && \
- defined(KERN_CPTIME) && defined(CPUSTATES)
+ (defined(KERN_CPTIME) || defined(KERN_CP_TIME)) && defined(CPUSTATES)
#define CAN_USE_SYSCTL 1
- #else
- #define CAN_USE_SYSCTL 0
-@@ -673,6 +673,24 @@ static int cpu_read(void) {
++#else
++#define CAN_USE_SYSCTL 0
+ #endif
++#else
++#define CAN_USE_SYSCTL 0
+ #endif /* HAVE_SYSCTL_H && HAVE_SYSCTLBYNAME || __OpenBSD__ */
+
+ #define COLLECTD_CPU_STATE_USER 0
+@@ -746,6 +749,24 @@ static int cpu_read(void) {
memset(cpuinfo, 0, sizeof(cpuinfo));
@@ -38,7 +48,7 @@ Port this too to NetBSD.
#if defined(KERN_CPTIME2)
if (numcpu > 1) {
for (int i = 0; i < numcpu; i++) {
-@@ -710,6 +728,7 @@ static int cpu_read(void) {
+@@ -779,6 +800,7 @@ static int cpu_read(void) {
cpuinfo[0][i] = cpuinfo_tmp[i];
}
}
Index: pkgsrc/sysutils/collectd/patches/patch-configure.ac
diff -u pkgsrc/sysutils/collectd/patches/patch-configure.ac:1.12 pkgsrc/sysutils/collectd/patches/patch-configure.ac:1.13
--- pkgsrc/sysutils/collectd/patches/patch-configure.ac:1.12 Thu Mar 19 06:26:26 2020
+++ pkgsrc/sysutils/collectd/patches/patch-configure.ac Sat Oct 24 22:39:45 2020
@@ -1,20 +1,20 @@
-$NetBSD: patch-configure.ac,v 1.12 2020/03/19 06:26:26 rillig Exp $
+$NetBSD: patch-configure.ac,v 1.13 2020/10/24 22:39:45 wiz Exp $
-Add KERNEL_NETBSD, add entry and disk plugins for NetBSD,
+Add KERNEL_NETBSD, add entry and netstat_udp plugin definition,
and also do swap for "have_swapctl_three_args" (as for NetBSD).
Also, the start of process support, but that's not yet finished.
---- configure.ac.orig 2017-11-18 09:03:27.330751467 +0000
-+++ configure.ac
-@@ -110,6 +110,7 @@ AM_CONDITIONAL([BUILD_DARWIN], [test "x$
+--- configure.ac.orig 2020-03-19 09:52:56.000000000 +0100
++++ configure.ac 2020-07-06 19:24:03.404718013 +0200
+@@ -114,6 +114,7 @@
AM_CONDITIONAL([BUILD_FREEBSD], [test "x$ac_system" = "xFreeBSD"])
AM_CONDITIONAL([BUILD_LINUX], [test "x$ac_system" = "xLinux"])
AM_CONDITIONAL([BUILD_OPENBSD], [test "x$ac_system" = "xOpenBSD"])
+AM_CONDITIONAL([BUILD_NETBSD], [test "x$ac_system" = "xNetBSD"])
AM_CONDITIONAL([BUILD_SOLARIS], [test "x$ac_system" = "xSolaris"])
+ AM_CONDITIONAL([BUILD_WIN32], [test "x$ac_system" = "xWindows"])
- if test "x$ac_system" = "xSolaris"; then
-@@ -6136,6 +6137,7 @@ plugin_log_logstash="no"
+@@ -6595,6 +6596,7 @@
plugin_mcelog="no"
plugin_memory="no"
plugin_multimeter="no"
@@ -22,23 +22,23 @@ Also, the start of process support, but
plugin_nfs="no"
plugin_numa="no"
plugin_ovs_events="no"
-@@ -6229,6 +6231,7 @@ if test "x$ac_system" = "xNetBSD"; then
- plugin_entropy="yes"
+@@ -6708,6 +6710,7 @@
plugin_irq="yes"
+ plugin_nfs="yes"
plugin_processes="yes"
+ plugin_netstat_udp="yes"
fi
# Mac OS X devices
-@@ -6568,6 +6571,7 @@ AC_PLUGIN([multimeter], [$plugi
- AC_PLUGIN([mysql], [$with_libmysql], [MySQL statistics])
- AC_PLUGIN([netapp], [$with_libnetapp], [NetApp plugin])
- AC_PLUGIN([netlink], [$with_libmnl], [Enhanced Linux network statistics])
-+AC_PLUGIN([netstat_udp], [$plugin_netstat_udp], [UDP network statistics])
- AC_PLUGIN([network], [yes], [Network communication plugin])
- AC_PLUGIN([nfs], [$plugin_nfs], [NFS statistics])
- AC_PLUGIN([nginx], [$with_libcurl], [nginx statistics])
-@@ -6987,6 +6991,7 @@ AC_MSG_RESULT([ multimeter . . . . .
+@@ -7077,6 +7080,7 @@
+ AC_PLUGIN([mysql], [$with_libmysql], [MySQL statistics])
+ AC_PLUGIN([netapp], [$with_libnetapp], [NetApp plugin])
+ AC_PLUGIN([netlink], [$with_libmnl], [Enhanced Linux network statistics])
++AC_PLUGIN([netstat_udp], [$plugin_netstat_udp], [UDP network statistics])
+ AC_PLUGIN([network], [yes], [Network communication plugin])
+ AC_PLUGIN([nfs], [$plugin_nfs], [NFS statistics])
+ AC_PLUGIN([nginx], [$with_libcurl], [nginx statistics])
+@@ -7521,6 +7525,7 @@
AC_MSG_RESULT([ mysql . . . . . . . . $enable_mysql])
AC_MSG_RESULT([ netapp . . . . . . . $enable_netapp])
AC_MSG_RESULT([ netlink . . . . . . . $enable_netlink])
Index: pkgsrc/sysutils/collectd/patches/patch-src_bind.c
diff -u pkgsrc/sysutils/collectd/patches/patch-src_bind.c:1.1 pkgsrc/sysutils/collectd/patches/patch-src_bind.c:1.2
--- pkgsrc/sysutils/collectd/patches/patch-src_bind.c:1.1 Sun Jul 5 13:57:32 2020
+++ pkgsrc/sysutils/collectd/patches/patch-src_bind.c Sat Oct 24 22:39:45 2020
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_bind.c,v 1.1 2020/07/05 13:57:32 he Exp $
+$NetBSD: patch-src_bind.c,v 1.2 2020/10/24 22:39:45 wiz Exp $
Also pick out the response time bins from the resolver stats.
---- src/bind.c.orig 2017-11-18 09:03:27.000000000 +0000
-+++ src/bind.c
+--- src/bind.c.orig 2020-03-08 16:57:09.000000000 +0100
++++ src/bind.c 2020-07-20 12:55:28.000000000 +0200
@@ -228,7 +228,17 @@ static const translation_info_t resstats
{"ValAttempt", "dns_resolver", "DNSSEC-attempt"},
{"ValOk", "dns_resolver", "DNSSEC-okay"},
Index: pkgsrc/sysutils/collectd/patches/patch-src_netstat__udp.c
diff -u pkgsrc/sysutils/collectd/patches/patch-src_netstat__udp.c:1.1 pkgsrc/sysutils/collectd/patches/patch-src_netstat__udp.c:1.2
--- pkgsrc/sysutils/collectd/patches/patch-src_netstat__udp.c:1.1 Sat Sep 12 19:04:56 2015
+++ pkgsrc/sysutils/collectd/patches/patch-src_netstat__udp.c Sat Oct 24 22:39:45 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_netstat__udp.c,v 1.1 2015/09/12 19:04:56 he Exp $
+$NetBSD: patch-src_netstat__udp.c,v 1.2 2020/10/24 22:39:45 wiz Exp $
Add a plugin which reports the UDP summary statistics.
Useful for busyish DNS name servers.
@@ -28,7 +28,7 @@ Useful for busyish DNS name servers.
+ **/
+
+#include "collectd.h"
-+#include "common.h"
++#include "utils/common/common.h"
+#include "plugin.h"
+
+#if !defined(KERNEL_NETBSD)
Index: pkgsrc/sysutils/collectd/patches/patch-src_collectd.conf.in
diff -u pkgsrc/sysutils/collectd/patches/patch-src_collectd.conf.in:1.2 pkgsrc/sysutils/collectd/patches/patch-src_collectd.conf.in:1.3
--- pkgsrc/sysutils/collectd/patches/patch-src_collectd.conf.in:1.2 Wed Jun 10 20:05:26 2015
+++ pkgsrc/sysutils/collectd/patches/patch-src_collectd.conf.in Sat Oct 24 22:39:45 2020
@@ -1,8 +1,9 @@
-$NetBSD: patch-src_collectd.conf.in,v 1.2 2015/06/10 20:05:26 fhajny Exp $
+$NetBSD: patch-src_collectd.conf.in,v 1.3 2020/10/24 22:39:45 wiz Exp $
Fix default dirs.
---- src/collectd.conf.in.orig 2015-05-20 12:05:42.672060002 +0000
-+++ src/collectd.conf.in
+
+--- src/collectd.conf.in.orig 2020-03-19 09:52:56.000000000 +0100
++++ src/collectd.conf.in 2020-07-06 19:18:19.842344185 +0200
@@ -12,7 +12,7 @@
#Hostname "localhost"
@@ -12,7 +13,7 @@ Fix default dirs.
#PIDFile "@localstatedir@/run/@PACKAGE_NAME@.pid"
#PluginDir "@libdir@/@PACKAGE_NAME@"
#TypesDB "@prefix@/share/@PACKAGE_NAME@/types.db"
-@@ -315,16 +315,16 @@
+@@ -389,16 +389,16 @@
# LongRunAvgLatency false
# ConvertSpecialMetricTypes true
# <Daemon "osd.0">
@@ -33,7 +34,7 @@ Fix default dirs.
# </Daemon>
#</Plugin>
-@@ -340,7 +340,7 @@
+@@ -427,7 +427,7 @@
#</Plugin>
#
#<Plugin csv>
@@ -42,7 +43,7 @@ Fix default dirs.
# StoreRates false
#</Plugin>
-@@ -683,7 +683,7 @@
+@@ -1029,7 +1029,7 @@
# <Database db_name2>
# Alias "squeeze"
# Host "localhost"
@@ -51,7 +52,7 @@ Fix default dirs.
# SlaveStats true
# SlaveNotifications true
# </Database>
-@@ -956,14 +956,14 @@
+@@ -1347,14 +1347,14 @@
# <Server "server_name">
# Collect "latency"
# Collect "udp-answers" "udp-queries"
@@ -69,7 +70,7 @@ Fix default dirs.
#</Plugin>
#<Plugin processes>
-@@ -1011,14 +1011,14 @@
+@@ -1466,14 +1466,14 @@
#<Plugin rrdcached>
# DaemonAddress "unix:/tmp/rrdcached.sock"
@@ -86,7 +87,7 @@ Fix default dirs.
# CreateFilesAsync false
# CacheTimeout 120
# CacheFlush 900
-@@ -1174,7 +1174,7 @@
+@@ -1711,7 +1711,7 @@
# Type "kpackets_wire_per_sec.realtime"
# ValueFrom 4
# </Metric>
@@ -95,7 +96,7 @@ Fix default dirs.
# Instance "snort-eth0"
# Interval 600
# Collect "dropped" "mbps" "alerts" "kpps"
-@@ -1231,7 +1231,7 @@
+@@ -1773,7 +1773,7 @@
#</Plugin>
#<Plugin unixsock>
Index: pkgsrc/sysutils/collectd/patches/patch-src_df.c
diff -u pkgsrc/sysutils/collectd/patches/patch-src_df.c:1.5 pkgsrc/sysutils/collectd/patches/patch-src_df.c:1.6
--- pkgsrc/sysutils/collectd/patches/patch-src_df.c:1.5 Wed Dec 7 17:28:39 2016
+++ pkgsrc/sysutils/collectd/patches/patch-src_df.c Sat Oct 24 22:39:45 2020
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_df.c,v 1.5 2016/12/07 17:28:39 fhajny Exp $
+$NetBSD: patch-src_df.c,v 1.6 2020/10/24 22:39:45 wiz Exp $
Older NetBSD doesn't have float_t.
---- src/df.c.orig 2016-11-30 08:52:01.312911569 +0000
-+++ src/df.c
+--- src/df.c.orig 2020-03-08 16:57:09.000000000 +0100
++++ src/df.c 2020-07-06 19:28:15.661572605 +0200
@@ -28,6 +28,14 @@
- #include "utils_ignorelist.h"
- #include "utils_mount.h"
+ #include "utils/ignorelist/ignorelist.h"
+ #include "utils/mount/mount.h"
+#if defined(__NetBSD__)
+#include <sys/param.h>
Index: pkgsrc/sysutils/collectd/patches/patch-src_irq.c
diff -u pkgsrc/sysutils/collectd/patches/patch-src_irq.c:1.5 pkgsrc/sysutils/collectd/patches/patch-src_irq.c:1.6
--- pkgsrc/sysutils/collectd/patches/patch-src_irq.c:1.5 Tue Nov 21 15:18:23 2017
+++ pkgsrc/sysutils/collectd/patches/patch-src_irq.c Sat Oct 24 22:39:45 2020
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_irq.c,v 1.5 2017/11/21 15:18:23 fhajny Exp $
+$NetBSD: patch-src_irq.c,v 1.6 2020/10/24 22:39:45 wiz Exp $
Provide a port to NetBSD.
---- src/irq.c.orig 2017-11-18 09:03:27.354750373 +0000
-+++ src/irq.c
-@@ -27,10 +27,20 @@
- #include "plugin.h"
- #include "utils_ignorelist.h"
+--- src/irq.c.orig 2020-03-08 16:57:09.000000000 +0100
++++ src/irq.c 2020-07-06 19:50:01.057574443 +0200
+@@ -27,10 +27,18 @@
+ #include "utils/common/common.h"
+ #include "utils/ignorelist/ignorelist.h"
-#if !KERNEL_LINUX
+#if !KERNEL_LINUX && !KERNEL_NETBSD
@@ -14,19 +14,17 @@ Provide a port to NetBSD.
#endif
+#if KERNEL_NETBSD
-+
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <sys/evcnt.h>
+#include <malloc.h>
-+
+#endif /* KERNEL_NETBSD */
+
/*
* (Module-)Global variables
*/
-@@ -75,6 +85,7 @@ static void irq_submit(const char *irq_n
+@@ -75,6 +83,7 @@ static void irq_submit(const char *irq_n
plugin_dispatch_values(&vl);
} /* void irq_submit */
@@ -34,7 +32,7 @@ Provide a port to NetBSD.
static int irq_read(void) {
FILE *fh;
char buffer[1024];
-@@ -167,6 +178,64 @@ static int irq_read(void) {
+@@ -165,6 +174,64 @@ static int irq_read(void) {
return 0;
} /* int irq_read */
Index: pkgsrc/sysutils/collectd/patches/patch-src_memory.c
diff -u pkgsrc/sysutils/collectd/patches/patch-src_memory.c:1.5 pkgsrc/sysutils/collectd/patches/patch-src_memory.c:1.6
--- pkgsrc/sysutils/collectd/patches/patch-src_memory.c:1.5 Tue Nov 21 15:18:23 2017
+++ pkgsrc/sysutils/collectd/patches/patch-src_memory.c Sat Oct 24 22:39:45 2020
@@ -1,33 +1,24 @@
-$NetBSD: patch-src_memory.c,v 1.5 2017/11/21 15:18:23 fhajny Exp $
+$NetBSD: patch-src_memory.c,v 1.6 2020/10/24 22:39:45 wiz Exp $
Add a port for NetBSD using VM_UVMEXP2, and preferring
sysctl over sysctlbyname.
---- src/memory.c.orig 2017-11-18 09:03:27.358750191 +0000
-+++ src/memory.c
-@@ -66,6 +66,10 @@ static mach_port_t port_host;
- static vm_size_t pagesize;
+--- src/memory.c.orig 2020-06-19 21:12:44.000000000 +0200
++++ src/memory.c 2020-07-09 21:13:27.000000000 +0200
+@@ -69,7 +69,12 @@ static vm_size_t pagesize;
/* #endif HAVE_HOST_STATISTICS */
-+#elif HAVE_SYSCTL
-+static int pagesize;
-+/* #endif HAVE_SYSCTL */
-+
#elif HAVE_SYSCTLBYNAME
++#if HAVE_SYSCTL && defined(KERNEL_NETBSD)
++static int pagesize;
++#include <unistd.h> /* getpagesize() */
++#else
/* no global variables */
++#endif
/* #endif HAVE_SYSCTLBYNAME */
-@@ -80,10 +84,6 @@ static kstat_t *ksp;
- static kstat_t *ksz;
- /* #endif HAVE_LIBKSTAT */
-
--#elif HAVE_SYSCTL
--static int pagesize;
--/* #endif HAVE_SYSCTL */
--
- #elif HAVE_LIBSTATGRAB
- /* no global variables */
- /* endif HAVE_LIBSTATGRAB */
-@@ -94,6 +94,10 @@ static int pagesize;
+
+ #elif KERNEL_LINUX
+@@ -97,6 +102,10 @@ static int pagesize;
#error "No applicable input method."
#endif
@@ -35,41 +26,23 @@ sysctl over sysctlbyname.
+# include <uvm/uvm_extern.h>
+#endif
+
- static _Bool values_absolute = 1;
- static _Bool values_percentage = 0;
+ static bool values_absolute = true;
+ static bool values_percentage;
-@@ -120,6 +124,14 @@ static int memory_init(void) {
- host_page_size(port_host, &pagesize);
- /* #endif HAVE_HOST_STATISTICS */
+@@ -124,7 +133,11 @@ static int memory_init(void) {
+ /* #endif HAVE_HOST_STATISTICS */
-+#elif HAVE_SYSCTL
-+ pagesize = getpagesize();
-+ if (pagesize <= 0) {
-+ ERROR("memory plugin: Invalid pagesize: %i", pagesize);
-+ return (-1);
-+ }
-+/* #endif HAVE_SYSCTL */
-+
#elif HAVE_SYSCTLBYNAME
++#if HAVE_SYSCTL && defined(KERNEL_NETBSD)
++ pagesize = getpagesize();
++#else
/* no init stuff */
++#endif /* HAVE_SYSCTL && defied(KERNEL_NETBSD) */
/* #endif HAVE_SYSCTLBYNAME */
-@@ -142,14 +154,6 @@ static int memory_init(void) {
- /* #endif HAVE_LIBKSTAT */
-
--#elif HAVE_SYSCTL
-- pagesize = getpagesize();
-- if (pagesize <= 0) {
-- ERROR("memory plugin: Invalid pagesize: %i", pagesize);
-- return -1;
-- }
--/* #endif HAVE_SYSCTL */
--
- #elif HAVE_LIBSTATGRAB
- /* no init stuff */
- /* #endif HAVE_LIBSTATGRAB */
-@@ -221,6 +225,46 @@ static int memory_read_internal(value_li
- /* #endif HAVE_HOST_STATISTICS */
+ #elif defined(KERNEL_LINUX)
+@@ -225,6 +238,45 @@ static int memory_read_internal(value_li
+ /* #endif HAVE_HOST_STATISTICS */
#elif HAVE_SYSCTLBYNAME
+
@@ -111,16 +84,15 @@ sysctl over sysctlbyname.
+/* #endif HAVE_SYSCTL && defined(KERNEL_NETBSD) */
+
+#else /* Other HAVE_SYSCTLBYNAME providers */
-+
/*
* vm.stats.vm.v_page_size: 4096
* vm.stats.vm.v_page_count: 246178
-@@ -259,6 +303,8 @@ static int memory_read_internal(value_li
+@@ -263,6 +315,8 @@ static int memory_read_internal(value_li
(gauge_t)sysctl_vals[3], "active", (gauge_t)sysctl_vals[4],
"inactive", (gauge_t)sysctl_vals[5], "cache",
(gauge_t)sysctl_vals[6]);
+
+#endif /* HAVE_SYSCTL && KERNEL_NETBSD */
- /* #endif HAVE_SYSCTLBYNAME */
+ /* #endif HAVE_SYSCTLBYNAME */
#elif KERNEL_LINUX
Index: pkgsrc/sysutils/collectd/patches/patch-src_swap.c
diff -u pkgsrc/sysutils/collectd/patches/patch-src_swap.c:1.5 pkgsrc/sysutils/collectd/patches/patch-src_swap.c:1.6
--- pkgsrc/sysutils/collectd/patches/patch-src_swap.c:1.5 Tue Nov 21 15:18:23 2017
+++ pkgsrc/sysutils/collectd/patches/patch-src_swap.c Sat Oct 24 22:39:45 2020
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_swap.c,v 1.5 2017/11/21 15:18:23 fhajny Exp $
+$NetBSD: patch-src_swap.c,v 1.6 2020/10/24 22:39:45 wiz Exp $
Extend support for NetBSD, and add per-swap-device
reporting for HAVE_SWAPCTL_THREE_ARGS.
---- src/swap.c.orig 2017-11-18 09:03:27.366749826 +0000
-+++ src/swap.c
-@@ -78,9 +78,12 @@ static _Bool report_bytes = 0;
- static _Bool report_by_device = 0;
+--- src/swap.c.orig 2020-03-08 16:57:09.000000000 +0100
++++ src/swap.c 2020-07-06 20:21:18.416804717 +0200
+@@ -80,9 +80,12 @@ static bool report_bytes;
+ static bool report_by_device;
/* #endif KERNEL_LINUX */
-#elif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS
@@ -16,10 +16,10 @@ reporting for HAVE_SWAPCTL_THREE_ARGS.
+#if KERNEL_NETBSD
+static _Bool report_bytes = 0;
+#endif
- static _Bool report_by_device = 0;
+ static bool report_by_device;
/* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS */
-@@ -118,7 +121,7 @@ static int swap_config(oconfig_item_t *c
+@@ -120,7 +123,7 @@ static int swap_config(oconfig_item_t *c
for (int i = 0; i < ci->children_num; i++) {
oconfig_item_t *child = ci->children + i;
if (strcasecmp("ReportBytes", child->key) == 0)
@@ -28,16 +28,16 @@ reporting for HAVE_SWAPCTL_THREE_ARGS.
cf_util_get_boolean(child, &report_bytes);
#else
WARNING("swap plugin: The \"ReportBytes\" option "
-@@ -152,7 +155,7 @@ static int swap_init(void) /* {{{ */
+@@ -154,7 +157,7 @@ static int swap_init(void) /* {{{ */
pagesize = (derive_t)sysconf(_SC_PAGESIZE);
- /* #endif KERNEL_LINUX */
+ /* #endif KERNEL_LINUX */
-#elif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS
+#elif HAVE_SWAPCTL && (HAVE_SWAPCTL_TWO_ARGS || HAVE_SWAPCTL_THREE_ARGS)
/* getpagesize(3C) tells me this does not fail.. */
pagesize = (derive_t)getpagesize();
- /* #endif HAVE_SWAPCTL */
-@@ -210,7 +213,7 @@ static void swap_submit_usage(char const
+ /* #endif HAVE_SWAPCTL */
+@@ -212,7 +215,7 @@ static void swap_submit_usage(char const
free, other_name, other_value, NULL);
} /* }}} void swap_submit_usage */
@@ -46,7 +46,7 @@ reporting for HAVE_SWAPCTL_THREE_ARGS.
__attribute__((nonnull(1))) static void
swap_submit_derive(char const *type_instance, /* {{{ */
derive_t value) {
-@@ -577,6 +580,43 @@ static int swap_read(void) /* {{{ */
+@@ -549,6 +552,43 @@ static int swap_read(void) /* {{{ */
/* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS */
#elif HAVE_SWAPCTL && HAVE_SWAPCTL_THREE_ARGS
@@ -90,7 +90,7 @@ reporting for HAVE_SWAPCTL_THREE_ARGS.
static int swap_read(void) /* {{{ */
{
struct swapent *swap_entries;
-@@ -615,12 +655,32 @@ static int swap_read(void) /* {{{ */
+@@ -587,12 +627,32 @@ static int swap_read(void) /* {{{ */
/* TODO: Report per-device stats. The path name is available from
* swap_entries[i].se_path */
for (int i = 0; i < swap_num; i++) {
@@ -126,7 +126,7 @@ reporting for HAVE_SWAPCTL_THREE_ARGS.
if (total < used) {
ERROR(
-@@ -631,8 +691,15 @@ static int swap_read(void) /* {{{ */
+@@ -603,8 +663,15 @@ static int swap_read(void) /* {{{ */
}
swap_submit_usage(NULL, used, total - used, NULL, NAN);
Index: pkgsrc/sysutils/collectd/patches/patch-src_entropy.c
diff -u pkgsrc/sysutils/collectd/patches/patch-src_entropy.c:1.10 pkgsrc/sysutils/collectd/patches/patch-src_entropy.c:1.11
--- pkgsrc/sysutils/collectd/patches/patch-src_entropy.c:1.10 Tue Nov 21 15:18:23 2017
+++ pkgsrc/sysutils/collectd/patches/patch-src_entropy.c Sat Oct 24 22:39:45 2020
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_entropy.c,v 1.10 2017/11/21 15:18:23 fhajny Exp $
+$NetBSD: patch-src_entropy.c,v 1.11 2020/10/24 22:39:45 wiz Exp $
Provide a NetBSD implementation for graphing available entropy.
This version tries to keep /dev/urandom open (for repeated use),
instead of constantly re-opening/closing it, since the latter will
needlessly reduce the kernel's entropy estimate.
---- src/entropy.c.orig 2017-11-18 09:03:27.354750373 +0000
-+++ src/entropy.c
+--- src/entropy.c.orig 2020-03-08 16:57:09.000000000 +0100
++++ src/entropy.c 2020-07-06 19:39:37.204772249 +0200
@@ -29,23 +29,16 @@
- #include "common.h"
#include "plugin.h"
+ #include "utils/common/common.h"
-#if !KERNEL_LINUX
+static void entropy_submit (value_t);
Index: pkgsrc/sysutils/collectd/patches/patch-src_processes.c
diff -u pkgsrc/sysutils/collectd/patches/patch-src_processes.c:1.8 pkgsrc/sysutils/collectd/patches/patch-src_processes.c:1.9
--- pkgsrc/sysutils/collectd/patches/patch-src_processes.c:1.8 Tue Nov 21 16:02:20 2017
+++ pkgsrc/sysutils/collectd/patches/patch-src_processes.c Sat Oct 24 22:39:45 2020
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_processes.c,v 1.8 2017/11/21 16:02:20 he Exp $
+$NetBSD: patch-src_processes.c,v 1.9 2020/10/24 22:39:45 wiz Exp $
Add a port to NetBSD.
---- src/processes.c.orig 2017-06-06 18:13:54.693164693 +0000
-+++ src/processes.c
-@@ -97,14 +97,16 @@
+--- src/processes.c.orig 2020-03-08 16:57:09.000000000 +0100
++++ src/processes.c 2020-07-06 20:15:33.891304651 +0200
+@@ -102,14 +102,16 @@
/* #endif KERNEL_LINUX */
#elif HAVE_LIBKVM_GETPROCS && \
@@ -23,7 +23,7 @@ Add a port to NetBSD.
#elif HAVE_PROCINFO_H
#include <procinfo.h>
-@@ -286,10 +288,15 @@ static void ps_fill_details(const procst
+@@ -315,10 +317,15 @@ static void ps_fill_details(const procst
/* #endif KERNEL_LINUX */
#elif HAVE_LIBKVM_GETPROCS && \
@@ -41,8 +41,8 @@ Add a port to NetBSD.
#elif HAVE_PROCINFO_H
static struct procentry64 procentry[MAXPROCENTRY];
-@@ -673,10 +680,21 @@ static int ps_init(void) {
- /* #endif KERNEL_LINUX */
+@@ -774,10 +781,21 @@ static int ps_init(void) {
+ /* #endif KERNEL_LINUX */
#elif HAVE_LIBKVM_GETPROCS && \
- (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD)
@@ -59,15 +59,15 @@ Add a port to NetBSD.
+#endif
+
pagesize = getpagesize();
- /* #endif HAVE_LIBKVM_GETPROCS && (HAVE_STRUCT_KINFO_PROC_FREEBSD ||
-- * HAVE_STRUCT_KINFO_PROC_OPENBSD) */
-+ * HAVE_STRUCT_KINFO_PROC_OPENBSD || HAVE_STRUCT_KINFO_PROC2_NETBSD) */
+ /* #endif HAVE_LIBKVM_GETPROCS && (HAVE_STRUCT_KINFO_PROC_FREEBSD ||
+- * HAVE_STRUCT_KINFO_PROC_OPENBSD) */
++ * HAVE_STRUCT_KINFO_PROC_OPENBSD || HAVE_STRUCT_KINFO_PROC2_NETBSD) */
#elif HAVE_PROCINFO_H
pagesize = getpagesize();
-@@ -2074,6 +2092,197 @@ static int ps_read(void) {
+@@ -2296,6 +2314,196 @@ static int ps_read(void) {
ps_submit_proc_list(ps_ptr);
- /* #endif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD */
+ /* #endif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD */
+#elif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC2_NETBSD
+ int running = 0;
@@ -259,7 +259,6 @@ Add a port to NetBSD.
+ ps_submit_proc_list (ps_ptr);
+/* #endif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC2_NETBSD */
+
-+
#elif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_OPENBSD
int running = 0;
int sleeping = 0;
Index: pkgsrc/sysutils/collectd/patches/patch-src_tcpconns.c
diff -u pkgsrc/sysutils/collectd/patches/patch-src_tcpconns.c:1.7 pkgsrc/sysutils/collectd/patches/patch-src_tcpconns.c:1.8
--- pkgsrc/sysutils/collectd/patches/patch-src_tcpconns.c:1.7 Tue Nov 21 15:18:23 2017
+++ pkgsrc/sysutils/collectd/patches/patch-src_tcpconns.c Sat Oct 24 22:39:45 2020
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_tcpconns.c,v 1.7 2017/11/21 15:18:23 fhajny Exp $
+$NetBSD: patch-src_tcpconns.c,v 1.8 2020/10/24 22:39:45 wiz Exp $
Include <sys/param.h>
Re-order to fix build on NetBSD.
---- src/tcpconns.c.orig 2017-11-18 09:03:27.370749644 +0000
-+++ src/tcpconns.c
-@@ -128,9 +128,9 @@
+--- src/tcpconns.c.orig 2020-03-08 16:57:09.000000000 +0100
++++ src/tcpconns.c 2020-07-06 20:25:33.959459766 +0200
+@@ -127,9 +127,9 @@
#include <net/route.h>
#include <netdb.h>
#include <netinet/in.h>
@@ -16,7 +16,7 @@ Re-order to fix build on NetBSD.
#include <netinet/ip_var.h>
#include <netinet/tcp.h>
#include <netinet/tcp_timer.h>
-@@ -897,6 +897,7 @@ static int conn_init(void) {
+@@ -895,6 +895,7 @@ static int conn_init(void) {
return 0;
} /* int conn_init */
Added files:
Index: pkgsrc/sysutils/collectd-CGP/DESCR
diff -u /dev/null pkgsrc/sysutils/collectd-CGP/DESCR:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-CGP/DESCR Sat Oct 24 22:39:45 2020
@@ -0,0 +1 @@
+Graphical web-based front-end for visualizing RRD collected
Index: pkgsrc/sysutils/collectd-CGP/Makefile
diff -u /dev/null pkgsrc/sysutils/collectd-CGP/Makefile:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-CGP/Makefile Sat Oct 24 22:39:45 2020
@@ -0,0 +1,34 @@
+# $NetBSD: Makefile,v 1.1 2020/10/24 22:39:45 wiz Exp $
+
+DISTNAME= collectd-cgp-1
+PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME:S/-1//}
+CATEGORIES= sysutils
+GITHUB_PROJECT= CGP
+MASTER_SITES= ${MASTER_SITE_GITHUB:=pommi/}
+GITHUB_TAG= v${DISTNAME:S/collectd-cgp-//}
+EXTRACT_SUFX= .zip
+
+MAINTAINER= kethzer.dr%gmail.com@localhost
+HOMEPAGE= https://github.com/pommi/
+COMMENT= Graphical web-based front-end for visualizing RRD collected
+LICENSE= gnu-gpl-v3
+
+NO_CONFIGURE= yes
+NO_BUILD= yes
+USE_TOOLS+= pax unzip
+EXTRACT_ONLY= # empty
+
+INSTALLATION_DIRS= share/collectd-graph-panel
+
+WRKSRC= ${WRKDIR}/CGP-1
+
+DEPENDS+= ${PHP_PKG_PREFIX}-rrd>=1.1.3:../../databases/php-rrd
+
+PHP_VERSIONS_ACCEPTED= 56 # php-rrd
+
+do-install:
+ cd ${DESTDIR}/${PREFIX}/${INSTALLATION_DIRS} && \
+ unzip -ojqL ${DISTDIR}/${DISTFILES}
+
+.include "../../lang/php/phpversion.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-CGP/PLIST
diff -u /dev/null pkgsrc/sysutils/collectd-CGP/PLIST:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-CGP/PLIST Sat Oct 24 22:39:45 2020
@@ -0,0 +1,92 @@
+@comment $NetBSD: PLIST,v 1.1 2020/10/24 22:39:45 wiz Exp $
+share/collectd-graph-panel/.gitignore
+share/collectd-graph-panel/.htaccess
+share/collectd-graph-panel/apache.json
+share/collectd-graph-panel/apcups.json
+share/collectd-graph-panel/base.class.php
+share/collectd-graph-panel/base64.js
+share/collectd-graph-panel/battery.json
+share/collectd-graph-panel/binaryxhr.js
+share/collectd-graph-panel/${PKGVERSION}.js
+share/collectd-graph-panel/changelog
+share/collectd-graph-panel/collectd.inc.php
+share/collectd-graph-panel/color.js
+share/collectd-graph-panel/common.inc.php
+share/collectd-graph-panel/config.php
+share/collectd-graph-panel/conntrack.json
+share/collectd-graph-panel/contextswitch.json
+share/collectd-graph-panel/cpu.json
+share/collectd-graph-panel/cpufreq.json
+share/collectd-graph-panel/default.class.php
+share/collectd-graph-panel/detail.php
+share/collectd-graph-panel/df.json
+share/collectd-graph-panel/disk.json
+share/collectd-graph-panel/dns.json
+share/collectd-graph-panel/entropy.json
+share/collectd-graph-panel/error.png
+share/collectd-graph-panel/error.xcf
+share/collectd-graph-panel/filecount.json
+share/collectd-graph-panel/functions.inc.php
+share/collectd-graph-panel/genericio.class.php
+share/collectd-graph-panel/genericstacked.class.php
+share/collectd-graph-panel/graph.php
+share/collectd-graph-panel/haproxy.json
+share/collectd-graph-panel/hddtemp.json
+share/collectd-graph-panel/host.php
+share/collectd-graph-panel/html.inc.php
+share/collectd-graph-panel/index.php
+share/collectd-graph-panel/interface.json
+share/collectd-graph-panel/ipmi.json
+share/collectd-graph-panel/iptables.json
+share/collectd-graph-panel/irq.json
+share/collectd-graph-panel/jquery-2.1.1.min.js
+share/collectd-graph-panel/jquery.timeago.js
+share/collectd-graph-panel/libvirt.json
+share/collectd-graph-panel/license
+share/collectd-graph-panel/load.json
+share/collectd-graph-panel/lvm.json
+share/collectd-graph-panel/md.json
+share/collectd-graph-panel/memcached.json
+share/collectd-graph-panel/memory.json
+share/collectd-graph-panel/mysql.json
+share/collectd-graph-panel/netlink.json
+share/collectd-graph-panel/nfs.json
+share/collectd-graph-panel/nginx.conf
+share/collectd-graph-panel/nginx.json
+share/collectd-graph-panel/ntpd.json
+share/collectd-graph-panel/nut.json
+share/collectd-graph-panel/openvpn.json
+share/collectd-graph-panel/ping.json
+share/collectd-graph-panel/postgresql.json
+share/collectd-graph-panel/processes.json
+share/collectd-graph-panel/readme.md
+share/collectd-graph-panel/rrd.php
+share/collectd-graph-panel/rrdcmdline.js
+share/collectd-graph-panel/rrddatafile.js
+share/collectd-graph-panel/rrdfile.js
+share/collectd-graph-panel/rrdgfxcanvas.js
+share/collectd-graph-panel/rrdgfxpdf.js
+share/collectd-graph-panel/rrdgfxsvg.js
+share/collectd-graph-panel/rrdgraph.js
+share/collectd-graph-panel/rrdjson.js
+share/collectd-graph-panel/rrdrpn.js
+share/collectd-graph-panel/rrdtime.js
+share/collectd-graph-panel/rrdtool.class.php
+share/collectd-graph-panel/sensors.json
+share/collectd-graph-panel/snmp.json
+share/collectd-graph-panel/sprintf.js
+share/collectd-graph-panel/strftime.js
+share/collectd-graph-panel/style-b.css
+share/collectd-graph-panel/style-c.css
+share/collectd-graph-panel/style-d.css
+share/collectd-graph-panel/style.css
+share/collectd-graph-panel/swap.json
+share/collectd-graph-panel/tcpconns.json
+share/collectd-graph-panel/thermal.json
+share/collectd-graph-panel/types.db
+share/collectd-graph-panel/uptime.class.php
+share/collectd-graph-panel/uptime.json
+share/collectd-graph-panel/users.json
+share/collectd-graph-panel/vmem.json
+share/collectd-graph-panel/vserver.json
+share/collectd-graph-panel/wireless.json
Index: pkgsrc/sysutils/collectd-CGP/distinfo
diff -u /dev/null pkgsrc/sysutils/collectd-CGP/distinfo:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-CGP/distinfo Sat Oct 24 22:39:45 2020
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2020/10/24 22:39:45 wiz Exp $
+
+SHA1 (collectd-cgp-1.zip) = 38965c92c217cefba68a80165481af043957143c
+RMD160 (collectd-cgp-1.zip) = 83562f3777c93efff254e7010d66f502bdd8cefd
+SHA512 (collectd-cgp-1.zip) = 8b1b1edabe188644c94cb66e6dd2ca4727312e6c5ea237514a644cabeb19ae46e9512e63af63b7c252b185b2f1aa02b1ac726e7df7cf28fa8f2949f9f5681fc8
+Size (collectd-cgp-1.zip) = 165843 bytes
Index: pkgsrc/sysutils/collectd-gmond/DESCR
diff -u /dev/null pkgsrc/sysutils/collectd-gmond/DESCR:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-gmond/DESCR Sat Oct 24 22:39:46 2020
@@ -0,0 +1 @@
+gmond plugin for collectd
Index: pkgsrc/sysutils/collectd-gmond/Makefile
diff -u /dev/null pkgsrc/sysutils/collectd-gmond/Makefile:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-gmond/Makefile Sat Oct 24 22:39:46 2020
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2020/10/24 22:39:46 wiz Exp $
+
+COLLECTD_PACKAGE= gmond
+
+COMMENT= Statistics collection daemon - gmond plugin
+
+.include "../../parallel/ganglia-monitor-core/buildlink3.mk"
+COLLECTD_LIB.ganglia= ${BUILDLINK_PREFIX.ganglia-monitor-core}
+
+.include "../../sysutils/collectd/Makefile.common"
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-gps/DESCR
diff -u /dev/null pkgsrc/sysutils/collectd-gps/DESCR:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-gps/DESCR Sat Oct 24 22:39:46 2020
@@ -0,0 +1 @@
+gps plugin for collectd
Index: pkgsrc/sysutils/collectd-gps/Makefile
diff -u /dev/null pkgsrc/sysutils/collectd-gps/Makefile:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-gps/Makefile Sat Oct 24 22:39:46 2020
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2020/10/24 22:39:46 wiz Exp $
+
+COLLECTD_PACKAGE= gps
+
+COMMENT= Statistics collection daemon - gps plugin
+
+.include "../../geography/gpsd/buildlink3.mk"
+COLLECTD_LIB.gps= ${BUILDLINK_PREFIX.gpsd}
+
+.include "../../sysutils/collectd/Makefile.common"
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-grpc/DESCR
diff -u /dev/null pkgsrc/sysutils/collectd-grpc/DESCR:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-grpc/DESCR Sat Oct 24 22:39:46 2020
@@ -0,0 +1 @@
+grpc plugin for collectd
Index: pkgsrc/sysutils/collectd-grpc/Makefile
diff -u /dev/null pkgsrc/sysutils/collectd-grpc/Makefile:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-grpc/Makefile Sat Oct 24 22:39:46 2020
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2020/10/24 22:39:46 wiz Exp $
+
+COLLECTD_PACKAGE= grpc
+
+COMMENT= Statistics collection daemon - grpc plugin
+
+.include "../../net/grpc/buildlink3.mk"
+.include "../../devel/protobuf/buildlink3.mk"
+.include "../../devel/protobuf-c/buildlink3.mk"
+COLLECTD_LIB.grpcpp= ${BUILDLINK_PREFIX.grpc}
+COLLECTD_LIB.protobuf= ${BUILDLINK_PREFIX.protobuf}
+COLLECTD_LIB.protobuf-c=${BUILDLINK_PREFIX.protobuf-c}
+
+BUILD_DEPENDS+= protobuf>=3.0.0:../../devel/protobuf
+
+.include "../../sysutils/collectd/Makefile.common"
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-haproxy/DESCR
diff -u /dev/null pkgsrc/sysutils/collectd-haproxy/DESCR:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-haproxy/DESCR Sat Oct 24 22:39:46 2020
@@ -0,0 +1 @@
+haproxy plugin for collectd
Index: pkgsrc/sysutils/collectd-haproxy/Makefile
diff -u /dev/null pkgsrc/sysutils/collectd-haproxy/Makefile:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-haproxy/Makefile Sat Oct 24 22:39:46 2020
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1 2020/10/24 22:39:46 wiz Exp $
+
+DISTNAME= collectd-haproxy-1.2.1
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES= sysutils
+MASTER_SITES= ${MASTER_SITE_GITHUB:=wglass/}
+GITHUB_PROJECT= collectd-haproxy
+GITHUB_TAG= ${PKGVERSION_NOREV}
+EXTRACT_SUFX= .zip
+
+MAINTAINER= kethzer.dr%gmail.com@localhost
+HOMEPAGE= https://github.com/wglass/collectd-haproxy
+COMMENT= Plugin for collectd to gather HAProxy metrics
+LICENSE= mit
+
+DEPENDS+= haproxy>=1.4:../../net/haproxy
+DEPENDS+= ${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8
+DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
+DEPENDS+= ${PYPKGPREFIX}-collectd-[0-9]*:../../sysutils/py-collectd
+
+.include "../../lang/python/egg.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-haproxy/PLIST
diff -u /dev/null pkgsrc/sysutils/collectd-haproxy/PLIST:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-haproxy/PLIST Sat Oct 24 22:39:46 2020
@@ -0,0 +1,20 @@
+@comment $NetBSD: PLIST,v 1.1 2020/10/24 22:39:46 wiz Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/collectd_haproxy/__init__.py
+${PYSITELIB}/collectd_haproxy/__init__.pyc
+${PYSITELIB}/collectd_haproxy/__init__.pyo
+${PYSITELIB}/collectd_haproxy/compat.py
+${PYSITELIB}/collectd_haproxy/compat.pyc
+${PYSITELIB}/collectd_haproxy/compat.pyo
+${PYSITELIB}/collectd_haproxy/connection.py
+${PYSITELIB}/collectd_haproxy/connection.pyc
+${PYSITELIB}/collectd_haproxy/connection.pyo
+${PYSITELIB}/collectd_haproxy/metrics.py
+${PYSITELIB}/collectd_haproxy/metrics.pyc
+${PYSITELIB}/collectd_haproxy/metrics.pyo
+${PYSITELIB}/collectd_haproxy/plugin.py
+${PYSITELIB}/collectd_haproxy/plugin.pyc
+${PYSITELIB}/collectd_haproxy/plugin.pyo
Index: pkgsrc/sysutils/collectd-haproxy/distinfo
diff -u /dev/null pkgsrc/sysutils/collectd-haproxy/distinfo:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-haproxy/distinfo Sat Oct 24 22:39:46 2020
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2020/10/24 22:39:46 wiz Exp $
+
+SHA1 (collectd-haproxy-1.2.1.zip) = ddccc4a0a7fddf54144044c98a0236ff8927fc07
+RMD160 (collectd-haproxy-1.2.1.zip) = 3c1ae3f4664c770beabd6d2f2db666667b921828
+SHA512 (collectd-haproxy-1.2.1.zip) = 70f43a44e8b4afa9469ef7cd6bd340210e0f2473e631c3b20f852756a2f997278a8fd4744e073a5f22ee94eac680f0d0c0b516dd54a6ad2fc84987d65ef1f2ed
+Size (collectd-haproxy-1.2.1.zip) = 66871 bytes
Index: pkgsrc/sysutils/collectd-kafka/DESCR
diff -u /dev/null pkgsrc/sysutils/collectd-kafka/DESCR:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-kafka/DESCR Sat Oct 24 22:39:46 2020
@@ -0,0 +1 @@
+write_kafka plugin for collectd
Index: pkgsrc/sysutils/collectd-kafka/Makefile
diff -u /dev/null pkgsrc/sysutils/collectd-kafka/Makefile:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-kafka/Makefile Sat Oct 24 22:39:46 2020
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2020/10/24 22:39:46 wiz Exp $
+
+COLLECTD_PACKAGE= kafka
+COLLECTD_PLUGINS= write_kafka
+
+COMMENT= Statistics collection daemon - write_kafka plugin
+
+.include "../../devel/librdkafka/buildlink3.mk"
+COLLECTD_LIB.rdkafka= ${BUILDLINK_PREFIX.librdkafka}
+
+.include "../../sysutils/collectd/Makefile.common"
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-memcachec/DESCR
diff -u /dev/null pkgsrc/sysutils/collectd-memcachec/DESCR:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-memcachec/DESCR Sat Oct 24 22:39:46 2020
@@ -0,0 +1 @@
+memcachec plugin for collectd
Index: pkgsrc/sysutils/collectd-memcachec/Makefile
diff -u /dev/null pkgsrc/sysutils/collectd-memcachec/Makefile:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-memcachec/Makefile Sat Oct 24 22:39:46 2020
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2020/10/24 22:39:46 wiz Exp $
+
+COLLECTD_PACKAGE= memcachec
+
+COMMENT= Statistics collection daemon - memcachec plugin
+
+.include "../../devel/libmemcached/buildlink3.mk"
+COLLECTD_LIB.memcached= ${BUILDLINK_PREFIX.libmemcached}
+
+.include "../../sysutils/collectd/Makefile.common"
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-mongodb/DESCR
diff -u /dev/null pkgsrc/sysutils/collectd-mongodb/DESCR:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-mongodb/DESCR Sat Oct 24 22:39:46 2020
@@ -0,0 +1 @@
+write_mongodb plugin for collectd
Index: pkgsrc/sysutils/collectd-mongodb/Makefile
diff -u /dev/null pkgsrc/sysutils/collectd-mongodb/Makefile:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-mongodb/Makefile Sat Oct 24 22:39:46 2020
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2020/10/24 22:39:46 wiz Exp $
+
+COLLECTD_PACKAGE= mongodb
+COLLECTD_PLUGINS= write_mongodb
+
+COMMENT= Statistics collection daemon - write_mongodb plugin
+
+.include "../../databases/mongo-c-driver/buildlink3.mk"
+COLLECTD_LIB.mongoc= yes # help says argument is the path, but everything but "yes" disables
+
+.include "../../sysutils/collectd/Makefile.common"
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-notify_desktop/DESCR
diff -u /dev/null pkgsrc/sysutils/collectd-notify_desktop/DESCR:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-notify_desktop/DESCR Sat Oct 24 22:39:47 2020
@@ -0,0 +1 @@
+notify_desktop plugin for collectd
Index: pkgsrc/sysutils/collectd-notify_desktop/Makefile
diff -u /dev/null pkgsrc/sysutils/collectd-notify_desktop/Makefile:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-notify_desktop/Makefile Sat Oct 24 22:39:47 2020
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2020/10/24 22:39:47 wiz Exp $
+
+COLLECTD_PACKAGE= notify_desktop
+
+COMMENT= Statistics collection daemon - notify_desktop plugin
+
+.include "../../sysutils/libnotify/buildlink3.mk"
+COLLECTD_LIB.notify= ${BUILDLINK_PREFIX.libnotify}
+
+.include "../../sysutils/collectd/Makefile.common"
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-nut/DESCR
diff -u /dev/null pkgsrc/sysutils/collectd-nut/DESCR:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-nut/DESCR Sat Oct 24 22:39:47 2020
@@ -0,0 +1 @@
+nut (ups-nut) plugin for collectd
Index: pkgsrc/sysutils/collectd-nut/Makefile
diff -u /dev/null pkgsrc/sysutils/collectd-nut/Makefile:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-nut/Makefile Sat Oct 24 22:39:47 2020
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2020/10/24 22:39:47 wiz Exp $
+
+COLLECTD_PACKAGE= nut
+
+COMMENT= Statistics collection daemon - nut plugin
+
+.include "../../sysutils/ups-nut/buildlink3.mk"
+COLLECTD_LIB.upsclient= ${BUILDLINK_PREFIX.ups-nut}
+
+.include "../../sysutils/collectd/Makefile.common"
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-openldap/DESCR
diff -u /dev/null pkgsrc/sysutils/collectd-openldap/DESCR:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-openldap/DESCR Sat Oct 24 22:39:47 2020
@@ -0,0 +1 @@
+openldap plugin for collectd
Index: pkgsrc/sysutils/collectd-openldap/Makefile
diff -u /dev/null pkgsrc/sysutils/collectd-openldap/Makefile:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-openldap/Makefile Sat Oct 24 22:39:47 2020
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2020/10/24 22:39:47 wiz Exp $
+
+COLLECTD_PACKAGE= openldap
+
+COMMENT= Statistics collection daemon - openldap plugin
+
+.include "../../databases/openldap-client/buildlink3.mk"
+COLLECTD_LIB.ldap= ${BUILDLINK_PREFIX.openldap-client}
+
+.include "../../sysutils/collectd/Makefile.common"
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-pinba/DESCR
diff -u /dev/null pkgsrc/sysutils/collectd-pinba/DESCR:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-pinba/DESCR Sat Oct 24 22:39:47 2020
@@ -0,0 +1 @@
+pinba plugin for collectd
Index: pkgsrc/sysutils/collectd-pinba/Makefile
diff -u /dev/null pkgsrc/sysutils/collectd-pinba/Makefile:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-pinba/Makefile Sat Oct 24 22:39:47 2020
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2020/10/24 22:39:47 wiz Exp $
+
+COLLECTD_PACKAGE= pinba
+
+COMMENT= Statistics collection daemon - pinba plugin
+
+.include "../../devel/protobuf-c/buildlink3.mk"
+COLLECTD_LIB.protobuf-c=${BUILDLINK_PREFIX.protobuf-c}
+
+BUILD_DEPENDS+= protobuf>=3.0.0:../../devel/protobuf
+
+.include "../../sysutils/collectd/Makefile.common"
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-redis/DESCR
diff -u /dev/null pkgsrc/sysutils/collectd-redis/DESCR:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-redis/DESCR Sat Oct 24 22:39:47 2020
@@ -0,0 +1 @@
+redis plugins (redis, write_redis) for collectd
Index: pkgsrc/sysutils/collectd-redis/Makefile
diff -u /dev/null pkgsrc/sysutils/collectd-redis/Makefile:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-redis/Makefile Sat Oct 24 22:39:47 2020
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2020/10/24 22:39:47 wiz Exp $
+
+COLLECTD_PACKAGE= redis
+COLLECTD_PLUGINS= redis write_redis
+
+COMMENT= Statistics collection daemon - redis plugins
+
+.include "../../databases/hiredis/buildlink3.mk"
+COLLECTD_LIB.hiredis= ${BUILDLINK_PREFIX.hiredis}
+
+.include "../../sysutils/collectd/Makefile.common"
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-tokyotyrant/DESCR
diff -u /dev/null pkgsrc/sysutils/collectd-tokyotyrant/DESCR:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-tokyotyrant/DESCR Sat Oct 24 22:39:48 2020
@@ -0,0 +1 @@
+tokyotyrant plugin for collectd
Index: pkgsrc/sysutils/collectd-tokyotyrant/Makefile
diff -u /dev/null pkgsrc/sysutils/collectd-tokyotyrant/Makefile:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-tokyotyrant/Makefile Sat Oct 24 22:39:48 2020
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2020/10/24 22:39:48 wiz Exp $
+
+COLLECTD_PACKAGE= tokyotyrant
+
+COMMENT= Statistics collection daemon - tokyotyrant plugin
+
+.include "../../databases/tokyotyrant/buildlink3.mk"
+COLLECTD_LIB.tokyotyrant= ${BUILDLINK_PREFIX.tokyotyrant}
+
+.include "../../sysutils/collectd/Makefile.common"
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-varnish/DESCR
diff -u /dev/null pkgsrc/sysutils/collectd-varnish/DESCR:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-varnish/DESCR Sat Oct 24 22:39:48 2020
@@ -0,0 +1 @@
+varnish plugin for collectd
Index: pkgsrc/sysutils/collectd-varnish/Makefile
diff -u /dev/null pkgsrc/sysutils/collectd-varnish/Makefile:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-varnish/Makefile Sat Oct 24 22:39:48 2020
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2020/10/24 22:39:48 wiz Exp $
+
+COLLECTD_PACKAGE= varnish
+
+COMMENT= Statistics collection daemon - varnish plugin
+
+.include "../../www/varnish/buildlink3.mk"
+COLLECTD_LIB.varnish= ${BUILDLINK_PREFIX.varnish}
+
+.include "../../sysutils/collectd/Makefile.common"
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-virt/DESCR
diff -u /dev/null pkgsrc/sysutils/collectd-virt/DESCR:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-virt/DESCR Sat Oct 24 22:39:48 2020
@@ -0,0 +1 @@
+virt plugin for collectd
Index: pkgsrc/sysutils/collectd-virt/Makefile
diff -u /dev/null pkgsrc/sysutils/collectd-virt/Makefile:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-virt/Makefile Sat Oct 24 22:39:48 2020
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2020/10/24 22:39:48 wiz Exp $
+
+COLLECTD_PACKAGE= virt
+
+COMMENT= Statistics collection daemon - virt plugin
+
+.include "../../sysutils/libvirt/buildlink3.mk"
+COLLECTD_LIB.virt= ${BUILDLINK_PREFIX.libvirt}
+
+.include "../../sysutils/collectd/Makefile.common"
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-web/DESCR
diff -u /dev/null pkgsrc/sysutils/collectd-web/DESCR:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-web/DESCR Sat Oct 24 22:39:48 2020
@@ -0,0 +1,6 @@
+The main objective of this is to develop an easy to use and
+customizable web interface for Collectd (Resource monitoring
+software). Two days of research where enough to realize that collectd
+didn't have a real frontend and the one bundled with the backend
+was really made for testing purposes, so much of the usability and
+strength of statistics was left aside.
Index: pkgsrc/sysutils/collectd-web/Makefile
diff -u /dev/null pkgsrc/sysutils/collectd-web/Makefile:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-web/Makefile Sat Oct 24 22:39:48 2020
@@ -0,0 +1,41 @@
+# $NetBSD: Makefile,v 1.1 2020/10/24 22:39:48 wiz Exp $
+
+DISTNAME= collectd-web-0.4.1
+CATEGORIES= sysutils
+GITHUB_PROJECT= collectd-web
+MASTER_SITES= ${MASTER_SITE_GITHUB:=httpdss/}
+EXTRACT_SUFX= .zip
+
+MAINTAINER= kethzer.dr%gmail.com@localhost
+HOMEPAGE= https://github.com/httpdss/collectd-web
+COMMENT= Web interface for Collectd
+LICENSE= gnu-gpl-v2
+
+DEPENDS+= fcgiwrap>=1.1.0:../../www/fcgiwrap
+DEPENDS+= spawn-fcgi>=1.6.3:../../www/spawn-fcgi
+DEPENDS+= p5-HTTP-Parser>=0.06:../../www/p5-HTTP-Parser
+DEPENDS+= p5-JSON>=2.94:../../converters/p5-JSON
+DEPENDS+= p5-RRD-Simple>=1.44:../../databases/p5-RRD-Simple
+DEPENDS+= p5-CGI>=4.36:../../www/p5-CGI
+#DEPENDS+= cgic>=2.02:../../www/cgic
+#DEPENDS+= fcgi>=2.4.0:../../www/fcgi
+
+NO_BUILD= yes
+USE_TOOLS+= pax perl:run
+REPLACE_PERL+= cgi-bin/*.pl
+REPLACE_PERL+= cgi-bin/*.cgi
+REPLACE_SH+= check_deps.sh
+REPLACE_PYTHON+= runserver.py
+
+WRKSRC= ${WRKDIR}/${DISTNAME}
+USE_LANGUAGES= # none
+
+do-configure:
+ # empty target is needed, otherwise REPLACE_* do not happen
+
+do-install:
+ cd ${WRKSRC} && pax -rw -pp . ${DESTDIR}${PREFIX}/share/collectd-web
+
+.include "../../lang/perl5/module.mk"
+.include "../../lang/python/application.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-web/PLIST
diff -u /dev/null pkgsrc/sysutils/collectd-web/PLIST:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-web/PLIST Sat Oct 24 22:39:48 2020
@@ -0,0 +1,191 @@
+@comment $NetBSD: PLIST,v 1.1 2020/10/24 22:39:48 wiz Exp $
+share/collectd-web/.gitignore
+share/collectd-web/.project
+share/collectd-web/.pydevproject
+share/collectd-web/AUTHORS
+share/collectd-web/CHANGELOG
+share/collectd-web/COPYING
+share/collectd-web/README.rst
+share/collectd-web/cgi-bin/.htaccess
+share/collectd-web/cgi-bin/check_perl_modules.pl
+share/collectd-web/cgi-bin/collection.modified.cgi
+share/collectd-web/cgi-bin/graphdefs.cgi
+share/collectd-web/cgi-bin/time.cgi
+share/collectd-web/check_deps.sh
+share/collectd-web/docs/Makefile
+share/collectd-web/docs/conf.py
+share/collectd-web/docs/index.rst
+share/collectd-web/docs/make.bat
+share/collectd-web/docs/setup.rst
+share/collectd-web/docs/usage.rst
+share/collectd-web/index.html
+share/collectd-web/iphone/index.html
+share/collectd-web/media/css/base.css
+share/collectd-web/media/css/blueprint/ie.css
+share/collectd-web/media/css/blueprint/plugins/buttons/icons/cross.png
+share/collectd-web/media/css/blueprint/plugins/buttons/icons/key.png
+share/collectd-web/media/css/blueprint/plugins/buttons/icons/tick.png
+share/collectd-web/media/css/blueprint/plugins/buttons/readme.txt
+share/collectd-web/media/css/blueprint/plugins/buttons/screen.css
+share/collectd-web/media/css/blueprint/plugins/fancy-type/readme.txt
+share/collectd-web/media/css/blueprint/plugins/fancy-type/screen.css
+share/collectd-web/media/css/blueprint/plugins/link-icons/icons/doc.png
+share/collectd-web/media/css/blueprint/plugins/link-icons/icons/email.png
+share/collectd-web/media/css/blueprint/plugins/link-icons/icons/external.png
+share/collectd-web/media/css/blueprint/plugins/link-icons/icons/feed.png
+share/collectd-web/media/css/blueprint/plugins/link-icons/icons/im.png
+share/collectd-web/media/css/blueprint/plugins/link-icons/icons/pdf.png
+share/collectd-web/media/css/blueprint/plugins/link-icons/icons/visited.png
+share/collectd-web/media/css/blueprint/plugins/link-icons/icons/xls.png
+share/collectd-web/media/css/blueprint/plugins/link-icons/readme.txt
+share/collectd-web/media/css/blueprint/plugins/link-icons/screen.css
+share/collectd-web/media/css/blueprint/plugins/rtl/readme.txt
+share/collectd-web/media/css/blueprint/plugins/rtl/screen.css
+share/collectd-web/media/css/blueprint/plugins/silksprite/sprite.css
+share/collectd-web/media/css/blueprint/plugins/silksprite/sprites.png
+share/collectd-web/media/css/blueprint/print.css
+share/collectd-web/media/css/blueprint/screen.css
+share/collectd-web/media/css/blueprint/src/forms.css
+share/collectd-web/media/css/blueprint/src/grid.css
+share/collectd-web/media/css/blueprint/src/grid.png
+share/collectd-web/media/css/blueprint/src/ie.css
+share/collectd-web/media/css/blueprint/src/print.css
+share/collectd-web/media/css/blueprint/src/reset.css
+share/collectd-web/media/css/blueprint/src/typography.css
+share/collectd-web/media/css/custom-theme/images/ui-bg_diagonals-thick_18_b81900_40x40.png
+share/collectd-web/media/css/custom-theme/images/ui-bg_diagonals-thick_20_666666_40x40.png
+share/collectd-web/media/css/custom-theme/images/ui-bg_flat_10_000000_40x100.png
+share/collectd-web/media/css/custom-theme/images/ui-bg_glass_100_f6f6f6_1x400.png
+share/collectd-web/media/css/custom-theme/images/ui-bg_glass_100_fdf5ce_1x400.png
+share/collectd-web/media/css/custom-theme/images/ui-bg_glass_65_ffffff_1x400.png
+share/collectd-web/media/css/custom-theme/images/ui-bg_gloss-wave_35_f6a828_500x100.png
+share/collectd-web/media/css/custom-theme/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
+share/collectd-web/media/css/custom-theme/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
+share/collectd-web/media/css/custom-theme/images/ui-icons_222222_256x240.png
+share/collectd-web/media/css/custom-theme/images/ui-icons_228ef1_256x240.png
+share/collectd-web/media/css/custom-theme/images/ui-icons_ef8c08_256x240.png
+share/collectd-web/media/css/custom-theme/images/ui-icons_ffd27a_256x240.png
+share/collectd-web/media/css/custom-theme/images/ui-icons_ffffff_256x240.png
+share/collectd-web/media/css/custom-theme/jquery-ui-1.8.custom.css
+share/collectd-web/media/css/custom-theme/jquery-ui-1.8.iphone.css
+share/collectd-web/media/images/filetypes/SVG.png
+share/collectd-web/media/images/graph-load.png
+share/collectd-web/media/images/loading.gif
+share/collectd-web/media/images/question.png
+share/collectd-web/media/images/shortcut-icon.png
+share/collectd-web/media/jqtouch/.htaccess
+share/collectd-web/media/jqtouch/LICENSE.txt
+share/collectd-web/media/jqtouch/README.txt
+share/collectd-web/media/jqtouch/demos/clock/clock.css
+share/collectd-web/media/jqtouch/demos/clock/icon.png
+share/collectd-web/media/jqtouch/demos/clock/img/face.png
+share/collectd-web/media/jqtouch/demos/clock/img/hour.png
+share/collectd-web/media/jqtouch/demos/clock/img/minute.png
+share/collectd-web/media/jqtouch/demos/clock/img/second.png
+share/collectd-web/media/jqtouch/demos/clock/img/startup.png
+share/collectd-web/media/jqtouch/demos/clock/index.html
+share/collectd-web/media/jqtouch/demos/customanimation/index.html
+share/collectd-web/media/jqtouch/demos/customanimation/jqt_startup.png
+share/collectd-web/media/jqtouch/demos/customanimation/jqtouch.png
+share/collectd-web/media/jqtouch/demos/customanimation2/index.html
+share/collectd-web/media/jqtouch/demos/customanimation2/jqt_startup.png
+share/collectd-web/media/jqtouch/demos/customanimation2/jqtouch.png
+share/collectd-web/media/jqtouch/demos/ext_autotitles/index.html
+share/collectd-web/media/jqtouch/demos/ext_autotitles/jqt_startup.png
+share/collectd-web/media/jqtouch/demos/ext_autotitles/jqtouch.png
+share/collectd-web/media/jqtouch/demos/ext_floaty/index.html
+share/collectd-web/media/jqtouch/demos/ext_floaty/jqt_startup.png
+share/collectd-web/media/jqtouch/demos/ext_floaty/jqtouch.png
+share/collectd-web/media/jqtouch/demos/ext_location/index.html
+share/collectd-web/media/jqtouch/demos/ext_location/jqt_startup.png
+share/collectd-web/media/jqtouch/demos/ext_location/jqtouch.png
+share/collectd-web/media/jqtouch/demos/ext_offline/.htaccess
+share/collectd-web/media/jqtouch/demos/ext_offline/cache.manifest
+share/collectd-web/media/jqtouch/demos/ext_offline/index.html
+share/collectd-web/media/jqtouch/demos/ext_offline/jqt_startup.png
+share/collectd-web/media/jqtouch/demos/ext_offline/jqtouch.png
+share/collectd-web/media/jqtouch/demos/ext_offline/sample.htaccess
+share/collectd-web/media/jqtouch/demos/main/ajax.html
+share/collectd-web/media/jqtouch/demos/main/ajax_post.php
+share/collectd-web/media/jqtouch/demos/main/index.html
+share/collectd-web/media/jqtouch/demos/main/jqt_startup.png
+share/collectd-web/media/jqtouch/demos/main/jqtouch.png
+share/collectd-web/media/jqtouch/demos/todo/icon.png
+share/collectd-web/media/jqtouch/demos/todo/index.html
+share/collectd-web/media/jqtouch/demos/todo/startup.png
+share/collectd-web/media/jqtouch/extensions/jqt.autotitles.js
+share/collectd-web/media/jqtouch/extensions/jqt.floaty.js
+share/collectd-web/media/jqtouch/extensions/jqt.location.js
+share/collectd-web/media/jqtouch/extensions/jqt.offline.js
+share/collectd-web/media/jqtouch/jqtouch/jqt_startup.png
+share/collectd-web/media/jqtouch/jqtouch/jqtouch.css
+share/collectd-web/media/jqtouch/jqtouch/jqtouch.js
+share/collectd-web/media/jqtouch/jqtouch/jqtouch.min.css
+share/collectd-web/media/jqtouch/jqtouch/jqtouch.min.js
+share/collectd-web/media/jqtouch/jqtouch/jqtouch.png
+share/collectd-web/media/jqtouch/jqtouch/jqtouch.transitions.js
+share/collectd-web/media/jqtouch/jqtouch/jquery.1.3.2.min.js
+share/collectd-web/media/jqtouch/sample.htaccess
+share/collectd-web/media/jqtouch/themes/apple/img/backButton.png
+share/collectd-web/media/jqtouch/themes/apple/img/blueButton.png
+share/collectd-web/media/jqtouch/themes/apple/img/cancel.png
+share/collectd-web/media/jqtouch/themes/apple/img/chevron.png
+share/collectd-web/media/jqtouch/themes/apple/img/grayButton.png
+share/collectd-web/media/jqtouch/themes/apple/img/listArrowSel.png
+share/collectd-web/media/jqtouch/themes/apple/img/listGroup.png
+share/collectd-web/media/jqtouch/themes/apple/img/loadinfo.net.gif
+share/collectd-web/media/jqtouch/themes/apple/img/loading.gif
+share/collectd-web/media/jqtouch/themes/apple/img/on_off.png
+share/collectd-web/media/jqtouch/themes/apple/img/pinstripes.png
+share/collectd-web/media/jqtouch/themes/apple/img/selection.png
+share/collectd-web/media/jqtouch/themes/apple/img/thumb.png
+share/collectd-web/media/jqtouch/themes/apple/img/toggle.png
+share/collectd-web/media/jqtouch/themes/apple/img/toggleOn.png
+share/collectd-web/media/jqtouch/themes/apple/img/toolButton.png
+share/collectd-web/media/jqtouch/themes/apple/img/toolbar.png
+share/collectd-web/media/jqtouch/themes/apple/img/whiteButton.png
+share/collectd-web/media/jqtouch/themes/apple/theme.css
+share/collectd-web/media/jqtouch/themes/apple/theme.min.css
+share/collectd-web/media/jqtouch/themes/jqt/img/back_button.png
+share/collectd-web/media/jqtouch/themes/jqt/img/back_button_clicked.png
+share/collectd-web/media/jqtouch/themes/jqt/img/button.png
+share/collectd-web/media/jqtouch/themes/jqt/img/button_clicked.png
+share/collectd-web/media/jqtouch/themes/jqt/img/chevron.png
+share/collectd-web/media/jqtouch/themes/jqt/img/chevron_circle.png
+share/collectd-web/media/jqtouch/themes/jqt/img/grayButton.png
+share/collectd-web/media/jqtouch/themes/jqt/img/loading.gif
+share/collectd-web/media/jqtouch/themes/jqt/img/on_off.png
+share/collectd-web/media/jqtouch/themes/jqt/img/rowhead.png
+share/collectd-web/media/jqtouch/themes/jqt/img/toggle.png
+share/collectd-web/media/jqtouch/themes/jqt/img/toggleOn.png
+share/collectd-web/media/jqtouch/themes/jqt/img/toolbar.png
+share/collectd-web/media/jqtouch/themes/jqt/img/whiteButton.png
+share/collectd-web/media/jqtouch/themes/jqt/theme.css
+share/collectd-web/media/jqtouch/themes/jqt/theme.min.css
+share/collectd-web/media/js/base.js
+share/collectd-web/media/js/external/TimeSpan-1.2.min.js
+share/collectd-web/media/js/external/date.js
+share/collectd-web/media/js/external/jStore-1.2.0-production/engines/jStore.Dom-min.js
+share/collectd-web/media/js/external/jStore-1.2.0-production/engines/jStore.Flash-min.js
+share/collectd-web/media/js/external/jStore-1.2.0-production/engines/jStore.Gears-min.js
+share/collectd-web/media/js/external/jStore-1.2.0-production/engines/jStore.Html5-min.js
+share/collectd-web/media/js/external/jStore-1.2.0-production/engines/jStore.IE-min.js
+share/collectd-web/media/js/external/jStore-1.2.0-production/jStore.Flash.html
+share/collectd-web/media/js/external/jStore-1.2.0-production/jStore.swf
+share/collectd-web/media/js/external/jStore-1.2.0-production/jquery.jstore-all-min.js
+share/collectd-web/media/js/external/jStore-1.2.0-production/jquery.jstore-min.js
+share/collectd-web/media/js/external/jquery-1.4.4.min.js
+share/collectd-web/media/js/external/jquery.jixedbar.js
+share/collectd-web/media/js/graph-menu.js
+share/collectd-web/media/js/jquery-ui-1.8.custom.min.js
+share/collectd-web/media/js/jquery.history.fixed.js
+share/collectd-web/media/js/jquery.history.js
+share/collectd-web/media/js/jquery.jclock.js
+share/collectd-web/media/js/jquery.livequery.js
+share/collectd-web/media/js/jquery.metadata.min.js
+share/collectd-web/media/js/jquery.validate.pack.js
+share/collectd-web/media/libs/backbone.js
+share/collectd-web/media/libs/backbone.localStorage.js
+share/collectd-web/media/libs/json2.js
+share/collectd-web/media/libs/underscore.js
+share/collectd-web/runserver.py
Index: pkgsrc/sysutils/collectd-web/distinfo
diff -u /dev/null pkgsrc/sysutils/collectd-web/distinfo:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-web/distinfo Sat Oct 24 22:39:48 2020
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2020/10/24 22:39:48 wiz Exp $
+
+SHA1 (collectd-web-0.4.1.zip) = 4cd43b3a31081c61e3a968152b37aa16107b5cce
+RMD160 (collectd-web-0.4.1.zip) = 2555cf419ee8e36b3bd59de2d43b205ded6cd88e
+SHA512 (collectd-web-0.4.1.zip) = 836d5b9b8fe7e89797c5ce08d216e39d513fe15791a642b9c42b54e1b49d6be2af257d9270b377ad4a288bccf0092dbfdade65ac56c0c4e6418df0c271291a16
+Size (collectd-web-0.4.1.zip) = 979647 bytes
Index: pkgsrc/sysutils/collectd-xen/DESCR
diff -u /dev/null pkgsrc/sysutils/collectd-xen/DESCR:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-xen/DESCR Sat Oct 24 22:39:48 2020
@@ -0,0 +1 @@
+xen_cpu plugin for collectd
Index: pkgsrc/sysutils/collectd-xen/Makefile
diff -u /dev/null pkgsrc/sysutils/collectd-xen/Makefile:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-xen/Makefile Sat Oct 24 22:39:48 2020
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2020/10/24 22:39:48 wiz Exp $
+
+COLLECTD_PACKAGE= xen
+COLLECTD_PLUGINS= xencpu
+
+COMMENT= Statistics collection daemon - xencpu plugin
+
+COLLECTD_XEN?= 411
+
+.include "../../sysutils/xentools${COLLECTD_XEN}/buildlink3.mk"
+COLLECTD_LIB.xenctrl= ${BUILDLINK_PREFIX.xentools${COLLECTD_XEN}}
+
+.include "../../sysutils/collectd/Makefile.common"
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-xmms/DESCR
diff -u /dev/null pkgsrc/sysutils/collectd-xmms/DESCR:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-xmms/DESCR Sat Oct 24 22:39:49 2020
@@ -0,0 +1 @@
+xmms plugin for collectd
Index: pkgsrc/sysutils/collectd-xmms/Makefile
diff -u /dev/null pkgsrc/sysutils/collectd-xmms/Makefile:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-xmms/Makefile Sat Oct 24 22:39:49 2020
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2020/10/24 22:39:49 wiz Exp $
+
+COLLECTD_PACKAGE= xmms
+
+COMMENT= Statistics collection daemon - xmms plugin
+
+.include "../../audio/xmms/buildlink3.mk"
+COLLECTD_LIB.xmms= ${BUILDLINK_PREFIX.xmms}
+
+.include "../../sysutils/collectd/Makefile.common"
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd-yajl/DESCR
diff -u /dev/null pkgsrc/sysutils/collectd-yajl/DESCR:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-yajl/DESCR Sat Oct 24 22:39:49 2020
@@ -0,0 +1,2 @@
+YAJL-based plugins for collectd (ceph, log_logstash, sysevent).
+Plugins that also depend on CURL are in the collectd-curl package.
Index: pkgsrc/sysutils/collectd-yajl/Makefile
diff -u /dev/null pkgsrc/sysutils/collectd-yajl/Makefile:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd-yajl/Makefile Sat Oct 24 22:39:49 2020
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2020/10/24 22:39:49 wiz Exp $
+
+COLLECTD_PACKAGE= yajl
+COLLECTD_PLUGINS= ceph log_logstash sysevent
+
+COMMENT= Statistics collection daemon - YAJL-based plugins
+
+.include "../../devel/yajl/buildlink3.mk"
+COLLECTD_LIB.yajl= ${BUILDLINK_PREFIX.yajl}
+
+.include "../../sysutils/collectd/Makefile.common"
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/collectd/patches/patch-src_libcollectdclient_network__buffer.c
diff -u /dev/null pkgsrc/sysutils/collectd/patches/patch-src_libcollectdclient_network__buffer.c:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd/patches/patch-src_libcollectdclient_network__buffer.c Sat Oct 24 22:39:45 2020
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_libcollectdclient_network__buffer.c,v 1.1 2020/10/24 22:39:45 wiz Exp $
+
+Need the workaround on at least SunOS too.
+
+--- src/libcollectdclient/network_buffer.c.orig 2020-03-08 16:57:09.000000000 +0100
++++ src/libcollectdclient/network_buffer.c 2020-07-06 19:48:22.130670698 +0200
+@@ -41,7 +41,7 @@
+ #include <pthread.h>
+
+ #if HAVE_GCRYPT_H
+-#if defined __APPLE__
++#if defined __APPLE__ || defined(__sun)
+ /* default xcode compiler throws warnings even when deprecated functionality
+ * is not used. -Werror breaks the build because of erroneous warnings.
+ * http://stackoverflow.com/questions/10556299/compiler-warnings-with-libgcrypt-v1-5-0/12830209#12830209
+@@ -54,7 +54,7 @@
+ */
+ #define GCRYPT_NO_DEPRECATED
+ #include <gcrypt.h>
+-#if defined __APPLE__
++#if defined __APPLE__ || defined(__sun)
+ /* Re enable deprecation warnings */
+ #pragma GCC diagnostic warning "-Wdeprecated-declarations"
+ #endif
Index: pkgsrc/sysutils/collectd/patches/patch-src_nfs.c
diff -u /dev/null pkgsrc/sysutils/collectd/patches/patch-src_nfs.c:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd/patches/patch-src_nfs.c Sat Oct 24 22:39:45 2020
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_nfs.c,v 1.1 2020/10/24 22:39:45 wiz Exp $
+
+Don't use undefined suppress_warning variable (see
+https://github.com/collectd/collectd/pull/3495).
+
+--- src/nfs.c.orig 2020-07-07 12:20:18.984988453 +0200
++++ src/nfs.c 2020-07-07 12:20:23.513661540 +0200
+@@ -622,19 +622,14 @@ static int nfs_read(void) {
+
+ /* NetBSD reports v2 statistics mapped to v3 and doen't yet support v4 */
+ if (report_v2) {
+- if (!suppress_warning) {
+- WARNING(
+- "nfs plugin: NFSv2 statistics have been requested "
+- "but they are mapped to NFSv3 statistics in the kernel on NetBSD.");
+- }
++ WARNING("nfs plugin: NFSv2 statistics have been requested "
++ "but they are mapped to NFSv3 statistics in the kernel on NetBSD.");
+ return 0;
+ }
+
+ if (report_v4) {
+- if (!suppress_warning) {
+- WARNING("nfs plugin: NFSv4 statistics have been requested "
+- "but they are not yet supported on NetBSD.");
+- }
++ WARNING("nfs plugin: NFSv4 statistics have been requested "
++ "but they are not yet supported on NetBSD.");
+ return 0;
+ }
+
Index: pkgsrc/sysutils/collectd/patches/patch-src_utils_dns_dns.c
diff -u /dev/null pkgsrc/sysutils/collectd/patches/patch-src_utils_dns_dns.c:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd/patches/patch-src_utils_dns_dns.c Sat Oct 24 22:39:45 2020
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_utils_dns_dns.c,v 1.1 2020/10/24 22:39:45 wiz Exp $
+
+Resolve conflict with pkgsrc PCAP on NetBSD 7 and 8.
+
+--- src/utils/dns/dns.c.orig 2020-03-08 16:57:09.000000000 +0100
++++ src/utils/dns/dns.c 2020-07-20 12:55:29.000000000 +0200
+@@ -85,6 +85,12 @@
+ #endif
+
+ #if HAVE_PCAP_H
++# if defined(DLT_MATCHING_MAX)
++# undef DLT_MATCHING_MAX
++# endif
++# if defined(DLT_IEEE802_15_4)
++# undef DLT_IEEE802_15_4
++# endif
+ #include <pcap.h>
+ #endif
+
Index: pkgsrc/sysutils/collectd/patches/patch-src_utils_format__kairosdb_format__kairosdb.c
diff -u /dev/null pkgsrc/sysutils/collectd/patches/patch-src_utils_format__kairosdb_format__kairosdb.c:1.1
--- /dev/null Sat Oct 24 22:39:49 2020
+++ pkgsrc/sysutils/collectd/patches/patch-src_utils_format__kairosdb_format__kairosdb.c Sat Oct 24 22:39:45 2020
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_utils_format__kairosdb_format__kairosdb.c,v 1.1 2020/10/24 22:39:45 wiz Exp $
+
+Cast arguments to isalnum() and tolower() to "unsigned char" to
+squelch warnings.
+
+--- src/utils/format_kairosdb/format_kairosdb.c.orig 2016-11-30 08:52:01.000000000 +0000
++++ src/utils/format_kairosdb/format_kairosdb.c
+@@ -80,9 +80,9 @@ static int kairosdb_escape_string(char *
+ /* authorize -_. and alpha num but also escapes " */
+ BUFFER_ADD('"');
+ for (size_t src_pos = 0; string[src_pos] != 0; src_pos++) {
+- if (isalnum(string[src_pos]) || 0x2d == string[src_pos] ||
++ if (isalnum((unsigned char)string[src_pos]) || 0x2d == string[src_pos] ||
+ 0x2e == string[src_pos] || 0x5f == string[src_pos])
+- BUFFER_ADD(tolower(string[src_pos]));
++ BUFFER_ADD(tolower((unsigned char)string[src_pos]));
+ } /* for */
+ BUFFER_ADD('"');
+ buffer[dst_pos] = 0;
Home |
Main Index |
Thread Index |
Old Index