Let the user know about itcl installations, too.

4 files changed, 24 insertions, 12 deletions

diff --git a/lang/tcl80/pkg-install.tclsh b/lang/tcl80/pkg-install.tclsh
index 055957a6c36f..9dec69942b2a 100644
--- a/lang/tcl80/pkg-install.tclsh
+++ b/lang/tcl80/pkg-install.tclsh
@@ -3,14 +3,17 @@
 # The user may have a tclsh they want to preserve
 ver=`grep -a awieYJFnsuILOnfsYEW ${PKG_PREFIX}/bin/tclsh 2> /dev/null \
     | sed -e 's/.*\*\*//'`
-if [ ! -e ${PKG_PREFIX}/bin/tclsh ] || [ "$ver" != "" -a "$ver" -lt 001 ]
+if [ ! -e ${PKG_PREFIX}/bin/tclsh ] || [ "$ver" != "" -a "$ver" -lt 002 ]
 then
 	[ -f ${PKG_PREFIX}/bin/tclsh ] && chmod u+w ${PKG_PREFIX}/bin/tclsh
 
 	mkdir -p ${PKG_PREFIX}/bin
 	cat > ${PKG_PREFIX}/bin/tclsh <<'EOF'
 #!/bin/sh
-# Installed by ports system.  id: awieYJFnsuILOnfsYEW**001
+# Installed by ports system.  id: awieYJFnsuILOnfsYEW**002
+#
+# $FreeBSD$
+#
  
 (
 echo "In FreeBSD, tclsh is named with a version number.  This is because"
@@ -20,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 '^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]+([a-z][a-z])?$')
 do
 	echo $name
 done
diff --git a/lang/tcl82/pkg-install.tclsh b/lang/tcl82/pkg-install.tclsh
index 055957a6c36f..9dec69942b2a 100644
--- a/lang/tcl82/pkg-install.tclsh
+++ b/lang/tcl82/pkg-install.tclsh
@@ -3,14 +3,17 @@
 # The user may have a tclsh they want to preserve
 ver=`grep -a awieYJFnsuILOnfsYEW ${PKG_PREFIX}/bin/tclsh 2> /dev/null \
     | sed -e 's/.*\*\*//'`
-if [ ! -e ${PKG_PREFIX}/bin/tclsh ] || [ "$ver" != "" -a "$ver" -lt 001 ]
+if [ ! -e ${PKG_PREFIX}/bin/tclsh ] || [ "$ver" != "" -a "$ver" -lt 002 ]
 then
 	[ -f ${PKG_PREFIX}/bin/tclsh ] && chmod u+w ${PKG_PREFIX}/bin/tclsh
 
 	mkdir -p ${PKG_PREFIX}/bin
 	cat > ${PKG_PREFIX}/bin/tclsh <<'EOF'
 #!/bin/sh
-# Installed by ports system.  id: awieYJFnsuILOnfsYEW**001
+# Installed by ports system.  id: awieYJFnsuILOnfsYEW**002
+#
+# $FreeBSD$
+#
  
 (
 echo "In FreeBSD, tclsh is named with a version number.  This is because"
@@ -20,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 '^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]+([a-z][a-z])?$')
 do
 	echo $name
 done
diff --git a/lang/tcl83/pkg-install.tclsh b/lang/tcl83/pkg-install.tclsh
index 055957a6c36f..9dec69942b2a 100644
--- a/lang/tcl83/pkg-install.tclsh
+++ b/lang/tcl83/pkg-install.tclsh
@@ -3,14 +3,17 @@
 # The user may have a tclsh they want to preserve
 ver=`grep -a awieYJFnsuILOnfsYEW ${PKG_PREFIX}/bin/tclsh 2> /dev/null \
     | sed -e 's/.*\*\*//'`
-if [ ! -e ${PKG_PREFIX}/bin/tclsh ] || [ "$ver" != "" -a "$ver" -lt 001 ]
+if [ ! -e ${PKG_PREFIX}/bin/tclsh ] || [ "$ver" != "" -a "$ver" -lt 002 ]
 then
 	[ -f ${PKG_PREFIX}/bin/tclsh ] && chmod u+w ${PKG_PREFIX}/bin/tclsh
 
 	mkdir -p ${PKG_PREFIX}/bin
 	cat > ${PKG_PREFIX}/bin/tclsh <<'EOF'
 #!/bin/sh
-# Installed by ports system.  id: awieYJFnsuILOnfsYEW**001
+# Installed by ports system.  id: awieYJFnsuILOnfsYEW**002
+#
+# $FreeBSD$
+#
  
 (
 echo "In FreeBSD, tclsh is named with a version number.  This is because"
@@ -20,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 '^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]+([a-z][a-z])?$')
 do
 	echo $name
 done
diff --git a/lang/tcl84/pkg-install.tclsh b/lang/tcl84/pkg-install.tclsh
index 055957a6c36f..9dec69942b2a 100644
--- a/lang/tcl84/pkg-install.tclsh
+++ b/lang/tcl84/pkg-install.tclsh
@@ -3,14 +3,17 @@
 # The user may have a tclsh they want to preserve
 ver=`grep -a awieYJFnsuILOnfsYEW ${PKG_PREFIX}/bin/tclsh 2> /dev/null \
     | sed -e 's/.*\*\*//'`
-if [ ! -e ${PKG_PREFIX}/bin/tclsh ] || [ "$ver" != "" -a "$ver" -lt 001 ]
+if [ ! -e ${PKG_PREFIX}/bin/tclsh ] || [ "$ver" != "" -a "$ver" -lt 002 ]
 then
 	[ -f ${PKG_PREFIX}/bin/tclsh ] && chmod u+w ${PKG_PREFIX}/bin/tclsh
 
 	mkdir -p ${PKG_PREFIX}/bin
 	cat > ${PKG_PREFIX}/bin/tclsh <<'EOF'
 #!/bin/sh
-# Installed by ports system.  id: awieYJFnsuILOnfsYEW**001
+# Installed by ports system.  id: awieYJFnsuILOnfsYEW**002
+#
+# $FreeBSD$
+#
  
 (
 echo "In FreeBSD, tclsh is named with a version number.  This is because"
@@ -20,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 '^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]+([a-z][a-z])?$')
 do
 	echo $name
 done