From wtp@bsdserwis.com  Fri Aug 31 13:23:40 2012
Return-Path: <wtp@bsdserwis.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3BCBB106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 31 Aug 2012 13:23:40 +0000 (UTC)
	(envelope-from wtp@bsdserwis.com)
Received: from mx1.bsdserwis.com (ns37332.ovh.net [91.121.4.86])
	by mx1.freebsd.org (Postfix) with ESMTP id 07BA48FC14
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 31 Aug 2012 13:23:38 +0000 (UTC)
Received: by mx1.bsdserwis.com (Postfix, from userid 1000)
	id 2ABDA2CA5CC0; Fri, 31 Aug 2012 15:23:32 +0200 (CEST)
Message-Id: <20120831132332.2ABDA2CA5CC0@mx1.bsdserwis.com>
Date: Fri, 31 Aug 2012 15:23:32 +0200 (CEST)
From: Krzysztof Stryjek <ports@bsdserwis.com>
Reply-To: Krzysztof Stryjek <ports@bsdserwis.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: net-mgmt/collectd update - new options
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         171204
>Category:       ports
>Synopsis:       net-mgmt/collectd update - new options
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bdrewery
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 31 13:30:13 UTC 2012
>Closed-Date:    Wed Sep 12 17:08:19 CDT 2012
>Last-Modified:  Wed Sep 12 22:10:02 UTC 2012
>Originator:     Krzysztof Stryjek
>Release:        FreeBSD 7.3-STABLE amd64
>Organization:
private
>Environment:
System: FreeBSD dmc.bsdserwis.com 7.3-STABLE FreeBSD 7.3-STABLE #1: Fri May 7 15:18:19 CEST 2010 toor@dmc.bsdserwis.com:/home/usr/obj/home/usr/src/sys/IBM amd64

>Description:
	I've added more "plugins" do colletd port: http_write and libvirt

>How-To-Repeat:
	Just install port :-)
>Fix:

	Apply following patch:

diff -ruN collectd/Makefile collectd.new/Makefile
--- collectd/Makefile	2012-07-26 07:40:22.000000000 +0200
+++ collectd.new/Makefile	2012-08-31 15:17:42.000000000 +0200
@@ -7,7 +7,7 @@
 
 PORTNAME=	collectd
 PORTVERSION=	4.10.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://collectd.org/files/
 
@@ -46,7 +46,9 @@
 		TOKYOTYRANT	"Input: Tokyotyrant database"			Off \
 		XMMS		"Input: XMMS" 					Off \
 		RRDTOOL		"Output: RRDTool"				On \
-		RRDCACHED	"Output: RRDTool Cached (require RRDTOOL)"	On
+		RRDCACHED	"Output: RRDTool Cached (require RRDTOOL)"	On  \
+		VIRT		"Build with libvirt"				Off \
+		WRITE_HTTP	"Output: write_http"				Off
 
 MAN1=		collectd.1 collectd-nagios.1 collectdmon.1
 MAN5=		collectd.conf.5 collectd-email.5 collectd-exec.5 \
@@ -85,7 +87,6 @@
 		--disable-ipvs \
 		--disable-irq \
 		--disable-java \
-		--disable-libvirt \
 		--disable-madwifi \
 		--disable-match_empty_counter \
 		--disable-match_hashed \
@@ -121,7 +122,6 @@
 		--disable-vmem \
 		--disable-vserver \
 		--disable-wireless \
-		--disable-write_http \
 		--disable-zfs_arc \
 		--without-perl-bindings \
 		--without-librabbitmq \
@@ -378,6 +378,23 @@
 PLIST_SUB+=	TOKYOTYRANT="@comment "
 .endif
 
+.if defined(WITH_VIRT)
+CONFIGURE_ARGS+=--enable-libvirt
+LIB_DEPENDS+=	virt.9:${PORTSDIR}/devel/libvirt
+PLIST_SUB+=	VIRT=""
+.else
+CONFIGURE_ARGS+=--disable-libvirt
+PLIST_SUB+=	VIRT="@comment "
+.endif
+
+.if defined(WITH_WRITE_HTTP)
+CONFIGURE_ARGS+=--enable-write_http
+PLIST_SUB+=	WRITE_HTTP=""
+.else
+CONFIGURE_ARGS+=--disable-write_http
+PLIST_SUB+=	WRITE_HTTP="@comment "
+.endif
+
 .if defined(WITH_XMMS)
 LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
 CONFIGURE_ARGS+=--enable-xmms
diff -ruN collectd/pkg-plist collectd.new/pkg-plist
--- collectd/pkg-plist	2012-04-12 07:44:15.000000000 +0200
+++ collectd.new/pkg-plist	2012-08-31 15:17:37.000000000 +0200
@@ -101,11 +101,15 @@
 lib/collectd/uptime.la
 lib/collectd/uuid.so
 lib/collectd/uuid.la
+%%VIRT%%lib/collectd/libvirt.la
+%%VIRT%%lib/collectd/libvirt.so
+%%WRITE_HTTP%%lib/collectd/write_http.la
+%%WRITE_HTTP%%lib/collectd/write_http.so
+%%XMMS%%lib/collectd/xmms.la
+%%XMMS%%lib/collectd/xmms.so
 include/collectd/client.h
 include/collectd/lcc_features.h
 libdata/pkgconfig/libcollectdclient.pc
-%%XMMS%%lib/collectd/xmms.la
-%%XMMS%%lib/collectd/xmms.so
 %%DATADIR%%/postgresql_default.conf
 %%DATADIR%%/types.db
 @dirrm lib/collectd

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->bdrewery 
Responsible-Changed-By: bdrewery 
Responsible-Changed-When: Fri Aug 31 15:06:04 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171204 
State-Changed-From-To: open->feedback 
State-Changed-By: bdrewery 
State-Changed-When: Sat Sep 1 20:00:12 UTC 2012 
State-Changed-Why:  
Waiting on maintainer feedback. 

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

