Index: trunk/kitgen/Makefile
===================================================================
--- trunk/kitgen/Makefile	(revision 176)
+++ trunk/kitgen/Makefile	(revision 195)
@@ -1,14 +1,14 @@
-GSL_URL    = http://ftp.gnu.org/gnu/gsl/gsl-1.15.tar.gz
-TDOM_URL   = http://github.com/downloads/tDOM/tdom/tDOM-0.8.3.tgz
-ZLIB_URL   = http://downloads.sourceforge.net/project/libpng/zlib/1.2.7/zlib-1.2.7.tar.gz
-XOTCL_URL  = http://downloads.sourceforge.net/project/xotcl/xotcl/1.6.7/xotcl-1.6.7.tar.gz
-SQLITE_URL = http://www.sqlite.org/sqlite-autoconf-3071401.tar.gz
-LIBUSB_URL = http://heanet.dl.sourceforge.net/project/libusb/libusb-0.1%20%28LEGACY%29/0.1.12/libusb-0.1.12.tar.gz
+TDOM_URL    = http://github.com/downloads/tDOM/tdom/tDOM-0.8.3.tgz
+TCLLIB_URL  = http://github.com/tcltk/tcllib/archive/tcllib_1_16.tar.gz -O tcllib_1_16.tar.gz
+ZLIB_URL    = http://heanet.dl.sourceforge.net/project/libpng/zlib/1.2.3/zlib-1.2.3.tar.gz
+XOTCL_URL   = http://heanet.dl.sourceforge.net/project/xotcl/xotcl/1.6.7/xotcl-1.6.7.tar.gz
+TKTABLE_URL = http://heanet.dl.sourceforge.net/project/tktable/tktable/2.10/Tktable2.10.tar.gz
+SQLITE_URL  = http://www.sqlite.org/2014/sqlite-autoconf-3080403.tar.gz
+LIBUSB_URL  = http://heanet.dl.sourceforge.net/project/libusb/libusb-0.1%20%28LEGACY%29/0.1.12/libusb-0.1.12.tar.gz
 
-TCL_CVS    = :pserver:anonymous@tcl.cvs.sourceforge.net:/cvsroot/tcl
-TK_CVS     = :pserver:anonymous@tktoolkit.cvs.sourceforge.net:/cvsroot/tktoolkit
+TCL_CVS     = :pserver:anonymous@tcl.cvs.sourceforge.net:/cvsroot/tcl
+TK_CVS      = :pserver:anonymous@tktoolkit.cvs.sourceforge.net:/cvsroot/tktoolkit
 
-VFS_CVS    = :pserver:anonymous@tclvfs.cvs.sourceforge.net:/cvsroot/tclvfs
-TCLLIB_CVS = :pserver:anonymous@tcllib.cvs.sourceforge.net:/cvsroot/tcllib
+VFS_CVS     = :pserver:anonymous@tclvfs.cvs.sourceforge.net:/cvsroot/tclvfs
 
 unspecified-target:
@@ -16,6 +16,5 @@
 cvs:
 	mkdir -p 8.x && cd 8.x && \
-	  cvs -d $(VFS_CVS) co tclvfs && \
-	  cvs -d ${TCLLIB_CVS} co tcllib
+	  cvs -d $(VFS_CVS) co tclvfs
 	mkdir -p 8.5 && cd 8.5 && \
 	  cvs -d $(TCL_CVS) co -r core-8-5-branch tcl && \
@@ -24,8 +23,9 @@
 tars:
 	mkdir -p 8.x && cd 8.x && \
-	  wget -q $(GSL_URL) && \
 	  wget -q $(TDOM_URL) && \
+	  wget -q $(TCLLIB_URL) && \
 	  wget -q $(ZLIB_URL) && \
 	  wget -q $(XOTCL_URL) && \
+	  wget -q $(TKTABLE_URL) && \
 	  wget -q $(SQLITE_URL) && \
 	  wget -q $(LIBUSB_URL)
@@ -33,15 +33,17 @@
 untar:
 	mkdir -p 8.x && cd 8.x && \
-	  tar xfz gsl-1.15.tar.gz && \
 	  tar xfz tDOM-0.8.3.tgz && \
-	  tar xfz zlib-1.2.7.tar.gz && \
+	  tar xfz tcllib_1_16.tar.gz && \
+	  tar xfz zlib-1.2.3.tar.gz && \
 	  tar xfz xotcl-1.6.7.tar.gz && \
