Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 22 Oct 2015 13:36:05 +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: r399976 - in head: . Mk/Uses
Message-ID:  <201510221336.t9MDa5ni099804@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Thu Oct 22 13:36:05 2015
New Revision: 399976
URL: https://svnweb.freebsd.org/changeset/ports/399976

Log:
  - Add shebangfix documentation bits
  - Fix tcl_OLD_CMD tk_OLD_CMD
  
  Approved by:	portmgr (bapt)
  Differential Revision:	D3939

Modified:
  head/CHANGES
  head/Mk/Uses/shebangfix.mk

Modified: head/CHANGES
==============================================================================
--- head/CHANGES	Thu Oct 22 13:35:23 2015	(r399975)
+++ head/CHANGES	Thu Oct 22 13:36:05 2015	(r399976)
@@ -10,6 +10,21 @@ in the release notes and/or placed into 
 
 All ports committers are allowed to commit to this file.
 
+20151022:
+AUTHOR: amdmi3@FreeBSD.org
+
+  Improved support for USES=shebangfix
+
+  - We now support multiple values for *_OLD_CMD
+  - We replace more variants by default (/bin/${lang}, /usr/bin/${lang},
+    /usr/bin/env ${lang}).
+  - shebangfix now also supports lua if USES=lua is specified
+  - Pattern matching has been improved: we now only match whole worlds,
+    e.g. "/usr/bin/perl5.005" is no longer erroneously replaced with
+    "${perl_CMD}5.005".
+
+  Note that *_OLD_CMD entries which contain spaces must now be quoted.
+
 20150928:
 AUTHOR: amdmi3@FreeBSD.org
 

Modified: head/Mk/Uses/shebangfix.mk
==============================================================================
--- head/Mk/Uses/shebangfix.mk	Thu Oct 22 13:35:23 2015	(r399975)
+++ head/Mk/Uses/shebangfix.mk	Thu Oct 22 13:36:05 2015	(r399976)
@@ -13,6 +13,11 @@
 #
 #   SHEBANG_FILES=	path1/file path2/*.pl
 #
+# To define custom shebangs to replace, use the following (note that
+# shebangs with spaces should be quoted):
+#
+#   perl_OLD_CMD=	/usr/bin/perl5.005 "/usr/bin/setenv perl5.005"
+#
 # To define a new shebang scheme add the following to the port Makefile:
 #
 #   SHEBANG_LANG=	lua
@@ -36,8 +41,11 @@ SHEBANG_LANG+=	lua
 lua_CMD?=	${LOCALBASE}/bin/${LUA_CMD}
 .endif
 
-tcl_CMD?=      ${TCLSH}
-tk_CMD?=       ${WISH}
+tcl_OLD_CMD+=	/usr/bin/tclsh
+tcl_CMD?=	${TCLSH}
+
+tk_OLD_CMD+=	/usr/bin/wish
+tk_CMD?=	${WISH}
 
 .if ${USES:Mpython*}
 python_CMD?=	${PYTHON_CMD}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510221336.t9MDa5ni099804>