tk: updated to 8.6.11

8.6.11:

2019-11-25 (bug)[a95373] TkKeyEvent platform variations (werner)

2019-11-26 (bug) workaround Win bug so test bind-34.3 passes (nijtmans)

2019-12-03 Aqua: white cursors in dark mode (culler)

2019-12-04 (bug)[749bd9] Aqua: systemControlAccentColor (bll,culler)

2019-12-14 (bug)[b3b56a] ttk respect -cursor option (vogel)

2019-12-14 (bug)[b094cb] Win: $tv -show grows widget width 1 pixel (vogel)

2019-12-14 (bug)[02a694] spinbox options used wrong db names (vogel)

2020-01-11 (bug)[2b8fa6] MouseWheel for ttk::scrollbar (oehlmann)

2020-01-18 (bug)[1771594] icursor and scrollregion, canvText-14.7 (vogel)

2020-01-18 (bug)[587937] tag list ops preserve list order (vogel)

2020-01-18 (bug)[2830360] lose invalid state at focus event, entry-10.1 (vogel)

2020-01-18 (bug)[077d49] string table options support null ok (vogel)

2020-01-18 (bug)[bf93d0] Aqua: unresponsive menubar (culler)

2020-01-31 (bug)[a196fb] restore support for unthreaded Tcl (porter,sebres)

2020-02-09 (bug)[90a4d7] fontconfig crash when no font installed (vogel)

2020-02-24 (bug) Aqua: incomplete floating window display (walzer)

2020-03-11 (bug)[fb2ec3] OSX 10.15+: full screen options (nicolas,walzer)

2020-03-12 (bug)[08e2f8] focus on unmapped windows, focus-7.1 (vogel)

2020-03-12 (bug)[2edd84] [$c postscript] result management (gavilan)

2020-03-22 (bug)[98662d] restore TK_MAC_DEBUG_DRAWING build (chavez)

2020-03-29 (bug)[655fe2] tearoff menu redraw artifacts (vogel)

2020-04-03 (bug)[efbedd] Aqua: compund button-like widget appearance (chavez)

2020-04-14 (bug)[87bade] Aqua: improved dealing with PressAndHold (culler)

2020-04-14 (bug)[376788] X: stop crash w/Noto Color Emoji font (nijtmans)

2020-04-15 (bug)[89354d] Aqua: text color w/o clipping (culler)

2020-04-15 (new) Aqua: assign Button 3 to the middle button (chavez)

2020-04-25 (bug)[3519111] treeview horizontal scroll, entry-2.1.1 (vogel)

2020-04-25 (bug)[141881] treeview vertical scroll, treeview-9.2 (vogel)

2020-05-01 (bug)[2712f4] X: crash angled text w/o Xft, canvText-20.2 (vogel)

2020-05-01 (bug)[cd8714] Win: long angled text (chavez)

2020-05-09 (bug)[88c9e0] treeview -selectmode none focus ring (gavilan)

2020-05-12 (new) Aqua: Rewrite of the Key event system (culler)

2020-05-12 (bug)[411359] Aqua: stop crashes/zombies related to TouchBar (culler)

2020-05-12 (new) Aqua: systemLinkColor (chavez)

2020-05-16 (bug)[40ada9] crash when active button is destroyed (chavez)

2020-05-28 (bug)[3c6660,601cea,4b50b7] Win10: ttk scale (nemethi,lanam)

2020-06-08 (bug)[2790615] Some callbacks not eval'd in global scope (nijtmans)

2020-06-25 Aqua: Update OSX version tests to support Big Sur (culler)

2020-06-27 (bug)[6920b2] dup in spinbox -values causes trouble (lanam)

2020-06-27 (bug)[5c51be] invalid mem read buffer in Tk_PhotoPut* (chavez)

2020-06-27 (bug)[16ef16] restore bind sequence support, bind-33.(16-21) (vogel)

2020-07-02 (bug)[2d2459] default style for combobox (bll)

2020-07-06 (bug)[40c4bf] double free, entry-19.21 (vogel)

