From c98fe22da061cfc1b81bd6e0556630a8ecfb208e Mon Sep 17 00:00:00 2001
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Wed, 23 Nov 2022 08:57:45 +0000
Subject: [PATCH] lang/tcl86, x11-toolkits/tk86: update to 8.6.13

Announcement: https://sourceforge.net/p/tcl/mailman/message/37738603/
---
 lang/tcl86/Makefile                     |  2 +-
 lang/tcl86/distinfo                     |  6 +--
 lang/tcl86/files/patch-unix-Makefile.in | 59 ++++++++++++-------------
 lang/tcl86/pkg-plist                    |  9 ++--
 x11-toolkits/tk86/Makefile              |  2 +-
 x11-toolkits/tk86/distinfo              |  6 +--
 x11-toolkits/tk86/pkg-plist             |  3 ++
 7 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile
index c350a06eaa37..150445ac2ad5 100644
--- a/lang/tcl86/Makefile
+++ b/lang/tcl86/Makefile
@@ -47,7 +47,7 @@ ALL_TARGET=	all
 INSTALL_TARGET=	install-strip install-libraries install-private-headers
 TEST_TARGET=	test-tcl
 
-TCL_VERSION=	8.6.12
+TCL_VERSION=	8.6.13
 TCL_VER=	${TCL_VERSION:R}
 TCL_RC=
 SHORT_TCL_VER=	${TCL_VER:S/.//}
diff --git a/lang/tcl86/distinfo b/lang/tcl86/distinfo
index 623e6426fb8d..87c6c15d1ceb 100644
--- a/lang/tcl86/distinfo
+++ b/lang/tcl86/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1636356651
-SHA256 (tcl8.6.12-src.tar.gz) = 26c995dd0f167e48b11961d891ee555f680c175f7173ff8cb829f4ebcde4c1a6
-SIZE (tcl8.6.12-src.tar.gz) = 10353486
+TIMESTAMP = 1669190690
+SHA256 (tcl8.6.13-src.tar.gz) = 43a1fae7412f61ff11de2cfd05d28cfc3a73762f354a417c62370a54e2caf066
+SIZE (tcl8.6.13-src.tar.gz) = 10834396
diff --git a/lang/tcl86/files/patch-unix-Makefile.in b/lang/tcl86/files/patch-unix-Makefile.in
index c753356406aa..8317abb8db62 100644
--- a/lang/tcl86/files/patch-unix-Makefile.in
+++ b/lang/tcl86/files/patch-unix-Makefile.in
@@ -1,4 +1,4 @@
---- unix/Makefile.in.orig	2021-10-29 17:08:08 UTC
+--- unix/Makefile.in.orig	2022-10-28 18:34:26 UTC
 +++ unix/Makefile.in
 @@ -58,6 +58,8 @@ MODULE_INSTALL_DIR	= $(SCRIPT_INSTALL_DIR)/../tcl8
  
@@ -22,7 +22,7 @@
  
  # Package search path.
  TCL_PACKAGE_PATH	= @TCL_PACKAGE_PATH@
-@@ -709,9 +711,9 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $(UNIX_SRCS) $(
+@@ -713,9 +715,9 @@ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(NOTIFY_SRCS) \
  # Start of rules
  #--------------------------------------------------------------------------
  
@@ -34,7 +34,7 @@
  
  libraries:
  
-@@ -722,7 +724,13 @@ doc:
+@@ -726,7 +728,13 @@ doc:
  ${LIB_FILE}: ${STUB_LIB_FILE} ${OBJS}
  	rm -f $@
  	@MAKE_LIB@
@@ -48,7 +48,7 @@
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	@if test "x${LIB_FILE}" = "xlibtcl${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \
  	    (cd ${TOP_DIR}/win; ${MAKE} winextensions); \
-@@ -868,13 +876,13 @@ trace-test: ${TCLTEST_EXE}
+@@ -875,13 +883,13 @@ trace-test: ${TCLTEST_EXE}
  # Installation rules
  #--------------------------------------------------------------------------
  
@@ -65,7 +65,7 @@
  
  install: $(INSTALL_TARGETS)
  
-@@ -894,6 +902,11 @@ install-binaries: binaries
+@@ -901,6 +909,11 @@ install-binaries: binaries
  	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
  	@@INSTALL_LIB@
  	@chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
@@ -77,16 +77,16 @@
  	@echo "Installing ${TCL_EXE} as $(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)/"
-@@ -906,35 +919,19 @@ install-binaries: binaries
+@@ -913,33 +926,19 @@ install-binaries: binaries
  	    @INSTALL_STUB_LIB@ ; \
  	fi
  	@EXTRA_INSTALL_BINARIES@
 -	@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/"
 -	@$(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/pkgconfig"
 -	@$(INSTALL_DATA) tcl.pc "$(LIB_INSTALL_DIR)/pkgconfig/tcl.pc"
-+	@echo "Installing pkg-config file to $(prefix)/libdata/pkgconfig"
-+	@$(INSTALL_DATA_DIR) $(INSTALL_ROOT)$(prefix)/libdata/pkgconfig
-+	@$(INSTALL_DATA) tcl.pc $(INSTALL_ROOT)$(prefix)/libdata/pkgconfig/tcl86.pc
++	@echo "Installing pkg-config file to $(prefix)/libdata/pkgconfig/"
++	@$(INSTALL_DATA_DIR) "$(INSTALL_ROOT)$(prefix)/libdata/pkgconfig"
++	@$(INSTALL_DATA) tcl.pc "$(INSTALL_ROOT)$(prefix)/libdata/pkgconfig/tcl86.pc"
  
  install-libraries: libraries
 -	@for i in "$(SCRIPT_INSTALL_DIR)" "$(MODULE_INSTALL_DIR)"; \
@@ -95,8 +95,7 @@
 -	    if [ ! -d "$$i" ] ; then \
 -		echo "Making directory $$i"; \
 -		$(INSTALL_DATA_DIR) "$$i"; \
--		else true; \
--		fi; \
+-	    fi; \
 -	    done;
 -	@for i in opt0.4 http1.0 encoding; \
 -	    do \
@@ -111,19 +110,18 @@
 -	    if [ ! -d "$(MODULE_INSTALL_DIR)/$$i" ] ; then \
 -		echo "Making directory $(MODULE_INSTALL_DIR)/$$i"; \
 -		$(INSTALL_DATA_DIR) "$(MODULE_INSTALL_DIR)/$$i"; \
--		else true; \
--		fi; \
+-	    fi; \
 -	    done;
- 	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)/";
+ 	@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@; \
-@@ -947,32 +944,32 @@ install-libraries: libraries
- 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/http1.0"; \
+ 		$(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@ ; do \
+@@ -952,32 +951,32 @@ install-libraries: libraries
  	    done
- 	@echo "Installing package http 2.9.5 as a Tcl Module";
--	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(MODULE_INSTALL_DIR)/8.6/http-2.9.5.tm"
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)/http-2.9.5.tm"
- 	@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
+ 	@echo "Installing package http 2.9.8 as a Tcl Module";
+ 	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl \
+-		"$(MODULE_INSTALL_DIR)/8.6/http-2.9.8.tm"
++		"$(SCRIPT_INSTALL_DIR)/http-2.9.8.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
@@ -131,20 +129,19 @@
  	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl \
 -		"$(MODULE_INSTALL_DIR)/8.5/msgcat-1.6.1.tm"
 +		"$(SCRIPT_INSTALL_DIR)/msgcat-1.6.1.tm"
- 	@echo "Installing package tcltest 2.5.3 as a Tcl Module"
+ 	@echo "Installing package tcltest 2.5.5 as a Tcl Module"
  	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl \
--		"$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.3.tm"
-+		"$(SCRIPT_INSTALL_DIR)/tcltest-2.5.3.tm"
- 	@echo "Installing package platform 1.0.18 as a Tcl Module"
+-		"$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.5.tm"
++		"$(SCRIPT_INSTALL_DIR)/tcltest-2.5.5.tm"
+ 	@echo "Installing package platform 1.0.19 as a Tcl Module"
  	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl \
--		"$(MODULE_INSTALL_DIR)/8.4/platform-1.0.18.tm"
-+		"$(SCRIPT_INSTALL_DIR)/platform-1.0.18.tm"
+-		"$(MODULE_INSTALL_DIR)/8.4/platform-1.0.19.tm"
++		"$(SCRIPT_INSTALL_DIR)/platform-1.0.19.tm"
  	@echo "Installing package platform::shell 1.1.4 as a Tcl Module"
  	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl \
 -		"$(MODULE_INSTALL_DIR)/8.4/platform/shell-1.1.4.tm"
--	@echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"
 +		"$(SCRIPT_INSTALL_DIR)/platform/shell-1.1.4.tm"
-+	@echo "Installing 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 \
  		$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/encoding"; \
  	done
@@ -161,7 +158,7 @@
  
  install-tzdata:
  	@for i in tzdata; do \
-@@ -1039,7 +1036,7 @@ install-doc: doc
+@@ -1044,7 +1043,7 @@ install-doc: doc
  	done
  
  install-headers:
@@ -170,7 +167,7 @@
  	    if [ ! -d "$$i" ] ; then \
  		echo "Making directory $$i"; \
  		$(INSTALL_DATA_DIR) "$$i"; \
-@@ -1054,23 +1051,22 @@ install-headers:
+@@ -1059,23 +1058,22 @@ install-headers:
  	    do \
  	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
  	done
diff --git a/lang/tcl86/pkg-plist b/lang/tcl86/pkg-plist
index d70f2c933843..bad52770fc82 100644
--- a/lang/tcl86/pkg-plist
+++ b/lang/tcl86/pkg-plist
@@ -39,15 +39,15 @@ include/tcl%%TCL_VER%%/tclOO.h
 include/tcl%%TCL_VER%%/tclOODecls.h
 include/tcl%%TCL_VER%%/tclTomMath.h
 include/tcl%%TCL_VER%%/tclTomMathDecls.h
-lib/tcl%%TCL_VER%%/http-2.9.5.tm
+lib/tcl%%TCL_VER%%/http-2.9.8.tm
 lib/tcl%%TCL_VER%%/http1.0/http.tcl
 lib/tcl%%TCL_VER%%/http1.0/pkgIndex.tcl
 lib/tcl%%TCL_VER%%/msgcat-1.6.1.tm
 lib/tcl%%TCL_VER%%/opt0.4/optparse.tcl
 lib/tcl%%TCL_VER%%/opt0.4/pkgIndex.tcl
-lib/tcl%%TCL_VER%%/platform-1.0.18.tm
+lib/tcl%%TCL_VER%%/platform-1.0.19.tm
 lib/tcl%%TCL_VER%%/platform/shell-1.1.4.tm
-lib/tcl%%TCL_VER%%/tcltest-2.5.3.tm
+lib/tcl%%TCL_VER%%/tcltest-2.5.5.tm
 lib/tcl%%TCL_VER%%/auto.tcl
 lib/tcl%%TCL_VER%%/clock.tcl
 lib/tcl%%TCL_VER%%/encoding/ascii.enc
@@ -1467,7 +1467,6 @@ lib/tcl%%TCL_VER%%/word.tcl
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Brazil/West
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Canada/Atlantic
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Canada/Central
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Canada/East-Saskatchewan
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Canada/Eastern
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Canada/Mountain
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Canada/Newfoundland
@@ -1542,6 +1541,7 @@ lib/tcl%%TCL_VER%%/word.tcl
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Jersey
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Kaliningrad
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Kiev
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Kyiv
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Kirov
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Lisbon
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Ljubljana
@@ -1696,7 +1696,6 @@ lib/tcl%%TCL_VER%%/word.tcl
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Michigan
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Mountain
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Pacific
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Pacific-New
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Samoa
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/UTC
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/W-SU
diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile
index 046131f023ee..9fa38295af12 100644
--- a/x11-toolkits/tk86/Makefile
+++ b/x11-toolkits/tk86/Makefile
@@ -43,7 +43,7 @@ CONFIGURE_ENV=	PORTSDIR=${PORTSDIR}
 CFLAGS+=	-I${TCL_INCLUDEDIR} \
 		-I${LOCALBASE}/include
 
-TK_VERSION=	8.6.12
+TK_VERSION=	8.6.13
 TK_VER=		${TK_VERSION:R}
 TK_RC=
 SHORT_TK_VER=	${TK_VER:S/.//}
diff --git a/x11-toolkits/tk86/distinfo b/x11-toolkits/tk86/distinfo
index bd9107ce1cca..88f1b31bd5f6 100644
--- a/x11-toolkits/tk86/distinfo
+++ b/x11-toolkits/tk86/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1636356842
-SHA256 (tk8.6.12-src.tar.gz) = 12395c1f3fcb6bed2938689f797ea3cdf41ed5cb6c4766eec8ac949560310630
-SIZE (tk8.6.12-src.tar.gz) = 4515393
+TIMESTAMP = 1669193492
+SHA256 (tk8.6.13-src.tar.gz) = 2e65fa069a23365440a3c56c556b8673b5e32a283800d8d9b257e3f584ce0675
+SIZE (tk8.6.13-src.tar.gz) = 4546848
diff --git a/x11-toolkits/tk86/pkg-plist b/x11-toolkits/tk86/pkg-plist
index 20f0fe71db7e..036cef15da09 100644
--- a/x11-toolkits/tk86/pkg-plist
+++ b/x11-toolkits/tk86/pkg-plist
@@ -34,6 +34,7 @@ include/tk%%TK_VER%%/tkIntXlibDecls.h
 include/tk%%TK_VER%%/unix/tkUnixDefault.h
 include/tk%%TK_VER%%/unix/tkUnixInt.h
 include/tk%%TK_VER%%/unix/tkUnixPort.h
+include/tk%%TK_VER%%/unix/tkUuid.h
 lib/libtk%%SHORT_TK_VER%%.a
 lib/libtk%%SHORT_TK_VER%%.so
 lib/libtk%%SHORT_TK_VER%%.so.1
@@ -161,6 +162,7 @@ lib/tk%%TK_VER%%/msgs/en.msg
 lib/tk%%TK_VER%%/msgs/en_gb.msg
 lib/tk%%TK_VER%%/msgs/eo.msg
 lib/tk%%TK_VER%%/msgs/es.msg
+lib/tk%%TK_VER%%/msgs/fi.msg
 lib/tk%%TK_VER%%/msgs/fr.msg
 lib/tk%%TK_VER%%/msgs/hu.msg
 lib/tk%%TK_VER%%/msgs/it.msg
@@ -169,6 +171,7 @@ lib/tk%%TK_VER%%/msgs/pl.msg
 lib/tk%%TK_VER%%/msgs/pt.msg
 lib/tk%%TK_VER%%/msgs/ru.msg
 lib/tk%%TK_VER%%/msgs/sv.msg
+lib/tk%%TK_VER%%/msgs/zh_cn.msg
 lib/tk%%TK_VER%%/obsolete.tcl
 lib/tk%%TK_VER%%/optMenu.tcl
 lib/tk%%TK_VER%%/palette.tcl