Update Tcl to 8.5.19.

Changes in 8.5.16

Changed Tcl behavior
- Unicode 7.0 charset (within BMP)
- [scan %E%G%X].
Updated packages
- http 2.7.13
- tcltest 2.3.8
- platform 1.0.13

Changes in 8.5.17

Changed Tcl behavior
- Fixed several I/O bugs introduced in 8.5.16.

Changes in 8.5.18

(none)

Changes in 8.5.19

New global variables
- tcl_platform(engine) TIP440
Changed Tcl behavior
- Update to Unicode 8.0 support.

8 files changed, 84 insertions, 74 deletions

diff --git a/lang/tcl85/Makefile b/lang/tcl85/Makefile
index ccb9ac67bd7..a48782ba400 100644
--- a/lang/tcl85/Makefile
+++ b/lang/tcl85/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2014/03/10 14:20:44 taca Exp $
+# $NetBSD: Makefile,v 1.2 2016/03/03 21:16:46 bsiegert Exp $
 
 DISTNAME=	tcl${TCL_VERSION}-src
 PKGNAME=	tcl-${TCL_VERSION}
-PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 
@@ -40,6 +39,14 @@ SUBST_FILES.tcl-config=	unix/tclConfig.sh
 SUBST_SED.tcl-config+=	-e "s|${WRKSRC}/unix|${PREFIX}/lib|"
 SUBST_SED.tcl-config+=	-e "s|${WRKSRC}|${PREFIX}/include/tcl|"
 
+.if ${OPSYS} == "Darwin"
+PLIST_SUBST+=		SO=dylib
+PLIST_SUBST+=		SO_1_0=1.0.dylib
+.else
+PLIST_SUBST+=		SO=so
+PLIST_SUBST+=		SO_1_0=so.1.0
+.endif
+
 PLIST_SUBST+=		SONUM=${TCL_SONUM}
 PLIST_SUBST+=		BASEVER=${TCL_BASEVER}
 
diff --git a/lang/tcl85/Makefile.version b/lang/tcl85/Makefile.version
index ead01507516..2a91938f57a 100644
--- a/lang/tcl85/Makefile.version
+++ b/lang/tcl85/Makefile.version
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.version,v 1.1 2014/03/10 14:20:44 taca Exp $
+# $NetBSD: Makefile.version,v 1.2 2016/03/03 21:16:46 bsiegert Exp $
 
 TCL_SONUM=	85
 TCL_BASEVER=	8.5
-TCL_VERSION=	8.5.15
+TCL_VERSION=	8.5.19
diff --git a/lang/tcl85/PLIST b/lang/tcl85/PLIST
index 37dd28b2f24..bbdf8660ca7 100644
--- a/lang/tcl85/PLIST
+++ b/lang/tcl85/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2014/03/10 14:20:44 taca Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/03/03 21:16:46 bsiegert Exp $
 bin/tclsh
 bin/tclsh${BASEVER}
 include/tcl.h
@@ -26,9 +26,10 @@ include/tcl/unix/tclUnixThrd.h
 include/tclDecls.h
 include/tclPlatDecls.h
 lib/libtcl${SONUM}.a
-lib/libtcl${SONUM}.so
-lib/libtcl${SONUM}.so.1.0
+lib/libtcl${SONUM}.${SO}
+lib/libtcl${SONUM}.${SO_1_0}
 lib/libtclstub${SONUM}.a
+lib/pkgconfig/tcl.pc
 lib/tcl${BASEVER}/auto.tcl
 lib/tcl${BASEVER}/clock.tcl
 lib/tcl${BASEVER}/encoding/ascii.enc
@@ -115,8 +116,8 @@ lib/tcl${BASEVER}/http/pkgIndex.tcl
 lib/tcl${BASEVER}/http1.0/http.tcl
 lib/tcl${BASEVER}/http1.0/pkgIndex.tcl
 lib/tcl${BASEVER}/init.tcl
-lib/tcl${BASEVER}/msgcat1.4/msgcat.tcl
-lib/tcl${BASEVER}/msgcat1.4/pkgIndex.tcl
+lib/tcl${BASEVER}/msgcat1.5/msgcat.tcl
+lib/tcl${BASEVER}/msgcat1.5/pkgIndex.tcl
 lib/tcl${BASEVER}/msgs/af.msg
 lib/tcl${BASEVER}/msgs/af_za.msg
 lib/tcl${BASEVER}/msgs/ar.msg
