View | Details | Raw Unified | Return to bug 278098 | Differences between
and this patch

Collapse All | Expand All

(-)b/Mk/Uses/tcl.mk (-13 / +7 lines)
Lines 38-48 Link Here
38
#   			  is installed, bring in the default version. See
38
#   			  is installed, bring in the default version. See
39
#   			  ${_TCLTK_DEFAULT_VERSION} below.
39
#   			  ${_TCLTK_DEFAULT_VERSION} below.
40
#
40
#
41
# - 85, 86, 87		- Depend on a specific version series of PORT. Multiple
41
# - 86, 87		- Depend on a specific version series of PORT. Multiple
42
#   			  values are OK. The highest version available is
42
#   			  values are OK. The highest version available is
43
#   			  picked.
43
#   			  picked.
44
#
44
#
45
# - 85+, 86+, 87+	- Depend on any installed version greater or equal to
45
# - 86+, 87+		- Depend on any installed version greater or equal to
46
#   			  the specified version.
46
#   			  the specified version.
47
#
47
#
48
# If wrapper is specified, an additional dependency on tcl-wrapper or
48
# If wrapper is specified, an additional dependency on tcl-wrapper or
Lines 71-77 _INCLUDE_USES_TCL_MK= yes Link Here
71
#
71
#
72
# When adding a version, please keep the comment in
72
# When adding a version, please keep the comment in
73
# Mk/bsd.default-versions.mk in sync.
73
# Mk/bsd.default-versions.mk in sync.
74
_TCLTK_VALID_VERSIONS=	85 86 87
74
_TCLTK_VALID_VERSIONS=	86 87
75
75
76
#
76
#
77
# Bring in the default and check that the specified version is in the list of
77
# Bring in the default and check that the specified version is in the list of
Lines 94-109 _TCLTK_PORT?= tcl Link Here
94
.  if ${tcl_ARGS:M*+}
94
.  if ${tcl_ARGS:M*+}
95
_TCLTK_MIN_VERSION:=	${tcl_ARGS:M*+:S/+//}
95
_TCLTK_MIN_VERSION:=	${tcl_ARGS:M*+:S/+//}
96
_TCLTK_WANTED_VERSIONS:=${_TCLTK_DEFAULT_VERSION}
96
_TCLTK_WANTED_VERSIONS:=${_TCLTK_DEFAULT_VERSION}
97
.    if ${_TCLTK_MIN_VERSION} == "85"
97
.    if ${_TCLTK_MIN_VERSION} == "86"
98
IGNORE=	Minimum tcltk version 85+ is meaningless
98
IGNORE=	Minimum tcltk version 86+ is meaningless
99
.    endif
99
.    endif
100
.  endif
100
.  endif
101
101
102
#
102
#
103
# Parse one or more ver arguments.
103
# Parse one or more ver arguments.
104
#
104
#
105
.  if ${tcl_ARGS:M8[5-7]}
105
.  if ${tcl_ARGS:M8[6-7]}
106
_TCLTK_WANTED_VERSIONS:=${tcl_ARGS:M8[5-7]}
106
_TCLTK_WANTED_VERSIONS:=${tcl_ARGS:M8[6-7]}
107
.  endif
107
.  endif
108
108
109
#
109
#
Lines 155-166 _TCLTK_WANTED_VERSION:= ${_TCLTK_HIGHEST_VERSION} Link Here
155
.    endif
155
.    endif
156
.  endif
156
.  endif
157
157
158
#
159
# Deprecate by default all ports depending on 8.5
160
.  if ${_TCLTK_WANTED_VERSION} == "85"
161
DEPRECATED=	Tcl/Tk 8.5 is nearing EOL, please consider porting to Tcl/Tk 8.6
162
.  endif
163
164
#
158
#
165
# Exported variables
159
# Exported variables
166
#
160
#

Return to bug 278098