ports/174903: [PATCH] net-mgmt/collectd: Allow not selecting INPUT/OUTPUT so RRDTOOL is not required

[Bryan Drewery]

>Number:         174903
>Category:       ports
>Synopsis:       [PATCH] net-mgmt/collectd: Allow not selecting INPUT/OUTPUT so RRDTOOL is not required
>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 Jan 02 16:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Bryan Drewery
>Release:        FreeBSD 8.3-RELEASE-p5 i386
>Organization:
>Environment:

	
>Description:
	The conversion to the new options framework ended up requiring that *at least* 1 of INPUT and OUTPUT is selected. This, for example, requires RRDTOOL to be selected, when it may not be wanted on a particular system. The previous port version did not require this.
>How-To-Repeat:
	'make config' and deselect all INPUT/OUTPUT options, it will require you to select at least one.
>Fix:

	The attached patch uses the new GROUP option type to allow selecting *0 or more*. Which allows to deselect all INPUT/OUTPUT, or select multiple.

--- patch-collectd-group.txt begins here ---
# svn status
M       collectd/Makefile
M       collectd5/Makefile

Index: collectd/Makefile
===================================================================
--- collectd/Makefile	(revision 309821)
+++ collectd/Makefile	(working copy)
@@ -16,9 +16,9 @@
 WANT_GNOME=	yes
 
 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 \
+OPTIONS_GROUP=		INPUT OUTPUT
+OPTIONS_GROUP_OUTPUT=	RRDTOOL RRDCACHED WRITE_HTTP
+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=	BIND INTERFACE PING SNMP RRDTOOL RRDCACHED
Index: collectd5/Makefile
===================================================================
--- collectd5/Makefile	(revision 309821)
+++ collectd5/Makefile	(working copy)
@@ -17,9 +17,9 @@
 LATEST_LINK=	collectd5
 
 OPTIONS_DEFINE=		CGI BIND DEBUG GCRYPT VIRT
-OPTIONS_MULTI=		INPUT OUTPUT
-OPTIONS_MULTI_OUTPUT=	RRDTOOL RRDCACHED WRITE_GRAPHITE WRITE_HTTP
-OPTIONS_MULTI_INPUT=	APACHE APCUPS CURL CURL_JSON CURL_XML DBI DISK \
+OPTIONS_GROUP=		INPUT OUTPUT
+OPTIONS_GROUP_OUTPUT=	RRDTOOL RRDCACHED WRITE_GRAPHITE WRITE_HTTP
+OPTIONS_GROUP_INPUT=	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
 OPTIONS_DEFAULT=	BIND INTERFACE PING SNMP RRDTOOL RRDCACHED
--- patch-collectd-group.txt ends here ---


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