diff options
| author | gahr <gahr@FreeBSD.org> | 2017-10-20 19:12:56 +0800 |
|---|---|---|
| committer | gahr <gahr@FreeBSD.org> | 2017-10-20 19:12:56 +0800 |
| commit | 4da1ad33dff71069143338c2d8ef7be9f0390b94 (patch) | |
| tree | 00b27cc6b78d04aba9fd16c52c95551b33697b23 /Mk | |
| parent | ce9e19e5c5da7c3a493c79d76177d7e2797baa5e (diff) | |
| download | freebsd-ports-gnome-4da1ad33dff71069143338c2d8ef7be9f0390b94.tar.gz freebsd-ports-gnome-4da1ad33dff71069143338c2d8ef7be9f0390b94.tar.zst freebsd-ports-gnome-4da1ad33dff71069143338c2d8ef7be9f0390b94.zip | |
Revert 452511, I missed some ports
I missed some ports that depend on lang/tcl84 or x11-toolkits/tk84 by
explicitly mentioning the port origin instead of using USES.
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/tcl.mk | 10 | ||||
| -rw-r--r-- | Mk/bsd.default-versions.mk | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Mk/Uses/tcl.mk b/Mk/Uses/tcl.mk index 85d88c250034..94250178c2fe 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. # -# - 85, 86, 87 - 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. # -# - 85+, 86+, 87+ - 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= 85 86 87 +_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[5-7]} -_TCLTK_WANTED_VERSIONS:=${tcl_ARGS:M8[5-7]} +.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 d66a7af937ab..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.5, 8.6, 8.7 +# Possible values: 8.4, 8.5, 8.6, 8.7 TCLTK_DEFAULT?= 8.6 # Possible values: 4, 5 |