@@ -255,8 +256,8 @@ lib/tcl${BASEVER}/shell1.1/pkgIndex.tcl
 lib/tcl${BASEVER}/shell1.1/shell.tcl
 lib/tcl${BASEVER}/tclAppInit.c
 lib/tcl${BASEVER}/tclIndex
-lib/tcl${BASEVER}/tcltest2.3/tcltest.tcl
 lib/tcl${BASEVER}/tcltest2.3/pkgIndex.tcl
+lib/tcl${BASEVER}/tcltest2.3/tcltest.tcl
 lib/tcl${BASEVER}/tm.tcl
 lib/tcl${BASEVER}/word.tcl
 lib/tclConfig.sh
@@ -805,6 +806,8 @@ man/man3/Tcl_UtfBackslash.3
 man/man3/Tcl_UtfCharComplete.3
 man/man3/Tcl_UtfFindFirst.3
 man/man3/Tcl_UtfFindLast.3
+man/man3/Tcl_UtfNcasecmp.3
+man/man3/Tcl_UtfNcmp.3
 man/man3/Tcl_UtfNext.3
 man/man3/Tcl_UtfPrev.3
 man/man3/Tcl_UtfToExternal.3
diff --git a/lang/tcl85/distinfo b/lang/tcl85/distinfo
index 06f75d9079f..c840a02c210 100644
--- a/lang/tcl85/distinfo
+++ b/lang/tcl85/distinfo
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 22:50:45 agc Exp $
+$NetBSD: distinfo,v 1.3 2016/03/03 21:16:46 bsiegert Exp $
 
-SHA1 (tcl8.5.15-src.tar.gz) = ff20698d7f77617ea179ec225300f4ea4a905299
-RMD160 (tcl8.5.15-src.tar.gz) = 17f570c0f44da5cb49b4b7c56273544bad7b5a76
-SHA512 (tcl8.5.15-src.tar.gz) = 44c8a975ffaeca1f954fbc160fed966064340b5de883e53321691c6c457283716c4ab5c87c7c754ff5c1bd293d46eb14bbf356a0bf6a5ed0078d8789703df3df
-Size (tcl8.5.15-src.tar.gz) = 4536117 bytes
+SHA1 (tcl8.5.19-src.tar.gz) = 6113fcc4fc15c65f8a840037f37e9174c846bcd4
+RMD160 (tcl8.5.19-src.tar.gz) = 272dd86e28384d11894bdf9014e5ea6282b1b51a
+SHA512 (tcl8.5.19-src.tar.gz) = e04d8a9115a6903057d33a72e1971b6fba68d6be9eab2649ded0671a3ddbec80c0a027f9e5b0985c66cbf915ffbd28a8139b480480988338c203690051ef84ee
+Size (tcl8.5.19-src.tar.gz) = 4552371 bytes
 SHA1 (patch-generic_tclInt.h) = 2e83a0345bc7f87b2a0196d2c2d8d2462b28fbd6
 SHA1 (patch-generic_tclPort.h) = 2b1d78456b23206e5431a696f271d5ecebac7b52
 SHA1 (patch-generic_tclPosixStr.c) = 8c252a4f3d8898fb48544d15123d6a8ddc3172f0
 SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb
 SHA1 (patch-tests_pkgMkIndex.test) = 3091cc124a4e7ae6a1140f83c9f43bee7edccf98
-SHA1 (patch-unix_Makefile.in) = 956490fe37e5f8b5564c2f3ef3c474c49ba9f73a
-SHA1 (patch-unix_configure) = 1ec17ce4dbb78cbf42f5ee39bc10a6840b360913
-SHA1 (patch-unix_tclConfig.sh.in) = 6d1c69065d7c4ed1a7462f041094e91e33d7d0f4
+SHA1 (patch-unix_Makefile.in) = d8858c05b3ed829fd4234211e8cfed94a563b6c2
+SHA1 (patch-unix_configure) = eae8dd39c23971e432bae6ea3ab793347ce2ebfd
+SHA1 (patch-unix_tclConfig.sh.in) = ea3e0071e9e8b64a8ab46fec927c4acb6f917272
 SHA1 (patch-unix_tclUnixCompat.c) = 7ffa40a1a56345f5b86cd896e8e3b0d5748d8c5e
 SHA1 (patch-unix_tclUnixFCmd.c) = a56a12b8a0068e914d10336076347ca2b0ba9ac7
