From owner-svn-ports-all@FreeBSD.ORG Sun Aug 4 13:05:44 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A659366E; Sun, 4 Aug 2013 13:05:44 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 93BA8281E; Sun, 4 Aug 2013 13:05:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r74D5iOY053428; Sun, 4 Aug 2013 13:05:44 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r74D5ik5053427; Sun, 4 Aug 2013 13:05:44 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201308041305.r74D5ik5053427@svn.freebsd.org> From: William Grzybowski Date: Sun, 4 Aug 2013 13:05:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324229 - head/net-mgmt/collectd5 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Aug 2013 13:05:44 -0000 Author: wg Date: Sun Aug 4 13:05:44 2013 New Revision: 324229 URL: http://svnweb.freebsd.org/changeset/ports/324229 Log: net-mgmt/collectd5: fix PYTHON option - Fix PYTHON option (use ${PYTHON_CMD}) PR: ports/180838 Submitted by: wg (myself) Approved by: maintainer Modified: head/net-mgmt/collectd5/Makefile Modified: head/net-mgmt/collectd5/Makefile ============================================================================== --- head/net-mgmt/collectd5/Makefile Sun Aug 4 13:04:54 2013 (r324228) +++ head/net-mgmt/collectd5/Makefile Sun Aug 4 13:05:44 2013 (r324229) @@ -3,7 +3,7 @@ PORTNAME= collectd PORTVERSION= 5.3.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt MASTER_SITES= http://collectd.org/files/ @@ -17,7 +17,7 @@ USE_AUTOTOOLS= autoconf autoheader autom LATEST_LINK= collectd5 -OPTIONS_DEFINE= CGI CURL DEBUG DBI GCRYPT JSON MEMCACHEC MODBUS MYSQL NUTUPS PGSQL PING PYTHON REDIS ROUTEROS RRDTOOL SNMP STATGRAB TOKYOTYRANT VIRT XML XMMS +OPTIONS_DEFINE= CGI CURL DEBUG DBI GCRYPT JSON MEMCACHEC MODBUS MYSQL NOTIFYEMAIL NUTUPS PGSQL PING PYTHON REDIS ROUTEROS RRDTOOL SNMP STATGRAB TOKYOTYRANT VIRT XML XMMS CGI_DESC= Install collection.cgi (requires rrdtool) CURL_DESC= Enable curl-based plugins (apache, nginx, etc) @@ -99,7 +99,6 @@ CONFIGURE_ARGS= --localstatedir=/var \ --without-libyajl \ --without-oracle \ --without-perl-bindings \ - --without-python # NOTE: Plugins without external dependencies CONFIGURE_ARGS+= \ @@ -275,12 +274,12 @@ PLIST_SUB+= PING="@comment " .if ${PORT_OPTIONS:MPYTHON} USE_PYTHON= yes -CONFIGURE_ARGS+=--with-python=${LOCALBASE} --enable-python +CONFIGURE_ARGS+=--with-python=${PYTHON_CMD} --enable-python PLIST_SUB+= PYTHON="" .else +CONFIGURE_ARGS+=--without-python PLIST_SUB+= PYTHON="@comment " .endif - .if ${PORT_OPTIONS:MREDIS} LIB_DEPENDS+= credis:${PORTSDIR}/databases/credis CONFIGURE_ARGS+=--with-libcredis=${LOCALBASE} \