- Update Tcl/Tk 8.5 to 8.5.14

  Release notes: http://code.activestate.com/lists/tcl-core/13208/

Feature safe:	yes

5 files changed, 46 insertions, 43 deletions

diff --git a/lang/tcl85/Makefile b/lang/tcl85/Makefile
index f71290945a45..6a3cefdddbed 100644
--- a/lang/tcl85/Makefile
+++ b/lang/tcl85/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tcl
-PORTVERSION=	8.5.13
+PORTVERSION=	8.5.14
 CATEGORIES=	lang
 MASTER_SITES=	SF/tcl/Tcl/${PORTVERSION}
 DISTNAME=	tcl${PORTVERSION}-src
diff --git a/lang/tcl85/distinfo b/lang/tcl85/distinfo
index 242cda92e5b9..784dfceb60d0 100644
--- a/lang/tcl85/distinfo
+++ b/lang/tcl85/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tcl8.5.13-src.tar.gz) = 9b868dd563e65671a26fcf518b6b86c1bb1b6756f48fdc90f04301d4f3a6596a
-SIZE (tcl8.5.13-src.tar.gz) = 4513204
+SHA256 (tcl8.5.14-src.tar.gz) = 7494e94f1e195a505c542a3c50e01589d2f8bfd19597382827a895fa1c471f2d
+SIZE (tcl8.5.14-src.tar.gz) = 4528533
diff --git a/lang/tcl85/files/patch-generic-tclPort.h b/lang/tcl85/files/patch-generic-tclPort.h
index edcef0bd2918..c767eee2f67e 100644
--- a/lang/tcl85/files/patch-generic-tclPort.h
+++ b/lang/tcl85/files/patch-generic-tclPort.h
@@ -1,11 +1,11 @@
---- ../generic/tclPort.h.orig	2010-02-01 00:51:36.000000000 +0100
-+++ ../generic/tclPort.h	2010-09-17 16:28:05.133598753 +0200
-@@ -24,7 +24,7 @@
- #endif
- #include "tcl.h"
- #if !defined(_WIN32)
+--- ../generic/tclPort.h.orig	2013-04-03 16:57:25.000000000 +0200
++++ ../generic/tclPort.h	2013-04-03 16:57:35.000000000 +0200
+@@ -20,7 +20,7 @@
+ #if defined(_WIN32)
+ #   include "tclWinPort.h"
+ #else
 -#   include "tclUnixPort.h"
 +#   include "../unix/tclUnixPort.h"
  #endif
+ #include "tcl.h"
  
- #if defined(__CYGWIN__)
diff --git a/lang/tcl85/files/patch-unix-Makefile.in b/lang/tcl85/files/patch-unix-Makefile.in
index 3e6bdfcc5f5e..a995b0933005 100644
--- a/lang/tcl85/files/patch-unix-Makefile.in
+++ b/lang/tcl85/files/patch-unix-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2012-11-09 16:14:39.000000000 +0100
-+++ Makefile.in	2013-01-10 15:47:17.000000000 +0100
+--- Makefile.in.orig	2013-04-03 16:58:41.000000000 +0200
++++ Makefile.in	2013-04-03 17:13:01.000000000 +0200
 @@ -54,6 +54,8 @@
  
  # Directory in which to install the include file tcl.h:
@@ -22,7 +22,7 @@
  ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
  	rm -f $@
  	@MAKE_LIB@
-+	@ln -sf $(LIB_FILE) ./libtcl${SHORT_TCL_VER}.so
++	@ln -sf ${LIB_FILE} ./libtcl${SHORT_TCL_VER}.so
 +	if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
 +		$(RANLIB) ${LIB_FILE}; \
 +	fi;
@@ -53,12 +53,12 @@
 +	@(cd "$(DLL_INSTALL_DIR)"; $(RANLIB) libtcl${SHORT_TCL_VER}.a)
 +	@chmod 555 "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a
  	@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@"
-+	@echo "Installing tclConfig.sh to $(SCRIPT_INSTALL_DIR)/"
-+	@mkdir -p "$(SCRIPT_INSTALL_DIR)"
-+	@$(INSTALL_DATA) tclConfig.sh "$(SCRIPT_INSTALL_DIR)"/tclConfig.sh
  	@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)@EXEEXT@
 -	@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
 -	@$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)"/tclConfig.sh
++	@echo "Installing tclConfig.sh to $(SCRIPT_INSTALL_DIR)/"
++	@mkdir -p "$(SCRIPT_INSTALL_DIR)"
++	@$(INSTALL_DATA) tclConfig.sh "$(SCRIPT_INSTALL_DIR)"/tclConfig.sh
  	@if test "$(STUB_LIB_FILE)" != "" ; then \
  	    echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    @INSTALL_STUB_LIB@ ; \
@@ -108,20 +108,20 @@
  	    do \
  	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
  	    done;