-SHA1 (patch-unix_tclUnixInit.c) = 4cbddb3e1a9ed4bbbf2d8de0df1a9032fc5b2629
+SHA1 (patch-unix_tclUnixInit.c) = 61e3419cad9f3a00825218f9d92b1d8088f4bd30
 SHA1 (patch-unix_tclUnixPort.h) = fde3e497b9c94958aaac1b14a4f97916f17cf951
diff --git a/lang/tcl85/patches/patch-unix_Makefile.in b/lang/tcl85/patches/patch-unix_Makefile.in
index 5968f8ead8c..f5107a58da7 100644
--- a/lang/tcl85/patches/patch-unix_Makefile.in
+++ b/lang/tcl85/patches/patch-unix_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-unix_Makefile.in,v 1.1 2014/03/10 14:20:44 taca Exp $
+$NetBSD: patch-unix_Makefile.in,v 1.2 2016/03/03 21:16:46 bsiegert Exp $
 
 Shared library handling on pkgsrc.
 
---- unix/Makefile.in.orig	2012-11-09 17:14:39.000000000 +0200
-+++ unix/Makefile.in	2013-04-08 17:05:01.000000000 +0300
-@@ -8,6 +8,7 @@
+--- unix/Makefile.in.orig	2016-02-08 20:44:53.000000000 +0000
++++ unix/Makefile.in
+@@ -8,6 +8,7 @@ VERSION 		= @TCL_VERSION@
  MAJOR_VERSION		= @TCL_MAJOR_VERSION@
  MINOR_VERSION		= @TCL_MINOR_VERSION@
  PATCH_LEVEL		= @TCL_PATCH_LEVEL@
@@ -12,7 +12,7 @@ Shared library handling on pkgsrc.
  
  #--------------------------------------------------------------------------
  # Things you can change to personalize the Makefile for your own site (you can
-@@ -54,6 +55,8 @@
+@@ -54,6 +55,8 @@ SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TC
  
  # Directory in which to install the include file tcl.h:
  INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
@@ -21,7 +21,7 @@ Shared library handling on pkgsrc.
  
  # Path to the private tcl header dir:
  PRIVATE_INCLUDE_DIR	= @PRIVATE_INCLUDE_DIR@
-@@ -100,7 +103,7 @@
+@@ -100,7 +103,7 @@ CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@
  #CFLAGS			= $(CFLAGS_DEBUG)
  #CFLAGS			= $(CFLAGS_OPTIMIZE)
  #CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
@@ -30,7 +30,7 @@ Shared library handling on pkgsrc.
  
  # Flags to pass to the linker
  LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
-@@ -194,6 +197,7 @@
+@@ -194,6 +197,7 @@ BUILD_DLTEST		= @BUILD_DLTEST@
  #BUILD_DLTEST		=
  
  TCL_LIB_FILE		= @TCL_LIB_FILE@
@@ -38,16 +38,16 @@ Shared library handling on pkgsrc.
  #TCL_LIB_FILE		= libtcl.a
  
  # Generic lib name used in rules that apply to tcl and tk
-@@ -542,7 +546,7 @@
+@@ -546,7 +550,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $
  
  all: binaries libraries doc
  
--binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE}
-+binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE} ${TCL_LIB_A_FILE}
+-binaries: ${LIB_FILE} ${TCL_EXE}
++binaries: ${LIB_FILE} ${TCL_EXE} ${TCL_LIB_A_FILE}
  
  libraries:
  
-@@ -558,6 +562,11 @@
+@@ -565,6 +569,11 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f $@
  	@MAKE_STUB_LIB@
  
@@ -59,11 +59,11 @@ Shared library handling on pkgsrc.
  # 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
-@@ -719,9 +728,16 @@
+@@ -726,9 +735,16 @@ install-binaries: binaries
  	    done;
  	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
  	@@INSTALL_LIB@
