9 files changed, 29 insertions, 101 deletions
diff --git a/Master/source/tlgui/tltcl/LICENSE b/Master/source/tlgui/tltcl/LICENSE
deleted file mode 100644
index d8fe08dc831..00000000000
--- a/Master/source/tlgui/tltcl/LICENSE
+++ /dev/null
@@ -1,60 +0,0 @@
-The MIT License is applied to all files in this distribution, except:
-	kitsh/buildsrc/kitsh-0.0/boot.tcl
-	kitsh/buildsrc/kitsh-0.0/boot.tcl.h
-	kitsh/buildsrc/kitsh-0.0/kit.rc
-	kitsh/buildsrc/kitsh-0.0/kit.ico
-	kitsh/buildsrc/kitsh-0.0/kitInit.c
-	kitsh/buildsrc/kitsh-0.0/license.terms
-	kitsh/buildsrc/kitsh-0.0/pwb.c
-	kitsh/buildsrc/kitsh-0.0/rechan.c
-	kitsh/buildsrc/kitsh-0.0/zipvfs.tcl
-	kitsh/buildsrc/kitsh-0.0/zipvfs.tcl.h
-	kitsh/buildsrc/kitsh-0.0/zlib.c
-	kitsh/buildsrc/kitsh-0.0/winMain.c
-	kitsh/buildsrc/kitsh-0.0/mk4tcl.tcl
-	kitsh/buildsrc/kitsh-0.0/mk4tcl.tcl.h
-	kitdll/buildsrc/kitdll-0.0/rechan.c
-	kitdll/buildsrc/kitdll-0.0/zlib.c
-	kitdll/buildsrc/kitdll-0.0/kitInit.c
-	kitdll/buildsrc/kitdll-0.0/boot.tcl
-	kitdll/buildsrc/kitdll-0.0/pwb.c
-
-Please see "kitsh/buildsrc/kitsh-0.0/license.terms" for licensing information
-regarding these files.
-
-Files that are downloaded are under different licenses (grouped by project):
-	* Tcl: Tcl/Tk License <http://www.tcl.tk/software/tcltk/license.html>
-	* Tk: Tcl/Tk License <http://www.tcl.tk/software/tcltk/license.html>
-	* Itcl: Tcl/Tk License <http://incrtcl.sourceforge.net/itcl/copyright.html>
-	* Mk4tcl: MIT License <http://www.equi4.com/metakit/license.html>
-	* TclVFS: BSD License
-	* Thread: Tcl/Tk License <http://www.tcl.tk/software/tcltk/license.html>
-	* ZLib: Zlib License <http://www.gzip.org/zlib/zlib_license.html>
-
-The final result of this build process is a derivative work of all of these
-projects and is restricted by the cumulative licensing requirements of all of
-them.
-
-All other files in this distribution are licensed under the terms of the MIT
-License, below:
-The MIT License
-
-Copyright (c) 2010  Roy S. Keene
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-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
-AUTHORS OR COPYRIGHT HOLDERS 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.
diff --git a/Master/source/tlgui/tltcl/kitcreator-0.11.0.tar.gz b/Master/source/tlgui/tltcl/kitcreator-0.11.0.tar.gz
deleted file mode 100644
index 49eb0dac352..00000000000
--- a/Master/source/tlgui/tltcl/kitcreator-0.11.0.tar.gz
+++ /dev/null
diff --git a/Master/source/tlgui/tltcl/metakit-2.4.9.7.tar.gz b/Master/source/tlgui/tltcl/metakit-2.4.9.7.tar.gz
deleted file mode 100644
index 82378e0e26a..00000000000
--- a/Master/source/tlgui/tltcl/metakit-2.4.9.7.tar.gz
+++ /dev/null
diff --git a/Master/source/tlgui/tltcl/tcl8.6.8.tar.gz b/Master/source/tlgui/tltcl/tcl8.6.10.tar.gz
index c8577f40564..b34ba452e1c 100644..100755
--- a/Master/source/tlgui/tltcl/tcl8.6.8.tar.gz
+++ b/Master/source/tlgui/tltcl/tcl8.6.10.tar.gz
diff --git a/Master/source/tlgui/tltcl/tclvfs-20080503.tar.gz b/Master/source/tlgui/tltcl/tclvfs-20080503.tar.gz
deleted file mode 100644
index 6bbdf4a087b..00000000000
--- a/Master/source/tlgui/tltcl/tclvfs-20080503.tar.gz
+++ /dev/null
diff --git a/Master/source/tlgui/tltcl/tk8.6.10.tar.gz b/Master/source/tlgui/tltcl/tk8.6.10.tar.gz
new file mode 100755
index 00000000000..53d1d1c8d9b
--- /dev/null
+++ b/Master/source/tlgui/tltcl/tk8.6.10.tar.gz
diff --git a/Master/source/tlgui/tltcl/tk8.6.8.tar.gz b/Master/source/tlgui/tltcl/tk8.6.8.tar.gz
deleted file mode 100644
index 21cbb485ddc..00000000000
--- a/Master/source/tlgui/tltcl/tk8.6.8.tar.gz
+++ /dev/null
diff --git a/Master/source/tlgui/tltcl/tltcl.README b/Master/source/tlgui/tltcl/tltcl.README
index 4f54395cd9a..5e56317b407 100644
--- a/Master/source/tlgui/tltcl/tltcl.README
+++ b/Master/source/tlgui/tltcl/tltcl.README
@@ -1,54 +1,42 @@
-tclkit.exe is a single-file Tcl/Tk runtime. The one included in TeX
-Live is generated with kitcreator. This program downloads and
-compiles tcl, tk and various pieces of infrastructure.
+Notes on building Tcl/Tk for TeX Live 2020
 
