Date: Mon, 8 Jul 2013 21:49:14 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322541 - head/net-mgmt/collectd Message-ID: <201307082149.r68LnEo6029804@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Mon Jul 8 21:49:14 2013 New Revision: 322541 URL: http://svnweb.freebsd.org/changeset/ports/322541 Log: net-mgmt/collectd: sanity checking for options requiring CURL For options that actually require CURL, check to see if it is enabled before we even try to build. PR: ports/180376 Submitted by: brd Approved by: maintainer Modified: head/net-mgmt/collectd/Makefile Modified: head/net-mgmt/collectd/Makefile ============================================================================== --- head/net-mgmt/collectd/Makefile Mon Jul 8 21:31:53 2013 (r322540) +++ head/net-mgmt/collectd/Makefile Mon Jul 8 21:49:14 2013 (r322541) @@ -155,6 +155,9 @@ CONFIGURE_ARGS+=--enable-bind 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 @@ PLIST_SUB+= BIND="@comment " 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 @@ PLIST_SUB+= MYSQL="@comment " 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 "
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307082149.r68LnEo6029804>