--	@chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE)
+-	@chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
 +	@cd "$(DLL_INSTALL_DIR)" && if test "$(SHLIB_SUFFIX)" = ".dylib"; then \
 +		ln -sf libtcl$(MAJOR_VERSION)$(MINOR_VERSION).$(SHLIB_VERSION)$(SHLIB_SUFFIX) $(LIB_FILE) ; \
 +	else \
@@ -72,13 +72,13 @@ Shared library handling on pkgsrc.
 +	@echo "Installing ${TCL_LIB_A_FILE} to $(DLL_INSTALL_DIR)/"
 +	@$(INSTALL_DATA) ${TCL_LIB_A_FILE} $(DLL_INSTALL_DIR)/${TCL_LIB_A_FILE}
  	@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@"
- 	@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)@EXEEXT@
+ 	@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@"
 +	@cd "$(BIN_INSTALL_DIR)" && ln -sf tclsh$(VERSION)@EXEEXT@ tclsh
  	@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
- 	@$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)"/tclConfig.sh
+ 	@$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)/tclConfig.sh"
  	@if test "$(STUB_LIB_FILE)" != "" ; then \
-@@ -731,7 +747,8 @@
- 	@EXTRA_INSTALL_BINARIES@
+@@ -741,7 +757,8 @@ install-binaries: binaries
+ 	@$(INSTALL_DATA) tcl.pc $(LIB_INSTALL_DIR)/pkgconfig/tcl.pc
  
  install-libraries: libraries $(INSTALL_TZDATA) install-msgs
 -	@for i in "$(INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"; \
@@ -87,7 +87,7 @@ Shared library handling on pkgsrc.
  	    do \
  	    if [ ! -d "$$i" ] ; then \
  		echo "Making directory $$i"; \
-@@ -739,7 +756,7 @@
+@@ -749,7 +766,7 @@ install-libraries: libraries $(INSTALL_T
  		else true; \
  		fi; \
  	    done;
@@ -96,7 +96,7 @@ Shared library handling on pkgsrc.
  	    do \
  	    if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
  		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
-@@ -748,12 +765,17 @@
+@@ -758,12 +775,17 @@ install-libraries: libraries $(INSTALL_T
  		fi; \
  	    done;
  	@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
@@ -119,11 +119,11 @@ Shared library handling on pkgsrc.
  	    done;
  	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)/";
  	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
-@@ -767,21 +789,26 @@
+@@ -777,21 +799,26 @@ install-libraries: libraries $(INSTALL_T
  	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
  	    done;
- 	@echo "Installing package http 2.7.12 as a Tcl Module";
--	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.12.tm;
+ 	@echo "Installing package http 2.7.13 as a Tcl Module";
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.13.tm;
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http/http.tcl;
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/http/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/http/pkgIndex.tcl;
  	@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
@@ -133,15 +133,15 @@ Shared library handling on pkgsrc.
  	    done;
  	@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)"/msgcat1.4/msgcat.tcl;
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.4/pkgIndex.tcl;
- 	@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/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.5/msgcat.tcl;
++	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.5/pkgIndex.tcl;
+ 	@echo "Installing package tcltest 2.3.8 as a Tcl Module";
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.8.tm;
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.3/tcltest.tcl;
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.3/pkgIndex.tcl;
  
- 	@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;
+ 	@echo "Installing package platform 1.0.14 as a Tcl Module";
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.14.tm;
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/platform1.0/platform.tcl;
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/platform1.0/pkgIndex.tcl;
  	@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
diff --git a/lang/tcl85/patches/patch-unix_configure b/lang/tcl85/patches/patch-unix_configure
index 599ffc5f7ba..2d159c66503 100644
--- a/lang/tcl85/patches/patch-unix_configure
+++ b/lang/tcl85/patches/patch-unix_configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-unix_configure,v 1.1 2014/03/10 14:20:44 taca Exp $
+$NetBSD: patch-unix_configure,v 1.2 2016/03/03 21:16:46 bsiegert Exp $
 
 Add MirBSD and DragonFly support.
 
---- unix/configure.orig	2013-09-13 16:07:56.000000000 +0000
+--- unix/configure.orig	2016-02-08 20:44:53.000000000 +0000
 +++ unix/configure
-@@ -7560,7 +7560,7 @@ fi
+@@ -7565,7 +7565,7 @@ fi
  	    CC_SEARCH_FLAGS=""
  	    LD_SEARCH_FLAGS=""
  	    ;;
@@ -13,28 +13,28 @@ Add MirBSD and DragonFly support.
  	    arch=`arch -s`
  	    case "$arch" in
  	    vax)
