net-mgmt/collectd5: partially convert to option helpers [1]

- Add explicit CURL_JSON and CURL_XML options.  Previously these options
  would be automatically enabled when CURL and JSON or CURL and XML were
  selected together.  Change them to an _IMPLIES variable as an explicit
  option
- Convert all options except PERL and PYTHON, for the time being, to the
  new framework.  The option helper variant is not expanding ${PYTHON_CMD}
  and is currently passing it as "--with-python= " which fails to build.
- No PORTREVISION change given no change to package
- While here, tag VARNISH as BROKEN, fails to compile with varnish4-4.1 [2]

PR:		204220 [1]
PR:		204583 [2]
Submitted by:	Krzysztof <ports@bsdserwis.com> (maintainer) [1]

1 files changed, 167 insertions, 392 deletions

diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index 446f429833b1..75b7c4ea6b06 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -25,13 +25,16 @@ GNU_CONFIGURE=	yes
 OPTIONS_DEFINE=		CGI DEBUG GCRYPT LOGSTASH VIRT
 OPTIONS_GROUP=		INPUT OUTPUT
 OPTIONS_GROUP_OUTPUT=	KAFKA NOTIFYDESKTOP NOTIFYEMAIL RIEMANN RRDTOOL
-OPTIONS_GROUP_INPUT=	CURL DBI IPMI JSON MEMCACHEC MODBUS MONGODB MYSQL \
-			NUTUPS OLSRD ONEWIRE OPENLDAP PERL PGSQL PINBA PING \
-			PYTHON RABBITMQ REDIS ROUTEROS SIGROK SNMP STATGRAB \
-			STATSD TOKYOTYRANT VARNISH XML XMMS ZOOKEEPER
+OPTIONS_GROUP_INPUT=	CURL CURL_JSON CURL_XML DBI IPMI JSON MEMCACHEC \
+			MODBUS MONGODB MYSQL NUTUPS OLSRD ONEWIRE OPENLDAP \
+			PERL PGSQL PINBA PING PYTHON RABBITMQ REDIS ROUTEROS \
+			SIGROK SNMP STATGRAB STATSD TOKYOTYRANT VARNISH XML \
+			XMMS ZOOKEEPER
 
 CGI_DESC=		Install collection.cgi (requires rrdtool)
 CURL_DESC=		Enable curl-based plugins (apache, nginx, etc)
+CURL_JSON_DESC=		Enable curl_json plugin (implies curl and json)
+CURL_XML_DESC=		Enable ascent, bind, curl_xml plugins (implies curl and xml)
 DBI_DESC=		Enable dbi plugin
 DEBUG_DESC=		Enable debugging
 GCRYPT_DESC=		Build with libgcrypt
@@ -70,6 +73,8 @@ XML_DESC=		Enable XML plugins
 XMMS_DESC=		Enable xmms plugin
 ZOOKEEPER_DESC=		Enable zookeeper plugin
 
+OPTIONS_SUB=	yes
+
 USE_RC_SUBR=	collectd collectdmon
 
 USE_LDCONFIG=	yes
@@ -79,8 +84,6 @@ CONFLICTS=	collectd-4.[0-9]*
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
-.include <bsd.port.options.mk>
-
 # NOTE: Plugins without dependencies are defined further down.
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--disable-all-plugins \
@@ -101,15 +104,163 @@ CONFIGURE_ARGS=	--localstatedir=/var \
 		--without-libowcapi \
 		--without-libperfstat \
 		--without-libsensors \
-		--without-libvarnish \
 		--without-lvm \
 		--without-mic \
 		--without-oracle \
 		--disable-turbostat
 