2020-07-06 (bug)[e3888d] grab & warp, bind-36.1 (vogel)

2020-07-12 (bug)[2442314] fontchooser i18n (nijtmans)

2020-07-13 (bug)[7655f6] [*entry]: selected text drawing reform (chavez)

2020-07-14 (bug)[09abd7] workaround invalid key codes from Debian 10 (vogel)

2020-07-20 (bug)[cf3853] Aqua: improve bounds on non-Retina displays (chavez)

2020-08-01 Aqua: [winfo rgb] light and dark mode support (culler)

2020-08-15 (bug)[315104] Aqua: appearance change virtual events (culler)

2020-08-21 (bug)[291699] mouse binding for scrollbar grip (bll)

2020-09-08 (bug)[6c2425] buffer bounds violation (chavez)

2020-09-08 (bug)[2a6d63] OSX 10.6 crash (hellstrom,culler)

2020-09-08 (bug)[420feb] undefined behavior due to alignment (chavez,nijtmans)

2020-09-10 (bug)[ab1fea] Aqua init issues (culler)

2020-09-14 (bug)[71e18c] Aqua: crash in full screen toggle (culler)

2020-09-18 (bug)[4f4f03] Aqua: mouse drags across title bar (nab,culler)

2020-09-21 (bug)[d91e05] select/copy in disabled text (bll)

2020-09-27 (TIP 581) disfavor Master/Slave terminology (nijtmans)

2020-09-30 (bug)[59cba3] win: improve theme detection (bll,nijtmans)

2020-10-06 (bug)[175a6e] Aqua: support tiled windows (culler)

2020-10-07 (bug)[1fa8c3] Aqua: crash on resize during display (nab,culler)

2020-10-16 (bug)[c2483b] Aqua: consistent finalization (culler,nijtmans)

2020-11-06 (bug)[c9ebac] Aqua: use standard about dialog (culler)

2020-11-07 (bug)[4ebcc0] sticky fontchooser options (roseman,vogel)

2020-11-10 (bug)[f9fa92] Aqua: crash in color caching scheme (culler)

2020-11-20 (bug)[7185d2] Aqua: fixes to special menu support (culler)

2020-11-24 (bug)[4a40c6] Aqua: [wm manage] frame offset (chavez)

2020-12-04 (bug)[3ef77f] Aqua dark mode combobox focus ring (walzer,culler)

2020-12-15 (bug)[80e4c6] Aqua: progressbar animation (nab,culler)

2020-12-24 (bug)[6157a8] Aqua: file dialog -filetypes (davis,culler)

7 files changed, 49 insertions, 49 deletions

diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index 03b19247059..bdc693e5ef2 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.90 2020/12/14 08:46:56 dbj Exp $
+# $NetBSD: Makefile,v 1.91 2021/01/20 20:40:28 adam Exp $
 
 DISTNAME=	tk${TK_VERSION}-src
 PKGNAME=	tk-${TK_VERSION}
-PKGREVISION=	1
 CATEGORIES=	x11 lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 
diff --git a/x11/tk/Makefile.version b/x11/tk/Makefile.version
index 404e016e593..8baf7c74a71 100644
--- a/x11/tk/Makefile.version
+++ b/x11/tk/Makefile.version
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.version,v 1.22 2020/04/16 17:07:07 adam Exp $
+# $NetBSD: Makefile.version,v 1.23 2021/01/20 20:40:28 adam Exp $
 # used by cad/xcircuit/Makefile
 # used by devel/tcl-tclcl/Makefile
 # used by lang/tcl/Makefile
@@ -7,4 +7,4 @@
 
 TK_SONUM=	86
 TK_BASEVER=	8.6
-TK_VERSION=	8.6.10
+TK_VERSION=	8.6.11
diff --git a/x11/tk/PLIST b/x11/tk/PLIST
index dfef89b365f..aa3da8980eb 100644
--- a/x11/tk/PLIST
+++ b/x11/tk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2020/04/16 17:07:07 adam Exp $
+@comment $NetBSD: PLIST,v 1.19 2021/01/20 20:40:28 adam Exp $
 bin/wish
 bin/wish${BASEVER}
 ${PLIST.aqua}include/X11/DECkeysym.h
