Switch default python_CMD used by shebangfix to ${PYTHON_CMD} for ports

using python

PR:		201077
Reviewed by:	mat
With hat:	portmgr
Differential Revision:	https://reviews.freebsd.org/D2955

10 files changed, 3 insertions, 13 deletions

diff --git a/net/cloud-init/Makefile b/net/cloud-init/Makefile
index 5781a70fc12d..e2dc5f1c243d 100644
--- a/net/cloud-init/Makefile
+++ b/net/cloud-init/Makefile
@@ -34,7 +34,6 @@ USES=		python:2.7 shebangfix
 SHEBANG_FILES=	tools/validate-yaml.py tools/read-dependencies \
 		tools/read-version tools/hacking.py
 python_OLD_CMD=	/usr/bin/env python
-python_CMD=	${PYTHON_CMD}
 USE_PYTHON=	autoplist distutils
 
 PYDISTUTILS_INSTALLARGS+=	"--init-system=sysvinit_freebsd"
diff --git a/net/gupnp/Makefile b/net/gupnp/Makefile
index a7d205bf7019..3b0f7ddf6146 100644
--- a/net/gupnp/Makefile
+++ b/net/gupnp/Makefile
@@ -26,7 +26,6 @@ USE_CSTD=	c11
 USES=		compiler:c11 gmake libtool pathfix pkgconfig python:run shebangfix tar:xz
 
 SHEBANG_FILES=	tools/gupnp-binding-tool
-python_CMD=	${PYTHON_CMD}
 
 .include <bsd.port.pre.mk>
 
diff --git a/net/polyorb/Makefile b/net/polyorb/Makefile
index e5a19c406f5c..b47ff62386c2 100644
--- a/net/polyorb/Makefile
+++ b/net/polyorb/Makefile
@@ -33,7 +33,6 @@ PORTDOCS=	html \
 SHEBANG_FILES=	compilers/idlac/*.py testsuite/*.py testsuite/tests/*.py
 
 python_OLD_CMD=	/usr/bin/env python
-python_CMD=	${PYTHON_CMD}
 
 CONFIGURE_ARGS=	--with-appli-perso="corba dsa moma" \
 		--with-proto-perso="giop soap srp" \
diff --git a/net/py-pynmsg/Makefile b/net/py-pynmsg/Makefile
index a236770770d4..894dad2dd21c 100644
--- a/net/py-pynmsg/Makefile
+++ b/net/py-pynmsg/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS=	libnmsg.so:${PORTSDIR}/net/nmsg
 USE_PYTHON=	distutils autoplist
 USES=		python shebangfix uniquefiles:dirs
 
-python_CMD=	${PYTHON_CMD}
 python_OLD_CMD=	/usr/bin/env python
 SHEBANG_FILES=	examples/*.py
 
diff --git a/net/py-pysphere/Makefile b/net/py-pysphere/Makefile
index d1d589af0c28..4acef049bbab 100644
--- a/net/py-pysphere/Makefile
+++ b/net/py-pysphere/Makefile
@@ -18,7 +18,6 @@ USE_PYTHON=	distutils autoplist
 
 SHEBANG_LANG=	python
 python_OLD_CMD=	/usr/bin/env python
-python_CMD=	${PYTHON_CMD}
 SHEBANG_FILES= *.py \
 	       pysphere/ZSI/*.py \
 	       pysphere/ZSI/generate/*.py \
diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index d083bf493a9c..968042fd8dc5 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -28,7 +28,6 @@ USES=		cpe gmake python:build shebangfix
 USE_RC_SUBR=	rabbitmq
 SHEBANG_FILES=	calculate-relative plugins-src/rabbitmq-amqp1.0/codegen.py
 python_OLD_CMD=	.*python
-python_CMD=	${PYTHON_CMD}
 
 USERS=		rabbitmq
 GROUPS=		rabbitmq
diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index 73289bdeea6b..6b0c6caf6d12 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -405,8 +405,7 @@ USE_RC_SUBR=		samba_server
 SUB_FILES=		pkg-message README.FreeBSD
 # Make sure that the right version of Python is used by the tools
 # https://bugzilla.samba.org/show_bug.cgi?id=7305
-python_CMD=		${PYTHON_CMD}
-python_OLD_CMD=		${SETENV} python
+python_OLD_CMD=		/usr/bin/env python
 SHEBANG_FILES=		${PATCH_WRKSRC}/source4/scripting/bin/*
 # No fancy color error messages
 .if ${COMPILER_TYPE} == "clang"
diff --git a/net/samba41/Makefile b/net/samba41/Makefile
index b45f4146d936..ff9e502e8a89 100644
--- a/net/samba41/Makefile
+++ b/net/samba41/Makefile
@@ -400,8 +400,7 @@ USE_RC_SUBR=		samba_server
 SUB_FILES=		pkg-message README.FreeBSD
 # Make sure that the right version of Python is used by the tools
 # https://bugzilla.samba.org/show_bug.cgi?id=7305
-python_CMD=		${PYTHON_CMD}
-python_OLD_CMD=		${SETENV} python
+python_OLD_CMD=		/usr/bin/env python
 SHEBANG_FILES=		${PATCH_WRKSRC}/source4/scripting/bin/*
 # No fancy color error messages
 .if ${COMPILER_TYPE} == "clang"
diff --git a/net/samba42/Makefile b/net/samba42/Makefile
index d255fe43f01e..fe7341863610 100644
--- a/net/samba42/Makefile
+++ b/net/samba42/Makefile
@@ -403,8 +403,7 @@ USE_RC_SUBR=		samba_server
 SUB_FILES=		pkg-message README.FreeBSD
 # Make sure that the right version of Python is used by the tools
 # https://bugzilla.samba.org/show_bug.cgi?id=7305
-python_CMD=		${PYTHON_CMD}
-python_OLD_CMD=		${SETENV} python
+python_OLD_CMD=		/usr/bin/env python
 SHEBANG_FILES=		${PATCH_WRKSRC}/source4/scripting/bin/*
 # No fancy color error messages
 .if ${COMPILER_TYPE} == "clang"
diff --git a/net/xorp/Makefile b/net/xorp/Makefile
index 6b2ff23ceabe..c045ddb5932d 100644
--- a/net/xorp/Makefile
+++ b/net/xorp/Makefile
@@ -24,7 +24,6 @@ USE_OPENSSL=	yes
 USE_RC_SUBR=	xorp
 SHEBANG_FILES=	xrl/scripts/clnt-gen xrl/scripts/tgt-gen
 python_OLD_CMD=	.*python
-python_CMD=	${PYTHON_CMD}
 SUB_FILES=	pkg-message
 XORP_SAMPLECONF=	rtrmgr/config/multicast4.boot