Changes 8.4.12:

  * Repeated [namespace import] of same command now permitted.
  * ${prefix}/share added to ::tcl_pkgPath on some systems.
  * [exec]'s >> redirection has improved append behavior.
  * [info globals] returned only existing variables.
  * Recognize some Solaris variations of the cp1251 encoding.
  * Addressed [file mkdir] race condition.
  * Support opening >2GB files on RHEL 3.
  * Corrections to $argv formatting when [encoding system] is multibyte.
  * http 2.5.2: Update URL encoding rules to RFC 3986.
  * Fixed issue in recursive file delete with NFS lock files.
  * Stopped crash after use of Tcl_TraceCommand().
  * Win NT/XP: support unicode console.
  * Improved support for Tclkit to set [encoding system].
  * Added Korean timezone abbreviations.
  * Windows: exit codes can now exceed -128..127 range.
  * [load] support on LynxOS.
  * Packages with incorrect index scripts now cause a warning to be logged.
        *** POTENTIAL INCOMPATIBILITY ***
  * [lsearch -regexp] now accepts backrefs in the RE.
  * [selection get] made compatible with OpenOffice.org.
  * Dialog support for widget names containing spaces.
  * Improved Tk window manager event interaction on OS X Aqua.

7 files changed, 57 insertions, 58 deletions

diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index 40a6deec777..e037b4b8916 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2005/11/03 23:09:24 rillig Exp $
+# $NetBSD: Makefile,v 1.53 2006/01/16 14:48:34 adam Exp $
 
 DISTNAME=	tk${TK_VERSION}-src
 PKGNAME=	tk-${TK_VERSION}
-PKGREVISION=	2
 CATEGORIES=	x11 lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 
diff --git a/x11/tk/Makefile.version b/x11/tk/Makefile.version
index 1a92e7f7f81..e58e64d12f6 100644
--- a/x11/tk/Makefile.version
+++ b/x11/tk/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.2 2005/11/03 23:09:24 rillig Exp $
+# $NetBSD: Makefile.version,v 1.3 2006/01/16 14:48:34 adam Exp $
 
-TK_VERSION=	8.4.11
+TK_VERSION=	8.4.12
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index dff02c18242..0b17c6e5030 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.25 2005/11/03 23:09:24 rillig Exp $
+$NetBSD: distinfo,v 1.26 2006/01/16 14:48:34 adam Exp $
 
-SHA1 (tk8.4.11-src.tar.gz) = c05dec9163e6f75787aa2825122d424fc1a1edb6
-RMD160 (tk8.4.11-src.tar.gz) = 71b42c0f0ae5067c23d61a2d852a53fb3c546e2f
-Size (tk8.4.11-src.tar.gz) = 3236334 bytes
-SHA1 (patch-aa) = 7bcdb2cb46599f4aceaf1af9c8415ded45e7c2fd
-SHA1 (patch-ab) = 245a3b852e77fe3ac2870852510eaee1a5210ad1
-SHA1 (patch-ac) = 515869cc0c258aef07d0db090770f20be6d2f06a
-SHA1 (patch-ad) = 3565400245f583fd6a74aedaae27b7491952a0c9
+SHA1 (tk8.4.12-src.tar.gz) = 05e8a82fc4ab9f825b8e7b8cbc917ea9ba31ed5d
+RMD160 (tk8.4.12-src.tar.gz) = b50e4da0bc3914e6339fc537761d550ddcf22330
+Size (tk8.4.12-src.tar.gz) = 3245547 bytes
+SHA1 (patch-aa) = cdb66101f4b87cb2c967f2777f8e7af9c82079cd
+SHA1 (patch-ab) = bab49f0cbf043f7a88351ee0f8f2f7b2584c91d4
+SHA1 (patch-ac) = 24c56d9660e8f6e644d4cc72909befd7eafa9a32
+SHA1 (patch-ad) = f6ea4c2fde0a916f252c30bbc2117a4af8a9f442
 SHA1 (patch-ae) = 2815cb827ee15cbdd979d4866b8a3bcdf453cc54
