Date: Sun, 7 Jul 2013 22:59:30 -0600 (MDT) From: Brad Davis <brd@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/180376: [patch] net-mgmt/collectd: Add more sanity checking for options dependencies Message-ID: <20130708045930.C9CCA8FF88@valentine.liquidneon.com> Resent-Message-ID: <201307080500.r68500hG085554@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 180376
>Category: ports
>Synopsis: [patch] net-mgmt/collectd: Add more sanity checking for options dependencies
>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: Mon Jul 08 05:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Brad Davis
>Release: FreeBSD 9.1-RELEASE i386
>Organization:
>Environment:
>Description:
For options that actually require CURL, check to see if it is enabled before we even try to build
>How-To-Repeat:
>Fix:
--- collectd-curloptions begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 322461)
+++ Makefile (working copy)
@@ -155,6 +155,9 @@
LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
LIB_DEPENDS+= xml2:${PORTSDIR}/textproc/libxml2
PLIST_SUB+= BIND=""
+. if empty(PORT_OPTIONS:MCURL)
+IGNORE= BIND requires CURL. Either select CURL or deselect BIND
+. endif
.else
CONFIGURE_ARGS+=--disable-bind
PLIST_SUB+= BIND="@comment "
@@ -164,6 +167,9 @@
CONFIGURE_ARGS+=--enable-apache
LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
PLIST_SUB+= APACHE=""
+. if empty(PORT_OPTIONS:MCURL)
+IGNORE= APACHE requires CURL. Either select CURL or deselect APACHE
+. endif
.else
CONFIGURE_ARGS+=--disable-apache
PLIST_SUB+= APACHE="@comment "
@@ -285,6 +291,9 @@
LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
CONFIGURE_ARGS+=--enable-nginx
PLIST_SUB+= NGINX=""
+. if empty(PORT_OPTIONS:MCURL)
+IGNORE= NGINX requires CURL. Either select CURL or deselect NGINX
+. endif
.else
CONFIGURE_ARGS+=--disable-nginx
PLIST_SUB+= NGINX="@comment "
--- collectd-curloptions ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130708045930.C9CCA8FF88>