7 files changed, 447 insertions, 276 deletions

diff --git a/lang/STk/Makefile b/lang/STk/Makefile
index c8b651eb1ad9..b969db79e848 100644
--- a/lang/STk/Makefile
+++ b/lang/STk/Makefile
@@ -1,25 +1,24 @@
-# New ports collection makefile for:    STk
-# Date created:         17 Sep 96 
-# Whom:                 jmacd@cs.berkeley.edu
+# New ports collection makefile for:	STk
+# Date created:		17 Sep 96 
+# Whom:			jmacd@cs.berkeley.edu
 #
 # $FreeBSD$
 #
 
 PORTNAME=	STk
-PORTVERSION=	3.1.1
+PORTVERSION=	4.0.1
 CATEGORIES=	lang
-MASTER_SITES=	ftp://kaolin.unice.fr/pub/
+MASTER_SITES=	${MASTER_SITE_SUNSITE} \
+		ftp://kaolin.unice.fr/pub/STk/
+MASTER_SITE_SUBDIR=	devel/lang/lisp
 
-MAINTAINER=	jmacd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 USE_XLIB=	yes
-PATCH_STRIP=	-p1
 GNU_CONFIGURE=	yes
-MAKE_FLAGS=	"prefix=${PREFIX}" -f
-STK_ARCH!=	echo "$$(uname)-$$(uname -r)-$$(uname -m)"
-PLIST_SUB=	STK_VERSION=3.1.1 STK_ARCH=${STK_ARCH}
 
-post-install:
-	@(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install.man)
+PLIST_SUB=	STK_VERSION=${PORTVERSION} STK_ARCH=${STK_ARCH}
+
+STK_ARCH!=	${ECHO} "$$(uname)-$$(uname -r)-$$(uname -m)"
 
 .include <bsd.port.mk>
diff --git a/lang/STk/distinfo b/lang/STk/distinfo
index 4dc9dc729db6..a123db2bfb8a 100644
--- a/lang/STk/distinfo
+++ b/lang/STk/distinfo
@@ -1 +1 @@
-MD5 (STk-3.1.1.tar.gz) = 7cc038e09dc86132e7c3a12eff28a3f9
+MD5 (STk-4.0.1.tar.gz) = 4f21cae40a619193ee081eafaa58a5be
diff --git a/lang/STk/files/patch-aa b/lang/STk/files/patch-aa
deleted file mode 100644
index 6fbb4676ff46..000000000000
--- a/lang/STk/files/patch-aa
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -cr STk-3.1/Makefile.in STk-3.1.new/Makefile.in
-*** STk-3.1/Makefile.in	Wed Jul 24 12:53:04 1996
---- STk-3.1.new/Makefile.in	Tue Sep 17 15:26:07 1996
-***************
-*** 73,79 ****
-  	@echo "SH_LDFLAGS	= @SH_LDFLAGS@"			>> config.make
-  	@echo "SH_LOADER	= @SH_LOADER@"			>> config.make
-  	@echo "SH_SUFFIX	= @SH_SUFFIX@"			>> config.make
-! 	@echo "LIB_MALLOC	= @LIB_MALLOC@"			>> config.make
-  	@echo "LIB_DLD		= @LIB_DLD@"			>> config.make
-  		
-  	@echo "STK_LIBRARY	= $(libdir)"			>> config.make
---- 73,79 ----
-  	@echo "SH_LDFLAGS	= @SH_LDFLAGS@"			>> config.make
-  	@echo "SH_LOADER	= @SH_LOADER@"			>> config.make
-  	@echo "SH_SUFFIX	= @SH_SUFFIX@"			>> config.make
-! 	@echo "LIB_MALLOC	= "				>> config.make
-  	@echo "LIB_DLD		= @LIB_DLD@"			>> config.make
-  		
-  	@echo "STK_LIBRARY	= $(libdir)"			>> config.make
-***************
-*** 108,114 ****
-  demos:
-  	/bin/sh -c "(cd Demos; ../Src/test-stk -f hbrowse README.html)"
-  
-! install: clean-before
-  	(cd Tcl;     	$(MAKE) install)
-  	(cd Tk;      	$(MAKE) install)
-  	(cd Mp;		$(MAKE) install)
---- 108,114 ----
-  demos:
-  	/bin/sh -c "(cd Demos; ../Src/test-stk -f hbrowse README.html)"
-  
-! install:
-  	(cd Tcl;     	$(MAKE) install)
-  	(cd Tk;      	$(MAKE) install)
-  	(cd Mp;		$(MAKE) install)
-*** STk-3.1/Tk/unix/Makefile.in	Tue Sep 17 15:47:29 1996
---- STk-3.1.new/Tk/unix/Makefile.in	Tue Sep 17 15:57:13 1996
-***************
-*** 75,86 ****
-  # X11 include files accessible (the configure script will try to
-  # set this value, and will cause it to be an empty string if the
-  # include files are accessible via /usr/include).
-! X11_INCLUDES =		@XINCLUDES@
-  
-  # Linker switch(es) to use to link with the X11 library archive (the
-  # configure script will try to set this value automatically, but you
-  # can override it).
-! X11_LIB_SWITCHES =	@XLIBSW@
-  
-  # Libraries to use when linking:  must include at least Tk, Tcl, Xlib,
-  # and the math library (in that order).  The "LIBS" part will be
---- 75,86 ----
-  # X11 include files accessible (the configure script will try to
-  # set this value, and will cause it to be an empty string if the
-  # include files are accessible via /usr/include).
-! X11_INCLUDES =		-I/usr/X11R6/include/
-  
-  # Linker switch(es) to use to link with the X11 library archive (the
-  # configure script will try to set this value automatically, but you
-  # can override it).
-! X11_LIB_SWITCHES =	-L/usr/X11R6/lib/
-  
-  # Libraries to use when linking:  must include at least Tk, Tcl, Xlib,
-  # and the math library (in that order).  The "LIBS" part will be
-*** STk-3.1.1/configure.in.orig	Sat Mar  7 17:05:37 1998
---- STk-3.1.1/configure.in	Sat Mar  7 17:05:48 1998
-***************
-*** 387,393 ****
-       STKLDFLAGS="$STKLDFLAGS -Wl,-E"
-       LIB_DLD=-ldld;;
-     FREEBSD)
-!      SH_CCFLAGS="-pic"
-       SH_LDFLAGS="-Bshareable -o"
-       SH_LOADER="ld"
-       LIB_MALLOC="-lgnumalloc"
---- 387,393 ----
-       STKLDFLAGS="$STKLDFLAGS -Wl,-E"
-       LIB_DLD=-ldld;;
-     FREEBSD)
-!      SH_CCFLAGS="-fpic"
-       SH_LDFLAGS="-Bshareable -o"
-       SH_LOADER="ld"
-       LIB_MALLOC="-lgnumalloc"
-*** STk-3.1.1/configure.orig	Sat Mar  7 17:17:50 1998
---- STk-3.1.1/configure	Sat Mar  7 17:17:59 1998
-***************
-*** 1536,1542 ****
-       STKLDFLAGS="$STKLDFLAGS -Wl,-E"
-       LIB_DLD=-ldld;;
-     FREEBSD)
-!      SH_CCFLAGS="-pic"
-       SH_LDFLAGS="-Bshareable -o"
-       SH_LOADER="ld"
-       LIB_MALLOC="-lgnumalloc"
---- 1536,1542 ----
-       STKLDFLAGS="$STKLDFLAGS -Wl,-E"
-       LIB_DLD=-ldld;;
-     FREEBSD)
-!      SH_CCFLAGS="-fpic"
-       SH_LDFLAGS="-Bshareable -o"
-       SH_LOADER="ld"
-       LIB_MALLOC="-lgnumalloc"
diff --git a/lang/STk/files/patch-ab b/lang/STk/files/patch-ab
new file mode 100644
index 000000000000..1bd405bfa2d2
--- /dev/null
+++ b/lang/STk/files/patch-ab
@@ -0,0 +1,11 @@
+--- configure.orig	Mon Sep 27 00:02:14 1999
++++ configure	Wed Mar 15 23:44:50 2000
+@@ -578,7 +578,7 @@
+ 	  esac;;
+   FreeBSD*)
+  	  case $machine in
+- 	    i*86) machine=ix86;;
++ 	    i*86) machine=i386;;
+  	  esac;;
+   SunOS*)
+ 	  case $version in
diff --git a/lang/STk/files/patch-ac b/lang/STk/files/patch-ac
new file mode 100644
index 000000000000..a85d59c5e02a
--- /dev/null
+++ b/lang/STk/files/patch-ac
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sat Sep  4 05:21:32 1999
++++ Makefile.in	Wed Mar 15 23:46:41 2000
+@@ -118,7 +118,7 @@
+ 	(cd Extensions; $(MAKE) install prefix=$(root)$(prefix))
+ 	(cd Demos;   	$(MAKE) install root=$(root))
+ 	(cd Help;	$(MAKE) install prefix=$(root)$(prefix))
+-	(cd Doc;	$(MAKE) install prefix=$(root)$(prefix))
++	(cd Doc;	$(MAKE) install.man prefix=$(root)$(prefix))
+ 	(cd Stack;	$(MAKE) install prefix=$(root)$(prefix))
+ 
+ install.libs:
diff --git a/lang/STk/pkg-descr b/lang/STk/pkg-descr
index 382bb3adb30e..7eead027ae9c 100644
--- a/lang/STk/pkg-descr
+++ b/lang/STk/pkg-descr
@@ -7,3 +7,5 @@ The Scheme interpreter is now R4RS conformant.
 This release provides an efficient object oriented system called STklos. 
 STklos is a full OO system with multi-inheritance, generic functions,
 multi-methods and a true meta object protocol).