diff --git a/x11/tk/patches/patch-aa b/x11/tk/patches/patch-aa
index 179e694f4a5..b8592a654f2 100644
--- a/x11/tk/patches/patch-aa
+++ b/x11/tk/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.16 2005/11/03 23:09:24 rillig Exp $
+$NetBSD: patch-aa,v 1.17 2006/01/16 14:48:34 adam Exp $
 
---- unix/Makefile.in.orig	2005-06-29 16:43:10.000000000 +0000
+--- unix/Makefile.in.orig	2005-12-06 03:42:37.000000000 +0100
 +++ unix/Makefile.in
 @@ -93,7 +93,7 @@ HTML_INSTALL_DIR	= $(INSTALL_ROOT)$(HTML
  # The directory containing the Tcl sources and headers appropriate
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.16 2005/11/03 23:09:24 rillig Exp $
  
  # The directory containing the Tcl library archive file appropriate
  # for this version of Tk:
-@@ -194,8 +194,8 @@ SHELL			= /bin/sh
+@@ -209,8 +209,8 @@ TCL_EXE			= @TCLSH_PROG@
  INSTALL_STRIP_PROGRAM   = -s
  INSTALL_STRIP_LIBRARY   = -S -S
  
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.16 2005/11/03 23:09:24 rillig Exp $
  INSTALL_LIBRARY		= ${INSTALL}
  INSTALL_DATA		= ${INSTALL} -m 644
  
-@@ -225,6 +225,7 @@ TK_STUB_LIB_FLAG	= @TK_STUB_LIB_FLAG@
+@@ -233,6 +233,7 @@ TK_STUB_LIB_FLAG	= @TK_STUB_LIB_FLAG@
  #TK_STUB_LIB_FLAG	= -ltkstub
  
  TK_LIB_FILE		= @TK_LIB_FILE@
@@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.16 2005/11/03 23:09:24 rillig Exp $
  #TK_LIB_FILE		= libtk.a
  
  # Generic lib name used in rules that apply to tcl and tk
-@@ -254,7 +255,7 @@ WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11
+@@ -262,7 +263,7 @@ WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11
  # these definitions by hand.
  
  STLIB_LD		= @STLIB_LD@
@@ -39,7 +39,7 @@ $NetBSD: patch-aa,v 1.16 2005/11/03 23:09:24 rillig Exp $
  SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
  TK_SHLIB_LD_EXTRAS	= @TK_SHLIB_LD_EXTRAS@
  
-@@ -301,7 +302,8 @@ XLIB_DIR		= $(TOP_DIR)/xlib
+@@ -309,7 +310,8 @@ XLIB_DIR		= $(TOP_DIR)/xlib
  # should be compressed and linked with softlinks
  MAN_FLAGS               = @MAN_FLAGS@
  
@@ -49,7 +49,7 @@ $NetBSD: patch-aa,v 1.16 2005/11/03 23:09:24 rillig Exp $
  
  CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
  -I${UNIX_DIR} -I${GENERIC_DIR} \
-@@ -471,7 +473,7 @@ DEMOPROGS = browse hello ixset rmt rolod
+@@ -480,7 +482,7 @@ DEMOPROGS = browse hello ixset rmt rolod
  
  all: binaries libraries doc
  
@@ -58,7 +58,7 @@ $NetBSD: patch-aa,v 1.16 2005/11/03 23:09:24 rillig Exp $
  
  libraries:
  
-@@ -483,7 +485,7 @@ doc: $(TOP_DIR)/doc/man.macros
+@@ -492,7 +494,7 @@ doc: $(TOP_DIR)/doc/man.macros
  
  # The following target is configured by autoconf to generate either
  # a shared library or non-shared library for Tk.
@@ -67,36 +67,36 @@ $NetBSD: patch-aa,v 1.16 2005/11/03 23:09:24 rillig Exp $
  	rm -f $@
  	@MAKE_LIB@
  
-@@ -512,8 +514,8 @@ tkLibObjs:
+@@ -521,8 +523,8 @@ tkLibObjs:
  objs: ${OBJS}
  
  
 -wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) @APP_RSRC_FILE@