--	@echo "Installing package http 2.7.10 as a Tcl Module";
--	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.10.tm;
+-	@echo "Installing package http 2.7.11 as a Tcl Module";
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.11.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;
--	@echo "Installing package tcltest 2.3.4 as a Tcl Module";
--	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.4.tm;
+-	@echo "Installing package msgcat 1.5.1 as a Tcl Module";
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.1.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;
 -
--	@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;
+-	@echo "Installing package platform 1.0.11 as a Tcl Module";
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.11.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;
 -
@@ -134,26 +134,26 @@
 -	    echo "if {![interp issafe]} { ::tcl::tm::roots {$(TCL_MODULE_PATH)} }" >> \
 -	        "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \
 -	fi
-+	echo "Customizing tcl module path"; \
-+	echo "if {![interp issafe]} { ::tcl::tm::path add {$(SCRIPT_INSTALL_DIR)} }" >> \
++	@echo "Customizing tcl module path";
++	@echo "if {![interp issafe]} { ::tcl::tm::path add {$(SCRIPT_INSTALL_DIR)} }" >> \
 +	    "$(SCRIPT_INSTALL_DIR)"/tm.tcl;
 +
 +install-tm:
-+	@echo "Installing package http 2.7.10 as a Tcl Module";
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.7.10.tm;
-+	@echo "Installing package msgcat 1.5.0 as a Tcl Module";
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat-1.5.0.tm;
-+	@echo "Installing package tcltest 2.3.4 as a Tcl Module";
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest-2.3.4.tm;
-+	@echo "Installing package platform 1.0.10 as a Tcl Module";
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/platform-1.0.10.tm;
++	@echo "Installing package http 2.7.11 as a Tcl Module";
++	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.7.11.tm
++	@echo "Installing package msgcat 1.5.1 as a Tcl Module";
++	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat-1.5.1.tm
++	@echo "Installing package tcltest 2.3.5 as a Tcl Module";
++	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest-2.3.5.tm
++	@echo "Installing package platform 1.0.11 as a Tcl Module";
++	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/platform-1.0.11.tm
 +	@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
 +	@$(INSTALL_DATA_DIR) "$(SCRIPT_INSTALL_DIR)"/platform;
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/platform/shell-1.1.4.tm;
++	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/platform/shell-1.1.4.tm
  
- install-tzdata: ${TCL_EXE}
- 	@echo "Installing time zone files to $(SCRIPT_INSTALL_DIR)/tzdata/"
-@@ -1537,7 +1558,7 @@
+ install-tzdata:
+ 	@for i in tzdata; \
+@@ -1564,7 +1585,7 @@
  			match=1; \
  		    fi; \
  		done; \
@@ -162,7 +162,7 @@
  	done
  
  #
-@@ -1554,7 +1575,7 @@
+@@ -1581,7 +1602,7 @@
  			match=1; \
  		    fi; \
  		done; \
diff --git a/lang/tcl85/pkg-plist b/lang/tcl85/pkg-plist
index a7a23ff9e3da..9e6b1147783f 100644
--- a/lang/tcl85/pkg-plist
+++ b/lang/tcl85/pkg-plist
@@ -565,6 +565,7 @@ lib/tcl%%TCL_VER%%/word.tcl
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Kashgar
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Kathmandu
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Katmandu
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Khandyga
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Kolkata
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Krasnoyarsk
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Kuala_Lumpur
@@ -606,6 +607,7 @@ lib/tcl%%TCL_VER%%/word.tcl
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Ulaanbaatar
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Ulan_Bator
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Urumqi
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Ust-Nera
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Vientiane
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Vladivostok
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Yakutsk
@@ -706,6 +708,7 @@ lib/tcl%%TCL_VER%%/word.tcl
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Brussels
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Bucharest
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Budapest
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Busingen
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Chisinau
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Copenhagen
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Dublin
@@ -858,11 +861,11 @@ lib/tcl%%TCL_VER%%/word.tcl
 %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/America
 %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/Africa
 %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata
-%%MODULES%%lib/tcl%%TCL_VER%%/http-2.7.10.tm
+%%MODULES%%lib/tcl%%TCL_VER%%/http-2.7.11.tm
 %%MODULES%%lib/tcl%%TCL_VER%%/platform/shell-1.1.4.tm
-%%MODULES%%lib/tcl%%TCL_VER%%/platform-1.0.10.tm
-%%MODULES%%lib/tcl%%TCL_VER%%/msgcat-1.5.0.tm
-%%MODULES%%lib/tcl%%TCL_VER%%/tcltest-2.3.4.tm
+%%MODULES%%lib/tcl%%TCL_VER%%/platform-1.0.11.tm
+%%MODULES%%lib/tcl%%TCL_VER%%/msgcat-1.5.1.tm
+%%MODULES%%lib/tcl%%TCL_VER%%/tcltest-2.3.5.tm
 @dirrm lib/tcl%%TCL_VER%%/platform
 @dirrm lib/tcl%%TCL_VER%%/opt0.4
 @dirrm lib/tcl%%TCL_VER%%/msgs