+
+WWW: http://kaolin.unice.fr/STk/
diff --git a/lang/STk/pkg-plist b/lang/STk/pkg-plist
index ddff89d7e60b..826e609bbc70 100644
--- a/lang/STk/pkg-plist
+++ b/lang/STk/pkg-plist
@@ -1,16 +1,254 @@
-bin/stk
-bin/stk-%%STK_VERSION%%
 bin/snow
 bin/snow-%%STK_VERSION%%
+bin/stk
+bin/stk-%%STK_VERSION%%
+lib/stk/%%STK_VERSION%%/%%STK_ARCH%%/base64.so 
 lib/stk/%%STK_VERSION%%/%%STK_ARCH%%/hash.so
 lib/stk/%%STK_VERSION%%/%%STK_ARCH%%/html.so
+lib/stk/%%STK_VERSION%%/%%STK_ARCH%%/jpeg.so    
+lib/stk/%%STK_VERSION%%/%%STK_ARCH%%/locale.so
 lib/stk/%%STK_VERSION%%/%%STK_ARCH%%/pixmap.so
 lib/stk/%%STK_VERSION%%/%%STK_ARCH%%/posix.so
 lib/stk/%%STK_VERSION%%/%%STK_ARCH%%/process.so
-lib/stk/%%STK_VERSION%%/%%STK_ARCH%%/snow
+lib/stk/%%STK_VERSION%%/%%STK_ARCH%%/snow 
 lib/stk/%%STK_VERSION%%/%%STK_ARCH%%/socket.so
 lib/stk/%%STK_VERSION%%/%%STK_ARCH%%/sregexp.so
 lib/stk/%%STK_VERSION%%/%%STK_ARCH%%/stk