--	$(CC) $(LDFLAGS) $(WISH_OBJS) \
+-	${CC} ${CFLAGS} ${LDFLAGS} $(WISH_OBJS) @TK_BUILD_LIB_SPEC@ \
 +wish: $(WISH_OBJS) $(TK_LA_FILE) $(TK_STUB_LIB_FILE) @APP_RSRC_FILE@
-+	$(LD) $(LDFLAGS) $(WISH_OBJS) \
- 		@TK_BUILD_LIB_SPEC@ \
++	${LD} ${CFLAGS} ${LDFLAGS} $(WISH_OBJS) @TK_BUILD_LIB_SPEC@ \
  		$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o wish
  
-@@ -527,7 +529,7 @@ tktest: $(TKTEST_OBJS) $(TK_LIB_FILE)
+ # Resetting the LIB_RUNTIME_DIR below is required so that
+@@ -535,7 +537,7 @@ tktest: $(TKTEST_OBJS) $(TK_LIB_FILE)
  	$(MAKE) tktest-real LIB_RUNTIME_DIR=`pwd`:$(TCL_BIN_DIR)
  
  tktest-real:
--	${CC} $(LDFLAGS) $(TKTEST_OBJS) @TK_BUILD_LIB_SPEC@ \
-+	${LD} $(LDFLAGS) $(TKTEST_OBJS) @TK_BUILD_LIB_SPEC@ \
+-	${CC} ${CFLAGS} ${LDFLAGS} $(TKTEST_OBJS) @TK_BUILD_LIB_SPEC@ \
++	${LD} ${CFLAGS} ${LDFLAGS} $(TKTEST_OBJS) @TK_BUILD_LIB_SPEC@ \
  		$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o tktest
  
  # FIXME: This xttest rule seems to be broken in a number of ways.
-@@ -535,7 +537,7 @@ tktest-real:
+@@ -543,7 +545,7 @@ tktest-real:
  # lib location logic from tktest, and it is not clear where this
  # test.o object file comes from.
  xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE)
--	${CC} $(LDFLAGS) test.o tkTest.o tkSquare.o \
-+	${LD} $(LDFLAGS) test.o tkTest.o tkSquare.o \
+-	${CC} ${CFLAGS} ${LDFLAGS} test.o tkTest.o tkSquare.o \
++	${LD} ${CFLAGS} ${LDFLAGS} test.o tkTest.o tkSquare.o \
  		@TK_BUILD_LIB_SPEC@ \
  		$(WISH_LIBS) $(LD_SEARCH_FLAGS) -lXt -o xttest
  
-@@ -605,7 +607,7 @@ install-strip:
+@@ -613,7 +615,7 @@ install-strip:
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab
index 2fa86296bcc..8e7f64b9901 100644
--- a/x11/tk/patches/patch-ab
+++ b/x11/tk/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.22 2005/11/03 23:09:24 rillig Exp $
+$NetBSD: patch-ab,v 1.23 2006/01/16 14:48:34 adam Exp $
 
---- unix/configure.orig	2005-06-29 16:43:10.000000000 +0000
+--- unix/configure.orig	2005-12-06 03:42:37.000000000 +0100
 +++ unix/configure
-@@ -1910,12 +1910,13 @@ fi
+@@ -2007,12 +2007,13 @@ fi
      # Step 3: set configuration options based on system name and version.
  
      do64bit_ok=no
@@ -17,7 +17,7 @@ $NetBSD: patch-ab,v 1.22 2005/11/03 23:09:24 rillig Exp $
      CFLAGS_DEBUG=-g
      CFLAGS_OPTIMIZE=-O
      if test "$GCC" = "yes" ; then
-@@ -2585,7 +2586,6 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -2699,7 +2700,6 @@ if eval "test \"`echo '$ac_cv_header_'$a
    
  		# NetBSD/SPARC needs -fPIC, -fpic will not do.
  		SHLIB_CFLAGS="-fPIC"
