pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
collectd: remove, imported to pkgsrc
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <tk%giga.or.at@localhost>
Pushed By: wiz
Date: Sun Oct 25 00:46:34 2020 +0200
Changeset: e6965bb94c4450ed6072347c6f904aefcc3cfd6e
Modified Files:
Makefile
Removed Files:
collectd-CGP/DESCR
collectd-CGP/Makefile
collectd-CGP/PLIST
collectd-CGP/distinfo
collectd-amqp/DESCR
collectd-amqp/Makefile
collectd-curl/DESCR
collectd-curl/Makefile
collectd-dbi/DESCR
collectd-dbi/Makefile
collectd-dns/DESCR
collectd-dns/Makefile
collectd-gmond/DESCR
collectd-gmond/Makefile
collectd-gps/DESCR
collectd-gps/Makefile
collectd-grpc/DESCR
collectd-grpc/Makefile
collectd-haproxy/DESCR
collectd-haproxy/Makefile
collectd-haproxy/PLIST
collectd-haproxy/distinfo
collectd-kafka/DESCR
collectd-kafka/Makefile
collectd-lua/DESCR
collectd-lua/Makefile
collectd-memcachec/DESCR
collectd-memcachec/Makefile
collectd-mongodb/DESCR
collectd-mongodb/Makefile
collectd-mysql/DESCR
collectd-mysql/Makefile
collectd-network/DESCR
collectd-network/Makefile
collectd-notify-email/DESCR
collectd-notify-email/Makefile
collectd-notify_desktop/DESCR
collectd-notify_desktop/Makefile
collectd-nut/DESCR
collectd-nut/Makefile
collectd-openldap/DESCR
collectd-openldap/Makefile
collectd-pinba/DESCR
collectd-pinba/Makefile
collectd-postgresql/DESCR
collectd-postgresql/Makefile
collectd-redis/DESCR
collectd-redis/Makefile
collectd-riemann/DESCR
collectd-riemann/Makefile
collectd-rrdtool/DESCR
collectd-rrdtool/Makefile
collectd-snmp/DESCR
collectd-snmp/Makefile
collectd-tokyotyrant/DESCR
collectd-tokyotyrant/Makefile
collectd-varnish/DESCR
collectd-varnish/Makefile
collectd-virt/DESCR
collectd-virt/Makefile
collectd-web/DESCR
collectd-web/Makefile
collectd-web/PLIST
collectd-web/distinfo
collectd-write_prometheus/DESCR
collectd-write_prometheus/Makefile
collectd-xen/DESCR
collectd-xen/Makefile
collectd-xmms/DESCR
collectd-xmms/Makefile
collectd-yajl/DESCR
collectd-yajl/Makefile
collectd/DESCR
collectd/Makefile
collectd/Makefile.common
collectd/PLIST
collectd/distinfo
collectd/files/collectd.sh
collectd/files/smf/manifest.xml
collectd/options.mk
collectd/patches/patch-Makefile.am
collectd/patches/patch-configure.ac
collectd/patches/patch-src_bind.c
collectd/patches/patch-src_collectd.conf.in
collectd/patches/patch-src_cpu.c
collectd/patches/patch-src_df.c
collectd/patches/patch-src_entropy.c
collectd/patches/patch-src_irq.c
collectd/patches/patch-src_libcollectdclient_network__buffer.c
collectd/patches/patch-src_memory.c
collectd/patches/patch-src_netstat__udp.c
collectd/patches/patch-src_nfs.c
collectd/patches/patch-src_processes.c
collectd/patches/patch-src_statsd.c
collectd/patches/patch-src_swap.c
collectd/patches/patch-src_tcpconns.c
collectd/patches/patch-src_utils_dns_dns.c
collectd/patches/patch-src_utils_format__kairosdb_format__kairosdb.c
Log Message:
collectd: remove, imported to pkgsrc
Sync Makefile
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e6965bb94c4450ed6072347c6f904aefcc3cfd6e
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 82 ++++---
collectd-CGP/DESCR | 1 -
collectd-CGP/Makefile | 34 ---
collectd-CGP/PLIST | 92 -------
collectd-CGP/distinfo | 6 -
collectd-amqp/DESCR | 1 -
collectd-amqp/Makefile | 12 -
collectd-curl/DESCR | 2 -
collectd-curl/Makefile | 18 --
collectd-dbi/DESCR | 1 -
collectd-dbi/Makefile | 12 -
collectd-dns/DESCR | 1 -
collectd-dns/Makefile | 17 --
collectd-gmond/DESCR | 1 -
collectd-gmond/Makefile | 12 -
collectd-gps/DESCR | 1 -
collectd-gps/Makefile | 12 -
collectd-grpc/DESCR | 1 -
collectd-grpc/Makefile | 18 --
collectd-haproxy/DESCR | 1 -
collectd-haproxy/Makefile | 22 --
collectd-haproxy/PLIST | 20 --
collectd-haproxy/distinfo | 6 -
collectd-kafka/DESCR | 1 -
collectd-kafka/Makefile | 13 -
collectd-lua/DESCR | 1 -
collectd-lua/Makefile | 13 -
collectd-memcachec/DESCR | 1 -
collectd-memcachec/Makefile | 12 -
collectd-mongodb/DESCR | 1 -
collectd-mongodb/Makefile | 13 -
collectd-mysql/DESCR | 1 -
collectd-mysql/Makefile | 13 -
collectd-network/DESCR | 1 -
collectd-network/Makefile | 12 -
collectd-notify-email/DESCR | 1 -
collectd-notify-email/Makefile | 12 -
collectd-notify_desktop/DESCR | 1 -
collectd-notify_desktop/Makefile | 12 -
collectd-nut/DESCR | 1 -
collectd-nut/Makefile | 12 -
collectd-openldap/DESCR | 1 -
collectd-openldap/Makefile | 12 -
collectd-pinba/DESCR | 1 -
collectd-pinba/Makefile | 14 --
collectd-postgresql/DESCR | 1 -
collectd-postgresql/Makefile | 13 -
collectd-redis/DESCR | 1 -
collectd-redis/Makefile | 13 -
collectd-riemann/DESCR | 1 -
collectd-riemann/Makefile | 15 --
collectd-rrdtool/DESCR | 1 -
collectd-rrdtool/Makefile | 13 -
collectd-snmp/DESCR | 1 -
collectd-snmp/Makefile | 12 -
collectd-tokyotyrant/DESCR | 1 -
collectd-tokyotyrant/Makefile | 12 -
collectd-varnish/DESCR | 1 -
collectd-varnish/Makefile | 12 -
collectd-virt/DESCR | 1 -
collectd-virt/Makefile | 12 -
collectd-web/DESCR | 6 -
collectd-web/Makefile | 41 ----
collectd-web/PLIST | 191 ---------------
collectd-web/distinfo | 6 -
collectd-write_prometheus/DESCR | 1 -
collectd-write_prometheus/Makefile | 16 --
collectd-xen/DESCR | 1 -
collectd-xen/Makefile | 15 --
collectd-xmms/DESCR | 1 -
collectd-xmms/Makefile | 12 -
collectd-yajl/DESCR | 2 -
collectd-yajl/Makefile | 13 -
collectd/DESCR | 3 -
collectd/Makefile | 46 ----
collectd/Makefile.common | 113 ---------
collectd/PLIST | 101 --------
collectd/distinfo | 24 --
collectd/files/collectd.sh | 26 --
collectd/files/smf/manifest.xml | 29 ---
collectd/options.mk | 45 ----
collectd/patches/patch-Makefile.am | 37 ---
collectd/patches/patch-configure.ac | 48 ----
collectd/patches/patch-src_bind.c | 25 --
collectd/patches/patch-src_collectd.conf.in | 107 ---------
collectd/patches/patch-src_cpu.c | 58 -----
collectd/patches/patch-src_df.c | 21 --
collectd/patches/patch-src_entropy.c | 109 ---------
collectd/patches/patch-src_irq.c | 99 --------
.../patch-src_libcollectdclient_network__buffer.c | 24 --
collectd/patches/patch-src_memory.c | 98 --------
collectd/patches/patch-src_netstat__udp.c | 165 -------------
collectd/patches/patch-src_nfs.c | 31 ---
collectd/patches/patch-src_processes.c | 264 ---------------------
collectd/patches/patch-src_statsd.c | 19 --
collectd/patches/patch-src_swap.c | 144 -----------
collectd/patches/patch-src_tcpconns.c | 26 --
collectd/patches/patch-src_utils_dns_dns.c | 19 --
...h-src_utils_format__kairosdb_format__kairosdb.c | 19 --
99 files changed, 46 insertions(+), 2591 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 13bd3323a0..ff249001ec 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,7 @@ SUBDIR+= OpenTESArena
SUBDIR+= PHPUnit
SUBDIR+= PPower4
SUBDIR+= PatternPaint
+SUBDIR+= PrusaSlicer
SUBDIR+= PyBabelFish
SUBDIR+= Pythonol
SUBDIR+= Qweyboard
@@ -453,41 +454,7 @@ SUBDIR+= cm-unicode-ttf
SUBDIR+= cmetrics
SUBDIR+= coccigrep
SUBDIR+= coccinelle
-SUBDIR+= collectd
-SUBDIR+= collectd-CGP
-SUBDIR+= collectd-amqp
-SUBDIR+= collectd-curl
-SUBDIR+= collectd-dbi
-SUBDIR+= collectd-dns
-SUBDIR+= collectd-gmond
-SUBDIR+= collectd-gps
-SUBDIR+= collectd-grpc
-SUBDIR+= collectd-haproxy
-SUBDIR+= collectd-kafka
-SUBDIR+= collectd-lua
-SUBDIR+= collectd-memcachec
-SUBDIR+= collectd-mongodb
-SUBDIR+= collectd-mysql
-SUBDIR+= collectd-network
-SUBDIR+= collectd-notify-email
-SUBDIR+= collectd-notify_desktop
-SUBDIR+= collectd-nut
-SUBDIR+= collectd-openldap
-SUBDIR+= collectd-pinba
-SUBDIR+= collectd-postgresql
-SUBDIR+= collectd-redis
-SUBDIR+= collectd-riemann
-SUBDIR+= collectd-rrdtool
-SUBDIR+= collectd-snmp
-SUBDIR+= collectd-tokyotyrant
SUBDIR+= collectd-unbound
-SUBDIR+= collectd-varnish
-SUBDIR+= collectd-virt
-SUBDIR+= collectd-web
-SUBDIR+= collectd-write_prometheus
-SUBDIR+= collectd-xen
-SUBDIR+= collectd-xmms
-SUBDIR+= collectd-yajl
SUBDIR+= colm-devel
SUBDIR+= colobot
SUBDIR+= colord
@@ -679,6 +646,7 @@ SUBDIR+= double-conversion
SUBDIR+= dovecot-antispam
SUBDIR+= downtimed
SUBDIR+= dpic
+SUBDIR+= dps8m
SUBDIR+= dragbox-git
SUBDIR+= drist
SUBDIR+= drkonqi
@@ -1599,6 +1567,7 @@ SUBDIR+= hztool
SUBDIR+= i2pd
SUBDIR+= i2pd-git
SUBDIR+= i3-git
+SUBDIR+= i3lock-color
SUBDIR+= iText
SUBDIR+= iTextXML
SUBDIR+= ical2pcal
@@ -1781,6 +1750,7 @@ SUBDIR+= kmymoney4
SUBDIR+= kodi
SUBDIR+= koha
SUBDIR+= konsole
+SUBDIR+= kronometer
SUBDIR+= krusader
SUBDIR+= kscreen
SUBDIR+= kscreenlocker
@@ -1962,6 +1932,7 @@ SUBDIR+= libpsurface
SUBDIR+= libpthread-stubs
SUBDIR+= libpusb
SUBDIR+= libpwquality
+SUBDIR+= libqd
SUBDIR+= libquantum
SUBDIR+= libquvi
SUBDIR+= libquvi-scripts
@@ -2361,11 +2332,11 @@ SUBDIR+= ngircd
SUBDIR+= nicotine+
SUBDIR+= nih-current
SUBDIR+= ninja-ide
-SUBDIR+= ninka
SUBDIR+= nios2-gdb
SUBDIR+= nitrogen
SUBDIR+= nix
SUBDIR+= nlohmann-json
+SUBDIR+= nlopt
SUBDIR+= nltk_data
SUBDIR+= nnrpd
SUBDIR+= nodau
@@ -2376,6 +2347,7 @@ SUBDIR+= nomad
SUBDIR+= nomadio
SUBDIR+= nominatim
SUBDIR+= nongnu-libunwind-git
+SUBDIR+= nono
SUBDIR+= noor
SUBDIR+= normaliz
SUBDIR+= nos-tun
@@ -3048,6 +3020,7 @@ SUBDIR+= pts
SUBDIR+= ptunnel
SUBDIR+= pudb
SUBDIR+= pulseaudio-git
+SUBDIR+= pulseaudio-qt
SUBDIR+= pure
SUBDIR+= purple-facebook
SUBDIR+= pwnat
@@ -3135,6 +3108,7 @@ SUBDIR+= py-ass
SUBDIR+= py-astlib
SUBDIR+= py-astropy
SUBDIR+= py-astropysics
+SUBDIR+= py-astunparse
SUBDIR+= py-async
SUBDIR+= py-atmark
SUBDIR+= py-atmos
@@ -3142,6 +3116,7 @@ SUBDIR+= py-atom
SUBDIR+= py-atomicfile
SUBDIR+= py-atpy
SUBDIR+= py-attrdict
+SUBDIR+= py-autoflake
SUBDIR+= py-autokey
SUBDIR+= py-automata
SUBDIR+= py-awesome-slugify
@@ -3177,6 +3152,7 @@ SUBDIR+= py-booktype
SUBDIR+= py-brian
SUBDIR+= py-brian2
SUBDIR+= py-bruce
+SUBDIR+= py-brython
SUBDIR+= py-bsddb
SUBDIR+= py-bson
SUBDIR+= py-bxa
@@ -3253,6 +3229,7 @@ SUBDIR+= py-colorlog
SUBDIR+= py-colormath
SUBDIR+= py-colorpy
SUBDIR+= py-complexsystems
+SUBDIR+= py-compyle
SUBDIR+= py-conan
SUBDIR+= py-concepts
SUBDIR+= py-conda
@@ -3280,6 +3257,7 @@ SUBDIR+= py-cse
SUBDIR+= py-csp
SUBDIR+= py-ctutils
SUBDIR+= py-cubicweb
+SUBDIR+= py-curlify
SUBDIR+= py-cutadapt
SUBDIR+= py-cva
SUBDIR+= py-cvf
@@ -3293,6 +3271,7 @@ SUBDIR+= py-cythongsl
SUBDIR+= py-cytoolz
SUBDIR+= py-da
SUBDIR+= py-dana
+SUBDIR+= py-dantic
SUBDIR+= py-das
SUBDIR+= py-dask
SUBDIR+= py-dataclasses
@@ -3421,6 +3400,7 @@ SUBDIR+= py-extremes
SUBDIR+= py-fancyimpute
SUBDIR+= py-fanova
SUBDIR+= py-fastaudio
+SUBDIR+= py-fastavro
SUBDIR+= py-fastdtw
SUBDIR+= py-fatiando
SUBDIR+= py-fcn
@@ -3457,6 +3437,7 @@ SUBDIR+= py-forthon
SUBDIR+= py-fortpy
SUBDIR+= py-freetype-py
SUBDIR+= py-fssa
+SUBDIR+= py-fsspec
SUBDIR+= py-functions
SUBDIR+= py-fuzzpy
SUBDIR+= py-fwarp
@@ -3477,6 +3458,7 @@ SUBDIR+= py-genesis
SUBDIR+= py-geographiclib
SUBDIR+= py-geoip
SUBDIR+= py-geom
+SUBDIR+= py-geometry-utils
SUBDIR+= py-geopy
SUBDIR+= py-geppy
SUBDIR+= py-gettext-tools
@@ -3509,11 +3491,15 @@ SUBDIR+= py-graph-tool
SUBDIR+= py-graphite-web
SUBDIR+= py-graphmin
SUBDIR+= py-graphpath
+SUBDIR+= py-graphql-core
+SUBDIR+= py-graphql-relay
SUBDIR+= py-graphs
SUBDIR+= py-graphsim
SUBDIR+= py-gratelpy
SUBDIR+= py-gravipy
+SUBDIR+= py-greenery
SUBDIR+= py-griddata
+SUBDIR+= py-grimp
SUBDIR+= py-grpy
SUBDIR+= py-grtipy
SUBDIR+= py-gsl
@@ -3536,6 +3522,7 @@ SUBDIR+= py-hcluster
SUBDIR+= py-hddm
SUBDIR+= py-hdf5able
SUBDIR+= py-hdf5storage
+SUBDIR+= py-hdfs
SUBDIR+= py-healpy
SUBDIR+= py-helio
SUBDIR+= py-hepcrawl
@@ -3557,6 +3544,7 @@ SUBDIR+= py-htmlparser
SUBDIR+= py-htseq
SUBDIR+= py-http-prompt
SUBDIR+= py-httpretty
+SUBDIR+= py-hug
SUBDIR+= py-hugo
SUBDIR+= py-humanfriendly
SUBDIR+= py-hvac
@@ -3573,6 +3561,7 @@ SUBDIR+= py-idx2numpy
SUBDIR+= py-ift-nifty
SUBDIR+= py-igraph
SUBDIR+= py-iisignature
+SUBDIR+= py-import-linter
SUBDIR+= py-imread
SUBDIR+= py-imreg-dft
SUBDIR+= py-influxdb
@@ -3815,6 +3804,7 @@ SUBDIR+= py-numberjack
SUBDIR+= py-numdifftools
SUBDIR+= py-numericalunits
SUBDIR+= py-numpoly
+SUBDIR+= py-numpy-quaternion
SUBDIR+= py-nupic
SUBDIR+= py-nxos
SUBDIR+= py-nxpd
@@ -3845,6 +3835,7 @@ SUBDIR+= py-othman
SUBDIR+= py-otp
SUBDIR+= py-owslib
SUBDIR+= py-p4
+SUBDIR+= py-p_tqdm
SUBDIR+= py-paegan
SUBDIR+= py-pafy
SUBDIR+= py-paida
@@ -3861,6 +3852,7 @@ SUBDIR+= py-parameters
SUBDIR+= py-paramz
SUBDIR+= py-parserutils
SUBDIR+= py-parsimonious
+SUBDIR+= py-parsy
SUBDIR+= py-patch
SUBDIR+= py-patch-ng
SUBDIR+= py-pathos
@@ -3896,6 +3888,7 @@ SUBDIR+= py-plucker
SUBDIR+= py-pluginbase
SUBDIR+= py-pmi
SUBDIR+= py-poisson-approval
+SUBDIR+= py-poissongeometry
SUBDIR+= py-polygon3
SUBDIR+= py-polynomial
SUBDIR+= py-poppy
@@ -3918,6 +3911,7 @@ SUBDIR+= py-prody
SUBDIR+= py-progressbar
SUBDIR+= py-progressbar2
SUBDIR+= py-projectq
+SUBDIR+= py-promise
SUBDIR+= py-property-manager
SUBDIR+= py-propyte
SUBDIR+= py-psamm
@@ -4066,15 +4060,18 @@ SUBDIR+= py-ropemode
SUBDIR+= py-rpaths
SUBDIR+= py-rpncalc
SUBDIR+= py-rql
+SUBDIR+= py-rtree
SUBDIR+= py-ruffus
SUBDIR+= py-sabyenc
SUBDIR+= py-sabyenc3
SUBDIR+= py-safersympify
SUBDIR+= py-safety
+SUBDIR+= py-sanic
SUBDIR+= py-sarge
SUBDIR+= py-sas7bdat
SUBDIR+= py-sasa
SUBDIR+= py-scalpy
+SUBDIR+= py-scanapi
SUBDIR+= py-scanless
SUBDIR+= py-scholarmetrics
SUBDIR+= py-scikit-aero
@@ -4104,6 +4101,7 @@ SUBDIR+= py-sdt_metrics
SUBDIR+= py-se
SUBDIR+= py-seeds
SUBDIR+= py-selection
+SUBDIR+= py-selenium-generator
SUBDIR+= py-semidbm
SUBDIR+= py-sempy
SUBDIR+= py-semver
@@ -4151,6 +4149,8 @@ SUBDIR+= py-speview
SUBDIR+= py-spfpm
SUBDIR+= py-spglib
SUBDIR+= py-sphereTS
+SUBDIR+= py-spherical
+SUBDIR+= py-spherical-functions
SUBDIR+= py-sphinx-automodapi
SUBDIR+= py-sphinxreport
SUBDIR+= py-sphviewer
@@ -4159,11 +4159,13 @@ SUBDIR+= py-spm1d
SUBDIR+= py-spotpy
SUBDIR+= py-sppy
SUBDIR+= py-spyse
+SUBDIR+= py-sqlalchemy-json
SUBDIR+= py-sqlalchemy-searchable
SUBDIR+= py-srpy
SUBDIR+= py-ssh2
SUBDIR+= py-ssp
SUBDIR+= py-stache
+SUBDIR+= py-starlette
SUBDIR+= py-statemint
SUBDIR+= py-statgrap
SUBDIR+= py-statsd
@@ -4173,6 +4175,7 @@ SUBDIR+= py-strategies
SUBDIR+= py-stringcase
SUBDIR+= py-sumatra
SUBDIR+= py-sunpy
+SUBDIR+= py-sv-geometry
SUBDIR+= py-swiginac
SUBDIR+= py-sydent
SUBDIR+= py-sym
@@ -4210,6 +4213,7 @@ SUBDIR+= py-test-metadata
SUBDIR+= py-test-mpl
SUBDIR+= py-test-mypy
SUBDIR+= py-test-nbval
+SUBDIR+= py-test-ordering
SUBDIR+= py-test-remotedata
SUBDIR+= py-texext
SUBDIR+= py-texml
@@ -4405,6 +4409,7 @@ SUBDIR+= quickjs
SUBDIR+= quiterss
SUBDIR+= qupzilla
SUBDIR+= quvi
+SUBDIR+= qxmpp
SUBDIR+= qzdoom
SUBDIR+= r8s
SUBDIR+= radare2-git
@@ -4566,6 +4571,7 @@ SUBDIR+= ruby-versionomy
SUBDIR+= ruby-xmpp4r
SUBDIR+= ruby-yaml_waml
SUBDIR+= runit
+SUBDIR+= rust
SUBDIR+= rust-bindgen
SUBDIR+= rygel
SUBDIR+= s2tc
@@ -4680,6 +4686,7 @@ SUBDIR+= sis
SUBDIR+= siscone
SUBDIR+= sjg-mk-files
SUBDIR+= skinlf
+SUBDIR+= skippy-xd
SUBDIR+= skype4
SUBDIR+= slack-term
SUBDIR+= slackpkg2pkgsrc
@@ -4732,6 +4739,7 @@ SUBDIR+= sparse
SUBDIR+= spatt
SUBDIR+= spcm
SUBDIR+= spe
+SUBDIR+= spectacle
SUBDIR+= spectra
SUBDIR+= spectrwm-git
SUBDIR+= speedx
@@ -5004,6 +5012,7 @@ SUBDIR+= tuxpaint-cvs
SUBDIR+= tuxtype2
SUBDIR+= tvmet
SUBDIR+= twemproxy
+SUBDIR+= twin-environment
SUBDIR+= twintk
SUBDIR+= twitim
SUBDIR+= twitmail
@@ -5187,6 +5196,7 @@ SUBDIR+= wrcs
SUBDIR+= wsmake
SUBDIR+= wvstreams
SUBDIR+= wxGTK-test
+SUBDIR+= wxGTK31
SUBDIR+= wxmaxima-git
SUBDIR+= wyeb-git
SUBDIR+= wyebadblock-git
@@ -5332,7 +5342,7 @@ SUBDIR+= zmap
SUBDIR+= zodiac
SUBDIR+= zoneminder
SUBDIR+= zvbi
-SUBDIR+= nono
+
${.CURDIR}/PKGDB:
${RM} -f ${.CURDIR}/PKGDB
${ECHO_MSG} "Extracting complete dependency database. This may take a while..."
diff --git a/collectd-CGP/DESCR b/collectd-CGP/DESCR
deleted file mode 100644
index 09e464af42..0000000000
--- a/collectd-CGP/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Graphical web-based front-end for visualizing RRD collected
diff --git a/collectd-CGP/Makefile b/collectd-CGP/Makefile
deleted file mode 100644
index c17bae9318..0000000000
--- a/collectd-CGP/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD$
-
-DISTNAME= collectd-cgp-1
-PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME:S/-1//}
-CATEGORIES= www
-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"
diff --git a/collectd-CGP/PLIST b/collectd-CGP/PLIST
deleted file mode 100644
index 9387e22c57..0000000000
--- a/collectd-CGP/PLIST
+++ /dev/null
@@ -1,92 +0,0 @@
-@comment $NetBSD$
-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
diff --git a/collectd-CGP/distinfo b/collectd-CGP/distinfo
deleted file mode 100644
index 400c954d34..0000000000
--- a/collectd-CGP/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD$
-
-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
diff --git a/collectd-amqp/DESCR b/collectd-amqp/DESCR
deleted file mode 100644
index a68f324e2c..0000000000
--- a/collectd-amqp/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-amqp plugin for collectd
diff --git a/collectd-amqp/Makefile b/collectd-amqp/Makefile
deleted file mode 100644
index 30068abb5c..0000000000
--- a/collectd-amqp/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2020/01/18 21:50:52 jperkin Exp $
-
-COLLECTD_PACKAGE= amqp
-
-COMMENT= Statistics collection daemon - amqp plugin
-
-.include "../../net/rabbitmq-c/buildlink3.mk"
-COLLECTD_LIB.rabbitmq= ${BUILDLINK_PREFIX.rabbitmq-c}
-
-.include "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-curl/DESCR b/collectd-curl/DESCR
deleted file mode 100644
index ae780cbe35..0000000000
--- a/collectd-curl/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-CURL-based plugins for collectd (curl, curl_json, curl_xml,
-apache, bind, nginx, write_http, ascent).
diff --git a/collectd-curl/Makefile b/collectd-curl/Makefile
deleted file mode 100644
index 16d2ff1c0a..0000000000
--- a/collectd-curl/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2020/06/02 08:24:44 adam Exp $
-
-COLLECTD_PACKAGE= curl
-COLLECTD_PLUGINS= curl curl_json curl_xml apache bind nginx write_http ascent
-
-COMMENT= Statistics collection daemon - curl-based plugins
-
-.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 "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-dbi/DESCR b/collectd-dbi/DESCR
deleted file mode 100644
index 952e616801..0000000000
--- a/collectd-dbi/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-dbi plugin for collectd
diff --git a/collectd-dbi/Makefile b/collectd-dbi/Makefile
deleted file mode 100644
index 82941d536f..0000000000
--- a/collectd-dbi/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2019/08/11 13:23:04 wiz Exp $
-
-COLLECTD_PACKAGE= dbi
-
-COMMENT= Statistics collection daemon - dbi plugin
-
-.include "../../databases/libdbi/buildlink3.mk"
-COLLECTD_LIB.dbi= ${BUILDLINK_PREFIX.libdbi}
-
-.include "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-dns/DESCR b/collectd-dns/DESCR
deleted file mode 100644
index 70169d1b9f..0000000000
--- a/collectd-dns/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-dns plugin for collectd
diff --git a/collectd-dns/Makefile b/collectd-dns/Makefile
deleted file mode 100644
index 72b22b09d4..0000000000
--- a/collectd-dns/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2020/02/03 09:12:32 triaxx Exp $
-
-COLLECTD_PACKAGE= dns
-
-COMMENT= Statistics collection daemon - dns plugin
-
-.include "../../net/libpcap/buildlink3.mk"
-COLLECTD_LIB.pcap= ${BUILDLINK_PREFIX.libpcap}
-
-.include "../../wip/collectd/Makefile.common"
-
-# On NetBSD, built-in pcap lacks headers needed
-.if ${OPSYS} == "NetBSD"
-PREFER.libpcap= pkgsrc
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-gmond/DESCR b/collectd-gmond/DESCR
deleted file mode 100644
index 48d9bdfb1c..0000000000
--- a/collectd-gmond/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-gmond plugin for collectd
diff --git a/collectd-gmond/Makefile b/collectd-gmond/Makefile
deleted file mode 100644
index 2d9e22f039..0000000000
--- a/collectd-gmond/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v $
-
-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 "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-gps/DESCR b/collectd-gps/DESCR
deleted file mode 100644
index c2eb2761a4..0000000000
--- a/collectd-gps/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-gps plugin for collectd
diff --git a/collectd-gps/Makefile b/collectd-gps/Makefile
deleted file mode 100644
index 41ce7dec66..0000000000
--- a/collectd-gps/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v $
-
-COLLECTD_PACKAGE= gps
-
-COMMENT= Statistics collection daemon - gps plugin
-
-.include "../../geography/gpsd/buildlink3.mk"
-COLLECTD_LIB.gps= ${BUILDLINK_PREFIX.gpsd}
-
-.include "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-grpc/DESCR b/collectd-grpc/DESCR
deleted file mode 100644
index bb07e748f7..0000000000
--- a/collectd-grpc/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-grpc plugin for collectd
diff --git a/collectd-grpc/Makefile b/collectd-grpc/Makefile
deleted file mode 100644
index c2616da700..0000000000
--- a/collectd-grpc/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v $
-
-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 "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-haproxy/DESCR b/collectd-haproxy/DESCR
deleted file mode 100644
index e001a2ccb8..0000000000
--- a/collectd-haproxy/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-haproxy plugin for collectd
diff --git a/collectd-haproxy/Makefile b/collectd-haproxy/Makefile
deleted file mode 100644
index 3b80ce07e5..0000000000
--- a/collectd-haproxy/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD$
-
-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]*:../../wip/py-collectd
-
-.include "../../lang/python/egg.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-haproxy/PLIST b/collectd-haproxy/PLIST
deleted file mode 100644
index 09290dbd49..0000000000
--- a/collectd-haproxy/PLIST
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $NetBSD$
-${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
diff --git a/collectd-haproxy/distinfo b/collectd-haproxy/distinfo
deleted file mode 100644
index 516d14c7d4..0000000000
--- a/collectd-haproxy/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD$
-
-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
diff --git a/collectd-kafka/DESCR b/collectd-kafka/DESCR
deleted file mode 100644
index 2a735f11bd..0000000000
--- a/collectd-kafka/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-write_kafka plugin for collectd
diff --git a/collectd-kafka/Makefile b/collectd-kafka/Makefile
deleted file mode 100644
index 5588aac2ec..0000000000
--- a/collectd-kafka/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v $
-
-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 "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-lua/DESCR b/collectd-lua/DESCR
deleted file mode 100644
index d56f91dfad..0000000000
--- a/collectd-lua/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-lua plugin for collectd
diff --git a/collectd-lua/Makefile b/collectd-lua/Makefile
deleted file mode 100644
index 8ed0abc1ab..0000000000
--- a/collectd-lua/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2019/08/11 13:23:04 wiz Exp $
-
-COLLECTD_PACKAGE= lua
-COLLECTD_PLUGINS= lua
-
-COMMENT= Statistics collection daemon - lua plugin
-
-.include "../../wip/collectd/Makefile.common"
-
-CONFIGURE_ARGS+= --enable-lua
-
-.include "../../lang/lua/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-memcachec/DESCR b/collectd-memcachec/DESCR
deleted file mode 100644
index 18eeae1008..0000000000
--- a/collectd-memcachec/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-memcachec plugin for collectd
diff --git a/collectd-memcachec/Makefile b/collectd-memcachec/Makefile
deleted file mode 100644
index 4d14777195..0000000000
--- a/collectd-memcachec/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2019/08/11 13:23:05 wiz Exp $
-
-COLLECTD_PACKAGE= memcachec
-
-COMMENT= Statistics collection daemon - memcachec plugin
-
-.include "../../devel/libmemcached/buildlink3.mk"
-COLLECTD_LIB.memcached= ${BUILDLINK_PREFIX.libmemcached}
-
-.include "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-mongodb/DESCR b/collectd-mongodb/DESCR
deleted file mode 100644
index 97e61e0712..0000000000
--- a/collectd-mongodb/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-write_mongodb plugin for collectd
diff --git a/collectd-mongodb/Makefile b/collectd-mongodb/Makefile
deleted file mode 100644
index be6ad47912..0000000000
--- a/collectd-mongodb/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v $
-
-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 "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-mysql/DESCR b/collectd-mysql/DESCR
deleted file mode 100644
index c2c6232d03..0000000000
--- a/collectd-mysql/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-mysql plugin for collectd
diff --git a/collectd-mysql/Makefile b/collectd-mysql/Makefile
deleted file mode 100644
index 0c6a0cd115..0000000000
--- a/collectd-mysql/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2019/08/11 13:23:05 wiz Exp $
-
-COLLECTD_PACKAGE= mysql
-
-PKGNAME= ${DISTNAME:S/collectd/collectd-${COLLECTD_PACKAGE}${MYSQL_VERSION}/}
-COMMENT= Statistics collection daemon - mysql plugin
-
-.include "../../mk/mysql.buildlink3.mk"
-COLLECTD_LIB.mysql= ${BUILDLINK_PREFIX.mysql-client}
-
-.include "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-network/DESCR b/collectd-network/DESCR
deleted file mode 100644
index 796cb01cba..0000000000
--- a/collectd-network/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-network plugin for collectd
diff --git a/collectd-network/Makefile b/collectd-network/Makefile
deleted file mode 100644
index 32aaf3a048..0000000000
--- a/collectd-network/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2017/06/14 13:42:53 fhajny Exp $
-
-COLLECTD_PACKAGE= network
-
-COMMENT= Statistics collection daemon - network plugin
-
-.include "../../security/libgcrypt/buildlink3.mk"
-COLLECTD_LIB.gcrypt= ${BUILDLINK_PREFIX.libgcrypt}/bin/libgcrypt-config
-
-.include "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-notify-email/DESCR b/collectd-notify-email/DESCR
deleted file mode 100644
index 05cd73581a..0000000000
--- a/collectd-notify-email/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-notify-email plugin for collectd
diff --git a/collectd-notify-email/Makefile b/collectd-notify-email/Makefile
deleted file mode 100644
index 3f56de99a5..0000000000
--- a/collectd-notify-email/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2020/01/18 21:50:53 jperkin Exp $
-
-COLLECTD_PACKAGE= notify-email
-
-COMMENT= Statistics collection daemon - notify_email plugin
-
-.include "../../mail/libesmtp/buildlink3.mk"
-COLLECTD_LIB.esmtp= ${BUILDLINK_PREFIX.libesmtp}
-
-.include "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-notify_desktop/DESCR b/collectd-notify_desktop/DESCR
deleted file mode 100644
index fb710ec57f..0000000000
--- a/collectd-notify_desktop/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-notify_desktop plugin for collectd
diff --git a/collectd-notify_desktop/Makefile b/collectd-notify_desktop/Makefile
deleted file mode 100644
index 1432546205..0000000000
--- a/collectd-notify_desktop/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v $
-
-COLLECTD_PACKAGE= notify_desktop
-
-COMMENT= Statistics collection daemon - notify_desktop plugin
-
-.include "../../sysutils/libnotify/buildlink3.mk"
-COLLECTD_LIB.notify= ${BUILDLINK_PREFIX.libnotify}
-
-.include "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-nut/DESCR b/collectd-nut/DESCR
deleted file mode 100644
index cf052d4129..0000000000
--- a/collectd-nut/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-nut (ups-nut) plugin for collectd
diff --git a/collectd-nut/Makefile b/collectd-nut/Makefile
deleted file mode 100644
index fa3c2a18b7..0000000000
--- a/collectd-nut/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v $
-
-COLLECTD_PACKAGE= nut
-
-COMMENT= Statistics collection daemon - nut plugin
-
-.include "../../sysutils/ups-nut/buildlink3.mk"
-COLLECTD_LIB.upsclient= ${BUILDLINK_PREFIX.ups-nut}
-
-.include "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-openldap/DESCR b/collectd-openldap/DESCR
deleted file mode 100644
index 64bb9d6198..0000000000
--- a/collectd-openldap/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-openldap plugin for collectd
diff --git a/collectd-openldap/Makefile b/collectd-openldap/Makefile
deleted file mode 100644
index ea75b4a0cf..0000000000
--- a/collectd-openldap/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v $
-
-COLLECTD_PACKAGE= openldap
-
-COMMENT= Statistics collection daemon - openldap plugin
-
-.include "../../databases/openldap-client/buildlink3.mk"
-COLLECTD_LIB.ldap= ${BUILDLINK_PREFIX.openldap-client}
-
-.include "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-pinba/DESCR b/collectd-pinba/DESCR
deleted file mode 100644
index 5504e3db48..0000000000
--- a/collectd-pinba/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-pinba plugin for collectd
diff --git a/collectd-pinba/Makefile b/collectd-pinba/Makefile
deleted file mode 100644
index 430137a928..0000000000
--- a/collectd-pinba/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile,v $
-
-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 "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-postgresql/DESCR b/collectd-postgresql/DESCR
deleted file mode 100644
index cd20e2db83..0000000000
--- a/collectd-postgresql/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-postgresql plugin for collectd
diff --git a/collectd-postgresql/Makefile b/collectd-postgresql/Makefile
deleted file mode 100644
index 2c0bdb56e3..0000000000
--- a/collectd-postgresql/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2019/08/11 13:23:05 wiz Exp $
-
-COLLECTD_PACKAGE= postgresql
-
-PKGNAME= ${DISTNAME:S/collectd/collectd-${COLLECTD_PACKAGE}${PGSQL_VERSION}/}
-COMMENT= Statistics collection daemon - postgresql plugin
-
-.include "../../mk/pgsql.buildlink3.mk"
-COLLECTD_LIB.pq= ${PGSQL_PREFIX}
-
-.include "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-redis/DESCR b/collectd-redis/DESCR
deleted file mode 100644
index d42edee436..0000000000
--- a/collectd-redis/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-redis plugins (redis, write_redis) for collectd
diff --git a/collectd-redis/Makefile b/collectd-redis/Makefile
deleted file mode 100644
index 989b0ed5ce..0000000000
--- a/collectd-redis/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2014/02/17 11:21:55 fhajny 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 "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-riemann/DESCR b/collectd-riemann/DESCR
deleted file mode 100644
index 6eae0841a9..0000000000
--- a/collectd-riemann/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-riemann output plugin for collectd
diff --git a/collectd-riemann/Makefile b/collectd-riemann/Makefile
deleted file mode 100644
index 01dc7832c5..0000000000
--- a/collectd-riemann/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2020/05/22 10:56:39 adam Exp $
-
-COLLECTD_PACKAGE= riemann
-COLLECTD_PLUGINS= write_riemann
-
-COMMENT= Statistics collection daemon - riemann plugin
-
-.include "../../sysutils/riemann-client/buildlink3.mk"
-COLLECTD_LIB.riemann-client=${BUILDLINK_PREFIX.riemann-client}
-
-.include "../../devel/protobuf-c/buildlink3.mk"
-
-.include "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-rrdtool/DESCR b/collectd-rrdtool/DESCR
deleted file mode 100644
index cbe65e7c90..0000000000
--- a/collectd-rrdtool/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-rrdtool plugin for collectd
diff --git a/collectd-rrdtool/Makefile b/collectd-rrdtool/Makefile
deleted file mode 100644
index 83d20fe090..0000000000
--- a/collectd-rrdtool/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2020/06/02 08:24:44 adam Exp $
-
-COLLECTD_PACKAGE= rrdtool
-COLLECTD_PLUGINS= rrdtool rrdcached
-
-COMMENT= Statistics collection daemon - rrdtool plugins
-
-.include "../../databases/rrdtool/buildlink3.mk"
-COLLECTD_LIB.rrd= ${BUILDLINK_PREFIX.rrdtool}
-
-.include "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-snmp/DESCR b/collectd-snmp/DESCR
deleted file mode 100644
index 455fd44e66..0000000000
--- a/collectd-snmp/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-snmp plugin for collectd
diff --git a/collectd-snmp/Makefile b/collectd-snmp/Makefile
deleted file mode 100644
index 40c718ad70..0000000000
--- a/collectd-snmp/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2020/01/18 21:50:53 jperkin Exp $
-
-COLLECTD_PACKAGE= snmp
-
-COMMENT= Statistics collection daemon - snmp plugin
-
-.include "../../net/net-snmp/buildlink3.mk"
-COLLECTD_LIB.netsnmp= ${BUILDLINK_PREFIX.net-snmp}/bin/net-snmp-config
-
-.include "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-tokyotyrant/DESCR b/collectd-tokyotyrant/DESCR
deleted file mode 100644
index ea89980c3e..0000000000
--- a/collectd-tokyotyrant/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-tokyotyrant plugin for collectd
diff --git a/collectd-tokyotyrant/Makefile b/collectd-tokyotyrant/Makefile
deleted file mode 100644
index 5b557b2b5b..0000000000
--- a/collectd-tokyotyrant/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v $
-
-COLLECTD_PACKAGE= tokyotyrant
-
-COMMENT= Statistics collection daemon - tokyotyrant plugin
-
-.include "../../databases/tokyotyrant/buildlink3.mk"
-COLLECTD_LIB.tokyotyrant= ${BUILDLINK_PREFIX.tokyotyrant}
-
-.include "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-varnish/DESCR b/collectd-varnish/DESCR
deleted file mode 100644
index 327b094e08..0000000000
--- a/collectd-varnish/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-varnish plugin for collectd
diff --git a/collectd-varnish/Makefile b/collectd-varnish/Makefile
deleted file mode 100644
index fb9dff6f2d..0000000000
--- a/collectd-varnish/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v $
-
-COLLECTD_PACKAGE= varnish
-
-COMMENT= Statistics collection daemon - varnish plugin
-
-.include "../../www/varnish/buildlink3.mk"
-COLLECTD_LIB.varnish= ${BUILDLINK_PREFIX.varnish}
-
-.include "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-virt/DESCR b/collectd-virt/DESCR
deleted file mode 100644
index 970ea13881..0000000000
--- a/collectd-virt/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-virt plugin for collectd
diff --git a/collectd-virt/Makefile b/collectd-virt/Makefile
deleted file mode 100644
index 0226783846..0000000000
--- a/collectd-virt/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v $
-
-COLLECTD_PACKAGE= virt
-
-COMMENT= Statistics collection daemon - virt plugin
-
-.include "../../sysutils/libvirt/buildlink3.mk"
-COLLECTD_LIB.virt= ${BUILDLINK_PREFIX.libvirt}
-
-.include "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-web/DESCR b/collectd-web/DESCR
deleted file mode 100644
index 4f4189d269..0000000000
--- a/collectd-web/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-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.
diff --git a/collectd-web/Makefile b/collectd-web/Makefile
deleted file mode 100644
index b04c493bfa..0000000000
--- a/collectd-web/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD$
-
-DISTNAME= collectd-web-0.4.1
-CATEGORIES= www
-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"
diff --git a/collectd-web/PLIST b/collectd-web/PLIST
deleted file mode 100644
index 0d3f578616..0000000000
--- a/collectd-web/PLIST
+++ /dev/null
@@ -1,191 +0,0 @@
-@comment $NetBSD$
-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
diff --git a/collectd-web/distinfo b/collectd-web/distinfo
deleted file mode 100644
index 8434bf5bbf..0000000000
--- a/collectd-web/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD$
-
-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
diff --git a/collectd-write_prometheus/DESCR b/collectd-write_prometheus/DESCR
deleted file mode 100644
index 4c7c823f36..0000000000
--- a/collectd-write_prometheus/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-write_prometheus plugin for collectd
diff --git a/collectd-write_prometheus/Makefile b/collectd-write_prometheus/Makefile
deleted file mode 100644
index 8e7c4c13ec..0000000000
--- a/collectd-write_prometheus/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2020/05/22 10:56:39 adam Exp $
-
-COLLECTD_PACKAGE= write_prometheus
-
-COMMENT= Statistics collection daemon - write_prometheus plugin
-
-.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 "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-xen/DESCR b/collectd-xen/DESCR
deleted file mode 100644
index 31e0907fd4..0000000000
--- a/collectd-xen/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-xen_cpu plugin for collectd
diff --git a/collectd-xen/Makefile b/collectd-xen/Makefile
deleted file mode 100644
index 25b323dc90..0000000000
--- a/collectd-xen/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v $
-
-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 "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-xmms/DESCR b/collectd-xmms/DESCR
deleted file mode 100644
index 41934ebb65..0000000000
--- a/collectd-xmms/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-xmms plugin for collectd
diff --git a/collectd-xmms/Makefile b/collectd-xmms/Makefile
deleted file mode 100644
index cdbd206101..0000000000
--- a/collectd-xmms/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v $
-
-COLLECTD_PACKAGE= xmms
-
-COMMENT= Statistics collection daemon - xmms plugin
-
-.include "../../audio/xmms/buildlink3.mk"
-COLLECTD_LIB.xmms= ${BUILDLINK_PREFIX.xmms}
-
-.include "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd-yajl/DESCR b/collectd-yajl/DESCR
deleted file mode 100644
index 862021d530..0000000000
--- a/collectd-yajl/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-YAJL-based plugins for collectd (ceph, log_logstash, sysevent).
-Plugins that also depend on CURL are in the collectd-curl package.
diff --git a/collectd-yajl/Makefile b/collectd-yajl/Makefile
deleted file mode 100644
index 7742b0247e..0000000000
--- a/collectd-yajl/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v $
-
-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 "../../wip/collectd/Makefile.common"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd/DESCR b/collectd/DESCR
deleted file mode 100644
index 2fea573116..0000000000
--- a/collectd/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-collectd is a daemon which collects system performance statistics periodically
-and provides mechanisms to store the values in a variety of ways, for example
-in RRD-files.
diff --git a/collectd/Makefile b/collectd/Makefile
deleted file mode 100644
index 2c28b61665..0000000000
--- a/collectd/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2020/07/05 13:57:32 he Exp $
-
-.include "../../wip/collectd/Makefile.common"
-
-COMMENT= Statistics collection daemon base
-
-RCD_SCRIPTS= collectd
-
-.include "../../mk/bsd.prefs.mk"
-
-# Simple plugins that have no dependencies
-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
-
-INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/collectd
-
-.include "options.mk"
-
-CONF_FILES+= share/examples/collectd/collectd.conf \
- ${PKG_SYSCONFDIR}/collectd.conf
-
-BUILD_DEFS+= VARBASE
-
-OWN_DIRS+= ${VARBASE}/db/collectd
-
-COLLECTD_USER?= collectd
-COLLECTD_GROUP?= ${COLLECTD_USER}
-PKG_USERS_VARS+= COLLECTD_USER
-PKG_GROUPS_VARS+= COLLECTD_GROUP
-PKG_GROUPS= ${COLLECTD_GROUP}
-PKG_USERS= ${COLLECTD_USER}:${COLLECTD_GROUP}
-PKG_GECOS.${COLLECTD_USER}= collectd unprivileged user
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd/Makefile.common b/collectd/Makefile.common
deleted file mode 100644
index 57488065ba..0000000000
--- a/collectd/Makefile.common
+++ /dev/null
@@ -1,113 +0,0 @@
-# $NetBSD: Makefile.common,v 1.24 2020/06/02 11:12:05 nia Exp $
-#
-# used by wip/collectd/Makefile
-# used by wip/collectd-amqp/Makefile
-# used by wip/collectd-curl/Makefile
-# used by wip/collectd-dbi/Makefile
-# used by wip/collectd-dns/Makefile
-# used by wip/collectd-gmond/Makefile
-# used by wip/collectd-gps/Makefile
-# used by wip/collectd-grpc/Makefile
-# used by wip/collectd-kafka/Makefile
-# used by wip/collectd-lua/Makefile
-# used by wip/collectd-memcachec/Makefile
-# used by wip/collectd-mongodb/Makefile
-# used by wip/collectd-mysql/Makefile
-# used by wip/collectd-network/Makefile
-# used by wip/collectd-notify_desktop/Makefile
-# used by wip/collectd-notify-email/Makefile
-# used by wip/collectd-nut/Makefile
-# used by wip/collectd-openldap/Makefile
-# used by wip/collectd-pinba/Makefile
-# used by wip/collectd-postgresql/Makefile
-# used by wip/collectd-redis/Makefile
-# used by wip/collectd-riemann/Makefile
-# used by wip/collectd-rrdtool/Makefile
-# used by wip/collectd-snmp/Makefile
-# used by wip/collectd-tokyotyrant/Makefile
-# used by wip/collectd-varnish/Makefile
-# used by wip/collectd-virt/Makefile
-# used by wip/collectd-write_prometheus/Makefile
-# used by wip/collectd-xen/Makefile
-# used by wip/collectd-xmms/Makefile
-# used by wip/collectd-yajl/Makefile
-# used by wip/p5-collectd/Makefile
-# used by wip/py-collectd/Makefile
-
-DISTNAME= collectd-5.11.0
-MASTER_SITES= http://collectd.org/files/
-CATEGORIES= sysutils
-EXTRACT_SUFX= .tar.bz2
-EXTRACT_USING= bsdtar
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://collectd.org/
-LICENSE= gnu-gpl-v2
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= autoconf automake pkg-config
-USE_LANGUAGES= c c99 c++
-
-DISTINFO_FILE= ${.CURDIR}/../../wip/collectd/distinfo
-PATCHDIR= ${.CURDIR}/../../wip/collectd/patches
-
-.if !empty(COLLECTD_PACKAGE)
-PKGNAME?= ${DISTNAME:S/collectd/collectd-${COLLECTD_PACKAGE}/}
-
-DEPENDS+= collectd>=${PKGVERSION_NOREV}:../../wip/collectd
-
-COLLECTD_PLUGINS?= ${COLLECTD_PACKAGE:S/-/_/}
-
-BUILD_TARGET= ${COLLECTD_PLUGINS:S/$/.la/}
-INSTALL_TARGET= install-pkglibLTLIBRARIES
-. for plugin in ${COLLECTD_PLUGINS}
-CONFIGURE_ARGS+= --enable-${plugin}
-GENERATE_PLIST+= ${ECHO} "lib/collectd/${plugin}.la";
-. endfor
-.endif
-
-.include "../../mk/bsd.prefs.mk"
-
-BUILD_DEFS+= VARBASE
-
-# 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 ${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.NetBSD+= ac_cv_func_getfsstat=no
-# aarch64 accidentally had this function for a bit.
-CONFIGURE_ARGS.NetBSD+= c_cv_have_htonll=no
-
-CPPFLAGS.SunOS+= -DSOLARIS2=${OS_VERSION:C/5.//}
-
-SUBST_CLASSES+= ver
-SUBST_MESSAGE.ver= Fixing canonical version number
-SUBST_STAGE.ver= pre-configure
-SUBST_FILES.ver= configure.ac
-SUBST_SED.ver= -e 's,m4_esyscmd(./version-gen.sh),${PKGVERSION_NOREV},'
-
-pre-configure:
- cd ${WRKSRC} && autoreconf
-
-.include "../../mk/pthread.buildlink3.mk"
diff --git a/collectd/PLIST b/collectd/PLIST
deleted file mode 100644
index 5a8c90cabd..0000000000
--- a/collectd/PLIST
+++ /dev/null
@@ -1,101 +0,0 @@
-@comment $NetBSD: PLIST.collectd-v 1.8 2017/11/21 15:18:22 fhajny Exp $
-bin/collectd-nagios
-bin/collectd-tg
-bin/collectdctl
-include/collectd/client.h
-include/collectd/lcc_features.h
-include/collectd/network.h
-include/collectd/network_buffer.h
-include/collectd/network_parse.h
-include/collectd/server.h
-include/collectd/types.h
-lib/collectd/aggregation.la
-lib/collectd/apcups.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.collectd-df}lib/collectd/df.la
-${PLIST.collectd-disk}lib/collectd/disk.la
-lib/collectd/email.la
-${PLIST.collectd-entropy}lib/collectd/entropy.la
-lib/collectd/exec.la
-lib/collectd/filecount.la
-lib/collectd/hddtemp.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
-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.collectd-pf}lib/collectd/pf.la
-lib/collectd/powerdns.la
-${PLIST.collectd-processes}lib/collectd/processes.la
-lib/collectd/statsd.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
-lib/collectd/target_notification.la
-lib/collectd/target_replace.la
-lib/collectd/target_scale.la
-lib/collectd/target_set.la
-lib/collectd/target_v5upgrade.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.collectd-uptime}lib/collectd/uptime.la
-${PLIST.collectd-users}lib/collectd/users.la
-lib/collectd/uuid.la
-lib/collectd/write_graphite.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
-man/man1/collectd-tg.1
-man/man1/collectd.1
-man/man1/collectdctl.1
-man/man1/collectdmon.1
-man/man5/collectd-email.5
-man/man5/collectd-exec.5
-man/man5/collectd-java.5
-man/man5/collectd-lua.5
-man/man5/collectd-perl.5
-man/man5/collectd-python.5
-man/man5/collectd-snmp.5
-man/man5/collectd-threshold.5
-man/man5/collectd-unixsock.5
-man/man5/collectd.conf.5
-man/man5/types.db.5
-sbin/collectd
-sbin/collectdmon
-share/collectd/postgresql_default.conf
-share/collectd/types.db
-share/examples/collectd/collectd.conf
diff --git a/collectd/distinfo b/collectd/distinfo
deleted file mode 100644
index 82573170cb..0000000000
--- a/collectd/distinfo
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: distinfo,v 1.45 2020/07/05 13:57:32 he Exp $
-
-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) = 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
diff --git a/collectd/files/collectd.sh b/collectd/files/collectd.sh
deleted file mode 100644
index 5c7b3b4862..0000000000
--- a/collectd/files/collectd.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: collectd.sh,v 1.1 2014/02/17 11:21:55 fhajny Exp $
-#
-# PROVIDE: collectd
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-#
-# You will need to set some variables in /etc/rc.conf to start collectd:
-#
-# collectd=YES
-#
-
-if [ -f /etc/rc.subr ]
-then
- . /etc/rc.subr
-fi
-
-name="collectd"
-rcvar=${name}
-command=@PREFIX@/sbin/collectd
-pidfile="@VARBASE@/run/collectd.pid"
-required_files=@PKG_SYSCONFDIR@/collectd.conf
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/collectd/files/smf/manifest.xml b/collectd/files/smf/manifest.xml
deleted file mode 100644
index b145e24081..0000000000
--- a/collectd/files/smf/manifest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type='manifest' name='export'>
- <service name='@SMF_PREFIX@/@SMF_NAME@' type='service' version='1'>
- <create_default_instance enabled='false' />
- <single_instance />
- <dependency name='network' grouping='require_all' restart_on='none' type='service'>
- <service_fmri value='svc:/milestone/network:default' />
- </dependency>
- <dependency name='filesystem-local' grouping='require_all' restart_on='none' type='service'>
- <service_fmri value='svc:/system/filesystem/local:default' />
- </dependency>
- <exec_method type='method' name='start' exec='@PREFIX@/sbin/collectd' timeout_seconds='60'>
- <method_context>
- <method_credential user='root' group='root' />
- </method_context>
- </exec_method>
- <exec_method type='method' name='stop' exec=':kill' timeout_seconds='60'>
- <method_context>
- <method_credential user='root' group='root' />
- </method_context>
- </exec_method>
- <property_group name='startd' type='framework'>
- <propval name="duration" type="astring" value="contract" />
- <!-- sub-process core dumps shouldn't restart session -->
- <propval name='ignore_error' type='astring' value='core,signal' />
- </property_group>
- </service>
-</service_bundle>
diff --git a/collectd/options.mk b/collectd/options.mk
deleted file mode 100644
index 316e9c898a..0000000000
--- a/collectd/options.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-# $NetBSD: options.mk,v 1.11 2017/11/21 16:02:20 he Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.collectd
-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.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+= collectd-debug
-
-.include "../../mk/bsd.options.mk"
-
-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/collectd-//:S/-/_/}
-PLIST.${option}= yes
-. endif
-.endfor
-
-.if !empty(PKG_OPTIONS:Mcollectd-debug)
-CONFIGURE_ARGS+= --enable-debug
-.endif
diff --git a/collectd/patches/patch-Makefile.am b/collectd/patches/patch-Makefile.am
deleted file mode 100644
index 412cb721eb..0000000000
--- a/collectd/patches/patch-Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-Makefile.am,v 1.3 2018/01/04 15:42:42 jperkin Exp $
-
-Use other data directory.
-
---- 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
-
- BUILT_SOURCES = \
-@@ -1478,6 +1478,12 @@
- netlink_la_LIBADD = $(BUILD_WITH_LIBMNL_LIBS)
- endif
-
-+if BUILD_PLUGIN_NETSTAT_UDP
-+pkglib_LTLIBRARIES += netstat_udp.la
-+netstat_udp_la_SOURCES = src/netstat_udp.c
-+netstat_udp_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-+endif
-+
- if BUILD_PLUGIN_NETWORK
- pkglib_LTLIBRARIES += network.la
- network_la_SOURCES = \
-@@ -2352,6 +2358,8 @@
- if BUILD_PLUGIN_WRITE_PROMETHEUS
- BUILT_SOURCES += prometheus.pb-c.c prometheus.pb-c.h
-
-+src/write_prometheus.c: prometheus.pb-c.h
-+
- 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
diff --git a/collectd/patches/patch-configure.ac b/collectd/patches/patch-configure.ac
deleted file mode 100644
index bc297bb8c1..0000000000
--- a/collectd/patches/patch-configure.ac
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.11 2017/11/21 15:18:23 fhajny Exp $
-
-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 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"])
-
-@@ -6595,6 +6596,7 @@
- plugin_mcelog="no"
- plugin_memory="no"
- plugin_multimeter="no"
-+plugin_netstat_udp="no"
- plugin_nfs="no"
- plugin_numa="no"
- plugin_ovs_events="no"
-@@ -6708,6 +6710,7 @@
- plugin_irq="yes"
- plugin_nfs="yes"
- plugin_processes="yes"
-+ plugin_netstat_udp="yes"
- fi
-
- # Mac OS X devices
-@@ -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])
-+AC_MSG_RESULT([ netstat_udp . . . . . $enable_netstat_udp])
- AC_MSG_RESULT([ network . . . . . . . $enable_network])
- AC_MSG_RESULT([ nfs . . . . . . . . . $enable_nfs])
- AC_MSG_RESULT([ nginx . . . . . . . . $enable_nginx])
diff --git a/collectd/patches/patch-src_bind.c b/collectd/patches/patch-src_bind.c
deleted file mode 100644
index 002c1130df..0000000000
--- a/collectd/patches/patch-src_bind.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_bind.c,v 1.1 2020/07/05 13:57:32 he Exp $
-
-Also pick out the response time bins from the resolver stats.
-
---- 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"},
- {"ValNegOk", "dns_resolver", "DNSSEC-negokay"},
-- {"ValFail", "dns_resolver", "DNSSEC-fail"}};
-+ {"ValFail", "dns_resolver", "DNSSEC-fail"},
-+
-+ /* Query RTT information */
-+ {"QryRTT10", "dns_resolver", "rtt10"},
-+ {"QryRTT100", "dns_resolver", "rtt100"},
-+ {"QryRTT500", "dns_resolver", "rtt500"},
-+ {"QryRTT800", "dns_resolver", "rtt800"},
-+ {"QryRTT1600", "dns_resolver", "rtt1600"},
-+ {"QryRTT1600+", "dns_resolver", "rtt1600plus"}
-+};
-+
- static int resstats_translation_table_length =
- STATIC_ARRAY_SIZE(resstats_translation_table);
- /* }}} */
diff --git a/collectd/patches/patch-src_collectd.conf.in b/collectd/patches/patch-src_collectd.conf.in
deleted file mode 100644
index 8165e17834..0000000000
--- a/collectd/patches/patch-src_collectd.conf.in
+++ /dev/null
@@ -1,107 +0,0 @@
-$NetBSD: patch-src_collectd.conf.in,v 1.2 2015/06/10 20:05:26 fhajny Exp $
-
-Fix default dirs.
-
---- 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"
- #FQDNLookup true
--#BaseDir "@localstatedir@/lib/@PACKAGE_NAME@"
-+#BaseDir "@localstatedir@/db/@PACKAGE_NAME@"
- #PIDFile "@localstatedir@/run/@PACKAGE_NAME@.pid"
- #PluginDir "@libdir@/@PACKAGE_NAME@"
- #TypesDB "@prefix@/share/@PACKAGE_NAME@/types.db"
-@@ -389,16 +389,16 @@
- # LongRunAvgLatency false
- # ConvertSpecialMetricTypes true
- # <Daemon "osd.0">
--# SocketPath "/var/run/ceph/ceph-osd.0.asok"
-+# SocketPath "@localstatedir@/run/ceph/ceph-osd.0.asok"
- # </Daemon>
- # <Daemon "osd.1">
--# SocketPath "/var/run/ceph/ceph-osd.1.asok"
-+# SocketPath "@localstatedir@/run/ceph/ceph-osd.1.asok"
- # </Daemon>
- # <Daemon "mon.a">
--# SocketPath "/var/run/ceph/ceph-mon.ceph1.asok"
-+# SocketPath "@localstatedir@/run/ceph/ceph-mon.ceph1.asok"
- # </Daemon>
- # <Daemon "mds.a">
--# SocketPath "/var/run/ceph/ceph-mds.ceph1.asok"
-+# SocketPath "@localstatedir@/run/ceph/ceph-mds.ceph1.asok"
- # </Daemon>
- #</Plugin>
-
-@@ -427,7 +427,7 @@
- #</Plugin>
- #
- #<Plugin csv>
--# DataDir "@localstatedir@/lib/@PACKAGE_NAME@/csv"
-+# DataDir "@localstatedir@/db/@PACKAGE_NAME@/csv"
- # StoreRates false
- #</Plugin>
-
-@@ -1029,7 +1029,7 @@
- # <Database db_name2>
- # Alias "squeeze"
- # Host "localhost"
--# Socket "/var/run/mysql/mysqld.sock"
-+# Socket "@localstatedir@/run/mysql/mysqld.sock"
- # SlaveStats true
- # SlaveNotifications true
- # </Database>
-@@ -1347,14 +1347,14 @@
- # <Server "server_name">
- # Collect "latency"
- # Collect "udp-answers" "udp-queries"
--# Socket "/var/run/pdns.controlsocket"
-+# Socket "@localstatedir@/run/pdns.controlsocket"
- # </Server>
- # <Recursor "recursor_name">
- # Collect "questions"
- # Collect "cache-hits" "cache-misses"
--# Socket "/var/run/pdns_recursor.controlsocket"
-+# Socket "@localstatedir@/run/pdns_recursor.controlsocket"
- # </Recursor>
--# LocalSocket "/opt/collectd/var/run/collectd-powerdns"
-+# LocalSocket "@localstatedir@/run/collectd-powerdns"
- #</Plugin>
-
- #<Plugin processes>
-@@ -1466,14 +1466,14 @@
-
- #<Plugin rrdcached>
- # DaemonAddress "unix:/tmp/rrdcached.sock"
--# DataDir "@localstatedir@/lib/@PACKAGE_NAME@/rrd"
-+# DataDir "@localstatedir@/db/@PACKAGE_NAME@/rrd"
- # CreateFiles true
- # CreateFilesAsync false
- # CollectStatistics true
- #</Plugin>
-
- #<Plugin rrdtool>
--# DataDir "@localstatedir@/lib/@PACKAGE_NAME@/rrd"
-+# DataDir "@localstatedir@/db/@PACKAGE_NAME@/rrd"
- # CreateFilesAsync false
- # CacheTimeout 120
- # CacheFlush 900
-@@ -1711,7 +1711,7 @@
- # Type "kpackets_wire_per_sec.realtime"
- # ValueFrom 4
- # </Metric>
--# <File "/var/log/snort/snort.stats">
-+# <File "@localstatedir@/log/snort/snort.stats">
- # Instance "snort-eth0"
- # Interval 600
- # Collect "dropped" "mbps" "alerts" "kpps"
-@@ -1773,7 +1773,7 @@
- #</Plugin>
-
- #<Plugin unixsock>
--# SocketFile "@prefix@/var/run/@PACKAGE_NAME@-unixsock"
-+# SocketFile "@localstatedir@/run/@PACKAGE_NAME@-unixsock"
- # SocketGroup "collectd"
- # SocketPerms "0660"
- # DeleteSocket false
diff --git a/collectd/patches/patch-src_cpu.c b/collectd/patches/patch-src_cpu.c
deleted file mode 100644
index 09480b12a4..0000000000
--- a/collectd/patches/patch-src_cpu.c
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-src_cpu.c,v 1.3 2016/12/07 17:28:39 fhajny Exp $
-
-Port this too to NetBSD.
-
---- 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 */
-
--#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
- #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));
-
-+#if defined(KERN_CP_TIME) && defined(KERNEL_NETBSD)
-+ {
-+ int mib[] = {CTL_KERN, KERN_CP_TIME};
-+
-+ cpuinfo_size = sizeof(cpuinfo[0]) * numcpu * CPUSTATES;
-+ status = sysctl(mib, 2, cpuinfo, &cpuinfo_size, NULL, 0);
-+ if (status == -1) {
-+ char errbuf[1024];
-+
-+ ERROR ("cpu plugin: sysctl failed: %s.",
-+ sstrerror (errno, errbuf, sizeof (errbuf)));
-+ return -1;
-+ }
-+ if (cpuinfo_size == (sizeof(cpuinfo[0]) * CPUSTATES)) {
-+ numcpu = 1;
-+ }
-+ }
-+#else /* defined(KERN_CP_TIME) && defined(KERNEL_NETBSD) */
- #if defined(KERN_CPTIME2)
- if (numcpu > 1) {
- for (int i = 0; i < numcpu; i++) {
-@@ -779,6 +800,7 @@ static int cpu_read(void) {
- cpuinfo[0][i] = cpuinfo_tmp[i];
- }
- }
-+#endif /* defined(KERN_CP_TIME) && defined(KERNEL_NETBSD) */
-
- for (int i = 0; i < numcpu; i++) {
- cpu_stage(i, COLLECTD_CPU_STATE_USER, (derive_t)cpuinfo[i][CP_USER], now);
diff --git a/collectd/patches/patch-src_df.c b/collectd/patches/patch-src_df.c
deleted file mode 100644
index 5ddabf9313..0000000000
--- a/collectd/patches/patch-src_df.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_df.c,v 1.5 2016/12/07 17:28:39 fhajny Exp $
-
-Older NetBSD doesn't have float_t.
-
---- 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/ignorelist.h"
- #include "utils/mount/mount.h"
-
-+#if defined(__NetBSD__)
-+#include <sys/param.h>
-+#include <math.h>
-+#if __NetBSD_Version__ < 699001900
-+typedef float float_t;
-+#endif
-+#endif
-+
- #if HAVE_STATVFS
- #if HAVE_SYS_STATVFS_H
- #include <sys/statvfs.h>
diff --git a/collectd/patches/patch-src_entropy.c b/collectd/patches/patch-src_entropy.c
deleted file mode 100644
index 5c31c8abcf..0000000000
--- a/collectd/patches/patch-src_entropy.c
+++ /dev/null
@@ -1,109 +0,0 @@
-$NetBSD: patch-src_entropy.c,v 1.10 2017/11/21 15:18:23 fhajny 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 2020-03-08 16:57:09.000000000 +0100
-+++ src/entropy.c 2020-07-06 19:39:37.204772249 +0200
-@@ -29,23 +29,16 @@
- #include "plugin.h"
- #include "utils/common/common.h"
-
--#if !KERNEL_LINUX
-+static void entropy_submit (value_t);
-+static int entropy_read (void);
-+
-+#if !KERNEL_LINUX && !KERNEL_NETBSD
- #error "No applicable input method."
- #endif
-
-+#if KERNEL_LINUX
- #define ENTROPY_FILE "/proc/sys/kernel/random/entropy_avail"
-
--static void entropy_submit(value_t value) {
-- value_list_t vl = VALUE_LIST_INIT;
--
-- vl.values = &value;
-- vl.values_len = 1;
-- sstrncpy(vl.plugin, "entropy", sizeof(vl.plugin));
-- sstrncpy(vl.type, "entropy", sizeof(vl.type));
--
-- plugin_dispatch_values(&vl);
--}
--
- static int entropy_read(void) {
- value_t v;
- if (parse_value_file(ENTROPY_FILE, &v, DS_TYPE_GAUGE) != 0) {
-@@ -56,6 +49,70 @@ static int entropy_read(void) {
- entropy_submit(v);
- return 0;
- }
-+#endif /* KERNEL_LINUX */
-+
-+#if KERNEL_NETBSD
-+/* Provide a NetBSD implementation, partial from rndctl.c */
-+
-+/*
-+ * Improved to keep the /dev/urandom open, since there's a consumption
-+ * of entropy from /dev/random for every open of /dev/urandom, and this
-+ * will end up opening /dev/urandom lots of times.
-+ */
-+
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
-+#include <sys/param.h>
-+#include <sys/rnd.h>
-+#if HAVE_SYS_RNDIO_H
-+# include <sys/rndio.h>
-+#endif
-+#include <paths.h>
-+
-+static int
-+entropy_read (void)
-+{
-+ value_t v;
-+ rndpoolstat_t rs;
-+ static int fd;
-+ char buf[30];
-+
-+ if (fd == 0) {
-+ fd = open(_PATH_URANDOM, O_RDONLY, 0644);
-+ if (fd < 0) {
-+ fd = 0;
-+ return -1;
-+ }
-+ }
-+
-+ if (ioctl(fd, RNDGETPOOLSTAT, &rs) < 0) {
-+ (void) close(fd);
-+ fd = 0; /* signal a reopening on next attempt */
-+ return -1;
-+ }
-+ snprintf(buf, sizeof(buf), "%ju", (uintmax_t)rs.curentropy);
-+ if (parse_value(buf, &v, DS_TYPE_GAUGE) != 0) {
-+ ERROR("entropy plugin: Parsing \"%s\" failed.", buf);
-+ return (-1);
-+ }
-+
-+ entropy_submit (v);
-+
-+ return 0;
-+}
-+
-+#endif /* KERNEL_NETBSD */
-+
-+static void entropy_submit(value_t value) {
-+ value_list_t vl = VALUE_LIST_INIT;
-+
-+ vl.values = &value;
-+ vl.values_len = 1;
-+ sstrncpy(vl.plugin, "entropy", sizeof(vl.plugin));
-+ sstrncpy(vl.type, "entropy", sizeof(vl.type));
-+
-+ plugin_dispatch_values(&vl);
-+}
-
- void module_register(void) {
- plugin_register_read("entropy", entropy_read);
diff --git a/collectd/patches/patch-src_irq.c b/collectd/patches/patch-src_irq.c
deleted file mode 100644
index d56562975b..0000000000
--- a/collectd/patches/patch-src_irq.c
+++ /dev/null
@@ -1,99 +0,0 @@
-$NetBSD: patch-src_irq.c,v 1.5 2017/11/21 15:18:23 fhajny Exp $
-
-Provide a port to NetBSD.
-
---- 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
- #error "No applicable input method."
- #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 +83,7 @@ static void irq_submit(const char *irq_n
- plugin_dispatch_values(&vl);
- } /* void irq_submit */
-
-+#if KERNEL_LINUX
- static int irq_read(void) {
- FILE *fh;
- char buffer[1024];
-@@ -165,6 +174,64 @@ static int irq_read(void) {
-
- return 0;
- } /* int irq_read */
-+#endif /* KERNEL_LINUX */
-+
-+#if KERNEL_NETBSD
-+static int
-+irq_read (void)
-+{
-+ const int mib[4] = {
-+ CTL_KERN,
-+ KERN_EVCNT,
-+ EVCNT_TYPE_INTR,
-+ KERN_EVCNT_COUNT_NONZERO
-+ };
-+ size_t buflen = 0;
-+ void *buf = NULL;
-+ const struct evcnt_sysctl *evs, *last_evs;
-+
-+ for (;;) {
-+ size_t newlen;
-+ int error;
-+
-+ newlen = buflen;
-+ if (buflen)
-+ buf = malloc(buflen);
-+ error = sysctl(mib, __arraycount(mib),
-+ buf, &newlen, NULL, 0);
-+ if (error) {
-+ ERROR("irq plugin: failed to get event count");
-+ return -1;
-+ }
-+ if (newlen <= buflen) {
-+ buflen = newlen;
-+ break;
-+ }
-+ if (buf)
-+ free(buf);
-+ buflen = newlen;
-+ }
-+ evs = buf;
-+ last_evs = (void*)((char *)buf + buflen);
-+ buflen /= sizeof(uint64_t);
-+ while(evs < last_evs
-+ && buflen > sizeof(*evs) / sizeof(uint64_t)
-+ && buflen >= evs->ev_len)
-+ {
-+ char irqname[80];
-+
-+ snprintf(irqname, 80, "%s-%s", evs->ev_strings,
-+ evs->ev_strings + evs->ev_grouplen + 1);
-+
-+ irq_submit(irqname, evs->ev_count);
-+
-+ buflen -= evs->ev_len;
-+ evs =(const void*)((const uint64_t *)evs + evs->ev_len);
-+ }
-+ free(buf);
-+ return 0;
-+}
-+#endif /* KERNEL_NETBSD */
-
- void module_register(void) {
- plugin_register_config("irq", irq_config, config_keys, config_keys_num);
diff --git a/collectd/patches/patch-src_libcollectdclient_network__buffer.c b/collectd/patches/patch-src_libcollectdclient_network__buffer.c
deleted file mode 100644
index 3361dbbbf9..0000000000
--- a/collectd/patches/patch-src_libcollectdclient_network__buffer.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_libcollectclient_network__buffer.c,v 1.4 2017/11/21 15:18:23 fhajny 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
diff --git a/collectd/patches/patch-src_memory.c b/collectd/patches/patch-src_memory.c
deleted file mode 100644
index 8effbeb83c..0000000000
--- a/collectd/patches/patch-src_memory.c
+++ /dev/null
@@ -1,98 +0,0 @@
-$NetBSD: patch-src_memory.c,v 1.5 2017/11/21 15:18:23 fhajny Exp $
-
-Add a port for NetBSD using VM_UVMEXP2, and preferring
-sysctl over sysctlbyname.
-
---- 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_SYSCTLBYNAME
-+#if HAVE_SYSCTL && defined(KERNEL_NETBSD)
-+static int pagesize;
-+#include <unistd.h> /* getpagesize() */
-+#else
- /* no global variables */
-+#endif
- /* #endif HAVE_SYSCTLBYNAME */
-
- #elif KERNEL_LINUX
-@@ -97,6 +102,10 @@ static int pagesize;
- #error "No applicable input method."
- #endif
-
-+#if KERNEL_NETBSD
-+# include <uvm/uvm_extern.h>
-+#endif
-+
- static bool values_absolute = true;
- static bool values_percentage;
-
-@@ -124,7 +133,11 @@ static int memory_init(void) {
- /* #endif HAVE_HOST_STATISTICS */
-
- #elif HAVE_SYSCTLBYNAME
-+#if HAVE_SYSCTL && defined(KERNEL_NETBSD)
-+ pagesize = getpagesize();
-+#else
- /* no init stuff */
-+#endif /* HAVE_SYSCTL && defied(KERNEL_NETBSD) */
- /* #endif HAVE_SYSCTLBYNAME */
-
- #elif defined(KERNEL_LINUX)
-@@ -225,6 +238,45 @@ static int memory_read_internal(value_li
- /* #endif HAVE_HOST_STATISTICS */
-
- #elif HAVE_SYSCTLBYNAME
-+
-+#if HAVE_SYSCTL && defined(KERNEL_NETBSD)
-+ int mib[] = {CTL_VM, VM_UVMEXP2};
-+ struct uvmexp_sysctl uvmexp;
-+ gauge_t mem_active;
-+ gauge_t mem_inactive;
-+ gauge_t mem_free;
-+ gauge_t mem_wired;
-+ gauge_t mem_kernel;
-+ size_t size;
-+
-+ memset (&uvmexp, 0, sizeof (uvmexp));
-+ size = sizeof (uvmexp);
-+
-+ if (sysctl (mib, 2, &uvmexp, &size, NULL, 0) < 0) {
-+ char errbuf[1024];
-+ WARNING ("memory plugin: sysctl failed: %s",
-+ sstrerror (errno, errbuf, sizeof (errbuf)));
-+ return (-1);
-+ }
-+
-+ assert (pagesize > 0);
-+ mem_active = (gauge_t) (uvmexp.active * pagesize);
-+ mem_inactive = (gauge_t) (uvmexp.inactive * pagesize);
-+ mem_free = (gauge_t) (uvmexp.free * pagesize);
-+ mem_wired = (gauge_t) (uvmexp.wired * pagesize);
-+ mem_kernel = (gauge_t) ((uvmexp.npages - (
-+ uvmexp.active + uvmexp.inactive +
-+ uvmexp.free + uvmexp.wired
-+ )) * pagesize);
-+
-+ MEMORY_SUBMIT ("active", mem_active,
-+ "inactive", mem_inactive,
-+ "free", mem_free,
-+ "wired", mem_wired,
-+ "kernel", mem_kernel);
-+/* #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
-@@ -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 */
-
- #elif KERNEL_LINUX
diff --git a/collectd/patches/patch-src_netstat__udp.c b/collectd/patches/patch-src_netstat__udp.c
deleted file mode 100644
index 29565a6009..0000000000
--- a/collectd/patches/patch-src_netstat__udp.c
+++ /dev/null
@@ -1,165 +0,0 @@
-$NetBSD: patch-src_netstat__udp.c,v 1.1 2015/09/12 19:04:56 he Exp $
-
-Add a plugin which reports the UDP summary statistics.
-Useful for busyish DNS name servers.
-
---- src/netstat_udp.c.orig 2015-09-11 16:55:05.000000000 +0000
-+++ src/netstat_udp.c
-@@ -0,0 +1,157 @@
-+/**
-+ * collectd - src/netstat-udp.c
-+ * Copyright (C) 2015 Håvard Eidnes
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License as published by the
-+ * Free Software Foundation; only version 2 of the License is applicable.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ * Authors:
-+ * Håvard Eidnes <he at NetBSD.org>
-+ **/
-+
-+#include "collectd.h"
-+#include "utils/common/common.h"
-+#include "plugin.h"
-+
-+#if !defined(KERNEL_NETBSD)
-+# error "No applicable input method."
-+#endif
-+
-+#include <sys/cdefs.h>
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+
-+#include <netinet/in.h>
-+#include <netinet/ip_var.h>
-+#include <netinet/udp.h>
-+#include <netinet/udp_var.h>
-+#include <netinet6/udp6_var.h>
-+
-+static int
-+netstat_udp_init (void)
-+{
-+ return (0);
-+} /* int netstat_udp_init */
-+
-+#define SUBMIT_VARS(...) \
-+ plugin_dispatch_multivalue (vl, 0, DS_TYPE_DERIVE, __VA_ARGS__, NULL)
-+
-+static int
-+netstat_udp_internal (value_list_t *vl)
-+{
-+ uint64_t udpstat[UDP_NSTATS];
-+ uint64_t udp6stat[UDP6_NSTATS];
-+ size_t size;
-+ uint64_t delivered, delivered6;
-+ int err;
-+
-+ size = sizeof(udpstat);
-+ if (sysctlbyname("net.inet.udp.stats", udpstat, &size, NULL, 0) == -1) {
-+ ERROR("netstat-udp plugin: could not get udp stats");
-+ return -1;
-+ }
-+
-+ delivered = udpstat[UDP_STAT_IPACKETS] -
-+ udpstat[UDP_STAT_HDROPS] -
-+ udpstat[UDP_STAT_BADLEN] -
-+ udpstat[UDP_STAT_BADSUM] -
-+ udpstat[UDP_STAT_NOPORT] -
-+ udpstat[UDP_STAT_NOPORTBCAST] -
-+ udpstat[UDP_STAT_FULLSOCK];
-+
-+ err = SUBMIT_VARS ("udp-received",
-+ (derive_t) udpstat[UDP_STAT_IPACKETS],
-+ "udp-bad-header",
-+ (derive_t) udpstat[UDP_STAT_HDROPS],
-+ "udp-bad-length",
-+ (derive_t) udpstat[UDP_STAT_BADLEN],
-+ "udp-bad-checksum",
-+ (derive_t) udpstat[UDP_STAT_BADSUM],
-+ "udp-no-port",
-+ (derive_t) udpstat[UDP_STAT_NOPORT],
-+ "udp-no-port-broadcast",
-+ (derive_t) udpstat[UDP_STAT_NOPORTBCAST],
-+ "udp-full-socket",
-+ (derive_t) udpstat[UDP_STAT_FULLSOCK],
-+ "udp-delivered",
-+ (derive_t) delivered
-+ );
-+ if (err != 0) {
-+ ERROR("netstat-udp plugin: could not submit, err=%d\n", err);
-+ }
-+
-+ size = sizeof(udp6stat);
-+ if (sysctlbyname("net.inet6.udp6.stats", udp6stat, &size,
-+ NULL, 0) == -1) {
-+ ERROR("netstat-udp plugin: could not get udp6 stats");
-+ return -1;
-+ }
-+
-+ delivered6 = udp6stat[UDP6_STAT_IPACKETS] -
-+ udp6stat[UDP6_STAT_HDROPS] -
-+ udp6stat[UDP6_STAT_BADLEN] -
-+ udp6stat[UDP6_STAT_BADSUM] -
-+ udp6stat[UDP6_STAT_NOSUM] -
-+ udp6stat[UDP6_STAT_NOPORT] -
-+ udp6stat[UDP6_STAT_NOPORTMCAST] -
-+ udp6stat[UDP6_STAT_FULLSOCK];
-+
-+ err = SUBMIT_VARS ("udp6-received",
-+ (derive_t) udp6stat[UDP6_STAT_IPACKETS],
-+ "udp6-bad-header",
-+ (derive_t) udp6stat[UDP6_STAT_HDROPS],
-+ "udp6-bad-length",
-+ (derive_t) udp6stat[UDP6_STAT_BADLEN],
-+ "udp6-bad-checksum",
-+ (derive_t) udp6stat[UDP6_STAT_BADSUM],
-+ "udp6-no-checksum",
-+ (derive_t) udp6stat[UDP6_STAT_NOSUM],
-+ "udp6-no-port",
-+ (derive_t) udp6stat[UDP6_STAT_NOPORT],
-+ "udp6-no-port-multicast",
-+ (derive_t) udp6stat[UDP6_STAT_NOPORTMCAST],
-+ "udp6-full-socket",
-+ (derive_t) udp6stat[UDP6_STAT_FULLSOCK],
-+ "udp6-delivered",
-+ (derive_t) delivered6
-+ );
-+ if (err != 0) {
-+ ERROR("netstat-udp plugin ipv6: could not submit, err=%d\n",
-+ err);
-+ }
-+
-+ return (0);
-+} /* }}} int netstat_udp_internal */
-+
-+static int
-+netstat_udp_read (void) /* {{{ */
-+{
-+ value_t v[1];
-+ value_list_t vl = VALUE_LIST_INIT;
-+
-+ vl.values = v;
-+ vl.values_len = STATIC_ARRAY_SIZE (v);
-+ sstrncpy (vl.host, hostname_g, sizeof (vl.host));
-+ sstrncpy (vl.plugin, "netstat_udp", sizeof (vl.plugin));
-+ sstrncpy (vl.type, "packets", sizeof (vl.type));
-+ vl.time = cdtime ();
-+
-+ return (netstat_udp_internal (&vl));
-+} /* }}} int netstat_udp_read */
-+
-+void
-+module_register (void)
-+{
-+ plugin_register_init ("netstat_udp", netstat_udp_init);
-+ plugin_register_read ("netstat_udp", netstat_udp_read);
-+} /* void module_register */
diff --git a/collectd/patches/patch-src_nfs.c b/collectd/patches/patch-src_nfs.c
deleted file mode 100644
index 9a2581772d..0000000000
--- a/collectd/patches/patch-src_nfs.c
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-src_nfs.c,v $
-
-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;
- }
-
diff --git a/collectd/patches/patch-src_processes.c b/collectd/patches/patch-src_processes.c
deleted file mode 100644
index ff1553b754..0000000000
--- a/collectd/patches/patch-src_processes.c
+++ /dev/null
@@ -1,264 +0,0 @@
-$NetBSD: patch-src_processes.c,v 1.8 2017/11/21 16:02:20 he Exp $
-
-Add a port to NetBSD.
-
---- 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 && \
-- (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD)
-+ (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD || HAVE_STRUCT_KINFO_PROC2_NETBSD)
- #include <kvm.h>
- #include <sys/param.h>
- #include <sys/proc.h>
- #include <sys/sysctl.h>
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #include <sys/user.h>
-+#endif
- /* #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
- #include <procinfo.h>
-@@ -315,10 +317,15 @@ static void ps_fill_details(const procst
- /* #endif KERNEL_LINUX */
-
- #elif HAVE_LIBKVM_GETPROCS && \
-- (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD)
-+ (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD || HAVE_STRUCT_KINFO_PROC2_NETBSD)
- static int pagesize;
-+
-+#if KERNEL_NETBSD
-+int maxslp;
-+#endif
-+
- /* #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
- static struct procentry64 procentry[MAXPROCENTRY];
-@@ -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)
-+ (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD || HAVE_STRUCT_KINFO_PROC2_NETBSD)
-+#if KERNEL_NETBSD
-+ int mib[2];
-+ size_t size;
-+
-+ mib[0] = CTL_VM;
-+ mib[1] = VM_MAXSLP;
-+ size = sizeof(maxslp);
-+ if (sysctl(mib, 2, &maxslp, &size, NULL, 0) == -1)
-+ maxslp = 20; /* reasonable default? */
-+#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) */
-
- #elif HAVE_PROCINFO_H
- pagesize = getpagesize();
-@@ -2296,6 +2314,196 @@ static int ps_read(void) {
- ps_submit_proc_list(ps_ptr);
- /* #endif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD */
-
-+#elif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC2_NETBSD
-+ int running = 0;
-+ int sleeping = 0;
-+ int zombies = 0;
-+ int stopped = 0;
-+ int blocked = 0;
-+ int idle = 0;
-+ int wait = 0;
-+
-+ kvm_t *kd;
-+ char errbuf[_POSIX2_LINE_MAX];
-+ struct kinfo_proc2 *procs; /* array of processes */
-+ struct kinfo_proc2 *proc_ptr = NULL;
-+ struct kinfo_proc2 *p;
-+ int count; /* returns number of processes */
-+ int i;
-+ int l, nlwps;
-+ struct kinfo_lwp *kl;
-+
-+ procstat_t *ps_ptr;
-+ process_entry_t pse;
-+
-+ ps_list_reset ();
-+
-+ /* Open the kvm interface, get a descriptor */
-+ kd = kvm_openfiles (NULL, NULL, NULL, KVM_NO_FILES, errbuf);
-+ if (kd == NULL)
-+ {
-+ ERROR ("processes plugin: Cannot open kvm interface: %s",
-+ errbuf);
-+ return (0);
-+ }
-+
-+ /* Get the list of processes. */
-+ procs = kvm_getproc2(kd, KERN_PROC_ALL, 0,
-+ sizeof(struct kinfo_proc2), &count);
-+ if (procs == NULL)
-+ {
-+ ERROR ("processes plugin: Cannot get kvm processes list: %s",
-+ kvm_geterr(kd));
-+ kvm_close (kd);
-+ return (0);
-+ }
-+
-+ /* Iterate through the processes in kinfo_proc */
-+ for (i = 0; i < count; i++)
-+ {
-+ /* Create only one process list entry per _process_, i.e.
-+ * filter out threads (duplicate PID entries). */
-+ if ((proc_ptr == NULL) || (proc_ptr->p_pid != procs[i].p_pid))
-+ {
-+ char cmdline[CMDLINE_BUFFER_SIZE] = "";
-+ _Bool have_cmdline = 0;
-+
-+ proc_ptr = &(procs[i]);
-+ /* Don't probe system processes and processes without arguments */
-+ if (((procs[i].p_flag & P_SYSTEM) == 0)
-+ && (procs[i].p_comm[0] != 0))
-+ {
-+ char **argv;
-+ int argc;
-+ int status;
-+
-+ /* retrieve the arguments */
-+ argv = kvm_getargv2 (kd, proc_ptr, 0);
-+ argc = 0;
-+ if ((argv != NULL) && (argv[0] != NULL))
-+ {
-+ while (argv[argc] != NULL)
-+ argc++;
-+
-+ status = strjoin (cmdline, sizeof (cmdline), argv, argc, " ");
-+ if (status < 0)
-+ WARNING ("processes plugin: Command line did not fit into buffer.");
-+ else
-+ have_cmdline = 1;
-+ }
-+ } /* if (process has argument list) */
-+
-+ memset(&pse, 0, sizeof(pse));
-+ pse.id = procs[i].p_pid;
-+
-+ pse.num_proc = 1;
-+ pse.num_lwp = procs[i].p_nlwps;
-+
-+ pse.vmem_size = procs[i].p_uru_maxrss * pagesize;
-+ pse.vmem_rss = procs[i].p_vm_rssize * pagesize;
-+ pse.vmem_data = procs[i].p_vm_dsize * pagesize;
-+ pse.vmem_code = procs[i].p_vm_tsize * pagesize;
-+ pse.stack_size = procs[i].p_vm_ssize * pagesize;
-+ pse.vmem_minflt_counter = procs[i].p_uru_minflt;
-+ pse.vmem_majflt_counter = procs[i].p_uru_majflt;
-+
-+ pse.cpu_user_counter = 0;
-+ pse.cpu_system_counter = 0;
-+ /* context switch counters not implemented */
-+ pse.cswitch_vol = -1;
-+ pse.cswitch_invol = -1;
-+
-+ /*
-+ * The u-area might be swapped out, and we can't get
-+ * at it because we have a crashdump and no swap.
-+ * If it's here fill in these fields, otherwise, just
-+ * leave them 0.
-+ */
-+ if (procs[i].p_flag & P_INMEM)
-+ {
-+ pse.cpu_user_counter = procs[i].p_uutime_usec
-+ + (1000000lu * procs[i].p_uutime_sec);
-+ pse.cpu_system_counter = procs[i].p_ustime_usec
-+ + (1000000lu * procs[i].p_ustime_sec);
-+ }
-+
-+ /* no I/O data */
-+ pse.io_rchar = -1;
-+ pse.io_wchar = -1;
-+ pse.io_syscr = procs[i].p_uru_inblock;
-+ pse.io_syscw = procs[i].p_uru_oublock;
-+
-+ /* file descriptor count not implemented */
-+ pse.num_fd = 0;
-+
-+ /* Number of memory mappings */
-+ pse.num_maps = 0;
-+
-+ /* context switch counters not implemented */
-+ pse.cswitch_vol = -1;
-+ pse.cswitch_invol = -1;
-+
-+ ps_list_add (procs[i].p_comm, have_cmdline ? cmdline : NULL, &pse);
-+ } /* if ((proc_ptr == NULL) || (proc_ptr->ki_pid != procs[i].ki_pid)) */
-+
-+ /* system processes' LWPs end up in "running" state */
-+ if ((procs[i].p_flag & P_SYSTEM) != 0)
-+ continue;
-+
-+ switch (procs[i].p_realstat)
-+ {
-+ case SSTOP:
-+ case SACTIVE:
-+ case SIDL:
-+ p = &(procs[i]);
-+ /* get info about LWPs */
-+ kl = kvm_getlwps(kd, p->p_pid, (u_long)p->p_paddr,
-+ sizeof(struct kinfo_lwp), &nlwps);
-+
-+ for (l = 0; kl && l < nlwps; l++) {
-+ switch (kl[l].l_stat) {
-+ case LSONPROC:
-+ case LSRUN:
-+ running++;
-+ break;
-+ case LSSLEEP:
-+ if (kl[l].l_flag & L_SINTR) {
-+ if (kl[l].l_slptime > maxslp)
-+ idle++;
-+ else
-+ sleeping++;
-+ } else
-+ blocked++;
-+ break;
-+ case LSSTOP:
-+ stopped++; break;
-+ case LSIDL:
-+ idle++; break;
-+ }
-+ }
-+ break;
-+ case SZOMB:
-+ case SDYING:
-+ case SDEAD:
-+ zombies++; break;
-+
-+ }
-+ }
-+
-+ kvm_close(kd);
-+
-+ ps_submit_state ("running", running);
-+ ps_submit_state ("sleeping", sleeping);
-+ ps_submit_state ("zombies", zombies);
-+ ps_submit_state ("stopped", stopped);
-+ ps_submit_state ("blocked", blocked);
-+ ps_submit_state ("idle", idle);
-+ ps_submit_state ("wait", wait);
-+
-+ for (ps_ptr = list_head_g; ps_ptr != NULL; ps_ptr = ps_ptr->next)
-+ 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;
diff --git a/collectd/patches/patch-src_statsd.c b/collectd/patches/patch-src_statsd.c
deleted file mode 100644
index 1ce2b17fdc..0000000000
--- a/collectd/patches/patch-src_statsd.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_statsd.c,v 1.1 2017/01/19 17:20:42 he Exp $
-
-Insert workaround for possibly missing nearbyint().
-(Could be more specific, but test would be ... complicated.)
-
---- src/statsd.c.orig 2017-01-19 16:24:15.000000000 +0000
-+++ src/statsd.c
-@@ -48,6 +48,11 @@
- #define STATSD_DEFAULT_SERVICE "8125"
- #endif
-
-+#ifdef __NetBSD__
-+/* May not have this, could be more specific... */
-+#define nearbyint(v) rint((v))
-+#endif
-+
- enum metric_type_e { STATSD_COUNTER, STATSD_TIMER, STATSD_GAUGE, STATSD_SET };
- typedef enum metric_type_e metric_type_t;
-
diff --git a/collectd/patches/patch-src_swap.c b/collectd/patches/patch-src_swap.c
deleted file mode 100644
index d529e12c42..0000000000
--- a/collectd/patches/patch-src_swap.c
+++ /dev/null
@@ -1,144 +0,0 @@
-$NetBSD: patch-src_swap.c,v 1.5 2017/11/21 15:18:23 fhajny Exp $
-
-Extend support for NetBSD, and add per-swap-device
-reporting for HAVE_SWAPCTL_THREE_ARGS.
-
---- 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
-+#elif HAVE_SWAPCTL && (HAVE_SWAPCTL_TWO_ARGS || HAVE_SWAPCTL_THREE_ARGS)
- #define SWAP_HAVE_REPORT_BY_DEVICE 1
- static derive_t pagesize;
-+#if KERNEL_NETBSD
-+static _Bool report_bytes = 0;
-+#endif
- static bool report_by_device;
- /* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS */
-
-@@ -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)
--#if KERNEL_LINUX
-+#if KERNEL_LINUX || KERNEL_NETBSD
- cf_util_get_boolean(child, &report_bytes);
- #else
- WARNING("swap plugin: The \"ReportBytes\" option "
-@@ -154,7 +157,7 @@ static int swap_init(void) /* {{{ */
- pagesize = (derive_t)sysconf(_SC_PAGESIZE);
- /* #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 */
-@@ -212,7 +215,7 @@ static void swap_submit_usage(char const
- free, other_name, other_value, NULL);
- } /* }}} void swap_submit_usage */
-
--#if KERNEL_LINUX || HAVE_PERFSTAT
-+#if KERNEL_LINUX || HAVE_PERFSTAT || KERNEL_NETBSD
- __attribute__((nonnull(1))) static void
- swap_submit_derive(char const *type_instance, /* {{{ */
- derive_t value) {
-@@ -549,6 +552,43 @@ static int swap_read(void) /* {{{ */
- /* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS */
-
- #elif HAVE_SWAPCTL && HAVE_SWAPCTL_THREE_ARGS
-+#if KERNEL_NETBSD
-+#include <uvm/uvm_extern.h>
-+
-+static int
-+swap_read_io (void) /* {{{ */
-+{
-+ static int uvmexp_mib[] = { CTL_VM, VM_UVMEXP2 };
-+ struct uvmexp_sysctl uvmexp;
-+ size_t ssize;
-+ derive_t swap_in, swap_out;
-+
-+ ssize = sizeof(uvmexp);
-+ memset(&uvmexp, 0, ssize);
-+ if (sysctl(uvmexp_mib, __arraycount(uvmexp_mib), &uvmexp,
-+ &ssize, NULL, 0) == -1) {
-+ char errbuf[1024];
-+ WARNING ("swap: sysctl for uvmexp failed: %s",
-+ sstrerror (errno, errbuf, sizeof (errbuf)));
-+ return (-1);
-+ }
-+
-+ swap_in = uvmexp.pgswapin;
-+ swap_out = uvmexp.pgswapout;
-+
-+ if (report_bytes)
-+ {
-+ swap_in = swap_in * pagesize;
-+ swap_out = swap_out * pagesize;
-+ }
-+
-+ swap_submit_derive ("in", swap_in);
-+ swap_submit_derive ("out", swap_out);
-+
-+ return (0);
-+} /* }}} */
-+#endif
-+
- static int swap_read(void) /* {{{ */
- {
- struct swapent *swap_entries;
-@@ -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++) {
-+ char path[PATH_MAX];
-+ gauge_t this_used;
-+ gauge_t this_total;
-+
- if ((swap_entries[i].se_flags & SWF_ENABLE) == 0)
- continue;
-
-- used += ((gauge_t)swap_entries[i].se_inuse) * C_SWAP_BLOCK_SIZE;
-- total += ((gauge_t)swap_entries[i].se_nblks) * C_SWAP_BLOCK_SIZE;
-- }
-+ this_used = ((gauge_t) swap_entries[i].se_inuse)
-+ * C_SWAP_BLOCK_SIZE;
-+ this_total = ((gauge_t) swap_entries[i].se_nblks)
-+ * C_SWAP_BLOCK_SIZE;
-+
-+ /* Shortcut for the "combined" setting (default) */
-+ if (!report_by_device)
-+ {
-+ used += this_used;
-+ total += this_total;
-+ continue;
-+ }
-+
-+ sstrncpy (path, swap_entries[i].se_path, sizeof (path));
-+ escape_slashes (path, sizeof (path));
-+
-+ swap_submit_usage (path, this_used, this_total - this_used,
-+ NULL, NAN);
-+ } /* for (swap_num) */
-
- if (total < used) {
- ERROR(
-@@ -603,8 +663,15 @@ static int swap_read(void) /* {{{ */
- }
-
- swap_submit_usage(NULL, used, total - used, NULL, NAN);
-+ /* If the "separate" option was specified (report_by_device == 1), all
-+ * values have already been dispatched from within the loop. */
-+ if (!report_by_device)
-+ swap_submit_usage (NULL, used, total - used, NULL, NAN);
-
- sfree(swap_entries);
-+#if KERNEL_NETBSD
-+ swap_read_io ();
-+#endif
- return 0;
- } /* }}} int swap_read */
- /* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_THREE_ARGS */
diff --git a/collectd/patches/patch-src_tcpconns.c b/collectd/patches/patch-src_tcpconns.c
deleted file mode 100644
index 56897faf69..0000000000
--- a/collectd/patches/patch-src_tcpconns.c
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-src_tcpconns.c,v 1.7 2017/11/21 15:18:23 fhajny Exp $
-
-Include <sys/param.h>
-Re-order to fix build on NetBSD.
-
---- 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>
-+#include <netinet/ip.h>
- #include <netinet/in_pcb.h>
- #include <netinet/in_systm.h>
--#include <netinet/ip.h>
- #include <netinet/ip_var.h>
- #include <netinet/tcp.h>
- #include <netinet/tcp_timer.h>
-@@ -895,6 +895,7 @@ static int conn_init(void) {
- return 0;
- } /* int conn_init */
-
-+#include <sys/param.h>
- static int conn_read(void) {
- struct inpcbtable table;
- #if !defined(__OpenBSD__) && \
diff --git a/collectd/patches/patch-src_utils_dns_dns.c b/collectd/patches/patch-src_utils_dns_dns.c
deleted file mode 100644
index 2d55df0111..0000000000
--- a/collectd/patches/patch-src_utils_dns_dns.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_utils__dns.c,v 1.3 2020/02/03 09:12:32 triaxx 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
-
diff --git a/collectd/patches/patch-src_utils_format__kairosdb_format__kairosdb.c b/collectd/patches/patch-src_utils_format__kairosdb_format__kairosdb.c
deleted file mode 100644
index b97b0e8aeb..0000000000
--- a/collectd/patches/patch-src_utils_format__kairosdb_format__kairosdb.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_utils__format__kairosdb.c,v 1.4 2017/01/19 17:20:42 he 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