6 files changed, 77 insertions, 75 deletions

diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile
index 14853a2526c0..21551ff5b66d 100644
--- a/lang/tcl86/Makefile
+++ b/lang/tcl86/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	tcl
-PORTVERSION=	8.6.b.2
-PORTREVISION=	1
+PORTVERSION=	8.6.b.3
 CATEGORIES=	lang
-MASTER_SITES=	SF/tcl/Tcl/8.6b2
-PKGNAMESUFFIX?=		${THREADS_SUFFIX}${PKGNAMESUFFIX2}
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.b.2/b2/}-src
+MASTER_SITES=	SF/tcl/Tcl/8.6b3 \
+		${MASTER_SITE_TCLTK}
+MASTER_SITE_SUBDIR=tcl8_6
+PKGNAMESUFFIX?=	${THREADS_SUFFIX}${PKGNAMESUFFIX2}
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.b.3/b3/}-src
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	gahr@FreeBSD.org
 COMMENT?=	Tool Command Language
 
 LICENSE=	BSD
@@ -722,9 +723,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
 		-e 's|$${TCL_TRIM_DOTS}|$${TCL_TRIM_DOTS}${THREADS_SUFFIX}|g' \
 		-e 's|-ltcl$${TCL_VERSION}|-ltcl$${TCL_VERSION}${THREADS_SUFFIX}|g' \