+lib/stk/%%STK_VERSION%%/man/man1/STk-man.macros
+lib/stk/%%STK_VERSION%%/man/man1/snow.1
+lib/stk/%%STK_VERSION%%/man/man1/stk.1
+lib/stk/%%STK_VERSION%%/man/mann/STk-man.macros
+lib/stk/%%STK_VERSION%%/man/mann/stk_after.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_bell.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_bind.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_bindtags.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_bitmap.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_button.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_canvas.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_change-image.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_checkbutton.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_choose-color.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_clipboard.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_destroy.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_ed.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_entry.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_event.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_find-image.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_focus-next.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_focus.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_font.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_frame.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_free-image.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_ftp.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_grab.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_grid.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_image.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_jpeg.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_label.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_listbox.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_listener.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_lower.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_make-console.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_make-dialog.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_make-image.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_menu.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_menubutton.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_message-box.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_message.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_option-menu.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_option.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_options.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_pack.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_palette.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_photo.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_pixmap.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_place.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_popup.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_posix.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_radiobutton.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_raise.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_repl-display-prompt.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_repl-display-result.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_report-error.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_scale.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_scrollbar.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_selection.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_send.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_text.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_tk.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_tkvars.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_tkwait.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_toplevel.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_update.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_winfo.n
+lib/stk/%%STK_VERSION%%/man/mann/stk_wm.n
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/STk-tiny.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/amib-tiny.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/amib.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/backward.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/compo-all.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/en.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/entry.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/envdraw.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/fr.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/frame.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/label.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/mosaic_01.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/mosaic_02.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/mosaic_03.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/mosaic_04.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/mosaic_05.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/mosaic_06.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/mosaic_07.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/mosaic_08.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/mosaic_09.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/mosaic_10.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/mosaic_11.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/mosaic_12.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/mosaic_13.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/mosaic_14.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/mosaic_15.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/mosaic_16.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/mosaic_17.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/mosaic_18.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/mosaic_19.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/mosaic_20.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/mosaic_21.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/mosaic_22.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/mosaic_23.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/mosaic_24.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images/mosaic_25.gif
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/S-scape-en.html
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/S-scape-fr.html
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/amib-en.html
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/amib-fr.html
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/amib.stklos
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/applet-en.html
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/applet-fr.html
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/compo-en.html
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/compo-fr.html
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/envdraw-en.html
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/envdraw-fr.html
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/intro-en.html
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/intro-fr.html
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/main-en.html
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/main-fr.html
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/main.html
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/simple-en.html
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/simple-fr.html
+lib/stk/%%STK_VERSION%%/Demos/Html-Demos/stklos-widgets
+lib/stk/%%STK_VERSION%%/Demos/README.html
+lib/stk/%%STK_VERSION%%/Demos/S-scape.stklos
+lib/stk/%%STK_VERSION%%/Demos/Warrow.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wbind.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wbitmap.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wbutton.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wcheck.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wcolors.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wcscroll.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wctext.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wdialog1.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wdialog2.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wentry1.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wentry2.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wfloor.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wform.stklos
+lib/stk/%%STK_VERSION%%/Demos/Whscale.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wicon.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wimage1.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wimage2.stklos
+lib/stk/%%STK_VERSION%%/Demos/Witems.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wlabel.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wmenu.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wpuzzle.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wradio.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wruler.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wsayings.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wsearch.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wstates.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wstyles.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wtext.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wvscale.stklos
+lib/stk/%%STK_VERSION%%/Demos/Wwind.stklos
+lib/stk/%%STK_VERSION%%/Demos/amib.stklos
+lib/stk/%%STK_VERSION%%/Demos/browse.stk
+lib/stk/%%STK_VERSION%%/Demos/browse.stklos
+lib/stk/%%STK_VERSION%%/Demos/calc.stklos
+lib/stk/%%STK_VERSION%%/Demos/classbrowse.stklos
+lib/stk/%%STK_VERSION%%/Demos/colormap.stk
+lib/stk/%%STK_VERSION%%/Demos/console-demo.stk
+lib/stk/%%STK_VERSION%%/Demos/filebox.stklos
+lib/stk/%%STK_VERSION%%/Demos/hanoi.stk
+lib/stk/%%STK_VERSION%%/Demos/hello.stk
+lib/stk/%%STK_VERSION%%/Demos/hello.stklos
+lib/stk/%%STK_VERSION%%/Demos/inspector.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/bind1.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/bind2.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/bind3.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/button1.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/button2.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/canvas-animate.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/canvas-drag.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/canvas-draw.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/canvas-funky.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/canvas-rubber.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/canvas1.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/canvas2.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/canvas3.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/canvas4.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/canvas5.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/canvas6.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/canvas7.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/checkbutton.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/dialogbox.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/entry1.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/entry2.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/frame1.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/frame2.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/frame3.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/grouping.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/index
+lib/stk/%%STK_VERSION%%/Demos/lessons/label1.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/label2.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/label3.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/listbox1.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/listbox2.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/menu1.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/menu2.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/message.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/misc.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/options.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/pack1.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/pack2.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/pack3.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/radiobutton.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/scale1.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/scale2.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/selection.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/text1.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/text2.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/text3.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/text4.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/text5.stk
+lib/stk/%%STK_VERSION%%/Demos/lessons/tkwait.stk
+lib/stk/%%STK_VERSION%%/Demos/lib/iu.ridge.xbm
+lib/stk/%%STK_VERSION%%/Demos/lib/iu.seal.small.xbm
+lib/stk/%%STK_VERSION%%/Demos/mc-server.stk
+lib/stk/%%STK_VERSION%%/Demos/queens.stk
+lib/stk/%%STK_VERSION%%/Demos/server.stk
+lib/stk/%%STK_VERSION%%/Demos/showvars.stk
+lib/stk/%%STK_VERSION%%/Demos/small-ed.stk
+lib/stk/%%STK_VERSION%%/Demos/stetris.stk
+lib/stk/%%STK_VERSION%%/Demos/stkfontsel.stk
+lib/stk/%%STK_VERSION%%/Demos/stklos-demo.stklos
+lib/stk/%%STK_VERSION%%/Demos/stklos-demo2.stklos
+lib/stk/%%STK_VERSION%%/Demos/stklos-widgets.stklos
+lib/stk/%%STK_VERSION%%/Demos/term.stk
+lib/stk/%%STK_VERSION%%/Demos/tkcolor.stklos
+lib/stk/%%STK_VERSION%%/Demos/ttt.stk
+lib/stk/%%STK_VERSION%%/Demos/turtle.stk
+lib/stk/%%STK_VERSION%%/Demos/widget.stk
+lib/stk/%%STK_VERSION%%/Demos/wtour.stk
 lib/stk/%%STK_VERSION%%/Help/BlueIndex.html
 lib/stk/%%STK_VERSION%%/Help/GreenIndex.html
 lib/stk/%%STK_VERSION%%/Help/Img/BlueBall.gif