From: Bryan Drewery <bdrewery@FreeBSD.org>
To: ports@bsdserwis.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/171204: net-mgmt/collectd update - new options
Date: Sat, 01 Sep 2012 14:59:02 -0500

 Hi,
 
 The OPTIONS format has changed. Can you please update and submit an
 updated patch?
 See:
 http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/makefile-options.html
 
 You want something like:
 
 OPTIONS_DEFINE=	FOO BAR
 OPTIONS_DEFAULT=FOO
 FOO_DESC=	FOO support
 BAR_DESC=	BAR support
 
 And then:
 
 .if ${PORT_OPTIONS:MFOO}
 CONFIGURE_ARGS+= --with-foo
 .else
 ..
 .endif
 
 .if empty(PORT_OPTIONS:MBAR)
 CONFIGURE_ARGS+= --without-bar
 .else
 ..
 .endif
 
 Regards,
 Bryan

From: Krzysztof Stryjek <ports@bsdserwis.com>
To: Bryan Drewery <bdrewery@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/171204: net-mgmt/collectd update - new options
Date: Mon, 3 Sep 2012 02:24:19 +0200

 --i0/AhcQY5QxfSsSZ
 Content-Type: text/plain; charset=iso-8859-2
 Content-Disposition: inline
 
 Hello,
 
 On Sat, Sep 01, 2012 at 02:59:02PM -0500, Bryan Drewery wrote:
 > Hi,
 > 
 > The OPTIONS format has changed. Can you please update and submit an
 > updated patch?
 > See:
 > http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/makefile-options.html
 > 
 New patch attached. 
 
 Greetings,
 -- 
 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.
 
 --i0/AhcQY5QxfSsSZ
 Content-Type: text/x-diff; charset=iso-8859-2
 Content-Disposition: attachment; filename="collectd.patch"
 
 diff -ruN collectd/Makefile collectd.new/Makefile
 --- collectd/Makefile	2012-07-26 07:40:22.000000000 +0200
 +++ collectd.new/Makefile	2012-09-03 02:16:15.000000000 +0200
 @@ -7,7 +7,7 @@
  
  PORTNAME=	collectd
  PORTVERSION=	4.10.4
 -PORTREVISION=	5
 +PORTREVISION=	6
  CATEGORIES=	net-mgmt
  MASTER_SITES=	http://collectd.org/files/
  
 @@ -19,34 +19,41 @@
  USE_AUTOTOOLS=	autoconf autoheader automake libltdl
  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 \
 -		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 \
 -		GCRYPT		"Build with libgcrypt"				Off \
 -		NUTUPS		"Input: NUT UPS daemon" 			Off \
 -		INTERFACE 	"Input: Network interfaces (libstatgrab)" 	On  \
 -		MBMON		"Input: MBMon" 					Off \
 -		MEMCACHED	"Input: Memcached"				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  \
 -		PYTHON		"Input: Python plugin"				Off  \
 -		ROUTEROS	"Input: RouterOS plugin"			Off  \
 -		SNMP		"Input: SNMP" 					On  \
 -		TOKYOTYRANT	"Input: Tokyotyrant database"			Off \
 -		XMMS		"Input: XMMS" 					Off \
 -		RRDTOOL		"Output: RRDTool"				On \
 -		RRDCACHED	"Output: RRDTool Cached (require RRDTOOL)"	On
 +OPTIONS_DEFINE=	CGI BIND DEBUG APACHE APCUPS CURL CURL_JSON CURL_XML DBI DISK \
 +		GCRYPT NUTUPS INTERFACE MBMON MEMCACHED MYSQL NGINX OPENVPN \
 +		PDNS PGSQL PING PYTHON ROUTEROS SNMP TOKYOTYRANT XMMS RRDTOOL \
 +		RRDCACHED VIRT WRITE_HTTP
 +OPTIONS_DEFAULT=BIND INTERFACE PING SNMP RRDTOOL RRDCACHED
 +CGI_DESC=	"Install collection.cgi (requires RRDTOOL)"
 +BIND_DESC=	"Enable BIND 9.5+ statistics"
 +DEBUG_DESC=	"Enable debugging"
 +APACHE_DESC=	"Input: Apache mod_status (libcurl)"
 +APCUPS_DESC=	"Input: APC UPS (apcupsd)"
 +CURL_DESC=	"Input: CURL generic web statistics"
 +CURL_JSON_DESC=	"Input: CURL JSON generic web statistics"
 +CURL_XML_DESC=	"Input: CURL XML generic web statistics"
 +DBI_DESC=	"Input: database abstraction library"
 +DISK_DESC=	"Input: Disk performance statistics"
 +GCRYPT_DESC=	"Build with libgcrypt"
 +NUTUPS_DESC=	"Input: NUT UPS daemon"
 +INTERFACE_DESC=	"Input: Network interfaces (libstatgrab)"
 +MBMON_DESC=	"Input: MBMon" 
 +MEMCACHED_DESC=	"Input: Memcached"
 +MYSQL_DESC=	"Input: MySQL"
 +NGINX_DESC=	"Input: Nginx"
 +OPENVPN_DESC=	"Input: OpenVPN statistics"
 +PDNS_DESC=	"Input: PowerDNS"
 +PGSQL_DESC=	"Input: PostgreSQL"
 +PING_DESC=	"Input: Network latency (liboping)"
 +PYTHON_DESC=	"Input: Python plugin"
 +ROUTEROS_DESC=	"Input: RouterOS plugin"
 +SNMP_DESC=	"Input: SNMP"
 +TOKYOTYRANT_DESC="Input: Tokyotyrant database"
 +XMMS_DESC=	"Input: XMMS"
 +RRDTOOL_DESC=	"Output: RRDTool"
 +RRDCACHED_DESC=	"Output: RRDTool Cached (require RRDTOOL)"
 +VIRT_DESC=	"Build with libvirt"
 +WRITE_HTTP_DESC="Output: write_http"
  
  MAN1=		collectd.1 collectd-nagios.1 collectdmon.1
  MAN5=		collectd.conf.5 collectd-email.5 collectd-exec.5 \
 @@ -85,7 +92,6 @@
  		--disable-ipvs \
  		--disable-irq \
  		--disable-java \
 -		--disable-libvirt \
  		--disable-madwifi \
  		--disable-match_empty_counter \
  		--disable-match_hashed \
 @@ -121,7 +127,6 @@
  		--disable-vmem \
  		--disable-vserver \
  		--disable-wireless \
 -		--disable-write_http \
  		--disable-zfs_arc \
  		--without-perl-bindings \
  		--without-librabbitmq \
 @@ -132,22 +137,22 @@
  		--without-libesmtp \
  		--disable-static
  
 -.if defined(WITH_DEBUG)
 +.if defined(PORT_OPTIONS:DEBUG)
  CONFIGURE_ARGS+=--enable-debug
  .endif
  
 -.if defined(WITH_CGI)
 +.if defined(PORT_OPTIONS:CGI)
  RUN_DEPENDS+=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
  		p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm \
  		p5-Data-Dumper>=0:${PORTSDIR}/devel/p5-Data-Dumper \
  		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
  PLIST_SUB+=	CGI=""
 -WITH_RRDTOOL=	YES
 +PORT_OPTIONS:RRDTOOL=	YES
  .else
  PLIST_SUB+=	CGI="@comment "
  .endif
  
 -.if defined(WITH_BIND)
 +.if defined(PORT_OPTIONS:BIND)
  CONFIGURE_ARGS+=--enable-bind
  LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
  LIB_DEPENDS+=	xml2:${PORTSDIR}/textproc/libxml2
 @@ -157,7 +162,7 @@
  PLIST_SUB+=	BIND="@comment "
  .endif
  
 -.if defined(WITH_APACHE)
 +.if defined(PORT_OPTIONS:APACHE)
  CONFIGURE_ARGS+=--enable-apache
  LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
  PLIST_SUB+=	APACHE=""
 @@ -166,7 +171,7 @@
  PLIST_SUB+=	APACHE="@comment "
  .endif
  
 -.if defined(WITH_APCUPS)
 +.if defined(PORT_OPTIONS:APCUPS)
  CONFIGURE_ARGS+=--enable-apcups
  BUILD_DEPENDS+=	${LOCALBASE}/sbin/apcupsd:${PORTSDIR}/sysutils/apcupsd
  PLIST_SUB+=	APCUPS=""
 @@ -175,7 +180,7 @@
  PLIST_SUB+=	APCUPS="@comment "
  .endif
  
 -.if defined(WITH_CURL)
 +.if defined(PORT_OPTIONS:CURL)
  CONFIGURE_ARGS+=--enable-curl --with-libcurl=${LOCALBASE}
  LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
  PLIST_SUB+=	CURL=""
 @@ -184,8 +189,8 @@
  PLIST_SUB+=	CURL="@comment "
  .endif
  
 -.if defined(WITH_CURL_JSON)
 -.if !defined(WITH_CURL)
 +.if defined(PORT_OPTIONS:CURL_JSON)
 +.if !defined(PORT_OPTIONS:CURL)
  IGNORE=	using CURL_JSON requires CURL support
  .endif
  CONFIGURE_ARGS+=--enable-curl_json
 @@ -196,8 +201,8 @@
  PLIST_SUB+=	CURL_JSON="@comment "
  .endif
  
 -.if defined(WITH_CURL_XML)
 -.if !defined(WITH_CURL)
 +.if defined(PORT_OPTIONS:CURL_XML)
 +.if !defined(PORT_OPTIONS:CURL)
  IGNORE=	using CURL_XML requires CURL support
  .endif
  CONFIGURE_ARGS+=--enable-curl_xml
 @@ -208,7 +213,7 @@
  PLIST_SUB+=	CURL_XML="@comment "
  .endif
  
 -.if defined(WITH_DBI)
 +.if defined(PORT_OPTIONS:DBI)
  CONFIGURE_ARGS+=--enable-dbi --with-libdbi=${LOCALBASE}
  LIB_DEPENDS+=	dbi.1:${PORTSDIR}/databases/libdbi
  PLIST_SUB+=	DBI=""
 @@ -217,7 +222,7 @@
  PLIST_SUB+=	DBI="@comment "
  .endif
  
 -.if defined(WITH_DISK)
 +.if defined(PORT_OPTIONS:DISK)
  CONFIGURE_ARGS+=--enable-disk
  PLIST_SUB+=	DISK=""
  .else
 @@ -225,12 +230,12 @@
  PLIST_SUB+=	DISK="@comment "
  .endif
  
 -.if defined(WITH_GCRYPT)
 +.if defined(PORT_OPTIONS:GCRYPT)
  CONFIGURE_ARGS+=--with-libgcrypt-prefix=${LOCALBASE}
  LIB_DEPENDS+=	gcrypt.18:${PORTSDIR}/security/libgcrypt
  .endif
  
 -.if defined(WITH_NUTUPS)
 +.if defined(PORT_OPTIONS:NUTUPS)
  CONFIGURE_ARGS+=--enable-nut --with-upsclient
  LIB_DEPENDS+=	upsclient.1:${PORTSDIR}/sysutils/nut
  PLIST_SUB+=	NUTUPS=""
 @@ -239,7 +244,7 @@
  PLIST_SUB+=	NUTUPS="@comment "
  .endif
  
 -.if defined(WITH_INTERFACE)
 +.if defined(PORT_OPTIONS:INTERFACE)
  USE_PKGCONFIG=	yes
  CONFIGURE_ARGS+=--enable-interface
  LIB_DEPENDS+=	statgrab.8:${PORTSDIR}/devel/libstatgrab
 @@ -250,7 +255,7 @@
  PLIST_SUB+=	INTERFACE="@comment "
  .endif
  
 -.if defined(WITH_MBMON)
 +.if defined(PORT_OPTIONS:MBMON)
  CONFIGURE_ARGS+=--enable-mbmon
  RUN_DEPENDS+=	${LOCALBASE}/bin/mbmon:${PORTSDIR}/sysutils/mbmon
  PLIST_SUB+=	MBMON=""
 @@ -259,7 +264,7 @@
  PLIST_SUB+=	MBMON="@comment "
  .endif
  
 -.if defined(WITH_MEMCACHED)
 +.if defined(PORT_OPTIONS:MEMCACHED)
  LIB_DEPENDS+=	memcached.10:${PORTSDIR}/databases/libmemcached
  CONFIGURE_ARGS+=--enable-memcached
  CONFIGURE_ARGS+=--with-libmemcached=${LOCALBASE}
 @@ -269,7 +274,7 @@
  PLIST_SUB+=	MEMCACHED="@comment "
  .endif
  
 -.if defined(WITH_MYSQL)
 +.if defined(PORT_OPTIONS:MYSQL)
  USE_MYSQL=	yes
  CONFIGURE_ARGS+=--enable-mysql
  PLIST_SUB+=	MYSQL=""
 @@ -278,7 +283,7 @@
  PLIST_SUB+=	MYSQL="@comment "
  .endif
  
 -.if defined(WITH_NGINX)
 +.if defined(PORT_OPTIONS:NGINX)
  RUN_DEPENDS+=	nginx:${PORTSDIR}/www/nginx
  LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
  CONFIGURE_ARGS+=--enable-nginx
 @@ -288,7 +293,7 @@
  PLIST_SUB+=	NGINX="@comment "
  .endif
  
 -.if defined(WITH_OPENVPN)
 +.if defined(PORT_OPTIONS:OPENVPN)
  CONFIGURE_ARGS+=--enable-openvpn
  RUN_DEPENDS+=	${LOCALBASE}/sbin/openvpn:${PORTSDIR}/security/openvpn
  PLIST_SUB+=	OPENVPN=""
 @@ -297,7 +302,7 @@
  PLIST_SUB+=	OPENVPN="@comment "
  .endif
  
 -.if defined(WITH_PDNS)
 +.if defined(PORT_OPTIONS:PDNS)
  USE_PDNS=	yes
  CONFIGURE_ARGS+=--enable-powerdns
  PLIST_SUB+=	PDNS=""
 @@ -306,7 +311,7 @@
  PLIST_SUB+=	PDNS="@comment "
  .endif
  
 -.if defined(WITH_PGSQL)
 +.if defined(PORT_OPTIONS:PGSQL)
  USE_PGSQL=	yes
  CONFIGURE_ARGS+=--enable-postgresql
  PLIST_SUB+=	PGSQL=""
 @@ -315,7 +320,7 @@
  PLIST_SUB+=	PGSQL="@comment "
  .endif
  
 -.if defined(WITH_PING)
 +.if defined(PORT_OPTIONS:PING)
  LIB_DEPENDS+=	oping:${PORTSDIR}/net/liboping
  CONFIGURE_ARGS+=--enable-ping
  PLIST_SUB+=	PING=""
 @@ -324,7 +329,7 @@
  PLIST_SUB+=	PING="@comment "
  .endif
  
 -.if defined(WITH_PYTHON)
 +.if defined(PORT_OPTIONS:PYTHON)
  USE_PYTHON=		yes
  CONFIGURE_ARGS+=--enable-python
  PLIST_SUB+=	PYTHON=""
 @@ -333,7 +338,7 @@
  PLIST_SUB+=	PYTHON="@comment "
  .endif
  
 -.if defined(WITH_ROUTEROS)
 +.if defined(PORT_OPTIONS:ROUTEROS)
  LIB_DEPENDS+=	routeros:${PORTSDIR}/net/librouteros
  CONFIGURE_ARGS+=--enable-routeros --with-librouteros=${LOCALBASE}
  PLIST_SUB+=	ROUTEROS=""
 @@ -342,7 +347,7 @@
  PLIST_SUB+=	ROUTEROS="@comment "
  .endif
  
 -.if defined(WITH_RRDTOOL)
 +.if defined(PORT_OPTIONS:RRDTOOL)
  LIB_DEPENDS+=	rrd:${PORTSDIR}/databases/rrdtool
  CONFIGURE_ARGS+=--enable-rrdtool
  PLIST_SUB+=	RRD=""
 @@ -351,7 +356,7 @@
  PLIST_SUB+=	RRD="@comment "
  .endif
  
 -.if defined(WITH_RRDCACHED) && defined(WITH_RRDTOOL)
 +.if defined(PORT_OPTIONS:RRDCACHED) && defined(PORT_OPTIONS:RRDTOOL)
  CONFIGURE_ARGS+=--enable-rrdcached
  PLIST_SUB+=	RRDCACHED=""
  .else
 @@ -359,7 +364,7 @@
  PLIST_SUB+=	RRDCACHED="@comment "
  .endif
  
 -.if defined(WITH_SNMP)
 +.if defined(PORT_OPTIONS:SNMP)
  LIB_DEPENDS+=	netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
  CONFIGURE_ARGS+=--enable-snmp
  PLIST_SUB+=	SNMP=""
 @@ -368,7 +373,7 @@
  PLIST_SUB+=	SNMP="@comment "
  .endif
  
 -.if defined(WITH_TOKYOTYRANT)
 +.if defined(PORT_OPTIONS:TOKYOTYRANT)
  LIB_DEPENDS+=	tokyotyrant.3:${PORTSDIR}/databases/tokyotyrant
  CONFIGURE_ARGS+=--enable-tokyotyrant
  CONFIGURE_ARGS+=--with-libtokyotyrant=${LOCALBASE}
 @@ -378,7 +383,24 @@
  PLIST_SUB+=	TOKYOTYRANT="@comment "
  .endif
  
 -.if defined(WITH_XMMS)
 +.if defined(PORT_OPTIONS:VIRT)
 +CONFIGURE_ARGS+=--enable-libvirt
 +LIB_DEPENDS+=	virt.9:${PORTSDIR}/devel/libvirt
 +PLIST_SUB+=	VIRT=""
 +.else
 +CONFIGURE_ARGS+=--disable-libvirt
 +PLIST_SUB+=	VIRT="@comment "
 +.endif
 +
 +.if defined(PORT_OPTIONS:WRITE_HTTP)
 +CONFIGURE_ARGS+=--enable-write_http
 +PLIST_SUB+=	WRITE_HTTP=""
 +.else
 +CONFIGURE_ARGS+=--disable-write_http
 +PLIST_SUB+=	WRITE_HTTP="@comment "
 +.endif
 +
 +.if defined(PORT_OPTIONS:XMMS)
  LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
  CONFIGURE_ARGS+=--enable-xmms
  CFLAGS+=	`xmms-config --cflags`
 @@ -416,7 +438,7 @@
  		${CP} -p ${PREFIX}/etc/collectd.conf.sample \
  			${PREFIX}/etc/collectd.conf ; \
  	fi
 -.if defined(WITH_CGI)
 +.if defined(PORT_OPTIONS:CGI)
  	${MKDIR} ${WWWDIR}
  	${INSTALL_SCRIPT} ${WRKSRC}/contrib/collection.cgi ${WWWDIR}/
  	${INSTALL_DATA} ${WRKSRC}/contrib/collection.conf \
 diff -ruN collectd/pkg-plist collectd.new/pkg-plist
 --- collectd/pkg-plist	2012-04-12 07:44:15.000000000 +0200
 +++ collectd.new/pkg-plist	2012-08-31 15:17:37.000000000 +0200
 @@ -101,11 +101,15 @@
  lib/collectd/uptime.la
  lib/collectd/uuid.so
  lib/collectd/uuid.la
 +%%VIRT%%lib/collectd/libvirt.la
 +%%VIRT%%lib/collectd/libvirt.so
 +%%WRITE_HTTP%%lib/collectd/write_http.la
 +%%WRITE_HTTP%%lib/collectd/write_http.so
 +%%XMMS%%lib/collectd/xmms.la
 +%%XMMS%%lib/collectd/xmms.so
  include/collectd/client.h
  include/collectd/lcc_features.h
  libdata/pkgconfig/libcollectdclient.pc
 -%%XMMS%%lib/collectd/xmms.la
 -%%XMMS%%lib/collectd/xmms.so
  %%DATADIR%%/postgresql_default.conf
  %%DATADIR%%/types.db
  @dirrm lib/collectd
 
 --i0/AhcQY5QxfSsSZ--
