16 files changed, 0 insertions, 1142 deletions

diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile
index e68c8698c1e2..5edaec643a53 100644
--- a/net-mgmt/Makefile
+++ b/net-mgmt/Makefile
@@ -39,7 +39,6 @@
     SUBDIR += ciscoconf
     SUBDIR += clog
     SUBDIR += cnagios
-    SUBDIR += collectd
     SUBDIR += collectd5
     SUBDIR += confregdecode
     SUBDIR += coovachilli
diff --git a/net-mgmt/collectd/Makefile b/net-mgmt/collectd/Makefile
deleted file mode 100644
index 59bb4a222258..000000000000
--- a/net-mgmt/collectd/Makefile
+++ /dev/null
@@ -1,469 +0,0 @@
-# Created by: Matt Peterson <matt@peterson.org>
-# $FreeBSD$
-
-PORTNAME=	collectd
-PORTVERSION=	4.10.9
-PORTREVISION=	21
-CATEGORIES=	net-mgmt
-MASTER_SITES=	http://collectd.org/files/
-
-MAINTAINER=	ports@bsdserwis.com
-COMMENT=	Systems & network statistics collection daemon
-
-LICENSE=	GPLv2
-
-DEPRECATED=		Please move to collectd5 - collect4 is not developed/patched
-EXPIRATION_DATE=	2015-10-31
-
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
-
-GNU_CONFIGURE=	yes
-USES=		autoreconf gmake libtool shebangfix
-INSTALL_TARGET=	install-strip
-
-OPTIONS_DEFINE=		CGI BIND DEBUG GCRYPT LIBVIRT
-OPTIONS_GROUP=		INPUT OUTPUT
-OPTIONS_GROUP_OUTPUT=	RRDTOOL RRDCACHED WRITE_HTTP NOTIFYEMAIL NOTIFYDESKTOP
-OPTIONS_GROUP_INPUT=	APACHE APCUPS CURL CURL_JSON CURL_XML DBI DISK \
-			NUTUPS INTERFACE MBMON MEMCACHED MYSQL NGINX \
-			OPENVPN PDNS PGSQL PING PYTHON ROUTEROS SNMP \
-			TOKYOTYRANT XMMS
-OPTIONS_DEFAULT=	INTERFACE PING SNMP RRDTOOL RRDCACHED
-
-CGI_DESC=		Install collection.cgi (requires RRDTOOL)
-BIND_DESC=		Enable BIND 9.5+ statistics
-# INPUT
-APACHE_DESC=		Apache mod_status (libcurl)
-APCUPS_DESC=		APC UPS (apcupsd)
-CURL_DESC=		CURL generic web statistics
-CURL_JSON_DESC=		CURL JSON generic web statistics
-CURL_XML_DESC=		CURL XML generic web statistics
-DBI_DESC=		database abstraction library
-DISK_DESC=		Disk performance statistics
-NUTUPS_DESC=		NUT UPS daemon
-INTERFACE_DESC=		Network interfaces (libstatgrab)
-MBMON_DESC=		MBMon
-MEMCACHED_DESC=		Memcached
-NGINX_DESC=		Nginx
-NOTIFYEMAIL_DESC=	Email notifications (libesmtp)
-NOTIFYDESKTOP_DESC=	Email notifications (libnotify)
-OPENVPN_DESC=		OpenVPN statistics
-PDNS_DESC=		PowerDNS
-PING_DESC=		Network latency (liboping)
-ROUTEROS_DESC=		RouterOS plugin
-TOKYOTYRANT_DESC=	Tokyotyrant database
-XMMS_DESC=		XMMS
-# OUTPUT
-RRDTOOL_DESC=		RRDTool
-RRDCACHED_DESC=		RRDTool Cached (require RRDTOOL)
-WRITE_HTTP_DESC=	write_http
-
-USE_RC_SUBR=	collectd collectdmon
-
-USE_LDCONFIG=	yes
-
-CONFLICTS=	collectd-5.[0-9]*
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
-
-.include <bsd.port.options.mk>
-
-# NOTE: Feel free to submit patches adding support for any of these
-#       disabled plugins.  If a plugin requires external dependencies,
-#       make it optional through OPTIONS defaulting to Off.  Some of
-#       these are Linux specific, but others will probably run on
-#       FreeBSD as well, given a bit of careful attention.
-CONFIGURE_ARGS=	--localstatedir=/var \
-		--disable-getifaddrs \
-		--disable-apple_sensors \
-		--disable-ascent \
-		--disable-battery \
-		--disable-conntrack \
-		--disable-contextswitch \
-		--disable-cpufreq \
-		--disable-entropy \
-		--disable-fscache \
-		--disable-gmond \
-		--disable-hddtemp \
-		--disable-ipmi \
-		--disable-iptables \
-		--disable-ipvs \
-		--disable-irq \
-		--disable-java \
-		--disable-madwifi \
-		--disable-match_empty_counter \
-		--disable-match_hashed \
-		--disable-match_regex \
-		--disable-match_timediff \
-		--disable-match_value \
-		--disable-memcachec \
-		--disable-modbus \
-		--disable-multimeter \
-		--disable-netapp \
-		--disable-netlink \
-		--disable-nfs \
-		--disable-olsrd \
-		--disable-onewire \
-		--disable-oracle \
-		--disable-perl \
-		--disable-pinba \
-		--disable-protocols \
-		--disable-sensors \
-		--disable-serial \
-		--disable-table \
-		--disable-tape \
-		--disable-target_notification \
-		--disable-target_replace \
-		--disable-target_scale \
-		--disable-target_set \
-		--disable-teamspeak2 \
-		--disable-ted \
-		--disable-thermal \
-		--disable-users \
-		--disable-vmem \
-		--disable-vserver \
-		--disable-wireless \
-		--without-perl-bindings \
-		--without-librabbitmq \
-		--disable-varnish \
-		--without-libvarnish \
-		--without-libcredis \
-		--without-libganglia \
-		--without-libesmtp \
-		--disable-static
-
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=--enable-debug
-.endif
-
-.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:MBIND}
-CONFIGURE_ARGS+=--enable-bind
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
-LIB_DEPENDS+=	libxml2.so:${PORTSDIR}/textproc/libxml2
-PLIST_SUB+=	BIND=""
-.  if empty(PORT_OPTIONS:MCURL)
-IGNORE=	BIND requires CURL. Either select CURL or deselect BIND
-.  endif
-.else
-CONFIGURE_ARGS+=--disable-bind
-PLIST_SUB+=	BIND="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MAPACHE}
-CONFIGURE_ARGS+=--enable-apache
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
-PLIST_SUB+=	APACHE=""
-.  if empty(PORT_OPTIONS:MCURL)
-IGNORE=	APACHE requires CURL. Either select CURL or deselect APACHE
-.  endif
-.else
-CONFIGURE_ARGS+=--disable-apache
-PLIST_SUB+=	APACHE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MAPCUPS}
-CONFIGURE_ARGS+=--enable-apcups
-BUILD_DEPENDS+=	${LOCALBASE}/sbin/apcupsd:${PORTSDIR}/sysutils/apcupsd
-PLIST_SUB+=	APCUPS=""
-.else
-CONFIGURE_ARGS+=--disable-apcups
-PLIST_SUB+=	APCUPS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MCURL}
-CONFIGURE_ARGS+=--enable-curl --with-libcurl=${LOCALBASE}
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
-PLIST_SUB+=	CURL=""
-.else
-CONFIGURE_ARGS+=--disable-curl
-PLIST_SUB+=	CURL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MCURL_JSON}
-.if empty(PORT_OPTIONS:MCURL)
-IGNORE=	using CURL_JSON requires CURL support
-.endif
-CONFIGURE_ARGS+=--enable-curl_json
-LIB_DEPENDS+=	libyajl.so:${PORTSDIR}/devel/yajl
-PLIST_SUB+=	CURL_JSON=""
-.else
-CONFIGURE_ARGS+=--disable-curl_json --without-libyajl
-PLIST_SUB+=	CURL_JSON="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MCURL_XML}
-.if empty(PORT_OPTIONS:MCURL)
-IGNORE=	using CURL_XML requires CURL support
-.endif
-CONFIGURE_ARGS+=--enable-curl_xml
-LIB_DEPENDS+=	libxml2.so:${PORTSDIR}/textproc/libxml2
-PLIST_SUB+=	CURL_XML=""
-.else
-CONFIGURE_ARGS+=--disable-curl_xml
-PLIST_SUB+=	CURL_XML="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDBI}
-CONFIGURE_ARGS+=--enable-dbi --with-libdbi=${LOCALBASE}
-LIB_DEPENDS+=	libdbi.so:${PORTSDIR}/databases/libdbi
-PLIST_SUB+=	DBI=""
-.else
-CONFIGURE_ARGS+=--disable-dbi
-PLIST_SUB+=	DBI="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDISK}
-CONFIGURE_ARGS+=--enable-disk
-PLIST_SUB+=	DISK=""
-.else
-CONFIGURE_ARGS+=--disable-disk
-PLIST_SUB+=	DISK="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGCRYPT}
-CONFIGURE_ARGS+=--with-libgcrypt-prefix=${LOCALBASE}
-LIB_DEPENDS+=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
-.endif
-
-.if ${PORT_OPTIONS:MNUTUPS}
-CONFIGURE_ARGS+=--enable-nut --with-upsclient
-LIB_DEPENDS+=	libupsclient.so:${PORTSDIR}/sysutils/nut
-PLIST_SUB+=	NUTUPS=""
-.else
-CONFIGURE_ARGS+=--disable-nut --without-libupsclient
-PLIST_SUB+=	NUTUPS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MINTERFACE}
-USES+=		pkgconfig
-CONFIGURE_ARGS+=--enable-interface
-LIB_DEPENDS+=	libstatgrab.so:${PORTSDIR}/devel/libstatgrab
-PLIST_SUB+=	INTERFACE=""
-LIBS+=		`pkg-config --libs libstatgrab`
-.else
-CONFIGURE_ARGS+=--disable-interface
-PLIST_SUB+=	INTERFACE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMBMON}
-CONFIGURE_ARGS+=--enable-mbmon
-RUN_DEPENDS+=	${LOCALBASE}/bin/mbmon:${PORTSDIR}/sysutils/xmbmon
-PLIST_SUB+=	MBMON=""
-.else
-CONFIGURE_ARGS+=--disable-mbmon
-PLIST_SUB+=	MBMON="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMEMCACHED}
-LIB_DEPENDS+=	libmemcached.so:${PORTSDIR}/databases/libmemcached
-CONFIGURE_ARGS+=--enable-memcached
-CONFIGURE_ARGS+=--with-libmemcached=${LOCALBASE}
-PLIST_SUB+=	MEMCACHED=""
-.else
-CONFIGURE_ARGS+=--disable-memcached --without-libmemcached
-PLIST_SUB+=	MEMCACHED="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=	yes
-CONFIGURE_ARGS+=--enable-mysql
-PLIST_SUB+=	MYSQL=""
-.else
-CONFIGURE_ARGS+=--disable-mysql
-PLIST_SUB+=	MYSQL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNGINX}
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
-CONFIGURE_ARGS+=--enable-nginx
-PLIST_SUB+=	NGINX=""
-.  if empty(PORT_OPTIONS:MCURL)
-IGNORE=	NGINX requires CURL. Either select CURL or deselect NGINX
-.  endif
-.else
-CONFIGURE_ARGS+=--disable-nginx
-PLIST_SUB+=	NGINX="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNOTIFYDESKTOP}
-LIB_DEPENDS+=	libnotify.so:${PORTSDIR}/devel/libnotify
-CONFIGURE_ARGS+=--enable-notify_desktop
-PLIST_SUB+=	NOTIFYDESKTOP=""
-.else
-CONFIGURE_ARGS+=--disable-notify_desktop
-PLIST_SUB+=	NOTIFYDESKTOP="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNOTIFYEMAIL}
-LIB_DEPENDS+=	libesmtp.so:${PORTSDIR}/mail/libesmtp
-CONFIGURE_ARGS+=--enable-notify_email
-CONFIGURE_ARGS+=--with-libesmtp=${PREFIX}
-PLIST_SUB+=	NOTIFYEMAIL=""
-.else
-CONFIGURE_ARGS+=--disable-notify_email
-PLIST_SUB+=	NOTIFYEMAIL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MOPENVPN}
-CONFIGURE_ARGS+=--enable-openvpn
-RUN_DEPENDS+=	${LOCALBASE}/sbin/openvpn:${PORTSDIR}/security/openvpn
-PLIST_SUB+=	OPENVPN=""
-.else
-CONFIGURE_ARGS+=--disable-openvpn
-PLIST_SUB+=	OPENVPN="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPDNS}
-USE_PDNS=	yes
-CONFIGURE_ARGS+=--enable-powerdns
-PLIST_SUB+=	PDNS=""
-.else
-CONFIGURE_ARGS+=--disable-powerdns
-PLIST_SUB+=	PDNS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-USES+=		pgsql
-CONFIGURE_ARGS+=--enable-postgresql
-PLIST_SUB+=	PGSQL=""
-.else
-CONFIGURE_ARGS+=--disable-postgresql
-PLIST_SUB+=	PGSQL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPING}
-LIB_DEPENDS+=	liboping.so:${PORTSDIR}/net/liboping
-CONFIGURE_ARGS+=--enable-ping
-PLIST_SUB+=	PING=""
-.else
-CONFIGURE_ARGS+=--disable-ping
-PLIST_SUB+=	PING="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPYTHON}
-USES+=		python
-CONFIGURE_ARGS+=--enable-python --with-python=${PYTHON_CMD}
-PLIST_SUB+=	PYTHON=""
-.else
-CONFIGURE_ARGS+=--disable-python
-PLIST_SUB+=	PYTHON="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MROUTEROS}
-LIB_DEPENDS+=	librouteros.so:${PORTSDIR}/net/librouteros
-CONFIGURE_ARGS+=--enable-routeros --with-librouteros=${LOCALBASE}
-PLIST_SUB+=	ROUTEROS=""
-.else
-CONFIGURE_ARGS+=--disable-routeros --without-librouteros
-PLIST_SUB+=	ROUTEROS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MRRDTOOL}
-LIB_DEPENDS+=	librrd.so:${PORTSDIR}/databases/rrdtool
-CONFIGURE_ARGS+=--enable-rrdtool
-PLIST_SUB+=	RRD=""
-.else
-CONFIGURE_ARGS+=--disable-rrdtool
-PLIST_SUB+=	RRD="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MRRDCACHED} && ${PORT_OPTIONS:MRRDTOOL}
-CONFIGURE_ARGS+=--enable-rrdcached
-PLIST_SUB+=	RRDCACHED=""
-.else
-CONFIGURE_ARGS+=--disable-rrdcached
-PLIST_SUB+=	RRDCACHED="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSNMP}
-LIB_DEPENDS+=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
-CONFIGURE_ARGS+=--enable-snmp
-PLIST_SUB+=	SNMP=""
-.else
-CONFIGURE_ARGS+=--disable-snmp
-PLIST_SUB+=	SNMP="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MTOKYOTYRANT}
-LIB_DEPENDS+=	libtokyotyrant.so:${PORTSDIR}/databases/tokyotyrant
-CONFIGURE_ARGS+=--enable-tokyotyrant
-CONFIGURE_ARGS+=--with-libtokyotyrant=${LOCALBASE}
-PLIST_SUB+=	TOKYOTYRANT=""
-.else
-CONFIGURE_ARGS+=--disable-tokyotyrant --without-libtokyotyrant
-PLIST_SUB+=	TOKYOTYRANT="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MLIBVIRT}
-CONFIGURE_ARGS+=--enable-libvirt
-LIB_DEPENDS+=	libvirt.so:${PORTSDIR}/devel/libvirt
-PLIST_SUB+=	VIRT=""
-.else
-CONFIGURE_ARGS+=--disable-libvirt
-PLIST_SUB+=	VIRT="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MWRITE_HTTP}
-CONFIGURE_ARGS+=--enable-write_http
-PLIST_SUB+=	WRITE_HTTP=""
-.else
-CONFIGURE_ARGS+=--disable-write_http
-PLIST_SUB+=	WRITE_HTTP="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MXMMS}
-LIB_DEPENDS+=	libxmms.so:${PORTSDIR}/multimedia/xmms
-CONFIGURE_ARGS+=--enable-xmms
-CFLAGS+=	`xmms-config --cflags`
-PLIST_SUB+=	XMMS=""
-.else
-CONFIGURE_ARGS+=--disable-xmms
-PLIST_SUB+=	XMMS="@comment "
-.endif
-
-SHEBANG_FILES=	contrib/collection.cgi
-
-post-patch:
-	@${RM} -r ${WRKSRC}/libltdl
-	@${REINPLACE_CMD} \
-		-e 's;@prefix@/var/;/var/;' \
-		-e 's;/var/lib/;/var/db/;' \
-		${WRKSRC}/src/collectd.conf.in
-	@${REINPLACE_CMD} \
-		-e '/^ACLOCAL_AMFLAGS =/s;libltdl/m4;m4;' \
-		-e '/\$$[(]mkinstalldirs)/d' \
-		${WRKSRC}/Makefile.am
-	@${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
-	@${REINPLACE_CMD} \
-		-e 's;{libdir}/pkgconfig;{prefix}/libdata/pkgconfig;' \
-		${WRKSRC}/configure.in
-
-post-install:
-.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>
diff --git a/net-mgmt/collectd/distinfo b/net-mgmt/collectd/distinfo
deleted file mode 100644
index 11cde3f9a7dc..000000000000
--- a/net-mgmt/collectd/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (collectd-4.10.9.tar.gz) = 6fd43f04ed009cce7fd16296eb348ce78b859d8f32de48a10f1af8a09b3151d9
-SIZE (collectd-4.10.9.tar.gz) = 1602028
diff --git a/net-mgmt/collectd/files/collectd.in b/net-mgmt/collectd/files/collectd.in
deleted file mode 100644
index 5834adbab12f..000000000000
--- a/net-mgmt/collectd/files/collectd.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: collectd
-# REQUIRE: LOGIN
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# collectd_enable (bool):       Set to NO by default.
-#               Set it to YES to enable collectd.
-# collectd_flags (string):      Set to "" by default.
-#               Additional flags to collectd, see manual page.
-#
-
-. /etc/rc.subr
-
-name="collectd"
-rcvar=collectd_enable
-
-command=%%PREFIX%%/sbin/${name}
-
-_dbdir=/var/db/collectd
-start_precmd="collectdmon_prepcmd"
-
-load_rc_config $name
-
-: ${collectd_enable="NO"}
-
-collectdmon_prepcmd()
-{
-	if [ ! -d ${_dbdir} ] ; then
-		mkdir -p ${_dbdir}
-	fi
-}
-
-run_rc_command "$1"
diff --git a/net-mgmt/collectd/files/collectdmon.in b/net-mgmt/collectd/files/collectdmon.in
deleted file mode 100644
index 107a95a59f4f..000000000000
--- a/net-mgmt/collectd/files/collectdmon.in
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: collectdmon
-# REQUIRE: LOGIN
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# collectdmon_enable (bool):   Set to NO by default.
-#               Set it to YES to enable collectd.
-# collectdmon_flags (string):  Set to "-c %%PREFIX%%/sbin/collectd" by default.
-#               Additional flags to collectdmon, see manual page.
-#
-
-. /etc/rc.subr
-
-name="collectdmon"
-rcvar=collectdmon_enable
-
-command=%%PREFIX%%/sbin/${name}
-
-_dbdir=/var/db/collectd
-start_precmd="collectd_prepcmd"
-
-load_rc_config $name
-
-: ${collectdmon_enable="NO"}
-: ${collectdmon_flags="-c %%PREFIX%%/sbin/collectd"}
-
-collectd_prepcmd()
-{
-	if [ ! -d ${_dbdir} ] ; then
-		mkdir -p ${_dbdir}
-	fi
-}
-
-run_rc_command "$1"
diff --git a/net-mgmt/collectd/files/patch-configure.in b/net-mgmt/collectd/files/patch-configure.in
deleted file mode 100644
index 339c29f78f3c..000000000000
--- a/net-mgmt/collectd/files/patch-configure.in
+++ /dev/null
@@ -1,96 +0,0 @@
---- configure.in.orig	2013-04-08 06:26:17 UTC
-+++ configure.in
-@@ -2,13 +2,13 @@
- AC_INIT(collectd, m4_esyscmd(./version-gen.sh))
- AC_CONFIG_SRCDIR(src/collectd.c)
- AC_CONFIG_HEADERS(src/config.h)
--AC_CONFIG_AUX_DIR([libltdl/config])
-+AC_CONFIG_AUX_DIR([config])
- 
- m4_ifdef([LT_PACKAGE_VERSION],
- 	# libtool >= 2.2
- 	[
- 	 LT_CONFIG_LTDL_DIR([libltdl])
--	 LT_INIT([dlopen])
-+	 LT_INIT([dlopen disable-static])
- 	 LTDL_INIT([convenience])
- 	 AC_DEFINE(LIBTOOL_VERSION, 2, [Define to used libtool version.])
- 	]
-@@ -42,8 +42,6 @@
- AM_PROG_CC_C_O
- AM_CONDITIONAL(COMPILER_IS_GCC, test "x$GCC" = "xyes")
- 
--AC_DISABLE_STATIC
--AC_PROG_LIBTOOL
- AC_PROG_LEX
- AC_PROG_YACC
- PKG_PROG_PKG_CONFIG
-@@ -67,6 +65,9 @@
- 	*openbsd*)
- 	ac_system="OpenBSD"
- 	;;
-+	*freebsd*)
-+	ac_system="FreeBSD"
-+	;;
- 	*aix*)
- 	AC_DEFINE([KERNEL_AIX], 1, [True if program is to be compiled for a AIX kernel])
- 	ac_system="AIX"
-@@ -98,7 +99,7 @@
- fi
- 
- # Where to install .pc files.
--pkgconfigdir="${libdir}/pkgconfig"
-+pkgconfigdir="${prefix}/libdata/pkgconfig"
- AC_SUBST(pkgconfigdir)
- 
- # Check for standards compliance mode
-@@ -1200,6 +1201,8 @@
- 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")
-@@ -1562,9 +1565,6 @@
- 		[with_libgcrypt="yes"],
- 		[with_libgcrypt="no (symbol gcry_md_hash_buffer not found)"])
- 
--	if test "$with_libgcrypt" != "no"; then
--		AM_PATH_LIBGCRYPT(1:1.2.0,,with_libgcrypt="no (version 1.2.0+ required)")
--	fi
- fi
- 
- CPPFLAGS="$SAVE_CPPFLAGS"
-@@ -3056,7 +3056,7 @@
- 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_var(\"LINKFORSHARED\")+\" -L\"+distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0)+\" -l\"+distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0).replace(\"lib\", \"\").replace(\".a\", \"\"))" | "$with_python_prog" 2>&1`
- 	python_config_status=$?
- 
- 	if test "$python_config_status" -ne 0 || test "x$python_library_flags" = "x"
-@@ -3071,7 +3071,7 @@
- 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"],
-@@ -4168,6 +4168,12 @@
- 	plugin_zfs_arc="yes"
- fi
- 
-+# FreeBSD
-+if test "x$ac_system" = "xFreeBSD"
-+then
-+       plugin_zfs_arc="yes"
-+fi
-+
- if test "x$with_devinfo$with_kstat" = "xyesyes"
- then
- 	plugin_cpu="yes"
diff --git a/net-mgmt/collectd/files/patch-src__Makefile.am b/net-mgmt/collectd/files/patch-src__Makefile.am
deleted file mode 100644
index 753477bc92c8..000000000000
--- a/net-mgmt/collectd/files/patch-src__Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
---- src/Makefile.am.orig	2013-04-08 08:26:17.000000000 +0200
-+++ src/Makefile.am	2013-08-07 00:23:31.036813410 +0200
-@@ -7,7 +7,7 @@
- endif
- 
- if COMPILER_IS_GCC
--AM_CFLAGS = -Wall -Werror
-+AM_CFLAGS = -Wall
- endif
- 
- AM_CPPFLAGS = -DPREFIX='"${prefix}"'
-@@ -720,7 +720,7 @@
- pkglib_LTLIBRARIES += notify_email.la
- notify_email_la_SOURCES = notify_email.c
- notify_email_la_LDFLAGS = -module -avoid-version
--notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread -ldl
-+notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread
- collectd_LDADD += "-dlopen" notify_email.la
- collectd_DEPENDENCIES += notify_email.la
- endif
-@@ -1198,7 +1198,7 @@
- zfs_arc_la_SOURCES = zfs_arc.c
- zfs_arc_la_CFLAGS = $(AM_CFLAGS)
- zfs_arc_la_LDFLAGS = -module -avoid-version
--zfs_arc_la_LIBADD = -lkstat
-+zfs_arc_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS)
- collectd_LDADD += "-dlopen" zfs_arc.la
- collectd_DEPENDENCIES += zfs_arc.la
- endif
-@@ -1257,12 +1257,7 @@
- 
- 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 \
diff --git a/net-mgmt/collectd/files/patch-src__collectd.c b/net-mgmt/collectd/files/patch-src__collectd.c
deleted file mode 100644
index 976c2d8c4735..000000000000
--- a/net-mgmt/collectd/files/patch-src__collectd.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/collectd.c.orig	2013-11-23 22:04:05.130103822 +0000
-+++ ./src/collectd.c	2013-11-23 22:04:25.627104708 +0000
-@@ -294,7 +294,7 @@
- #endif
- 
- #if HAVE_LIBSTATGRAB
--	if (sg_init ())
-+	if (sg_init (0))
- 	{
- 		ERROR ("sg_init: %s", sg_str_error (sg_get_error ()));
- 		return (-1);
diff --git a/net-mgmt/collectd/files/patch-src__collectd.h b/net-mgmt/collectd/files/patch-src__collectd.h
deleted file mode 100644
index c148cf9f476f..000000000000
--- a/net-mgmt/collectd/files/patch-src__collectd.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/collectd.h.orig	2013-04-08 08:26:17.000000000 +0200
-+++ src/collectd.h	2014-05-22 22:08:39.288743891 +0200
-@@ -244,15 +244,15 @@
- #endif
- 
- #ifndef LOCALSTATEDIR
--#define LOCALSTATEDIR PREFIX "/var"
-+#define LOCALSTATEDIR "/var"
- #endif
- 
- #ifndef PKGLOCALSTATEDIR
--#define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME
-+#define PKGLOCALSTATEDIR "/var/db/" PACKAGE_NAME
- #endif
- 
- #ifndef PIDFILE
--#define PIDFILE PREFIX "/var/run/" PACKAGE_NAME ".pid"
-+#define PIDFILE "/var/run/" PACKAGE_NAME ".pid"
- #endif
- 
- #ifndef PLUGINDIR
diff --git a/net-mgmt/collectd/files/patch-src__disk.c b/net-mgmt/collectd/files/patch-src__disk.c
deleted file mode 100644
index 5f144e50a241..000000000000
--- a/net-mgmt/collectd/files/patch-src__disk.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./src/disk.c.orig	2013-11-23 22:36:13.757103756 +0000
-+++ ./src/disk.c	2013-11-23 22:36:15.058103844 +0000
-@@ -691,7 +691,8 @@
- 
- #elif defined(HAVE_LIBSTATGRAB)
- 	sg_disk_io_stats *ds;
--	int disks, counter;
-+	size_t disks;
-+	int counter;
- 	char name[DATA_MAX_NAME_LEN];
- 	
- 	if ((ds = sg_get_disk_io_stats(&disks)) == NULL)
diff --git a/net-mgmt/collectd/files/patch-src__dns.c b/net-mgmt/collectd/files/patch-src__dns.c
deleted file mode 100644
index fb045049b25a..000000000000
--- a/net-mgmt/collectd/files/patch-src__dns.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/dns.c.orig	2008-09-05 15:26:02.000000000 +0000
-+++ src/dns.c	2008-09-05 15:25:55.000000000 +0000
-@@ -210,6 +210,15 @@
- 		pthread_sigmask (SIG_SETMASK, &sigmask, NULL);
- 	}
- 
-+	/* Check for pcap_device, if needed */
-+#ifdef __sparc64__
-+	if (pcap_device == NULL)
-+	{
-+	    ERROR ("dns plugin: Interface required");
-+	    return (NULL);
-+	}
-+#endif
-+
- 	/* Passing `pcap_device == NULL' is okay and the same as passign "any" */
- 	DEBUG ("Creating PCAP object..");
- 	pcap_obj = pcap_open_live (pcap_device,
diff --git a/net-mgmt/collectd/files/patch-src__interface.c b/net-mgmt/collectd/files/patch-src__interface.c
deleted file mode 100644
index f2ad3d2bb601..000000000000
--- a/net-mgmt/collectd/files/patch-src__interface.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/interface.c.orig	2014-01-05 00:36:58.000000000 +0400
-+++ src/interface.c	2014-01-05 00:45:10.000000000 +0400
-@@ -212,20 +212,19 @@ static int interface_read (void)
- 		return (-1);
- 
- 	for (if_ptr = if_list; if_ptr != NULL; if_ptr = if_ptr->ifa_next)
--	{
--		if ((if_data = (struct IFA_DATA *) if_ptr->ifa_data) == NULL)
--			continue;
--
--		if_submit (if_ptr->ifa_name, "if_octets",
--				if_data->IFA_RX_BYTES,
--				if_data->IFA_TX_BYTES);
--		if_submit (if_ptr->ifa_name, "if_packets",
--				if_data->IFA_RX_PACKT,
--				if_data->IFA_TX_PACKT);
--		if_submit (if_ptr->ifa_name, "if_errors",
--				if_data->IFA_RX_ERROR,
--				if_data->IFA_TX_ERROR);
--	}
-+        if (if_ptr->ifa_addr != NULL && if_ptr->ifa_addr->sa_family == AF_LINK) {
-+            if_data = (struct IFA_DATA *) if_ptr->ifa_data;
-+            
-+            if_submit (if_ptr->ifa_name, "if_octets",
-+                       if_data->IFA_RX_BYTES,
-+                       if_data->IFA_TX_BYTES);
-+            if_submit (if_ptr->ifa_name, "if_packets",
-+                       if_data->IFA_RX_PACKT,
-+                       if_data->IFA_TX_PACKT);
-+            if_submit (if_ptr->ifa_name, "if_errors",
-+                       if_data->IFA_RX_ERROR,
-+                       if_data->IFA_TX_ERROR);
-+        }
- 
- 	freeifaddrs (if_list);
- /* #endif HAVE_GETIFADDRS */
diff --git a/net-mgmt/collectd/files/patch-src__zfs_arc.c b/net-mgmt/collectd/files/patch-src__zfs_arc.c
deleted file mode 100644
index 0f8abed3664b..000000000000
--- a/net-mgmt/collectd/files/patch-src__zfs_arc.c
+++ /dev/null
@@ -1,270 +0,0 @@
---- src/zfs_arc.c.orig	2012-11-11 11:43:05.000000000 +0100
-+++ src/zfs_arc.c	2013-02-26 15:29:15.297851681 +0100
-@@ -23,11 +23,58 @@
- #include "common.h"
- #include "plugin.h"
- 
-+#if !defined(HAVE_LIBKSTAT) && defined(HAVE_SYSCTLBYNAME)
-+#include <sys/sysctl.h>
-+#endif
-+
- /*
-  * Global variables
-  */
- 
--extern kstat_ctl_t *kc;
-+#if defined(HAVE_LIBKSTAT)
-+ extern kstat_ctl_t *kc;
-+#endif
-+
-+/*
-+ * Context
-+ */
-+struct za_context {
-+#if defined(HAVE_LIBKSTAT)
-+    kstat_t *ksp;
-+#endif
-+};
-+
-+static int za_init_context(struct za_context *ctx)
-+{
-+#if defined(HAVE_LIBKSTAT)
-+	get_kstat (&ctx->ksp, "zfs", 0, "arcstats");
-+	if (ctx->ksp == NULL)
-+	{
-+		ERROR ("zfs_arc plugin: Cannot find zfs:0:arcstats kstat.");
-+		return (-1);
-+	}
-+#endif
-+	return 0;
-+}
-+
-+static long long za_get_value(struct za_context *ctx, const char* name)
-+{
-+#if defined(HAVE_LIBKSTAT)
-+	return get_kstat_value(ctx->ksp, name);
-+#elif defined(HAVE_SYSCTLBYNAME)
-+	// kstat values are available on FreeBSD through sysctl
-+	char fullname[512];
-+	long long result = 0;
-+	size_t size = sizeof(result);
-+	ssnprintf(fullname, sizeof(fullname), "kstat.zfs.misc.arcstats.%s", name);
-+	if (sysctlbyname(fullname, &result, &size, NULL, 0) != 0 || size != sizeof(result))
-+	{
-+		ERROR ("zfs_arc plugin: Cannot find stats using sysctl");
-+		result = 0;
-+	}
-+	return result;
-+#endif
-+}
- 
- static void za_submit (const char* type, const char* type_instance, value_t* values, int values_len)
- {
-@@ -46,112 +93,136 @@
- 
- static void za_submit_gauge (const char* type, const char* type_instance, gauge_t value)
- {
--	value_t values[1];
-+	value_t vv;
- 
--	values[0].gauge = value;
-+	vv.gauge = value;
- 
--	za_submit (type, type_instance, values, STATIC_ARRAY_SIZE(values));
-+	za_submit (type, type_instance, &vv, 1);
- }
- 
--static void za_submit_size (gauge_t size, gauge_t size_target, gauge_t limit_min, gauge_t limit_max)
-+static int za_read_derive (struct za_context *ctx, const char *kstat_value,
-+   const char *type, const char *type_instance)
- {
--	value_t values[4];
-+   long long tmp;
-+   value_t v;
- 
--	values[0].gauge = size;
--	values[1].gauge = size_target;
--	values[2].gauge = limit_min;
--	values[3].gauge = limit_max;
-+   tmp = za_get_value (ctx, (char *)kstat_value);
-+   if (tmp == -1LL)
-+   {
-+     ERROR ("zfs_arc plugin: Reading kstat value \"%s\" failed.", kstat_value);
-+     return (-1);
-+   }
- 
--	za_submit ("arc_size", "", values, STATIC_ARRAY_SIZE(values));
-+   v.derive = (derive_t) tmp;
-+   za_submit (type, type_instance, /* values = */ &v, /* values_num = */ 1);
-+   return (0);
- }
- 
--static void za_submit_bytes (counter_t read, counter_t write)
-+static int za_read_gauge (struct za_context *ctx, const char *kstat_value,
-+	const char *type, const char *type_instance)
- {
--	value_t values[2];
-+   long long tmp;
-+   value_t v;
- 
--	values[0].counter = read;
--	values[1].counter = write;
-+   tmp = za_get_value (ctx, (char *)kstat_value);
-+   if (tmp == -1LL)
-+   {
-+     ERROR ("zfs_arc plugin: Reading kstat value \"%s\" failed.", kstat_value);
-+     return (-1);
-+   }
- 
--	za_submit ("arc_l2_bytes", "", values, STATIC_ARRAY_SIZE(values));
-+   v.gauge = (gauge_t) tmp;
-+   za_submit (type, type_instance, /* values = */ &v, /* values_num = */ 1);
-+   return (0);
- }
- 
--static void za_submit_counts (char *type_instance, counter_t demand_data, counter_t demand_metadata,
--	counter_t prefetch_data, counter_t prefetch_metadata)
-+static void za_submit_ratio (const char* type_instance, long long hits, long long misses)
- {
--	value_t values[4];
-+	gauge_t ratio = NAN;
- 
--	values[0].counter = demand_data;
--	values[1].counter = demand_metadata;
--	values[2].counter = prefetch_data;
--	values[3].counter = prefetch_metadata;
-+	if ((hits > 0) || (misses > 0))
-+		ratio = hits / (hits + misses);
- 
--	za_submit ("arc_counts", type_instance, values, STATIC_ARRAY_SIZE(values));
-+	za_submit_gauge ("cache_ratio", type_instance, ratio);
- }
- 
- static int za_read (void)
- {
--	gauge_t   arcsize, targetsize, minlimit, maxlimit, hits, misses, l2_size, l2_hits, l2_misses;
--	counter_t demand_data_hits, demand_metadata_hits, prefetch_data_hits, prefetch_metadata_hits;
--	counter_t demand_data_misses, demand_metadata_misses, prefetch_data_misses, prefetch_metadata_misses;
--	counter_t l2_read_bytes, l2_write_bytes;
--	kstat_t	 *ksp	= NULL;
-+	long long l2_read_bytes, l2_write_bytes;
-+	long long  arc_hits, arc_misses, l2_hits, l2_misses;
-+	value_t  l2_io[2];
-+	struct za_context ctx;
- 
--	get_kstat (&ksp, "zfs", 0, "arcstats");
--	if (ksp == NULL)
-+	if (za_init_context (&ctx) < 0)
- 	{
--		ERROR ("zfs_arc plugin: Cannot find zfs:0:arcstats kstat.");
- 		return (-1);
- 	}
- 
--	arcsize    = get_kstat_value(ksp, "size");
--	targetsize = get_kstat_value(ksp, "c");
--	minlimit   = get_kstat_value(ksp, "c_min");
--	maxlimit   = get_kstat_value(ksp, "c_max");
--
--	demand_data_hits       = get_kstat_value(ksp, "demand_data_hits");
--	demand_metadata_hits   = get_kstat_value(ksp, "demand_metadata_hits");
--	prefetch_data_hits     = get_kstat_value(ksp, "prefetch_data_hits");
--	prefetch_metadata_hits = get_kstat_value(ksp, "prefetch_metadata_hits");
--
--	demand_data_misses       = get_kstat_value(ksp, "demand_data_misses");
--	demand_metadata_misses   = get_kstat_value(ksp, "demand_metadata_misses");
--	prefetch_data_misses     = get_kstat_value(ksp, "prefetch_data_misses");
--	prefetch_metadata_misses = get_kstat_value(ksp, "prefetch_metadata_misses");
--
--	hits   = get_kstat_value(ksp, "hits");
--	misses = get_kstat_value(ksp, "misses");
--
--	l2_size        = get_kstat_value(ksp, "l2_size");
--	l2_read_bytes  = get_kstat_value(ksp, "l2_read_bytes");
--	l2_write_bytes = get_kstat_value(ksp, "l2_write_bytes");
--	l2_hits        = get_kstat_value(ksp, "l2_hits");
--	l2_misses      = get_kstat_value(ksp, "l2_misses");
--
--
--	za_submit_size (arcsize, targetsize, minlimit, maxlimit);
--	za_submit_gauge ("arc_l2_size", "", l2_size);
--
--	za_submit_counts ("hits",   demand_data_hits,     demand_metadata_hits,
--	                            prefetch_data_hits,   prefetch_metadata_hits);
--	za_submit_counts ("misses", demand_data_misses,   demand_metadata_misses,
--	                            prefetch_data_misses, prefetch_metadata_misses);
-+	/* Sizes */
-+	za_read_gauge (&ctx, "size",    "cache_size", "arc");
-+	za_read_gauge (&ctx, "l2_size", "cache_size", "L2");
-+
-+	/* Operations */
-+	za_read_derive (&ctx, "allocated","cache_operation", "allocated");
-+	za_read_derive (&ctx, "deleted",  "cache_operation", "deleted");
-+	za_read_derive (&ctx, "stolen",   "cache_operation", "stolen");
-+
-+	/* Issue indicators */
-+	za_read_derive (&ctx, "mutex_miss", "mutex_operation", "miss");
-+	za_read_derive (&ctx, "hash_collisions", "hash_collisions", "");
-+
-+	/* Evictions */
-+	za_read_derive (&ctx, "evict_l2_cached",     "cache_eviction", "cached");
-+	za_read_derive (&ctx, "evict_l2_eligible",   "cache_eviction", "eligible");
-+	za_read_derive (&ctx, "evict_l2_ineligible", "cache_eviction", "ineligible");
-+
-+	/* Hits / misses */
-+	za_read_derive (&ctx, "demand_data_hits",         "cache_result", "demand_data-hit");
-+	za_read_derive (&ctx, "demand_metadata_hits",     "cache_result", "demand_metadata-hit");
-+	za_read_derive (&ctx, "prefetch_data_hits",       "cache_result", "prefetch_data-hit");
-+	za_read_derive (&ctx, "prefetch_metadata_hits",   "cache_result", "prefetch_metadata-hit");
-+	za_read_derive (&ctx, "demand_data_misses",       "cache_result", "demand_data-miss");
-+	za_read_derive (&ctx, "demand_metadata_misses",   "cache_result", "demand_metadata-miss");
-+	za_read_derive (&ctx, "prefetch_data_misses",     "cache_result", "prefetch_data-miss");
-+	za_read_derive (&ctx, "prefetch_metadata_misses", "cache_result", "prefetch_metadata-miss");
-+
-+	/* Ratios */
-+	arc_hits   = za_get_value (&ctx, "hits");
-+	arc_misses = za_get_value (&ctx, "misses");
-+	l2_hits    = za_get_value (&ctx, "l2_hits");
-+	l2_misses  = za_get_value (&ctx, "l2_misses");
-+
-+	za_submit_ratio ("arc", arc_hits, arc_misses);
-+	za_submit_ratio ("L2", l2_hits, l2_misses);
-+
-+	/* I/O */
-+	l2_io[0].derive = za_get_value (&ctx, "l2_read_bytes");
-+	l2_io[1].derive = za_get_value (&ctx, "l2_write_bytes");
- 
--	za_submit_gauge ("arc_ratio", "L1", hits / (hits + misses));
--	za_submit_gauge ("arc_ratio", "L2", l2_hits / (l2_hits + l2_misses));
--
--	za_submit_bytes (l2_read_bytes, l2_write_bytes);
-+	za_submit ("io_octets", "L2", l2_io, /* num values = */ 2);
- 
- 	return (0);
--}
-+} /* int za_read */
- 
- static int za_init (void) /* {{{ */
- {
--	/* kstats chain already opened by update_kstat (using *kc), verify everything went fine. */
--	if (kc == NULL)
-+#if defined(HAVE_LIBKSTAT)
-+ 	/* kstats chain already opened by update_kstat (using *kc), verify everything went fine. */
-+ 	if (kc == NULL)
-+ 	{
-+ 		ERROR ("zfs_arc plugin: kstat chain control structure not available.");
-+ 		return (-1);
-+ 	}
-+#elif defined(HAVE_SYSCTLBYNAME)
-+	/* make sure ARC is available (arc_size is not null) */
-+	unsigned long long arc_size;
-+	size_t size = sizeof(arc_size);
-+	if (sysctlbyname("kstat.zfs.misc.arcstats.size", &arc_size, &size, NULL, 0) != 0 || arc_size == 0)
- 	{
--		ERROR ("zfs_arc plugin: kstat chain control structure not available.");
-+		ERROR ("zfs_arc plugin: could not get ARC size using sysctl, is ARC enabled?");
- 		return (-1);
- 	}
-+#endif
- 
- 	return (0);
- } /* }}} int za_init */
diff --git a/net-mgmt/collectd/files/patch-version-gen.sh b/net-mgmt/collectd/files/patch-version-gen.sh
deleted file mode 100644
index 0294450a34bb..000000000000
--- a/net-mgmt/collectd/files/patch-version-gen.sh
+++ /dev/null
@@ -1,7 +0,0 @@
---- version-gen.sh.orig	2012-11-11 11:43:05.000000000 +0100
-+++ version-gen.sh	2012-12-06 14:49:39.204586447 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/env sh
- 
- DEFAULT_VERSION="4.10.8.git"
diff --git a/net-mgmt/collectd/pkg-descr b/net-mgmt/collectd/pkg-descr
deleted file mode 100644
index a591a0195caa..000000000000
--- a/net-mgmt/collectd/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-collectd is a small daemon written in C for performance. It reads various
-system & network statistics along with updating output RRD or CSV files.
-The daemon is very fast and allows for frequent polling of values, with
-support for polling as frequent as every 10 seconds.
-
-WWW: http://www.collectd.org/
diff --git a/net-mgmt/collectd/pkg-plist b/net-mgmt/collectd/pkg-plist
deleted file mode 100644
index 712befc66332..000000000000
--- a/net-mgmt/collectd/pkg-plist
+++ /dev/null
@@ -1,77 +0,0 @@
-@stopdaemon collectd
-sbin/collectd
-sbin/collectdmon
-@sample etc/collectd.conf.sample
-%%CGI%%%%WWWDIR%%/collection.cgi
-%%CGI%%@sample %%WWWDIR%%/collection.conf.sample
-bin/collectd-nagios
-lib/libcollectdclient.so
-lib/libcollectdclient.so.0
-lib/libcollectdclient.so.0.0.0
-%%APACHE%%lib/collectd/apache.so
-%%APCUPS%%lib/collectd/apcups.so
-%%BIND%%lib/collectd/bind.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
-%%DISK%%lib/collectd/disk.so
-lib/collectd/df.so
-lib/collectd/dns.so
-lib/collectd/email.so
-lib/collectd/exec.so
-lib/collectd/filecount.so
-%%INTERFACE%%lib/collectd/interface.so
-lib/collectd/load.so
-lib/collectd/logfile.so
-%%MBMON%%lib/collectd/mbmon.so
-%%MEMCACHED%%lib/collectd/memcached.so
-lib/collectd/memory.so
-%%MYSQL%%lib/collectd/mysql.so
-%%NGINX%%lib/collectd/nginx.so
-lib/collectd/network.so
-%%NOTIFYDESKTOP%%lib/collectd/notify_desktop.so
-%%NOTIFYEMAIL%%lib/collectd/notify_email.so
-%%NUTUPS%%lib/collectd/nut.so
-lib/collectd/ntpd.so
-%%OPENVPN%%lib/collectd/openvpn.so
-%%PGSQL%%lib/collectd/postgresql.so
-%%PING%%lib/collectd/ping.so
-%%PDNS%%lib/collectd/powerdns.so
-%%PYTHON%%lib/collectd/python.so
-lib/collectd/processes.so
-%%ROUTEROS%%lib/collectd/routeros.so
-%%RRD%%lib/collectd/rrdtool.so
-%%RRDCACHED%%lib/collectd/rrdcached.so
-%%SNMP%%lib/collectd/snmp.so
-lib/collectd/swap.so
-lib/collectd/syslog.so
-lib/collectd/tail.so
-lib/collectd/tcpconns.so
-%%TOKYOTYRANT%%lib/collectd/tokyotyrant.so
-lib/collectd/unixsock.so
-lib/collectd/uptime.so
-lib/collectd/uuid.so
-%%VIRT%%lib/collectd/libvirt.so
-%%WRITE_HTTP%%lib/collectd/write_http.so
-%%XMMS%%lib/collectd/xmms.so
-lib/collectd/zfs_arc.so
-include/collectd/client.h
-include/collectd/lcc_features.h
-libdata/pkgconfig/libcollectdclient.pc
-man/man1/collectd-nagios.1.gz
-man/man1/collectd.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-unixsock.5.gz
-man/man5/collectd.conf.5.gz
-man/man5/types.db.5.gz
-%%DATADIR%%/postgresql_default.conf
-%%DATADIR%%/types.db