@@ -44,26 +282,39 @@ lib/stk/%%STK_VERSION%%/Help/bindtags.n.html
 lib/stk/%%STK_VERSION%%/Help/bitmap.n.html
 lib/stk/%%STK_VERSION%%/Help/button.n.html
 lib/stk/%%STK_VERSION%%/Help/canvas.n.html
+lib/stk/%%STK_VERSION%%/Help/change-image.n.html
 lib/stk/%%STK_VERSION%%/Help/checkbutton.n.html
+lib/stk/%%STK_VERSION%%/Help/choose-color.n.html
 lib/stk/%%STK_VERSION%%/Help/clipboard.n.html
 lib/stk/%%STK_VERSION%%/Help/destroy.n.html
+lib/stk/%%STK_VERSION%%/Help/ed.n.html
 lib/stk/%%STK_VERSION%%/Help/entry.n.html
 lib/stk/%%STK_VERSION%%/Help/error-hlp.html
+lib/stk/%%STK_VERSION%%/Help/event.n.html
 lib/stk/%%STK_VERSION%%/Help/fbox-hlp.html
+lib/stk/%%STK_VERSION%%/Help/find-image.n.html
 lib/stk/%%STK_VERSION%%/Help/focus-next.n.html
 lib/stk/%%STK_VERSION%%/Help/focus.n.html
+lib/stk/%%STK_VERSION%%/Help/font.n.html
 lib/stk/%%STK_VERSION%%/Help/frame.n.html
+lib/stk/%%STK_VERSION%%/Help/free-image.n.html
 lib/stk/%%STK_VERSION%%/Help/ftp.n.html
 lib/stk/%%STK_VERSION%%/Help/grab.n.html
 lib/stk/%%STK_VERSION%%/Help/grid.n.html
 lib/stk/%%STK_VERSION%%/Help/image.n.html
+lib/stk/%%STK_VERSION%%/Help/inspect-abt.html
+lib/stk/%%STK_VERSION%%/Help/inspect-hlp.html
+lib/stk/%%STK_VERSION%%/Help/jpeg.n.html
 lib/stk/%%STK_VERSION%%/Help/label.n.html
 lib/stk/%%STK_VERSION%%/Help/listbox.n.html
 lib/stk/%%STK_VERSION%%/Help/listener.n.html
 lib/stk/%%STK_VERSION%%/Help/lower.n.html
+lib/stk/%%STK_VERSION%%/Help/make-console.n.html
 lib/stk/%%STK_VERSION%%/Help/make-dialog.n.html
+lib/stk/%%STK_VERSION%%/Help/make-image.n.html
 lib/stk/%%STK_VERSION%%/Help/menu.n.html
 lib/stk/%%STK_VERSION%%/Help/menubutton.n.html
+lib/stk/%%STK_VERSION%%/Help/message-box.n.html
 lib/stk/%%STK_VERSION%%/Help/message.n.html
 lib/stk/%%STK_VERSION%%/Help/option-menu.n.html
 lib/stk/%%STK_VERSION%%/Help/option.n.html
@@ -71,11 +322,14 @@ lib/stk/%%STK_VERSION%%/Help/options.n.html
 lib/stk/%%STK_VERSION%%/Help/pack.n.html
 lib/stk/%%STK_VERSION%%/Help/palette.n.html
 lib/stk/%%STK_VERSION%%/Help/photo.n.html
+lib/stk/%%STK_VERSION%%/Help/pixmap.n.html
 lib/stk/%%STK_VERSION%%/Help/place.n.html
 lib/stk/%%STK_VERSION%%/Help/popup.n.html
 lib/stk/%%STK_VERSION%%/Help/posix.n.html
 lib/stk/%%STK_VERSION%%/Help/radiobutton.n.html
 lib/stk/%%STK_VERSION%%/Help/raise.n.html
+lib/stk/%%STK_VERSION%%/Help/repl-display-prompt.n.html
+lib/stk/%%STK_VERSION%%/Help/repl-display-result.n.html
 lib/stk/%%STK_VERSION%%/Help/report-error.n.html
 lib/stk/%%STK_VERSION%%/Help/scale.n.html
 lib/stk/%%STK_VERSION%%/Help/scrollbar.n.html
@@ -90,229 +344,227 @@ lib/stk/%%STK_VERSION%%/Help/toplevel.n.html
 lib/stk/%%STK_VERSION%%/Help/update.n.html
 lib/stk/%%STK_VERSION%%/Help/winfo.n.html
 lib/stk/%%STK_VERSION%%/Help/wm.n.html
