Index: README
==================================================================
--- README
+++ README
@@ -1,7 +1,7 @@
 README:  Tcl
-    This is the Tcl 8.7a2 source distribution.
+    This is the Tcl 8.7.0-alpha.2 source distribution.
 	http://sourceforge.net/projects/tcl/files/Tcl/
     You can get any source release of Tcl from the URL above.
 
 Contents
 --------

Index: doc/GetVersion.3
==================================================================
--- doc/GetVersion.3
+++ doc/GetVersion.3
@@ -23,11 +23,12 @@
 .AP int *patchLevel out
 The patch level of the Tcl library (or alpha or beta number).
 .AP Tcl_ReleaseType *type out
 The type of release, also indicates the type of patch level. Can be
 one of \fBTCL_ALPHA_RELEASE\fR, \fBTCL_BETA_RELEASE\fR, or
-\fBTCL_FINAL_RELEASE\fR.
+\fBTCL_FINAL_RELEASE\fR. This function cannot distinguish between
+final and rc releases, both will be considered final.
 .BE
 
 .SH DESCRIPTION
 .PP
 \fBTcl_GetVersion\fR should be used to query the version number

Index: doc/package.n
==================================================================
--- doc/package.n
+++ doc/package.n
@@ -167,12 +167,12 @@
 If the \fIcommand\fR argument is supplied, it contains the first part
 of a command;  when the command is invoked during a \fBpackage require\fR
 command, Tcl appends one or more additional arguments giving the desired
 package name and requirements.
 For example, if \fIcommand\fR is \fBfoo bar\fR and later the command
-\fBpackage require test 2.4\fR is invoked, then Tcl will execute
-the command \fBfoo bar test 2.4\fR to load the package.
+\fBpackage require test 2.4.0\fR is invoked, then Tcl will execute
+the command \fBfoo bar test 2.4.0\fR to load the package.
 If no requirements are supplied to the \fBpackage require\fR command,
 then only the name will be added to invoked command.
 If the \fBpackage unknown\fR command is invoked without a \fIcommand\fR
 argument, then the current \fBpackage unknown\fR script is returned,
 or an empty string if there is none.
@@ -237,11 +237,11 @@
 is equal to the \fImin\fR.
 .IP [b]
 Otherwise if, and only if the \fIversion\fR is greater than or equal
 to the \fImin\fR, and less than the \fImax\fR, where both \fImin\fR
 and \fImax\fR have been padded internally with
-.QW a0 .
+.QW -alpha.0 .
 Note that while the comparison to \fImin\fR is inclusive, the
 comparison to \fImax\fR is exclusive.
 .RE
 .IP [3]
 A
@@ -255,11 +255,11 @@
 .IP [4]
 A \fIversion\fR satisfies a
 .QW min-unbound
 requirement if, and only if it is greater than or equal to the
 \fImin\fR, where the \fImin\fR has been padded internally with
-.QW a0 .
+.QW -alpha.0 .
 There is no constraint to a maximum.
 .RE
 .TP
 \fBpackage prefer \fR?\fBlatest\fR|\fBstable\fR?
 With no arguments, the commands returns either
@@ -297,50 +297,72 @@
 .QW latest .
 .RE
 .SH "VERSION NUMBERS"
 .PP
 Version numbers consist of one or more decimal numbers separated
-by dots, such as 2 or 1.162 or 3.1.13.1.
+by dots, such as 2.0.0 or 1.162.0 or 3.1.13.
 The first number is called the major version number.
 Larger numbers correspond to later versions of a package, with
 leftmost numbers having greater significance.
-For example, version 2.1 is later than 1.3 and version
+For example, version 2.1.0 is later than 1.3.0 and version
 3.4.6 is later than 3.3.5.
 Missing fields are equivalent to zeroes:  version 1.3 is the
 same as version 1.3.0 and 1.3.0.0, so it is earlier than 1.3.1 or 1.3.0.2.
-In addition, the letters
-.QW a
+In addition, the specifiers
+.QW -alpha
 (alpha) and/or
-.QW b
-(beta) may appear
-exactly once to replace a dot for separation. These letters
+.QW -beta
+(beta) and/or
+.QW -rc
+(rc) may be inserted
+exactly once just before a dot for separation. These specifiers
 semantically add a negative specifier into the version, where
-.QW a
+.QW -alpha
+is \-3, and
+.QW -beta
 is \-2, and
-.QW b
+.QW -rc
 is \-1. Each may be specified only once, and
-.QW a
+.QW -alpha
+or
+.QW -beta
 or
-.QW b
-are mutually exclusive in a specifier. Thus 1.3a1 becomes (semantically)
-1.3.\-2.1, 1.3b1 is 1.3.\-1.1. Negative numbers are not directly allowed
+.QW -rc
+are mutually exclusive in a specifier. Thus 1.3.0-alpha.1 becomes (semantically)
+1.3.0.\-3.1, 1.3.0-beta.1 is 1.3.0.\-2.1. Negative numbers are not directly allowed
 in version specifiers.
-A version number not containing the letters
-.QW a
+A version number not containing the specifier
+.QW -alpha
+or
+.QW -beta
 or
-.QW b
+.QW -rc
 as specified
-above is called a \fBstable\fR version, whereas presence of the letters
+above is called a \fBstable\fR version, whereas presence of the specifier
 causes the version to be called is \fBunstable\fR.
 A later version number is assumed to be upwards compatible with
 an earlier version number as long as both versions have the same
 major version number.
-For example, Tcl scripts written for version 2.3 of a package should
-work unchanged under versions 2.3.2, 2.4, and 2.5.1.
+For example, Tcl scripts written for version 2.3.0 of a package should
+work unchanged under versions 2.3.2, 2.4.0, and 2.5.1.
 Changes in the major version number signify incompatible changes:
-if code is written to use version 2.1 of a package, it is not guaranteed
+if code is written to use version 2.1.0 of a package, it is not guaranteed
 to work unmodified with either version 1.7.3 or version 3.1.
+.PP
+Instead of the full specifiers \fB-alpha.\fR and \fB-beta.\fR (with dot this
+time), it is allowed to shorten this to simply \fBa\fR resp \fBb\fR. The
+number of elements doesn't need to be 3 (MAJOR, MINOR, PATCH), but it could
+be for reasons of compatibility with the "Semantic Versioning" specification.
+Tcl and Tk >= 8.7 follow this specificiation, but packages are
+not required to do that: Those packages will still function as expected
+with Tcl and Tk >= 8.7. There is no short equivalent to \fB-rc.\fR
+.PP
+Note that valid version number may contain a "-", while a dash can
+also be used to separate two version numbers in a requirement. The rule
+is that if the dash is followed by a non-digit, then the dash is
+interpreted as being part of the version number. Otherwise, it is
+handled as part of the requirement syntax.
 .SH "PACKAGE INDICES"
 .PP
 The recommended way to use packages in Tcl is to invoke \fBpackage require\fR
 and \fBpackage provide\fR commands in scripts, and use the procedure
 \fBpkg_mkIndex\fR to create package index files.

Index: generic/tcl.h
==================================================================
--- generic/tcl.h
+++ generic/tcl.h
@@ -55,12 +55,31 @@
 #define TCL_MAJOR_VERSION   8
 #define TCL_MINOR_VERSION   7
 #define TCL_RELEASE_LEVEL   TCL_ALPHA_RELEASE
 #define TCL_RELEASE_SERIAL  2
 
+/*
+ * Translation of above numbers to the strings below are as follows:
+ *      TCL_VERSION = $TCL_MAJOR_VERSION.$TCL_MINOR_VERSION
+ * For alpha releases:
+ *      TCL_PATCH_LEVEL = $TCL_MAJOR_VERSION.$TCL_MINOR_VERSION.0-alpha.$TCL_RELEASE_SERIAL
+ * For beta releases:
+ *      TCL_PATCH_LEVEL = $TCL_MAJOR_VERSION.$TCL_MINOR_VERSION.0-beta.$TCL_RELEASE_SERIAL
+ * For rc releases (not distinguishing from final releases, other than through TCL_PATCH_LEVEL):
+ *      TCL_PATCH_LEVEL = $TCL_MAJOR_VERSION.$TCL_MINOR_VERSION.0-rc.1
+ * For final releases:
+ *      TCL_PATCH_LEVEL = $TCL_MAJOR_VERSION.$TCL_MINOR_VERSION.$TCL_RELEASE_SERIAL
+ *
+ * Indeed, for alpha and beta releases, and additional ".0" is inserted in order
+ * to comply with the semver rules that the numerical version must consist of 3 parts.
+ * It indicates that version "a.b.c-anything" will eventually lead to version "a.b.c".
+ * Tcl only releases alpha/beta's for c=0, there are no plans to change that (although
+ * it would be possible with the semver numbering)
+ */
+
 #define TCL_VERSION	    "8.7"
