Index: apps/actiweb/Counter.xotcl
===================================================================
diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r2d45b41a8a644b3d647f59208067e81391ad7d36
--- apps/actiweb/Counter.xotcl	(.../Counter.xotcl)	(revision c72f9f638677608fab1502cd696c8f2d6b2952f9)
+++ apps/actiweb/Counter.xotcl	(.../Counter.xotcl)	(revision 2d45b41a8a644b3d647f59208067e81391ad7d36)
@@ -4,7 +4,7 @@
 array set opts {-pkgdir .}; array set opts $argv
 lappend auto_path $opts(-pkgdir)
 
-package require XOTcl; namespace import -force xotcl::*
+package require XOTcl 1; namespace import -force xotcl::*
 package require xotcl::actiweb::htmlPlace
 package require xotcl::actiweb::webDocument
 
Index: apps/actiweb/Counter2.xotcl
===================================================================
diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r2d45b41a8a644b3d647f59208067e81391ad7d36
--- apps/actiweb/Counter2.xotcl	(.../Counter2.xotcl)	(revision c72f9f638677608fab1502cd696c8f2d6b2952f9)
+++ apps/actiweb/Counter2.xotcl	(.../Counter2.xotcl)	(revision 2d45b41a8a644b3d647f59208067e81391ad7d36)
@@ -3,7 +3,7 @@
 array set opts {-pkgdir .}; array set opts $argv
 lappend auto_path $opts(-pkgdir)
 
-package require XOTcl; namespace import -force xotcl::*
+package require XOTcl 1; namespace import -force xotcl::*
 
 package require xotcl::actiweb::htmlPlace
 package require xotcl::actiweb::pageTemplate
Index: apps/actiweb/Counter3.xotcl
===================================================================
diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r2d45b41a8a644b3d647f59208067e81391ad7d36
--- apps/actiweb/Counter3.xotcl	(.../Counter3.xotcl)	(revision c72f9f638677608fab1502cd696c8f2d6b2952f9)
+++ apps/actiweb/Counter3.xotcl	(.../Counter3.xotcl)	(revision 2d45b41a8a644b3d647f59208067e81391ad7d36)
@@ -3,7 +3,7 @@
 array set opts {-pkgdir .}; array set opts $argv
 lappend auto_path $opts(-pkgdir)
 
-package require XOTcl; namespace import -force xotcl::*
+package require XOTcl 1; namespace import -force xotcl::*
 package require xotcl::actiweb::htmlPlace
 package require xotcl::actiweb::webDocument
 
Index: apps/actiweb/Counter4.xotcl
===================================================================
diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r2d45b41a8a644b3d647f59208067e81391ad7d36
--- apps/actiweb/Counter4.xotcl	(.../Counter4.xotcl)	(revision c72f9f638677608fab1502cd696c8f2d6b2952f9)
+++ apps/actiweb/Counter4.xotcl	(.../Counter4.xotcl)	(revision 2d45b41a8a644b3d647f59208067e81391ad7d36)
@@ -3,7 +3,7 @@
 array set opts {-pkgdir .}; array set opts $argv
 lappend auto_path $opts(-pkgdir)
 
-package require XOTcl; namespace import -force xotcl::*
+package require XOTcl 1; namespace import -force xotcl::*
 package require xotcl::actiweb::htmlPlace
 package require xotcl::actiweb::webDocument
 
Index: apps/actiweb/MC.xotcl
===================================================================
diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r2d45b41a8a644b3d647f59208067e81391ad7d36
--- apps/actiweb/MC.xotcl	(.../MC.xotcl)	(revision c72f9f638677608fab1502cd696c8f2d6b2952f9)
+++ apps/actiweb/MC.xotcl	(.../MC.xotcl)	(revision 2d45b41a8a644b3d647f59208067e81391ad7d36)
@@ -6,7 +6,7 @@
 array set opts {-pkgdir .}; array set opts $argv
 lappend auto_path $opts(-pkgdir)
 
-package require XOTcl; namespace import -force xotcl::*
+package require XOTcl 1; namespace import -force xotcl::*
 #package require xotcl::package; package verbose 1
 package require xotcl::actiweb::htmlPlace
 package require xotcl::actiweb::pageTemplate
Index: apps/actiweb/univ/UNIVERSAL.xotcl
===================================================================
diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r2d45b41a8a644b3d647f59208067e81391ad7d36
--- apps/actiweb/univ/UNIVERSAL.xotcl	(.../UNIVERSAL.xotcl)	(revision c72f9f638677608fab1502cd696c8f2d6b2952f9)
+++ apps/actiweb/univ/UNIVERSAL.xotcl	(.../UNIVERSAL.xotcl)	(revision 2d45b41a8a644b3d647f59208067e81391ad7d36)
@@ -1,6 +1,6 @@
 #!/usr/bin/env tclsh
 #$Id: UNIVERSAL.xotcl,v 1.8 2007/08/14 16:38:26 neumann Exp $
-package require XOTcl; namespace import -force xotcl::*
+package require XOTcl 1; namespace import -force xotcl::*
 array set opts {
   -ssl 0 -instanceFile UNIVERSAL.rdf -cssFile UNIVERSAL.css -root . -pkgdir .}
 array set opts $argv
Index: doc/index.html
===================================================================
diff -u -ra976b7c6a116f584114d2612494aaaa8e8028387 -r2d45b41a8a644b3d647f59208067e81391ad7d36
--- doc/index.html	(.../index.html)	(revision a976b7c6a116f584114d2612494aaaa8e8028387)
+++ doc/index.html	(.../index.html)	(revision 2d45b41a8a644b3d647f59208067e81391ad7d36)
@@ -23,7 +23,7 @@
 </center>
 
   <ul>
