Index: head/Mk/Uses/shebangfix.mk
===================================================================
--- head/Mk/Uses/shebangfix.mk	(revision 399862)
+++ head/Mk/Uses/shebangfix.mk	(revision 399863)
@@ -1,89 +1,73 @@
 # $FreeBSD$
 #
 # Replace #! interpreters in scripts by what we actually have.
 #
 # Standard templates for bash, perl, python,... are included out of
 # the box, others can easily be added per port.
 #
 # Feature:	shebangfix
 # Usage:	USES=shebangfix
 #
 # To specify that ${WRKSRC}/path1/file and all .pl files in ${WRKSRC}/path2
 # should be processed:
 #
 #   SHEBANG_FILES=	path1/file path2/*.pl
 #
 # To define a new shebang scheme add the following to the port Makefile:
 #
 #   SHEBANG_LANG=	lua
 #   lua_OLD_CMD=	/usr/bin/lua
 #   lua_CMD=	${LOCALBASE}/bin/lua
 #
 # To override a definition, for example replacing /usr/bin/perl by
 # /usr/bin/env perl, add the following:
 #
 #   perl_CMD=	${SETENV} perl
 #
 # MAINTAINER: portmgr@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_SHEBANGFIX_MK)
 _INCLUDE_USES_SHEBANGFIX_MK=	yes
 
-bash_OLD_CMD+=	/bin/bash
-bash_OLD_CMD+=	"/usr/bin/env bash"
-bash_CMD?=	${LOCALBASE}/bin/bash
-java_OLD_CMD+=	/usr/bin/java
-java_CMD?=	${LOCALBASE}/bin/java
-ksh_OLD_CMD+=	/bin/ksh
-ksh_CMD?=	${LOCALBASE}/bin/ksh
+SHEBANG_LANG+=	bash java ksh perl php python ruby tcl tk
+
 .if ${USES:Mlua*}
-lua_OLD_CMD+=	/usr/bin/lua
-lua_OLD_CMD+=	"/usr/bin/env lua"
+SHEBANG_LANG+=	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_CMD?=	${LOCALBASE}/bin/php
-python_OLD_CMD+=	/usr/bin/python
-python_OLD_CMD+=	"/usr/bin/env python"
+
+tcl_CMD?=      ${TCLSH}
+tk_CMD?=       ${WISH}
+
 .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/env ruby"
-ruby_CMD?=	${LOCALBASE}/bin/ruby
-tcl_OLD_CMD+=	/usr/bin/tclsh
-tcl_CMD?=	${TCLSH}
-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
+# Replace the same patterns for all langs and setup a default, that may have
+# been set already above with ?=.
+.for lang in ${SHEBANG_LANG}
+${lang}_CMD?= ${LOCALBASE}/bin/${lang}
+${lang}_OLD_CMD+= "/usr/bin/env ${lang}"
+${lang}_OLD_CMD+= /bin/${lang}
+${lang}_OLD_CMD+= /usr/bin/${lang}
+.endfor
 
 .for lang in ${SHEBANG_LANG}
 .  if !defined(${lang}_CMD)
 IGNORE+=	missing definition for ${lang}_CMD
 .  endif
 .  if !defined(${lang}_OLD_CMD)
 IGNORE+=	missing definition for ${lang}_OLD_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
 fix-shebang:
 	@cd ${WRKSRC}; \
 		${ECHO_CMD} ${SHEBANG_FILES} | ${XARGS} ${SED} -i '' ${_SHEBANG_REINPLACE_ARGS}
 
 .endif