ports/151464: Update of net-mgmt/collectd due to new release

Thu Oct 14 21:10:13 UTC 2010

>Number:         151464
>Category:       ports
>Synopsis:       Update of net-mgmt/collectd due to new release
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 14 21:10:10 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Krzysztof Stryjek
>Release:        FreeBSD 7.3-STABLE amd64
>Organization:
private
>Environment:
System: FreeBSD __server__ 7.3-STABLE FreeBSD 7.3-STABLE #1: Fri May 7 15:18:19 CEST 2010 toor at __server__:/home/usr/obj/home/usr/src/sys/SRV64 amd64

>Description:
	There is new version of collectd daemon, so it's time to update ports
collection. Also I've added three collectd plugins to options. I've tested
new version using tinderbox, and there were no errors :-)))

>How-To-Repeat:
	cd /usr/ports/net-mgmt/collectd && make all install clean
>Fix:
	I'm attaching "cummulative" patch for update:

diff -ruN collectd.orig/Makefile collectd/Makefile

--- collectd.orig/Makefile	2010-07-31 23:44:24.000000000 +0200
+++ collectd/Makefile	2010-10-14 22:39:33.000000000 +0200
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	collectd
-PORTVERSION=	4.9.2
-PORTREVISION=	2
+PORTVERSION=	4.9.3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://collectd.org/files/
 
@@ -20,15 +19,18 @@
 WANT_GNOME=	yes
 
 OPTIONS=	CGI		"Install collection.cgi (requires RRDTOOL)" 	Off \
+		BIND		"Enable BIND 9.5+ statistics"			On  \
 		DEBUG		"Enable debugging" 				Off \
 		APACHE		"Input: Apache mod_status (libcurl)" 		Off \
 		APCUPS		"Input: APC UPS (apcupsd)" 			Off \
 		CURL		"Input: CURL generic web statistics" 		Off \
+		DBI		"Input: database abstraction library"		Off \
 		NUTUPS		"Input: NUT UPS daemon" 			Off \
 		INTERFACE 	"Input: Network interfaces (libstatgrab)" 	On  \
 		MBMON		"Input: MBMon" 					Off \
 		MYSQL		"Input: MySQL" 					Off \
 		NGINX		"Input: Nginx" 					Off \
+		OPENVPN		"Input: OpenVPN statistics"			Off \
 		PDNS		"Input: PowerDNS" 				Off \
 		PGSQL		"Input: PostgreSQL" 				Off \
 		PING		"Input: Network latency (liboping)" 		On  \
@@ -67,19 +69,17 @@
 		--disable-apple_sensors \
 		--disable-ascent \
 		--disable-battery \
-		--disable-bind \
 		--disable-conntrack \
 		--disable-contextswitch \
 		--disable-cpufreq \
 		--disable-curl_json \
-		--disable-dbi \
 		--disable-disk \
 		--disable-entropy \
 		--disable-fscache \
 		--disable-gmond \
 		--disable-hddtemp \
-		--disable-iptables \
 		--disable-ipmi \
+		--disable-iptables \
 		--disable-ipvs \
 		--disable-irq \
 		--disable-java \
@@ -99,7 +99,6 @@
 		--disable-notify_email \
 		--disable-olsrd \
 		--disable-onewire \
-		--disable-openvpn \
 		--disable-oracle \
 		--disable-perl \
 		--disable-python \
@@ -114,6 +113,7 @@
 		--disable-target_replace \
 		--disable-target_scale \
 		--disable-target_set \
+		--disable-teamspeak2 \
 		--disable-ted \
 		--disable-thermal \
 		--disable-tokyotyrant \
@@ -138,6 +138,17 @@
 PLIST_SUB+=	CGI="@comment "
 .endif
 
+.if defined(WITH_BIND)
+.if ${OSVERSION} < 800000
+BROKEN=		Need bind 9.5+
+.endif
+CONFIGURE_ARGS+=--enable-bind
+PLIST_SUB+=	BIND=""
+.else
+CONFIGURE_ARGS+=--disable-bind
+PLIST_SUB+=	BIND="@comment "
+.endif
+
 .if defined(WITH_APACHE)
 CONFIGURE_ARGS+=--enable-apache
 LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
@@ -165,6 +176,15 @@
 PLIST_SUB+=	CURL="@comment "
 .endif
 
