Index: head/Mk/Uses/tcl.mk
===================================================================
--- head/Mk/Uses/tcl.mk	(revision 454755)
+++ head/Mk/Uses/tcl.mk	(revision 454756)
@@ -1,225 +1,225 @@
 # $FreeBSD$
 #
 # vim: ts=8 noexpandtab
 #
 # Provide support to use Tcl/Tk
 #
 # Variables set by this file:
 #
 # TCL_VER		- Major.Minor version of Tcl
 #
 # TCLSH			- Set to full path of the Tcl interpreter
 #
 # TCL_LIBDIR		- Path where the Tcl libraries can be found
 #
 # TCL_INCLUDEDIR	- Path where the Tcl C headers can be found
 #
 #
 # TK_VER		- Major.Minor version of Tk
 #
 # WISH			- Set to full path of the Tk interpreter
 #
 # TK_LIBDIR		- Path where the Tk libraries can be found
 #
 # TK_INCLUDEDIR		- Path where the Tk C headers can be found
 #
 #
 #
 # Usage:
 #
 # USES+=	PORT[:(VERSION|wrapper),build,run,tea]
 #
 # where PORT is one of:
 #
 # - tcl			- Depend on Tcl
 # - tk			- Depend on both Tk and Tcl (Tk itself depends on Tcl)
 #
 # and VERSION is in one of the following formats:
 #
 # - (empty)		- Depend on any installed version of PORT. If none
 #   			  is installed, bring in the default version. See
 #   			  ${_TCLTK_DEFAULT_VERSION} below.
 #
-# - 84, 85, 86, 87	- Depend on a specific version series of PORT. Multiple
+# - 85, 86, 87		- Depend on a specific version series of PORT. Multiple
 #   			  values are OK. The highest version available is
 #   			  picked.
 #
