Date: Tue, 12 May 2026 17:39:31 +0000 From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2ce64c48a7de - main - lang/tcl86, x11-toolkits/tk86: update to 8.6.18 Message-ID: <6a0365d3.414f3.331fdd5d@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by gahr: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ce64c48a7de0a5631c290e21a7802c69f493cbc commit 2ce64c48a7de0a5631c290e21a7802c69f493cbc Author: Pietro Cerutti <gahr@FreeBSD.org> AuthorDate: 2026-05-12 17:38:08 +0000 Commit: Pietro Cerutti <gahr@FreeBSD.org> CommitDate: 2026-05-12 17:39:12 +0000 lang/tcl86, x11-toolkits/tk86: update to 8.6.18 Announcement: https://sourceforge.net/p/tcl/mailman/message/59333692/ --- lang/tcl86/Makefile | 5 ++- lang/tcl86/distinfo | 6 +-- lang/tcl86/files/patch-unix-Makefile.in | 71 ++++++------------------------ lang/tcl86/files/patch-unix-installManPage | 4 +- lang/tcl86/files/patch-unix-tclUnixInit.c | 4 +- lang/tcl86/pkg-plist | 6 +-- x11-toolkits/tk86/Makefile | 2 +- x11-toolkits/tk86/distinfo | 6 +-- 8 files changed, 32 insertions(+), 72 deletions(-) diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile index 86fbfdff67b8..d68cf9f3da91 100644 --- a/lang/tcl86/Makefile +++ b/lang/tcl86/Makefile @@ -48,7 +48,7 @@ ALL_TARGET= all INSTALL_TARGET= install-strip install-libraries install-private-headers TEST_TARGET= test-tcl -TCL_VERSION= 8.6.17 +TCL_VERSION= 8.6.18 TCL_VER= ${TCL_VERSION:R} TCL_RC= SHORT_TCL_VER= ${TCL_VER:S/.//} @@ -81,6 +81,9 @@ post-patch: s|@TCL_BUILD_STUB_LIB_PATH@|@TCL_STUB_LIB_PATH@|; \ s|@TCL_SRC_DIR@|${PREFIX}/include/tcl${TCL_VER}|' \ ${PATCH_WRKSRC}/unix/tclConfig.sh.in + ${REINPLACE_CMD} -e \ + 's|MODULE_INSTALL_DIR)/8.[56]|SCRIPT_INSTALL_DIR)|' \ + ${PATCH_WRKSRC}/unix/Makefile.in post-patch-TCLMAN-off: @${FIND} ${PATCH_WRKSRC}/pkgs -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \ diff --git a/lang/tcl86/distinfo b/lang/tcl86/distinfo index 4fbe308ac569..6c57caf6e83b 100644 --- a/lang/tcl86/distinfo +++ b/lang/tcl86/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1755510767 -SHA256 (tcl8.6.17-src.tar.gz) = a3903371efcce8a405c5c245d029e9f6850258a60fa3761c4d58995610949b31 -SIZE (tcl8.6.17-src.tar.gz) = 11724552 +TIMESTAMP = 1778590378 +SHA256 (tcl8.6.18-src.tar.gz) = 14f9af32b1767ff718477a8f974ad03c34341097e6b43f4ce54644ee974e268e +SIZE (tcl8.6.18-src.tar.gz) = 11816279 diff --git a/lang/tcl86/files/patch-unix-Makefile.in b/lang/tcl86/files/patch-unix-Makefile.in index 3c6e1c559c29..17183ce026f3 100644 --- a/lang/tcl86/files/patch-unix-Makefile.in +++ b/lang/tcl86/files/patch-unix-Makefile.in @@ -1,6 +1,6 @@ ---- unix/Makefile.in.orig 2024-08-26 17:56:52.000000000 +0000 -+++ unix/Makefile.in 2024-09-09 06:46:52.429118000 +0000 -@@ -58,6 +58,8 @@ +--- unix/Makefile.in.orig 2026-04-17 18:51:37 UTC ++++ unix/Makefile.in +@@ -58,6 +58,8 @@ INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) # 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@ -@@ -84,10 +86,10 @@ +@@ -84,10 +86,10 @@ HTML_INSTALL_DIR = $(INSTALL_ROOT)$(HTML_DIR) HTML_INSTALL_DIR = $(INSTALL_ROOT)$(HTML_DIR) # Directory in which to install the configuration file tclConfig.sh @@ -22,7 +22,7 @@ # Package search path. TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@ -@@ -151,7 +153,7 @@ +@@ -151,7 +153,7 @@ INSTALL_STRIP_PROGRAM = strip # distribution, which is slower but guaranteed to work. INSTALL_STRIP_PROGRAM = strip @@ -31,7 +31,7 @@ INSTALL = $(SHELL) $(UNIX_DIR)/install-sh -c INSTALL_PROGRAM = ${INSTALL} -@@ -622,9 +624,9 @@ +@@ -622,9 +624,9 @@ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(NOTIFY_SRCS) \ # Start of rules #-------------------------------------------------------------------------- @@ -43,7 +43,7 @@ libraries: -@@ -635,7 +637,13 @@ +@@ -635,7 +637,13 @@ ${LIB_FILE}: ${STUB_LIB_FILE} ${OBJS} ${LIB_FILE}: ${STUB_LIB_FILE} ${OBJS} rm -f $@ @MAKE_LIB@ @@ -57,7 +57,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); \ -@@ -787,13 +795,13 @@ +@@ -787,13 +795,13 @@ trace-test: ${TCLTEST_EXE} # Installation rules #-------------------------------------------------------------------------- @@ -74,7 +74,7 @@ install: $(INSTALL_TARGETS) -@@ -813,6 +821,11 @@ +@@ -813,6 +821,11 @@ install-binaries: binaries @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" @@ -86,7 +86,7 @@ @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)/" -@@ -825,33 +838,19 @@ +@@ -825,33 +838,19 @@ install-binaries: binaries @INSTALL_STUB_LIB@ ; \ fi @EXTRA_INSTALL_BINARIES@ @@ -95,7 +95,7 @@ - @$(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" ++ @$(INSTALL_DATA) tcl.pc "$(INSTALL_ROOT)/$(prefix)/libdata/pkgconfig/tcl86.pc" install-libraries: libraries - @for i in "$(SCRIPT_INSTALL_DIR)" "$(MODULE_INSTALL_DIR)"; \ @@ -114,7 +114,7 @@ else true; \ fi; \ done; -- @for i in 8.4 8.4/platform 8.5 8.6; \ +- @for i in 8.5 8.6 8.6/platform; \ - do \ - if [ ! -d "$(MODULE_INSTALL_DIR)/$$i" ] ; then \ - echo "Making directory $(MODULE_INSTALL_DIR)/$$i"; \ @@ -124,50 +124,7 @@ @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@ ; do \ -@@ -864,32 +863,32 @@ - done - @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 - @echo "Installing package msgcat 1.6.1 as a Tcl Module" - @$(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.10 as a Tcl Module" - @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl \ -- "$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.10.tm" -+ "$(SCRIPT_INSTALL_DIR)/tcltest-2.5.10.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.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" -+ "$(SCRIPT_INSTALL_DIR)/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 -- @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 [list $(TCL_MODULE_PATH)] }" >> \ -- "$(SCRIPT_INSTALL_DIR)/tm.tcl"; \ -- fi -+ @echo "Customizing tcl module path"; -+ echo "if {![interp issafe]} { ::tcl::tm::roots {$(TCL_MODULE_PATH)} }" >> \ -+ "$(SCRIPT_INSTALL_DIR)"/tm.tcl; -+ echo "::tcl::tm::path add {$(TCL_LIBRARY)}" >> \ -+ "$(SCRIPT_INSTALL_DIR)"/tm.tcl; - - install-tzdata: - @for i in tzdata; do \ -@@ -956,7 +955,7 @@ +@@ -956,7 +955,7 @@ install-headers: done install-headers: @@ -176,7 +133,7 @@ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ $(INSTALL_DATA_DIR) "$$i"; \ -@@ -971,23 +970,22 @@ +@@ -971,23 +970,22 @@ install-headers: do \ $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \ done diff --git a/lang/tcl86/files/patch-unix-installManPage b/lang/tcl86/files/patch-unix-installManPage index 37c4c20d0bd7..cb6dde8906fc 100644 --- a/lang/tcl86/files/patch-unix-installManPage +++ b/lang/tcl86/files/patch-unix-installManPage @@ -1,6 +1,6 @@ ---- unix/installManPage.orig 2020-12-11 19:22:34 UTC +--- unix/installManPage.orig 2026-04-17 18:51:37 UTC +++ unix/installManPage -@@ -108,7 +108,7 @@ done +@@ -124,7 +124,7 @@ for Target in $Names; do First="" for Target in $Names; do diff --git a/lang/tcl86/files/patch-unix-tclUnixInit.c b/lang/tcl86/files/patch-unix-tclUnixInit.c index 64b12ead8a86..3d5759fac515 100644 --- a/lang/tcl86/files/patch-unix-tclUnixInit.c +++ b/lang/tcl86/files/patch-unix-tclUnixInit.c @@ -1,6 +1,6 @@ ---- unix/tclUnixInit.c.orig 2020-12-11 17:46:23 UTC +--- unix/tclUnixInit.c.orig 2026-04-17 18:51:37 UTC +++ unix/tclUnixInit.c -@@ -395,14 +395,6 @@ TclpInitPlatform(void) +@@ -391,14 +391,6 @@ TclpInitPlatform(void) #endif /* SIGPIPE */ #if defined(__FreeBSD__) && defined(__GNUC__) diff --git a/lang/tcl86/pkg-plist b/lang/tcl86/pkg-plist index 38cbcb12a94c..522f910952f5 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.8.tm +lib/tcl%%TCL_VER%%/http-2.9.9.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.19.tm +lib/tcl%%TCL_VER%%/platform-1.1.0.tm lib/tcl%%TCL_VER%%/platform/shell-1.1.4.tm -lib/tcl%%TCL_VER%%/tcltest-2.5.10.tm +lib/tcl%%TCL_VER%%/tcltest-2.5.11.tm lib/tcl%%TCL_VER%%/auto.tcl lib/tcl%%TCL_VER%%/clock.tcl lib/tcl%%TCL_VER%%/encoding/ascii.enc diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile index 4aac4bd2f38c..e5d4b7a388a5 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.17 +TK_VERSION= 8.6.18 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 5ae7561e9207..6bb0cfe9d252 100644 --- a/x11-toolkits/tk86/distinfo +++ b/x11-toolkits/tk86/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1755519875 -SHA256 (tk8.6.17-src.tar.gz) = e4982df6f969c08bf9dd858a6891059b4a3f50dc6c87c10abadbbe2fc4838946 -SIZE (tk8.6.17-src.tar.gz) = 4593109 +TIMESTAMP = 1778598923 +SHA256 (tk8.6.18-src.tar.gz) = 95cd528a80f5e4bdb557af9b14a7197d6860793a3894e25e7c9fad2ed05d4c3c +SIZE (tk8.6.18-src.tar.gz) = 4600288home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a0365d3.414f3.331fdd5d>