Date: Mon, 19 Oct 2015 14:50:52 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399684 - in head: Mk/Uses astro/weather audio/lollypop audio/mma audio/pulseaudio audio/py-tagpy audio/ripit audio/sphinx chinese/pyzy chinese/ydict databases/luadbi databases/nagios-c... Message-ID: <201510191450.t9JEoqln023397@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Oct 19 14:50:52 2015 New Revision: 399684 URL: https://svnweb.freebsd.org/changeset/ports/399684 Log: Improve shebangfix framework - Support multiple values in *_OLD_CMD, i.e. we can now fix both "/usr/bin/python" and "/usr/bin/env python" at the same time - Default *_OLD_CMD values are now always appended, so you don't need to specify them in individual ports - Add lua support (depends on USES=lua) - Add more default values, such as "/usr/bin/env foo" for python, perl, bash, ruby and lua - Shebangfix now matches whole words, e.g. we will no longer (erroneously) replace "/usr/bin/perl5.005" with "${perl_CMD}5.005" (but "/usr/bin/perl -tt" is still (correctly) replaced with "${perl_CMD} -tt") Note that *_OLD_CMD items containing spaces must now be quoted (e.g. perl_OLD_CMD=/bin/perl /usr/bin/perl "/usr/bin/env perl") Update shebangfix usage according to new rules in many ports: - Remove *_OLD_CMD for patterns now replaced by default - Quote custom *_OLD_CMD which contain spaces Fix shebangfix usage in many ports (irrelevant to infrastructure change): - Remove redundant SHEBANG_LANG (no need to duplicate default langs) - Remove redundant *_CMD (such as python_CMD=${LOCALBASE}/bin/python${PYTHON_VER} when USES=python is present) - Never use *_OLD_CMD in REINPLACE_CMD matchers, these should always look for exact string Approved by: portmgr (bapt) Differential Revision: D3756 Modified: head/Mk/Uses/shebangfix.mk head/astro/weather/Makefile head/audio/lollypop/Makefile head/audio/mma/Makefile head/audio/pulseaudio/Makefile head/audio/py-tagpy/Makefile head/audio/ripit/Makefile head/audio/sphinx/Makefile head/chinese/pyzy/Makefile head/chinese/ydict/Makefile head/databases/luadbi/Makefile head/databases/nagios-check_mongodb/Makefile head/databases/pgtune/Makefile head/databases/postgresql_autodoc/Makefile head/databases/skytools/Makefile head/deskutils/tel/Makefile head/deskutils/tnote/Makefile head/deskutils/virt-manager/Makefile head/devel/cvs2svn/Makefile head/devel/doxygen/Makefile head/devel/libnxt/Makefile head/devel/lua-alien/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/pipelight/Makefile head/games/childsplay/Makefile head/games/linux-enemyterritory-jaymod-21/Makefile head/games/linux-enemyterritory-jaymod/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/imgv/Makefile head/graphics/inkscape/Makefile head/graphics/py-cairo/Makefile head/graphics/py-gdal/Makefile head/graphics/py3-cairo/Makefile head/japanese/kcode/Makefile head/japanese/man/Makefile head/lang/cjs/Makefile head/lang/go/Makefile head/lang/go14/Makefile head/lang/python-tools/Makefile head/lang/v8/Makefile head/mail/bsfilter/Makefile head/mail/fetchmail/Makefile head/mail/postfix-current/Makefile head/mail/postfix-policyd-weight/Makefile head/mail/postfix-postfwd/Makefile head/mail/postfix/Makefile head/mail/tumgreyspf/Makefile head/math/mosesdecoder/Makefile head/misc/gimp-help-en/Makefile head/multimedia/lives/Makefile head/multimedia/pymp/Makefile head/net-im/prosody/Makefile head/net-mgmt/netams/Makefile head/net/cloud-init/Makefile head/net/get_iplayer/Makefile head/net/polyorb/Makefile head/net/py-pynmsg/Makefile head/net/py-pysphere/Makefile head/net/samba4/Makefile head/net/samba41/Makefile head/net/samba42/Makefile head/news/nzbget/Makefile head/news/xpn/Makefile head/print/texlive-texmf/Makefile head/security/cops/Makefile head/sysutils/racktables/Makefile head/sysutils/sd-agent/Makefile head/sysutils/tdir/Makefile head/sysutils/zfs-stats/Makefile head/textproc/asciidoc/Makefile head/textproc/google-ctemplate/Makefile head/textproc/py2html/Makefile head/textproc/sigil/Makefile head/www/calendarserver/Makefile head/www/joomla25/Makefile head/www/joomla31/Makefile head/www/libhpack/Makefile head/www/py-GinGin/Makefile head/www/py-djblets/Makefile head/www/varnish4/Makefile head/x11-wm/ede/Makefile head/x11/eaglemode/Makefile head/x11/scripts/Makefile head/x11/wbarconf/Makefile Modified: head/Mk/Uses/shebangfix.mk ============================================================================== --- head/Mk/Uses/shebangfix.mk Mon Oct 19 14:22:46 2015 (r399683) +++ head/Mk/Uses/shebangfix.mk Mon Oct 19 14:50:52 2015 (r399684) @@ -29,39 +29,56 @@ .if !defined(_INCLUDE_USES_SHEBANGFIX_MK) _INCLUDE_USES_SHEBANGFIX_MK= yes -bash_OLD_CMD?= /bin/bash +bash_OLD_CMD+= /bin/bash +bash_OLD_CMD+= "/usr/bin/env bash" bash_CMD?= ${LOCALBASE}/bin/bash -java_OLD_CMD?= /usr/bin/java +java_OLD_CMD+= /usr/bin/java java_CMD?= ${LOCALBASE}/bin/java -ksh_OLD_CMD?= /bin/ksh +ksh_OLD_CMD+= /bin/ksh ksh_CMD?= ${LOCALBASE}/bin/ksh -perl_OLD_CMD?= /usr/bin/perl +.if ${USES:Mlua*} +lua_OLD_CMD+= /usr/bin/lua +lua_OLD_CMD+= "/usr/bin/env lua" +lua_CMD?= ${LOCALBASE}/bin/${LUA_CMD} +.endif +perl_OLD_CMD+= /usr/bin/perl +perl_OLD_CMD+= "/usr/bin/env perl" +perl_OLD_CMD+= perl perl_CMD?= ${LOCALBASE}/bin/perl -php_OLD_CMD?= /usr/bin/php +php_OLD_CMD+= /usr/bin/php php_CMD?= ${LOCALBASE}/bin/php -python_OLD_CMD?= /usr/bin/python +python_OLD_CMD+= /usr/bin/python +python_OLD_CMD+= "/usr/bin/env python" .if ${USES:Mpython*} python_CMD?= ${PYTHON_CMD} .else python_CMD?= ${LOCALBASE}/bin/python .endif -ruby_OLD_CMD?= /usr/bin/ruby +ruby_OLD_CMD+= /usr/bin/ruby +ruby_OLD_CMD+= "/usr/bin/env ruby" ruby_CMD?= ${LOCALBASE}/bin/ruby -tcl_OLD_CMD?= /usr/bin/tclsh +tcl_OLD_CMD+= /usr/bin/tclsh tcl_CMD?= ${TCLSH} -tk_OLD_CMD?= /usr/bin/wish +tk_OLD_CMD+= /usr/bin/wish tk_CMD?= ${WISH} SHEBANG_LANG+= bash java ksh perl php python ruby tcl tk +.if ${USES:Mlua*} +SHEBANG_LANG+= lua +.endif + .for lang in ${SHEBANG_LANG} -.if !defined(${lang}_CMD) +. if !defined(${lang}_CMD) IGNORE+= missing definition for ${lang}_CMD -.endif -.if !defined(${lang}_OLD_CMD) +. endif +. if !defined(${lang}_OLD_CMD) IGNORE+= missing definition for ${lang}_OLD_CMD -.endif -_SHEBANG_REINPLACE_ARGS+= -e "1s|^\#![[:space:]]*${${lang}_OLD_CMD}|\#!${${lang}_CMD}|" +. endif +. for old_cmd in ${${lang}_OLD_CMD} +_SHEBANG_REINPLACE_ARGS+= -e "1s|^\#![[:space:]]*${old_cmd:C/\"//g}\([[:space:]]\)|\#!${${lang}_CMD}\1|" +_SHEBANG_REINPLACE_ARGS+= -e "1s|^\#![[:space:]]*${old_cmd:C/\"//g}$$|\#!${${lang}_CMD}|" +. endfor .endfor _USES_patch+= 210:fix-shebang Modified: head/astro/weather/Makefile ============================================================================== --- head/astro/weather/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/astro/weather/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -25,7 +25,6 @@ PLIST_FILES= bin/${PORTNAME} \ PORTDATA= airports places stations zctas zones SHEBANG_FILES= ${PORTNAME} -python_OLD_CMD= /usr/bin/env python .include <bsd.port.pre.mk> Modified: head/audio/lollypop/Makefile ============================================================================== --- head/audio/lollypop/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/audio/lollypop/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -27,7 +27,6 @@ USE_PYTHON= py3kplist INSTALLS_ICONS= yes SHEBANG_FILES= src/*.py -SHEBANG_LANG= python GLIB_SCHEMAS= org.gnome.Lollypop.gschema.xml Modified: head/audio/mma/Makefile ============================================================================== --- head/audio/mma/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/audio/mma/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -31,8 +31,6 @@ USES= python shebangfix WRKDOC= ${WRKDIR}/${PORTNAME}-pdf-${DISTVERSION:S,a,,} WRKSRC= ${WRKDIR}/${PORTNAME}-bin-${DISTVERSION} -python_OLD_CMD= /usr/bin/env python - DOCS_DISTFILES= ${PORTNAME}-pdf-${DISTVERSION:S,a,,}.tar.gz post-patch: Modified: head/audio/pulseaudio/Makefile ============================================================================== --- head/audio/pulseaudio/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/audio/pulseaudio/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -42,7 +42,6 @@ LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip SHEBANG_FILES= shell-completion/bash/pulseaudio -SHEBANG_LANG= bash bash_CMD= ${SETENV} bash SUB_FILES= pkg-message Modified: head/audio/py-tagpy/Makefile ============================================================================== --- head/audio/py-tagpy/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/audio/py-tagpy/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -24,7 +24,6 @@ CONFIGURE_ARGS= --taglib-inc-dir="${LOCA --boost-inc-dir="${PYTHON_INCLUDEDIR},${LOCALBASE}/include" \ --boost-lib-dir="${PYTHON_LIBDIR},${LOCALBASE}/lib" \ --boost-python-libname="boost_python" -python_OLD_CMD= /usr/bin/env python SHEBANG_FILES= configure.py USE_PYTHON= distutils autoplist Modified: head/audio/ripit/Makefile ============================================================================== --- head/audio/ripit/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/audio/ripit/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -24,7 +24,6 @@ USES= perl5 shebangfix tar:bzip2 NO_BUILD= yes USE_PERL5= run SHEBANG_FILES= ripit.pl -perl_OLD_CMD= /usr/bin/env perl OPTIONS_DEFINE= EXAMPLES Modified: head/audio/sphinx/Makefile ============================================================================== --- head/audio/sphinx/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/audio/sphinx/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -16,7 +16,7 @@ USE_LDCONFIG= yes PKGMESSAGE= ${WRKDIR}/pkg-message USES= gmake libtool shebangfix SHEBANG_FILES= scripts/sphinx2-demo.in -perl_OLD_CMD= @PERL@ -w +perl_OLD_CMD= "@PERL@ -w" # contains i386 sound code ONLY_FOR_ARCHS= i386 Modified: head/chinese/pyzy/Makefile ============================================================================== --- head/chinese/pyzy/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/chinese/pyzy/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -18,7 +18,6 @@ LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/d USES= compiler:c++11-lib gmake libtool pkgconfig python:build shebangfix SHEBANG_FILES= data/db/android/create_db.py -python_OLD_CMD= /usr/bin/env python USE_GNOME= glib20 USE_LDCONFIG= yes Modified: head/chinese/ydict/Makefile ============================================================================== --- head/chinese/ydict/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/chinese/ydict/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -18,7 +18,6 @@ NO_WRKSUBDIR= yes PLIST_FILES= bin/ydict SHEBANG_FILES= ${WRKSRC}/ydict -python_OLD_CMD= /usr/bin/env python python_CMD= /usr/bin/env python2 do-install: Modified: head/databases/luadbi/Makefile ============================================================================== --- head/databases/luadbi/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/databases/luadbi/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -17,9 +17,6 @@ NO_WRKSUBDIR= yes USES= gmake lua:51 shebangfix SHEBANG_FILES= DBI.lua -SHEBANG_LANG= lua -lua_OLD_CMD= /usr/bin/lua -lua_CMD= ${LOCALBASE}/bin/${LUA_CMD} CFLAGS+= -fpic -I${LOCALBASE}/include -I${LUA_INCDIR} -I. \ -I${LOCALBASE}/include/postgresql/server Modified: head/databases/nagios-check_mongodb/Makefile ============================================================================== --- head/databases/nagios-check_mongodb/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/databases/nagios-check_mongodb/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -17,7 +17,6 @@ GH_PROJECT= nagios-plugin-mongodb GH_TAGNAME= 9d17373 USES= python shebangfix SHEBANG_FILES= ${WRKSRC}/check_mongodb.py -python_OLD_CMD= /usr/bin/env python NO_BUILD= yes PLIST_FILES= libexec/nagios/check_mongodb Modified: head/databases/pgtune/Makefile ============================================================================== --- head/databases/pgtune/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/databases/pgtune/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -12,17 +12,11 @@ MAINTAINER= gjb@FreeBSD.org COMMENT= Postgresql.conf tuning tips based on hardware and load type USES= python shebangfix -NO_BUILD= yes - SHEBANG_FILES= ${PORTNAME} -python_OLD_CMD= ${PREFIX}/bin/python - -pre-install: - @${REINPLACE_CMD} -e 's|${python_OLD_CMD}|${PYTHON_CMD}|' \ - ${WRKSRC}/${PORTNAME} +NO_BUILD= yes do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/pgtune ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/pgtune ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${PREFIX}/share/pgtune/settings ${INSTALL_DATA} ${WRKSRC}/pg_settings* \ ${STAGEDIR}${PREFIX}/share/pgtune/settings Modified: head/databases/postgresql_autodoc/Makefile ============================================================================== --- head/databases/postgresql_autodoc/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/databases/postgresql_autodoc/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -15,7 +15,6 @@ RUN_DEPENDS= p5-HTML-Template>=0:${PORTS p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg USES+= gmake perl5 shebangfix -perl_OLD_CMD= /usr/bin/env perl SHEBANG_FILES= postgresql_autodoc.pl CONFIGURE_ARGS+=--datadir=${DATADIR} Modified: head/databases/skytools/Makefile ============================================================================== --- head/databases/skytools/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/databases/skytools/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -12,8 +12,6 @@ COMMENT= PostgreSQL tools from Skype: wa GNU_CONFIGURE= yes USES= gmake python:2 shebangfix pgsql -python_OLD_CMD= /usr/bin/env python -python_CMD= /usr/bin/env python2 SHEBANG_FILES= setup_pkgloader.py setup_skytools.py \ scripts/catsql.py scripts/data_maintainer.py \ scripts/find_sql_functions.py scripts/grantfu.py \ Modified: head/deskutils/tel/Makefile ============================================================================== --- head/deskutils/tel/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/deskutils/tel/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -16,7 +16,6 @@ NO_ARCH= yes USES= gettext python shebangfix tar:bzip2 SHEBANG_FILES= src/tel.py -python_OLD_CMD= /usr/bin/env python USE_PYTHON= distutils post-patch: Modified: head/deskutils/tnote/Makefile ============================================================================== --- head/deskutils/tnote/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/deskutils/tnote/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -16,8 +16,6 @@ USES= python:2 shebangfix USE_PYTHON= distutils SHEBANG_FILES= tnote -python_OLD_CMD= ${SETENV} python -python_CMD= ${SETENV} python2 PLIST_FILES= bin/tnote man/man1/tnote.1.gz PORTDOCS= * Modified: head/deskutils/virt-manager/Makefile ============================================================================== --- head/deskutils/virt-manager/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/deskutils/virt-manager/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -35,7 +35,7 @@ USE_GNOME= introspection:run intltool li INSTALLS_ICONS= yes -python_OLD_CMD= /usr/bin/python2 "-tt" +python_OLD_CMD= "/usr/bin/python2 -tt" SHEBANG_FILES= virt-manager \ virt-install \ virt-clone \ Modified: head/devel/cvs2svn/Makefile ============================================================================== --- head/devel/cvs2svn/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/devel/cvs2svn/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -23,9 +23,6 @@ PATCHREV= 5433 USES= shebangfix python:2.7 USE_PYTHON= distutils autoplist -SHEBANG_LANG= python python2 -python2_OLD_CMD= /usr/bin/env python -python2_CMD= ${PYTHON_CMD} SHEBANG_FILES= cvs2svn cvs2git cvs2bzr *.py \ contrib/* cvs2svn_lib/*.py \ svntest/* cvs2svn_rcsparse/*.py Modified: head/devel/doxygen/Makefile ============================================================================== --- head/devel/doxygen/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/devel/doxygen/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -60,7 +60,7 @@ CMAKE_ARGS+= -DFLEX_EXECUTABLE=${LOCALBA .endif post-patch: - @${REINPLACE_CMD} -e '/PERL_PATH/ s|${perl_OLD_CMD}|${perl_CMD}|' \ + @${REINPLACE_CMD} -e '/PERL_PATH/ s|/usr/bin/perl|${perl_CMD}|' \ ${WRKSRC}/src/config.xml .include <bsd.port.post.mk> Modified: head/devel/libnxt/Makefile ============================================================================== --- head/devel/libnxt/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/devel/libnxt/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -15,7 +15,6 @@ BUILD_DEPENDS= scons:${PORTSDIR}/devel/s SUB_FILES= pkg-message USES= python:build shebangfix USE_LDCONFIG= yes -python_OLD_CMD= /usr/bin/env python SHEBANG_FILES= make_flash_header.py do-build: Modified: head/devel/lua-alien/Makefile ============================================================================== --- head/devel/lua-alien/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/devel/lua-alien/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -21,9 +21,6 @@ GH_ACCOUNT= mascarenhas USES= libtool lua shebangfix zip SHEBANG_FILES= src/constants -SHEBANG_LANG= lua -lua_OLD_CMD= /usr/bin/env lua -lua_CMD= ${LOCALBASE}/bin/${LUA_CMD} GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-silent-rules \ --libdir=${LUA_MODLIBDIR} \ Modified: head/devel/py-gflags/Makefile ============================================================================== --- head/devel/py-gflags/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/devel/py-gflags/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -18,7 +18,6 @@ USES= python:2 shebangfix USE_PYTHON= autoplist distutils SHEBANG_FILES= gflags2man.py -python_OLD_CMD= /usr/bin/env python PROJECTHOST= python-gflags Modified: head/devel/py-ice/Makefile ============================================================================== --- head/devel/py-ice/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/devel/py-ice/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -20,8 +20,6 @@ PLIST= ${.CURDIR}/pkg-plist BUILD_WRKSRC= ${WRKSRC}/python INSTALL_WRKSRC= ${WRKSRC}/python -SHEBANG_LANG= python -python_OLD_CMD= /usr/bin/env python SHEBANG_FILES= ${BUILD_WRKSRC}/config/s2py.py MAKE_ENV+= PYTHON_VERSION=${PYTHON_VERSION} Modified: head/devel/py-ioflo/Makefile ============================================================================== --- head/devel/py-ioflo/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/devel/py-ioflo/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -17,6 +17,5 @@ USE_PYTHON= distutils NO_ARCH= yes SHEBANG_FILES= scripts/ioflo -python_OLD_CMD= /usr/bin/env python .include <bsd.port.mk> Modified: head/devel/py-pip/Makefile ============================================================================== --- head/devel/py-pip/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/devel/py-pip/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -34,7 +34,6 @@ USE_GITHUB= yes USE_PYTHON= autoplist concurrent distutils 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 Mon Oct 19 14:22:46 2015 (r399683) +++ head/devel/py-pymtbl/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -17,7 +17,6 @@ LIB_DEPENDS= libmtbl.so:${PORTSDIR}/deve USE_PYTHON= autoplist distutils USES= pkgconfig python shebangfix uniquefiles:dirs -python_OLD_CMD= /usr/bin/env python SHEBANG_FILES= examples/*.py examples/*/*.py PORTEXAMPLES= * Modified: head/devel/renpy/Makefile ============================================================================== --- head/devel/renpy/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/devel/renpy/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -33,7 +33,6 @@ USE_SDL= sdl2 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 BUILD_WRKSRC= ${WRKSRC}/module INSTALL_WRKSRC= ${BUILD_WRKSRC} MAKE_ENV+= RENPY_DEPS_INSTALL="${LOCALBASE}" Modified: head/emulators/pipelight/Makefile ============================================================================== --- head/emulators/pipelight/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/emulators/pipelight/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -40,7 +40,6 @@ CONFIGURE_ARGS+=--verbose --wine-path=${ USE_XORG= x11 USES= compiler:gcc-c++11-lib gmake shebangfix MAKE_JOBS_UNSAFE=yes -bash_OLD_CMD= /usr/bin/env bash SHEBANG_FILES= configure \ share/install-dependency Modified: head/games/childsplay/Makefile ============================================================================== --- head/games/childsplay/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/games/childsplay/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -21,8 +21,6 @@ NO_BUILD= yes USES= gettext shebangfix tar:tgz python:2 USE_GNOME= pygtk2 -python_OLD_CMD= /usr/bin/env python -python_CMD= ${SETENV} python2 SHEBANG_FILES= childsplay.py .for i in buttons funcs text dialogs gtk_widgets base SHEBANG_FILES+= SPWidgets/$i.py Modified: head/games/linux-enemyterritory-jaymod-21/Makefile ============================================================================== --- head/games/linux-enemyterritory-jaymod-21/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/games/linux-enemyterritory-jaymod-21/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -22,7 +22,7 @@ PLIST_SUB= VERSTR="${VERSTR}" USES= shebangfix SHEBANG_FILES= linux/convert_shrub -perl_OLD_CMD= /bin/env perl +perl_OLD_CMD= "/bin/env perl" USE_LINUX= yes PORTSCOUT= limit:^2\.1\.7 Modified: head/games/linux-enemyterritory-jaymod/Makefile ============================================================================== --- head/games/linux-enemyterritory-jaymod/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/games/linux-enemyterritory-jaymod/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -16,7 +16,7 @@ RUN_DEPENDS= et:${PORTSDIR}/games/linux- USES= shebangfix SHEBANG_FILES= linux/convert_shrub -perl_OLD_CMD= /bin/env perl +perl_OLD_CMD= "/bin/env perl" USE_LINUX= yes OPTIONS_DEFINE= DOCS OMNIBOT Modified: head/games/lostfeathers/Makefile ============================================================================== --- head/games/lostfeathers/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/games/lostfeathers/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -20,7 +20,6 @@ RUN_DEPENDS= avbin>=0:${PORTSDIR}/multim USES= python shebangfix zip SHEBANG_FILES= run_game.py -python_OLD_CMD= /usr/bin/env python USE_GNOME= pygtk2 librsvg2 PORTDOCS= README.txt Modified: head/games/oneisenough/Makefile ============================================================================== --- head/games/oneisenough/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/games/oneisenough/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -24,7 +24,6 @@ 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 PORTDOCS= README.txt OPTIONS_DEFINE= DOCS Modified: head/games/schwarzweiss/Makefile ============================================================================== --- head/games/schwarzweiss/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/games/schwarzweiss/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -25,7 +25,6 @@ GH_TAGNAME= d95263f USES= python:2 shebangfix SHEBANG_FILES= schwarzweiss_start.py data/*.py -python_OLD_CMD= /usr/bin/env python PORTDOCS= readme.txt OPTIONS_DEFINE= DOCS Modified: head/games/starfighter/Makefile ============================================================================== --- head/games/starfighter/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/games/starfighter/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -24,7 +24,6 @@ WITH_ZLIB= yes MAKEFILE= makefile SHEBANG_FILES= pack.py unpack.py -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 Mon Oct 19 14:22:46 2015 (r399683) +++ head/games/super_mario_bros_python/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -24,7 +24,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 PORTDOCS= changelog.txt readme.txt OPTIONS_DEFINE= DOCS Modified: head/graphics/imgv/Makefile ============================================================================== --- head/graphics/imgv/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/graphics/imgv/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -23,7 +23,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER USES= python:run shebangfix SHEBANG_FILES= imgv.py -python_OLD_CMD= /usr/bin/env python post-patch: @${REINPLACE_CMD} -e \ Modified: head/graphics/inkscape/Makefile ============================================================================== --- head/graphics/inkscape/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/graphics/inkscape/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -30,7 +30,6 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --without-gnome-vfs -python_OLD_CMD?=/usr/bin/env python python_CMD?= ${LOCALBASE}/bin/python2 SHEBANG_FILES= cxxtest/cxxtestgen.pl share/extensions/*.p[lm] \ share/extensions/*.py share/extensions/genpofiles.sh Modified: head/graphics/py-cairo/Makefile ============================================================================== --- head/graphics/py-cairo/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/graphics/py-cairo/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -20,9 +20,7 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= PYTHON=${LOCALBASE}/bin/${PYTHON_CMD} \ PREFIX=${PREFIX} -python_OLD_CMD?= /usr/bin/env python -python_CMD?= ${LOCALBASE}/bin/python2 -SHEBANG_FILES= examples/*.py examples/*/*.py test/*.py +SHEBANG_FILES= examples/*.py examples/*/*.py test/*.py post-install: @cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ Modified: head/graphics/py-gdal/Makefile ============================================================================== --- head/graphics/py-gdal/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/graphics/py-gdal/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -26,7 +26,6 @@ USES= python shebangfix tar:xz WRKSRC= ${WRKDIR}/${DISTNAME}/swig/python SHEBANG_FILES= scripts/*.py -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/py3-cairo/Makefile ============================================================================== --- head/graphics/py3-cairo/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/graphics/py3-cairo/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -18,9 +18,7 @@ USE_GNOME= cairo CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -python_OLD_CMD?= /usr/bin/env python -python_CMD?= ${LOCALBASE}/bin/python${PYTHON_VER} -SHEBANG_FILES= examples/*.py examples/*/*.py test/*.py +SHEBANG_FILES= examples/*.py examples/*/*.py test/*.py PLIST_SUB+= PYTVER=${PYTHON_VER:S/.//} Modified: head/japanese/kcode/Makefile ============================================================================== --- head/japanese/kcode/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/japanese/kcode/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -15,7 +15,6 @@ USE_PERL5= extract run NO_WRKSUBDIR= yes NO_BUILD= yes SHEBANG_FILES= kcode -perl_OLD_CMD= /usr/bin/env perl PLIST_FILES= bin/kcode man/ja/man1/kcode.1.gz Modified: head/japanese/man/Makefile ============================================================================== --- head/japanese/man/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/japanese/man/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -22,9 +22,8 @@ RUN_DEPENDS= ${LOCALBASE}/bin/groff:${PO jless:${PORTSDIR}/japanese/less MAKE_ENV= GZCAT=${GZCAT} GZIP_CMD="${GZIP_CMD}" -USES+= shebangfix +USES= shebangfix SHEBANG_FILES= catman/catman.perl makewhatis/makewhatis.perl -SHEBANG_LANG= perl post-patch: .for file in apropos/apropos.sh catman/catman.perl \ Modified: head/lang/cjs/Makefile ============================================================================== --- head/lang/cjs/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/lang/cjs/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -29,6 +29,5 @@ LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip CONFIGURE_ARGS+=--enable-compile-warnings=no -python_OLD_CMD= /usr/bin/env python .include <bsd.port.mk> Modified: head/lang/go/Makefile ============================================================================== --- head/lang/go/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/lang/go/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -21,7 +21,7 @@ SHEBANG_FILES= ${WRKSRC}/src/*.bash \ ${WRKSRC}/doc/articles/wiki/*.bash \ ${WRKSRC}/test/bench/shootout/timing.sh -sh_OLD_CMD= ${SETENV} bash +sh_OLD_CMD= "/usr/bin/env bash" sh_CMD= ${SH} WRKSRC= ${WRKDIR}/go Modified: head/lang/go14/Makefile ============================================================================== --- head/lang/go14/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/lang/go14/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -18,7 +18,7 @@ SHEBANG_FILES= ${WRKSRC}/src/*.bash \ ${WRKSRC}/doc/articles/wiki/*.bash \ ${WRKSRC}/test/bench/shootout/timing.sh -sh_OLD_CMD= ${SETENV} bash +sh_OLD_CMD= "/usr/bin/env bash" sh_CMD= ${SH} WRKSRC= ${WRKDIR}/go Modified: head/lang/python-tools/Makefile ============================================================================== --- head/lang/python-tools/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/lang/python-tools/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -26,7 +26,6 @@ SCRIPT_FILES= byteyears checkpyc copytim PYLIB_FILES= tabnanny timeit 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 @@ -38,10 +37,6 @@ UNIQUE_SUFFIX_FILES= ${SCRIPT_FILES:C/^. .if ${PYTHON_REL} < 3200 SCRIPT_FILES+= logmerge -python_OLD_CMD= /usr/bin/env python -.else -# Python 3+ uses python3 as shebang line, python2 just python -python_OLD_CMD= /usr/bin/env python3 .endif .if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} Modified: head/lang/v8/Makefile ============================================================================== --- head/lang/v8/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/lang/v8/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -27,7 +27,6 @@ USES= alias compiler cpe execinfo gmake CPE_VENDOR= google SHEBANG_FILES= build/gyp/gyp -python_OLD_CMD= /usr/bin/env python .include <bsd.port.pre.mk> Modified: head/mail/bsfilter/Makefile ============================================================================== --- head/mail/bsfilter/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/mail/bsfilter/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -18,7 +18,6 @@ NO_BUILD= yes USE_RUBY= yes USES= shebangfix tar:tgz SHEBANG_FILES= bsfilter/bsfilter -ruby_OLD_CMD= /usr/bin/env ruby OPTIONS_DEFINE= EXAMPLES MECAB Modified: head/mail/fetchmail/Makefile ============================================================================== --- head/mail/fetchmail/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/mail/fetchmail/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -22,7 +22,6 @@ GROUPS= ${USERS} USES= cpe gmake shebangfix tar:xz SHEBANG_FILES= fetchmailconf.py -python_OLD_CMD= /usr/bin/env python USE_RC_SUBR= fetchmail SUB_FILES= pkg-message pkg-install pkg-deinstall Modified: head/mail/postfix-current/Makefile ============================================================================== --- head/mail/postfix-current/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/mail/postfix-current/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -33,7 +33,6 @@ CONFLICTS_INSTALL?= courier-0.* opensmtp USERS= postfix GROUPS= mail maildrop postfix USES= perl5 shebangfix cpe -SHEBANG_LANG= perl SHEBANG_FILES= auxiliary/qshape/qshape.pl USE_RC_SUBR= postfix Modified: head/mail/postfix-policyd-weight/Makefile ============================================================================== --- head/mail/postfix-policyd-weight/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/mail/postfix-policyd-weight/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -33,9 +33,6 @@ USE_PERL5= run NO_BUILD= yes NO_ARCH= yes -SHEBANG_LANG= perl -perl_OLD_CMD= ${SETENV} perl -perl_CMD= ${PERL} SHEBANG_FILES= ${WRKSRC}/policyd-weight do-install: Modified: head/mail/postfix-postfwd/Makefile ============================================================================== --- head/mail/postfix-postfwd/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/mail/postfix-postfwd/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -22,7 +22,6 @@ SUB_FILES= pkg-message USE_RC_SUBR= ${PORTNAME} USES= perl5 shebangfix -SHEBANG_LANG= perl SHEBANG_FILES= sbin/* tools/*.pl tools/hapolicy/* USE_PERL5= run NO_BUILD= yes Modified: head/mail/postfix/Makefile ============================================================================== --- head/mail/postfix/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/mail/postfix/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -33,7 +33,6 @@ CONFLICTS_INSTALL?= courier-0.* opensmtp USERS= postfix GROUPS= mail maildrop postfix USES= perl5 shebangfix cpe -SHEBANG_LANG= perl SHEBANG_FILES= auxiliary/qshape/qshape.pl USE_RC_SUBR= postfix Modified: head/mail/tumgreyspf/Makefile ============================================================================== --- head/mail/tumgreyspf/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/mail/tumgreyspf/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -31,7 +31,6 @@ SUB_LIST= PYTHON_CMD=${PYTHON_CMD} \ TUMGREYSPF_USER=${TUMGREYSPF_USER} SHEBANG_FILES= * -python_OLD_CMD= /usr/bin/env python TUMGREYSPF_DIR?= /var/db/${PORTNAME} TUMGREYSPF_USER?= nobody Modified: head/math/mosesdecoder/Makefile ============================================================================== --- head/math/mosesdecoder/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/math/mosesdecoder/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -31,7 +31,7 @@ MAKE_ENV+= BOOST_BUILD_PATH=${WRKSRC}/ja post-patch: @${FIND} ${WRKSRC}/scripts \( -name "*.pl" -o -name "*.perl" -o -name "*.cgi" \) -exec \ - ${REINPLACE_CMD} -i '' -e '1s|${perl_OLD_CMD}|${perl_CMD}|' {} \; + ${REINPLACE_CMD} -i '' -e '1s|/usr/bin/perl|${perl_CMD}|' {} \; do-build: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} bjam --with-boost=${LOCALBASE} --with-irstlm=${LOCALBASE} --with-randlm=${LOCALBASE} --without-tcmalloc --notrace --toolset=${CHOSEN_COMPILER_TYPE} debug-symbols=off ${_MAKE_JOBS} Modified: head/misc/gimp-help-en/Makefile ============================================================================== --- head/misc/gimp-help-en/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/misc/gimp-help-en/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -34,7 +34,6 @@ PORTDATA= * DATADIR= ${PREFIX}/share/gimp SHEBANG_FILES= tools/xml2po.py -python_OLD_CMD= /usr/bin/env python post-patch: # Install to the same directory as when configuring --with-gimp Modified: head/multimedia/lives/Makefile ============================================================================== --- head/multimedia/lives/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/multimedia/lives/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -79,7 +79,7 @@ NLS_USES= gettext NLS_CONFIGURE_OFF= --disable-nls post-patch: - @${REINPLACE_CMD} -e 's|${perl_OLD_CMD}|${perl_CMD}|' \ + @${REINPLACE_CMD} -e 's|/usr/bin/perl|${perl_CMD}|' \ ${WRKSRC}/build-lives-rfx-plugin @${REINPLACE_CMD} -e 's| install-docDATA||g; s|-$$(VERSION)||g' \ ${WRKSRC}/Makefile.in Modified: head/multimedia/pymp/Makefile ============================================================================== --- head/multimedia/pymp/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/multimedia/pymp/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -20,7 +20,6 @@ GH_TAGNAME= bea99d9 USES= shebangfix python tar:bzip2 SHEBANG_FILES= *.py -python_OLD_CMD= /usr/bin/env python USE_GNOME= pygtk2 PORTDOCS= CHANGELOG README.md Modified: head/net-im/prosody/Makefile ============================================================================== --- head/net-im/prosody/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/net-im/prosody/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -32,9 +32,7 @@ LUAJIT_LIB_DEPENDS= libluajit-5.1.so:${P .include <bsd.port.options.mk> USES= cpe gmake lua:51 shebangfix -SHEBANG_LANG= lua SHEBANG_FILES= prosody prosodyctl -lua_OLD_CMD= ${SETENV} lua .if ${PORT_OPTIONS:MLUAJIT} lua_CMD= ${LOCALBASE}/bin/luajit .else Modified: head/net-mgmt/netams/Makefile ============================================================================== --- head/net-mgmt/netams/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/net-mgmt/netams/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -19,7 +19,6 @@ USE_SUBMAKE= yes SUB_FILES= pkg-message USE_RC_SUBR= netams USES= shebangfix -SHEBANG_LANG= perl SHEBANG_FILES= cgi-bin/*.cgi cgi-bin/*.pl \ cgi-bin/admin/*.cgi addon/*.pl Modified: head/net/cloud-init/Makefile ============================================================================== --- head/net/cloud-init/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/net/cloud-init/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -33,7 +33,6 @@ ETCDIR= ${PREFIX}/etc/cloud 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 USE_PYTHON= autoplist distutils PYDISTUTILS_INSTALLARGS+= "--init-system=sysvinit_freebsd" Modified: head/net/get_iplayer/Makefile ============================================================================== --- head/net/get_iplayer/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/net/get_iplayer/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -22,7 +22,6 @@ RUN_DEPENDS= p5-HTML-Parser>=0:${PORTSDI USES= perl5 shebangfix USE_PERL5= run -perl_OLD_CMD= ${SETENV} perl SHEBANG_FILES= ${PORTNAME} ${PORTNAME}.cgi NO_BUILD= yes NO_ARCH= yes Modified: head/net/polyorb/Makefile ============================================================================== --- head/net/polyorb/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/net/polyorb/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -32,8 +32,6 @@ PORTDOCS= html \ txt/polyorb_ug.txt SHEBANG_FILES= compilers/idlac/*.py testsuite/*.py testsuite/tests/*.py -python_OLD_CMD= /usr/bin/env python - CONFIGURE_ARGS= --with-appli-perso="corba dsa moma" \ --with-proto-perso="giop soap srp" \ --with-corba-services="event ir naming notification time" Modified: head/net/py-pynmsg/Makefile ============================================================================== --- head/net/py-pynmsg/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/net/py-pynmsg/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -18,7 +18,6 @@ LIB_DEPENDS= libnmsg.so:${PORTSDIR}/net/ USE_PYTHON= distutils autoplist USES= python shebangfix uniquefiles:dirs -python_OLD_CMD= /usr/bin/env python SHEBANG_FILES= examples/*.py PORTEXAMPLES= * Modified: head/net/py-pysphere/Makefile ============================================================================== --- head/net/py-pysphere/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/net/py-pysphere/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -16,11 +16,9 @@ LICENSE= BSD3CLAUSE USES= dos2unix zip shebangfix python:2.7 USE_PYTHON= distutils autoplist -SHEBANG_LANG= python -python_OLD_CMD= /usr/bin/env python -SHEBANG_FILES= *.py \ - pysphere/ZSI/*.py \ - pysphere/ZSI/generate/*.py \ - pysphere/ZSI/wstools/*.py +SHEBANG_FILES= *.py \ + pysphere/ZSI/*.py \ + pysphere/ZSI/generate/*.py \ + pysphere/ZSI/wstools/*.py .include <bsd.port.mk> Modified: head/net/samba4/Makefile ============================================================================== --- head/net/samba4/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/net/samba4/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -405,7 +405,6 @@ 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_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 Mon Oct 19 14:22:46 2015 (r399683) +++ head/net/samba41/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -400,7 +400,6 @@ 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_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 Mon Oct 19 14:22:46 2015 (r399683) +++ head/net/samba42/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -403,7 +403,6 @@ 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_OLD_CMD= /usr/bin/env python SHEBANG_FILES= ${PATCH_WRKSRC}/source4/scripting/bin/* # No fancy color error messages .if ${COMPILER_TYPE} == "clang" Modified: head/news/nzbget/Makefile ============================================================================== --- head/news/nzbget/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/news/nzbget/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -25,7 +25,6 @@ LDFLAGS+= -lpthread BINMODE= 0755 SHEBANG_FILES= scripts/*.py -python_OLD_CMD= /usr/bin/env python OPTIONS_DEFINE= 7Z PYTHON RAR DOCS OPTIONS_SINGLE= TLSLIB Modified: head/news/xpn/Makefile ============================================================================== --- head/news/xpn/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/news/xpn/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -17,9 +17,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gtk2 NO_BUILD= yes -# we want a versioned python command -python_OLD_CMD= /usr/bin/env python - SHEBANG_FILES= ${XPN} SUB_FILES= ${PORTNAME} SUB_LIST= PYTHON_CMD=${PYTHON_CMD} XPN=${XPN} Modified: head/print/texlive-texmf/Makefile ============================================================================== --- head/print/texlive-texmf/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/print/texlive-texmf/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -273,11 +273,11 @@ do-install: ${TOUCH} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/source/.keep_me post-install: - @${REINPLACE_CMD} -i '' -e '1s|${bash_OLD_CMD}|${bash_CMD}|' \ + @${REINPLACE_CMD} -i '' -e '1s|/bin/bash|${bash_CMD}|' \ ${STAGEDIR}${PREFIX}/share/texmf-dist/scripts/logicpuzzle/createlpsudoku \ ${STAGEDIR}${PREFIX}/share/texmf-dist/scripts/logicpuzzle/lpsmag \ ${STAGEDIR}${PREFIX}/share/texmf-dist/scripts/shipunov/biokey2html.sh - @${REINPLACE_CMD} -i '' -e '1s|${perl_OLD_CMD}|${perl_CMD}|' \ + @${REINPLACE_CMD} -i '' -e '1s|/usr/bin/perl|${perl_CMD}|' \ ${STAGEDIR}${PREFIX}/share/texmf-dist/scripts/mycv/mycv_split_contents.pl .include <bsd.port.mk> Modified: head/security/cops/Makefile ============================================================================== --- head/security/cops/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/security/cops/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -28,7 +28,7 @@ C_SRC= home.chk.c user.chk.c is_able.c crc.c crc_check.c post-patch: - @${REINPLACE_CMD} -i '' -e 's|${perl_OLD_CMD}|${perl_CMD}|' \ + @${REINPLACE_CMD} -i '' -e 's|/usr/bin/perl|${perl_CMD}|' \ ${WRKSRC}/perl/cops pre-build: Modified: head/sysutils/racktables/Makefile ============================================================================== --- head/sysutils/racktables/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/sysutils/racktables/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -3,7 +3,7 @@ PORTNAME= racktables DISTVERSION= 0.20.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= sysutils www MASTER_SITES= SF/${PORTNAME}/ DISTNAME= RackTables-${DISTVERSION} @@ -18,10 +18,9 @@ RACKHOME?= www/racktables PORTEXAMPLES= init-sample-racks.sql syncdomain.php -USES= shebangfix +USES= shebangfix perl5 python:run +USE_PERL5= run SHEBANG_FILES= gateways/* -python_OLD_CMD= ${SETENV} python -python_CMD= ${LOCALBASE}/bin/python2.7 WANT_PHP_WEB= yes USE_PHP= bcmath gd json mbstring mysql pdo_mysql session Modified: head/sysutils/sd-agent/Makefile ============================================================================== --- head/sysutils/sd-agent/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/sysutils/sd-agent/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -19,7 +19,6 @@ GH_ACCOUNT= serverdensity USES= python shebangfix SHEBANG_FILES= agent.py -python_OLD_CMD= /usr/bin/env python USE_RC_SUBR= $(PORTNAME) SUB_LIST+= RCNAME=$(PORTNAME:S/-/_/g) Modified: head/sysutils/tdir/Makefile ============================================================================== --- head/sysutils/tdir/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/sysutils/tdir/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -12,7 +12,7 @@ COMMENT= Advanced file directory display USES= python shebangfix SHEBANG_FILES= tdir -python_OLD_CMD= /usr//bin/env python +python_OLD_CMD= "/usr//bin/env python" MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX} Modified: head/sysutils/zfs-stats/Makefile ============================================================================== --- head/sysutils/zfs-stats/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/sysutils/zfs-stats/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -18,7 +18,7 @@ GH_ACCOUNT= mmatuska NO_BUILD= yes SHEBANG_FILES= zfs-* -perl_OLD_CMD= /usr/bin/env -iS perl +perl_OLD_CMD= "/usr/bin/env -iS perl" PLIST_FILES= bin/zfs-stats \ bin/zfs-mon Modified: head/textproc/asciidoc/Makefile ============================================================================== --- head/textproc/asciidoc/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/textproc/asciidoc/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -34,7 +34,6 @@ SHEBANG_FILES= a2x.py \ filters/graphviz/graphviz2png.py \ filters/latex/latex2png.py \ filters/music/music2png.py -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/google-ctemplate/Makefile ============================================================================== --- head/textproc/google-ctemplate/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/textproc/google-ctemplate/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -22,7 +22,6 @@ USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= OlafvdSpek GH_TAGNAME= 359a9f0 -python_OLD_CMD= /usr/bin/env python INSTALL_target= install-strip post-patch: Modified: head/textproc/py2html/Makefile ============================================================================== --- head/textproc/py2html/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/textproc/py2html/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -13,7 +13,6 @@ COMMENT= Python Highlighter for HTML USES= python:2 shebangfix USE_PYTHON= distutils autoplist -python_OLD_CMD= /usr/bin/env python SHEBANG_FILES= py2html .include <bsd.port.mk> Modified: head/textproc/sigil/Makefile ============================================================================== --- head/textproc/sigil/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/textproc/sigil/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -30,7 +30,6 @@ EXCLUDE= BoostParts Xerces hunspell mini EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude src/,} DOS2UNIX_FILES= src/FlightCrew/CMakeLists.txt SHEBANG_FILES= src/Sigil/Resource_Files/plugin_launchers/python/*.py -python_OLD_CMD= /usr/bin/env python OPTIONS_DEFINE= DEBUG DEBUG_CFLAGS_OFF= -DNDEBUG # tidyLib Modified: head/www/calendarserver/Makefile ============================================================================== --- head/www/calendarserver/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/www/calendarserver/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -41,7 +41,6 @@ USE_PYTHON= autoplist distutils SUB_FILES= pkg-message SUB_LIST+= USER=${USERS} -python_OLD_CMD= /usr/bin/env python SHEBANG_FILES= bin/calendarserver_* \ bin/icalendar_split \ Modified: head/www/joomla25/Makefile ============================================================================== --- head/www/joomla25/Makefile Mon Oct 19 14:22:46 2015 (r399683) +++ head/www/joomla25/Makefile Mon Oct 19 14:50:52 2015 (r399684) @@ -16,10 +16,10 @@ GH_PROJECT= ${PORTNAME}-cms NO_BUILD= yes PLIST_SUB= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} -php_OLD_CMD= C:\\\xampp\\\php\\\.\\\php.exe -REINPLACE_ARGS= -i '' -e 's,${php_OLD_CMD},${LOCALBASE}/bin/php,g' -REINPLACE_FILES= tests/unit/phpunit.php tests/system/phpunit.php +USES= shebangfix +php_OLD_CMD= C:\\\xampp\\\php\\\.\\\php.exe +SHEBANG_FILES= tests/unit/phpunit.php tests/system/phpunit.php SUB_FILES= pkg-message @@ -28,10 +28,7 @@ USE_MYSQL= yes USE_PHP= gd json mbstring mysql mysqli pcre pdf session simplexml xml zip zlib *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510191450.t9JEoqln023397>