Attachment #249656 for bug #278098




#   			  is installed, bring in the default version. See
#   			  ${_TCLTK_DEFAULT_VERSION} below.
#
# - 86, 87		- Depend on a specific version series of PORT. Multiple
#   			  values are OK. The highest version available is
#   			  picked.
#
# - 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

#
# When adding a version, please keep the comment in
# Mk/bsd.default-versions.mk in sync.
_TCLTK_VALID_VERSIONS=	86 87

#
# Bring in the default and check that the specified version is in the list of

.  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
.    endif
.  endif

#
# Parse one or more ver arguments.
#
.  if ${tcl_ARGS:M8[6-7]}
_TCLTK_WANTED_VERSIONS:=${tcl_ARGS:M8[6-7]}
.  endif

#

.    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
#

Lines 17-30 LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept Link Here

(-)b/x11-toolkits/tk85/Makefile (-2 / +8 lines)
17		17
18	DEPRECATED= Tcl/Tk 8.5 is nearing EOL, please consider switching to Tcl/Tk 8.6	18	DEPRECATED= Tcl/Tk 8.5 is nearing EOL, please consider switching to Tcl/Tk 8.6
19		19
20	USES+= tcl:${SHORT_TK_VER},tea xorg	20	LIB_DEPENDS= libtcl${SHORT_TK_VER}.so:lang/tcl${SHORT_TK_VER}
		21
		22	GNU_CONFIGURE= yes
		23	USES+= xorg display
21	USE_XORG= x11 xft xscrnsaver	24	USE_XORG= x11 xft xscrnsaver
22	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
23	WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}/unix	26	WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}/unix
24	TK_VER= ${PORTVERSION:R}	27	TK_VER= ${PORTVERSION:R}
25	SHORT_TK_VER= ${TK_VER:S/.//}	28	SHORT_TK_VER= ${TK_VER:S/.//}
26	GNU_CONFIGURE_MANPREFIX=${PREFIX}/share	29	GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
27	CONFIGURE_ARGS= --enable-xss \	30	CONFIGURE_ARGS= --exec-prefix=${PREFIX} \
		31	--with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
		32	--with-tclinclude=${LOCALBASE}/include/tcl${TK_VER} \
		33	--enable-xss \
28	--enable-xft \	34	--enable-xft \
29	--enable-man-suffix=.${MAN_SUFFIX} \	35	--enable-man-suffix=.${MAN_SUFFIX} \
30	--includedir=${PREFIX}/include/tk${TK_VER}	36	--includedir=${PREFIX}/include/tk${TK_VER}

Return to bug 278098

Lines 38-48 Link Here

(-)b/Mk/Uses/tcl.mk (-14 / +5 lines)
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"
98	IGNORE= Minimum tcltk version 85+ is meaningless
99	. endif
100	. endif	97	. endif
101		98
102	#	99	#
103	# Parse one or more ver arguments.	100	# Parse one or more ver arguments.
104	#	101	#
105	. if ${tcl_ARGS:M8[5-7]}	102	. if ${tcl_ARGS:M8[6-7]}
106	_TCLTK_WANTED_VERSIONS:=${tcl_ARGS:M8[5-7]}	103	_TCLTK_WANTED_VERSIONS:=${tcl_ARGS:M8[6-7]}
107	. endif	104	. endif
108		105
109	#	106	#
Lines 155-166 _TCLTK_WANTED_VERSION:= ${_TCLTK_HIGHEST_VERSION} Link Here
155	. endif	152	. endif
156	. endif	153	. endif
157		154
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	#	155	#
165	# Exported variables	156	# Exported variables
166	#	157	#