@@ -363,6 +363,7 @@ man/man3/Tk_GetHINSTANCE.3
 man/man3/Tk_GetHWND.3
 man/man3/Tk_GetImage.3
 man/man3/Tk_GetImageMasterData.3
+man/man3/Tk_GetImageModelData.3
 man/man3/Tk_GetItemTypes.3
 man/man3/Tk_GetJoinStyle.3
 man/man3/Tk_GetJustify.3
diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk
index 4f78582283c..7533604feaa 100644
--- a/x11/tk/buildlink3.mk
+++ b/x11/tk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.39 2020/08/17 20:18:01 leot Exp $
+# $NetBSD: buildlink3.mk,v 1.40 2021/01/20 20:40:28 adam Exp $
 
 BUILDLINK_TREE+=	tk
 
@@ -30,9 +30,9 @@ pkgbase := tk
 .  include "../../x11/libXft/buildlink3.mk"
 .endif
 .if empty(PKG_BUILD_OPTIONS.tk:Maqua)
-. include "../../x11/libX11/buildlink3.mk"
-. include "../../x11/libXext/buildlink3.mk"
-. include "../../x11/libXScrnSaver/buildlink3.mk"
+.  include "../../x11/libX11/buildlink3.mk"
+.  include "../../x11/libXext/buildlink3.mk"
+.  include "../../x11/libXScrnSaver/buildlink3.mk"
 .endif
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index 55abdf1746f..a0767ab3a1f 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.55 2020/04/16 17:07:07 adam Exp $
+$NetBSD: distinfo,v 1.56 2021/01/20 20:40:28 adam Exp $
 
-SHA1 (tk8.6.10-src.tar.gz) = 8f6fb6276e8b82509a2637e7798b7e58da0bd164
-RMD160 (tk8.6.10-src.tar.gz) = 41abb02f092e419a8466a0ce5ee90a49df96704d
-SHA512 (tk8.6.10-src.tar.gz) = d12ef3a5bde9e10209a24e9f978bd23360a979d8fa70a859cf750a79ca51067a11ef6df7589303b52fe2a2baed4083583ddaa19e2c7cb433ea523639927f1be5
-Size (tk8.6.10-src.tar.gz) = 4444764 bytes
-SHA1 (patch-unix_Makefile.in) = 6238796c15a0df653109b74817c153d226c64c21
-SHA1 (patch-unix_configure) = 9186d7dca8a436e8e4ecb90b11c0dca1275646e8
+SHA1 (tk8.6.11-src.tar.gz) = bce8d477fd64f4e626e1fb9bd5a1aeca65bd85cb
+RMD160 (tk8.6.11-src.tar.gz) = 5ddb89a523471b56f8ac7f1be3f1117497801e64
+SHA512 (tk8.6.11-src.tar.gz) = 2e11490f2f51ef7e723661dd91c95622234fb97850e80d8ecd564be8c28f7c8fb0334a97cf8267af9d68f63e4adea887a1a4eec8d2e807d6a970b5912f99d3f2
+Size (tk8.6.11-src.tar.gz) = 4496914 bytes
+SHA1 (patch-unix_Makefile.in) = f97307d551827c845c60e5ed775811a24c21f859
+SHA1 (patch-unix_configure) = af73fbbcba79d237a8c5915a217aeb19a1675fdd
diff --git a/x11/tk/patches/patch-unix_Makefile.in b/x11/tk/patches/patch-unix_Makefile.in
index 75cdf8ab9a3..eac87f7c1da 100644
--- a/x11/tk/patches/patch-unix_Makefile.in
+++ b/x11/tk/patches/patch-unix_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-unix_Makefile.in,v 1.9 2019/06/25 12:06:41 bsiegert Exp $
+$NetBSD: patch-unix_Makefile.in,v 1.10 2021/01/20 20:40:28 adam Exp $
 
 Support MirBSD.
 Honor LDFLAGS.
 Standardize file names.
 