State-Changed-From-To: feedback->open 
State-Changed-By: bdrewery 
State-Changed-When: Tue Sep 4 22:25:56 UTC 2012 
State-Changed-Why:  
Feedback received 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171204 
State-Changed-From-To: open->closed 
State-Changed-By: bdrewery 
State-Changed-When: Wed Sep 12 17:08:16 CDT 2012 
State-Changed-Why:  
Committed with other minor changes. Also fixed the build with clang 
using vendor fix from https://github.com/collectd/collectd/issues/49. 
Also fixed up some of the Options conversion, please review 
http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/makefile-options.html 
again as the format is PORT_OPTIONS:Moption, that M is needed. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/171204: commit references a PR
Date: Wed, 12 Sep 2012 22:07:20 +0000 (UTC)

 Author: bdrewery
 Date: Wed Sep 12 22:07:07 2012
 New Revision: 304166
 URL: http://svn.freebsd.org/changeset/ports/304166
 
 Log:
   - Add VIRT and WRITE_HTTP options [1]
   - Convert to new options framework [1]
   - Remove ABI versions from LIB_DEPENDS
   - Fix build with Clang by using upstream patch [2]
   
   Upstream fix:
   	https://github.com/collectd/collectd/issues/49 [2]
   
   PR:		ports/171204 [1]
   Submitted by:	Krzysztof Stryjek <ports@bsdserwis.com> (maintainer)
 
 Modified:
   head/net-mgmt/collectd/Makefile
   head/net-mgmt/collectd/files/patch-src__network.c
   head/net-mgmt/collectd/pkg-plist
 
 Modified: head/net-mgmt/collectd/Makefile
 ==============================================================================
 --- head/net-mgmt/collectd/Makefile	Wed Sep 12 21:39:41 2012	(r304165)
 +++ head/net-mgmt/collectd/Makefile	Wed Sep 12 22:07:07 2012	(r304166)
 @@ -7,7 +7,7 @@
  
  PORTNAME=	collectd
  PORTVERSION=	4.10.4
 -PORTREVISION=	5
 +PORTREVISION=	6
  CATEGORIES=	net-mgmt
  MASTER_SITES=	http://collectd.org/files/
  
 @@ -19,34 +19,46 @@ GNU_CONFIGURE=	yes
  USE_AUTOTOOLS=	autoconf autoheader automake libltdl
  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 \
 -		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 \
 -		GCRYPT		"Build with libgcrypt"				Off \
 -		NUTUPS		"Input: NUT UPS daemon" 			Off \
 -		INTERFACE 	"Input: Network interfaces (libstatgrab)" 	On  \
 -		MBMON		"Input: MBMon" 					Off \
 -		MEMCACHED	"Input: Memcached"				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  \
 -		PYTHON		"Input: Python plugin"				Off  \
 -		ROUTEROS	"Input: RouterOS plugin"			Off  \
 -		SNMP		"Input: SNMP" 					On  \
 -		TOKYOTYRANT	"Input: Tokyotyrant database"			Off \
 -		XMMS		"Input: XMMS" 					Off \
 -		RRDTOOL		"Output: RRDTool"				On \
 -		RRDCACHED	"Output: RRDTool Cached (require RRDTOOL)"	On
 +OPTIONS_DEFINE=		CGI BIND DEBUG GCRYPT VIRT
 +OPTIONS_MULTI=		INPUT OUTPUT
 +OPTIONS_MULTI_OUTPUT=	RRDTOOL RRDCACHED WRITE_HTTP
 +OPTIONS_MULTI_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=	BIND INTERFACE PING SNMP RRDTOOL RRDCACHED
 +
 +CGI_DESC=		Install collection.cgi (requires RRDTOOL)
 +BIND_DESC=		Enable BIND 9.5+ statistics
 +DEBUG_DESC=		Enable debugging
 +GCRYPT_DESC=		Build with libgcrypt
 +VIRT_DESC=		Build with libvirt
 +# 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
 +MYSQL_DESC=		MySQL
 +NGINX_DESC=		Nginx
 +OPENVPN_DESC=		OpenVPN statistics
 +PDNS_DESC=		PowerDNS
 +PGSQL_DESC=		PostgreSQL
 +PING_DESC=		Network latency (liboping)
 +PYTHON_DESC=		Python plugin
 +ROUTEROS_DESC=		RouterOS plugin
 +SNMP_DESC=		SNMP
 +TOKYOTYRANT_DESC=	Tokyotyrant database
 +XMMS_DESC=		XMMS
 +# OUTPUT
 +RRDTOOL_DESC=		RRDTool
 +RRDCACHED_DESC=		RRDTool Cached (require RRDTOOL)
 +WRITE_HTTP_DESC=	write_http
  
  MAN1=		collectd.1 collectd-nagios.1 collectdmon.1
  MAN5=		collectd.conf.5 collectd-email.5 collectd-exec.5 \
 @@ -85,7 +97,6 @@ CONFIGURE_ARGS=	--localstatedir=/var \
  		--disable-ipvs \
  		--disable-irq \
  		--disable-java \
 -		--disable-libvirt \
  		--disable-madwifi \
  		--disable-match_empty_counter \
  		--disable-match_hashed \
 @@ -121,7 +132,6 @@ CONFIGURE_ARGS=	--localstatedir=/var \
  		--disable-vmem \
  		--disable-vserver \
  		--disable-wireless \
 -		--disable-write_http \
  		--disable-zfs_arc \
  		--without-perl-bindings \
  		--without-librabbitmq \
 @@ -132,22 +142,24 @@ CONFIGURE_ARGS=	--localstatedir=/var \
  		--without-libesmtp \
  		--disable-static
  
 -.if defined(WITH_DEBUG)
 +.if ${PORT_OPTIONS:MDEBUG}
  CONFIGURE_ARGS+=--enable-debug
  .endif
  
 -.if defined(WITH_CGI)
 +.if ${PORT_OPTIONS:MCGI}
  RUN_DEPENDS+=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
  		p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm \
  		p5-Data-Dumper>=0:${PORTSDIR}/devel/p5-Data-Dumper \
  		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
  PLIST_SUB+=	CGI=""
 -WITH_RRDTOOL=	YES
 +.  if empty(PORT_OPTIONS:MRRDTOOL)
 +IGNORE=		CGI requires RRDTOOL. Either select RRDTOOL or deselect CGI
 +.  endif
  .else
  PLIST_SUB+=	CGI="@comment "
  .endif
  
 -.if defined(WITH_BIND)
 +.if ${PORT_OPTIONS:MBIND}
  CONFIGURE_ARGS+=--enable-bind
  LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
  LIB_DEPENDS+=	xml2:${PORTSDIR}/textproc/libxml2
 @@ -157,16 +169,16 @@ CONFIGURE_ARGS+=--disable-bind
  PLIST_SUB+=	BIND="@comment "
  .endif
  
 -.if defined(WITH_APACHE)
 +.if ${PORT_OPTIONS:MAPACHE}
  CONFIGURE_ARGS+=--enable-apache
 -LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
 +LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
  PLIST_SUB+=	APACHE=""
  .else
  CONFIGURE_ARGS+=--disable-apache
  PLIST_SUB+=	APACHE="@comment "
  .endif
  
 -.if defined(WITH_APCUPS)
 +.if ${PORT_OPTIONS:MAPCUPS}
  CONFIGURE_ARGS+=--enable-apcups
  BUILD_DEPENDS+=	${LOCALBASE}/sbin/apcupsd:${PORTSDIR}/sysutils/apcupsd
  PLIST_SUB+=	APCUPS=""
 @@ -175,17 +187,17 @@ CONFIGURE_ARGS+=--disable-apcups
  PLIST_SUB+=	APCUPS="@comment "
  .endif
  
 -.if defined(WITH_CURL)
 +.if ${PORT_OPTIONS:MCURL}
  CONFIGURE_ARGS+=--enable-curl --with-libcurl=${LOCALBASE}
 -LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
 +LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
  PLIST_SUB+=	CURL=""
  .else
  CONFIGURE_ARGS+=--disable-curl
  PLIST_SUB+=	CURL="@comment "
  .endif
  
 -.if defined(WITH_CURL_JSON)
 -.if !defined(WITH_CURL)
 +.if ${PORT_OPTIONS:MCURL_JSON}
 +.if empty(PORT_OPTIONS:MCURL)
  IGNORE=	using CURL_JSON requires CURL support
  .endif
  CONFIGURE_ARGS+=--enable-curl_json
 @@ -196,8 +208,8 @@ CONFIGURE_ARGS+=--disable-curl_json --wi
  PLIST_SUB+=	CURL_JSON="@comment "
  .endif
  
 -.if defined(WITH_CURL_XML)
 -.if !defined(WITH_CURL)
 +.if ${PORT_OPTIONS:MCURL_XML}
 +.if empty(PORT_OPTIONS:MCURL)
  IGNORE=	using CURL_XML requires CURL support
  .endif
  CONFIGURE_ARGS+=--enable-curl_xml
 @@ -208,16 +220,16 @@ CONFIGURE_ARGS+=--disable-curl_xml
  PLIST_SUB+=	CURL_XML="@comment "
  .endif
  
 -.if defined(WITH_DBI)
 +.if ${PORT_OPTIONS:MDBI}
  CONFIGURE_ARGS+=--enable-dbi --with-libdbi=${LOCALBASE}
 -LIB_DEPENDS+=	dbi.1:${PORTSDIR}/databases/libdbi
 +LIB_DEPENDS+=	dbi:${PORTSDIR}/databases/libdbi
  PLIST_SUB+=	DBI=""
  .else
  CONFIGURE_ARGS+=--disable-dbi
  PLIST_SUB+=	DBI="@comment "
  .endif
  
 -.if defined(WITH_DISK)
 +.if ${PORT_OPTIONS:MDISK}
  CONFIGURE_ARGS+=--enable-disk
  PLIST_SUB+=	DISK=""
  .else
 @@ -225,24 +237,24 @@ CONFIGURE_ARGS+=--disable-disk
  PLIST_SUB+=	DISK="@comment "
  .endif
  
 -.if defined(WITH_GCRYPT)
 +.if ${PORT_OPTIONS:MGCRYPT}
  CONFIGURE_ARGS+=--with-libgcrypt-prefix=${LOCALBASE}
 -LIB_DEPENDS+=	gcrypt.18:${PORTSDIR}/security/libgcrypt
 +LIB_DEPENDS+=	gcrypt8:${PORTSDIR}/security/libgcrypt
  .endif
  
 -.if defined(WITH_NUTUPS)
 +.if ${PORT_OPTIONS:MNUTUPS}
  CONFIGURE_ARGS+=--enable-nut --with-upsclient
 -LIB_DEPENDS+=	upsclient.1:${PORTSDIR}/sysutils/nut
 +LIB_DEPENDS+=	upsclient:${PORTSDIR}/sysutils/nut
  PLIST_SUB+=	NUTUPS=""
  .else
  CONFIGURE_ARGS+=--disable-nut --without-libupsclient
  PLIST_SUB+=	NUTUPS="@comment "
  .endif
  
 -.if defined(WITH_INTERFACE)
 +.if ${PORT_OPTIONS:MINTERFACE}
  USE_PKGCONFIG=	yes
  CONFIGURE_ARGS+=--enable-interface
 -LIB_DEPENDS+=	statgrab.8:${PORTSDIR}/devel/libstatgrab
 +LIB_DEPENDS+=	statgrab:${PORTSDIR}/devel/libstatgrab
  PLIST_SUB+=	INTERFACE=""
  CONFIGURE_ENV+=	LIBS="`pkg-config --libs libstatgrab`"
  .else
 @@ -250,7 +262,7 @@ CONFIGURE_ARGS+=--disable-interface
  PLIST_SUB+=	INTERFACE="@comment "
  .endif
  
 -.if defined(WITH_MBMON)
 +.if ${PORT_OPTIONS:MMBMON}
  CONFIGURE_ARGS+=--enable-mbmon
  RUN_DEPENDS+=	${LOCALBASE}/bin/mbmon:${PORTSDIR}/sysutils/mbmon
  PLIST_SUB+=	MBMON=""
 @@ -259,8 +271,8 @@ CONFIGURE_ARGS+=--disable-mbmon
  PLIST_SUB+=	MBMON="@comment "
  .endif
  
 -.if defined(WITH_MEMCACHED)
 -LIB_DEPENDS+=	memcached.10:${PORTSDIR}/databases/libmemcached
 +.if ${PORT_OPTIONS:MMEMCACHED}
 +LIB_DEPENDS+=	memcached:${PORTSDIR}/databases/libmemcached
  CONFIGURE_ARGS+=--enable-memcached
  CONFIGURE_ARGS+=--with-libmemcached=${LOCALBASE}
  PLIST_SUB+=	MEMCACHED=""
 @@ -269,7 +281,7 @@ CONFIGURE_ARGS+=--disable-memcached --wi
  PLIST_SUB+=	MEMCACHED="@comment "
  .endif
  
 -.if defined(WITH_MYSQL)
 +.if ${PORT_OPTIONS:MMYSQL}
  USE_MYSQL=	yes
  CONFIGURE_ARGS+=--enable-mysql
  PLIST_SUB+=	MYSQL=""
 @@ -278,9 +290,9 @@ CONFIGURE_ARGS+=--disable-mysql
  PLIST_SUB+=	MYSQL="@comment "
  .endif
  
 -.if defined(WITH_NGINX)
 +.if ${PORT_OPTIONS:MNGINX}
  RUN_DEPENDS+=	nginx:${PORTSDIR}/www/nginx
 -LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
 +LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
  CONFIGURE_ARGS+=--enable-nginx
  PLIST_SUB+=	NGINX=""
  .else
 @@ -288,7 +300,7 @@ CONFIGURE_ARGS+=--disable-nginx
  PLIST_SUB+=	NGINX="@comment "
  .endif
  
 -.if defined(WITH_OPENVPN)
 +.if ${PORT_OPTIONS:MOPENVPN}
  CONFIGURE_ARGS+=--enable-openvpn
  RUN_DEPENDS+=	${LOCALBASE}/sbin/openvpn:${PORTSDIR}/security/openvpn
  PLIST_SUB+=	OPENVPN=""
 @@ -297,7 +309,7 @@ CONFIGURE_ARGS+=--disable-openvpn
  PLIST_SUB+=	OPENVPN="@comment "
  .endif
  
 -.if defined(WITH_PDNS)
 +.if ${PORT_OPTIONS:MPDNS}
  USE_PDNS=	yes
  CONFIGURE_ARGS+=--enable-powerdns
  PLIST_SUB+=	PDNS=""
 @@ -306,7 +318,7 @@ CONFIGURE_ARGS+=--disable-powerdns
  PLIST_SUB+=	PDNS="@comment "
  .endif
  
 -.if defined(WITH_PGSQL)
 +.if ${PORT_OPTIONS:MPGSQL}
  USE_PGSQL=	yes
  CONFIGURE_ARGS+=--enable-postgresql
  PLIST_SUB+=	PGSQL=""
 @@ -315,7 +327,7 @@ CONFIGURE_ARGS+=--disable-postgresql
  PLIST_SUB+=	PGSQL="@comment "
  .endif
  
 -.if defined(WITH_PING)
 +.if ${PORT_OPTIONS:MPING}
  LIB_DEPENDS+=	oping:${PORTSDIR}/net/liboping
  CONFIGURE_ARGS+=--enable-ping
  PLIST_SUB+=	PING=""
 @@ -324,7 +336,7 @@ CONFIGURE_ARGS+=--disable-ping
  PLIST_SUB+=	PING="@comment "
  .endif
  
 -.if defined(WITH_PYTHON)
 +.if ${PORT_OPTIONS:MPYTHON}
  USE_PYTHON=		yes
  CONFIGURE_ARGS+=--enable-python
  PLIST_SUB+=	PYTHON=""
 @@ -333,7 +345,7 @@ CONFIGURE_ARGS+=--disable-python
  PLIST_SUB+=	PYTHON="@comment "
  .endif
  
 -.if defined(WITH_ROUTEROS)
 +.if ${PORT_OPTIONS:MROUTEROS}
  LIB_DEPENDS+=	routeros:${PORTSDIR}/net/librouteros
  CONFIGURE_ARGS+=--enable-routeros --with-librouteros=${LOCALBASE}
  PLIST_SUB+=	ROUTEROS=""
 @@ -342,7 +354,7 @@ CONFIGURE_ARGS+=--disable-routeros --wit
  PLIST_SUB+=	ROUTEROS="@comment "
  .endif
  
 -.if defined(WITH_RRDTOOL)
 +.if ${PORT_OPTIONS:MRRDTOOL}
  LIB_DEPENDS+=	rrd:${PORTSDIR}/databases/rrdtool
  CONFIGURE_ARGS+=--enable-rrdtool
  PLIST_SUB+=	RRD=""
 @@ -351,7 +363,7 @@ CONFIGURE_ARGS+=--disable-rrdtool
  PLIST_SUB+=	RRD="@comment "
  .endif
  
 -.if defined(WITH_RRDCACHED) && defined(WITH_RRDTOOL)
 +.if ${PORT_OPTIONS:MRRDCACHED} && ${PORT_OPTIONS:MRRDTOOL}
  CONFIGURE_ARGS+=--enable-rrdcached
  PLIST_SUB+=	RRDCACHED=""
  .else
 @@ -359,8 +371,8 @@ CONFIGURE_ARGS+=--disable--rrdcached
  PLIST_SUB+=	RRDCACHED="@comment "
  .endif
  
 -.if defined(WITH_SNMP)
 -LIB_DEPENDS+=	netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
 +.if ${PORT_OPTIONS:MSNMP}
 +LIB_DEPENDS+=	netsnmp:${PORTSDIR}/net-mgmt/net-snmp
  CONFIGURE_ARGS+=--enable-snmp
  PLIST_SUB+=	SNMP=""
  .else
 @@ -368,8 +380,8 @@ CONFIGURE_ARGS+=--disable-snmp
  PLIST_SUB+=	SNMP="@comment "
  .endif
  
 -.if defined(WITH_TOKYOTYRANT)
 -LIB_DEPENDS+=	tokyotyrant.3:${PORTSDIR}/databases/tokyotyrant
 +.if ${PORT_OPTIONS:MTOKYOTYRANT}
 +LIB_DEPENDS+=	tokyotyrant:${PORTSDIR}/databases/tokyotyrant
  CONFIGURE_ARGS+=--enable-tokyotyrant
  CONFIGURE_ARGS+=--with-libtokyotyrant=${LOCALBASE}
  PLIST_SUB+=	TOKYOTYRANT=""
 @@ -378,8 +390,25 @@ CONFIGURE_ARGS+=--disable-tokyotyrant --
  PLIST_SUB+=	TOKYOTYRANT="@comment "
  .endif
  
 -.if defined(WITH_XMMS)
 -LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
 +.if ${PORT_OPTIONS:MVIRT}
 +CONFIGURE_ARGS+=--enable-libvirt
 +LIB_DEPENDS+=	virt:${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+=	xmms:${PORTSDIR}/multimedia/xmms
  CONFIGURE_ARGS+=--enable-xmms
  CFLAGS+=	`xmms-config --cflags`
  PLIST_SUB+=	XMMS=""
 @@ -416,7 +445,7 @@ post-install:
  		${CP} -p ${PREFIX}/etc/collectd.conf.sample \
  			${PREFIX}/etc/collectd.conf ; \
  	fi
 -.if defined(WITH_CGI)
 +.if ${PORT_OPTIONS:MCGI}
  	${MKDIR} ${WWWDIR}
  	${INSTALL_SCRIPT} ${WRKSRC}/contrib/collection.cgi ${WWWDIR}/
  	${INSTALL_DATA} ${WRKSRC}/contrib/collection.conf \
 
 Modified: head/net-mgmt/collectd/files/patch-src__network.c
 ==============================================================================
 --- head/net-mgmt/collectd/files/patch-src__network.c	Wed Sep 12 21:39:41 2012	(r304165)
 +++ head/net-mgmt/collectd/files/patch-src__network.c	Wed Sep 12 22:07:07 2012	(r304166)
 @@ -10,3 +10,32 @@
   GCRY_THREAD_OPTION_PTHREAD_IMPL;
   #endif
   
 +--- src/network.c
 ++++ src/network.c
 +@@ -704,7 +704,7 @@ static int parse_part_values (void **ret_buffer, size_t *ret_buffer_len,
 + 
 + 	exp_size = 3 * sizeof (uint16_t)
 + 		+ pkg_numval * (sizeof (uint8_t) + sizeof (value_t));
 +-	if ((buffer_len < 0) || (buffer_len < exp_size))
 ++	if (buffer_len < exp_size)
 + 	{
 + 		WARNING ("network plugin: parse_part_values: "
 + 				"Packet too short: "
 +@@ -789,7 +789,7 @@ static int parse_part_number (void **ret_buffer, size_t *ret_buffer_len,
 + 
 + 	uint16_t pkg_length;
 + 
 +-	if ((buffer_len < 0) || ((size_t) buffer_len < exp_size))
 ++	if (buffer_len < exp_size)
 + 	{
 + 		WARNING ("network plugin: parse_part_number: "
 + 				"Packet too short: "
 +@@ -828,7 +828,7 @@ static int parse_part_string (void **ret_buffer, size_t *ret_buffer_len,
 + 
 + 	uint16_t pkg_length;
 + 
 +-	if ((buffer_len < 0) || (buffer_len < header_size))
 ++	if (buffer_len < header_size)
 + 	{
 + 		WARNING ("network plugin: parse_part_string: "
 + 				"Packet too short: "
 
 Modified: head/net-mgmt/collectd/pkg-plist
 ==============================================================================
 --- head/net-mgmt/collectd/pkg-plist	Wed Sep 12 21:39:41 2012	(r304165)
 +++ head/net-mgmt/collectd/pkg-plist	Wed Sep 12 22:07:07 2012	(r304166)
 @@ -101,11 +101,15 @@ lib/collectd/uptime.so
  lib/collectd/uptime.la
  lib/collectd/uuid.so
  lib/collectd/uuid.la
 +%%VIRT%%lib/collectd/libvirt.la
 +%%VIRT%%lib/collectd/libvirt.so
 +%%WRITE_HTTP%%lib/collectd/write_http.la
 +%%WRITE_HTTP%%lib/collectd/write_http.so
 +%%XMMS%%lib/collectd/xmms.la
 +%%XMMS%%lib/collectd/xmms.so
  include/collectd/client.h
  include/collectd/lcc_features.h
  libdata/pkgconfig/libcollectdclient.pc
 -%%XMMS%%lib/collectd/xmms.la
 -%%XMMS%%lib/collectd/xmms.so
  %%DATADIR%%/postgresql_default.conf
  %%DATADIR%%/types.db
  @dirrm lib/collectd
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
