Be aware of otclsh and tclsh8.1_r

8 files changed, 8 insertions, 8 deletions

diff --git a/lang/tcl80/pkg-deinstall.tclsh b/lang/tcl80/pkg-deinstall.tclsh
index 07c6493c07cf..c48dc863cf43 100644
--- a/lang/tcl80/pkg-deinstall.tclsh
+++ b/lang/tcl80/pkg-deinstall.tclsh
@@ -13,7 +13,7 @@ BINDIR="${PKG_PREFIX}/bin /usr/X11R6/bin"
 TCLSH=${PKG_PREFIX}/bin/tclsh
 
 tclshs=$(/bin/ls ${BINDIR} 2> /dev/null | \
-    egrep '^i?tclsh[0-9]+\.[0-9]+([a-z][a-z])?$')
+    egrep '^(i?tclsh[0-9]+\.[0-9]+(\_r)?([a-z][a-z])?)|otclsh$')
 
 if [ "$tclshs" = "" -a -f ${TCLSH} ] && \
     (head -3 ${TCLSH} | grep awieYJFnsuILOnfsYEW) > /dev/null 2>&1
diff --git a/lang/tcl80/pkg-install.tclsh b/lang/tcl80/pkg-install.tclsh
index 9dec69942b2a..3b808e2b500f 100644
--- a/lang/tcl80/pkg-install.tclsh
+++ b/lang/tcl80/pkg-install.tclsh
@@ -23,7 +23,7 @@ echo "installed because a given port may depend on a specific version."
 echo
 echo "On your system, tclsh is installed under at least the following names:"
 echo
-for name in $(/bin/ls $(echo $PATH | sed 's/:/ /g') 2> /dev/null | egrep '^i?tclsh[0-9]+\.[0-9]+([a-z][a-z])?$')
+for name in $(/bin/ls $(echo $PATH | sed 's/:/ /g') 2> /dev/null | egrep '^(i?tclsh[0-9]+\.[0-9]+(\_r)?([a-z][a-z])?)|otclsh$')
 do
 	echo $name
 done
diff --git a/lang/tcl82/pkg-deinstall.tclsh b/lang/tcl82/pkg-deinstall.tclsh
index 07c6493c07cf..c48dc863cf43 100644
--- a/lang/tcl82/pkg-deinstall.tclsh
+++ b/lang/tcl82/pkg-deinstall.tclsh
@@ -13,7 +13,7 @@ BINDIR="${PKG_PREFIX}/bin /usr/X11R6/bin"
 TCLSH=${PKG_PREFIX}/bin/tclsh
 
 tclshs=$(/bin/ls ${BINDIR} 2> /dev/null | \
-    egrep '^i?tclsh[0-9]+\.[0-9]+([a-z][a-z])?$')
+    egrep '^(i?tclsh[0-9]+\.[0-9]+(\_r)?([a-z][a-z])?)|otclsh$')
 
 if [ "$tclshs" = "" -a -f ${TCLSH} ] && \
     (head -3 ${TCLSH} | grep awieYJFnsuILOnfsYEW) > /dev/null 2>&1
diff --git a/lang/tcl82/pkg-install.tclsh b/lang/tcl82/pkg-install.tclsh
index 9dec69942b2a..3b808e2b500f 100644
--- a/lang/tcl82/pkg-install.tclsh
+++ b/lang/tcl82/pkg-install.tclsh
@@ -23,7 +23,7 @@ echo "installed because a given port may depend on a specific version."
 echo
 echo "On your system, tclsh is installed under at least the following names:"
 echo
-for name in $(/bin/ls $(echo $PATH | sed 's/:/ /g') 2> /dev/null | egrep '^i?tclsh[0-9]+\.[0-9]+([a-z][a-z])?$')
+for name in $(/bin/ls $(echo $PATH | sed 's/:/ /g') 2> /dev/null | egrep '^(i?tclsh[0-9]+\.[0-9]+(\_r)?([a-z][a-z])?)|otclsh$')
 do
 	echo $name
 done
