tcl90: some cleanups

[Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Tue Jul 15 08:18:32 2025 +0200
Changeset:	927af3cb5ee99576eb4db9fd5e97c8770db041e5

Modified Files:
	tcl90/Makefile
	tcl90/Makefile.version
	tcl90/buildlink3.mk

Log Message:
tcl90: some cleanups

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=927af3cb5ee99576eb4db9fd5e97c8770db041e5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 tcl90/Makefile         |  8 ++++----
 tcl90/Makefile.version | 11 +----------
 tcl90/buildlink3.mk    | 16 +++-------------
 3 files changed, 8 insertions(+), 27 deletions(-)

diffs:
diff --git a/tcl90/Makefile b/tcl90/Makefile
index 69d8407530..fc917059b7 100644
--- a/tcl90/Makefile
+++ b/tcl90/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	https://www.tcl.tk/
+HOMEPAGE=	https://www.tcl-lang.org/
 COMMENT=	Tool Command Language, a dynamic language
 LICENSE=	2-clause-bsd
 
@@ -29,7 +29,7 @@ USE_TOOLS+=		ln mkdir mv
 CONFIGURE_ARGS+=	--without-tzdata
 
 CONFIGURE_ARGS+=	--enable-zipfs
-BUILD_DEPENDS+=		zip-[0-9]*:../../archivers/zip
+TOOL_DEPENDS+=		zip-[0-9]*:../../archivers/zip
 
 PKGCONFIG_OVERRIDE+=	unix/tcl.pc.in
 
@@ -81,7 +81,7 @@ EMB_SRC=	itcl-4.3.2 sqlite-3.47.2 tdbc-1.1.10 tdbcmysql-1.1.10 \
 		thread-3.0.1
 # xxx maybe add some kind of rule in mk/pkgformat/pkg/check.mk for
 # something like
-# 	${CHECK_BUNDLED_PKG_VULNERABILItIES} ${EMB_SRC}
+# 	${CHECK_BUNDLED_PKG_VULNERABILITIES} ${EMB_SRC}
 # or
 #	${AUDIT_PACKAGE} itcl-4.3.2
 #
@@ -89,7 +89,7 @@ EMB_SRC=	itcl-4.3.2 sqlite-3.47.2 tdbc-1.1.10 tdbcmysql-1.1.10 \
 VFILE=		${_EXTRACT_PKGVULNDIR:sh}/pkg-vulnerabilities
 pre-fetch:
 .if exists(${VFILE})
-.  if !empty(ALLOW_VULNERABLE_PACKAGES:tl:Mno)
+.  if ${ALLOW_VULNERABLE_PACKAGES:tl:Uno} == no
 	for i in ${EMB_SRC}; do \
 		${PKG_ADMIN} audit-pkg $$i || \
 		 { ${FAIL_MSG} "embedded source $$i has vulnerabilities. "\
diff --git a/tcl90/Makefile.version b/tcl90/Makefile.version
index 9df633cde2..4e163bbfcf 100644
--- a/tcl90/Makefile.version
+++ b/tcl90/Makefile.version
@@ -4,20 +4,11 @@
 # used by lang/tcl/Makefile
 # used by lang/tcl-otcl/Makefile
 
-#TCL_SONUM=	86
-#TCL_BASEVER=	8.6
-#TCL_VERSION=	8.6.16
-
-# Update bundled versions in lang/tcl/buildlink3.mk
-#ITCL_VERSION=		4.3.2
-#SQLITE3_VERSION=	3.47.2
-#TDBC_VERSION=		1.1.10
-#THREAD_VERSION=	2.8.11
-
 TCL_SONUM=	90
 TCL_BASEVER=	9.0
 TCL_VERSION=	9.0.1
 
+# Update bundled versions in lang/tcl/buildlink3.mk
 ITCL_VERSION=		4.3.2
 SQLITE3_VERSION=	3.47.2
 TDBC_VERSION=		1.1.10
diff --git a/tcl90/buildlink3.mk b/tcl90/buildlink3.mk
index b4f2aa2e75..0e381ab201 100644
--- a/tcl90/buildlink3.mk
+++ b/tcl90/buildlink3.mk
@@ -5,29 +5,19 @@ BUILDLINK_TREE+=	tcl
 .if !defined(TCL_BUILDLINK3_MK)
 TCL_BUILDLINK3_MK:=
 
-#BUILDLINK_API_DEPENDS.tcl+=	tcl>=8.5.7
-#BUILDLINK_ABI_DEPENDS.tcl+=	tcl>=8.6.1nb1
-#BUILDLINK_PKGSRCDIR.tcl?=	../../lang/tcl
-
 BUILDLINK_API_DEPENDS.tcl+=	tcl>=9.0.1
 BUILDLINK_ABI_DEPENDS.tcl+=	tcl>=9.0.1
 # xxx
 #BUILDLINK_PKGSRCDIR.tcl?=	../../lang/tcl
-BUILDLINK_PKGSRCDIR.tcl?=	../../lang/tcl90
+BUILDLINK_PKGSRCDIR.tcl?=	../../wip/tcl90
 
 BUILDLINK_FILES.tcl+=	bin/tclsh*
 #
-# Make "-ltcl" and "-ltcl8.6" resolve into "-ltcl86", so that we don't
+# Make "-ltcl" resolve into "-ltcl9.0", so that we don't
 # need to patch so many Makefiles.
 #
-#BUILDLINK_TRANSFORM+=	l:tcl:tcl86
-#BUILDLINK_TRANSFORM+=	l:tcl8.6:tcl86
-
-# xxx
-#BUILDLINK_TRANSFORM+=	l:tcl:tcl90
-#BUILDLINK_TRANSFORM+=	l:tcl90:tcl90
 BUILDLINK_TRANSFORM+=	l:tcl:tcl9.0
-BUILDLINK_TRANSFORM+=	l:tcl90:tcl9.0
+#BUILDLINK_TRANSFORM+=	l:tcl90:tcl9.0
 
 _TOOLS_USE_PKGSRC.tclsh=	yes