-    <li> <b>Directory './library/lib': </b><br><a HREF="./Script-xotcl.html">Script.xotcl</a>, <a HREF="./changeXOTclVersion-xotcl.html">changeXOTclVersion.xotcl</a>, <a HREF="./htmllib-xotcl.html">htmllib.xotcl</a>, <a HREF="./make-xotcl.html">make.xotcl</a>, <a HREF="./makeDoc-xotcl.html">makeDoc.xotcl</a>, <a HREF="./metadataAnalyzer-xotcl.html">metadataAnalyzer.xotcl</a>, <a HREF="./mixinStrategy-xotcl.html">mixinStrategy.xotcl</a>, <a HREF="./package-xotcl.html">package.xotcl</a>, <a HREF="./staticMetadata-xotcl.html">staticMetadata.xotcl</a>, <a HREF="./test-xotcl.html">test.xotcl</a>, <a HREF="./trace-xotcl.html">trace.xotcl</a>, <a HREF="./upvarcompat-xotcl.html">upvarcompat.xotcl</a>, <a HREF="./xodoc-xotcl.html">xodoc.xotcl</a><li> <b>Directory './library/store': </b><br><a HREF="./JufGdbmStorage-xotcl.html">JufGdbmStorage.xotcl</a>, <a HREF="./MemStorage-xotcl.html">MemStorage.xotcl</a>, <a HREF="./MultiStorage-xotcl.html">MultiStorage.xotcl</a>, <a HREF="./Persistence-xotcl.html">Persistence.xotcl</a>, <a HREF="./Storage-xotcl.html">Storage.xotcl</a>, <a HREF="./TclGdbmStorage-xotcl.html">TclGdbmStorage.xotcl</a>, <a HREF="./TextFileStorage-xotcl.html">TextFileStorage.xotcl</a>, <a HREF="./persistenceExample-xotcl.html">persistenceExample.xotcl</a><li> <b>Directory './library/serialize': </b><br><a HREF="./Serializer-xotcl.html">Serializer.xotcl</a><li> <b>Directory './tests': </b><br><a HREF="./12-xotcl.html">12.xotcl</a>, <a HREF="./forwardtest-xotcl.html">forwardtest.xotcl</a>, <a HREF="./mix-xotcl.html">mix.xotcl</a>, <a HREF="./mixinoftest-xotcl.html">mixinoftest.xotcl</a>, <a HREF="./o2-xotcl.html">o2.xotcl</a>, <a HREF="./slottest-xotcl.html">slottest.xotcl</a>, <a HREF="./speedtest-xotcl.html">speedtest.xotcl</a>, <a HREF="./stack-xotcl.html">stack.xotcl</a>, <a HREF="./testo-xotcl.html">testo.xotcl</a>, <a HREF="./testx-xotcl.html">testx.xotcl</a>, <a HREF="./var-xotcl.html">var.xotcl</a>, <a HREF="./varresolutiontest-xotcl.html">varresolutiontest.xotcl</a><li> <b>Directory './apps/scripts': </b><br><a HREF="./adapter-xotcl.html">adapter.xotcl</a>, <a HREF="./adapterExample-xotcl.html">adapterExample.xotcl</a>, <a HREF="./composite-xotcl.html">composite.xotcl</a>, <a HREF="./compositeExample-xotcl.html">compositeExample.xotcl</a>, <a HREF="./observer-xotcl.html">observer.xotcl</a>, <a HREF="./parameter-xotcl.html">parameter.xotcl</a>, <a HREF="./pinger-xotcl.html">pinger.xotcl</a>, <a HREF="./simpleFilters-xotcl.html">simpleFilters.xotcl</a>, <a HREF="./soccerClub-xotcl.html">soccerClub.xotcl</a><li> <b>Directory './apps/comm': </b><br><a HREF="./ftp-xotcl.html">ftp.xotcl</a>, <a HREF="./link-checker-xotcl.html">link-checker.xotcl</a>, <a HREF="./secure-webclient-xotcl.html">secure-webclient.xotcl</a>, <a HREF="./secure-webserver-xotcl.html">secure-webserver.xotcl</a>, <a HREF="./webclient-xotcl.html">webclient.xotcl</a>, <a HREF="./webserver-xotcl.html">webserver.xotcl</a><li> <b>Directory './apps/actiweb/univ': </b><br><a HREF="./UNIVERSAL-xotcl.html">UNIVERSAL.xotcl</a><li> <b>Directory './apps/utils': </b><br><a HREF="./xo-daemon.html">xo-daemon</a>, <a HREF="./xo-whichPkg.html">xo-whichPkg</a>
+    <li> <b>Directory './library/lib': </b><br><a HREF="./Script-xotcl.html">Script.xotcl</a>, <a HREF="./changeXOTclVersion-xotcl.html">changeXOTclVersion.xotcl</a>, <a HREF="./htmllib-xotcl.html">htmllib.xotcl</a>, <a HREF="./make-xotcl.html">make.xotcl</a>, <a HREF="./makeDoc-xotcl.html">makeDoc.xotcl</a>, <a HREF="./metadataAnalyzer-xotcl.html">metadataAnalyzer.xotcl</a>, <a HREF="./mixinStrategy-xotcl.html">mixinStrategy.xotcl</a>, <a HREF="./package-xotcl.html">package.xotcl</a>, <a HREF="./staticMetadata-xotcl.html">staticMetadata.xotcl</a>, <a HREF="./test-xotcl.html">test.xotcl</a>, <a HREF="./trace-xotcl.html">trace.xotcl</a>, <a HREF="./upvarcompat-xotcl.html">upvarcompat.xotcl</a>, <a HREF="./xodoc-xotcl.html">xodoc.xotcl</a><li> <b>Directory './library/store': </b><br><a HREF="./JufGdbmStorage-xotcl.html">JufGdbmStorage.xotcl</a>, <a HREF="./MemStorage-xotcl.html">MemStorage.xotcl</a>, <a HREF="./MultiStorage-xotcl.html">MultiStorage.xotcl</a>, <a HREF="./Persistence-xotcl.html">Persistence.xotcl</a>, <a HREF="./Storage-xotcl.html">Storage.xotcl</a>, <a HREF="./TclGdbmStorage-xotcl.html">TclGdbmStorage.xotcl</a>, <a HREF="./TextFileStorage-xotcl.html">TextFileStorage.xotcl</a>, <a HREF="./persistenceExample-xotcl.html">persistenceExample.xotcl</a><li> <b>Directory './library/serialize': </b><br><a HREF="./Serializer-xotcl.html">Serializer.xotcl</a><li> <b>Directory './tests': </b><br><a HREF="./forwardtest-xotcl.html">forwardtest.xotcl</a>, <a HREF="./mixinoftest-xotcl.html">mixinoftest.xotcl</a>, <a HREF="./slottest-xotcl.html">slottest.xotcl</a>, <a HREF="./speedtest-xotcl.html">speedtest.xotcl</a>, <a HREF="./testo-xotcl.html">testo.xotcl</a>, <a HREF="./testx-xotcl.html">testx.xotcl</a>, <a HREF="./varresolutiontest-xotcl.html">varresolutiontest.xotcl</a><li> <b>Directory './apps/scripts': </b><br><a HREF="./adapter-xotcl.html">adapter.xotcl</a>, <a HREF="./adapterExample-xotcl.html">adapterExample.xotcl</a>, <a HREF="./composite-xotcl.html">composite.xotcl</a>, <a HREF="./compositeExample-xotcl.html">compositeExample.xotcl</a>, <a HREF="./observer-xotcl.html">observer.xotcl</a>, <a HREF="./parameter-xotcl.html">parameter.xotcl</a>, <a HREF="./pinger-xotcl.html">pinger.xotcl</a>, <a HREF="./simpleFilters-xotcl.html">simpleFilters.xotcl</a>, <a HREF="./soccerClub-xotcl.html">soccerClub.xotcl</a><li> <b>Directory './apps/comm': </b><br><a HREF="./ftp-xotcl.html">ftp.xotcl</a>, <a HREF="./link-checker-xotcl.html">link-checker.xotcl</a>, <a HREF="./secure-webclient-xotcl.html">secure-webclient.xotcl</a>, <a HREF="./secure-webserver-xotcl.html">secure-webserver.xotcl</a>, <a HREF="./webclient-xotcl.html">webclient.xotcl</a>, <a HREF="./webserver-xotcl.html">webserver.xotcl</a><li> <b>Directory './apps/actiweb/univ': </b><br><a HREF="./UNIVERSAL-xotcl.html">UNIVERSAL.xotcl</a><li> <b>Directory './apps/utils': </b><br><a HREF="./xo-daemon.html">xo-daemon</a>, <a HREF="./xo-whichPkg.html">xo-whichPkg</a>
   </ul>
   <p>
 