-		-e 's/-ltcl`echo $${TCL_VERSION} | tr -d .`/-ltcl`echo $${TCL_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \
+		-e 's/-ltcl`echo $${TCL_VERSION} | ${TR} -d .`/-ltcl`echo $${TCL_VERSION} | ${TR} -d .`${THREADS_SUFFIX}/g' \
 		-e 's|-ltclstub$${TCL_VERSION}|-ltclstub$${TCL_VERSION}${THREADS_SUFFIX}|g' \
-		-e 's/-ltclstub`echo $${TCL_VERSION} | tr -d .`/-ltclstub`echo $${TCL_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \
+		-e 's/-ltclstub`echo $${TCL_VERSION} | ${TR} -d .`/-ltclstub`echo $${TCL_VERSION} | ${TR} -d .`${THREADS_SUFFIX}/g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|libtcl$${SHORT_TCL_VER}|libtcl$${SHORT_TCL_VER}${THREADS_SUFFIX}|g' \
 		-e 's|/tclsh$$(VERSION)|/tclsh$$(VERSION)${THREADS_SUFFIX}|g' \
diff --git a/lang/tcl86/distinfo b/lang/tcl86/distinfo
index 934eab97dc76..1728d1a7b043 100644
--- a/lang/tcl86/distinfo
+++ b/lang/tcl86/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tcl8.6b2-src.tar.gz) = b0f5ca125fbbcde7cfe076d3b1bdd729113cbf7ad50e8fb1a9a20cf551904a1b
-SIZE (tcl8.6b2-src.tar.gz) = 6455956
+SHA256 (tcl8.6b3-src.tar.gz) = a96323570d986ef02fff611cd2c401c6888b0534a17ca68dd3b5c69ee0f29b38
+SIZE (tcl8.6b3-src.tar.gz) = 8078739
diff --git a/lang/tcl86/files/patch-generic-tclPort.h b/lang/tcl86/files/patch-generic-tclPort.h
index d5825f4e37a8..bdd3af35886c 100644
--- a/lang/tcl86/files/patch-generic-tclPort.h
+++ b/lang/tcl86/files/patch-generic-tclPort.h
@@ -1,5 +1,5 @@
---- ../generic/tclPort.h.orig	2011-04-26 17:14:03.000000000 +0200
-+++ ../generic/tclPort.h	2011-08-09 14:25:40.620587462 +0200
+--- ../generic/tclPort.h.orig	2012-06-26 15:59:02.000000000 +0200
++++ ../generic/tclPort.h	2012-09-17 16:29:41.000000000 +0200
 @@ -22,7 +22,7 @@
  #endif
  #include "tcl.h"
@@ -8,4 +8,4 @@
 +#   include "../unix/tclUnixPort.h"
  #endif
  
- #if defined(__CYGWIN__)
+ #if !defined(LLONG_MIN)
diff --git a/lang/tcl86/files/patch-uk-locale b/lang/tcl86/files/patch-uk-locale
deleted file mode 100644
index 81b02bb46e59..000000000000
--- a/lang/tcl86/files/patch-uk-locale
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix the misspelled name of "March" in Ukrainian.
-
-Submitted upstream as:
-
-https://sourceforge.net/tracker/?func=detail&aid=3561330&group_id=10894&atid=310894
-
---- ../library/msgs/uk.msg	2011-04-26 11:14:03.000000000 -0400
-+++ ../library/msgs/uk.msg	2012-08-24 12:52:15.000000000 -0400
-@@ -34,5 +34,5 @@
-         "\u0441\u0456\u0447\u043d\u044f"\
-         "\u043b\u044e\u0442\u043e\u0433\u043e"\
--        "\u0431\u0435\u0440\u0435\u0436\u043d\u044f"\
-+        "\u0431\u0435\u0440\u0435\u0437\u043d\u044f"\
-         "\u043a\u0432\u0456\u0442\u043d\u044f"\
-         "\u0442\u0440\u0430\u0432\u043d\u044f"\
diff --git a/lang/tcl86/files/patch-unix-Makefile.in b/lang/tcl86/files/patch-unix-Makefile.in
index 7d0835ffa183..694159f900d0 100644
--- a/lang/tcl86/files/patch-unix-Makefile.in
+++ b/lang/tcl86/files/patch-unix-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2011-08-05 20:57:53.000000000 +0200
-+++ Makefile.in	2011-08-09 16:54:17.758348126 +0200
-@@ -53,6 +53,8 @@
+--- Makefile.in.orig	2012-09-17 15:07:09.000000000 +0200
++++ Makefile.in	2012-09-17 17:29:57.000000000 +0200
+@@ -54,6 +54,8 @@
  
  # Directory in which to install the include file tcl.h:
  INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
@@ -9,7 +9,7 @@
  
  # Path to the private tcl header dir:
  PRIVATE_INCLUDE_DIR	= @PRIVATE_INCLUDE_DIR@
-@@ -79,7 +81,7 @@
+@@ -80,7 +82,7 @@
  HTML_INSTALL_DIR	= $(INSTALL_ROOT)$(HTML_DIR)
  
  # Directory in which to install the configuration file tclConfig.sh
@@ -18,7 +18,7 @@
  
  # Directory in which to install bundled packages:
  PACKAGE_DIR             = @PACKAGE_DIR@
-@@ -102,7 +104,7 @@
+@@ -103,7 +105,7 @@
  #CFLAGS			= $(CFLAGS_DEBUG)
  #CFLAGS			= $(CFLAGS_OPTIMIZE)
  #CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
@@ -27,7 +27,7 @@
  
  # Flags to pass to the linker
  LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
-@@ -600,9 +602,9 @@
+@@ -601,9 +603,9 @@
  # Start of rules
  #--------------------------------------------------------------------------
  
@@ -39,23 +39,28 @@
  
  libraries:
  
-@@ -613,6 +615,15 @@
+@@ -614,11 +616,19 @@
  ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
  	rm -f $@
  	@MAKE_LIB@
-+	@ln -sf $(LIB_FILE) ./libtcl${SHORT_TCL_VER}.so
-+	if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
-+		$(RANLIB) ${LIB_FILE}; \
++	@ln -sf ${LIB_FILE} ./libtcl${SHORT_TCL_VER}.so
++	if test "x@DL_OBJS" = "xtclLoadAout.o"; then \
++	    $(RANLIB) ${LIB_FILE}; \
 +	fi
-+
++	
 +libtcl${SHORT_TCL_VER}.a: ${OBJS}
 +	rm -f libtcl${SHORT_TCL_VER}.a
 +	ar cr libtcl${SHORT_TCL_VER}.a ${OBJS}
-+	$(RANLIB) libtcl${SHORT_TCL_VER}.a
++	${RANLIB} libtcl${SHORT_TCL_VER}.a
+ 	@if test "x$(DLL_INSTALL_DIR)" = "x$(BIN_INSTALL_DIR)"; then\
+ 	    cp ${ZLIB_DIR}/win32/zlib1.dll .;\
+ 	fi
  
+-
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f $@
-@@ -754,8 +765,8 @@
+ 	@MAKE_STUB_LIB@
+@@ -759,8 +769,8 @@
  #--------------------------------------------------------------------------
  
  INSTALL_BASE_TARGETS = install-binaries install-libraries install-msgs $(INSTALL_TZDATA)
@@ -66,20 +71,20 @@
  INSTALL_DEV_TARGETS = install-headers
  INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@
  INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \
-@@ -785,6 +796,12 @@
- 	@echo "Installing $(LIB_FILE) to @DLL_INSTALL_DIR@/"
+@@ -795,6 +805,12 @@
+ 	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
  	@@INSTALL_LIB@
- 	@chmod 555 "@DLL_INSTALL_DIR@"/$(LIB_FILE)
+ 	@chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
 +	@ln -sf $(LIB_FILE) "@DLL_INSTALL_DIR@"/libtcl${SHORT_TCL_VER}.so
 +	@echo "Installing libtcl${SHORT_TCL_VER}.a"
 +	@$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a \
-+		"@DLL_INSTALL_DIR@"/libtcl${SHORT_TCL_VER}.a
++	    "@DLL_INSTALL_DIR@"/libtcl${SHORT_TCL_VER}.a
 +	@(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)${EXE_SUFFIX}"
- 	@$(INSTALL_PROGRAM) ${TCL_EXE} "$(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)/"
-@@ -797,9 +814,9 @@
+@@ -807,9 +823,9 @@
  	    @INSTALL_STUB_LIB@ ; \
  	fi
  	@EXTRA_INSTALL_BINARIES@
@@ -92,57 +97,58 @@
  
  install-libraries: libraries
  	@for i in "$(SCRIPT_INSTALL_DIR)"; \
-@@ -810,7 +827,7 @@
+@@ -820,7 +836,7 @@
  		else true; \
  		fi; \
  	    done;
--	@for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.3 ../tcl8/8.4  ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6; \
-+	@for i in opt0.4 http1.0 encoding; \
+-	@for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4  ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6; \
++	@for i in opt0.4 http1.0 encoding ; \
  	    do \
  	    if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
  		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
-@@ -829,22 +846,11 @@
- 	    do \
- 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
- 	    done;
--	@echo "Installing package http 2.8.2 as a Tcl Module";
--	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.2.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; \
+@@ -848,13 +864,13 @@
  	    done;
--	@echo "Installing package msgcat 1.4.4 as a Tcl Module";
--	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.4.4.tm;
--	@echo "Installing package tcltest 2.3.3 as a Tcl Module";
--	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.3.tm;
--
+ 	@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 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 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::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 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::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 library encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
+ 	@echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
  	@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
-@@ -884,23 +890,18 @@
+@@ -894,23 +910,23 @@
  		else true; \
  		fi; \
  	    done;
--	@echo "Installing and cross-linking top-level (.1) docs";
+-	@echo "Installing and cross-linking top-level (.1) docs to $(MAN1_INSTALL_DIR)/";
 -	@for i in $(TOP_DIR)/doc/*.1; do \
 -	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
 -	done
--
- 	@echo "Installing and cross-linking C API (.3) docs";
++#	@echo "Installing and cross-linking top-level (.1) docs to $(MAN1_INSTALL_DIR)/";
++#	@for i in $(TOP_DIR)/doc/*.1; do \
++#	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
++#	done
+ 
+ 	@echo "Installing and cross-linking C API (.3) docs to $(MAN3_INSTALL_DIR)/";
  	@for i in $(TOP_DIR)/doc/*.3; do \
 -	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
-+	    ${BSD_INSTALL_MAN} $$i "$(MAN3_INSTALL_DIR)"; \
++	    ${BSD_INSTALL_MAN} $$i "${MAN3_INSTALL_DIR}"; \
  	done
  
- 	@echo "Installing and cross-linking command (.n) docs";
+ 	@echo "Installing and cross-linking command (.n) docs to $(MANN_INSTALL_DIR)/";
  	@for i in $(TOP_DIR)/doc/*.n; do \
 -	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
-+	    ${BSD_INSTALL_MAN} $$i "$(MANN_INSTALL_DIR)"; \
++	    ${BSD_INSTALL_MAN} $$i "${MANN_INSTALL_DIR}"; \
  	done
  
  install-headers:
@@ -151,7 +157,7 @@
  	    do \
  	    if [ ! -d "$$i" ] ; then \
  		echo "Making directory $$i"; \
-@@ -908,15 +909,22 @@
+@@ -918,15 +934,21 @@
  		else true; \
  		fi; \
  	    done;
@@ -161,7 +167,6 @@
 -		$(GENERIC_DIR)/tclPlatDecls.h \
 -		$(GENERIC_DIR)/tclTomMath.h \
 -		$(GENERIC_DIR)/tclTomMathDecls.h ; \
-+	@echo "Installing header files to $(GENERIC_INCLUDE_INSTALL_DIR)/";
 +	@for i in $(GENERIC_DIR)/*.h ; \
 +	    do \
 +	    $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)"; \
diff --git a/lang/tcl86/pkg-plist b/lang/tcl86/pkg-plist
index 2970dcf50ec1..02517c34a185 100644
--- a/lang/tcl86/pkg-plist
+++ b/lang/tcl86/pkg-plist
@@ -15,6 +15,7 @@ include/tcl%%TCL_VER%%/generic/tclOO.h
 include/tcl%%TCL_VER%%/generic/tclOODecls.h
 include/tcl%%TCL_VER%%/generic/tclOOInt.h
 include/tcl%%TCL_VER%%/generic/tclOOIntDecls.h
+include/tcl%%TCL_VER%%/generic/tclParse.h
 include/tcl%%TCL_VER%%/generic/tclPlatDecls.h
 include/tcl%%TCL_VER%%/generic/tclPort.h
 include/tcl%%TCL_VER%%/generic/tclRegexp.h
@@ -256,6 +257,8 @@ lib/tcl%%TCL_VER%%/tclAppInit.c
 lib/tcl%%TCL_VER%%/tclConfig.sh
 lib/tcl%%TCL_VER%%/tclIndex
 lib/tcl%%TCL_VER%%/tclooConfig.sh
+lib/tcl8/8.6/http-2.8.4.tm
+lib/tcl8/8.5/msgcat-1.5.0.tm
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/CST6CDT
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/CET
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/PST8PDT
@@ -323,6 +326,7 @@ lib/tcl%%TCL_VER%%/tclooConfig.sh
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Africa/Gaborone
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Africa/Harare
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Africa/Johannesburg
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Africa/Juba
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Africa/Kampala
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Africa/Khartoum
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Africa/Kigali
@@ -397,6 +401,7 @@ lib/tcl%%TCL_VER%%/tclooConfig.sh
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Coral_Harbour
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Cordoba
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Costa_Rica
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Creston
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Cuiaba
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Curacao
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Danmarkshavn
@@ -556,6 +561,7 @@ lib/tcl%%TCL_VER%%/tclooConfig.sh
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Dushanbe
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Gaza
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Harbin
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Hebron
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Ho_Chi_Minh
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Hong_Kong
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Hovd
@@ -875,3 +881,8 @@ libdata/pkgconfig/tcl.pc
 @dirrm include/tcl%%TCL_VER%%/unix
 @dirrm include/tcl%%TCL_VER%%/generic
 @dirrm include/tcl%%TCL_VER%%
+@dirrmtry lib/tcl8/%%TCL_VER%%
+@dirrmtry lib/tcl8/8.5
+@dirrmtry lib/tcl8/8.4/platform
+@dirrmtry lib/tcl8/8.4
+@dirrmtry lib/tcl8