diff --git a/CHANGES b/CHANGES
index b7b8e8a93a4..a6af122cf8f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,42 @@ in the release notes and/or placed into UPDATING.
 
 All ports committers are allowed to commit to this file.
 
+20250205:
+AUTHOR: yasu@FreeBSD.org
+
+  3 new variables are defined if you add 'USES=samba' in Makefile.
+
+  * SAMBA_TALLOC_PORT
+  * SAMBA_TDB_PORT
+  * SAMBA_TEVENT_PORT
+
+  They are intended to be used by ports that works with Samba to
+  specify proper version of talloc, tdb and/or tevent as dependency
+  such as bellow.
+
+      LIB_DEPENDS=	ibtalloc.so:${SAMBA_TALLOC_PORT} \
+			libtdb.so:${SAMBA_TDB_PORT} \
+			libtevent.so:${SAMBA_TEVENT_PORT}
+      USES=		samba:env
+
+  You need not use them if port just depends on talloc, tdb and/or
+  tevent and it has nothing to do with Samba.
+
+20250203:
+AUTHOR: yasu@FreeBSD.org
+
+  Following legacy variables are removed from Mk/Uses/samba.mk
+
+  * SAMBAPORT
+  * SAMBAINCLUDES
+  * SAMBALIBS
+
+  And ones below should be used instead.
+
+  * SAMBA_PORT
+  * SAMBA_INCLUDEDIR
+  * SAMBA_LIBDIR
+
 20241231:
 AUTHOR: bofh@FreeBSD.org
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9a7be3ba194..cd23241c4ef 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,9 @@
-FreeBSD does not currently accept pull requests. This is a read-only mirror from SVN.
+# FreeBSD Ports Collection Contribution Guidelines
 