+CGI_RUN_DEPENDS=		p5-URI>=0:${PORTSDIR}/net/p5-URI \
+				p5-CGI>=0:${PORTSDIR}/www/p5-CGI \
+				p5-Data-Dumper>=0:${PORTSDIR}/devel/p5-Data-Dumper \
+				p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
+CGI_IMPLIES=			RRDTOOL
+
+CURL_LIB_DEPENDS=		libcurl.so:${PORTSDIR}/ftp/curl
+CURL_CONFIGURE_ENABLE=		apache curl nginx write_http
+CURL_CONFIGURE_WITH=		libcurl=${LOCALBASE}
+
+CURL_JSON_IMPLIES=		CURL JSON
+CURL_JSON_CONFIGURE_ENABLE=	curl_json
+
+CURL_XML_IMPLIES=		CURL XML
+CURL_XML_CONFIGURE_ENABLE=	ascent bind curl_xml
+
+DEBUG_CONFIGURE_ENABLE=		debug
+
+DBI_LIB_DEPENDS=		libdbi.so:${PORTSDIR}/databases/libdbi
+DBI_CONFIGURE_WITH=		libdbi=${LOCALBASE}
+DBI_CONFIGURE_ENABLE=		dbi
+DBI_CFLAGS=			-Wno-deprecated-declarations
+
+GCRYPT_LIB_DEPENDS=		libgcrypt.so:${PORTSDIR}/security/libgcrypt
+GCRYPT_CONFIGURE_WITH=		-with-libgcrypt=${LOCALBASE}
+GCRYPT_LIBS=			-lgcrypt
+
+IPMI_LIB_DEPENDS=		libOpenIPMI.so:${PORTSDIR}/sysutils/openipmi
+IPMI_CONFIGURE_ENABLE=		ipmi
+
+JSON_LIB_DEPENDS=		libyajl.so:${PORTSDIR}/devel/yajl
+JSON_CONFIGURE_WITH=		libyajl=${LOCALBASE}
+
+KAFKA_LIB_DEPENDS=		librdkafka.so:${PORTSDIR}/net/librdkafka
+KAFKA_CONFIGURE_ENABLE=		write_kafka
+
+LOGSTASH_CONFIGURE_ENABLE=	log_logstash
+LOGSTASH_IMPLIES=		JSON
+
+MEMCACHEC_LIB_DEPENDS=		libmemcached.so:${PORTSDIR}/databases/libmemcached
+MEMCACHEC_CONFIGURE_ENABLE=	memcachec
+MEMCACHEC_CONFIGURE_WITH=	libmemcached=${LOCALBASE}
+
+MODBUS_LIB_DEPENDS=		libmodbus.so:${PORTSDIR}/comms/libmodbus
+MODBUS_CONFIGURE_ENABLE=	modbus
+MODBUS_CONFIGURE_WITH=		libmodbus=${LOCALBASE}
+
+MONGODB_LIB_DEPENDS=		libmongoc.so:${PORTSDIR}/devel/mongo-c-driver
+MONGODB_CONFIGURE_ENABLE=	write_mongodb
+MONGODB_CONFIGURE_WITH=		libmongoc=${LOCALBASE}
+
+MYSQL_USE=			mysql=yes
+MYSQL_CONFIGURE_ENABLE=		mysql
+MYSQL_CONFIGURE_WITH=		libmysql=${LOCALBASE}
+
+NOTIFYDESKTOP_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+NOTIFYDESKTOP_CONFIGURE_ENABLE=	notify_desktop
+NOTIFYDESKTOP_CONFIGURE_WITH=	libnotify=${LOCALBASE}
+
+NOTIFYEMAIL_LIB_DEPENDS=	libesmtp.so:${PORTSDIR}/mail/libesmtp
+NOTIFYEMAIL_CONFIGURE_ENABLE=	notify_email
+NOTIFYEMAIL_CONFIGURE_WITH=	libesmtp=${LOCALBASE}
+
+NUTUPS_LIB_DEPENDS=		libupsclient.so:${PORTSDIR}/sysutils/nut
+NUTUPS_CONFIGURE_ENABLE=	nut
+NUTUPS_CONFIGURE_WITH=		upsclient=${LOCALBASE}
+
+OLSRD_CONFIGURE_ENABLE=		olsrd
+
+ONEWIRE_LIB_DEPENDS=		libow.so:${PORTSDIR}/comms/owfs
+ONEWIRE_CONFIGURE_ENABLE=	onewire
+ONEWIRE_CONFIGURE_WITH=		libowcapi=${LOCALBASE}
+
+OPENLDAP_USE=			openldap=yes
+OPENLDAP_CONFIGURE_ENABLE=	openldap
+OPENLDAP_CONFIGURE_WITH=	libldap=${LOCALBASE}
+
+PGSQL_USES=			pgsql
+PGSQL_CONFIGURE_ENABLE=		postgresql
+PGSQL_CONFIGURE_WITH=		postgresql=${LOCALBASE} libpq
+
+PINBA_LIB_DEPENDS=		libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
+PINBA_CONFIGURE_ENABLE=		pinba
+
+PING_LIB_DEPENDS=		liboping.so:${PORTSDIR}/net/liboping
+PING_CONFIGURE_ENABLE=		ping
+PING_CONFIGURE_WITH=		liboping=${LOCALBASE}
+
+RABBITMQ_LIB_DEPENDS=		librabbitmq.so:${PORTSDIR}/net/rabbitmq-c
+RABBITMQ_CONFIGURE_ENABLE=	rabbitmq
+RABBITMQ_CONFIGURE_WITH=	librabbitmq=${LOCALBASE}
+
+REDIS_LIB_DEPENDS=		libhiredis.so:${PORTSDIR}/databases/hiredis
+REDIS_CONFIGURE_ENABLE=		redis write_redis
+REDIS_CONFIGURE_WITH=		libhiredis=${LOCALBASE}
+
+RIEMANN_LIB_DEPENDS=		libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
+RIEMANN_CONFIGURE_ENABLE=	write_riemann
+
+ROUTEROS_LIB_DEPENDS=		librouteros.so:${PORTSDIR}/net/librouteros
+ROUTEROS_CONFIGURE_ENABLE=	routeros
+ROUTEROS_CONFIGURE_WITH=	librouteros=${LOCALBASE}
+
+RRDTOOL_LIB_DEPENDS=		librrd.so:${PORTSDIR}/databases/rrdtool
+RRDTOOL_CONFIGURE_ENABLE=	rrdcached rrdtool
+RRDTOOL_CONFIGURE_WITH=		librrd=${LOCALBASE}
+
+STATGRAB_LIB_DEPENDS=		libstatgrab.so:${PORTSDIR}/devel/libstatgrab
+STATGRAB_LIBS=			`pkg-config --libs libstatgrab`
+STATGRAB_CONFIGURE_ENABLE=	interface
+STATGRAB_CONFIGURE_WITH=	libstatgrab=${LOCALBASE}
+
+SIGROK_USE=			GNOME=glib20
+SIGROK_CFLAGS=			`pkg-config --cflags glib-2.0`
+SIGROK_LIB_DEPENDS=		libsigrok.so:${PORTSDIR}/devel/libsigrok
+SIGROK_CONFIGURE_ENABLE=	sigrok
+SIGROK_CONFIGURE_WITH=		libsigrok
+
+SNMP_LIB_DEPENDS=		libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+SNMP_CONFIGURE_ENABLE=		snmp
+SNMP_CONFIGURE_WITH=		libnetsnmp
+
+STATSD_CONFIGURE_ENABLE=	statsd
+
+TOKYOTYRANT_LIB_DEPENDS=	libtokyotyrant.so:${PORTSDIR}/databases/tokyotyrant
+TOKYOTYRANT_CONFIGURE_ENABLE=	tokyotyrant
+TOKYOTYRANT_CONFIGURE_WITH=	libtokyotyrant=${LOCALBASE}
+
+VARNISH_LIB_DEPENDS=		libvarnishapi.so:${PORTSDIR}/www/varnish4
+VARNISH_CONFIGURE_ENABLE=	varnish
+VARNISH_CONFIGURE_WITH=		libvarnish=${LOCALBASE}
+VARNISH_BROKEN=			fails to compile with varnish4-4.1
+
+VIRT_IMPLIES=			XML
+VIRT_LIB_DEPENDS=		libvirt.so:${PORTSDIR}/devel/libvirt
+VIRT_CONFIGURE_ENABLE=		virt
+VIRT_CONFIGURE_WITH=		virt=${LOCALBASE}
+
+XML_LIB_DEPENDS=		libxmms.so:${PORTSDIR}/multimedia/xmms
+XML_CONFIGURE_WITH=		libxml2=${LOCALBASE}
+
+XMMS_CFLAGS=			`xmms-config --cflags`
+XMMS_LIB_DEPENDS=		libxmms.so:${PORTSDIR}/multimedia/xmms
+XMMS_CONFIGURE_ENABLE=		xmms
+XMMS_CONFIGURE_WITH=		libxmms=${LOCALBASE}
+
+ZOOKEEPER_LIB_DEPENDS=		libzookeeper_mt.so:${PORTSDIR}/devel/libzookeeper
+ZOOKEEPER_CONFIGURE_ENABLE=	zookeeper
+ZOOKEEPER_CONFIGURE_WITH=	libzookeeper=${LOCALBASE}
+
 # NOTE: Plugins without external dependencies
