Changes 8.6.1:

* object-oriented programming support
* a stackless evaluation implementation
and much more besides.

8 files changed, 122 insertions, 87 deletions

diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index cba2da0f955..e225a0cf7b8 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2013/11/02 20:22:02 adam Exp $
+# $NetBSD: Makefile,v 1.77 2014/01/11 14:41:05 adam Exp $
 
 DISTNAME=	tk${TK_VERSION}-src
 PKGNAME=	tk-${TK_VERSION}
@@ -20,8 +20,6 @@ GNU_CONFIGURE=		yes
 CONFIGURE_DIRS=		unix
 BUILD_DIRS=		${CONFIGURE_DIRS}
 CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
-CONFIGURE_ARGS+=	--x-includes=${X11BASE}/include
-CONFIGURE_ARGS+=	--x-libraries=${X11BASE}/lib${LIBABISUFFIX:Q}
 CONFIGURE_ENV+=		LIB_RUNTIME_DIR=${PREFIX}/lib
 PTHREAD_OPTS+=		require
 
@@ -49,6 +47,8 @@ PLIST_SRC=		PLIST
 CONFIGURE_ARGS+=	--enable-aqua
 PLIST_SRC+=		PLIST.aqua
 .else
+CONFIGURE_ARGS+=	--x-includes=${X11BASE}/include
+CONFIGURE_ARGS+=	--x-libraries=${X11BASE}/lib${LIBABISUFFIX:Q}
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .endif
diff --git a/x11/tk/Makefile.version b/x11/tk/Makefile.version
index f9f4dbeba35..4be6e42766d 100644
--- a/x11/tk/Makefile.version
+++ b/x11/tk/Makefile.version
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.version,v 1.12 2013/11/02 20:22:02 adam Exp $
+# $NetBSD: Makefile.version,v 1.13 2014/01/11 14:41:05 adam Exp $
 
-TK_SONUM=	85
-TK_BASEVER=	8.5
-TK_VERSION=	8.5.15
+TK_SONUM=	86
+TK_BASEVER=	8.6
+TK_VERSION=	8.6.1
diff --git a/x11/tk/PLIST b/x11/tk/PLIST
index a58f380e737..f5070d80e36 100644
--- a/x11/tk/PLIST
+++ b/x11/tk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2012/08/21 21:32:34 marino Exp $
+@comment $NetBSD: PLIST,v 1.13 2014/01/11 14:41:05 adam Exp $
 bin/wish
 bin/wish${BASEVER}
 include/tk.h
@@ -6,6 +6,7 @@ include/tk/generic/default.h
 include/tk/generic/ks_names.h
 include/tk/generic/tk.h
 include/tk/generic/tk3d.h
+include/tk/generic/tkBusy.h
 include/tk/generic/tkButton.h
 include/tk/generic/tkCanvas.h
 include/tk/generic/tkColor.h
@@ -13,6 +14,7 @@ include/tk/generic/tkDecls.h
 include/tk/generic/tkEntry.h
 include/tk/generic/tkFileFilter.h
 include/tk/generic/tkFont.h
+include/tk/generic/tkImgPhoto.h
 include/tk/generic/tkInt.h
 include/tk/generic/tkIntDecls.h
 include/tk/generic/tkIntPlatDecls.h
@@ -39,6 +41,7 @@ lib/libtk${SONUM}.a
 lib/libtk${SONUM}.so
 lib/libtk${SONUM}.so.1.0
 lib/libtkstub${SONUM}.a
+lib/pkgconfig/tk.pc
 lib/tk${BASEVER}/bgerror.tcl
 lib/tk${BASEVER}/button.tcl
 lib/tk${BASEVER}/choosedir.tcl
@@ -67,6 +70,7 @@ lib/tk${BASEVER}/demos/entry2.tcl
 lib/tk${BASEVER}/demos/entry3.tcl
 lib/tk${BASEVER}/demos/filebox.tcl
 lib/tk${BASEVER}/demos/floor.tcl
+lib/tk${BASEVER}/demos/fontchoose.tcl
 lib/tk${BASEVER}/demos/form.tcl
 lib/tk${BASEVER}/demos/goldberg.tcl
 lib/tk${BASEVER}/demos/hello