+lib/stk/%%STK_VERSION%%/Images/Cancel.gif
+lib/stk/%%STK_VERSION%%/Images/Help.gif
+lib/stk/%%STK_VERSION%%/Images/LineLeft.gif
+lib/stk/%%STK_VERSION%%/Images/LineRight.gif
+lib/stk/%%STK_VERSION%%/Images/Ok.gif
+lib/stk/%%STK_VERSION%%/Images/STk-big-logo.gif
+lib/stk/%%STK_VERSION%%/Images/STk-large.gif
+lib/stk/%%STK_VERSION%%/Images/STk-logo.gif
+lib/stk/%%STK_VERSION%%/Images/STk-normal.gif
+lib/stk/%%STK_VERSION%%/Images/STk-small-logo.gif
+lib/stk/%%STK_VERSION%%/Images/STk-tiny-logo.gif
+lib/stk/%%STK_VERSION%%/Images/STk-tiny.gif
+lib/stk/%%STK_VERSION%%/Images/box-minus.gif
+lib/stk/%%STK_VERSION%%/Images/box-plus.gif
+lib/stk/%%STK_VERSION%%/Images/boxes
+lib/stk/%%STK_VERSION%%/Images/colorline.gif
+lib/stk/%%STK_VERSION%%/Images/colors.gif
+lib/stk/%%STK_VERSION%%/Images/cross_weave
+lib/stk/%%STK_VERSION%%/Images/dimple1
+lib/stk/%%STK_VERSION%%/Images/dimple3
+lib/stk/%%STK_VERSION%%/Images/dir.gif
+lib/stk/%%STK_VERSION%%/Images/dir.jpg
+lib/stk/%%STK_VERSION%%/Images/diropen.gif
+lib/stk/%%STK_VERSION%%/Images/down_arrow_8.bm
+lib/stk/%%STK_VERSION%%/Images/earth.gif
+lib/stk/%%STK_VERSION%%/Images/earthris.gif
+lib/stk/%%STK_VERSION%%/Images/error
+lib/stk/%%STK_VERSION%%/Images/error.gif
+lib/stk/%%STK_VERSION%%/Images/face
+lib/stk/%%STK_VERSION%%/Images/file.gif
+lib/stk/%%STK_VERSION%%/Images/flagdown
+lib/stk/%%STK_VERSION%%/Images/flagup
+lib/stk/%%STK_VERSION%%/Images/font.gif
+lib/stk/%%STK_VERSION%%/Images/full
+lib/stk/%%STK_VERSION%%/Images/gray1
+lib/stk/%%STK_VERSION%%/Images/gray3
+lib/stk/%%STK_VERSION%%/Images/grey.25
+lib/stk/%%STK_VERSION%%/Images/grey.5
+lib/stk/%%STK_VERSION%%/Images/grid4
+lib/stk/%%STK_VERSION%%/Images/grid8
+lib/stk/%%STK_VERSION%%/Images/hlines2
+lib/stk/%%STK_VERSION%%/Images/hlines3
+lib/stk/%%STK_VERSION%%/Images/hourglass.gif
+lib/stk/%%STK_VERSION%%/Images/info
+lib/stk/%%STK_VERSION%%/Images/info.gif
+lib/stk/%%STK_VERSION%%/Images/letters
+lib/stk/%%STK_VERSION%%/Images/light_gray
+lib/stk/%%STK_VERSION%%/Images/menu.bm
+lib/stk/%%STK_VERSION%%/Images/mickey.gif
+lib/stk/%%STK_VERSION%%/Images/noletters
+lib/stk/%%STK_VERSION%%/Images/parentdir.gif
+lib/stk/%%STK_VERSION%%/Images/pattern
+lib/stk/%%STK_VERSION%%/Images/queen
+lib/stk/%%STK_VERSION%%/Images/question
+lib/stk/%%STK_VERSION%%/Images/question.gif
+lib/stk/%%STK_VERSION%%/Images/root_weave
+lib/stk/%%STK_VERSION%%/Images/stipple
+lib/stk/%%STK_VERSION%%/Images/tb_back.gif
+lib/stk/%%STK_VERSION%%/Images/tb_console.gif
+lib/stk/%%STK_VERSION%%/Images/tb_copy.gif
+lib/stk/%%STK_VERSION%%/Images/tb_customize.gif
+lib/stk/%%STK_VERSION%%/Images/tb_cut.gif
+lib/stk/%%STK_VERSION%%/Images/tb_edit.gif
+lib/stk/%%STK_VERSION%%/Images/tb_evalbuf.gif
+lib/stk/%%STK_VERSION%%/Images/tb_evalreg.gif
+lib/stk/%%STK_VERSION%%/Images/tb_exit.gif
+lib/stk/%%STK_VERSION%%/Images/tb_fileopen.gif
+lib/stk/%%STK_VERSION%%/Images/tb_floppy.gif
+lib/stk/%%STK_VERSION%%/Images/tb_forward.gif
+lib/stk/%%STK_VERSION%%/Images/tb_hborder.gif
+lib/stk/%%STK_VERSION%%/Images/tb_info.gif
+lib/stk/%%STK_VERSION%%/Images/tb_paste.gif
+lib/stk/%%STK_VERSION%%/Images/tb_reload.gif
+lib/stk/%%STK_VERSION%%/Images/tb_stop.gif
+lib/stk/%%STK_VERSION%%/Images/tb_vborder.gif
+lib/stk/%%STK_VERSION%%/Images/teapot.ppm
+lib/stk/%%STK_VERSION%%/Images/up_arrow_8.bm
+lib/stk/%%STK_VERSION%%/Images/vlines2
+lib/stk/%%STK_VERSION%%/Images/vlines3
+lib/stk/%%STK_VERSION%%/Images/warning
+lib/stk/%%STK_VERSION%%/Images/warning.gif
+lib/stk/%%STK_VERSION%%/STk/Balloon.stklos
 lib/stk/%%STK_VERSION%%/STk/Basics.stklos
 lib/stk/%%STK_VERSION%%/STk/Button.stklos
 lib/stk/%%STK_VERSION%%/STk/Canvas.stklos
 lib/stk/%%STK_VERSION%%/STk/Canvitem.stklos
 lib/stk/%%STK_VERSION%%/STk/Choicebox.stklos
+lib/stk/%%STK_VERSION%%/STk/Colorbox.stklos
+lib/stk/%%STK_VERSION%%/STk/Combobox.stklos
 lib/stk/%%STK_VERSION%%/STk/Defbutton.stklos
 lib/stk/%%STK_VERSION%%/STk/Entry.stklos
 lib/stk/%%STK_VERSION%%/STk/Filebox.stklos
+lib/stk/%%STK_VERSION%%/STk/Font.stklos
 lib/stk/%%STK_VERSION%%/STk/Frame.stklos
+lib/stk/%%STK_VERSION%%/STk/Gauge.stklos
+lib/stk/%%STK_VERSION%%/STk/Hierarchy.stklos
 lib/stk/%%STK_VERSION%%/STk/Image.stklos
 lib/stk/%%STK_VERSION%%/STk/Lentry.stklos