@@ -25,7 +25,7 @@ $NetBSD: patch-ab,v 1.22 2005/11/03 23:09:24 rillig Exp $
  		SHLIB_LD_LIBS=""
  		SHLIB_SUFFIX=".so"
  		DL_OBJS="tclLoadDl.o"
-@@ -2606,13 +2606,23 @@ EOF
+@@ -2720,13 +2720,23 @@ EOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    egrep "yes" >/dev/null 2>&1; then
    rm -rf conftest*
@@ -51,7 +51,7 @@ $NetBSD: patch-ab,v 1.22 2005/11/03 23:09:24 rillig Exp $
  fi
  rm -f conftest*
  
-@@ -2699,12 +2709,13 @@ rm -f conftest*
+@@ -2813,12 +2823,13 @@ rm -f conftest*
  	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
  	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
@@ -66,7 +66,7 @@ $NetBSD: patch-ab,v 1.22 2005/11/03 23:09:24 rillig Exp $
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
  	    LDFLAGS="$LDFLAGS -export-dynamic"
-@@ -3521,7 +3532,7 @@ fi
+@@ -3748,7 +3759,7 @@ fi
  		    ;;
  		IRIX*)
  		    ;;
@@ -75,7 +75,7 @@ $NetBSD: patch-ab,v 1.22 2005/11/03 23:09:24 rillig Exp $
  		    ;;
  		Darwin-*)
  		    ;;
-@@ -3539,16 +3550,16 @@ fi
+@@ -3766,16 +3777,16 @@ fi
      fi
  
      if test "$SHARED_LIB_SUFFIX" = "" ; then
@@ -96,7 +96,7 @@ $NetBSD: patch-ab,v 1.22 2005/11/03 23:09:24 rillig Exp $
      else
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
-@@ -5091,7 +5102,11 @@ echo "configure:5089: checking for X11 l
+@@ -5313,7 +5324,11 @@ echo "configure:5311: checking for X11 l
  	for i in $dirs ; do
  	    if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then
  		echo "$ac_t""$i" 1>&6
@@ -109,7 +109,7 @@ $NetBSD: patch-ab,v 1.22 2005/11/03 23:09:24 rillig Exp $
  		x_libraries="$i"
  		break
  	    fi
-@@ -5100,7 +5115,11 @@ echo "configure:5089: checking for X11 l
+@@ -5322,7 +5337,11 @@ echo "configure:5311: checking for X11 l
  	if test "$x_libraries" = ""; then
  	    XLIBSW=-lX11
  	else
@@ -122,7 +122,7 @@ $NetBSD: patch-ab,v 1.22 2005/11/03 23:09:24 rillig Exp $
  	fi
      fi
      if test "$XLIBSW" = nope ; then
-@@ -5172,6 +5191,10 @@ if test "x${x_libraries}" != "x"; then
+@@ -5394,6 +5413,10 @@ if test "x${x_libraries}" != "x"; then
  fi
  if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
      LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
@@ -133,7 +133,7 @@ $NetBSD: patch-ab,v 1.22 2005/11/03 23:09:24 rillig Exp $
  fi
  
  # The statement below is very tricky!  It actually *evaluates* the
-@@ -5823,11 +5846,18 @@ else
+@@ -5927,11 +5950,18 @@ else
      if test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then
          if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
              eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"
diff --git a/x11/tk/patches/patch-ac b/x11/tk/patches/patch-ac
index e137acd61fe..c4d10787708 100644
--- a/x11/tk/patches/patch-ac
+++ b/x11/tk/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.12 2005/11/03 23:09:24 rillig Exp $
+$NetBSD: patch-ac,v 1.13 2006/01/16 14:48:35 adam Exp $
 
---- unix/tcl.m4.orig	2005-06-29 16:43:10.000000000 +0000
+--- unix/tcl.m4.orig	2005-12-06 03:42:37.000000000 +0100
 +++ unix/tcl.m4
