9 files changed, 18 insertions, 17 deletions
diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk
index 49d5f06d22bb..d52d3e4bfb27 100644
--- a/Mk/Uses/cabal.mk
+++ b/Mk/Uses/cabal.mk
@@ -318,7 +318,7 @@ cabal-pre-configure:
 .  if !target(do-build)
 do-build:
 	cd ${WRKSRC} && \
-		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} build --disable-benchmarks --disable-tests ${CABAL_WITH_ARGS} ${CABAL_LTO_ARGS} --flags "${CABAL_FLAGS}" ${BUILD_ARGS} ${BUILD_TARGET}
+		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} build --no-semaphore --disable-benchmarks --disable-tests ${CABAL_WITH_ARGS} ${CABAL_LTO_ARGS} --flags "${CABAL_FLAGS}" ${BUILD_ARGS} ${BUILD_TARGET}
 .  endif
 
 .  if !target(do-install)
diff --git a/Mk/Uses/cpe.mk b/Mk/Uses/cpe.mk
index 92d27e5aa12b..23f4a73dc266 100644
--- a/Mk/Uses/cpe.mk
+++ b/Mk/Uses/cpe.mk
@@ -1,7 +1,5 @@
 # Include CPE information in package manifest as a CPE 2.3 formatted
-# string.
-# See https://csrc.nist.gov/projects/security-content-automation-protocol/specifications/cpe
-# for details.
+# string.  See https://scap.nist.gov/specifications/cpe/ for details.
 #
 # CPE_PART		Defaults to "a" for "application".
 # CPE_VENDOR		Defaults to same as ${CPE_PRODUCT} (below).
