Date: Wed, 29 Jul 2015 22:09:55 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393196 - in head: Mk/Uses accessibility/caribou astro/py-metar astro/weather audio/boodler audio/lollypop audio/mma audio/py-tagpy chinese/sunpinyin databases/nagios-check_mongodb data... Message-ID: <201507292209.t6TM9tQC064356@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Wed Jul 29 22:09:53 2015 New Revision: 393196 URL: https://svnweb.freebsd.org/changeset/ports/393196 Log: 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 Modified: head/Mk/Uses/shebangfix.mk head/accessibility/caribou/Makefile head/astro/py-metar/Makefile head/astro/weather/Makefile head/audio/boodler/Makefile head/audio/lollypop/Makefile head/audio/mma/Makefile head/audio/py-tagpy/Makefile head/chinese/sunpinyin/Makefile head/databases/nagios-check_mongodb/Makefile head/databases/postgresql-libpqxx/Makefile head/databases/postgresql-libpqxx3/Makefile head/deskutils/semantik/Makefile head/deskutils/tel/Makefile head/devel/cvs2svn/Makefile head/devel/py-InlineEgg/Makefile head/devel/py-gflags/Makefile head/devel/py-ice/Makefile head/devel/py-ioflo/Makefile head/devel/py-pip/Makefile head/devel/py-pymtbl/Makefile head/devel/renpy/Makefile head/emulators/dynagen/Makefile head/finance/mybudget/Makefile head/games/lostfeathers/Makefile head/games/oneisenough/Makefile head/games/schwarzweiss/Makefile head/games/starfighter/Makefile head/games/super_mario_bros_python/Makefile head/graphics/blender/Makefile head/graphics/imgv/Makefile head/graphics/py-gdal/Makefile head/graphics/variety/Makefile head/lang/cjs/Makefile head/lang/python-tools/Makefile head/lang/v8/Makefile head/mail/tumgreyspf/Makefile head/misc/gimp-help-en/Makefile head/misc/pastebinit/Makefile head/multimedia/pymp/Makefile head/net/cloud-init/Makefile head/net/gupnp/Makefile head/net/polyorb/Makefile head/net/py-pynmsg/Makefile head/net/py-pysphere/Makefile head/net/rabbitmq/Makefile head/net/samba4/Makefile head/net/samba41/Makefile head/net/samba42/Makefile head/net/xorp/Makefile head/news/xpn/Makefile head/security/py-python-registry/Makefile head/sysutils/abck/Makefile head/sysutils/py-pytsk/Makefile head/textproc/asciidoc/Makefile head/textproc/py2html/Makefile head/www/calendarserver/Makefile head/www/cherokee/Makefile head/www/libhpack/Makefile head/www/py-djblets/Makefile head/www/varnish4/Makefile head/x11-wm/ede/Makefile Modified: head/Mk/Uses/shebangfix.mk ============================================================================== --- head/Mk/Uses/shebangfix.mk Wed Jul 29 21:58:23 2015 (r393195) +++ head/Mk/Uses/shebangfix.mk Wed Jul 29 22:09:53 2015 (r393196) @@ -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 Modified: head/accessibility/caribou/Makefile ============================================================================== --- head/accessibility/caribou/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/accessibility/caribou/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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> Modified: head/astro/py-metar/Makefile ============================================================================== --- head/astro/py-metar/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/astro/py-metar/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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> Modified: head/astro/weather/Makefile ============================================================================== --- head/astro/weather/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/astro/weather/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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> Modified: head/audio/boodler/Makefile ============================================================================== --- head/audio/boodler/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/audio/boodler/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -24,7 +24,6 @@ CONFIGURE_ARGS= --include ${LOCALBASE}/i WRKSRC= ${WRKDIR}/${PORTNAME} SHEBANG_FILES= ${CONFIGURE_SCRIPT} boodler.py -python_CMD= ${PYTHON_CMD} SUB_FILES= boodler-wrapper SUB_LIST= PYTHON_CMD=${PYTHON_CMD} Modified: head/audio/lollypop/Makefile ============================================================================== --- head/audio/lollypop/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/audio/lollypop/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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 Modified: head/audio/mma/Makefile ============================================================================== --- head/audio/mma/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/audio/mma/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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> Modified: head/audio/py-tagpy/Makefile ============================================================================== --- head/audio/py-tagpy/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/audio/py-tagpy/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -25,7 +25,6 @@ CONFIGURE_ARGS= --taglib-inc-dir="${LOCA --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 Modified: head/chinese/sunpinyin/Makefile ============================================================================== --- head/chinese/sunpinyin/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/chinese/sunpinyin/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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} Modified: head/databases/nagios-check_mongodb/Makefile ============================================================================== --- head/databases/nagios-check_mongodb/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/databases/nagios-check_mongodb/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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 Modified: head/databases/postgresql-libpqxx/Makefile ============================================================================== --- head/databases/postgresql-libpqxx/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/databases/postgresql-libpqxx/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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 Modified: head/databases/postgresql-libpqxx3/Makefile ============================================================================== --- head/databases/postgresql-libpqxx3/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/databases/postgresql-libpqxx3/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -23,7 +23,6 @@ PLIST_SUB= PORTVERSION=${PORTVERSION} INSTALL_TARGET= install-strip SHEBANG_FILES= tools/splitconfig -python_CMD= ${PYTHON_CMD} CONFIGURE_ARGS= --enable-shared Modified: head/deskutils/semantik/Makefile ============================================================================== --- head/deskutils/semantik/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/deskutils/semantik/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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}" Modified: head/deskutils/tel/Makefile ============================================================================== --- head/deskutils/tel/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/deskutils/tel/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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: Modified: head/devel/cvs2svn/Makefile ============================================================================== --- head/devel/cvs2svn/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/devel/cvs2svn/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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 \ Modified: head/devel/py-InlineEgg/Makefile ============================================================================== --- head/devel/py-InlineEgg/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/devel/py-InlineEgg/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -14,7 +14,6 @@ COMMENT= Python module for writing inlin 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 Modified: head/devel/py-gflags/Makefile ============================================================================== --- head/devel/py-gflags/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/devel/py-gflags/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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 Modified: head/devel/py-ice/Makefile ============================================================================== --- head/devel/py-ice/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/devel/py-ice/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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} Modified: head/devel/py-ioflo/Makefile ============================================================================== --- head/devel/py-ioflo/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/devel/py-ioflo/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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> Modified: head/devel/py-pip/Makefile ============================================================================== --- head/devel/py-pip/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/devel/py-pip/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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 Modified: head/devel/py-pymtbl/Makefile ============================================================================== --- head/devel/py-pymtbl/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/devel/py-pymtbl/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -17,7 +17,6 @@ LIB_DEPENDS= libmtbl.so:${PORTSDIR}/deve 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 Modified: head/devel/renpy/Makefile ============================================================================== --- head/devel/renpy/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/devel/renpy/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -36,7 +36,6 @@ EXCLUDE= gen 'module/*.py[co]' 'renpy/*. 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}" Modified: head/emulators/dynagen/Makefile ============================================================================== --- head/emulators/dynagen/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/emulators/dynagen/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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 Modified: head/finance/mybudget/Makefile ============================================================================== --- head/finance/mybudget/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/finance/mybudget/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -19,7 +19,6 @@ INSTALL_ICONS= yes USES= python shebangfix SHEBANG_FILES= myBudget.py -python_CMD= ${PYTHON_CMD} OPTIONS_DEFINE= DOCS Modified: head/games/lostfeathers/Makefile ============================================================================== --- head/games/lostfeathers/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/games/lostfeathers/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -21,7 +21,6 @@ RUN_DEPENDS= avbin>=0:${PORTSDIR}/multim 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 Modified: head/games/oneisenough/Makefile ============================================================================== --- head/games/oneisenough/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/games/oneisenough/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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 Modified: head/games/schwarzweiss/Makefile ============================================================================== --- head/games/schwarzweiss/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/games/schwarzweiss/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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 Modified: head/games/starfighter/Makefile ============================================================================== --- head/games/starfighter/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/games/starfighter/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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 Modified: head/games/super_mario_bros_python/Makefile ============================================================================== --- head/games/super_mario_bros_python/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/games/super_mario_bros_python/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -25,7 +25,6 @@ WRKSRC= ${WRKDIR}/Super-Mario-Bros-Pyth 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 Modified: head/graphics/blender/Makefile ============================================================================== --- head/graphics/blender/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/graphics/blender/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -25,7 +25,6 @@ CMAKE_ARGS= -DWITH_PYTHON_INSTALL:BOOL=O -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 \ Modified: head/graphics/imgv/Makefile ============================================================================== --- head/graphics/imgv/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/graphics/imgv/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -24,7 +24,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER USES= python:run shebangfix SHEBANG_FILES= imgv.py python_OLD_CMD= /usr/bin/env python -python_CMD= ${PYTHON_CMD} post-patch: @${REINPLACE_CMD} -e \ Modified: head/graphics/py-gdal/Makefile ============================================================================== --- head/graphics/py-gdal/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/graphics/py-gdal/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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 Modified: head/graphics/variety/Makefile ============================================================================== --- head/graphics/variety/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/graphics/variety/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -37,8 +37,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}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 Modified: head/lang/cjs/Makefile ============================================================================== --- head/lang/cjs/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/lang/cjs/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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 Modified: head/lang/python-tools/Makefile ============================================================================== --- head/lang/python-tools/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/lang/python-tools/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -29,7 +29,6 @@ PLIST_FILES= ${SCRIPT_FILES:C/^.*/bin\/& 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} \ Modified: head/lang/v8/Makefile ============================================================================== --- head/lang/v8/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/lang/v8/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -27,8 +27,7 @@ USES= alias compiler cpe execinfo gmake 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> Modified: head/mail/tumgreyspf/Makefile ============================================================================== --- head/mail/tumgreyspf/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/mail/tumgreyspf/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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 Modified: head/misc/gimp-help-en/Makefile ============================================================================== --- head/misc/gimp-help-en/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/misc/gimp-help-en/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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 Modified: head/misc/pastebinit/Makefile ============================================================================== --- head/misc/pastebinit/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/misc/pastebinit/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -17,7 +17,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}conf 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 Modified: head/multimedia/pymp/Makefile ============================================================================== --- head/multimedia/pymp/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/multimedia/pymp/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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 Modified: head/net/cloud-init/Makefile ============================================================================== --- head/net/cloud-init/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/net/cloud-init/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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" Modified: head/net/gupnp/Makefile ============================================================================== --- head/net/gupnp/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/net/gupnp/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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> Modified: head/net/polyorb/Makefile ============================================================================== --- head/net/polyorb/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/net/polyorb/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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" \ Modified: head/net/py-pynmsg/Makefile ============================================================================== --- head/net/py-pynmsg/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/net/py-pynmsg/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -18,7 +18,6 @@ LIB_DEPENDS= libnmsg.so:${PORTSDIR}/net/ USE_PYTHON= distutils autoplist USES= python shebangfix uniquefiles:dirs -python_CMD= ${PYTHON_CMD} python_OLD_CMD= /usr/bin/env python SHEBANG_FILES= examples/*.py Modified: head/net/py-pysphere/Makefile ============================================================================== --- head/net/py-pysphere/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/net/py-pysphere/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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 \ Modified: head/net/rabbitmq/Makefile ============================================================================== --- head/net/rabbitmq/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/net/rabbitmq/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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 Modified: head/net/samba4/Makefile ============================================================================== --- head/net/samba4/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/net/samba4/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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" Modified: head/net/samba41/Makefile ============================================================================== --- head/net/samba41/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/net/samba41/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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" Modified: head/net/samba42/Makefile ============================================================================== --- head/net/samba42/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/net/samba42/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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" Modified: head/net/xorp/Makefile ============================================================================== --- head/net/xorp/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/net/xorp/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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 Modified: head/news/xpn/Makefile ============================================================================== --- head/news/xpn/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/news/xpn/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -17,9 +17,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gtk2 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} Modified: head/security/py-python-registry/Makefile ============================================================================== --- head/security/py-python-registry/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/security/py-python-registry/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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 Modified: head/sysutils/abck/Makefile ============================================================================== --- head/sysutils/abck/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/sysutils/abck/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -13,6 +13,5 @@ COMMENT= Manage intrusion attempts recor USES= python shebangfix SHEBANG_FILES= abck python_OLD_CMD= /usr/local/bin/python -python_CMD= ${PYTHON_CMD} .include <bsd.port.mk> Modified: head/sysutils/py-pytsk/Makefile ============================================================================== --- head/sysutils/py-pytsk/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/sysutils/py-pytsk/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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 Modified: head/textproc/asciidoc/Makefile ============================================================================== --- head/textproc/asciidoc/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/textproc/asciidoc/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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 Modified: head/textproc/py2html/Makefile ============================================================================== --- head/textproc/py2html/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/textproc/py2html/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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> Modified: head/www/calendarserver/Makefile ============================================================================== --- head/www/calendarserver/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/www/calendarserver/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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 \ Modified: head/www/cherokee/Makefile ============================================================================== --- head/www/cherokee/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/www/cherokee/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -23,7 +23,6 @@ SHEBANG_FILES= admin/CTK/CTK-run.pre adm 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 Modified: head/www/libhpack/Makefile ============================================================================== --- head/www/libhpack/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/www/libhpack/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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 Modified: head/www/py-djblets/Makefile ============================================================================== --- head/www/py-djblets/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/www/py-djblets/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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> Modified: head/www/varnish4/Makefile ============================================================================== --- head/www/varnish4/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/www/varnish4/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -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 Modified: head/x11-wm/ede/Makefile ============================================================================== --- head/x11-wm/ede/Makefile Wed Jul 29 21:58:23 2015 (r393195) +++ head/x11-wm/ede/Makefile Wed Jul 29 22:09:53 2015 (r393196) @@ -26,8 +26,7 @@ LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/de 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507292209.t6TM9tQC064356>