Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 4 Aug 2013 13:05:44 +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: r324229 - head/net-mgmt/collectd5
Message-ID:  <201308041305.r74D5ik5053427@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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} \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308041305.r74D5ik5053427>