@@ -76,12 +80,12 @@ lib/tk${BASEVER}/demos/image1.tcl
 lib/tk${BASEVER}/demos/image2.tcl
 lib/tk${BASEVER}/demos/images/earth.gif
 lib/tk${BASEVER}/demos/images/earthris.gif
-lib/tk${BASEVER}/demos/images/face.xbm
 lib/tk${BASEVER}/demos/images/flagdown.xbm
 lib/tk${BASEVER}/demos/images/flagup.xbm
 lib/tk${BASEVER}/demos/images/gray25.xbm
 lib/tk${BASEVER}/demos/images/letters.xbm
 lib/tk${BASEVER}/demos/images/noletter.xbm
+lib/tk${BASEVER}/demos/images/ouster.png
 lib/tk${BASEVER}/demos/images/pattern.xbm
 lib/tk${BASEVER}/demos/images/tcllogo.gif
 lib/tk${BASEVER}/demos/images/teapot.ppm
@@ -130,7 +134,12 @@ lib/tk${BASEVER}/demos/widget
 lib/tk${BASEVER}/dialog.tcl
 lib/tk${BASEVER}/entry.tcl
 lib/tk${BASEVER}/focus.tcl
+lib/tk${BASEVER}/fontchooser.tcl
+lib/tk${BASEVER}/iconlist.tcl
+lib/tk${BASEVER}/icons.tcl
 lib/tk${BASEVER}/images/README
+lib/tk${BASEVER}/images/lamp.png
+lib/tk${BASEVER}/images/lamp.svg
 lib/tk${BASEVER}/images/logo.eps
 lib/tk${BASEVER}/images/logo100.gif
 lib/tk${BASEVER}/images/logo64.gif
@@ -144,6 +153,7 @@ lib/tk${BASEVER}/images/pwrdLogo200.gif
 lib/tk${BASEVER}/images/pwrdLogo75.gif
 lib/tk${BASEVER}/images/tai-ku.gif
 lib/tk${BASEVER}/listbox.tcl
+lib/tk${BASEVER}/megawidget.tcl
 lib/tk${BASEVER}/menu.tcl
 lib/tk${BASEVER}/mkpsenc.tcl
 lib/tk${BASEVER}/msgbox.tcl
@@ -488,6 +498,7 @@ man/mann/bell.n
 man/mann/bind.n
 man/mann/bindtags.n
 man/mann/bitmap.n
+man/mann/busy.n
 man/mann/button.n
 man/mann/canvas.n
 man/mann/checkbutton.n
@@ -500,7 +511,9 @@ man/mann/entry.n
 man/mann/event.n
 man/mann/focus.n
 man/mann/font.n
+man/mann/fontchooser.n
 man/mann/frame.n
+man/mann/geometry.n
 man/mann/grab.n
 man/mann/grid.n
 man/mann/image.n
@@ -508,20 +521,20 @@ man/mann/keysyms.n
 man/mann/label.n
 man/mann/labelframe.n
 man/mann/listbox.n
-man/mann/loadTk.n
 man/mann/lower.n
 man/mann/menu.n
 man/mann/menubutton.n
 man/mann/message.n
 man/mann/option.n
 man/mann/options.n
-man/mann/pack-old.n
 man/mann/pack.n
+man/mann/pack_old.n
 man/mann/panedwindow.n
 man/mann/photo.n
 man/mann/place.n
 man/mann/radiobutton.n
 man/mann/raise.n
+man/mann/safe_loadTk.n
 man/mann/scale.n
 man/mann/scrollbar.n
 man/mann/selection.n
@@ -539,41 +552,45 @@ man/mann/tk_focusNext.n
 man/mann/tk_focusPrev.n
 man/mann/tk_getOpenFile.n
 man/mann/tk_getSaveFile.n
+man/mann/tk_library.n
+man/mann/tk_mac.n
 man/mann/tk_menuBar.n
 man/mann/tk_menuSetFocus.n
 man/mann/tk_messageBox.n
 man/mann/tk_optionMenu.n
+man/mann/tk_patchLevel.n
 man/mann/tk_popup.n
 man/mann/tk_setPalette.n
+man/mann/tk_strictMotif.n
 man/mann/tk_textCopy.n
 man/mann/tk_textCut.n
 man/mann/tk_textPaste.n
+man/mann/tk_version.n
 man/mann/tkerror.n
-man/mann/tkvars.n
 man/mann/tkwait.n
 man/mann/toplevel.n
-man/mann/ttk::button.n
-man/mann/ttk::checkbutton.n
-man/mann/ttk::combobox.n
-man/mann/ttk::entry.n
-man/mann/ttk::frame.n
-man/mann/ttk::intro.n
-man/mann/ttk::label.n
-man/mann/ttk::labelframe.n
-man/mann/ttk::menubutton.n
-man/mann/ttk::notebook.n
-man/mann/ttk::panedwindow.n
-man/mann/ttk::progressbar.n
-man/mann/ttk::radiobutton.n
-man/mann/ttk::scale.n
-man/mann/ttk::scrollbar.n
-man/mann/ttk::separator.n
-man/mann/ttk::sizegrip.n
-man/mann/ttk::spinbox.n
-man/mann/ttk::style.n
-man/mann/ttk::treeview.n
-man/mann/ttk::widget.n
+man/mann/ttk_button.n
+man/mann/ttk_checkbutton.n
+man/mann/ttk_combobox.n
+man/mann/ttk_entry.n
+man/mann/ttk_frame.n
 man/mann/ttk_image.n
+man/mann/ttk_intro.n
+man/mann/ttk_label.n
+man/mann/ttk_labelframe.n
+man/mann/ttk_menubutton.n
+man/mann/ttk_notebook.n
+man/mann/ttk_panedwindow.n
+man/mann/ttk_progressbar.n
+man/mann/ttk_radiobutton.n
+man/mann/ttk_scale.n
+man/mann/ttk_scrollbar.n
+man/mann/ttk_separator.n
+man/mann/ttk_sizegrip.n
+man/mann/ttk_spinbox.n
+man/mann/ttk_style.n
+man/mann/ttk_treeview.n
 man/mann/ttk_vsapi.n
+man/mann/ttk_widget.n
 man/mann/winfo.n
 man/mann/wm.n
diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk
index 9fadc431d04..4636860c5f1 100644
--- a/x11/tk/buildlink3.mk
+++ b/x11/tk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.33 2013/06/06 12:53:41 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.34 2014/01/11 14:41:05 adam Exp $
 
 BUILDLINK_TREE+=	tk
 
@@ -6,16 +6,16 @@ BUILDLINK_TREE+=	tk
 TK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.tk+=	tk>=8.5.7
-BUILDLINK_ABI_DEPENDS.tk+=	tk>=8.5.14nb3
+BUILDLINK_ABI_DEPENDS.tk+=	tk>=8.6.1
 BUILDLINK_PKGSRCDIR.tk?=	../../x11/tk
 
 BUILDLINK_FILES.tk+=	bin/wish*
 #
-# Make "-ltk" and "-ltk8.5" resolve into "-ltk85", so that we don't
+# Make "-ltk" and "-ltk8.6" resolve into "-ltk86", so that we don't
 # need to patch so many Makefiles.
 #
-BUILDLINK_TRANSFORM+=	l:tk:tk85
-BUILDLINK_TRANSFORM+=	l:tk8.5:tk85
+BUILDLINK_TRANSFORM+=	l:tk:tk86
+BUILDLINK_TRANSFORM+=	l:tk8.6:tk86
 
 TKCONFIG_SH?=	${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
 
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index e230dafb1cf..8c85078ed13 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.41 2013/11/02 20:22:02 adam Exp $
+$NetBSD: distinfo,v 1.42 2014/01/11 14:41:05 adam Exp $
 
-SHA1 (tk8.5.15-src.tar.gz) = 11c9e4d94719184a62b6beb19d37e3391b376619
-RMD160 (tk8.5.15-src.tar.gz) = 6f642a13389d02a0a0179a8e156376e31304466d
-Size (tk8.5.15-src.tar.gz) = 4086650 bytes
-SHA1 (patch-unix_Makefile.in) = b428cd131efd9ece3bf6a4a17c829f383f79b835
-SHA1 (patch-unix_configure) = 0bfbb99b11fb8634c5cccb739854775a088dc600
+SHA1 (tk8.6.1-src.tar.gz) = ecfcc20833c04d6890b14a7920a04d16f2123a51
+RMD160 (tk8.6.1-src.tar.gz) = 9176fd2c5e7d36c84141333939e85614d3ba2e11
+Size (tk8.6.1-src.tar.gz) = 4244010 bytes
+SHA1 (patch-macosx_tkMacOSXDraw.c) = 3b45060592b5805b57dcd55234dcd9eaca22c3e0
+SHA1 (patch-unix_Makefile.in) = d4309930f0c62f4712098586d1b763ffea8abbc5
+SHA1 (patch-unix_configure) = 1cc4f07dba9ab1052aa0604fb5e45892de86888e
diff --git a/x11/tk/patches/patch-macosx_tkMacOSXDraw.c b/x11/tk/patches/patch-macosx_tkMacOSXDraw.c
new file mode 100644
index 00000000000..e36d6b41b79
--- /dev/null
+++ b/x11/tk/patches/patch-macosx_tkMacOSXDraw.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-macosx_tkMacOSXDraw.c,v 1.3 2014/01/11 14:41:06 adam Exp $
+
+Fix OS X screen refresh problem.
+
+--- macosx/tkMacOSXDraw.c.orig	2014-01-11 12:56:24.000000000 +0000
++++ macosx/tkMacOSXDraw.c
+@@ -1690,6 +1690,7 @@ TkMacOSXRestoreDrawingContext(
+ {
+     if (dcPtr->context) {
+ 	CGContextSynchronize(dcPtr->context);
++	[[dcPtr->view window] setViewsNeedDisplay:YES];
+ 	[[dcPtr->view window] enableFlushWindow];
+ 	if (dcPtr->focusLocked) {
+ 	    [dcPtr->view unlockFocus];
diff --git a/x11/tk/patches/patch-unix_Makefile.in b/x11/tk/patches/patch-unix_Makefile.in
index d0c12596504..65ff27afcb5 100644
--- a/x11/tk/patches/patch-unix_Makefile.in
+++ b/x11/tk/patches/patch-unix_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
+$NetBSD: patch-unix_Makefile.in,v 1.5 2014/01/11 14:41:06 adam Exp $
 
---- unix/Makefile.in.orig	2013-09-16 16:45:24.000000000 +0000
+--- unix/Makefile.in.orig	2013-09-17 12:25:13.000000000 +0000
 +++ unix/Makefile.in
-@@ -13,6 +13,7 @@ MAJOR_VERSION		= @TK_MAJOR_VERSION@
+@@ -14,6 +14,7 @@ MAJOR_VERSION		= @TK_MAJOR_VERSION@
  MINOR_VERSION		= @TK_MINOR_VERSION@
  PATCH_LEVEL		= @TK_PATCH_LEVEL@
  LOCALES			= @LOCALES@
@@ -10,7 +10,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
  
  #----------------------------------------------------------------
  # Things you can change to personalize the Makefile for your own
-@@ -63,6 +64,8 @@ SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TK
+@@ -64,6 +65,8 @@ SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TK
  
  # Directory in which to install the include file tk.h:
  INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
@@ -19,7 +19,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
  
  # Path to the private tk header dir:
  PRIVATE_INCLUDE_DIR	= @PRIVATE_INCLUDE_DIR@
-@@ -99,7 +102,7 @@ DEMO_INSTALL_DIR	= $(INSTALL_ROOT)$(TK_L
+@@ -100,7 +103,7 @@ DEMO_INSTALL_DIR	= $(INSTALL_ROOT)$(TK_L
  # The directory containing the Tcl sources and headers appropriate
  # for this version of Tk ("srcdir" will be replaced or has already
  # been replaced by the configure script):
@@ -28,7 +28,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
  
  # The directory containing the platform specific Tcl sources and headers
  # appropriate for this version of Tk:
-@@ -136,7 +139,7 @@ CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@
+@@ -137,7 +140,7 @@ CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@
  #CFLAGS			= $(CFLAGS_DEBUG)
  #CFLAGS			= $(CFLAGS_OPTIMIZE)
  #CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
@@ -37,7 +37,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
  
  # Flags to pass to the linker
  LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
-@@ -244,6 +247,7 @@ TK_STUB_LIB_FLAG	= @TK_STUB_LIB_FLAG@
+@@ -245,6 +248,7 @@ TK_STUB_LIB_FLAG	= @TK_STUB_LIB_FLAG@
  #TK_STUB_LIB_FLAG	= -ltkstub
  
  TK_LIB_FILE		= @TK_LIB_FILE@
@@ -45,7 +45,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
  #TK_LIB_FILE		= libtk.a
  
  # Generic lib name used in rules that apply to tcl and tk
-@@ -275,6 +279,8 @@ SHLIB_LD		= @SHLIB_LD@
+@@ -276,6 +280,8 @@ SHLIB_LD		= @SHLIB_LD@
  SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
  TK_SHLIB_LD_EXTRAS	= @TK_SHLIB_LD_EXTRAS@
  
@@ -54,7 +54,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
  # 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.
-@@ -545,6 +551,9 @@ PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(
+@@ -562,6 +568,9 @@ PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(
  
  DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
  
@@ -64,7 +64,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
  SHELL_ENV = \
  	@LD_LIBRARY_PATH_VAR@="`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}"; \
  	export @LD_LIBRARY_PATH_VAR@; \
-@@ -568,6 +577,11 @@ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @L
+@@ -585,6 +594,11 @@ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @L
  	rm -f $@
  	@MAKE_LIB@
  
@@ -76,7 +76,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f $@
  	@MAKE_STUB_LIB@
-@@ -685,7 +699,7 @@ install-strip:
+@@ -713,7 +727,7 @@ install-strip:
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
@@ -85,7 +85,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
  	@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \
  	    "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \
  	    do \
-@@ -715,7 +729,13 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
+@@ -743,7 +757,13 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
  	    fi
  	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
  	@@INSTALL_LIB@
@@ -100,7 +100,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
  	@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";\
-@@ -724,6 +744,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
+@@ -752,6 +772,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
  	fi
  	@echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
  	@$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
@@ -108,7 +108,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
  	@echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/"
  	@$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)/tkConfig.sh"
  	@if test "$(STUB_LIB_FILE)" != "" ; then \
-@@ -828,7 +849,7 @@ install-doc:
+@@ -859,7 +880,7 @@ install-doc:
  install-headers:
  	@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
  	    XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
@@ -117,7 +117,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
  	    do \
  	    if [ -n "$$i" -a ! -d "$$i" ] ; then \
  		echo "Making directory $$i"; \
-@@ -837,9 +858,12 @@ install-headers:
+@@ -868,9 +889,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 ac943b955f1..ce7cea0bf75 100644
--- a/x11/tk/patches/patch-unix_configure
+++ b/x11/tk/patches/patch-unix_configure
@@ -1,21 +1,21 @@
-$NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
+$NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
 
---- unix/configure.orig	2013-09-16 16:45:24.000000000 +0000
+--- unix/configure.orig	2013-09-17 12:25:13.000000000 +0000
 +++ unix/configure
-@@ -4844,10 +4844,10 @@ fi
+@@ -4617,10 +4617,10 @@ fi
      # LDFLAGS_ARCH so they eventually end up in LDFLAGS even if [load]
      # is disabled by the user. [Bug 1016796]
      LDFLAGS_ARCH=""
 -    UNSHARED_LIB_SUFFIX=""
++    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
      TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
      ECHO_VERSION='`echo ${VERSION}`'
 -    TCL_LIB_VERSIONS_OK=ok
 +    TCL_LIB_VERSIONS_OK=nodots
-+    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
      CFLAGS_DEBUG=-g
-     CFLAGS_OPTIMIZE=-O
      if test "$GCC" = yes; then
-@@ -5766,7 +5766,7 @@ fi
+ 
+@@ -5576,7 +5576,7 @@ fi
  	    CC_SEARCH_FLAGS=""
  	    LD_SEARCH_FLAGS=""
  	    ;;
@@ -24,7 +24,7 @@ $NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
  	    arch=`arch -s`
  	    case "$arch" in
  	    vax)
-@@ -5788,7 +5788,7 @@ fi
+@@ -5598,7 +5598,7 @@ fi
  fi
  
  		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
@@ -33,7 +33,7 @@ $NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
  		LDFLAGS="-Wl,-export-dynamic"
  		;;
  	    esac
-@@ -5823,7 +5823,7 @@ fi
+@@ -5633,7 +5633,7 @@ fi
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
@@ -42,25 +42,16 @@ $NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
  	    if test $doRpath = yes; then
  
  		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-@@ -5839,16 +5839,11 @@ fi
- 
+@@ -5650,7 +5650,7 @@ fi
  fi
  
--	    case $system in
--	    FreeBSD-3.*)
--	    	# FreeBSD-3 doesn't handle version numbers with dots.
- 	    	UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
- 	    	SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
- 	    	TCL_LIB_VERSIONS_OK=nodots
--		;;
--	    esac
  	    ;;
 -	FreeBSD-*)
 +	FreeBSD-*|DragonFly-*)
  	    # This configuration from FreeBSD Ports.
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD="${CC} -shared"
-@@ -5874,7 +5869,7 @@ fi
+@@ -5676,7 +5676,7 @@ fi
  	    # Version numbers are dot-stripped by system policy.
  	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
  	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
@@ -69,7 +60,7 @@ $NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
  	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
  	Darwin-*)
-@@ -7052,7 +7047,7 @@ fi
+@@ -6855,7 +6855,7 @@ fi
  	    BSD/OS*) ;;
  	    CYGWIN_*|MINGW32_*) ;;
  	    IRIX*) ;;
@@ -78,7 +69,7 @@ $NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
  	    Darwin-*) ;;
  	    SCO_SV-3.2*) ;;
  	    *) SHLIB_CFLAGS="-fPIC" ;;
-@@ -7062,12 +7057,12 @@ fi
+@@ -6876,12 +6876,12 @@ fi
  
      if test "$SHARED_LIB_SUFFIX" = ""; then
  
@@ -93,7 +84,7 @@ $NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
  fi
  
      DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)"
-@@ -7083,7 +7078,11 @@ fi
+@@ -6897,7 +6897,11 @@ fi
  
  else
  
@@ -106,7 +97,7 @@ $NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
  
  fi
  
-@@ -7117,7 +7116,7 @@ fi
+@@ -6931,7 +6935,7 @@ fi
  else
  
          MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@'
@@ -115,7 +106,7 @@ $NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
  
  fi
  
-@@ -10252,7 +10251,7 @@ echo $ECHO_N "checking for X11 libraries
+@@ -10066,7 +10070,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
@@ -124,7 +115,7 @@ $NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
  		x_libraries="$i"
  		break
  	    fi
-@@ -10261,7 +10260,7 @@ echo "${ECHO_T}$i" >&6
+@@ -10075,7 +10079,7 @@ echo "${ECHO_T}$i" >&6
  	if test "$x_libraries" = ""; then
  	    XLIBSW=-lX11
  	else
@@ -133,7 +124,19 @@ $NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
  	fi
      fi
      if test "$XLIBSW" = nope ; then
-@@ -11446,14 +11445,10 @@ else
+@@ -10171,11 +10175,6 @@ fi
+ #	   be replaced by spaces.
+ #--------------------------------------------------------------------
+ 
+-if test "x${x_libraries}" != "x"; then
+-  if test "x${x_libraries}" != "xNONE"; then
+-    LIB_RUNTIME_DIR="${LIB_RUNTIME_DIR}:${x_libraries}"
+-  fi
+-fi
+ if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
+     LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
+ fi
+@@ -11333,14 +11332,10 @@ else
  	TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
  	TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win ${TK_LIB_FLAG}"
      else
@@ -149,7 +152,7 @@ $NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
  fi
  
  #--------------------------------------------------------------------
-@@ -11465,11 +11460,7 @@ fi
+@@ -11352,11 +11347,7 @@ fi
  eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
  eval "TK_STUB_LIB_DIR=${libdir}"
  
@@ -162,7 +165,7 @@ $NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
  
  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}"
-@@ -12290,6 +12281,7 @@ s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t
+@@ -12177,6 +12168,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