---- unix/Makefile.in.orig	2019-06-24 09:27:45.000000000 +0000
+--- unix/Makefile.in.orig	2020-12-31 01:55:50.000000000 +0000
 +++ unix/Makefile.in
 @@ -14,6 +14,7 @@ MAJOR_VERSION		= @TK_MAJOR_VERSION@
  MINOR_VERSION		= @TK_MINOR_VERSION@
@@ -14,7 +14,7 @@ Standardize file names.
  
  #----------------------------------------------------------------
  # Things you can change to personalize the Makefile for your own
-@@ -64,6 +65,8 @@ SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TK
+@@ -65,6 +66,8 @@ SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TK
  
  # Directory in which to install the include file tk.h:
  INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
@@ -23,16 +23,16 @@ Standardize file names.
  
  # Path to the private tk header dir:
  PRIVATE_INCLUDE_DIR	= @PRIVATE_INCLUDE_DIR@
-@@ -100,7 +103,7 @@ DEMO_INSTALL_DIR	= $(INSTALL_ROOT)$(TK_L
- # The directory containing the Tcl sources and headers appropriate
+@@ -102,7 +105,7 @@ DEMO_INSTALL_DIR	= $(INSTALL_ROOT)$(TK_L
  # for this version of Tk ("srcdir" will be replaced or has already
  # been replaced by the configure script):
--TCL_GENERIC_DIR		= @TCL_SRC_DIR@/generic
+ TCLDIR   = @TCL_SRC_DIR@
+-TCL_GENERIC_DIR		= $(TCLDIR)/generic
 +TCL_GENERIC_DIR		= $(TCL_BIN_DIR)/../include/tcl/generic
  
  # The directory containing the platform specific Tcl sources and headers
  # appropriate for this version of Tk:
-@@ -119,7 +122,7 @@ TK_SHARED_BUILD		= @TK_SHARED_BUILD@
+@@ -121,7 +124,7 @@ TK_SHARED_BUILD		= @TK_SHARED_BUILD@
  # Subdirectory of $(libdir) containing the pkgIndex.tcl file for loadable Tk
  TK_PKG_DIR		= @TK_PKG_DIR@
  
@@ -41,7 +41,7 @@ Standardize file names.
  PKG_INSTALL_DIR		= $(LIB_INSTALL_DIR)/$(TK_PKG_DIR)
  
  # Package index file for loadable Tk
-@@ -137,7 +140,7 @@ CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@
+@@ -139,7 +142,7 @@ CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@
  #CFLAGS			= $(CFLAGS_DEBUG)
  #CFLAGS			= $(CFLAGS_OPTIMIZE)
  #CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
@@ -50,7 +50,7 @@ Standardize file names.
  
  # Flags to pass to the linker
  LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
-@@ -245,6 +248,7 @@ TK_STUB_LIB_FLAG	= @TK_STUB_LIB_FLAG@
+@@ -247,6 +250,7 @@ TK_STUB_LIB_FLAG	= @TK_STUB_LIB_FLAG@
  #TK_STUB_LIB_FLAG	= -ltkstub
  
  TK_LIB_FILE		= @TK_LIB_FILE@
@@ -58,7 +58,7 @@ Standardize file names.
  #TK_LIB_FILE		= libtk.a
  
  # Generic lib name used in rules that apply to tcl and tk
-@@ -276,6 +280,8 @@ SHLIB_LD		= @SHLIB_LD@
+@@ -278,6 +282,8 @@ SHLIB_LD		= @SHLIB_LD@
  SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
  TK_SHLIB_LD_EXTRAS	= @TK_SHLIB_LD_EXTRAS@
  
@@ -67,7 +67,7 @@ Standardize file names.
  # Additional search flags needed to find the various shared libraries
  # at run-time.  The first symbol is for use when creating a binary
  # with cc, and the second is for use when running ld directly.
-@@ -563,6 +569,9 @@ PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(
+@@ -568,6 +574,9 @@ PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(
  
  DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
  
@@ -77,7 +77,7 @@ Standardize file names.
  SHELL_ENV = \
  	@LD_LIBRARY_PATH_VAR@="`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}"; \
  	export @LD_LIBRARY_PATH_VAR@; \
-@@ -586,6 +595,11 @@ ${LIB_FILE}: ${STUB_LIB_FILE} @LIB_RSRC_
+@@ -591,6 +600,11 @@ ${LIB_FILE}: ${STUB_LIB_FILE} @LIB_RSRC_
  	rm -f $@
  	@MAKE_LIB@
  
@@ -89,7 +89,7 @@ Standardize file names.
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	@if test "x${LIB_FILE}" = "xlibtk${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \
  	    (cd ${TOP_DIR}/win; ${MAKE} tk${MAJOR_VERSION}${MINOR_VERSION}.dll); \
-@@ -710,7 +724,7 @@ install-strip:
+@@ -715,7 +729,7 @@ install-strip:
  		INSTALL_PROGRAM="$(INSTALL_PROGRAM) ${INSTALL_STRIP_PROGRAM}" \
  		INSTALL_LIBRARY="$(INSTALL_LIBRARY) ${INSTALL_STRIP_LIBRARY}"
  
@@ -98,7 +98,7 @@ Standardize file names.
  	@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \
  	    "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \
  	    do \
-@@ -740,7 +754,13 @@ install-binaries: $(TK_STUB_LIB_FILE) $(
+@@ -745,7 +759,13 @@ install-binaries: $(TK_STUB_LIB_FILE) $(
  	    fi
  	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
  	@@INSTALL_LIB@
@@ -113,7 +113,7 @@ Standardize file names.
  	@if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \
  	    $(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\
  	    chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\
-@@ -749,6 +769,7 @@ install-binaries: $(TK_STUB_LIB_FILE) $(
+@@ -754,6 +774,7 @@ install-binaries: $(TK_STUB_LIB_FILE) $(
  	fi
  	@echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
  	@$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
@@ -121,7 +121,7 @@ Standardize file names.
  	@echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/"
  	@$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)/tkConfig.sh"
  	@if test "$(STUB_LIB_FILE)" != "" ; then \
-@@ -856,7 +877,7 @@ install-doc:
+@@ -861,7 +882,7 @@ install-doc:
  install-headers:
  	@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
  	    XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
@@ -130,7 +130,7 @@ Standardize file names.
  	    do \
  	    if [ -n "$$i" -a ! -d "$$i" ] ; then \
  		echo "Making directory $$i"; \
-@@ -865,9 +886,12 @@ install-headers:
+@@ -870,9 +891,12 @@ install-headers:
  		fi; \
  	    done;
  	@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
diff --git a/x11/tk/patches/patch-unix_configure b/x11/tk/patches/patch-unix_configure
index f26cf73767c..2a0e328bd56 100644
--- a/x11/tk/patches/patch-unix_configure
+++ b/x11/tk/patches/patch-unix_configure
@@ -1,12 +1,12 @@
-$NetBSD: patch-unix_configure,v 1.15 2019/06/27 09:33:27 jperkin Exp $
+$NetBSD: patch-unix_configure,v 1.16 2021/01/20 20:40:28 adam Exp $
 
 Support MirBSD.
 Honor LDFLAGS.
 Standardize file names.
 
---- unix/configure.orig	2018-11-16 19:02:48.000000000 +0000
+--- unix/configure.orig	2020-12-31 01:55:50.000000000 +0000
 +++ unix/configure
-@@ -4391,10 +4391,10 @@ fi
+@@ -4377,10 +4377,10 @@ fi
      # LDFLAGS_ARCH so they eventually end up in LDFLAGS even if [load]
      # is disabled by the user. [Bug 1016796]
      LDFLAGS_ARCH=""
@@ -19,7 +19,7 @@ Standardize file names.
      CFLAGS_DEBUG=-g
      if test "$GCC" = yes; then
  
-@@ -5357,7 +5357,7 @@ fi
+@@ -5343,7 +5343,7 @@ fi
  	    CC_SEARCH_FLAGS=""
  	    LD_SEARCH_FLAGS=""
  	    ;;
@@ -28,7 +28,7 @@ Standardize file names.
  	    arch=`arch -s`
  	    case "$arch" in
  	    alpha|sparc64)
-@@ -5378,7 +5378,7 @@ fi
+@@ -5364,7 +5364,7 @@ fi
  
  	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
@@ -37,7 +37,7 @@ Standardize file names.
  	    CFLAGS_OPTIMIZE="-O2"
  	    if test "${TCL_THREADS}" = "1"; then
  
-@@ -5396,11 +5396,10 @@ fi
+@@ -5382,11 +5382,10 @@ fi
  	NetBSD-*)
  	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
  	    SHLIB_CFLAGS="-fPIC"
@@ -49,8 +49,8 @@ Standardize file names.
 -	    LDFLAGS="$LDFLAGS -export-dynamic"
  	    if test $doRpath = yes; then
  
- 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-@@ -6646,12 +6645,12 @@ fi
+ 		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
+@@ -6625,12 +6624,12 @@ fi
  
      if test "$SHARED_LIB_SUFFIX" = ""; then
  
@@ -65,7 +65,7 @@ Standardize file names.
  fi
  
      DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)"
-@@ -6667,8 +6666,11 @@ fi
+@@ -6646,8 +6645,11 @@ fi
  
  else
  
@@ -79,7 +79,7 @@ Standardize file names.
  fi
  
  
-@@ -6702,7 +6704,7 @@ else
+@@ -6681,7 +6683,7 @@ else
  
  fi
  
@@ -88,7 +88,7 @@ Standardize file names.
  
      # Define TCL_LIBS now that we know what DL_LIBS is.
      # The trick here is that we don't want to change the value of TCL_LIBS if
-@@ -9713,7 +9715,7 @@ echo $ECHO_N "checking for X11 libraries
+@@ -9691,7 +9693,7 @@ echo $ECHO_N "checking for X11 libraries
  	    if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl -o -r $i/libX11.dylib; then
  		echo "$as_me:$LINENO: result: $i" >&5
  echo "${ECHO_T}$i" >&6
@@ -97,7 +97,7 @@ Standardize file names.
  		x_libraries="$i"
  		break
  	    fi
-@@ -9722,7 +9724,7 @@ echo "${ECHO_T}$i" >&6
+@@ -9700,7 +9702,7 @@ echo "${ECHO_T}$i" >&6
  	if test "$x_libraries" = ""; then
  	    XLIBSW=-lX11
  	else
@@ -106,7 +106,7 @@ Standardize file names.
  	fi
      fi
      if test "$XLIBSW" = nope ; then
-@@ -9818,11 +9820,6 @@ fi
+@@ -9796,11 +9798,6 @@ fi
  #	   be replaced by spaces.
  #--------------------------------------------------------------------
  
@@ -118,7 +118,7 @@ Standardize file names.
  if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
      LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
  fi
-@@ -11058,14 +11055,10 @@ else
+@@ -11042,14 +11039,10 @@ else
  	TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
  	TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win ${TK_LIB_FLAG}"
      else
@@ -134,7 +134,7 @@ Standardize file names.
  fi
  
  #--------------------------------------------------------------------
-@@ -11077,11 +11070,7 @@ fi
+@@ -11061,11 +11054,7 @@ fi
  eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
  eval "TK_STUB_LIB_DIR=${libdir}"
  
@@ -147,7 +147,7 @@ Standardize file names.
  
  TK_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_STUB_LIB_FLAG}"
  TK_STUB_LIB_SPEC="-L${TK_STUB_LIB_DIR} ${TK_STUB_LIB_FLAG}"
-@@ -11902,6 +11893,7 @@ s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t
+@@ -11887,6 +11876,7 @@ s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t
  s,@REZ@,$REZ,;t t
  s,@REZ_FLAGS@,$REZ_FLAGS,;t t
  s,@LTLIBOBJS@,$LTLIBOBJS,;t t