Mk/Uses/tcl.mk: remove support for Tcl/Tk 8.5

In preparation for removing the lang/tcl85 and x11-toolkits/tk85 ports.
The 8.5 series is EOL.

PR:		278098
Approved by:	antoine (portmgr, exp-run)

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,13 @@ _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
-.    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 +152,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
 #

lang/tclX/Makefile

@@ -33,12 +33,7 @@ TCLM4=		tcl.m4?name=2e84c8
 
 .include <bsd.port.pre.mk>
 
-.if ${TCL_VER} > 8.4
-EXTRA_PATCHES+=	${FILESDIR}/tcl85-test-patch
-.endif
-.if ${TCL_VER} > 8.5
 EXTRA_PATCHES+=	${FILESDIR}/tcl86-test-patch
-.endif
 
 post-extract:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${TCLM4} ${WRKSRC}/tclconfig/tcl.m4

x11-toolkits/tk85/Makefile

@@ -17,14 +17,20 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 DEPRECATED=	Tcl/Tk 8.5 is nearing EOL, please consider switching to Tcl/Tk 8.6
 
-USES+=		tcl:${SHORT_TK_VER},tea xorg
+LIB_DEPENDS=	libtcl${SHORT_TK_VER}.so:lang/tcl${SHORT_TK_VER}
+
+GNU_CONFIGURE=	yes
+USES+=		xorg display
 USE_XORG=	x11 xft xscrnsaver
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}/unix
 TK_VER=		${PORTVERSION:R}
 SHORT_TK_VER=	${TK_VER:S/.//}
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-CONFIGURE_ARGS=	--enable-xss \
+CONFIGURE_ARGS=	--exec-prefix=${PREFIX} \
+		--with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
+		--with-tclinclude=${LOCALBASE}/include/tcl${TK_VER} \
+		--enable-xss \
 		--enable-xft \
 		--enable-man-suffix=.${MAN_SUFFIX} \
 		--includedir=${PREFIX}/include/tk${TK_VER}