-# - 84+, 85+, 86+, 87+	- Depend on any installed version greater or equal to
+# - 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
 # tk-wrapper is added. It is NOT possible to select a specific version of
 # Tcl/Tk when using the wrapper.
 #
 # Build-time / Run-time only dependencies can be specified with build or run.
 #
 # Tea can be used for Tcl/Tk extensions that use the Tcl Extension Architecture
 # [http://www.tcl.tk/doc/tea] and allows to set common autoconf parameters.
 #
 # MAINTAINER: tcltk@FreeBSD.org
 
 .if ${USES:Mtk} || ${USES:Mtk\:*}
 .if !defined(_TCLTK_PORT)
 _TCLTK_IGNORE=	yes
 .endif
 .endif
 
 .if !defined(_INCLUDE_USES_TCL_MK) && !defined(_TCLTK_IGNORE)
 _INCLUDE_USES_TCL_MK=	yes
 
 #
 # List the currently available versions.
 #
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
-_TCLTK_VALID_VERSIONS=	84 85 86 87
+_TCLTK_VALID_VERSIONS=	85 86 87
 
 #
 # Bring in the default and check that the specified version is in the list of
 # valid versions.
 #
 _TCLTK_DEFAULT_VERSION=	${TCLTK_DEFAULT:S/.//}
 .if ! ${_TCLTK_VALID_VERSIONS:M${_TCLTK_DEFAULT_VERSION}}
 IGNORE=	Invalid tcltk version ${TCLTK_DEFAULT}
 .endif
 
 #
 # _TCLTK_PORT tells us whether we're depending on Tcl or Tk. When using
 # USES+=tk, the included file tk.mk sets this before including this file.
 #
 _TCLTK_PORT?=	tcl
 
 #
 # Parse a ver+ argument.
 #
 .if ${tcl_ARGS:M*+}
 _TCLTK_MIN_VERSION:=	${tcl_ARGS:M*+:S/+//}
 _TCLTK_WANTED_VERSIONS:=${_TCLTK_DEFAULT_VERSION}
 .endif
 
 #
 # Parse one or more ver arguments.
 #
-.if ${tcl_ARGS:M8[4-7]}
-_TCLTK_WANTED_VERSIONS:=${tcl_ARGS:M8[4-7]}
+.if ${tcl_ARGS:M8[5-7]}
+_TCLTK_WANTED_VERSIONS:=${tcl_ARGS:M8[5-7]}
 .endif
 
 #
 # It makes little sense to specify both the wrapper and a specific version.
 #
 .if ${tcl_ARGS:Mwrapper} && defined(_TCLTK_WANTED_VERSIONS)
 IGNORE=	USES=${_TCLTK_PORT}: it is not possible to specify both a version and the wrapper: ${tcl_ARGS}
 .endif
 
 #
 # If no version was specified with any of the ver or ver+ arguments, set the
 # default version.
 #
 .if !defined(_TCLTK_WANTED_VERSIONS)
 _TCLTK_WANTED_VERSIONS=	${_TCLTK_DEFAULT_VERSION}
 .endif
 
 # 
 # Resolve minimum versions (ver+). Append anything greater or equal than the
 # specified minimum version to the list of wanted versions.
 #
 .if defined(_TCLTK_MIN_VERSION)
 .  for _v in ${_TCLTK_VALID_VERSIONS}
 .    if ${_TCLTK_MIN_VERSION} <= ${_v}
 _TCLTK_WANTED_VERSIONS+=${_v}
 .    endif
 .  endfor
 .endif
 
 #
 # Right now we have built a list of potential versions that we may depend on.
 # Let's sort them and remove any duplicates. We then locate the highest one
 # already installed, if any.
 #
 .for _v in ${_TCLTK_WANTED_VERSIONS:O:u}
 _TCLTK_HIGHEST_VERSION:=${_v}
 .  if exists(${LOCALBASE}/lib/lib${_TCLTK_PORT}${_v}.so)
 _TCLTK_WANTED_VERSION:=	${_v}
 .  endif
 .endfor
 
 #
 # If we couldn't find any wanted version installed, depend on the default or the highest one.
 .if !defined(_TCLTK_WANTED_VERSION)
 .  if ${_TCLTK_WANTED_VERSIONS:M${_TCLTK_DEFAULT_VERSION}}
 _TCLTK_WANTED_VERSION:=	${_TCLTK_DEFAULT_VERSION}
 .  else
 _TCLTK_WANTED_VERSION:= ${_TCLTK_HIGHEST_VERSION}
 .  endif
 .endif
 
 #
 # Exported variables
 #
 TCL_VER:=	${_TCLTK_WANTED_VERSION:S/8/8./}
 TCL_SHLIB_VER:=	${_TCLTK_WANTED_VERSION}
 TCLSH:=		${LOCALBASE}/bin/tclsh${TCL_VER}
 TCL_LIBDIR:=	${LOCALBASE}/lib/tcl${TCL_VER}
 TCL_INCLUDEDIR:=${LOCALBASE}/include/tcl${TCL_VER}
 
 .if ${_TCLTK_PORT} == "tk"
 TK_VER:=	${_TCLTK_WANTED_VERSION:S/8/8./}
 TK_SHLIB_VER:=	${_TCLTK_WANTED_VERSION}
 WISH:=		${LOCALBASE}/bin/wish${TCL_VER}
 TK_LIBDIR:=	${LOCALBASE}/lib/tk${TK_VER}
 TK_INCLUDEDIR:=	${LOCALBASE}/include/tk${TK_VER}
 .endif
 
 #
 # Dependencies
 #
 _TCLTK_BUILD_DEPENDS=
 _TCLTK_RUN_DEPENDS=
 _TCLTK_LIB_DEPENDS=
 
 # Construct the correct dependency lines (wrapper)
 .if ${tcl_ARGS:Mwrapper}
 .  if ${_TCLTK_PORT} == "tcl"
 _TCLTK_WRAPPER_PORT=	tclsh:lang/tcl-wrapper
 .  elif ${_TCLTK_PORT} == "tk"
 _TCLTK_WRAPPER_PORT=	wish:x11-toolkits/tk-wrapper
 .  endif
 .endif
 
 # Construct the correct dependency lines (Tcl/Tk)
 .if ${_TCLTK_PORT} == "tcl"
 _TCLTK_EXE_LINE=	tclsh${TCL_VER}:lang/tcl${_TCLTK_WANTED_VERSION}
 _TCLTK_LIB_LINE=	libtcl${TCL_SHLIB_VER}.so:lang/tcl${_TCLTK_WANTED_VERSION}
 .elif ${_TCLTK_PORT} == "tk"
 _TCLTK_EXE_LINE=	wish${TK_VER}:x11-toolkits/tk${_TCLTK_WANTED_VERSION}
 _TCLTK_LIB_LINE=	libtk${TK_SHLIB_VER}.so:x11-toolkits/tk${_TCLTK_WANTED_VERSION} \
 			libtcl${TCL_SHLIB_VER}.so:lang/tcl${_TCLTK_WANTED_VERSION}
 .endif
 
 .if ${tcl_ARGS:Mbuild}
 BUILD_DEPENDS+=	${_TCLTK_WRAPPER_PORT} \
 		${_TCLTK_EXE_LINE}
 .elif ${tcl_ARGS:Mrun}
 RUN_DEPENDS+=	${_TCLTK_WRAPPER_PORT} \
 		${_TCLTK_EXE_LINE}
 .else
 RUN_DEPENDS+=	${_TCLTK_WRAPPER_PORT}
 LIB_DEPENDS+=	${_TCLTK_LIB_LINE}
 .endif
 
 # Setup TEA stuff
 .if ${tcl_ARGS:Mtea}
 GNU_CONFIGURE=	yes
 TCL_PKG?=	${PORTNAME:C/^tcl(-?)//:C/(-?)tcl\$//}${PORTVERSION}
 PLIST_SUB+=	TCL_PKG=${TCL_PKG}
 CONFIGURE_ARGS+=--exec-prefix=${PREFIX} \
 		--with-tcl=${TCL_LIBDIR} \
 		--with-tclinclude=${TCL_INCLUDEDIR}
 .  if ${_TCLTK_PORT} == "tk"
 CONFIGURE_ARGS+=--with-tk=${TK_LIBDIR} --with-tkinclude=${TK_INCLUDEDIR}
 .  endif
 .endif
 
 .endif # defined(_INCLUDE_USES_TCL_MK)
 
 .undef _TCLTK_IGNORE
Index: head/Mk/bsd.default-versions.mk
===================================================================
--- head/Mk/bsd.default-versions.mk	(revision 454755)
+++ head/Mk/bsd.default-versions.mk	(revision 454756)
@@ -1,145 +1,145 @@
 # $FreeBSD$
 #
 # MAINTAINER:	ports@FreeBSD.org
 #
 # Provide default versions for ports with multiple versions selectable
 # by the user.
 #
 # Users who want to override these defaults can easily do so by defining
 # DEFAULT_VERSIONS in their make.conf as follows:
 #
 #   DEFAULT_VERSIONS=	perl5=5.20 ruby=2.0
 
 .if !defined(_INCLUDE_BSD_DEFAULT_VERSIONS_MK)
 _INCLUDE_BSD_DEFAULT_VERSIONS_MK=	yes
 
 LOCALBASE?=	/usr/local
 
 .for lang in APACHE BDB FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT LINUX LUA MYSQL \
 	PERL5 PGSQL PHP PYTHON PYTHON2 PYTHON3 RUBY SSL TCLTK
 .if defined(${lang}_DEFAULT)
 WARNING+=	"The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf"
 WARNING+=	"This behaviour has never been supported and will be removed on 2017-01-31"
 .endif
 #.undef ${lang}_DEFAULT
 .endfor
 
 .for lang in ${DEFAULT_VERSIONS}
 _l=		${lang:C/=.*//g}
 ${_l:tu}_DEFAULT=	${lang:C/.*=//g}
 .endfor
 
 # Possible values: 2.2, 2.4
 APACHE_DEFAULT?=	2.4
 # Possible values: 48, 5, 6
 BDB_DEFAULT?=		5
 # Possible values: 2.5
 FIREBIRD_DEFAULT?=	2.5
 # Possible values: flang (experimental), gfortran
 FORTRAN_DEFAULT?=	gfortran
 # Possible values: 3.0.0
 FPC_DEFAULT?=		3.0.2
 # Possible values: 4.8, 4.9, 5, 6, 7
 GCC_DEFAULT?=		6
 # Possible values: 7, 8, 9, agpl
 GHOSTSCRIPT_DEFAULT?=	agpl
 .if ${ARCH} == amd64
 # Possible values: c6, c6_64, c7
 LINUX_DEFAULT?=		c6_64
 .else
 # Possible values: c6
 LINUX_DEFAULT?=		c6
 .endif
 .if defined(OVERRIDE_LINUX_BASE_PORT)
 LINUX_DEFAULT:=		${OVERRIDE_LINUX_BASE_PORT}
 WARNING+=		"OVERRIDE_LINUX_BASE_PORT is deprecated, please use DEFAULT_VERSIONS+=linux=${OVERRIDE_LINUX_BASE_PORT}."
 .endif
 # Possible values: 5.1, 5.2, 5.3
 LUA_DEFAULT?=		5.2
 # Possible values: 5.5, 5.6, 5.7, 8.0, 5.5m, 10.0m, 10.1m, 10.2m, 5.5p, 5.6p, 5.7p, 5.6w
 MYSQL_DEFAULT?=		5.6
 # Possible values: 5.22, 5.24, 5.26, devel
 .if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \
     defined(PACKAGE_BUILDING))
 PERL5_DEFAULT?=		5.24
 .elif !defined(PERL5_DEFAULT)
 # There's no need to replace development versions, like "5.23" with "devel"
 # because 1) nobody is supposed to use it outside of poudriere, and 2) it must
 # be set manually in /etc/make.conf in the first place, and we're never getting
 # in here.
 .if !defined(_PERL5_FROM_BIN)
 _PERL5_FROM_BIN!=	perl -e 'printf "%vd\n", $$^V;'
 .endif
 _EXPORTED_VARS+=	_PERL5_FROM_BIN
 PERL5_DEFAULT:=		${_PERL5_FROM_BIN:R}
 .endif
 # Possible values: 9.2, 9.3, 9.4, 9.5, 9.6
 PGSQL_DEFAULT?=		9.5
 # Possible values: 5.6, 7.0, 7.1, 7.2
 PHP_DEFAULT?=		5.6
 # Possible values: 2.7, 3.4, 3.5, 3.6
 PYTHON_DEFAULT?=	2.7
 # Possible values: 2.7
 PYTHON2_DEFAULT?=	2.7
 # Possible values: 3.4, 3.5, 3.6
 PYTHON3_DEFAULT?=	3.6
 # Possible values: 2.2, 2.3, 2.4
 RUBY_DEFAULT?=		2.3
 # Possible values: 4.4, 4.5, 4.6
 SAMBA_DEFAULT?=		4.4
 # Possible values: base, openssl, openssl-devel, libressl, libressl-devel
 .if !defined(SSL_DEFAULT)
 #	If no preference was set, check for an installed base version
 #	but give an installed port preference over it.
 .  if defined(WITH_OPENSSL_PORT)
 .    if defined(OPENSSL_PORT)
 SSL_DEFAULT:=${OPENSSL_PORT:T}
 WARNING+=	"Using WITH_OPENSSL_PORT and OPENSSL_PORT in make.conf is deprecated, replace them with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} in your make.conf"
 .    else
 SSL_DEFAULT=openssl
 WARNING+=	"Using WITH_OPENSSL_PORT in make.conf is deprecated, replace it with DEFAULT_VERSIONS+=ssl=openssl in your make.conf"
 .    endif
 .  elif defined(WITH_OPENSSL_BASE)
 SSL_DEFAULT=base
 WARNING+=	"Using WITH_OPENSSL_BASE in make.conf is deprecated, replace it with DEFAULT_VERSIONS+=ssl=base in your make.conf"
 .  elif	!defined(WITH_OPENSSL_BASE) && \
 	!defined(WITH_OPENSSL_PORT) && \
 	!defined(SSL_DEFAULT) && \
 	!exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) && \
 	exists(${DESTDIR}/usr/include/openssl/opensslv.h)
 SSL_DEFAULT=	base
 .  else
 .    if exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so)
 .      if defined(PKG_BIN)
 # find installed port and use it for dependency
 .        if !defined(OPENSSL_INSTALLED)
 .          if defined(DESTDIR)
 PKGARGS=	-c ${DESTDIR}
 .          else
 PKGARGS=
 .          endif
 OPENSSL_INSTALLED!=	${PKG_BIN} ${PKGARGS} which -qo ${LOCALBASE}/lib/libcrypto.so || :
 .        endif
 .        if defined(OPENSSL_INSTALLED) && !empty(OPENSSL_INSTALLED)
 SSL_DEFAULT:=		${OPENSSL_INSTALLED:T}
 WARNING+=	"You have ${OPENSSL_INSTALLED} installed but do not have DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} set in your make.conf"
 .        endif
 .      else
 check-makevars::
 	@${ECHO_MSG} "You have a ${LOCALBASE}/lib/libcrypto.so file installed, but the framework is unable"
 	@${ECHO_MSG} "to determine what port it comes from."
 	@${ECHO_MSG} "Add DEFAULT_VERSIONS+=ssl=<openssl package name> to your /etc/make.conf and try again."
 	@${FALSE}
 .      endif
 .    endif
 .  endif
 # Make sure we have a default in the end
 SSL_DEFAULT?=	base
 .endif
-# Possible values: 8.4, 8.5, 8.6, 8.7
+# Possible values: 8.5, 8.6, 8.7
 TCLTK_DEFAULT?=		8.6
 
 # Possible values: 4, 5
 VARNISH_DEFAULT?=	4
 
 .endif