Index: head/net-mgmt/collectd5/Makefile
===================================================================
--- head/net-mgmt/collectd5/Makefile	(revision 394252)
+++ head/net-mgmt/collectd5/Makefile	(revision 394253)
@@ -1,588 +1,589 @@
 # Created by: Matt Peterson <matt@peterson.org>
 # $FreeBSD$
 
 PORTNAME=	collectd
 PORTVERSION=	5.5.0
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://collectd.org/files/ \
 		http://collectd.org/files/
 PKGNAMESUFFIX=	5
 
 MAINTAINER=	ports@bsdserwis.com
 COMMENT=	Systems & network statistics collection daemon
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 # Only autoreconf stage and sigrok plugin need GLIB:
 BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/glib-2.0.m4:${PORTSDIR}/devel/glib20
 LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
 
 USES=		autoreconf gmake libtool pkgconfig shebangfix tar:bzip2
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=		CGI DEBUG GCRYPT LOGSTASH VIRT
 OPTIONS_GROUP=		INPUT OUTPUT
 OPTIONS_GROUP_OUTPUT=	RRDTOOL NOTIFYEMAIL NOTIFYDESKTOP RIEMANN
 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
 
 CGI_DESC=		Install collection.cgi (requires rrdtool)
 CURL_DESC=		Enable curl-based plugins (apache, nginx, etc)
 DEBUG_DESC=		Enable debugging
 DBI_DESC=		Enable dbi plugin
 GCRYPT_DESC=		Build with libgcrypt
 IPMI_DESC=		Enable OpenIPMI plugin
 JSON_DESC=		Enable JSON plugins
 LOGSTASH_DESC=		Enable log_logstash plugin (requires json)
 MEMCACHEC_DESC=		Enable memcachec plugin
 MODBUS_DESC=		Enable modbus plugin
 MONGODB_DESC=		Enable MongoDB-based plugins
 MYSQL_DESC=		Enable mysql-based plugins
 NOTIFYEMAIL_DESC=	Enable notifications via email
 NOTIFYDESKTOP_DESC=	Enable desktop notifications
 NUTUPS_DESC=		Enable nut (ups) plugin
 OLSRD_DESC=		Enable olsrd plugin
 ONEWIRE_DESC=		Eanble onewire plugin (via owfs)
 OPENLDAP_DESC=		Enable OpenLDAP plugin
 PERL_DESC=		Enable libperl plugin and binding
 PGSQL_DESC=		Enable postgresql-based plugins
 PINBA_DESC=		Enable pinba plugin (via protobuf-c)
 PING_DESC=		Enable ping plugin
 PYTHON_DESC=		Enable python-based plugins
 RABBITMQ_DESC=		Enable rabbitmq-based plugins
 REDIS_DESC=		Enable redis-based plugins
 RIEMANN_DESC=		Enable write_riemann plugin (via protobuf-c)
 ROUTEROS_DESC=		Enable routeros plugin
 RRDTOOL_DESC=		Enable rrdtool plugin (also rrdcached plugin)
 SIGROK_DESC=		Enable sigrok plugin
 SNMP_DESC=		Enable SNMP plugin
-STATGRAB_DESC=		Enable statgrab-based plugins (disk, interface, etc)
+STATGRAB_DESC=		Enable statgrab-based plugins (interface, etc)
 STATSD_DESC=		Enable statsd plugin
 TOKYOTYRANT_DESC=	Enable tokyotyrant plugin
 VARNISH_DESC=		Enable varnish 4.x cache statistics
 VIRT_DESC=		Enable libvirt plugin (requires XML)
 XML_DESC=		Enable XML plugins
 XMMS_DESC=		Enable xmms plugin
 ZOOKEEPER_DESC=		Enable zookeeper plugin
 
 USE_RC_SUBR=	collectd collectdmon
 
 USE_LDCONFIG=	yes
 
 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 \
 		--disable-static \
 		--without-amqp \
 		--without-java \
 		--without-libaquaero5 \
 		--without-libganglia \
 		--without-libiptc \
 		--without-libjvm \
 		--without-liblvm2app \
 		--without-libkstat \
 		--without-libldap \
 		--without-libmnl \
 		--without-libmodbus \
 		--without-libnetlink \
 		--without-libnetapp \
 		--without-libowcapi \
 		--without-libperfstat \
 		--without-librdkafka \
 		--without-libsensors \
 		--without-libvarnish \
 		--without-lvm \
 		--without-mic \
 		--without-oracle \
 		--disable-turbostat
 
 # NOTE: Plugins without external dependencies
 CONFIGURE_ARGS+=	\
 		--enable-aggregation \
 		--enable-apcups \
 		--enable-contextswitch \
 		--enable-cpu \
 		--enable-csv \
 		--enable-df \
