summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lang/tcl86/Makefile2
-rw-r--r--lang/tcl86/distinfo6
-rw-r--r--lang/tcl86/files/patch-unix-Makefile.in36
-rw-r--r--lang/tcl86/files/patch-unix-configure10
-rw-r--r--lang/tcl86/pkg-plist5
-rw-r--r--x11-toolkits/tk86/Makefile4
-rw-r--r--x11-toolkits/tk86/distinfo6
-rw-r--r--x11-toolkits/tk86/pkg-plist21
8 files changed, 47 insertions, 43 deletions
diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile
index b2097dd37362..9438eb068301 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.14
+TCL_VERSION= 8.6.15
TCL_VER= ${TCL_VERSION:R}
TCL_RC=
SHORT_TCL_VER= ${TCL_VER:S/.//}
diff --git a/lang/tcl86/distinfo b/lang/tcl86/distinfo
index 66899a4a7ee0..5c6858e9b911 100644
--- a/lang/tcl86/distinfo
+++ b/lang/tcl86/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709195396
-SHA256 (tcl8.6.14-src.tar.gz) = 5880225babf7954c58d4fb0f5cf6279104ce1cd6aa9b71e9a6322540e1c4de66
-SIZE (tcl8.6.14-src.tar.gz) = 11627322
+TIMESTAMP = 1726509388
+SHA256 (tcl8.6.15-src.tar.gz) = 861e159753f2e2fbd6ec1484103715b0be56be3357522b858d3cbb5f893ffef1
+SIZE (tcl8.6.15-src.tar.gz) = 11765231
diff --git a/lang/tcl86/files/patch-unix-Makefile.in b/lang/tcl86/files/patch-unix-Makefile.in
index a4c5236e9b9a..2e7f3887f160 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-02-14 19:11:11 UTC
-+++ unix/Makefile.in
-@@ -58,6 +58,8 @@ INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
+--- 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 @@
# 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_INSTALL_DIR = $(INSTALL_ROOT)$(HTML_DIR)
+@@ -84,10 +86,10 @@
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 @@ INSTALL_STRIP_PROGRAM = strip
+@@ -151,7 +153,7 @@
# 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}
-@@ -714,9 +716,9 @@ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(NOTIFY_SRCS) \
+@@ -622,9 +624,9 @@
# Start of rules
#--------------------------------------------------------------------------
@@ -43,7 +43,7 @@
libraries:
-@@ -727,7 +729,13 @@ ${LIB_FILE}: ${STUB_LIB_FILE} ${OBJS}
+@@ -635,7 +637,13 @@
${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); \
-@@ -879,13 +887,13 @@ trace-test: ${TCLTEST_EXE}
+@@ -787,13 +795,13 @@
# Installation rules
#--------------------------------------------------------------------------
@@ -74,7 +74,7 @@
install: $(INSTALL_TARGETS)
-@@ -905,6 +913,11 @@ install-binaries: binaries
+@@ -813,6 +821,11 @@
@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)/"
-@@ -917,33 +930,19 @@ install-binaries: binaries
+@@ -825,33 +838,19 @@
@INSTALL_STUB_LIB@ ; \
fi
@EXTRA_INSTALL_BINARIES@
@@ -124,7 +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 \
-@@ -956,32 +955,32 @@ install-libraries: libraries
+@@ -864,32 +863,32 @@
done
@echo "Installing package http 2.9.8 as a Tcl Module";
@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl \
@@ -138,10 +138,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.7 as a Tcl Module"
+ @echo "Installing package tcltest 2.5.8 as a Tcl Module"
@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl \
-- "$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.7.tm"
-+ "$(SCRIPT_INSTALL_DIR)/tcltest-2.5.7.tm"
+- "$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.8.tm"
++ "$(SCRIPT_INSTALL_DIR)/tcltest-2.5.8.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"
@@ -156,8 +156,8 @@
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 {$(TCL_MODULE_PATH)} }" >> \
-- "$(SCRIPT_INSTALL_DIR)/tm.tcl"; \
+- 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)} }" >> \
@@ -167,7 +167,7 @@
install-tzdata:
@for i in tzdata; do \
-@@ -1048,7 +1047,7 @@ install-headers:
+@@ -956,7 +955,7 @@
done
install-headers:
@@ -176,7 +176,7 @@
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
$(INSTALL_DATA_DIR) "$$i"; \
-@@ -1063,23 +1062,22 @@ install-headers:
+@@ -971,23 +970,22 @@
do \
$(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
done
diff --git a/lang/tcl86/files/patch-unix-configure b/lang/tcl86/files/patch-unix-configure
index a3e67dd721f4..07ce89570742 100644
--- a/lang/tcl86/files/patch-unix-configure
+++ b/lang/tcl86/files/patch-unix-configure
@@ -1,6 +1,6 @@
---- unix/configure.orig 2021-11-04 15:04:06 UTC
-+++ unix/configure
-@@ -7323,6 +7323,10 @@ fi
+--- unix/configure.orig 2024-09-06 16:02:44.000000000 +0000
++++ unix/configure 2024-09-09 06:50:30.736361000 +0000
+@@ -6364,6 +6364,10 @@
case $system in
DragonFly-*|FreeBSD-*)
@@ -8,6 +8,6 @@
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
+ TCL_LIB_VERSIONS_OK=nodots
- if test "${TCL_THREADS}" = "1"; then
+ if test "${TCL_THREADS}" = "1"
+ then :
- # The -pthread needs to go in the LDFLAGS, not LIBS
diff --git a/lang/tcl86/pkg-plist b/lang/tcl86/pkg-plist
index 3951ef37b253..929907cc9894 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.7.tm
+lib/tcl%%TCL_VER%%/tcltest-2.5.8.tm
lib/tcl%%TCL_VER%%/auto.tcl
lib/tcl%%TCL_VER%%/clock.tcl
lib/tcl%%TCL_VER%%/encoding/ascii.enc
@@ -113,6 +113,8 @@ lib/tcl%%TCL_VER%%/encoding/jis0201.enc
lib/tcl%%TCL_VER%%/encoding/jis0208.enc
lib/tcl%%TCL_VER%%/encoding/jis0212.enc
lib/tcl%%TCL_VER%%/encoding/koi8-r.enc
+lib/tcl%%TCL_VER%%/encoding/koi8-ru.enc
+lib/tcl%%TCL_VER%%/encoding/koi8-t.enc
lib/tcl%%TCL_VER%%/encoding/koi8-u.enc
lib/tcl%%TCL_VER%%/encoding/ksc5601.enc
lib/tcl%%TCL_VER%%/encoding/macCentEuro.enc
@@ -1019,6 +1021,7 @@ lib/tcl%%TCL_VER%%/word.tcl
%%TCLMAN%%share/man/mann/oo_define.tcl86.n.gz
%%TCLMAN%%share/man/mann/oo_objdefine.tcl86.n.gz
%%TCLMAN%%share/man/mann/oo_object.tcl86.n.gz
+%%TCLMAN%%share/man/mann/oo_Slot.tcl86.n.gz
%%TCLMAN%%share/man/mann/open.tcl86.n.gz
%%TCLMAN%%share/man/mann/package.tcl86.n.gz
%%TCLMAN%%share/man/mann/packagens.tcl86.n.gz
diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile
index 1c16cd1f0038..3253b3494c3a 100644
--- a/x11-toolkits/tk86/Makefile
+++ b/x11-toolkits/tk86/Makefile
@@ -1,6 +1,6 @@
PORTNAME= tk
DISTVERSION= ${TK_VERSION}${TK_RC}
-PORTREVISION= 2
+PORTREVISION= 0
CATEGORIES= x11-toolkits
MASTER_SITES= SF/tcl/Tcl/${TK_VERSION}
PKGNAMESUFFIX= ${SHORT_TK_VER}
@@ -44,7 +44,7 @@ CONFIGURE_ENV= PORTSDIR=${PORTSDIR}
CFLAGS+= -I${TCL_INCLUDEDIR} \
-I${LOCALBASE}/include
-TK_VERSION= 8.6.14
+TK_VERSION= 8.6.15
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 0fd601d1f837..1a5094d6a924 100644
--- a/x11-toolkits/tk86/distinfo
+++ b/x11-toolkits/tk86/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709547877
-SHA256 (tk8.6.14-src.tar.gz) = 8ffdb720f47a6ca6107eac2dd877e30b0ef7fac14f3a84ebbd0b3612cee41a94
-SIZE (tk8.6.14-src.tar.gz) = 4510695
+TIMESTAMP = 1726509808
+SHA256 (tk8.6.15-src.tar.gz) = 550969f35379f952b3020f3ab7b9dd5bfd11c1ef7c9b7c6a75f5c49aca793fec
+SIZE (tk8.6.15-src.tar.gz) = 4590766
diff --git a/x11-toolkits/tk86/pkg-plist b/x11-toolkits/tk86/pkg-plist
index f3de865d6883..8b033887fbf7 100644
--- a/x11-toolkits/tk86/pkg-plist
+++ b/x11-toolkits/tk86/pkg-plist
@@ -8,8 +8,8 @@ include/tk%%TK_VER%%/generic/tkBusy.h
include/tk%%TK_VER%%/generic/tkButton.h
include/tk%%TK_VER%%/generic/tkCanvas.h
include/tk%%TK_VER%%/generic/tkColor.h
-include/tk%%TK_VER%%/generic/tkDecls.h
include/tk%%TK_VER%%/generic/tkDList.h
+include/tk%%TK_VER%%/generic/tkDecls.h
include/tk%%TK_VER%%/generic/tkEntry.h
include/tk%%TK_VER%%/generic/tkFileFilter.h
include/tk%%TK_VER%%/generic/tkFont.h
@@ -39,7 +39,6 @@ lib/libtk%%SHORT_TK_VER%%.a
lib/libtk%%SHORT_TK_VER%%.so
lib/libtk%%SHORT_TK_VER%%.so.1
lib/libtkstub%%SHORT_TK_VER%%.a
-lib/tk%%TK_VER%%/pkgIndex.tcl
lib/tk%%TK_VER%%/bgerror.tcl
lib/tk%%TK_VER%%/button.tcl
lib/tk%%TK_VER%%/choosedir.tcl
@@ -126,6 +125,7 @@ lib/tk%%TK_VER%%/console.tcl
%%DEMOS%%lib/tk%%TK_VER%%/demos/ttkpane.tcl
%%DEMOS%%lib/tk%%TK_VER%%/demos/ttkprogress.tcl
%%DEMOS%%lib/tk%%TK_VER%%/demos/ttkscale.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/ttkspin.tcl
%%DEMOS%%lib/tk%%TK_VER%%/demos/twind.tcl
%%DEMOS%%lib/tk%%TK_VER%%/demos/unicodeout.tcl
%%DEMOS%%lib/tk%%TK_VER%%/demos/vscale.tcl
@@ -176,6 +176,7 @@ lib/tk%%TK_VER%%/obsolete.tcl
lib/tk%%TK_VER%%/optMenu.tcl
lib/tk%%TK_VER%%/palette.tcl
lib/tk%%TK_VER%%/panedwindow.tcl
+lib/tk%%TK_VER%%/pkgIndex.tcl
lib/tk%%TK_VER%%/safetk.tcl
lib/tk%%TK_VER%%/scale.tcl
lib/tk%%TK_VER%%/scrlbar.tcl
@@ -213,6 +214,7 @@ lib/tk%%TK_VER%%/ttk/winTheme.tcl
lib/tk%%TK_VER%%/ttk/xpTheme.tcl
lib/tk%%TK_VER%%/unsupported.tcl
lib/tk%%TK_VER%%/xmfbox.tcl
+libdata/pkgconfig/tk86.pc
%%TKMAN%%share/man/man1/wish.tk86.1.gz
%%TKMAN%%share/man/man3/FindPhoto.tk86.3.gz
%%TKMAN%%share/man/man3/FontId.tk86.3.gz
@@ -244,8 +246,8 @@ lib/tk%%TK_VER%%/xmfbox.tcl
%%TKMAN%%share/man/man3/Tk_CanvasTextInfo.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_CanvasTkwin.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_CanvasWindowCoords.tk86.3.gz
-%%TKMAN%%share/man/man3/Tk_Changes.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_ChangeWindowAttributes.tk86.3.gz
+%%TKMAN%%share/man/man3/Tk_Changes.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_CharBbox.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_Class.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_ClearSelection.tk86.3.gz
@@ -366,12 +368,12 @@ lib/tk%%TK_VER%%/xmfbox.tcl
%%TKMAN%%share/man/man3/Tk_GetSelection.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_GetUid.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_GetUserInactiveTime.tk86.3.gz
-%%TKMAN%%share/man/man3/Tk_GetVisual.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_GetVRootGeometry.tk86.3.gz
+%%TKMAN%%share/man/man3/Tk_GetVisual.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_Grab.tk86.3.gz
+%%TKMAN%%share/man/man3/Tk_HWNDToWindow.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_HandleEvent.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_Height.tk86.3.gz
-%%TKMAN%%share/man/man3/Tk_HWNDToWindow.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_IdToWindow.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_ImageChanged.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_Init.tk86.3.gz
@@ -379,11 +381,11 @@ lib/tk%%TK_VER%%/xmfbox.tcl
%%TKMAN%%share/man/man3/Tk_InitImageArgs.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_InitOptions.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_InitStubs.tk86.3.gz
+%%TKMAN%%share/man/man3/Tk_InternAtom.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_InternalBorderBottom.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_InternalBorderLeft.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_InternalBorderRight.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_InternalBorderTop.tk86.3.gz
-%%TKMAN%%share/man/man3/Tk_InternAtom.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_Interp.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_IntersectTextLayout.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_IsContainer.tk86.3.gz
@@ -392,8 +394,8 @@ lib/tk%%TK_VER%%/xmfbox.tcl
%%TKMAN%%share/man/man3/Tk_IsTopLevel.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_Main.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_MainLoop.tk86.3.gz
-%%TKMAN%%share/man/man3/Tk_MaintainGeometry.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_MainWindow.tk86.3.gz
+%%TKMAN%%share/man/man3/Tk_MaintainGeometry.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_MakeWindowExist.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_ManageGeometry.tk86.3.gz
%%TKMAN%%share/man/man3/Tk_MapWindow.tk86.3.gz
@@ -529,8 +531,8 @@ lib/tk%%TK_VER%%/xmfbox.tcl
%%TKMAN%%share/man/mann/message.tk86.n.gz
%%TKMAN%%share/man/mann/option.tk86.n.gz
%%TKMAN%%share/man/mann/options.tk86.n.gz
-%%TKMAN%%share/man/mann/pack_old.tk86.n.gz
%%TKMAN%%share/man/mann/pack.tk86.n.gz
+%%TKMAN%%share/man/mann/pack_old.tk86.n.gz
%%TKMAN%%share/man/mann/panedwindow.tk86.n.gz
%%TKMAN%%share/man/mann/photo.tk86.n.gz
%%TKMAN%%share/man/mann/place.tk86.n.gz
@@ -543,6 +545,7 @@ lib/tk%%TK_VER%%/xmfbox.tcl
%%TKMAN%%share/man/mann/send.tk86.n.gz
%%TKMAN%%share/man/mann/spinbox.tk86.n.gz
%%TKMAN%%share/man/mann/text.tk86.n.gz
+%%TKMAN%%share/man/mann/tk.tk86.n.gz
%%TKMAN%%share/man/mann/tk_bindForTraversal.tk86.n.gz
%%TKMAN%%share/man/mann/tk_bisque.tk86.n.gz
%%TKMAN%%share/man/mann/tk_chooseColor.tk86.n.gz
@@ -567,7 +570,6 @@ lib/tk%%TK_VER%%/xmfbox.tcl
%%TKMAN%%share/man/mann/tk_textCut.tk86.n.gz
%%TKMAN%%share/man/mann/tk_textPaste.tk86.n.gz
%%TKMAN%%share/man/mann/tk_version.tk86.n.gz
-%%TKMAN%%share/man/mann/tk.tk86.n.gz
%%TKMAN%%share/man/mann/tkerror.tk86.n.gz
%%TKMAN%%share/man/mann/tkwait.tk86.n.gz
%%TKMAN%%share/man/mann/toplevel.tk86.n.gz
@@ -596,4 +598,3 @@ lib/tk%%TK_VER%%/xmfbox.tcl
%%TKMAN%%share/man/mann/ttk_widget.tk86.n.gz
%%TKMAN%%share/man/mann/winfo.tk86.n.gz
%%TKMAN%%share/man/mann/wm.tk86.n.gz
-libdata/pkgconfig/tk86.pc