Index: library/store/XOTclSdbm/Makefile
===================================================================
diff -u -rfb1c70479008e8b50c8b1ac0885af959fc316775 -r2d45b41a8a644b3d647f59208067e81391ad7d36
--- library/store/XOTclSdbm/Makefile	(.../Makefile)	(revision fb1c70479008e8b50c8b1ac0885af959fc316775)
+++ library/store/XOTclSdbm/Makefile	(.../Makefile)	(revision 2d45b41a8a644b3d647f59208067e81391ad7d36)
@@ -68,8 +68,8 @@
 SHELL		= /bin/sh
 
 srcdir		= .
-prefix		= /usr/local
-exec_prefix	= /usr/local
+prefix		= /usr/local/ns
+exec_prefix	= /usr/local/ns
 
 bindir		= ${exec_prefix}/bin
 libdir		= ${exec_prefix}/lib
@@ -109,11 +109,11 @@
 SHLIB_CFLAGS	= -fno-common
 SHLIB_LD	= ${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT} -Wl,-single_module
 SHLIB_LD_FLAGS	= @SHLIB_LD_FLAGS@
-SHLIB_LD_LIBS	= ${LIBS} -L/usr/local/src/tcl8.6b1/unix -ltclstub8.6
+SHLIB_LD_LIBS	= ${LIBS} -L/usr/local/src/tcl8.5.8/unix -ltclstub8.5
 STLIB_LD	= ${AR} cr
-TCL_DEFS	= -DPACKAGE_NAME=\"tcl\" -DPACKAGE_TARNAME=\"tcl\" -DPACKAGE_VERSION=\"8.6\" -DPACKAGE_STRING=\"tcl\ 8.6\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DNO_VALUES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DTCL_THREADS=1 -DTCL_CFGVAL_ENCODING=\"iso8859-1\" -DHAVE_ZLIB=1 -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -DMAC_OSX_TCL=1 -DTCL_SHLIB_EXT=\".dylib\" -DTCL_CFG_DEBUG=1 -DTCL_TOMMATH=1 -DMP_PREC=4 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRTOL=1 -DHAVE_WAITPID=1 -DHAVE_GETADDRINFO=1 -DHAVE_GETPWUID_R_5=1 -DHAVE_GETPWUID_R=1 -DHAVE_GETPWNAM_R_5=1 -DHAVE_GETPWNAM_R=1 -DHAVE_GETGRGID_R_5=1 -DHAVE_GETGRGID_R=1 -DHAVE_GETGRNAM_R_5=1 -DHAVE_GETGRNAM_R=1 -DHAVE_MTSAFE_GETHOSTBYNAME=1 -DHAVE_MTSAFE_GETHOSTBYADDR=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_STRUCT_TM_TM_ZONE=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_MKTIME=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_STRUCT_STAT_ST_BLKSIZE=1 -DHAVE_ST_BLKSIZE=1 -DHAVE_INTPTR_T=1 -DHAVE_UINTPTR_T=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DHAVE_CHFLAGS=1 -DHAVE_MKSTEMPS=1 -DHAVE_GETATTRLIST=1 -DHAVE_COPYFILE_H=1 -DHAVE_COPYFILE=1 -DUSE_VFORK=1 -DTCL_DEFAULT_ENCODING=\"utf-8\" -DTCL_LOAD_FROM_MEMORY=1 -DTCL_WIDE_CLICKS=1 -DHAVE_AVAILABILITYMACROS_H=1 -DHAVE_WEAK_IMPORT=1 -DHAVE_FTS=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_FILIO_H=1 -DTCL_UNLOAD_DLLS=1 
-TCL_BIN_DIR	= /usr/local/src/tcl8.6b1/unix
-TCL_SRC_DIR	= /usr/local/src/tcl8.6b1
+TCL_DEFS	= -DPACKAGE_NAME=\"tcl\" -DPACKAGE_TARNAME=\"tcl\" -DPACKAGE_VERSION=\"8.5\" -DPACKAGE_STRING=\"tcl\ 8.5\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DNO_VALUES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_PTHREAD_GET_STACKSIZE_NP=1 -DTCL_THREADS=1 -DTCL_CFGVAL_ENCODING=\"iso8859-1\" -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -DMAC_OSX_TCL=1 -DTCL_SHLIB_EXT=\".dylib\" -DTCL_CFG_DEBUG=1 -DTCL_TOMMATH=1 -DMP_PREC=4 -DTCL_WIDE_INT_IS_LONG=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRTOL=1 -DHAVE_WAITPID=1 -DHAVE_GETADDRINFO=1 -DHAVE_GETPWUID_R_5=1 -DHAVE_GETPWUID_R=1 -DHAVE_GETPWNAM_R_5=1 -DHAVE_GETPWNAM_R=1 -DHAVE_GETGRGID_R_5=1 -DHAVE_GETGRGID_R=1 -DHAVE_GETGRNAM_R_5=1 -DHAVE_GETGRNAM_R=1 -DHAVE_MTSAFE_GETHOSTBYNAME=1 -DHAVE_MTSAFE_GETHOSTBYADDR=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_STRUCT_TM_TM_ZONE=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_MKTIME=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_STRUCT_STAT_ST_BLKSIZE=1 -DHAVE_ST_BLKSIZE=1 -DHAVE_INTPTR_T=1 -DHAVE_UINTPTR_T=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DHAVE_CHFLAGS=1 -DHAVE_GETATTRLIST=1 -DHAVE_COPYFILE_H=1 -DHAVE_COPYFILE=1 -DUSE_VFORK=1 -DTCL_DEFAULT_ENCODING=\"utf-8\" -DTCL_LOAD_FROM_MEMORY=1 -DTCL_WIDE_CLICKS=1 -DHAVE_AVAILABILITYMACROS_H=1 -DHAVE_WEAK_IMPORT=1 -D_DARWIN_C_SOURCE=1 -DHAVE_FTS=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_FILIO_H=1 -DTCL_UNLOAD_DLLS=1 
+TCL_BIN_DIR	= /usr/local/src/tcl8.5.8/unix
+TCL_SRC_DIR	= /usr/local/src/tcl8.5.8
 # This is necessary for packages that use private Tcl headers
 #TCL_TOP_DIR_NATIVE	= @TCL_TOP_DIR_NATIVE@
 # Not used, but retained for reference of what libs Tcl required
@@ -131,11 +131,11 @@
 		  DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \
 		  PATH="$(EXTRA_PATH):$(PATH)" \
 		  TCLLIBPATH="$(top_builddir)"
-TCLSH_PROG	= /usr/local/src/tcl8.6b1/unix/tclsh
+TCLSH_PROG	= /usr/local/src/tcl8.5.8/unix/tclsh
 TCLSH		= $(TCLSH_ENV) $(TCLSH_PROG)
 SHARED_BUILD	= 1
 
-INCLUDES	=  -I/Users/neumann/src/xotcl-1.6.6/generic -I./generic -I"/usr/local/src/tcl8.6b1/generic"
+INCLUDES	=  -I/Users/neumann/src/xotcl-1.6.6/generic -I./generic -I"/usr/local/src/tcl8.5.8/generic"
 
 EXTRA_CFLAGS	=  
 
Index: library/store/XOTclSdbm/config.log
===================================================================
diff -u -rfb1c70479008e8b50c8b1ac0885af959fc316775 -r2d45b41a8a644b3d647f59208067e81391ad7d36
--- library/store/XOTclSdbm/config.log	(.../config.log)	(revision fb1c70479008e8b50c8b1ac0885af959fc316775)
+++ library/store/XOTclSdbm/config.log	(.../config.log)	(revision 2d45b41a8a644b3d647f59208067e81391ad7d36)
@@ -4,7 +4,7 @@
 It was created by xotclsdbm configure 1.2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