+		--enable-disk \
 		--enable-dns \
 		--enable-email \
 		--enable-exec \
 		--enable-fhcount \
 		--enable-filecount \
 		--enable-load \
 		--enable-logfile \
 		--enable-match_empty_counter \
 		--enable-match_hashed \
 		--enable-match_regex \
 		--enable-match_timediff \
 		--enable-match_value \
 		--enable-mbmon \
 		--enable-memcached \
 		--enable-memory \
 		--enable-network \
 		--enable-ntpd \
 		--enable-openvpn \
 		--enable-powerdns \
 		--enable-pf \
 		--enable-processes \
 		--enable-statsd \
 		--enable-swap \
 		--enable-syslog \
 		--enable-table \
 		--enable-tail \
 		--enable-tail_csv \
 		--enable-target_notification \
 		--enable-target_replace \
 		--enable-target_scale \
 		--enable-target_set \
 		--enable-target_v5upgrade \
 		--enable-tcpconns \
 		--enable-teamspeak2 \
 		--enable-ted \
 		--enable-threshold \
 		--enable-unixsock \
 		--enable-uptime \
 		--enable-uuid \
 		--enable-write_graphite \
 		--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: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
 
 .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
 
 .if ${PORT_OPTIONS:MPERL}
 USES+=		perl5
 CONFIGURE_ARGS+=--with-perl=${PERL} --with-perl-bindings --enable-perl
 PLIST_SUB+=	PERL=""
 .else
 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
 PLIST_SUB+=	PYTHON=""
 .else
 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-disk \
 		--enable-interface
 PLIST_SUB+=	STATGRAB=""
 .else
 CONFIGURE_ARGS+=--without-libstatgrab
 PLIST_SUB+=	STATGRAB="@comment "
 .endif
 
 .if ${OSVERSION} >= 900007
 CONFIGURE_ARGS+=--enable-users
 PLIST_SUB+=	USERS=""
 .elif ${PORT_OPTIONS:MSTATGRAB}
 CONFIGURE_ARGS+=--enable-users
 PLIST_SUB+=	USERS=""
 .else
 PLIST_SUB+=	USERS="@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 \
 		${WRKSRC}/src/libcollectdclient/Makefile.am
 	@${REINPLACE_CMD} \
 		-e 's;@prefix@/var/;/var/;' \
 		-e 's;/var/lib/;/var/db/;' \
 		-e 's;@localstatedir@/lib/;/var/db/;' \
 		${WRKSRC}/src/collectd.conf.in \
 		${WRKSRC}/src/collectd.conf.5
 	@${REINPLACE_CMD} \
 		-e 's;/etc/collection\.conf;${WWWDIR}/collection.conf;' \
 		${WRKSRC}/contrib/collection.cgi
 	@${REINPLACE_CMD} \
 		-e 's;/opt/collectd/var/lib;/var/db;' \
 		-e 's;/opt/collectd/lib;${PREFIX}/lib;' \
 		${WRKSRC}/contrib/collection.conf
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/db/collectd
 .if ${PORT_OPTIONS:MCGI}
 	@${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>
Index: head/net-mgmt/collectd5/files/patch-configure.ac
===================================================================
--- head/net-mgmt/collectd5/files/patch-configure.ac	(revision 394252)
+++ head/net-mgmt/collectd5/files/patch-configure.ac	(revision 394253)
@@ -1,48 +1,110 @@
---- configure.ac.orig	2015-02-26 11:49:16 UTC
+--- configure.ac.orig	2015-05-27 07:51:35 UTC
 +++ configure.ac
 @@ -120,7 +120,7 @@ then
  fi
  
  # Where to install .pc files.
 -pkgconfigdir="${libdir}/pkgconfig"
 +pkgconfigdir="${prefix}/libdata/pkgconfig"
  AC_SUBST(pkgconfigdir)
  
  # Check for standards compliance mode
+@@ -641,7 +641,7 @@ SAVE_CFLAGS="$CFLAGS"
+ # Emulate behavior of src/Makefile.am
+ if test "x$GCC" = "xyes"
+ then
+-	CFLAGS="$CFLAGS -Wall -Werror"
++	CFLAGS="$CFLAGS -Wall "
+ fi
+ 
+ AC_CACHE_CHECK([for strtok_r],
+@@ -770,7 +770,7 @@ AC_CHECK_FUNCS(getutxent, [have_getutxen
+ if test "x$GCC" = "xyes"
+ then
+ 	SAVE_CFLAGS="$CFLAGS"
+-	CFLAGS="$CFLAGS -Wall -Wextra -Werror"
++	CFLAGS="$CFLAGS -Wall -Wextra "
+ fi
+ 
+ AC_CHECK_FUNCS(strptime, [have_strptime="yes"], [have_strptime="no"])
 @@ -1495,6 +1495,7 @@ if test "x$with_kstat" = "xyes"
  then
  	AC_CHECK_LIB(kstat, kstat_open, [with_kstat="yes"], [with_kstat="no (libkstat not found)"], [])
  fi
 +
  if test "x$with_kstat" = "xyes"
  then
  	AC_CHECK_LIB(devinfo, di_init, [with_devinfo="yes"], [with_devinfo="no (not found)"], [])
 @@ -1504,6 +1505,8 @@ if test "x$with_kstat" = "xyes"
  then
  	AC_DEFINE(HAVE_LIBKSTAT, 1,
  		  [Define to 1 if you have the 'kstat' library (-lkstat)])
 +	BUILD_WITH_LIBKSTAT_LIBS="-lkstat"
 +	AC_SUBST(BUILD_WITH_LIBKSTAT_LIBS)
  fi
  AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" = "xyes")
  AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes")
+@@ -3346,7 +3349,7 @@ then
+ 	SAVE_LIBS="$LIBS"
+ 	# trigger an error if Perl_load_module*() uses __attribute__nonnull__(3)
+ 	# (see issues #41 and #42)
+-	CFLAGS="$CFLAGS $PERL_CFLAGS -Wall -Werror"
++	CFLAGS="$CFLAGS $PERL_CFLAGS -Wall "
+ 	LIBS="$LIBS $PERL_LIBS"
+ 
+ 	AC_CACHE_CHECK([for broken Perl_load_module()],
+@@ -3576,7 +3579,7 @@ fi
+ if test "x$with_python" = "xyes"
+ then
+ 	AC_MSG_CHECKING([for Python CPPFLAGS])
+-	python_include_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_python_inc())" | "$with_python_prog" 2>&1`
++	python_include_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_python_inc())" | "$with_python_prog" 2>/dev/null`
+ 	python_config_status=$?
+ 
+ 	if test "$python_config_status" -ne 0 || test "x$python_include_path" = "x"
+@@ -3599,7 +3602,7 @@ fi
+ if test "x$with_python" = "xyes"
+ then
+ 	AC_MSG_CHECKING([for Python LDFLAGS])
+-	python_library_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0))" | "$with_python_prog" 2>&1`
++	python_library_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0))" | "$with_python_prog" 2>/dev/null`
+ 	python_config_status=$?
+ 
+ 	if test "$python_config_status" -ne 0 || test "x$python_library_path" = "x"
+@@ -3614,7 +3617,7 @@ fi
+ if test "x$with_python" = "xyes"
+ then
+ 	AC_MSG_CHECKING([for Python LIBS])
+-	python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" | "$with_python_prog" 2>&1`
++	python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" | "$with_python_prog" 2>/dev/null`
+ 	python_config_status=$?
+ 
+ 	if test "$python_config_status" -ne 0 || test "x$python_library_flags" = "x"
 @@ -3629,7 +3632,7 @@ fi
  if test "x$with_python" = "xyes"
  then
  	LDFLAGS="-L$python_library_path $LDFLAGS"
 -	LIBS="$python_library_flags $LIBS"
 +	LIBS="$python_library_flags $LIBS -lm -lpthread -lutil"
  
  	AC_CHECK_FUNC(PyObject_CallFunction,
  		      [with_python="yes"],
 @@ -4692,8 +4695,8 @@ AC_ARG_WITH(libvarnish, [AS_HELP_STRING(
  	else if test -d "$with_libvarnish/lib"
  	then
  		AC_MSG_NOTICE([Not checking for libvarnish: Manually configured])
 -		with_libvarnish_cflags="-I$withval/include"
 -		with_libvarnish_libs="-L$withval/lib -lvarnishapi"
 +		with_libvarnish_cflags="-I$withval/include/varnish"
 +		with_libvarnish_libs="-L$withval/lib/varnish -lvarnishapi"
  		with_libvarnish="yes"
  	fi; fi; fi
  ],
+@@ -5263,6 +5266,7 @@ fi
+ 
+ if test "x$ac_system" = "xFreeBSD"
+ then
++	plugin_disk="yes"
+         plugin_zfs_arc="yes"
+ fi
+ 
Index: head/net-mgmt/collectd5/files/patch-src__Makefile.am
===================================================================
--- head/net-mgmt/collectd5/files/patch-src__Makefile.am	(revision 394252)
+++ head/net-mgmt/collectd5/files/patch-src__Makefile.am	(revision 394253)
@@ -1,97 +1,115 @@
 --- src/Makefile.am.orig	2015-05-26 19:38:14 UTC
 +++ src/Makefile.am
-@@ -14,7 +14,7 @@ AM_CPPFLAGS = -I$(srcdir)/daemon
+@@ -7,14 +7,14 @@ SUBDIRS += daemon
+ PLUGIN_LDFLAGS = -module -avoid-version -export-symbols-regex '\<module_register\>'
+ 
+ if COMPILER_IS_GCC
+-AM_CFLAGS = -Wall -Werror
++AM_CFLAGS = -Wall 
+ endif
+ 
+ AM_CPPFLAGS = -I$(srcdir)/daemon
  AM_CPPFLAGS += -DPREFIX='"${prefix}"'
  AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"'
  AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"'
 -AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"'
 +AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/db/${PACKAGE_NAME}"'
  if BUILD_FEATURE_DAEMON
  AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
  endif
 @@ -218,7 +218,7 @@ cpu_la_CFLAGS = $(AM_CFLAGS)
  cpu_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  cpu_la_LIBADD =
  if BUILD_WITH_LIBKSTAT
 -cpu_la_LIBADD += -lkstat
 +cpu_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)
  endif
  if BUILD_WITH_LIBDEVINFO
  cpu_la_LIBADD += -ldevinfo
 @@ -303,7 +303,7 @@ disk_la_CFLAGS = $(AM_CFLAGS)
  disk_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  disk_la_LIBADD =
  if BUILD_WITH_LIBKSTAT
 -disk_la_LIBADD += -lkstat
 +disk_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)
  endif
  if BUILD_WITH_LIBDEVINFO
  disk_la_LIBADD += -ldevinfo
-@@ -408,7 +408,7 @@ interface_la_CFLAGS += $(BUILD_WITH_LIBS
+@@ -321,6 +321,9 @@ endif
+ if BUILD_WITH_PERFSTAT
+ disk_la_LIBADD += -lperfstat
+ endif
++if BUILD_FREEBSD
++disk_la_LIBADD += -ldevstat -lgeom
++endif
+ endif
+ 
+ if BUILD_PLUGIN_DNS
+@@ -408,7 +411,7 @@ interface_la_CFLAGS += $(BUILD_WITH_LIBS
  interface_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
  else
  if BUILD_WITH_LIBKSTAT
 -interface_la_LIBADD += -lkstat
 +interface_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)
  endif
  if BUILD_WITH_LIBDEVINFO
  interface_la_LIBADD += -ldevinfo
-@@ -591,7 +591,7 @@ memory_la_CFLAGS = $(AM_CFLAGS)
+@@ -591,7 +594,7 @@ memory_la_CFLAGS = $(AM_CFLAGS)
  memory_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  memory_la_LIBADD =
  if BUILD_WITH_LIBKSTAT
 -memory_la_LIBADD += -lkstat
 +memory_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)
  endif
  if BUILD_WITH_LIBDEVINFO
  memory_la_LIBADD += -ldevinfo
-@@ -964,7 +964,7 @@ swap_la_CFLAGS = $(AM_CFLAGS)
+@@ -964,7 +967,7 @@ swap_la_CFLAGS = $(AM_CFLAGS)
  swap_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  swap_la_LIBADD =
  if BUILD_WITH_LIBKSTAT
 -swap_la_LIBADD += -lkstat
 +swap_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)
  endif
  if BUILD_WITH_LIBDEVINFO
  swap_la_LIBADD += -ldevinfo
