16 files changed, 37 insertions, 1080 deletions

diff --git a/lang/tclX/files/patch-ab b/lang/tclX/files/patch-ab
deleted file mode 100644
index 08abd86235d2..000000000000
--- a/lang/tclX/files/patch-ab
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../tcl/unix/Makefile.in.orig	Sun Feb  6 18:53:59 2000
-+++ ../tcl/unix/Makefile.in	Thu Jul 13 15:35:23 2000
-@@ -131,7 +131,7 @@
- #
- all: binaries libraries doc
- 
--binaries: tcl checkup RUNTIME tclXtest
-+binaries: tcl checkup RUNTIME
- 
- libraries: tcl.tndx tcl.tlib tclx.tcl buildidx.tcl
- 
-@@ -162,7 +162,8 @@
- 	PATH=${TCL_UNIX_DIR}:${PATH}; export PATH; \
- 	TCL_LIBRARY=${TCL_UNIX_DIR}/../library; export TCL_LIBRARY; \
- 	LD_LIBRARY_PATH=${TCL_UNIX_DIR}:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH; \
--	${TCL_SHLIB_LD} -o ${TCLX_SHLIB_NAME} ${SOBJS} ${TCL_SHLIB_LD_LIBS}
-+	${TCL_SHLIB_LD} -o ${TCLX_SHLIB_NAME} ${SOBJS} @NEED_TCL_STUB@ -lm
-+	ln -sf ${TCLX_SHLIB_NAME} `echo ${TCLX_SHLIB_NAME} | sed 's/\.so.*$$/.so/'`
- 
- hello:	hello.c
- 	${CC} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS}
-@@ -184,7 +185,7 @@
- # unless we don't have them.
- #
- RUNTIME: tcl.tlib tcl.tndx tclx.tcl buildidx.tcl autoload.tcl help.tmp \
--         dltest.tmp checkup
-+         checkup
- 
- tcl.tlib: ${TLIB_SRCS} autoload.tcl
- 	-rm -f tcl.tlib tcl.tndx
-@@ -308,5 +308,5 @@
- 	mkdir ${HELP_DIR}
--	${BLDMANHELP} ${TCL_SRC_DIR}/doc ${TCLX_TOOLS_SRC_DIR}/tclmanpages \
-+	${BLDMANHELP} ${TCLX_TOOLS_SRC_DIR}/tclmanpages \
- 	    ${HELP_DIR} Tcl.brf
- 	${RUNTCL} -c "buildhelp ${HELP_DIR} TclX.brf ${TCLX_DOC_DIR}/TclX.n"
- 
-@@ -338,9 +339,11 @@
- 	    ${INSTCOPY} ${TCLX_STLIB_NAME} ${INSTALL_ROOT}${TCLX_INST_LIB}; \
- 	    ${RANLIB} ${INSTALL_ROOT}${TCLX_INST_LIB}/${TCLX_STLIB_NAME}; \
- 	fi
--	${INSTCOPY} tclxConfig.sh ${INSTALL_ROOT}${TCLX_INST_LIB}
-+	${INSTCOPY} tclxConfig.sh ${INSTALL_ROOT}${TCLX_INST_RUNTIME}
- 	if test "@SHARED_BUILD@" = "1"; then \
- 	    ${INSTCOPY} ${TCLX_SHLIB_NAME} ${INSTALL_ROOT}${TCLX_INST_LIB} ;\
-+	    (cd ${INSTALL_ROOT}${TCLX_INST_LIB} && \
-+		ln -sf ${TCLX_SHLIB_NAME} `echo ${TCLX_SHLIB_NAME} | sed 's/\.so.*$$/.so/'`) ;\
- 	    ${INSTCOPY} pkgIndex.tcl ${INSTALL_ROOT}${TCLX_EXEC_RUNTIME} ;\
- 	fi
- 
-@@ -385,2 +388,2 @@
- tclXAppInit.o: ${TCLX_UNIX_SRC_DIR}/tclXAppInit.c
--	${CC} -c ${CC_SWITCHES} ${TCLX_UNIX_SRC_DIR}/tclXAppInit.c
-+	${CC} -c ${CC_SWITCHES} -UUSE_TCL_STUBS ${TCLX_UNIX_SRC_DIR}/tclXAppInit.c
diff --git a/lang/tclX/files/patch-ac b/lang/tclX/files/patch-ac
deleted file mode 100644
index 2546b1a81dfa..000000000000
--- a/lang/tclX/files/patch-ac
+++ /dev/null
@@ -1,43 +0,0 @@
---- ../tk/unix/Makefile.in	Sun Feb  6 18:54:01 2000
-+++ ../tk/unix/Makefile.in	Thu Jul 13 15:35:36 2000
-@@ -81,7 +81,7 @@
- #
- all: binaries libraries doc
- 
--binaries: wishx tktest
-+binaries: wishx
- 
- libraries: RUNTIME
- 
-@@ -112,4 +112,4 @@
- 	${TCL_SHLIB_LD} -o ${TKX_SHLIB_NAME} ${SOBJS} \
--	    ${TK_BUILD_STUB_LIB_SPEC} ${TCLX_BUILD_LIB_SPEC} \
--	    ${TCL_BUILD_STUB_LIB_SPEC} ${TCL_SHLIB_LD_LIBS}
-+	    ${TK_SHLIB_LD_LIBS} ${TCLX_BUILD_LIB_SPEC}
-+	ln -sf ${TKX_SHLIB_NAME} `echo ${TKX_SHLIB_NAME} | sed 's/\.so.*$$/.so/'`
- 
-@@ -199,5 +200,5 @@
- 	mkdir -p ${HELP_DIR}
--	${BLDMANHELP} ${TK_SRC_DIR}/doc ${TCLX_TOOLS_SRC_DIR}/tkmanpages \
-+	${BLDMANHELP} ${TCLX_TOOLS_SRC_DIR}/tkmanpages \
- 	    ${HELP_DIR} Tk.brf
- 	${INSTCOPY} ${HELP_DIR} ${INSTALL_ROOT}${TKX_INST_RUNTIME}/help
- 
-@@ -227,9 +228,11 @@
- 	    ${INSTCOPY} ${TKX_STLIB_NAME} ${INSTALL_ROOT}${TKX_INST_LIB}; \
- 	    ${RANLIB} ${INSTALL_ROOT}${TKX_INST_LIB}/${TKX_STLIB_NAME}; \
- 	fi
--	${INSTCOPY} tkxConfig.sh ${INSTALL_ROOT}${TKX_INST_LIB}
-+	${INSTCOPY} tkxConfig.sh ${INSTALL_ROOT}${TKX_INST_RUNTIME}
- 	if test "@SHARED_BUILD@" = "1"; then \
- 	    ${INSTCOPY} ${TKX_SHLIB_NAME} ${INSTALL_ROOT}${TKX_INST_LIB} ;\
-+	    (cd ${INSTALL_ROOT}${TKX_INST_LIB} && \
-+		ln -sf ${TKX_SHLIB_NAME} `echo ${TKX_SHLIB_NAME} | sed 's/\.so.*$$/.so/'`) ;\
- 	    ${INSTCOPY} pkgIndex.tcl ${INSTALL_ROOT}${TKX_EXEC_RUNTIME} ;\
- 	fi
- 	${INSTCOPY} tclhelp ${INSTALL_ROOT}${TKX_INST_BIN}
-@@ -274,2 +276,3 @@
- tkXAppInit.o: ${TKX_UNIX_SRC_DIR}/tkXAppInit.c
--	${CC} -c ${CC_SWITCHES} ${TKX_UNIX_SRC_DIR}/tkXAppInit.c
-+	${CC} -c ${CC_SWITCHES} -UUSE_TCL_STUBS -UUSE_TK_STUBS \
-+		${TKX_UNIX_SRC_DIR}/tkXAppInit.c
diff --git a/lang/tclX/files/patch-ad b/lang/tclX/files/patch-ad
deleted file mode 100644
index 69011c45858b..000000000000
--- a/lang/tclX/files/patch-ad
+++ /dev/null
@@ -1,72 +0,0 @@
---- Common.mk.in.orig	Sun Feb  6 18:54:02 2000
-+++ Common.mk.in	Thu Jul 13 13:54:11 2000
-@@ -36,8 +36,7 @@
- #------------------------------------------------------------------------------
- # Programs and options used by build
- #
--CC           = @CC@
--CFLAGS       = @CFLAGS@ @TCL_CFLAGS_WARNING@ @TCL_EXTRA_CFLAGS@
-+CFLAGS      += @TCL_CFLAGS_WARNING@ @TCL_EXTRA_CFLAGS@
- SYSCFLAGS    = @SYSCFLAGS@
- RANLIB       = @RANLIB@
- AR           = ar
-@@ -115,6 +114,7 @@
- #------------------------------------------------------------------------------
- # Configuration information from tclConfig.sh.
- #
-+TCL_PREFIX	     = @TCL_PREFIX@
- TCL_BIN_DIR          = @TCL_BIN_DIR@
- TCL_SRC_DIR          = @TCL_SRC_DIR@
- TCL_LIB_DIR          = @TCL_BIN_DIR@
-@@ -128,18 +128,19 @@
- TCL_SHLIB_LD         = @TCL_SHLIB_LD@
- TCL_SHLIB_LD_LIBS    = @TCL_SHLIB_LD_LIBS@
- TCL_DBGX             = @TCL_DBGX@
--TCL_BUILD_LIB_SPEC   = @TCL_BUILD_LIB_SPEC@
-+TCL_BUILD_LIB_SPEC   = @TCL_LIB_SPEC@
- TCL_LIB_SPEC         = @TCL_LIB_SPEC@
--TCL_BUILD_STUB_LIB_SPEC   = @TCL_BUILD_STUB_LIB_SPEC@
-+TCL_BUILD_STUB_LIB_SPEC   = @TCL_STUB_LIB_SPEC@
- TCL_STUB_LIB_SPEC         = @TCL_STUB_LIB_SPEC@
- TCL_LD_SEARCH_FLAGS  = @TCL_LD_SEARCH_FLAGS@
- 
--TCL_GENERIC_DIR      = ${TCL_SRC_DIR}/generic
--TCL_UNIX_DIR	     = ${TCL_SRC_DIR}/unix
-+TCL_GENERIC_DIR      = ${TCL_PREFIX}/include/tcl${TCL_VERSION}/generic
-+TCL_UNIX_DIR	     = ${TCL_PREFIX}/include/tcl${TCL_VERSION}/unix
- 
- #------------------------------------------------------------------------------
- # Configuration information from tkConfig.sh.
- #
-+TK_PREFIX	     = @TK_PREFIX@
- TK_BIN_DIR           = @TK_BIN_DIR@
- TK_SRC_DIR           = @TK_SRC_DIR@
- TK_LIB_DIR           = @TK_BIN_DIR@
-@@ -150,23 +151,18 @@
- TK_XINCLUDES         = @TK_XINCLUDES@
- TK_XLIBSW            = @TK_XLIBSW@
- TK_DBGX              = @TK_DBGX@
--TK_BUILD_LIB_SPEC    = @TK_BUILD_LIB_SPEC@
-+TK_BUILD_LIB_SPEC    = @TK_LIB_SPEC@
- TK_LIB_SPEC          = @TK_LIB_SPEC@
--TK_BUILD_STUB_LIB_SPEC    = @TK_BUILD_STUB_LIB_SPEC@
-+TK_BUILD_STUB_LIB_SPEC    = @TK_STUB_LIB_SPEC@
- TK_STUB_LIB_SPEC          = @TK_STUB_LIB_SPEC@
- TK_LD_SEARCH_FLAGS   = @TK_LD_SEARCH_FLAGS@
- 
--TK_GENERIC_DIR       = ${TK_SRC_DIR}/generic
--TK_UNIX_DIR	     = ${TK_SRC_DIR}/unix
-+TK_GENERIC_DIR       = ${TK_PREFIX}/include/tk${TK_VERSION}/generic
-+TK_UNIX_DIR	     = ${TK_PREFIX}/include/tk${TK_VERSION}/unix
- 
- #------------------------------------------------------------------------------
- # Location of directories in TclX source and build trees.
- #
--TCL_GENERIC_DIR    = ${TCL_SRC_DIR}/generic
--TCL_UNIX_DIR       = ${TCL_SRC_DIR}/unix
--TCL_LIBRARY_DIR    = ${TCL_SRC_DIR}/library
--TK_GENERIC_DIR     = ${TK_SRC_DIR}/generic
--TK_UNIX_DIR        = ${TK_SRC_DIR}/unix
- 
- TCLX_GENERIC_DIR   = ${srcbasedir}/tcl/generic
- TCLX_UNIX_SRC_DIR  = ${srcbasedir}/tcl/unix
diff --git a/lang/tclX/files/patch-ae b/lang/tclX/files/patch-ae
deleted file mode 100644
index 0f5976564f83..000000000000
--- a/lang/tclX/files/patch-ae
+++ /dev/null
@@ -1,67 +0,0 @@
---- configure	Sun Feb  6 18:54:02 2000
-+++ configure	Thu Jul 13 14:29:54 2000
-@@ -820,3 +820,5 @@
- 
-+if [ `uname -m` != sparc64 ]; then
- TCL_SHLIB_CFLAGS=`echo "$TCL_SHLIB_CFLAGS" |sed -e "s|-fPIC|-fpic|" -e "s|-PIC|-pic|" -e "s|-K PIC|-K pic|" -e "s|-KPIC|-Kpic|" -e "s|+Z|+z|"`
-+fi
- 
-@@ -2088,8 +2088,11 @@
- 	    ;;
- 	FreeBSD-*)
- 	    # FreeBSD 3.* and greater have ELF.
-+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+	    TCL_LIB_VERSIONS_OK=nodots
--	    SHLIB_CFLAGS="-fPIC"
-+	    SHLIB_CFLAGS="-fPIC -DPIC"
-	    SHLIB_LD="ld -Bshareable -x"
- 	    SHLIB_LD_LIBS=""
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
-@@ -2496,15 +2499,13 @@
- 
- DBGX=${TCLX_DBGX}
- VERSION=$TCLX_VERSION
--eval "TCLX_STLIB_NAME=libtclx${UNSHARED_LIB_SUFFIX}"
--eval "TCLX_SHLIB_NAME=libtclx${SHARED_LIB_SUFFIX}"
--eval "TCLX_SHLIB_NAME=${TCLX_SHLIB_NAME}"
-+TCLX_STLIB_NAME=libtclx83.a
-+TCLX_SHLIB_NAME=libtclx83.so.1
- 
- DBGX=${TKX_DBGX}
- VERSION=$TKX_VERSION
--eval "TKX_STLIB_NAME=libtkx${UNSHARED_LIB_SUFFIX}"
--eval "TKX_SHLIB_NAME=libtkx${SHARED_LIB_SUFFIX}"
--eval "TKX_SHLIB_NAME=${TKX_SHLIB_NAME}"
-+TKX_STLIB_NAME=libtkx83.a
-+TKX_SHLIB_NAME=libtkx83.so.1
- 
- #
- # Determine suffix to use for the object files for the shared library.
-@@ -4793,2 +4794,8 @@
- EOF
-+
-+if /usr/bin/ldd ${prefix}/bin/tclsh$TCL_VERSION | fgrep -qv libtcl; then
-+	TCL_EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS\ -DUSE_TCL_STUBS
-+	NEED_TCL_STUB=$TCL_STUB_LIB_SPEC
-+fi
-+
- cat >> $CONFIG_STATUS <<EOF
-@@ -4831,6 +4832,8 @@
- s%@TCLX_FULL_VERSION@%$TCLX_FULL_VERSION%g
- s%@TKX_VERSION@%$TKX_VERSION%g
- s%@TKX_FULL_VERSION@%$TKX_FULL_VERSION%g
-+s%@TCL_PREFIX@%$TCL_PREFIX%g
-+s%@NEED_TCL_STUB@%$NEED_TCL_STUB%g
- s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g
- s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g
- s%@TCL_LIB_FILE@%$TCL_LIB_FILE%g
-@@ -4851,6 +4853,7 @@
- s%@TCL_STUB_LIB_SPEC@%$TCL_STUB_LIB_SPEC%g
- s%@TCL_LIB_DIR@%$TCL_LIB_DIR%g
- s%@TCL_LIBRARY_DIR@%$TCL_LIBRARY_DIR%g
-+s%@TK_PREFIX@%$TK_PREFIX%g
- s%@TK_BIN_DIR@%$TK_BIN_DIR%g
- s%@TK_SRC_DIR@%$TK_SRC_DIR%g
- s%@TK_LIB_FILE@%$TK_LIB_FILE%g
diff --git a/lang/tclX/files/patch-af b/lang/tclX/files/patch-af
index bab422b04e6e..a9339d197188 100644
--- a/lang/tclX/files/patch-af
+++ b/lang/tclX/files/patch-af
@@ -1,6 +1,7 @@
---- tools/bldmanhelp.tcl.orig	Sun Feb  6 19:54:02 2000
-+++ tools/bldmanhelp.tcl	Thu Feb 24 17:03:26 2000
-@@ -13,6 +13,5 @@
+--- unix/tools/bldmanhelp.tcl	Thu Dec  2 15:33:05 2004
++++ unix/tools/bldmanhelp.tcl	Mon Jun 26 19:51:14 2006
+@@ -12,8 +12,7 @@
+ # The command line is:
  #
 -#   bldmanhelp docdir maninfo helpdir
 +#   bldmanhelp maninfo helpdir