+lib/stk/%%STK_VERSION%%/STk/Lframe.stklos
 lib/stk/%%STK_VERSION%%/STk/Listbox.stklos
+lib/stk/%%STK_VERSION%%/STk/Match/compiler.scm
+lib/stk/%%STK_VERSION%%/STk/Match/descr.scm
+lib/stk/%%STK_VERSION%%/STk/Match/mexpand.scm
+lib/stk/%%STK_VERSION%%/STk/Match/normalize.scm
+lib/stk/%%STK_VERSION%%/STk/Match/s2cfun.scm
 lib/stk/%%STK_VERSION%%/STk/Menu.stklos
 lib/stk/%%STK_VERSION%%/STk/Message.stklos
+lib/stk/%%STK_VERSION%%/STk/Msgbox.stklos
 lib/stk/%%STK_VERSION%%/STk/Multipaned.stklos
 lib/stk/%%STK_VERSION%%/STk/Multiwin.stklos
+lib/stk/%%STK_VERSION%%/STk/Notepad.stklos
 lib/stk/%%STK_VERSION%%/STk/Paned.stklos
 lib/stk/%%STK_VERSION%%/STk/STF.stklos
 lib/stk/%%STK_VERSION%%/STk/STk.init
 lib/stk/%%STK_VERSION%%/STk/Scale.stklos
+lib/stk/%%STK_VERSION%%/STk/Schemetext.stklos
 lib/stk/%%STK_VERSION%%/STk/Scrollbar.stklos
 lib/stk/%%STK_VERSION%%/STk/Scrollbox.stklos
 lib/stk/%%STK_VERSION%%/STk/Scrollcanvas.stklos
+lib/stk/%%STK_VERSION%%/STk/Scrollframe.stklos
 lib/stk/%%STK_VERSION%%/STk/Scrolltext.stklos
 lib/stk/%%STK_VERSION%%/STk/Text.stklos
+lib/stk/%%STK_VERSION%%/STk/Tk-active.stklos
 lib/stk/%%STK_VERSION%%/STk/Tk-classes.stklos
 lib/stk/%%STK_VERSION%%/STk/Tk-meta.stklos
-lib/stk/%%STK_VERSION%%/STk/Tk-methods.stklos
+lib/stk/%%STK_VERSION%%/STk/Toolbar.stklos
 lib/stk/%%STK_VERSION%%/STk/Toplevel.stklos
+lib/stk/%%STK_VERSION%%/STk/active-slot.stklos
+lib/stk/%%STK_VERSION%%/STk/balloon.stk
+lib/stk/%%STK_VERSION%%/STk/base64.stk
+lib/stk/%%STK_VERSION%%/STk/bigloo.stk
+lib/stk/%%STK_VERSION%%/STk/butbar.stk
 lib/stk/%%STK_VERSION%%/STk/button.stk
+lib/stk/%%STK_VERSION%%/STk/class-browser.stklos
 lib/stk/%%STK_VERSION%%/STk/compatibility.stk
-lib/stk/%%STK_VERSION%%/STk/describe.stk
+lib/stk/%%STK_VERSION%%/STk/composite-slot.stklos
+lib/stk/%%STK_VERSION%%/STk/console-customize.stk
+lib/stk/%%STK_VERSION%%/STk/console.stk
+lib/stk/%%STK_VERSION%%/STk/defsyntax.stk
+lib/stk/%%STK_VERSION%%/STk/describe.stklos
 lib/stk/%%STK_VERSION%%/STk/dialog.stk
+lib/stk/%%STK_VERSION%%/STk/edit.stk
 lib/stk/%%STK_VERSION%%/STk/editor.stk
 lib/stk/%%STK_VERSION%%/STk/entry.stk
 lib/stk/%%STK_VERSION%%/STk/error.stk
+lib/stk/%%STK_VERSION%%/STk/extset.stk
+lib/stk/%%STK_VERSION%%/STk/ffi.stk
 lib/stk/%%STK_VERSION%%/STk/fileevent.stk
 lib/stk/%%STK_VERSION%%/STk/focus.stk
-lib/stk/%%STK_VERSION%%/STk/ftp.stk
+lib/stk/%%STK_VERSION%%/STk/font-chooser.stklos
+lib/stk/%%STK_VERSION%%/STk/font-lock.stk
+lib/stk/%%STK_VERSION%%/STk/fs.stk
+lib/stk/%%STK_VERSION%%/STk/ftp.stklos
 lib/stk/%%STK_VERSION%%/STk/hash.stk
 lib/stk/%%STK_VERSION%%/STk/help.stk
 lib/stk/%%STK_VERSION%%/STk/html.stk
+lib/stk/%%STK_VERSION%%/STk/image.stk
 lib/stk/%%STK_VERSION%%/STk/init.stk
 lib/stk/%%STK_VERSION%%/STk/inspect-detail.stk
 lib/stk/%%STK_VERSION%%/STk/inspect-help.stk
 lib/stk/%%STK_VERSION%%/STk/inspect-main.stk
 lib/stk/%%STK_VERSION%%/STk/inspect-misc.stk
 lib/stk/%%STK_VERSION%%/STk/inspect-view.stk
+lib/stk/%%STK_VERSION%%/STk/jpeg.stk
 lib/stk/%%STK_VERSION%%/STk/listbox.stk
 lib/stk/%%STK_VERSION%%/STk/listener.stk
+lib/stk/%%STK_VERSION%%/STk/locale.stk
+lib/stk/%%STK_VERSION%%/STk/match.stk
 lib/stk/%%STK_VERSION%%/STk/menu.stk
+lib/stk/%%STK_VERSION%%/STk/method-editor.stklos
 lib/stk/%%STK_VERSION%%/STk/palette.stk
 lib/stk/%%STK_VERSION%%/STk/pixmap.stk
 lib/stk/%%STK_VERSION%%/STk/posix.stk
 lib/stk/%%STK_VERSION%%/STk/pp.stk
 lib/stk/%%STK_VERSION%%/STk/process.stk
