Attachment 249636 Details for Bug 278098 – remove tcl/tk 85 from USES

[patch] remove tcl/tk 85 from USES

remove-uses-tcl-tk-85.diff (text/plain), 1.83 KB, created by Pietro Cerutti on 2024-04-01 14:32:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pietro Cerutti

Created: 2024-04-01 14:32:47 UTC

Size: 1.83 KB

patch

obsolete

>diff --git a/Mk/Uses/tcl.mk b/Mk/Uses/tcl.mk
>index d940b4a19409..42849a30a196 100644
>--- a/Mk/Uses/tcl.mk
>+++ b/Mk/Uses/tcl.mk
>@@ -38,11 +38,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
>+# - 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
>+# - 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
>@@ -71,7 +71,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=	86 87
> 
> #
> # Bring in the default and check that the specified version is in the list of
>@@ -94,16 +94,16 @@ _TCLTK_PORT?=	tcl
> .  if ${tcl_ARGS:M*+}
> _TCLTK_MIN_VERSION:=	${tcl_ARGS:M*+:S/+//}
> _TCLTK_WANTED_VERSIONS:=${_TCLTK_DEFAULT_VERSION}
>-.    if ${_TCLTK_MIN_VERSION} == "85"
>-IGNORE=	Minimum tcltk version 85+ is meaningless
>+.    if ${_TCLTK_MIN_VERSION} == "86"
>+IGNORE=	Minimum tcltk version 86+ is meaningless
> .    endif
> .  endif
> 
> #
> # Parse one or more ver arguments.
> #
>-.  if ${tcl_ARGS:M8[5-7]}
>-_TCLTK_WANTED_VERSIONS:=${tcl_ARGS:M8[5-7]}
>+.  if ${tcl_ARGS:M8[6-7]}
>+_TCLTK_WANTED_VERSIONS:=${tcl_ARGS:M8[6-7]}
> .  endif
> 
> #
>@@ -155,12 +155,6 @@ _TCLTK_WANTED_VERSION:= ${_TCLTK_HIGHEST_VERSION}
> .    endif
> .  endif
> 
>-#
>-# Deprecate by default all ports depending on 8.5
>-.  if ${_TCLTK_WANTED_VERSION} == "85"
>-DEPRECATED=	Tcl/Tk 8.5 is nearing EOL, please consider porting to Tcl/Tk 8.6
>-.  endif
>-
> #
> # Exported variables
> #

Actions: View | Diff

Attachments on bug 278098: 249636 | 249653 | 249656