From nobody@FreeBSD.org  Wed May 11 01:49:43 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CAF8B106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 11 May 2011 01:49:43 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id AFCBE8FC15
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 11 May 2011 01:49:43 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p4B1nhlV000459
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 11 May 2011 01:49:43 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p4B1nhR1000458;
	Wed, 11 May 2011 01:49:43 GMT
	(envelope-from nobody)
Message-Id: <201105110149.p4B1nhR1000458@red.freebsd.org>
Date: Wed, 11 May 2011 01:49:43 GMT
From: Benjamin Lee <ben@b1c1l1.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] update net-mgmt/collectd to 4.10.3
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: ports@bsdserwis.com

>Number:         156943
>Category:       ports
>Synopsis:       [patch] update net-mgmt/collectd to 4.10.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sahil
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 11 01:50:12 UTC 2011
>Closed-Date:    Tue May 17 01:07:12 UTC 2011
>Last-Modified:  Tue May 17 01:10:14 UTC 2011
>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@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:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed May 11 01:50:26 UTC 2011 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=156943 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: ports@bsdserwis.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/156943: [patch] update net-mgmt/collectd to 4.10.3
Date: Wed, 11 May 2011 01:50:24 UT

 Maintainer of net-mgmt/collectd,
 
 Please note that PR ports/156943 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/156943
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Krzysztof Stryjek <ports@bsdserwis.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: Re: ports/156943: [patch] update net-mgmt/collectd to 4.10.3
Date: Wed, 11 May 2011 22:34:42 +0200

 Hello,
 
 On Wed, May 11, 2011 at 01:50:24AM +0000, Edwin Groothuis wrote:
 > Maintainer of net-mgmt/collectd,
 > 
 > Please note that PR ports/156943 has just been submitted.
 > 
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 > 
 > The full text of the PR can be found at:
 >     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/156943
 > 
 I approve this patch
 
 Greeting,
 -- 
 Krzysztof Stryjek
 UNIX administrator/Juniper Networks Specialist
 email: wtp (at) bsdserwis (dot) com
 http://www.linkedin.com/in/KrzysztofStryjek
 GPG fingerprint: 8BD7 40CE 8994 0BBE CE6C  91CD 1292 8959 DC61 0E76
 
 In theory, there is no difference between theory and practice.
 In practice, there is.
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Thu May 12 13:12:11 UTC 2011 
State-Changed-Why:  
Maintainer approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=156943 
Responsible-Changed-From-To: freebsd-ports-bugs->sahil 
Responsible-Changed-By: sahil 
Responsible-Changed-When: Mon May 16 01:07:46 UTC 2011 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=156943 
State-Changed-From-To: open->closed 
State-Changed-By: sahil 
State-Changed-When: Tue May 17 01:07:11 UTC 2011 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=156943 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/156943: commit references a PR
Date: Tue, 17 May 2011 01:07:01 +0000 (UTC)

 sahil       2011-05-17 01:06:46 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-mgmt/collectd    Makefile distinfo pkg-plist 
   Log:
   - Update to 4.10.3 [1]
   
   While here, pacify portlint by removing CPPFLAGS from
   CONFIGURE_ENV; the former is passed to underlying
   configure scripts via bsd.port.mk.
   
   PR:             ports/156943 [1]
   Submitted by:   Benjamin Lee <ben@b1c1l1.com>
   Approved by:    Krzysztof Stryjek <ports@bsdserwis.com> (maintainer)
   
   Revision  Changes    Path
   1.25      +32 -4     ports/net-mgmt/collectd/Makefile
   1.7       +2 -2      ports/net-mgmt/collectd/distinfo
   1.11      +4 -0      ports/net-mgmt/collectd/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