-  $ ./configure --with-tcl=/usr/local/src/tcl8.6b1/unix/ --enable-symbols --with-actiweb --prefix=/usr/local --with-xotcl=/Users/neumann/src/xotcl-1.6.6
+  $ ./configure --with-tcl=/usr/local/src/tcl8.5.8/unix/ --enable-symbols --with-actiweb --prefix=/usr/local/ns --with-xotcl=/Users/neumann/src/xotcl-1.6.6
 
 ## --------- ##
 ## Platform. ##
@@ -30,8 +30,8 @@
 Processor type: i486 (Intel 80486)
 Processors active: 0 1
 Primary memory available: 8.00 gigabytes
-Default processor set: 108 tasks, 490 threads, 2 processors
-Load average: 1.86, Mach factor: 0.73
+Default processor set: 102 tasks, 403 threads, 2 processors
+Load average: 0.85, Mach factor: 1.19
 /bin/machine           = unknown
 /usr/bin/oslevel       = unknown
 /bin/universe          = unknown
@@ -57,10 +57,10 @@
 configure:1772: checking for correct TEA configuration
 configure:1788: result: warning: requested TEA version "3.5", have "3.6"
 configure:1940: checking for Tcl configuration
-configure:2056: result: found /usr/local/src/tcl8.6b1/unix/tclConfig.sh
-configure:2062: checking for existence of /usr/local/src/tcl8.6b1/unix/tclConfig.sh
+configure:2056: result: found /usr/local/src/tcl8.5.8/unix/tclConfig.sh
+configure:2062: checking for existence of /usr/local/src/tcl8.5.8/unix/tclConfig.sh
 configure:2066: result: loading
-configure:2164: --exec-prefix defaulting to TCL_EXEC_PREFIX /usr/local
+configure:2164: --exec-prefix defaulting to TCL_EXEC_PREFIX /usr/local/ns
 configure:2240: checking for gcc
 configure:2256: found /usr/bin/gcc
 configure:2267: result: gcc
@@ -558,7 +558,7 @@
 configure:6545: result: yes
 configure:6570: Reading file /Users/neumann/src/xotcl-1.6.6/xotclConfig.sh
 configure:6733: checking for Tcl public headers
-configure:6807: result: /usr/local/src/tcl8.6b1/generic
+configure:6807: result: /usr/local/src/tcl8.5.8/generic
 configure:6875: checking for pthread_mutex_init in -lpthread
 configure:6910: gcc -o conftest  -pipe   conftest.c -lpthread   >&5
 configure:6916: $? = 0
@@ -760,7 +760,7 @@
 configure:10072: checking for build with symbols
 configure:10091: result: yes (standard debugging)
 configure:10224: checking for tclsh
-configure:10251: result: /usr/local/src/tcl8.6b1/unix/tclsh
+configure:10251: result: /usr/local/src/tcl8.5.8/unix/tclsh
 configure:10396: creating ./config.status
 
 ## ---------------------- ##
@@ -787,8 +787,8 @@
 
 ac_cv_c_bigendian=no
 ac_cv_c_compiler_gnu=yes
-ac_cv_c_tclconfig=/usr/local/src/tcl8.6b1/unix
-ac_cv_c_tclh=/usr/local/src/tcl8.6b1/generic
+ac_cv_c_tclconfig=/usr/local/src/tcl8.5.8/unix
+ac_cv_c_tclh=/usr/local/src/tcl8.5.8/generic
 ac_cv_env_CC_set=
 ac_cv_env_CC_value=
 ac_cv_env_CFLAGS_set=
@@ -915,34 +915,34 @@
 SHELL='/bin/sh'
 SHLIB_CFLAGS='-fno-common'
 SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT} -Wl,-single_module'
-SHLIB_LD_LIBS='${LIBS} -L/usr/local/src/tcl8.6b1/unix -ltclstub8.6'
+SHLIB_LD_LIBS='${LIBS} -L/usr/local/src/tcl8.5.8/unix -ltclstub8.5'
 STLIB_LD='${AR} cr'
-TCLSH_PROG='/usr/local/src/tcl8.6b1/unix/tclsh'
-TCL_BIN_DIR='/usr/local/src/tcl8.6b1/unix'
+TCLSH_PROG='/usr/local/src/tcl8.5.8/unix/tclsh'
+TCL_BIN_DIR='/usr/local/src/tcl8.5.8/unix'
 TCL_DBGX=''
-TCL_DEFS='-DPACKAGE_NAME=\"tcl\" -DPACKAGE_TARNAME=\"tcl\" -DPACKAGE_VERSION=\"8.6\" -DPACKAGE_STRING=\"tcl\ 8.6\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DNO_VALUES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DTCL_THREADS=1 -DTCL_CFGVAL_ENCODING=\"iso8859-1\" -DHAVE_ZLIB=1 -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -DMAC_OSX_TCL=1 -DTCL_SHLIB_EXT=\".dylib\" -DTCL_CFG_DEBUG=1 -DTCL_TOMMATH=1 -DMP_PREC=4 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRTOL=1 -DHAVE_WAITPID=1 -DHAVE_GETADDRINFO=1 -DHAVE_GETPWUID_R_5=1 -DHAVE_GETPWUID_R=1 -DHAVE_GETPWNAM_R_5=1 -DHAVE_GETPWNAM_R=1 -DHAVE_GETGRGID_R_5=1 -DHAVE_GETGRGID_R=1 -DHAVE_GETGRNAM_R_5=1 -DHAVE_GETGRNAM_R=1 -DHAVE_MTSAFE_GETHOSTBYNAME=1 -DHAVE_MTSAFE_GETHOSTBYADDR=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_STRUCT_TM_TM_ZONE=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_MKTIME=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_STRUCT_STAT_ST_BLKSIZE=1 -DHAVE_ST_BLKSIZE=1 -DHAVE_INTPTR_T=1 -DHAVE_UINTPTR_T=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DHAVE_CHFLAGS=1 -DHAVE_MKSTEMPS=1 -DHAVE_GETATTRLIST=1 -DHAVE_COPYFILE_H=1 -DHAVE_COPYFILE=1 -DUSE_VFORK=1 -DTCL_DEFAULT_ENCODING=\"utf-8\" -DTCL_LOAD_FROM_MEMORY=1 -DTCL_WIDE_CLICKS=1 -DHAVE_AVAILABILITYMACROS_H=1 -DHAVE_WEAK_IMPORT=1 -DHAVE_FTS=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_FILIO_H=1 -DTCL_UNLOAD_DLLS=1 '
+TCL_DEFS='-DPACKAGE_NAME=\"tcl\" -DPACKAGE_TARNAME=\"tcl\" -DPACKAGE_VERSION=\"8.5\" -DPACKAGE_STRING=\"tcl\ 8.5\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DNO_VALUES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_PTHREAD_GET_STACKSIZE_NP=1 -DTCL_THREADS=1 -DTCL_CFGVAL_ENCODING=\"iso8859-1\" -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -DMAC_OSX_TCL=1 -DTCL_SHLIB_EXT=\".dylib\" -DTCL_CFG_DEBUG=1 -DTCL_TOMMATH=1 -DMP_PREC=4 -DTCL_WIDE_INT_IS_LONG=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRTOL=1 -DHAVE_WAITPID=1 -DHAVE_GETADDRINFO=1 -DHAVE_GETPWUID_R_5=1 -DHAVE_GETPWUID_R=1 -DHAVE_GETPWNAM_R_5=1 -DHAVE_GETPWNAM_R=1 -DHAVE_GETGRGID_R_5=1 -DHAVE_GETGRGID_R=1 -DHAVE_GETGRNAM_R_5=1 -DHAVE_GETGRNAM_R=1 -DHAVE_MTSAFE_GETHOSTBYNAME=1 -DHAVE_MTSAFE_GETHOSTBYADDR=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_STRUCT_TM_TM_ZONE=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_MKTIME=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_STRUCT_STAT_ST_BLKSIZE=1 -DHAVE_ST_BLKSIZE=1 -DHAVE_INTPTR_T=1 -DHAVE_UINTPTR_T=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DHAVE_CHFLAGS=1 -DHAVE_GETATTRLIST=1 -DHAVE_COPYFILE_H=1 -DHAVE_COPYFILE=1 -DUSE_VFORK=1 -DTCL_DEFAULT_ENCODING=\"utf-8\" -DTCL_LOAD_FROM_MEMORY=1 -DTCL_WIDE_CLICKS=1 -DHAVE_AVAILABILITYMACROS_H=1 -DHAVE_WEAK_IMPORT=1 -D_DARWIN_C_SOURCE=1 -DHAVE_FTS=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_FILIO_H=1 -DTCL_UNLOAD_DLLS=1 '
 TCL_EXTRA_CFLAGS='-pipe   '
