diff --git a/multimedia/gstreamer1-plugins-rust/Makefile b/multimedia/gstreamer1-plugins-rust/Makefile
--- a/multimedia/gstreamer1-plugins-rust/Makefile
+++ b/multimedia/gstreamer1-plugins-rust/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gstreamer1-plugins-rust
 DISTVERSION=	0.11.1
 DISTVERSIONSUFFIX=	+fixup
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -46,31 +46,57 @@
 
 ASM_BUILD_DEPENDS=	nasm:devel/nasm
 
-CAIRO_USE=		GNOME=cairo
+CAIRO_SUBPACKAGES=	cairo
+#USE_GNOME.cairo=	cairo
+#USE_GSTREAMER.cairo=	yes
+LIB_DEPENDS.cairo=	libcairo.so:graphics/cairo \
+			libgstvideo-1.0.so:multimedia/gstreamer1-plugins
 CAIRO_MESON_ENABLED=	videofx
 
 CSOUND_DESC=		Audio filtering via Csound
-CSOUND_LIB_DEPENDS=	libcsound64.so:audio/csound
+CSOUND_SUBPACKAGES=	csound
+LIB_DEPENDS.csound=	libcsound64.so:audio/csound
+#USE_GSTREAMER.csound=	yes
+LIB_DEPENDS.csound+=	libgstvideo-1.0.so:multimedia/gstreamer1-plugins
 CSOUND_CONFIGURE_ENV=	CSOUND_LIB_DIR="${LOCALBASE}/lib"
 CSOUND_MESON_ENABLED=	csound
 
 DAV1D_DESC=		AV1 video decoding via libdav1d
-DAV1D_LIB_DEPENDS=	libdav1d.so:multimedia/dav1d
+DAV1D_SUBPACKAGES=	dav1d
+LIB_DEPENDS.dav1d=	libdav1d.so:multimedia/dav1d
+#USE_GSTREAMER.dav1d=	yes
+LIB_DEPENDS.dav1d+=	libgstvideo-1.0.so:multimedia/gstreamer1-plugins
 DAV1D_MESON_ENABLED=	dav1d
 
-GTK4_LIB_DEPENDS=	libgraphene-1.0.so:graphics/graphene
-GTK4_USE=		GNOME=gtk40 GSTREAMER=gl
+GTK4_SUBPACKAGES=	gtk4
+LIB_DEPENDS.gtk4=	libgraphene-1.0.so:graphics/graphene
+#USE_GNOME.gtk4=	gtk40
+#USE_GSTREAMER.gtk4=	gl
+LIB_DEPENDS.gtk4+=	libgstgl-1.0.so:graphics/gstreamer1-plugins-gl \
+			libgstvideo-1.0.so:multimedia/gstreamer1-plugins \
+			libgtk-4.so:x11-toolkits/gtk40
 GTK4_MESON_ENABLED=	gtk4
 
-PANGO_USE=		GNOME=cairo,pango
+PANGO_SUBPACKAGES=	pango
+#USE_GNOME.pango=	cairo pango
+#USE_GSTREAMER.pango=	yes
+LIB_DEPENDS.pango=	libcairo.so:graphics/cairo \
+			libgstvideo-1.0.so:multimedia/gstreamer1-plugins \
+			libpango-1.0.so:x11-toolkits/pango
 PANGO_MESON_ENABLED=	closedcaption onvif
 
 SODIUM_DESC=		File encryption and decryption via libsodium
-SODIUM_LIB_DEPENDS=	libsodium.so:security/libsodium
+SODIUM_SUBPACKAGES=	sodium
+LIB_DEPENDS.sodium=	libsodium.so:security/libsodium
+#USE_GSTREAMER.sodium=	yes
+LIB_DEPENDS.sodium+=	libgstvideo-1.0.so:multimedia/gstreamer1-plugins
 SODIUM_MESON_ENABLED=	sodium
 SODIUM_MESON_ON=	-Dsodium-source=system
 
