- Update Tcl/Tk 8.5 to 8.5.15

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

5 files changed, 54 insertions, 52 deletions

diff --git a/lang/tcl85/Makefile b/lang/tcl85/Makefile
index 4df0406f8217..ab930729b3f7 100644
--- a/lang/tcl85/Makefile
+++ b/lang/tcl85/Makefile
@@ -2,11 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	tcl
-PORTVERSION=	8.5.14
-PORTREVISION=	1
+DISTVERSION=	8.5.15
 CATEGORIES=	lang
-MASTER_SITES=	SF/tcl/Tcl/${PORTVERSION}
-DISTNAME=	tcl${PORTVERSION}-src
+MASTER_SITES=	${MASTER_SITE_TCLTK} \
+		SF/tcl/Tcl/${PORTVERSION}
+MASTER_SITE_SUBDIR=tcl8_5
+DISTNAME=	${PORTNAME}${DISTVERSION}-src
 
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	Tool Command Language
diff --git a/lang/tcl85/distinfo b/lang/tcl85/distinfo
index 784dfceb60d0..da4e756b53bd 100644
--- a/lang/tcl85/distinfo
+++ b/lang/tcl85/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tcl8.5.14-src.tar.gz) = 7494e94f1e195a505c542a3c50e01589d2f8bfd19597382827a895fa1c471f2d
-SIZE (tcl8.5.14-src.tar.gz) = 4528533
+SHA256 (tcl8.5.15-src.tar.gz) = f24eaae461795e6b09bf54c7e9f38def025892da55f26008c16413cfdda2884e
+SIZE (tcl8.5.15-src.tar.gz) = 4536117
diff --git a/lang/tcl85/files/patch-unix-Makefile.in b/lang/tcl85/files/patch-unix-Makefile.in
index 28b499ab9c34..1cfca72ccc1a 100644
--- a/lang/tcl85/files/patch-unix-Makefile.in
+++ b/lang/tcl85/files/patch-unix-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2013-04-03 16:58:41.000000000 +0200
-+++ Makefile.in	2013-04-03 17:13:01.000000000 +0200
+--- Makefile.in.orig	2013-08-30 18:26:25.000000000 +0200
++++ Makefile.in	2013-09-02 15:13:47.000000000 +0200
 @@ -54,6 +54,8 @@
  
  # Directory in which to install the include file tcl.h:
@@ -81,7 +81,7 @@
  	    do \
  	    if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
  		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
-@@ -748,13 +766,17 @@
+@@ -748,51 +766,53 @@
  		fi; \
  	    done;
  	@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
@@ -104,56 +104,66 @@
  	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)/";
  	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
  		$(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@; \
-@@ -766,32 +788,31 @@
  	    do \
- 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
+ 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \
  	    done;
--	@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 http1.0 files to $(SCRIPT_INSTALL_DIR)/http1.0/";
+-	@for i in $(TOP_DIR)/library/http1.0/*.tcl ; \
+-	    do \
+-	    $(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 encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
++	@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
++		$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \
++	done;
++	@echo "Customizing tcl module path";
++ 	@echo "::tcl::tm::path add {$(SCRIPT_INSTALL_DIR)}" >> \
++ 	    "$(SCRIPT_INSTALL_DIR)"/tm.tcl;
++
++install-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.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";
++	@echo "Installing package http 2.7.12 as a Tcl Module";
++	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.7.12.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)"/msgcat-1.5.2.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.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/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest-2.3.5.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)"/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;
 -
- 	@echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
- 	@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
- 		$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \
- 	done;
+-	@echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
+-	@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
+-		$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \
+-	done;
 -	@if [ -n "$(TCL_MODULE_PATH)" -a -f $(TOP_DIR)/library/tm.tcl ]; then \
 -	    echo "Customizing tcl module path"; \
 -	    echo "if {![interp issafe]} { ::tcl::tm::roots {$(TCL_MODULE_PATH)} }" >> \
 -	        "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \
 -	fi
-+	@echo "Customizing tcl module path";
-+	@echo "::tcl::tm::path add {$(SCRIPT_INSTALL_DIR)}" >> \
-+	    "$(SCRIPT_INSTALL_DIR)"/tm.tcl;
-+
-+install-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
- 
++	@echo "Installing package http1.0 files to $(SCRIPT_INSTALL_DIR)/http1.0/";
++	@for i in $(TOP_DIR)/library/http1.0/*.tcl ; \
++	    do \
++	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
++	    done;
  install-tzdata:
  	@for i in tzdata; \
-@@ -1564,7 +1585,7 @@
+ 	    do \
+@@ -1564,7 +1584,7 @@
  			match=1; \
  		    fi; \
  		done; \
@@ -162,7 +172,7 @@
  	done
  
  #
-@@ -1581,7 +1602,7 @@
+@@ -1581,7 +1601,7 @@
  			match=1; \
  		    fi; \
  		done; \
diff --git a/lang/tcl85/files/patch-unix-configure b/lang/tcl85/files/patch-unix-configure
index 1fced9ec8b33..c1c6c4739ff2 100644
--- a/lang/tcl85/files/patch-unix-configure
+++ b/lang/tcl85/files/patch-unix-configure
@@ -39,12 +39,3 @@
  	    	TCL_LIB_VERSIONS_OK=nodots
  		;;
  	    esac
-@@ -7677,7 +7677,7 @@
- 	    # This configuration from FreeBSD Ports.
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD="${CC} -shared"
--	    TCL_SHLIB_LD_EXTRAS="-soname \$@"
-+	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@"
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS=""
diff --git a/lang/tcl85/pkg-plist b/lang/tcl85/pkg-plist
index 9e6b1147783f..099aff21c935 100644
--- a/lang/tcl85/pkg-plist
+++ b/lang/tcl85/pkg-plist
@@ -861,10 +861,10 @@ 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.11.tm
+%%MODULES%%lib/tcl%%TCL_VER%%/http-2.7.12.tm
 %%MODULES%%lib/tcl%%TCL_VER%%/platform/shell-1.1.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%%/platform-1.0.12.tm
+%%MODULES%%lib/tcl%%TCL_VER%%/msgcat-1.5.2.tm
 %%MODULES%%lib/tcl%%TCL_VER%%/tcltest-2.3.5.tm
 @dirrm lib/tcl%%TCL_VER%%/platform
 @dirrm lib/tcl%%TCL_VER%%/opt0.4