-	  tar xfz sqlite-autoconf-3071401.tar.gz && \
+	  tar xfz Tktable2.10.tar.gz && \
+	  tar xfz sqlite-autoconf-3080403.tar.gz && \
 	  tar xfz libusb-0.1.12.tar.gz && \
-	  mv gsl-1.15 gsl && \
 	  mv tDOM-0.8.3 tdom && \
-	  mv zlib-1.2.7 zlib && \
+	  mv tcllib-tcllib_1_16 tcllib && \
+	  mv zlib-1.2.3 zlib && \
 	  mv xotcl-1.6.7 xotcl && \
-	  mv sqlite-autoconf-3071401 sqlite && \
+	  mv Tktable2.10 Tktable && \
+	  mv sqlite-autoconf-3080403 sqlite && \
 	  mv libusb-0.1.12 libusb
 
Index: trunk/kitgen/files/Tktable2.10-pkgIndex.tcl
===================================================================
--- trunk/kitgen/files/Tktable2.10-pkgIndex.tcl	(revision 195)
+++ trunk/kitgen/files/Tktable2.10-pkgIndex.tcl	(revision 195)
@@ -0,0 +1,1 @@
+package ifneeded Tktable 2.10 [load {} Tktable]
Index: trunk/kitgen/files/vfs1.4.2-pkgIndex.tcl
===================================================================
--- trunk/kitgen/files/vfs1.4.2-pkgIndex.tcl	(revision 195)
+++ trunk/kitgen/files/vfs1.4.2-pkgIndex.tcl	(revision 195)
@@ -0,0 +1,5 @@
+package ifneeded vfs        1.4.2  [list load {} vfs]
+package ifneeded starkit    1.3.3  [list source [file join $dir starkit.tcl]]
+package ifneeded vfslib     1.4    [list source [file join $dir vfslib.tcl]]
+package ifneeded vfs::mk4   1.10.1 [list source [file join $dir mk4vfs.tcl]]
+package ifneeded vfs::zip   1.0.4  [list source [file join $dir zipvfs.tcl]]
Index: trunk/kitgen/kitInit.c
===================================================================
--- trunk/kitgen/kitInit.c	(revision 176)
+++ trunk/kitgen/kitInit.c	(revision 195)
@@ -44,4 +44,5 @@
 #ifdef KIT_INCLUDES_TK
 Tcl_AppInitProc	Blt_Init, Blt_SafeInit;
+Tcl_AppInitProc	Tktable_Init, Tktable_SafeInit;
 #endif
 
@@ -114,4 +115,5 @@
     Tcl_StaticPackage(0, "Tk", Tk_Init, Tk_SafeInit);
     Tcl_StaticPackage(0, "Blt", Blt_Init, Blt_SafeInit);
+    Tcl_StaticPackage(0, "Tktable", Tktable_Init, Tktable_SafeInit);
 #endif
 
Index: trunk/kitgen/makefile.include
===================================================================
--- trunk/kitgen/makefile.include	(revision 176)
+++ trunk/kitgen/makefile.include	(revision 195)
@@ -27,4 +27,5 @@
 
 BLT_OPTS = --disable-threads
+TKTABLE_OPTS = --disable-threads
 VFS_OPTS = --disable-threads
 TDOM_OPTS = --disable-threads
@@ -43,5 +44,5 @@
 
 ifeq ($(PLAT), win)
-kit-gui$(EXE): build/tcl build/tk build/blt build/tclvfs build/zlib \
+kit-gui$(EXE): build/tcl build/tk build/blt build/Tktable build/tclvfs build/zlib \
 	build/tdom build/tcllib build/xotcl build/sqlite build/libusb-win32 $(GUIOBJ)
 	$(CC) -o $@ $(CFLAGS) ../../kitInit.c $(GUIOBJ) \
@@ -52,4 +53,5 @@
 	  build/lib/*tcl8*$A \
 	  build/lib/BLT2*/*BLT2*$A \
