diff options
62 files changed, 22 insertions, 81 deletions
diff --git a/Mk/Uses/shebangfix.mk b/Mk/Uses/shebangfix.mk index 5ef46388fcf8..14443dc32a79 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 4b447f52e167..9ed0b74c79d8 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 3b6f38eabcb5..3a3997d6b338 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 0a97a9ae2055..5cb1a0c82442 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 d5b50727828d..c381e1f0a56d 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 5e002d1411bb..c68fe70e817b 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 d3131109723a..d27fab0233c5 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 755b617afa51..2988f8a2c47e 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 a44f940942b1..30a631a26761 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 8e21edcdf7fe..74c42e0b823c 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 0f4c5dd56099..ed9ed981cf91 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 ae82dae5aa78..9acfb01c90bc 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 f29782ec2721..109edfd6f0b7 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 5e007b502e76..85263207c736 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 6d2c2beb1a30..55c6b7f77554 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 68f3af9db2f1..7c48e57ffc1c 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 69c16af7a9b5..310564ebf9a3 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 576446a3c5ee..a36e430feb1a 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 1004aa81c1de..c8dbd1d918c8 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 426ae61be732..f121c3e9640c 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 f578a920f586..9ed6fddaac96 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 fa814160be0e..c0ddc332f2c6 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 2f04a386ea3c..5415de1ff3e3 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 bb6a1f683eca..8b802860330e 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 0b5ea0dd3ccd..75af257002c6 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 e191d00b0ac3..5f33ae658250 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 920822abb432..a34e3f1838c3 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 53cad5359920..b3fc1c03037b 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 ffe190c37190..250f20514960 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 e76902777b2d..98af14c7ae66 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 1d353edf894d..d2bc2a60042a 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 2b0ca9770b1e..35a23bc7ec1a 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 c2f2ec28b69b..95b25b826309 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 d394b1f4746c..8068d74f49b3 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 543827bbfdcc..79490306050f 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 60912c8b315c..7362c2147335 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 1d7f3fe8f5b9..855a86976ddb 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 6d61a5d1fe63..66a189adb9bc 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 aeba55e74b2f..37e5b4f09668 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 e20a85e51a97..4b9c120ffb97 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 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 diff --git a/news/xpn/Makefile b/news/xpn/Makefile index 7c7df9f0792c..2623e0513761 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 27839fc8395a..14feb902c69e 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 6ae9af09227e..e191fb297004 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 fa8e74006f62..5b382c0e94fa 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 2836d2944153..b45cddcf2f22 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 e8bcd221669a..63958d2e0ae9 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 e38934e0461a..2b5f98092744 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 e38cc03c466e..417589dbbb32 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 61db992b72b1..f55378bc6775 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 b59557d6c54a..c6c5c49eab37 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 deefae29c96c..2b5ed4289ee2 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 e13fcad383dc..5f97b867330d 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 |