Index: Mk/Uses/shebangfix.mk =================================================================== --- Mk/Uses/shebangfix.mk +++ Mk/Uses/shebangfix.mk @@ -40,7 +40,11 @@ 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 Index: accessibility/caribou/Makefile =================================================================== --- accessibility/caribou/Makefile +++ accessibility/caribou/Makefile @@ -33,6 +33,5 @@ CONFIGURE_ARGS= --enable-gtk2-module=no GLIB_SCHEMAS= org.gnome.caribou.gschema.xml \ org.gnome.antler.gschema.xml -python_CMD= ${PYTHON_CMD} .include Index: astro/py-metar/Makefile =================================================================== --- astro/py-metar/Makefile +++ astro/py-metar/Makefile @@ -18,6 +18,5 @@ USES= python:2 shebangfix SHEBANG_FILES= bin/py${PORTNAME} -python_CMD= ${PYTHON_CMD} .include Index: astro/weather/Makefile =================================================================== --- astro/weather/Makefile +++ astro/weather/Makefile @@ -24,8 +24,7 @@ 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 Index: audio/boodler/Makefile =================================================================== --- audio/boodler/Makefile +++ audio/boodler/Makefile @@ -24,7 +24,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME} SHEBANG_FILES= ${CONFIGURE_SCRIPT} boodler.py -python_CMD= ${PYTHON_CMD} SUB_FILES= boodler-wrapper SUB_LIST= PYTHON_CMD=${PYTHON_CMD} Index: audio/lollypop/Makefile =================================================================== --- audio/lollypop/Makefile +++ audio/lollypop/Makefile @@ -28,8 +28,6 @@ SHEBANG_FILES= src/*.py SHEBANG_LANG= python -python_OLD_CMD= /usr/bin/python -python_CMD= ${PYTHON_CMD} GLIB_SCHEMAS= org.gnome.Lollypop.gschema.xml Index: audio/mma/Makefile =================================================================== --- audio/mma/Makefile +++ audio/mma/Makefile @@ -31,7 +31,6 @@ WRKDOC= ${WRKDIR}/${PORTNAME}-pdf-${DISTVERSION:S,a,,} WRKSRC= ${WRKDIR}/${PORTNAME}-bin-${DISTVERSION} -python_CMD= ${PYTHON_CMD} python_OLD_CMD= /usr/bin/env python .include Index: audio/py-tagpy/Makefile =================================================================== --- audio/py-tagpy/Makefile +++ audio/py-tagpy/Makefile @@ -25,7 +25,6 @@ --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 Index: chinese/sunpinyin/Makefile =================================================================== --- chinese/sunpinyin/Makefile +++ chinese/sunpinyin/Makefile @@ -24,7 +24,6 @@ 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} Index: databases/nagios-check_mongodb/Makefile =================================================================== --- databases/nagios-check_mongodb/Makefile +++ databases/nagios-check_mongodb/Makefile @@ -17,8 +17,7 @@ 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 Index: databases/postgresql-libpqxx/Makefile =================================================================== --- databases/postgresql-libpqxx/Makefile +++ databases/postgresql-libpqxx/Makefile @@ -22,7 +22,6 @@ USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION:R} SHEBANG_FILES= ${WRKSRC}/tools/splitconfig -python_CMD= ${PYTHON_CMD} CONFIGURE_ARGS= --enable-shared \ --disable-dependency-tracking Index: databases/postgresql-libpqxx3/Makefile =================================================================== --- databases/postgresql-libpqxx3/Makefile +++ databases/postgresql-libpqxx3/Makefile @@ -23,7 +23,6 @@ INSTALL_TARGET= install-strip SHEBANG_FILES= tools/splitconfig -python_CMD= ${PYTHON_CMD} CONFIGURE_ARGS= --enable-shared Index: deskutils/semantik/Makefile =================================================================== --- deskutils/semantik/Makefile +++ deskutils/semantik/Makefile @@ -29,7 +29,6 @@ SHEBANG_FILES= ${WRKSRC}/src/templates/beamer/wscript \ ${WRKSRC}/src/templates/pdflatex/wscript -python_CMD= ${PYTHON_CMD} PLIST_SUB= PORTVERSION="${PORTVERSION}" Index: deskutils/tel/Makefile =================================================================== --- deskutils/tel/Makefile +++ deskutils/tel/Makefile @@ -17,7 +17,6 @@ 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: Index: devel/cvs2svn/Makefile =================================================================== --- devel/cvs2svn/Makefile +++ devel/cvs2svn/Makefile @@ -24,7 +24,6 @@ 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 \ Index: devel/py-InlineEgg/Makefile =================================================================== --- devel/py-InlineEgg/Makefile +++ devel/py-InlineEgg/Makefile @@ -14,7 +14,6 @@ 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 Index: devel/py-gflags/Makefile =================================================================== --- devel/py-gflags/Makefile +++ devel/py-gflags/Makefile @@ -18,8 +18,7 @@ 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 Index: devel/py-ice/Makefile =================================================================== --- devel/py-ice/Makefile +++ devel/py-ice/Makefile @@ -22,7 +22,6 @@ 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} Index: devel/py-ioflo/Makefile =================================================================== --- devel/py-ioflo/Makefile +++ devel/py-ioflo/Makefile @@ -18,6 +18,5 @@ SHEBANG_FILES= scripts/ioflo python_OLD_CMD= /usr/bin/env python -python_CMD= ${PYTHON_CMD} .include Index: devel/py-pip/Makefile =================================================================== --- devel/py-pip/Makefile +++ devel/py-pip/Makefile @@ -33,9 +33,8 @@ 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 Index: devel/py-pymtbl/Makefile =================================================================== --- devel/py-pymtbl/Makefile +++ devel/py-pymtbl/Makefile @@ -17,7 +17,6 @@ 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 Index: devel/renpy/Makefile =================================================================== --- devel/renpy/Makefile +++ devel/renpy/Makefile @@ -36,7 +36,6 @@ 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}" Index: emulators/dynagen/Makefile =================================================================== --- emulators/dynagen/Makefile +++ emulators/dynagen/Makefile @@ -26,7 +26,6 @@ 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 Index: finance/mybudget/Makefile =================================================================== --- finance/mybudget/Makefile +++ finance/mybudget/Makefile @@ -19,7 +19,6 @@ USES= python shebangfix SHEBANG_FILES= myBudget.py -python_CMD= ${PYTHON_CMD} OPTIONS_DEFINE= DOCS Index: games/lostfeathers/Makefile =================================================================== --- games/lostfeathers/Makefile +++ games/lostfeathers/Makefile @@ -21,7 +21,6 @@ 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 Index: games/oneisenough/Makefile =================================================================== --- games/oneisenough/Makefile +++ games/oneisenough/Makefile @@ -24,8 +24,7 @@ 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 Index: games/schwarzweiss/Makefile =================================================================== --- games/schwarzweiss/Makefile +++ games/schwarzweiss/Makefile @@ -26,7 +26,6 @@ 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 Index: games/starfighter/Makefile =================================================================== --- games/starfighter/Makefile +++ games/starfighter/Makefile @@ -24,8 +24,7 @@ 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 Index: games/super_mario_bros_python/Makefile =================================================================== --- games/super_mario_bros_python/Makefile +++ games/super_mario_bros_python/Makefile @@ -25,7 +25,6 @@ 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 Index: graphics/blender/Makefile =================================================================== --- graphics/blender/Makefile +++ graphics/blender/Makefile @@ -25,7 +25,6 @@ -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 \ Index: graphics/imgv/Makefile =================================================================== --- graphics/imgv/Makefile +++ graphics/imgv/Makefile @@ -24,7 +24,6 @@ USES= python:run shebangfix SHEBANG_FILES= imgv.py python_OLD_CMD= /usr/bin/env python -python_CMD= ${PYTHON_CMD} post-patch: @${REINPLACE_CMD} -e \ Index: graphics/py-gdal/Makefile =================================================================== --- graphics/py-gdal/Makefile +++ graphics/py-gdal/Makefile @@ -25,8 +25,7 @@ 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 Index: graphics/variety/Makefile =================================================================== --- graphics/variety/Makefile +++ graphics/variety/Makefile @@ -37,8 +37,6 @@ 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 Index: lang/cjs/Makefile =================================================================== --- lang/cjs/Makefile +++ lang/cjs/Makefile @@ -31,7 +31,6 @@ 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 Index: lang/python-tools/Makefile =================================================================== --- lang/python-tools/Makefile +++ lang/python-tools/Makefile @@ -29,7 +29,6 @@ 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} \ Index: lang/v8/Makefile =================================================================== --- lang/v8/Makefile +++ lang/v8/Makefile @@ -26,8 +26,7 @@ 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 Index: mail/tumgreyspf/Makefile =================================================================== --- mail/tumgreyspf/Makefile +++ mail/tumgreyspf/Makefile @@ -31,8 +31,7 @@ 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 Index: misc/gimp-help-en/Makefile =================================================================== --- misc/gimp-help-en/Makefile +++ misc/gimp-help-en/Makefile @@ -35,7 +35,6 @@ 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 Index: misc/pastebinit/Makefile =================================================================== --- misc/pastebinit/Makefile +++ misc/pastebinit/Makefile @@ -17,7 +17,6 @@ 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 Index: multimedia/pymp/Makefile =================================================================== --- multimedia/pymp/Makefile +++ multimedia/pymp/Makefile @@ -20,8 +20,7 @@ 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 Index: net/cloud-init/Makefile =================================================================== --- net/cloud-init/Makefile +++ net/cloud-init/Makefile @@ -34,7 +34,6 @@ 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" Index: net/gupnp/Makefile =================================================================== --- net/gupnp/Makefile +++ net/gupnp/Makefile @@ -26,7 +26,6 @@ USES= compiler:c11 gmake libtool pathfix pkgconfig python:run shebangfix tar:xz SHEBANG_FILES= tools/gupnp-binding-tool -python_CMD= ${PYTHON_CMD} .include Index: net/polyorb/Makefile =================================================================== --- net/polyorb/Makefile +++ net/polyorb/Makefile @@ -33,7 +33,6 @@ 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" \ Index: net/py-pynmsg/Makefile =================================================================== --- net/py-pynmsg/Makefile +++ net/py-pynmsg/Makefile @@ -18,7 +18,6 @@ USE_PYTHON= distutils autoplist USES= python shebangfix uniquefiles:dirs -python_CMD= ${PYTHON_CMD} python_OLD_CMD= /usr/bin/env python SHEBANG_FILES= examples/*.py Index: net/py-pysphere/Makefile =================================================================== --- net/py-pysphere/Makefile +++ net/py-pysphere/Makefile @@ -18,7 +18,6 @@ SHEBANG_LANG= python python_OLD_CMD= /usr/bin/env python -python_CMD= ${PYTHON_CMD} SHEBANG_FILES= *.py \ pysphere/ZSI/*.py \ pysphere/ZSI/generate/*.py \ Index: net/rabbitmq/Makefile =================================================================== --- net/rabbitmq/Makefile +++ net/rabbitmq/Makefile @@ -28,7 +28,6 @@ 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 Index: net/samba4/Makefile =================================================================== --- net/samba4/Makefile +++ net/samba4/Makefile @@ -405,8 +405,7 @@ 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" Index: net/samba41/Makefile =================================================================== --- net/samba41/Makefile +++ net/samba41/Makefile @@ -400,8 +400,7 @@ 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" Index: net/samba42/Makefile =================================================================== --- net/samba42/Makefile +++ net/samba42/Makefile @@ -403,8 +403,7 @@ 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" Index: net/xorp/Makefile =================================================================== --- net/xorp/Makefile +++ net/xorp/Makefile @@ -24,7 +24,6 @@ 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 Index: news/xpn/Makefile =================================================================== --- news/xpn/Makefile +++ news/xpn/Makefile @@ -17,9 +17,8 @@ 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} Index: security/py-python-registry/Makefile =================================================================== --- security/py-python-registry/Makefile +++ security/py-python-registry/Makefile @@ -19,7 +19,6 @@ USE_PYTHON= distutils autoplist SHEBANG_FILES= samples/*.py python_OLD_CMD= .* -python_CMD= ${PYTHON_CMD} OPTIONS_DEFINE= DOCS EXAMPLES Index: sysutils/abck/Makefile =================================================================== --- sysutils/abck/Makefile +++ sysutils/abck/Makefile @@ -13,6 +13,5 @@ USES= python shebangfix SHEBANG_FILES= abck python_OLD_CMD= /usr/local/bin/python -python_CMD= ${PYTHON_CMD} .include Index: sysutils/py-pytsk/Makefile =================================================================== --- sysutils/py-pytsk/Makefile +++ sysutils/py-pytsk/Makefile @@ -20,7 +20,6 @@ USES= python shebangfix tar:tgz SHEBANG_FILES= samples/*.py python_OLD_CMD= .* -python_CMD= ${PYTHON_CMD} USE_PYTHON= distutils autoplist PORTDOCS= README Index: textproc/asciidoc/Makefile =================================================================== --- textproc/asciidoc/Makefile +++ textproc/asciidoc/Makefile @@ -34,8 +34,7 @@ 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 Index: textproc/py2html/Makefile =================================================================== --- textproc/py2html/Makefile +++ textproc/py2html/Makefile @@ -14,7 +14,6 @@ USE_PYTHON= distutils autoplist python_OLD_CMD= /usr/bin/env python -python_CMD= ${PYTHON_CMD} SHEBANG_FILES= py2html .include Index: www/calendarserver/Makefile =================================================================== --- www/calendarserver/Makefile +++ www/calendarserver/Makefile @@ -42,7 +42,6 @@ SUB_LIST+= USER=${USERS} python_OLD_CMD= /usr/bin/env python -python_CMD= ${PYTHON_CMD} SHEBANG_FILES= bin/calendarserver_* \ bin/icalendar_split \ Index: www/cherokee/Makefile =================================================================== --- www/cherokee/Makefile +++ www/cherokee/Makefile @@ -23,7 +23,6 @@ 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 Index: www/libhpack/Makefile =================================================================== --- www/libhpack/Makefile +++ www/libhpack/Makefile @@ -21,8 +21,7 @@ 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 Index: www/py-djblets/Makefile =================================================================== --- www/py-djblets/Makefile +++ www/py-djblets/Makefile @@ -26,7 +26,6 @@ PYDISTUTILS_PKGNAME= Djblets python_OLD_CMD= /usr/bin/env python -python_CMD= ${PYTHON_CMD} SHEBANG_FILES= contrib/internal/build-media.py .include Index: www/varnish4/Makefile =================================================================== --- www/varnish4/Makefile +++ www/varnish4/Makefile @@ -20,7 +20,6 @@ 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 Index: x11-wm/ede/Makefile =================================================================== --- x11-wm/ede/Makefile +++ x11-wm/ede/Makefile @@ -26,8 +26,7 @@ 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