Page MenuHomeFreeBSD
Files F109519405

D2955.diff
No OneTemporary
Actions

D2955.diff
View Options

Index: head/Mk/Uses/shebangfix.mk
===================================================================
--- head/Mk/Uses/shebangfix.mk
+++ head/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: head/accessibility/caribou/Makefile
===================================================================
--- head/accessibility/caribou/Makefile
+++ head/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 <bsd.port.mk>
Index: head/astro/py-metar/Makefile
===================================================================
--- head/astro/py-metar/Makefile
+++ head/astro/py-metar/Makefile
@@ -18,6 +18,5 @@
USES= python:2 shebangfix
SHEBANG_FILES= bin/py${PORTNAME}
-python_CMD= ${PYTHON_CMD}
.include <bsd.port.mk>
Index: head/astro/weather/Makefile
===================================================================
--- head/astro/weather/Makefile
+++ head/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 <bsd.port.pre.mk>
Index: head/audio/boodler/Makefile
===================================================================
--- head/audio/boodler/Makefile
+++ head/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: head/audio/lollypop/Makefile
===================================================================
--- head/audio/lollypop/Makefile
+++ head/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: head/audio/mma/Makefile
===================================================================
--- head/audio/mma/Makefile
+++ head/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 <bsd.port.options.mk>
Index: head/audio/py-tagpy/Makefile
===================================================================
--- head/audio/py-tagpy/Makefile
+++ head/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: head/chinese/sunpinyin/Makefile
===================================================================
--- head/chinese/sunpinyin/Makefile
+++ head/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: head/databases/nagios-check_mongodb/Makefile
===================================================================
--- head/databases/nagios-check_mongodb/Makefile
+++ head/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: head/databases/postgresql-libpqxx/Makefile
===================================================================
--- head/databases/postgresql-libpqxx/Makefile
+++ head/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: head/databases/postgresql-libpqxx3/Makefile
===================================================================
--- head/databases/postgresql-libpqxx3/Makefile
+++ head/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: head/deskutils/semantik/Makefile
===================================================================
--- head/deskutils/semantik/Makefile
+++ head/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: head/deskutils/tel/Makefile
===================================================================
--- head/deskutils/tel/Makefile
+++ head/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: head/devel/cvs2svn/Makefile
===================================================================
--- head/devel/cvs2svn/Makefile
+++ head/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: head/devel/py-InlineEgg/Makefile
===================================================================
--- head/devel/py-InlineEgg/Makefile
+++ head/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: head/devel/py-gflags/Makefile
===================================================================
--- head/devel/py-gflags/Makefile
+++ head/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: head/devel/py-ice/Makefile
===================================================================
--- head/devel/py-ice/Makefile
+++ head/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: head/devel/py-ioflo/Makefile
===================================================================
--- head/devel/py-ioflo/Makefile
+++ head/devel/py-ioflo/Makefile
@@ -18,6 +18,5 @@
SHEBANG_FILES= scripts/ioflo
python_OLD_CMD= /usr/bin/env python
-python_CMD= ${PYTHON_CMD}
.include <bsd.port.mk>
Index: head/devel/py-pip/Makefile
===================================================================
--- head/devel/py-pip/Makefile
+++ head/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: head/devel/py-pymtbl/Makefile
===================================================================
--- head/devel/py-pymtbl/Makefile
+++ head/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: head/devel/renpy/Makefile
===================================================================
--- head/devel/renpy/Makefile
+++ head/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: head/emulators/dynagen/Makefile
===================================================================
--- head/emulators/dynagen/Makefile
+++ head/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: head/finance/mybudget/Makefile
===================================================================
--- head/finance/mybudget/Makefile
+++ head/finance/mybudget/Makefile
@@ -19,7 +19,6 @@
USES= python shebangfix
SHEBANG_FILES= myBudget.py
-python_CMD= ${PYTHON_CMD}
OPTIONS_DEFINE= DOCS
Index: head/games/lostfeathers/Makefile
===================================================================
--- head/games/lostfeathers/Makefile
+++ head/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: head/games/oneisenough/Makefile
===================================================================
--- head/games/oneisenough/Makefile
+++ head/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: head/games/schwarzweiss/Makefile
===================================================================
--- head/games/schwarzweiss/Makefile
+++ head/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: head/games/starfighter/Makefile
===================================================================
--- head/games/starfighter/Makefile
+++ head/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: head/games/super_mario_bros_python/Makefile
===================================================================
--- head/games/super_mario_bros_python/Makefile
+++ head/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: head/graphics/blender/Makefile
===================================================================
--- head/graphics/blender/Makefile
+++ head/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: head/graphics/imgv/Makefile
===================================================================
--- head/graphics/imgv/Makefile
+++ head/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: head/graphics/py-gdal/Makefile
===================================================================
--- head/graphics/py-gdal/Makefile
+++ head/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: head/graphics/variety/Makefile
===================================================================
--- head/graphics/variety/Makefile
+++ head/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: head/lang/cjs/Makefile
===================================================================
--- head/lang/cjs/Makefile
+++ head/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: head/lang/python-tools/Makefile
===================================================================
--- head/lang/python-tools/Makefile
+++ head/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: head/lang/v8/Makefile
===================================================================
--- head/lang/v8/Makefile
+++ head/lang/v8/Makefile
@@ -27,8 +27,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 <bsd.port.pre.mk>
Index: head/mail/tumgreyspf/Makefile
===================================================================
--- head/mail/tumgreyspf/Makefile
+++ head/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: head/misc/gimp-help-en/Makefile
===================================================================
--- head/misc/gimp-help-en/Makefile
+++ head/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: head/misc/pastebinit/Makefile
===================================================================
--- head/misc/pastebinit/Makefile
+++ head/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: head/multimedia/pymp/Makefile
===================================================================
--- head/multimedia/pymp/Makefile
+++ head/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: head/net/cloud-init/Makefile
===================================================================
--- head/net/cloud-init/Makefile
+++ head/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: head/net/gupnp/Makefile
===================================================================
--- head/net/gupnp/Makefile
+++ head/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 <bsd.port.pre.mk>
Index: head/net/polyorb/Makefile
===================================================================
--- head/net/polyorb/Makefile
+++ head/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: head/net/py-pynmsg/Makefile
===================================================================
--- head/net/py-pynmsg/Makefile
+++ head/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: head/net/py-pysphere/Makefile
===================================================================
--- head/net/py-pysphere/Makefile
+++ head/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: head/net/rabbitmq/Makefile
===================================================================
--- head/net/rabbitmq/Makefile
+++ head/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: head/net/samba4/Makefile
===================================================================
--- head/net/samba4/Makefile
+++ head/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: head/net/samba41/Makefile
===================================================================
--- head/net/samba41/Makefile
+++ head/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: head/net/samba42/Makefile
===================================================================
--- head/net/samba42/Makefile
+++ head/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: head/net/xorp/Makefile
===================================================================
--- head/net/xorp/Makefile
+++ head/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: head/news/xpn/Makefile
===================================================================
--- head/news/xpn/Makefile
+++ head/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: head/security/py-python-registry/Makefile
===================================================================
--- head/security/py-python-registry/Makefile
+++ head/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: head/sysutils/abck/Makefile
===================================================================
--- head/sysutils/abck/Makefile
+++ head/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 <bsd.port.mk>
Index: head/sysutils/py-pytsk/Makefile
===================================================================
--- head/sysutils/py-pytsk/Makefile
+++ head/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: head/textproc/asciidoc/Makefile
===================================================================
--- head/textproc/asciidoc/Makefile
+++ head/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: head/textproc/py2html/Makefile
===================================================================
--- head/textproc/py2html/Makefile
+++ head/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 <bsd.port.mk>
Index: head/www/calendarserver/Makefile
===================================================================
--- head/www/calendarserver/Makefile
+++ head/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: head/www/cherokee/Makefile
===================================================================
--- head/www/cherokee/Makefile
+++ head/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: head/www/libhpack/Makefile
===================================================================
--- head/www/libhpack/Makefile
+++ head/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: head/www/py-djblets/Makefile
===================================================================
--- head/www/py-djblets/Makefile
+++ head/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 <bsd.port.mk>
Index: head/www/varnish4/Makefile
===================================================================
--- head/www/varnish4/Makefile
+++ head/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: head/x11-wm/ede/Makefile
===================================================================
--- head/x11-wm/ede/Makefile
+++ head/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

File Metadata

Mime Type
text/plain
Expires
Fri, Feb 7, 4:00 AM (21 h, 4 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16505540
Default Alt Text
D2955.diff (24 KB)

Event Timeline