summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorantoine <antoine@FreeBSD.org>2015-07-29 22:09:53 +0000
committerantoine <antoine@FreeBSD.org>2015-07-29 22:09:53 +0000
commita2a61228425375c282f23f3d4efacb0f00530176 (patch)
tree39f5db5e677aac0352369cb6e46374b5bd11a774
parenta1e502657ee2383d4a62910668b2161f359bad53 (diff)
downloadFreeBSD-ports-a2a61228425375c282f23f3d4efacb0f00530176.zip
FreeBSD-ports-a2a61228425375c282f23f3d4efacb0f00530176.tar.gz
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
-rw-r--r--Mk/Uses/shebangfix.mk4
-rw-r--r--accessibility/caribou/Makefile1
-rw-r--r--astro/py-metar/Makefile1
-rw-r--r--astro/weather/Makefile3
-rw-r--r--audio/boodler/Makefile1
-rw-r--r--audio/lollypop/Makefile2
-rw-r--r--audio/mma/Makefile1
-rw-r--r--audio/py-tagpy/Makefile1
-rw-r--r--chinese/sunpinyin/Makefile1
-rw-r--r--databases/nagios-check_mongodb/Makefile3
-rw-r--r--databases/postgresql-libpqxx/Makefile1
-rw-r--r--databases/postgresql-libpqxx3/Makefile1
-rw-r--r--deskutils/semantik/Makefile1
-rw-r--r--deskutils/tel/Makefile1
-rw-r--r--devel/cvs2svn/Makefile1
-rw-r--r--devel/py-InlineEgg/Makefile1
-rw-r--r--devel/py-gflags/Makefile3
-rw-r--r--devel/py-ice/Makefile1
-rw-r--r--devel/py-ioflo/Makefile1
-rw-r--r--devel/py-pip/Makefile5
-rw-r--r--devel/py-pymtbl/Makefile1
-rw-r--r--devel/renpy/Makefile1
-rw-r--r--emulators/dynagen/Makefile1
-rw-r--r--finance/mybudget/Makefile1
-rw-r--r--games/lostfeathers/Makefile1
-rw-r--r--games/oneisenough/Makefile3
-rw-r--r--games/schwarzweiss/Makefile1
-rw-r--r--games/starfighter/Makefile3
-rw-r--r--games/super_mario_bros_python/Makefile1
-rw-r--r--graphics/blender/Makefile1
-rw-r--r--graphics/imgv/Makefile1
-rw-r--r--graphics/py-gdal/Makefile3
-rw-r--r--graphics/variety/Makefile2
-rw-r--r--lang/cjs/Makefile1
-rw-r--r--lang/python-tools/Makefile1
-rw-r--r--lang/v8/Makefile3
-rw-r--r--mail/tumgreyspf/Makefile3
-rw-r--r--misc/gimp-help-en/Makefile1
-rw-r--r--misc/pastebinit/Makefile1
-rw-r--r--multimedia/pymp/Makefile3
-rw-r--r--net/cloud-init/Makefile1
-rw-r--r--net/gupnp/Makefile1
-rw-r--r--net/polyorb/Makefile1
-rw-r--r--net/py-pynmsg/Makefile1
-rw-r--r--net/py-pysphere/Makefile1
-rw-r--r--net/rabbitmq/Makefile1
-rw-r--r--net/samba4/Makefile3
-rw-r--r--net/samba41/Makefile3
-rw-r--r--net/samba42/Makefile3
-rw-r--r--net/xorp/Makefile1
-rw-r--r--news/xpn/Makefile3
-rw-r--r--security/py-python-registry/Makefile1
-rw-r--r--sysutils/abck/Makefile1
-rw-r--r--sysutils/py-pytsk/Makefile1
-rw-r--r--textproc/asciidoc/Makefile3
-rw-r--r--textproc/py2html/Makefile1
-rw-r--r--www/calendarserver/Makefile1
-rw-r--r--www/cherokee/Makefile1
-rw-r--r--www/libhpack/Makefile3
-rw-r--r--www/py-djblets/Makefile1
-rw-r--r--www/varnish4/Makefile1
-rw-r--r--x11-wm/ede/Makefile3
62 files changed, 22 insertions, 81 deletions
diff --git a/Mk/Uses/shebangfix.mk b/Mk/Uses/shebangfix.mk
index 5ef4638..14443dc 100644
--- a/Mk/Uses/shebangfix.mk
+++ b/Mk/Uses/shebangfix.mk
@@ -40,7 +40,11 @@ perl_CMD?= ${LOCALBASE}/bin/perl
php_OLD_CMD?= /usr/bin/php
php_CMD?= ${LOCALBASE}/bin/php
python_OLD_CMD?= /usr/bin/python
+.if ${USES:Mpython*}
+python_CMD?= ${PYTHON_CMD}
+.else
python_CMD?= ${LOCALBASE}/bin/python
+.endif
ruby_OLD_CMD?= /usr/bin/ruby
ruby_CMD?= ${LOCALBASE}/bin/ruby
tcl_OLD_CMD?= /usr/bin/tclsh
diff --git a/accessibility/caribou/Makefile b/accessibility/caribou/Makefile
index 4b447f5..9ed0b74 100644
--- a/accessibility/caribou/Makefile
+++ b/accessibility/caribou/Makefile
@@ -33,6 +33,5 @@ INSTALL_TARGET= install-strip
CONFIGURE_ARGS= --enable-gtk2-module=no
GLIB_SCHEMAS= org.gnome.caribou.gschema.xml \
org.gnome.antler.gschema.xml
-python_CMD= ${PYTHON_CMD}
.include <bsd.port.mk>
diff --git a/astro/py-metar/Makefile b/astro/py-metar/Makefile
index 3b6f38e..3a3997d 100644
--- a/astro/py-metar/Makefile
+++ b/astro/py-metar/Makefile
@@ -18,6 +18,5 @@ USE_PYTHON= autoplist distutils
USES= python:2 shebangfix
SHEBANG_FILES= bin/py${PORTNAME}
-python_CMD= ${PYTHON_CMD}
.include <bsd.port.mk>
diff --git a/astro/weather/Makefile b/astro/weather/Makefile
index 0a97a9a..5cb1a0c 100644
--- a/astro/weather/Makefile
+++ b/astro/weather/Makefile
@@ -24,8 +24,7 @@ PLIST_FILES= bin/${PORTNAME} \
PORTDATA= airports places stations zctas zones
SHEBANG_FILES= ${PORTNAME}
-python_OLD_CMD= ${SETENV} python
-python_CMD= ${PYTHON_CMD}
+python_OLD_CMD= /usr/bin/env python
.include <bsd.port.pre.mk>
diff --git a/audio/boodler/Makefile b/audio/boodler/Makefile
index d5b5072..c381e1f 100644
--- a/audio/boodler/Makefile
+++ b/audio/boodler/Makefile
@@ -24,7 +24,6 @@ CONFIGURE_ARGS= --include ${LOCALBASE}/include --lib ${LOCALBASE}/lib
WRKSRC= ${WRKDIR}/${PORTNAME}
SHEBANG_FILES= ${CONFIGURE_SCRIPT} boodler.py
-python_CMD= ${PYTHON_CMD}
SUB_FILES= boodler-wrapper
SUB_LIST= PYTHON_CMD=${PYTHON_CMD}
diff --git a/audio/lollypop/Makefile b/audio/lollypop/Makefile
index 5e002d14..c68fe70 100644
--- a/audio/lollypop/Makefile
+++ b/audio/lollypop/Makefile
@@ -28,8 +28,6 @@ INSTALLS_ICONS= yes
SHEBANG_FILES= src/*.py
SHEBANG_LANG= python
-python_OLD_CMD= /usr/bin/python
-python_CMD= ${PYTHON_CMD}
GLIB_SCHEMAS= org.gnome.Lollypop.gschema.xml
diff --git a/audio/mma/Makefile b/audio/mma/Makefile
index d313110..d27fab0 100644
--- a/audio/mma/Makefile
+++ b/audio/mma/Makefile
@@ -31,7 +31,6 @@ USES= python shebangfix
WRKDOC= ${WRKDIR}/${PORTNAME}-pdf-${DISTVERSION:S,a,,}
WRKSRC= ${WRKDIR}/${PORTNAME}-bin-${DISTVERSION}
-python_CMD= ${PYTHON_CMD}
python_OLD_CMD= /usr/bin/env python
.include <bsd.port.options.mk>
diff --git a/audio/py-tagpy/Makefile b/audio/py-tagpy/Makefile
index 755b617..2988f8a 100644
--- a/audio/py-tagpy/Makefile
+++ b/audio/py-tagpy/Makefile
@@ -25,7 +25,6 @@ CONFIGURE_ARGS= --taglib-inc-dir="${LOCALBASE}/include/taglib" \
--boost-lib-dir="${PYTHON_LIBDIR},${LOCALBASE}/lib" \
--boost-python-libname="boost_python"
python_OLD_CMD= /usr/bin/env python
-python_CMD= ${PYTHON_CMD}
SHEBANG_FILES= configure.py
USE_PYTHON= distutils autoplist
diff --git a/chinese/sunpinyin/Makefile b/chinese/sunpinyin/Makefile
index a44f940..30a631a 100644
--- a/chinese/sunpinyin/Makefile
+++ b/chinese/sunpinyin/Makefile
@@ -24,7 +24,6 @@ USE_LDCONFIG= yes
USES= gmake iconv perl5 pkgconfig python scons shebangfix
USE_PERL5= build
SHEBANG_FILES= python/*.py
-python_CMD= ${PYTHON_CMD}
LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB}
INSTALL_TARGET= install-lib install-headers --install-sandbox=${STAGEDIR}
diff --git a/databases/nagios-check_mongodb/Makefile b/databases/nagios-check_mongodb/Makefile
index 8e21edc..74c42e0 100644
--- a/databases/nagios-check_mongodb/Makefile
+++ b/databases/nagios-check_mongodb/Makefile
@@ -17,8 +17,7 @@ GH_PROJECT= nagios-plugin-mongodb
GH_TAGNAME= 9d17373
USES= python shebangfix
SHEBANG_FILES= ${WRKSRC}/check_mongodb.py
-python_OLD_CMD= "/usr/bin/env\ python"
-python_CMD= ${PYTHON_CMD}
+python_OLD_CMD= /usr/bin/env python
NO_BUILD= yes
PLIST_FILES= libexec/nagios/check_mongodb
diff --git a/databases/postgresql-libpqxx/Makefile b/databases/postgresql-libpqxx/Makefile
index 0f4c5dd..ed9ed98 100644
--- a/databases/postgresql-libpqxx/Makefile
+++ b/databases/postgresql-libpqxx/Makefile
@@ -22,7 +22,6 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
PLIST_SUB= PORTVERSION=${PORTVERSION:R}
SHEBANG_FILES= ${WRKSRC}/tools/splitconfig
-python_CMD= ${PYTHON_CMD}
CONFIGURE_ARGS= --enable-shared \
--disable-dependency-tracking
diff --git a/databases/postgresql-libpqxx3/Makefile b/databases/postgresql-libpqxx3/Makefile
index ae82dae..9acfb01 100644
--- a/databases/postgresql-libpqxx3/Makefile
+++ b/databases/postgresql-libpqxx3/Makefile
@@ -23,7 +23,6 @@ PLIST_SUB= PORTVERSION=${PORTVERSION}
INSTALL_TARGET= install-strip
SHEBANG_FILES= tools/splitconfig
-python_CMD= ${PYTHON_CMD}
CONFIGURE_ARGS= --enable-shared
diff --git a/deskutils/semantik/Makefile b/deskutils/semantik/Makefile
index f29782e..109edfd 100644
--- a/deskutils/semantik/Makefile
+++ b/deskutils/semantik/Makefile
@@ -29,7 +29,6 @@ USE_LDCONFIG= yes
SHEBANG_FILES= ${WRKSRC}/src/templates/beamer/wscript \
${WRKSRC}/src/templates/pdflatex/wscript
-python_CMD= ${PYTHON_CMD}
PLIST_SUB= PORTVERSION="${PORTVERSION}"
diff --git a/deskutils/tel/Makefile b/deskutils/tel/Makefile
index 5e007b5..8526320 100644
--- a/deskutils/tel/Makefile
+++ b/deskutils/tel/Makefile
@@ -17,7 +17,6 @@ NO_ARCH= yes
USES= gettext python shebangfix tar:bzip2
SHEBANG_FILES= src/tel.py
python_OLD_CMD= /usr/bin/env python
-python_CMD= ${PYTHON_CMD}
USE_PYTHON= distutils
post-patch:
diff --git a/devel/cvs2svn/Makefile b/devel/cvs2svn/Makefile
index 6d2c2be..55c6b7f 100644
--- a/devel/cvs2svn/Makefile
+++ b/devel/cvs2svn/Makefile
@@ -24,7 +24,6 @@ USES= shebangfix python:2.7
USE_PYTHON= distutils autoplist
SHEBANG_LANG= python python2
-python_CMD= ${PYTHON_CMD}
python2_OLD_CMD= /usr/bin/env python
python2_CMD= ${PYTHON_CMD}
SHEBANG_FILES= cvs2svn cvs2git cvs2bzr *.py \
diff --git a/devel/py-InlineEgg/Makefile b/devel/py-InlineEgg/Makefile
index 68f3af9..7c48e57 100644
--- a/devel/py-InlineEgg/Makefile
+++ b/devel/py-InlineEgg/Makefile
@@ -14,7 +14,6 @@ COMMENT= Python module for writing inline assembler programs
FETCH_BEFORE_ARGS=-o ${DISTFILES}
USES= dos2unix python shebangfix
SHEBANG_FILES= examples/*.py
-python_CMD= ${PYTHON_CMD}
USE_PYTHON= distutils autoplist
PORTDOCS= InlineEgg.html Changelog README
diff --git a/devel/py-gflags/Makefile b/devel/py-gflags/Makefile
index 69c16af..310564e 100644
--- a/devel/py-gflags/Makefile
+++ b/devel/py-gflags/Makefile
@@ -18,8 +18,7 @@ USES= python:2 shebangfix
USE_PYTHON= autoplist distutils
SHEBANG_FILES= gflags2man.py
-python_OLD_CMD= ${SETENV} python
-python_CMD= ${PYTHON_CMD}
+python_OLD_CMD= /usr/bin/env python
PROJECTHOST= python-gflags
diff --git a/devel/py-ice/Makefile b/devel/py-ice/Makefile
index 576446a..a36e430 100644
--- a/devel/py-ice/Makefile
+++ b/devel/py-ice/Makefile
@@ -22,7 +22,6 @@ INSTALL_WRKSRC= ${WRKSRC}/python
SHEBANG_LANG= python
python_OLD_CMD= /usr/bin/env python
-python_CMD= ${PYTHON_CMD}
SHEBANG_FILES= ${BUILD_WRKSRC}/config/s2py.py
MAKE_ENV+= PYTHON_VERSION=${PYTHON_VERSION}
diff --git a/devel/py-ioflo/Makefile b/devel/py-ioflo/Makefile
index 1004aa8..c8dbd1d 100644
--- a/devel/py-ioflo/Makefile
+++ b/devel/py-ioflo/Makefile
@@ -18,6 +18,5 @@ NO_ARCH= yes
SHEBANG_FILES= scripts/ioflo
python_OLD_CMD= /usr/bin/env python
-python_CMD= ${PYTHON_CMD}
.include <bsd.port.mk>
diff --git a/devel/py-pip/Makefile b/devel/py-pip/Makefile
index 426ae61..f121c3e 100644
--- a/devel/py-pip/Makefile
+++ b/devel/py-pip/Makefile
@@ -33,9 +33,8 @@ USES= python shebangfix
USE_GITHUB= yes
USE_PYTHON= autoplist concurrent distutils
-SHEBANG_FILES= pip/__init__.py
-python_OLD_CMD= ${SETENV} python
-python_CMD= ${PYTHON_CMD}
+SHEBANG_FILES= pip/__init__.py
+python_OLD_CMD= /usr/bin/env python
GH_ACCOUNT= pypa
diff --git a/devel/py-pymtbl/Makefile b/devel/py-pymtbl/Makefile
index f578a92..9ed6fdd 100644
--- a/devel/py-pymtbl/Makefile
+++ b/devel/py-pymtbl/Makefile
@@ -17,7 +17,6 @@ LIB_DEPENDS= libmtbl.so:${PORTSDIR}/devel/mtbl
USE_PYTHON= distutils autoplist
USES= python shebangfix uniquefiles:dirs
-python_CMD= ${PYTHON_CMD}
python_OLD_CMD= /usr/bin/env python
SHEBANG_FILES= examples/*.py examples/*/*.py
diff --git a/devel/renpy/Makefile b/devel/renpy/Makefile
index fa81416..c0ddc33 100644
--- a/devel/renpy/Makefile
+++ b/devel/renpy/Makefile
@@ -36,7 +36,6 @@ EXCLUDE= gen 'module/*.py[co]' 'renpy/*.py[co]'
EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,}
SHEBANG_FILES= renpy.py launcher/game/tkaskdir.py
python_OLD_CMD= /usr/bin/env python
-python_CMD= ${PYTHON_CMD}
BUILD_WRKSRC= ${WRKSRC}/module
INSTALL_WRKSRC= ${BUILD_WRKSRC}
MAKE_ENV+= RENPY_DEPS_INSTALL="${LOCALBASE}"
diff --git a/emulators/dynagen/Makefile b/emulators/dynagen/Makefile
index 2f04a38..5415de1 100644
--- a/emulators/dynagen/Makefile
+++ b/emulators/dynagen/Makefile
@@ -26,7 +26,6 @@ USES= dos2unix python
USES+= shebangfix
SHEBANG_FILES= *.py dynagen pemu-start.sh
SHEBANG_LANG= python_env python_bol python_cnf
-python_CMD= ${PYTHON_CMD}
python_env_OLD_CMD=/usr/bin/env[[:space:]]*python
python_env_CMD= ${PYTHON_CMD}
python_bol_OLD_CMD=the an incredible combination
diff --git a/finance/mybudget/Makefile b/finance/mybudget/Makefile
index bb6a1f6..8b80286 100644
--- a/finance/mybudget/Makefile
+++ b/finance/mybudget/Makefile
@@ -19,7 +19,6 @@ INSTALL_ICONS= yes
USES= python shebangfix
SHEBANG_FILES= myBudget.py
-python_CMD= ${PYTHON_CMD}
OPTIONS_DEFINE= DOCS
diff --git a/games/lostfeathers/Makefile b/games/lostfeathers/Makefile
index 0b5ea0d..75af257 100644
--- a/games/lostfeathers/Makefile
+++ b/games/lostfeathers/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS= avbin>=0:${PORTSDIR}/multimedia/avbin
USES= python shebangfix zip
SHEBANG_FILES= run_game.py
python_OLD_CMD= /usr/bin/env python
-python_CMD?= ${PYTHON_CMD}
USE_GNOME= pygtk2 librsvg2
PORTDOCS= README.txt
diff --git a/games/oneisenough/Makefile b/games/oneisenough/Makefile
index e191d00..5f33ae6 100644
--- a/games/oneisenough/Makefile
+++ b/games/oneisenough/Makefile
@@ -24,8 +24,7 @@ USES= dos2unix python:2 shebangfix zip
DOS2UNIX_FILES= *.txt bin/*.py
DOS2UNIX_REGEX= .*.[^pt][^nt][^gf]
SHEBANG_FILES= run_game.py bin/mainmenu.py
-python_OLD_CMD?= /usr/bin/env python
-python_CMD?= ${PYTHON_CMD}
+python_OLD_CMD= /usr/bin/env python
PORTDOCS= README.txt
OPTIONS_DEFINE= DOCS
diff --git a/games/schwarzweiss/Makefile b/games/schwarzweiss/Makefile
index 920822a..a34e3f1 100644
--- a/games/schwarzweiss/Makefile
+++ b/games/schwarzweiss/Makefile
@@ -26,7 +26,6 @@ GH_TAGNAME= d95263f
USES= python:2 shebangfix
SHEBANG_FILES= schwarzweiss_start.py data/*.py
python_OLD_CMD= /usr/bin/env python
-python_CMD?= ${PYTHON_CMD}
PORTDOCS= readme.txt
OPTIONS_DEFINE= DOCS
diff --git a/games/starfighter/Makefile b/games/starfighter/Makefile
index 53cad53..b3fc1c0 100644
--- a/games/starfighter/Makefile
+++ b/games/starfighter/Makefile
@@ -24,8 +24,7 @@ WITH_ZLIB= yes
MAKEFILE= makefile
SHEBANG_FILES= pack.py unpack.py
-python_OLD_CMD= ${SETENV} python
-python_CMD= ${PYTHON_CMD}
+python_OLD_CMD= /usr/bin/env python
INSTALLS_ICONS= yes
diff --git a/games/super_mario_bros_python/Makefile b/games/super_mario_bros_python/Makefile
index ffe190c..250f205 100644
--- a/games/super_mario_bros_python/Makefile
+++ b/games/super_mario_bros_python/Makefile
@@ -25,7 +25,6 @@ WRKSRC= ${WRKDIR}/Super-Mario-Bros-Python-v${DISTVERSION}release
USES= shebangfix python:2 zip
SHEBANG_FILES= gamelib/*.py start.py
python_OLD_CMD= /usr/bin/env python
-python_CMD?= ${PYTHON_CMD}
PORTDOCS= changelog.txt readme.txt
OPTIONS_DEFINE= DOCS
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index e769027..98af14c 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -25,7 +25,6 @@ CMAKE_ARGS= -DWITH_PYTHON_INSTALL:BOOL=OFF \
-DWITH_PYTHON_INSTALL_NUMPY:BOOL=OFF \
-DWITH_INSTALL_PORTABLE:BOOL=FALSE
-python_CMD= ${PYTHON_CMD}
SHEBANG_FILES= release/bin/blender-thumbnailer.py \
release/scripts/modules/bl_i18n_utils/merge_po.py \
release/scripts/modules/bl_i18n_utils/utils_rtl.py \
diff --git a/graphics/imgv/Makefile b/graphics/imgv/Makefile
index 1d353ed..d2bc2a6 100644
--- a/graphics/imgv/Makefile
+++ b/graphics/imgv/Makefile
@@ -24,7 +24,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USES= python:run shebangfix
SHEBANG_FILES= imgv.py
python_OLD_CMD= /usr/bin/env python
-python_CMD= ${PYTHON_CMD}
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/graphics/py-gdal/Makefile b/graphics/py-gdal/Makefile
index 2b0ca97..35a23bc 100644
--- a/graphics/py-gdal/Makefile
+++ b/graphics/py-gdal/Makefile
@@ -25,8 +25,7 @@ USES= python shebangfix tar:xz
WRKSRC= ${WRKDIR}/${DISTNAME}/swig/python
SHEBANG_FILES= scripts/*.py
-python_OLD_CMD= ${SETENV} python
-python_CMD= ${PYTHON_CMD}
+python_OLD_CMD= /usr/bin/env python
NUMPY_BUILD_DEPENDS= ${PKGNAMEPREFIX}numpy>=1.0.0:${PORTSDIR}/math/py-numpy
NUMPY_RUN_DEPENDS= ${PKGNAMEPREFIX}numpy>=1.0.0:${PORTSDIR}/math/py-numpy
diff --git a/graphics/variety/Makefile b/graphics/variety/Makefile
index c2f2ec2..95b25b8 100644
--- a/graphics/variety/Makefile
+++ b/graphics/variety/Makefile
@@ -37,8 +37,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:${PORTSDIR}/www/py-beau
webkit-gtk3>=2.4.8:${PORTSDIR}/www/webkit-gtk3 \
yelp>=3.14.1:${PORTSDIR}/x11/yelp
-python_CMD= ${PYTHON_CMD}
-
SHEBANG_FILES= bin/variety data/scripts/*
USES= desktop-file-utils gettext python:2 shebangfix
diff --git a/lang/cjs/Makefile b/lang/cjs/Makefile
index d394b1f..8068d74 100644
--- a/lang/cjs/Makefile
+++ b/lang/cjs/Makefile
@@ -31,7 +31,6 @@ INSTALL_TARGET= install-strip
CONFIGURE_ARGS+=--enable-compile-warnings=no
python_OLD_CMD= /usr/bin/env python
-python_CMD= ${PYTHON_CMD}
pre-configure:
cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} ./autogen.sh
diff --git a/lang/python-tools/Makefile b/lang/python-tools/Makefile
index 543827b..7949030 100644
--- a/lang/python-tools/Makefile
+++ b/lang/python-tools/Makefile
@@ -29,7 +29,6 @@ PLIST_FILES= ${SCRIPT_FILES:C/^.*/bin\/&/g} ${PYLIB_FILES:C/^.*/bin\/&/g}
SHEBANG_LANG= python
SHEBANG_FILES= ${SCRIPT_FILES:C/^.*/&\.py/g} \
../../Lib/tabnanny.py ../../Lib/timeit.py
-python_CMD= ${PYTHON_CMD}
UNIQUE_SUFFIX= -${PYTHON_VER}
UNIQUE_SUFFIX_FILES= ${SCRIPT_FILES:C/^.*/bin\/&/g} \
diff --git a/lang/v8/Makefile b/lang/v8/Makefile
index 60912c8..7362c21 100644
--- a/lang/v8/Makefile
+++ b/lang/v8/Makefile
@@ -27,8 +27,7 @@ USES= alias compiler cpe execinfo gmake python:2 shebangfix tar:xz
CPE_VENDOR= google
SHEBANG_FILES= build/gyp/gyp
-python_OLD_CMD= ${SETENV} python
-python_CMD= ${PYTHON_CMD}
+python_OLD_CMD= /usr/bin/env python
.include <bsd.port.pre.mk>
diff --git a/mail/tumgreyspf/Makefile b/mail/tumgreyspf/Makefile
index 1d7f3fe..855a869 100644
--- a/mail/tumgreyspf/Makefile
+++ b/mail/tumgreyspf/Makefile
@@ -31,8 +31,7 @@ SUB_LIST= PYTHON_CMD=${PYTHON_CMD} \
TUMGREYSPF_USER=${TUMGREYSPF_USER}
SHEBANG_FILES= *
-python_OLD_CMD= ${SETENV} python
-python_CMD= ${PYTHON_CMD}
+python_OLD_CMD= /usr/bin/env python
TUMGREYSPF_DIR?= /var/db/${PORTNAME}
TUMGREYSPF_USER?= nobody
diff --git a/misc/gimp-help-en/Makefile b/misc/gimp-help-en/Makefile
index 6d61a5d..66a189a 100644
--- a/misc/gimp-help-en/Makefile
+++ b/misc/gimp-help-en/Makefile
@@ -35,7 +35,6 @@ DATADIR= ${PREFIX}/share/gimp
SHEBANG_FILES= tools/xml2po.py
python_OLD_CMD= /usr/bin/env python
-python_CMD= ${PYTHON_CMD}
post-patch:
# Install to the same directory as when configuring --with-gimp
diff --git a/misc/pastebinit/Makefile b/misc/pastebinit/Makefile
index aeba55e..37e5b4f 100644
--- a/misc/pastebinit/Makefile
+++ b/misc/pastebinit/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>=4.3.2:${PORTSDIR}/devel/py-config
USES= python:run shebangfix tar:bzip2
SHEBANG_FILES= pastebinit
python_OLD_CMD= /usr/bin/python3
-python_CMD= ${PYTHON_CMD}
NO_BUILD= yes
PLIST_FILES= bin/pastebinit
diff --git a/multimedia/pymp/Makefile b/multimedia/pymp/Makefile
index e20a85e..4b9c120 100644
--- a/multimedia/pymp/Makefile
+++ b/multimedia/pymp/Makefile
@@ -20,8 +20,7 @@ GH_TAGNAME= bea99d9
USES= shebangfix python tar:bzip2
SHEBANG_FILES= *.py
-python_OLD_CMD?= /usr/bin/env python
-python_CMD?= ${PYTHON_CMD}
+python_OLD_CMD= /usr/bin/env python
USE_GNOME= pygtk2
PORTDOCS= CHANGELOG README.md
diff --git a/net/cloud-init/Makefile b/net/cloud-init/Makefile
index 5781a70..e2dc5f1 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 a7d205b..3b0f7dd 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 e5a19c4..b47ff62 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 a236770..894dad2 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 d1d589a..4acef04 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 d083bf4..968042f 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 73289bd..6b0c6ca 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 b45f4146..ff9e502 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 d255fe4..fe73418 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 6b2ff23..c045ddb 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
diff --git a/news/xpn/Makefile b/news/xpn/Makefile
index 7c7df9f..2623e05 100644
--- a/news/xpn/Makefile
+++ b/news/xpn/Makefile
@@ -17,9 +17,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gtk2>=2.24.0:${PORTSDIR}/x11-toolkits/py-gtk
NO_BUILD= yes
-python_OLD_CMD= /usr/bin/env python
# we want a versioned python command
-python_CMD= ${PYTHON_CMD}
+python_OLD_CMD= /usr/bin/env python
SHEBANG_FILES= ${XPN}
SUB_FILES= ${PORTNAME}
diff --git a/security/py-python-registry/Makefile b/security/py-python-registry/Makefile
index 27839fc..14feb90 100644
--- a/security/py-python-registry/Makefile
+++ b/security/py-python-registry/Makefile
@@ -19,7 +19,6 @@ USES= python shebangfix
USE_PYTHON= distutils autoplist
SHEBANG_FILES= samples/*.py
python_OLD_CMD= .*
-python_CMD= ${PYTHON_CMD}
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/sysutils/abck/Makefile b/sysutils/abck/Makefile
index 6ae9af0..e191fb2 100644
--- a/sysutils/abck/Makefile
+++ b/sysutils/abck/Makefile
@@ -13,6 +13,5 @@ COMMENT= Manage intrusion attempts recorded in the system log
USES= python shebangfix
SHEBANG_FILES= abck
python_OLD_CMD= /usr/local/bin/python
-python_CMD= ${PYTHON_CMD}
.include <bsd.port.mk>
diff --git a/sysutils/py-pytsk/Makefile b/sysutils/py-pytsk/Makefile
index fa8e740..5b382c0 100644
--- a/sysutils/py-pytsk/Makefile
+++ b/sysutils/py-pytsk/Makefile
@@ -20,7 +20,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USES= python shebangfix tar:tgz
SHEBANG_FILES= samples/*.py
python_OLD_CMD= .*
-python_CMD= ${PYTHON_CMD}
USE_PYTHON= distutils autoplist
PORTDOCS= README
diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile
index 2836d29..b45cddc 100644
--- a/textproc/asciidoc/Makefile
+++ b/textproc/asciidoc/Makefile
@@ -34,8 +34,7 @@ SHEBANG_FILES= a2x.py \
filters/graphviz/graphviz2png.py \
filters/music/music2png.py \
filters/code/code-filter.py
-python_OLD_CMD= ${SETENV} python
-python_CMD= ${PYTHON_CMD}
+python_OLD_CMD= /usr/bin/env python
post-patch:
@${REINPLACE_CMD} -e '/^INSTALL_PROG/ s|INSTALL_PROGRAM|INSTALL_SCRIPT|; s|\.conf|&.sample|' ${WRKSRC}/Makefile.in
diff --git a/textproc/py2html/Makefile b/textproc/py2html/Makefile
index e8bcd22..63958d2 100644
--- a/textproc/py2html/Makefile
+++ b/textproc/py2html/Makefile
@@ -14,7 +14,6 @@ USES= python:2 shebangfix
USE_PYTHON= distutils autoplist
python_OLD_CMD= /usr/bin/env python
-python_CMD= ${PYTHON_CMD}
SHEBANG_FILES= py2html
.include <bsd.port.mk>
diff --git a/www/calendarserver/Makefile b/www/calendarserver/Makefile
index e38934e..2b5f980 100644
--- a/www/calendarserver/Makefile
+++ b/www/calendarserver/Makefile
@@ -42,7 +42,6 @@ SUB_FILES= pkg-message
SUB_LIST+= USER=${USERS}
python_OLD_CMD= /usr/bin/env python
-python_CMD= ${PYTHON_CMD}
SHEBANG_FILES= bin/calendarserver_* \
bin/icalendar_split \
diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index e38cc03..417589d 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -23,7 +23,6 @@ SHEBANG_FILES= admin/CTK/CTK-run.pre admin/server.py \
doc/test_images.py doc/test_links.py \
po/admin/generate_POTFILESin.py po/po_stats.py \
qa/fcgi.py qa/run-tests.py
-python_CMD= ${PYTHON_CMD}
USE_RC_SUBR= cherokee
USE_OPENSSL= yes
GNU_CONFIGURE= yes
diff --git a/www/libhpack/Makefile b/www/libhpack/Makefile
index 61db992..f55378b 100644
--- a/www/libhpack/Makefile
+++ b/www/libhpack/Makefile
@@ -21,8 +21,7 @@ USE_LDCONFIG= yes
USES= cmake pkgconfig python:2,build shebangfix tar:xz
SHEBANG_FILES= gen-config.py libhpack/huffman-gen.py
-python_OLD_CMD= ${SETENV} python
-python_CMD= ${PYTHON_CMD}
+python_OLD_CMD= /usr/bin/env python
post-patch:
@${REINPLACE_CMD} -e 's|STATIC|SHARED|' ${WRKSRC}/libchula/CMakeLists.txt ${WRKSRC}/libhpack/CMakeLists.txt
diff --git a/www/py-djblets/Makefile b/www/py-djblets/Makefile
index b59557d..c6c5c49 100644
--- a/www/py-djblets/Makefile
+++ b/www/py-djblets/Makefile
@@ -26,7 +26,6 @@ USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= Djblets
python_OLD_CMD= /usr/bin/env python
-python_CMD= ${PYTHON_CMD}
SHEBANG_FILES= contrib/internal/build-media.py
.include <bsd.port.mk>
diff --git a/www/varnish4/Makefile b/www/varnish4/Makefile
index deefae2..2b5ed42 100644
--- a/www/varnish4/Makefile
+++ b/www/varnish4/Makefile
@@ -20,7 +20,6 @@ CONFLICTS= varnish-2.* varnish-3.*
USES= autoreconf cpe gmake libtool pkgconfig python:2,build readline shebangfix
SHEBANG_FILES= lib/libvcc/vmodtool.py
python_OLD_CMD= /usr/bin/env python
-python_CMD= ${PYTHON_CMD}
CPE_VENDOR= varnish-cache
CFLAGS+= -I${LOCALBASE}/include
GNU_CONFIGURE= yes
diff --git a/x11-wm/ede/Makefile b/x11-wm/ede/Makefile
index e13fcad3..5f97b86 100644
--- a/x11-wm/ede/Makefile
+++ b/x11-wm/ede/Makefile
@@ -26,8 +26,7 @@ LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \
USES= fam gettext iconv:translit pathfix pkgconfig python:2 \
shared-mime-info shebangfix
SHEBANG_FILES= doc/asciidoc/asciidoc.py
-python_OLD_CMD= ${SETENV} python
-python_CMD= ${PYTHON_CMD}
+python_OLD_CMD= /usr/bin/env python
USE_XORG= xcomposite xft xinerama xkbfile xpm xrandr
USE_CSTD= gnu89
GNU_CONFIGURE= yes
OpenPOWER on IntegriCloud