-TCL_INCLUDES='-I"/usr/local/src/tcl8.6b1/generic"'
+TCL_INCLUDES='-I"/usr/local/src/tcl8.5.8/generic"'
 TCL_LD_FLAGS=' -prebind -headerpad_max_install_names -Wl,-search_paths_first '
 TCL_LIBS='${DL_LIBS} ${LIBS} ${MATH_LIBS}'
-TCL_LIB_FILE='libtcl8.6.dylib'
-TCL_LIB_FLAG='-ltcl8.6'
-TCL_LIB_SPEC='-L/usr/local/src/tcl8.6b1/unix -ltcl8.6'
+TCL_LIB_FILE='libtcl8.5.dylib'
+TCL_LIB_FLAG='-ltcl8.5'
+TCL_LIB_SPEC='-L/usr/local/src/tcl8.5.8/unix -ltcl8.5'
 TCL_SHLIB_LD_LIBS='${LIBS}'
-TCL_SRC_DIR='/usr/local/src/tcl8.6b1'
-TCL_STUB_LIB_FILE='libtclstub8.6.a'
-TCL_STUB_LIB_FLAG='-ltclstub8.6'
-TCL_STUB_LIB_SPEC='-L/usr/local/src/tcl8.6b1/unix -ltclstub8.6'
+TCL_SRC_DIR='/usr/local/src/tcl8.5.8'
+TCL_STUB_LIB_FILE='libtclstub8.5.a'
+TCL_STUB_LIB_FLAG='-ltclstub8.5'
+TCL_STUB_LIB_SPEC='-L/usr/local/src/tcl8.5.8/unix -ltclstub8.5'
 TCL_THREADS='1'
-TCL_VERSION='8.6'
+TCL_VERSION='8.5'
 ac_ct_CC='gcc'
 bindir='${exec_prefix}/bin'
 build_alias=''
 datadir='${datarootdir}'
 datarootdir='${prefix}/share'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 dvidir='${docdir}'
-exec_prefix='/usr/local'
+exec_prefix='/usr/local/ns'
 host_alias=''
 htmldir='${docdir}'
 includedir='${prefix}/include'
@@ -954,7 +954,7 @@
 mandir='${datarootdir}/man'
 oldincludedir='/usr/include'
 pdfdir='${docdir}'
-prefix='/usr/local'
+prefix='/usr/local/ns'
 program_transform_name='s,x,x,'
 psdir='${docdir}'
 sbindir='${exec_prefix}/sbin'
Index: library/xml/TclExpat-1.1/Makefile
===================================================================
diff -u -rfb1c70479008e8b50c8b1ac0885af959fc316775 -r2d45b41a8a644b3d647f59208067e81391ad7d36
--- library/xml/TclExpat-1.1/Makefile	(.../Makefile)	(revision fb1c70479008e8b50c8b1ac0885af959fc316775)
+++ library/xml/TclExpat-1.1/Makefile	(.../Makefile)	(revision 2d45b41a8a644b3d647f59208067e81391ad7d36)
@@ -68,8 +68,8 @@
 SHELL		= /bin/sh
 
 srcdir		= .
-prefix		= /usr/local
-exec_prefix	= /usr/local
+prefix		= /usr/local/ns
+exec_prefix	= /usr/local/ns
 
 bindir		= ${exec_prefix}/bin
 libdir		= ${exec_prefix}/lib
@@ -109,11 +109,11 @@
 SHLIB_CFLAGS	= -fno-common
 SHLIB_LD	= ${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT} -Wl,-single_module -current_version 0.9 -compatibility_version 0.9
 SHLIB_LD_FLAGS	= @SHLIB_LD_FLAGS@
-SHLIB_LD_LIBS	= ${LIBS} -L/usr/local/src/tcl8.6b1/unix -ltclstub8.6
+SHLIB_LD_LIBS	= ${LIBS} -L/usr/local/src/tcl8.5.8/unix -ltclstub8.5
 STLIB_LD	= ${AR} cr