-@@ -7642,11 +7642,10 @@ fi
- 		;;
- 	    esac
+@@ -7646,11 +7646,10 @@ fi
+ fi
+ 
  	    ;;
 -	FreeBSD-*)
 +	FreeBSD-*|DragonFly-*)
  	    # This configuration from FreeBSD Ports.
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD="${CC} -shared"
--	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@"
+-	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,-soname,\$@"
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
-@@ -7672,7 +7671,6 @@ fi
- 	    TCL_LIB_VERSIONS_OK=nodots
+@@ -7680,7 +7679,6 @@ fi
+ 	    esac
  	    ;;
  	Darwin-*)
 -	    CFLAGS_OPTIMIZE="-Os"
  	    SHLIB_CFLAGS="-fno-common"
  	    # To avoid discrepancies between what headers configure sees during
  	    # preprocessing tests and compiling tests, move any -isysroot and
-@@ -8846,7 +8844,7 @@ fi
+@@ -8854,7 +8852,7 @@ fi
  	    BSD/OS*) ;;
  	    CYGWIN_*|MINGW32_*) ;;
  	    IRIX*) ;;
@@ -43,7 +43,7 @@ Add MirBSD and DragonFly support.
  	    Darwin-*) ;;
  	    SCO_SV-3.2*) ;;
  	    *) SHLIB_CFLAGS="-fPIC" ;;
-@@ -8877,7 +8875,11 @@ fi
+@@ -8885,7 +8883,11 @@ fi
  
  else
  
@@ -56,7 +56,7 @@ Add MirBSD and DragonFly support.
  
  fi
  
-@@ -8911,7 +8913,7 @@ fi
+@@ -8919,7 +8921,7 @@ fi
  else
  
          MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@'
@@ -65,7 +65,7 @@ Add MirBSD and DragonFly support.
  
  fi
  
-@@ -18684,9 +18686,9 @@ fi
+@@ -18692,9 +18694,9 @@ fi
  #	building libtcl as a shared library instead of a static library.
  #--------------------------------------------------------------------
  
@@ -78,7 +78,7 @@ Add MirBSD and DragonFly support.
  
  # tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
  # since on some platforms TCL_LIB_FILE contains shell escapes.
-@@ -18791,13 +18793,10 @@ _ACEOF
+@@ -18799,13 +18801,10 @@ _ACEOF
  else
      # libdir must be a fully qualified path and not ${exec_prefix}/lib
      eval libdir="$libdir"
@@ -95,7 +95,7 @@ Add MirBSD and DragonFly support.
  fi
  VERSION='${VERSION}'
  eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}"
-@@ -18816,12 +18815,11 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
+@@ -18824,12 +18823,11 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
  	TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /System/Library/Frameworks"
      test -z "$TCL_MODULE_PATH"  && \
  	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
@@ -110,7 +110,7 @@ Add MirBSD and DragonFly support.
  #--------------------------------------------------------------------
  #       The statements below define various symbols relating to Tcl
  #       stub support.
-@@ -18834,12 +18832,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
+@@ -18842,12 +18840,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
  eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
  eval "TCL_STUB_LIB_DIR=${libdir}"
  
@@ -124,7 +124,7 @@ Add MirBSD and DragonFly support.
  TCL_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_STUB_LIB_FLAG}"
  TCL_STUB_LIB_SPEC="-L${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}"
  TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
-@@ -18991,34 +18984,15 @@ fi
+@@ -18999,34 +18992,15 @@ fi
  # Transform confdefs.h into DEFS.
  # Protect against shell expansion while executing Makefile rules.
  # Protect against Makefile macro expansion.
@@ -168,7 +168,7 @@ Add MirBSD and DragonFly support.
  
  
  