diff --git a/lang/tcl83/pkg-deinstall.tclsh b/lang/tcl83/pkg-deinstall.tclsh
index 07c6493c07cf..c48dc863cf43 100644
--- a/lang/tcl83/pkg-deinstall.tclsh
+++ b/lang/tcl83/pkg-deinstall.tclsh
@@ -13,7 +13,7 @@ BINDIR="${PKG_PREFIX}/bin /usr/X11R6/bin"
 TCLSH=${PKG_PREFIX}/bin/tclsh
 
 tclshs=$(/bin/ls ${BINDIR} 2> /dev/null | \
-    egrep '^i?tclsh[0-9]+\.[0-9]+([a-z][a-z])?$')
+    egrep '^(i?tclsh[0-9]+\.[0-9]+(\_r)?([a-z][a-z])?)|otclsh$')
 
 if [ "$tclshs" = "" -a -f ${TCLSH} ] && \
     (head -3 ${TCLSH} | grep awieYJFnsuILOnfsYEW) > /dev/null 2>&1
diff --git a/lang/tcl83/pkg-install.tclsh b/lang/tcl83/pkg-install.tclsh
index 9dec69942b2a..3b808e2b500f 100644
--- a/lang/tcl83/pkg-install.tclsh
+++ b/lang/tcl83/pkg-install.tclsh
@@ -23,7 +23,7 @@ echo "installed because a given port may depend on a specific version."
 echo
 echo "On your system, tclsh is installed under at least the following names:"
 echo
-for name in $(/bin/ls $(echo $PATH | sed 's/:/ /g') 2> /dev/null | egrep '^i?tclsh[0-9]+\.[0-9]+([a-z][a-z])?$')
+for name in $(/bin/ls $(echo $PATH | sed 's/:/ /g') 2> /dev/null | egrep '^(i?tclsh[0-9]+\.[0-9]+(\_r)?([a-z][a-z])?)|otclsh$')
 do
 	echo $name
 done
diff --git a/lang/tcl84/pkg-deinstall.tclsh b/lang/tcl84/pkg-deinstall.tclsh
index 07c6493c07cf..c48dc863cf43 100644
--- a/lang/tcl84/pkg-deinstall.tclsh
+++ b/lang/tcl84/pkg-deinstall.tclsh
@@ -13,7 +13,7 @@ BINDIR="${PKG_PREFIX}/bin /usr/X11R6/bin"
 TCLSH=${PKG_PREFIX}/bin/tclsh
 
 tclshs=$(/bin/ls ${BINDIR} 2> /dev/null | \
-    egrep '^i?tclsh[0-9]+\.[0-9]+([a-z][a-z])?$')
+    egrep '^(i?tclsh[0-9]+\.[0-9]+(\_r)?([a-z][a-z])?)|otclsh$')
 
 if [ "$tclshs" = "" -a -f ${TCLSH} ] && \
     (head -3 ${TCLSH} | grep awieYJFnsuILOnfsYEW) > /dev/null 2>&1
diff --git a/lang/tcl84/pkg-install.tclsh b/lang/tcl84/pkg-install.tclsh
index 9dec69942b2a..3b808e2b500f 100644
--- a/lang/tcl84/pkg-install.tclsh
+++ b/lang/tcl84/pkg-install.tclsh
@@ -23,7 +23,7 @@ echo "installed because a given port may depend on a specific version."
 echo
 echo "On your system, tclsh is installed under at least the following names:"
 echo
-for name in $(/bin/ls $(echo $PATH | sed 's/:/ /g') 2> /dev/null | egrep '^i?tclsh[0-9]+\.[0-9]+([a-z][a-z])?$')
+for name in $(/bin/ls $(echo $PATH | sed 's/:/ /g') 2> /dev/null | egrep '^(i?tclsh[0-9]+\.[0-9]+(\_r)?([a-z][a-z])?)|otclsh$')
 do
 	echo $name
 done