-#define TCL_PATCH_LEVEL	    "8.7a2"
+#define TCL_PATCH_LEVEL	    "8.7.0-alpha.2"
 
 #if !defined(TCL_NO_DEPRECATED) || defined(RC_INVOKED)
 /*
  *----------------------------------------------------------------------------
  * The following definitions set up the proper options for Windows compilers.

Index: generic/tclInterp.c
==================================================================
--- generic/tclInterp.c
+++ generic/tclInterp.c
@@ -415,12 +415,12 @@
 "	    lappend scripts {::tcl::pkgconfig get scriptdir,runtime}\n"
 "	}\n"
 "	lappend scripts {\n"
 "set parentDir [file dirname [file dirname [info nameofexecutable]]]\n"
 "set grandParentDir [file dirname $parentDir]\n"
-"file join $parentDir lib tcl[info tclversion]} \\\n"
-"	{file join $grandParentDir lib tcl[info tclversion]} \\\n"
+"file join $parentDir share tcl8} \\\n"
+"	{file join $grandParentDir share tcl8} \\\n"
 "	{file join $parentDir library} \\\n"
 "	{file join $grandParentDir library} \\\n"
 "	{file join $grandParentDir tcl[info tclversion] library} \\\n"
 "	{file join $grandParentDir tcl[info patchlevel] library} \\\n"
 "	{\n"

Index: generic/tclPkg.c
==================================================================
--- generic/tclPkg.c
+++ generic/tclPkg.c
@@ -1423,15 +1423,15 @@
 				 * dots. */
     char **internal,		/* Internal normalized representation */
     int *stable)		/* Flag: Version is (un)stable. */
 {
     const char *p = string;
-    char prevChar;
+    char prevChar = 0;
     int hasunstable = 0;
     /*
      * 4* assuming that each char is a separator (a,b become ' -x ').
-     * 4+ to have spce for an additional -2 at the end
+     * 4+ to have spce for an additional -3 at the end
      */
     char *ibuf = ckalloc(4 + 4*strlen(string));
     char *ip = ibuf;
 
     /*
@@ -1444,10 +1444,16 @@
      * (1) s.a.
      * (2) All other characters have to be a digit, 'a', 'b', or '.'
      * (3) s.a.
      * (4) Only one of 'a' or 'b' may occur.
      * (5) Neither 'a', nor 'b' may occur before or after a '.'
+     *
+     * TIP 439, Modified rules
+     * In stead of "a" and "b" in the above rules, the longer
+     * forms "-alpha." and "-beta." are accepted as well. In
+     * addition, "-rc." is allowed as intermediate between
+     * beta and final release.
      */
 
     if (!isdigit(UCHAR(*p))) {				/* INTL: digit */
 	goto error;
     }
@@ -1454,49 +1460,65 @@
 
     *ip++ = *p;
 
     for (prevChar = *p, p++; *p != 0; p++) {
 	if (!isdigit(UCHAR(*p)) &&			/* INTL: digit */
-		((*p!='.' && *p!='a' && *p!='b') ||
-		((hasunstable && (*p=='a' || *p=='b')) ||
-		((prevChar=='a' || prevChar=='b' || prevChar=='.')
+		((*p!='.' && *p!='a' && *p!='b' && *p!='-') ||
+		((hasunstable && (*p=='a' || *p=='b'|| *p=='-')) ||
+		((prevChar=='a' || prevChar=='b' || prevChar=='r' || prevChar=='.')
 			&& (*p=='.')) ||
 		((*p=='a' || *p=='b' || *p=='.') && prevChar=='.')))) {
 	    goto error;
 	}
 
-	if (*p == 'a' || *p == 'b') {
-	    hasunstable = 1;
-	}
-
 	/*
 	 * Translation to the internal rep. Regular version chars are copied
 	 * as is. The separators are translated to numerics. The new separator
 	 * for all parts is space.
 	 */
 
-	if (*p == '.') {
+	prevChar = *p;
+	if (*p == '-') {
+	    if (!strncmp(p+1, "alpha.", 6)) {
+		p += 6;
+		prevChar = 'a';
+	    } else if (!strncmp(p+1, "beta.", 5)) {
+		p += 5;
+		prevChar = 'b';
+	    } else if (!strncmp(p+1, "rc.", 3)) {
+		p += 3;
+		prevChar = 'r';
+	    }
+	}
+	if (prevChar == '.') {
 	    *ip++ = ' ';
 	    *ip++ = '0';
 	    *ip++ = ' ';
-	} else if (*p == 'a') {
+	} else if (prevChar == 'a') {
+	    hasunstable = 1;
+	    *ip++ = ' ';
+	    *ip++ = '-';
+	    *ip++ = '3';
+	    *ip++ = ' ';
+	} else if (prevChar == 'b') {
+	    hasunstable = 1;
 	    *ip++ = ' ';
 	    *ip++ = '-';
 	    *ip++ = '2';
 	    *ip++ = ' ';
-	} else if (*p == 'b') {
+	} else if (prevChar == 'r') {
+	    hasunstable = 1;
 	    *ip++ = ' ';
 	    *ip++ = '-';
 	    *ip++ = '1';
 	    *ip++ = ' ';
 	} else {
 	    *ip++ = *p;
 	}
 
-	prevChar = *p;
     }
-    if (prevChar!='.' && prevChar!='a' && prevChar!='b') {
+    if (prevChar!='.' && prevChar!='a' && prevChar!='b' && prevChar!='r') {
 	*ip = '\0';
 	if (internal != NULL) {
 	    *internal = ibuf;
 	} else {
 	    ckfree(ibuf);
@@ -1757,19 +1779,23 @@
      */
 
     char *dash = NULL, *buf;
 
     dash = strchr(string, '-');
-    if (dash == NULL) {
+    if ((dash != NULL) && (dash[1]=='a' || dash[1]=='b' || dash[1]=='r')) {
+	dash = strchr(dash+1, '-');
+    }
+    if ((dash == NULL) || dash[1]=='a' || dash[1]=='b' || dash[1]=='r') {
 	/*
 	 * No dash found, has to be a simple version.
 	 */
 
 	return CheckVersionAndConvert(interp, string, NULL, NULL);
     }
 
-    if (strchr(dash+1, '-') != NULL) {
+    buf = strchr(dash+1, '-');
+    if ((buf != NULL) && isdigit(UCHAR(buf[1]))) {
 	/*
 	 * More dashes found after the first. This is wrong.
 	 */
 
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -1945,23 +1971,26 @@
 
     int satisfied, res;
     char *dash = NULL, *buf, *min, *max;
 
     dash = strchr(req, '-');
-    if (dash == NULL) {
+    if ((dash != NULL) && (dash[1]=='a' || dash[1]=='b')) {
+	dash = strchr(dash+1, '-');
+    }
+    if ((dash == NULL) || dash[1]=='a' || dash[1]=='b') {
 	/*
 	 * No dash found, is a simple version, fallback to regular check. The
 	 * 'CheckVersionAndConvert' cannot fail. We pad the requirement with
-	 * 'a0', i.e '-2' before doing the comparison to properly accept
+	 * 'a0', i.e '-3' before doing the comparison to properly accept
 	 * unstables as well.
 	 */
 
 	char *reqi = NULL;
 	int thisIsMajor;
 
 	CheckVersionAndConvert(NULL, req, &reqi, NULL);
-	strcat(reqi, " -2");
+	strcat(reqi, " -3");
 	res = CompareVersions(havei, reqi, &thisIsMajor);
 	satisfied = (res == 0) || ((res == 1) && !thisIsMajor);
 	ckfree(reqi);
 	return satisfied;
     }
@@ -1978,15 +2007,15 @@
     dash++;			/* dash now <=> max part */
 
     if (*dash == '\0') {
 	/*
 	 * We have a min, but no max. For the comparison we generate the
-	 * internal rep, padded with 'a0' i.e. '-2'.
+	 * internal rep, padded with 'a0' i.e. '-3'.
 	 */
 
 	CheckVersionAndConvert(NULL, buf, &min, NULL);
-	strcat(min, " -2");
+	strcat(min, " -3");
 	satisfied = (CompareVersions(havei, min, NULL) >= 0);
 	ckfree(min);
 	ckfree(buf);
 	return satisfied;
     }
@@ -2001,12 +2030,12 @@
     CheckVersionAndConvert(NULL, dash, &max, NULL);
 
     if (CompareVersions(min, max, NULL) == 0) {
 	satisfied = (CompareVersions(min, havei, NULL) == 0);
     } else {
-	strcat(min, " -2");
-	strcat(max, " -2");
+	strcat(min, " -3");
+	strcat(max, " -3");
 	satisfied = ((CompareVersions(min, havei, NULL) <= 0) &&
 		(CompareVersions(havei, max, NULL) < 0));
     }
 
     ckfree(min);

Index: generic/tclTest.c
==================================================================
--- generic/tclTest.c
+++ generic/tclTest.c
@@ -20,10 +20,13 @@
 #   define USE_TCL_STUBS
 #endif
 #include "tclInt.h"
 #include "tclOO.h"
 #include <math.h>
+#ifndef TCL_NO_DEPRECATED
+#   define TCL_NO_DEPRECATED
+#endif
 
 /*
  * Required for Testregexp*Cmd
  */
 #include "tclRegexp.h"

Index: library/auto.tcl
==================================================================
--- library/auto.tcl
+++ library/auto.tcl
@@ -44,11 +44,11 @@
 #	using a canonical searching algorithm. A side effect is to source the
 #	initialization script and set a global library variable.
 #
 # Arguments:
 # 	basename	Prefix of the directory name, (e.g., "tk")
-#	version		Version number of the package, (e.g., "8.0")
+#	version		Version number of the package, (e.g., "8")
 #	patch		Patchlevel of the package, (e.g., "8.0.3")
 #	initScript	Initialization script to source (e.g., tk.tcl)
 #	enVarName	environment variable to honor (e.g., TK_LIBRARY)
 #	varName		Global variable to set when done (e.g., tk_library)
 
@@ -92,12 +92,12 @@
 		lappend dirs [file join $d $basename$version Resources Scripts]
 	    }
 	}
 
 	# 3. Various locations relative to the executable
-	# ../lib/foo1.0		(From bin directory in install hierarchy)
-	# ../../lib/foo1.0	(From bin/arch directory in install hierarchy)
+	# ../share/foo1.0		(From bin directory in install hierarchy)
+	# ../../share/foo1.0	(From bin/arch directory in install hierarchy)
 	# ../library		(From unix directory in build hierarchy)
 	#
 	# Remaining locations are out of date (when relevant, they ought to be
 	# covered by the $::auto_path seach above) and disabled.
 	#
@@ -107,12 +107,14 @@
 	# ../../../foo1.0.1/library
 	#		(From unix/arch directory in parallel build hierarchy)
 
         set parentDir [file dirname [file dirname [info nameofexecutable]]]
         set grandParentDir [file dirname $parentDir]
-        lappend dirs [file join $parentDir lib $basename$version]
-        lappend dirs [file join $grandParentDir lib $basename$version]
+        lappend dirs [file join $parentDir share $basename$version]
+        lappend dirs [file join $grandParentDir share $basename$version]
+        lappend dirs [file join $parentDir share tcl8 $basename$version]
+        lappend dirs [file join $grandParentDir share tcl8 $basename$version]
         lappend dirs [file join $parentDir library]
 	if {0} {
 	    lappend dirs [file join $grandParentDir library]
 	    lappend dirs [file join $grandParentDir $basename$patch library]
 	    lappend dirs [file join [file dirname $grandParentDir] \

Index: library/dde/pkgIndex.tcl
==================================================================
--- library/dde/pkgIndex.tcl
+++ library/dde/pkgIndex.tcl
@@ -1,7 +1,3 @@
 if {([info commands ::tcl::pkgconfig] eq "")
 	|| ([info sharedlibextension] ne ".dll")} return
-if {[::tcl::pkgconfig get debug]} {
-    package ifneeded dde 1.4.0 [list load [file join $dir tcldde14g.dll] dde]
-} else {
-    package ifneeded dde 1.4.0 [list load [file join $dir tcldde14.dll] dde]
-}
+package ifneeded dde 1.4.0 [list load [file join $dir tcldde1.dll] dde]

Index: library/init.tcl
==================================================================
--- library/init.tcl
+++ library/init.tcl
@@ -14,11 +14,11 @@
 
 # This test intentionally written in pre-7.5 Tcl
 if {[info commands package] == ""} {
     error "version mismatch: library\nscripts expect Tcl version 7.5b1 or later but the loaded version is\nonly [info patchlevel]"
 }
-package require -exact Tcl 8.7a2
+package require -exact Tcl 8.7.0-alpha.2
 
 # Compute the auto path to use in this interpreter.
 # The values on the path come from several locations:
 #
 # The environment variable TCLLIBPATH
@@ -51,11 +51,15 @@
 	if {$Dir ni $::auto_path} {
 	    lappend ::auto_path $Dir
 	}
     }
     set Dir [file join [file dirname [file dirname \
-	    [info nameofexecutable]]] lib]
+	    [info nameofexecutable]]] lib tcl8]
+    if {$Dir ni $::auto_path} {
+	lappend ::auto_path $Dir
+    }
+    set Dir [file dirname $Dir]
     if {$Dir ni $::auto_path} {
 	lappend ::auto_path $Dir
     }
     catch {
 	foreach Dir $::tcl_pkgPath {

Index: library/reg/pkgIndex.tcl
==================================================================
--- library/reg/pkgIndex.tcl
+++ library/reg/pkgIndex.tcl
@@ -1,9 +1,4 @@
 if {([info commands ::tcl::pkgconfig] eq "")
 	|| ([info sharedlibextension] ne ".dll")} return
-if {[::tcl::pkgconfig get debug]} {
-    package ifneeded registry 1.3.2 \
-            [list load [file join $dir tclreg13g.dll] registry]
-} else {
-    package ifneeded registry 1.3.2 \
-            [list load [file join $dir tclreg13.dll] registry]
-}
+package ifneeded registry 1.3.2 \
+	[list load [file join $dir tclreg1.dll] registry]

Index: library/tm.tcl
==================================================================
--- library/tm.tcl
+++ library/tm.tcl
@@ -315,18 +315,22 @@
     set exe [file normalize [info nameofexecutable]]
 
     # Note that we're using [::list], not [list] because [list] means
     # something other than [::list] in this namespace.
     roots [::list \
-	    [file dirname [info library]] \
 	    [file join [file dirname [file dirname $exe]] lib] \
 	    ]
 
     if {$tcl_platform(platform) eq "windows"} {
 	set sep ";"
     } else {
 	set sep ":"
+    }
+    if {[info exists env(TCL${major}_TM_PATH)]} {
+	foreach p [split $env(TCL${major}_TM_PATH) $sep] {
+	    path add $p
+	}
     }
     for {set n $minor} {$n >= 0} {incr n -1} {
 	foreach ev [::list \
 			TCL${major}.${n}_TM_PATH \
 			TCL${major}_${n}_TM_PATH \

Index: macosx/GNUmakefile
==================================================================
--- macosx/GNUmakefile
+++ macosx/GNUmakefile
@@ -90,11 +90,11 @@
 
 PROJECT			:= tcl
 PRODUCT_NAME		:= Tcl
 
 UNIX_DIR		:= ${CURDIR}/../unix
-VERSION			:= $(shell awk -F= '/^TCL_VERSION/ {print $$2; nextfile}' ${UNIX_DIR}/configure.ac)
+VERSION			:= $(shell awk -F= '/^TCL_MAJOR_VERSION/ {print $$2; nextfile}' ${UNIX_DIR}/configure.ac)
 TCLSH			:= tclsh${VERSION}
 
 BUILD_TARGET		:= all tcltest
 INSTALL_TARGET		:= install
 

Index: macosx/README
==================================================================
--- macosx/README
+++ macosx/README
@@ -139,13 +139,13 @@
 ----------------------------------------------------------
 
 - Unpack the Tcl source release archive.
 
 - The following instructions assume the Tcl source tree is named "tcl${ver}",
-(where ${ver} is a shell variable containing the Tcl version number e.g. '8.7').
+(where ${ver} is a shell variable containing the Tcl version number e.g. '8').
 Setup this shell variable as follows:
-	ver="8.7"
+	ver="8"
 If you are building from CVS, omit this step (CVS source tree names usually do
 not contain a version number).
 
 - Setup environment variables as desired, e.g. for a universal build on 10.5:
 	CFLAGS="-arch i386 -arch x86_64 -arch ppc -mmacosx-version-min=10.5"

Index: macosx/Tcl-Common.xcconfig
==================================================================
--- macosx/Tcl-Common.xcconfig
+++ macosx/Tcl-Common.xcconfig
@@ -32,6 +32,6 @@
 PREFIX = /usr/local
 TCL_CONFIGURE_ARGS = --enable-threads --enable-dtrace
 TCL_LIBRARY = $(LIBDIR)/tcl$(VERSION)
 TCL_PACKAGE_PATH = "$(LIBDIR)"
 TCL_DEFS = HAVE_TCL_CONFIG_H
-VERSION = 8.7
+VERSION = 8

Index: tests/package.test
==================================================================
--- tests/package.test
+++ tests/package.test
@@ -116,10 +116,18 @@
 } -result {}
 test package-2.6 {Tcl_PkgProvide procedure} {
     package forget t
     package provide t 2.3a1
 } {}
+test package-2.7 {Tcl_PkgProvide procedure} {
+    package forget t
+    package provide t 2.3.0-alpha.1
+} {}
+test package-2.8 {Tcl_PkgProvide procedure} {
+    package forget t
+    package provide t 2.3.0-rc.1
+} {}
 
 set n 0
 foreach v {
     2.3k1 2a3a2 2ab3 2.a4 2.b4 2b.4 2a.4 2ba4 2a4b1
     2b4a1 2b3b2
@@ -583,11 +591,11 @@
     package forget t
     set x xxx
     }
 } -body {
     child eval {
-    foreach i {1.4 3.4 4.0a1 2.3 2.4 2.2} {
+    foreach i {1.4 3.4 4.0a1 4.0.0-alpha.1 2.3 2.4 2.2} {
 	package ifneeded t $i "set x $i; package provide t $i"
     }
     package require t
     set x
     }
@@ -596,21 +604,21 @@
 } -result {3.4}
 test package-3.51 {Tcl_PkgRequire procedure, picking best stable version} -setup {
     package forget t
     set x xxx
 } -body {
-    foreach i {1.2b1 1.2 1.3a2 1.3} {
+    foreach i {1.2b1 1.2.0-beta.1 1.2 1.3a2 1.3.0-alpha.2 1.3} {
 	package ifneeded t $i "set x $i; package provide t $i"
     }
     package require t
     set x
 } -result {1.3}
 test package-3.52 {Tcl_PkgRequire procedure, picking best stable version} -setup {
     package forget t
     set x xxx
 } -body {
-    foreach i {1.2b1 1.2 1.3 1.3a2} {
+    foreach i {1.2b1 1.2.0-beta.1 1.2 1.3 1.3a2 1.3.0-alpha.2} {
 	package ifneeded t $i "set x $i; package provide t $i"
     }
     package require t
     set x
 } -result {1.3}

Index: tools/configure
==================================================================
--- tools/configure
+++ tools/configure
@@ -1698,11 +1698,11 @@
     as_fn_error $? "There's no tclConfig.sh in $TCL_BIN_DIR;  perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" "$LINENO" 5
 fi
 
 . $TCL_BIN_DIR/tclConfig.sh
 
-TCL_WIN_VERSION=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
+TCL_WIN_VERSION=$TCL_MAJOR_VERSION
 
 CC=$TCL_CC
 
 
 

Index: tools/configure.ac
==================================================================
--- tools/configure.ac
+++ tools/configure.ac
@@ -21,11 +21,11 @@
     AC_MSG_ERROR(There's no tclConfig.sh in $TCL_BIN_DIR;  perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?)
 fi
 
 . $TCL_BIN_DIR/tclConfig.sh
 
-TCL_WIN_VERSION=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
+TCL_WIN_VERSION=$TCL_MAJOR_VERSION
 AC_SUBST(TCL_WIN_VERSION)
 CC=$TCL_CC
 AC_SUBST(CC)
 AC_SUBST(TCL_VERSION)
 AC_SUBST(TCL_PATCH_LEVEL)

Index: tools/tcl.hpj.in
==================================================================
--- tools/tcl.hpj.in
+++ tools/tcl.hpj.in
@@ -3,13 +3,13 @@
 [OPTIONS]
 HCW=0
 LCID=0x409 0x0 0x0 ;English (United States)
 REPORT=Yes
 TITLE=Tcl/Tk Reference Manual
-CNT=tcl87.cnt
+CNT=tcl8.cnt
 COPYRIGHT=Copyright © 2000 Ajuba Solutions
-HLP=tcl87.hlp
+HLP=tcl8.hlp
 
 [FILES]
 tcl.rtf
 
 [WINDOWS]

Index: tools/tcltk-man2html.tcl
==================================================================
--- tools/tcltk-man2html.tcl
+++ tools/tcltk-man2html.tcl
@@ -2,11 +2,11 @@
 
 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\
-	tclsh8.7 (or the equivalent tclsh87.exe\non Windows)."
+	tclsh8 (or the equivalent tclsh8.exe\non Windows)."
     exit 1
 }
 
 # Convert Ousterhout format man pages into highly crosslinked hypertext.
 #
@@ -20,11 +20,11 @@
 # try to use this, you'll be very much on your own.
 #
 # Copyright (c) 1995-1997 Roger E. Critchlow Jr
 # Copyright (c) 2004-2010 Donal K. Fellows
 
-set ::Version "50/8.7"
+set ::Version "50/8"
 set ::CSSFILE "docs.css"
 
 ##
 ## Source the utility functions that provide most of the
 ## implementation of the transformation from nroff to html.

Index: unix/Makefile.in
==================================================================
--- unix/Makefile.in
+++ unix/Makefile.in
@@ -633,11 +633,11 @@
 ${LIB_FILE}: ${STUB_LIB_FILE} ${OBJS}
 	rm -f $@
 	@MAKE_LIB@
 
 ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
-	@if test "x${LIB_FILE}" = "xlibtcl${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \
+	@if test "x${LIB_FILE}" = "xlibtcl${MAJOR_VERSION}.dll"; then \
 	    (cd ${TOP_DIR}/win; ${MAKE} winextensions); \
 	fi
 	rm -f $@
 	@MAKE_STUB_LIB@
 
@@ -802,12 +802,12 @@
 		fi; \
 	    done;
 	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
 	@@INSTALL_LIB@
 	@chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
-	@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
-	@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
+	@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(MAJOR_VERSION)${EXE_SUFFIX}"
+	@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(MAJOR_VERSION)${EXE_SUFFIX}"
 	@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
 	@$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)/tclConfig.sh"
 	@echo "Installing tclooConfig.sh to $(CONFIG_INSTALL_DIR)/"
 	@$(INSTALL_DATA) $(UNIX_DIR)/tclooConfig.sh \
 		"$(CONFIG_INSTALL_DIR)/tclooConfig.sh"
@@ -827,17 +827,25 @@
 		echo "Making directory $$i"; \
 		$(INSTALL_DATA_DIR) "$$i"; \
 		else true; \
 		fi; \
 	    done;
-	@for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4  ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6; \
+	@for i in opt0.4 http1.0 encoding; \
 	    do \
 	    if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
 		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
 		$(INSTALL_DATA_DIR) "$(SCRIPT_INSTALL_DIR)"/$$i; \
 		else true; \
 		fi; \
+	    done;
+	@for i in tcl8 tcl8/8.4 tcl8/8.4/platform tcl8/8.5 tcl8/8.6; \
+	    do \
+	    if [ ! -d "$(LIB_INSTALL_DIR)"/$$i ] ; then \
+		echo "Making directory $(LIB_INSTALL_DIR)/$$i"; \
+		$(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)"/$$i; \
+		else true; \
+		fi; \
 	    done;
 	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)/";
 	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
 		$(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@; \
 	    do \
@@ -847,25 +855,25 @@
 	@for i in $(TOP_DIR)/library/http1.0/*.tcl ; \
 	    do \
 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
 	    done;
 	@echo "Installing package http 2.8.12 as a Tcl Module";
-	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.12.tm;
+	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.6/http-2.8.12.tm;
 	@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
 	@for i in $(TOP_DIR)/library/opt/*.tcl ; \
 	    do \
 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \
 	    done;
 	@echo "Installing package msgcat 1.6.1 as a Tcl Module";
-	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.6.1.tm;
-	@echo "Installing package tcltest 2.4.1 as a Tcl Module";
-	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.4.1.tm;
+	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/msgcat-1.6.1.tm;
+	@echo "Installing package tcltest 2.4.0 as a Tcl Module";
+	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/tcltest-2.4.1.tm;
 
 	@echo "Installing package platform 1.0.14 as a Tcl Module";
-	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.14.tm;
+	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform-1.0.14.tm;
 	@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
-	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm;
+	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform/shell-1.1.4.tm;
 
 	@echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
 	@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
 		$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \
 	done;
@@ -2103,11 +2111,11 @@
 # Note that for platforms where this is important, it is more common to use a
 # build of this HTML documentation that has already been placed online. As
 # such, this rule is not guaranteed to work well on all systems; it only needs
 # to function on those of the Tcl/Tk maintainers.
 #
-# Also note that the 8.6 tool build requires an installed 8.6 native Tcl
+# Also note that the 8.7 tool build requires an installed 8.7 native Tcl
 # interpreter in order to be able to run.
 #--------------------------------------------------------------------------
 
 html: ${NATIVE_TCLSH}
 	$(BUILD_HTML)

Index: unix/configure
==================================================================
--- unix/configure
+++ unix/configure
@@ -759,10 +759,11 @@
 with_encoding
 enable_shared
 enable_64bit
 enable_64bit_vis
 enable_rpath
+with_dbgx
 enable_corefoundation
 enable_load
 enable_symbols
 enable_langinfo
 enable_dll_unloading
@@ -1414,10 +1415,11 @@
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-encoding         encoding for configuration values (default:
                           iso8859-1)
+  --with-dbgx             debug extension for binaries
   --with-tzdata           install timezone data (default: autodetect)
 
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -2323,12 +2325,12 @@
 
 
 TCL_VERSION=8.7
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=7
-TCL_PATCH_LEVEL="a2"
-VERSION=${TCL_VERSION}
+TCL_PATCH_LEVEL=".0-alpha.2"
+VERSION=${TCL_MAJOR_VERSION}
 
 EXTRA_INSTALL_BINARIES=${EXTRA_INSTALL_BINARIES:-"@:"}
 EXTRA_BUILD_HTML=${EXTRA_BUILD_HTML:-"@:"}
 
 #------------------------------------------------------------------------
@@ -4940,10 +4942,17 @@
     # Require ranlib early so we can override it in special cases below.
 
 
 
     # Step 3: set configuration options based on system name and version.
+
+
+# Check whether --with-dbgx was given.
+if test "${with_dbgx+set}" = set; then :
+  withval=$with_dbgx; with_dbgx=${withval}
+fi
+
 
     do64bit_ok=no
     # default to '{$LIBS}' and set to "" on per-platform necessary basis
     SHLIB_LD_LIBS='${LIBS}'
     LDFLAGS_ORIG="$LDFLAGS"
@@ -4950,13 +4959,11 @@
     # When ld needs options to work in 64-bit mode, put them in
     # LDFLAGS_ARCH so they eventually end up in LDFLAGS even if [load]
     # is disabled by the user. [Bug 1016796]
     LDFLAGS_ARCH=""
     UNSHARED_LIB_SUFFIX=""
-    TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
     ECHO_VERSION='`echo ${VERSION}`'
-    TCL_LIB_VERSIONS_OK=ok
     CFLAGS_DEBUG=-g
     if test "$GCC" = yes; then :
 
 	CFLAGS_OPTIMIZE=-O2
 	CFLAGS_WARNING="-Wall -Wwrite-strings -Wsign-compare -Wdeclaration-after-statement"
@@ -5234,11 +5241,11 @@
 	    PLAT_SRCS='${CYGWIN_SRCS}'
 	    DL_LIBS="-ldl"
 	    CC_SEARCH_FLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    TCL_NEEDS_EXP_FILE=1
-	    TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.dll.a'
+	    TCL_EXPORT_FILE_SUFFIX='${VERSION}${with_dbgx}.dll.a'
 	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$@.a"
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Cygwin version of gcc" >&5
 $as_echo_n "checking for Cygwin version of gcc... " >&6; }
 if ${ac_cv_cygwin+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -5727,12 +5734,11 @@
 		LIBS=`echo $LIBS | sed s/-lpthread//`
 		CFLAGS="$CFLAGS -pthread"
 
 fi
 	    # OpenBSD doesn't do version numbers with dots.
-	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-	    TCL_LIB_VERSIONS_OK=nodots
+	    UNSHARED_LIB_SUFFIX='${TCL_MAJOR_VERSION}${with_dbgx}.a'
 	    ;;
 	NetBSD-*)
 	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
 	    SHLIB_CFLAGS="-fPIC"
 	    SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
@@ -5776,14 +5782,12 @@
 		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
 fi
 	    case $system in
 	    FreeBSD-3.*)
 		# Version numbers are dot-stripped by system policy.
-		TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
-		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
-		TCL_LIB_VERSIONS_OK=nodots
+		UNSHARED_LIB_SUFFIX='${TCL_MAJOR_VERSION}${with_dbgx}.a'
+		SHARED_LIB_SUFFIX='${TCL_MAJOR_VERSION}${with_dbgx}.so'
 		;;
 	    esac
 	    ;;
 	Darwin-*)
 	    CFLAGS_OPTIMIZE="-Os"
@@ -6517,15 +6521,15 @@
 
 fi
 
     if test "$SHARED_LIB_SUFFIX" = ""; then :
 
-	SHARED_LIB_SUFFIX='${VERSION}${SHLIB_SUFFIX}'
+	SHARED_LIB_SUFFIX='${TCL_MAJOR_VERSION}${with_dbgx}${SHLIB_SUFFIX}'
 fi
     if test "$UNSHARED_LIB_SUFFIX" = ""; then :
 
-	UNSHARED_LIB_SUFFIX='${VERSION}.a'
+	UNSHARED_LIB_SUFFIX='${TCL_MAJOR_VERSION}${with_dbgx}.a'
 fi
     DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)"
 
     if test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""; then :
 
@@ -6669,11 +6673,10 @@
 else
   tcl_ok=no
 fi
 
 # FIXME: Currently, LDFLAGS_DEFAULT is not used, it should work like CFLAGS_DEFAULT.
-    DBGX=""
     if test "$tcl_ok" = "no"; then
 	CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)'
 	LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)'
 
 $as_echo "#define NDEBUG 1" >>confdefs.h
@@ -10184,15 +10187,15 @@
 TCL_SHARED_LIB_SUFFIX=${SHARED_LIB_SUFFIX}
 eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
 
 # tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
 # since on some platforms TCL_LIB_FILE contains shell escapes.
-# (See also: TCL_TRIM_DOTS).
+# (See also: TCL_TRIM_DOTS, which is deprecated).
 
 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
 
-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
+TCL_LIBRARY='$(prefix)/share/tcl$(MAJOR_VERSION)'
 PRIVATE_INCLUDE_DIR='$(includedir)'
 HTML_DIR='$(DISTDIR)/html'
 
 # Note:  in the following variable, it's important to use the absolute
 # path name of the Tcl directory rather than "..":  this is because
@@ -10291,15 +10294,11 @@
 else
     # libdir must be a fully qualified path and not ${exec_prefix}/lib
     eval libdir="$libdir"
     # default install directory for bundled packages
     PACKAGE_DIR="$libdir"
-    if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-        TCL_LIB_FLAG="-ltcl${TCL_VERSION}"
-    else
-        TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`"
-    fi
+    TCL_LIB_FLAG="-ltcl${TCL_MAJOR_VERSION}${with_dbgx}"
     TCL_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_LIB_FLAG}"
     TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}"
 fi
 VERSION='${VERSION}'
 eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}"
@@ -10327,22 +10326,17 @@
 #--------------------------------------------------------------------
 #       The statements below define various symbols relating to Tcl
 #       stub support.
 #--------------------------------------------------------------------
 
-# Replace ${VERSION} with contents of ${TCL_VERSION}
-# double-eval to account for TCL_TRIM_DOTS.
+# Replace ${VERSION} with contents of ${TCL_MAJOR_VERSION}
 #
 eval "TCL_STUB_LIB_FILE=libtclstub${TCL_UNSHARED_LIB_SUFFIX}"
 eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
 eval "TCL_STUB_LIB_DIR=${libdir}"
 
-if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-    TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}"
-else
-    TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`"
-fi
+TCL_STUB_LIB_FLAG="-ltclstub${TCL_MAJOR_VERSION}${with_dbgx}"
 
 TCL_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_STUB_LIB_FLAG}"
 TCL_STUB_LIB_SPEC="-L${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}"
 TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
 TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}"

Index: unix/configure.ac
==================================================================
--- unix/configure.ac
+++ unix/configure.ac
@@ -2,11 +2,11 @@
 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([tcl],[8.7])
-AC_PREREQ(2.69)
+AC_PREREQ(2.59)
 
 dnl This is only used when included from macosx/configure.ac
 m4_ifdef([SC_USE_CONFIG_HEADERS], [
     AC_CONFIG_HEADERS([tclConfig.h:../unix/tclConfig.h.in])
     AC_CONFIG_COMMANDS_PRE([DEFS="-DHAVE_TCL_CONFIG_H  -imacros tclConfig.h"])
@@ -23,12 +23,12 @@
 ])
 
 TCL_VERSION=8.7
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=7
-TCL_PATCH_LEVEL="a2"
-VERSION=${TCL_VERSION}
+TCL_PATCH_LEVEL=".0-alpha.2"
+VERSION=${TCL_MAJOR_VERSION}
 
 EXTRA_INSTALL_BINARIES=${EXTRA_INSTALL_BINARIES:-"@:"}
 EXTRA_BUILD_HTML=${EXTRA_BUILD_HTML:-"@:"}
 
 #------------------------------------------------------------------------
@@ -817,15 +817,15 @@
 TCL_SHARED_LIB_SUFFIX=${SHARED_LIB_SUFFIX}
 eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
 
 # tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
 # since on some platforms TCL_LIB_FILE contains shell escapes.
-# (See also: TCL_TRIM_DOTS).
+# (See also: TCL_TRIM_DOTS, which is deprecated).
 
 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
 
-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
+TCL_LIBRARY='$(prefix)/share/tcl$(MAJOR_VERSION)'
 PRIVATE_INCLUDE_DIR='$(includedir)'
 HTML_DIR='$(DISTDIR)/html'
 
 # Note:  in the following variable, it's important to use the absolute
 # path name of the Tcl directory rather than "..":  this is because
@@ -888,15 +888,11 @@
 else
     # libdir must be a fully qualified path and not ${exec_prefix}/lib
     eval libdir="$libdir"
     # default install directory for bundled packages
     PACKAGE_DIR="$libdir"
-    if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-        TCL_LIB_FLAG="-ltcl${TCL_VERSION}"
-    else
-        TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`"
-    fi
+    TCL_LIB_FLAG="-ltcl${TCL_MAJOR_VERSION}${with_dbgx}"
     TCL_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_LIB_FLAG}"
     TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}"
 fi
 VERSION='${VERSION}'
 eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}"
@@ -924,22 +920,17 @@
 #--------------------------------------------------------------------
 #       The statements below define various symbols relating to Tcl
 #       stub support.
 #--------------------------------------------------------------------
 
-# Replace ${VERSION} with contents of ${TCL_VERSION}
-# double-eval to account for TCL_TRIM_DOTS.
+# Replace ${VERSION} with contents of ${TCL_MAJOR_VERSION}
 #
 eval "TCL_STUB_LIB_FILE=libtclstub${TCL_UNSHARED_LIB_SUFFIX}"
 eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
 eval "TCL_STUB_LIB_DIR=${libdir}"
 
-if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-    TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}"
-else
-    TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`"
-fi
+TCL_STUB_LIB_FLAG="-ltclstub${TCL_MAJOR_VERSION}${with_dbgx}"
 
 TCL_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_STUB_LIB_FLAG}"
 TCL_STUB_LIB_SPEC="-L${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}"
 TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
 TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}"

Index: unix/tcl.m4
==================================================================
--- unix/tcl.m4
+++ unix/tcl.m4
@@ -734,11 +734,10 @@
     AC_ARG_ENABLE(symbols,
 	AC_HELP_STRING([--enable-symbols],
 	    [build with debugging symbols (default: off)]),
 	[tcl_ok=$enableval], [tcl_ok=no])
 # FIXME: Currently, LDFLAGS_DEFAULT is not used, it should work like CFLAGS_DEFAULT.
-    DBGX=""
     if test "$tcl_ok" = "no"; then
 	CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)'
 	LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)'
 	AC_DEFINE(NDEBUG, 1, [Is no debugging enabled?])
 	AC_MSG_RESULT([no])
@@ -1070,22 +1069,22 @@
 
     AC_REQUIRE([AC_PROG_RANLIB])
 
     # Step 3: set configuration options based on system name and version.
 
+    AC_ARG_WITH(dbgx, [  --with-dbgx             debug extension for binaries], with_dbgx=${withval})
+
     do64bit_ok=no
     # default to '{$LIBS}' and set to "" on per-platform necessary basis
     SHLIB_LD_LIBS='${LIBS}'
     LDFLAGS_ORIG="$LDFLAGS"
     # When ld needs options to work in 64-bit mode, put them in
     # LDFLAGS_ARCH so they eventually end up in LDFLAGS even if [load]
     # is disabled by the user. [Bug 1016796]
     LDFLAGS_ARCH=""
     UNSHARED_LIB_SUFFIX=""
-    TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
     ECHO_VERSION='`echo ${VERSION}`'
-    TCL_LIB_VERSIONS_OK=ok
     CFLAGS_DEBUG=-g
     AS_IF([test "$GCC" = yes], [
 	CFLAGS_OPTIMIZE=-O2
 	CFLAGS_WARNING="-Wall -Wwrite-strings -Wsign-compare -Wdeclaration-after-statement"
     ], [
@@ -1205,11 +1204,11 @@
 	    PLAT_SRCS='${CYGWIN_SRCS}'
 	    DL_LIBS="-ldl"
 	    CC_SEARCH_FLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    TCL_NEEDS_EXP_FILE=1
-	    TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.dll.a'
+	    TCL_EXPORT_FILE_SUFFIX='${VERSION}${with_dbgx}.dll.a'
 	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$[@].a"
 	    AC_CACHE_CHECK(for Cygwin version of gcc,
 		ac_cv_cygwin,
 		AC_TRY_COMPILE([
 		#ifdef __CYGWIN__
@@ -1459,12 +1458,11 @@
 		#		Don't link with -lpthread
 		LIBS=`echo $LIBS | sed s/-lpthread//`
 		CFLAGS="$CFLAGS -pthread"
 	    ])
 	    # OpenBSD doesn't do version numbers with dots.
-	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-	    TCL_LIB_VERSIONS_OK=nodots
+	    UNSHARED_LIB_SUFFIX='${TCL_MAJOR_VERSION}${with_dbgx}.a'
 	    ;;
 	NetBSD-*)
 	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
 	    SHLIB_CFLAGS="-fPIC"
 	    SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
@@ -1500,14 +1498,12 @@
 		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"])
 	    case $system in
 	    FreeBSD-3.*)
 		# Version numbers are dot-stripped by system policy.
-		TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
-		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
-		TCL_LIB_VERSIONS_OK=nodots
+		UNSHARED_LIB_SUFFIX='${TCL_MAJOR_VERSION}${with_dbgx}.a'
+		SHARED_LIB_SUFFIX='${TCL_MAJOR_VERSION}${with_dbgx}.so'
 		;;
 	    esac
 	    ;;
 	Darwin-*)
 	    CFLAGS_OPTIMIZE="-Os"
@@ -1924,13 +1920,13 @@
 	AC_DEFINE(MODULE_SCOPE, [extern],
 	    [No Compiler support for module scope symbols])
     ])
 
     AS_IF([test "$SHARED_LIB_SUFFIX" = ""], [
-	SHARED_LIB_SUFFIX='${VERSION}${SHLIB_SUFFIX}'])
+	SHARED_LIB_SUFFIX='${TCL_MAJOR_VERSION}${with_dbgx}${SHLIB_SUFFIX}'])
     AS_IF([test "$UNSHARED_LIB_SUFFIX" = ""], [
-	UNSHARED_LIB_SUFFIX='${VERSION}.a'])
+	UNSHARED_LIB_SUFFIX='${TCL_MAJOR_VERSION}${with_dbgx}.a'])
     DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)"
 
     AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [
         LIB_SUFFIX=${SHARED_LIB_SUFFIX}
         MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'

Index: unix/tcl.spec
==================================================================
--- unix/tcl.spec
+++ unix/tcl.spec
@@ -2,11 +2,11 @@
 
 %{!?directory:%define directory /usr/local}
 
 Name:          tcl
 Summary:       Tcl scripting language development environment
-Version:       8.7a2
+Version:       8.7.0-alpha.2
 Release:       2
 License:       BSD
 Group:         Development/Languages
 Source:        http://prdownloads.sourceforge.net/tcl/tcl%{version}-src.tar.gz
 URL:           http://www.tcl.tk/

Index: unix/tclConfig.sh.in
==================================================================
--- unix/tclConfig.sh.in
+++ unix/tclConfig.sh.in
@@ -21,10 +21,11 @@
 # -D flags for use with the C compiler.
 TCL_DEFS='@DEFS@'
 
 # TCL_DBGX used to be used to distinguish debug vs. non-debug builds.
 # This was a righteous pain so the core doesn't do that any more.
+# DEPRECATED, will be removed in Tcl 9!
 TCL_DBGX=
 
 # Default flags used in an optimized and debuggable build, respectively.
 TCL_CFLAGS_DEBUG='@CFLAGS_DEBUG@'
 TCL_CFLAGS_OPTIMIZE='@CFLAGS_OPTIMIZE@'
@@ -111,11 +112,11 @@
 TCL_INCLUDE_SPEC='@TCL_INCLUDE_SPEC@'
 
 # Indicates whether a version numbers should be used in -l switches
 # ("ok" means it's safe to use switches like -ltcl7.5;  "nodots" means
 # use switches like -ltcl75).  SunOS and FreeBSD require "nodots", for
-# example.
+# example. DEPRECATED, will be removed in Tcl 9!
 TCL_LIB_VERSIONS_OK='@TCL_LIB_VERSIONS_OK@'
 
 # String that can be evaluated to generate the part of a shared library
 # name that comes after the "libxxx" (includes version number, if any,
 # extension, and anything else needed).  May depend on the variables

Index: unix/tclUnixInit.c
==================================================================
--- unix/tclUnixInit.c
+++ unix/tclUnixInit.c
@@ -486,11 +486,11 @@
 	 * Initialize the substrings used when locating an executable. The
 	 * installLib variable computes the path as though the executable is
 	 * installed.
 	 */
 
-	sprintf(installLib, "lib/tcl%s", TCL_VERSION);
+	sprintf(installLib, "lib/tcl%d", TCL_MAJOR_VERSION);
 
 	/*
 	 * If TCL_LIBRARY is set, search there.
 	 */
 

Index: win/Makefile.in
==================================================================
--- win/Makefile.in
+++ win/Makefile.in
@@ -32,11 +32,11 @@
 INSTALL_ROOT	=
 
 # Directory from which applications will reference the library of Tcl scripts
 # (note: you can set the TCL_LIBRARY environment variable at run-time to
 # override this value):
-TCL_LIBRARY	= $(prefix)/lib/tcl$(VERSION)
+TCL_LIBRARY	= $(prefix)/share/tcl$(VER)
 
 # Path to use at runtime to refer to LIB_INSTALL_DIR:
 LIB_RUNTIME_DIR		= $(libdir)
 
 # Directory in which to install the program tclsh:
@@ -64,13 +64,10 @@
 MAN3_INSTALL_DIR = $(MAN_INSTALL_DIR)/man3
 
 # Directory in which to install manual entries for the built-in Tcl commands:
 MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/mann
 
-# Libraries built with optimization switches have this additional extension
-TCL_DBGX = @TCL_DBGX@
-
 # warning flags
 CFLAGS_WARNING = @CFLAGS_WARNING@
 
 # The default switches for optimization or debugging
 CFLAGS_DEBUG    = @CFLAGS_DEBUG@
@@ -128,16 +125,13 @@
 LIBRARY_DIR             = $(shell $(CYGPATH) '$(LIBRARY_DIR1)')
 DLLSUFFIX		= @DLLSUFFIX@
 LIBSUFFIX		= @LIBSUFFIX@
 EXESUFFIX		= @EXESUFFIX@
 
-VER			= @TCL_MAJOR_VERSION@@TCL_MINOR_VERSION@
-DOTVER			= @TCL_MAJOR_VERSION@.@TCL_MINOR_VERSION@
-DDEVER			= @TCL_DDE_MAJOR_VERSION@@TCL_DDE_MINOR_VERSION@
-DDEDOTVER		= @TCL_DDE_MAJOR_VERSION@.@TCL_DDE_MINOR_VERSION@
-REGVER			= @TCL_REG_MAJOR_VERSION@@TCL_REG_MINOR_VERSION@
-REGDOTVER		= @TCL_REG_MAJOR_VERSION@.@TCL_REG_MINOR_VERSION@
+VER				= @TCL_MAJOR_VERSION@
+DDEVER			= @TCL_DDE_MAJOR_VERSION@
+REGVER			= @TCL_REG_MAJOR_VERSION@
 
 TCL_STUB_LIB_FILE	= @TCL_STUB_LIB_FILE@
 TCL_DLL_FILE		= @TCL_DLL_FILE@
 TCL_LIB_FILE		= @TCL_LIB_FILE@
 DDE_DLL_FILE		= tcldde$(DDEVER)${DLLSUFFIX}
@@ -575,11 +569,11 @@
 		$(MKDIR) $$i; \
 		chmod 755 $$i; \
 		else true; \
 		fi; \
 	    done;
-	@for i in dde${DDEDOTVER} reg${REGDOTVER}; \
+	@for i in tcl8 tcl8/dde${DDEVER} tcl8/reg${REGVER}; \
 	    do \
 	    if [ ! -d $(LIB_INSTALL_DIR)/$$i ] ; then \
 		echo "Making directory $(LIB_INSTALL_DIR)/$$i"; \
 		$(MKDIR) $(LIB_INSTALL_DIR)/$$i; \
 		else true; \
@@ -599,27 +593,27 @@
 		$(COPY) $$i "$(LIB_INSTALL_DIR)"; \
 	    fi; \
 	    done
 	@if [ -f $(DDE_DLL_FILE) ]; then \
 	    echo Installing $(DDE_DLL_FILE); \
-	    $(COPY) $(DDE_DLL_FILE) $(LIB_INSTALL_DIR)/dde${DDEDOTVER}; \
+	    $(COPY) $(DDE_DLL_FILE) $(LIB_INSTALL_DIR)/tcl8/dde${DDEVER}; \
 	    $(COPY) $(ROOT_DIR)/library/dde/pkgIndex.tcl \
-		$(LIB_INSTALL_DIR)/dde${DDEDOTVER}; \
+		$(LIB_INSTALL_DIR)/tcl8/dde${DDEVER}; \
 	    fi
 	@if [ -f $(DDE_LIB_FILE) ]; then \
 	    echo Installing $(DDE_LIB_FILE); \
-	    $(COPY) $(DDE_LIB_FILE) $(LIB_INSTALL_DIR)/dde${DDEDOTVER}; \
+	    $(COPY) $(DDE_LIB_FILE) $(LIB_INSTALL_DIR)/tcl8/dde${DDEVER}; \
 	    fi
 	@if [ -f $(REG_DLL_FILE) ]; then \
 	    echo Installing $(REG_DLL_FILE); \
-	    $(COPY) $(REG_DLL_FILE) $(LIB_INSTALL_DIR)/reg${REGDOTVER}; \
+	    $(COPY) $(REG_DLL_FILE) $(LIB_INSTALL_DIR)/tcl8/reg${REGVER}; \
 	    $(COPY) $(ROOT_DIR)/library/reg/pkgIndex.tcl \
-		$(LIB_INSTALL_DIR)/reg${REGDOTVER}; \
+		$(LIB_INSTALL_DIR)/tcl8/reg${REGVER}; \
 	    fi
 	@if [ -f $(REG_LIB_FILE) ]; then \
 	    echo Installing $(REG_LIB_FILE); \
-	    $(COPY) $(REG_LIB_FILE) $(LIB_INSTALL_DIR)/reg${REGDOTVER}; \
+	    $(COPY) $(REG_LIB_FILE) $(LIB_INSTALL_DIR)/tcl8/reg${REGVER}; \
 	    fi
 
 install-libraries: libraries install-tzdata install-msgs
 	@for i in "$$($(CYGPATH) $(prefix)/lib)" "$(INCLUDE_INSTALL_DIR)" \
 		$(SCRIPT_INSTALL_DIR); \
@@ -628,11 +622,11 @@
 		echo "Making directory $$i"; \
 		$(MKDIR) $$i; \
 		else true; \
 		fi; \
 	    done;
-	@for i in http1.0 opt0.4 encoding ../tcl8 ../tcl8/8.4  ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6; \
+	@for i in http1.0 opt0.4 encoding platform; \
 	    do \
 	    if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
 		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
 		$(MKDIR) $(SCRIPT_INSTALL_DIR)/$$i; \
 		else true; \
@@ -656,24 +650,24 @@
 	@for j in $(ROOT_DIR)/library/http1.0/*.tcl; \
 	    do \
 	    $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/http1.0"; \
 	    done;
 	@echo "Installing package http 2.8.12 as a Tcl Module";
-	@$(COPY) $(ROOT_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.6/http-2.8.12.tm;
+	@$(COPY) $(ROOT_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/http-2.8.12.tm;
 	@echo "Installing library opt0.4 directory";
 	@for j in $(ROOT_DIR)/library/opt/*.tcl; \
 	    do \
 	    $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/opt0.4"; \
 	    done;
 	@echo "Installing package msgcat 1.6.1 as a Tcl Module";
-	@$(COPY) $(ROOT_DIR)/library/msgcat/msgcat.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/msgcat-1.6.1.tm;
-	@echo "Installing package tcltest 2.4.0 as a Tcl Module";
-	@$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/tcltest-2.4.0.tm;
+	@$(COPY) $(ROOT_DIR)/library/msgcat/msgcat.tcl $(SCRIPT_INSTALL_DIR)/msgcat-1.6.1.tm;
+	@echo "Installing package tcltest 2.4.1 as a Tcl Module";
+	@$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/tcltest-2.4.1.tm;
 	@echo "Installing package platform 1.0.14 as a Tcl Module";
-	@$(COPY) $(ROOT_DIR)/library/platform/platform.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform-1.0.14.tm;
+	@$(COPY) $(ROOT_DIR)/library/platform/platform.tcl $(SCRIPT_INSTALL_DIR)/platform-1.0.14.tm;
 	@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
-	@$(COPY) $(ROOT_DIR)/library/platform/shell.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform/shell-1.1.4.tm;
+	@$(COPY) $(ROOT_DIR)/library/platform/shell.tcl $(SCRIPT_INSTALL_DIR)/platform/shell-1.1.4.tm;
 	@echo "Installing encodings";
 	@for i in $(ROOT_DIR)/library/encoding/*.enc ; do \
 		$(COPY) "$$i" "$(SCRIPT_INSTALL_DIR)/encoding"; \
 	done;
 

Index: win/README
==================================================================
--- win/README
+++ win/README
@@ -77,13 +77,13 @@
 
 Use the Makefile "install" target to install Tcl.  It will install it
 according to the prefix options you provided in the correct directory
 structure.
 
-Note that in order to run tclsh87.exe, you must ensure that tcl87.dll is
+Note that in order to run tclsh8.exe, you must ensure that tcl8.dll is
 on your path, in the system directory, or in the directory containing
-tclsh87.exe.
+tclsh8.exe.
 
 Note: Tcl no longer provides support for Win32s.
 
 3. Test suite
 -------------

Index: win/configure
==================================================================
--- win/configure
+++ win/configure
@@ -765,10 +765,11 @@
 enable_option_checking
 enable_threads
 with_encoding
 enable_shared
 enable_64bit
+with_dbgx
 enable_symbols
 enable_embedded_manifest
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1395,10 +1396,11 @@
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-encoding         encoding for configuration values
+  --with-dbgx             debug extension for binaries
 
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
@@ -2095,12 +2097,12 @@
 SHELL=/bin/sh
 
 TCL_VERSION=8.7
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=7
-TCL_PATCH_LEVEL="a2"
-VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
+TCL_PATCH_LEVEL=".0-alpha.2"
+VER=$TCL_MAJOR_VERSION
 
 TCL_DDE_VERSION=1.4
 TCL_DDE_MAJOR_VERSION=1
 TCL_DDE_MINOR_VERSION=4
 DDEVER=$TCL_DDE_MAJOR_VERSION$TCL_DDE_MINOR_VERSION
@@ -3848,10 +3850,17 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
+
+
+# Check whether --with-dbgx was given.
+if test "${with_dbgx+set}" = set; then :
+  withval=$with_dbgx; with_dbgx=${withval}
+fi
+
 
     SHLIB_SUFFIX=".dll"
 
     # MACHINE is IX86 for LINK, but this is used by the manifest,
     # which requires x86|amd64|ia64.
@@ -4097,11 +4106,11 @@
 	    # static
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: using static flags" >&5
 $as_echo "using static flags" >&6; }
 	    runtime=
 	    LIBRARIES="\${STATIC_LIBRARIES}"
-	    EXESUFFIX="s\${DBGX}.exe"
+	    EXESUFFIX="${with_dbgx}.exe"
 	else
 	    # dynamic
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: using shared flags" >&5
 $as_echo "using shared flags" >&6; }
 
@@ -4112,11 +4121,11 @@
 	    fi
 
 	    runtime=
 	    # Add SHLIB_LD_LIBS to the Make rule, not here.
 
-	    EXESUFFIX="\${DBGX}.exe"
+	    EXESUFFIX="${with_dbgx}.exe"
 	    LIBRARIES="\${SHARED_LIBRARIES}"
 	fi
 	# Link with gcc since ld does not link to default libs like
 	# -luser32 and -lmsvcrt by default.
 	SHLIB_LD='${CC} -shared'
@@ -4123,13 +4132,13 @@
 	SHLIB_LD_LIBS='${LIBS}'
 	MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -o \$@ ${extra_ldflags} \
 	    -Wl,--out-implib,\$(patsubst %.dll,lib%.a,\$@)"
 	# DLLSUFFIX is separate because it is the building block for
 	# users of tclConfig.sh that may build shared or static.
-	DLLSUFFIX="\${DBGX}.dll"
-	LIBSUFFIX="\${DBGX}.a"
-	LIBFLAGSUFFIX="\${DBGX}"
+	DLLSUFFIX="${with_dbgx}.dll"
+	LIBSUFFIX="${with_dbgx}.a"
+	LIBFLAGSUFFIX="${with_dbgx}"
 	SHLIB_SUFFIX=.dll
 
 	EXTRA_CFLAGS="${extra_cflags}"
 
 	CFLAGS_DEBUG=-g
@@ -4206,19 +4215,19 @@
 	    # static
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: using static flags" >&5
 $as_echo "using static flags" >&6; }
 	    runtime=-MT
 	    LIBRARIES="\${STATIC_LIBRARIES}"
-	    EXESUFFIX="s\${DBGX}.exe"
+	    EXESUFFIX="${with_dbgx}.exe"
 	else
 	    # dynamic
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: using shared flags" >&5
 $as_echo "using shared flags" >&6; }
 	    runtime=-MD
 	    # Add SHLIB_LD_LIBS to the Make rule, not here.
 	    LIBRARIES="\${SHARED_LIBRARIES}"
-	    EXESUFFIX="\${DBGX}.exe"
+	    EXESUFFIX="${with_dbgx}.exe"
 	    case "x`echo \${VisualStudioVersion}`" in
 		x1[4-9]*)
 		    lflags="${lflags} -nodefaultlib:libucrt.lib"
 		    ;;
 		*)
@@ -4226,13 +4235,13 @@
 	    esac
 	fi
 	MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -out:\$@"
 	# DLLSUFFIX is separate because it is the building block for
 	# users of tclConfig.sh that may build shared or static.
-	DLLSUFFIX="\${DBGX}.dll"
-	LIBSUFFIX="\${DBGX}.lib"
-	LIBFLAGSUFFIX="\${DBGX}"
+	DLLSUFFIX="${with_dbgx}.dll"
+	LIBSUFFIX="${with_dbgx}.lib"
+	LIBFLAGSUFFIX="${with_dbgx}"
 
 	# This is a 2-stage check to make sure we have the 64-bit SDK
 	# We have to know where the SDK is installed.
 	# This magic is based on MS Platform SDK for Win2003 SP1 - hobbs
 	if test "$do64bit" != "no" ; then
@@ -4882,11 +4891,10 @@
 
 # FIXME: Currently, LDFLAGS_DEFAULT is not used, it should work like CFLAGS_DEFAULT.
     if test "$tcl_ok" = "no"; then
 	CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)'
 	LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)'
-	DBGX=""
 
 $as_echo "#define NDEBUG 1" >>confdefs.h
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -4894,11 +4902,10 @@
 	$as_echo "#define TCL_CFG_OPTIMIZED 1" >>confdefs.h
 
     else
 	CFLAGS_DEFAULT='$(CFLAGS_DEBUG)'
 	LDFLAGS_DEFAULT='$(LDFLAGS_DEBUG)'
-	DBGX=g
 	if test "$tcl_ok" = "yes"; then
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (standard debugging)" >&5
 $as_echo "yes (standard debugging)" >&6; }
 	fi
     fi
@@ -4929,11 +4936,11 @@
 $as_echo "enabled $tcl_ok debugging" >&6; }
 	fi
     fi
 
 
-TCL_DBGX=${DBGX}
+TCL_DBGX=""
 
 #--------------------------------------------------------------------
 # Embed the manifest if we can determine how
 #--------------------------------------------------------------------
 
@@ -5034,21 +5041,13 @@
 # Adjust the defines for how the resources are built depending
 # on symbols and static vs. shared.
 #--------------------------------------------------------------------
 
 if test ${SHARED_BUILD} = 0 ; then
-    if test "${DBGX}" = "g"; then
-        RC_DEFINES="${RC_DEFINE} STATIC_BUILD ${RC_DEFINE} DEBUG"
-    else
-        RC_DEFINES="${RC_DEFINE} STATIC_BUILD"
-    fi
-else
-    if test "${DBGX}" = "g"; then
-        RC_DEFINES="${RC_DEFINE} DEBUG"
-    else
-        RC_DEFINES=""
-    fi
+    RC_DEFINES="${RC_DEFINE} STATIC_BUILD"
+else
+    RC_DEFINES=""
 fi
 
 #--------------------------------------------------------------------
 #	The statements below define the symbol TCL_PACKAGE_PATH, which
 #	gives a list of directories that may contain packages.  The list
@@ -5064,15 +5063,15 @@
 
 # The tclsh.exe.manifest requires these
 # TCL_WIN_VERSION is the 4 dotted pair Windows version format which needs
 # the release level, and must account for interim release versioning
 case "$TCL_PATCH_LEVEL" in
-     *a*) TCL_RELEASE_LEVEL=0 ;;
-     *b*) TCL_RELEASE_LEVEL=1 ;;
+     *alpha*) TCL_RELEASE_LEVEL=0 ;;
+     *beta*) TCL_RELEASE_LEVEL=1 ;;
      *)   TCL_RELEASE_LEVEL=2 ;;
 esac
-TCL_WIN_VERSION="$TCL_VERSION.$TCL_RELEASE_LEVEL.`echo $TCL_PATCH_LEVEL | tr -d ab.`"
+TCL_WIN_VERSION="$TCL_VERSION.$TCL_RELEASE_LEVEL.0`echo $TCL_PATCH_LEVEL | tr -d 0abehlpt\\\\-.`"
 
 # X86|AMD64|IA64 for manifest
 
 
 

Index: win/configure.ac
==================================================================
--- win/configure.ac
+++ win/configure.ac
@@ -12,12 +12,12 @@
 SHELL=/bin/sh
 
 TCL_VERSION=8.7
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=7
-TCL_PATCH_LEVEL="a2"
-VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
+TCL_PATCH_LEVEL=".0-alpha.2"
+VER=$TCL_MAJOR_VERSION
 
 TCL_DDE_VERSION=1.4
 TCL_DDE_MAJOR_VERSION=1
 TCL_DDE_MINOR_VERSION=4
 DDEVER=$TCL_DDE_MAJOR_VERSION$TCL_DDE_MINOR_VERSION
@@ -266,11 +266,11 @@
 # after SC_CONFIG_CFLAGS macro is called.
 #--------------------------------------------------------------------
 
 SC_ENABLE_SYMBOLS
 
-TCL_DBGX=${DBGX}
+TCL_DBGX=""
 
 #--------------------------------------------------------------------
 # Embed the manifest if we can determine how
 #--------------------------------------------------------------------
 
@@ -322,21 +322,13 @@
 # Adjust the defines for how the resources are built depending
 # on symbols and static vs. shared.
 #--------------------------------------------------------------------
 
 if test ${SHARED_BUILD} = 0 ; then
-    if test "${DBGX}" = "g"; then
-        RC_DEFINES="${RC_DEFINE} STATIC_BUILD ${RC_DEFINE} DEBUG"
-    else
-        RC_DEFINES="${RC_DEFINE} STATIC_BUILD"
-    fi
-else
-    if test "${DBGX}" = "g"; then
-        RC_DEFINES="${RC_DEFINE} DEBUG"
-    else
-        RC_DEFINES=""
-    fi
+    RC_DEFINES="${RC_DEFINE} STATIC_BUILD"
+else
+    RC_DEFINES=""
 fi
 
 #--------------------------------------------------------------------
 #	The statements below define the symbol TCL_PACKAGE_PATH, which
 #	gives a list of directories that may contain packages.  The list
@@ -352,15 +344,15 @@
 
 # The tclsh.exe.manifest requires these
 # TCL_WIN_VERSION is the 4 dotted pair Windows version format which needs
 # the release level, and must account for interim release versioning
 case "$TCL_PATCH_LEVEL" in
-     *a*) TCL_RELEASE_LEVEL=0 ;;
-     *b*) TCL_RELEASE_LEVEL=1 ;;
+     *alpha*) TCL_RELEASE_LEVEL=0 ;;
+     *beta*) TCL_RELEASE_LEVEL=1 ;;
      *)   TCL_RELEASE_LEVEL=2 ;;
 esac
-TCL_WIN_VERSION="$TCL_VERSION.$TCL_RELEASE_LEVEL.`echo $TCL_PATCH_LEVEL | tr -d ab.`"
+TCL_WIN_VERSION="$TCL_VERSION.$TCL_RELEASE_LEVEL.0`echo $TCL_PATCH_LEVEL | tr -d 0abehlpt\\\\-.`"
 AC_SUBST(TCL_WIN_VERSION)
 # X86|AMD64|IA64 for manifest
 AC_SUBST(MACHINE)
 
 AC_SUBST(TCL_VERSION)

Index: win/makefile.vc
==================================================================
--- win/makefile.vc
+++ win/makefile.vc
@@ -78,11 +78,11 @@
 # the build configuration, macros, output directories etc.
 !include "rules.vc"
 
 # Tcl version info based on macros set up by rules.vc
 DOTVERSION      = $(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)
-VERSION         = $(TCL_MAJOR_VERSION)$(TCL_MINOR_VERSION)
+VERSION         = $(TCL_MAJOR_VERSION)
 
 # We need versions of various core packages to generate appropriate
 # file names during installation.
 !if [echo REM = This file is generated from makefile.vc > versions.vc]
 !endif
@@ -109,14 +109,14 @@
 !endif
 
 !include versions.vc
 
 DDEDOTVERSION = 1.4
-DDEVERSION = $(DDEDOTVERSION:.=)
+DDEVERSION = 1
 
 REGDOTVERSION = 1.3
-REGVERSION = $(REGDOTVERSION:.=)
+REGVERSION = 1
 
 TCLREGLIBNAME	= $(PROJECT)reg$(REGVERSION)$(SUFX:t=).$(EXT)
 TCLREGLIB	= $(OUT_DIR)\$(TCLREGLIBNAME)
 
 TCLDDELIBNAME	= $(PROJECT)dde$(DDEVERSION)$(SUFX:t=).$(EXT)
@@ -885,23 +885,23 @@
 !if $(STATIC_BUILD)
 !if !$(TCL_USE_STATIC_PACKAGES)
 	@$(CPY) "$(TCLDDELIB)" "$(LIB_INSTALL_DIR)\"
 !endif
 !else
-	@$(CPY) "$(TCLDDELIB)" "$(LIB_INSTALL_DIR)\dde$(DDEDOTVERSION)\"
+	@$(CPY) "$(TCLDDELIB)" "$(LIB_INSTALL_DIR)\dde$(DDEVERSION)\"
 	@$(CPY) "$(ROOT)\library\dde\pkgIndex.tcl" \
-	    "$(LIB_INSTALL_DIR)\dde$(DDEDOTVERSION)\"
+	    "$(LIB_INSTALL_DIR)\dde$(DDEVERSION)\"
 !endif
 	@echo Installing $(TCLREGLIBNAME)
 !if $(STATIC_BUILD)
 !if !$(TCL_USE_STATIC_PACKAGES)
 	@$(CPY) "$(TCLREGLIB)" "$(LIB_INSTALL_DIR)\"
 !endif
 !else
-	@$(CPY) "$(TCLREGLIB)" "$(LIB_INSTALL_DIR)\reg$(REGDOTVERSION)\"
+	@$(CPY) "$(TCLREGLIB)" "$(LIB_INSTALL_DIR)\reg$(REGVERSION)\"
 	@$(CPY) "$(ROOT)\library\reg\pkgIndex.tcl" \
-	    "$(LIB_INSTALL_DIR)\reg$(REGDOTVERSION)\"
+	    "$(LIB_INSTALL_DIR)\reg$(REGVERSION)\"
 !endif
 	@echo Installing encodings
 	@$(CPY) "$(ROOT)\library\encoding\*.enc" \
 		"$(SCRIPT_INSTALL_DIR)\encoding\"
 # "emacs font-lock highlighting fix

Index: win/rules.vc
==================================================================
--- win/rules.vc
+++ win/rules.vc
@@ -963,11 +963,11 @@
 # PRJLIB     - output path of generated project library
 # PRJSTUBLIBNAME - name of the generated project stubs library
 # PRJSTUBLIB - output path of the generated project stubs library
 # RESFILE - output resource file (only if not static build)
 
-SUFX	    = tsgx
+SUFX	    = sgx
 
 !if $(DEBUG)
 BUILDDIRTOP = Debug
 !else
 BUILDDIRTOP = Release
@@ -982,11 +982,11 @@
 
 !if !$(DEBUG) || $(DEBUG) && $(UNCHECKED)
 SUFX	    = $(SUFX:g=)
 !endif
 
-TMP_DIRFULL = .\$(BUILDDIRTOP)\$(PROJECT)_ThreadedDynamicStaticX
+TMP_DIRFULL = .\$(BUILDDIRTOP)\$(PROJECT)_DynamicStaticX
 
 !if !$(STATIC_BUILD)
 TMP_DIRFULL = $(TMP_DIRFULL:Static=)
 SUFX	    = $(SUFX:s=)
 EXT	    = dll
@@ -999,15 +999,10 @@
 TMP_DIRFULL = $(TMP_DIRFULL:X=)
 SUFX	    = $(SUFX:x=)
 !endif
 !endif
 
-!if !$(TCL_THREADS)
-TMP_DIRFULL = $(TMP_DIRFULL:Threaded=)
-SUFX	    = $(SUFX:t=)
-!endif
-
 !ifndef TMP_DIR
 TMP_DIR	    = $(TMP_DIRFULL)
 !ifndef OUT_DIR
 OUT_DIR	    = .\$(BUILDDIRTOP)
 !endif
@@ -1032,11 +1027,11 @@
 STUBPREFIX      = $(PROJECT)stub
 
 # Set up paths to various Tcl executables and libraries needed by extensions
 !if $(DOING_TCL)
 
-TCLSHNAME       = $(PROJECT)sh$(TCL_VERSION)$(SUFX).exe
+TCLSHNAME       = $(PROJECT)sh$(TCL_MAJOR_VERSION)$(SUFX).exe
 TCLSH		= $(OUT_DIR)\$(TCLSHNAME)
 TCLIMPLIB	= $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib
 TCLLIBNAME	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)
 TCLLIB		= $(OUT_DIR)\$(TCLLIBNAME)
 
@@ -1046,33 +1041,27 @@
 
 !else # ! $(DOING_TCL)
 
 !if $(TCLINSTALL) # Building against an installed Tcl
 
-TCLSH		= $(_TCLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX).exe
-!if !exist("$(TCLSH)") && $(TCL_THREADS)
-TCLSH           = $(_TCLDIR)\bin\tclsh$(TCL_VERSION)t$(SUFX).exe
-!endif
-TCLSTUBLIB	= $(_TCLDIR)\lib\tclstub$(TCL_VERSION).lib
-TCLIMPLIB	= $(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX).lib
+TCLSH		= $(_TCLDIR)\bin\tclsh$(TCL_MAJOR_VERSION)$(SUFX).exe
+TCLSTUBLIB	= $(_TCLDIR)\lib\tclstub$(TCL_MAJOR_VERSION).lib
+TCLIMPLIB	= $(_TCLDIR)\lib\tcl$(TCL_MAJOR_VERSION)$(SUFX).lib
 TCL_LIBRARY	= $(_TCLDIR)\lib
-TCLREGLIB	= $(_TCLDIR)\lib\tclreg13$(SUFX:t=).lib
-TCLDDELIB	= $(_TCLDIR)\lib\tcldde14$(SUFX:t=).lib
+TCLREGLIB	= $(_TCLDIR)\lib\tclreg1$(SUFX:t=).lib
+TCLDDELIB	= $(_TCLDIR)\lib\tcldde1$(SUFX:t=).lib
 TCLTOOLSDIR	= \must\have\tcl\sources\to\build\this\target
 TCL_INCLUDES    = -I"$(_TCLDIR)\include"
 
 !else # Building against Tcl sources
 
-TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)$(SUFX).exe
-!if !exist($(TCLSH)) && $(TCL_THREADS)
-TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)t$(SUFX).exe
-!endif
-TCLSTUBLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub$(TCL_VERSION).lib
-TCLIMPLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX).lib
+TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_MAJOR_VERSION)$(SUFX).exe
+TCLSTUBLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub$(TCL_MAJOR_VERSION).lib
+TCLIMPLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_MAJOR_VERSION)$(SUFX).lib
 TCL_LIBRARY	= $(_TCLDIR)\library
-TCLREGLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg13$(SUFX:t=).lib
-TCLDDELIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde14$(SUFX:t=).lib
+TCLREGLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg1.lib
+TCLDDELIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde1.lib
 TCLTOOLSDIR	= $(_TCLDIR)\tools
 TCL_INCLUDES	= -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win"
 
 !endif # TCLINSTALL
 

Index: win/tcl.dsp
==================================================================
--- win/tcl.dsp
+++ win/tcl.dsp
@@ -34,20 +34,20 @@
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "Release"
 # PROP BASE Intermediate_Dir "Release\tcl_Dynamic"
 # PROP BASE Cmd_Line "nmake -nologo -f makefile.vc OPTS=none MSVCDIR=IDE"
 # PROP BASE Rebuild_Opt "-a"
-# PROP BASE Target_File "Release\tclsh87.exe"
+# PROP BASE Target_File "Release\tclsh8.exe"
 # PROP BASE Bsc_Name ""
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "Release"
 # PROP Intermediate_Dir "Release\tcl_Dynamic"
 # PROP Cmd_Line "nmake -nologo -f makefile.vc OPTS=threads MSVCDIR=IDE"
 # PROP Rebuild_Opt "clean release"
-# PROP Target_File "Release\tclsh87t.exe"
+# PROP Target_File "Release\tclsh8.exe"
 # PROP Bsc_Name ""
 # PROP Target_Dir ""
 
 !ELSEIF  "$(CFG)" == "tcl - Win32 Debug"
 
@@ -55,20 +55,20 @@
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "Debug"
 # PROP BASE Intermediate_Dir "Debug\tcl_Dynamic"
 # PROP BASE Cmd_Line "nmake -nologo -f makefile.vc OPTS=symbols MSVCDIR=IDE"
 # PROP BASE Rebuild_Opt "-a"
-# PROP BASE Target_File "Debug\tclsh87g.exe"
+# PROP BASE Target_File "Debug\tclsh8.exe"
 # PROP BASE Bsc_Name ""
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "Debug"
 # PROP Intermediate_Dir "Debug\tcl_Dynamic"
 # PROP Cmd_Line "nmake -nologo -f makefile.vc OPTS=threads,symbols MSVCDIR=IDE"
 # PROP Rebuild_Opt "clean release"
-# PROP Target_File "Debug\tclsh87tg.exe"
+# PROP Target_File "Debug\tclsh8.exe"
 # PROP Bsc_Name ""
 # PROP Target_Dir ""
 
 !ELSEIF  "$(CFG)" == "tcl - Win32 Debug Static"
 
@@ -76,20 +76,20 @@
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "Debug"
 # PROP BASE Intermediate_Dir "Debug\tcl_Static"
 # PROP BASE Cmd_Line "nmake -nologo -f makefile.vc OPTS=symbols,static MSVCDIR=IDE"
 # PROP BASE Rebuild_Opt "-a"
-# PROP BASE Target_File "Debug\tclsh87sg.exe"
+# PROP BASE Target_File "Debug\tclsh8.exe"
 # PROP BASE Bsc_Name ""
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "Debug"
 # PROP Intermediate_Dir "Debug\tcl_Static"
 # PROP Cmd_Line "nmake -nologo -f makefile.vc OPTS=symbols,static MSVCDIR=IDE"
 # PROP Rebuild_Opt "-a"
-# PROP Target_File "Debug\tclsh87sg.exe"
+# PROP Target_File "Debug\tclsh8.exe"
 # PROP Bsc_Name ""
 # PROP Target_Dir ""
 
 !ELSEIF  "$(CFG)" == "tcl - Win32 Release Static"
 
@@ -97,20 +97,20 @@
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "Release"
 # PROP BASE Intermediate_Dir "Release\tcl_Static"
 # PROP BASE Cmd_Line "nmake -nologo -f makefile.vc OPTS=static MSVCDIR=IDE"
 # PROP BASE Rebuild_Opt "-a"
-# PROP BASE Target_File "Release\tclsh87s.exe"
+# PROP BASE Target_File "Release\tclsh8.exe"
 # PROP BASE Bsc_Name ""
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "Release"
 # PROP Intermediate_Dir "Release\tcl_Static"
 # PROP Cmd_Line "nmake -nologo -f makefile.vc OPTS=static MSVCDIR=IDE"
 # PROP Rebuild_Opt "-a"
-# PROP Target_File "Release\tclsh87s.exe"
+# PROP Target_File "Release\tclsh8.exe"
 # PROP Bsc_Name ""
 # PROP Target_Dir ""
 
 !ENDIF
 

Index: win/tcl.m4
==================================================================
--- win/tcl.m4
+++ win/tcl.m4
@@ -440,11 +440,10 @@
 #	Defines the following vars:
 #		CFLAGS_DEFAULT	Sets to $(CFLAGS_DEBUG) if true
 #				Sets to $(CFLAGS_OPTIMIZE) if false
 #		LDFLAGS_DEFAULT	Sets to $(LDFLAGS_DEBUG) if true
 #				Sets to $(LDFLAGS_OPTIMIZE) if false
-#		DBGX		Debug library extension
 #
 #------------------------------------------------------------------------
 
 AC_DEFUN([SC_ENABLE_SYMBOLS], [
     AC_MSG_CHECKING([for build with symbols])
@@ -451,19 +450,17 @@
     AC_ARG_ENABLE(symbols, [  --enable-symbols        build with debugging symbols (default: off)],    [tcl_ok=$enableval], [tcl_ok=no])
 # FIXME: Currently, LDFLAGS_DEFAULT is not used, it should work like CFLAGS_DEFAULT.
     if test "$tcl_ok" = "no"; then
 	CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)'
 	LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)'
-	DBGX=""
 	AC_DEFINE(NDEBUG, 1, [Is no debugging enabled?])
 	AC_MSG_RESULT([no])
 
 	AC_DEFINE(TCL_CFG_OPTIMIZED)
     else
 	CFLAGS_DEFAULT='$(CFLAGS_DEBUG)'
 	LDFLAGS_DEFAULT='$(LDFLAGS_DEBUG)'
-	DBGX=g
 	if test "$tcl_ok" = "yes"; then
 	    AC_MSG_RESULT([yes (standard debugging)])
 	fi
     fi
     AC_SUBST(CFLAGS_DEFAULT)
@@ -547,10 +544,12 @@
     # Set some defaults (may get changed below)
     EXTRA_CFLAGS=""
 	AC_DEFINE(MODULE_SCOPE, [extern], [No need to mark inidividual symbols as hidden])
 
     AC_CHECK_PROG(CYGPATH, cygpath, cygpath -m, echo)
+
+    AC_ARG_WITH(dbgx, [  --with-dbgx             debug extension for binaries], with_dbgx=${withval})
 
     SHLIB_SUFFIX=".dll"
 
     # MACHINE is IX86 for LINK, but this is used by the manifest,
     # which requires x86|amd64|ia64.
@@ -680,11 +679,11 @@
 	if test "${SHARED_BUILD}" = "0" ; then
 	    # static
             AC_MSG_RESULT([using static flags])
 	    runtime=
 	    LIBRARIES="\${STATIC_LIBRARIES}"
-	    EXESUFFIX="s\${DBGX}.exe"
+	    EXESUFFIX="${with_dbgx}.exe"
 	else
 	    # dynamic
             AC_MSG_RESULT([using shared flags])
 
 	    # ad-hoc check to see if CC supports -shared.
@@ -694,11 +693,11 @@
 	    fi
 
 	    runtime=
 	    # Add SHLIB_LD_LIBS to the Make rule, not here.
 
-	    EXESUFFIX="\${DBGX}.exe"
+	    EXESUFFIX="${with_dbgx}.exe"
 	    LIBRARIES="\${SHARED_LIBRARIES}"
 	fi
 	# Link with gcc since ld does not link to default libs like
 	# -luser32 and -lmsvcrt by default.
 	SHLIB_LD='${CC} -shared'
@@ -705,13 +704,13 @@
 	SHLIB_LD_LIBS='${LIBS}'
 	MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -o \[$]@ ${extra_ldflags} \
 	    -Wl,--out-implib,\$(patsubst %.dll,lib%.a,\[$]@)"
 	# DLLSUFFIX is separate because it is the building block for
 	# users of tclConfig.sh that may build shared or static.
-	DLLSUFFIX="\${DBGX}.dll"
-	LIBSUFFIX="\${DBGX}.a"
-	LIBFLAGSUFFIX="\${DBGX}"
+	DLLSUFFIX="${with_dbgx}.dll"
+	LIBSUFFIX="${with_dbgx}.a"
+	LIBFLAGSUFFIX="${with_dbgx}"
 	SHLIB_SUFFIX=.dll
 
 	EXTRA_CFLAGS="${extra_cflags}"
 
 	CFLAGS_DEBUG=-g
@@ -770,18 +769,18 @@
 	if test "${SHARED_BUILD}" = "0" ; then
 	    # static
             AC_MSG_RESULT([using static flags])
 	    runtime=-MT
 	    LIBRARIES="\${STATIC_LIBRARIES}"
-	    EXESUFFIX="s\${DBGX}.exe"
+	    EXESUFFIX="${with_dbgx}.exe"
 	else
 	    # dynamic
             AC_MSG_RESULT([using shared flags])
 	    runtime=-MD
 	    # Add SHLIB_LD_LIBS to the Make rule, not here.
 	    LIBRARIES="\${SHARED_LIBRARIES}"
-	    EXESUFFIX="\${DBGX}.exe"
+	    EXESUFFIX="${with_dbgx}.exe"
 	    case "x`echo \${VisualStudioVersion}`" in
 		x1[[4-9]]*)
 		    lflags="${lflags} -nodefaultlib:libucrt.lib"
 		    ;;
 		*)
@@ -789,13 +788,13 @@
 	    esac
 	fi
 	MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -out:\[$]@"
 	# DLLSUFFIX is separate because it is the building block for
 	# users of tclConfig.sh that may build shared or static.
-	DLLSUFFIX="\${DBGX}.dll"
-	LIBSUFFIX="\${DBGX}.lib"
-	LIBFLAGSUFFIX="\${DBGX}"
+	DLLSUFFIX="${with_dbgx}.dll"
+	LIBSUFFIX="${with_dbgx}.lib"
+	LIBFLAGSUFFIX="${with_dbgx}"
 
 	# This is a 2-stage check to make sure we have the 64-bit SDK
 	# We have to know where the SDK is installed.
 	# This magic is based on MS Platform SDK for Win2003 SP1 - hobbs
 	if test "$do64bit" != "no" ; then
@@ -1022,17 +1021,17 @@
 #	Defines the following vars:
 #		TCL_BIN_DIR	Full path to the tcl build dir.
 #------------------------------------------------------------------------
 
 AC_DEFUN([SC_WITH_TCL], [
-    if test -d ../../tcl8.7$1/win;  then
-	TCL_BIN_DEFAULT=../../tcl8.7$1/win
+    if test -d ../../tcl8$1/win;  then
+	TCL_BIN_DEFAULT=../../tcl8$1/win
     else
-	TCL_BIN_DEFAULT=../../tcl8.7/win
+	TCL_BIN_DEFAULT=../../tcl8/win
     fi
 
-    AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 8.7 binaries from DIR],
+    AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 8 binaries from DIR],
 	    TCL_BIN_DIR=$withval, TCL_BIN_DIR=`cd $TCL_BIN_DEFAULT; pwd`)
     if test ! -d $TCL_BIN_DIR; then
 	AC_MSG_ERROR(Tcl directory $TCL_BIN_DIR does not exist)
     fi
     if test ! -f $TCL_BIN_DIR/Makefile; then
@@ -1109,11 +1108,11 @@
 #		BUILD_TCLSH
 #------------------------------------------------------------------------
 
 AC_DEFUN([SC_BUILD_TCLSH], [
     AC_MSG_CHECKING([for tclsh in Tcl build directory])
-    BUILD_TCLSH=${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT}
+    BUILD_TCLSH=${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${EXEEXT}
     AC_MSG_RESULT($BUILD_TCLSH)
     AC_SUBST(BUILD_TCLSH)
 ])
 
 #--------------------------------------------------------------------

Index: win/tclConfig.sh.in
==================================================================
--- win/tclConfig.sh.in
+++ win/tclConfig.sh.in
@@ -21,13 +21,14 @@
 TCL_CC='@CC@'
 
 # -D flags for use with the C compiler.
 TCL_DEFS='@DEFS@'
 
-# If TCL was built with debugging symbols, generated libraries contain
-# this string at the end of the library name (before the extension).
-TCL_DBGX=@TCL_DBGX@
+# TCL_DBGX used to be used to distinguish debug vs. non-debug builds.
+# This was a righteous pain so the core doesn't do that any more.
+# DEPRECATED, will be removed in Tcl 9!
+TCL_DBGX=
 
 # Default flags used in an optimized and debuggable build, respectively.
 TCL_CFLAGS_DEBUG='@CFLAGS_DEBUG@'
 TCL_CFLAGS_OPTIMIZE='@CFLAGS_OPTIMIZE@'
 
@@ -122,11 +123,11 @@
 TCL_INCLUDE_SPEC='@TCL_INCLUDE_SPEC@'
 
 # Indicates whether a version numbers should be used in -l switches
 # ("ok" means it's safe to use switches like -ltcl7.5;  "nodots" means
 # use switches like -ltcl75).  SunOS and FreeBSD require "nodots", for
-# example.
+# example. DEPRECATED, will be removed in Tcl 9!
 TCL_LIB_VERSIONS_OK='@TCL_LIB_VERSIONS_OK@'
 
 # String that can be evaluated to generate the part of a shared library
 # name that comes after the "libxxx" (includes version number, if any,
 # extension, and anything else needed).  May depend on the variables
@@ -176,6 +177,5 @@
 # Path to the Tcl stub library in the install directory.
 TCL_STUB_LIB_PATH='@TCL_STUB_LIB_PATH@'
 
 # Flag, 1: we built Tcl with threads enabled, 0 we didn't
 TCL_THREADS=@TCL_THREADS@
-

Index: win/tclsh.rc
==================================================================
--- win/tclsh.rc
+++ win/tclsh.rc
@@ -2,34 +2,10 @@
 // Version Resource Script
 //
 
 #include <winver.h>
 #include <tcl.h>
-
-//
-// build-up the name suffix that defines the type of build this is.
-//
-#if TCL_THREADS
-#define SUFFIX_THREADS	    "t"
-#else
-#define SUFFIX_THREADS	    ""
-#endif
-
-#if STATIC_BUILD
-#define SUFFIX_STATIC	    "s"
-#else
-#define SUFFIX_STATIC	    ""
-#endif
-
-#if DEBUG && !UNCHECKED
-#define SUFFIX_DEBUG	    "g"
-#else
-#define SUFFIX_DEBUG	    ""
-#endif
-
-#define SUFFIX		    SUFFIX_THREADS SUFFIX_STATIC SUFFIX_DEBUG
-
 
 LANGUAGE 0x9, 0x1	/* LANG_ENGLISH, SUBLANG_DEFAULT */
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION 	TCL_MAJOR_VERSION,TCL_MINOR_VERSION,TCL_RELEASE_LEVEL,TCL_RELEASE_SERIAL
@@ -47,11 +23,11 @@
     BLOCK "StringFileInfo"
     BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "Tclsh Application\0"
-            VALUE "OriginalFilename", "tclsh" STRINGIFY(TCL_MAJOR_VERSION) STRINGIFY(TCL_MINOR_VERSION) SUFFIX ".exe\0"
+            VALUE "OriginalFilename", "tclsh" STRINGIFY(TCL_MAJOR_VERSION) ".exe\0"
             VALUE "CompanyName", "ActiveState Corporation\0"
             VALUE "FileVersion", TCL_PATCH_LEVEL
             VALUE "LegalCopyright", "Copyright \251 2000 by ActiveState Corporation, et al\0"
             VALUE "ProductName", "Tcl " TCL_VERSION " for Windows\0"
             VALUE "ProductVersion", TCL_PATCH_LEVEL