-CONFIGURE_ARGS+=	\
-		--enable-aggregation \
+CONFIGURE_ARGS+=--enable-aggregation \
 		--enable-apcups \
 		--enable-contextswitch \
 		--enable-cpu \
@@ -160,208 +311,10 @@ CONFIGURE_ARGS+=	\
 		--enable-write_log \
 		--enable-zfs_arc \
 
-.if ${PORT_OPTIONS:MCGI}
-RUN_DEPENDS+=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-CGI>=0:${PORTSDIR}/www/p5-CGI \
-		p5-Data-Dumper>=0:${PORTSDIR}/devel/p5-Data-Dumper \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
-PLIST_SUB+=	CGI=""
-.if empty(PORT_OPTIONS:MRRDTOOL)
-IGNORE=		CGI requires RRDTOOL. Either select RRDTOOL or deselect CGI
-.endif
-.else
-PLIST_SUB+=	CGI="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
-CONFIGURE_ARGS+=--with-libcurl=${LOCALBASE} \
-		--enable-apache \
-		--enable-curl \
-		--enable-nginx \
-		--enable-write_http
-PLIST_SUB+=	CURL=""
-.else
-CONFIGURE_ARGS+=--without-libcurl \
-		--disable-apache \
-		--disable-curl \
-		--disable-nginx \
-		--disable-write_http
-PLIST_SUB+=	CURL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MCURL} && ${PORT_OPTIONS:MJSON}
-CONFIGURE_ARGS+=--enable-curl_json
-PLIST_SUB+=	CURL_JSON=""
-.else
-CONFIGURE_ARGS+=--disable-curl_json
-PLIST_SUB+=	CURL_JSON="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MCURL} && ${PORT_OPTIONS:MXML}
-CONFIGURE_ARGS+=	\
-		--enable-ascent \
-		--enable-bind \
-		--enable-curl_xml
-PLIST_SUB+=	CURL_XML=""
-.else
-CONFIGURE_ARGS+=	\
-		--disable-ascent \
-		--disable-bind \
-		--disable-curl_xml
-PLIST_SUB+=	CURL_XML="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=--enable-debug
-.else
-CONFIGURE_ARGS+=--disable-debug
-.endif
-
-.if ${PORT_OPTIONS:MDBI}
-LIB_DEPENDS+=	libdbi.so:${PORTSDIR}/databases/libdbi
-CONFIGURE_ARGS+=--with-libdbi=${LOCALBASE} --enable-dbi
-PLIST_SUB+=	DBI=""
-CFLAGS+=	-Wno-deprecated-declarations
-.else
-CONFIGURE_ARGS+=--without-libdbi --disable-dbi
-PLIST_SUB+=	DBI="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGCRYPT}
-LIB_DEPENDS+=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
-CONFIGURE_ARGS+=--with-libgcrypt=${LOCALBASE}
-LIBS+=		-lgcrypt
-.else
-CONFIGURE_ARGS+=--without-libgcrypt
-.endif
-
-.if ${PORT_OPTIONS:MIPMI}
-LIB_DEPENDS+=	libOpenIPMI.so:${PORTSDIR}/sysutils/openipmi
-CONFIGURE_ARGS+=--enable-ipmi
-PLIST_SUB+=	IPMI=""
-.else
-CONFIGURE_ARGS+=--disable-ipmi
-PLIST_SUB+=	IPMI="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MJSON}
-LIB_DEPENDS+=	libyajl.so:${PORTSDIR}/devel/yajl
-CONFIGURE_ARGS+=--with-libyajl=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--without-libyajl
-.endif
-
-.if ${PORT_OPTIONS:MKAFKA}
-LIB_DEPENDS+=	librdkafka.so:${PORTSDIR}/net/librdkafka
-CONFIGURE_ARGS+=--enable-write_kafka
-PLIST_SUB+=	KAFKA=""
-.else
-CONFIGURE_ARGS+=--disable-write_kafka
-PLIST_SUB+=	KAFKA="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MLOGSTASH}
-CONFIGURE_ARGS+=--enable-log_logstash
-PLIST_SUB+=	LOGSTASH=""
-.if empty(PORT_OPTIONS:MJSON)
-IGNORE=		LOGSTASH requires JSON. Either select JSON or deselect LOGSTASH
-.endif
-.else
-PLIST_SUB+=	LOGSTASH="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMEMCACHEC}
-LIB_DEPENDS+=	libmemcached.so:${PORTSDIR}/databases/libmemcached
-CONFIGURE_ARGS+=--with-libmemcached=${LOCALBASE} --enable-memcachec
-PLIST_SUB+=	MEMCACHEC=""
-.else
-CONFIGURE_ARGS+=--without-libmemcached
-PLIST_SUB+=	MEMCACHEC="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMODBUS}
-LIB_DEPENDS+=	libmodbus.so:${PORTSDIR}/comms/libmodbus
-CONFIGURE_ARGS+=--with-libmodbus=${LOCALBASE} --enable-modbus
-PLIST_SUB+=	MODBUS=""
-.else
-PLIST_SUB+=	MODBUS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMONGODB}
-LIB_DEPENDS+=	libmongoc.so:${PORTSDIR}/devel/mongo-c-driver
-CONFIGURE_ARGS+=--with-libmongoc=${LOCALBASE} \
-		--enable-write_mongodb
-PLIST_SUB+=	MONGODB=""
-.else
-CONFIGURE_ARGS+=--without-libcmongoc \
-		--disable-write_mongodb
-PLIST_SUB+=	MONGODB="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=	yes
-CONFIGURE_ARGS+=--with-libmysql=${LOCALBASE} --enable-mysql
-PLIST_SUB+=	MYSQL=""
-.else
-CONFIGURE_ARGS+=--without-libmysql --disable-mysql
-PLIST_SUB+=	MYSQL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNOTIFYDESKTOP}
-LIB_DEPENDS+=	libnotify.so:${PORTSDIR}/devel/libnotify
-CONFIGURE_ARGS+=--with-libnotify=${LOCALBASE} \
-		--enable-notify_desktop
-PLIST_SUB+=	NOTIFYDESKTOP=""
-.else
-CONFIGURE_ARGS+=--without-libnotify --disable-notify_desktop
-PLIST_SUB+=	NOTIFYDESKTOP="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNOTIFYEMAIL}
-LIB_DEPENDS+=	libesmtp.so:${PORTSDIR}/mail/libesmtp
-CONFIGURE_ARGS+=--with-libesmtp=${LOCALBASE} \
-		--enable-notify_email
-PLIST_SUB+=	NOTIFYEMAIL=""
-.else
-CONFIGURE_ARGS+=--without-libesmtp --disable-notify_email
-PLIST_SUB+=	NOTIFYEMAIL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNUTUPS}
-LIB_DEPENDS+=	libupsclient.so:${PORTSDIR}/sysutils/nut
-CONFIGURE_ARGS+=--with-upsclient=${LOCALBASE} --enable-nut
-PLIST_SUB+=	NUTUPS=""
-.else
-CONFIGURE_ARGS+=--without-libupsclient --disable-nut
-PLIST_SUB+=	NUTUPS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MOLSRD}
-CONFIGURE_ARGS+=--enable-olsrd
-PLIST_SUB+=	OLSRD=""
-.else
-CONFIGURE_ARGS+=--enable-olsrd
-PLIST_SUB+=	OLSRD="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MONEWIRE}
-LIB_DEPENDS+=	libow.so:${PORTSDIR}/comms/owfs
-CONFIGURE_ARGS+=--with-libowcapi=${LOCALBASE} --enable-onewire
-PLIST_SUB+=	ONEWIRE=""
-.else
-CONFIGURE_ARGS+=--disable-onewire
-PLIST_SUB+=	ONEWIRE="@comment "
-.endif
+INSTALL_TARGET=	install-strip
+SHEBANG_FILES=	contrib/collection.cgi
 
-.if ${PORT_OPTIONS:MOPENLDAP}
-USE_OPENLDAP=	yes
-CONFIGURE_ARGS+=--with-libldap=${LOCALBASE} --enable-openldap
-PLIST_SUB+=	OPENLDAP=""
-.else
-CONFIGURE_ARGS+=--disable-openldap
-PLIST_SUB+=	OPENLDAP="@comment "
-.endif
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPERL}
 USES+=		perl5
@@ -372,33 +325,6 @@ CONFIGURE_ARGS+=--without-perl --without-perl-bindings --disable-perl
 PLIST_SUB+=	PERL="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MPGSQL}
-USES+=		pgsql
-CONFIGURE_ARGS+=--with-postgresql=${LOCALBASE} --enable-postgresql --with-libpq
-PLIST_SUB+=	PGSQL=""
-.else
-CONFIGURE_ARGS+=--without-postgresql --disable-postgresql --without-libpq
-PLIST_SUB+=	PGSQL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPINBA}
-LIB_DEPENDS+=	libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
-CONFIGURE_ARGS+=--enable-pinba
-PLIST_SUB+=	PINBA=""
-.else
-CONFIGURE_ARGS+=--disable-pinba
-PLIST_SUB+=	PINBA="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPING}
-LIB_DEPENDS+=	liboping.so:${PORTSDIR}/net/liboping
-CONFIGURE_ARGS+=--with-liboping=${LOCALBASE} --enable-ping
-PLIST_SUB+=	PING=""
-.else
-CONFIGURE_ARGS+=--without-liboping --disable-ping
-PLIST_SUB+=	PING="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MPYTHON}
 USES+=		python:2
 CONFIGURE_ARGS+=--with-python=${PYTHON_CMD} --enable-python
@@ -408,157 +334,6 @@ CONFIGURE_ARGS+=--without-python --disable-python
 PLIST_SUB+=	PYTHON="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MRABBITMQ}
-LIB_DEPENDS+=	librabbitmq.so:${PORTSDIR}/net/rabbitmq-c
-CONFIGURE_ARGS+=--with-librabbitmq=${LOCALBASE} \
-		--enable-rabbitmq
-PLIST_SUB+=	RABBITMQ=""
-.else
-CONFIGURE_ARGS+=--without-librabbitmq \
-		--disable-rabbitmq
-PLIST_SUB+=	RABBITMQ="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MREDIS}
-LIB_DEPENDS+=	libhiredis.so:${PORTSDIR}/databases/hiredis
-CONFIGURE_ARGS+=--with-libhiredis=${LOCALBASE} \
-		--enable-redis \
-		--enable-write_redis
-PLIST_SUB+=	REDIS=""
-.else
-CONFIGURE_ARGS+=--without-libcredis \
-		--disable-redis \
-		--disable-write_redis
-PLIST_SUB+=	REDIS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MRIEMANN}
-LIB_DEPENDS+=	libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
-CONFIGURE_ARGS+=--enable-write_riemann
-PLIST_SUB+=	RIEMANN=""
-.else
-CONFIGURE_ARGS+=--disable-write_riemann
-PLIST_SUB+=	RIEMANN="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MROUTEROS}
-LIB_DEPENDS+=	librouteros.so:${PORTSDIR}/net/librouteros
-CONFIGURE_ARGS+=--with-librouteros=${LOCALBASE} --enable-routeros
-PLIST_SUB+=	ROUTEROS=""
-.else
-CONFIGURE_ARGS+=--without-librouteros --disable-routeros
-PLIST_SUB+=	ROUTEROS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MRRDTOOL}
-LIB_DEPENDS+=	librrd.so:${PORTSDIR}/databases/rrdtool
-CONFIGURE_ARGS+=--with-librrd=${LOCALBASE} \
-		--enable-rrdcached \
-		--enable-rrdtool
-PLIST_SUB+=	RRDTOOL=""
-.else
-CONFIGURE_ARGS+=--without-librrd \
-		--disable-rrdcached \
-		--disable-rrdtool
-PLIST_SUB+=	RRDTOOL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSTATGRAB}
-LIB_DEPENDS+=	libstatgrab.so:${PORTSDIR}/devel/libstatgrab
-LIBS+=		`pkg-config --libs libstatgrab`
-CONFIGURE_ARGS+=--with-libstatgrab=${LOCALBASE} \
-		--enable-interface
-PLIST_SUB+=	STATGRAB=""
-.else
-CONFIGURE_ARGS+=--without-libstatgrab
-PLIST_SUB+=	STATGRAB="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSIGROK}
-USE_GNOME+=	glib20
-LIB_DEPENDS+=	libsigrok.so:${PORTSDIR}/devel/libsigrok
-CONFIGURE_ARGS+=--with-libsigrok --enable-sigrok
-CFLAGS+=	`pkg-config --cflags glib-2.0`
-PLIST_SUB+=	SIGROK=""
-.else
-CONFIGURE_ARGS+=--disable-sigrok
-PLIST_SUB+=	SIGROK="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSNMP}
-LIB_DEPENDS+=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
-CONFIGURE_ARGS+=--with-libnetsnmp --enable-snmp
-PLIST_SUB+=	SNMP=""
-.else
-CONFIGURE_ARGS+=--without-libnetsnmp
-PLIST_SUB+=	SNMP="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSTATSD}
-CONFIGURE_ARGS+=--enable-statsd
-PLIST_SUB+=	STATSD=""
-.else
-CONFIGURE_ARGS+=--disable-statsd
-PLIST_SUB+=	STATSD="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MTOKYOTYRANT}
-LIB_DEPENDS+=	libtokyotyrant.so:${PORTSDIR}/databases/tokyotyrant
-CONFIGURE_ARGS+=--with-libtokyotyrant=${LOCALBASE} --enable-tokyotyrant
-PLIST_SUB+=	TOKYOTYRANT=""
-.else
-CONFIGURE_ARGS+=--without-libtokyotyrant --disable-tokyotyrant
-PLIST_SUB+=	TOKYOTYRANT="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MVARNISH}
-LIB_DEPENDS+=	libvarnishapi.so:${PORTSDIR}/www/varnish4
-CONFIGURE_ARGS+=--with-libvarnish=${LOCALBASE} --enable-varnish
-PLIST_SUB+=	VARNISH=""
-.else
-CONFIGURE_ARGS+=--without-libvarnish
-PLIST_SUB+=	VARNISH="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MVIRT}
-.if empty(PORT_OPTIONS:MXML)
-IGNORE=		VIRT requires XML. Either select XML or deselect VIRT.
-.endif
-LIB_DEPENDS+=	libvirt.so:${PORTSDIR}/devel/libvirt
-CONFIGURE_ARGS+=--enable-virt
-PLIST_SUB+=	VIRT=""
-.else
-CONFIGURE_ARGS+=--without-virt --disable-virt
-PLIST_SUB+=	VIRT="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MXML}
-LIB_DEPENDS+=	libxml2.so:${PORTSDIR}/textproc/libxml2
-CONFIGURE_ARGS+=--with-libxml2=${LOCALBASE}
-.endif
-
-.if ${PORT_OPTIONS:MXMMS}
-LIB_DEPENDS+=	libxmms.so:${PORTSDIR}/multimedia/xmms
-CONFIGURE_ARGS+=--with-libxmms=${LOCALBASE} --enable-xmms
-CFLAGS+=	`xmms-config --cflags`
-PLIST_SUB+=	XMMS=""
-.else
-CONFIGURE_ARGS+=--without-libxmms --disable-xmms
-PLIST_SUB+=	XMMS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MZOOKEEPER}
-LIB_DEPENDS+=	libzookeeper_mt.so:${PORTSDIR}/devel/libzookeeper
-CONFIGURE_ARGS+=--with-libzookeeper=${LOCALBASE} --enable-zookeeper
-PLIST_SUB+=	ZOOKEEPER=""
-.else
-CONFIGURE_ARGS+=--without-libzookeeper --disable-zookeeper
-PLIST_SUB+=	ZOOKEEPER="@comment "
-.endif
-
-INSTALL_TARGET=install-strip
-SHEBANG_FILES=	contrib/collection.cgi
-
 post-patch:
 	@${REINPLACE_CMD} 's/-Werror//' \
 		${WRKSRC}/configure.ac ${WRKSRC}/src/Makefile.am \
@@ -578,12 +353,12 @@ post-patch:
 		${WRKSRC}/contrib/collection.conf
 
 post-install:
-	@${MKDIR} ${STAGEDIR}/var/db/collectd
-.if ${PORT_OPTIONS:MCGI}
-	@${MKDIR} ${STAGEDIR}${WWWDIR}
+	${MKDIR} ${STAGEDIR}/var/db/collectd
+
+post-install-CGI-on:
+	${MKDIR} ${STAGEDIR}${WWWDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/collection.cgi ${STAGEDIR}${WWWDIR}/
 	${INSTALL_DATA} ${WRKSRC}/contrib/collection.conf \
 		${STAGEDIR}${WWWDIR}/collection.conf.sample
-.endif
 
 .include <bsd.port.mk>