-I used kitcreator's README file for guidance in generating
-tclkit.exe:
+The 2020 edition contains a standard basic Tcl/Tk installation.
+However, I was unable this time to create a single-file Tcl/Tk
+runtime, as for the 2019 TeX Live edition.
 
-from the root of the unpacked kitcreator archive I first created a
-native Linux tclkit:
+The Tcl/Tk 8.6.10 sources were downloaded via
+http://www.tcl.tk/software/tcltk/download.html
 
-./kitcreator
-mv tclkit-8.6.8 tclkit-local
+Tcl/Tk was cross-compiled under Ubuntu Linux 18.04 as follows. For
+first Tcl, then Tk do:
 
-From this same directory I ran the following script:
+- Unpack the source, and run in the win subdirectory:
 
-================
-#!/bin/bash
-export TCLKIT=`pwd`/tclkit-local
-export CROSS=i686-w64-mingw32
+  ./configure --host=i686-w64-mingw32 --enable-embedded-manifest \
+    --prefix=<tcltk root>
 
-export CC=${CROSS}-gcc
-export CXX=${CROSS}-c++
-export AR=${CROSS}-ar
-export RANLIB=${CROSS}-ranlib
-export STRIP=${CROSS}-strip
-export RC=${CROSS}-windres
-./kitcreator --host=${CROSS}
+- For Tk, patch the file tk8.6.10/win/win/wish.exe.manifest for
+  better HiPDI support by adding a dpiAwareness element; the
+  asmv3:windowsSettings element in this file becomes:
 
-mv tclkit-8.6.8 tclkit.exe
-================
+        <asmv3:windowsSettings
+                xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+            <dpiAware>true</dpiAware>
+            <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+        </asmv3:windowsSettings>
 
-This directory contains the archives of kitcreator and the archives
-it downloaded during the build process.
+  Presumably I could instead have patched wish.exe.manifest.in
+  _before_ running configure.
 
-The LICENSE file is the one I found in the root of the kitcreator
-archive.
+- run 'make' and 'make install'
 
-As to the urls of the downloaded files: a command
+  make
+  make install
 
-find . -name "build*.sh" -exec grep '^SRCURL=' \{} \;
-
-generated the following output:
-
-SRCURL="http://sourceforge.net/projects/incrtcl/files/%5BIncr%20Tcl_Tk%5D-source/Itcl%20${ITCLVERS}/itcl${ITCLVERS}${ITCLVERSEXTRA}.tar.gz/download"
-SRCURL="http://prdownloads.sourceforge.net/tcl/tcl${TCLVERS}-src.tar.gz"
-SRCURL="http://sourceforge.net/projects/tcl/files/Thread%20Extension/${THREADVERS}/thread${THREADVERS}.tar.gz/download"
-SRCURL="http://www.equi4.com/pub/mk/metakit-${MK4VERS}.tar.gz"
-SRCURL="http://pkgs.fedoraproject.org/repo/pkgs/metakit/metakit-${MK4VERS}.tar.gz/17330257376eea657827ed632ea62c9e/metakit-${MK4VERS}.tar.gz"
-SRCURL="http://prdownloads.sourceforge.net/tcl/tk${TCLVERS}-src.tar.gz"
-
-The itcl- and thread- packages listed above were not actually downloaded.
+Portability of the result should be no problem. I removed
+sqlite3_analyzer from <tcltk root>/bin and placed the resulting lib-
+and bin subdirectories under <TL root>/tlpkg/tltcl.
 
 Siep Kroonenberg
-November 2018
+
+March 2020
diff --git a/Master/source/tlgui/tltcl/zlib-1.2.8.tar.gz b/Master/source/tlgui/tltcl/zlib-1.2.8.tar.gz
deleted file mode 100644
index ed88885bd40..00000000000
--- a/Master/source/tlgui/tltcl/zlib-1.2.8.tar.gz
+++ /dev/null