Import build of Tcl/Tk 8.6.12

2021-11-08 21:12:37 +00:00
parent c5c7ca7f25
commit e3c3e9a285
2280 changed files with 315906 additions and 327798 deletions
--- a/amd64/bin/tcl86t.dll
+++ b/amd64/bin/tcl86t.dll
--- a/amd64/bin/tclsh86t.exe
+++ b/amd64/bin/tclsh86t.exe
--- a/amd64/bin/tk86t.dll
+++ b/amd64/bin/tk86t.dll
--- a/amd64/bin/wish86t.exe
+++ b/amd64/bin/wish86t.exe
--- a/amd64/include/X11/Xlib.h
+++ b/amd64/include/X11/Xlib.h
@@ -330,9 +330,6 @@ typedef struct _XImage {
    unsigned long green_mask;
    unsigned long blue_mask;
    XPointer obdata;		/* hook for the object routines to hang on */
-#if defined(MAC_OSX_TK)
-    int pixelpower;		/* No longer used. */
-#endif
    struct funcs {		/* image manipulation routines */
 	struct _XImage *(*create_image)();
 #if NeedFunctionPrototypes
--- a/amd64/include/X11/keysym.h
+++ b/amd64/include/X11/keysym.h
@@ -1,8 +1,29 @@
-/* $XConsortium: keysym.h,v 1.13 91/03/13 20:09:49 rws Exp $ */
-
 /***********************************************************
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
-and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.

                        All Rights Reserved

@@ -10,7 +31,7 @@ Permission to use, copy, modify, and distribute this software and its
 documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
 both that copyright notice and this permission notice appear in
-supporting documentation, and that the names of Digital or MIT not be
+supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
 software without specific, written prior permission.

@@ -30,6 +51,12 @@ SOFTWARE.
 #define XK_LATIN2
 #define XK_LATIN3
 #define XK_LATIN4
+#define XK_LATIN9
 #define XK_GREEK
+#define XK_KATAKANA
+#define XK_ARABIC
+#define XK_CYRILLIC
+#define XK_HEBREW

 #include <X11/keysymdef.h>
+
--- a/amd64/include/X11/keysymdef.h
+++ b/amd64/include/X11/keysymdef.h
--- a/amd64/include/tcl.h
+++ b/amd64/include/tcl.h
@@ -51,10 +51,10 @@ extern "C" {
 #define TCL_MAJOR_VERSION   8
 #define TCL_MINOR_VERSION   6
 #define TCL_RELEASE_LEVEL   TCL_FINAL_RELEASE
-#define TCL_RELEASE_SERIAL  11
+#define TCL_RELEASE_SERIAL  12

 #define TCL_VERSION	    "8.6"
-#define TCL_PATCH_LEVEL	    "8.6.11"
+#define TCL_PATCH_LEVEL	    "8.6.12"

 /*
 *----------------------------------------------------------------------------
@@ -131,13 +131,17 @@ extern "C" {
 */

 #include <stdarg.h>
-#ifndef TCL_NO_DEPRECATED
+#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
 #    define TCL_VARARGS(type, name) (type name, ...)
 #    define TCL_VARARGS_DEF(type, name) (type name, ...)
 #    define TCL_VARARGS_START(type, name, list) (va_start(list, name), name)
-#endif
+#endif /* !TCL_NO_DEPRECATED */
 #if defined(__GNUC__) && (__GNUC__ > 2)
+#   if defined(_WIN32) && defined(__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO
+#	define TCL_FORMAT_PRINTF(a,b) __attribute__ ((__format__ (__MINGW_PRINTF_FORMAT, a, b)))
+#   else
 #	define TCL_FORMAT_PRINTF(a,b) __attribute__ ((__format__ (__printf__, a, b)))
+#   endif
 #   define TCL_NORETURN __attribute__ ((noreturn))
 #   if defined(BUILD_tcl) || defined(BUILD_tk)
 #	define TCL_NORETURN1 __attribute__ ((noreturn))
@@ -216,7 +220,7 @@ extern "C" {
 * to be included in a shared library, then it should have the DLLEXPORT
 * storage class. If is being declared for use by a module that is going to
 * link against the shared library, then it should have the DLLIMPORT storage
- * class. If the symbol is beind declared for a static build or for use from a
+ * class. If the symbol is being declared for a static build or for use from a
 * stub library, then the storage class should be empty.
 *
 * The convention is that a macro called BUILD_xxxx, where xxxx is the name of
@@ -362,6 +366,15 @@ typedef long LONG;
 #    undef HAVE_STRUCT_STAT64
 #endif /* __APPLE__ */

+/* Cross-compiling 32-bit on a 64-bit platform? Then our
+ * configure script does the wrong thing. Correct that here.
+ */
+#if defined(__GNUC__) && !defined(_WIN32) && !defined(__LP64__)
+#   undef TCL_WIDE_INT_IS_LONG
+#   undef TCL_WIDE_INT_TYPE
+#   define TCL_WIDE_INT_TYPE long long
+#endif
+
 /*
 * Define Tcl_WideInt to be a type that is (at least) 64-bits wide, and define
 * Tcl_WideUInt to be the unsigned variant of that type (assuming that where
@@ -384,13 +397,15 @@ typedef long LONG;
 */

 #if !defined(TCL_WIDE_INT_TYPE)&&!defined(TCL_WIDE_INT_IS_LONG)
-#   if defined(_WIN32) && (!defined(__USE_MINGW_ANSI_STDIO) || !__USE_MINGW_ANSI_STDIO)
+#   ifdef _WIN32
 #	define TCL_WIDE_INT_TYPE __int64
 #	ifdef __BORLANDC__
 #	    define TCL_LL_MODIFIER	"L"
-#      else /* __BORLANDC__ */
+#	elif defined(_WIN32) && (!defined(__USE_MINGW_ANSI_STDIO) || !__USE_MINGW_ANSI_STDIO)
 #	    define TCL_LL_MODIFIER	"I64"
-#      endif /* __BORLANDC__ */
+#	else
+#	    define TCL_LL_MODIFIER	"ll"
+#	endif
 #   elif defined(__GNUC__)
 #      define TCL_WIDE_INT_TYPE long long
 #      define TCL_LL_MODIFIER	"ll"
@@ -437,7 +452,7 @@ typedef unsigned TCL_WIDE_INT_TYPE	Tcl_WideUInt;
 #   define Tcl_DoubleAsWide(val)	((Tcl_WideInt)((double)(val)))
 #endif /* TCL_WIDE_INT_IS_LONG */

-#if defined(_WIN32)
+#ifdef _WIN32
 #   ifdef __BORLANDC__
 	typedef struct stati64 Tcl_StatBuf;
 #   elif defined(_WIN64) || defined(_USE_64BIT_TIME_T)
@@ -491,7 +506,7 @@ typedef unsigned TCL_WIDE_INT_TYPE	Tcl_WideUInt;
 */

 typedef struct Tcl_Interp
-#ifndef TCL_NO_DEPRECATED
+#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
 {
    /* TIP #330: Strongly discourage extensions from using the string
     * result. */
@@ -521,7 +536,7 @@ typedef struct Tcl_Interp
    int errorLineDontUse; /* Don't use in extensions! */
 #endif
 }
-#endif /* TCL_NO_DEPRECATED */
+#endif /* !TCL_NO_DEPRECATED */
 Tcl_Interp;

 typedef struct Tcl_AsyncHandler_ *Tcl_AsyncHandler;
@@ -1120,9 +1135,9 @@ typedef struct Tcl_DString {
 * give the flag)
 */

-#ifndef TCL_NO_DEPRECATED
+#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
 #   define TCL_PARSE_PART1	0x400
-#endif
+#endif /* !TCL_NO_DEPRECATED */

 /*
 * Types for linked variables:
@@ -1714,7 +1729,7 @@ typedef struct Tcl_FSVersion_ *Tcl_FSVersion;
 * struct Tcl_Filesystem:
 *
 * One such structure exists for each type (kind) of filesystem. It collects
- * together in one place all the functions that are part of the specific
+ * together the functions that form the interface for a particulr the
 * filesystem. Tcl always accesses the filesystem through one of these
 * structures.
 *
@@ -1729,147 +1744,119 @@ typedef struct Tcl_Filesystem {
 				 * compatibility can be assured. */
    Tcl_FSVersion version;	/* Version of the filesystem type. */
    Tcl_FSPathInFilesystemProc *pathInFilesystemProc;
-				/* Function to check whether a path is in this
+				/* Determines whether the pathname is in this
 				 * filesystem. This is the most important
 				 * filesystem function. */
    Tcl_FSDupInternalRepProc *dupInternalRepProc;
-				/* Function to duplicate internal fs rep. May
-				 * be NULL (but then fs is less efficient). */
+				/* Duplicates the internal handle of the node.
+				 * If it is NULL, the filesystem is less
+				 * performant. */
    Tcl_FSFreeInternalRepProc *freeInternalRepProc;
-				/* Function to free internal fs rep. Must be
-				 * implemented if internal representations
-				 * need freeing, otherwise it can be NULL. */
+				/* Frees the internal handle of the node.  NULL
+				 * only if there is no need to free resources
+				 * used for the internal handle. */
    Tcl_FSInternalToNormalizedProc *internalToNormalizedProc;
-				/* Function to convert internal representation
-				 * to a normalized path. Only required if the
-				 * fs creates pure path objects with no
-				 * string/path representation. */
+				/* Converts the internal handle to a normalized
+				 * path.  NULL if the filesystem creates nodes
+				 * having no pathname. */
    Tcl_FSCreateInternalRepProc *createInternalRepProc;
-				/* Function to create a filesystem-specific
-				 * internal representation. May be NULL if
-				 * paths have no internal representation, or
-				 * if the Tcl_FSPathInFilesystemProc for this
-				 * filesystem always immediately creates an
-				 * internal representation for paths it
-				 * accepts. */
+				/* Creates an internal handle for a pathname.
+				 * May be NULL if pathnames have no internal
+				 * handle or if pathInFilesystemProc always
+				 * immediately creates an internal
+				 * representation for pathnames in the
+				 * filesystem. */
    Tcl_FSNormalizePathProc *normalizePathProc;
-				/* Function to normalize a path.  Should be
-				 * implemented for all filesystems which can
-				 * have multiple string representations for
-				 * the same path object. */
+				/* Normalizes a path.  Should be implemented if
+				 * the filesystems supports multiple paths to
+				 * the same node. */
    Tcl_FSFilesystemPathTypeProc *filesystemPathTypeProc;
-				/* Function to determine the type of a path in
-				 * this filesystem. May be NULL. */
+				/* Determines the type of a path in this
+				 * filesystem. May be NULL. */
    Tcl_FSFilesystemSeparatorProc *filesystemSeparatorProc;
-				/* Function to return the separator
-				 * character(s) for this filesystem. Must be
-				 * implemented. */
-    Tcl_FSStatProc *statProc;	/* Function to process a 'Tcl_FSStat()' call.
-				 * Must be implemented for any reasonable
-				 * filesystem. */
-    Tcl_FSAccessProc *accessProc;
-				/* Function to process a 'Tcl_FSAccess()'
-				 * call. Must be implemented for any
+				/* Produces the separator character(s) for this
+				 * filesystem. Must not be NULL. */
+    Tcl_FSStatProc *statProc;	/* Called by 'Tcl_FSStat()'.  Provided by any
 				 * reasonable filesystem. */
+    Tcl_FSAccessProc *accessProc;
+				/* Called by 'Tcl_FSAccess()'.  Implemented by
+				 * any reasonable filesystem. */
    Tcl_FSOpenFileChannelProc *openFileChannelProc;
-				/* Function to process a
-				 * 'Tcl_FSOpenFileChannel()' call. Must be
-				 * implemented for any reasonable
-				 * filesystem. */
+				/* Called by 'Tcl_FSOpenFileChannel()'.
+				 * Provided by any reasonable filesystem. */
    Tcl_FSMatchInDirectoryProc *matchInDirectoryProc;
-				/* Function to process a
-				 * 'Tcl_FSMatchInDirectory()'.  If not
-				 * implemented, then glob and recursive copy
-				 * functionality will be lacking in the
-				 * filesystem. */
-    Tcl_FSUtimeProc *utimeProc;	/* Function to process a 'Tcl_FSUtime()' call.
-				 * Required to allow setting (not reading) of
-				 * times with 'file mtime', 'file atime' and
-				 * the open-r/open-w/fcopy implementation of
-				 * 'file copy'. */
-    Tcl_FSLinkProc *linkProc;	/* Function to process a 'Tcl_FSLink()' call.
-				 * Should be implemented only if the
-				 * filesystem supports links (reading or
-				 * creating). */
+				/* Called by 'Tcl_FSMatchInDirectory()'.  NULL
+				 * if the filesystem does not support glob or
+				 * recursive copy. */
+    Tcl_FSUtimeProc *utimeProc;	/* Called by 'Tcl_FSUtime()', by 'file
+				 *  mtime' to set (not read) times, 'file
+				 *  atime', and the open-r/open-w/fcopy variant
+				 *  of 'file copy'. */
+    Tcl_FSLinkProc *linkProc;	/* Called by 'Tcl_FSLink()'. NULL if reading or
+				 *  creating links is not supported. */
    Tcl_FSListVolumesProc *listVolumesProc;
-				/* Function to list any filesystem volumes
-				 * added by this filesystem. Should be
-				 * implemented only if the filesystem adds
-				 * volumes at the head of the filesystem. */
+				/* Lists filesystem volumes added by this
+				 * filesystem. NULL if the filesystem does not
+				 * use volumes. */
    Tcl_FSFileAttrStringsProc *fileAttrStringsProc;
-				/* Function to list all attributes strings
-				 * which are valid for this filesystem. If not
-				 * implemented the filesystem will not support
-				 * the 'file attributes' command. This allows
-				 * arbitrary additional information to be
-				 * attached to files in the filesystem. */
-    Tcl_FSFileAttrsGetProc *fileAttrsGetProc;
-				/* Function to process a
-				 * 'Tcl_FSFileAttrsGet()' call, used by 'file
-				 * attributes'. */
-    Tcl_FSFileAttrsSetProc *fileAttrsSetProc;
-				/* Function to process a
-				 * 'Tcl_FSFileAttrsSet()' call, used by 'file
-				 * attributes'.  */
-    Tcl_FSCreateDirectoryProc *createDirectoryProc;
-				/* Function to process a
-				 * 'Tcl_FSCreateDirectory()' call. Should be
-				 * implemented unless the FS is read-only. */
-    Tcl_FSRemoveDirectoryProc *removeDirectoryProc;
-				/* Function to process a
-				 * 'Tcl_FSRemoveDirectory()' call. Should be
-				 * implemented unless the FS is read-only. */
-    Tcl_FSDeleteFileProc *deleteFileProc;
-				/* Function to process a 'Tcl_FSDeleteFile()'
-				 * call. Should be implemented unless the FS
-				 * is read-only. */
-    Tcl_FSCopyFileProc *copyFileProc;
-				/* Function to process a 'Tcl_FSCopyFile()'
-				 * call. If not implemented Tcl will fall back
-				 * on open-r, open-w and fcopy as a copying
-				 * mechanism, for copying actions initiated in
-				 * Tcl (not C). */
-    Tcl_FSRenameFileProc *renameFileProc;
-				/* Function to process a 'Tcl_FSRenameFile()'
-				 * call. If not implemented, Tcl will fall
-				 * back on a copy and delete mechanism, for
-				 * rename actions initiated in Tcl (not C). */
-    Tcl_FSCopyDirectoryProc *copyDirectoryProc;
-				/* Function to process a
-				 * 'Tcl_FSCopyDirectory()' call. If not
-				 * implemented, Tcl will fall back on a
-				 * recursive create-dir, file copy mechanism,
-				 * for copying actions initiated in Tcl (not
-				 * C). */
-    Tcl_FSLstatProc *lstatProc;	/* Function to process a 'Tcl_FSLstat()' call.
-				 * If not implemented, Tcl will attempt to use
-				 * the 'statProc' defined above instead. */
-    Tcl_FSLoadFileProc *loadFileProc;
-				/* Function to process a 'Tcl_FSLoadFile()'
-				 * call. If not implemented, Tcl will fall
-				 * back on a copy to native-temp followed by a
-				 * Tcl_FSLoadFile on that temporary copy. */
-    Tcl_FSGetCwdProc *getCwdProc;
-				/* Function to process a 'Tcl_FSGetCwd()'
-				 * call. Most filesystems need not implement
-				 * this. It will usually only be called once,
-				 * if 'getcwd' is called before 'chdir'. May
-				 * be NULL. */
-    Tcl_FSChdirProc *chdirProc;	/* Function to process a 'Tcl_FSChdir()' call.
-				 * If filesystems do not implement this, it
-				 * will be emulated by a series of directory
-				 * access checks. Otherwise, virtual
-				 * filesystems which do implement it need only
-				 * respond with a positive return result if
-				 * the dirName is a valid directory in their
-				 * filesystem. They need not remember the
-				 * result, since that will be automatically
-				 * remembered for use by GetCwd. Real
-				 * filesystems should carry out the correct
-				 * action (i.e. call the correct system
-				 * 'chdir' api). If not implemented, then 'cd'
-				 * and 'pwd' will fail inside the
+				/* List all valid attributes strings.  NULL if
+				 * the filesystem does not support the 'file
+				 * attributes' command.  Can be used to attach
+				 * arbitrary additional data to files in a
 				 * filesystem. */
+    Tcl_FSFileAttrsGetProc *fileAttrsGetProc;
+				/* Called by 'Tcl_FSFileAttrsGet()' and by
+				 * 'file attributes'. */
+    Tcl_FSFileAttrsSetProc *fileAttrsSetProc;
+				/* Called by 'Tcl_FSFileAttrsSet()' and by
+				 * 'file attributes'.  */
+    Tcl_FSCreateDirectoryProc *createDirectoryProc;
+				/* Called by 'Tcl_FSCreateDirectory()'.  May be
+				 * NULL if the filesystem is read-only. */
+    Tcl_FSRemoveDirectoryProc *removeDirectoryProc;
+				/* Called by 'Tcl_FSRemoveDirectory()'.  May be
+				 * NULL if the filesystem is read-only. */
+    Tcl_FSDeleteFileProc *deleteFileProc;
+				/* Called by 'Tcl_FSDeleteFile()' May be NULL
+				 * if the filesystem is is read-only. */
+    Tcl_FSCopyFileProc *copyFileProc;
+				/* Called by 'Tcl_FSCopyFile()'.  If NULL, for
+				 * a copy operation at the script level (not
+				 * C) Tcl uses open-r, open-w and fcopy. */
+    Tcl_FSRenameFileProc *renameFileProc;
+				/* Called by 'Tcl_FSRenameFile()'. If NULL, for
+				 * a rename operation at the script level (not
+				 * C) Tcl performs a copy operation followed
+				 * by a delete operation. */
+    Tcl_FSCopyDirectoryProc *copyDirectoryProc;
+				/* Called by 'Tcl_FSCopyDirectory()'. If NULL,
+				 * for a copy operation at the script level
+				 * (not C) Tcl recursively creates directories
+				 * and copies files. */
+    Tcl_FSLstatProc *lstatProc;	/* Called by 'Tcl_FSLstat()'. If NULL, Tcl
+				 * attempts to use 'statProc' instead. */
+    Tcl_FSLoadFileProc *loadFileProc;
+				/* Called by 'Tcl_FSLoadFile()'. If NULL, Tcl
+				 * performs a copy to a temporary file in the
+				 * native filesystem and then calls
+				 * Tcl_FSLoadFile() on that temporary copy. */
+    Tcl_FSGetCwdProc *getCwdProc;
+				/* Called by 'Tcl_FSGetCwd()'.  Normally NULL.
+				 * Usually only called once:  If 'getcwd' is
+				 * called before 'chdir' is ever called. */
+    Tcl_FSChdirProc *chdirProc;	/* Called by 'Tcl_FSChdir()'.  For a virtual
+				 * filesystem, chdirProc just returns zero
+				 * (success) if the pathname is a valid
+				 * directory, and some other value otherwise.
+				 * For A real filesystem, chdirProc performs
+				 * the correct action, e.g.  calls the system
+				 * 'chdir' function. If not implemented, then
+				 * 'cd' and 'pwd' fail for a pathname in this
+				 * filesystem. On success Tcl stores the
+				 * pathname for use by GetCwd.  If NULL, Tcl
+				 * performs records the pathname as the new
+				 * current directory if it passes a series of
+				 * directory access checks. */
 } Tcl_Filesystem;

 /*
@@ -2130,29 +2117,28 @@ typedef struct Tcl_EncodingType {
 *				reset to an initial state. If the source
 *				buffer contains the entire input stream to be
 *				converted, this flag should be set.
- * TCL_ENCODING_STOPONERROR -	If set, then the converter will return
- *				immediately upon encountering an invalid byte
- *				sequence or a source character that has no
- *				mapping in the target encoding. If clear, then
- *				the converter will skip the problem,
- *				substituting one or more "close" characters in
- *				the destination buffer and then continue to
+ * TCL_ENCODING_STOPONERROR -	If set, the converter returns immediately upon
+ *				encountering an invalid byte sequence or a
+ *				source character that has no mapping in the
+ *				target encoding. If clear, the converter
+ *				substitues the problematic character(s) with
+ *				one or more "close" characters in the
+ *				destination buffer and then continues to
 *				convert the source.
- * TCL_ENCODING_NO_TERMINATE - 	If set, Tcl_ExternalToUtf will not append a
- *				terminating NUL byte.  Knowing that it will
- *				not need space to do so, it will fill all
- *				dstLen bytes with encoded UTF-8 content, as
- *				other circumstances permit.  If clear, the
- *				default behavior is to reserve a byte in
- *				the dst space for NUL termination, and to
- *				append the NUL byte.
+ * TCL_ENCODING_NO_TERMINATE - 	If set, Tcl_ExternalToUtf does not append a
+ *				terminating NUL byte.  Since it does not need
+ *				an extra byte for a terminating NUL, it fills
+ *				all dstLen bytes with encoded UTF-8 content if
+ *				needed.  If clear, a byte is reserved in the
+ *				dst space for NUL termination, and a
+ *				terminating NUL is appended.
 * TCL_ENCODING_CHAR_LIMIT -	If set and dstCharsPtr is not NULL, then
- *				Tcl_ExternalToUtf takes the initial value
- *				of *dstCharsPtr is taken as a limit of the
- *				maximum number of chars to produce in the
- *				encoded UTF-8 content.  Otherwise, the
- *				number of chars produced is controlled only
- *				by other limiting factors.
+ *				Tcl_ExternalToUtf takes the initial value of
+ *				*dstCharsPtr as a limit of the maximum number
+ *				of chars to produce in the encoded UTF-8
+ *				content.  Otherwise, the number of chars
+ *				produced is controlled only by other limiting
+ *				factors.
 */

 #define TCL_ENCODING_START		0x01
@@ -2215,10 +2201,8 @@ typedef struct Tcl_EncodingType {

 #if TCL_UTF_MAX > 4
    /*
-     * unsigned int isn't 100% accurate as it should be a strict 4-byte value
-     * (perhaps wchar_t). 64-bit systems may have troubles. The size of this
-     * value must be reflected correctly in regcustom.h and
-     * in tclEncoding.c.
+     * unsigned int isn't 100% accurate as it should be a strict 4-byte value.
+     * The size of this value must be reflected correctly in regcustom.h.
     * XXX: Tcl is currently UCS-2 and planning UTF-16 for the Unicode
     * XXX: string rep that Tcl_UniChar represents.  Changing the size
     * XXX: of Tcl_UniChar is /not/ supported.
@@ -2387,9 +2371,6 @@ typedef int (Tcl_NRPostProc) (ClientData data[], Tcl_Interp *interp,
 *----------------------------------------------------------------------------
 * The following constant is used to test for older versions of Tcl in the
 * stubs tables.
- *
- * Jan Nijtman's plus patch uses 0xFCA1BACF, so we need to pick a different
- * value since the stubs tables don't match.
 */

 #define TCL_STUB_MAGIC		((int) 0xFCA3BACF)
@@ -2415,10 +2396,6 @@ const char *		TclTomMathInitializeStubs(Tcl_Interp *interp,
    Tcl_PkgInitStubsCheck(interp, version, exact)
 #endif

-/*
- * TODO - tommath stubs export goes here!
- */
-
 /*
 * Public functions that are not accessible via the stubs table.
 * Tcl_GetMemoryInfo is needed for AOLserver. [Bug 1868171]
@@ -2512,7 +2489,7 @@ EXTERN void		Tcl_GetMemoryInfo(Tcl_DString *dsPtr);
 	++(objPtr)->refCount
    /*
     * Use do/while0 idiom for optimum correctness without compiler warnings.
-     * http://c2.com/cgi/wiki?TrivialDoWhileLoop
+     * https://wiki.c2.com/?TrivialDoWhileLoop
     */
 #   define Tcl_DecrRefCount(objPtr) \
 	do { \
--- a/amd64/include/tclDecls.h
+++ b/amd64/include/tclDecls.h
@@ -725,7 +725,7 @@ EXTERN void		Tcl_SplitPath(const char *path, int *argcPtr,
 				CONST84 char ***argvPtr);
 /* 244 */
 EXTERN void		Tcl_StaticPackage(Tcl_Interp *interp,
-				const char *pkgName,
+				const char *prefix,
 				Tcl_PackageInitProc *initProc,
 				Tcl_PackageInitProc *safeInitProc);
 /* 245 */
@@ -1833,7 +1833,18 @@ EXTERN void		Tcl_ZlibStreamSetCompressionDictionary(
 /* Slot 646 is reserved */
 /* Slot 647 is reserved */
 /* Slot 648 is reserved */
-/* 649 */
+/* Slot 649 is reserved */
+/* Slot 650 is reserved */
+/* Slot 651 is reserved */
+/* Slot 652 is reserved */
+/* Slot 653 is reserved */
+/* Slot 654 is reserved */
+/* Slot 655 is reserved */
+/* Slot 656 is reserved */
+/* Slot 657 is reserved */
+/* Slot 658 is reserved */
+/* Slot 659 is reserved */
+/* 660 */
 EXTERN void		TclUnusedStubEntry(void);

 typedef struct {
@@ -2114,7 +2125,7 @@ typedef struct TclStubs {
    void (*tcl_SourceRCFile) (Tcl_Interp *interp); /* 241 */
    int (*tcl_SplitList) (Tcl_Interp *interp, const char *listStr, int *argcPtr, CONST84 char ***argvPtr); /* 242 */
    void (*tcl_SplitPath) (const char *path, int *argcPtr, CONST84 char ***argvPtr); /* 243 */
-    void (*tcl_StaticPackage) (Tcl_Interp *interp, const char *pkgName, Tcl_PackageInitProc *initProc, Tcl_PackageInitProc *safeInitProc); /* 244 */
+    void (*tcl_StaticPackage) (Tcl_Interp *interp, const char *prefix, Tcl_PackageInitProc *initProc, Tcl_PackageInitProc *safeInitProc); /* 244 */
    int (*tcl_StringMatch) (const char *str, const char *pattern); /* 245 */
    int (*tcl_TellOld) (Tcl_Channel chan); /* 246 */
    int (*tcl_TraceVar) (Tcl_Interp *interp, const char *varName, int flags, Tcl_VarTraceProc *proc, ClientData clientData); /* 247 */
@@ -2519,7 +2530,18 @@ typedef struct TclStubs {
    void (*reserved646)(void);
    void (*reserved647)(void);
    void (*reserved648)(void);
-    void (*tclUnusedStubEntry) (void); /* 649 */
+    void (*reserved649)(void);
+    void (*reserved650)(void);
+    void (*reserved651)(void);
+    void (*reserved652)(void);
+    void (*reserved653)(void);
+    void (*reserved654)(void);
+    void (*reserved655)(void);
+    void (*reserved656)(void);
+    void (*reserved657)(void);
+    void (*reserved658)(void);
+    void (*reserved659)(void);
+    void (*tclUnusedStubEntry) (void); /* 660 */
 } TclStubs;

 extern const TclStubs *tclStubsPtr;
@@ -3830,8 +3852,19 @@ extern const TclStubs *tclStubsPtr;
 /* Slot 646 is reserved */
 /* Slot 647 is reserved */
 /* Slot 648 is reserved */
+/* Slot 649 is reserved */
+/* Slot 650 is reserved */
+/* Slot 651 is reserved */
+/* Slot 652 is reserved */
+/* Slot 653 is reserved */
+/* Slot 654 is reserved */
+/* Slot 655 is reserved */
+/* Slot 656 is reserved */
+/* Slot 657 is reserved */
+/* Slot 658 is reserved */
+/* Slot 659 is reserved */
 #define TclUnusedStubEntry \
-	(tclStubsPtr->tclUnusedStubEntry) /* 649 */
+	(tclStubsPtr->tclUnusedStubEntry) /* 660 */

 #endif /* defined(USE_TCL_STUBS) */

@@ -3915,7 +3948,24 @@ extern const TclStubs *tclStubsPtr;
 #define Tcl_UpVar(interp, frameName, varName, localName, flags) \
 	Tcl_UpVar2(interp, frameName, varName, NULL, localName, flags)

-#if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
+#if defined(USE_TCL_STUBS)
+#   if defined(_WIN32) && defined(_WIN64)
+#	undef Tcl_GetTime
+/* Handle Win64 tk.dll being loaded in Cygwin64. */
+#	define Tcl_GetTime(t) \
+		do { \
+		    union { \
+			Tcl_Time now; \
+			__int64 reserved; \
+		    } _t; \
+		    _t.reserved = -1; \
+		    tclStubsPtr->tcl_GetTime((&_t.now)); \
+		    if (_t.reserved != -1) { \
+			_t.now.usec = _t.reserved; \
+		    } \
+		    *(t) = _t.now; \
+		} while (0)
+#   endif
 #   if defined(__CYGWIN__) && defined(TCL_WIDE_INT_IS_LONG)
 /* On Cygwin64, long is 64-bit while on Win64 long is 32-bit. Therefore
 * we have to make sure that all stub entries on Cygwin64 follow the
--- a/amd64/include/tclOODecls.h
+++ b/amd64/include/tclOODecls.h
@@ -116,6 +116,10 @@ TCLAPI void		Tcl_ClassSetDestructor(Tcl_Interp *interp,
 /* 28 */
 TCLAPI Tcl_Obj *	Tcl_GetObjectName(Tcl_Interp *interp,
 				Tcl_Object object);
+/* Slot 29 is reserved */
+/* Slot 30 is reserved */
+/* 31 */
+TCLAPI void		TclOOUnusedStubEntry(void);

 typedef struct {
    const struct TclOOIntStubs *tclOOIntStubs;
@@ -154,6 +158,9 @@ typedef struct TclOOStubs {
    void (*tcl_ClassSetConstructor) (Tcl_Interp *interp, Tcl_Class clazz, Tcl_Method method); /* 26 */
    void (*tcl_ClassSetDestructor) (Tcl_Interp *interp, Tcl_Class clazz, Tcl_Method method); /* 27 */
    Tcl_Obj * (*tcl_GetObjectName) (Tcl_Interp *interp, Tcl_Object object); /* 28 */
+    void (*reserved29)(void);
+    void (*reserved30)(void);
+    void (*tclOOUnusedStubEntry) (void); /* 31 */
 } TclOOStubs;

 extern const TclOOStubs *tclOOStubsPtr;
@@ -226,9 +233,15 @@ extern const TclOOStubs *tclOOStubsPtr;
 	(tclOOStubsPtr->tcl_ClassSetDestructor) /* 27 */
 #define Tcl_GetObjectName \
 	(tclOOStubsPtr->tcl_GetObjectName) /* 28 */
+/* Slot 29 is reserved */
+/* Slot 30 is reserved */
+#define TclOOUnusedStubEntry \
+	(tclOOStubsPtr->tclOOUnusedStubEntry) /* 31 */

 #endif /* defined(USE_TCLOO_STUBS) */

 /* !END!: Do not edit above this line. */

+#undef TclOOUnusedStubEntry
+
 #endif /* _TCLOODECLS */
--- a/amd64/include/tclPlatDecls.h
+++ b/amd64/include/tclPlatDecls.h
@@ -69,6 +69,8 @@ EXTERN int		Tcl_MacOSXOpenVersionedBundleResources(
 				const char *bundleVersion,
 				int hasResourceFile, int maxPathLen,
 				char *libraryPath);
+/* 2 */
+EXTERN void		TclUnusedStubEntry(void);
 #endif /* MACOSX */

 typedef struct TclPlatStubs {
@@ -82,6 +84,7 @@ typedef struct TclPlatStubs {
 #ifdef MAC_OSX_TCL /* MACOSX */
    int (*tcl_MacOSXOpenBundleResources) (Tcl_Interp *interp, const char *bundleName, int hasResourceFile, int maxPathLen, char *libraryPath); /* 0 */
    int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, const char *bundleName, const char *bundleVersion, int hasResourceFile, int maxPathLen, char *libraryPath); /* 1 */
+    void (*tclUnusedStubEntry) (void); /* 2 */
 #endif /* MACOSX */
 } TclPlatStubs;

@@ -108,12 +111,15 @@ extern const TclPlatStubs *tclPlatStubsPtr;
 	(tclPlatStubsPtr->tcl_MacOSXOpenBundleResources) /* 0 */
 #define Tcl_MacOSXOpenVersionedBundleResources \
 	(tclPlatStubsPtr->tcl_MacOSXOpenVersionedBundleResources) /* 1 */
+#define TclUnusedStubEntry \
+	(tclPlatStubsPtr->tclUnusedStubEntry) /* 2 */
 #endif /* MACOSX */

 #endif /* defined(USE_TCL_STUBS) */

 /* !END!: Do not edit above this line. */

+#undef TclUnusedStubEntry
 #ifdef MAC_OSX_TCL /* MACOSX */
 #undef Tcl_MacOSXOpenBundleResources
 #define Tcl_MacOSXOpenBundleResources(a,b,c,d,e) Tcl_MacOSXOpenVersionedBundleResources(a,b,NULL,c,d,e)
--- a/amd64/include/tk.h
+++ b/amd64/include/tk.h
@@ -75,10 +75,10 @@ extern "C" {
 #define TK_MAJOR_VERSION	8
 #define TK_MINOR_VERSION	6
 #define TK_RELEASE_LEVEL	TCL_FINAL_RELEASE
-#define TK_RELEASE_SERIAL	11
+#define TK_RELEASE_SERIAL	12

 #define TK_VERSION		"8.6"
-#define TK_PATCH_LEVEL		"8.6.11"
+#define TK_PATCH_LEVEL		"8.6.12"

 /*
 * A special definition used to allow this header file to be included from
@@ -93,6 +93,9 @@ extern "C" {
 #ifndef RC_INVOKED

 #if !defined(_XLIB_H) && !defined(_X11_XLIB_H_)
+#if defined(__GNUC__) && !defined(__cplusplus)
+#   pragma GCC diagnostic ignored "-Wc++-compat"
+#endif
 #   include <X11/Xlib.h>
 #   ifdef MAC_OSX_TK
 #	include <X11/X.h>
--- a/amd64/lib/dde1.4/pkgIndex.tcl
+++ b/amd64/lib/dde1.4/pkgIndex.tcl
@@ -1,7 +1,12 @@
-if {![package vsatisfies [package provide Tcl] 8.5]} return
 if {[info sharedlibextension] != ".dll"} return
-if {[::tcl::pkgconfig get debug]} {
-    package ifneeded dde 1.4.3 [list load [file join $dir tcldde14g.dll] Dde]
+if {[package vsatisfies [package provide Tcl] 9.0-]} {
+    package ifneeded dde 1.4.4 \
+	    [list load [file join $dir tcl9dde14.dll] Dde]
+} elseif {![package vsatisfies [package provide Tcl] 8.7]
+	&& [::tcl::pkgconfig get debug]} {
+    package ifneeded dde 1.4.4 \
+	    [list load [file join $dir tcldde14g.dll] Dde]
 } else {
-    package ifneeded dde 1.4.3 [list load [file join $dir tcldde14.dll] Dde]
+    package ifneeded dde 1.4.4 \
+	    [list load [file join $dir tcldde14.dll] Dde]
 }
--- a/amd64/lib/dde1.4/tcldde14.dll
+++ b/amd64/lib/dde1.4/tcldde14.dll
--- a/amd64/lib/nmake/nmakehlp.c
+++ b/amd64/lib/nmake/nmakehlp.c
@@ -14,8 +14,10 @@

 #define _CRT_SECURE_NO_DEPRECATE
 #include <windows.h>
+#ifdef _MSC_VER
 #pragma comment (lib, "user32.lib")
 #pragma comment (lib, "kernel32.lib")
+#endif
 #include <stdio.h>
 #include <math.h>

@@ -37,7 +39,7 @@
 /* protos */

 static int CheckForCompilerFeature(const char *option);
-static int CheckForLinkerFeature(const char **options, int count);
+static int CheckForLinkerFeature(char **options, int count);
 static int IsIn(const char *string, const char *substring);
 static int SubstituteFile(const char *substs, const char *filename);
 static int QualifyPath(const char *path);
@@ -54,8 +56,8 @@ typedef struct {
    char buffer[STATICBUFFERSIZE];
 } pipeinfo;

-pipeinfo Out = {INVALID_HANDLE_VALUE, '\0'};
-pipeinfo Err = {INVALID_HANDLE_VALUE, '\0'};
+pipeinfo Out = {INVALID_HANDLE_VALUE, ""};
+pipeinfo Err = {INVALID_HANDLE_VALUE, ""};

 /*
 * exitcodes: 0 == no, 1 == yes, 2 == error
@@ -273,7 +275,7 @@ CheckForCompilerFeature(
 		"Tried to launch: \"%s\", but got error [%u]: ", cmdline, err);

 	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS|
-		FORMAT_MESSAGE_MAX_WIDTH_MASK, 0L, err, 0, (LPVOID)&msg[chars],
+		FORMAT_MESSAGE_MAX_WIDTH_MASK, 0L, err, 0, (LPSTR)&msg[chars],
 		(300-chars), 0);
 	WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, lstrlen(msg), &err,NULL);
 	return 2;
@@ -326,7 +328,7 @@ CheckForCompilerFeature(

 static int
 CheckForLinkerFeature(
-    const char **options,
+    char **options,
    int count)
 {
    STARTUPINFO si;
@@ -407,7 +409,7 @@ CheckForLinkerFeature(
 		"Tried to launch: \"%s\", but got error [%u]: ", cmdline, err);

 	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS|
-		FORMAT_MESSAGE_MAX_WIDTH_MASK, 0L, err, 0, (LPVOID)&msg[chars],
+		FORMAT_MESSAGE_MAX_WIDTH_MASK, 0L, err, 0, (LPSTR)&msg[chars],
 		(300-chars), 0);
 	WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, lstrlen(msg), &err,NULL);
 	return 2;
@@ -503,7 +505,6 @@ GetVersionFromFile(
    const char *match,
    int numdots)
 {
-    size_t cbBuffer = 100;
    static char szBuffer[100];
    char *szResult = NULL;
    FILE *fp = fopen(filename, "rt");
@@ -513,7 +514,7 @@ GetVersionFromFile(
 	 * Read data until we see our match string.
 	 */

-	while (fgets(szBuffer, cbBuffer, fp) != NULL) {
+	while (fgets(szBuffer, sizeof(szBuffer), fp) != NULL) {
 	    LPSTR p, q;

 	    p = strstr(szBuffer, match);
@@ -523,7 +524,7 @@ GetVersionFromFile(
 		 */

 		p += strlen(match);
-		while (*p && !isdigit(*p)) {
+		while (*p && !isdigit((unsigned char)*p)) {
 		    ++p;
 		}

@@ -532,14 +533,13 @@ GetVersionFromFile(
 		 */

 		q = p;
-		while (*q && (strchr("0123456789.ab", *q)) && ((!strchr(".ab", *q)
-			    && (!strchr("ab", q[-1])) || --numdots))) {
+		while (*q && (strchr("0123456789.ab", *q)) && (((!strchr(".ab", *q)
+			    && !strchr("ab", q[-1])) || --numdots))) {
 		    ++q;
 		}

-		memcpy(szBuffer, p, q - p);
-		szBuffer[q-p] = 0;
-		szResult = szBuffer;
+		*q = 0;
+		szResult = p;
 		break;
 	    }
 	}
@@ -562,7 +562,7 @@ typedef struct list_item_t {
 static list_item_t *
 list_insert(list_item_t **listPtrPtr, const char *key, const char *value)
 {
-    list_item_t *itemPtr = malloc(sizeof(list_item_t));
+    list_item_t *itemPtr = (list_item_t *)malloc(sizeof(list_item_t));
    if (itemPtr) {
 	itemPtr->key = strdup(key);
 	itemPtr->value = strdup(value);
@@ -611,9 +611,7 @@ SubstituteFile(
    const char *substitutions,
    const char *filename)
 {
-    size_t cbBuffer = 1024;
    static char szBuffer[1024], szCopy[1024];
-    char *szResult = NULL;
    list_item_t *substPtr = NULL;
    FILE *fp, *sp;

@@ -626,7 +624,7 @@ SubstituteFile(

 	sp = fopen(substitutions, "rt");
 	if (sp != NULL) {
-	    while (fgets(szBuffer, cbBuffer, sp) != NULL) {
+	    while (fgets(szBuffer, sizeof(szBuffer), sp) != NULL) {
 		unsigned char *ks, *ke, *vs, *ve;
 		ks = (unsigned char*)szBuffer;
 		while (ks && *ks && isspace(*ks)) ++ks;
@@ -657,7 +655,7 @@ SubstituteFile(
 	 * Run the substitutions over each line of the input
 	 */

-	while (fgets(szBuffer, cbBuffer, fp) != NULL) {
+	while (fgets(szBuffer, sizeof(szBuffer), fp) != NULL) {
 	    list_item_t *p = NULL;
 	    for (p = substPtr; p != NULL; p = p->nextPtr) {
 		char *m = strstr(szBuffer, p->key);
@@ -674,7 +672,7 @@ SubstituteFile(
 		    memcpy(szBuffer, szCopy, sizeof(szCopy));
 		}
 	    }
-	    printf(szBuffer);
+	    printf("%s", szBuffer);
 	}

 	list_free(&substPtr);
@@ -725,7 +723,8 @@ static int LocateDependencyHelper(const char *dir, const char *keypath)
 {
    HANDLE hSearch;
    char path[MAX_PATH+1];
-    int dirlen, keylen, ret;
+    size_t dirlen;
+    int keylen, ret;
    WIN32_FIND_DATA finfo;

    if (dir == NULL || keypath == NULL)
@@ -792,7 +791,8 @@ static int LocateDependencyHelper(const char *dir, const char *keypath)
 */
 static int LocateDependency(const char *keypath)
 {
-    int i, ret;
+    size_t i;
+    int ret;
    static const char *paths[] = {"..", "..\\..", "..\\..\\.."};

    for (i = 0; i < (sizeof(paths)/sizeof(paths[0])); ++i) {
--- a/amd64/lib/nmake/rules.vc
+++ b/amd64/lib/nmake/rules.vc
@@ -24,7 +24,7 @@ _RULES_VC = 1
 # For modifications that are not backward-compatible, you *must* change
 # the major version.
 RULES_VERSION_MAJOR = 1
-RULES_VERSION_MINOR = 8
+RULES_VERSION_MINOR = 9

 # The PROJECT macro must be defined by parent makefile.
 !if "$(PROJECT)" == ""
@@ -1122,16 +1122,8 @@ STUBPREFIX      = $(PROJECT)stub
 #

 # TIP 430. Unused for 8.6 but no harm defining it to allow a common rules.vc
-!if "$(TCL_PATCH_LETTER)" == "."
-TCLSCRIPTZIPNAME = libtcl_$(TCL_MAJOR_VERSION)_$(TCL_MINOR_VERSION)_$(TCL_RELEASE_SERIAL).zip
-!else
-TCLSCRIPTZIPNAME = libtcl_$(TCL_MAJOR_VERSION)_$(TCL_MINOR_VERSION)_$(TCL_PATCH_LETTER)$(TCL_RELEASE_SERIAL).zip
-!endif
-!if "$(TK_PATCH_LETTER)" == "."
-TKSCRIPTZIPNAME = libtk_$(TK_MAJOR_VERSION)_$(TK_MINOR_VERSION)_$(TK_RELEASE_SERIAL).zip
-!else
-TKSCRIPTZIPNAME = libtk_$(TK_MAJOR_VERSION)_$(TK_MINOR_VERSION)_$(TK_PATCH_LETTER)$(TK_RELEASE_SERIAL).zip
-!endif
+TCLSCRIPTZIPNAME = libtcl$(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)$(TCL_PATCH_LETTER)$(TCL_RELEASE_SERIAL).zip
+TKSCRIPTZIPNAME = libtk$(TK_MAJOR_VERSION).$(TK_MINOR_VERSION)$(TK_PATCH_LETTER)$(TK_RELEASE_SERIAL).zip

 !if $(DOING_TCL)
 TCLSHNAME       = $(PROJECT)sh$(VERSION)$(SUFX).exe
@@ -1211,9 +1203,16 @@ TCLSH_NATIVE	= $(TCLSH)
 !if $(DOING_TK) || $(NEED_TK)
 WISHNAMEPREFIX = wish
 WISHNAME = $(WISHNAMEPREFIX)$(TK_VERSION)$(SUFX).exe
-TKLIBNAME	= $(PROJECT)$(TK_VERSION)$(SUFX).$(EXT)
-TKSTUBLIBNAME	= tkstub$(TK_VERSION).lib
+TKLIBNAME8	= tk$(TK_VERSION)$(SUFX).$(EXT)
+TKLIBNAME9	= tcl9tk$(TK_VERSION)$(SUFX).$(EXT)
+!if $(TCL_MAJOR_VERSION) == 8
+TKLIBNAME	= tk$(TK_VERSION)$(SUFX).$(EXT)
 TKIMPLIBNAME	= tk$(TK_VERSION)$(SUFX).lib
+!else
+TKLIBNAME	= tcl9tk$(TK_VERSION)$(SUFX).$(EXT)
+TKIMPLIBNAME	= tcl9tk$(TK_VERSION)$(SUFX).lib
+!endif
+TKSTUBLIBNAME	= tkstub$(TK_VERSION).lib

 !if $(DOING_TK)
 WISH 		= $(OUT_DIR)\$(WISHNAME)
@@ -1261,7 +1260,13 @@ tklibs = "$(TKSTUBLIB)" "$(TKIMPLIB)"

 # Various output paths
 PRJIMPLIB	= $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib
-PRJLIBNAME	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)
+PRJLIBNAME8	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)
+PRJLIBNAME9	= tcl9$(PROJECT)$(VERSION)$(SUFX).$(EXT)
+!if $(TCL_MAJOR_VERSION) == 8
+PRJLIBNAME	= $(PRJLIBNAME8)
+!else
+PRJLIBNAME	= $(PRJLIBNAME9)
+!endif
 PRJLIB		= $(OUT_DIR)\$(PRJLIBNAME)

 PRJSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib
@@ -1339,7 +1344,7 @@ INCLUDE_INSTALL_DIR	= $(_INSTALLDIR)\..\include
 # baselibs - minimum Windows libraries required. Parent makefile can
 #    define PRJ_LIBS before including rules.rc if additional libs are needed

-OPTDEFINES	= /DSTDC_HEADERS
+OPTDEFINES	= /DSTDC_HEADERS /DUSE_NMAKE=1
 !if $(VCVERSION) > 1600
 OPTDEFINES	= $(OPTDEFINES) /DHAVE_STDINT_H=1
 !else
@@ -1510,7 +1515,7 @@ pkgcflags_nostubs = $(appcflags_nostubs) $(PKGNAMEFLAGS) /DBUILD_$(PROJECT)
 # so we do not remove it from cflags. -GL may prevent extensions
 # compiled with one VC version to fail to link against stubs library
 # compiled with another VC version. Check for this and fix accordingly.
-stubscflags = $(cflags) $(PKGNAMEFLAGS) $(PRJ_DEFINES) $(OPTDEFINES) -Zl /DSTATIC_BUILD $(INCLUDES) $(USE_STUBS_DEFS)
+stubscflags = $(cflags) $(PKGNAMEFLAGS) $(PRJ_DEFINES) $(OPTDEFINES) /Zl /GL- /DSTATIC_BUILD $(INCLUDES) $(USE_STUBS_DEFS)

 # Link flags

@@ -1591,12 +1596,22 @@ default-target: $(DEFAULT_BUILD_TARGET)

 !if $(MULTIPLATFORM_INSTALL)
 default-pkgindex:
+	@echo if {[package vsatisfies [package provide Tcl] 9.0-]} { > $(OUT_DIR)\pkgIndex.tcl
 	@echo package ifneeded $(PRJ_PACKAGE_TCLNAME) $(DOTVERSION) \
-	    [list load [file join $$dir $(PLATFORM_IDENTIFY) $(PRJLIBNAME)] [string totitle $(PRJ_PACKAGE_TCLNAME)]] > $(OUT_DIR)\pkgIndex.tcl
+	    [list load [file join $$dir $(PLATFORM_IDENTIFY) $(PRJLIBNAME9)]] >> $(OUT_DIR)\pkgIndex.tcl
+	@echo } else { >> $(OUT_DIR)\pkgIndex.tcl
+	@echo package ifneeded $(PRJ_PACKAGE_TCLNAME) $(DOTVERSION) \
+	    [list load [file join $$dir $(PLATFORM_IDENTIFY) $(PRJLIBNAME8)]] >> $(OUT_DIR)\pkgIndex.tcl
+	@echo } >> $(OUT_DIR)\pkgIndex.tcl
 !else
 default-pkgindex:
+	@echo if {[package vsatisfies [package provide Tcl] 9.0-]} { > $(OUT_DIR)\pkgIndex.tcl
 	@echo package ifneeded $(PRJ_PACKAGE_TCLNAME) $(DOTVERSION) \
-	    [list load [file join $$dir $(PRJLIBNAME)] [string totitle $(PRJ_PACKAGE_TCLNAME)]] > $(OUT_DIR)\pkgIndex.tcl
+	    [list load [file join $$dir $(PRJLIBNAME9)]] >> $(OUT_DIR)\pkgIndex.tcl
+	@echo } else { >> $(OUT_DIR)\pkgIndex.tcl
+	@echo package ifneeded $(PRJ_PACKAGE_TCLNAME) $(DOTVERSION) \
+	    [list load [file join $$dir $(PRJLIBNAME8)]] >> $(OUT_DIR)\pkgIndex.tcl
+	@echo } >> $(OUT_DIR)\pkgIndex.tcl
 !endif

 default-pkgindex-tea:
@@ -1605,6 +1620,8 @@ default-pkgindex-tea:
@PACKAGE_NAME@       $(PRJ_PACKAGE_TCLNAME)
@PACKAGE_TCLNAME@    $(PRJ_PACKAGE_TCLNAME)
@PKG_LIB_FILE@       $(PRJLIBNAME)
+@PKG_LIB_FILE8@      $(PRJLIBNAME8)
+@PKG_LIB_FILE9@      $(PRJLIBNAME9)
 <<

 default-install: default-install-binaries default-install-libraries
--- a/amd64/lib/reg1.3/tclreg13.dll
+++ b/amd64/lib/reg1.3/tclreg13.dll
--- a/amd64/lib/tcl8.6/auto.tcl
+++ b/amd64/lib/tcl8.6/auto.tcl
@@ -240,7 +240,7 @@ proc auto_mkindex_old {dir args} {
 	set f ""
 	set error [catch {
 	    set f [open $file]
-	    fconfigure $f -eofchar \032
+	    fconfigure $f -eofchar "\032 {}"
 	    while {[gets $f line] >= 0} {
 		if {[regexp {^proc[ 	]+([^ 	]*)} $line match procName]} {
 		    set procName [lindex [auto_qualify $procName "::"] 0]
@@ -351,7 +351,7 @@ proc auto_mkindex_parser::mkindex {file} {
    set scriptFile $file

    set fid [open $file]
-    fconfigure $fid -eofchar \032
+    fconfigure $fid -eofchar "\032 {}"
    set contents [read $fid]
    close $fid

--- a/amd64/lib/tcl8.6/clock.tcl
+++ b/amd64/lib/tcl8.6/clock.tcl
@@ -2988,8 +2988,7 @@ proc ::tcl::clock::GetSystemTimeZone {} {
 	set timezone $result
    } elseif {[set result [getenv TZ]] ne {}} {
 	set timezone $result
-    }
-    if {![info exists timezone]} {
+    } else {
        # Cache the time zone only if it was detected by one of the
        # expensive methods.
        if { [info exists CachedSystemTimeZone] } {
--- a/amd64/lib/tcl8.6/encoding/cns11643.enc
+++ b/amd64/lib/tcl8.6/encoding/cns11643.enc
--- a/amd64/lib/tcl8.6/encoding/iso8859-11.enc
+++ b/amd64/lib/tcl8.6/encoding/iso8859-11.enc
@@ -0,0 +1,20 @@
+# Encoding file: iso8859-11, single-byte
+S
+003F 0 1
+00
+0000000100020003000400050006000700080009000A000B000C000D000E000F
+0010001100120013001400150016001700180019001A001B001C001D001E001F
+0020002100220023002400250026002700280029002A002B002C002D002E002F
+0030003100320033003400350036003700380039003A003B003C003D003E003F
+0040004100420043004400450046004700480049004A004B004C004D004E004F
+0050005100520053005400550056005700580059005A005B005C005D005E005F
+0060006100620063006400650066006700680069006A006B006C006D006E006F
+0070007100720073007400750076007700780079007A007B007C007D007E007F
+0080008100820083008400850086008700880089008A008B008C008D008E008F
+0090009100920093009400950096009700980099009A009B009C009D009E009F
+00A00E010E020E030E040E050E060E070E080E090E0A0E0B0E0C0E0D0E0E0E0F
+0E100E110E120E130E140E150E160E170E180E190E1A0E1B0E1C0E1D0E1E0E1F
+0E200E210E220E230E240E250E260E270E280E290E2A0E2B0E2C0E2D0E2E0E2F
+0E300E310E320E330E340E350E360E370E380E390E3A00000000000000000E3F
+0E400E410E420E430E440E450E460E470E480E490E4A0E4B0E4C0E4D0E4E0E4F
+0E500E510E520E530E540E550E560E570E580E590E5A0E5B0000000000000000
--- a/amd64/lib/tcl8.6/encoding/iso8859-7.enc
+++ b/amd64/lib/tcl8.6/encoding/iso8859-7.enc
@@ -12,7 +12,7 @@ S
 0070007100720073007400750076007700780079007A007B007C007D007E007F
 0080008100820083008400850086008700880089008A008B008C008D008E008F
 0090009100920093009400950096009700980099009A009B009C009D009E009F
-00A02018201900A30000000000A600A700A800A9000000AB00AC00AD00002015
+00A02018201900A320AC20AF00A600A700A800A9037A00AB00AC00AD00002015
 00B000B100B200B303840385038600B703880389038A00BB038C00BD038E038F
 0390039103920393039403950396039703980399039A039B039C039D039E039F
 03A003A1000003A303A403A503A603A703A803A903AA03AB03AC03AD03AE03AF
--- a/amd64/lib/tcl8.6/init.tcl
+++ b/amd64/lib/tcl8.6/init.tcl
@@ -16,7 +16,7 @@
 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.6.11
+package require -exact Tcl 8.6.12

 # Compute the auto path to use in this interpreter.
 # The values on the path come from several locations:
@@ -494,7 +494,7 @@ proc auto_load_index {} {
 	    continue
 	} else {
 	    set error [catch {
-		fconfigure $f -eofchar \032
+		fconfigure $f -eofchar "\032 {}"
 		set id [gets $f]
 		if {$id eq "# Tcl autoload index file, version 2.0"} {
 		    eval [read $f]
@@ -643,7 +643,7 @@ proc auto_execok name {
    }
    set auto_execs($name) ""

-    set shellBuiltins [list assoc cls copy date del dir echo erase ftype \
+    set shellBuiltins [list assoc cls copy date del dir echo erase exit ftype \
 	    md mkdir mklink move rd ren rename rmdir start time type ver vol]
    if {[info exists env(PATHEXT)]} {
 	# Add an initial ; to have the {} extension check first.
--- a/amd64/lib/tcl8.6/opt0.4/optparse.tcl
+++ b/amd64/lib/tcl8.6/opt0.4/optparse.tcl
@@ -601,7 +601,7 @@ proc ::tcl::OptCheckType {arg type {typeArgs ""}} {
 	    return [expr {$arg ? 1 : 0}]
        }
        choice {
-            if {[lsearch -exact $typeArgs $arg] < 0} {
+            if {$arg ni $typeArgs} {
                error "invalid choice"
            }
 	    return $arg
--- a/amd64/lib/tcl8.6/safe.tcl
+++ b/amd64/lib/tcl8.6/safe.tcl
@@ -982,7 +982,7 @@ proc ::safe::AliasSource {child args} {
    set replacementMsg "script error"
    set code [catch {
 	set f [open $realfile]
-	fconfigure $f -eofchar \032
+	fconfigure $f -eofchar "\032 {}"
 	if {$encoding ne ""} {
 	    fconfigure $f -encoding $encoding
 	}
--- a/amd64/lib/tcl8.6/tzdata/Africa/Accra
+++ b/amd64/lib/tcl8.6/tzdata/Africa/Accra
@@ -1,66 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Accra) {
-    {-9223372036854775808 -52 0 LMT}
-    {-1709337548 0 0 GMT}
-    {-1581206400 1200 1 +0020}
-    {-1577917200 0 0 GMT}
-    {-1556834400 1200 1 +0020}
-    {-1546294800 0 0 GMT}
-    {-1525298400 1200 1 +0020}
-    {-1514758800 0 0 GMT}
-    {-1493762400 1200 1 +0020}
-    {-1483222800 0 0 GMT}
-    {-1462226400 1200 1 +0020}
-    {-1451686800 0 0 GMT}
-    {-1430604000 1200 1 +0020}
-    {-1420064400 0 0 GMT}
-    {-1399068000 1200 1 +0020}
-    {-1388528400 0 0 GMT}
-    {-1367532000 1200 1 +0020}
-    {-1356992400 0 0 GMT}
-    {-1335996000 1200 1 +0020}
-    {-1325456400 0 0 GMT}
-    {-1304373600 1200 1 +0020}
-    {-1293834000 0 0 GMT}
-    {-1272837600 1200 1 +0020}
-    {-1262298000 0 0 GMT}
-    {-1241301600 1200 1 +0020}
-    {-1230762000 0 0 GMT}
-    {-1209765600 1200 1 +0020}
-    {-1199226000 0 0 GMT}
-    {-1178143200 1200 1 +0020}
-    {-1167603600 0 0 GMT}
-    {-1146607200 1200 1 +0020}
-    {-1136067600 0 0 GMT}
-    {-1115071200 1200 1 +0020}
-    {-1104531600 0 0 GMT}
-    {-1083535200 1200 1 +0020}
-    {-1072995600 0 0 GMT}
-    {-1051912800 1200 1 +0020}
-    {-1041373200 0 0 GMT}
-    {-1020376800 1200 1 +0020}
-    {-1009837200 0 0 GMT}
-    {-988840800 1200 1 +0020}
-    {-978301200 0 0 GMT}
-    {-957304800 1200 1 +0020}
-    {-946765200 0 0 GMT}
-    {-936309600 1200 1 +0020}
-    {-915142800 0 0 GMT}
-    {-904773600 1200 1 +0020}
-    {-883606800 0 0 GMT}
-    {-880329600 1800 0 +0030}
-    {-756952200 0 0 GMT}
-    {-610149600 1800 1 +0030}
-    {-599610600 0 0 GMT}
-    {-578613600 1800 1 +0030}
-    {-568074600 0 0 GMT}
-    {-546991200 1800 1 +0030}
-    {-536452200 0 0 GMT}
-    {-515455200 1800 1 +0030}
-    {-504916200 0 0 GMT}
-    {-483919200 1800 1 +0030}
-    {-473380200 0 0 GMT}
-    {-452383200 1800 1 +0030}
-    {-441844200 0 0 GMT}
+if {![info exists TZData(Africa/Abidjan)]} {
+    LoadTimeZoneFile Africa/Abidjan
 }
+set TZData(:Africa/Accra) $TZData(:Africa/Abidjan)
--- a/amd64/lib/tcl8.6/tzdata/Africa/Juba
+++ b/amd64/lib/tcl8.6/tzdata/Africa/Juba
@@ -36,4 +36,5 @@ set TZData(:Africa/Juba) {
    {483487200 10800 1 CAST}
    {498171600 7200 0 CAT}
    {947930400 10800 0 EAT}
+    {1612126800 7200 0 CAT}
 }
--- a/amd64/lib/tcl8.6/tzdata/America/Anguilla
+++ b/amd64/lib/tcl8.6/tzdata/America/Anguilla
@@ -1,5 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(America/Port_of_Spain)]} {
-    LoadTimeZoneFile America/Port_of_Spain
+if {![info exists TZData(America/Puerto_Rico)]} {
+    LoadTimeZoneFile America/Puerto_Rico
 }
-set TZData(:America/Anguilla) $TZData(:America/Port_of_Spain)
+set TZData(:America/Anguilla) $TZData(:America/Puerto_Rico)
--- a/amd64/lib/tcl8.6/tzdata/America/Antigua
+++ b/amd64/lib/tcl8.6/tzdata/America/Antigua
@@ -1,5 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(America/Port_of_Spain)]} {
-    LoadTimeZoneFile America/Port_of_Spain
+if {![info exists TZData(America/Puerto_Rico)]} {
+    LoadTimeZoneFile America/Puerto_Rico
 }
-set TZData(:America/Antigua) $TZData(:America/Port_of_Spain)
+set TZData(:America/Antigua) $TZData(:America/Puerto_Rico)
--- a/amd64/lib/tcl8.6/tzdata/America/Aruba
+++ b/amd64/lib/tcl8.6/tzdata/America/Aruba
@@ -1,5 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(America/Curacao)]} {
-    LoadTimeZoneFile America/Curacao
+if {![info exists TZData(America/Puerto_Rico)]} {
+    LoadTimeZoneFile America/Puerto_Rico
 }
-set TZData(:America/Aruba) $TZData(:America/Curacao)
+set TZData(:America/Aruba) $TZData(:America/Puerto_Rico)
--- a/amd64/lib/tcl8.6/tzdata/America/Atikokan
+++ b/amd64/lib/tcl8.6/tzdata/America/Atikokan
@@ -1,12 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/Atikokan) {
-    {-9223372036854775808 -21988 0 LMT}
-    {-2366733212 -21600 0 CST}
-    {-1632067200 -18000 1 CDT}
-    {-1615136400 -21600 0 CST}
-    {-923248800 -18000 1 CDT}
-    {-880214400 -18000 0 CWT}
-    {-769395600 -18000 1 CPT}
-    {-765388800 -18000 0 EST}
+if {![info exists TZData(America/Panama)]} {
+    LoadTimeZoneFile America/Panama
 }
+set TZData(:America/Atikokan) $TZData(:America/Panama)
--- a/amd64/lib/tcl8.6/tzdata/America/Barbados
+++ b/amd64/lib/tcl8.6/tzdata/America/Barbados
@@ -2,8 +2,15 @@

 set TZData(:America/Barbados) {
    {-9223372036854775808 -14309 0 LMT}
-    {-1451678491 -14309 0 BMT}
-    {-1199217691 -14400 0 AST}
+    {-1841256091 -14400 0 AST}
+    {-874263600 -10800 1 ADT}
+    {-862682400 -14400 0 AST}
+    {-841604400 -10800 1 ADT}
+    {-830714400 -14400 0 AST}
+    {-820526400 -14400 0 -0330}
+    {-811882800 -12600 1 AST}
+    {-798660000 -14400 0 -0330}
+    {-788904000 -14400 0 AST}
    {234943200 -10800 1 ADT}
    {244616400 -14400 0 AST}
    {261554400 -10800 1 ADT}
--- a/amd64/lib/tcl8.6/tzdata/America/Blanc-Sablon
+++ b/amd64/lib/tcl8.6/tzdata/America/Blanc-Sablon
@@ -1,12 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/Blanc-Sablon) {
-    {-9223372036854775808 -13708 0 LMT}
-    {-2713896692 -14400 0 AST}
-    {-1632074400 -10800 1 ADT}
-    {-1615143600 -14400 0 AST}
-    {-880221600 -10800 1 AWT}
-    {-769395600 -10800 1 APT}
-    {-765399600 -14400 0 AST}
-    {14400 -14400 0 AST}
+if {![info exists TZData(America/Puerto_Rico)]} {
+    LoadTimeZoneFile America/Puerto_Rico
 }
+set TZData(:America/Blanc-Sablon) $TZData(:America/Puerto_Rico)
--- a/amd64/lib/tcl8.6/tzdata/America/Coral_Harbour
+++ b/amd64/lib/tcl8.6/tzdata/America/Coral_Harbour
@@ -1,5 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(America/Atikokan)]} {
-    LoadTimeZoneFile America/Atikokan
+if {![info exists TZData(America/Panama)]} {
+    LoadTimeZoneFile America/Panama
 }
-set TZData(:America/Coral_Harbour) $TZData(:America/Atikokan)
+set TZData(:America/Coral_Harbour) $TZData(:America/Panama)
--- a/amd64/lib/tcl8.6/tzdata/America/Creston
+++ b/amd64/lib/tcl8.6/tzdata/America/Creston
@@ -1,8 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/Creston) {
-    {-9223372036854775808 -27964 0 LMT}
-    {-2713882436 -25200 0 MST}
-    {-1680454800 -28800 0 PST}
-    {-1627833600 -25200 0 MST}
+if {![info exists TZData(America/Phoenix)]} {
+    LoadTimeZoneFile America/Phoenix
 }
+set TZData(:America/Creston) $TZData(:America/Phoenix)
--- a/amd64/lib/tcl8.6/tzdata/America/Curacao
+++ b/amd64/lib/tcl8.6/tzdata/America/Curacao
@@ -1,7 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/Curacao) {
-    {-9223372036854775808 -16547 0 LMT}
-    {-1826738653 -16200 0 -0430}
-    {-157750200 -14400 0 AST}
+if {![info exists TZData(America/Puerto_Rico)]} {
+    LoadTimeZoneFile America/Puerto_Rico
 }
+set TZData(:America/Curacao) $TZData(:America/Puerto_Rico)
--- a/amd64/lib/tcl8.6/tzdata/America/Dominica
+++ b/amd64/lib/tcl8.6/tzdata/America/Dominica
@@ -1,5 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(America/Port_of_Spain)]} {
-    LoadTimeZoneFile America/Port_of_Spain
+if {![info exists TZData(America/Puerto_Rico)]} {
+    LoadTimeZoneFile America/Puerto_Rico
 }
-set TZData(:America/Dominica) $TZData(:America/Port_of_Spain)
+set TZData(:America/Dominica) $TZData(:America/Puerto_Rico)
--- a/amd64/lib/tcl8.6/tzdata/America/Grenada
+++ b/amd64/lib/tcl8.6/tzdata/America/Grenada
@@ -1,5 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(America/Port_of_Spain)]} {
-    LoadTimeZoneFile America/Port_of_Spain
+if {![info exists TZData(America/Puerto_Rico)]} {
+    LoadTimeZoneFile America/Puerto_Rico
 }
-set TZData(:America/Grenada) $TZData(:America/Port_of_Spain)
+set TZData(:America/Grenada) $TZData(:America/Puerto_Rico)
--- a/amd64/lib/tcl8.6/tzdata/America/Guadeloupe
+++ b/amd64/lib/tcl8.6/tzdata/America/Guadeloupe
@@ -1,5 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(America/Port_of_Spain)]} {
-    LoadTimeZoneFile America/Port_of_Spain
+if {![info exists TZData(America/Puerto_Rico)]} {
+    LoadTimeZoneFile America/Puerto_Rico
 }
-set TZData(:America/Guadeloupe) $TZData(:America/Port_of_Spain)
+set TZData(:America/Guadeloupe) $TZData(:America/Puerto_Rico)
--- a/amd64/lib/tcl8.6/tzdata/America/Guyana
+++ b/amd64/lib/tcl8.6/tzdata/America/Guyana
@@ -1,8 +1,9 @@
 # created by tools/tclZIC.tcl - do not edit

 set TZData(:America/Guyana) {
-    {-9223372036854775808 -13960 0 LMT}
-    {-1730578040 -13500 0 -0345}
-    {176010300 -10800 0 -03}
-    {662698800 -14400 0 -04}
+    {-9223372036854775808 -13959 0 LMT}
+    {-1843589241 -14400 0 -04}
+    {-1730577600 -13500 0 -0345}
+    {176096700 -10800 0 -03}
+    {701841600 -14400 0 -04}
 }
--- a/amd64/lib/tcl8.6/tzdata/America/Kralendijk
+++ b/amd64/lib/tcl8.6/tzdata/America/Kralendijk
@@ -1,5 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(America/Curacao)]} {
-    LoadTimeZoneFile America/Curacao
+if {![info exists TZData(America/Puerto_Rico)]} {
+    LoadTimeZoneFile America/Puerto_Rico
 }
-set TZData(:America/Kralendijk) $TZData(:America/Curacao)
+set TZData(:America/Kralendijk) $TZData(:America/Puerto_Rico)
--- a/amd64/lib/tcl8.6/tzdata/America/Lower_Princes
+++ b/amd64/lib/tcl8.6/tzdata/America/Lower_Princes
@@ -1,5 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(America/Curacao)]} {
-    LoadTimeZoneFile America/Curacao
+if {![info exists TZData(America/Puerto_Rico)]} {
+    LoadTimeZoneFile America/Puerto_Rico
 }
-set TZData(:America/Lower_Princes) $TZData(:America/Curacao)
+set TZData(:America/Lower_Princes) $TZData(:America/Puerto_Rico)
--- a/amd64/lib/tcl8.6/tzdata/America/Marigot
+++ b/amd64/lib/tcl8.6/tzdata/America/Marigot
@@ -1,5 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(America/Port_of_Spain)]} {
-    LoadTimeZoneFile America/Port_of_Spain
+if {![info exists TZData(America/Puerto_Rico)]} {
+    LoadTimeZoneFile America/Puerto_Rico
 }
-set TZData(:America/Marigot) $TZData(:America/Port_of_Spain)
+set TZData(:America/Marigot) $TZData(:America/Puerto_Rico)
--- a/amd64/lib/tcl8.6/tzdata/America/Montserrat
+++ b/amd64/lib/tcl8.6/tzdata/America/Montserrat
@@ -1,5 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(America/Port_of_Spain)]} {
-    LoadTimeZoneFile America/Port_of_Spain
+if {![info exists TZData(America/Puerto_Rico)]} {
+    LoadTimeZoneFile America/Puerto_Rico
 }
-set TZData(:America/Montserrat) $TZData(:America/Port_of_Spain)
+set TZData(:America/Montserrat) $TZData(:America/Puerto_Rico)
--- a/amd64/lib/tcl8.6/tzdata/America/Nassau
+++ b/amd64/lib/tcl8.6/tzdata/America/Nassau
@@ -1,284 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/Nassau) {
-    {-9223372036854775808 -18570 0 LMT}
-    {-1825095030 -18000 0 EST}
-    {-873140400 -14400 1 EWT}
-    {-788904000 -18000 0 EST}
-    {-786222000 -14400 1 EWT}
-    {-769395600 -14400 1 EPT}
-    {-763848000 -18000 0 EST}
-    {-179341200 -14400 1 EDT}
-    {-163620000 -18000 0 EST}
-    {-147891600 -14400 1 EDT}
-    {-131565600 -18000 0 EST}
-    {-116442000 -14400 1 EDT}
-    {-100116000 -18000 0 EST}
-    {-84387600 -14400 1 EDT}
-    {-68666400 -18000 0 EST}
-    {-52938000 -14400 1 EDT}
-    {-37216800 -18000 0 EST}
-    {-21488400 -14400 1 EDT}
-    {-5767200 -18000 0 EST}
-    {9961200 -14400 1 EDT}
-    {25682400 -18000 0 EST}
-    {41410800 -14400 1 EDT}
-    {57736800 -18000 0 EST}
-    {73465200 -14400 1 EDT}
-    {89186400 -18000 0 EST}
-    {104914800 -14400 1 EDT}
-    {120636000 -18000 0 EST}
-    {136364400 -14400 1 EDT}
-    {152085600 -18000 0 EST}
-    {167814000 -14400 1 EDT}
-    {183535200 -18000 0 EST}
-    {189320400 -18000 0 EST}
-    {199263600 -14400 1 EDT}
-    {215589600 -18000 0 EST}
-    {230713200 -14400 1 EDT}
-    {247039200 -18000 0 EST}
-    {262767600 -14400 1 EDT}
-    {278488800 -18000 0 EST}
-    {294217200 -14400 1 EDT}
-    {309938400 -18000 0 EST}
-    {325666800 -14400 1 EDT}
-    {341388000 -18000 0 EST}
-    {357116400 -14400 1 EDT}
-    {372837600 -18000 0 EST}
-    {388566000 -14400 1 EDT}
-    {404892000 -18000 0 EST}
-    {420015600 -14400 1 EDT}
-    {436341600 -18000 0 EST}
-    {452070000 -14400 1 EDT}
-    {467791200 -18000 0 EST}
-    {483519600 -14400 1 EDT}
-    {499240800 -18000 0 EST}
-    {514969200 -14400 1 EDT}
-    {530690400 -18000 0 EST}
-    {544604400 -14400 1 EDT}
-    {562140000 -18000 0 EST}
-    {576054000 -14400 1 EDT}
-    {594194400 -18000 0 EST}
-    {607503600 -14400 1 EDT}
-    {625644000 -18000 0 EST}
-    {638953200 -14400 1 EDT}
-    {657093600 -18000 0 EST}
-    {671007600 -14400 1 EDT}
-    {688543200 -18000 0 EST}
-    {702457200 -14400 1 EDT}
-    {719992800 -18000 0 EST}
-    {733906800 -14400 1 EDT}
-    {752047200 -18000 0 EST}
-    {765356400 -14400 1 EDT}
-    {783496800 -18000 0 EST}
-    {796806000 -14400 1 EDT}
-    {814946400 -18000 0 EST}
-    {828860400 -14400 1 EDT}
-    {846396000 -18000 0 EST}
-    {860310000 -14400 1 EDT}
-    {877845600 -18000 0 EST}
-    {891759600 -14400 1 EDT}
-    {909295200 -18000 0 EST}
-    {923209200 -14400 1 EDT}
-    {941349600 -18000 0 EST}
-    {954658800 -14400 1 EDT}
-    {972799200 -18000 0 EST}
-    {986108400 -14400 1 EDT}
-    {1004248800 -18000 0 EST}
-    {1018162800 -14400 1 EDT}
-    {1035698400 -18000 0 EST}
-    {1049612400 -14400 1 EDT}
-    {1067148000 -18000 0 EST}
-    {1081062000 -14400 1 EDT}
-    {1099202400 -18000 0 EST}
-    {1112511600 -14400 1 EDT}
-    {1130652000 -18000 0 EST}
-    {1143961200 -14400 1 EDT}
-    {1162101600 -18000 0 EST}
-    {1173596400 -14400 1 EDT}
-    {1194156000 -18000 0 EST}
-    {1205046000 -14400 1 EDT}
-    {1225605600 -18000 0 EST}
-    {1236495600 -14400 1 EDT}
-    {1257055200 -18000 0 EST}
-    {1268550000 -14400 1 EDT}
-    {1289109600 -18000 0 EST}
-    {1299999600 -14400 1 EDT}
-    {1320559200 -18000 0 EST}
-    {1331449200 -14400 1 EDT}
-    {1352008800 -18000 0 EST}
-    {1362898800 -14400 1 EDT}
-    {1383458400 -18000 0 EST}
-    {1394348400 -14400 1 EDT}
-    {1414908000 -18000 0 EST}
-    {1425798000 -14400 1 EDT}
-    {1446357600 -18000 0 EST}
-    {1457852400 -14400 1 EDT}
-    {1478412000 -18000 0 EST}
-    {1489302000 -14400 1 EDT}
-    {1509861600 -18000 0 EST}
-    {1520751600 -14400 1 EDT}
-    {1541311200 -18000 0 EST}
-    {1552201200 -14400 1 EDT}
-    {1572760800 -18000 0 EST}
-    {1583650800 -14400 1 EDT}
-    {1604210400 -18000 0 EST}
-    {1615705200 -14400 1 EDT}
-    {1636264800 -18000 0 EST}
-    {1647154800 -14400 1 EDT}
-    {1667714400 -18000 0 EST}
-    {1678604400 -14400 1 EDT}
-    {1699164000 -18000 0 EST}
-    {1710054000 -14400 1 EDT}
-    {1730613600 -18000 0 EST}
-    {1741503600 -14400 1 EDT}
-    {1762063200 -18000 0 EST}
-    {1772953200 -14400 1 EDT}
-    {1793512800 -18000 0 EST}
-    {1805007600 -14400 1 EDT}
-    {1825567200 -18000 0 EST}
-    {1836457200 -14400 1 EDT}
-    {1857016800 -18000 0 EST}
-    {1867906800 -14400 1 EDT}
-    {1888466400 -18000 0 EST}
-    {1899356400 -14400 1 EDT}
-    {1919916000 -18000 0 EST}
-    {1930806000 -14400 1 EDT}
-    {1951365600 -18000 0 EST}
-    {1962860400 -14400 1 EDT}
-    {1983420000 -18000 0 EST}
-    {1994310000 -14400 1 EDT}
-    {2014869600 -18000 0 EST}
-    {2025759600 -14400 1 EDT}
-    {2046319200 -18000 0 EST}
-    {2057209200 -14400 1 EDT}
-    {2077768800 -18000 0 EST}
-    {2088658800 -14400 1 EDT}
-    {2109218400 -18000 0 EST}
-    {2120108400 -14400 1 EDT}
-    {2140668000 -18000 0 EST}
-    {2152162800 -14400 1 EDT}
-    {2172722400 -18000 0 EST}
-    {2183612400 -14400 1 EDT}
-    {2204172000 -18000 0 EST}
-    {2215062000 -14400 1 EDT}
-    {2235621600 -18000 0 EST}
-    {2246511600 -14400 1 EDT}
-    {2267071200 -18000 0 EST}
-    {2277961200 -14400 1 EDT}
-    {2298520800 -18000 0 EST}
-    {2309410800 -14400 1 EDT}
-    {2329970400 -18000 0 EST}
-    {2341465200 -14400 1 EDT}
-    {2362024800 -18000 0 EST}
-    {2372914800 -14400 1 EDT}
-    {2393474400 -18000 0 EST}
-    {2404364400 -14400 1 EDT}
-    {2424924000 -18000 0 EST}
-    {2435814000 -14400 1 EDT}
-    {2456373600 -18000 0 EST}
-    {2467263600 -14400 1 EDT}
-    {2487823200 -18000 0 EST}
-    {2499318000 -14400 1 EDT}
-    {2519877600 -18000 0 EST}
-    {2530767600 -14400 1 EDT}
-    {2551327200 -18000 0 EST}
-    {2562217200 -14400 1 EDT}
-    {2582776800 -18000 0 EST}
-    {2593666800 -14400 1 EDT}
-    {2614226400 -18000 0 EST}
-    {2625116400 -14400 1 EDT}
-    {2645676000 -18000 0 EST}
-    {2656566000 -14400 1 EDT}
-    {2677125600 -18000 0 EST}
-    {2688620400 -14400 1 EDT}
-    {2709180000 -18000 0 EST}
-    {2720070000 -14400 1 EDT}
-    {2740629600 -18000 0 EST}
-    {2751519600 -14400 1 EDT}
-    {2772079200 -18000 0 EST}
-    {2782969200 -14400 1 EDT}
-    {2803528800 -18000 0 EST}
-    {2814418800 -14400 1 EDT}
-    {2834978400 -18000 0 EST}
-    {2846473200 -14400 1 EDT}
-    {2867032800 -18000 0 EST}
-    {2877922800 -14400 1 EDT}
-    {2898482400 -18000 0 EST}
-    {2909372400 -14400 1 EDT}
-    {2929932000 -18000 0 EST}
-    {2940822000 -14400 1 EDT}
-    {2961381600 -18000 0 EST}
-    {2972271600 -14400 1 EDT}
-    {2992831200 -18000 0 EST}
-    {3003721200 -14400 1 EDT}
-    {3024280800 -18000 0 EST}
-    {3035775600 -14400 1 EDT}
-    {3056335200 -18000 0 EST}
-    {3067225200 -14400 1 EDT}
-    {3087784800 -18000 0 EST}
-    {3098674800 -14400 1 EDT}
-    {3119234400 -18000 0 EST}
-    {3130124400 -14400 1 EDT}
-    {3150684000 -18000 0 EST}
-    {3161574000 -14400 1 EDT}
-    {3182133600 -18000 0 EST}
-    {3193023600 -14400 1 EDT}
-    {3213583200 -18000 0 EST}
-    {3225078000 -14400 1 EDT}
-    {3245637600 -18000 0 EST}
-    {3256527600 -14400 1 EDT}
-    {3277087200 -18000 0 EST}
-    {3287977200 -14400 1 EDT}
-    {3308536800 -18000 0 EST}
-    {3319426800 -14400 1 EDT}
-    {3339986400 -18000 0 EST}
-    {3350876400 -14400 1 EDT}
-    {3371436000 -18000 0 EST}
-    {3382930800 -14400 1 EDT}
-    {3403490400 -18000 0 EST}
-    {3414380400 -14400 1 EDT}
-    {3434940000 -18000 0 EST}
-    {3445830000 -14400 1 EDT}
-    {3466389600 -18000 0 EST}
-    {3477279600 -14400 1 EDT}
-    {3497839200 -18000 0 EST}
-    {3508729200 -14400 1 EDT}
-    {3529288800 -18000 0 EST}
-    {3540178800 -14400 1 EDT}
-    {3560738400 -18000 0 EST}
-    {3572233200 -14400 1 EDT}
-    {3592792800 -18000 0 EST}
-    {3603682800 -14400 1 EDT}
-    {3624242400 -18000 0 EST}
-    {3635132400 -14400 1 EDT}
-    {3655692000 -18000 0 EST}
-    {3666582000 -14400 1 EDT}
-    {3687141600 -18000 0 EST}
-    {3698031600 -14400 1 EDT}
-    {3718591200 -18000 0 EST}
-    {3730086000 -14400 1 EDT}
-    {3750645600 -18000 0 EST}
-    {3761535600 -14400 1 EDT}
-    {3782095200 -18000 0 EST}
-    {3792985200 -14400 1 EDT}
-    {3813544800 -18000 0 EST}
-    {3824434800 -14400 1 EDT}
-    {3844994400 -18000 0 EST}
-    {3855884400 -14400 1 EDT}
-    {3876444000 -18000 0 EST}
-    {3887334000 -14400 1 EDT}
-    {3907893600 -18000 0 EST}
-    {3919388400 -14400 1 EDT}
-    {3939948000 -18000 0 EST}
-    {3950838000 -14400 1 EDT}
-    {3971397600 -18000 0 EST}
-    {3982287600 -14400 1 EDT}
-    {4002847200 -18000 0 EST}
-    {4013737200 -14400 1 EDT}
-    {4034296800 -18000 0 EST}
-    {4045186800 -14400 1 EDT}
-    {4065746400 -18000 0 EST}
-    {4076636400 -14400 1 EDT}
-    {4097196000 -18000 0 EST}
+if {![info exists TZData(America/Toronto)]} {
+    LoadTimeZoneFile America/Toronto
 }
+set TZData(:America/Nassau) $TZData(:America/Toronto)
--- a/amd64/lib/tcl8.6/tzdata/America/Port_of_Spain
+++ b/amd64/lib/tcl8.6/tzdata/America/Port_of_Spain
@@ -1,6 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/Port_of_Spain) {
-    {-9223372036854775808 -14764 0 LMT}
-    {-1825098836 -14400 0 AST}
+if {![info exists TZData(America/Puerto_Rico)]} {
+    LoadTimeZoneFile America/Puerto_Rico
 }
+set TZData(:America/Port_of_Spain) $TZData(:America/Puerto_Rico)
--- a/amd64/lib/tcl8.6/tzdata/America/St_Barthelemy
+++ b/amd64/lib/tcl8.6/tzdata/America/St_Barthelemy
@@ -1,5 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(America/Port_of_Spain)]} {
-    LoadTimeZoneFile America/Port_of_Spain
+if {![info exists TZData(America/Puerto_Rico)]} {
+    LoadTimeZoneFile America/Puerto_Rico
 }
-set TZData(:America/St_Barthelemy) $TZData(:America/Port_of_Spain)
+set TZData(:America/St_Barthelemy) $TZData(:America/Puerto_Rico)
--- a/amd64/lib/tcl8.6/tzdata/America/St_Kitts
+++ b/amd64/lib/tcl8.6/tzdata/America/St_Kitts
@@ -1,5 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(America/Port_of_Spain)]} {
-    LoadTimeZoneFile America/Port_of_Spain
+if {![info exists TZData(America/Puerto_Rico)]} {
+    LoadTimeZoneFile America/Puerto_Rico
 }
-set TZData(:America/St_Kitts) $TZData(:America/Port_of_Spain)
+set TZData(:America/St_Kitts) $TZData(:America/Puerto_Rico)
--- a/amd64/lib/tcl8.6/tzdata/America/St_Lucia
+++ b/amd64/lib/tcl8.6/tzdata/America/St_Lucia
@@ -1,5 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(America/Port_of_Spain)]} {
-    LoadTimeZoneFile America/Port_of_Spain
+if {![info exists TZData(America/Puerto_Rico)]} {
+    LoadTimeZoneFile America/Puerto_Rico
 }
-set TZData(:America/St_Lucia) $TZData(:America/Port_of_Spain)
+set TZData(:America/St_Lucia) $TZData(:America/Puerto_Rico)
--- a/amd64/lib/tcl8.6/tzdata/America/St_Thomas
+++ b/amd64/lib/tcl8.6/tzdata/America/St_Thomas
@@ -1,5 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(America/Port_of_Spain)]} {
-    LoadTimeZoneFile America/Port_of_Spain
+if {![info exists TZData(America/Puerto_Rico)]} {
+    LoadTimeZoneFile America/Puerto_Rico
 }
-set TZData(:America/St_Thomas) $TZData(:America/Port_of_Spain)
+set TZData(:America/St_Thomas) $TZData(:America/Puerto_Rico)
--- a/amd64/lib/tcl8.6/tzdata/America/St_Vincent
+++ b/amd64/lib/tcl8.6/tzdata/America/St_Vincent
@@ -1,5 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(America/Port_of_Spain)]} {
-    LoadTimeZoneFile America/Port_of_Spain
+if {![info exists TZData(America/Puerto_Rico)]} {
+    LoadTimeZoneFile America/Puerto_Rico
 }
-set TZData(:America/St_Vincent) $TZData(:America/Port_of_Spain)
+set TZData(:America/St_Vincent) $TZData(:America/Puerto_Rico)
--- a/amd64/lib/tcl8.6/tzdata/America/Tortola
+++ b/amd64/lib/tcl8.6/tzdata/America/Tortola
@@ -1,5 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(America/Port_of_Spain)]} {
-    LoadTimeZoneFile America/Port_of_Spain
+if {![info exists TZData(America/Puerto_Rico)]} {
+    LoadTimeZoneFile America/Puerto_Rico
 }
-set TZData(:America/Tortola) $TZData(:America/Port_of_Spain)
+set TZData(:America/Tortola) $TZData(:America/Puerto_Rico)
--- a/amd64/lib/tcl8.6/tzdata/America/Virgin
+++ b/amd64/lib/tcl8.6/tzdata/America/Virgin
@@ -1,5 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(America/Port_of_Spain)]} {
-    LoadTimeZoneFile America/Port_of_Spain
+if {![info exists TZData(America/Puerto_Rico)]} {
+    LoadTimeZoneFile America/Puerto_Rico
 }
-set TZData(:America/Virgin) $TZData(:America/Port_of_Spain)
+set TZData(:America/Virgin) $TZData(:America/Puerto_Rico)
--- a/amd64/lib/tcl8.6/tzdata/Antarctica/DumontDUrville
+++ b/amd64/lib/tcl8.6/tzdata/Antarctica/DumontDUrville
@@ -1,8 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Antarctica/DumontDUrville) {
-    {-9223372036854775808 0 0 -00}
-    {-725846400 36000 0 +10}
-    {-566992800 0 0 -00}
-    {-415497600 36000 0 +10}
+if {![info exists TZData(Pacific/Port_Moresby)]} {
+    LoadTimeZoneFile Pacific/Port_Moresby
 }
+set TZData(:Antarctica/DumontDUrville) $TZData(:Pacific/Port_Moresby)
--- a/amd64/lib/tcl8.6/tzdata/Antarctica/Syowa
+++ b/amd64/lib/tcl8.6/tzdata/Antarctica/Syowa
@@ -1,6 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Antarctica/Syowa) {
-    {-9223372036854775808 0 0 -00}
-    {-407808000 10800 0 +03}
+if {![info exists TZData(Asia/Riyadh)]} {
+    LoadTimeZoneFile Asia/Riyadh
 }
+set TZData(:Antarctica/Syowa) $TZData(:Asia/Riyadh)
--- a/amd64/lib/tcl8.6/tzdata/Asia/Amman
+++ b/amd64/lib/tcl8.6/tzdata/Asia/Amman
@@ -87,160 +87,160 @@ set TZData(:Asia/Amman) {
    {1604008800 7200 0 EET}
    {1616709600 10800 1 EEST}
    {1635458400 7200 0 EET}
-    {1648764000 10800 1 EEST}
+    {1645740000 10800 1 EEST}
    {1666908000 7200 0 EET}
-    {1680213600 10800 1 EEST}
+    {1677189600 10800 1 EEST}
    {1698357600 7200 0 EET}
-    {1711663200 10800 1 EEST}
+    {1709244000 10800 1 EEST}
    {1729807200 7200 0 EET}
-    {1743112800 10800 1 EEST}
+    {1740693600 10800 1 EEST}
    {1761861600 7200 0 EET}
-    {1774562400 10800 1 EEST}
+    {1772143200 10800 1 EEST}
    {1793311200 7200 0 EET}
-    {1806012000 10800 1 EEST}
+    {1803592800 10800 1 EEST}
    {1824760800 7200 0 EET}
-    {1838066400 10800 1 EEST}
+    {1835042400 10800 1 EEST}
    {1856210400 7200 0 EET}
-    {1869516000 10800 1 EEST}
+    {1866492000 10800 1 EEST}
    {1887660000 7200 0 EET}
-    {1900965600 10800 1 EEST}
+    {1898546400 10800 1 EEST}
    {1919109600 7200 0 EET}
-    {1932415200 10800 1 EEST}
+    {1929996000 10800 1 EEST}
    {1951164000 7200 0 EET}
-    {1963864800 10800 1 EEST}
+    {1961445600 10800 1 EEST}
    {1982613600 7200 0 EET}
-    {1995919200 10800 1 EEST}
+    {1992895200 10800 1 EEST}
    {2014063200 7200 0 EET}
-    {2027368800 10800 1 EEST}
+    {2024344800 10800 1 EEST}
    {2045512800 7200 0 EET}
-    {2058818400 10800 1 EEST}
+    {2055794400 10800 1 EEST}
    {2076962400 7200 0 EET}
-    {2090268000 10800 1 EEST}
+    {2087848800 10800 1 EEST}
    {2109016800 7200 0 EET}
-    {2121717600 10800 1 EEST}
+    {2119298400 10800 1 EEST}
    {2140466400 7200 0 EET}
-    {2153167200 10800 1 EEST}
+    {2150748000 10800 1 EEST}
    {2171916000 7200 0 EET}
-    {2185221600 10800 1 EEST}
+    {2182197600 10800 1 EEST}
    {2203365600 7200 0 EET}
-    {2216671200 10800 1 EEST}
+    {2213647200 10800 1 EEST}
    {2234815200 7200 0 EET}
-    {2248120800 10800 1 EEST}
+    {2245701600 10800 1 EEST}
    {2266264800 7200 0 EET}
-    {2279570400 10800 1 EEST}
+    {2277151200 10800 1 EEST}
    {2298319200 7200 0 EET}
-    {2311020000 10800 1 EEST}
+    {2308600800 10800 1 EEST}
    {2329768800 7200 0 EET}
-    {2343074400 10800 1 EEST}
+    {2340050400 10800 1 EEST}
    {2361218400 7200 0 EET}
-    {2374524000 10800 1 EEST}
+    {2371500000 10800 1 EEST}
    {2392668000 7200 0 EET}
-    {2405973600 10800 1 EEST}
+    {2402949600 10800 1 EEST}
    {2424117600 7200 0 EET}
-    {2437423200 10800 1 EEST}
+    {2435004000 10800 1 EEST}
    {2455567200 7200 0 EET}
-    {2468872800 10800 1 EEST}
+    {2466453600 10800 1 EEST}
    {2487621600 7200 0 EET}
-    {2500322400 10800 1 EEST}
+    {2497903200 10800 1 EEST}
    {2519071200 7200 0 EET}
-    {2532376800 10800 1 EEST}
+    {2529352800 10800 1 EEST}
    {2550520800 7200 0 EET}
-    {2563826400 10800 1 EEST}
+    {2560802400 10800 1 EEST}
    {2581970400 7200 0 EET}
-    {2595276000 10800 1 EEST}
+    {2592856800 10800 1 EEST}
    {2613420000 7200 0 EET}
-    {2626725600 10800 1 EEST}
+    {2624306400 10800 1 EEST}
    {2645474400 7200 0 EET}
-    {2658175200 10800 1 EEST}
+    {2655756000 10800 1 EEST}
    {2676924000 7200 0 EET}
-    {2689624800 10800 1 EEST}
+    {2687205600 10800 1 EEST}
    {2708373600 7200 0 EET}
-    {2721679200 10800 1 EEST}
+    {2718655200 10800 1 EEST}
    {2739823200 7200 0 EET}
-    {2753128800 10800 1 EEST}
+    {2750104800 10800 1 EEST}
    {2771272800 7200 0 EET}
-    {2784578400 10800 1 EEST}
+    {2782159200 10800 1 EEST}
    {2802722400 7200 0 EET}
-    {2816028000 10800 1 EEST}
+    {2813608800 10800 1 EEST}
    {2834776800 7200 0 EET}
-    {2847477600 10800 1 EEST}
+    {2845058400 10800 1 EEST}
    {2866226400 7200 0 EET}
-    {2879532000 10800 1 EEST}
+    {2876508000 10800 1 EEST}
    {2897676000 7200 0 EET}
-    {2910981600 10800 1 EEST}
+    {2907957600 10800 1 EEST}
    {2929125600 7200 0 EET}
-    {2942431200 10800 1 EEST}
+    {2939407200 10800 1 EEST}
    {2960575200 7200 0 EET}
-    {2973880800 10800 1 EEST}
+    {2971461600 10800 1 EEST}
    {2992629600 7200 0 EET}
-    {3005330400 10800 1 EEST}
+    {3002911200 10800 1 EEST}
    {3024079200 7200 0 EET}
-    {3036780000 10800 1 EEST}
+    {3034360800 10800 1 EEST}
    {3055528800 7200 0 EET}
-    {3068834400 10800 1 EEST}
+    {3065810400 10800 1 EEST}
    {3086978400 7200 0 EET}
-    {3100284000 10800 1 EEST}
+    {3097260000 10800 1 EEST}
    {3118428000 7200 0 EET}
-    {3131733600 10800 1 EEST}
+    {3129314400 10800 1 EEST}
    {3149877600 7200 0 EET}
-    {3163183200 10800 1 EEST}
+    {3160764000 10800 1 EEST}
    {3181932000 7200 0 EET}
-    {3194632800 10800 1 EEST}
+    {3192213600 10800 1 EEST}
    {3213381600 7200 0 EET}
-    {3226687200 10800 1 EEST}
+    {3223663200 10800 1 EEST}
    {3244831200 7200 0 EET}
-    {3258136800 10800 1 EEST}
+    {3255112800 10800 1 EEST}
    {3276280800 7200 0 EET}
-    {3289586400 10800 1 EEST}
+    {3286562400 10800 1 EEST}
    {3307730400 7200 0 EET}
-    {3321036000 10800 1 EEST}
+    {3318616800 10800 1 EEST}
    {3339180000 7200 0 EET}
-    {3352485600 10800 1 EEST}
+    {3350066400 10800 1 EEST}
    {3371234400 7200 0 EET}
-    {3383935200 10800 1 EEST}
+    {3381516000 10800 1 EEST}
    {3402684000 7200 0 EET}
-    {3415989600 10800 1 EEST}
+    {3412965600 10800 1 EEST}
    {3434133600 7200 0 EET}
-    {3447439200 10800 1 EEST}
+    {3444415200 10800 1 EEST}
    {3465583200 7200 0 EET}
-    {3478888800 10800 1 EEST}
+    {3476469600 10800 1 EEST}
    {3497032800 7200 0 EET}
-    {3510338400 10800 1 EEST}
+    {3507919200 10800 1 EEST}
    {3529087200 7200 0 EET}
-    {3541788000 10800 1 EEST}
+    {3539368800 10800 1 EEST}
    {3560536800 7200 0 EET}
-    {3573237600 10800 1 EEST}
+    {3570818400 10800 1 EEST}
    {3591986400 7200 0 EET}
-    {3605292000 10800 1 EEST}
+    {3602268000 10800 1 EEST}
    {3623436000 7200 0 EET}
-    {3636741600 10800 1 EEST}
+    {3633717600 10800 1 EEST}
    {3654885600 7200 0 EET}
-    {3668191200 10800 1 EEST}
+    {3665772000 10800 1 EEST}
    {3686335200 7200 0 EET}
-    {3699640800 10800 1 EEST}
+    {3697221600 10800 1 EEST}
    {3718389600 7200 0 EET}
-    {3731090400 10800 1 EEST}
+    {3728671200 10800 1 EEST}
    {3749839200 7200 0 EET}
-    {3763144800 10800 1 EEST}
+    {3760120800 10800 1 EEST}
    {3781288800 7200 0 EET}
-    {3794594400 10800 1 EEST}
+    {3791570400 10800 1 EEST}
    {3812738400 7200 0 EET}
-    {3826044000 10800 1 EEST}
+    {3823020000 10800 1 EEST}
    {3844188000 7200 0 EET}
-    {3857493600 10800 1 EEST}
+    {3855074400 10800 1 EEST}
    {3876242400 7200 0 EET}
-    {3888943200 10800 1 EEST}
+    {3886524000 10800 1 EEST}
    {3907692000 7200 0 EET}
-    {3920392800 10800 1 EEST}
+    {3917973600 10800 1 EEST}
    {3939141600 7200 0 EET}
-    {3952447200 10800 1 EEST}
+    {3949423200 10800 1 EEST}
    {3970591200 7200 0 EET}
-    {3983896800 10800 1 EEST}
+    {3980872800 10800 1 EEST}
    {4002040800 7200 0 EET}
-    {4015346400 10800 1 EEST}
+    {4012927200 10800 1 EEST}
    {4033490400 7200 0 EET}
-    {4046796000 10800 1 EEST}
+    {4044376800 10800 1 EEST}
    {4065544800 7200 0 EET}
-    {4078245600 10800 1 EEST}
+    {4075826400 10800 1 EEST}
    {4096994400 7200 0 EET}
 }
--- a/amd64/lib/tcl8.6/tzdata/Asia/Gaza
+++ b/amd64/lib/tcl8.6/tzdata/Asia/Gaza
@@ -124,161 +124,161 @@ set TZData(:Asia/Gaza) {
    {1585346400 10800 1 EEST}
    {1603490400 7200 0 EET}
    {1616796000 10800 1 EEST}
-    {1635544800 7200 0 EET}
+    {1635458400 7200 0 EET}
    {1648245600 10800 1 EEST}
-    {1666994400 7200 0 EET}
+    {1666908000 7200 0 EET}
    {1679695200 10800 1 EEST}
-    {1698444000 7200 0 EET}
+    {1698357600 7200 0 EET}
    {1711749600 10800 1 EEST}
-    {1729893600 7200 0 EET}
+    {1729807200 7200 0 EET}
    {1743199200 10800 1 EEST}
-    {1761343200 7200 0 EET}
+    {1761861600 7200 0 EET}
    {1774648800 10800 1 EEST}
-    {1792792800 7200 0 EET}
+    {1793311200 7200 0 EET}
    {1806098400 10800 1 EEST}
-    {1824847200 7200 0 EET}
+    {1824760800 7200 0 EET}
    {1837548000 10800 1 EEST}
-    {1856296800 7200 0 EET}
+    {1856210400 7200 0 EET}
    {1868997600 10800 1 EEST}
-    {1887746400 7200 0 EET}
+    {1887660000 7200 0 EET}
    {1901052000 10800 1 EEST}
-    {1919196000 7200 0 EET}
+    {1919109600 7200 0 EET}
    {1932501600 10800 1 EEST}
-    {1950645600 7200 0 EET}
+    {1951164000 7200 0 EET}
    {1963951200 10800 1 EEST}
-    {1982700000 7200 0 EET}
+    {1982613600 7200 0 EET}
    {1995400800 10800 1 EEST}
-    {2014149600 7200 0 EET}
+    {2014063200 7200 0 EET}
    {2026850400 10800 1 EEST}
-    {2045599200 7200 0 EET}
+    {2045512800 7200 0 EET}
    {2058300000 10800 1 EEST}
-    {2077048800 7200 0 EET}
+    {2076962400 7200 0 EET}
    {2090354400 10800 1 EEST}
-    {2108498400 7200 0 EET}
+    {2109016800 7200 0 EET}
    {2121804000 10800 1 EEST}
-    {2139948000 7200 0 EET}
+    {2140466400 7200 0 EET}
    {2153253600 10800 1 EEST}
-    {2172002400 7200 0 EET}
+    {2171916000 7200 0 EET}
    {2184703200 10800 1 EEST}
-    {2203452000 7200 0 EET}
+    {2203365600 7200 0 EET}
    {2216152800 10800 1 EEST}
-    {2234901600 7200 0 EET}
+    {2234815200 7200 0 EET}
    {2248207200 10800 1 EEST}
-    {2266351200 7200 0 EET}
+    {2266264800 7200 0 EET}
    {2279656800 10800 1 EEST}
-    {2297800800 7200 0 EET}
+    {2298319200 7200 0 EET}
    {2311106400 10800 1 EEST}
-    {2329250400 7200 0 EET}
+    {2329768800 7200 0 EET}
    {2342556000 10800 1 EEST}
-    {2361304800 7200 0 EET}
+    {2361218400 7200 0 EET}
    {2374005600 10800 1 EEST}
-    {2392754400 7200 0 EET}
+    {2392668000 7200 0 EET}
    {2405455200 10800 1 EEST}
-    {2424204000 7200 0 EET}
+    {2424117600 7200 0 EET}
    {2437509600 10800 1 EEST}
-    {2455653600 7200 0 EET}
+    {2455567200 7200 0 EET}
    {2468959200 10800 1 EEST}
-    {2487103200 7200 0 EET}
+    {2487621600 7200 0 EET}
    {2500408800 10800 1 EEST}
-    {2519157600 7200 0 EET}
+    {2519071200 7200 0 EET}
    {2531858400 10800 1 EEST}
-    {2550607200 7200 0 EET}
+    {2550520800 7200 0 EET}
    {2563308000 10800 1 EEST}
-    {2582056800 7200 0 EET}
+    {2581970400 7200 0 EET}
    {2595362400 10800 1 EEST}
-    {2613506400 7200 0 EET}
+    {2613420000 7200 0 EET}
    {2626812000 10800 1 EEST}
-    {2644956000 7200 0 EET}
+    {2645474400 7200 0 EET}
    {2658261600 10800 1 EEST}
-    {2676405600 7200 0 EET}
+    {2676924000 7200 0 EET}
    {2689711200 10800 1 EEST}
-    {2708460000 7200 0 EET}
+    {2708373600 7200 0 EET}
    {2721160800 10800 1 EEST}
-    {2739909600 7200 0 EET}
+    {2739823200 7200 0 EET}
    {2752610400 10800 1 EEST}
-    {2771359200 7200 0 EET}
+    {2771272800 7200 0 EET}
    {2784664800 10800 1 EEST}
-    {2802808800 7200 0 EET}
+    {2802722400 7200 0 EET}
    {2816114400 10800 1 EEST}
-    {2834258400 7200 0 EET}
+    {2834776800 7200 0 EET}
    {2847564000 10800 1 EEST}
-    {2866312800 7200 0 EET}
+    {2866226400 7200 0 EET}
    {2879013600 10800 1 EEST}
-    {2897762400 7200 0 EET}
+    {2897676000 7200 0 EET}
    {2910463200 10800 1 EEST}
-    {2929212000 7200 0 EET}
+    {2929125600 7200 0 EET}
    {2941912800 10800 1 EEST}
-    {2960661600 7200 0 EET}
+    {2960575200 7200 0 EET}
    {2973967200 10800 1 EEST}
-    {2992111200 7200 0 EET}
+    {2992629600 7200 0 EET}
    {3005416800 10800 1 EEST}
-    {3023560800 7200 0 EET}
+    {3024079200 7200 0 EET}
    {3036866400 10800 1 EEST}
-    {3055615200 7200 0 EET}
+    {3055528800 7200 0 EET}
    {3068316000 10800 1 EEST}
-    {3087064800 7200 0 EET}
+    {3086978400 7200 0 EET}
    {3099765600 10800 1 EEST}
-    {3118514400 7200 0 EET}
+    {3118428000 7200 0 EET}
    {3131820000 10800 1 EEST}
-    {3149964000 7200 0 EET}
+    {3149877600 7200 0 EET}
    {3163269600 10800 1 EEST}
-    {3181413600 7200 0 EET}
+    {3181932000 7200 0 EET}
    {3194719200 10800 1 EEST}
-    {3212863200 7200 0 EET}
+    {3213381600 7200 0 EET}
    {3226168800 10800 1 EEST}
-    {3244917600 7200 0 EET}
+    {3244831200 7200 0 EET}
    {3257618400 10800 1 EEST}
-    {3276367200 7200 0 EET}
+    {3276280800 7200 0 EET}
    {3289068000 10800 1 EEST}
-    {3307816800 7200 0 EET}
+    {3307730400 7200 0 EET}
    {3321122400 10800 1 EEST}
-    {3339266400 7200 0 EET}
+    {3339180000 7200 0 EET}
    {3352572000 10800 1 EEST}
-    {3370716000 7200 0 EET}
+    {3371234400 7200 0 EET}
    {3384021600 10800 1 EEST}
-    {3402770400 7200 0 EET}
+    {3402684000 7200 0 EET}
    {3415471200 10800 1 EEST}
-    {3434220000 7200 0 EET}
+    {3434133600 7200 0 EET}
    {3446920800 10800 1 EEST}
-    {3465669600 7200 0 EET}
+    {3465583200 7200 0 EET}
    {3478975200 10800 1 EEST}
-    {3497119200 7200 0 EET}
+    {3497032800 7200 0 EET}
    {3510424800 10800 1 EEST}
-    {3528568800 7200 0 EET}
+    {3529087200 7200 0 EET}
    {3541874400 10800 1 EEST}
-    {3560018400 7200 0 EET}
+    {3560536800 7200 0 EET}
    {3573324000 10800 1 EEST}
-    {3592072800 7200 0 EET}
+    {3591986400 7200 0 EET}
    {3604773600 10800 1 EEST}
-    {3623522400 7200 0 EET}
+    {3623436000 7200 0 EET}
    {3636223200 10800 1 EEST}
-    {3654972000 7200 0 EET}
+    {3654885600 7200 0 EET}
    {3668277600 10800 1 EEST}
-    {3686421600 7200 0 EET}
+    {3686335200 7200 0 EET}
    {3699727200 10800 1 EEST}
-    {3717871200 7200 0 EET}
+    {3718389600 7200 0 EET}
    {3731176800 10800 1 EEST}
-    {3749925600 7200 0 EET}
+    {3749839200 7200 0 EET}
    {3762626400 10800 1 EEST}
-    {3781375200 7200 0 EET}
+    {3781288800 7200 0 EET}
    {3794076000 10800 1 EEST}
-    {3812824800 7200 0 EET}
+    {3812738400 7200 0 EET}
    {3825525600 10800 1 EEST}
-    {3844274400 7200 0 EET}
+    {3844188000 7200 0 EET}
    {3857580000 10800 1 EEST}
-    {3875724000 7200 0 EET}
+    {3876242400 7200 0 EET}
    {3889029600 10800 1 EEST}
-    {3907173600 7200 0 EET}
+    {3907692000 7200 0 EET}
    {3920479200 10800 1 EEST}
-    {3939228000 7200 0 EET}
+    {3939141600 7200 0 EET}
    {3951928800 10800 1 EEST}
-    {3970677600 7200 0 EET}
+    {3970591200 7200 0 EET}
    {3983378400 10800 1 EEST}
-    {4002127200 7200 0 EET}
+    {4002040800 7200 0 EET}
    {4015432800 10800 1 EEST}
-    {4033576800 7200 0 EET}
+    {4033490400 7200 0 EET}
    {4046882400 10800 1 EEST}
-    {4065026400 7200 0 EET}
+    {4065544800 7200 0 EET}
    {4078332000 10800 1 EEST}
-    {4096476000 7200 0 EET}
+    {4096994400 7200 0 EET}
 }
--- a/amd64/lib/tcl8.6/tzdata/Asia/Hebron
+++ b/amd64/lib/tcl8.6/tzdata/Asia/Hebron
@@ -123,161 +123,161 @@ set TZData(:Asia/Hebron) {
    {1585346400 10800 1 EEST}
    {1603490400 7200 0 EET}
    {1616796000 10800 1 EEST}
-    {1635544800 7200 0 EET}
+    {1635458400 7200 0 EET}
    {1648245600 10800 1 EEST}
-    {1666994400 7200 0 EET}
+    {1666908000 7200 0 EET}
    {1679695200 10800 1 EEST}
-    {1698444000 7200 0 EET}
+    {1698357600 7200 0 EET}
    {1711749600 10800 1 EEST}
-    {1729893600 7200 0 EET}
+    {1729807200 7200 0 EET}
    {1743199200 10800 1 EEST}
-    {1761343200 7200 0 EET}
+    {1761861600 7200 0 EET}
    {1774648800 10800 1 EEST}
-    {1792792800 7200 0 EET}
+    {1793311200 7200 0 EET}
    {1806098400 10800 1 EEST}
-    {1824847200 7200 0 EET}
+    {1824760800 7200 0 EET}
    {1837548000 10800 1 EEST}
-    {1856296800 7200 0 EET}
+    {1856210400 7200 0 EET}
    {1868997600 10800 1 EEST}
-    {1887746400 7200 0 EET}
+    {1887660000 7200 0 EET}
    {1901052000 10800 1 EEST}
-    {1919196000 7200 0 EET}
+    {1919109600 7200 0 EET}
    {1932501600 10800 1 EEST}
-    {1950645600 7200 0 EET}
+    {1951164000 7200 0 EET}
    {1963951200 10800 1 EEST}
-    {1982700000 7200 0 EET}
+    {1982613600 7200 0 EET}
    {1995400800 10800 1 EEST}
-    {2014149600 7200 0 EET}
+    {2014063200 7200 0 EET}
    {2026850400 10800 1 EEST}
-    {2045599200 7200 0 EET}
+    {2045512800 7200 0 EET}
    {2058300000 10800 1 EEST}
-    {2077048800 7200 0 EET}
+    {2076962400 7200 0 EET}
    {2090354400 10800 1 EEST}
-    {2108498400 7200 0 EET}
+    {2109016800 7200 0 EET}
    {2121804000 10800 1 EEST}
-    {2139948000 7200 0 EET}
+    {2140466400 7200 0 EET}
    {2153253600 10800 1 EEST}
-    {2172002400 7200 0 EET}
+    {2171916000 7200 0 EET}
    {2184703200 10800 1 EEST}
-    {2203452000 7200 0 EET}
+    {2203365600 7200 0 EET}
    {2216152800 10800 1 EEST}
-    {2234901600 7200 0 EET}
+    {2234815200 7200 0 EET}
    {2248207200 10800 1 EEST}
-    {2266351200 7200 0 EET}
+    {2266264800 7200 0 EET}
    {2279656800 10800 1 EEST}
-    {2297800800 7200 0 EET}
+    {2298319200 7200 0 EET}
    {2311106400 10800 1 EEST}
-    {2329250400 7200 0 EET}
+    {2329768800 7200 0 EET}
    {2342556000 10800 1 EEST}
-    {2361304800 7200 0 EET}
+    {2361218400 7200 0 EET}
    {2374005600 10800 1 EEST}
-    {2392754400 7200 0 EET}
+    {2392668000 7200 0 EET}
    {2405455200 10800 1 EEST}
-    {2424204000 7200 0 EET}
+    {2424117600 7200 0 EET}
    {2437509600 10800 1 EEST}
-    {2455653600 7200 0 EET}
+    {2455567200 7200 0 EET}
    {2468959200 10800 1 EEST}
-    {2487103200 7200 0 EET}
+    {2487621600 7200 0 EET}
    {2500408800 10800 1 EEST}
-    {2519157600 7200 0 EET}
+    {2519071200 7200 0 EET}
    {2531858400 10800 1 EEST}
-    {2550607200 7200 0 EET}
+    {2550520800 7200 0 EET}
    {2563308000 10800 1 EEST}
-    {2582056800 7200 0 EET}
+    {2581970400 7200 0 EET}
    {2595362400 10800 1 EEST}
-    {2613506400 7200 0 EET}
+    {2613420000 7200 0 EET}
    {2626812000 10800 1 EEST}
-    {2644956000 7200 0 EET}
+    {2645474400 7200 0 EET}
    {2658261600 10800 1 EEST}
-    {2676405600 7200 0 EET}
+    {2676924000 7200 0 EET}
    {2689711200 10800 1 EEST}
-    {2708460000 7200 0 EET}
+    {2708373600 7200 0 EET}
    {2721160800 10800 1 EEST}
-    {2739909600 7200 0 EET}
+    {2739823200 7200 0 EET}
    {2752610400 10800 1 EEST}
-    {2771359200 7200 0 EET}
+    {2771272800 7200 0 EET}
    {2784664800 10800 1 EEST}
-    {2802808800 7200 0 EET}
+    {2802722400 7200 0 EET}
    {2816114400 10800 1 EEST}
-    {2834258400 7200 0 EET}
+    {2834776800 7200 0 EET}
    {2847564000 10800 1 EEST}
-    {2866312800 7200 0 EET}
+    {2866226400 7200 0 EET}
    {2879013600 10800 1 EEST}
-    {2897762400 7200 0 EET}
+    {2897676000 7200 0 EET}
    {2910463200 10800 1 EEST}
-    {2929212000 7200 0 EET}
+    {2929125600 7200 0 EET}
    {2941912800 10800 1 EEST}
-    {2960661600 7200 0 EET}
+    {2960575200 7200 0 EET}
    {2973967200 10800 1 EEST}
-    {2992111200 7200 0 EET}
+    {2992629600 7200 0 EET}
    {3005416800 10800 1 EEST}
-    {3023560800 7200 0 EET}
+    {3024079200 7200 0 EET}
    {3036866400 10800 1 EEST}
-    {3055615200 7200 0 EET}
+    {3055528800 7200 0 EET}
    {3068316000 10800 1 EEST}
-    {3087064800 7200 0 EET}
+    {3086978400 7200 0 EET}
    {3099765600 10800 1 EEST}
-    {3118514400 7200 0 EET}
+    {3118428000 7200 0 EET}
    {3131820000 10800 1 EEST}
-    {3149964000 7200 0 EET}
+    {3149877600 7200 0 EET}
    {3163269600 10800 1 EEST}
-    {3181413600 7200 0 EET}
+    {3181932000 7200 0 EET}
    {3194719200 10800 1 EEST}
-    {3212863200 7200 0 EET}
+    {3213381600 7200 0 EET}
    {3226168800 10800 1 EEST}
-    {3244917600 7200 0 EET}
+    {3244831200 7200 0 EET}
    {3257618400 10800 1 EEST}
-    {3276367200 7200 0 EET}
+    {3276280800 7200 0 EET}
    {3289068000 10800 1 EEST}
-    {3307816800 7200 0 EET}
+    {3307730400 7200 0 EET}
    {3321122400 10800 1 EEST}
-    {3339266400 7200 0 EET}
+    {3339180000 7200 0 EET}
    {3352572000 10800 1 EEST}
-    {3370716000 7200 0 EET}
+    {3371234400 7200 0 EET}
    {3384021600 10800 1 EEST}
-    {3402770400 7200 0 EET}
+    {3402684000 7200 0 EET}
    {3415471200 10800 1 EEST}
-    {3434220000 7200 0 EET}
+    {3434133600 7200 0 EET}
    {3446920800 10800 1 EEST}
-    {3465669600 7200 0 EET}
+    {3465583200 7200 0 EET}
    {3478975200 10800 1 EEST}
-    {3497119200 7200 0 EET}
+    {3497032800 7200 0 EET}
    {3510424800 10800 1 EEST}
-    {3528568800 7200 0 EET}
+    {3529087200 7200 0 EET}
    {3541874400 10800 1 EEST}
-    {3560018400 7200 0 EET}
+    {3560536800 7200 0 EET}
    {3573324000 10800 1 EEST}
-    {3592072800 7200 0 EET}
+    {3591986400 7200 0 EET}
    {3604773600 10800 1 EEST}
-    {3623522400 7200 0 EET}
+    {3623436000 7200 0 EET}
    {3636223200 10800 1 EEST}
-    {3654972000 7200 0 EET}
+    {3654885600 7200 0 EET}
    {3668277600 10800 1 EEST}
-    {3686421600 7200 0 EET}
+    {3686335200 7200 0 EET}
    {3699727200 10800 1 EEST}
-    {3717871200 7200 0 EET}
+    {3718389600 7200 0 EET}
    {3731176800 10800 1 EEST}
-    {3749925600 7200 0 EET}
+    {3749839200 7200 0 EET}
    {3762626400 10800 1 EEST}
-    {3781375200 7200 0 EET}
+    {3781288800 7200 0 EET}
    {3794076000 10800 1 EEST}
-    {3812824800 7200 0 EET}
+    {3812738400 7200 0 EET}
    {3825525600 10800 1 EEST}
-    {3844274400 7200 0 EET}
+    {3844188000 7200 0 EET}
    {3857580000 10800 1 EEST}
-    {3875724000 7200 0 EET}
+    {3876242400 7200 0 EET}
    {3889029600 10800 1 EEST}
-    {3907173600 7200 0 EET}
+    {3907692000 7200 0 EET}
    {3920479200 10800 1 EEST}
-    {3939228000 7200 0 EET}
+    {3939141600 7200 0 EET}
    {3951928800 10800 1 EEST}
-    {3970677600 7200 0 EET}
+    {3970591200 7200 0 EET}
    {3983378400 10800 1 EEST}
-    {4002127200 7200 0 EET}
+    {4002040800 7200 0 EET}
    {4015432800 10800 1 EEST}
-    {4033576800 7200 0 EET}
+    {4033490400 7200 0 EET}
    {4046882400 10800 1 EEST}
-    {4065026400 7200 0 EET}
+    {4065544800 7200 0 EET}
    {4078332000 10800 1 EEST}
-    {4096476000 7200 0 EET}
+    {4096994400 7200 0 EET}
 }
--- a/amd64/lib/tcl8.6/tzdata/Atlantic/Azores
+++ b/amd64/lib/tcl8.6/tzdata/Atlantic/Azores
@@ -66,6 +66,8 @@ set TZData(:Atlantic/Azores) {
    {-670449600 -7200 0 -02}
    {-654724800 -3600 1 -01}
    {-639000000 -7200 0 -02}
+    {-623275200 -3600 1 -01}
+    {-607550400 -7200 0 -02}
    {-591825600 -3600 1 -01}
    {-575496000 -7200 0 -02}
    {-559771200 -3600 1 -01}
--- a/amd64/lib/tcl8.6/tzdata/Atlantic/Madeira
+++ b/amd64/lib/tcl8.6/tzdata/Atlantic/Madeira
@@ -66,6 +66,8 @@ set TZData(:Atlantic/Madeira) {
    {-670453200 -3600 0 -01}
    {-654728400 0 1 +00}
    {-639003600 -3600 0 -01}
+    {-623278800 0 1 +00}
+    {-607554000 -3600 0 -01}
    {-591829200 0 1 +00}
    {-575499600 -3600 0 -01}
    {-559774800 0 1 +00}
--- a/amd64/lib/tcl8.6/tzdata/Europe/Lisbon
+++ b/amd64/lib/tcl8.6/tzdata/Europe/Lisbon
@@ -70,6 +70,8 @@ set TZData(:Europe/Lisbon) {
    {-670456800 0 0 WET}
    {-654732000 3600 1 WEST}
    {-639007200 0 0 WET}
+    {-623282400 3600 1 WEST}
+    {-607557600 0 0 WET}
    {-591832800 3600 1 WEST}
    {-575503200 0 0 WET}
    {-559778400 3600 1 WEST}
--- a/amd64/lib/tcl8.6/tzdata/Pacific/Apia
+++ b/amd64/lib/tcl8.6/tzdata/Pacific/Apia
@@ -28,161 +28,4 @@ set TZData(:Pacific/Apia) {
    {1586008800 46800 0 +13}
    {1601128800 50400 1 +13}
    {1617458400 46800 0 +13}
-    {1632578400 50400 1 +13}
-    {1648908000 46800 0 +13}
-    {1664028000 50400 1 +13}
-    {1680357600 46800 0 +13}
-    {1695477600 50400 1 +13}
-    {1712412000 46800 0 +13}
-    {1727532000 50400 1 +13}
-    {1743861600 46800 0 +13}
-    {1758981600 50400 1 +13}
-    {1775311200 46800 0 +13}
-    {1790431200 50400 1 +13}
-    {1806760800 46800 0 +13}
-    {1821880800 50400 1 +13}
-    {1838210400 46800 0 +13}
-    {1853330400 50400 1 +13}
-    {1869660000 46800 0 +13}
-    {1885384800 50400 1 +13}
-    {1901714400 46800 0 +13}
-    {1916834400 50400 1 +13}
-    {1933164000 46800 0 +13}
-    {1948284000 50400 1 +13}
-    {1964613600 46800 0 +13}
-    {1979733600 50400 1 +13}
-    {1996063200 46800 0 +13}
-    {2011183200 50400 1 +13}
-    {2027512800 46800 0 +13}
-    {2042632800 50400 1 +13}
-    {2058962400 46800 0 +13}
-    {2074687200 50400 1 +13}
-    {2091016800 46800 0 +13}
-    {2106136800 50400 1 +13}
-    {2122466400 46800 0 +13}
-    {2137586400 50400 1 +13}
-    {2153916000 46800 0 +13}
-    {2169036000 50400 1 +13}
-    {2185365600 46800 0 +13}
-    {2200485600 50400 1 +13}
-    {2216815200 46800 0 +13}
-    {2232540000 50400 1 +13}
-    {2248869600 46800 0 +13}
-    {2263989600 50400 1 +13}
-    {2280319200 46800 0 +13}
-    {2295439200 50400 1 +13}
-    {2311768800 46800 0 +13}
-    {2326888800 50400 1 +13}
-    {2343218400 46800 0 +13}
-    {2358338400 50400 1 +13}
-    {2374668000 46800 0 +13}
-    {2389788000 50400 1 +13}
-    {2406117600 46800 0 +13}
-    {2421842400 50400 1 +13}
-    {2438172000 46800 0 +13}
-    {2453292000 50400 1 +13}
-    {2469621600 46800 0 +13}
-    {2484741600 50400 1 +13}
-    {2501071200 46800 0 +13}
-    {2516191200 50400 1 +13}
-    {2532520800 46800 0 +13}
-    {2547640800 50400 1 +13}
-    {2563970400 46800 0 +13}
-    {2579090400 50400 1 +13}
-    {2596024800 46800 0 +13}
-    {2611144800 50400 1 +13}
-    {2627474400 46800 0 +13}
-    {2642594400 50400 1 +13}
-    {2658924000 46800 0 +13}
-    {2674044000 50400 1 +13}
-    {2690373600 46800 0 +13}
-    {2705493600 50400 1 +13}
-    {2721823200 46800 0 +13}
-    {2736943200 50400 1 +13}
-    {2753272800 46800 0 +13}
-    {2768997600 50400 1 +13}
-    {2785327200 46800 0 +13}
-    {2800447200 50400 1 +13}
-    {2816776800 46800 0 +13}
-    {2831896800 50400 1 +13}
-    {2848226400 46800 0 +13}
-    {2863346400 50400 1 +13}
-    {2879676000 46800 0 +13}
-    {2894796000 50400 1 +13}
-    {2911125600 46800 0 +13}
-    {2926245600 50400 1 +13}
-    {2942575200 46800 0 +13}
-    {2958300000 50400 1 +13}
-    {2974629600 46800 0 +13}
-    {2989749600 50400 1 +13}
-    {3006079200 46800 0 +13}
-    {3021199200 50400 1 +13}
-    {3037528800 46800 0 +13}
-    {3052648800 50400 1 +13}
-    {3068978400 46800 0 +13}
-    {3084098400 50400 1 +13}
-    {3100428000 46800 0 +13}
-    {3116152800 50400 1 +13}
-    {3132482400 46800 0 +13}
-    {3147602400 50400 1 +13}
-    {3163932000 46800 0 +13}
-    {3179052000 50400 1 +13}
-    {3195381600 46800 0 +13}
-    {3210501600 50400 1 +13}
-    {3226831200 46800 0 +13}
-    {3241951200 50400 1 +13}
-    {3258280800 46800 0 +13}
-    {3273400800 50400 1 +13}
-    {3289730400 46800 0 +13}
-    {3305455200 50400 1 +13}
-    {3321784800 46800 0 +13}
-    {3336904800 50400 1 +13}
-    {3353234400 46800 0 +13}
-    {3368354400 50400 1 +13}
-    {3384684000 46800 0 +13}
-    {3399804000 50400 1 +13}
-    {3416133600 46800 0 +13}
-    {3431253600 50400 1 +13}
-    {3447583200 46800 0 +13}
-    {3462703200 50400 1 +13}
-    {3479637600 46800 0 +13}
-    {3494757600 50400 1 +13}
-    {3511087200 46800 0 +13}
-    {3526207200 50400 1 +13}
-    {3542536800 46800 0 +13}
-    {3557656800 50400 1 +13}
-    {3573986400 46800 0 +13}
-    {3589106400 50400 1 +13}
-    {3605436000 46800 0 +13}
-    {3620556000 50400 1 +13}
-    {3636885600 46800 0 +13}
-    {3652610400 50400 1 +13}
-    {3668940000 46800 0 +13}
-    {3684060000 50400 1 +13}
-    {3700389600 46800 0 +13}
-    {3715509600 50400 1 +13}
-    {3731839200 46800 0 +13}
-    {3746959200 50400 1 +13}
-    {3763288800 46800 0 +13}
-    {3778408800 50400 1 +13}
-    {3794738400 46800 0 +13}
-    {3809858400 50400 1 +13}
-    {3826188000 46800 0 +13}
-    {3841912800 50400 1 +13}
-    {3858242400 46800 0 +13}
-    {3873362400 50400 1 +13}
-    {3889692000 46800 0 +13}
-    {3904812000 50400 1 +13}
-    {3921141600 46800 0 +13}
-    {3936261600 50400 1 +13}
-    {3952591200 46800 0 +13}
-    {3967711200 50400 1 +13}
-    {3984040800 46800 0 +13}
-    {3999765600 50400 1 +13}
-    {4016095200 46800 0 +13}
-    {4031215200 50400 1 +13}
-    {4047544800 46800 0 +13}
-    {4062664800 50400 1 +13}
-    {4078994400 46800 0 +13}
-    {4094114400 50400 1 +13}
 }
--- a/amd64/lib/tcl8.6/tzdata/Pacific/Enderbury
+++ b/amd64/lib/tcl8.6/tzdata/Pacific/Enderbury
@@ -1,8 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Pacific/Enderbury) {
-    {-9223372036854775808 -41060 0 LMT}
-    {-2177411740 -43200 0 -12}
-    {307627200 -39600 0 -11}
-    {788871600 46800 0 +13}
+if {![info exists TZData(Pacific/Kanton)]} {
+    LoadTimeZoneFile Pacific/Kanton
 }
+set TZData(:Pacific/Enderbury) $TZData(:Pacific/Kanton)
--- a/amd64/lib/tcl8.6/tzdata/Pacific/Fiji
+++ b/amd64/lib/tcl8.6/tzdata/Pacific/Fiji
@@ -31,8 +31,6 @@ set TZData(:Pacific/Fiji) {
    {1578751200 43200 0 +12}
    {1608386400 46800 1 +12}
    {1610805600 43200 0 +12}
-    {1636812000 46800 1 +12}
-    {1642255200 43200 0 +12}
    {1668261600 46800 1 +12}
    {1673704800 43200 0 +12}
    {1699711200 46800 1 +12}
--- a/amd64/lib/tcl8.6/tzdata/Pacific/Kanton
+++ b/amd64/lib/tcl8.6/tzdata/Pacific/Kanton
@@ -0,0 +1,8 @@
+# created by tools/tclZIC.tcl - do not edit
+
+set TZData(:Pacific/Kanton) {
+    {-9223372036854775808 0 0 -00}
+    {-1020470400 -43200 0 -12}
+    {307627200 -39600 0 -11}
+    {788871600 46800 0 +13}
+}
--- a/amd64/lib/tcl8.6/tzdata/Pacific/Niue
+++ b/amd64/lib/tcl8.6/tzdata/Pacific/Niue
@@ -2,7 +2,6 @@

 set TZData(:Pacific/Niue) {
    {-9223372036854775808 -40780 0 LMT}
-    {-2177412020 -40800 0 -1120}
-    {-599575200 -41400 0 -1130}
-    {276089400 -39600 0 -11}
+    {-543069620 -40800 0 -1120}
+    {-173623200 -39600 0 -11}
 }
--- a/amd64/lib/tcl8.6/tzdata/Pacific/Rarotonga
+++ b/amd64/lib/tcl8.6/tzdata/Pacific/Rarotonga
@@ -1,8 +1,9 @@
 # created by tools/tclZIC.tcl - do not edit

 set TZData(:Pacific/Rarotonga) {
-    {-9223372036854775808 -38344 0 LMT}
-    {-2177414456 -37800 0 -1030}
+    {-9223372036854775808 48056 0 LMT}
+    {-2209555256 -38344 0 LMT}
+    {-543072056 -37800 0 -1030}
    {279714600 -34200 0 -10}
    {289387800 -36000 0 -10}
    {309952800 -34200 1 -10}
--- a/amd64/lib/tcl8.6/tzdata/Pacific/Tongatapu
+++ b/amd64/lib/tcl8.6/tzdata/Pacific/Tongatapu
@@ -1,9 +1,9 @@
 # created by tools/tclZIC.tcl - do not edit

 set TZData(:Pacific/Tongatapu) {
-    {-9223372036854775808 44360 0 LMT}
-    {-2177497160 44400 0 +1220}
-    {-915193200 46800 0 +13}
+    {-9223372036854775808 44352 0 LMT}
+    {-767189952 44400 0 +1220}
+    {-284041200 46800 0 +13}
    {915102000 46800 0 +13}
    {939214800 50400 1 +13}
    {953384400 46800 0 +13}
--- a/amd64/lib/tcl8/8.4/platform-1.0.14.tm
+++ b/amd64/lib/tcl8/8.4/platform-1.0.14.tm
@@ -1,397 +0,0 @@
-# -*- tcl -*-
-# ### ### ### ######### ######### #########
-## Overview
-
-# Heuristics to assemble a platform identifier from publicly available
-# information. The identifier describes the platform of the currently
-# running tcl shell. This is a mixture of the runtime environment and
-# of build-time properties of the executable itself.
-#
-# Examples:
-# <1> A tcl shell executing on a x86_64 processor, but having a
-#   wordsize of 4 was compiled for the x86 environment, i.e. 32
-#   bit, and loaded packages have to match that, and not the
-#   actual cpu.
-#
-# <2> The hp/solaris 32/64 bit builds of the core cannot be
-#   distinguished by looking at tcl_platform. As packages have to
-#   match the 32/64 information we have to look in more places. In
-#   this case we inspect the executable itself (magic numbers,
-#   i.e. fileutil::magic::filetype).
-#
-# The basic information used comes out of the 'os' and 'machine'
-# entries of the 'tcl_platform' array. A number of general and
-# os/machine specific transformation are applied to get a canonical
-# result.
-#
-# General
-# Only the first element of 'os' is used - we don't care whether we
-# are on "Windows NT" or "Windows XP" or whatever.
-#
-# Machine specific
-# % arm*   -> arm
-# % sun4*  -> sparc
-# % intel  -> ix86
-# % i*86*  -> ix86
-# % Power* -> powerpc
-# % x86_64 + wordSize 4 => x86 code
-#
-# OS specific
-# % AIX are always powerpc machines
-# % HP-UX 9000/800 etc means parisc
-# % linux has to take glibc version into account
-# % sunos -> solaris, and keep version number
-#
-# NOTE: A platform like linux glibc 2.3, which can use glibc 2.2 stuff
-# has to provide all possible allowed platform identifiers when
-# searching search. Ditto a solaris 2.8 platform can use solaris 2.6
-# packages. Etc. This is handled by the other procedure, see below.
-
-# ### ### ### ######### ######### #########
-## Requirements
-
-namespace eval ::platform {}
-
-# ### ### ### ######### ######### #########
-## Implementation
-
-# -- platform::generic
-#
-# Assembles an identifier for the generic platform. It leaves out
-# details like kernel version, libc version, etc.
-
-proc ::platform::generic {} {
-    global tcl_platform
-
-    set plat [string tolower [lindex $tcl_platform(os) 0]]
-    set cpu  $tcl_platform(machine)
-
-    switch -glob -- $cpu {
-	sun4* {
-	    set cpu sparc
-	}
-	intel -
-	i*86* {
-	    set cpu ix86
-	}
-	x86_64 {
-	    if {$tcl_platform(wordSize) == 4} {
-		# See Example <1> at the top of this file.
-		set cpu ix86
-	    }
-	}
-	"Power*" {
-	    set cpu powerpc
-	}
-	"arm*" {
-	    set cpu arm
-	}
-	ia64 {
-	    if {$tcl_platform(wordSize) == 4} {
-		append cpu _32
-	    }
-	}
-    }
-
-    switch -glob -- $plat {
-	cygwin* {
-	    set plat cygwin
-	}
-	windows {
-	    if {$tcl_platform(platform) == "unix"} {
-		set plat cygwin
-	    } else {
-		set plat win32
-	    }
-	    if {$cpu eq "amd64"} {
-		# Do not check wordSize, win32-x64 is an IL32P64 platform.
-		set cpu x86_64
-	    }
-	}
-	sunos {
-	    set plat solaris
-	    if {[string match "ix86" $cpu]} {
-		if {$tcl_platform(wordSize) == 8} {
-		    set cpu x86_64
-		}
-	    } elseif {![string match "ia64*" $cpu]} {
-		# sparc
-		if {$tcl_platform(wordSize) == 8} {
-		    append cpu 64
-		}
-	    }
-	}
-	darwin {
-	    set plat macosx
-	    # Correctly identify the cpu when running as a 64bit
-	    # process on a machine with a 32bit kernel
-	    if {$cpu eq "ix86"} {
-		if {$tcl_platform(wordSize) == 8} {
-		    set cpu x86_64
-		}
-	    }
-	}
-	aix {
-	    set cpu powerpc
-	    if {$tcl_platform(wordSize) == 8} {
-		append cpu 64
-	    }
-	}
-	hp-ux {
-	    set plat hpux
-	    if {![string match "ia64*" $cpu]} {
-		set cpu parisc
-		if {$tcl_platform(wordSize) == 8} {
-		    append cpu 64
-		}
-	    }
-	}
-	osf1 {
-	    set plat tru64
-	}
-    }
-
-    return "${plat}-${cpu}"
-}
-
-# -- platform::identify
-#
-# Assembles an identifier for the exact platform, by extending the
-# generic identifier. I.e. it adds in details like kernel version,
-# libc version, etc., if they are relevant for the loading of
-# packages on the platform.
-
-proc ::platform::identify {} {
-    global tcl_platform
-
-    set id [generic]
-    regexp {^([^-]+)-([^-]+)$} $id -> plat cpu
-
-    switch -- $plat {
-	solaris {
-	    regsub {^5} $tcl_platform(osVersion) 2 text
-	    append plat $text
-	    return "${plat}-${cpu}"
-	}
-	macosx {
-	    set major [lindex [split $tcl_platform(osVersion) .] 0]
-	    if {$major > 8} {
-		incr major -4
-		append plat 10.$major
-		return "${plat}-${cpu}"
-	    }
-	}
-	linux {
-	    # Look for the libc*.so and determine its version
-	    # (libc5/6, libc6 further glibc 2.X)
-
-	    set v unknown
-
-	    # Determine in which directory to look. /lib, or /lib64.
-	    # For that we use the tcl_platform(wordSize).
-	    #
-	    # We could use the 'cpu' info, per the equivalence below,
-	    # that however would be restricted to intel. And this may
-	    # be a arm, mips, etc. system. The wordsize is more
-	    # fundamental.
-	    #
-	    # ix86   <=> (wordSize == 4) <=> 32 bit ==> /lib
-	    # x86_64 <=> (wordSize == 8) <=> 64 bit ==> /lib64
-	    #
-	    # Do not look into /lib64 even if present, if the cpu
-	    # doesn't fit.
-
-	    # TODO: Determine the prefixes (i386, x86_64, ...) for
-	    # other cpus.  The path after the generic one is utterly
-	    # specific to intel right now.  Ok, on Ubuntu, possibly
-	    # other Debian systems we may apparently be able to query
-	    # the necessary CPU code. If we can't we simply use the
-	    # hardwired fallback.
-
-	    switch -exact -- $tcl_platform(wordSize) {
-		4 {
-		    lappend bases /lib
-		    if {[catch {
-			exec dpkg-architecture -qDEB_HOST_MULTIARCH
-		    } res]} {
-			lappend bases /lib/i386-linux-gnu
-		    } else {
-			# dpkg-arch returns the full tripled, not just cpu.
-			lappend bases /lib/$res
-		    }
-		}
-		8 {
-		    lappend bases /lib64
-		    if {[catch {
-			exec dpkg-architecture -qDEB_HOST_MULTIARCH
-		    } res]} {
-			lappend bases /lib/x86_64-linux-gnu
-		    } else {
-			# dpkg-arch returns the full tripled, not just cpu.
-			lappend bases /lib/$res
-		    }
-		}
-		default {
-		    return -code error "Bad wordSize $tcl_platform(wordSize), expected 4 or 8"
-		}
-	    }
-
-	    foreach base $bases {
-		if {[LibcVersion $base -> v]} break
-	    }
-
-	    append plat -$v
-	    return "${plat}-${cpu}"
-	}
-    }
-
-    return $id
-}
-
-proc ::platform::LibcVersion {base _->_ vv} {
-    upvar 1 $vv v
-    set libclist [lsort [glob -nocomplain -directory $base libc*]]
-
-    if {![llength $libclist]} { return 0 }
-
-    set libc [lindex $libclist 0]
-
-    # Try executing the library first. This should suceed
-    # for a glibc library, and return the version
-    # information.
-
-    if {![catch {
-	set vdata [lindex [split [exec $libc] \n] 0]
-    }]} {
-	regexp {version ([0-9]+(\.[0-9]+)*)} $vdata -> v
-	foreach {major minor} [split $v .] break
-	set v glibc${major}.${minor}
-	return 1
-    } else {
-	# We had trouble executing the library. We are now
-	# inspecting its name to determine the version
-	# number. This code by Larry McVoy.
-
-	if {[regexp -- {libc-([0-9]+)\.([0-9]+)} $libc -> major minor]} {
-	    set v glibc${major}.${minor}
-	    return 1
-	}
-    }
-    return 0
-}
-
-# -- platform::patterns
-#
-# Given an exact platform identifier, i.e. _not_ the generic
-# identifier it assembles a list of exact platform identifier
-# describing platform which should be compatible with the
-# input.
-#
-# I.e. packages for all platforms in the result list should be
-# loadable on the specified platform.
-
-# << Should we add the generic identifier to the list as well ? In
-#    general it is not compatible I believe. So better not. In many
-#    cases the exact identifier is identical to the generic one
-#    anyway.
-# >>
-
-proc ::platform::patterns {id} {
-    set res [list $id]
-    if {$id eq "tcl"} {return $res}
-
-    switch -glob --  $id {
-	solaris*-* {
-	    if {[regexp {solaris([^-]*)-(.*)} $id -> v cpu]} {
-		if {$v eq ""} {return $id}
-		foreach {major minor} [split $v .] break
-		incr minor -1
-		for {set j $minor} {$j >= 6} {incr j -1} {
-		    lappend res solaris${major}.${j}-${cpu}
-		}
-	    }
-	}
-	linux*-* {
-	    if {[regexp {linux-glibc([^-]*)-(.*)} $id -> v cpu]} {
-		foreach {major minor} [split $v .] break
-		incr minor -1
-		for {set j $minor} {$j >= 0} {incr j -1} {
-		    lappend res linux-glibc${major}.${j}-${cpu}
-		}
-	    }
-	}
-	macosx-powerpc {
-	    lappend res macosx-universal
-	}
-	macosx-x86_64 {
-	    lappend res macosx-i386-x86_64
-	}
-	macosx-ix86 {
-	    lappend res macosx-universal macosx-i386-x86_64
-	}
-	macosx*-*    {
-	    # 10.5+
-	    if {[regexp {macosx([^-]*)-(.*)} $id -> v cpu]} {
-
-		switch -exact -- $cpu {
-		    ix86    {
-			lappend alt i386-x86_64
-			lappend alt universal
-		    }
-		    x86_64  { lappend alt i386-x86_64 }
-		    default { set alt {} }
-		}
-
-		if {$v ne ""} {
-		    foreach {major minor} [split $v .] break
-
-		    # Add 10.5 to 10.minor to patterns.
-		    set res {}
-		    for {set j $minor} {$j >= 5} {incr j -1} {
-			lappend res macosx${major}.${j}-${cpu}
-			foreach a $alt {
-			    lappend res macosx${major}.${j}-$a
-			}
-		    }
-
-		    # Add unversioned patterns for 10.3/10.4 builds.
-		    lappend res macosx-${cpu}
-		    foreach a $alt {
-			lappend res macosx-$a
-		    }
-		} else {
-		    # No version, just do unversioned patterns.
-		    foreach a $alt {
-			lappend res macosx-$a
-		    }
-		}
-	    } else {
-		# no v, no cpu ... nothing
-	    }
-	}
-    }
-    lappend res tcl ; # Pure tcl packages are always compatible.
-    return $res
-}
-
-
-# ### ### ### ######### ######### #########
-## Ready
-
-package provide platform 1.0.14
-
-# ### ### ### ######### ######### #########
-## Demo application
-
-if {[info exists argv0] && ($argv0 eq [info script])} {
-    puts ====================================
-    parray tcl_platform
-    puts ====================================
-    puts Generic\ identification:\ [::platform::generic]
-    puts Exact\ identification:\ \ \ [::platform::identify]
-    puts ====================================
-    puts Search\ patterns:
-    puts *\ [join [::platform::patterns [::platform::identify]] \n*\ ]
-    puts ====================================
-    exit 0
-}
--- a/amd64/lib/tcl8/8.4/platform-1.0.18.tm
+++ b/amd64/lib/tcl8/8.4/platform-1.0.18.tm
@@ -29,8 +29,10 @@
 # are on "Windows NT" or "Windows XP" or whatever.
 #
 # Machine specific
+# % amd64  -> x86_64
 # % arm*   -> arm
 # % sun4*  -> sparc
+# % ia32*  -> ix86
 # % intel  -> ix86
 # % i*86*  -> ix86
 # % Power* -> powerpc
@@ -71,6 +73,7 @@ proc ::platform::generic {} {
 	    set cpu sparc
 	}
 	intel -
+	ia32* -
 	i*86* {
 	    set cpu ix86
 	}
@@ -80,6 +83,7 @@ proc ::platform::generic {} {
 		set cpu ix86
 	    }
 	}
+	ppc -
 	"Power*" {
 	    set cpu powerpc
 	}
@@ -176,8 +180,9 @@ proc ::platform::identify {} {
 	macosx {
 	    set major [lindex [split $tcl_platform(osVersion) .] 0]
 	    if {$major > 19} {
-		incr major -20
-		append plat 11.$major
+		set minor [lindex [split $tcl_platform(osVersion) .] 1]
+		incr major -9
+		append plat $major.[expr {$minor - 1}]
 	    } else {
 		incr major -4
 		append plat 10.$major
@@ -359,6 +364,17 @@ proc ::platform::patterns {id} {
 		    foreach {major minor} [split $v .] break

 		    set res {}
+		    if {$major eq 12} {
+			# Add 12.0 to 12.minor to patterns.
+			for {set j $minor} {$j >= 0} {incr j -1} {
+			    lappend res macosx${major}.${j}-${cpu}
+			    foreach a $alt {
+				lappend res macosx${major}.${j}-$a
+			    }
+			}
+			set major 11
+			set minor 5
+		    }
 		    if {$major eq 11} {
 			# Add 11.0 to 11.minor to patterns.
 			for {set j $minor} {$j >= 0} {incr j -1} {
@@ -404,7 +420,7 @@ proc ::platform::patterns {id} {
 # ### ### ### ######### ######### #########
 ## Ready

-package provide platform 1.0.15
+package provide platform 1.0.18

 # ### ### ### ######### ######### #########
 ## Demo application
--- a/amd64/lib/tcl8/8.5/tcltest-2.5.1.tm
+++ b/amd64/lib/tcl8/8.5/tcltest-2.5.1.tm
--- a/amd64/lib/tcl8/8.5/tcltest-2.5.3.tm
+++ b/amd64/lib/tcl8/8.5/tcltest-2.5.3.tm
@@ -642,7 +642,7 @@ namespace eval tcltest {

    proc IsVerbose {level} {
 	variable Option
-	return [expr {[lsearch -exact $Option(-verbose) $level] >= 0}]
+	return [expr {$level in $Option(-verbose)}]
    }

    # Default verbosity is to show bodies of failed tests
--- a/amd64/lib/tcl8/8.6/http-2.9.1.tm
+++ b/amd64/lib/tcl8/8.6/http-2.9.1.tm
--- a/amd64/lib/tclConfig.sh
+++ b/amd64/lib/tclConfig.sh
@@ -15,21 +15,21 @@ TCL_DLL_FILE="tcl86t.dll"
 TCL_VERSION='8.6'
 TCL_MAJOR_VERSION='8'
 TCL_MINOR_VERSION='6'
-TCL_PATCH_LEVEL='8.6.11'
+TCL_PATCH_LEVEL='8.6.12'

 # C compiler to use for compilation.
 TCL_CC='cl'

 # -D flags for use with the C compiler.
-TCL_DEFS='-nologo -c /D_ATL_XP_TARGETING  -W3 -wd4311 -wd4312 -wd4311 -wd4312 -FpD:\_w\1\b\tcl-core-8.6.11.0\win\Release_AMD64_VC13\tcl_ThreadedDynamic\  -fp:strict -O2 -GS -GL -MD -I"D:\_w\1\b\tcl-core-8.6.11.0\win\..\win" -I"D:\_w\1\b\tcl-core-8.6.11.0\win\..\generic"  -I"D:\_w\1\b\tcl-core-8.6.11.0\win\..\libtommath"  /DTCL_TOMMATH /DMP_PREC=4 /Dinline=__inline /DHAVE_ZLIB=1 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DMP_FIXED_CUTOFFS /DSTDC_HEADERS /DHAVE_STDINT_H=1 /DHAVE_INTTYPES_H=1 /DHAVE_STDBOOL_H=1 /DTCL_THREADS=1 /DUSE_THREAD_ALLOC=1 /DNDEBUG /DTCL_CFG_OPTIMIZED /DTCL_CFG_DO64BIT   /DBUILD_tcl'
+TCL_DEFS='-nologo -c /D_ATL_XP_TARGETING  -W3 -wd4311 -wd4312 -wd4311 -wd4312 -FpC:\A\37\b\externals\tcl-core-8.6.12.0\win\Release_AMD64_VC13\tcl_ThreadedDynamic\  -fp:strict -O2 -GS -GL -MD -I"C:\A\37\b\externals\tcl-core-8.6.12.0\win\..\win" -I"C:\A\37\b\externals\tcl-core-8.6.12.0\win\..\generic"  -I"C:\A\37\b\externals\tcl-core-8.6.12.0\win\..\libtommath"  /DTCL_TOMMATH /DMP_PREC=4 /Dinline=__inline /DHAVE_ZLIB=1 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DMP_FIXED_CUTOFFS /DSTDC_HEADERS /DUSE_NMAKE=1 /DHAVE_STDINT_H=1 /DHAVE_INTTYPES_H=1 /DHAVE_STDBOOL_H=1 /DTCL_THREADS=1 /DUSE_THREAD_ALLOC=1 /DNDEBUG /DTCL_CFG_OPTIMIZED /DTCL_CFG_DO64BIT   /DBUILD_tcl'

 # If TCL was built with debugging symbols, generated libraries contain
 # this string at the end of the library name (before the extension).
 TCL_DBGX=t

 # Default flags used in an optimized and debuggable build, respectively.
-TCL_CFLAGS_DEBUG='-nologo -c -W3 -YX -FpD:\_w\1\b\tcl-core-8.6.11.0\win\Release_AMD64_VC13\tcl_ThreadedDynamic\ -MDd'
-TCL_CFLAGS_OPTIMIZE='-nologo -c -W3 -YX -FpD:\_w\1\b\tcl-core-8.6.11.0\win\Release_AMD64_VC13\tcl_ThreadedDynamic\ -MD'
+TCL_CFLAGS_DEBUG='-nologo -c -W3 -YX -FpC:\A\37\b\externals\tcl-core-8.6.12.0\win\Release_AMD64_VC13\tcl_ThreadedDynamic\ -MDd'
+TCL_CFLAGS_OPTIMIZE='-nologo -c -W3 -YX -FpC:\A\37\b\externals\tcl-core-8.6.12.0\win\Release_AMD64_VC13\tcl_ThreadedDynamic\ -MD'

 # Default linker flags used in an optimized and debuggable build, respectively.
 TCL_LDFLAGS_DEBUG='-nologo -machine:AMD64 -debug -debugtype:cv'
@@ -55,11 +55,11 @@ TCL_LIBS='kernel32.lib advapi32.lib netapi32.lib user32.lib userenv.lib ws2_32.l

 # Top-level directory in which Tcl's platform-independent files are
 # installed.
-TCL_PREFIX='D:\_w\1\b\tcltk-8.6.11.0\amd64'
+TCL_PREFIX='C:\A\37\a\amd64'

 # Top-level directory in which Tcl's platform-specific files (e.g.
 # executables) are installed.
-TCL_EXEC_PREFIX='D:\_w\1\b\tcltk-8.6.11.0\amd64\bin'
+TCL_EXEC_PREFIX='C:\A\37\a\amd64\bin'

 # Flags to pass to cc when compiling the components of a shared library:
 TCL_SHLIB_CFLAGS=''
@@ -115,11 +115,11 @@ TCL_BUILD_LIB_SPEC=''

 # String to pass to linker to pick up the Tcl library from its
 # installed directory.
-TCL_LIB_SPEC='D:\_w\1\b\tcltk-8.6.11.0\amd64\lib\tcl86t.lib'
+TCL_LIB_SPEC='C:\A\37\a\amd64\lib\tcl86t.lib'

 # String to pass to the compiler so that an extension can
 # find installed Tcl headers.
-TCL_INCLUDE_SPEC='-ID:\_w\1\b\tcltk-8.6.11.0\amd64\include'
+TCL_INCLUDE_SPEC='-IC:\A\37\a\amd64\include'

 # Indicates whether a version numbers should be used in -l switches
 # ("ok" means it's safe to use switches like -ltcl7.5;  "nodots" means
@@ -146,7 +146,7 @@ TCL_UNSHARED_LIB_SUFFIX='86t.lib'
 # different place than the directory containing the source files, this
 # points to the location of the sources, not the location where Tcl was
 # compiled.
-TCL_SRC_DIR='D:\_w\1\b\tcl-core-8.6.11.0\win\..'
+TCL_SRC_DIR='C:\A\37\b\externals\tcl-core-8.6.12.0\win\..'

 # List of standard directories in which to look for packages during
 # "package require" commands.  Contains the "prefix" directory plus also
@@ -164,17 +164,17 @@ TCL_STUB_LIB_FLAG='tclstub86.lib'

 # String to pass to linker to pick up the Tcl stub library from its
 # build directory.
-TCL_BUILD_STUB_LIB_SPEC='-LD:\_w\1\b\tcl-core-8.6.11.0\win\Release_AMD64_VC13 tclstub86.lib'
+TCL_BUILD_STUB_LIB_SPEC='-LC:\A\37\b\externals\tcl-core-8.6.12.0\win\Release_AMD64_VC13 tclstub86.lib'

 # String to pass to linker to pick up the Tcl stub library from its
 # installed directory.
-TCL_STUB_LIB_SPEC='-LD:\_w\1\b\tcltk-8.6.11.0\amd64\lib tclstub86.lib'
+TCL_STUB_LIB_SPEC='-LC:\A\37\a\amd64\lib tclstub86.lib'

 # Path to the Tcl stub library in the build directory.
-TCL_BUILD_STUB_LIB_PATH='D:\_w\1\b\tcl-core-8.6.11.0\win\Release_AMD64_VC13\tclstub86.lib'
+TCL_BUILD_STUB_LIB_PATH='C:\A\37\b\externals\tcl-core-8.6.12.0\win\Release_AMD64_VC13\tclstub86.lib'

 # Path to the Tcl stub library in the install directory.
-TCL_STUB_LIB_PATH='D:\_w\1\b\tcltk-8.6.11.0\amd64\lib\tclstub86.lib'
+TCL_STUB_LIB_PATH='C:\A\37\a\amd64\lib\tclstub86.lib'

 # Flag, 1: we built Tcl with threads enabled, 0 we didn't
 TCL_THREADS=1
--- a/amd64/lib/tclstub86.lib
+++ b/amd64/lib/tclstub86.lib
--- a/amd64/lib/tix8.4.3/tix84.dll
+++ b/amd64/lib/tix8.4.3/tix84.dll
--- a/amd64/lib/tk8.6/demos/cscroll.tcl
+++ b/amd64/lib/tk8.6/demos/cscroll.tcl
@@ -114,7 +114,7 @@ if {[tk windowingsystem] eq "x11" && ![package vsatisfies [package provide Tk] 8
    # Support for mousewheels on Linux/Unix commonly comes through mapping
    # the wheel to the extended buttons.  If you have a mousewheel, find
    # Linux configuration info at:
-    #	http://linuxreviews.org/howtos/xfree/mouse/
+    #	https://linuxreviews.org/HOWTO_change_the_mouse_speed_in_X
    bind $c <Button-4> {
 	if {!$tk_strictMotif} {
 	    %W yview scroll -5 units
--- a/amd64/lib/tk8.6/demos/menu.tcl
+++ b/amd64/lib/tk8.6/demos/menu.tcl
@@ -134,6 +134,8 @@ menu $m -tearoff 0
 foreach i {{An entry} {Another entry} {Does nothing} {Does almost nothing} {Make life meaningful}} {
    $m add command -label $i -command [list puts "You invoked \"$i\""]
 }
+set emojiLabel [encoding convertfrom utf-8 "\xF0\x9F\x98\x8D Make friends"]
+$m add command -label $emojiLabel -command [list puts "Menu labels can include non-BMP characters."]
 $m entryconfigure "Does almost nothing" -bitmap questhead -compound left \
 	-command [list \
 	tk_dialog $w.compound {Compound Menu Entry} \
--- a/amd64/lib/tk8.6/demos/widget
+++ b/amd64/lib/tk8.6/demos/widget
@@ -624,7 +624,7 @@ proc showCode w {
    wm title $top [mc "Demo code: %s" [file join $tk_demoDirectory $file]]
    wm iconname $top $file
    set id [open [file join $tk_demoDirectory $file]]
-    fconfigure $id -encoding utf-8 -eofchar \032
+    fconfigure $id -encoding utf-8 -eofchar "\032 {}"
    $top.f.text delete 1.0 end
    $top.f.text insert 1.0 [read $id]
    $top.f.text mark set insert 1.0
--- a/amd64/lib/tk8.6/fontchooser.tcl
+++ b/amd64/lib/tk8.6/fontchooser.tcl
@@ -247,6 +247,7 @@ proc ::tk::fontchooser::Create {} {
        grid $S(W).lfonts x $S(W).lstyles x $S(W).lsizes x ^     -in $outer -sticky news
        grid $WE          x $WS           - -            x ^     -in $outer -sticky news -pady {15 30}
        grid configure $bbox -sticky n
+        grid rowconfigure $outer 2 -weight 1
        grid columnconfigure $outer {1 3 5} -minsize $minsize(gap)
        grid columnconfigure $outer {0 2 4} -weight 1
        grid columnconfigure $outer 0 -minsize $minsize(fonts)
--- a/amd64/lib/tk8.6/icons.tcl
+++ b/amd64/lib/tk8.6/icons.tcl
@@ -4,7 +4,7 @@
 #	were provided by the Tango Desktop project which provides a
 #	unified set of high quality icons licensed under the
 #	Creative Commons Attribution Share-Alike license
-#	(http://creativecommons.org/licenses/by-sa/3.0/)
+#	(https://creativecommons.org/licenses/by-sa/3.0/)
 #
 #	See http://tango.freedesktop.org/Tango_Desktop_Project
 #
--- a/amd64/lib/tk8.6/listbox.tcl
+++ b/amd64/lib/tk8.6/listbox.tcl
@@ -214,7 +214,7 @@ if {[tk windowingsystem] eq "x11"} {
    # Support for mousewheels on Linux/Unix commonly comes through mapping
    # the wheel to the extended buttons.  If you have a mousewheel, find
    # Linux configuration info at:
-    #	http://linuxreviews.org/howtos/xfree/mouse/
+    #	https://linuxreviews.org/HOWTO_change_the_mouse_speed_in_X
    bind Listbox <4> {
 	if {!$tk_strictMotif} {
 	    %W yview scroll -5 units
@@ -296,7 +296,7 @@ proc ::tk::ListboxMotion {w el} {
 	}
 	extended {
 	    set i $Priv(listboxPrev)
-	    if {$i eq ""} {
+	    if {$i < 0} {
 		set i $el
 		$w selection set $el
 	    }
--- a/amd64/lib/tk8.6/menu.tcl
+++ b/amd64/lib/tk8.6/menu.tcl
@@ -6,7 +6,7 @@
 #
 # Copyright (c) 1992-1994 The Regents of the University of California.
 # Copyright (c) 1994-1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
+# Copyright (c) 1998-1999 Scriptics Corporation.
 # Copyright (c) 2007 Daniel A. Steffen <das@users.sourceforge.net>
 #
 # See the file "license.terms" for information on usage and redistribution
@@ -475,7 +475,7 @@ proc ::tk::MbButtonUp w {
 proc ::tk::MenuMotion {menu x y state} {
    variable ::tk::Priv
    if {$menu eq $Priv(window)} {
-        set activeindex [$menu index active]
+	set active [$menu index active]
 	if {[$menu cget -type] eq "menubar"} {
 	    if {[info exists Priv(focus)] && $menu ne $Priv(focus)} {
 		$menu activate @$x,$y
@@ -488,7 +488,7 @@ proc ::tk::MenuMotion {menu x y state} {
 	set index [$menu index @$x,$y]
 	if {[info exists Priv(menuActivated)] \
 		&& $index ne "none" \
-                && $index ne $activeindex} {
+		&& $index ne $active} {
 	    set mode [option get $menu clickToFocus ClickToFocus]
 	    if {[string is false $mode]} {
 		set delay [expr {[$menu cget -type] eq "menubar" ? 0 : 50}]
@@ -941,7 +941,7 @@ proc ::tk::MenuFind {w char} {
 	    }
 	}
    }
-    return {}
+    return ""
 }

 # ::tk::TraverseToMenu --
@@ -1115,7 +1115,7 @@ proc ::tk::MenuFindName {menu s} {
    }
    set last [$menu index last]
    if {$last eq "none"} {
-	return
+	return ""
    }
    for {set i 0} {$i <= $last} {incr i} {
 	if {![catch {$menu entrycget $i -label} label]} {
@@ -1340,15 +1340,13 @@ proc ::tk_menuSetFocus {menu} {
 proc ::tk::GenerateMenuSelect {menu} {
    variable ::tk::Priv

-    if {$Priv(activeMenu) eq $menu \
-	    && $Priv(activeItem) eq [$menu index active]} {
-	return
-    }
-
+    if {$Priv(activeMenu) ne $menu \
+	    || $Priv(activeItem) ne [$menu index active]} {
 	set Priv(activeMenu) $menu
 	set Priv(activeItem) [$menu index active]
 	event generate $menu <<MenuSelect>>
    }
+}

 # ::tk_popup --
 # This procedure pops up a menu and sets things up for traversing
--- a/amd64/lib/tk8.6/pkgIndex.tcl
+++ b/amd64/lib/tk8.6/pkgIndex.tcl
@@ -1,7 +1,7 @@
-if {[catch {package present Tcl 8.6.0}]} { return }
+if {![package vsatisfies [package provide Tcl] 8.6.0]} return
 if {($::tcl_platform(platform) eq "unix") && ([info exists ::env(DISPLAY)]
 	|| ([info exists ::argv] && ("-display" in $::argv)))} {
-    package ifneeded Tk 8.6.11 [list load [file join $dir .. .. bin libtk8.6.dll] Tk]
+    package ifneeded Tk 8.6.12 [list load [file join $dir .. .. bin libtk8.6.dll]]
 } else {
-    package ifneeded Tk 8.6.11 [list load [file join $dir .. .. bin tk86t.dll] Tk]
+    package ifneeded Tk 8.6.12 [list load [file join $dir .. .. bin tk86t.dll]]
 }
--- a/amd64/lib/tk8.6/tearoff.tcl
+++ b/amd64/lib/tk8.6/tearoff.tcl
@@ -135,7 +135,7 @@ proc ::tk::MenuDup {src dst type} {
    }
    eval $cmd
    set last [$src index last]
-    if {$last eq "none"} {
+    if {$last eq "none" || $last < 0} {
 	return
    }
    for {set i [$src cget -tearoff]} {$i <= $last} {incr i} {
--- a/amd64/lib/tk8.6/text.tcl
+++ b/amd64/lib/tk8.6/text.tcl
@@ -499,7 +499,7 @@ if {[tk windowingsystem] eq "x11"} {
    # Support for mousewheels on Linux/Unix commonly comes through mapping
    # the wheel to the extended buttons.  If you have a mousewheel, find
    # Linux configuration info at:
-    #	http://linuxreviews.org/howtos/xfree/mouse/
+    #	https://linuxreviews.org/HOWTO_change_the_mouse_speed_in_X
    bind Text <4> {
 	if {!$tk_strictMotif} {
 	    %W yview scroll -50 pixels
--- a/amd64/lib/tk8.6/tk.tcl
+++ b/amd64/lib/tk8.6/tk.tcl
@@ -11,7 +11,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.

 # Verify that we have Tk binary and script components from the same release
-package require -exact Tk  8.6.11
+package require -exact Tk  8.6.12

 # Create a ::tk namespace
 namespace eval ::tk {
@@ -460,7 +460,7 @@ switch -exact -- [tk windowingsystem] {
 	event add <<ContextMenu>>	<Button-2>

 	# Official bindings
-	# See http://support.apple.com/kb/HT1343
+	# See https://support.apple.com/en-us/HT201236
 	event add <<SelectAll>>		<Command-Key-a>
 	event add <<Undo>>		<Command-Key-z> <Command-Lock-Key-Z>
 	event add <<Redo>>		<Shift-Command-Key-z> <Shift-Command-Lock-Key-z>
--- a/amd64/lib/tk8.6/ttk/aquaTheme.tcl
+++ b/amd64/lib/tk8.6/ttk/aquaTheme.tcl
@@ -42,6 +42,9 @@ namespace eval ttk::theme::aqua {
 	# so we only need to specify !focus.)

 	# Entry
+	ttk::style configure TEntry \
+	    -foreground systemTextColor \
+	    -background systemTextBackgroundColor
 	ttk::style map TEntry \
 	    -foreground {
 		disabled systemDisabledControlTextColor
@@ -60,6 +63,9 @@ namespace eval ttk::theme::aqua {
 	    }

 	# Spinbox
+	ttk::style configure TSpinbox \
+	    -foreground systemTextColor \
+	    -background systemTextBackgroundColor
 	ttk::style map TSpinbox \
 	    -foreground {
 		disabled systemDisabledControlTextColor
--- a/amd64/lib/tk8.6/ttk/menubutton.tcl
+++ b/amd64/lib/tk8.6/ttk/menubutton.tcl
@@ -83,9 +83,8 @@ if {[tk windowingsystem] eq "aqua"} {
 	set mw [winfo reqwidth $menu]
 	set bw [winfo width $mb]
 	set dF [expr {[winfo width $mb] - [winfo reqwidth $menu] - $menuPad}]
-	set entry ""
 	set entry [::tk::MenuFindName $menu [$mb cget -text]]
-	if {$entry eq ""} {
+	if {$entry < 0} {
 	    set entry 0
 	}
 	set x [winfo rootx $mb]
@@ -124,16 +123,15 @@ if {[tk windowingsystem] eq "aqua"} {
 	    incr mh 6
 	    incr mw 16
 	}
-	set entry {}
 	set entry [::tk::MenuFindName $menu [$mb cget -text]]
-	if {$entry eq {}} {
+	if {$entry < 0} {
 	    set entry 0
 	}
 	set x [winfo rootx $mb]
 	set y [winfo rooty $mb]
 	switch [$mb cget -direction] {
 	    above {
-		set entry {}
+		set entry ""
 		incr y -$mh
 		# if we go offscreen to the top, show as 'below'
 		if {$y < [winfo vrooty $mb]} {
@@ -142,7 +140,7 @@ if {[tk windowingsystem] eq "aqua"} {
 		}
 	    }
 	    below {
-		set entry {}
+		set entry ""
 		incr y $bh
 		# if we go offscreen to the bottom, show as 'above'
 		if {($y + $mh) > ([winfo vrooty $mb] + [winfo vrootheight $mb])} {
@@ -196,7 +194,7 @@ proc ttk::menubutton::Pulldown {mb} {
    $mb state pressed
    $mb configure -cursor [$menu cget -cursor]
    foreach {x y entry} [PostPosition $mb $menu] { break }
-    if {$entry ne {}} {
+    if {$entry >= 0} {
 	$menu post $x $y $entry
    } else {
 	$menu post $x $y
@@ -228,7 +226,7 @@ proc ttk::menubutton::TransferGrab {mb} {
 #
 proc ttk::menubutton::FindMenuEntry {menu s} {
    set last [$menu index last]
-    if {$last eq "none" || $last eq ""} {
+    if {$last eq "none" || $last < 0} {
 	return ""
    }
    for {set i 0} {$i <= $last} {incr i} {
--- a/amd64/lib/tk8.6/ttk/notebook.tcl
+++ b/amd64/lib/tk8.6/ttk/notebook.tcl
@@ -57,11 +57,13 @@ proc ttk::notebook::Press {w x y} {
 #	Select the next/previous tab in the list.
 #
 proc ttk::notebook::CycleTab {w dir} {
-    if {[$w index end] != 0} {
    set current [$w index current]
-	set select [expr {($current + $dir) % [$w index end]}]
-	while {[$w tab $select -state] != "normal" && ($select != $current)} {
-	    set select [expr {($select + $dir) % [$w index end]}]
+    if {$current >= 0} {
+	set tabCount [$w index end]
+	set select [expr {($current + $dir) % $tabCount}]
+	set step [expr {$dir > 0 ? 1 : -1}]
+	while {[$w tab $select -state] ne "normal" && ($select != $current)} {
+	    set select [expr {($select + $step) % $tabCount}]
 	}
 	if {$select != $current} {
 	    ActivateTab $w $select
--- a/amd64/lib/tk8.6/ttk/scrollbar.tcl
+++ b/amd64/lib/tk8.6/ttk/scrollbar.tcl
@@ -29,8 +29,6 @@ switch [tk windowingsystem] {
    x11 {
        lappend eventList <Button-4> <Button-5> \
                <Shift-Button-4> <Shift-Button-5>
-        # For tk 8.7, the event list will be extended by
-        # <Button-6> <Button-7>
    }
 }
 foreach event $eventList {
--- a/amd64/lib/tk8.6/ttk/utils.tcl
+++ b/amd64/lib/tk8.6/ttk/utils.tcl
@@ -311,11 +311,6 @@ proc ttk::bindMouseWheel {bindtag callback} {

 ## Mousewheel bindings for standard scrollable widgets.
 #
-# Usage: [ttk::copyBindings TtkScrollable $bindtag]
-#
-# $bindtag should be for a widget that supports the
-# standard scrollbar protocol.
-#

 if {[tk windowingsystem] eq "x11"} {
    bind TtkScrollable <Button-4>       { %W yview scroll -5 units }
@@ -325,18 +320,18 @@ if {[tk windowingsystem] eq "x11"} {
 }
 if {[tk windowingsystem] eq "aqua"} {
    bind TtkScrollable <MouseWheel> \
-	    { %W yview scroll [expr {-(%D)}] units }
+	    { %W yview scroll [expr {-%D}] units }
    bind TtkScrollable <Shift-MouseWheel> \
-	    { %W xview scroll [expr {-(%D)}] units }
+	    { %W xview scroll [expr {-%D}] units }
    bind TtkScrollable <Option-MouseWheel> \
-	    { %W yview scroll  [expr {-10 * (%D)}] units }
+	    { %W yview scroll  [expr {-10 * %D}] units }
    bind TtkScrollable <Shift-Option-MouseWheel> \
-	    { %W xview scroll [expr {-10 * (%D)}] units }
+	    { %W xview scroll [expr {-10 * %D}] units }
 } else {
    bind TtkScrollable <MouseWheel> \
-	    { %W yview scroll [expr {-(%D / 120)}] units }
+	    { %W yview scroll [expr {-%D / 120}] units }
    bind TtkScrollable <Shift-MouseWheel> \
-	    { %W xview scroll [expr {-(%D / 120)}] units }
+	    { %W xview scroll [expr {-%D / 120}] units }
 }

 #*EOF*
--- a/amd64/lib/tkstub86.lib
+++ b/amd64/lib/tkstub86.lib
--- a/win32/bin/tcl86t.dll
+++ b/win32/bin/tcl86t.dll
--- a/win32/bin/tclsh86t.exe
+++ b/win32/bin/tclsh86t.exe
--- a/win32/bin/tk86t.dll
+++ b/win32/bin/tk86t.dll
--- a/win32/bin/wish86t.exe
+++ b/win32/bin/wish86t.exe
--- a/win32/include/X11/Xlib.h
+++ b/win32/include/X11/Xlib.h
@@ -330,9 +330,6 @@ typedef struct _XImage {
    unsigned long green_mask;
    unsigned long blue_mask;
    XPointer obdata;		/* hook for the object routines to hang on */
-#if defined(MAC_OSX_TK)
-    int pixelpower;		/* No longer used. */
-#endif
    struct funcs {		/* image manipulation routines */
 	struct _XImage *(*create_image)();
 #if NeedFunctionPrototypes
--- a/win32/include/X11/keysym.h
+++ b/win32/include/X11/keysym.h
@@ -1,8 +1,29 @@
-/* $XConsortium: keysym.h,v 1.13 91/03/13 20:09:49 rws Exp $ */
-
 /***********************************************************
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
-and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.

                        All Rights Reserved

@@ -10,7 +31,7 @@ Permission to use, copy, modify, and distribute this software and its
 documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
 both that copyright notice and this permission notice appear in
-supporting documentation, and that the names of Digital or MIT not be
+supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
 software without specific, written prior permission.

@@ -30,6 +51,12 @@ SOFTWARE.
 #define XK_LATIN2
 #define XK_LATIN3
 #define XK_LATIN4
+#define XK_LATIN9
 #define XK_GREEK
+#define XK_KATAKANA
+#define XK_ARABIC
+#define XK_CYRILLIC
+#define XK_HEBREW

 #include <X11/keysymdef.h>
+
--- a/win32/include/X11/keysymdef.h
+++ b/win32/include/X11/keysymdef.h
--- a/Show More
+++ b/Show More