-lib/stk/%%STK_VERSION%%/STk/prolog.ps
 lib/stk/%%STK_VERSION%%/STk/regexp.stk
 lib/stk/%%STK_VERSION%%/STk/scale.stk
 lib/stk/%%STK_VERSION%%/STk/scrollbar.stk
+lib/stk/%%STK_VERSION%%/STk/security.stk
 lib/stk/%%STK_VERSION%%/STk/slib.stk
 lib/stk/%%STK_VERSION%%/STk/socket.stk
+lib/stk/%%STK_VERSION%%/STk/srfi-0.stk
+lib/stk/%%STK_VERSION%%/STk/srfi-2.stk
+lib/stk/%%STK_VERSION%%/STk/srfi-7.stk
+lib/stk/%%STK_VERSION%%/STk/srfi-9.stk
 lib/stk/%%STK_VERSION%%/STk/sterm.stk
 lib/stk/%%STK_VERSION%%/STk/stklos.stk
-lib/stk/%%STK_VERSION%%/STk/tearoff.stk
 lib/stk/%%STK_VERSION%%/STk/text.stk
 lib/stk/%%STK_VERSION%%/STk/tk-init.stk
+lib/stk/%%STK_VERSION%%/STk/tk-unix.stk
+lib/stk/%%STK_VERSION%%/STk/trace-gf.stklos
 lib/stk/%%STK_VERSION%%/STk/trace.stk
 lib/stk/%%STK_VERSION%%/STk/unix.stk
