Index: x11-wm/wayfire-plugins-extra/Makefile
===================================================================
--- x11-wm/wayfire-plugins-extra/Makefile
+++ x11-wm/wayfire-plugins-extra/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	wayfire-plugins-extra
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -33,7 +33,10 @@
 OPTIONS_DEFAULT=LIBRSVG2
 OPTIONS_SUB=	yes
 
-LIBRSVG2_USE=		GNOME=librsvg2
+LIBRSVG2_SUBPACKAGES=	librsvg2
+LIB_DEPENDS.librsvg2=	${LIB_DEPENDS:N*wayland*:N*glibmm*:N*libsigc*}
+#USE_GNOME.librsvg2=	librsvg2
+LIB_DEPENDS.librsvg2+=	${librsvg2_LIB_DEPENDS} ${pango_LIB_DEPENDS}
 LIBRSVG2_MESON_TRUE=	enable_windecor
 
 post-patch:
Index: x11-wm/wayfire-plugins-extra/pkg-message
===================================================================
--- /dev/null
+++ x11-wm/wayfire-plugins-extra/pkg-message
@@ -0,0 +1,9 @@
+[
+{ type: upgrade
+  maximum_version: "0.8.0_1"
+  message: <<EOD
+Plugins with extra dependencies moved into subpackages:
+- wayfire-plugins-extra-librsvg2
+EOD
+}
+]
Index: x11-wm/wayfire-plugins-extra/pkg-plist
===================================================================
--- x11-wm/wayfire-plugins-extra/pkg-plist
+++ x11-wm/wayfire-plugins-extra/pkg-plist
@@ -16,11 +16,11 @@
 lib/wayfire/libshowrepaint.so
 lib/wayfire/libview-shot.so
 lib/wayfire/libwater.so
-%%LIBRSVG2%%lib/wayfire/libwindecor.so
+@@librsvg2@@lib/wayfire/libwindecor.so
 lib/wayfire/libwinshadows.so
 lib/wayfire/libwinzoom.so
 lib/wayfire/libworkspace-names.so
-%%LIBRSVG2%%share/wayfire/icons/plugin-windecor.svg
+@@librsvg2@@share/wayfire/icons/plugin-windecor.svg
 share/wayfire/metadata/annotate.xml
 share/wayfire/metadata/autorotate-iio.xml
 share/wayfire/metadata/background-view.xml
@@ -38,8 +38,8 @@
 share/wayfire/metadata/showrepaint.xml
 share/wayfire/metadata/view-shot.xml
 share/wayfire/metadata/water.xml
-%%LIBRSVG2%%share/wayfire/metadata/windecor.xml
+@@librsvg2@@share/wayfire/metadata/windecor.xml
 share/wayfire/metadata/window-zoom.xml
 share/wayfire/metadata/winshadows.xml
 share/wayfire/metadata/workspace-names.xml
-%%LIBRSVG2%%share/wayfire/windecor/executable.svg
+@@librsvg2@@share/wayfire/windecor/executable.svg