summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-06-01 12:03:50 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-06-01 12:03:50 (GMT)
commit5331fe2426d21535fabda8f3cc23c92c0b98be9a (patch)
tree1660dd27bf6585b5388ca39c41f97673229ea518
parent68e030c1017b44bc5b0f1a625f06350058bea3ed (diff)
parent5937053b54cde66ba71209b74b6d6732275cafec (diff)
downloadtcl-5331fe2426d21535fabda8f3cc23c92c0b98be9a.zip
tcl-5331fe2426d21535fabda8f3cc23c92c0b98be9a.tar.gz
tcl-5331fe2426d21535fabda8f3cc23c92c0b98be9a.tar.bz2
Fix [3bd69eba99a395ee]: 'make dist' fails when tclsh9.0 is on $PATH
-rw-r--r--library/tcltest/tcltest.tcl2
-rw-r--r--tools/genStubs.tcl2
-rw-r--r--tools/man2html.tcl2
-rw-r--r--tools/man2html1.tcl2
-rw-r--r--tools/man2html2.tcl2
-rwxr-xr-xtools/tclZIC.tcl2
-rwxr-xr-xtools/tcltk-man2html.tcl2
7 files changed, 2 insertions, 12 deletions
diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl
index 1ba3c41..5dcfc61 100644
--- a/library/tcltest/tcltest.tcl
+++ b/library/tcltest/tcltest.tcl
@@ -614,7 +614,7 @@ namespace eval tcltest {
set levelMap {
l list
p pass
- b body
+ b body
s skip
t start
e error
diff --git a/tools/genStubs.tcl b/tools/genStubs.tcl
index beede9e..9f2c6ca 100644
--- a/tools/genStubs.tcl
+++ b/tools/genStubs.tcl
@@ -10,8 +10,6 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-package require Tcl 8.4
-
namespace eval genStubs {
# libraryName --
#
diff --git a/tools/man2html.tcl b/tools/man2html.tcl
index 6d4724f..2d03ab6 100644
--- a/tools/man2html.tcl
+++ b/tools/man2html.tcl
@@ -2,8 +2,6 @@
# \
exec tclsh "$0" ${1+"$@"}
-package require Tcl 8.4
-
# man2html.tcl --
#
# This file contains procedures that work in conjunction with the
diff --git a/tools/man2html1.tcl b/tools/man2html1.tcl
index e8d29e8..64982ff 100644
--- a/tools/man2html1.tcl
+++ b/tools/man2html1.tcl
@@ -5,8 +5,6 @@
#
# Copyright (c) 1996 by Sun Microsystems, Inc.
-package require Tcl 8.4
-
# Global variables used by these scripts:
#
# state - state variable that controls action of text proc.
diff --git a/tools/man2html2.tcl b/tools/man2html2.tcl
index 163196e..e4ccedf 100644
--- a/tools/man2html2.tcl
+++ b/tools/man2html2.tcl
@@ -6,8 +6,6 @@
#
# Copyright (c) 1996 by Sun Microsystems, Inc.
-package require Tcl 8.4
-
# Global variables used by these scripts:
#
# NAME_file - array indexed by NAME and containing file names used for
diff --git a/tools/tclZIC.tcl b/tools/tclZIC.tcl
index 005919a..85c9ba9 100755
--- a/tools/tclZIC.tcl
+++ b/tools/tclZIC.tcl
@@ -30,8 +30,6 @@
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#----------------------------------------------------------------------
-package require Tcl 8.5
-
# Define the names of the Olson files that we need to load.
# We avoid the solar time files and the leap seconds.
diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl
index 6d899a0..9a372b7 100755
--- a/tools/tcltk-man2html.tcl
+++ b/tools/tcltk-man2html.tcl
@@ -1,6 +1,6 @@
#!/usr/bin/env tclsh
-if {[catch {package require Tcl 8.6} msg]} {
+if {[catch {package require Tcl 8.6-} msg]} {
puts stderr "ERROR: $msg"
puts stderr "If running this script from 'make html', set the\
NATIVE_TCLSH environment\nvariable to point to an installed\