diff -ruN net-mgmt/collectd5/Makefile net-mgmt/collectd5.new/Makefile
--- net-mgmt/collectd5/Makefile	2019-07-05 21:08:49.000000000 +0200
+++ net-mgmt/collectd5.new/Makefile	2019-07-08 07:34:43.416285000 +0200
@@ -84,27 +84,24 @@
 
 # NOTE: Plugins without dependencies are defined further down.
 CONFIGURE_ARGS=	--disable-all-plugins \
+		--disable-amqp \
 		--disable-ceph \
 		--disable-cgroups \
 		--disable-fhcount \
+		--disable-lvm \
 		--disable-static \
 		--disable-turbostat \
 		--enable-disk \
 		--localstatedir=/var \
-		--without-amqp \
 		--without-libaquaero5 \
 		--without-libganglia \
 		--without-libiptc \
-		--without-libkstat \
 		--without-libldap \
 		--without-liblvm2app \
 		--without-libmnl \
 		--without-libnetapp \
-		--without-libnetlink \
 		--without-libowcapi \
-		--without-libperfstat \
 		--without-libsensors \
-		--without-lvm \
 		--without-mic \
 		--without-oracle
 
@@ -130,13 +127,13 @@
 JAVA_CONFIGURE_WITH=	java=${LOCALBASE} libjvm
 
 DBI_LIB_DEPENDS=	libdbi.so:databases/libdbi
-DBI_CONFIGURE_WITH=	libdbi=${LOCALBASE}
+DBI_CONFIGURE_ENABLE=	libdbi=${LOCALBASE}
 DBI_CONFIGURE_ENABLE=	dbi
 DBI_CFLAGS=		-Wno-deprecated-declarations
 
 GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 			libgpg-error.so:security/libgpg-error
-GCRYPT_CONFIGURE_WITH=	-with-libgcrypt=${LOCALBASE}
+GCRYPT_CONFIGURE_WITH=	libgcrypt=${LOCALBASE}
 GCRYPT_LIBS=		-lgcrypt
 
 IPMI_LIB_DEPENDS=	libOpenIPMI.so:sysutils/openipmi
@@ -250,8 +247,9 @@
 SIGROK_CFLAGS=			`pkg-config --cflags glib-2.0`
 SIGROK_LIB_DEPENDS=		libsigrok.so:devel/libsigrok
 SIGROK_CONFIGURE_ENABLE=	sigrok
-SIGROK_CONFIGURE_WITH=		libsigrok
+SIGROK_CONFIGURE_WITH=		libsigrok=${LOCALBASE}
 SIGROK_USES=			gettext-runtime
+SIGROK_BROKEN=			fails to configure with sigrok option
 
 SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_ENABLE=	snmp
@@ -276,6 +274,7 @@
 VIRT_CONFIGURE_ENABLE=	virt
 VIRT_CONFIGURE_WITH=	virt=${LOCALBASE}
 
+XML_CFLAGS=		`xml2-config --cflags`
 XML_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 XML_CONFIGURE_WITH=	libxml2=${LOCALBASE}