aboutsummaryrefslogtreecommitdiffstats
path: root/Mk
diff options
context:
space:
mode:
authorPietro Cerutti <gahr@FreeBSD.org>2017-09-11 14:30:53 +0800
committerPietro Cerutti <gahr@FreeBSD.org>2017-09-11 14:30:53 +0800
commitdfa831161ea6b263f532d97dcac3f7aac3eb7612 (patch)
tree36d90816c97c585bd4fae7c67a634f732ef8dc6e /Mk
parent9751729d0941cdadcdacdba0f6fe26d07b51cea0 (diff)
downloadfreebsd-ports-dfa831161ea6b263f532d97dcac3f7aac3eb7612.tar.gz
freebsd-ports-dfa831161ea6b263f532d97dcac3f7aac3eb7612.tar.zst
freebsd-ports-dfa831161ea6b263f532d97dcac3f7aac3eb7612.zip
lang/tcl87, x11-toolkits/tk87: import Tcl/Tk 8.7a1
This is the first alpha release for Tcl/Tk 8.7. See the full release notes here: https://sourceforge.net/p/tcl/mailman/message/36030211
Notes
Notes: svn path=/head/; revision=449606
Diffstat (limited to 'Mk')
-rw-r--r--Mk/Uses/tcl.mk10
-rw-r--r--Mk/bsd.default-versions.mk2
2 files changed, 6 insertions, 6 deletions
diff --git a/Mk/Uses/tcl.mk b/Mk/Uses/tcl.mk
index b4aad235af71..90068e5ed409 100644
--- a/Mk/Uses/tcl.mk
+++ b/Mk/Uses/tcl.mk
@@ -40,11 +40,11 @@
# is installed, bring in the default version. See
# ${_TCLTK_DEFAULT_VERSION} below.
#
-# - 84, 85, 86 - Depend on a specific version series of PORT. Multiple
+# - 84, 85, 86, 87 - Depend on a specific version series of PORT. Multiple
# values are OK. The highest version available is
# picked.
#
-# - 84+, 85+, 86+ - Depend on any installed version greater or equal to
+# - 84+, 85+, 86+, 87+ - Depend on any installed version greater or equal to
# the specified version.
#
# If wrapper is specified, an additional dependency on tcl-wrapper or
@@ -72,7 +72,7 @@ _INCLUDE_USES_TCL_MK= yes
#
# When adding a version, please keep the comment in
# Mk/bsd.default-versions.mk in sync.
-_TCLTK_VALID_VERSIONS= 84 85 86
+_TCLTK_VALID_VERSIONS= 84 85 86 87
#
# Bring in the default and check that the specified version is in the list of
@@ -100,8 +100,8 @@ _TCLTK_WANTED_VERSIONS:=${_TCLTK_DEFAULT_VERSION}
#
# Parse one or more ver arguments.
#
-.if ${tcl_ARGS:M8[4-6]}
-_TCLTK_WANTED_VERSIONS:=${tcl_ARGS:M8[4-6]}
+.if ${tcl_ARGS:M8[4-7]}
+_TCLTK_WANTED_VERSIONS:=${tcl_ARGS:M8[4-7]}
.endif
#
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 9025789b21b8..e6c369403018 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -134,7 +134,7 @@ check-makevars::
# Make sure we have a default in the end
SSL_DEFAULT?= base
.endif
-# Possible values: 8.4, 8.5, 8.6
+# Possible values: 8.4, 8.5, 8.6, 8.7
TCLTK_DEFAULT?= 8.6
# Possible values: 4, 5