diff --git a/Mk/Uses/gstreamer.mk b/Mk/Uses/gstreamer.mk
index abea43bc9db1..e713b7c3def0 100644
--- a/Mk/Uses/gstreamer.mk
+++ b/Mk/Uses/gstreamer.mk
@@ -55,7 +55,7 @@ _GST1_SOVERSION=	0.${_GST1_VERSION:R:E}${${_GST1_VERSION:E} > 9:?:0}${_GST1_VERS
 _GST1_CATEGORIES=	audio comms devel ftp graphics multimedia net security \
 			sysutils textproc www x11 x11-toolkits
 _GST1_PLUGINS_audio= 	a52dec alsa amrnb amrwbdec bs2b cdparanoia chromaprint faac \
-			faad flac flite gme gsm jack ladspa lame lv2 modplug \
+			faad fdkaac flac flite gme gsm jack ladspa lame lv2 modplug \
 			mpg123 ogg openmpt opus pulse shout2 sidplay \
 			sndfile sndio soundtouch speex taglib twolame vorbis \
 			wavpack webrtcdsp
@@ -145,6 +145,9 @@ gst-faac_IMPL=		bad
 gst-faad_PORT=		audio/gstreamer${_GST_VER}-plugins-faad
 gst-faad_IMPL=		bad
 
+gst-fdkaac_PORT=	audio/gstreamer${_GST_VER}-plugins-fdkaac
+gst-fdkaac_IMPL=	bad
+
 gst-flac_PORT=		audio/gstreamer${_GST_VER}-plugins-flac
 gst-flac_IMPL=		good
 
diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk
index 8352623f93ea..cdeb7ff7ed77 100644
--- a/Mk/Uses/kde.mk
+++ b/Mk/Uses/kde.mk
@@ -91,7 +91,7 @@ KDE_PLASMA5_VERSION?=		5.27.12
 KDE_PLASMA5_BRANCH?=		stable
 
 # Current KDE Plasma desktop.
-KDE_PLASMA6_VERSION?=		6.3.4
+KDE_PLASMA6_VERSION?=		6.3.5
 KDE_PLASMA6_BRANCH?=		stable
 
 # Legacy KDE frameworks (Qt5 based).
@@ -104,8 +104,8 @@ KDE_FRAMEWORKS6_BRANCH?=	stable
 
 # Current KDE applications. Update _${PORTNAME}_PROJECT_VERSION for the following ports:
 # devel/kdevelop, games/libkdegames, games/libkmahjongg, graphics/kgraphviewer
-KDE_APPLICATIONS6_VERSION?=	25.04.0
-KDE_APPLICATIONS6_SHLIB_VER?=	6.4.0
+KDE_APPLICATIONS6_VERSION?=	25.04.1
+KDE_APPLICATIONS6_SHLIB_VER?=	6.4.1
 # 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
diff --git a/Mk/Uses/lazarus.mk b/Mk/Uses/lazarus.mk
index 587b311739d0..945fb32e55a5 100644
--- a/Mk/Uses/lazarus.mk
+++ b/Mk/Uses/lazarus.mk
@@ -52,6 +52,10 @@ LAZARUS_Include_MAINTAINER= acm@FreeBSD.org
 
 _INCLUDE_USES_LAZARUS_MK=   yes
 
+.  if empty(lazarus_ARGS)
+lazarus_ARGS=	gtk2
+.  endif
+
 .  if defined(DEFAULT_LAZARUS_VER)
 WARNING+=	"DEFAULT_LAZARUS_VER is defined, consider using DEFAULT_VERSIONS=lazarus=${DEFAULT_LAZARUS_VER} instead"
 .  endif
@@ -131,7 +135,7 @@ BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus$
 LIB_DEPENDS+=	libglib-2.0.so:devel/glib20 \
 		libgtk-3.so:x11-toolkits/gtk30 \
 		libcairo.so:graphics/cairo \
-		libpango-1.0.so:x11-toolkits/pango \
+		libpango-1.0.so:x11-toolkits/pango
 LCL_PLATFORM=	gtk3
 BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-gtk3${LAZARUS_DEVELSUFFIX}
 .  endif
diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk
index 98dce5be0875..bf62f887899a 100644
--- a/Mk/Uses/linux.mk
+++ b/Mk/Uses/linux.mk
@@ -136,7 +136,6 @@ _linux_rl9_libva=			linux-rl9-libva>0:multimedia/linux-rl9-libva
 _linux_rl9_libvdpau=			linux-rl9-libvdpau>0:multimedia/linux-rl9-libvdpau
 _linux_${linux_ARGS}_libvorbis=		linux-${linux_ARGS}-libvorbis>0:audio/linux-${linux_ARGS}-libvorbis
 _linux_rl9_libvpx=			linux-rl9-libvpx>0:multimedia/linux-rl9-libvpx
-_linux_${linux_ARGS}_libxcrypt=		linux-${linux_ARGS}-libxcrypt>0:security/linux-${linux_ARGS}-libxcrypt
 _linux_${linux_ARGS}_libxkbcommon=	linux-${linux_ARGS}-libxkbcommon>0:x11/linux-${linux_ARGS}-libxkbcommon
 _linux_${linux_ARGS}_libxml2=		linux-${linux_ARGS}-libxml2>0:textproc/linux-${linux_ARGS}-libxml2
 _linux_${linux_ARGS}_libxslt=		linux-${linux_ARGS}-libxslt>0:textproc/linux-${linux_ARGS}-libxslt
@@ -188,17 +187,13 @@ _linux_rl9_qtwebsockets=		linux-rl9-qt5-qtwebsockets>0:www/linux-rl9-qt5-qtwebso
 _linux_rl9_qtx11extras=			linux-rl9-qt5-qtx11extras>0:x11/linux-rl9-qt5-qtx11extras
 _linux_rl9_qtxmlpatterns=		linux-rl9-qt5-qtxmlpatterns>0:textproc/linux-rl9-qt5-qtxmlpatterns
 _linux_${linux_ARGS}_sdl12=		linux-${linux_ARGS}-sdl>0:devel/linux-${linux_ARGS}-sdl12
+_linux_${linux_ARGS}_sdl12-extralibs=	linux-${linux_ARGS}-sdl12-extralibs>0:misc/linux-${linux_ARGS}-sdl12-extralibs
 _linux_${linux_ARGS}_sdl20=		linux-${linux_ARGS}-sdl20>0:devel/linux-${linux_ARGS}-sdl20
 _linux_${linux_ARGS}_sdl2gfx=		linux-${linux_ARGS}-sdl2_gfx>0:graphics/linux-${linux_ARGS}-sdl2_gfx
 _linux_${linux_ARGS}_sdl2image=		linux-${linux_ARGS}-sdl2_image>0:graphics/linux-${linux_ARGS}-sdl2_image
 _linux_${linux_ARGS}_sdl2mixer=		linux-${linux_ARGS}-sdl2_mixer>0:audio/linux-${linux_ARGS}-sdl2_mixer
 _linux_${linux_ARGS}_sdl2ttf=		linux-${linux_ARGS}-sdl2_ttf>0:graphics/linux-${linux_ARGS}-sdl2_ttf
 _linux_${linux_ARGS}_sdl2sound=		linux-${linux_ARGS}-sdl2_sound>0:audio/linux-${linux_ARGS}-sdl2_sound
-_linux_${linux_ARGS}_sdlgfx=		linux-${linux_ARGS}-sdl_gfx>0:graphics/linux-${linux_ARGS}-sdl_gfx
-_linux_${linux_ARGS}_sdlimage=		linux-${linux_ARGS}-sdl_image>0:graphics/linux-${linux_ARGS}-sdl_image
-_linux_${linux_ARGS}_sdlmixer=		linux-${linux_ARGS}-sdl_mixer>0:audio/linux-${linux_ARGS}-sdl_mixer
-_linux_${linux_ARGS}_sdlttf=		linux-${linux_ARGS}-sdl_ttf>0:graphics/linux-${linux_ARGS}-sdl_ttf
-_linux_${linux_ARGS}_sdlsound=		linux-${linux_ARGS}-sdl_sound>0:audio/linux-${linux_ARGS}-sdl_sound
 _linux_rl9_shaderc=			linux-rl9-shaderc>0:graphics/linux-rl9-shaderc
 _linux_rl9_spirv-tools=			linux-rl9-spirv-tools>0:graphics/linux-rl9-spirv-tools
 _linux_${linux_ARGS}_sqlite3=		linux-${linux_ARGS}-sqlite>0:databases/linux-${linux_ARGS}-sqlite3
diff --git a/Mk/Uses/pgsql.mk b/Mk/Uses/pgsql.mk
index 20f43a5e17f2..0ce84d448e2c 100644
--- a/Mk/Uses/pgsql.mk
+++ b/Mk/Uses/pgsql.mk
@@ -39,7 +39,7 @@ _INCLUDE_USES_PGSQL_MK=	yes
 
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
-VALID_PGSQL_VER=	13 14 15 16 17
+VALID_PGSQL_VER=	13 14 15 16 17 18
 
 # Override non-default LIBVERS like this:
 #PGSQL99_LIBVER=6
diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
index ef2f8f92b796..d2b787504316 100644
--- a/Mk/Uses/python.mk
+++ b/Mk/Uses/python.mk
@@ -857,6 +857,7 @@ PY_SETUPTOOLS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAV
 .  if ${PYTHON_REL} < 31100
 PY_EXCEPTIONGROUP=	${PYTHON_PKGNAMEPREFIX}exceptiongroup>=1.1.1:devel/py-exceptiongroup@${PY_FLAVOR}
 PY_TOMLI=	${PYTHON_PKGNAMEPREFIX}tomli>=2.0.2<3:textproc/py-tomli@${PY_FLAVOR}
+PY_TYPING_EXTENSIONS=	${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR}
 .  endif
 
 .  if ${PYTHON_REL} >= 30000
diff --git a/Mk/Uses/ruby.mk b/Mk/Uses/ruby.mk
index 1f9f55e27b52..620fff71f832 100644
--- a/Mk/Uses/ruby.mk
+++ b/Mk/Uses/ruby.mk
@@ -162,7 +162,7 @@ RUBY_PORTREVISION=	0
 #
 # Ruby 3.4
 #
-RUBY_DISTVERSION=	3.4.3
+RUBY_DISTVERSION=	3.4.4
 RUBY_PORTREVISION=	0