diff --git a/Mk/Uses/mysql.mk b/Mk/Uses/mysql.mk
index d022a7709b3e..cd9879305ea3 100644
--- a/Mk/Uses/mysql.mk
+++ b/Mk/Uses/mysql.mk
@@ -1,159 +1,158 @@
 # Provide support for MySQL
 # Feature:	mysql
 # Usage:	USES=mysql or USES=mysql:args
 # Valid ARGS:	<version>, client, server
 #
 # version	If no version is given (by the maintainer via the port), try to
 #		find the currently installed version.  Fall back to default if
 #		necessary (MySQL-8.0 = 80, look at bsd.default-versions.mk for
 #		possible values).
 # client	Depends on the libmysqlclient library (default)
 # server 	Depend on the server at run/build time. If none of these is
 #		set, depends on the client.
 #
 # IGNORE_WITH_MYSQL
 #		This variable can be defined if the ports does not support one
 #		or more versions of MySQL.
 # WITH_MYSQL_VER
 #		User defined variable to set MySQL version.
 # MYSQL_VER
 #		Detected MySQL version.
 #
 # DBD_MYSQL
 #		Set compatible p5-DBD-mysql version
 #
 # MAINTAINER:	ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_MYSQL_MK)
 _INCLUDE_USES_MYSQL_MK=	yes
 
 .  if !empty(mysql_ARGS)
 .undef _WANT_MYSQL_VER
 .undef _WANT_MYSQL_SERVER
 _MYSQL_ARGS=		${mysql_ARGS:S/,/ /g}
 .    if ${_MYSQL_ARGS:Mserver}
 _WANT_MYSQL_SERVER=	yes
 _MYSQL_ARGS:=	${_MYSQL_ARGS:Nserver}
 .    endif
 .    if ${_MYSQL_ARGS:Mclient}
 _WANT_MYSQL_CLIENT=	yes
 _MYSQL_ARGS:=	${_MYSQL_ARGS:Nclient}
 .    endif
 
 # Port requested a version
 .    if !empty(_MYSQL_ARGS)
 _WANT_MYSQL_VER=	${_MYSQL_ARGS}
 .      if   (${_WANT_MYSQL_VER:C/[0-9]*//} == "m")
 _WANT_MYSQL_FLAVOUR=	mariadb
 .      else
 _WANT_MYSQL_FLAVOUR=	mysql
 .      endif
 .    endif
 .  endif # !empty(mysql_ARGS)
 
 .  if defined(DEFAULT_MYSQL_VER)
 WARNING+=	"DEFAULT_MYSQL_VER is defined, consider using DEFAULT_VERSIONS=mysql=${DEFAULT_MYSQL_VER} instead"
 .  endif
 
 DEFAULT_MYSQL_VER?=	${MYSQL_DEFAULT:S/.//}
 # MySQL client version currently supported.
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
 MYSQL80_LIBVER=		21
-MYSQL81_LIBVER=		22
 MYSQL84_LIBVER=		24
 MYSQL90_LIBVER=		24
 
 .  for v in 105 106 1011 114
 MYSQL${v}m_LIBVER=	3
 .  endfor
 
 # Setting/finding MySQL version we want.
 .  if exists(${LOCALBASE}/bin/mariadb)
 _MARIADB!=      ${LOCALBASE}/bin/mariadb --version | ${GREP} MariaDB | wc -l
 .  elif exists(${LOCALBASE}/bin/mysql)
 _MYSQL!=	${LOCALBASE}/bin/mysql_config --version | ${SED} -e 's/\([0-9]\{1,2\}\)\.\([0-9]*\).*/\1\2/'
 _MARIADB!=	${LOCALBASE}/bin/mysql --version | ${GREP} MariaDB | wc -l
 
 .    if ${_MARIADB} == 1
 _MYSQL_VER=	${_MYSQL}m
 _MYSQL_FLAVOUR=	mariadb
 .    else
 _MYSQL_VER=	${_MYSQL}
 _MYSQL_FLAVOUR=	mysql
 .    endif
 .  endif
 
 .  if defined(_WANT_MYSQL_VER)
 .    if   defined(WITH_MYSQL_VER) && (${WITH_MYSQL_VER:C/[0-9]*//} == "m")
 WITH_MYSQL_FLAVOUR=	mariadb
 .    else
 WITH_MYSQL_FLAVOUR=	mysql
 .    endif
 .    if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER} != ${_WANT_MYSQL_VER}
 IGNORE=		cannot install: the port wants ${_WANT_MYSQL_FLAVOUR}${_WANT_MYSQL_VER:C/[m]//}-client and you try to install ${WITH_MYSQL_FLAVOUR}${WITH_MYSQL_VER:C/[m]//}-client
 .    endif
 MYSQL_VER=	${_WANT_MYSQL_VER}
 .  elif defined(WITH_MYSQL_VER)
 MYSQL_VER=	${WITH_MYSQL_VER}
 .  else
 .    if defined(_MYSQL_VER)
 MYSQL_VER=	${_MYSQL_VER}
 .    else
 MYSQL_VER=	${DEFAULT_MYSQL_VER}
 .    endif
 .  endif # _WANT_MYSQL_VER
 
 .  if   ${MYSQL_VER:C/[0-9]*//} == "m"
 MYSQL_FLAVOUR=     mariadb
 .  else
 MYSQL_FLAVOUR=     mysql
 .  endif
 
 .  if defined(_MYSQL_VER)
 .    if ${_MYSQL_VER} != ${MYSQL_VER}
 IGNORE=		cannot install: MySQL versions mismatch: ${_MYSQL_FLAVOUR}${_MYSQL_VER:C/[m]//}-client is installed and wanted version is ${MYSQL_FLAVOUR}${MYSQL_VER:C/[m]//}-client
 .    endif
 .  endif
 
 _MYSQL_SHLIB=	libmysqlclient
 .  if (${MYSQL_VER:C/[0-9]*//} == "m")
 _MYSQL_SERVER_FLAVOUR=	mariadb
 _MYSQL_CLIENT_FLAVOUR=	mariadb
 .    if ${MYSQL_VER:C/m//} >= 105
 _MYSQL_SHLIB=	libmariadb
 .    endif
 .  else
 _MYSQL_SERVER_FLAVOUR=	mysql
 _MYSQL_CLIENT_FLAVOUR=	mysql
 .  endif
 
 _MYSQL_CLIENT=	databases/${_MYSQL_CLIENT_FLAVOUR}${MYSQL_VER:C/[m]//}-client
 _MYSQL_SERVER=	databases/${_MYSQL_SERVER_FLAVOUR}${MYSQL_VER:C/[m]//}-server
 
 # And now we are checking if we can use it
 .  if defined(MYSQL${MYSQL_VER}_LIBVER)
 .    if defined(IGNORE_WITH_MYSQL)
 .      for VER in ${IGNORE_WITH_MYSQL}
 .        if (${MYSQL_VER} == "${VER}")
 IGNORE=		cannot install: does not work with MySQL version ${MYSQL_VER} (MySQL ${IGNORE_WITH_MYSQL} not supported)
 .        endif
 .      endfor
 .    endif # IGNORE_WITH_MYSQL
 .    if defined(_WANT_MYSQL_SERVER)
 RUN_DEPENDS+=	${LOCALBASE}/libexec/mysqld:${_MYSQL_SERVER}
 .    endif
 .    if defined(_WANT_MYSQL_CLIENT) || !defined(_WANT_MYSQL_SERVER)
 LIB_DEPENDS+=	${_MYSQL_SHLIB}.so.${MYSQL${MYSQL_VER}_LIBVER}:${_MYSQL_CLIENT}
 .    endif
 .  else
 IGNORE=		cannot install: unknown MySQL version: ${MYSQL_VER}
 .  endif # Check for correct libs
 
 .  if ${MYSQL_FLAVOUR} == mariadb
 DBD_MYSQL=	p5-DBD-mysql4>=0:databases/p5-DBD-mysql4
 .  else
 DBD_MYSQL=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 .  endif
 
 .endif
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 52afdc222280..0cd48331206b 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -1,192 +1,192 @@
 # MAINTAINER:	ports@FreeBSD.org
 #
 # Note: before committing to this file, contact portmgr to arrange for an
 # experimental ports run.  Untested commits may be backed out at portmgr's
 # discretion.
 #
 # 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=3.1
 
 .if !defined(_INCLUDE_BSD_DEFAULT_VERSIONS_MK)
 _INCLUDE_BSD_DEFAULT_VERSIONS_MK=	yes
 
 LOCALBASE?=	/usr/local
 
 .  for lang in APACHE BDB COROSYNC EBUR128 EMACS FIREBIRD FORTRAN FPC GCC \
 	GHOSTSCRIPT GL GO GUILE IMAGEMAGICK JAVA LAZARUS LIBRSVG2 LINUX LLVM \
 	LUA LUAJIT MONO MYSQL NINJA NODEJS OPENLDAP PERL5 PGSQL PHP \
 	PYCRYPTOGRAPHY PYTHON PYTHON2 RUBY RUST SAMBA SSL TCLTK VARNISH
 .    if defined(${lang}_DEFAULT)
 ERROR+=	"The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf"
 .    endif
 #.undef ${lang}_DEFAULT
 .  endfor
 
 .  for lang in ${DEFAULT_VERSIONS}
 _l=		${lang:C/=.*//g}
 ${_l:tu}_DEFAULT=	${lang:C/.*=//g}
 .  endfor
 
 # Possible values: 2.4
 APACHE_DEFAULT?=	2.4
 # Possible values: 5, 18
 BDB_DEFAULT?=		5
 # Possible values: 2, 3
 COROSYNC_DEFAULT?=	3
 # Possible values: rust, legacy
 .  if empty(ARCH:Naarch64:Namd64:Narmv7:Ni386:Npowerpc64:Npowerpc64le:Npowerpc:Nriscv64)
 EBUR128_DEFAULT?=	rust
 .  else
 EBUR128_DEFAULT?=	legacy
 .  endif
 # Possible_values: full canna nox devel_full devel_nox
 #EMACS_DEFAULT?=	let the flavor be the default if not explicitly set
 # Possible values: 3.0, 4.0
 FIREBIRD_DEFAULT?=	3.0
 # Possible values: gfortran
 FORTRAN_DEFAULT?=	gfortran
 # Possible values: 3.2.3, 3.3.1
 .  if !defined(WANT_FPC_DEVEL)
 FPC_DEFAULT?=		3.2.3
 .  else
 FPC_DEFAULT?=		3.3.1
 .  endif
 # Possible values: 10, 11, 12, 13, 14, 15
 # (Any other version is completely unsupported and not meant for general use.)
 GCC_DEFAULT?=		13
 # Possible values: 10
 GHOSTSCRIPT_DEFAULT?=	10
 # Possible values: mesa-libs, mesa-devel
 GL_DEFAULT?=		mesa-libs
 # Possible values: 1.20, 1.21, 1.22, 1.23-devel
 GO_DEFAULT?=		1.21
 # Possible values: 1.8, 2.2, 3.0
 GUILE_DEFAULT?=		2.2
 # Possible versions: 6, 7
 # Possible flavors:  x11, nox11
 #                    (defaults to x11 when not specified)
 # Format:	     version[-flavor]
 # Examples:	     6-nox11, 7
 IMAGEMAGICK_DEFAULT?=	7
 # Possible values: 8, 11, 17, 18, 19, 20, 21
 JAVA_DEFAULT?=		8
 # Possible values: 3.4.0, 3.99
 .  if !defined(WANT_LAZARUS_DEVEL)
 LAZARUS_DEFAULT?=	3.4.0
 .  else
 LAZARUS_DEFAULT?=	3.99
 .  endif
 # Possible values: rust, legacy
 .  if empty(ARCH:Naarch64:Namd64:Narmv7:Ni386:Npowerpc64:Npowerpc64le:Npowerpc:Nriscv64)
 LIBRSVG2_DEFAULT?=	rust
 .  else
 LIBRSVG2_DEFAULT?=	legacy
 .  endif
 # Possible values: c7 rl9
 LINUX_DEFAULT?=		c7
 # Possible values: 11, 12, 13, 14, 15, 16, 17, -devel (to be used when non-base compiler is required)
 LLVM_DEFAULT?=		15
 # Possible values: 5.1, 5.2, 5.3, 5.4
 LUA_DEFAULT?=		5.4
 # Possible values: luajit, luajit-devel, luajit-openresty
 .  if ${ARCH:Mpowerpc64*}
 LUAJIT_DEFAULT?=	luajit-openresty
 .  else
 LUAJIT_DEFAULT?=	luajit-devel
 .  endif
 # Possible values: 5.10, 5.20, 6.8
 MONO_DEFAULT?=		5.20
-# Possible values: 8.0, 8.1, 8.4, 9.0, 10.5m, 10.6m, 10.11m, 11.4m
+# Possible values: 8.0, 8.4, 9.0, 10.5m, 10.6m, 10.11m, 11.4m
 MYSQL_DEFAULT?=		8.0
 # Possible values: ninja, samurai
 NINJA_DEFAULT?=		ninja
 # Possible value: 18, 20, 22, current, lts (Note: current = 22 and lts = 20)
 NODEJS_DEFAULT?=	lts
 # Possible value: 25, 26
 OPENLDAP_DEFAULT?=	26
 # Possible values: 5.36, 5.38, 5.40, devel
 .  if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \
     defined(PACKAGE_BUILDING))
 # When changing the default here, make sure the DEPRECATED/EXPIRATION lines in
 # the older Perl 5 ports are uncommented at the same time.
 PERL5_DEFAULT?=		5.36
 .  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!=	${LOCALBASE}/bin/perl -e 'printf "%vd\n", $$^V;'
 .    endif
 _EXPORTED_VARS+=	_PERL5_FROM_BIN
 PERL5_DEFAULT:=		${_PERL5_FROM_BIN:R}
 .  endif
 # Possible values: 12, 13, 14, 15, 16
 PGSQL_DEFAULT?=		16
 # Possible values: 8.1, 8.2, 8.3, 8.4
 PHP_DEFAULT?=		8.2
 # Possible values: rust, legacy
 .  if empty(ARCH:Naarch64:Namd64:Narmv7:Ni386:Npowerpc64:Npowerpc64le:Npowerpc:Nriscv64)
 PYCRYPTOGRAPHY_DEFAULT?=	rust
 .  else
 PYCRYPTOGRAPHY_DEFAULT?=	legacy
 .  endif
 # Possible values: 3.8, 3.9, 3.10, 3.11
 PYTHON_DEFAULT?=	3.11
 # Possible values: 2.7
 PYTHON2_DEFAULT?=	2.7
 # Possible values: 3.1, 3.2, 3.3
 RUBY_DEFAULT?=		3.2
 # Possible values: rust, rust-nightly
 RUST_DEFAULT?=		rust
 # Possible values: 4.16, 4.19
 SAMBA_DEFAULT?=		4.16
 # When updating this, please also update the same list in ssl.mk and the checks
 # for USES=ssl in qa.sh!
 # Possible values: base, openssl, openssl111, openssl31, openssl32, openssl33, 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(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.5, 8.6, 8.7
 TCLTK_DEFAULT?=		8.6
 # Possible values: 6, 7
 VARNISH_DEFAULT?=	6
 
 .endif