-@@ -19639,6 +19613,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,;
+@@ -19648,6 +19622,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,;
  s,@EXTRA_TCLSH_LIBS@,$EXTRA_TCLSH_LIBS,;t t
  s,@DLTEST_LD@,$DLTEST_LD,;t t
  s,@DLTEST_SUFFIX@,$DLTEST_SUFFIX,;t t
diff --git a/lang/tcl85/patches/patch-unix_tclConfig.sh.in b/lang/tcl85/patches/patch-unix_tclConfig.sh.in
index 646c27c55e7..7b665d87c83 100644
--- a/lang/tcl85/patches/patch-unix_tclConfig.sh.in
+++ b/lang/tcl85/patches/patch-unix_tclConfig.sh.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-unix_tclConfig.sh.in,v 1.1 2014/03/10 14:20:44 taca Exp $
+$NetBSD: patch-unix_tclConfig.sh.in,v 1.2 2016/03/03 21:16:46 bsiegert Exp $
 
 * Handling of thread PKG_OPTIONS.
 
---- unix/tclConfig.sh.in.orig	2012-07-25 16:45:05.000000000 +0000
+--- unix/tclConfig.sh.in.orig	2016-02-08 20:44:53.000000000 +0000
 +++ unix/tclConfig.sh.in
 @@ -9,6 +9,8 @@
  #
@@ -15,7 +15,7 @@ $NetBSD: patch-unix_tclConfig.sh.in,v 1.1 2014/03/10 14:20:44 taca Exp $
  TCL_MAJOR_VERSION='@TCL_MAJOR_VERSION@'
 @@ -167,3 +169,9 @@ TCL_STUB_LIB_PATH='@TCL_STUB_LIB_PATH@'
  
- # Flag, 1: we built Tcl with threads enables, 0 we didn't
+ # Flag, 1: we built Tcl with threads enabled, 0 we didn't
  TCL_THREADS=@TCL_THREADS@
 +
 +else
diff --git a/lang/tcl85/patches/patch-unix_tclUnixInit.c b/lang/tcl85/patches/patch-unix_tclUnixInit.c
index e7185ff428c..66d9bdb09e0 100644
--- a/lang/tcl85/patches/patch-unix_tclUnixInit.c
+++ b/lang/tcl85/patches/patch-unix_tclUnixInit.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-unix_tclUnixInit.c,v 1.1 2014/03/10 14:20:44 taca Exp $
+$NetBSD: patch-unix_tclUnixInit.c,v 1.2 2016/03/03 21:16:46 bsiegert Exp $
 
 Carried over from TCL 8.4
 
---- unix/tclUnixInit.c.orig	2012-07-16 11:57:06.000000000 +0000
+--- unix/tclUnixInit.c.orig	2015-10-23 11:50:57.000000000 +0000
 +++ unix/tclUnixInit.c
 @@ -22,7 +22,7 @@
  #    endif
@@ -25,8 +25,8 @@ Carried over from TCL 8.4
 +
  
  #ifdef __CYGWIN__
- DLLIMPORT extern __stdcall unsigned char GetVersionExA(void *);
-@@ -448,7 +454,7 @@ TclpInitPlatform(void)
+ DLLIMPORT extern __stdcall unsigned char GetVersionExW(void *);
+@@ -451,7 +457,7 @@ TclpInitPlatform(void)
      (void) signal(SIGPIPE, SIG_IGN);
  #endif /* SIGPIPE */
  
@@ -35,7 +35,7 @@ Carried over from TCL 8.4
      /*
       * Adjust the rounding mode to be more conventional. Note that FreeBSD
       * only provides the __fpsetreg() used by the following two for the GNU
-@@ -818,6 +824,11 @@ TclpSetVariables(
+@@ -822,6 +828,11 @@ TclpSetVariables(
  #endif
      int unameOK;
      Tcl_DString ds;
@@ -47,7 +47,7 @@ Carried over from TCL 8.4
  
  #ifdef HAVE_COREFOUNDATION
      char tclLibPath[MAXPATHLEN + 1];
-@@ -986,8 +997,15 @@ TclpSetVariables(
+@@ -1002,8 +1013,15 @@ TclpSetVariables(
  
  #endif /* DJGPP */
  	}