devel/tcl-thread: unifiy tcl8-thread and tcl9-thread

Version 3.0.4 of the Thread extension supports both Tcl8 and Tcl9. Get rid of the version-specific ports.

11 files changed, 11 insertions, 72 deletions

diff --git a/MOVED b/MOVED
index 03055bd686a8..0665eee909e7 100644
--- a/MOVED
+++ b/MOVED
@@ -5082,3 +5082,5 @@ lang/cython3|lang/cython|2026-01-15|Remove obsoleted port. Use lang/cython inste
 multimedia/gpac-mp4box|multimedia/gpac|2026-01-15|Merge mp4box and libgpac and add gpac
 java/openjdk18||2026-01-16|Has expired: No longer supported by upstream
 textproc/py-pyRdfa3|textproc/py-pyrdfa3|2026-01-18|Rename to match upstream naming
+devel/tcl8-thread|devel/tcl-thread|2026-01-19|The new tcl-thread port supports both Tcl8 and Tcl9
+devel/tcl9-thread|devel/tcl-thread|2026-01-19|The new tcl-thread port supports both Tcl8 and Tcl9
diff --git a/devel/Makefile b/devel/Makefile
index 768ac09a537f..db96520dc347 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -8437,8 +8437,7 @@
     SUBDIR += tcl-mmap
     SUBDIR += tcl-signal
     SUBDIR += tcl-trf
-    SUBDIR += tcl8-thread
-    SUBDIR += tcl9-thread
+    SUBDIR += tcl-thread
     SUBDIR += tclap
     SUBDIR += tclap12
     SUBDIR += tclbsd
diff --git a/devel/tcl9-thread/Makefile b/devel/tcl-thread/Makefile
index 476a489c7b10..12e6613e4561 100644
--- a/devel/tcl9-thread/Makefile
+++ b/devel/tcl-thread/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	thread
-PORTVERSION=	3.0.2
+PORTVERSION=	3.0.4
 CATEGORIES=	devel
-MASTER_SITES=	SF/tcl/Tcl/9.0.2
-PKGNAMEPREFIX=	tcl9-
+MASTER_SITES=	SF/tcl/Tcl/9.0.3
+PKGNAMEPREFIX=	tcl-
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	tcltk@FreeBSD.org
-COMMENT=	Scripting level thread extension for Tcl 9
+COMMENT=	Scripting level thread extension for Tcl
 WWW=		https://wiki.tcl.tk/2770
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/license.terms
 
-USES=		tcl:90,tea
+USES=		tcl:tea
 
 DOCSDIR=	${PREFIX}/share/doc/${TCL_PKG}
 USE_LDCONFIG=	${PREFIX}/lib/${TCL_PKG}
diff --git a/devel/tcl-thread/distinfo b/devel/tcl-thread/distinfo
new file mode 100644
index 000000000000..0946820b2e3b
--- /dev/null
+++ b/devel/tcl-thread/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1768817716
+SHA256 (thread3.0.4.tar.gz) = 59bee1674c340b2c6b8894321d4cf7d829ddd11c1155b7acd76747d59c2f99af
+SIZE (thread3.0.4.tar.gz) = 344198
diff --git a/devel/tcl9-thread/pkg-descr b/devel/tcl-thread/pkg-descr
index 1206678a5ab4..1206678a5ab4 100644
--- a/devel/tcl9-thread/pkg-descr
+++ b/devel/tcl-thread/pkg-descr
diff --git a/devel/tcl9-thread/pkg-plist b/devel/tcl-thread/pkg-plist
index 54aaa3c6db20..54aaa3c6db20 100644
--- a/devel/tcl9-thread/pkg-plist
+++ b/devel/tcl-thread/pkg-plist
diff --git a/devel/tcl8-thread/Makefile b/devel/tcl8-thread/Makefile
deleted file mode 100644
index 7f432d1ecd1b..000000000000
--- a/devel/tcl8-thread/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-PORTNAME=	thread
-PORTVERSION=	2.8.12
-CATEGORIES=	devel
-MASTER_SITES=	SF/tcl/Tcl/8.6.17/
-PKGNAMEPREFIX=	tcl8-
-DISTNAME=	${PORTNAME}${PORTVERSION}
-
-MAINTAINER=	tcltk@FreeBSD.org
-COMMENT=	Scripting level thread extension for Tcl
-WWW=		https://wiki.tcl.tk/2770
-
-LICENSE=	BSD2CLAUSE
-LICENSE_FILE=	${WRKSRC}/license.terms
-
-USES=		tcl:86,tea
-
-DOCSDIR=	${PREFIX}/share/doc/${TCL_PKG}
-USE_LDCONFIG=	${PREFIX}/lib/${TCL_PKG}
-
-PLIST_SUB+=	VERSION="${PORTVERSION}"
-
-INSTALL_TARGET=	install-binaries install-doc
-TEST_TARGET=	test
-
-OPTIONS_DEFINE=	DOCS GDBM LMDB
-OPTIONS_DEFAULT=GDBM
-GDBM_DESC=	Persistent shared variables using GDBM
-LMDB_DESC=	Persistent shared variables using LMDB
-GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
-GDBM_CONFIGURE_WITH=	gdbm
-LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
-LMDB_CONFIGURE_WITH=	lmdb
-
-PORTDOCS=	*
-
-PORTSCOUT=	limit:^2\.
-
-post-patch:
-	@${REINPLACE_CMD} "/INSTALL_LIBRARY=/s|'\$$| -s'|" \
-	    ${WRKSRC}/tclconfig/tcl.m4
-
-post-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/html
-.for FILE in ChangeLog README
-	${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}
-.endfor
-	cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/html
-
-.include <bsd.port.mk>
diff --git a/devel/tcl8-thread/distinfo b/devel/tcl8-thread/distinfo
deleted file mode 100644
index a3f8d237e4d8..000000000000
--- a/devel/tcl8-thread/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1755523715
-SHA256 (thread2.8.12.tar.gz) = a3dbf0ad70ae37a5e344748881a51c8b1aa0e1ba26cb57dab5ce47ff597b9525
-SIZE (thread2.8.12.tar.gz) = 343756
diff --git a/devel/tcl8-thread/pkg-descr b/devel/tcl8-thread/pkg-descr
deleted file mode 100644
index bbf8f7d97f85..000000000000
--- a/devel/tcl8-thread/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Tcl 8.x Thread extension
-
-Script-level access to Tcl threading capabilities.
diff --git a/devel/tcl8-thread/pkg-plist b/devel/tcl8-thread/pkg-plist
deleted file mode 100644
index 6dd31ea4f498..000000000000
--- a/devel/tcl8-thread/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-lib/%%TCL_PKG%%/lib%%TCL_PKG%%.so
-lib/%%TCL_PKG%%/ttrace.tcl
-lib/%%TCL_PKG%%/pkgIndex.tcl
-share/man/mann/thread.n.gz
-share/man/mann/tpool.n.gz
-share/man/mann/tsv.n.gz
-share/man/mann/ttrace.n.gz
diff --git a/devel/tcl9-thread/distinfo b/devel/tcl9-thread/distinfo
deleted file mode 100644
index 51723a070ff8..000000000000
--- a/devel/tcl9-thread/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1754574219
-SHA256 (thread3.0.2.tar.gz) = fb565622621582ab81b958a5d6732846da2a455284f8a1fd82e821b5d093c590
-SIZE (thread3.0.2.tar.gz) = 342813