pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
tk90: some cleanups
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Tue Jul 15 08:20:54 2025 +0200
Changeset: 943e8c666f6a5d0092d8f480ed6e687ccf8e2339
Modified Files:
tk90/Makefile.version
tk90/buildlink3.mk
Log Message:
tk90: some cleanups
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=943e8c666f6a5d0092d8f480ed6e687ccf8e2339
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
tk90/Makefile.version | 4 ----
tk90/buildlink3.mk | 17 +++++------------
2 files changed, 5 insertions(+), 16 deletions(-)
diffs:
diff --git a/tk90/Makefile.version b/tk90/Makefile.version
index 1e719f45a4..f344413a6f 100644
--- a/tk90/Makefile.version
+++ b/tk90/Makefile.version
@@ -5,10 +5,6 @@
# used by lang/tcl-otcl/Makefile
# used by x11/tk/Makefile
-#TK_SONUM= 86
-#TK_BASEVER= 8.6
-#TK_VERSION= 8.6.16
-
TK_SONUM= 90
TK_BASEVER= 9.0
TK_VERSION= 9.0.1
diff --git a/tk90/buildlink3.mk b/tk90/buildlink3.mk
index cdad56e8a0..6986cf663c 100644
--- a/tk90/buildlink3.mk
+++ b/tk90/buildlink3.mk
@@ -5,24 +5,17 @@ BUILDLINK_TREE+= tk
.if !defined(TK_BUILDLINK3_MK)
TK_BUILDLINK3_MK:=
-# BUILDLINK_API_DEPENDS.tk+= tk>=8.5.7
-# BUILDLINK_ABI_DEPENDS.tk+= tk>=8.6.13nb1
-# BUILDLINK_PKGSRCDIR.tk?= ../../x11/tk
-# xxx
BUILDLINK_API_DEPENDS.tk+= tk>=9.0.1
BUILDLINK_ABI_DEPENDS.tk+= tk>=9.0.1
-BUILDLINK_PKGSRCDIR.tk?= ../../x11/tk90
+# xxx
+BUILDLINK_PKGSRCDIR.tk?= ../../wip/tk90
BUILDLINK_FILES.tk+= bin/wish*
#
-# Make "-ltk" and "-ltk8.6" resolve into "-ltk86", so that we don't
+# Make "-ltk" resolve into "-ltk9.0", so that we don't
# need to patch so many Makefiles.
#
-# BUILDLINK_TRANSFORM+= l:tk:tk86
-# BUILDLINK_TRANSFORM+= l:tk8.6:tk86
-# xxx
-BUILDLINK_TRANSFORM+= l:tk:tk90
-BUILDLINK_TRANSFORM+= l:tk9.0:tk90
+BUILDLINK_TRANSFORM+= l:tk:tk9.0
TKCONFIG_SH?= ${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
@@ -43,7 +36,7 @@ pkgbase := tk
.endif
# xxx
#.include "../../lang/tcl/buildlink3.mk"
-.include "../../lang/tcl90/buildlink3.mk"
+.include "../../wip/tcl90/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.endif # TK_BUILDLINK3_MK
Home |
Main Index |
Thread Index |
Old Index