- Update to 8.5.8

5 files changed, 33 insertions, 31 deletions

diff --git a/lang/tcl85/Makefile b/lang/tcl85/Makefile
index 10f39585c208..cfbcbcb50bcb 100644
--- a/lang/tcl85/Makefile
+++ b/lang/tcl85/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	tcl
-PORTVERSION=	8.5.7
-PORTREVISION?=	1
+PORTVERSION=	8.5.8
 CATEGORIES=	lang
 MASTER_SITES=	SF/tcl/Tcl/${PORTVERSION}
 PKGNAMESUFFIX?=		${THREADS_SUFFIX}${PKGNAMESUFFIX2}
@@ -52,7 +51,7 @@ PLIST=		${PKGDIR}/pkg-plist.tm
 .if !defined(BUILDING_TCL_TM)
 
 .if !defined(WITHOUT_TCL_MODULES)
-RUN_DEPENDS+=	${LOCALBASE}/lib/tcl8/8.5/tcltest-2.3.1.tm:${PORTSDIR}/lang/tcl-modules
+RUN_DEPENDS+=	${LOCALBASE}/lib/tcl8/8.5/tcltest-2.3.2.tm:${PORTSDIR}/lang/tcl-modules
 .endif
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${TCL_VER}
diff --git a/lang/tcl85/distinfo b/lang/tcl85/distinfo
index 5e5ec7a4be50..63bec0d5444a 100644
--- a/lang/tcl85/distinfo
+++ b/lang/tcl85/distinfo
@@ -1,3 +1,3 @@
-MD5 (tcl8.5.7-src.tar.gz) = f70ad8f78b5e4a9f792fe101f22b125f
-SHA256 (tcl8.5.7-src.tar.gz) = 67d28d51a8d04c37114030276503bc8859a4b291bc33133556ab2d11303e66f2
-SIZE (tcl8.5.7-src.tar.gz) = 4421720
+MD5 (tcl8.5.8-src.tar.gz) = 7f123e53b3daaaba2478d3af5a0752e3
+SHA256 (tcl8.5.8-src.tar.gz) = 6b090c1024038d0381e1ccfbd6d5c0f0e6ef205269ceb9d28bd7bd7ac5bbf4a7
+SIZE (tcl8.5.8-src.tar.gz) = 4452127
diff --git a/lang/tcl85/files/patch-unix-Makefile.in b/lang/tcl85/files/patch-unix-Makefile.in
index 7b9af0f8dbb4..e675d436296d 100644
--- a/lang/tcl85/files/patch-unix-Makefile.in
+++ b/lang/tcl85/files/patch-unix-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2009-04-15 21:30:05.000000000 +0200
-+++ Makefile.in	2009-04-23 22:00:29.107152173 +0200
+--- Makefile.in.orig	2009-11-13 19:38:45.000000000 +0100
++++ Makefile.in	2009-11-20 10:00:12.822708367 +0100
 @@ -55,6 +55,8 @@
  
  # Directory in which to install the include file tcl.h:
@@ -125,8 +125,8 @@
  	    do \
  	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
  	    done;