-lib/stk/%%STK_VERSION%%/demos/Warrow.stklos
-lib/stk/%%STK_VERSION%%/demos/Wbind.stklos
-lib/stk/%%STK_VERSION%%/demos/Wbitmap.stklos
-lib/stk/%%STK_VERSION%%/demos/Wbutton.stklos
-lib/stk/%%STK_VERSION%%/demos/Wcheck.stklos
-lib/stk/%%STK_VERSION%%/demos/Wcolors.stklos
-lib/stk/%%STK_VERSION%%/demos/Wctext.stklos
-lib/stk/%%STK_VERSION%%/demos/Wdialog1.stklos
-lib/stk/%%STK_VERSION%%/demos/Wdialog2.stklos
-lib/stk/%%STK_VERSION%%/demos/Wentry1.stklos
-lib/stk/%%STK_VERSION%%/demos/Wentry2.stklos
-lib/stk/%%STK_VERSION%%/demos/Wform.stklos
-lib/stk/%%STK_VERSION%%/demos/Whscale.stklos
-lib/stk/%%STK_VERSION%%/demos/Wicon.stklos
-lib/stk/%%STK_VERSION%%/demos/Wimage1.stklos
-lib/stk/%%STK_VERSION%%/demos/Wimage2.stklos
-lib/stk/%%STK_VERSION%%/demos/Witems.stklos
-lib/stk/%%STK_VERSION%%/demos/Wlabel.stklos
-lib/stk/%%STK_VERSION%%/demos/Wmenu.stklos
-lib/stk/%%STK_VERSION%%/demos/Wpuzzle.stklos
-lib/stk/%%STK_VERSION%%/demos/Wradio.stklos
-lib/stk/%%STK_VERSION%%/demos/Wsayings.stklos
-lib/stk/%%STK_VERSION%%/demos/Wsearch.stklos
-lib/stk/%%STK_VERSION%%/demos/Wstates.stklos
-lib/stk/%%STK_VERSION%%/demos/Wstyles.stklos
-lib/stk/%%STK_VERSION%%/demos/Wtext.stklos
-lib/stk/%%STK_VERSION%%/demos/Wvscale.stklos
-lib/stk/%%STK_VERSION%%/demos/Wwind.stklos
-lib/stk/%%STK_VERSION%%/demos/amib.stklos
-lib/stk/%%STK_VERSION%%/demos/browse.stk
-lib/stk/%%STK_VERSION%%/demos/browse.stklos
-lib/stk/%%STK_VERSION%%/demos/calc.stklos
-lib/stk/%%STK_VERSION%%/demos/colormap.stk
-lib/stk/%%STK_VERSION%%/demos/compo-demo.stklos
-lib/stk/%%STK_VERSION%%/demos/filebox.stklos
-lib/stk/%%STK_VERSION%%/demos/hanoi.stk
-lib/stk/%%STK_VERSION%%/demos/hbrowse.stklos
-lib/stk/%%STK_VERSION%%/demos/hello.stk
-lib/stk/%%STK_VERSION%%/demos/hello.stklos
-lib/stk/%%STK_VERSION%%/demos/inspector.stk
-lib/stk/%%STK_VERSION%%/demos/mc-server.stk
-lib/stk/%%STK_VERSION%%/demos/queens.stk
-lib/stk/%%STK_VERSION%%/demos/server.stk
-lib/stk/%%STK_VERSION%%/demos/showvars.stk
-lib/stk/%%STK_VERSION%%/demos/small-ed.stk
-lib/stk/%%STK_VERSION%%/demos/stetris.stk
-lib/stk/%%STK_VERSION%%/demos/stklos-demo.stklos
-lib/stk/%%STK_VERSION%%/demos/stklos-demo2.stklos
-lib/stk/%%STK_VERSION%%/demos/term.stk
-lib/stk/%%STK_VERSION%%/demos/tkcolor.stklos
-lib/stk/%%STK_VERSION%%/demos/ttt.stk
-lib/stk/%%STK_VERSION%%/demos/turtle.stk
-lib/stk/%%STK_VERSION%%/demos/widget.stk
-lib/stk/%%STK_VERSION%%/demos/wtour.stk
-lib/stk/%%STK_VERSION%%/images/Cancel.gif
-lib/stk/%%STK_VERSION%%/images/Help.gif
-lib/stk/%%STK_VERSION%%/images/Ok.gif
-lib/stk/%%STK_VERSION%%/images/STk-normal.gif
-lib/stk/%%STK_VERSION%%/images/boxes
-lib/stk/%%STK_VERSION%%/images/cross_weave
-lib/stk/%%STK_VERSION%%/images/dimple1
-lib/stk/%%STK_VERSION%%/images/dimple3
-lib/stk/%%STK_VERSION%%/images/down_arrow_8.bm
-lib/stk/%%STK_VERSION%%/images/earth.gif
-lib/stk/%%STK_VERSION%%/images/earthris.gif
-lib/stk/%%STK_VERSION%%/images/face
-lib/stk/%%STK_VERSION%%/images/flagdown
-lib/stk/%%STK_VERSION%%/images/flagup
-lib/stk/%%STK_VERSION%%/images/full
-lib/stk/%%STK_VERSION%%/images/gray1
-lib/stk/%%STK_VERSION%%/images/gray3
-lib/stk/%%STK_VERSION%%/images/grey.25
-lib/stk/%%STK_VERSION%%/images/grey.5
-lib/stk/%%STK_VERSION%%/images/grid4
-lib/stk/%%STK_VERSION%%/images/grid8
-lib/stk/%%STK_VERSION%%/images/hlines2
-lib/stk/%%STK_VERSION%%/images/hlines3
-lib/stk/%%STK_VERSION%%/images/letters
-lib/stk/%%STK_VERSION%%/images/light_gray
-lib/stk/%%STK_VERSION%%/images/menu.bm
-lib/stk/%%STK_VERSION%%/images/mickey.gif
-lib/stk/%%STK_VERSION%%/images/noletters
-lib/stk/%%STK_VERSION%%/images/pattern
-lib/stk/%%STK_VERSION%%/images/queen
-lib/stk/%%STK_VERSION%%/images/root_weave
-lib/stk/%%STK_VERSION%%/images/stipple
-lib/stk/%%STK_VERSION%%/images/teapot.ppm
-lib/stk/%%STK_VERSION%%/images/vlines2
-lib/stk/%%STK_VERSION%%/images/vlines3
-lib/stk/%%STK_VERSION%%/man/man1/STk-man.macros
-lib/stk/%%STK_VERSION%%/man/man1/snow.1
-lib/stk/%%STK_VERSION%%/man/man1/stk.1
-lib/stk/%%STK_VERSION%%/man/mann/STk-man.macros
-lib/stk/%%STK_VERSION%%/man/mann/stk_after.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_bell.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_bind.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_bindtags.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_bitmap.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_button.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_canvas.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_checkbutton.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_clipboard.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_destroy.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_entry.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_focus-next.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_focus.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_frame.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_ftp.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_grab.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_grid.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_image.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_label.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_listbox.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_listener.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_lower.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_make-dialog.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_menu.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_menubutton.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_message.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_option-menu.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_option.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_options.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_pack.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_palette.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_photo.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_place.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_popup.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_posix.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_radiobutton.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_raise.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_report-error.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_scale.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_scrollbar.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_selection.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_send.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_text.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_tk.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_tkvars.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_tkwait.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_toplevel.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_update.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_winfo.n
-lib/stk/%%STK_VERSION%%/man/mann/stk_wm.n
-@exec /bin/ln -sf %%STK_VERSION%%/man %D/lib/stk/man
-@unexec /bin/rm -f %D/lib/stk/man
-@dirrm lib/stk/site-scheme
-@dirrm lib/stk/%%STK_VERSION%%/%%STK_ARCH%%
+lib/stk/%%STK_VERSION%%/STk/win32.stk
+lib/stk/%%STK_VERSION%%/STk/winsocket.stklos
+lib/stk/%%STK_VERSION%%/STk/www-browser.stklos
+lib/stk/%%STK_VERSION%%/STk/www-file.stk
+lib/stk/%%STK_VERSION%%/STk/www-html.stk
+lib/stk/%%STK_VERSION%%/STk/www-http.stk
+lib/stk/%%STK_VERSION%%/STk/www-img.stk
+lib/stk/%%STK_VERSION%%/STk/www-snd.stk
+lib/stk/%%STK_VERSION%%/STk/www-txt.stk
+lib/stk/%%STK_VERSION%%/STk/www-url.stk
+lib/stk/%%STK_VERSION%%/STk/www.stk
+@exec ln -sf %D/lib/stk/%%STK_VERSION%%/man %D/lib/stk/man
+@exec mkdir -p %D/lib/stk/site-scheme
+@unexec rmdir %D/lib/stk/site-scheme 2>/dev/null || true
+@unexec rm -f %D/lib/stk/man
+@dirrm lib/stk/%%STK_VERSION%%/STk/Match
+@dirrm lib/stk/%%STK_VERSION%%/STk
+@dirrm lib/stk/%%STK_VERSION%%/Images
 @dirrm lib/stk/%%STK_VERSION%%/Help/Img
 @dirrm lib/stk/%%STK_VERSION%%/Help
-@dirrm lib/stk/%%STK_VERSION%%/STk
-@dirrm lib/stk/%%STK_VERSION%%/demos
-@dirrm lib/stk/%%STK_VERSION%%/images
-@dirrm lib/stk/%%STK_VERSION%%/man/man1
+@dirrm lib/stk/%%STK_VERSION%%/Demos/lib
+@dirrm lib/stk/%%STK_VERSION%%/Demos/lessons
+@dirrm lib/stk/%%STK_VERSION%%/Demos/Html-Demos/Images
+@dirrm lib/stk/%%STK_VERSION%%/Demos/Html-Demos
+@dirrm lib/stk/%%STK_VERSION%%/Demos
 @dirrm lib/stk/%%STK_VERSION%%/man/mann
+@dirrm lib/stk/%%STK_VERSION%%/man/man1
 @dirrm lib/stk/%%STK_VERSION%%/man
+@dirrm lib/stk/%%STK_VERSION%%/%%STK_ARCH%%
 @dirrm lib/stk/%%STK_VERSION%%
 @dirrm lib/stk