-@@ -866,6 +866,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
+@@ -900,6 +900,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
      # Step 3: set configuration options based on system name and version.
  
      do64bit_ok=no
@@ -10,7 +10,7 @@ $NetBSD: patch-ac,v 1.12 2005/11/03 23:09:24 rillig Exp $
      LDFLAGS_ORIG="$LDFLAGS"
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
-@@ -1108,6 +1109,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1147,6 +1148,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    DL_LIBS=""
  	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.12 2005/11/03 23:09:24 rillig Exp $
  	    ;;
  	IRIX-6.*)
  	    SHLIB_CFLAGS=""
-@@ -1133,6 +1137,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1172,6 +1176,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  		esac
  		LDFLAGS="$LDFLAGS -n32"
  	    fi
@@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.12 2005/11/03 23:09:24 rillig Exp $
  	    ;;
  	IRIX64-6.*)
  	    SHLIB_CFLAGS=""
-@@ -1156,6 +1163,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1195,6 +1202,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  	            LDFLAGS="$LDFLAGS -64"
  	        fi
  	    fi
@@ -40,7 +40,7 @@ $NetBSD: patch-ac,v 1.12 2005/11/03 23:09:24 rillig Exp $
  	    ;;
  	Linux*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -1201,6 +1211,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1240,6 +1250,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    # XIM peeking works under XFree86.
  	    AC_DEFINE(PEEK_XCLOSEIM)
  
@@ -50,7 +50,7 @@ $NetBSD: patch-ac,v 1.12 2005/11/03 23:09:24 rillig Exp $
  	    ;;
  	GNU*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -1248,28 +1261,36 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1299,28 +1312,36 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    LD_SEARCH_FLAGS=""
  	    ;;
  	NetBSD-*|FreeBSD-[[1-2]].*)
@@ -91,7 +91,7 @@ $NetBSD: patch-ac,v 1.12 2005/11/03 23:09:24 rillig Exp $
  	    ], [
  		SHLIB_CFLAGS=""
  		SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
-@@ -1668,6 +1689,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1736,6 +1757,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
  		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
  	    fi
@@ -101,7 +101,7 @@ $NetBSD: patch-ac,v 1.12 2005/11/03 23:09:24 rillig Exp $
  	    ;;
  	ULTRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
-@@ -1847,8 +1871,8 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1915,8 +1939,8 @@ dnl AC_CHECK_TOOL(AR, ar)
  
      if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
          LIB_SUFFIX=${SHARED_LIB_SUFFIX}
@@ -112,7 +112,7 @@ $NetBSD: patch-ac,v 1.12 2005/11/03 23:09:24 rillig Exp $
      else
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
-@@ -1878,10 +1902,10 @@ dnl        esac
+@@ -1946,10 +1970,10 @@ dnl        esac
  
      # Stub lib does not depend on shared/static configuration
      if test "$RANLIB" = "" ; then
diff --git a/x11/tk/patches/patch-ad b/x11/tk/patches/patch-ad
index 4690ec13e6a..8f26a624919 100644
--- a/x11/tk/patches/patch-ad
+++ b/x11/tk/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.7 2005/11/03 23:09:24 rillig Exp $
+$NetBSD: patch-ad,v 1.8 2006/01/16 14:48:35 adam Exp $
 
---- unix/configure.in.orig	2005-06-29 16:43:10.000000000 +0000
+--- unix/configure.in.orig	2005-12-06 03:42:37.000000000 +0100
 +++ unix/configure.in
-@@ -283,6 +283,10 @@ if test "x${x_libraries}" != "x"; then
+@@ -301,6 +301,10 @@ if test "x${x_libraries}" != "x"; then
  fi
  if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
      LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
@@ -13,7 +13,7 @@ $NetBSD: patch-ad,v 1.7 2005/11/03 23:09:24 rillig Exp $
  fi
  
  # The statement below is very tricky!  It actually *evaluates* the
-@@ -466,11 +470,18 @@ else
+@@ -475,11 +479,18 @@ else
      if test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then
          if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
              eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"