ports/156943: [patch] update net-mgmt/collectd to 4.10.3

[Benjamin Lee]

>Number:         156943
>Category:       ports
>Synopsis:       [patch] update net-mgmt/collectd to 4.10.3
>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:   Wed May 11 01:50:12 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Benjamin Lee
>Release:        8.2-RELEASE
>Organization:
>Environment:
FreeBSD eclipse.b1c1l1.com 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Fri Feb 18 02:24:46 UTC 2011     root at almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
The attached patch updates the net-mgmt/collectd port to version 4.10.3.

It also adds OPTIONS for the cURL-JSON plugin and the new cURL-XML plugin.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN /usr/ports/net-mgmt/collectd/Makefile collectd/Makefile
--- /usr/ports/net-mgmt/collectd/Makefile	2011-04-23 07:32:34.000000000 -0700
+++ collectd/Makefile	2011-05-10 18:48:43.000000000 -0700
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	collectd
-PORTVERSION=	4.9.5
+PORTVERSION=	4.10.3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://collectd.org/files/
 
@@ -24,6 +24,8 @@
 		APACHE		"Input: Apache mod_status (libcurl)" 		Off \
 		APCUPS		"Input: APC UPS (apcupsd)" 			Off \
 		CURL		"Input: CURL generic web statistics" 		Off \
+		CURL_JSON	"Input: CURL JSON generic web statistics"	Off \
+		CURL_XML	"Input: CURL XML generic web statistics"	Off \
 		DBI		"Input: database abstraction library"		Off \
 		DISK		"Input: Disk performance statistics"		Off \
 		NUTUPS		"Input: NUT UPS daemon" 			Off \
@@ -73,7 +75,6 @@
 		--disable-conntrack \
 		--disable-contextswitch \
 		--disable-cpufreq \
-		--disable-curl_json \
 		--disable-entropy \
 		--disable-fscache \
 		--disable-gmond \
@@ -91,6 +92,7 @@
 		--disable-match_timediff \
 		--disable-match_value \
 		--disable-memcachec \
+		--disable-modbus \
 		--disable-multimeter \
 		--disable-netapp \
 		--disable-netlink \
@@ -101,6 +103,7 @@
 		--disable-onewire \
 		--disable-oracle \
 		--disable-perl \
+		--disable-pinba \
 		--disable-python \
 		--disable-protocols \
 		--disable-routeros \
@@ -185,6 +188,30 @@
 PLIST_SUB+=	CURL="@comment "
 .endif
 
+.if defined(WITH_CURL_JSON)
+.if !defined(WITH_CURL)
+IGNORE=	using CURL_JSON requires CURL support
+.endif
+CONFIGURE_ARGS+=--enable-curl_json
+LIB_DEPENDS+=	yajl:${PORTSDIR}/devel/yajl
+PLIST_SUB+=	CURL_JSON=""
+.else
+CONFIGURE_ARGS+=--disable-curl_json
+PLIST_SUB+=	CURL_JSON="@comment "
+.endif
+
+.if defined(WITH_CURL_XML)
+.if !defined(WITH_CURL)
+IGNORE=	using CURL_XML requires CURL support
+.endif
+CONFIGURE_ARGS+=--enable-curl_xml
+LIB_DEPENDS+=	xml2:${PORTSDIR}/textproc/libxml2
+PLIST_SUB+=	CURL_XML=""
+.else
+CONFIGURE_ARGS+=--disable-curl_xml
+PLIST_SUB+=	CURL_XML="@comment "
+.endif
+
 .if defined(WITH_DBI)
 CONFIGURE_ARGS+=--enable-dbi --with-libdbi=${LOCALBASE}
 LIB_DEPENDS+=	dbi.1:${PORTSDIR}/databases/libdbi
diff -ruN /usr/ports/net-mgmt/collectd/distinfo collectd/distinfo
--- /usr/ports/net-mgmt/collectd/distinfo	2011-04-23 07:32:34.000000000 -0700
+++ collectd/distinfo	2011-05-10 18:22:58.000000000 -0700
@@ -1,2 +1,2 @@
-SHA256 (collectd-4.9.5.tar.gz) = a9ea4aabc2a65ecbf8bc1ed80d4510b40e188b82dec4ba232582880072b02359
-SIZE (collectd-4.9.5.tar.gz) = 1701068
+SHA256 (collectd-4.10.3.tar.gz) = 69797d19f1782b243d8737072171611ebb16f972dc0021402df66905b8746033
+SIZE (collectd-4.10.3.tar.gz) = 1743443
diff -ruN /usr/ports/net-mgmt/collectd/pkg-plist collectd/pkg-plist
--- /usr/ports/net-mgmt/collectd/pkg-plist	2011-04-23 07:32:34.000000000 -0700
+++ collectd/pkg-plist	2011-05-10 18:23:24.000000000 -0700
@@ -25,6 +25,10 @@
 lib/collectd/csv.so
 %%CURL%%lib/collectd/curl.la
 %%CURL%%lib/collectd/curl.so
+%%CURL_JSON%%lib/collectd/curl_json.la
+%%CURL_JSON%%lib/collectd/curl_json.so
+%%CURL_XML%%lib/collectd/curl_xml.la
+%%CURL_XML%%lib/collectd/curl_xml.so
 %%DBI%%lib/collectd/dbi.la
 %%DBI%%lib/collectd/dbi.so
 %%DISK%%lib/collectd/disk.la


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