-@@ -1010,7 +1010,7 @@ if BUILD_PLUGIN_TAPE
+@@ -1010,7 +1013,7 @@ if BUILD_PLUGIN_TAPE
  pkglib_LTLIBRARIES += tape.la
  tape_la_SOURCES = tape.c
  tape_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -tape_la_LIBADD = -lkstat -ldevinfo
 +tape_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS) -ldevinfo
  endif
  
  if BUILD_PLUGIN_TARGET_NOTIFICATION
-@@ -1116,7 +1116,7 @@ uptime_la_CFLAGS = $(AM_CFLAGS)
+@@ -1116,7 +1119,7 @@ uptime_la_CFLAGS = $(AM_CFLAGS)
  uptime_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  uptime_la_LIBADD =
  if BUILD_WITH_LIBKSTAT
 -uptime_la_LIBADD += -lkstat
 +uptime_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)
  endif
  if BUILD_WITH_PERFSTAT
  uptime_la_LIBADD += -lperfstat
-@@ -1275,7 +1275,7 @@ if BUILD_LINUX
+@@ -1275,7 +1278,7 @@ if BUILD_LINUX
  # zfs_arc requires no library on linux
  else
  # solaris
 -zfs_arc_la_LIBADD = -lkstat
 +zfs_arc_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS)
  endif
  endif
  endif