--	@echo "Installing package http 2.7.3 as a Tcl Module";
--	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.3.tm;
+-	@echo "Installing package http 2.7.5 as a Tcl Module";
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.5.tm;
  	@echo "Installing library opt0.4 directory";
  	@for i in $(TOP_DIR)/library/opt/*.tcl ; \
  	    do \
@@ -134,11 +134,11 @@
  	    done;
 -	@echo "Installing package msgcat 1.4.2 as a Tcl Module";
 -	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.4.2.tm;
--	@echo "Installing package tcltest 2.3.1 as a Tcl Module";
--	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.1.tm;
+-	@echo "Installing package tcltest 2.3.2 as a Tcl Module";
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.2.tm;
 -
--	@echo "Installing package platform 1.0.4 as a Tcl Module";
--	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.4.tm;
+-	@echo "Installing package platform 1.0.5 as a Tcl Module";
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.5.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;
  
@@ -158,42 +158,42 @@
 +		else true; \
 +		fi; \
 +	    done;
-+	@echo "Installing package http 2.7.3 as a Tcl Module";
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/http-2.7.3.tm;
++	@echo "Installing package http 2.7.5 as a Tcl Module";
++	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/http-2.7.5.tm;
 +	@echo "Installing package msgcat 1.4.2 as a Tcl Module";
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/msgcat-1.4.2.tm;
-+	@echo "Installing package tcltest 2.3.1 as a Tcl Module";
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/tcltest-2.3.1.tm;
++	@echo "Installing package tcltest 2.3.2 as a Tcl Module";
++	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/tcltest-2.3.2.tm;
 +
-+	@echo "Installing package platform 1.0.4 as a Tcl Module";
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform-1.0.4.tm;
++	@echo "Installing package platform 1.0.5 as a Tcl Module";
++	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform-1.0.5.tm;
 +	@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform/shell-1.1.4.tm;
 +
  install-tzdata: tclsh
  	@echo "Installing time zone data"
  	@@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
-@@ -840,20 +876,25 @@
+@@ -837,21 +873,26 @@
  		else true; \
  		fi; \
  	    done;
 -	@echo "Installing and cross-linking top-level (.1) docs";
 -	@for i in $(TOP_DIR)/doc/*.1; do \
--	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
+-	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
 -	done
  
  	@echo "Installing and cross-linking C API (.3) docs";
  	@for i in $(TOP_DIR)/doc/*.3; do \
--	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
-+	    ${BSD_INSTALL_MAN} $$i "$(MAN3_INSTALL_DIR)"; \
+-	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
++	    $(BSD_INSTALL_MAN) $$i "$(MAN3_INSTALL_DIR)"; \
  	done
  
  	@echo "Installing and cross-linking command (.n) docs";
  	@for i in $(TOP_DIR)/doc/*.n; do \
--	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
-+	    ${BSD_INSTALL_MAN} $$i "$(MANN_INSTALL_DIR)"; \
+-	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
++	    $(BSD_INSTALL_MAN) $$i "$(MANN_INSTALL_DIR)"; \
  	done
-+	    
+ 
 +	@echo "**********"
 +	@echo "IMPORTANT:"
 +	@echo "**********"
@@ -202,6 +202,7 @@
 +	@echo "tclDecls.h   in $(INCLUDE_INSTALL_DIR)/tclDecls.h"
 +	@echo "There are NOT default place, but good place to avoid"
 +	@echo "conflicting with another version of Tcl/Tks."
- 
++
  # Optional target to install private headers
  install-private-headers: libraries
+ 	@for i in "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \
diff --git a/lang/tcl85/pkg-plist b/lang/tcl85/pkg-plist
index 29e28b7bcc74..f77c31e9ac32 100644
--- a/lang/tcl85/pkg-plist
+++ b/lang/tcl85/pkg-plist
@@ -15,6 +15,7 @@ include/tcl%%TCL_VER%%/generic/tclPlatDecls.h
 include/tcl%%TCL_VER%%/generic/tclPort.h
 include/tcl%%TCL_VER%%/generic/tclRegexp.h
 include/tcl%%TCL_VER%%/generic/tclTomMath.h
+include/tcl%%TCL_VER%%/generic/tclTomMathInt.h
 include/tcl%%TCL_VER%%/generic/tclTomMathDecls.h
 include/tcl%%TCL_VER%%/generic/tommath.h
 include/tcl%%TCL_VER%%/tcl.h
@@ -562,6 +563,7 @@ lib/tcl%%TCL_VER%%/tclIndex
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Manila
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Muscat
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Nicosia
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Novokuznetsk
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Novosibirsk
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Omsk
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Oral
diff --git a/lang/tcl85/pkg-plist.tm b/lang/tcl85/pkg-plist.tm
index 797d779a4ad4..eeb04f0ebd01 100644
--- a/lang/tcl85/pkg-plist.tm
+++ b/lang/tcl85/pkg-plist.tm
@@ -1,8 +1,8 @@
-lib/tcl8/8.4/http-2.7.3.tm
+lib/tcl8/8.4/http-2.7.5.tm
 lib/tcl8/8.4/platform/shell-1.1.4.tm
-lib/tcl8/8.4/platform-1.0.4.tm
+lib/tcl8/8.4/platform-1.0.5.tm
 lib/tcl8/8.5/msgcat-1.4.2.tm
-lib/tcl8/8.5/tcltest-2.3.1.tm
+lib/tcl8/8.5/tcltest-2.3.2.tm
 @dirrmtry lib/tcl8/8.3
 @dirrmtry lib/tcl8/8.4/platform
 @dirrmtry lib/tcl8/8.4