-TCL_DEFS	= -DPACKAGE_NAME=\"tcl\" -DPACKAGE_TARNAME=\"tcl\" -DPACKAGE_VERSION=\"8.6\" -DPACKAGE_STRING=\"tcl\ 8.6\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DNO_VALUES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DTCL_THREADS=1 -DTCL_CFGVAL_ENCODING=\"iso8859-1\" -DHAVE_ZLIB=1 -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -DMAC_OSX_TCL=1 -DTCL_SHLIB_EXT=\".dylib\" -DTCL_CFG_DEBUG=1 -DTCL_TOMMATH=1 -DMP_PREC=4 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRTOL=1 -DHAVE_WAITPID=1 -DHAVE_GETADDRINFO=1 -DHAVE_GETPWUID_R_5=1 -DHAVE_GETPWUID_R=1 -DHAVE_GETPWNAM_R_5=1 -DHAVE_GETPWNAM_R=1 -DHAVE_GETGRGID_R_5=1 -DHAVE_GETGRGID_R=1 -DHAVE_GETGRNAM_R_5=1 -DHAVE_GETGRNAM_R=1 -DHAVE_MTSAFE_GETHOSTBYNAME=1 -DHAVE_MTSAFE_GETHOSTBYADDR=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_STRUCT_TM_TM_ZONE=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_MKTIME=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_STRUCT_STAT_ST_BLKSIZE=1 -DHAVE_ST_BLKSIZE=1 -DHAVE_INTPTR_T=1 -DHAVE_UINTPTR_T=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DHAVE_CHFLAGS=1 -DHAVE_MKSTEMPS=1 -DHAVE_GETATTRLIST=1 -DHAVE_COPYFILE_H=1 -DHAVE_COPYFILE=1 -DUSE_VFORK=1 -DTCL_DEFAULT_ENCODING=\"utf-8\" -DTCL_LOAD_FROM_MEMORY=1 -DTCL_WIDE_CLICKS=1 -DHAVE_AVAILABILITYMACROS_H=1 -DHAVE_WEAK_IMPORT=1 -DHAVE_FTS=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_FILIO_H=1 -DTCL_UNLOAD_DLLS=1 
-TCL_BIN_DIR	= /usr/local/src/tcl8.6b1/unix
-TCL_SRC_DIR	= /usr/local/src/tcl8.6b1
+TCL_DEFS	= -DPACKAGE_NAME=\"tcl\" -DPACKAGE_TARNAME=\"tcl\" -DPACKAGE_VERSION=\"8.5\" -DPACKAGE_STRING=\"tcl\ 8.5\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DNO_VALUES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_PTHREAD_GET_STACKSIZE_NP=1 -DTCL_THREADS=1 -DTCL_CFGVAL_ENCODING=\"iso8859-1\" -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -DMAC_OSX_TCL=1 -DTCL_SHLIB_EXT=\".dylib\" -DTCL_CFG_DEBUG=1 -DTCL_TOMMATH=1 -DMP_PREC=4 -DTCL_WIDE_INT_IS_LONG=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRTOL=1 -DHAVE_WAITPID=1 -DHAVE_GETADDRINFO=1 -DHAVE_GETPWUID_R_5=1 -DHAVE_GETPWUID_R=1 -DHAVE_GETPWNAM_R_5=1 -DHAVE_GETPWNAM_R=1 -DHAVE_GETGRGID_R_5=1 -DHAVE_GETGRGID_R=1 -DHAVE_GETGRNAM_R_5=1 -DHAVE_GETGRNAM_R=1 -DHAVE_MTSAFE_GETHOSTBYNAME=1 -DHAVE_MTSAFE_GETHOSTBYADDR=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_STRUCT_TM_TM_ZONE=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_MKTIME=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_STRUCT_STAT_ST_BLKSIZE=1 -DHAVE_ST_BLKSIZE=1 -DHAVE_INTPTR_T=1 -DHAVE_UINTPTR_T=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DHAVE_CHFLAGS=1 -DHAVE_GETATTRLIST=1 -DHAVE_COPYFILE_H=1 -DHAVE_COPYFILE=1 -DUSE_VFORK=1 -DTCL_DEFAULT_ENCODING=\"utf-8\" -DTCL_LOAD_FROM_MEMORY=1 -DTCL_WIDE_CLICKS=1 -DHAVE_AVAILABILITYMACROS_H=1 -DHAVE_WEAK_IMPORT=1 -D_DARWIN_C_SOURCE=1 -DHAVE_FTS=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_FILIO_H=1 -DTCL_UNLOAD_DLLS=1 
+TCL_BIN_DIR	= /usr/local/src/tcl8.5.8/unix
+TCL_SRC_DIR	= /usr/local/src/tcl8.5.8
 # This is necessary for packages that use private Tcl headers
 #TCL_TOP_DIR_NATIVE	= @TCL_TOP_DIR_NATIVE@
 # Not used, but retained for reference of what libs Tcl required
@@ -131,11 +131,11 @@
 		  DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \
 		  PATH="$(EXTRA_PATH):$(PATH)" \
 		  TCLLIBPATH="$(top_builddir)"
-TCLSH_PROG	= /usr/local/src/tcl8.6b1/unix/tclsh
+TCLSH_PROG	= /usr/local/src/tcl8.5.8/unix/tclsh
 TCLSH		= $(TCLSH_ENV) $(TCLSH_PROG)
 SHARED_BUILD	= 1
 
-INCLUDES	=  -I/Users/neumann/src/xotcl-1.6.6/generic -I./generic -I"/usr/local/src/tcl8.6b1/generic"
+INCLUDES	=  -I/Users/neumann/src/xotcl-1.6.6/generic -I./generic -I"/usr/local/src/tcl8.5.8/generic"
 
 EXTRA_CFLAGS	=  
 
Index: library/xml/TclExpat-1.1/config.log
===================================================================
diff -u -rfb1c70479008e8b50c8b1ac0885af959fc316775 -r2d45b41a8a644b3d647f59208067e81391ad7d36
--- library/xml/TclExpat-1.1/config.log	(.../config.log)	(revision fb1c70479008e8b50c8b1ac0885af959fc316775)
+++ library/xml/TclExpat-1.1/config.log	(.../config.log)	(revision 2d45b41a8a644b3d647f59208067e81391ad7d36)
@@ -4,7 +4,7 @@
 It was created by xotclexpat configure 0.9, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
-  $ ./configure --with-tcl=/usr/local/src/tcl8.6b1/unix/ --enable-symbols --with-actiweb --prefix=/usr/local --with-xotcl=/Users/neumann/src/xotcl-1.6.6
+  $ ./configure --with-tcl=/usr/local/src/tcl8.5.8/unix/ --enable-symbols --with-actiweb --prefix=/usr/local/ns --with-xotcl=/Users/neumann/src/xotcl-1.6.6
 
 ## --------- ##
 ## Platform. ##
@@ -30,8 +30,8 @@
 Processor type: i486 (Intel 80486)
 Processors active: 0 1
 Primary memory available: 8.00 gigabytes
-Default processor set: 108 tasks, 490 threads, 2 processors
-Load average: 1.20, Mach factor: 0.86
+Default processor set: 102 tasks, 405 threads, 2 processors
+Load average: 1.23, Mach factor: 0.86
 /bin/machine           = unknown
 /usr/bin/oslevel       = unknown
 /bin/universe          = unknown
@@ -57,10 +57,10 @@
 configure:1776: checking for correct TEA configuration
 configure:1795: result: ok (TEA 3.7)
 configure:1987: checking for Tcl configuration
-configure:2113: result: found /usr/local/src/tcl8.6b1/unix/tclConfig.sh
-configure:2119: checking for existence of /usr/local/src/tcl8.6b1/unix/tclConfig.sh
+configure:2113: result: found /usr/local/src/tcl8.5.8/unix/tclConfig.sh
+configure:2119: checking for existence of /usr/local/src/tcl8.5.8/unix/tclConfig.sh
 configure:2123: result: loading
-configure:2282: --exec-prefix defaulting to TCL_EXEC_PREFIX /usr/local
+configure:2282: --exec-prefix defaulting to TCL_EXEC_PREFIX /usr/local/ns
 configure:2358: checking for gcc
 configure:2374: found /usr/bin/gcc
 configure:2385: result: gcc
@@ -557,57 +557,57 @@
 configure:6656: checking for sys/param.h
 configure:6664: result: yes
 configure:6689: Reading file /Users/neumann/src/xotcl-1.6.6/xotclConfig.sh
