tk: updated to 8.6.9

8.6.9:
* (bug)[aa7679] crash using window after master destroyed
* (bug)[6525e1] encoding leak in tkMacOSXProcessFiles
* (bug)[925262] New option -state for ttk::scale
* (bug)[fa8de7] Crash [ttk::checkbutton .x -variable {}]
* (bug)[382712] Crash in [event generate . <KeyPress>]
* (bug)[657c38] Crash in menu destroy with checkbutton entry
* (bug)[de156e] Deny PRIMARY selection access in safe interps
* (bug)[b68710] Fixes in [text] bindings
* (bug)[e20d5c] Stop failures of textTag-18.1
* (bug)[5d991b] Fortify var traces against deleted vars
* (bug)[1821174] Stop RenderBadPicture X error
* (bug)[502e74] Stop X errors on untrusted connections
* (bug)[71b131] Regression in Tk_DrawChars()
* (bug)[59fccb] menu flaws when empty menubar clicked
* (bug)[7423f9] improved legacy support for [tk_setPalette]
* (bug)[6d5042] enable [tk inactive] on Mac OSX
* (bug)[75d38f] fix touchpad scroll of listbox on win notebook
* (bug)[de01e2] Crash in [$text replace]
* (bug)[6ca257] Fix [wm resizable] on Mac OSX
* (bug)[135696] Crash in [wm transient]
* (bug)[309b42] Improve ttk high-contrast-mode support
* (bug)[1088825] fix frame-2.17,3.9,3.10 on Mac
* (bug)[fabed1] GIF photo support for "deferred clear code"
* (feature) Modern full-screen support on Mac OSX
* (bug)[1875c1] scrollbar on Mac OSX
* (bug)[1ba71a] KeyRelease events on Mac OSX(walzer)
* (bug)[3441086] error message in layout-2
* (bug)[05bd7f] vista theme for combobox
* (bug)[382712] crash in KeyPress event handling
* (bug)[6fcaaa] insertion cursor visibility in ttk::entry
* (bug)[822923] cascade menu indicator color
* (bug)[9658bc] borderwidth calculations on menu items
* (bug)[ca403f] treeview border drawing
* (bug)[4b555a] hang in [$text search -all]
* (new platform) port to system changes in Mac OSX 10.14
* (bug)[6b22d4] [treeview] binding fix

4 files changed, 27 insertions, 46 deletions

diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index 5cacf25d366..05a17706e90 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.83 2018/03/12 11:15:58 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2018/12/09 18:35:44 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 a41358bc81a..a273238014f 100644
--- a/x11/tk/Makefile.version
+++ b/x11/tk/Makefile.version
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.version,v 1.20 2018/02/03 17:53:12 adam Exp $
+# $NetBSD: Makefile.version,v 1.21 2018/12/09 18:35:44 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.8
+TK_VERSION=	8.6.9
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index 3beda52dc41..4f0d39277c1 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.51 2018/02/03 17:53:12 adam Exp $
+$NetBSD: distinfo,v 1.52 2018/12/09 18:35:44 adam Exp $
 
-SHA1 (tk8.6.8-src.tar.gz) = 7d674881bcfda5acb937bea084b10fe271463632
-RMD160 (tk8.6.8-src.tar.gz) = 8a900988a01aa267e8c23681dfab926e36c1caa9
-SHA512 (tk8.6.8-src.tar.gz) = d0d30637b733fb0b0d38461b6d872934c04af422fcdb7ec41a72331b2529cc94414e6f441f95a98642d69505e4f41469847fedd1cbe58bd08cdd818fcabd1db9
-Size (tk8.6.8-src.tar.gz) = 4319854 bytes
+SHA1 (tk8.6.9-src.tar.gz) = 9220739f077e64e974dfd8999d1de1a3b9355b9d
+RMD160 (tk8.6.9-src.tar.gz) = 8df24d99ef5e80e5317001408e1f6921a6998cb9
+SHA512 (tk8.6.9-src.tar.gz) = 654d73aad006e628110057681477b958b7ec0a42287bc78259fb4b84635e7ebe757e69099d66c0c73479bc506ca66fa5baf13f13b0f403d60b2c54fd48a4a686
+Size (tk8.6.9-src.tar.gz) = 4364606 bytes
 SHA1 (patch-unix_Makefile.in) = a94df921cf947918674c6ef26897fc702fd0c9e4
-SHA1 (patch-unix_configure) = ddb550c4226425e1fcaa1fd2e3de5613a0b3c55c
+SHA1 (patch-unix_configure) = 5797adcb5a1fd6b280a212c611d76c11771dc0a4
diff --git a/x11/tk/patches/patch-unix_configure b/x11/tk/patches/patch-unix_configure
index d63e629c3be..282ba0f3d76 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.12 2017/08/25 11:05:33 adam Exp $
+$NetBSD: patch-unix_configure,v 1.13 2018/12/09 18:35:44 adam Exp $
 
