Date: Tue, 5 Mar 2024 07:00:52 GMT 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: 83a177552f52 - main - lang/tcl86, x11-toolkits/tk86: update to 8.6.14 Message-ID: <202403050700.42570qua042397@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by gahr: URL: https://cgit.FreeBSD.org/ports/commit/?id=83a177552f5227992448de6fb80b3b7f0cb03810 commit 83a177552f5227992448de6fb80b3b7f0cb03810 Author: Pietro Cerutti <gahr@FreeBSD.org> AuthorDate: 2024-03-04 10:29:34 +0000 Commit: Pietro Cerutti <gahr@FreeBSD.org> CommitDate: 2024-03-05 07:00:50 +0000 lang/tcl86, x11-toolkits/tk86: update to 8.6.14 Announcement: https://sourceforge.net/p/tcl/mailman/message/58743251/ --- lang/tcl86/Makefile | 2 +- lang/tcl86/distinfo | 6 ++--- lang/tcl86/files/patch-unix-Makefile.in | 37 ++++++++++++------------------- lang/tcl86/pkg-plist | 3 ++- x11-toolkits/tk86/Makefile | 2 +- x11-toolkits/tk86/distinfo | 6 ++--- x11-toolkits/tk86/files/patch-Makefile.in | 9 -------- 7 files changed, 24 insertions(+), 41 deletions(-) diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile index ccf2417fb942..edd00c861ab0 100644 --- a/lang/tcl86/Makefile +++ b/lang/tcl86/Makefile @@ -49,7 +49,7 @@ ALL_TARGET= all INSTALL_TARGET= install-strip install-libraries install-private-headers TEST_TARGET= test-tcl -TCL_VERSION= 8.6.13 +TCL_VERSION= 8.6.14 TCL_VER= ${TCL_VERSION:R} TCL_RC= SHORT_TCL_VER= ${TCL_VER:S/.//} diff --git a/lang/tcl86/distinfo b/lang/tcl86/distinfo index 87c6c15d1ceb..66899a4a7ee0 100644 --- a/lang/tcl86/distinfo +++ b/lang/tcl86/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1669190690 -SHA256 (tcl8.6.13-src.tar.gz) = 43a1fae7412f61ff11de2cfd05d28cfc3a73762f354a417c62370a54e2caf066 -SIZE (tcl8.6.13-src.tar.gz) = 10834396 +TIMESTAMP = 1709195396 +SHA256 (tcl8.6.14-src.tar.gz) = 5880225babf7954c58d4fb0f5cf6279104ce1cd6aa9b71e9a6322540e1c4de66 +SIZE (tcl8.6.14-src.tar.gz) = 11627322 diff --git a/lang/tcl86/files/patch-unix-Makefile.in b/lang/tcl86/files/patch-unix-Makefile.in index 129c0afce1be..b846f5ec0a22 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 2022-10-28 18:34:26 UTC +--- unix/Makefile.in.orig 2024-02-14 19:11:11 UTC +++ unix/Makefile.in -@@ -58,6 +58,8 @@ MODULE_INSTALL_DIR = $(SCRIPT_INSTALL_DIR)/../tcl8 +@@ -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 @@ HTML_DIR = @HTML_DIR@ +@@ -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,16 +22,7 @@ # Package search path. TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@ -@@ -151,7 +153,7 @@ SHELL = @MAKEFILE_SHELL@ - # distribution, which is slower but guaranteed to work. - - INSTALL_STRIP_PROGRAM = -s --INSTALL_STRIP_LIBRARY = -S -x -+INSTALL_STRIP_LIBRARY = -S --strip-unneeded - - INSTALL = $(SHELL) $(UNIX_DIR)/install-sh -c - INSTALL_PROGRAM = ${INSTALL} -@@ -713,9 +715,9 @@ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(NOTIFY_SRCS) \ +@@ -714,9 +716,9 @@ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(NOTIFY_SRCS) \ # Start of rules #-------------------------------------------------------------------------- @@ -43,7 +34,7 @@ libraries: -@@ -726,7 +728,13 @@ doc: +@@ -727,7 +729,13 @@ ${LIB_FILE}: ${STUB_LIB_FILE} ${OBJS} ${LIB_FILE}: ${STUB_LIB_FILE} ${OBJS} rm -f $@ @MAKE_LIB@ @@ -57,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); \ -@@ -875,13 +883,13 @@ trace-test: ${TCLTEST_EXE} +@@ -879,13 +887,13 @@ trace-test: ${TCLTEST_EXE} # Installation rules #-------------------------------------------------------------------------- @@ -74,7 +65,7 @@ install: $(INSTALL_TARGETS) -@@ -901,6 +909,11 @@ install-binaries: binaries +@@ -905,6 +913,11 @@ install-binaries: binaries @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" @@ -86,7 +77,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)/" -@@ -913,33 +926,19 @@ install-binaries: binaries +@@ -917,33 +930,19 @@ install-binaries: binaries @INSTALL_STUB_LIB@ ; \ fi @EXTRA_INSTALL_BINARIES@ @@ -124,7 +115,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 \ -@@ -952,32 +951,32 @@ install-libraries: libraries +@@ -956,32 +955,32 @@ install-libraries: libraries done @echo "Installing package http 2.9.8 as a Tcl Module"; @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl \ @@ -138,10 +129,10 @@ @$(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.5 as a Tcl Module" + @echo "Installing package tcltest 2.5.7 as a Tcl Module" @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl \ -- "$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.5.tm" -+ "$(SCRIPT_INSTALL_DIR)/tcltest-2.5.5.tm" +- "$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.7.tm" ++ "$(SCRIPT_INSTALL_DIR)/tcltest-2.5.7.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" @@ -167,7 +158,7 @@ install-tzdata: @for i in tzdata; do \ -@@ -1044,7 +1043,7 @@ install-doc: doc +@@ -1048,7 +1047,7 @@ install-headers: done install-headers: @@ -176,7 +167,7 @@ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ $(INSTALL_DATA_DIR) "$$i"; \ -@@ -1059,23 +1058,22 @@ install-headers: +@@ -1063,23 +1062,22 @@ install-headers: do \ $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \ done diff --git a/lang/tcl86/pkg-plist b/lang/tcl86/pkg-plist index 307dac400625..3951ef37b253 100644 --- a/lang/tcl86/pkg-plist +++ b/lang/tcl86/pkg-plist @@ -47,7 +47,7 @@ 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/shell-1.1.4.tm -lib/tcl%%TCL_VER%%/tcltest-2.5.5.tm +lib/tcl%%TCL_VER%%/tcltest-2.5.7.tm lib/tcl%%TCL_VER%%/auto.tcl lib/tcl%%TCL_VER%%/clock.tcl lib/tcl%%TCL_VER%%/encoding/ascii.enc @@ -1188,6 +1188,7 @@ lib/tcl%%TCL_VER%%/word.tcl %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Cayman %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Chicago %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Chihuahua +%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Ciudad_Juarez %%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 diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile index b0ef23b3f963..65b3131819ce 100644 --- a/x11-toolkits/tk86/Makefile +++ b/x11-toolkits/tk86/Makefile @@ -44,7 +44,7 @@ CONFIGURE_ENV= PORTSDIR=${PORTSDIR} CFLAGS+= -I${TCL_INCLUDEDIR} \ -I${LOCALBASE}/include -TK_VERSION= 8.6.13 +TK_VERSION= 8.6.14 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 88f1b31bd5f6..0fd601d1f837 100644 --- a/x11-toolkits/tk86/distinfo +++ b/x11-toolkits/tk86/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1669193492 -SHA256 (tk8.6.13-src.tar.gz) = 2e65fa069a23365440a3c56c556b8673b5e32a283800d8d9b257e3f584ce0675 -SIZE (tk8.6.13-src.tar.gz) = 4546848 +TIMESTAMP = 1709547877 +SHA256 (tk8.6.14-src.tar.gz) = 8ffdb720f47a6ca6107eac2dd877e30b0ef7fac14f3a84ebbd0b3612cee41a94 +SIZE (tk8.6.14-src.tar.gz) = 4510695 diff --git a/x11-toolkits/tk86/files/patch-Makefile.in b/x11-toolkits/tk86/files/patch-Makefile.in index c531e2577899..3f7926d5dfa2 100644 --- a/x11-toolkits/tk86/files/patch-Makefile.in +++ b/x11-toolkits/tk86/files/patch-Makefile.in @@ -18,15 +18,6 @@ # Directory in which to install the demo files: DEMO_INSTALL_DIR = $(INSTALL_ROOT)$(TK_LIBRARY)/demos -@@ -220,7 +222,7 @@ TKTEST_EXE = tktest${EXE_SUFFIX} - # with the distribution, which is slower but guaranteed to work. - - INSTALL_STRIP_PROGRAM = -s --INSTALL_STRIP_LIBRARY = -S -x -+INSTALL_STRIP_LIBRARY = -S --strip-unneeded - - INSTALL = $(SHELL) $(UNIX_DIR)/install-sh -c - INSTALL_PROGRAM = ${INSTALL} @@ -561,6 +563,8 @@ TTK_HDRS = $(TTK_DIR)/ttkTheme.h $(TTK_DIR)/ttkDecls.h PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \ $(GENERIC_DIR)/tkPlatDecls.h $(@TK_WINDOWINGSYSTEM@_HDRS)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403050700.42570qua042397>