-configure:6710: result: using bundled expat distribution
-configure:6922: checking for Tcl public headers
-configure:6997: result: /usr/local/src/tcl8.6b1/generic
-configure:7065: checking for pthread_mutex_init in -lpthread
-configure:7100: gcc -o conftest  -pipe   conftest.c -lpthread   >&5
-configure:7106: $? = 0
-configure:7124: result: yes
-configure:7433: checking for building with threads
-configure:7441: result: yes (default)
-configure:7482: checking how to build libraries
-configure:7500: result: shared
-configure:7527: checking if 64bit support is requested
-configure:7536: result: no
-configure:7541: checking if 64bit Sparc VIS support is requested
-configure:7550: result: no
-configure:7561: checking if compiler supports visibility "hidden"
-configure:7591: gcc -o conftest  -pipe -Werror   conftest.c  >&5
-configure:7597: $? = 0
-configure:7615: result: yes
-configure:7630: checking if rpath support is requested
-configure:7639: result: yes
-configure:7665: checking system version
-configure:7696: result: Darwin-10.2.0
-configure:7704: checking for dlopen in -ldl
-configure:7739: gcc -o conftest  -pipe   conftest.c -ldl   >&5
-configure:7745: $? = 0
-configure:7763: result: yes
-configure:7809: checking for ar
-configure:7825: found /usr/bin/ar
-configure:7836: result: ar
-configure:9336: checking if ld accepts -single_module flag
-configure:9365: gcc -o conftest -pipe     -dynamiclib -Wl,-single_module conftest.c  >&5
-configure:9371: $? = 0
-configure:9389: result: yes
-configure:9412: checking if ld accepts -search_paths_first flag
-configure:9441: gcc -o conftest -pipe     -prebind -headerpad_max_install_names -Wl,-search_paths_first conftest.c  >&5
-configure:9447: $? = 0
-configure:9465: result: yes
-configure:10167: checking for required early compiler flags
-configure:10195: gcc -c -pipe    conftest.c >&5
-configure:10201: $? = 0
-configure:10292: gcc -c -pipe    conftest.c >&5
+configure:6717: result: using bundled expat distribution
+configure:6929: checking for Tcl public headers
+configure:7004: result: /usr/local/src/tcl8.5.8/generic
+configure:7072: checking for pthread_mutex_init in -lpthread
+configure:7107: gcc -o conftest  -pipe   conftest.c -lpthread   >&5
+configure:7113: $? = 0
+configure:7131: result: yes
+configure:7440: checking for building with threads
+configure:7448: result: yes (default)
+configure:7489: checking how to build libraries
+configure:7507: result: shared
+configure:7534: checking if 64bit support is requested
+configure:7543: result: no
+configure:7548: checking if 64bit Sparc VIS support is requested
+configure:7557: result: no
+configure:7568: checking if compiler supports visibility "hidden"
+configure:7598: gcc -o conftest  -pipe -Werror   conftest.c  >&5
+configure:7604: $? = 0
+configure:7622: result: yes
+configure:7637: checking if rpath support is requested
+configure:7646: result: yes
+configure:7672: checking system version
+configure:7703: result: Darwin-10.2.0
+configure:7711: checking for dlopen in -ldl
+configure:7746: gcc -o conftest  -pipe   conftest.c -ldl   >&5
+configure:7752: $? = 0
+configure:7770: result: yes
+configure:7816: checking for ar
+configure:7832: found /usr/bin/ar
+configure:7843: result: ar
+configure:9343: checking if ld accepts -single_module flag
+configure:9372: gcc -o conftest -pipe     -dynamiclib -Wl,-single_module conftest.c  >&5
+configure:9378: $? = 0
+configure:9396: result: yes
+configure:9419: checking if ld accepts -search_paths_first flag
+configure:9448: gcc -o conftest -pipe     -prebind -headerpad_max_install_names -Wl,-search_paths_first conftest.c  >&5
+configure:9454: $? = 0
+configure:9472: result: yes
+configure:10174: checking for required early compiler flags
+configure:10202: gcc -c -pipe    conftest.c >&5
+configure:10208: $? = 0
+configure:10299: gcc -c -pipe    conftest.c >&5
 conftest.c: In function 'main':
 conftest.c:30: warning: 'stat64' is deprecated (declared at /usr/include/sys/stat.h:465)
-configure:10298: $? = 0
-configure:10389: gcc -c -pipe    conftest.c >&5
+configure:10305: $? = 0
+configure:10396: gcc -c -pipe    conftest.c >&5
 conftest.c: In function 'main':
 conftest.c:30: error: 'open64' undeclared (first use in this function)
 conftest.c:30: error: (Each undeclared identifier is reported only once
 conftest.c:30: error: for each function it appears in.)
-configure:10395: $? = 1
+configure:10402: $? = 1
 configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "xotclexpat"
@@ -642,12 +642,12 @@
 |   ;
 |   return 0;
 | }
-configure:10427: gcc -c -pipe    conftest.c >&5
+configure:10434: gcc -c -pipe    conftest.c >&5
 conftest.c: In function 'main':
 conftest.c:31: error: 'open64' undeclared (first use in this function)
 conftest.c:31: error: (Each undeclared identifier is reported only once
 conftest.c:31: error: for each function it appears in.)
-configure:10433: $? = 1
+configure:10440: $? = 1
 configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "xotclexpat"
@@ -683,15 +683,15 @@
 |   ;
 |   return 0;
 | }
-configure:10462: result: none
-configure:10470: checking for 64-bit integer type
-configure:10499: gcc -c -pipe    conftest.c >&5
+configure:10469: result: none
+configure:10477: checking for 64-bit integer type
+configure:10506: gcc -c -pipe    conftest.c >&5
 conftest.c: In function 'main':
 conftest.c:30: error: '__int64' undeclared (first use in this function)
 conftest.c:30: error: (Each undeclared identifier is reported only once
 conftest.c:30: error: for each function it appears in.)
 conftest.c:30: error: expected ';' before 'value'
-configure:10505: $? = 1
+configure:10512: $? = 1
 configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "xotclexpat"
@@ -726,11 +726,11 @@
 |   ;
 |   return 0;
 | }
-configure:10545: gcc -c -pipe    conftest.c >&5
+configure:10552: gcc -c -pipe    conftest.c >&5
 conftest.c: In function 'main':
 conftest.c:31: error: duplicate case value
 conftest.c:31: error: previously used here
-configure:10551: $? = 1
+configure:10558: $? = 1
 configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "xotclexpat"
@@ -767,12 +767,12 @@
 |   ;
 |   return 0;
 | }
-configure:10573: result: using long
-configure:10878: checking for build with symbols
-configure:10897: result: yes (standard debugging)
-configure:11030: checking for tclsh
-configure:11057: result: /usr/local/src/tcl8.6b1/unix/tclsh
-configure:11202: creating ./config.status
+configure:10580: result: using long
+configure:10885: checking for build with symbols
+configure:10904: result: yes (standard debugging)
+configure:11037: checking for tclsh
+configure:11064: result: /usr/local/src/tcl8.5.8/unix/tclsh
+configure:11209: creating ./config.status
 
 ## ---------------------- ##
 ## Running config.status. ##
@@ -798,8 +798,8 @@
 
 ac_cv_c_bigendian=no
 ac_cv_c_compiler_gnu=yes
-ac_cv_c_tclconfig=/usr/local/src/tcl8.6b1/unix
-ac_cv_c_tclh=/usr/local/src/tcl8.6b1/generic
+ac_cv_c_tclconfig=/usr/local/src/tcl8.5.8/unix
+ac_cv_c_tclh=/usr/local/src/tcl8.5.8/generic
 ac_cv_env_CC_set=
 ac_cv_env_CC_value=
 ac_cv_env_CFLAGS_set=
@@ -927,34 +927,34 @@
 SHELL='/bin/sh'
 SHLIB_CFLAGS='-fno-common'
 SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT} -Wl,-single_module -current_version 0.9 -compatibility_version 0.9'
-SHLIB_LD_LIBS='${LIBS} -L/usr/local/src/tcl8.6b1/unix -ltclstub8.6'
+SHLIB_LD_LIBS='${LIBS} -L/usr/local/src/tcl8.5.8/unix -ltclstub8.5'
 STLIB_LD='${AR} cr'