+	  build/lib/Tktable2*/*Tktable2*$A \
 	  build/lib/tdom0*/*tdom0*$A \
 	  build/lib/sqlite3*/*sqlite3*$A \
@@ -57,5 +59,5 @@
 	  $(LDFLAGS) $(GUI_OPTS)
 else
-kit-gui$(EXE): build/tcl build/tk build/blt build/tclvfs build/zlib \
+kit-gui$(EXE): build/tcl build/tk build/blt build/Tktable build/tclvfs build/zlib \
 	build/tdom build/tcllib build/xotcl build/sqlite build/libusb $(GUIOBJ)
 	$(CC) -o $@ $(CFLAGS) ../../kitInit.c $(GUIOBJ) \
@@ -66,4 +68,5 @@
 	  build/lib/*tcl8*$A \
 	  build/lib/BLT2*/*BLT2*$A \
+	  build/lib/Tktable2*/*Tktable2*$A \
 	  build/lib/tdom0*/*tdom0*$A \
 	  build/lib/sqlite3*/*sqlite3*$A \
@@ -89,4 +92,9 @@
 	mkdir -p $@ && cd $@ && CFLAGS="$(CFLAGS)" && export CFLAGS && \
 	  sh $(EXTDIR)/blt/configure $(STATIC) $(TCLDIR) $(BLT_OPTS) && \
+	  $(MAKE) install-binaries install-libraries
+
+build/Tktable: build/tk
+	mkdir -p $@ && cd $@ && CFLAGS="$(CFLAGS)" && export CFLAGS && \
+	  sh $(EXTDIR)/Tktable/configure $(STATIC) $(TCLDIR) $(TKTABLE_OPTS) && \
 	  $(MAKE) install-binaries install-libraries
 
Index: trunk/kitgen/setupvfs.tcl
===================================================================
--- trunk/kitgen/setupvfs.tcl	(revision 176)
+++ trunk/kitgen/setupvfs.tcl	(revision 195)
@@ -40,4 +40,11 @@
   exit 1
 }
+
+set tcl_library ../tcl/library
+source ../tcl/library/init.tcl ;# for tcl::CopyDirectory
+
+package require platform
+
+set platform [lindex [split [platform::generic] -] 0]
 
 load {} zlib
@@ -64,4 +71,9 @@
                   csr0@ csr[package require csr]]
 
+if {[string equal $platform win32]} {
+  load {} registry
+  lappend versmap registry1@ registry[package require registry]
+}
+
 if {$debugOpt} {
   puts "Starting [info script]"
@@ -74,9 +86,9 @@
 }
 
-set tcl_library ../tcl/library
-source ../tcl/library/init.tcl ;# for tcl::CopyDirectory
-
 # Create package index files for the static extensions.
-set exts {swt csr usb g2lite XOTcl zlib}
+set exts [list swt csr usb g2lite XOTcl zlib]
+if {[string equal $platform win32]} {
+  lappend exts registry
+}
 foreach ext $exts {
   load {} $ext
@@ -89,5 +101,4 @@
 set clifiles {
   boot.tcl
-  main.tcl
   config.tcl
   lib/tcl8@/auto.tcl
@@ -115,15 +126,22 @@
   lib/csr0@/pkgIndex.tcl
   lib/zlib1@/pkgIndex.tcl
-  lib/tcllib1.14/pkgIndex.tcl
-  lib/tcllib1.14/asn
-  lib/tcllib1.14/base64
-  lib/tcllib1.14/comm
-  lib/tcllib1.14/cmdline
-  lib/tcllib1.14/fileutil
-  lib/tcllib1.14/ldap
-  lib/tcllib1.14/log
-  lib/tcllib1.14/math
-  lib/tcllib1.14/snit
-  lib/tcllib1.14/uri}
+  lib/tcllib1.16/pkgIndex.tcl
+  lib/tcllib1.16/asn
+  lib/tcllib1.16/base64
+  lib/tcllib1.16/comm
+  lib/tcllib1.16/cmdline
+  lib/tcllib1.16/csv
+  lib/tcllib1.16/fileutil
+  lib/tcllib1.16/ldap
+  lib/tcllib1.16/log
+  lib/tcllib1.16/math
+  lib/tcllib1.16/snit
+  lib/tcllib1.16/struct
+  lib/tcllib1.16/uri
+}
+
+if {[string equal $platform win32]} {
+  lappend clifiles lib/registry1@/pkgIndex.tcl
+}
 
 set guifiles {
@@ -168,4 +186,6 @@
   lib/BLT2.4/bltCanvEps.pro
   lib/BLT2.4/bltGraph.pro
+  lib/Tktable2.10/pkgIndex.tcl
+  lib/Tktable2.10/tkTable.tcl
 }