-@@ -1364,12 +1364,7 @@ endif
+@@ -1364,12 +1367,7 @@ endif
  
  install-exec-hook:
  	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
 -	if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \
 -	then \
 -		$(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \
 -	else \
 -		$(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \
 -	fi; \
 +	$(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.sample
  	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
  	$(INSTALL) -m 0644 $(srcdir)/types.db $(DESTDIR)$(pkgdatadir)/types.db;
  	$(INSTALL) -m 0644 $(srcdir)/postgresql_default.conf \
Index: head/net-mgmt/collectd5/pkg-plist
===================================================================
--- head/net-mgmt/collectd5/pkg-plist	(revision 394252)
+++ head/net-mgmt/collectd5/pkg-plist	(revision 394253)
@@ -1,128 +1,128 @@
 sbin/collectd
 sbin/collectdmon
 @sample etc/collectd.conf.sample
 %%CGI%%%%WWWDIR%%/collection.cgi
 %%CGI%%@sample %%WWWDIR%%/collection.conf.sample
 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
 lib/libcollectdclient.so
 lib/libcollectdclient.so.1
 lib/libcollectdclient.so.1.0.0
 lib/collectd/aggregation.so
 %%CURL%%lib/collectd/apache.so
 lib/collectd/apcups.so
 %%CURL_XML%%lib/collectd/ascent.so
 %%CURL_XML%%lib/collectd/bind.so
 lib/collectd/contextswitch.so
 lib/collectd/cpu.so
 lib/collectd/csv.so
 %%CURL%%lib/collectd/curl.so
 %%CURL_JSON%%lib/collectd/curl_json.so
 %%CURL_XML%%lib/collectd/curl_xml.so
 %%DBI%%lib/collectd/dbi.so
 lib/collectd/df.so
-%%STATGRAB%%lib/collectd/disk.so
+lib/collectd/disk.so
 lib/collectd/dns.so
 lib/collectd/email.so
 lib/collectd/exec.so
 lib/collectd/fhcount.so
 lib/collectd/filecount.so
 %%STATGRAB%%lib/collectd/interface.so
 %%IPMI%%lib/collectd/ipmi.so
 lib/collectd/load.so
 %%LOGSTASH%%lib/collectd/log_logstash.so
 lib/collectd/logfile.so
 lib/collectd/match_empty_counter.so
 lib/collectd/match_hashed.so
 lib/collectd/match_regex.so
 lib/collectd/match_timediff.so
 lib/collectd/match_value.so
 lib/collectd/mbmon.so
 %%MEMCACHEC%%lib/collectd/memcachec.so
 lib/collectd/memcached.so
 lib/collectd/memory.so
 %%MODBUS%%lib/collectd/modbus.so
 %%MYSQL%%lib/collectd/mysql.so
 lib/collectd/network.so
 %%CURL%%lib/collectd/nginx.so
 %%NOTIFYDESKTOP%%lib/collectd/notify_desktop.so
 %%NOTIFYEMAIL%%lib/collectd/notify_email.so
 lib/collectd/ntpd.so
 %%NUTUPS%%lib/collectd/nut.so
 %%OLSRD%%lib/collectd/olsrd.so
 %%ONEWIRE%%lib/collectd/onewire.so
 %%OPENLDAP%%lib/collectd/openldap.so
 lib/collectd/openvpn.so
 %%PERL%%lib/collectd/perl.so
 lib/collectd/pf.so
 %%PINBA%%lib/collectd/pinba.so
 %%PING%%lib/collectd/ping.so
 %%PGSQL%%lib/collectd/postgresql.so
 lib/collectd/powerdns.so
 lib/collectd/processes.so
 %%PYTHON%%lib/collectd/python.so
 %%REDIS%%lib/collectd/redis.so
 %%ROUTEROS%%lib/collectd/routeros.so
 %%RRDTOOL%%lib/collectd/rrdcached.so
 %%RRDTOOL%%lib/collectd/rrdtool.so
 %%SIGROK%%lib/collectd/sigrok.so
 %%SNMP%%lib/collectd/snmp.so
 %%STATSD%%lib/collectd/statsd.so
 lib/collectd/swap.so
 lib/collectd/syslog.so
 lib/collectd/table.so
 lib/collectd/tail.so
 lib/collectd/tail_csv.so
 lib/collectd/target_notification.so
 lib/collectd/target_replace.so
 lib/collectd/target_scale.so
 lib/collectd/target_set.so
 lib/collectd/target_v5upgrade.so
 lib/collectd/tcpconns.so
 lib/collectd/teamspeak2.so
 lib/collectd/ted.so
 lib/collectd/threshold.so
 %%TOKYOTYRANT%%lib/collectd/tokyotyrant.so
 lib/collectd/unixsock.so
 lib/collectd/uptime.so
 %%USERS%%lib/collectd/users.so
 lib/collectd/uuid.so
 %%VARNISH%%lib/collectd/varnish.so
 %%VIRT%%lib/collectd/virt.so
 lib/collectd/write_graphite.so
 %%CURL%%lib/collectd/write_http.so
 lib/collectd/write_log.so
 %%MONGODB%%lib/collectd/write_mongodb.so
 %%REDIS%%lib/collectd/write_redis.so
 %%RIEMANN%%lib/collectd/write_riemann.so
 %%XMMS%%lib/collectd/xmms.so
 lib/collectd/zfs_arc.so
 %%ZOOKEEPER%%lib/collectd/zookeeper.so
 libdata/pkgconfig/libcollectdclient.pc
 %%DATADIR%%/postgresql_default.conf
 %%DATADIR%%/types.db
 %%PERL%%%%PERL5_MAN3%%/Collectd::Unixsock.3.gz
 %%PERL%%%%SITE_PERL%%/Collectd/Plugins/OpenVZ.pm
 %%PERL%%%%SITE_PERL%%/Collectd.pm
 %%PERL%%%%SITE_PERL%%/Collectd/Unixsock.pm
 man/man1/collectd-nagios.1.gz
 man/man1/collectd-tg.1.gz
 man/man1/collectd.1.gz
 man/man1/collectdctl.1.gz
 man/man1/collectdmon.1.gz
 man/man5/collectd-email.5.gz
 man/man5/collectd-exec.5.gz
 man/man5/collectd-java.5.gz
 man/man5/collectd-perl.5.gz
 man/man5/collectd-python.5.gz
 man/man5/collectd-snmp.5.gz
 man/man5/collectd-threshold.5.gz
 man/man5/collectd-unixsock.5.gz
 man/man5/collectd.conf.5.gz
 man/man5/types.db.5.gz
 @dir /var/db/collectd