release lint

12 files changed, 112 insertions, 297 deletions

diff --git a/ChangeLog b/ChangeLog
index 77486cd..8c54f12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -109,7 +109,7 @@
 	the notifier thread. [Bug: 607]
 
 	* unix/tclUnixFCmd.c (GetPermissionsAttribute): Increase size of
-	returnString buffer to avoid overflow.
+	returnString buffer to avoid overflow. [Bug: 584]
 
 	* generic/tclThreadTest.c (TclThreadSend): Fixed memory leak due
 	to use of TCL_VOLATILE instead of TCL_DYNAMIC.
diff --git a/README b/README
index 38eaab0..8fb3749 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 Tcl
 
-RCS: @(#) $Id: README,v 1.1.2.3 1998/12/03 02:06:29 welch Exp $
+RCS: @(#) $Id: README,v 1.1.2.4 1998/12/10 00:49:42 stanton Exp $
 
 1. Introduction
 ---------------
@@ -13,14 +13,14 @@ have bugs and be missing some minor features.  This release is for
 early adopters who are willing to help us find and fix problems.
 Please let us know about any problems you uncover.
 
-Tcl 8.1 includes three major new features: Unicode support (all
-internal strings are now stored in UTF-8 form), a new regular
-expression matcher with most of the Perl features, and support for
-multithreading.  For details on features, incompatibilities, and
+Tcl 8.1 includes four major new features: Unicode support (all internal
+strings are now stored in UTF-8 form), a new regular expression matcher
+with most of the Perl features, support for multithreading, and a new
+message catalog package.  For details on features, incompatibilities, and
 potential problems with this release, see the Tcl/Tk 8.1 Web page at
-http://www.scriptics.com/software/8.1.html or refer to the "changes"
-file in this directory, which contains a historical record of all
-changes to Tcl.
+http://www.scriptics.com/software/8.1.html or refer to the "changes" file
+in this directory, which contains a historical record of all changes to
+Tcl.
 
 2. Documentation
 ----------------
@@ -68,8 +68,7 @@ pages at other sites.  Check them out!
 -------------------------------
 
 This release contains everything you should need to compile and run
-Tcl under UNIX, Macintoshes, and PCs (either Windows NT, Windows 95,
-or Win 3.1 with Win32s).
+Tcl under UNIX, Mac OS, and Windows (either Windows NT or Windows 95).
 
 Before trying to compile Tcl you should do the following things:
 
@@ -130,6 +129,48 @@ Here are the most significant changes in Tcl 8.1.  In addition to these
 changes, there are several smaller changes and bug fixes.  See the file
 "changes" for a complete list of all changes.
 
+    1. Unicode. All strings in Tcl are stored using the UTF-8
+    representation for 16-bit Unicode characters.  All of the APIs in Tcl
+    should support UTF strings.  UTF-8 has the property that all ASCII
+    strings will be encoded with no change so code that only used 7-bit
+    ASCII charaters should not need to be changed.  Strings that
+    previously contained European characters (i.e. 0x80 or higher) will
+    now be encoded as two bytes.  These changes should not be visible to
+    Tcl scripts except that a new "\u" substitution has been added to
+    allow Unicode characters to be entered and a character is now a 16-bit
+    Unicode value.  See the manual entries doc/Utf.3 and doc/Tcl.n for
+    more details.
+
+    2. Encodings.  In order to convert strings between Unicode and various
+    native character formats, an encoding subsystem has been added.  UTF
+    strings need to be converted to the system's native encoding
+    (e.g. EUC) before being passed to system calls.  All channels now have
+    an associatd encoding that can be modified after creation.  There is
+    also a new "encoding" command to allow Tcl scripts to perform
+    conversions between strings in different encodings.  The Tcl library
+    directory now includes an "encoding" subdirectory that contains files
+    that describe the various encodings that Tcl currently supports.
+    Additional encodings can be added by supplying appropriate encoding
+    files.  See the manual entries doc/encoding.n and doc/Encoding.3 for
+    more details.
+
+    3. Regular expressions.  The regular expression syntax has been
+    greatly expanded to include most of the features in Perl.  In
+    addition, the regexp engine supports Unicode and binary data.  See the
+    doc/regexp.n manual entry for more details.
+
+    4. Threads.  If configured with the --enable-threads flag, Tcl can now
+    be compiled for use in a multi-threaded application.  Individual
+    threads are allowed to use one or more interpreters as long as each
+    interpreter (and any slave interpreters) is only accessed by one
+    thread.  There are new C APIs for mutexes, condition variables, and
+    thread local storage.  See the doc/Thread.3 manual entry for more
+    details. 
+
+    5. Message catalog. There is a new message catalog package which makes
+    it easy to localize the strings in a script.  See the doc/msgcat.n
+    manual entry for more details.
+
 5. Tcl newsgroup
 -----------------
 
diff --git a/changes b/changes
index e903c53..b526a6f 100644
--- a/changes
+++ b/changes
@@ -1,6 +1,6 @@
 Recent user-visible changes to Tcl:
 
-RCS: @(#) $Id: changes,v 1.1.2.13 1998/12/04 01:19:33 stanton Exp $
+RCS: @(#) $Id: changes,v 1.1.2.14 1998/12/10 00:49:42 stanton Exp $
 
 1. No more [command1] [command2] construct for grouping multiple
 commands on a single command line.
@@ -3992,6 +3992,9 @@ the encoding.n manual entry for more details. (stanton)
 syntax now includes Unicode characters in the supported
 classes. (stanton)
 
+11/6/98 (bug fix) Variable traces were causing crashes when upvar
+variables went out of scope. [Bug: 796] (stanton)
+
 11/9/98 (bug fix) "format" now correctly handles multibyte characters
 in %s format strings. (stanton)
 
@@ -4006,3 +4009,35 @@ characters. (stanton)
 11/17/98 (new feature) "scan" now supports XPG3 position specifiers
 and the "%n" conversion character.  See the "scan" manual entry for
 more details. (stanton)
+
+11/17/98 (bug fix) The Tcl memory allocator now returns 8-byte aligned
+chunks of memory which improves performance on Windows and avoids
+crashes on other platforms. [Bug: 834] (stanton)
+
+11/23/98 (bug fix) Applied various regular expression performance bug
+fixes supplied by Henry Spencer. (stanton)
+
+11/30/98 (bug fix) Fixed various thread related race conditions. [Bug:
+880 & 607] (stanton)
+
+11/30/98 (bug fix) Fixed a number of memory overflow and leak
+bugs. [Bug: 584] (stanton)
+
+12/1/98 (new feaure) Added support for Korean encodings. (stanton)
+
+12/1/98 (feature change) Changed the Tcl_EvalObjv interface to remove
+the string and length arguments.
+*** POTENTIAL INCOMPATIBILITY with previous alpha releases ***
+
+12/2/98 (bug fix) Fixed various bugs related to line feed
+translation. [Bug: 887] (stanton)
+
+12/4/98 (new feature) Added a message catalog facility to help with
+localizing Tcl scripts.  Thanks to Mark Harrison for contributing the
+initial implementation of the "msgcat" package. (stanton)
+
+12/7/98 (bug fix) The memory allocator was failing to update the
+block list for large memory blocks that were reallocated into a
+different address. [Bug: 933] (stanton)
+
+----------------- Released 8.1b1, Dec 10 1998 -----------------------
diff --git a/doc/Encoding.3 b/doc/Encoding.3
index 9f42e31..1ad92ea 100644
--- a/doc/Encoding.3
+++ b/doc/Encoding.3
@@ -4,7 +4,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: Encoding.3,v 1.1.2.2 1998/10/21 20:21:31 stanton Exp $
+'\" RCS: @(#) $Id: Encoding.3,v 1.1.2.3 1998/12/10 00:49:44 stanton Exp $
 '\" 
 .so man.macros
 .TH Tcl_GetEncoding 3 "8.1" Tcl "Tcl Library Procedures"
@@ -362,7 +362,6 @@ files.  The lines in a table-based encoding file are in the same
 format as this example taken from the \fBshiftjis\fR encoding (this is not
 the complete file):
 .CS
-\fL
 # Encoding file: shiftjis, multi-byte
 M
 003F 0 40
@@ -428,7 +427,6 @@ Case [4] is the escape-sequence encoding file.  The lines in an this type of
 file are in the same format as this example taken from the \fBiso2022-jp\fR
 encoding:
 .CS
-\fL
 .ta 1.5i
 # Encoding file: iso2022-jp, escape-driven
 E
diff --git a/generic/regc_cvec.c b/generic/regc_cvec.c
index 9e79df2..c79e741 100644
--- a/generic/regc_cvec.c
+++ b/generic/regc_cvec.c
@@ -83,6 +83,7 @@ pchr to;
 	cv->nranges++;
 }
 
+#ifdef USE_MCCE
 /*
  - addmcce - add an MCCE to a cvec
  ^ static VOID addmcce(struct cvec *, chr *, chr *);
@@ -109,6 +110,7 @@ chr *endp;			/* just past end of text */
 	assert(d == &cv->chrs[cv->chrspace - cv->nmccechrs]);
 	cv->nmccechrs += n + 1;
 }
+#endif
 
 /*
  - haschr - does a cvec contain this chr?
diff --git a/generic/regc_locale.c b/generic/regc_locale.c
index 192b266..cd22a61 100644
--- a/generic/regc_locale.c
+++ b/generic/regc_locale.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: regc_locale.c,v 1.1.2.4 1998/11/11 04:54:06 stanton Exp $
+ * RCS: @(#) $Id: regc_locale.c,v 1.1.2.5 1998/12/10 00:49:44 stanton Exp $
  */
 
 /* ASCII character-name table */
@@ -351,33 +351,6 @@ static crange graphTable[] = {
 };
 
 #define NUM_GRAPH (sizeof(graphTable)/sizeof(crange))
-
-
-/* ASCII character-class table */
-static struct cclass {
-	char *name;
-	char *chars;
-	int hasch;
-} cclasses[] = {
-	{"blank",	" \t",		0},
-	{"cntrl",	"\007\b\t\n\v\f\r\1\2\3\4\5\6\16\17\20\21\22\23\24\
-\25\26\27\30\31\32\33\34\35\36\37\177",	0},
-	{"graph",	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\
-0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~",
-					1},
-	{"lower",	"abcdefghijklmnopqrstuvwxyz",
-					1},
-	{"print",	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\
-0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~ ",
-					1},
-	{"space",	"\t\n\v\f\r ",	0},
-	{"upper",	"ABCDEFGHIJKLMNOPQRSTUVWXYZ",
-					0},
-	{"xdigit",	"0123456789ABCDEFabcdef",
-					0},
-	{NULL,		0,		0}
-};
-
 #define	CH	NOCELT
 
 /*
diff --git a/generic/regcomp.c b/generic/regcomp.c
index 02a65c7..600e874 100644
--- a/generic/regcomp.c
+++ b/generic/regcomp.c
@@ -57,7 +57,6 @@ static chr lexdigits _ANSI_ARGS_((struct vars *, int, int, int));
 static int brenext _ANSI_ARGS_((struct vars *, pchr));
 static VOID skip _ANSI_ARGS_((struct vars *));
 static chr newline _ANSI_ARGS_((NOPARMS));
-static chr *ch _ANSI_ARGS_((NOPARMS));
 static chr chrnamed _ANSI_ARGS_((struct vars *, chr *, chr *, pchr));
 /* === regc_color.c === */
 static VOID initcm _ANSI_ARGS_((struct vars *, struct colormap *));
@@ -78,9 +77,6 @@ static VOID uncolorchain _ANSI_ARGS_((struct colormap *, struct arc *));
 static int singleton _ANSI_ARGS_((struct colormap *, pchr c));
 static VOID rainbow _ANSI_ARGS_((struct nfa *, struct colormap *, int, pcolor, struct state *, struct state *));
 static VOID colorcomplement _ANSI_ARGS_((struct nfa *, struct colormap *, int, struct state *, struct state *, struct state *));
-static VOID dumpcolors _ANSI_ARGS_((struct colormap *, FILE *));
-static VOID fillcheck _ANSI_ARGS_((struct colormap *, union tree *, int, FILE *));
-static VOID dumpchr _ANSI_ARGS_((pchr, FILE *));
 /* === regc_nfa.c === */
 static struct nfa *newnfa _ANSI_ARGS_((struct vars *, struct colormap *, struct nfa *));
 static VOID freenfa _ANSI_ARGS_((struct nfa *));
@@ -124,18 +120,15 @@ static VOID compact _ANSI_ARGS_((struct nfa *, struct cnfa *));
 static VOID carcsort _ANSI_ARGS_((struct carc *, struct carc *));
 static VOID freecnfa _ANSI_ARGS_((struct cnfa *));
 static VOID dumpnfa _ANSI_ARGS_((struct nfa *, FILE *));
-static VOID dumpstate _ANSI_ARGS_((struct state *, FILE *));
-static VOID dumparcs _ANSI_ARGS_((struct state *, FILE *));
-static int dumprarcs _ANSI_ARGS_((struct arc *, struct state *, FILE *, int));
-static VOID dumparc _ANSI_ARGS_((struct arc *, struct state *, FILE *));
 static VOID dumpcnfa _ANSI_ARGS_((struct cnfa *, FILE *));
-static VOID dumpcstate _ANSI_ARGS_((int, struct carc *, struct cnfa *, FILE *));
 /* === regc_cvec.c === */
 static struct cvec *newcvec _ANSI_ARGS_((int, int, int));
 static struct cvec *clearcvec _ANSI_ARGS_((struct cvec *));
 static VOID addchr _ANSI_ARGS_((struct cvec *, pchr));
 static VOID addrange _ANSI_ARGS_((struct cvec *, pchr, pchr));
+#ifdef USE_MCCE
 static VOID addmcce _ANSI_ARGS_((struct cvec *, chr *, chr *));
+#endif
 static int haschr _ANSI_ARGS_((struct cvec *, pchr));
 static struct cvec *getcvec _ANSI_ARGS_((struct vars *, int, int, int));
 static VOID freecvec _ANSI_ARGS_((struct cvec *));
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 8de979f..db3da6e 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -6,7 +6,7 @@
 #
 #    HTML:		 1. Build the html target on Unix
 
-# RCS: @(#) $Id: Makefile.in,v 1.1.2.2 1998/09/24 23:59:40 stanton Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.1.2.3 1998/12/10 00:49:46 stanton Exp $
 
 #TCL = tcl@TCL_VERSION@@TCL_PATCH_LEVEL@
 #TK = tk@TCL_VERSION@@TCL_PATCH_LEVEL@
@@ -49,6 +49,7 @@ core:
 
 rtf: man2help.tcl man2tcl $(DOCS)
 	LD_LIBRARY_PATH=$(TCL_SOURCE)/unix \
+	TCL_LIBRARY=$(TCL_SOURCE)/library \
 	$(TCLSH) man2help.tcl tcl "$(VER)" $(DOCS)
 
 winhelp: tcl.rtf
diff --git a/tools/spencer2regexp.tcl b/tools/spencer2regexp.tcl
deleted file mode 100644
index b23f806..0000000
--- a/tools/spencer2regexp.tcl
+++ /dev/null
@@ -1,174 +0,0 @@
-# spencer2regexp.tcl --
-#
-# This file generates a test suite for the regexp command based on
-# Henry Spencer's test suite.  This script must be run in tcl 8.1 or
-# higher and takes an output filename as its parameter.
-#
-# Copyright (c) 1996 by Sun Microsystems, Inc.
-#
-# SCCS: @(#) spencer2regexp.tcl 1.4 98/01/22 14:48:09
-# 
-
-source ../tools/regexpTestLib.tcl
-
-#
-# remove flags that have no meaning
-#
-proc removeFlags {flags} {
-    regsub -all {a|s|&|-|/|\+|,|\$|;|:|>|=|\.|\[|[A-Z]|[0-9]} $flags "" newFlags 
-    return $newFlags
-}
-
-#
-# NOTBOL flag is already tested and can't be tested from the command line, skip ^
-# L is locale dependant, skip L
-# $ flag has no (?$) meaning
-# b&a and q&e are bad flag combinations
-#
-proc findSkipFlag {flags} {
-    if {[string first "^" $flags] != -1} {
-	return 1
-    }
-    if {([string first "q" $flags] != -1) 
-	&& ([string first "e" $flags] != -1)} {
-	return 1
-    }
-    if {([string first "a" $flags] != -1) 
-	&& ([string first "b" $flags] != -1)} {
-	return 1
-    }
-    if {[regexp {\$|\+} $flags] == 1} {
-	return 1
-    }
-    return 0
-}
-
-proc prepareCmd {flags re str vars noBraces} {
-    # adjust the re to include to compile-time flag, where applicable
-    
-    if {[llength $flags] != 0} {
-	
-	# if re already has meta-syntax, skip this test
-	
-	if {[regexp {^(\(\?)|^(\*\*\*)} $re] == 1} {
-	    return -1
-	}
-	set re "\(?$flags\)$re"
-    }
-    if {$noBraces > 0} {
-	set cmd "regexp -- $re $str $vars"
-    } else {
-	set cmd "regexp -- [list $re] [list $str] $vars"
-    }
-    return $cmd
-}
-
-proc convertTestLineJunk {currentLine len lineNum srcLineNum} {
-
-    regsub -all {(?b)\\} $currentLine {\\\\} currentLine
-    set re [lindex $currentLine 0]
-    set flags [lindex $currentLine 1]
-    set str [lindex $currentLine 2]
-
-    # based on flags, decide whether to skip the test
-
-    if {[findSkipFlag $flags]} {
-	regsub -all {\[|\]|\(|\)|\{|\}|\#} $currentLine {\&} line
-	set msg "\# skipping char mapping test from line $srcLineNum\n"
-	append msg "print \{... skip test from line $srcLineNum:  $line\}"
-	return $msg
-    }
-
-    # perform mapping if '=' flag exists
-
-    if {[regexp {=|>} $flags] == 1} {
-	regsub -all {_} $currentLine {\\ } currentLine
-	regsub -all {A} $currentLine {\\007} currentLine
-	regsub -all {B} $currentLine {\\b} currentLine
-	regsub -all {E} $currentLine {\\033} currentLine
-	regsub -all {F} $currentLine {\\f} currentLine
-	regsub -all {N} $currentLine {\\n} currentLine
-	regsub -all {R} $currentLine {\\r} currentLine
-	regsub -all {T} $currentLine {\\t} currentLine
-	regsub -all {V} $currentLine {\\v} currentLine
-	if {[regexp {=} $flags] == 1} {
-	    set re [lindex $currentLine 0]
-	}
-	set str [lindex $currentLine 2]
-    }
-    set flags [removeFlags $flags]
-
-    # find the test result
-
-    set numVars [expr $len - 3]
-    set vars {}
-    set vals {}
-    set result 0
-    set v 0
-    
-    if {[regsub {\*} "$flags" "" newFlags] == 1} {
-	# an error is expected
-	
-	if {[string compare $str "EMPTY"] == 0} {
-	    # empty regexp is not an error
-	    # skip this test
-	    
-	    return "\# skipping the empty-re test from line $srcLineNum\n"
-	}
-	set flags $newFlags
-	set result "1 \{[convertErrCode $str]\}"
-    } elseif {$numVars > 0} {
-	# at least 1 match is made
-	
-	if {[regexp {s} $flags] == 1} {
-	    set result {0 1}
-	} else {
-	    while {$v < $numVars} {
-		append vars " var($v)"
-		append vals " \$var($v)"
-		incr v
-	    }
-	    set result "0 \{1 [removeAts [lrange $currentLine 3 $len]]\}"
-	}
-    } else {
-	# no match is made
-	
-	set result "0 0"
-    }
-
-    # adjust the re to include to compile-time flag, where applicable
-    
-    if {[llength $flags] != 0} {
-
-	# if re already has meta-syntax, skip this test
-
-	if {[regexp {^(\(\?)|^(\*\*\*)} $re] == 1} {
-	    return "\# skipping test with metasyntax from line $srcLineNum\n"	    
-	}
-	set re "\(?$flags\)$re"
-    }
-
-    # set up the test and write it to the output file
-    
-    set cmd "regexp -- [list $re] [list $str] $vars"
-    set test "test regexp-1.$srcLineNum \{converted from line $srcLineNum\} \{\n"
-    append test "\tcatch {unset var}\n"
-    append test "\tlist \[catch \{ \n"
-    append test "\t\tset match \[$cmd\] \n"
-    append test "\t\tlist \$match $vals \n"
-    append test "\t\} msg\] \$msg \n"
-    append test "\} \{$result\} \n"
-    return $test
-} 
-
-# main
-
-if {$argc != 2} {
-    puts "name of input and outfile reuqired"
-    return
-}
-
-set inFileName [lindex $argv 0]
-set outFileName [lindex $argv 1]
-
-writeOutputFile [readInputFile] regexp
diff --git a/tools/spencer2testregexp.tcl b/tools/spencer2testregexp.tcl
deleted file mode 100644
index 9e892ad..0000000
--- a/tools/spencer2testregexp.tcl
+++ /dev/null
@@ -1,53 +0,0 @@
-# spencer2testregexp.tcl --
-#
-# This file generates a test suite for the testregexp command based on
-# Henry Spencer's test suite.  This script must be run in tcl 8.1 or
-# higher and takes an output filename as its parameter.
-#
-# Copyright (c) 1996 by Sun Microsystems, Inc.
-#
-# SCCS: @(#) spencer2testregexp.tcl 1.4 98/01/22 14:48:14
-# 
-
-source ../tools/regexpTestLib.tcl
-
-#
-# remove flags that have no meaning
-#
-proc removeFlags {flags} {
-    regsub -all {\[|[A-Z]|[0-9]} $flags "" newFlags 
-    return $newFlags
-}
-
-#
-# code for mapping char is not yet written, skip = and >
-# NOTBOL flag is already tested and can't be tested from the command line, skip ^
-# L is locale dependant, skip L
-#
-proc findSkipFlag {flags} {
-    if {[regexp {\+} $flags] == 1} {
-	return 1
-    }
-    return 0
-}
-
-proc prepareCmd {flags re str vars noBraces} {
-    if {$noBraces > 0} {
-	set cmd "testregexp $flags $re $str $vars"
-    } else {
-	set cmd "testregexp [list $flags] [list $re] [list $str] $vars"
-    }
-    return $cmd
-}
-
-# main
-
-if {$argc != 2} {
-    puts "name of input and outfile reuqired"
-    return
-}
-
-set inFileName [lindex $argv 0]
-set outFileName [lindex $argv 1]
-
-writeOutputFile [readInputFile] testregexp
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 9561834..967f521 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.1.2.9 1998/12/02 20:08:10 welch Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.1.2.10 1998/12/10 00:49:46 stanton Exp $
 
 # Current Tcl version;  used in various names.
 
@@ -489,7 +489,7 @@ install-libraries:
 		else true; \
 		fi; \
 	    done;
-	@for i in http2.0 http1.0 opt0.4 encoding; \
+	@for i in http2.0 http1.0 opt0.4 encoding msgcat1.0; \
 	    do \
 	    if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
 		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -505,7 +505,7 @@ install-libraries:
 	    echo "Installing $$i"; \
 	    $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR); \
 	    done;
-	@for i in http2.0 http1.0 opt0.4; \
+	@for i in http2.0 http1.0 opt0.4 msgcat1.0; \
 	    do \
 	    for j in $(TOP_DIR)/library/$$i/*.tcl ; \
 		do \
@@ -954,7 +954,7 @@ dist: $(UNIX_DIR)/configure
 	mkdir $(DISTDIR)/library
 	cp -p $(TOP_DIR)/license.terms $(TOP_DIR)/library/*.tcl \
 		$(TOP_DIR)/library/tclIndex $(DISTDIR)/library
-	for i in http2.0 http1.0 opt0.4; \
+	for i in http2.0 http1.0 opt0.4 msgcat1.0; \
 	    do \
 		mkdir $(DISTDIR)/library/$$i ;\
 		cp -p $(TOP_DIR)/library/$$i/*.tcl $(DISTDIR)/library/$$i; \
@@ -975,7 +975,7 @@ dist: $(UNIX_DIR)/configure
 		$(TOP_DIR)/tests/defs $(DISTDIR)/tests
 	mkdir $(DISTDIR)/tests/pkg
 	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/tests/pkg
-	cp -p $(TOP_DIR)/tests/pkg/*.tcl $(TOP_DIR)/tests/pkg
+	cp -p $(TOP_DIR)/tests/pkg/*.tcl $(DISTDIR)/tests/pkg
 	mkdir $(DISTDIR)/win
 	cp -p $(TOP_DIR)/win/*.c $(TOP_DIR)/win/*.h $(TOP_DIR)/win/*.rc \
 		$(DISTDIR)/win
@@ -985,10 +985,7 @@ dist: $(UNIX_DIR)/configure
 	cp -p $(TOP_DIR)/win/pkgIndex.tcl $(DISTDIR)/win
 	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/win
 	mkdir $(DISTDIR)/mac
-	sccs edit -s $(TOP_DIR)/mac/tclMacProjects.sea.hqx
-	cp -p tclMacProjects.sea.hqx $(DISTDIR)/mac
-	sccs unedit $(TOP_DIR)/mac/tclMacProjects.sea.hqx
-	rm -f tclMacProjects.sea.hqx
+	cp -p $(TOP_DIR)/mac/tclMacProjects.sea.hqx $(DISTDIR)/mac
 	cp -p $(TOP_DIR)/mac/*.c $(TOP_DIR)/mac/*.h $(TOP_DIR)/mac/*.r \
 		$(DISTDIR)/mac
 	cp -p $(TOP_DIR)/mac/porting.notes $(TOP_DIR)/mac/README $(DISTDIR)/mac
@@ -1001,12 +998,14 @@ dist: $(UNIX_DIR)/configure
 		$(DISTDIR)/unix/dltest
 	cp -p $(UNIX_DIR)/dltest/configure.in $(UNIX_DIR)/dltest/configure \
 		$(UNIX_DIR)/dltest/README $(DISTDIR)/unix/dltest
-	@echo "ignore 'cp: xxx: is a directory' errors"
-	-@for i in tools tools/encoding ; do \
-		echo "making $(DISTDIR)/$$i"; \
-		mkdir -p $(DISTDIR)/$$i;\
-		cp `ls -d1 $(TOP_DIR)/$$i/*|egrep -v "(SCCS|TAGS|~|,|#|%|core|\.l?o)"` $(DISTDIR)/$$i;\
-	done
+	mkdir $(DISTDIR)/tools
+	cp -p $(TOP_DIR)/tools/*.in $(TOP_DIR)/tools/*.c \
+		$(TOP_DIR)/tools/*.tcl $(TOP_DIR)/tools/*.hpj \
+		$(TOP_DIR)/tools/*.wse $(TOP_DIR)/tools/str2c \
+		$(TOP_DIR)/tools/README $(DISTDIR)/tools
+	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/tools
+	mkdir $(DISTDIR)/tools/encoding
+	cp `ls -d1 $(TOP_DIR)/tools/encoding/*|egrep -i -v "(CVS|SCCS|TAGS|~|,|#|%|core|\.l?o)"` $(DISTDIR)/tools/encoding
 
 #
 # The following target can only be used for non-patch releases.  Use
diff --git a/unix/configure.in b/unix/configure.in
index c8a573a..b64ab7b 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -2,12 +2,12 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tcl installation
 dnl	to configure the system for the local environment.
 AC_INIT(../generic/tcl.h)
-# RCS: @(#) $Id: configure.in,v 1.1.2.5 1998/12/03 02:06:35 welch Exp $
+# RCS: @(#) $Id: configure.in,v 1.1.2.6 1998/12/10 00:49:47 stanton Exp $
 
 TCL_VERSION=8.1
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=1
-TCL_PATCH_LEVEL=".b1"
+TCL_PATCH_LEVEL=b1
 VERSION=${TCL_VERSION}
 
 if test "${prefix}" = "NONE"; then