+.if defined(WITH_DBI)
+CONFIGURE_ARGS+=--enable-dbi --with-libdbi=${LOCALBASE}
+LIB_DEPENDS+=	dbi.0:${PORTSDIR}/databases/libdbi
+PLIST_SUB+=	DBI=""
+.else
+CONFIGURE_ARGS+=--disable-dbi
+PLIST_SUB+=	DBI="@comment "
+.endif
+
 .if defined(WITH_NUTUPS)
 CONFIGURE_ARGS+=--enable-nut
 BUILD_DEPENDS+=	${LOCALBASE}/include/upsclient.h:${PORTSDIR}/sysutils/nut
@@ -187,7 +207,7 @@
 
 .if defined(WITH_MBMON)
 CONFIGURE_ARGS+=--enable-mbmon
-RUN_DEPENDS+=	${LOCALBASE}/sbin/mbmond:${PORTSDIR}/sysutils/mbmon
+RUN_DEPENDS+=	${LOCALBASE}/bin/mbmon:${PORTSDIR}/sysutils/mbmon
 PLIST_SUB+=	MBMON=""
 .else
 CONFIGURE_ARGS+=--disable-mbmon
@@ -213,6 +233,15 @@
 PLIST_SUB+=	NGINX="@comment "
 .endif
 
+.if defined(WITH_OPENVPN)
+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 defined(WITH_PDNS)
 USE_PDNS=	yes
 CONFIGURE_ARGS+=--enable-powerdns
diff -ruN collectd.orig/distinfo collectd/distinfo
--- collectd.orig/distinfo	2010-05-07 05:14:04.000000000 +0200
+++ collectd/distinfo	2010-10-14 14:32:48.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (collectd-4.9.2.tar.gz) = 2734f272753bfa8523dfed133866ae04
-SHA256 (collectd-4.9.2.tar.gz) = a171adf3f94136df3f56148084531e786ed72bda807dc0b3d9fb2bebe53b904d
-SIZE (collectd-4.9.2.tar.gz) = 1691127
+MD5 (collectd-4.9.3.tar.gz) = f56848e9293efa601ba95c208c6dcba9
+SHA256 (collectd-4.9.3.tar.gz) = 65983b428015ebdb5bd982c4d4d7fe7fa33e91f0d622e41cd1e7ea230b22ca05
+SIZE (collectd-4.9.3.tar.gz) = 1692985
diff -ruN collectd.orig/pkg-plist collectd/pkg-plist
--- collectd.orig/pkg-plist	2010-05-07 05:14:04.000000000 +0200
+++ collectd/pkg-plist	2010-10-14 22:39:28.000000000 +0200
@@ -20,6 +20,9 @@
 %%APCUPS%%lib/collectd/apcups.a
 %%APCUPS%%lib/collectd/apcups.la
 %%APCUPS%%lib/collectd/apcups.so
+%%BIND%%lib/collectd/bind.a
+%%BIND%%lib/collectd/bind.la
+%%BIND%%lib/collectd/bind.so
 lib/collectd/cpu.a
 lib/collectd/cpu.la
 lib/collectd/cpu.so
@@ -29,6 +32,9 @@
 %%CURL%%lib/collectd/curl.a
 %%CURL%%lib/collectd/curl.la
 %%CURL%%lib/collectd/curl.so
+%%DBI%%lib/collectd/dbi.a
+%%DBI%%lib/collectd/dbi.la
+%%DBI%%lib/collectd/dbi.so
 lib/collectd/df.a
 lib/collectd/df.la
 lib/collectd/df.so
@@ -77,6 +83,9 @@
 lib/collectd/ntpd.a
 lib/collectd/ntpd.la
 lib/collectd/ntpd.so
+%%OPENVPN%%lib/collectd/openvpn.a
+%%OPENVPN%%lib/collectd/openvpn.la
+%%OPENVPN%%lib/collectd/openvpn.so
 %%PGSQL%%lib/collectd/postgresql.a
 %%PGSQL%%lib/collectd/postgresql.la
 %%PGSQL%%lib/collectd/postgresql.so
@@ -107,9 +116,6 @@
 lib/collectd/tcpconns.so
 lib/collectd/tcpconns.la
 lib/collectd/tcpconns.a
-lib/collectd/teamspeak2.so
-lib/collectd/teamspeak2.la
-lib/collectd/teamspeak2.a
 lib/collectd/unixsock.a
 lib/collectd/unixsock.la
 lib/collectd/unixsock.so


>Release-Note:
>Audit-Trail:
>Unformatted:

