From 8cf6a0762af592c48f3a064c6554012c25c7a4d5 Mon Sep 17 00:00:00 2001
From: stu <stu@openbsd.org>
Date: Sun, 22 Sep 2013 10:33:12 +0000
Subject: [PATCH] Update to 8.6.1.

---
 lang/tcl/8.6/Makefile                        | 12 +++---
 lang/tcl/8.6/distinfo                        |  4 +-
 lang/tcl/8.6/patches/patch-library_init_tcl  |  8 ++--
 lang/tcl/8.6/patches/patch-library_tm_tcl    |  8 ++--
 lang/tcl/8.6/patches/patch-tests_binary_test |  8 ++--
 lang/tcl/8.6/patches/patch-unix_Makefile_in  | 42 ++++++++++----------
 lang/tcl/8.6/patches/patch-unix_configure    | 21 ----------
 lang/tcl/8.6/pkg/PLIST                       | 11 ++---
 x11/tk/8.6/Makefile                          | 12 +++---
 x11/tk/8.6/distinfo                          |  4 +-
 x11/tk/8.6/patches/patch-unix_Makefile_in    | 18 ++++-----
 x11/tk/8.6/patches/patch-unix_configure      | 21 ----------
 x11/tk/8.6/pkg/PLIST                         |  3 +-
 13 files changed, 64 insertions(+), 108 deletions(-)
 delete mode 100644 lang/tcl/8.6/patches/patch-unix_configure
 delete mode 100644 x11/tk/8.6/patches/patch-unix_configure

diff --git a/lang/tcl/8.6/Makefile b/lang/tcl/8.6/Makefile
index 56988b176f5..c30d618ee56 100644
--- a/lang/tcl/8.6/Makefile
+++ b/lang/tcl/8.6/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2013/07/16 02:48:45 stu Exp $
+# $OpenBSD: Makefile,v 1.7 2013/09/22 10:33:12 stu Exp $
 
 COMMENT =		Tool Command Language
 
-DISTNAME =		tcl8.6.0
-PKGNAME =		tcl-8.6.0
-REVISION =		3
-SHARED_LIBS =		tcl86 0.0
+DISTNAME =		tcl8.6.1
+PKGNAME =		tcl-8.6.1
+SHARED_LIBS =		tcl86 0.1
 CATEGORIES =		lang lang/tcl
 HOMEPAGE =		http://www.tcl.tk/
 MAINTAINER =		Stuart Cassoff <stwo@users.sourceforge.net>
@@ -16,7 +15,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB =		c m pthread z
 
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=tcl/}
-DISTFILES =		tcl-core8.6.0-src.tar.gz
+DISTFILES =		tcl-core8.6.1-src.tar.gz
 
 MAKE_FLAGS +=		TCL_PACKAGE_PATH='$$(prefix)/lib/tcl' \
 			TCL_LIBRARY='$$(prefix)/lib/tcl/tcl$$(VERSION)'
@@ -48,7 +47,6 @@ ALL_TARGET =		binaries libtcl86.a
 CONFIGURE_ARGS +=	EXTRA_INSTALL_BINARIES='@echo "Installing libtcl86.a to $$(LIB_INSTALL_DIR)/" \
 			&& $$(INSTALL_DATA) libtcl86.a $$(LIB_INSTALL_DIR)/libtcl86.a \
 			&& (cd $$(LIB_INSTALL_DIR) ; $$(RANLIB) libtcl86.a)'
-CONFIGURE_ARGS +=	tcl_cv_ld_elf=yes
 .else
 ALL_TARGET =		binaries
 .endif
diff --git a/lang/tcl/8.6/distinfo b/lang/tcl/8.6/distinfo
index 407706a1927..da58eeee36b 100644
--- a/lang/tcl/8.6/distinfo
+++ b/lang/tcl/8.6/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tcl-core8.6.0-src.tar.gz) = xTkVmWuz3doF12X4SLvVURHUS3RAaptnoCBwB4pkWWQ=
-SIZE (tcl-core8.6.0-src.tar.gz) = 5719946
+SHA256 (tcl-core8.6.1-src.tar.gz) = AKJfzXDgvmX4XpljU8KgcX6q9R3FR89uSZuwUlfiB2Q=
+SIZE (tcl-core8.6.1-src.tar.gz) = 5773335
diff --git a/lang/tcl/8.6/patches/patch-library_init_tcl b/lang/tcl/8.6/patches/patch-library_init_tcl
index a70fc41d33c..5c10b5caf7a 100644
--- a/lang/tcl/8.6/patches/patch-library_init_tcl
+++ b/lang/tcl/8.6/patches/patch-library_init_tcl
@@ -1,7 +1,7 @@
-$OpenBSD: patch-library_init_tcl,v 1.1.1.1 2013/02/02 11:15:01 stu Exp $
---- library/init.tcl.orig	Tue May 31 11:03:46 2011
-+++ library/init.tcl	Wed Oct  5 01:55:14 2011
-@@ -51,11 +51,14 @@ namespace eval tcl {
+$OpenBSD: patch-library_init_tcl,v 1.2 2013/09/22 10:33:12 stu Exp $
+--- library/init.tcl.orig	Tue Sep  3 08:47:31 2013
++++ library/init.tcl	Sat Sep  7 08:33:19 2013
+@@ -52,11 +52,14 @@ namespace eval tcl {
  	    lappend ::auto_path $Dir
  	}
      }
diff --git a/lang/tcl/8.6/patches/patch-library_tm_tcl b/lang/tcl/8.6/patches/patch-library_tm_tcl
index 93a3f1ec1f1..c2bc4f9626e 100644
--- a/lang/tcl/8.6/patches/patch-library_tm_tcl
+++ b/lang/tcl/8.6/patches/patch-library_tm_tcl
@@ -1,7 +1,7 @@
-$OpenBSD: patch-library_tm_tcl,v 1.1.1.1 2013/02/02 11:15:01 stu Exp $
---- library/tm.tcl.orig	Thu Feb 16 18:11:40 2012
-+++ library/tm.tcl	Thu Feb 16 23:09:21 2012
-@@ -309,10 +309,13 @@ proc ::tcl::tm::Defaults {} {
+$OpenBSD: patch-library_tm_tcl,v 1.2 2013/09/22 10:33:13 stu Exp $
+--- library/tm.tcl.orig	Tue Sep 17 08:14:11 2013
++++ library/tm.tcl	Tue Sep 17 20:54:45 2013
+@@ -316,10 +316,13 @@ proc ::tcl::tm::Defaults {} {
  
      # Note that we're using [::list], not [list] because [list] means
      # something other than [::list] in this namespace.
diff --git a/lang/tcl/8.6/patches/patch-tests_binary_test b/lang/tcl/8.6/patches/patch-tests_binary_test
index faa933e0684..98d51c99c18 100644
--- a/lang/tcl/8.6/patches/patch-tests_binary_test
+++ b/lang/tcl/8.6/patches/patch-tests_binary_test
@@ -1,7 +1,7 @@
-$OpenBSD: patch-tests_binary_test,v 1.1.1.1 2013/02/02 11:15:01 stu Exp $
---- tests/binary.test.orig	Fri Nov 23 16:36:50 2012
-+++ tests/binary.test	Tue Nov 27 01:49:34 2012
-@@ -2775,7 +2775,7 @@ test binary-75.26 {binary decode uuencode} -body {
+$OpenBSD: patch-tests_binary_test,v 1.2 2013/09/22 10:33:13 stu Exp $
+--- tests/binary.test.orig	Tue Sep 17 08:14:17 2013
++++ tests/binary.test	Tue Sep 17 20:54:45 2013
+@@ -2822,7 +2822,7 @@ test binary-75.26 {binary decode uuencode} -body {
  test binary-76.1 {binary string appending growth algorithm} unix {
      # Create zero-length byte array first
      set f [open /dev/null rb]
diff --git a/lang/tcl/8.6/patches/patch-unix_Makefile_in b/lang/tcl/8.6/patches/patch-unix_Makefile_in
index 662b9b50f57..38698096202 100644
--- a/lang/tcl/8.6/patches/patch-unix_Makefile_in
+++ b/lang/tcl/8.6/patches/patch-unix_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-unix_Makefile_in,v 1.1.1.1 2013/02/02 11:15:01 stu Exp $
---- unix/Makefile.in.orig	Thu Dec 20 10:02:15 2012
-+++ unix/Makefile.in	Sun Jan 27 11:38:28 2013
-@@ -623,6 +623,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+$OpenBSD: patch-unix_Makefile_in,v 1.2 2013/09/22 10:33:13 stu Exp $
+--- unix/Makefile.in.orig	Tue Sep  3 13:39:15 2013
++++ unix/Makefile.in	Sat Sep  7 09:04:12 2013
+@@ -630,6 +630,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f $@
  	@MAKE_STUB_LIB@
  
@@ -12,15 +12,15 @@ $OpenBSD: patch-unix_Makefile_in,v 1.1.1.1 2013/02/02 11:15:01 stu Exp $
  # Make target which outputs the list of the .o contained in the Tcl lib useful
  # to build a single big shared library containing Tcl and other extensions.
  # Used for the Tcl Plugin.  -- dl
-@@ -794,7 +798,6 @@ install-binaries: binaries
- 	fi
+@@ -796,7 +800,6 @@ install-binaries: binaries
+ 	    done;
  	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
  	@@INSTALL_LIB@
 -	@chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
  	@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
  	@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
  	@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
-@@ -809,7 +812,7 @@ install-binaries: binaries
+@@ -811,7 +814,7 @@ install-binaries: binaries
  	@EXTRA_INSTALL_BINARIES@
  	@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/"
  	@$(INSTALL_DATA_DIR) $(LIB_INSTALL_DIR)/pkgconfig
@@ -29,7 +29,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.1.1.1 2013/02/02 11:15:01 stu Exp $
  
  install-libraries: libraries
  	@for i in "$(SCRIPT_INSTALL_DIR)"; \
-@@ -820,7 +823,7 @@ install-libraries: libraries
+@@ -822,7 +825,7 @@ install-libraries: libraries
  		else true; \
  		fi; \
  	    done;
@@ -38,27 +38,27 @@ $OpenBSD: patch-unix_Makefile_in,v 1.1.1.1 2013/02/02 11:15:01 stu Exp $
  	    do \
  	    if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
  		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
-@@ -840,21 +843,21 @@ install-libraries: libraries
+@@ -842,21 +845,21 @@ install-libraries: libraries
  	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
  	    done;
- 	@echo "Installing package http 2.8.5 as a Tcl Module";
--	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.5.tm;
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.6/http-2.8.5.tm;
+ 	@echo "Installing package http 2.8.7 as a Tcl Module";
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.7.tm;
++	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.6/http-2.8.7.tm;
  	@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
  	@for i in $(TOP_DIR)/library/opt/*.tcl ; \
  	    do \
  	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \
  	    done;
- 	@echo "Installing package msgcat 1.5.0 as a Tcl Module";
--	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.0.tm;
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/msgcat-1.5.0.tm;
- 	@echo "Installing package tcltest 2.3.5 as a Tcl Module";
--	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.5.tm;
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/tcltest-2.3.5.tm;
+ 	@echo "Installing package msgcat 1.5.2 as a Tcl Module";
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.2.tm;
++	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/msgcat-1.5.2.tm;
+ 	@echo "Installing package tcltest 2.3.6 as a Tcl Module";
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.6.tm;
++	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/tcltest-2.3.6.tm;
  
- 	@echo "Installing package platform 1.0.10 as a Tcl Module";
--	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.10.tm;
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/platform-1.0.10.tm;
+ 	@echo "Installing package platform 1.0.12 as a Tcl Module";
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.12.tm;
++	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/platform-1.0.12.tm;
  	@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
 -	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm;
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/platform/shell-1.1.4.tm;
diff --git a/lang/tcl/8.6/patches/patch-unix_configure b/lang/tcl/8.6/patches/patch-unix_configure
deleted file mode 100644
index f913eaf2171..00000000000
--- a/lang/tcl/8.6/patches/patch-unix_configure
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-unix_configure,v 1.1 2013/07/06 11:05:30 stu Exp $
---- unix/configure.orig	Wed Dec 19 10:40:38 2012
-+++ unix/configure	Fri Jul  5 17:30:46 2013
-@@ -7794,7 +7794,7 @@ fi
- 	OpenBSD-*)
- 	    arch=`arch -s`
- 	    case "$arch" in
--	    m88k|vax)
-+	    vax)
- 		# Equivalent using configure option --disable-load
- 		# Step 4 will set the necessary variables
- 		DL_OBJS=""
-@@ -7816,7 +7816,7 @@ fi
- 		;;
- 	    esac
- 	    case "$arch" in
--	    m88k|vax)
-+	    vax)
- 		CFLAGS_OPTIMIZE="-O1"
- 		;;
- 	    sh)
diff --git a/lang/tcl/8.6/pkg/PLIST b/lang/tcl/8.6/pkg/PLIST
index ddb98aff348..ab4a84220ea 100644
--- a/lang/tcl/8.6/pkg/PLIST
+++ b/lang/tcl/8.6/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2013/07/09 16:14:20 stu Exp $
+@comment $OpenBSD: PLIST,v 1.3 2013/09/22 10:33:13 stu Exp $
 @option no-default-conflict
 @conflict tcl->=8.6,<8.7
 %%SHARED%%
@@ -526,6 +526,7 @@ lib/tcl/tcl8.6/man/cat3/
 @man lib/tcl/tcl8.6/man/cat3/Tcl_NRCreateCommand.0
 @man lib/tcl/tcl8.6/man/cat3/Tcl_NREvalObj.0
 @man lib/tcl/tcl8.6/man/cat3/Tcl_NREvalObjv.0
+@man lib/tcl/tcl8.6/man/cat3/Tcl_NRExprObj.0
 @man lib/tcl/tcl8.6/man/cat3/Tcl_NewBignumObj.0
 @man lib/tcl/tcl8.6/man/cat3/Tcl_NewBooleanObj.0
 @man lib/tcl/tcl8.6/man/cat3/Tcl_NewByteArrayObj.0
@@ -927,13 +928,13 @@ lib/tcl/tcl8.6/man/catn/
 lib/tcl/tcl8.6/man/license.terms
 lib/tcl/tcl8.6/modules/
 lib/tcl/tcl8.6/modules/8.5/
-lib/tcl/tcl8.6/modules/8.5/msgcat-1.5.0.tm
+lib/tcl/tcl8.6/modules/8.5/msgcat-1.5.2.tm
 lib/tcl/tcl8.6/modules/8.5/platform/
-lib/tcl/tcl8.6/modules/8.5/platform-1.0.10.tm
+lib/tcl/tcl8.6/modules/8.5/platform-1.0.12.tm
 lib/tcl/tcl8.6/modules/8.5/platform/shell-1.1.4.tm
-lib/tcl/tcl8.6/modules/8.5/tcltest-2.3.5.tm
+lib/tcl/tcl8.6/modules/8.5/tcltest-2.3.6.tm
 lib/tcl/tcl8.6/modules/8.6/
-lib/tcl/tcl8.6/modules/8.6/http-2.8.5.tm
+lib/tcl/tcl8.6/modules/8.6/http-2.8.7.tm
 lib/tcl/tcl8.6/msgs/
 lib/tcl/tcl8.6/msgs/af.msg
 lib/tcl/tcl8.6/msgs/af_za.msg
diff --git a/x11/tk/8.6/Makefile b/x11/tk/8.6/Makefile
index 6745f458120..c9a472321f9 100644
--- a/x11/tk/8.6/Makefile
+++ b/x11/tk/8.6/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.4 2013/07/09 16:15:01 stu Exp $
+# $OpenBSD: Makefile,v 1.5 2013/09/22 10:35:44 stu Exp $
 
 COMMENT =		graphical toolkit for Tcl
 
-DISTNAME =		tk8.6.0
-PKGNAME =		tk-8.6.0
-REVISION =		1
-SHARED_LIBS =		tk86 0.0
+DISTNAME =		tk8.6.1
+PKGNAME =		tk-8.6.1
+SHARED_LIBS =		tk86 0.1
 CATEGORIES =		x11 x11/tk
 HOMEPAGE =		http://www.tcl.tk/
 MAINTAINER =		Stuart Cassoff <stwo@users.sourceforge.net>
@@ -17,7 +16,7 @@ WANTLIB =		X11 Xext Xft Xss c m pthread tcl86 z
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=tcl/}
 DISTFILES =		${DISTNAME}-src.tar.gz
 
-LIB_DEPENDS =		tcl->=8.6.0,<8.6.1:lang/tcl/8.6
+LIB_DEPENDS =		tcl->=8.6.1,<8.6.2:lang/tcl/8.6
 
 MAKE_FLAGS +=		TK_LIBRARY='$$(prefix)/lib/tcl/tk$$(VERSION)' \
 			TCL_GENERIC_DIR='$$(GENERIC_DIR)' \
@@ -57,7 +56,6 @@ ALL_TARGET =		all libtk86.a
 CONFIGURE_ARGS +=	EXTRA_INSTALL_BINARIES='@echo "Installing libtk86.a to $$(LIB_INSTALL_DIR)/" \
 			&& $$(INSTALL_DATA) libtk86.a $$(LIB_INSTALL_DIR)/libtk86.a \
 			&& (cd $$(LIB_INSTALL_DIR) ; $$(RANLIB) libtk86.a)'
-CONFIGURE_ARGS +=	tcl_cv_ld_elf=yes
 .endif
 
 TEST_IS_INTERACTIVE =	X11
diff --git a/x11/tk/8.6/distinfo b/x11/tk/8.6/distinfo
index 65949c37b91..669e1abb084 100644
--- a/x11/tk/8.6/distinfo
+++ b/x11/tk/8.6/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tk8.6.0-src.tar.gz) = XHCLK29liRbfWRkLJ3UPoeorwQmSEI4Q+WHAcA8FjeY=
-SIZE (tk8.6.0-src.tar.gz) = 4239836
+SHA256 (tk8.6.1-src.tar.gz) = tpGi6EkHOSkYZl/gOg3rkTZjoCa+0hYhhbSpoUiYFiw=
+SIZE (tk8.6.1-src.tar.gz) = 4244010
diff --git a/x11/tk/8.6/patches/patch-unix_Makefile_in b/x11/tk/8.6/patches/patch-unix_Makefile_in
index 367d1eb29a0..01392418445 100644
--- a/x11/tk/8.6/patches/patch-unix_Makefile_in
+++ b/x11/tk/8.6/patches/patch-unix_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-unix_Makefile_in,v 1.1.1.1 2013/02/02 11:18:09 stu Exp $
---- unix/Makefile.in.orig	Wed Dec 19 10:39:12 2012
-+++ unix/Makefile.in	Sun Jan 27 11:46:55 2013
-@@ -559,6 +559,7 @@ PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDec
+$OpenBSD: patch-unix_Makefile_in,v 1.2 2013/09/22 10:35:45 stu Exp $
+--- unix/Makefile.in.orig	Tue Sep  3 13:38:32 2013
++++ unix/Makefile.in	Sat Sep  7 09:55:16 2013
+@@ -558,6 +558,7 @@ PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDec
  # The private headers we want installed for install-private-headers
  PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \
  	$(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \
@@ -9,7 +9,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.1.1.1 2013/02/02 11:18:09 stu Exp $
  	$(TTK_HDRS) $(@TK_WINDOWINGSYSTEM@_PRIVATE_HDRS)
  
  DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
-@@ -590,6 +591,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+@@ -589,6 +590,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f $@
  	@MAKE_STUB_LIB@
  
@@ -20,7 +20,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.1.1.1 2013/02/02 11:18:09 stu Exp $
  # Build Aqua resource files
  ${TK_RSRC_FILE}: $(AQUA_RESOURCES)
  	rm -f $@
-@@ -741,10 +746,10 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $
+@@ -740,10 +745,10 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $
  	    echo "}";\
  	    fi \
  	    ) > "$(PKG_INDEX)"; \
@@ -32,7 +32,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.1.1.1 2013/02/02 11:18:09 stu 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";\
-@@ -760,7 +765,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $
+@@ -761,7 +766,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $
  	@EXTRA_INSTALL_BINARIES@
  	@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/"
  	@$(INSTALL_DATA_DIR) $(LIB_INSTALL_DIR)/pkgconfig
@@ -41,7 +41,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.1.1.1 2013/02/02 11:18:09 stu Exp $
  
  install-libraries: libraries
  	@for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \
-@@ -815,6 +820,7 @@ install-demos:
+@@ -816,6 +821,7 @@ install-demos:
  	    if [ -f $$i ] ; then \
  		sed -e '3 s|exec wish|exec wish$(VERSION)|' \
  			$$i > "$(DEMO_INSTALL_DIR)"/`basename $$i`; \
@@ -49,7 +49,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.1.1.1 2013/02/02 11:18:09 stu Exp $
  	    fi; \
  	    done;
  	@for i in $(DEMOPROGS); \
-@@ -822,7 +828,7 @@ install-demos:
+@@ -823,7 +829,7 @@ install-demos:
  	    if test $$i = "square"; then \
  	    rm -f  "$(DEMO_INSTALL_DIR)/$$i"; \
  	    else \
diff --git a/x11/tk/8.6/patches/patch-unix_configure b/x11/tk/8.6/patches/patch-unix_configure
deleted file mode 100644
index 1f6848493d2..00000000000
--- a/x11/tk/8.6/patches/patch-unix_configure
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-unix_configure,v 1.1 2013/07/06 11:07:19 stu Exp $
---- unix/configure.orig	Fri Jul  5 18:48:54 2013
-+++ unix/configure	Fri Jul  5 18:49:08 2013
-@@ -5640,7 +5640,7 @@ fi
- 	OpenBSD-*)
- 	    arch=`arch -s`
- 	    case "$arch" in
--	    m88k|vax)
-+	    vax)
- 		# Equivalent using configure option --disable-load
- 		# Step 4 will set the necessary variables
- 		DL_OBJS=""
-@@ -5662,7 +5662,7 @@ fi
- 		;;
- 	    esac
- 	    case "$arch" in
--	    m88k|vax)
-+	    vax)
- 		CFLAGS_OPTIMIZE="-O1"
- 		;;
- 	    sh)
diff --git a/x11/tk/8.6/pkg/PLIST b/x11/tk/8.6/pkg/PLIST
index 435385ef2a4..ea56ffce2ee 100644
--- a/x11/tk/8.6/pkg/PLIST
+++ b/x11/tk/8.6/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2013/07/09 16:15:01 stu Exp $
+@comment $OpenBSD: PLIST,v 1.4 2013/09/22 10:35:45 stu Exp $
 @option no-default-conflict
 @conflict tk->=8.6,<8.7
 %%SHARED%%
@@ -10,6 +10,7 @@ include/tk8.6/tkDecls.h
 include/tk8.6/tkInt.h
 include/tk8.6/tkIntDecls.h
 include/tk8.6/tkIntPlatDecls.h
+include/tk8.6/tkIntXlibDecls.h
 include/tk8.6/tkPlatDecls.h
 include/tk8.6/tkPort.h
 include/tk8.6/tkUnixDefault.h