-Support MirBSD, DragonFly.
+Support MirBSD.
 Honor LDFLAGS.
 Standardize file names.
 
---- unix/configure.orig	2017-08-09 14:46:03.000000000 +0000
+--- unix/configure.orig	2018-11-16 19:02:48.000000000 +0000
 +++ unix/configure
-@@ -4389,10 +4389,10 @@ fi
+@@ -4391,10 +4391,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
  
-@@ -5355,7 +5355,7 @@ fi
+@@ -5357,7 +5357,7 @@ fi
  	    CC_SEARCH_FLAGS=""
  	    LD_SEARCH_FLAGS=""
  	    ;;
@@ -28,7 +28,7 @@ Standardize file names.
  	    arch=`arch -s`
  	    case "$arch" in
  	    alpha|sparc64)
-@@ -5376,7 +5376,7 @@ fi
+@@ -5378,7 +5378,7 @@ fi
  
  	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
@@ -37,12 +37,12 @@ Standardize file names.
  	    CFLAGS_OPTIMIZE="-O2"
  	    if test "${TCL_THREADS}" = "1"; then
  
-@@ -5394,11 +5394,10 @@ fi
+@@ -5396,11 +5396,10 @@ fi
  	NetBSD-*)
  	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
  	    SHLIB_CFLAGS="-fPIC"
--	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
-+	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS} ${LDFLAGS}'
+-	    SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
++	    SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared ${LDFLAGS}'
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
@@ -50,25 +50,7 @@ Standardize file names.
  	    if test $doRpath = yes; then
  
  		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-@@ -5415,7 +5414,7 @@ fi
- fi
- 
- 	    ;;
--	FreeBSD-*)
-+	FreeBSD-*|DragonFly-*)
- 	    # This configuration from FreeBSD Ports.
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD="${CC} -shared"
-@@ -6623,7 +6622,7 @@ fi
- 	    BSD/OS*) ;;
- 	    CYGWIN_*|MINGW32_*) ;;
- 	    IRIX*) ;;
--	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+	    NetBSD-*|FreeBSD-*|OpenBSD-*|MirBSD-*) ;;
- 	    Darwin-*) ;;
- 	    SCO_SV-3.2*) ;;
- 	    *) SHLIB_CFLAGS="-fPIC" ;;
-@@ -6644,12 +6643,12 @@ fi
+@@ -6646,12 +6645,12 @@ fi
  
      if test "$SHARED_LIB_SUFFIX" = ""; then
  
@@ -83,7 +65,7 @@ Standardize file names.
  fi
  
      DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)"
-@@ -6665,7 +6664,11 @@ fi
+@@ -6667,7 +6666,11 @@ fi
  
  else
  
@@ -96,7 +78,7 @@ Standardize file names.
  
  fi
  
-@@ -6700,7 +6703,7 @@ else
+@@ -6702,7 +6705,7 @@ else
  
  fi
  
@@ -105,7 +87,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
-@@ -9832,7 +9835,7 @@ echo $ECHO_N "checking for X11 libraries
+@@ -9713,7 +9716,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
@@ -114,7 +96,7 @@ Standardize file names.
  		x_libraries="$i"
  		break
  	    fi
-@@ -9841,7 +9844,7 @@ echo "${ECHO_T}$i" >&6
+@@ -9722,7 +9725,7 @@ echo "${ECHO_T}$i" >&6
  	if test "$x_libraries" = ""; then
  	    XLIBSW=-lX11
  	else
@@ -123,7 +105,7 @@ Standardize file names.
  	fi
      fi
      if test "$XLIBSW" = nope ; then
-@@ -9937,11 +9940,6 @@ fi
+@@ -9818,11 +9821,6 @@ fi
  #	   be replaced by spaces.
  #--------------------------------------------------------------------
  
@@ -135,7 +117,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
-@@ -11177,14 +11175,10 @@ else
+@@ -11058,14 +11056,10 @@ else
  	TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
  	TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win ${TK_LIB_FLAG}"
      else
@@ -151,7 +133,7 @@ Standardize file names.
  fi
  
  #--------------------------------------------------------------------
-@@ -11196,11 +11190,7 @@ fi
+@@ -11077,11 +11071,7 @@ fi
  eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
  eval "TK_STUB_LIB_DIR=${libdir}"
  
@@ -164,7 +146,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}"
-@@ -12021,6 +12011,7 @@ s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t
+@@ -11902,6 +11892,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