From owner-svn-ports-all@FreeBSD.ORG  Mon Jul  8 21:49:14 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id DBB01FB6;
 Mon,  8 Jul 2013 21:49:14 +0000 (UTC) (envelope-from wg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id CD5911B02;
 Mon,  8 Jul 2013 21:49:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r68LnE4X029805;
 Mon, 8 Jul 2013 21:49:14 GMT (envelope-from wg@svn.freebsd.org)
Received: (from wg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r68LnEo6029804;
 Mon, 8 Jul 2013 21:49:14 GMT (envelope-from wg@svn.freebsd.org)
Message-Id: <201307082149.r68LnEo6029804@svn.freebsd.org>
From: William Grzybowski <wg@FreeBSD.org>
Date: Mon, 8 Jul 2013 21:49:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r322541 - head/net-mgmt/collectd
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jul 2013 21:49:14 -0000

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 "