diff --git a/databases/mysql84-server/Makefile b/databases/mysql84-server/Makefile
index b3558ea26132..aa16428a1ce3 100644
--- a/databases/mysql84-server/Makefile
+++ b/databases/mysql84-server/Makefile
@@ -1,183 +1,182 @@
 PORTNAME?=		mysql
-PORTVERSION=		8.4.0
+PORTVERSION=		8.4.2
 PORTREVISION?=		0
 CATEGORIES=		databases
 MASTER_SITES=		MYSQL/MySQL-8.4
 PKGNAMESUFFIX?=		84-server
 
 MAINTAINER=		joneum@FreeBSD.org
 COMMENT?=		Multithreaded SQL database (server)
 WWW=		https://www.mysql.com/
 
 LICENSE=		GPLv2
 
 # MySQL8.2+ supports only 64-bit platforms
 # Review list after 13.x EoL
 NOT_FOR_ARCHS= armv6 armv7 i386 powerpc
 
 USES=		bison:build cmake:noninja cpe groff:run libedit localbase \
 		ncurses perl5 pkgconfig shebangfix ssl compiler:c++20-lang
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX}
 
 SLAVEDIRS=	databases/mysql84-client
 
 CPE_VENDOR=	oracle
 
 USE_CXXSTD=	c++20
 USE_PERL5=	run
 
 MY_DBDIR=	/var/db/mysql
 MY_SECDIR=	/var/db/mysql_secure
 MY_TMPDIR=	/var/db/mysql_tmpdir
 
 LIB_DEPENDS+=	libcurl.so:ftp/curl \
 		libicutu.so:devel/icu \
 		liblz4.so:archivers/liblz4 \
 		libhidapi.so:comms/hidapi \
 		libfido2.so:security/libfido2 \
 		${LIB_DEPENDS_${ARCH}}
 LIB_DEPENDS_aarch64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_amd64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_powerpc64=		libunwind.so:devel/libunwind
 LIB_DEPENDS_powerpc64le=	libunwind.so:devel/libunwind
 
 BUILD_DEPENDS=	liblz4>0:archivers/liblz4 \
 		${BUILD_DEPENDS_${ARCH}}
 BUILD_DEPENDS_aarch64=	libunwind>0:devel/libunwind
 BUILD_DEPENDS_amd64=	libunwind>0:devel/libunwind
 BUILD_DEPENDS_powerpc64=	libunwind>0:devel/libunwind
 BUILD_DEPENDS_powerpc64le=	libunwind>0:devel/libunwind
 
 CMAKE_BUILD_TYPE=	Release
 CFLAGS+=		-fPIC
 CFLAGS_aarch64?=	-march=armv8-a+crc+crypto
 
 CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
 		-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
 		-DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
 		-DINSTALL_DOCDIR="share/doc/mysql" \
 		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
 		-DINSTALL_INCLUDEDIR="include/mysql" \
 		-DINSTALL_INFODIR="${INFO_PATH}" \
 		-DINSTALL_LIBDIR="lib/mysql" \
 		-DINSTALL_PRIV_LIBDIR="lib/mysql/private" \
 		-DINSTALL_MANDIR="share/man" \
 		-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
 		-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
 		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
 		-DINSTALL_MYSQLTESTDIR="" \
 		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
 		-DINSTALL_SBINDIR="libexec" \
 		-DINSTALL_SCRIPTDIR="bin" \
 		-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
 		-DINSTALL_SHAREDIR="share" \
 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
 		-DWITH_BOOST="${WRKSRC}/boost" \
 		-DWITH_SYSTEM_LIBS=1 \
 		-DWITH_EDITLINE=system \
 		-DWITH_LZ4=system \
 		-DWITH_ICU=system \
 		-DWITH_CURL=system \
 		-DWITH_ZSTD=bundled \
 		-DWITH_PROTOBUF=bundled \
 		-DWITH_SSL=system \
 		-DWITH_ZLIB=system \
 		-DWITH_LZ4=system
 
 SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
 
 .ifdef USE_MYSQL
 IGNORE=		you have `USE_MYSQL' variable defined either in environment or in make(1) arguments, please undefine and try again
 .endif
 
 SUB_LIST=	MY_DBDIR=${MY_DBDIR} \
 		MY_SECDIR=${MY_SECDIR} \
 		MY_TMPDIR=${MY_TMPDIR}
 
 PLIST_SUB=	MY_DBDIR=${MY_DBDIR} \
 		MY_SECDIR=${MY_SECDIR} \
-		MY_TMPDIR=${MY_TMPDIR} \
-		MYSQL80_LIBVER=${MYSQL80_LIBVER}
+		MY_TMPDIR=${MY_TMPDIR}
 
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
 USES+=		mysql:84
 
 CONFLICTS_INSTALL=	mysql*-server \
 			mysqlwsrep*-server \
 			mariadb*-server \
 			percona*-server
 
 USE_RC_SUBR=	mysql-server
 
 SUB_FILES=	my.cnf.sample pkg-message
 
 USERS=		mysql
 GROUPS=		mysql
 
 USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
 
 MMAN1=		ibd2sdi.1 innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 \
 		myisamlog.1 myisampack.1 mysql_secure_installation.1 mysql_ssl_rsa_setup.1 \
 		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql.server.1 mysqldumpslow.1 mysqld_multi.1 \
 		mysqld_safe.1 mysqlrouter_passwd.1 mysqlrouter_plugin_info.1 mysqlrouter.1
 MMAN8=		mysqld.8
 
 CMAKE_ARGS+=	-DWITHOUT_CLIENTLIBS="ON"
 # Disable unit tests, it fails on !amd64 and <13.0 due to c++17 rules
 CMAKE_ARGS+=	-DWITH_UNIT_TESTS="OFF"
 
 OPTIONS_GROUP=		STORAGE
 OPTIONS_GROUP_STORAGE=	ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA
 OPTIONS_SUB=		YES
 STORAGE_DESC=		Permissible "Storage Engines" (to compile statically into the server)
 ARCHIVE_DESC=		Compile "Archive Storage" statically in server
 BLACKHOLE_DESC=		Compile "Blackhole Storage" statically in server
 EXAMPLE_DESC=		Compile "Example Storage" statically in server
 FEDERATED_DESC=		Compile "Federated Storage" statically in server
 INNOBASE_DESC=		Compile "InnoDB Storage" statically in server
 PARTITION_DESC=		Compile "Partitioning support Storage" statically in server
 PERFSCHEMA_DESC=	Compile "Performance Schema Storage" statically in server
 
 ARCHIVE_CMAKE_ON=	-DWITH_ARCHIVE_STORAGE_ENGINE=1
 BLACKHOLE_CMAKE_ON=	-DWITH_BLACKHOLE_STORAGE_ENGINE=1
 EXAMPLE_CMAKE_ON=	-DWITH_EXAMPLE_STORAGE_ENGINE=1
 FEDERATED_CMAKE_ON=	-DWITH_FEDERATED_STORAGE_ENGINE=1
 INNOBASE_CMAKE_ON=	-DWITH_INNOBASE_STORAGE_ENGINE=1
 PARTITION_CMAKE_ON=	-DWITH_PARTITION_STORAGE_ENGINE=1
 PERFSCHEMA_CMAKE_ON=	-DWITH_PERFSCHEMA_STORAGE_ENGINE=1
 
 OPTIONS_GROUP+=		FEATURES
 OPTIONS_GROUP_FEATURES=	PERFSCHM
 FEATURES_DESC=		Default features knobs
 PERFSCHM_DESC=		Enable "Performance Schema" by default (High RAM usage)
 OPTIONS_DEFAULT+=	PERFSCHM
 
 PERFSCHM_SUB_LIST+=		PERFSCHEMRC=""
 # todo, likely broken, see
 # https://dev.mysql.com/doc/refman/8.4/en/source-configuration-options.html
 PERFSCHM_SUB_LIST_OFF+=		PERFSCHEMRC="--skip-performance-schema"
 FEDERATED_SUB_LIST+=		FEDER="--federated"
 FEDERATED_SUB_LIST_OFF+=	FEDER=""
 .endif
 
 .include <bsd.port.options.mk>
 
 CXXFLAGS+=	-malign-double
 
 .include <bsd.port.pre.mk>
 
 post-extract:
 	@${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
 
 .if !defined(CLIENT_ONLY)
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
 	${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
 	${MKDIR} ${STAGEDIR}${MY_SECDIR}
 	${MKDIR} ${STAGEDIR}${MY_TMPDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/mysql84-server/distinfo b/databases/mysql84-server/distinfo
index 3c5822a40a59..4eb3b871ecf8 100644
--- a/databases/mysql84-server/distinfo
+++ b/databases/mysql84-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1715251111
-SHA256 (mysql-8.4.0.tar.gz) = 47a5433fcdd639db836b99e1b5459c2b813cbdad23ff2b5dd4ad27f792ba918e
-SIZE (mysql-8.4.0.tar.gz) = 413221068
+TIMESTAMP = 1721979278
+SHA256 (mysql-8.4.2.tar.gz) = 5657a78dc86bf0bf2227e0b05f8de5a2c447a816a112ffa26fa70083bcbe9814
+SIZE (mysql-8.4.2.tar.gz) = 425791134
diff --git a/databases/mysql84-server/files/patch-CMakeLists.txt b/databases/mysql84-server/files/patch-CMakeLists.txt
index 8ad23c61d72f..8994243f163f 100644
--- a/databases/mysql84-server/files/patch-CMakeLists.txt
+++ b/databases/mysql84-server/files/patch-CMakeLists.txt
@@ -1,80 +1,80 @@
---- CMakeLists.txt.orig	2024-04-10 06:26:28 UTC
+--- CMakeLists.txt.orig	2024-06-03 11:39:00 UTC
 +++ CMakeLists.txt
-@@ -1836,7 +1836,7 @@ IF(WITH_AUTHENTICATION_LDAP)
+@@ -1845,7 +1845,7 @@ IF(WITH_AUTHENTICATION_LDAP)
  ENDIF()
  
  IF(WITH_AUTHENTICATION_LDAP)
 -  IF(LINUX AND KNOWN_CUSTOM_LIBRARIES)
 +  IF(LINUX OR FREEBSD AND KNOWN_CUSTOM_LIBRARIES)
      # LDAP / SASL / KERBEROS / SSL must all be "system" or "custom", not a mix.
      IF(WITH_LDAP STREQUAL "system" OR
          WITH_SASL STREQUAL "system" OR
-@@ -1887,6 +1887,7 @@ ENDIF()
+@@ -1896,6 +1896,7 @@ ENDIF()
    ENDIF()
  ENDIF()
  
 +IF(NOT WITHOUT_TOOLS)
  # Add system/bundled editline.
  MYSQL_CHECK_EDITLINE()
  SET(EDITLINE_WARN_GIVEN)
-@@ -1897,6 +1898,7 @@ ENDIF()
+@@ -1906,6 +1907,7 @@ ENDIF()
      "You can use -DWITH_EDITLINE=bundled instead."
      )
  ENDIF()
 +ENDIF(NOT WITHOUT_TOOLS)
  
  # Add lz4 library
  MYSQL_CHECK_LZ4()
 @@ -2189,7 +2191,9 @@ ADD_DEPENDENCIES(clang_tidy_prerequisites GenError)
  ADD_DEPENDENCIES(clang_tidy_prerequisites protobuf_generated_all)
  ADD_DEPENDENCIES(clang_tidy_prerequisites GenError)
  
 -ADD_SUBDIRECTORY(include)
 +IF(NOT WITHOUT_CLIENTLIBS)
 +  ADD_SUBDIRECTORY(include)
 +ENDIF(NOT WITHOUT_CLIENTLIBS)
  ADD_SUBDIRECTORY(strings)
  ADD_SUBDIRECTORY(vio)
  ADD_SUBDIRECTORY(mysys)
-@@ -2235,12 +2239,15 @@ ENDIF()
+@@ -2239,12 +2243,15 @@ ENDIF()
    ADD_SUBDIRECTORY(unittest/mytap/t)
  ENDIF()
  
 -ADD_SUBDIRECTORY(client)
 +IF(NOT WITHOUT_TOOLS)
 +  ADD_SUBDIRECTORY(client)
 +ENDIF(NOT WITHOUT_TOOLS)
 +
  ADD_SUBDIRECTORY(utilities)
 -ADD_SUBDIRECTORY(share)
  ADD_SUBDIRECTORY(libservices)
  
  IF(NOT WITHOUT_SERVER)
 +  ADD_SUBDIRECTORY(share)
    ADD_SUBDIRECTORY(testclients)
    ADD_SUBDIRECTORY(sql)
  ENDIF()
-@@ -2318,11 +2325,11 @@ ADD_SUBDIRECTORY(scripts)
+@@ -2322,11 +2329,11 @@ ADD_SUBDIRECTORY(scripts)
  # scripts/mysql_config depends on client and server targets loaded above.
  # It is referenced by some of the directories below, so we insert it here.
  ADD_SUBDIRECTORY(scripts)
 +ADD_SUBDIRECTORY(support-files)
  
  IF(NOT WITHOUT_SERVER)
    ADD_SUBDIRECTORY(mysql-test)
    ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
 -  ADD_SUBDIRECTORY(support-files)
    IF(WITH_INTERNAL)
      ADD_SUBDIRECTORY(internal)
    ENDIF()
-@@ -2350,8 +2357,10 @@ ENDIF()
+@@ -2354,8 +2361,10 @@ ENDIF()
    INCLUDE(fastcov)
  ENDIF()
  
 +IF(FALSE)
  IF(UNIX)
    ADD_SUBDIRECTORY(man)
 +ENDIF()
  ENDIF()
  
  IF(LINUX AND NOT WITHOUT_SERVER)
diff --git a/databases/mysql84-server/files/patch-cmake_libutils.cmake b/databases/mysql84-server/files/patch-cmake_libutils.cmake
new file mode 100644
index 000000000000..a96fa8f41fb3
--- /dev/null
+++ b/databases/mysql84-server/files/patch-cmake_libutils.cmake
@@ -0,0 +1,22 @@
+--- cmake/libutils.cmake.orig	2024-06-03 11:39:00 UTC
++++ cmake/libutils.cmake
+@@ -384,9 +384,6 @@ MACRO(MERGE_LIBRARIES_SHARED TARGET_ARG)
+     ELSE()
+       SET(DESTINATION "${INSTALL_LIBDIR}")
+     ENDIF()
+-    IF(ARG_NAMELINK_SKIP)
+-      SET(INSTALL_ARGS NAMELINK_SKIP)
+-    ENDIF()
+     MYSQL_INSTALL_TARGET(${TARGET} DESTINATION "${DESTINATION}" ${COMP}
+       ${INSTALL_ARGS})
+   ENDIF()
+@@ -642,9 +639,6 @@ FUNCTION(ADD_SHARED_LIBRARY TARGET_ARG)
+       SET(COMP COMPONENT ${ARG_COMPONENT})
+     ELSE()
+       SET(COMP COMPONENT SharedLibraries)
+-    ENDIF()
+-    IF(ARG_NAMELINK_SKIP)
+-      SET(INSTALL_ARGS NAMELINK_SKIP)
+     ENDIF()
+     MYSQL_INSTALL_TARGET(${TARGET} DESTINATION "${DESTINATION}" ${COMP}
+       ${INSTALL_ARGS})
diff --git a/databases/mysql84-server/files/patch-man_CMakeLists.txt b/databases/mysql84-server/files/patch-man_CMakeLists.txt
index 89140e0259ea..5131ef284286 100644
--- a/databases/mysql84-server/files/patch-man_CMakeLists.txt
+++ b/databases/mysql84-server/files/patch-man_CMakeLists.txt
@@ -1,71 +1,71 @@
---- man/CMakeLists.txt.orig	2024-04-10 06:26:28 UTC
+--- man/CMakeLists.txt.orig	2024-06-03 11:39:00 UTC
 +++ man/CMakeLists.txt
 @@ -24,13 +24,6 @@ SET(MAN1
  # Copy man pages
  SET(MAN1
    comp_err.1
 -  ibd2sdi.1
 -  innochecksum.1
 -  my_print_defaults.1
 -  myisam_ftdump.1
 -  myisamchk.1
 -  myisamlog.1
 -  myisampack.1
    mysql.1
    mysql_config.1
    mysql_config_editor.1
 @@ -40,7 +33,6 @@ SET(MAN1
    mysqlbinlog.1
    mysqlcheck.1
    mysqldump.1
 -  mysqldumpslow.1
    mysqlimport.1
    mysqlman.1
    mysqlshow.1
 @@ -48,13 +40,23 @@ SET(MAN1
    perror.1
    )
  
 -IF(NOT WITH_SYSTEMD)
 -  LIST(APPEND MAN1
 -    mysql.server.1
 -    mysqld_multi.1
 -    mysqld_safe.1
 +SET(MAN1_TOOLS
 +  ibd2sdi.1
 +  innochecksum.1
 +  my_print_defaults.1
 +  myisam_ftdump.1
 +  myisamchk.1
 +  myisamlog.1
 +  myisampack.1
 +  mysql.server.1
 +  mysql_secure_installation.1
 +  mysql_ssl_rsa_setup.1
 +  mysql_tzinfo_to_sql.1
 +  mysql_upgrade.1
 +  mysqldumpslow.1
 +  mysqld_multi.1
 +  mysqld_safe.1
    )
 -ENDIF()
  
  SET(MAN1_NDB
    ndb_blob_tool.1
-@@ -101,8 +103,14 @@ SET(MAN8_NDB
+@@ -102,8 +104,14 @@ SET(MAN8_NDB
    ndbmtd.8
  )
  
 -INSTALL(FILES ${MAN1} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPages)
 -INSTALL(FILES ${MAN8} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPages)
 +IF(NOT WITHOUT_CLIENTLIBS)
 +    INSTALL(FILES ${MAN1} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPages)
 +ENDIF()
 +
 +IF(NOT WITHOUT_SERVER)
 +    INSTALL(FILES ${MAN1_TOOLS} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPages)
 +    INSTALL(FILES ${MAN8} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPages)
 +ENDIF()
  
  IF(WITH_ROUTER)
    INSTALL(FILES ${MAN1_ROUTER}
diff --git a/databases/mysql84-server/files/patch-router_src_harness_src_CMakeLists.txt b/databases/mysql84-server/files/patch-router_src_harness_src_CMakeLists.txt
deleted file mode 100644
index 223346bbf72b..000000000000
--- a/databases/mysql84-server/files/patch-router_src_harness_src_CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
---- router/src/harness/src/CMakeLists.txt.orig	2024-04-10 06:26:28 UTC
-+++ router/src/harness/src/CMakeLists.txt
-@@ -241,7 +241,6 @@ ELSE()
-   INSTALL(TARGETS harness-library
-     LIBRARY
-     DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
--    NAMELINK_SKIP
-     )
- ENDIF()
- 
-@@ -273,7 +272,6 @@ INSTALL(TARGETS harness_stdx
-   RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
-   ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
-   LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
--  NAMELINK_SKIP
-   )
- 
- ## harness_tls
-@@ -315,5 +313,4 @@ INSTALL(TARGETS harness_tls
-   RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
-   ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
-   LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
--  NAMELINK_SKIP
-   )
diff --git a/databases/mysql84-server/files/patch-router_src_http_src_CMakeLists.txt b/databases/mysql84-server/files/patch-router_src_http_src_CMakeLists.txt
deleted file mode 100644
index 8c7d705207fd..000000000000
--- a/databases/mysql84-server/files/patch-router_src_http_src_CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
---- router/src/http/src/CMakeLists.txt.orig	2024-04-10 06:26:28 UTC
-+++ router/src/http/src/CMakeLists.txt
-@@ -72,7 +72,6 @@ INSTALL(TARGETS http_common
-   RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
-   ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
-   LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
--  NAMELINK_SKIP
-   )
- 
- ## split library code from the plugin to use them _passwd and tests
-@@ -99,7 +98,6 @@ INSTALL(TARGETS http_auth_backend_lib
-   RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
-   ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
-   LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
--  NAMELINK_SKIP
-   )
- TARGET_INCLUDE_DIRECTORIES(http_auth_backend_lib PUBLIC
-   ${CMAKE_CURRENT_SOURCE_DIR}
-@@ -152,7 +150,6 @@ INSTALL(TARGETS http_auth_realm_lib
-   RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
-   ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
-   LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
--  NAMELINK_SKIP
-   )
- ## the rpath for the bundled openssl
- ADD_INSTALL_RPATH_FOR_OPENSSL(http_auth_realm_lib)
diff --git a/databases/mysql84-server/files/patch-router_src_io_src_CMakeLists.txt b/databases/mysql84-server/files/patch-router_src_io_src_CMakeLists.txt
deleted file mode 100644
index 33ad809e338f..000000000000
--- a/databases/mysql84-server/files/patch-router_src_io_src_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- router/src/io/src/CMakeLists.txt.orig	2024-04-10 06:26:28 UTC
-+++ router/src/io/src/CMakeLists.txt
-@@ -48,7 +48,6 @@ INSTALL(TARGETS io_component
-   RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
-   ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
-   LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
--  NAMELINK_SKIP
-   )
- 
- GENERATE_EXPORT_HEADER(io_component
diff --git a/databases/mysql84-server/files/patch-router_src_router_src_CMakeLists.txt b/databases/mysql84-server/files/patch-router_src_router_src_CMakeLists.txt
deleted file mode 100644
index 6be721ccac1c..000000000000
--- a/databases/mysql84-server/files/patch-router_src_router_src_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- router/src/router/src/CMakeLists.txt.orig	2024-04-10 06:26:28 UTC
-+++ router/src/router/src/CMakeLists.txt
-@@ -156,7 +156,6 @@ INSTALL(TARGETS router_lib
-   RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
-   ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
-   LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
--  NAMELINK_SKIP
-   )
- 
- MYSQL_ADD_EXECUTABLE(mysqlrouter_keyring
diff --git a/databases/mysql84-server/pkg-plist b/databases/mysql84-server/pkg-plist
index ccfd0220023a..b1849b78fa3c 100644
--- a/databases/mysql84-server/pkg-plist
+++ b/databases/mysql84-server/pkg-plist
@@ -1,255 +1,269 @@
 LICENSE.router
 README.router
 bin/ibd2sdi
 bin/innochecksum
 bin/myisam_ftdump
 bin/myisamchk
 bin/myisamlog
 bin/myisampack
 bin/mysql_client_test
 bin/mysql_keyring_encryption_test
 bin/mysql_secure_installation
 bin/mysql_test_event_tracking
 bin/mysql_tzinfo_to_sql
 bin/mysqld_multi
 bin/mysqld_safe
 bin/mysqldumpslow
 bin/mysqlrouter
 bin/mysqlrouter_keyring
 bin/mysqlrouter_passwd
 bin/mysqlrouter_plugin_info
 bin/mysqltest
 bin/mysqltest_safe_process
 bin/mysqlxtest
 etc/logrotate.d/mysqlrouter
 %%ETCDIR%%/my.cnf.sample
 lib/mysql/libmysqlharness.so
 lib/mysql/libmysqlharness.so.1
 lib/mysql/libmysqlharness_stdx.so
 lib/mysql/libmysqlharness_stdx.so.1
 lib/mysql/libmysqlharness_tls.so
 lib/mysql/libmysqlharness_tls.so.1
 lib/mysql/libmysqlrouter.so
 lib/mysql/libmysqlrouter.so.1
+lib/mysql/libmysqlrouter_cluster.so
+lib/mysql/libmysqlrouter_cluster.so.1
+lib/mysql/libmysqlrouter_connection_pool.so
 lib/mysql/libmysqlrouter_connection_pool.so.1
+lib/mysql/libmysqlrouter_destination_status.so
 lib/mysql/libmysqlrouter_destination_status.so.1
 lib/mysql/libmysqlrouter_http.so
 lib/mysql/libmysqlrouter_http.so.1
 lib/mysql/libmysqlrouter_http_auth_backend.so
 lib/mysql/libmysqlrouter_http_auth_backend.so.1
 lib/mysql/libmysqlrouter_http_auth_realm.so
 lib/mysql/libmysqlrouter_http_auth_realm.so.1
+lib/mysql/libmysqlrouter_http_server.so
+lib/mysql/libmysqlrouter_http_server.so.1
 lib/mysql/libmysqlrouter_io_component.so
 lib/mysql/libmysqlrouter_io_component.so.1
+lib/mysql/libmysqlrouter_metadata_cache.so
 lib/mysql/libmysqlrouter_metadata_cache.so.1
+lib/mysql/libmysqlrouter_mysql.so
+lib/mysql/libmysqlrouter_mysql.so.1
+lib/mysql/libmysqlrouter_mysqlxmessages.so
 lib/mysql/libmysqlrouter_mysqlxmessages.so.1
+lib/mysql/libmysqlrouter_routing.so
 lib/mysql/libmysqlrouter_routing.so.1
+lib/mysql/libmysqlrouter_routing_connections.so
 lib/mysql/libmysqlrouter_routing_connections.so.1
+lib/mysql/libmysqlrouter_utils.so
+lib/mysql/libmysqlrouter_utils.so.1
 lib/mysql/libprotobuf-lite.so.24.4.0
 lib/mysql/mysqlrouter/connection_pool.so
 lib/mysql/mysqlrouter/destination_status.so
 lib/mysql/mysqlrouter/http_auth_backend.so
 lib/mysql/mysqlrouter/http_auth_realm.so
 lib/mysql/mysqlrouter/http_server.so
 lib/mysql/mysqlrouter/io.so
 lib/mysql/mysqlrouter/keepalive.so
 lib/mysql/mysqlrouter/metadata_cache.so
 lib/mysql/mysqlrouter/rest_api.so
 lib/mysql/mysqlrouter/rest_connection_pool.so
 lib/mysql/mysqlrouter/rest_metadata_cache.so
 lib/mysql/mysqlrouter/rest_router.so
 lib/mysql/mysqlrouter/rest_routing.so
 lib/mysql/mysqlrouter/router_openssl.so
 lib/mysql/mysqlrouter/router_protobuf.so
 lib/mysql/mysqlrouter/routing.so
 lib/mysql/plugin/adt_null.so
 lib/mysql/plugin/auth.so
 lib/mysql/plugin/auth_test_plugin.so
 lib/mysql/plugin/component_audit_api_message_emit.so
 lib/mysql/plugin/component_example_component1.so
 lib/mysql/plugin/component_example_component2.so
 lib/mysql/plugin/component_example_component3.so
 lib/mysql/plugin/component_log_filter_dragnet.so
 lib/mysql/plugin/component_log_sink_json.so
 lib/mysql/plugin/component_log_sink_syseventlog.so
 lib/mysql/plugin/component_log_sink_test.so
 lib/mysql/plugin/component_mysqlbackup.so
 lib/mysql/plugin/component_mysqlx_global_reset.so
 lib/mysql/plugin/component_pfs_example.so
 lib/mysql/plugin/component_pfs_example_component_population.so
 lib/mysql/plugin/component_query_attributes.so
 lib/mysql/plugin/component_reference_cache.so
 lib/mysql/plugin/component_test_audit_api_message.so
 lib/mysql/plugin/component_test_backup_lock_service.so
 lib/mysql/plugin/component_test_component_deinit.so
 lib/mysql/plugin/component_test_event_tracking_consumer.so
 lib/mysql/plugin/component_test_event_tracking_consumer_a.so
 lib/mysql/plugin/component_test_event_tracking_consumer_b.so
 lib/mysql/plugin/component_test_event_tracking_consumer_c.so
 lib/mysql/plugin/component_test_event_tracking_producer_a.so
 lib/mysql/plugin/component_test_event_tracking_producer_b.so
 lib/mysql/plugin/component_test_host_application_signal.so
 lib/mysql/plugin/component_test_mysql_command_services.so
 lib/mysql/plugin/component_test_mysql_current_thread_reader.so
 lib/mysql/plugin/component_test_mysql_runtime_error.so
 lib/mysql/plugin/component_test_mysql_system_variable_set.so
 lib/mysql/plugin/component_test_mysql_thd_store_service.so
 lib/mysql/plugin/component_test_pfs_notification.so
 lib/mysql/plugin/component_test_pfs_resource_group.so
 lib/mysql/plugin/component_test_sensitive_system_variables.so
 lib/mysql/plugin/component_test_server_telemetry_traces.so
 lib/mysql/plugin/component_test_status_var_reader.so
 lib/mysql/plugin/component_test_status_var_service.so
 lib/mysql/plugin/component_test_status_var_service_int.so
 lib/mysql/plugin/component_test_status_var_service_reg_only.so
 lib/mysql/plugin/component_test_status_var_service_str.so
 lib/mysql/plugin/component_test_status_var_service_unreg_only.so
 lib/mysql/plugin/component_test_string_service.so
 lib/mysql/plugin/component_test_string_service_charset.so
 lib/mysql/plugin/component_test_string_service_long.so
 lib/mysql/plugin/component_test_sys_var_service.so
 lib/mysql/plugin/component_test_sys_var_service_int.so
 lib/mysql/plugin/component_test_sys_var_service_same.so
 lib/mysql/plugin/component_test_sys_var_service_str.so
 lib/mysql/plugin/component_test_system_variable_source.so
 lib/mysql/plugin/component_test_table_access.so
 lib/mysql/plugin/component_test_udf_registration.so
 lib/mysql/plugin/component_test_udf_services.so
 lib/mysql/plugin/component_udf_reg_3_func.so
 lib/mysql/plugin/component_udf_reg_avg_func.so
 lib/mysql/plugin/component_udf_reg_int_func.so
 lib/mysql/plugin/component_udf_reg_int_same_func.so
 lib/mysql/plugin/component_udf_reg_only_3_func.so
 lib/mysql/plugin/component_udf_reg_real_func.so
 lib/mysql/plugin/component_udf_unreg_3_func.so
 lib/mysql/plugin/component_udf_unreg_int_func.so
 lib/mysql/plugin/component_udf_unreg_real_func.so
 lib/mysql/plugin/component_validate_password.so
 lib/mysql/plugin/component_keyring_file.so
 lib/mysql/plugin/conflicting_variables.so
 lib/mysql/plugin/connection_control.so
 lib/mysql/plugin/daemon_example.ini
 lib/mysql/plugin/ddl_rewriter.so
 lib/mysql/plugin/group_replication.so
 %%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so
 lib/mysql/plugin/ha_mock.so
 lib/mysql/plugin/keyring_udf.so
 lib/mysql/plugin/libdaemon_example.so
 lib/mysql/plugin/libtest_framework.so
 lib/mysql/plugin/libtest_services.so
 lib/mysql/plugin/libtest_services_threaded.so
 lib/mysql/plugin/libtest_session_attach.so
 lib/mysql/plugin/libtest_session_detach.so
 lib/mysql/plugin/libtest_session_in_thd.so
 lib/mysql/plugin/libtest_session_info.so
 lib/mysql/plugin/libtest_sql_2_sessions.so
 lib/mysql/plugin/libtest_sql_all_col_types.so
 lib/mysql/plugin/libtest_sql_cmds_1.so
 lib/mysql/plugin/libtest_sql_commit.so
 lib/mysql/plugin/libtest_sql_complex.so
 lib/mysql/plugin/libtest_sql_errors.so
 lib/mysql/plugin/libtest_sql_lock.so
 lib/mysql/plugin/libtest_sql_processlist.so
 lib/mysql/plugin/libtest_sql_replication.so
 lib/mysql/plugin/libtest_sql_reset_connection.so
 lib/mysql/plugin/libtest_sql_shutdown.so
 lib/mysql/plugin/libtest_sql_sleep_is_connected.so
 lib/mysql/plugin/libtest_sql_sqlmode.so
 lib/mysql/plugin/libtest_sql_stmt.so
 lib/mysql/plugin/libtest_sql_stored_procedures_functions.so
 lib/mysql/plugin/libtest_sql_views_triggers.so
 lib/mysql/plugin/libtest_x_sessions_deinit.so
 lib/mysql/plugin/libtest_x_sessions_init.so
 lib/mysql/plugin/locking_service.so
 lib/mysql/plugin/mypluglib.so
 lib/mysql/plugin/mysql_clone.so
 lib/mysql/plugin/mysql_no_login.so
 lib/mysql/plugin/pfs_example_plugin_employee.so
 lib/mysql/plugin/qa_auth_client.so
 lib/mysql/plugin/qa_auth_interface.so
 lib/mysql/plugin/qa_auth_server.so
 lib/mysql/plugin/replication_observers_example_plugin.so
 lib/mysql/plugin/rewrite_example.so
 lib/mysql/plugin/rewriter.so
 lib/mysql/plugin/semisync_master.so
 lib/mysql/plugin/semisync_replica.so
 lib/mysql/plugin/semisync_slave.so
 lib/mysql/plugin/semisync_source.so
 lib/mysql/plugin/component_test_execute_prepared_statement.so
 lib/mysql/plugin/component_test_execute_regular_statement.so
 lib/mysql/plugin/component_test_mysql_signal_handler.so
 lib/mysql/plugin/component_test_server_telemetry_metrics.so
 lib/mysql/plugin/test_security_context.so
 lib/mysql/plugin/test_services_command_services.so
 lib/mysql/plugin/test_services_host_application_signal.so
 lib/mysql/plugin/test_services_plugin_registry.so
 lib/mysql/plugin/test_udf_services.so
 lib/mysql/plugin/udf_example.so
 lib/mysql/plugin/validate_password.so
 lib/mysql/plugin/version_token.so
 lib/mysql/private/libprotobuf-lite.so.24.4.0
 lib/mysql/private/libprotobuf.so.24.4.0
 libexec/mysqld
 %%DATADIR%%/bulgarian/errmsg.sys
 %%DATADIR%%/charsets/Index.xml
 %%DATADIR%%/charsets/README
 %%DATADIR%%/charsets/armscii8.xml
 %%DATADIR%%/charsets/ascii.xml
 %%DATADIR%%/charsets/cp1250.xml
 %%DATADIR%%/charsets/cp1251.xml
 %%DATADIR%%/charsets/cp1256.xml
 %%DATADIR%%/charsets/cp1257.xml
 %%DATADIR%%/charsets/cp850.xml
 %%DATADIR%%/charsets/cp852.xml
 %%DATADIR%%/charsets/cp866.xml
 %%DATADIR%%/charsets/dec8.xml
 %%DATADIR%%/charsets/geostd8.xml
 %%DATADIR%%/charsets/greek.xml
 %%DATADIR%%/charsets/hebrew.xml
 %%DATADIR%%/charsets/hp8.xml
 %%DATADIR%%/charsets/keybcs2.xml
 %%DATADIR%%/charsets/koi8r.xml
 %%DATADIR%%/charsets/koi8u.xml
 %%DATADIR%%/charsets/latin1.xml
 %%DATADIR%%/charsets/latin2.xml
 %%DATADIR%%/charsets/latin5.xml
 %%DATADIR%%/charsets/latin7.xml
 %%DATADIR%%/charsets/macce.xml
 %%DATADIR%%/charsets/macroman.xml
 %%DATADIR%%/charsets/swe7.xml
 %%DATADIR%%/czech/errmsg.sys
 %%DATADIR%%/danish/errmsg.sys
 %%DATADIR%%/dictionary.txt
 %%DATADIR%%/dutch/errmsg.sys
 %%DATADIR%%/english/errmsg.sys
 %%DATADIR%%/estonian/errmsg.sys
 %%DATADIR%%/french/errmsg.sys
 %%DATADIR%%/german/errmsg.sys
 %%DATADIR%%/greek/errmsg.sys
 %%DATADIR%%/hungarian/errmsg.sys
 %%DATADIR%%/install_rewriter.sql
 %%DATADIR%%/italian/errmsg.sys
 %%DATADIR%%/japanese/errmsg.sys
 %%DATADIR%%/korean/errmsg.sys
 %%DATADIR%%/messages_to_clients.txt
 %%DATADIR%%/messages_to_error_log.txt
 %%DATADIR%%/mysql-log-rotate
 %%DATADIR%%/mysql.server
 %%DATADIR%%/mysqld_multi.server
 %%DATADIR%%/norwegian-ny/errmsg.sys
 %%DATADIR%%/norwegian/errmsg.sys
 %%DATADIR%%/polish/errmsg.sys
 %%DATADIR%%/portuguese/errmsg.sys
 %%DATADIR%%/romanian/errmsg.sys
 %%DATADIR%%/russian/errmsg.sys
 %%DATADIR%%/serbian/errmsg.sys
 %%DATADIR%%/slovak/errmsg.sys
 %%DATADIR%%/spanish/errmsg.sys
 %%DATADIR%%/swedish/errmsg.sys
 %%DATADIR%%/ukrainian/errmsg.sys
 %%DATADIR%%/uninstall_rewriter.sql
 %%DATADIR%%router/docs/sample_mysqlrouter.conf
-@dir %%ETCDIR%%/keyring
+@dir(mysql,mysql,0750) %%ETCDIR%%/keyring
 @dir lib/mysql/plugin/debug
-@dir %%MY_SECDIR%%
-@dir %%MY_TMPDIR%%
+@dir(mysql,mysql,0750) %%MY_SECDIR%%
+@dir(mysql,mysql,0750) %%MY_TMPDIR%%