@@ -8,7 +9,9 @@
  # Where:
 -#    o docdir is the directory containing the manual pages.
  #    o maninfo is the path to a file that when sources returns a list of
-@@ -64,5 +63,16 @@
+ #      entries describing manual pages to convert.  Each entry is a list
+@@ -70,15 +69,27 @@
+     global skipSection
  
 -    set stat [catch {
 -        open $manPage
@@ -28,42 +31,38 @@
 +	set stat [catch {open $manPage} fh]
 +    }
      if {$stat != 0} {
-@@ -70,3 +75,3 @@
+         global gotErrors
          set gotErrors 1
 -        puts stderr "can't open \"$manPage\" $fh"
 +        puts stderr "can't open \"$manPage\" $fh. (cwd is [pwd])"
          return
-@@ -75,2 +89,3 @@
+     }
+     while {[gets $fh line] >= 0} {
          switch -glob -- $line {
 +	    {.so man.macros} {}
              .so* {
-@@ -114,3 +119,3 @@
+                 CopyManPage [lindex $line 1] $outFH
+@@ -120,9 +131,8 @@
+ #
  
 -proc GenInputFile {docDir manInfoTbl tmpFile} {
 +proc GenInputFile {manInfoTbl tmpFile} {
  
-@@ -118,3 +123,2 @@
+    set tmpFH [open $tmpFile w]
     set cwd [pwd]
 -   cd $docDir
  
-@@ -132,4 +136,4 @@
- 
--if {[llength $argv] != 4} {
--    puts stderr "wrong # args: bldmanhelp docdir maninfo helpdir brief"
-+if {[llength $argv] != 3} {
-+    puts stderr "wrong # args: bldmanhelp maninfo helpdir brief"
-     exit 1
-@@ -139,9 +143,8 @@
+    foreach ent $manInfoTbl {
+@@ -145,5 +155,4 @@
+ set tmpFile "bldmanhelp.tmp"
  
 -set docDir [lindex $argv 0]
--set manInfoTbl [source [lindex $argv 1]]
--set helpDir [lindex $argv 2]
--set brief [lindex $argv 3]
-+set manInfoTbl [source [lindex $argv 0]]
-+set helpDir [lindex $argv 1]
-+set brief [lindex $argv 2]
+ set manInfoTbl [source [lindex $argv 1]]
+ set helpDir [lindex $argv 2]
+@@ -151,5 +160,5 @@
  
  puts stdout "Begin preprocessing UCB manual files"
 -GenInputFile $docDir $manInfoTbl $tmpFile
 +GenInputFile $manInfoTbl $tmpFile
  
+ buildhelp $helpDir $brief [list $tmpFile]
diff --git a/lang/tclX/files/patch-ag b/lang/tclX/files/patch-ag
deleted file mode 100644
index 0ec2f3b27e5e..000000000000
--- a/lang/tclX/files/patch-ag
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../tcl/unix/tclXAppInit.c.orig	Sat Feb 19 19:05:30 2005
-+++ ../tcl/unix/tclXAppInit.c	Sat Feb 19 19:05:42 2005
-@@ -19,15 +19,6 @@
- 
- #include "tclExtend.h"
- 
--/*
-- * The following variable is a special hack that insures the tcl
-- * version of matherr() is used when linking against shared libraries.
-- * Even if matherr is not used on this system, there is a dummy version
-- * in libtcl.
-- */
--extern int matherr ();
--int (*tclDummyMathPtr)() = matherr;
--
- 
- /*-----------------------------------------------------------------------------
-  * main --
diff --git a/lang/tclX/files/patch-ah b/lang/tclX/files/patch-ah
deleted file mode 100644
index 4fa51723eabf..000000000000
--- a/lang/tclX/files/patch-ah
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../tk/unix/tkXAppInit.c.orig	Sat Feb 19 19:06:15 2005
-+++ ../tk/unix/tkXAppInit.c	Sat Feb 19 19:06:22 2005
-@@ -21,15 +21,6 @@
- #include "tclExtend.h"
- #include "tk.h"
- 
--/*
-- * The following variable is a special hack that insures the tcl
-- * version of matherr() is used when linking against shared libraries
-- * Even if matherr is not used on this system, there is a dummy version
-- * in libtcl.
-- */
--extern int matherr ();
--int (*tclDummyMathPtr)() = matherr;
--
- 
- /*-----------------------------------------------------------------------------
-  * main --
diff --git a/lang/tclX/files/patch-siginfo b/lang/tclX/files/patch-siginfo
new file mode 100644
index 000000000000..5af68c35bc95
--- /dev/null
+++ b/lang/tclX/files/patch-siginfo
@@ -0,0 +1,14 @@
+Add BSD-specific signal SIGINFO to the list.
+
+	-mi
+
+--- generic/tclXsignal.c	Thu Feb  3 20:34:01 2005
++++ generic/tclXsignal.c	Mon Jun 26 20:46:11 2006
+@@ -172,4 +172,7 @@
+     {"XFSZ",    SIGXFSZ},
+ #endif
++#ifdef SIGINFO
++    {"INFO",	SIGINFO},
++#endif
+     {NULL,         -1}};
+ 
diff --git a/lang/tclX/files/patch-tclXdebug b/lang/tclX/files/patch-tclXdebug
deleted file mode 100644
index 6e9d918ff2ec..000000000000
--- a/lang/tclX/files/patch-tclXdebug
+++ /dev/null
@@ -1,141 +0,0 @@
---- ../tcl/generic/tclXdebug.c	Wed Mar 31 01:37:43 1999
-+++ ../tcl/generic/tclXdebug.c	Mon Jul 18 23:18:20 2005
-@@ -48,11 +48,12 @@
- static void
- PrintStr _ANSI_ARGS_((Tcl_Channel  channel,
--                      char        *string,
--                      int          numChars,
-+                      const char  *string,
-+                      size_t       strLen,
-+                      size_t       numChars,
-                       int          quoted));
- 
- static void
- PrintArg _ANSI_ARGS_((Tcl_Channel  channel,
--                      char        *argStr,
-+                      const char  *argStr,
-                       int          noTruncate));
- 
-@@ -60,7 +61,7 @@
- TraceCode  _ANSI_ARGS_((traceInfo_pt infoPtr,
-                         int          level,
--                        char        *command,
-+                        const char  *command,
-                         int          argc,
--                        char       **argv));
-+                        const char  * const *argv));
- 
- static int
-@@ -73,7 +74,7 @@
-                            traceInfo_pt  infoPtr,
-                            int           level,
--                           char         *command,
-+                           const char   *command,
-                            int           argc,
--                           char        **argv));
-+                           const char   * const *argv));
- 
- static void
-@@ -81,9 +82,9 @@
-                              Tcl_Interp   *interp,
-                              int           level,
--                             char         *command,
-+                             const char   *command,
-                              Tcl_CmdProc  *cmdProc,
-                              ClientData    cmdClientData,
-                              int           argc,
--                             char        **argv));
-+                             const char   * const *argv));
- 
- static int
-@@ -132,8 +133,8 @@
-  */
- static void
--PrintStr (channel, string, numChars, quoted)
-+PrintStr (channel, string, strLen, numChars, quoted)
-     Tcl_Channel  channel;
--    char        *string;
--    int          numChars;
-+    const char  *string;
-+    size_t       strLen, numChars;
-     int          quoted;
- {
-@@ -149,5 +150,5 @@
-         }
-     }
--    if (numChars < (int) strlen (string))
-+    if (numChars < strLen)
-         Tcl_Write (channel, "...", 3);
-     if (quoted) 
-@@ -166,8 +167,9 @@
- PrintArg (channel, argStr, noTruncate)
-     Tcl_Channel  channel;
--    char        *argStr;
-+    const char  *argStr;
-     int          noTruncate;
- {
--    int idx, argLen, printLen;
-+    int idx;
-+    size_t argLen, printLen;
-     int quoted;
- 
-@@ -185,5 +187,5 @@
-         }
- 
--    PrintStr (channel, argStr, printLen, quoted);
-+    PrintStr (channel, argStr, argLen, printLen, quoted);
- }
- 
-@@ -199,9 +201,10 @@
-     traceInfo_pt infoPtr;
-     int          level;
--    char        *command;
-+    const char  *command;
-     int          argc;
--    char       **argv;
-+    const char  * const *argv;
- {
--    int idx, cmdLen, printLen;
-+    int idx;
-+    size_t strLen, printLen;
-     char buf [32];
- 
-@@ -215,9 +218,13 @@
- 
-     if (infoPtr->noEval) {
--        cmdLen = printLen = strlen (command);
--        if ((!infoPtr->noTruncate) && (printLen > CMD_TRUNCATE_SIZE))
-+        strLen = strlen (command);
-+	if (command[strLen - 1] == '\n')
-+	    --strLen;
-+        if ((!infoPtr->noTruncate) && (strLen > CMD_TRUNCATE_SIZE))
-             printLen = CMD_TRUNCATE_SIZE;
-+	else
-+	    printLen = strLen;
- 
--        PrintStr (infoPtr->channel, command, printLen, FALSE);
-+        PrintStr(infoPtr->channel, command, strLen, printLen, FALSE);
-       } else {
-           for (idx = 0; idx < argc; idx++) {
-@@ -289,7 +296,7 @@
-     traceInfo_pt  infoPtr;
-     int           level;
--    char         *command;
-+    const char   *command;
-     int           argc;
--    char        **argv;
-+    const char   * const *argv;
- {
-     Interp       *iPtr = (Interp *) interp;
-@@ -353,9 +360,9 @@
-     Tcl_Interp   *interp;
-     int           level;
--    char         *command;
-+    const char   *command; /* (almost) same as argv[0] */
-     Tcl_CmdProc  *cmdProc;
-     ClientData    cmdClientData;
-     int           argc;
--    char        **argv;
-+    const char   * const *argv;
- {
-     Interp       *iPtr = (Interp *) interp;
diff --git a/lang/tclX/files/patch-tclXsocket b/lang/tclX/files/patch-tclXsocket
deleted file mode 100644
index 81a07e6bbf5f..000000000000
--- a/lang/tclX/files/patch-tclXsocket
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../tcl/generic/tclXsocket.c	Wed Mar 31 01:37:46 1999
-+++ ../tcl/generic/tclXsocket.c	Mon Apr  5 17:14:32 2004
-@@ -166,5 +166,5 @@
-     char *command =    Tcl_GetStringFromObj (objv [0], NULL);
-     char *subCommand = Tcl_GetStringFromObj (objv [1], NULL);
--    char *host       = Tcl_GetStringFromObj (objv [2], NULL);
-+    char *host;
- 
-     if (objc != 3) {
-@@ -173,4 +173,6 @@
-         return NULL;
-     }
-+
-+    host       = Tcl_GetStringFromObj (objv [2], NULL);
- 
-     if (TclXOSInetAtoN (NULL, host, &address) == TCL_OK) {
diff --git a/lang/tclX/files/patch-tclXutil b/lang/tclX/files/patch-tclXutil
deleted file mode 100644
index 46e29738c821..000000000000
--- a/lang/tclX/files/patch-tclXutil
+++ /dev/null
@@ -1,45 +0,0 @@
-There is no need for TclX_WriteStr to exist any more -- Tcl_Write
-will do the same thing if the passed length is negative.
-
-This patch will still let the function into the library (for
-ABI compatibility), but the new compiles will use Tcl_Write
-directly.
-
-TclX_Eval does not do anything to its `string' argument, nor
-do Tcl_Eval or Tcl_EvalFile, that it calls. Constify `string'.
-
-	-mi
-
---- ../tcl/generic/tclExtdInt.h	Sat May 19 12:45:23 2001
-+++ ../tcl/generic/tclExtdInt.h	Mon Jul 18 21:05:47 2005
-@@ -224,5 +224,3 @@
- 
--extern int
--TclX_WriteStr _ANSI_ARGS_((Tcl_Channel  channel,
--                           char        *str));
-+#define TclX_WriteStr(channel, string)	Tcl_Write((channel), (string), -1)
- 
---- ../tcl/generic/tclXutil.c	Sat May 19 12:45:23 2001
-+++ ../tcl/generic/tclXutil.c	Mon Jul 18 21:04:07 2005
-@@ -556,5 +556,5 @@
-     Tcl_Interp  *interp;
-     unsigned     options;
--    char        *string;
-+    const char  *string;
- {
-     Interp      *iPtr = (Interp *) interp;
-@@ -624,4 +624,7 @@
- }
- 
-+#ifdef TclX_WriteStr
-+#	undef TclX_WriteStr
-+#endif
- /*-----------------------------------------------------------------------------
-  * TclX_WriteStr --
-@@ -937,5 +940,5 @@
-     Tcl_DString *joinedPath;
- {
--    char *joinArgv [2];
-+    const char *joinArgv [2];
- 
-     joinArgv [0] = path1;
diff --git a/lang/tclX/files/patch-tcllib b/lang/tclX/files/patch-tcllib
deleted file mode 100644
index f0f84d807313..000000000000
--- a/lang/tclX/files/patch-tcllib
+++ /dev/null
@@ -1,7 +0,0 @@
---- runtcl.in	Tue Jul  6 22:47:14 1999
-+++ runtcl.in	Fri Feb  7 16:45:41 2003
-@@ -3,3 +3,3 @@
- 
--TCL_LIBRARY="@TCL_LIBRARY_DIR@"
-+TCL_LIBRARY="@TCL_LIB_DIR@"
- TCLX_LIBRARY="@TCLX_RUNTIME_DIR@"
diff --git a/lang/tclX/files/patch-tests b/lang/tclX/files/patch-tests
deleted file mode 100644
index f0df8fbbe1ed..000000000000
--- a/lang/tclX/files/patch-tests
+++ /dev/null
@@ -1,7 +0,0 @@
---- ../tk/tests/signal.test	Wed Mar 31 01:37:56 1999
-+++ ../tk/tests/signal.test	Mon Jul 18 20:10:40 2005
-@@ -20,2 +20,4 @@
- 
-+package require Tk
-+
- foreach i [winfo children .] {
diff --git a/lang/tclX/files/patch-tkxshell b/lang/tclX/files/patch-tkxshell
deleted file mode 100644
index 6bc7e5a25b63..000000000000
--- a/lang/tclX/files/patch-tkxshell
+++ /dev/null
@@ -1,25 +0,0 @@
---- ../tk/generic/tkXshell.c	Fri Jun 29 16:55:39 2001
-+++ ../tk/generic/tkXshell.c	Mon Jul 18 22:50:01 2005
-@@ -85,6 +85,8 @@
- extern char *		strrchr _ANSI_ARGS_((CONST char *string, int c));
- #endif
-+#if TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION < 3
- 
- #ifndef TKX_SHELL
-+#endif
- /*
-  * Forward declarations for procedures defined later in this file.
-@@ -142,5 +144,5 @@
- #endif
- #ifdef TKX_SHELL
--    char *msg;
-+    const char *msg;
-     Tcl_Channel errChannel;
-     int argi;
-@@ -248,5 +250,5 @@
-      */
- 
--    args = Tcl_Merge(argc-1, argv+1);
-+    args = Tcl_Merge(argc-1, (const char **)argv+1);
-     Tcl_ExternalToUtfDString(NULL, args, -1, &argString);
-     Tcl_SetVar(interp, "argv", Tcl_DStringValue(&argString), TCL_GLOBAL_ONLY);
diff --git a/lang/tclX/files/patch-uidgid b/lang/tclX/files/patch-uidgid
index 900e7b5b9680..c5ef9187f9de 100644
--- a/lang/tclX/files/patch-uidgid
+++ b/lang/tclX/files/patch-uidgid
@@ -1,5 +1,5 @@
---- ../tcl/unix/tclXunixId.c	Thu Dec  2 22:02:08 1999
-+++ ../tcl/unix/tclXunixId.c	Fri Jan 10 17:36:50 2003
+--- unix/tclXunixId.c	Thu Dec  2 22:02:08 1999
++++ unix/tclXunixId.c	Fri Jan 10 17:36:50 2003
 @@ -41,3 +41,3 @@
  UseridToUsernameResult _ANSI_ARGS_((Tcl_Interp *interp,
 -                                    int         userId));
diff --git a/lang/tclX/files/patch-warnings b/lang/tclX/files/patch-warnings
deleted file mode 100644
index d67b907d4e50..000000000000
--- a/lang/tclX/files/patch-warnings
+++ /dev/null
@@ -1,543 +0,0 @@
---- ../tcl/generic/tclExtend.h	Wed Jun 14 03:48:24 2000
-+++ ../tcl/generic/tclExtend.h	Mon Jul 18 22:39:18 2005
-@@ -101,5 +101,5 @@
- TclX_Eval _ANSI_ARGS_((Tcl_Interp  *interp,
-                        unsigned     options,
--                       char        *cmd));
-+                       const char  *cmd));
- 
- EXTERN int
-@@ -123,7 +123,7 @@
- Tclx_SafeInit _ANSI_ARGS_((Tcl_Interp *interp));
- 
--EXTERN char*
-+EXTERN const char*
- TclX_InitTclStubs _ANSI_ARGS_((Tcl_Interp *interp,
--			       char       *version,
-+			       const char *version,
- 			       int         exact));
- 
-@@ -203,5 +203,5 @@
- TclX_KeyedListGet _ANSI_ARGS_((Tcl_Interp *interp,
-                                Tcl_Obj    *keylPtr,
--                               char       *key,
-+                               const char *key,
-                                Tcl_Obj   **valuePtrPtr));
- 
-@@ -209,5 +209,5 @@
- TclX_KeyedListSet _ANSI_ARGS_((Tcl_Interp *interp,
-                                Tcl_Obj    *keylPtr,
--                               char       *key,
-+                               const char *key,
-                                Tcl_Obj    *valuePtr));
- 
-@@ -215,10 +215,10 @@
- TclX_KeyedListDelete _ANSI_ARGS_((Tcl_Interp *interp,
-                                   Tcl_Obj    *keylPtr,
--                                  char       *key));
-+                                  const char *key));
- 
- EXTERN int
- TclX_KeyedListGetKeys _ANSI_ARGS_((Tcl_Interp *interp,
-                                    Tcl_Obj    *keylPtr,
--                                   char       *key,
-+                                   const char *key,
-                                    Tcl_Obj   **listObjPtrPtr));
- 
---- ../tcl/generic/tclXbsearch.c	Wed Mar 31 01:37:43 1999
-+++ ../tcl/generic/tclXbsearch.c	Mon Apr  5 13:30:43 2004
-@@ -106,7 +106,8 @@
- TclProcKeyCompare (searchCBPtr)
-     binSearchCB_t *searchCBPtr;
- {
--    char *cmdArgv [3], *command, *oldResult;
-+    const char * cmdArgv [3];
-+    char *command;
-     int   result;
- 
-     cmdArgv [0] = searchCBPtr->tclProc;
-@@ -123,15 +120,9 @@
-     if (Tcl_GetIntFromObj (searchCBPtr->interp,
-                            Tcl_GetObjResult (searchCBPtr->interp),
-                            &searchCBPtr->cmpResult) != TCL_OK) {
--        oldResult = Tcl_GetStringFromObj (
--            Tcl_GetObjResult (searchCBPtr->interp), NULL);
--        oldResult = ckstrdup (oldResult);
--
--        Tcl_ResetResult (searchCBPtr->interp);
--        TclX_AppendObjResult (searchCBPtr->interp, "invalid integer \"",
--                              oldResult, "\" returned from compare proc \"",
-+        TclX_AppendObjResult (searchCBPtr->interp,
-+                              "\" returned from compare proc \"",
-                               searchCBPtr->tclProc, "\"", (char *) NULL);
--        ckfree (oldResult);
-         return TCL_ERROR;
-     }
-     Tcl_ResetResult (searchCBPtr->interp);
-@@ -254,3 +254,4 @@ BinSearch (searchCBPtr)
- {
--    off_t middle, high, low;
-+    int   middle;
-+    off_t high, low;
- 
---- ../tcl/generic/tclXdup.c	Wed Mar 31 01:37:43 1999
-+++ ../tcl/generic/tclXdup.c	Mon Jul 18 21:24:59 2005
-@@ -58,5 +58,5 @@
- {
-     Tcl_DString strValues;
--    char *option, *value, **optArgv = NULL;
-+    const char *option, *value, **optArgv = NULL;
-     int optArgc, idx;
- 
-@@ -202,5 +202,5 @@
- {
-     Tcl_Channel newChannel;
--    int bindFnum, fnum;
-+    int fnum;
-     char *srcChannelId, *targetChannelId;
- 
-@@ -214,24 +214,14 @@
-      * a dup.
-      */
--    if (objv [1]->typePtr == Tcl_GetObjType ("int")) {
--        bindFnum = TRUE;
--    } else {
--        srcChannelId = Tcl_GetStringFromObj (objv [1], NULL);
--        if (ISDIGIT (srcChannelId [0])) {
--            if (Tcl_ConvertToType (interp, objv [1],
--                                   Tcl_GetObjType ("int")) != TCL_OK)
--                goto badFnum;
--            bindFnum = TRUE;
--        } else {
--            bindFnum = FALSE;
--        }
--    }
--    if (bindFnum) {
--        if (objc != 2)
--            goto bind2ndArg;
--        if (Tcl_GetIntFromObj (interp, objv [1], &fnum) != TCL_OK)
--            return TCL_ERROR;
-+    if (Tcl_GetIntFromObj(interp, objv [1], &fnum) == TCL_OK) {
-+	if (objc != 2) {
-+	    TclX_AppendObjResult (interp, "the second argument, "
-+		"targetChannelId, is not allowed when binding a "
-+		"file number to a Tcl channel", NULL);
-+	    return TCL_ERROR;
-+	}
-         newChannel = TclXOSBindOpenFile (interp,  fnum);
-     } else {
-+        srcChannelId = Tcl_GetStringFromObj (objv [1], NULL);
-         if (objc > 2) {
-             targetChannelId = Tcl_GetStringFromObj (objv [2], NULL);
-@@ -250,18 +240,4 @@
-                       Tcl_GetChannelName (newChannel), -1);
-     return TCL_OK;
--
--  badFnum:
--    Tcl_ResetResult (interp);
--    TclX_AppendObjResult (interp, "invalid integer file number \"",
--                          Tcl_GetStringFromObj (objv [1], NULL),
--                          "\", expected unsigned integer or Tcl file id",
--                          (char *) NULL);
--    return TCL_ERROR;
--
--  bind2ndArg:
--    TclX_AppendObjResult (interp, "the second argument, targetChannelId, ",
--                          "is not allow when binding a file number to ",
--                          "a Tcl channel", (char *) NULL);
--    return TCL_ERROR;
- }
- 
---- ../tcl/generic/tclXhandles.c	Wed Mar 31 01:37:44 1999
-+++ ../tcl/generic/tclXhandles.c	Fri Jan 10 17:09:53 2003
-@@ -160,3 +160,3 @@
-     int      numNewEntries;
--    int      newSize;
-+    size_t   newSize;
-     
-@@ -170,3 +170,3 @@
-     memcpy (tblHdrPtr->bodyPtr, oldbodyPtr, 
--            (tblHdrPtr->tableSize * tblHdrPtr->entrySize));
-+            (size_t)(tblHdrPtr->tableSize * tblHdrPtr->entrySize));
-     LinkInNewEntries (tblHdrPtr, tblHdrPtr->tableSize, numNewEntries);
-@@ -234,3 +234,3 @@
-     if ((strncmp (tblHdrPtr->handleBase, (char *) handle, 
--             tblHdrPtr->baseLength) != 0) ||
-+             (size_t)tblHdrPtr->baseLength) != 0) ||
-              !TclX_StrToUnsigned (&handle [tblHdrPtr->baseLength], 10, 
-@@ -269,3 +269,3 @@
-     if ((strncmp (tblHdrPtr->handleBase, (char *) handle, 
--                  tblHdrPtr->baseLength) != 0) ||
-+                  (size_t)tblHdrPtr->baseLength) != 0) ||
-         !TclX_StrToUnsigned (&handle [tblHdrPtr->baseLength], 10, 
-@@ -332,3 +332,3 @@
-     tblHdrPtr->bodyPtr =
--        (ubyte_pt) ckalloc (initEntries * tblHdrPtr->entrySize);
-+        (ubyte_pt) ckalloc ((size_t)initEntries * tblHdrPtr->entrySize);
-     LinkInNewEntries (tblHdrPtr, 0, initEntries);
---- ../tcl/generic/tclXkeylist.c	Wed Mar 31 01:37:45 1999
-+++ ../tcl/generic/tclXkeylist.c	Mon Jul 18 22:39:43 2005
-@@ -106,5 +106,5 @@
- static int
- FindKeyedListEntry _ANSI_ARGS_((keylIntObj_t *keylIntPtr,
--                                char         *key,
-+                                const char   *key,
-                                 int          *keyLenPtr,
-                                 char        **nextSubKeyPtr));
-@@ -370,10 +370,11 @@
- FindKeyedListEntry (keylIntPtr, key, keyLenPtr, nextSubKeyPtr)
-     keylIntObj_t *keylIntPtr;
--    char         *key;
-+    const char   *key;
-     int          *keyLenPtr;
-     char        **nextSubKeyPtr;
- {
-     char *keySeparPtr;
--    int keyLen, findIdx;
-+    int   findIdx;
-+    size_t keyLen;
- 
-     keySeparPtr = strchr (key, '.');
-@@ -604,6 +605,5 @@
-     for (idx = 0; idx < keylIntPtr->numEntries; idx++) {
-         entryObjv [0] = 
--            Tcl_NewStringObj (keylIntPtr->entries [idx].key,
--                              strlen (keylIntPtr->entries [idx].key));
-+            Tcl_NewStringObj (keylIntPtr->entries [idx].key, -1);
-         entryObjv [1] = keylIntPtr->entries [idx].valuePtr;
-         listObjv [idx] = Tcl_NewListObj (2, entryObjv);
-@@ -612,5 +612,5 @@
-     tmpListObj = Tcl_NewListObj (keylIntPtr->numEntries, listObjv);
-     listStr = Tcl_GetStringFromObj (tmpListObj, &strLen);
--    keylPtr->bytes = ckbinstrdup (listStr, strLen);
-+    keylPtr->bytes = ckbinstrdup (listStr, (size_t)strLen);
-     keylPtr->length = strLen;
- 
-@@ -660,5 +660,5 @@
-     Tcl_Interp *interp;
-     Tcl_Obj    *keylPtr;
--    char       *key;
-+    const char *key;
-     Tcl_Obj   **valuePtrPtr;
- {
-@@ -715,5 +715,5 @@
-     Tcl_Interp *interp;
-     Tcl_Obj    *keylPtr;
--    char       *key;
-+    const char *key;
-     Tcl_Obj    *valuePtr;
- {
-@@ -744,6 +744,6 @@
-         }
-         keylIntPtr->entries [findIdx].key =
--            (char *) ckalloc (keyLen + 1);
--        strncpy (keylIntPtr->entries [findIdx].key, key, keyLen);
-+            (char *) ckalloc ((size_t)(keyLen + 1));
-+        strncpy (keylIntPtr->entries [findIdx].key, key, (size_t)keyLen);
-         keylIntPtr->entries [findIdx].key [keyLen] = '\0';
-         keylIntPtr->entries [findIdx].valuePtr = valuePtr;
-@@ -783,6 +783,6 @@
-         findIdx = keylIntPtr->numEntries++;
-         keylIntPtr->entries [findIdx].key =
--            (char *) ckalloc (keyLen + 1);
--        strncpy (keylIntPtr->entries [findIdx].key, key, keyLen);
-+            (char *) ckalloc ((size_t)(keyLen + 1));
-+        strncpy (keylIntPtr->entries [findIdx].key, key, (size_t)keyLen);
-         keylIntPtr->entries [findIdx].key [keyLen] = '\0';
-         keylIntPtr->entries [findIdx].valuePtr = newKeylPtr;
-@@ -814,5 +814,5 @@
-     Tcl_Interp *interp;
-     Tcl_Obj    *keylPtr;
--    char       *key;
-+    const char *key;
- {
-     keylIntObj_t *keylIntPtr, *subKeylIntPtr;
-@@ -888,5 +888,5 @@
-     Tcl_Interp *interp;
-     Tcl_Obj    *keylPtr;
--    char       *key;
-+    const char *key;
-     Tcl_Obj   **listObjPtrPtr;
- {
---- ../tcl/generic/tclXlib.c	Wed Oct 24 18:57:02 2001
-+++ ../tcl/generic/tclXlib.c	Mon Jul 18 22:12:59 2005
-@@ -68,3 +68,3 @@
- EvalFilePart _ANSI_ARGS_((Tcl_Interp  *interp,
--                          char        *fileName,
-+                          const char  *fileName,
-                           off_t        offset,
-@@ -87,5 +87,5 @@
-                                   char       *packageName,
--                                  char      **fileNamePtr,
-+                                  Tcl_Obj   **fileNamePtr,
-                                   off_t      *offsetPtr,
--                                  unsigned   *lengthPtr));
-+                                  long       *lengthPtr));
- 
-@@ -159,3 +159,3 @@
-     Tcl_Interp  *interp;
--    char        *fileName;
-+    const char  *fileName;
-     off_t        offset;
-@@ -167,3 +167,4 @@
-     Tcl_DString pathBuf, cmdBuf;
--    char *oldScriptFile, *buf;
-+    Tcl_Obj *oldScriptFile;
-+    char *buf;
-     Tcl_Channel channel = NULL;
-@@ -210,3 +211,3 @@
-     oldScriptFile = iPtr->scriptFile;
--    iPtr->scriptFile = fileName;
-+    iPtr->scriptFile = Tcl_NewStringObj(fileName, -1);
-     result = Tcl_GlobalEval (interp, cmdBuf.string);
-@@ -384,5 +385,5 @@
-     char       *packageName;
--    char      **fileNamePtr;
--    off_t       *offsetPtr;
--    unsigned   *lengthPtr;
-+    Tcl_Obj   **fileNamePtr;
-+    off_t      *offsetPtr;
-+    long       *lengthPtr;
- {
-@@ -414,7 +415,7 @@
-         goto invalidEntry;
--    if (TclX_GetUnsignedFromObj (interp, pkgDataObjv [2], lengthPtr) != TCL_OK)
-+    if (Tcl_GetLongFromObj (interp, pkgDataObjv [2], lengthPtr) != TCL_OK
-+	|| *lengthPtr < 0)
-         goto invalidEntry;
- 
--    *fileNamePtr = Tcl_GetStringFromObj (pkgDataObjv [0], NULL);
--    *fileNamePtr = ckstrdup (*fileNamePtr);
-+    *fileNamePtr = pkgDataObjv[0];
- 
-@@ -455,3 +456,3 @@
-     Tcl_DString  command;
--    char        *result;
-+    const char  *result;
- 
-@@ -540,3 +541,3 @@
-         if ((Tcl_SplitList (interp, lineBuffer.string, &lineArgc,
--                            &lineArgv) != TCL_OK) || (lineArgc < 4))
-+                            (const char ***)&lineArgv) != TCL_OK) || (lineArgc < 4))
-             goto formatError;
-@@ -884,5 +885,6 @@
- {
--    char     *fileName;
-+    Tcl_Obj  *fileNameObj;
-+    const char *fileName;
-     off_t     offset;
--    unsigned  length;
-+    long      length;
-     int       result;
-@@ -894,7 +896,9 @@
-     if (GetPackageIndexEntry (interp, Tcl_GetStringFromObj (objv [1], NULL),
--                              &fileName, &offset, &length) != TCL_OK)
-+                              &fileNameObj, &offset, &length) != TCL_OK)
-         return TCL_ERROR;
- 
-+    fileName = Tcl_GetStringFromObj(fileNameObj, NULL);
-+    Tcl_IncrRefCount(fileNameObj);
-     result = EvalFilePart (interp, fileName, offset, length);
--    ckfree (fileName);
-+    Tcl_DecrRefCount(fileNameObj);
- 
---- ../tcl/generic/tclXlist.c	Sat May 19 12:39:44 2001
-+++ ../tcl/generic/tclXlist.c	Fri Jan 10 18:04:21 2003
-@@ -469,3 +469,3 @@
-             match = (valueLen == patternLen) &&
--                (memcmp (valueStr, patternStr, valueLen) == 0);
-+                (memcmp (valueStr, patternStr, (size_t) patternLen) == 0);
-             break;
-@@ -544,3 +544,3 @@
-         if ((elementLen == checkLen) &&
--            (memcmp (elementStr, checkStr, elementLen) == 0))
-+            (memcmp (elementStr, checkStr, (size_t)elementLen) == 0))
-             break;
---- ../tcl/generic/tclXmath.c	Wed Mar 31 01:37:45 1999
-+++ ../tcl/generic/tclXmath.c	Fri Jan 10 18:05:54 2003
-@@ -308,3 +308,3 @@ TclX_RandomObjCmd (dummy, interp, objc, 
-     } else {
--        int seed;
-+        unsigned int seed;
- 
---- ../tcl/generic/tclXcmdloop.c	Wed Mar 31 01:37:43 1999
-+++ ../tcl/generic/tclXcmdloop.c	Mon Jul 18 20:59:50 2005
-@@ -192,5 +192,5 @@
-     char       *prompt2;
- {
--    char *promptHook, *resultStr;
-+    const char *promptHook, *resultStr;
-     int result, useResult, promptDone = FALSE;
-     Tcl_Channel stdoutChan, stderrChan;
---- ../tcl/generic/tclXfilecmds.c	Wed Mar 31 01:37:43 1999
-+++ ../tcl/generic/tclXfilecmds.c	Mon Jul 18 21:27:01 2005
-@@ -72,5 +72,5 @@
- {
-     Tcl_Channel  channels [2];
--    char        *channelNames [2];
-+    const char  *channelNames[2];
- 
-     if (!((objc == 1) || (objc == 3)))
---- ../tcl/generic/tclXinit.c	Sat Feb  5 12:22:46 2000
-+++ ../tcl/generic/tclXinit.c	Mon Jul 18 22:20:14 2005
-@@ -167,6 +167,6 @@
- #define PROC_ARGC 5
-     Tcl_CmdInfo cmdInfo;
--    char *procArgv[PROC_ARGC+1];
--    char *quick;
-+    const char *procArgv[PROC_ARGC+1];
-+    const char *quick;
-     
-     if (DefineFindInit(interp, &cmdInfo) != TCL_OK) {
-@@ -207,5 +207,5 @@
- {
-     Tcl_DString buffer;
--    char *path;
-+    const char *path;
-     Tcl_Channel chan;
- 
-@@ -266,5 +266,5 @@
-     Tcl_Interp  *interp;
-     int exitCode;
--    char *message, *errorStack, *noDump, *strResult;
-+    const char *message, *errorStack, *noDump, *strResult;
-     Tcl_Channel stdoutChan, stderrChan;
-     Tcl_Obj *savedResult;
-@@ -453,11 +453,11 @@
-  *-----------------------------------------------------------------------------
-  */
--char *
-+const char *
- TclX_InitTclStubs (interp, version, exact)
-     Tcl_Interp *interp;
--    char *version;
-+    const char *version;
-     int exact;
- {
--    char *actualVersion;
-+    const char *actualVersion;
- 
-     actualVersion = Tcl_InitStubs(interp, version, exact);
---- ../tcl/generic/tclXprofile.c	Wed Mar 31 01:37:46 1999
-+++ ../tcl/generic/tclXprofile.c	Mon Jul 18 22:32:38 2005
-@@ -124,5 +124,5 @@
-                                 Tcl_Interp   *interp,
-                                 int           argc,
--                                char        **argv));
-+                                const char  **argv));
- 
- static int
-@@ -263,5 +263,6 @@
-     int idx, newEntry;
-     profEntry_t *scanPtr;
--    char **stackArgv, *stackListPtr;
-+    const char **stackArgv;
-+    char *stackListPtr;
-     Tcl_HashEntry *hashEntryPtr;
-     profDataEntry_t *dataEntryPtr;
-@@ -273,5 +274,5 @@
-      * are skipped.
-      */
--    stackArgv = (char **) ckalloc (sizeof (char *) * infoPtr->stackSize);
-+    stackArgv = (const char **)ckalloc (sizeof (char *) * infoPtr->stackSize);
-     if (infoPtr->evalMode) {
-         for (idx= 0, scanPtr = entryPtr; scanPtr != NULL;
-@@ -525,5 +526,5 @@
-     Tcl_Interp   *interp;
-     int           argc;
--    char        **argv;
-+    const char  **argv;
- {
-     profInfo_t *infoPtr = (profInfo_t *) clientData;
-@@ -796,5 +797,6 @@
-     Tcl_HashSearch searchCookie;
-     profDataEntry_t *dataEntryPtr;
--    char *dataArgv [3], *dataListPtr;
-+    const char *dataArgv[3];
-+    char *dataListPtr;
-     char countBuf [32], realTimeBuf [32], cpuTimeBuf [32];
- 
---- ../tcl/generic/tclXsignal.c	Wed Mar 31 01:37:46 1999
-+++ ../tcl/generic/tclXsignal.c	Mon Jul 18 22:38:35 2005
-@@ -53,5 +53,5 @@
-  * Pointer is used as a quick check of a valid signal number.
-  */
--static char *unknownSignalIdMsg;
-+static const char *unknownSignalIdMsg;
- 
- /*
-@@ -237,5 +237,5 @@
-  * Prototypes of internal functions.
-  */
--static char *
-+static const char *
- GetSignalName _ANSI_ARGS_((int signalNum));
- 
-@@ -346,5 +346,5 @@
-  *-----------------------------------------------------------------------------
-  */
--static char *
-+static const char *
- GetSignalName (signalNum)
-     int signalNum;
-@@ -806,5 +806,5 @@
-      */
-     if (signalTrapCmds [signalNum] == NULL) {
--        char *signalName = GetSignalName (signalNum);
-+        const char *signalName = GetSignalName (signalNum);
- 
-         signalsReceived [signalNum] = 0;
---- ../tcl/generic/tclXshell.c	Wed Jun 14 03:48:24 2000
-+++ ../tcl/generic/tclXshell.c	Mon Jul 18 22:45:08 2005
-@@ -144,5 +144,5 @@
-         goto tclError;
- 
--    tclArgv = Tcl_Merge (argc - optind,  &argv [optind]);
-+    tclArgv = Tcl_Merge (argc - optind,  (const char **)&argv [optind]);
-     if (Tcl_SetVar (interp, "argv", tclArgv,
-                     TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG) == NULL)
-@@ -227,5 +227,5 @@
-     Tcl_Interp *interp;
- {
--    char *evalStr;
-+    const char *evalStr;
- 
-     /* 
---- ../tcl/generic/tclXstring.c	Fri Apr 23 06:00:07 1999
-+++ ../tcl/generic/tclXstring.c	Mon Jul 18 22:46:30 2005
-@@ -212,5 +212,5 @@
-     int strLen, utfLen, first, subLen;
-     int isRange = (int) clientData;
--    char *str, *start, *end;
-+    const char *str, *start, *end;
- 
-     if (objc != 4) {
---- ../doc/Keylist.3	Wed Mar 31 01:37:41 1999
-+++ ../doc/Keylist.3	Mon Jul 18 23:35:57 2005
-@@ -32,5 +32,5 @@
- TclX_KeyedListGet (Tcl_Interp *interp,
-                    Tcl_Obj    *keylPtr,
--                   char       *key,
-+                   const char *key,
-                    Tcl_Obj   **valuePtrPtr);
- 
-@@ -38,5 +38,5 @@
- TclX_KeyedListSet (Tcl_Interp *interp,
-                    Tcl_Obj    *keylPtr,
--                   char       *key,
-+                   const char *key,
-                    Tcl_Obj    *valuePtr);
- 
-@@ -44,10 +44,10 @@
- TclX_KeyedListDelete (Tcl_Interp *interp,
-                       Tcl_Obj    *keylPtr,
--                      char       *key);
-+                      const char *key);
- 
- int
- TclX_KeyedListGetKeys (Tcl_Interp *interp,
-                        Tcl_Obj    *keylPtr,
--                       char       *key,
-+                       const char *key,
-                        Tcl_Obj   **listObjPtrPtr);
-