-Please see the [Porter's Handbook](https://docs.freebsd.org/en/books/porters-handbook/) section on [Submitting patches](https://docs.freebsd.org/en/books/porters-handbook/quick-porting/#porting-submitting).
+Contributions may be submitted to the FreeBSD Ports Collection via one of three methods:
+
+- Attachments to [Bugzilla tickets](https://bugs.freebsd.org) are preferred, as this notifies existing maintainers.
+- Code reviews on [Phabricator](https://reviews.freebsd.org/differential) are accepted by some maintainers.
+- GitHub Pull Requests are an experimental feature and should expect additional delay.
+
+To learn more about contributing to the FreeBSD Ports Collection, please see the [Porter's Handbook](https://docs.freebsd.org/en/books/porters-handbook/) section on [Submitting patches](https://docs.freebsd.org/en/books/porters-handbook/quick-porting/#porting-submitting).
diff --git a/GIDs b/GIDs
index 81a5275cc3c..58cbe5ed30d 100644
--- a/GIDs
+++ b/GIDs
@@ -805,7 +805,7 @@ plocate:*:860:
 # free: 861
 # free: 862
 # free: 863
-# free: 864
+mediamtx:*:864:
 z2m:*:865:
 vglusers:*:866:
 sqlpage:*:867:
diff --git a/MOVED b/MOVED
index 1e6a94bb874..f0736bf5a10 100644
--- a/MOVED
+++ b/MOVED
@@ -3891,7 +3891,6 @@ devel/py-jailconf||2025-01-02|Unknown, port deleted long time ago, entry added t
 devel/py-zeep||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
 devel/rubygem-acts-as-taggable-on||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
 devel/rubygem-google-apis-serviceusage_v1_041||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
-devel/rubygem-validates_timeliness7||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
 devel/sublime-merge||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
 devel/vulkan-validation-layers||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
 devel/xlocale||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
@@ -4016,3 +4015,125 @@ devel/py-zclockfile|devel/py-zc.lockfile|2025-01-11|Switch consumers to latest p
 devel/elixir-hex||2025-01-11|No longer used by any consumers, newer versions are expected to be installed per-user by mix
 devel/elixir-make||2025-01-11|No longer used by any consumers, newer versions are expected to be installed per-user by mix
 audio/gqradio||2025-01-13|Has expired: BKTR devices are not supported anymore
+x11-themes/kf5-breeze-icons|x11-themes/kf6-breeze-icons|2025-01-15|Replaced by the KF6 version
+x11-themes/kf5-oxygen-icons5|x11-themes/oxygen-icons|2025-01-15|Rename in accordance with the upstream
+devel/raknet||2025-01-15|Has expired: Unmaintained upstream, only builds with EOL toolchain
+devel/pas2dox||2025-01-15|Has expired: doesn't compile with moddern clang and gcc, upstream last updated it in 2003
+x11-toolkits/kirigami-addons|x11-toolkits/kirigami-addons-qt5|2025-01-16|Moved to have symmetric names with Qt6
+x11-toolkits/kirigami-addons-devel|x11-toolkits/kirigami-addons-qt6|2025-01-16|Moved to have symmetric names with Qt6
+audio/guitarix-lv2||2025-01-18|Has expired: Broken for more than a year
+net/libproxy-duktape||2025-01-19|Completely rewritten, plugins now built directly into the library
+net/libproxy-gnome3||2025-01-19|Completely rewritten, plugins now built directly into the library
+net/libproxy-kde||2025-01-19|Completely rewritten, plugins now built directly into the library
+net/libproxy-pacrunner||2025-01-19|Completely rewritten, plugins now built directly into the library
+net/libproxy-perl||2025-01-19|Completely rewritten, plugins now built directly into the library
+net/libproxy-python||2025-01-19|Completely rewritten, plugins now built directly into the library
+net/libproxy-webkit3||2025-01-19|Completely rewritten, plugins now built directly into the library
+www/webkit2-gtk3|www/webkit2-gtk@40|2025-01-20|Flavoured
+www/webkit2-gtk4|www/webkit2-gtk@60|2025-01-20|Flavoured
+sysutils/bareos21-traymonitor||2025-01-21|Has expired: not supported upstream
+www/bareos20-webui||2025-01-21|Has expired: not supported upstream
+www/bareos21-webui||2025-01-21|Has expired: not supported upstream
+sysutils/bareos20-traymonitor||2025-01-21|Has expired: not supported upstream
+sysutils/bareos20-client||2025-01-21|Has expired: not supported upstream
+sysutils/bareos20-server||2025-01-21|Has expired: not supported upstream
+sysutils/bareos21-client||2025-01-21|Has expired: not supported upstream
+sysutils/bareos21-server||2025-01-21|Has expired: not supported upstream
+www/mediawiki141||2025-01-22|Has expired: EOL upstream
+audio/plasma5-oxygen-sounds|audio/plasma6-oxygen-sounds|2025-01-23|Superseded by its Plasma 6 counterpart
+devel/kf5-extra-cmake-modules|devel/kf6-extra-cmake-modules|2025-01-23|Superseded by its KF6 counterpart
+devel/kf5-kapidox|devel/kf6-kapidox|2025-01-23|Superseded by its KF6 counterpart
+devel/rubygem-strong_migrations61|devel/rubygem-strong_migrations|2025-01-23|Has expired: Ruby on Rails 6.1.x reached EOL on 2024-10-01
+databases/rubygem-active_model_serializers61|databases/rubygem-active_model_serializers|2025-01-23|Has expired: Ruby on Rails 6.1.x reached EOL on 2024-10-01
+www/rubygem-gollum-grit_adapter10|www/rubygem-gollum-grit_adapter|2025-01-25|Obsolete, use www/rubygem-gollum-grit_adapter instead
+databases/jdbc-oracle11g||2025-01-25|Has expired: Oracle no longer provides public downloads of the old JDBC drivers
+emulators/vxtools||2025-01-25|Has expired: Dist files are no longer available as site returns NXDOMAIN
+java/infobus||2025-01-25|Has expired: Outdated API and is no longer actively developed or maintained
+chinese/eterm||2025-01-27|Has expired: Depends on kcfonts, which is marked DEPRECATED
+mail/queue-fix||2025-01-27|Has expired: Upstream disapeared and distfile is no more available
+games/senken||2025-01-27|Has expired: GENTOO mastersites are no longer available
+chinese/kcfonts||2025-01-27|Has expired: GENTOO MASTER_SITES are no longer available
+x11/fbdesk||2025-01-27|Has expired: Upstream disapear and distfile is no more available
+graphics/Hermes||2025-01-27|Has expired: Unmaintained, and no more public distfiles
+math/PDL|math/p5-PDL|2025-01-28|Move math/PDL to math/p5-PDL
+irc/ezbounce||2025-01-28|Has expired: broken with modern Boost, broken with modern compilers, last release in 2009, upstream is dead
+lang/rust182||2025-01-29|No consumers in ports
+x11-fm/tdfsb||2025-01-30|Has expired: Unmaintained, uses smpeg which has no distfiles anymore
+games/prboom|games/prboom-plus|2025-01-30|Has expired: Unmaintained, use games/prboom-plus instead
+net/akonadi-notes||2025-02-03|Discontinued upstream
+print/print-manager|print/plasma6-print-manager|2025-02-03|Moved to Plasma 6
+archivers/ark-devel|archivers/ark|2025-02-03|Obsoleted by non-devel version
+audio/plasma5-kpipewire|audio/plasma6-kpipewire|2025-02-03|Moved to Plasma 6
+audio/plasma5-plasma-pa|audio/plasma6-plasma-pa|2025-02-03|Moved to Plasma 6
+deskutils/plasma5-milou|deskutils/plasma6-milou|2025-02-03|Moved to Plasma 6
+deskutils/plasma5-sddm-kcm|deskutils/plasma6-sddm-kcm|2025-02-03|Moved to Plasma 6
+deskutils/plasma5-xdg-desktop-portal-kde|deskutils/plasma6-xdg-desktop-portal-kde|2025-02-03|Moved to Plasma 6
+devel/dolphin-plugins-devel|devel/dolphin-plugins|2025-02-03|Obsoleted by non-devel version
+devel/plasma5-khotkeys||2025-02-03|Discontinued upstream
+devel/plasma5-kwrited|devel/plasma6-kwrited|2025-02-03|Moved to Plasma 6
+devel/plasma5-plasma-sdk|devel/plasma6-plasma-sdk|2025-02-03|Moved to Plasma 6
+editors/kate-devel|editors/kate|2025-02-03|Obsoleted by non-devel version
+graphics/gwenview-devel|graphics/gwenview|2025-02-03|Obsoleted by non-devel version
+graphics/libkexiv2-devel|graphics/libkexiv2|2025-02-03|Obsoleted by non-devel version
+graphics/okular-devel|graphics/okular|2025-02-03|Obsoleted by non-devel version
+graphics/spectacle-devel|graphics/spectacle|2025-02-03|Obsoleted by non-devel version
+multimedia/plasma5-plank-player||2025-02-03|No releases for Plasma 6
+security/plasma5-kscreenlocker|security/plasma6-kscreenlocker|2025-02-03|Moved to Plasma 6
+security/plasma5-ksshaskpass|security/plasma6-ksshaskpass|2025-02-03|Moved to Plasma 6
+security/plasma5-kwallet-pam|security/plasma6-kwallet-pam|2025-02-03|Moved to Plasma 6
+sysutils/plasma5-discover|sysutils/plasma6-discover|2025-02-03|Moved to Plasma 6
+sysutils/plasma5-drkonqi|sysutils/plasma6-drkonqi|2025-02-03|Moved to Plasma 6
+sysutils/plasma5-kde-cli-tools|sysutils/plasma6-kde-cli-tools|2025-02-03|Moved to Plasma 6
+sysutils/plasma5-kinfocenter|sysutils/plasma6-kinfocenter|2025-02-03|Moved to Plasma 6
+sysutils/plasma5-kmenuedit|sysutils/plasma6-kmenuedit|2025-02-03|Moved to Plasma 6
+sysutils/plasma5-ksysguard||2025-02-03|Discontinued upstream
+sysutils/plasma5-ksystemstats|sysutils/plasma6-ksystemstats|2025-02-03|Moved to Plasma 6
+sysutils/plasma5-plasma-disks|sysutils/plasma6-plasma-disks|2025-02-03|Moved to Plasma 6
+sysutils/plasma5-plasma-systemmonitor|sysutils/plasma6-plasma-systemmonitor|2025-02-03|Moved to Plasma 6
+sysutils/plasma5-polkit-kde-agent-1|sysutils/plasma6-polkit-kde-agent-1|2025-02-03|Moved to Plasma 6
+sysutils/plasma5-powerdevil|sysutils/plasma6-powerdevil|2025-02-03|Moved to Plasma 6
+sysutils/plasma5-systemsettings|sysutils/plasma6-systemsettings|2025-02-03|Moved to Plasma 6
+www/plasma5-plasma-browser-integration|www/plasma6-plasma-browser-integration|2025-02-03|Moved to Plasma 6
+x11-fm/dolphin-devel|x11-fm/dolphin|2025-02-03|Obsoleted by non-devel version
+x11-themes/plasma5-breeze|x11-themes/plasma6-breeze|2025-02-03|Moved to Plasma 6
+x11-themes/plasma5-breeze-gtk|x11-themes/plasma6-breeze-gtk|2025-02-03|Moved to Plasma 6
+x11-themes/plasma5-kde-gtk-config|x11-themes/plasma6-kde-gtk-config|2025-02-03|Moved to Plasma 6
+x11-themes/plasma5-oxygen|x11-themes/plasma6-oxygen|2025-02-03|Moved to Plasma 6
+x11-themes/plasma5-plasma-workspace-wallpapers|x11-themes/plasma6-plasma-workspace-wallpapers|2025-02-03|Moved to Plasma 6
+x11-toolkits/plasma5-kdeplasma-addons|x11-toolkits/plasma6-kdeplasma-addons|2025-02-03|Moved to Plasma 6
+x11-wm/plasma5-kdecoration|x11-wm/plasma6-kdecoration|2025-02-03|Moved to Plasma 6
+x11-wm/plasma5-kwin|x11-wm/plasma6-kwin|2025-02-03|Moved to Plasma 6
+x11/kde5|x11/kde|2025-02-03|Remove version from KDE metaport
+x11/kde6|x11/kde|2025-02-03|Remove version from KDE metaport
+x11/konsole-devel|x11/konsole|2025-02-03|Obsoleted by non-devel version
+x11/plasma5-kactivitymanagerd|x11/plasma6-kactivitymanagerd|2025-02-03|Moved to Plasma 6
+x11/plasma5-kgamma5|x11/plasma6-kgamma|2025-02-03|Moved to Plasma 6
+x11/plasma5-kscreen|x11/plasma6-kscreen|2025-02-03|Moved to Plasma 6
+x11/plasma5-kwayland-integration||2025-02-03|Not relevant for Plasma 6
+x11/plasma5-layer-shell-qt|x11/plasma6-layer-shell-qt|2025-02-03|Moved to Plasma 6
+x11/plasma5-libkscreen|x11/plasma6-libkscreen|2025-02-03|Moved to Plasma 6
+x11/plasma5-plasma|x11/plasma6-plasma|2025-02-03|Moved to Plasma 6
+x11/plasma5-plasma-bigscreen||2025-02-03|No releases for Plasma 6
+x11/plasma5-plasma-desktop|x11/plasma6-plasma-desktop|2025-02-03|Moved to Plasma 6
+x11/plasma5-plasma-integration|x11/plasma6-plasma-integration|2025-02-03|Moved to Plasma 6
+x11/plasma5-plasma-workspace|x11/plasma6-plasma-workspace|2025-02-03|Moved to Plasma 6
+www/falkon@default|www/falkon@kf6|2025-02-03|Flavor was renamed to use a more standard PKGNAMESUFFIX
+www/falkon@qtonly|www/falkon@qt6|2025-02-03|Flavor was renamed to use a more standard PKGNAMESUFFIX
+x11-toolkits/qml-box2d@qt5||2025-02-03|Unflavorize port, qt5 flavor is no longer used in ports tree
+x11-toolkits/qml-box2d@qt6|x11-toolkits/qml-box2d|2025-02-03|Unflavorize port, as it is now qt6 only
+databases/mysql90-client|databases/mysql91-client|2025-02-04|Has expired: MySQL 9.0 is no longer supported by the vendor
+databases/mysql90-server|databases/mysql91-server|2025-02-04|Has expired: MySQL 9.0 is no longer supported by the vendor
+textproc/docproj-legacy|textproc/docproj|2025-02-04|Has expired: Old version of documentation set
+devel/kore||2025-02-04|Has expired: Unmaintained in tree for years and broken for months
+www/searx||2025-02-04|Has expired: Upstream repo archived Sep 7 2023
+databases/xtrabackup81|databases/xtrabackup84|2025-02-04|Has expired: Unsupported upstream, consider migrating to databases/xtrabackup84
+games/allacrost||2025-02-04|Has expired: Fails to build and upstream is gone
+multimedia/mpeg_encode||2025-02-04|Has expired: Upstream is dead and it's buggy, consider using multimedia/ffmpeg
+sysutils/pcns||2025-02-04|Has expired: not supported upstream
+devel/py-pydrive||2025-02-04|Has expired: Upstream repo archived on Jul 22, 2021
+devel/p5-Test-HTML-Tidy||2025-02-04|Has expired: Depends on expired textproc/p5-HTML-Tidy
+www/p5-CGI-Application-Plugin-HtmlTidy||2025-02-04|Has expired: Depends on expired textproc/p5-HTML-Tidy
+textproc/p5-HTML-Tidy||2025-02-04|Has expired: Depends on expired textproc/tidyp
+textproc/tidyp||2025-02-04|Has expired: The repository has been archived by upstream on Apr 14, 2019
+audio/kid3@kf5|audio/kid3@kf6|2025-02-05|kf5 support has been removed. Use kf6 flavor instead
+audio/liblastfm-qt5||2025-02-05|No ports depend on this. New ports should used Qt6-based audio/liblastfm
diff --git a/Mk/Features/lto.mk b/Mk/Features/lto.mk
index 3fef5a223e9..2d0e3657b53 100644
--- a/Mk/Features/lto.mk
+++ b/Mk/Features/lto.mk
@@ -14,6 +14,8 @@ LTO_Include_MAINTAINER=	pkubaj@FreeBSD.org
    CARGO_ENV+=	CARGO_PROFILE_RELEASE_LTO="true" \
 		CARGO_PROFILE_RELEASE_PANIC="abort" \
 		CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1
+.    elif defined(_INCLUDE_USES_CMAKE_MK)
+   CMAKE_ON+=  CMAKE_INTERPROCEDURAL_OPTIMIZATION
 .    elif defined(_INCLUDE_USES_MESON_MK)
    MESON_ARGS+=	-Db_lto=true
 .    elif defined(_INCLUDE_USES_CABAL_MK)
diff --git a/Mk/Scripts/create-manifest.sh b/Mk/Scripts/create-manifest.sh
index 1a198ed8aef..ce632bb4da7 100644
--- a/Mk/Scripts/create-manifest.sh
+++ b/Mk/Scripts/create-manifest.sh
@@ -13,7 +13,7 @@ validate_env dp_ACTUAL_PACKAGE_DEPENDS dp_CATEGORIES dp_COMMENT \
 	dp_NO_ARCH dp_PKGBASE dp_PKGDEINSTALL dp_PKGINSTALL dp_PKGMESSAGES \
 	dp_PKGORIGIN dp_PKGPOSTDEINSTALL dp_PKGPOSTINSTALL dp_PKGPREDEINSTALL \
 	dp_PKGPREINSTALL dp_PKGVERSION dp_PKG_BIN dp_PKG_IGNORE_DEPENDS \
-	dp_PKG_NOTES dp_PORT_OPTIONS dp_PREFIX dp_USERS dp_WWW
+	dp_PKG_NOTES dp_PORT_OPTIONS dp_PREFIX dp_USERS dp_WWW dp_VITAL
 
 [ -n "${DEBUG_MK_SCRIPTS}" -o -n "${DEBUG_MK_SCRIPTS_CREATE_MANIFEST}" ] && set -x
 
@@ -58,6 +58,7 @@ EOT
 [ -z "${dp_GROUPS}" ] || echo "groups: [ ${dp_GROUPS} ]"
 [ -n "${dp_NO_ARCH}" ] && echo "arch : $(${dp_PKG_BIN} config abi | tr '[:upper:]' '[:lower:]' | cut -d: -f1,2):*"
 [ -n "${dp_NO_ARCH}" ] && echo "abi : $(${dp_PKG_BIN} config abi | cut -d: -f1,2):*"
+[ -n "${dp_VITAL}" ] && echo "vital : true"
 
 # Then the key/values sections
 echo "deps: { "
diff --git a/Mk/Uses/blaslapack.mk b/Mk/Uses/blaslapack.mk
index 10f0c0a3166..1e602695b0a 100644
--- a/Mk/Uses/blaslapack.mk
+++ b/Mk/Uses/blaslapack.mk
@@ -15,10 +15,8 @@ _INCLUDE_USES_BLASLAPACK_MK=	yes
 
 _valid_ARGS=	atlas blis flexiblas netlib openblas openblas64
 
-_DEFAULT_BLASLAPACK=	netlib
-
 .  if empty(blaslapack_ARGS)
-blaslapack_ARGS=	${_DEFAULT_BLASLAPACK}
+blaslapack_ARGS=	${BLASLAPACK_DEFAULT}
 .  endif
 
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -40,7 +38,7 @@ BLA_VENDOR=	FLAME
 LIB_DEPENDS+=	libflexiblas.so:math/flexiblas
 _BLASLIB=	flexiblas
 BLA_VENDOR=	FlexiBLAS
-.  elif ${blaslapack_ARGS} == netlib
+.  elif ${blaslapack_ARGS} == netlib || empty(blaslapack_ARGS)
 LIB_DEPENDS+=	libblas.so:math/blas
 LIB_DEPENDS+=	liblapack.so:math/lapack
 _BLASLIB=	blas
diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk
index ded2b85555a..b0e7ecd1a93 100644
--- a/Mk/Uses/cargo.mk
+++ b/Mk/Uses/cargo.mk
@@ -97,7 +97,7 @@ WRKSRC_crate_${_crate}=	${WRKDIR}/${_wrksrc}
 
 CARGO_BUILDDEP?=	yes
 .  if ${CARGO_BUILDDEP:tl} == "yes"
-BUILD_DEPENDS+=	${RUST_DEFAULT}>=1.83.0:lang/${RUST_DEFAULT}
+BUILD_DEPENDS+=	${RUST_DEFAULT}>=1.84.0:lang/${RUST_DEFAULT}
 .  elif ${CARGO_BUILDDEP:tl} == "any-version"
 BUILD_DEPENDS+=	${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT}
 .  endif
diff --git a/Mk/Uses/cmake.mk b/Mk/Uses/cmake.mk
index 2990ae9c298..abd7e7ea949 100644
--- a/Mk/Uses/cmake.mk
+++ b/Mk/Uses/cmake.mk
@@ -68,7 +68,7 @@ _valid_ARGS=		indirect insource noninja run testing _internal
 
 # Reminder: devel/cmake-core, devel/cmake-doc, devel/cmake-gui, and devel/cmake-man
 # are all affected by changing _CMAKE_VERSION. Please check each of these ports.
-_CMAKE_VERSION=		3.31.3
+_CMAKE_VERSION=		3.31.5
 CMAKE_BIN=		${LOCALBASE}/bin/cmake
 
 # Sanity check
diff --git a/Mk/Uses/gstreamer.mk b/Mk/Uses/gstreamer.mk
index e4ec45219cc..e44fd668c7e 100644
--- a/Mk/Uses/gstreamer.mk
+++ b/Mk/Uses/gstreamer.mk
@@ -48,7 +48,7 @@ _GST_VER=	${_GST_VER_DEFAULT}
 # - multimedia/gstreamer1-rtsp-server
 # - multimedia/gstreamer1-vaapi
 # - multimedia/py-gstreamer1
-_GST1_VERSION=		1.24.10
+_GST1_VERSION=		1.24.12
 _GST1_LIB_VER=		1.0
 _GST1_SOVERSION=	0.${_GST1_VERSION:R:E}${${_GST1_VERSION:E} > 9:?:0}${_GST1_VERSION:E}.0
 
@@ -348,7 +348,7 @@ gst-resindvd_IMPL=	bad
 
 gst-rust_PORT=		multimedia/gstreamer${_GST_VER}-plugins-rust
 gst-rust_IMPL=		#
-gst-rust_GST1_VERSION=	0.13.3
+gst-rust_GST1_VERSION=	0.13.4
 gst-rust_VERSION=	${gst-rust_GST${_GST_VER}_VERSION}
 
 gst-smoothstreaming_PORT=	multimedia/gstreamer${_GST_VER}-plugins-smoothstreaming
diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk
index 5375685cdfe..22a4a7a0954 100644
--- a/Mk/Uses/kde.mk
+++ b/Mk/Uses/kde.mk
@@ -81,53 +81,41 @@ KDE_PLASMA_BRANCH?=		${KDE_PLASMA${_KDE_VERSION}_BRANCH}
 KDE_FRAMEWORKS_VERSION?=	${KDE_FRAMEWORKS${_KDE_VERSION}_VERSION}
 KDE_FRAMEWORKS_BRANCH?=		${KDE_FRAMEWORKS${_KDE_VERSION}_BRANCH}
 
-.    if ${CATEGORIES:Mkde-devel}
 KDE_APPLICATIONS_BRANCH?=	${KDE_APPLICATIONS6_BRANCH}
 KDE_APPLICATIONS_VERSION?=	${KDE_APPLICATIONS6_VERSION}
 KDE_APPLICATIONS_SHLIB_VER?=	${KDE_APPLICATIONS6_SHLIB_VER}
 KDE_APPLICATIONS_SHLIB_G_VER?=	${KDE_APPLICATIONS6_SHLIB_G_VER}
-PKGNAMESUFFIX?=			-devel
-.    else
-KDE_APPLICATIONS_BRANCH?=	${KDE_APPLICATIONS5_BRANCH}
-KDE_APPLICATIONS_VERSION?=	${KDE_APPLICATIONS5_VERSION}
-KDE_APPLICATIONS_SHLIB_VER?=	${KDE_APPLICATIONS5_SHLIB_VER}
-KDE_APPLICATIONS_SHLIB_G_VER?=	${KDE_APPLICATIONS5_SHLIB_G_VER}
-.    endif
 
-
-# Current KDE desktop.
+# Legacy KDE Plasma.
 KDE_PLASMA5_VERSION?=		5.27.11
 KDE_PLASMA5_BRANCH?=		stable
 
-# Next KDE Plasma desktop
+# Current KDE Plasma desktop.
 KDE_PLASMA6_VERSION?=		6.2.5
 KDE_PLASMA6_BRANCH?=		stable
 
-# Current KDE frameworks.
+# Legacy KDE frameworks (Qt5 based).
 KDE_FRAMEWORKS5_VERSION?=	5.116.0
 KDE_FRAMEWORKS5_BRANCH?=	stable
 
-# Next KDE Frameworks (Qt6 based)
+# Current KDE Frameworks (Qt6 based).
 KDE_FRAMEWORKS6_VERSION?=	6.9.0
 KDE_FRAMEWORKS6_BRANCH?=	stable
 
-# Current KDE applications.
+# Legacy KDE applications.
 KDE_APPLICATIONS5_VERSION?=	23.08.5
 KDE_APPLICATIONS5_SHLIB_VER?=	5.24.5
 # G as in KDE Gear, and as in "don't make the variable name longer than required"
 KDE_APPLICATIONS5_SHLIB_G_VER?=	23.8.5
 KDE_APPLICATIONS5_BRANCH?=	stable
 
-# Next KDE applications.
-KDE_APPLICATIONS6_VERSION?=	24.01.90
-KDE_APPLICATIONS6_SHLIB_VER?=	5.24.3
-# G as in KDE Gear, and as in "don't make the variable name longer than required"
-KDE_APPLICATIONS6_SHLIB_G_VER?=	24.01.90
-KDE_APPLICATIONS6_BRANCH?=	unstable
+# Current KDE applications.
+KDE_APPLICATIONS6_VERSION?=	24.12.0
+KDE_APPLICATIONS6_SHLIB_VER?=	6.3.0
+# G as in KDE Gear, and as in "don't make the variable name longer than required".
+KDE_APPLICATIONS6_SHLIB_G_VER?=	${KDE_APPLICATIONS6_VERSION}
+KDE_APPLICATIONS6_BRANCH?=	stable
 
-# Extended KDE universe applications.
-CALLIGRA_VERSION?=		2.9.11
-CALLIGRA_BRANCH?=		stable
 # ==============================================================================
 
 # === INSTALLATION PREFIXES AND HEADER LOCATION ================================
@@ -250,6 +238,9 @@ CMAKE_ARGS+=	-DCMAKE_MODULE_PATH="${LOCALBASE};${KDE_PREFIX}" \
 
 KDE_MAN_PREFIX?=	${KDE_PREFIX}/share/man
 
+# Enforce the chosen Qt Version
+CMAKE_ARGS+=	-DQT_MAJOR_VERSION=${_QT_VER}
+
 # Disable autotests unless TEST_TARGET is defined.
 .    if !defined(TEST_TARGET)
 CMAKE_ARGS+=	-DBUILD_TESTING:BOOL=false
@@ -265,16 +256,12 @@ PLIST_SUB+=		KDE_APPLICATIONS_VERSION="${KDE_APPLICATIONS_VERSION}" \
 			KDE_PLASMA_VERSION="${KDE_PLASMA_VERSION}"
 # ==============================================================================
 
-_USE_KDE_BOTH=		akonadi libkcddb libkcompactdisc libkdcraw libkdegames \
-			libkeduvocdocument libkipi libksane okular \
-			baloo-widgets kate marble
-
 # List of components of the KDE Frameworks distribution.
 # The *_TIER<n> variables are internal, primarily for checking
 # that our list of frameworks matches the structure offered upstream.
 _USE_FRAMEWORKS_TIER1=	apidox archive attica breeze-icons codecs config \
 			coreaddons dbusaddons dnssd holidays i18n idletime itemmodels \
-			itemviews kirigami2 kquickcharts oxygen-icons5 plotting prison \
+			itemviews kirigami2 kquickcharts plotting prison \
 			qqc2-desktop-style solid sonnet syntaxhighlighting \
 			threadweaver wayland widgetsaddons windowsystem
 # NOT LISTED TIER1: modemmanagerqt networkmanagerqt (not applicable)
@@ -286,7 +273,7 @@ _USE_FRAMEWORKS_TIER2=	auth completion crash doctools \
 _USE_FRAMEWORKS_TIER3=	activities activities-stats baloo bookmarks configwidgets \
 			designerplugin emoticons globalaccel guiaddons \
 			iconthemes init kcmutils kdav kdeclarative \
-			kded kdesu kio kpipewire newstuff notifyconfig parts \
+			kded kdesu kio newstuff notifyconfig parts \
 			people plasma-framework purpose runner service texteditor \
 			textwidgets wallet xmlgui xmlrpcclient
 
@@ -313,50 +300,60 @@ _USE_FRAMEWORKS6_ALL=	ecm colorscheme \
 			plasma-wayland-protocols \
 			texttemplate \
 			userfeedback \
-			${_USE_FRAMEWORKS_TIER1:Noxygen-icons5:Nwayland} \
+			${_USE_FRAMEWORKS_TIER1:Nwayland} \
 			${_USE_FRAMEWORKS_TIER2} \
-			${_USE_FRAMEWORKS_TIER3:Nemoticons:Ndesignerplugin:Nactivities:Nactivities-stats:Ninit:Nplasma-framework:Nxmlrpcclient:Nkpipewire} \
+			${_USE_FRAMEWORKS_TIER3:Nemoticons:Ndesignerplugin:Nactivities:Nactivities-stats:Ninit:Nplasma-framework:Nxmlrpcclient} \
 			${_USE_FRAMEWORKS_TIER4} \
 			${_USE_FRAMEWORKS_EXTRA}
 _USE_FRAMEWORKS_ALL=	${_USE_FRAMEWORKS${_KDE_VERSION}_ALL}
 
 # List of components of the KDE Plasma distribution.
-_USE_PLASMA_ALL=	activitymanagerd breeze breeze-gtk \
-			decoration discover drkonqi hotkeys \
-			infocenter kde-cli-tools kde-gtk-config \
-			kdeplasma-addons kgamma5 kmenuedit kscreen \
-			kscreenlocker ksshaskpass ksysguard ksystemstats kwallet-pam \
-			kwayland-integration kwin kwrited layer-shell-qt libkscreen \
-			libksysguard milou oxygen oxygen-sounds plasma-browser-integration \
-			plasma-desktop plasma-disks plasma-integration plasma-pa \
-			plasma-sdk plasma-workspace plasma-workspace-wallpapers \
-			polkit-kde-agent-1 powerdevil systemsettings xdg-desktop-portal-kde \
-			kirigami-addons
+_USE_PLASMA5_ALL=	libksysguard
+
+_USE_PLASMA6_ALL=	activities activities-stats activitymanagerd \
+			breeze breeze-gtk decoration discover drkonqi \
+			globalacceld infocenter kde-cli-tools \
+			kde-gtk-config kdeplasma-addons kgamma kmenuedit \
+			kpipewire kscreen kscreenlocker ksshaskpass \
+			ksystemstats kwallet-pam kwin kwrited \
+			layer-shell-qt libkscreen libksysguard libplasma \
+			milou ocean-sound-theme oxygen oxygen-sounds \
+			plasma-browser-integration plasma-desktop \
+			plasma-disks plasma-integration plasma-pa \
+			plasma-sdk plasma-workspace \
+			plasma-workspace-wallpapers plasma5support \
+			polkit-kde-agent-1 powerdevil print-manager \
+			qqc2-breeze-style sddm-kcm systemmonitor \
+			systemsettings wayland xdg-desktop-portal-kde
+_USE_PLASMA_ALL=	${_USE_PLASMA${_KDE_VERSION}_ALL}
 
 # List of components of the KDE PIM distribution (part of applications).
-_USE_KDEPIM5_ALL=	akonadicontacts akonadiimportwizard akonadimime akonadinotes \
+_USE_KDEPIM_ALL=	akonadicontacts akonadiimportwizard akonadimime \
 			akonadicalendar akonadisearch \
 			calendarcore calendarsupport calendarutils \
 			contacts eventviews gapi grantleetheme \
 			gravatar identitymanagement imap \
 			incidenceeditor kdepim-addons \
-			kdepim-runtime5 kitinerary kontactinterface kpkpass \
+			kdepim-runtime kitinerary kontactinterface kpkpass \
 			ksmtp ldap libkdepim libkleo libksieve mailcommon \
 			mailimporter mailtransport mbox messagelib \
 			mime pimcommon pimtextedit tnef \
 			kalarm kontact kmail mbox-importer \
 			akonadiconsole akregator grantlee-editor kaddressbook \
 			kalarm kmail-account-wizard kmail knotes kontact \
-			korganizer pim-data-exporter ktextaddons
+			korganizer pim-data-exporter ktextaddons \
+			mimetreeparser
 
 _USE_PHONON_ALL=	phonon phonon-backend
 
 _USE_KDE5_ALL=		${_USE_FRAMEWORKS_ALL} \
 			${_USE_PLASMA_ALL} \
-			${_USE_KDEPIM5_ALL} \
-			${_USE_KDE_BOTH} \
 			${_USE_PHONON_ALL} \
-			libkexiv2
+			kirigami-addons \
+			akonadi \
+			libkexiv2 \
+			libkdcraw
+
 # TODO: fix
 _USE_KDE6_ALL=		ecm colorscheme \
 			svg \
@@ -364,9 +361,18 @@ _USE_KDE6_ALL=		ecm colorscheme \
 			mediaplayer \
 			${_USE_FRAMEWORKS_ALL}  \
 			${_USE_PLASMA_ALL} \
-			plasma5support activities activities-stats kpipewire wayland globalacceld libplasma \
 			${_USE_PHONON_ALL} \
-			libkexiv2
+			kirigami-addons \
+			akonadi \
+			kpublictransport \
+			libkdegames \
+			libksane \
+			baloo-widgets \
+			libkdcraw \
+			${_USE_KDEPIM_ALL} \
+			libkeduvocdocument \
+			libkexiv2 \
+			okular
 
 # ====================== frameworks components =================================
 kde-activities_PORT5=		x11/kf${_KDE_VERSION}-kactivities
@@ -383,7 +389,8 @@ kde-activities-stats_LIB5=	libKF${_KDE_VERSION}ActivitiesStats.so
 kde-activities-stats_LIB6=	libPlasmaActivitiesStats.so
 kde-activities-stats_LIB=	${kde-activities-stats_LIB${_KDE_VERSION}}
 
-kde-apidox_PORT=		devel/kf${_KDE_VERSION}-kapidox
+# Use KApiDox tools from KDE Frameworks 6
+kde-apidox_PORT=		devel/kf6-kapidox
 kde-apidox_PATH=		${KDE_PREFIX}/bin/kapidox-generate
 kde-apidox_TYPE=		run
 
@@ -402,7 +409,8 @@ kde-baloo_LIB=			libKF${_KDE_VERSION}Baloo.so
 kde-bookmarks_PORT=		devel/kf${_KDE_VERSION}-kbookmarks
 kde-bookmarks_LIB=		libKF${_KDE_VERSION}Bookmarks.so
 
-kde-breeze-icons_PORT=		x11-themes/kf${_KDE_VERSION}-breeze-icons
+# Use the latest icons from KDE Frameworks 6
+kde-breeze-icons_PORT=		x11-themes/kf6-breeze-icons
 kde-breeze-icons_PATH=		${KDE_PREFIX}/share/icons/breeze/index.theme
 
 kde-codecs_PORT=		textproc/kf${_KDE_VERSION}-kcodecs
@@ -542,11 +550,8 @@ kde-notifications_LIB=		libKF${_KDE_VERSION}Notifications.so
 kde-notifyconfig_PORT=		devel/kf${_KDE_VERSION}-knotifyconfig
 kde-notifyconfig_LIB=		libKF${_KDE_VERSION}NotifyConfig.so
 
-kde-oxygen-icons5_PORT=		x11-themes/kf${_KDE_VERSION}-oxygen-icons5
-kde-oxygen-icons5_PATH=		${KDE_PREFIX}/share/icons/oxygen/index.theme
-kde-oxygen-icons5_TYPE=		run
-
-kde-oxygen-sounds_PORT=		audio/plasma${_KDE_VERSION}-oxygen-sounds
+# Use the latest sounds from Plasma 6
+kde-oxygen-sounds_PORT=		audio/plasma6-oxygen-sounds
 kde-oxygen-sounds_PATH=		${KDE_PREFIX}/share/sounds/Oxygen-Sys-Log-In.ogg
 kde-oxygen-sounds_TYPE=		run
 
@@ -682,9 +687,6 @@ kde-discover_PATH=		${KDE_PREFIX}/bin/plasma-discover
 kde-drkonqi_PORT=		sysutils/plasma${_KDE_VERSION}-drkonqi
 kde-drkonqi_PATH=		${KDE_PREFIX}/lib/libexec/drkonqi
 
-kde-hotkeys_PORT=		devel/plasma${_KDE_VERSION}-khotkeys
-kde-hotkeys_LIB=		libkhotkeysprivate.so.5
-
 kde-infocenter_PORT=		sysutils/plasma${_KDE_VERSION}-kinfocenter
 kde-infocenter_PATH=		${KDE_PREFIX}/bin/kinfocenter
 
@@ -697,12 +699,8 @@ kde-kde-gtk-config_PATH=	${KDE_PREFIX}/lib/kconf_update_bin/gtk_theme
 kde-kdeplasma-addons_PORT=	x11-toolkits/plasma${_KDE_VERSION}-kdeplasma-addons
 kde-kdeplasma-addons_LIB=	libplasmapotdprovidercore.so
 
-kde-kgamma5_PORT5=		x11/plasma${_KDE_VERSION}-kgamma5
-kde-kgamma5_PORT6=		x11/plasma${_KDE_VERSION}-kgamma
-kde-kgamma5_PORT=		${kde-kgamma5_PORT${_KDE_VERSION}}
-kde-kgamma5_PATH5=		${QT_PLUGINDIR}/plasma/kcms/systemsettings/kcm_kgamma.so
-kde-kgamma5_PATH6=		${QT_PLUGINDIR}/plasma/kcms/systemsettings_qwidgets/kcm_kgamma.so
-kde-kgamma5_PATH=		${kde-kgamma5_PATH${_KDE_VERSION}}
+kde-kgamma_PORT=		x11/plasma${_KDE_VERSION}-kgamma
+kde-kgamma_PATH=		${QT_PLUGINDIR}/plasma/kcms/systemsettings_qwidgets/kcm_kgamma.so
 
 kde-kmenuedit_PORT=		sysutils/plasma${_KDE_VERSION}-kmenuedit
 kde-kmenuedit_PATH=		${KDE_PREFIX}/bin/kmenuedit
@@ -716,19 +714,11 @@ kde-kscreenlocker_LIB=		libKScreenLocker.so
 kde-ksshaskpass_PORT=		security/plasma${_KDE_VERSION}-ksshaskpass
 kde-ksshaskpass_PATH=		${KDE_PREFIX}/bin/ksshaskpass
 
-kde-ksysguard_PORT=		sysutils/plasma${_KDE_VERSION}-ksysguard
-kde-ksysguard_PATH=		${KDE_PREFIX}/bin/ksysguard
-
 kde-ksystemstats_PORT=		sysutils/plasma${_KDE_VERSION}-ksystemstats
 kde-ksystemstats_PATH=		${KDE_PREFIX}/bin/ksystemstats
 
 kde-kwallet-pam_PORT=		security/plasma${_KDE_VERSION}-kwallet-pam
-kde-kwallet-pam_PATH5=		${KDE_PREFIX}/lib/pam_kwallet5.so
-kde-kwallet-pam_PATH6=		${KDE_PREFIX}/lib/security/pam_kwallet5.so
-kde-kwallet-pam_PATH=		${kde-kwallet-pam_PATH${_KDE_VERSION}}
-
-kde-kwayland-integration_PORT=	x11/plasma${_KDE_VERSION}-kwayland-integration
-kde-kwayland-integration_PATH=	${QT_PLUGINDIR}/kf${_KDE_VERSION}/kwindowsystem/KF5WindowSystemKWaylandPlugin.so
+kde-kwallet-pam_PATH=		${KDE_PREFIX}/lib/pam_kwallet5.so
 
 kde-kwin_PORT=			x11-wm/plasma${_KDE_VERSION}-kwin
 kde-kwin_PATH=			${KDE_PREFIX}/bin/kwin_x11
@@ -745,14 +735,14 @@ kde-libksysguard_LIB6=		libKSysGuardSystemStats.so
 kde-libksysguard_LIB=		${kde-libksysguard_LIB${_KDE_VERSION}}
 
 kde-milou_PORT=			deskutils/plasma${_KDE_VERSION}-milou
-kde-milou_PATH5=			${KDE_PREFIX}/lib/libmilou.so.5
-kde-milou_PATH6=		${QT_QMLDIR}/org/kde/milou/libmilouqmlplugin.so
-kde-milou_PATH=			${kde-milou_PATH${_KDE_VERSION}}
+kde-milou_PATH=		${QT_QMLDIR}/org/kde/milou/libmilouqmlplugin.so
+
+kde-ocean-sound-theme_PORT=	audio/plasma${_KDE_VERSION}-ocean-sound-theme
+kde-ocean-sound-theme_PATH=	${KDE_PREFIX}/share/sounds/ocean/index.theme
+kde-ocean-sound-theme_TYPE=	run
 
 kde-oxygen_PORT=		x11-themes/plasma${_KDE_VERSION}-oxygen
-kde-oxygen_PATH5=		${QT_PLUGINDIR}/styles/oxygen.so
-kde-oxygen_PATH6=		${QT_PLUGINDIR}/kstyle_config/kstyle_oxygen_config.so
-kde-oxygen_PATH=		${kde-oxygen_PATH${_KDE_VERSION}}
+kde-oxygen_PATH=		${QT_PLUGINDIR}/kstyle_config/kstyle_oxygen_config.so
 
 kde-plasma-browser-integration_PORT=	www/plasma${_KDE_VERSION}-plasma-browser-integration
 kde-plasma-browser-integration_PATH=	${KDE_PREFIX}/bin/plasma-browser-integration-host
@@ -761,14 +751,10 @@ kde-plasma-desktop_PORT=	x11/plasma${_KDE_VERSION}-plasma-desktop
 kde-plasma-desktop_PATH=	${KDE_PREFIX}/bin/kaccess
 
 kde-plasma-disks_PORT=		sysutils/plasma${_KDE_VERSION}-plasma-disks
-kde-plasma-disks_PATH5=		${KDE_PREFIX}/lib/libexec/kauth/kded-smart-helper
-kde-plasma-disks_PATH6=		${KDE_PREFIX}/lib/libexec/kf6/kauth/kded-smart-helper
-kde-plasma-disks_PATH=		${kde-plasma-disks_PATH${_KDE_VERSION}}
+kde-plasma-disks_PATH=		${KDE_PREFIX}/lib/libexec/kf6/kauth/kded-smart-helper
 
 kde-plasma-integration_PORT=	x11/plasma${_KDE_VERSION}-plasma-integration
-kde-plasma-integration_PATH5=	${QT_PLUGINDIR}/platformthemes/KDEPlasmaPlatformTheme.so
-kde-plasma-integration_PATH6=	${QT_PLUGINDIR}/platformthemes/KDEPlasmaPlatformTheme6.so
-kde-plasma-integration_PATH=	${kde-plasma-integration_PATH${_KDE_VERSION}}
+kde-plasma-integration_PATH=	${QT_PLUGINDIR}/platformthemes/KDEPlasmaPlatformTheme6.so
 
 kde-plasma-pa_PORT=		audio/plasma${_KDE_VERSION}-plasma-pa
 kde-plasma-pa_PATH=		${QT_PLUGINDIR}/plasma/kcms/systemsettings/kcm_pulseaudio.so
@@ -788,12 +774,16 @@ kde-polkit-kde-agent-1_PATH=	${KDE_PREFIX}/lib/libexec/polkit-kde-authentication
 kde-powerdevil_PORT=		sysutils/plasma${_KDE_VERSION}-powerdevil
 kde-powerdevil_LIB=		libpowerdevilcore.so
 
+kde-print-manager_PORT=		print/plasma${_KDE_VERSION}-print-manager
+kde-print-manager_PATH=		${KDE_PREFIX}/bin/kde-add-printer
+kde-print-manager_TYPE=		run
+
+kde-systemmonitor_PORT=		sysutils/plasma${_KDE_VERSION}-plasma-systemmonitor
+kde-systemmonitor_PATH=		${KDE_PREFIX}/bin/plasma-systemmonitor
+kde-systemmonitor_TYPE=		run
+
 kde-systemsettings_PORT=	sysutils/plasma${_KDE_VERSION}-systemsettings
-kde-systemsettings_PATH5=	${KDE_PREFIX}/bin/systemsettings5
-kde-systemsettings_PATH6=	${KDE_PREFIX}/bin/systemsettings
-kde-systemsettings_PATH=	${kde-systemsettings_PATH${_KDE_VERSION}}
-
-
+kde-systemsettings_PATH=	${KDE_PREFIX}/bin/systemsettings
 
 kde-xdg-desktop-portal-kde_PORT=	deskutils/plasma${_KDE_VERSION}-xdg-desktop-portal-kde
 kde-xdg-desktop-portal-kde_PATH=	${KDE_PREFIX}/lib/libexec/xdg-desktop-portal-kde
@@ -801,9 +791,14 @@ kde-xdg-desktop-portal-kde_PATH=	${KDE_PREFIX}/lib/libexec/xdg-desktop-portal-kd
 kde-plasma5support_PORT=	devel/plasma${_KDE_VERSION}-plasma5support
 kde-plasma5support_LIB=		libPlasma5Support.so
 
-kde-kirigami-addons_PORT5=	x11-toolkits/kirigami-addons
-kde-kirigami-addons_PORT6=	x11-toolkits/kirigami-addons-devel
-kde-kirigami-addons_PORT=	${kde-kirigami-addons_PORT${_KDE_VERSION}}
+kde-qqc2-breeze-style_PORT=	x11-themes/plasma${_KDE_VERSION}-qqc2-breeze-style
+kde-qqc2-breeze-style_PATH=	${QT_PLUGINDIR}/kf${_KDE_VERSION}/kirigami/platform/org.kde.breeze.so
+
+kde-sddm-kcm_PORT=		deskutils/plasma${_KDE_VERSION}-sddm-kcm
+kde-sddm-kcm_PATH=		${QT_PLUGINDIR}/plasma/kcms/systemsettings/kcm_sddm.so
+kde-sddm-kcm_TYPE=		run
+
+kde-kirigami-addons_PORT=	x11-toolkits/kirigami-addons-qt${_KDE_VERSION}
 kde-kirigami-addons_PATH=	${QT_QMLDIR}/org/kde/kirigamiaddons/components/libcomponentsplugin.so
 
 kde-globalacceld_PORT=		x11/plasma${_KDE_VERSION}-kglobalacceld
@@ -815,106 +810,106 @@ kde-libplasma_LIB=		libPlasma.so
 
 # ====================== pim5 components =======================================
 kde-akonadicontacts_PORT=	net/akonadi-contacts
-kde-akonadicontacts_LIB=	libKPim5AkonadiContact.so
+kde-akonadicontacts_LIB=	libKPim${_KDE_VERSION}AkonadiContactCore.so
 
 kde-akonadiimportwizard_PORT=	deskutils/akonadi-import-wizard
-kde-akonadiimportwizard_LIB=	libKPim5ImportWizard.so
+kde-akonadiimportwizard_LIB=	libKPim${_KDE_VERSION}ImportWizard.so
 
 kde-akonadimime_PORT=		net/akonadi-mime
-kde-akonadimime_LIB=		libKPim5AkonadiMime.so
+kde-akonadimime_LIB=		libKPim${_KDE_VERSION}AkonadiMime.so
 
 kde-akonadinotes_PORT=		net/akonadi-notes
-kde-akonadinotes_LIB=		libKPim5AkonadiNotes.so
+kde-akonadinotes_LIB=		libKPim${_KDE_VERSION}AkonadiNotes.so
 
 kde-akonadicalendar_PORT=	net/akonadi-calendar
-kde-akonadicalendar_LIB=	libKPim5AkonadiCalendar.so
+kde-akonadicalendar_LIB=	libKPim${_KDE_VERSION}AkonadiCalendar.so
 
 kde-akonadisearch_PORT=		net/akonadi-search
-kde-akonadisearch_LIB=		libKPim5AkonadiSearchCore.so
+kde-akonadisearch_LIB=		libKPim${_KDE_VERSION}AkonadiSearchCore.so
 
 kde-calendarsupport_PORT=	net/calendarsupport
-kde-calendarsupport_LIB=	libKPim5CalendarSupport.so
+kde-calendarsupport_LIB=	libKPim${_KDE_VERSION}CalendarSupport.so
 
 kde-calendarutils_PORT=		net/kcalutils
-kde-calendarutils_LIB=		libKPim5CalendarUtils.so
+kde-calendarutils_LIB=		libKPim${_KDE_VERSION}CalendarUtils.so
 
 kde-eventviews_PORT=		net/eventviews
-kde-eventviews_LIB=		libKPim5EventViews.so
+kde-eventviews_LIB=		libKPim${_KDE_VERSION}EventViews.so
 
 kde-gapi_PORT=			net/libkgapi
-kde-gapi_LIB=			libKPim5GAPIBlogger.so
+kde-gapi_LIB=			libKPim${_KDE_VERSION}GAPIBlogger.so
 
 kde-grantleetheme_PORT=		deskutils/grantleetheme
-kde-grantleetheme_LIB=		libKPim5GrantleeTheme.so
+kde-grantleetheme_LIB=		libKPim${_KDE_VERSION}GrantleeTheme.so
 
 kde-gravatar_PORT=		net/libgravatar
-kde-gravatar_LIB=		libKPim5Gravatar.so
+kde-gravatar_LIB=		libKPim${_KDE_VERSION}Gravatar.so
 
 kde-identitymanagement_PORT=	net/kidentitymanagement
-kde-identitymanagement_LIB=	libKPim5IdentityManagement.so
+kde-identitymanagement_LIB=	libKPim${_KDE_VERSION}IdentityManagementCore.so
 
 kde-imap_PORT=			net/kimap
-kde-imap_LIB=			libKPim5IMAP.so
+kde-imap_LIB=			libKPim${_KDE_VERSION}IMAP.so
 
 kde-incidenceeditor_PORT=	net/incidenceeditor
-kde-incidenceeditor_LIB=	libKPim5IncidenceEditor.so
+kde-incidenceeditor_LIB=	libKPim${_KDE_VERSION}IncidenceEditor.so
 
 kde-kdepim-addons_PORT=	deskutils/kdepim-addons
-kde-kdepim-addons_PATH=	${QT_PLUGINDIR}/pim5/contacteditor/editorpageplugins/cryptopageplugin.so
+kde-kdepim-addons_PATH=	${QT_PLUGINDIR}/pim${_KDE_VERSION}/contacteditor/editorpageplugins/cryptopageplugin.so
 
-kde-kdepim-runtime5_PORT=	deskutils/kdepim-runtime
-kde-kdepim-runtime5_PATH=	${KDE_PREFIX}/bin/gidmigrator
+kde-kdepim-runtime_PORT=	deskutils/kdepim-runtime
+kde-kdepim-runtime_PATH=	${KDE_PREFIX}/bin/gidmigrator
 
 kde-kitinerary_PORT=		net/kitinerary
-kde-kitinerary_LIB=		libKPim5Itinerary.so
+kde-kitinerary_LIB=		libKPim${_KDE_VERSION}Itinerary.so
 
 kde-kontactinterface_PORT=	net/kontactinterface
-kde-kontactinterface_LIB=	libKPim5KontactInterface.so
+kde-kontactinterface_LIB=	libKPim${_KDE_VERSION}KontactInterface.so
 
 kde-kpkpass_PORT=		security/kpkpass
-kde-kpkpass_LIB=		libKPim5PkPass.so
+kde-kpkpass_LIB=		libKPim${_KDE_VERSION}PkPass.so
 
 kde-ksmtp_PORT=			net/ksmtp
-kde-ksmtp_LIB=			libKPim5SMTP.so
+kde-ksmtp_LIB=			libKPim${_KDE_VERSION}SMTP.so
 
 kde-ldap_PORT=			net/kldap
-kde-ldap_LIB=			libKPim5Ldap.so
+kde-ldap_LIB=			libKPim${_KDE_VERSION}LdapCore.so
 
 kde-libkdepim_PORT=		deskutils/libkdepim
-kde-libkdepim_LIB=		libKPim5Libkdepim.so
+kde-libkdepim_LIB=		libKPim${_KDE_VERSION}Libkdepim.so
 
 kde-libkleo_PORT=		security/libkleo
-kde-libkleo_LIB=		libKPim5Libkleo.so
+kde-libkleo_LIB=		libKPim${_KDE_VERSION}Libkleo.so
 
 kde-libksieve_PORT=		net/libksieve
-kde-libksieve_LIB=		libKPim5KSieve.so
+kde-libksieve_LIB=		libKPim${_KDE_VERSION}KSieve.so
 
 kde-mailcommon_PORT=		net/mailcommon
-kde-mailcommon_LIB=		libKPim5MailCommon.so
+kde-mailcommon_LIB=		libKPim${_KDE_VERSION}MailCommon.so
 
 kde-mailimporter_PORT=		net/mailimporter
-kde-mailimporter_LIB=		libKPim5MailImporter.so
+kde-mailimporter_LIB=		libKPim${_KDE_VERSION}MailImporter.so
 
 kde-mailtransport_PORT=		net/kmailtransport
-kde-mailtransport_LIB=		libKPim5MailTransport.so
+kde-mailtransport_LIB=		libKPim${_KDE_VERSION}MailTransport.so
 
 kde-mbox_PORT=			net/kmbox
-kde-mbox_LIB=			libKPim5Mbox.so
+kde-mbox_LIB=			libKPim${_KDE_VERSION}Mbox.so
 
 kde-messagelib_PORT=		net/messagelib
-kde-messagelib_LIB=		libKPim5MessageList.so
+kde-messagelib_LIB=		libKPim${_KDE_VERSION}MessageList.so
 
 kde-mime_PORT=			net/kmime
-kde-mime_LIB=			libKPim5Mime.so
+kde-mime_LIB=			libKPim${_KDE_VERSION}Mime.so
 
 kde-pimcommon_PORT=		net/pimcommon
-kde-pimcommon_LIB=		libKPim5PimCommon.so
+kde-pimcommon_LIB=		libKPim${_KDE_VERSION}PimCommon.so
 
 kde-pimtextedit_PORT=		net/kpimtextedit
-kde-pimtextedit_LIB=		libKPim5TextEdit.so
+kde-pimtextedit_LIB=		libKPim${_KDE_VERSION}TextEdit.so
 
 kde-tnef_PORT=			net/ktnef
-kde-tnef_LIB=			libKPim5Tnef.so
+kde-tnef_LIB=			libKPim${_KDE_VERSION}Tnef.so
 
 kde-ktextaddons_PORT=		devel/ktextaddons
 kde-ktextaddons_LIB=		libKF${_KDE_VERSION}TextAutoCorrectionCore.so
@@ -953,50 +948,53 @@ kde-korganizer_PATH=		${KDE_PREFIX}/bin/korganizer
 kde-mbox-importer_PORT=		deskutils/mbox-importer
 kde-mbox-importer_PATH=		${KDE_PREFIX}/bin/mboximporter
 
+kde-mimetreeparser_PORT=	net/mimetreeparser
+kde-mimetreeparser_LIB=		libKPim${_KDE_VERSION}MimeTreeParserCore.so
+
 kde-pim-data-exporter_PORT=	deskutils/pim-data-exporter
 kde-pim-data-exporter_PATH=	${KDE_PREFIX}/bin/pimdataexporter
 # ====================== end of pim5 components ================================
 
 # ====================== multiversion component ================================
-kde-akonadi5_PORT=		databases/akonadi
-kde-akonadi5_LIB=		libKPim5AkonadiPrivate.so
+kde-akonadi_PORT=		databases/akonadi
+kde-akonadi_LIB=		libKPim${_KDE_VERSION}AkonadiPrivate.so
 
-kde-baloo-widgets5_PORT=	sysutils/baloo-widgets
-kde-baloo-widgets5_LIB=		libKF${_KDE_VERSION}BalooWidgets.so
+kde-baloo-widgets_PORT=		sysutils/baloo-widgets
+kde-baloo-widgets_LIB=		libKF${_KDE_VERSION}BalooWidgets.so
 
-kde-kate5_PORT=			editors/kate
-kde-kate5_PATH=			${QT_PLUGINDIR}/ktexteditor/katebacktracebrowserplugin.so
+kde-kate_PORT=			editors/kate
+kde-kate_PATH=			${QT_PLUGINDIR}/ktexteditor/katebacktracebrowserplugin.so
 
-kde-libkcddb5_PORT=		audio/libkcddb
-kde-libkcddb5_LIB=		libKF${_KDE_VERSION}Cddb.so
+kde-libkcddb_PORT=		audio/libkcddb
+kde-libkcddb_LIB=		libKF${_KDE_VERSION}Cddb.so
 
-kde-libkcompactdisc5_PORT=	audio/libkcompactdisc
-kde-libkcompactdisc5_LIB=	libKF${_KDE_VERSION}CompactDisc.so
+kde-libkcompactdisc_PORT=	audio/libkcompactdisc
+kde-libkcompactdisc_LIB=	libKF${_KDE_VERSION}CompactDisc.so
 
-kde-libkdcraw5_PORT=		graphics/libkdcraw@qt${_KDE_VERSION}
-kde-libkdcraw5_LIB=		libKF${_KDE_VERSION}KDcraw.so
+kde-libkdcraw_PORT=		graphics/libkdcraw@qt${_KDE_VERSION}
+kde-libkdcraw_LIB5=		libKF${_KDE_VERSION}KDcraw.so
+kde-libkdcraw_LIB6=		libKDcrawQt${_KDE_VERSION}.so
+kde-libkdcraw_LIB=		${kde-libkdcraw_LIB${_KDE_VERSION}}
 
-kde-libkdegames5_PORT=		games/libkdegames
-kde-libkdegames5_LIB=		libKF${_KDE_VERSION}KDEGames.so
+kde-libkdegames_PORT=		games/libkdegames
+kde-libkdegames_LIB=		libKDEGames${_KDE_VERSION}.so
 
-kde-libkeduvocdocument5_PORT=	misc/libkeduvocdocument
-kde-libkeduvocdocument5_LIB=	libKEduVocDocument.so
+kde-libkeduvocdocument_PORT=	misc/libkeduvocdocument
+kde-libkeduvocdocument_LIB=	libKEduVocDocument.so
 
-kde-libkexiv2_PORT5=		graphics/libkexiv2
-kde-libkexiv2_PORT6=		graphics/libkexiv2-devel
-kde-libkexiv2_PORT=		${kde-libkexiv2_PORT${_KDE_VERSION}}
+kde-libkexiv2_PORT=		graphics/libkexiv2@qt${_KDE_VERSION}
 kde-libkexiv2_LIB5=		libKF${_KDE_VERSION}KExiv2.so
 kde-libkexiv2_LIB6=		libKExiv2Qt${_KDE_VERSION}.so
 kde-libkexiv2_LIB=		${kde-libkexiv2_LIB${_KDE_VERSION}}
 
-kde-libkipi5_PORT=		graphics/libkipi
-kde-libkipi5_LIB=		libKF${_KDE_VERSION}Kipi.so
+kde-libkipi_PORT=		graphics/libkipi
+kde-libkipi_LIB=		libKF${_KDE_VERSION}Kipi.so
 
-kde-libksane5_PORT=		graphics/libksane
-kde-libksane5_LIB=		libKF${_KDE_VERSION}Sane.so
+kde-libksane_PORT=		graphics/libksane
+kde-libksane_LIB=		libKSaneWidgets${_KDE_VERSION}.so
 
-kde-marble5_PORT=		astro/marble
-kde-marble5_LIB=		libmarblewidget-qt5.so
+kde-marble_PORT=		astro/marble
+kde-marble_LIB=			libmarblewidget-qt6.so
 
 kde-kpublictransport_PORT=	devel/kpublictransport
 kde-kpublictransport_LIB=	libKPublicTransport.so
@@ -1004,8 +1002,8 @@ kde-kpublictransport_LIB=	libKPublicTransport.so
 kde-kosm_PORT=			astro/kosmindoormap
 kde-kosm_LIB=			libKOSM.so
 
-kde-okular5_PORT=		graphics/okular
-kde-okular5_LIB=		libOkular5Core.so
+kde-okular_PORT=		graphics/okular
+kde-okular_LIB=			libOkular${_KDE_VERSION}Core.so
 
 kde-phonon_PORT=		multimedia/phonon@${_QT_RELNAME}
 kde-phonon_LIB=			libphonon4${_QT_RELNAME}.so
@@ -1014,20 +1012,6 @@ kde-phonon-backend_PORT=	multimedia/phonon-vlc@${_QT_RELNAME}
 kde-phonon-backend_PATH=	${QT_PLUGINDIR}/phonon4${_QT_RELNAME}_backend/phonon_vlc_${_QT_RELNAME}.so
 # ====================== end of multiversion components ========================
 
-# ====================== select the proper multiversion component ==============
-.    for comp in ${_USE_KDE_BOTH}
-kde-${comp}_PORT=		${kde-${comp}${_KDE_VERSION}_PORT}
-.      if defined(kde-${comp}${_KDE_VERSION}_LIB)
-kde-${comp}_LIB=		${kde-${comp}${_KDE_VERSION}_LIB}
-.      else
-.        if defined(kde-${comp}${_KDE_VERSION}_PATH})
-kde-${comp}_PATH=		${kde-${comp}${_KDE_VERSION}_LIB}
-.        endif
-# If neither is defined, this gets caught below when checking components
-.      endif
-.    endfor
-#===============================================================================
-
 # end of component list ########################################################
 
 _USE_KDE_ALL=	${_USE_${_KDE_RELNAME}_ALL}
diff --git a/Mk/Uses/mlt.mk b/Mk/Uses/mlt.mk
index b788a824a55..da70a759d55 100644
--- a/Mk/Uses/mlt.mk
+++ b/Mk/Uses/mlt.mk
@@ -37,7 +37,7 @@ _MLT_NODEPEND=	yes
 .  endif
 
 # Library dependencies
-_MLT7_VERSION=	7.28.0
+_MLT7_VERSION=	7.30.0
 _MLT7_PORTNAME=	mlt7
 _MLT7_LIB=	libmlt-7.so
 _MLT7_MELT=	${LOCALBASE}/bin/melt-7
diff --git a/Mk/Uses/mysql.mk b/Mk/Uses/mysql.mk
index 3a2b7f085da..d9daa2e0a9d 100644
--- a/Mk/Uses/mysql.mk
+++ b/Mk/Uses/mysql.mk
@@ -61,7 +61,6 @@ DEFAULT_MYSQL_VER?=	${MYSQL_DEFAULT:S/.//}
 # Mk/bsd.default-versions.mk in sync.
 MYSQL80_LIBVER=		21
 MYSQL84_LIBVER=		24
-MYSQL90_LIBVER=		24
 MYSQL91_LIBVER=		24
 
 .  for v in 105 106 1011 114
diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk
index 627a86a9aac..9f34715e9ee 100644
--- a/Mk/Uses/perl5.mk
+++ b/Mk/Uses/perl5.mk
@@ -202,7 +202,7 @@ DESTDIRNAME=	--destdir
 .    if ${_USE_PERL5:Mmodbuild}
 CONFIGURE_ARGS+=--perl="${PERL}"
 .      if ${PORTNAME} != Module-Build
-BUILD_DEPENDS+=	p5-Module-Build>=0.4206:devel/p5-Module-Build
+BUILD_DEPENDS+=	p5-Module-Build>=0.4234:devel/p5-Module-Build
 .      endif
 CONFIGURE_ARGS+=--create_packlist 1
 .    endif
diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk
index 4e31e56ed68..786ef6fb34f 100644
--- a/Mk/Uses/pyqt.mk
+++ b/Mk/Uses/pyqt.mk
@@ -108,12 +108,12 @@ MASTER_SITES_PYQTWEBENGINE=	${MASTER_SITES_PYQT${_PYQT_VERSION}WEBENGINE}
 # below, should have a suitable epoch appended to the version.
 
 # Qt version-agnostic components
-PYQTBUILDER_VERSION=		1.17.1
+PYQTBUILDER_VERSION=		1.18.0
 QSCI2_VERSION=			2.14.1
-SIP_VERSION=			6.9.1	# ,1
+SIP_VERSION=			6.10.0	# ,1
 
 # Qt 5 components
-PYQT5SIP_VERSION=		12.16.1
+PYQT5SIP_VERSION=		12.17.0
 PYQT5_VERSION=			5.15.11
 PYQT53D_VERSION=		5.15.7
 PYQT5CHARTS_VERSION=		5.15.7
@@ -122,7 +122,7 @@ PYQT5NETWORKAUTH_VERSION=	5.15.6
 PYQT5WEBENGINE_VERSION=		5.15.7
 
 # Qt 6 components
-PYQT6SIP_VERSION=		13.9.1
+PYQT6SIP_VERSION=		13.10.0
 PYQT6_VERSION=			6.8.0
 PYQT63D_VERSION=		6.8.0
 PYQT6CHARTS_VERSION=		6.8.0
diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk
index 1ac27eb742c..d34a3ba0065 100644
--- a/Mk/Uses/qt-dist.mk
+++ b/Mk/Uses/qt-dist.mk
@@ -21,16 +21,16 @@ qmake_ARGS?=	# empty
 .include "${USESDIR}/qmake.mk"
 
 # Supported distribution arguments
-_COMMON_DISTS=		3d base charts connectivity datavis3d declarative imageformats location multimedia \
-			networkauth quick3d quicktimeline remoteobjects scxml sensors \
-			serialbus serialport speech svg tools translations virtualkeyboard \
+_COMMON_DISTS=		3d base charts connectivity datavis3d declarative \
+			imageformats location multimedia networkauth quick3d \
+			quicktimeline remoteobjects scxml sensors serialbus \
+			serialport speech svg tools translations virtualkeyboard \
 			wayland webchannel webengine websockets webview
-_QT5_DISTS=		gamepad graphicaleffects quickcontrols \
-			quickcontrols2 script webglplugin \
-			x11extras xmlpatterns
-_QT6_DISTS=		5compat coap doc graphs grpc httpserver languageserver lottie positioning \
-			quick3dphysics quickeffectmaker shadertools
-
+_QT5_DISTS=		gamepad graphicaleffects quickcontrols quickcontrols2 \
+			script webglplugin x11extras xmlpatterns
+_QT6_DISTS=		5compat coap doc graphs grpc httpserver languageserver \
+			lottie mqtt positioning quick3dphysics quickeffectmaker \
+			shadertools
 _QT_DISTS=		${_COMMON_DISTS} \
 			${_QT${_QT_VER}_DISTS}
 
@@ -96,8 +96,8 @@ _QT5_DISTNAME_kde=		${_QT_DIST:S,^,kde-qt,:S,$,-${DISTVERSION},}
 _QT6_DISTNAME=			${_QT_DIST:S,^,qt,:S,$,-everywhere-src-${DISTVERSION},}
 
 # Effective master sites and distfile values
-# net/qt6-coap has no submodule distfile and uses USE_GITHUB
-.  if ${_QT_DIST} != coap
+# net/qt6-coap and net/qt6-mqtt have no submodule distfiles and use USE_GITHUB
+.  if ${_QT_DIST} != coap && ${_QT_DIST} != mqtt
 MASTER_SITES=			${_QT${_QT_VER}_MASTER_SITES${_KDE_${_QT_DIST}:D_kde}}
 MASTER_SITE_SUBDIR=		${_QT${_QT_VER}_MASTER_SITE_SUBDIR${_KDE_${_QT_DIST}:D_kde}}
 DISTNAME=			${_QT${_QT_VER}_DISTNAME${_KDE_${_QT_DIST}:D_kde}}
@@ -202,6 +202,8 @@ CMAKE_ARGS+=		-DCMAKE_INSTALL_PREFIX=${PREFIX} \
 			-DINSTALL_EXAMPLESDIR=${PREFIX}/${QT_EXAMPLEDIR_REL} \
 			-DINSTALL_DESCRIPTIONSDIR=${PREFIX}/${QT_DESCRIPTIONSDIR_REL} \
 			-DQT_QMAKE_TARGET_MKSPEC:String=freebsd-clang \
+			-DQT_SBOM_GENERATE_JSON:BOOL=OFF \
+			-DQT_SBOM_VERIFY:BOOL=OFF \
 			--log-level=TRACE
 .  endif
 
diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk
index 50ef6aada57..01b01d38cae 100644
--- a/Mk/Uses/qt.mk
+++ b/Mk/Uses/qt.mk
@@ -23,8 +23,8 @@ _QT_MK_INCLUDED=	qt.mk
 # Qt versions currently supported by the framework.
 _QT_SUPPORTED?=		5 6
 QT5_VERSION?=		5.15.16
-QT6_VERSION?=		6.8.1
-PYSIDE6_VERSION?=	6.8.1.1
+QT6_VERSION?=		6.8.2
+PYSIDE6_VERSION?=	6.8.2
 
 # Support for intermediate Qt6 releases. This partially defines
 # _QT6_MASTER_SITE_SUBDIR and would probably be better in qt-dist.mk,
@@ -152,9 +152,10 @@ _USES_POST+=		qt
 _QT_MK_POST_INCLUDED=	qt.mk
 
 # The Qt components supported by qt.mk: list of shared, and version specific ones
-_USE_QT_COMMON=		3d charts connectivity datavis3d declarative doc examples imageformats location \
-			multimedia networkauth quick3d quicktimeline remoteobjects scxml \
-			sensors serialbus serialport speech svg virtualkeyboard wayland \
+_USE_QT_COMMON=		3d charts connectivity datavis3d declarative doc \
+			examples imageformats location multimedia networkauth \
+			quick3d quicktimeline remoteobjects scxml sensors \
+			serialbus serialport speech svg virtualkeyboard wayland \
 			webchannel webengine websockets webview
 
 _USE_QT5_ONLY=		assistant buildtools concurrent core dbus \
@@ -167,9 +168,10 @@ _USE_QT5_ONLY=		assistant buildtools concurrent core dbus \
 			uitools webglplugin websockets-qml \
 			widgets x11extras xml xmlpatterns
 
-_USE_QT6_ONLY=		5compat base coap graphs grpc httpserver languageserver lottie pdf positioning \
-			quick3dphysics quickeffectmaker shadertools tools translations \
-			sqldriver-sqlite sqldriver-mysql sqldriver-psql sqldriver-odbc
+_USE_QT6_ONLY=		5compat base coap graphs grpc httpserver languageserver \
+			lottie mqtt pdf positioning quick3dphysics quickeffectmaker \
+			shadertools tools translations sqldriver-sqlite \
+			sqldriver-mysql sqldriver-psql sqldriver-odbc
 
 # Dependency tuples: _LIB should be preferred if possible.
 qt-3d_PORT=		graphics/${_QT_RELNAME}-3d
@@ -269,6 +271,9 @@ qt-location_LIB=	libQt${_QT_LIBVER}Location.so
 qt-l10n_PORT=		misc/${_QT_RELNAME}-l10n
 qt-l10n_PATH=		${_QT_RELNAME}-l10n>=${_QT_VERSION:R:R}
 
+qt-mqtt_PORT=		net/${_QT_RELNAME}-mqtt
+qt-mqtt_LIB=		libQt${_QT_LIBVER}Mqtt.so
+
 qt-multimedia_PORT=	multimedia/${_QT_RELNAME}-multimedia
 qt-multimedia_LIB=	libQt${_QT_LIBVER}Multimedia.so
 
diff --git a/Mk/Uses/ruby.mk b/Mk/Uses/ruby.mk
index a2b05493efb..6d388b51ff3 100644
--- a/Mk/Uses/ruby.mk
+++ b/Mk/Uses/ruby.mk
@@ -162,7 +162,7 @@ RUBY_PORTREVISION=	0
 #
 # Ruby 3.3
 #
-RUBY_DISTVERSION=	3.3.6
+RUBY_DISTVERSION=	3.3.7
 RUBY_PORTREVISION=	0
 
 # When adding a version, please keep the comment in
diff --git a/Mk/Uses/samba.mk b/Mk/Uses/samba.mk
index 27d0ec1595d..fb949887c60 100644
--- a/Mk/Uses/samba.mk
+++ b/Mk/Uses/samba.mk
@@ -18,7 +18,7 @@ samba_ARGS=	build run
 IGNORE=		USES=samba has invalid arguments: ${samba_ARGS:Nbuild:Nenv:Nlib:Nrun}
 .  endif
 
-.  if ${SAMBA_DEFAULT} != 4.16 && ${SAMBA_DEFAULT} != 4.19
+.  if ${SAMBA_DEFAULT} != 4.16 && ${SAMBA_DEFAULT} != 4.19 && ${SAMBA_DEFAULT} != 4.20
 IGNORE=		Invalid version of samba: ${SAMBA_DEFAULT}
 .  endif
 
@@ -26,13 +26,27 @@ SAMBA_SUFFIX=	${SAMBA_DEFAULT:S/.//}
 
 SAMBA_PORT_416=		net/samba416
 SAMBA_LDB_PORT_416=	databases/ldb25
+SAMBA_TALLOC_PORT_416=	devel/talloc
+SAMBA_TDB_PORT_416=	databases/tdb
+SAMBA_TEVENT_PORT_416=	devel/tevent
 SAMBA_PORT_419=		net/samba419
 SAMBA_LDB_PORT_419=	databases/ldb28
+SAMBA_TALLOC_PORT_419=	devel/talloc
+SAMBA_TDB_PORT_419=	databases/tdb
+SAMBA_TEVENT_PORT_419=	devel/tevent
+SAMBA_PORT_420=		net/samba420
+SAMBA_LDB_PORT_420=	databases/ldb29
+SAMBA_TALLOC_PORT_420=	devel/talloc242
+SAMBA_TDB_PORT_420=	databases/tdb1410
+SAMBA_TEVENT_PORT_420=	devel/tevent016
 
 SAMBA_PORT=		${SAMBA_PORT_${SAMBA_SUFFIX}}
 SAMBA_INCLUDEDIR=	${LOCALBASE}/include/samba4
 SAMBA_LIBDIR=		${LOCALBASE}/lib/samba4
 SAMBA_LDB_PORT=		${SAMBA_LDB_PORT_${SAMBA_SUFFIX}}
+SAMBA_TALLOC_PORT=	${SAMBA_TALLOC_PORT_${SAMBA_SUFFIX}}
+SAMBA_TDB_PORT=		${SAMBA_TDB_PORT_${SAMBA_SUFFIX}}
+SAMBA_TEVENT_PORT=	${SAMBA_TEVENT_PORT_${SAMBA_SUFFIX}}
 
 .  if ${samba_ARGS:Mbuild}
 BUILD_DEPENDS+=	smbd:${SAMBA_PORT}
@@ -43,10 +57,4 @@ LIB_DEPENDS+=	libsmbclient.so:${SAMBA_PORT}
 .  if ${samba_ARGS:Mrun}
 RUN_DEPENDS+=	smbd:${SAMBA_PORT}
 .  endif
-
-# Legacy variables. Removing those requires a tree-wide update
-# and a note in the CHANGES file
-SAMBAPORT=		${SAMBA_PORT}
-SAMBAINCLUDES=		${SAMBA_INCLUDEDIR}
-SAMBALIBS=		${SAMBA_LIBDIR}
 .endif
diff --git a/Mk/Uses/sdl.mk b/Mk/Uses/sdl.mk
index 5289c3c02f2..4c29f13f0e6 100644
--- a/Mk/Uses/sdl.mk
+++ b/Mk/Uses/sdl.mk
@@ -69,6 +69,17 @@ _SDL_sound2_REQUIRES=		sdl2
 _SDL_ttf2_LIB_DEPENDS=		libSDL2_ttf.so:graphics/sdl2_ttf
 _SDL_ttf2_REQUIRES=		sdl2
 
+# These are the current supported SDL3 modules
+_SDL_USE_ALL+=	sdl3 image3 ttf3
+
+_SDL_sdl3_LIB_DEPENDS=		libSDL3.so:devel/sdl3
+
+_SDL_image3_LIB_DEPENDS=	libSDL3_image.so:graphics/sdl3_image
+_SDL_image3_REQUIRES=		sdl3
+
+_SDL_ttf3_LIB_DEPENDS=		libSDL3_ttf.so:graphics/sdl3_ttf
+_SDL_ttf3_REQUIRES=		sdl3
+
 # Basic checks
 .  if !empty(sdl_ARGS)
 IGNORE=		USES=sdl takes no arguments
diff --git a/Mk/Uses/shebangfix.mk b/Mk/Uses/shebangfix.mk
index 9d050cbbcfc..337cc5bf234 100644
--- a/Mk/Uses/shebangfix.mk
+++ b/Mk/Uses/shebangfix.mk
@@ -65,6 +65,7 @@ ${lang}_OLD_CMD+= /usr/local/bin/${lang}
 .  endfor
 
 .  for pyver in 2 3
+python_OLD_CMD+= "/bin/env python${pyver}"
 python_OLD_CMD+= "/usr/bin/env python${pyver}"
 python_OLD_CMD+= /bin/python${pyver}
 python_OLD_CMD+= /usr/bin/python${pyver}
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 7bc6eada9f2..9e65a2cff79 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -75,11 +75,11 @@ GUILE_DEFAULT?=		2.2
 IMAGEMAGICK_DEFAULT?=	7
 # Possible values: 8, 11, 17, 18, 19, 20, 21, 22 23
 JAVA_DEFAULT?=		8
-# Possible values: 3.4.0, 3.99
+# Possible values: 3.8.0, 4.99
 .  if (defined(WANT_LAZARUS_DEVEL) && !empty(WANT_LAZARUS_DEVEL)) || ${ARCH:Maarch64}
 LAZARUS_DEFAULT?=	4.99
 .  else
-LAZARUS_DEFAULT?=	3.6.0
+LAZARUS_DEFAULT?=	3.8.0
 .  endif
 # Possible values: rust, legacy
 .  if empty(ARCH:Naarch64:Namd64:Narmv7:Ni386:Npowerpc64:Npowerpc64le:Npowerpc:Nriscv64)
@@ -101,7 +101,7 @@ LUAJIT_DEFAULT?=	luajit-devel
 .  endif
 # Possible values: 5.10, 5.20, 6.8
 MONO_DEFAULT?=		5.20
-# Possible values: 8.0, 8.4, 9.0, 9.1, 10.5m, 10.6m, 10.11m, 11.4m
+# Possible values: 8.0, 8.4, 9.1, 10.5m, 10.6m, 10.11m, 11.4m
 MYSQL_DEFAULT?=		8.0
 # Possible values: ninja, samurai
 NINJA_DEFAULT?=		ninja
@@ -144,7 +144,7 @@ PYTHON2_DEFAULT?=	2.7
 RUBY_DEFAULT?=		3.2
 # Possible values: rust, rust-nightly
 RUST_DEFAULT?=		rust
-# Possible values: 4.16, 4.19
+# Possible values: 4.16, 4.19, 4.20
 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!
@@ -184,7 +184,7 @@ check-makevars::
 # Make sure we have a default in the end
 SSL_DEFAULT?=	base
 .  endif
-# Possible values: 8.5, 8.6, 8.7
+# Possible values: 8.6, 9.0
 TCLTK_DEFAULT?=		8.6
 # Possible values: 6, 7
 VARNISH_DEFAULT?=	6
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index a39a12ea8c9..9f125d7e67d 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -77,7 +77,7 @@ ELF_FEATURES+=	+wxneeded:dist/bin/${MOZILLA} +wxneeded:dist/bin/${MOZILLA}-bin
 BUNDLE_LIBS=	yes
 
 BUILD_DEPENDS+=	rust-cbindgen>=0.26.0:devel/rust-cbindgen \
-				${RUST_DEFAULT}>=1.83.0:lang/${RUST_DEFAULT} \
+				${RUST_DEFAULT}>=1.84.0:lang/${RUST_DEFAULT} \
 				node:www/node
 LIB_DEPENDS+=	libdrm.so:graphics/libdrm
 RUN_DEPENDS+=	${LOCALBASE}/lib/libpci.so:devel/libpci
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 74b883d4a44..712fe0b7acd 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -4377,6 +4377,7 @@ create-manifest.${sp}:
 			dp_PREFIX='${PREFIX}'                                 \
 			dp_USERS='${USERS:u:S/$/,/}'                          \
 			dp_WWW='${WWW}'                                       \
+			dp_VITAL='${VITAL${_SP.${sp}}}'                       \
 			${PKG_NOTES_ENV.${sp}}                                \
 			${SH} ${SCRIPTSDIR}/create-manifest.sh
 .    endfor
diff --git a/UIDs b/UIDs
index f79658aa4f9..4451ad11aa8 100644
--- a/UIDs
+++ b/UIDs
@@ -811,7 +811,7 @@ opensearch:*:855:855::0:0:opensearch user:/nonexistent:/usr/sbin/nologin
 # free: 861
 # free: 862
 # free: 863
-# free: 864
+mediamtx:*:864:864::0:0:mediamtx:/nonexistent:/usr/sbin/nologin
 z2m:*:865:865::0:0:zigbee2mqtt:/usr/local/z2m:/usr/sbin/nologin
 # free: 866
 sqlpage:*:867:867::0:0:SQLPage:/nonexistent:/usr/sbin/nologin
diff --git a/UPDATING b/UPDATING
index 2b402c345e2..c8f2e817919 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,79 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20250205:
+  AFFECTS: users of www/gitlab
+  AUTHOR: mfechner@FreeBSD.org
+
+  Make sure you compare your /usr/local/www/gitlab/config/puma.rb with
+  /usr/local/www/gitlab/config/puma.rb.sample and make sure you have the:
+  require "logger"
+  line in your puma.rb.
+  This fixes an error:
+  /usr/local/lib/ruby/gems/3.2/gems/activesupport-7.0.8.7/lib/active_support/logger_thread_safe_level.rb:12:in `<module:LoggerThreadSafeLevel>': uninitialized constant ActiveSupport::LoggerThreadSafeLevel::Logger (NameError)
+
+    Logger::Severity.constants.each do |severity|
+
+20250203:
+  AFFECTS: users of x11/kde5 and x11/kde6
+  AUTHOR: arrowd@FreeBSD.org
+
+  All KDE ports were fully switched to Qt6/KF6. Plasma 5 ports were removed.
+  KDE Applications were updated to 24.12.
+
+  If you installed KDE via kde5 or kde6 packages, the upgrade path is
+
+  # pkg remove -f kde[56] && pkg install kde
+
+  If you installed KDE via the plasma5-plasma metapackage, the upgrade path
+
+  # pkg remove -f plasma5-plasma && pkg install plasma6-plasma
+
+  Running "pkg autoremove" after the upgrade would clean unused dependencies.
+
+  For the uncommon cases of building on the host with synth, portmaster, etc.
+  the idea stays roughly the same - replace every plasma5 package with its
+  plasma6 counterpart.
+
+20250131:
+  AFFECTS: users of security/easy-rsa
+  AUTHOR: mandree@FreeBSD.org
+
+  easy-rsa (easyrsa) versions between 3.0.5 and 3.1.7 inclusively
+  may have chosen the wrong, a weak, cipher (des-ede3-cbc) when
+  encrypting the CA private keys with the build-ca command, when
+  running on a system where openssl was OpenSSL 3.
+
+  Such CA private keys should be re-encrypted with a stronger cipher
+  in order to protect them better, after upgrading EasyRSA to 3.2.1.
+  To that end, the   easyrsa set-pass ca    command can be used.
+
+  Details: https://community.openvpn.net/openvpn/wiki/CVE-2024-13454
+
+20250125:
+  AFFECTS: users of www/apache24
+  AUTHOR: brnrd@FreeBSD.org
+
+  Apache 2.4.63 removed the (experimental, non-default) mod_tls module due
+  to rustls-ffi API instability and it was moved to a standalone module.
+
+  Users of the TLS option can use the new www/mod_tls port as a replacement.
+
+  # pkg install ap24-mod_tls
+
+20250111:
+  AFFECTS: users of net/onedrive
+  AUTHOR: hiroo.ono+freebsd@gmail.com
+
+  The version 2.5.x introduces significant changes regarding how the
+  integrity and validation of your data is determined and is not backwards
+  compatible with v2.4.x.
+  OneDrive Business Shared Folder Sync has been 100% re-written in v2.5.0.
+  If you are using this feature, please read the new documentation
+  carefully.
+  The application function --download-only no longer automatically deletes
+  local files. Please read the new documentation regarding this feature.
+
 20250109:
   AFFECTS: users of www/kiwix-tools and devel/libkiwix
   AUTHOR: olce@FreeBSD.org
@@ -141,7 +214,7 @@ you update your ports collection, before attempting any port upgrades.
   results in a non-compatible database format.
 
   After upgrading, you must rebuild all BerkeleyDB databases used by
-  apr-util (example: Apache databases created with `httxt2dbm -F db` 
+  apr-util (example: Apache databases created with `httxt2dbm -F db`
 
 20241109:
   AFFECTS: all users of i386