-TCLSH_PROG='/usr/local/src/tcl8.6b1/unix/tclsh'
-TCL_BIN_DIR='/usr/local/src/tcl8.6b1/unix'
+TCLSH_PROG='/usr/local/src/tcl8.5.8/unix/tclsh'
+TCL_BIN_DIR='/usr/local/src/tcl8.5.8/unix'
 TCL_DBGX=''
-TCL_DEFS='-DPACKAGE_NAME=\"tcl\" -DPACKAGE_TARNAME=\"tcl\" -DPACKAGE_VERSION=\"8.6\" -DPACKAGE_STRING=\"tcl\ 8.6\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DNO_VALUES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DTCL_THREADS=1 -DTCL_CFGVAL_ENCODING=\"iso8859-1\" -DHAVE_ZLIB=1 -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -DMAC_OSX_TCL=1 -DTCL_SHLIB_EXT=\".dylib\" -DTCL_CFG_DEBUG=1 -DTCL_TOMMATH=1 -DMP_PREC=4 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRTOL=1 -DHAVE_WAITPID=1 -DHAVE_GETADDRINFO=1 -DHAVE_GETPWUID_R_5=1 -DHAVE_GETPWUID_R=1 -DHAVE_GETPWNAM_R_5=1 -DHAVE_GETPWNAM_R=1 -DHAVE_GETGRGID_R_5=1 -DHAVE_GETGRGID_R=1 -DHAVE_GETGRNAM_R_5=1 -DHAVE_GETGRNAM_R=1 -DHAVE_MTSAFE_GETHOSTBYNAME=1 -DHAVE_MTSAFE_GETHOSTBYADDR=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_STRUCT_TM_TM_ZONE=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_MKTIME=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_STRUCT_STAT_ST_BLKSIZE=1 -DHAVE_ST_BLKSIZE=1 -DHAVE_INTPTR_T=1 -DHAVE_UINTPTR_T=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DHAVE_CHFLAGS=1 -DHAVE_MKSTEMPS=1 -DHAVE_GETATTRLIST=1 -DHAVE_COPYFILE_H=1 -DHAVE_COPYFILE=1 -DUSE_VFORK=1 -DTCL_DEFAULT_ENCODING=\"utf-8\" -DTCL_LOAD_FROM_MEMORY=1 -DTCL_WIDE_CLICKS=1 -DHAVE_AVAILABILITYMACROS_H=1 -DHAVE_WEAK_IMPORT=1 -DHAVE_FTS=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_FILIO_H=1 -DTCL_UNLOAD_DLLS=1 '
+TCL_DEFS='-DPACKAGE_NAME=\"tcl\" -DPACKAGE_TARNAME=\"tcl\" -DPACKAGE_VERSION=\"8.5\" -DPACKAGE_STRING=\"tcl\ 8.5\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DNO_VALUES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_PTHREAD_GET_STACKSIZE_NP=1 -DTCL_THREADS=1 -DTCL_CFGVAL_ENCODING=\"iso8859-1\" -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -DMAC_OSX_TCL=1 -DTCL_SHLIB_EXT=\".dylib\" -DTCL_CFG_DEBUG=1 -DTCL_TOMMATH=1 -DMP_PREC=4 -DTCL_WIDE_INT_IS_LONG=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRTOL=1 -DHAVE_WAITPID=1 -DHAVE_GETADDRINFO=1 -DHAVE_GETPWUID_R_5=1 -DHAVE_GETPWUID_R=1 -DHAVE_GETPWNAM_R_5=1 -DHAVE_GETPWNAM_R=1 -DHAVE_GETGRGID_R_5=1 -DHAVE_GETGRGID_R=1 -DHAVE_GETGRNAM_R_5=1 -DHAVE_GETGRNAM_R=1 -DHAVE_MTSAFE_GETHOSTBYNAME=1 -DHAVE_MTSAFE_GETHOSTBYADDR=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_STRUCT_TM_TM_ZONE=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_MKTIME=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_STRUCT_STAT_ST_BLKSIZE=1 -DHAVE_ST_BLKSIZE=1 -DHAVE_INTPTR_T=1 -DHAVE_UINTPTR_T=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DHAVE_CHFLAGS=1 -DHAVE_GETATTRLIST=1 -DHAVE_COPYFILE_H=1 -DHAVE_COPYFILE=1 -DUSE_VFORK=1 -DTCL_DEFAULT_ENCODING=\"utf-8\" -DTCL_LOAD_FROM_MEMORY=1 -DTCL_WIDE_CLICKS=1 -DHAVE_AVAILABILITYMACROS_H=1 -DHAVE_WEAK_IMPORT=1 -D_DARWIN_C_SOURCE=1 -DHAVE_FTS=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_FILIO_H=1 -DTCL_UNLOAD_DLLS=1 '
 TCL_EXTRA_CFLAGS='-pipe   '
-TCL_INCLUDES='-I"/usr/local/src/tcl8.6b1/generic"'
+TCL_INCLUDES='-I"/usr/local/src/tcl8.5.8/generic"'
 TCL_LD_FLAGS=' -prebind -headerpad_max_install_names -Wl,-search_paths_first '
 TCL_LIBS='${DL_LIBS} ${LIBS} ${MATH_LIBS}'
-TCL_LIB_FILE='libtcl8.6.dylib'
-TCL_LIB_FLAG='-ltcl8.6'
-TCL_LIB_SPEC='-L/usr/local/src/tcl8.6b1/unix -ltcl8.6'
+TCL_LIB_FILE='libtcl8.5.dylib'
+TCL_LIB_FLAG='-ltcl8.5'
+TCL_LIB_SPEC='-L/usr/local/src/tcl8.5.8/unix -ltcl8.5'
 TCL_SHLIB_LD_LIBS='${LIBS}'
-TCL_SRC_DIR='/usr/local/src/tcl8.6b1'
-TCL_STUB_LIB_FILE='libtclstub8.6.a'
-TCL_STUB_LIB_FLAG='-ltclstub8.6'
-TCL_STUB_LIB_SPEC='-L/usr/local/src/tcl8.6b1/unix -ltclstub8.6'
+TCL_SRC_DIR='/usr/local/src/tcl8.5.8'
+TCL_STUB_LIB_FILE='libtclstub8.5.a'
+TCL_STUB_LIB_FLAG='-ltclstub8.5'
+TCL_STUB_LIB_SPEC='-L/usr/local/src/tcl8.5.8/unix -ltclstub8.5'
 TCL_THREADS='1'
-TCL_VERSION='8.6'
+TCL_VERSION='8.5'
 ac_ct_CC='gcc'
 bindir='${exec_prefix}/bin'
 build_alias=''
 datadir='${datarootdir}'
 datarootdir='${prefix}/share'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 dvidir='${docdir}'
-exec_prefix='/usr/local'
+exec_prefix='/usr/local/ns'
 host_alias=''
 htmldir='${docdir}'
 includedir='${prefix}/include'
@@ -966,7 +966,7 @@
 mandir='${datarootdir}/man'
 oldincludedir='/usr/include'
 pdfdir='${docdir}'
-prefix='/usr/local'
+prefix='/usr/local/ns'
 program_transform_name='s,x,x,'
 psdir='${docdir}'
 sbindir='${exec_prefix}/sbin'