-WEBP_LIB_DEPENDS=	libwebpdemux.so:graphics/webp
+WEBP_SUBPACKAGES=	webp
+LIB_DEPENDS.webp=	libwebpdemux.so:graphics/webp
+#USE_GSTREAMER.webp=	yes
+LIB_DEPENDS.webp+=	libgstvideo-1.0.so:multimedia/gstreamer1-plugins
 WEBP_MESON_ENABLED=	webp
 
 post-patch:
diff --git a/multimedia/gstreamer1-plugins-rust/pkg-message b/multimedia/gstreamer1-plugins-rust/pkg-message
new file mode 100644
--- /dev/null
+++ b/multimedia/gstreamer1-plugins-rust/pkg-message
@@ -0,0 +1,15 @@
+[
+{ type: upgrade
+  maximum_version: "0.11.1_3"
+  message: <<EOD
+Plugins with extra dependencies moved into subpackages:
+- gstreamer1-plugins-rust-cairo
+- gstreamer1-plugins-rust-csound
+- gstreamer1-plugins-rust-dav1d
+- gstreamer1-plugins-rust-gtk4
+- gstreamer1-plugins-rust-pango
+- gstreamer1-plugins-rust-sodium
+- gstreamer1-plugins-rust-webp
+EOD
+}
+]
diff --git a/multimedia/gstreamer1-plugins-rust/pkg-plist b/multimedia/gstreamer1-plugins-rust/pkg-plist
--- a/multimedia/gstreamer1-plugins-rust/pkg-plist
+++ b/multimedia/gstreamer1-plugins-rust/pkg-plist
@@ -2,13 +2,13 @@
 lib/gstreamer-1.0/libgstaws.so
 lib/gstreamer-1.0/libgstcdg.so
 lib/gstreamer-1.0/libgstclaxon.so
-%%CSOUND%%lib/gstreamer-1.0/libgstcsound.so
-%%DAV1D%%lib/gstreamer-1.0/libgstdav1d.so
+@@csound@@lib/gstreamer-1.0/libgstcsound.so
+@@dav1d@@lib/gstreamer-1.0/libgstdav1d.so
 lib/gstreamer-1.0/libgstfallbackswitch.so
 lib/gstreamer-1.0/libgstffv1.so
 lib/gstreamer-1.0/libgstfmp4.so
 lib/gstreamer-1.0/libgstgif.so
-%%GTK4%%lib/gstreamer-1.0/libgstgtk4.so
+@@gtk4@@lib/gstreamer-1.0/libgstgtk4.so
 lib/gstreamer-1.0/libgsthlssink3.so
 lib/gstreamer-1.0/libgsthsv.so
 lib/gstreamer-1.0/libgstjson.so
@@ -21,17 +21,17 @@
 lib/gstreamer-1.0/libgstregex.so
 lib/gstreamer-1.0/libgstreqwest.so
 lib/gstreamer-1.0/libgstrsaudiofx.so
-%%PANGO%%lib/gstreamer-1.0/libgstrsclosedcaption.so
+@@pango@@lib/gstreamer-1.0/libgstrsclosedcaption.so
 lib/gstreamer-1.0/libgstrsfile.so
 lib/gstreamer-1.0/libgstrsflv.so
-%%PANGO%%lib/gstreamer-1.0/libgstrsonvif.so
+@@pango@@lib/gstreamer-1.0/libgstrsonvif.so
 lib/gstreamer-1.0/libgstrspng.so
 lib/gstreamer-1.0/libgstrsrtp.so
 lib/gstreamer-1.0/libgstrstracers.so
-%%CAIRO%%lib/gstreamer-1.0/libgstrsvideofx.so
-%%WEBP%%lib/gstreamer-1.0/libgstrswebp.so
+@@cairo@@lib/gstreamer-1.0/libgstrsvideofx.so
+@@webp@@lib/gstreamer-1.0/libgstrswebp.so
 lib/gstreamer-1.0/libgstrswebrtc.so
-%%SODIUM%%lib/gstreamer-1.0/libgstsodium.so
+@@sodium@@lib/gstreamer-1.0/libgstsodium.so
 lib/gstreamer-1.0/libgstspotify.so
 lib/gstreamer-1.0/libgsttextahead.so
 lib/gstreamer-1.0/libgsttextwrap.so
@@ -42,13 +42,13 @@
 libdata/pkgconfig/gstaws.pc
 libdata/pkgconfig/gstcdg.pc
 libdata/pkgconfig/gstclaxon.pc
-%%CSOUND%%libdata/pkgconfig/gstcsound.pc
-%%DAV1D%%libdata/pkgconfig/gstdav1d.pc
+@@csound@@libdata/pkgconfig/gstcsound.pc
+@@dav1d@@libdata/pkgconfig/gstdav1d.pc
 libdata/pkgconfig/gstfallbackswitch.pc
 libdata/pkgconfig/gstffv1.pc
 libdata/pkgconfig/gstfmp4.pc
 libdata/pkgconfig/gstgif.pc
-%%GTK4%%libdata/pkgconfig/gstgtk4.pc
+@@gtk4@@libdata/pkgconfig/gstgtk4.pc
 libdata/pkgconfig/gsthlssink3.pc
 libdata/pkgconfig/gsthsv.pc
 libdata/pkgconfig/gstjson.pc
@@ -61,17 +61,17 @@
 libdata/pkgconfig/gstregex.pc
 libdata/pkgconfig/gstreqwest.pc
 libdata/pkgconfig/gstrsaudiofx.pc
-%%PANGO%%libdata/pkgconfig/gstrsclosedcaption.pc
+@@pango@@libdata/pkgconfig/gstrsclosedcaption.pc
 libdata/pkgconfig/gstrsfile.pc
 libdata/pkgconfig/gstrsflv.pc
-%%PANGO%%libdata/pkgconfig/gstrsonvif.pc
+@@pango@@libdata/pkgconfig/gstrsonvif.pc
 libdata/pkgconfig/gstrspng.pc
 libdata/pkgconfig/gstrsrtp.pc
 libdata/pkgconfig/gstrstracers.pc
-%%CAIRO%%libdata/pkgconfig/gstrsvideofx.pc
-%%WEBP%%libdata/pkgconfig/gstrswebp.pc
+@@cairo@@libdata/pkgconfig/gstrsvideofx.pc
+@@webp@@libdata/pkgconfig/gstrswebp.pc
 libdata/pkgconfig/gstrswebrtc.pc
-%%SODIUM%%libdata/pkgconfig/gstsodium.pc
+@@sodium@@libdata/pkgconfig/gstsodium.pc
 libdata/pkgconfig/gstspotify.pc
 libdata/pkgconfig/gsttextahead.pc
 libdata/pkgconfig/gsttextwrap.pc
diff --git a/multimedia/kooha/Makefile b/multimedia/kooha/Makefile
--- a/multimedia/kooha/Makefile
+++ b/multimedia/kooha/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	kooha
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -13,7 +13,7 @@
 
 LIB_DEPENDS=	libpulse.so:audio/pulseaudio \
 		libgraphene-1.0.so:graphics/graphene
-RUN_DEPENDS=	${LOCALBASE}/lib/gstreamer-1.0/libgstgtk4.so:multimedia/gstreamer1-plugins-rust
+RUN_DEPENDS=	gstreamer1-plugins-rust-gtk4>0:multimedia/gstreamer1-plugins-rust~gtk4
 
 USES=		cargo gettext gnome gstreamer meson pkgconfig
 USE_GITHUB=	yes
diff --git a/security/authenticator/Makefile b/security/authenticator/Makefile
--- a/security/authenticator/Makefile
+++ b/security/authenticator/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	authenticator
 DISTVERSION=	4.3.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	security
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -15,7 +15,7 @@
 LIB_DEPENDS=	libgraphene-1.0.so:graphics/graphene \
 		libzbar.so:graphics/zbar \
 		libpipewire-0.3.so:multimedia/pipewire
-RUN_DEPENDS=	${LOCALBASE}/lib/gstreamer-1.0/libgstgtk4.so:multimedia/gstreamer1-plugins-rust
+RUN_DEPENDS=	gstreamer1-plugins-rust-gtk4>0:multimedia/gstreamer1-plugins-rust~gtk4
 
 USES=		cargo desktop-file-utils gettext gnome gstreamer llvm meson pkgconfig sqlite ssl
 USE_GITLAB=	yes