*/*: move CARGO_CRATES to Makefile.crates in my ports

66 files changed, 6618 insertions, 6649 deletions

diff --git a/accessibility/wl-gammarelay-rs/Makefile b/accessibility/wl-gammarelay-rs/Makefile
index 30f9bb5f29a2..9c332e79e02a 100644
--- a/accessibility/wl-gammarelay-rs/Makefile
+++ b/accessibility/wl-gammarelay-rs/Makefile
@@ -16,128 +16,4 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	MaxVerevkin
 PLIST_FILES=	bin/${PORTNAME}
 
-CARGO_CRATES=	aho-corasick-0.7.19 \
-		anyhow-1.0.64 \
-		async-broadcast-0.4.1 \
-		async-recursion-0.3.2 \
-		async-trait-0.1.57 \
-		atty-0.2.14 \
-		autocfg-1.1.0 \
-		bitflags-1.3.2 \
-		byteorder-1.4.3 \
-		bytes-1.2.1 \
-		cc-1.0.73 \
-		cfg-if-1.0.0 \
-		clap-3.2.20 \
-		clap_derive-3.2.18 \
-		clap_lex-0.2.4 \
-		derivative-2.2.0 \
-		dirs-4.0.0 \
-		dirs-sys-0.3.7 \
-		dlib-0.5.0 \
-		downcast-rs-1.2.0 \
-		enumflags2-0.7.5 \
-		enumflags2_derive-0.7.4 \
-		event-listener-2.5.3 \
-		fastrand-1.8.0 \
-		futures-0.3.24 \
-		futures-channel-0.3.24 \
-		futures-core-0.3.24 \
-		futures-executor-0.3.24 \
-		futures-io-0.3.24 \
-		futures-macro-0.3.24 \
-		futures-sink-0.3.24 \
-		futures-task-0.3.24 \
-		futures-util-0.3.24 \
-		getrandom-0.2.7 \
-		hashbrown-0.12.3 \
-		heck-0.4.0 \
-		hermit-abi-0.1.19 \
-		hex-0.4.3 \
-		indexmap-1.9.1 \
-		instant-0.1.12 \
-		lazy_static-1.4.0 \
-		libc-0.2.132 \
-		libloading-0.7.3 \
-		lock_api-0.4.8 \
-		log-0.4.17 \
-		memchr-2.5.0 \
-		memmap-0.7.0 \
-		memoffset-0.6.5 \
-		mio-0.8.4 \
-		nix-0.24.2 \
-		once_cell-1.14.0 \
-		ordered-stream-0.0.1 \
-		os_str_bytes-6.3.0 \
-		parking_lot-0.12.1 \
-		parking_lot_core-0.9.3 \
-		pin-project-lite-0.2.9 \
-		pin-utils-0.1.0 \
-		pkg-config-0.3.25 \
-		ppv-lite86-0.2.16 \
-		proc-macro-crate-1.2.1 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.43 \
-		quick-xml-0.23.1 \
-		quote-1.0.21 \
-		rand-0.8.5 \
-		rand_chacha-0.3.1 \
-		rand_core-0.6.3 \
-		redox_syscall-0.2.16 \
-		redox_users-0.4.3 \
-		regex-1.6.0 \
-		regex-syntax-0.6.27 \
-		remove_dir_all-0.5.3 \
-		scoped-tls-1.0.0 \
-		scopeguard-1.1.0 \
-		serde-1.0.144 \
-		serde_derive-1.0.144 \
-		serde_repr-0.1.9 \
-		sha1-0.6.1 \
-		sha1_smol-1.0.0 \
-		shmemfdrs-0.1.3 \
-		slab-0.4.7 \
-		smallvec-1.9.0 \
-		socket2-0.4.7 \
-		static_assertions-1.1.0 \
-		strsim-0.10.0 \
-		syn-1.0.99 \
-		tempfile-3.3.0 \
-		termcolor-1.1.3 \
-		textwrap-0.15.0 \
-		thiserror-1.0.34 \
-		thiserror-impl-1.0.34 \
-		tokio-1.21.0 \
-		tokio-macros-1.8.0 \
-		toml-0.5.9 \
-		tracing-0.1.36 \
-		tracing-attributes-0.1.22 \
-		tracing-core-0.1.29 \
-		uds_windows-1.0.2 \
-		unicode-ident-1.0.3 \
-		version_check-0.9.4 \
-		wasi-0.11.0+wasi-snapshot-preview1 \
-		wayland-backend-0.1.0-beta.9 \
-		wayland-client-0.30.0-beta.9 \
-		wayland-protocols-0.30.0-beta.9 \
-		wayland-protocols-wlr-0.1.0-beta.9 \
-		wayland-scanner-0.30.0-beta.9 \
-		wayland-sys-0.30.0-beta.9 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		windows-sys-0.36.1 \
-		windows_aarch64_msvc-0.36.1 \
-		windows_i686_gnu-0.36.1 \
-		windows_i686_msvc-0.36.1 \
-		windows_x86_64_gnu-0.36.1 \
-		windows_x86_64_msvc-0.36.1 \
-		zbus-3.1.0 \
-		zbus_macros-3.1.0 \
-		zbus_names-2.2.0 \
-		zvariant-3.6.0 \
-		zvariant_derive-3.6.0
-
 .include <bsd.port.mk>
diff --git a/accessibility/wl-gammarelay-rs/Makefile.crates b/accessibility/wl-gammarelay-rs/Makefile.crates
new file mode 100644
index 000000000000..8f59e08c31b6
--- /dev/null
+++ b/accessibility/wl-gammarelay-rs/Makefile.crates
@@ -0,0 +1,123 @@
+CARGO_CRATES=	aho-corasick-0.7.19 \
+		anyhow-1.0.64 \
+		async-broadcast-0.4.1 \
+		async-recursion-0.3.2 \
+		async-trait-0.1.57 \
+		atty-0.2.14 \
+		autocfg-1.1.0 \
+		bitflags-1.3.2 \
+		byteorder-1.4.3 \
+		bytes-1.2.1 \
+		cc-1.0.73 \
+		cfg-if-1.0.0 \
+		clap-3.2.20 \
+		clap_derive-3.2.18 \
+		clap_lex-0.2.4 \
+		derivative-2.2.0 \
+		dirs-4.0.0 \
+		dirs-sys-0.3.7 \
+		dlib-0.5.0 \
+		downcast-rs-1.2.0 \
+		enumflags2-0.7.5 \
+		enumflags2_derive-0.7.4 \
+		event-listener-2.5.3 \
+		fastrand-1.8.0 \
+		futures-0.3.24 \
+		futures-channel-0.3.24 \
+		futures-core-0.3.24 \
+		futures-executor-0.3.24 \
+		futures-io-0.3.24 \
+		futures-macro-0.3.24 \
+		futures-sink-0.3.24 \
+		futures-task-0.3.24 \
+		futures-util-0.3.24 \
+		getrandom-0.2.7 \
+		hashbrown-0.12.3 \
+		heck-0.4.0 \
+		hermit-abi-0.1.19 \
+		hex-0.4.3 \
+		indexmap-1.9.1 \
+		instant-0.1.12 \
+		lazy_static-1.4.0 \
+		libc-0.2.132 \
+		libloading-0.7.3 \
+		lock_api-0.4.8 \
+		log-0.4.17 \
+		memchr-2.5.0 \
+		memmap-0.7.0 \
+		memoffset-0.6.5 \
+		mio-0.8.4 \
+		nix-0.24.2 \
+		once_cell-1.14.0 \
+		ordered-stream-0.0.1 \
+		os_str_bytes-6.3.0 \
+		parking_lot-0.12.1 \
+		parking_lot_core-0.9.3 \
+		pin-project-lite-0.2.9 \
+		pin-utils-0.1.0 \
+		pkg-config-0.3.25 \
+		ppv-lite86-0.2.16 \
+		proc-macro-crate-1.2.1 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.43 \
+		quick-xml-0.23.1 \
+		quote-1.0.21 \
+		rand-0.8.5 \
+		rand_chacha-0.3.1 \
+		rand_core-0.6.3 \
+		redox_syscall-0.2.16 \
+		redox_users-0.4.3 \
+		regex-1.6.0 \
+		regex-syntax-0.6.27 \
+		remove_dir_all-0.5.3 \
+		scoped-tls-1.0.0 \
+		scopeguard-1.1.0 \
+		serde-1.0.144 \
+		serde_derive-1.0.144 \
+		serde_repr-0.1.9 \
+		sha1-0.6.1 \
+		sha1_smol-1.0.0 \
+		shmemfdrs-0.1.3 \
+		slab-0.4.7 \
+		smallvec-1.9.0 \
+		socket2-0.4.7 \
+		static_assertions-1.1.0 \
+		strsim-0.10.0 \
+		syn-1.0.99 \
+		tempfile-3.3.0 \
+		termcolor-1.1.3 \
+		textwrap-0.15.0 \
+		thiserror-1.0.34 \
+		thiserror-impl-1.0.34 \
+		tokio-1.21.0 \
+		tokio-macros-1.8.0 \
+		toml-0.5.9 \
+		tracing-0.1.36 \
+		tracing-attributes-0.1.22 \
+		tracing-core-0.1.29 \
+		uds_windows-1.0.2 \
+		unicode-ident-1.0.3 \
+		version_check-0.9.4 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		wayland-backend-0.1.0-beta.9 \
+		wayland-client-0.30.0-beta.9 \
+		wayland-protocols-0.30.0-beta.9 \
+		wayland-protocols-wlr-0.1.0-beta.9 \
+		wayland-scanner-0.30.0-beta.9 \
+		wayland-sys-0.30.0-beta.9 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		windows-sys-0.36.1 \
+		windows_aarch64_msvc-0.36.1 \
+		windows_i686_gnu-0.36.1 \
+		windows_i686_msvc-0.36.1 \
+		windows_x86_64_gnu-0.36.1 \
+		windows_x86_64_msvc-0.36.1 \
+		zbus-3.1.0 \
+		zbus_macros-3.1.0 \
+		zbus_names-2.2.0 \
+		zvariant-3.6.0 \
+		zvariant_derive-3.6.0
diff --git a/audio/amberol/Makefile b/audio/amberol/Makefile
index f5de12410be2..85719f72c01b 100644
--- a/audio/amberol/Makefile
+++ b/audio/amberol/Makefile
@@ -26,228 +26,10 @@ GL_SITE=	https://gitlab.gnome.org
 GL_ACCOUNT=	World
 GL_COMMIT=	2b2fc127f63acf69f795b657d4721188bd5d145e
 MAKE_ENV=	${CARGO_ENV}
-GLIB_SCHEMAS=	io.bassi.Amberol.gschema.xml
-
-CARGO_CRATES=	adler-1.0.2 \
-		aho-corasick-0.7.18 \
-		anyhow-1.0.56 \
-		array-init-2.0.0 \
-		ashpd-0.3.2 \
-		async-broadcast-0.4.0 \
-		async-channel-1.6.1 \
-		async-executor-1.4.1 \
-		async-io-1.7.0 \
-		async-lock-2.5.0 \
-		async-recursion-0.3.2 \
-		async-task-4.2.0 \
-		async-trait-0.1.53 \
-		atty-0.2.14 \
-		autocfg-1.1.0 \
-		az-1.2.0 \
-		base64-0.13.0 \
-		bitflags-1.3.2 \
-		block-0.1.6 \
-		block-buffer-0.10.2 \
-		bytemuck-1.9.1 \
-		byteorder-1.4.3 \
-		cache-padded-1.2.0 \
-		cairo-rs-0.15.6 \
-		cairo-sys-rs-0.15.1 \
-		cc-1.0.73 \
-		cfg-expr-0.10.2 \
-		cfg-if-1.0.0 \
-		color-thief-0.2.1 \
-		concurrent-queue-1.2.2 \
-		cpufeatures-0.2.2 \
-		crc32fast-1.3.2 \
-		crypto-common-0.1.3 \
-		dbus-0.6.5 \
-		derivative-2.2.0 \
-		digest-0.10.3 \
-		easy-parallel-3.2.0 \
-		either-1.6.1 \
-		enumflags2-0.7.5 \
-		enumflags2_derive-0.7.4 \
-		env_logger-0.7.1 \
-		event-listener-2.5.2 \
-		fastrand-1.7.0 \
-		field-offset-0.3.4 \
-		flate2-1.0.24 \
-		futures-0.3.21 \
-		futures-channel-0.3.21 \
-		futures-core-0.3.21 \
-		futures-executor-0.3.21 \
-		futures-io-0.3.21 \
-		futures-lite-1.12.0 \
-		futures-macro-0.3.21 \
-		futures-sink-0.3.21 \
-		futures-task-0.3.21 \
-		futures-util-0.3.21 \
-		fuzzy-matcher-0.3.7 \
-		gdk-pixbuf-0.15.6 \
-		gdk-pixbuf-sys-0.15.1 \
-		gdk4-0.4.8 \
-		gdk4-sys-0.4.8 \
-		gdk4-wayland-0.4.7 \
-		gdk4-wayland-sys-0.4.8 \
-		gdk4-x11-0.4.2 \
-		gdk4-x11-sys-0.4.2 \
-		generic-array-0.14.5 \
-		getrandom-0.2.6 \
-		gettext-rs-0.7.0 \
-		gettext-sys-0.21.2 \
-		gio-0.15.7 \
-		gio-sys-0.15.7 \
-		glib-0.10.3 \
-		glib-0.15.9 \
-		glib-macros-0.10.1 \
-		glib-macros-0.15.6 \
-		glib-sys-0.10.1 \
-		glib-sys-0.15.7 \
-		gmp-mpfr-sys-1.4.8 \
-		gobject-sys-0.10.0 \
-		gobject-sys-0.15.9 \
-		graphene-rs-0.15.1 \
-		graphene-sys-0.15.1 \
-		gsk4-0.4.8 \
-		gsk4-sys-0.4.8 \
-		gstreamer-0.18.6 \
-		gstreamer-audio-0.18.7 \
-		gstreamer-audio-sys-0.18.3 \
-		gstreamer-base-0.18.0 \
-		gstreamer-base-sys-0.18.0 \
-		gstreamer-player-0.18.0 \
-		gstreamer-player-sys-0.18.0 \
-		gstreamer-sys-0.18.0 \
-		gstreamer-video-0.18.5 \
-		gstreamer-video-sys-0.18.3 \
-		gtk-macros-0.3.0 \
-		gtk4-0.4.8 \
-		gtk4-macros-0.4.8 \
-		gtk4-sys-0.4.8 \
-		heck-0.3.3 \
-		heck-0.4.0 \
-		hermit-abi-0.1.19 \
-		hex-0.4.3 \
-		humantime-1.3.0 \
-		instant-0.1.12 \
-		itertools-0.9.0 \
-		itoa-1.0.2 \
-		lazy_static-1.4.0 \
-		libadwaita-0.1.0 \
-		libadwaita-sys-0.1.0 \
-		libc-0.2.121 \
-		libdbus-sys-0.2.2 \
-		locale_config-0.3.0 \
-		lock_api-0.4.7 \
-		lofty-0.8.0 \
-		lofty_attr-0.3.0 \
-		log-0.4.16 \
-		malloc_buf-0.0.6 \
-		memchr-2.4.1 \
-		memoffset-0.6.5 \
-		miniz_oxide-0.5.3 \
-		mpris-player-0.6.1 \
-		muldiv-1.0.0 \
-		nix-0.23.1 \
-		num-0.4.0 \
-		num-bigint-0.4.3 \
-		num-complex-0.4.1 \
-		num-integer-0.1.44 \
-		num-iter-0.1.43 \
-		num-rational-0.4.0 \
-		num-traits-0.2.14 \
-		objc-0.2.7 \
-		objc-foundation-0.1.1 \
-		objc_id-0.1.1 \
-		ogg_pager-0.3.2 \
-		once_cell-1.13.0 \
-		option-operations-0.4.0 \
-		ordered-stream-0.0.1 \
-		pango-0.15.7 \
-		pango-sys-0.15.1 \
-		parking-2.0.0 \
-		parking_lot-0.11.2 \
-		parking_lot_core-0.8.5 \
-		paste-1.0.7 \
-		pest-2.1.3 \
-		pin-project-lite-0.2.8 \
-		pin-utils-0.1.0 \
-		pkg-config-0.3.24 \
-		polling-2.2.0 \
-		ppv-lite86-0.2.16 \
-		pretty-hex-0.2.1 \
-		pretty_env_logger-0.4.0 \
-		proc-macro-crate-0.1.5 \
-		proc-macro-crate-1.1.3 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.43 \
-		quick-error-1.2.3 \
-		quick-xml-0.22.0 \
-		quote-1.0.21 \
-		rand-0.8.5 \
-		rand_chacha-0.3.1 \
-		rand_core-0.6.3 \
-		redox_syscall-0.2.13 \
-		regex-1.5.5 \
-		regex-syntax-0.6.25 \
-		remove_dir_all-0.5.3 \
-		rgb-0.8.32 \
-		rgb_derivation-0.2.0 \
-		rug-1.16.0 \
-		rustc_version-0.3.3 \
-		ryu-1.0.10 \
-		scopeguard-1.1.0 \
-		semver-0.11.0 \
-		semver-parser-0.10.2 \
-		serde-1.0.136 \
-		serde_derive-1.0.136 \
-		serde_json-1.0.81 \
-		serde_repr-0.1.8 \
-		sha1-0.6.1 \
-		sha1_smol-1.0.0 \
-		sha2-0.10.2 \
-		slab-0.4.5 \
-		smallvec-1.8.0 \
-		socket2-0.4.4 \
-		srgb-0.3.0 \
-		static_assertions-1.1.0 \
-		strum-0.18.0 \
-		strum_macros-0.18.0 \
-		syn-1.0.99 \
-		system-deps-1.3.2 \
-		system-deps-6.0.2 \
-		temp-dir-0.1.11 \
-		tempfile-3.3.0 \
-		termcolor-1.1.3 \
-		thiserror-1.0.30 \
-		thiserror-impl-1.0.30 \
-		thread_local-1.1.4 \
-		toml-0.5.8 \
-		typenum-1.15.0 \
-		ucd-trie-0.1.3 \
-		uds_windows-1.0.2 \
-		unicode-ident-1.0.3 \
-		unicode-segmentation-1.9.0 \
-		version-compare-0.0.10 \
-		version-compare-0.1.0 \
-		version_check-0.9.4 \
-		waker-fn-1.1.0 \
-		wasi-0.10.2+wasi-snapshot-preview1 \
-		wepoll-ffi-0.1.2 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		zbus-2.2.0 \
-		zbus_macros-2.2.0 \
-		zbus_names-2.1.0 \
-		zvariant-3.2.1 \
-		zvariant_derive-3.2.1
 CARGO_BUILD=	no
 CARGO_INSTALL=	no
 CARGO_TEST=	no
+GLIB_SCHEMAS=	io.bassi.Amberol.gschema.xml
 
 post-patch:
 # Allow running from background via xdg-desktop-portal
diff --git a/audio/amberol/Makefile.crates b/audio/amberol/Makefile.crates
new file mode 100644
index 000000000000..d417cc138f5f
--- /dev/null
+++ b/audio/amberol/Makefile.crates
@@ -0,0 +1,217 @@
+CARGO_CRATES=	adler-1.0.2 \
+		aho-corasick-0.7.18 \
+		anyhow-1.0.56 \
+		array-init-2.0.0 \
+		ashpd-0.3.2 \
+		async-broadcast-0.4.0 \
+		async-channel-1.6.1 \
+		async-executor-1.4.1 \
+		async-io-1.7.0 \
+		async-lock-2.5.0 \
+		async-recursion-0.3.2 \
+		async-task-4.2.0 \
+		async-trait-0.1.53 \
+		atty-0.2.14 \
+		autocfg-1.1.0 \
+		az-1.2.0 \
+		base64-0.13.0 \
+		bitflags-1.3.2 \
+		block-0.1.6 \
+		block-buffer-0.10.2 \
+		bytemuck-1.9.1 \
+		byteorder-1.4.3 \
+		cache-padded-1.2.0 \
+		cairo-rs-0.15.6 \
+		cairo-sys-rs-0.15.1 \
+		cc-1.0.73 \
+		cfg-expr-0.10.2 \
+		cfg-if-1.0.0 \
+		color-thief-0.2.1 \
+		concurrent-queue-1.2.2 \
+		cpufeatures-0.2.2 \
+		crc32fast-1.3.2 \
+		crypto-common-0.1.3 \
+		dbus-0.6.5 \
+		derivative-2.2.0 \
+		digest-0.10.3 \
+		easy-parallel-3.2.0 \
+		either-1.6.1 \
+		enumflags2-0.7.5 \
+		enumflags2_derive-0.7.4 \
+		env_logger-0.7.1 \
+		event-listener-2.5.2 \
+		fastrand-1.7.0 \
+		field-offset-0.3.4 \
+		flate2-1.0.24 \
+		futures-0.3.21 \
+		futures-channel-0.3.21 \
+		futures-core-0.3.21 \
+		futures-executor-0.3.21 \
+		futures-io-0.3.21 \
+		futures-lite-1.12.0 \
+		futures-macro-0.3.21 \
+		futures-sink-0.3.21 \
+		futures-task-0.3.21 \
+		futures-util-0.3.21 \
+		fuzzy-matcher-0.3.7 \
+		gdk-pixbuf-0.15.6 \
+		gdk-pixbuf-sys-0.15.1 \
+		gdk4-0.4.8 \
+		gdk4-sys-0.4.8 \
+		gdk4-wayland-0.4.7 \
+		gdk4-wayland-sys-0.4.8 \
+		gdk4-x11-0.4.2 \
+		gdk4-x11-sys-0.4.2 \
+		generic-array-0.14.5 \
+		getrandom-0.2.6 \
+		gettext-rs-0.7.0 \
+		gettext-sys-0.21.2 \
+		gio-0.15.7 \
+		gio-sys-0.15.7 \
+		glib-0.10.3 \
+		glib-0.15.9 \
+		glib-macros-0.10.1 \
+		glib-macros-0.15.6 \
+		glib-sys-0.10.1 \
+		glib-sys-0.15.7 \
+		gmp-mpfr-sys-1.4.8 \
+		gobject-sys-0.10.0 \
+		gobject-sys-0.15.9 \
+		graphene-rs-0.15.1 \
+		graphene-sys-0.15.1 \
+		gsk4-0.4.8 \
+		gsk4-sys-0.4.8 \
+		gstreamer-0.18.6 \
+		gstreamer-audio-0.18.7 \
+		gstreamer-audio-sys-0.18.3 \
+		gstreamer-base-0.18.0 \
+		gstreamer-base-sys-0.18.0 \
+		gstreamer-player-0.18.0 \
+		gstreamer-player-sys-0.18.0 \
+		gstreamer-sys-0.18.0 \
+		gstreamer-video-0.18.5 \
+		gstreamer-video-sys-0.18.3 \
+		gtk-macros-0.3.0 \
+		gtk4-0.4.8 \
+		gtk4-macros-0.4.8 \
+		gtk4-sys-0.4.8 \
+		heck-0.3.3 \
+		heck-0.4.0 \
+		hermit-abi-0.1.19 \
+		hex-0.4.3 \
+		humantime-1.3.0 \
+		instant-0.1.12 \
+		itertools-0.9.0 \
+		itoa-1.0.2 \
+		lazy_static-1.4.0 \
+		libadwaita-0.1.0 \
+		libadwaita-sys-0.1.0 \
+		libc-0.2.121 \
+		libdbus-sys-0.2.2 \
+		locale_config-0.3.0 \
+		lock_api-0.4.7 \
+		lofty-0.8.0 \
+		lofty_attr-0.3.0 \
+		log-0.4.16 \
+		malloc_buf-0.0.6 \
+		memchr-2.4.1 \
+		memoffset-0.6.5 \
+		miniz_oxide-0.5.3 \
+		mpris-player-0.6.1 \
+		muldiv-1.0.0 \
+		nix-0.23.1 \
+		num-0.4.0 \
+		num-bigint-0.4.3 \
+		num-complex-0.4.1 \
+		num-integer-0.1.44 \
+		num-iter-0.1.43 \
+		num-rational-0.4.0 \
+		num-traits-0.2.14 \
+		objc-0.2.7 \
+		objc-foundation-0.1.1 \
+		objc_id-0.1.1 \
+		ogg_pager-0.3.2 \
+		once_cell-1.13.0 \
+		option-operations-0.4.0 \
+		ordered-stream-0.0.1 \
+		pango-0.15.7 \
+		pango-sys-0.15.1 \
+		parking-2.0.0 \
+		parking_lot-0.11.2 \
+		parking_lot_core-0.8.5 \
+		paste-1.0.7 \
+		pest-2.1.3 \
+		pin-project-lite-0.2.8 \
+		pin-utils-0.1.0 \
+		pkg-config-0.3.24 \
+		polling-2.2.0 \
+		ppv-lite86-0.2.16 \
+		pretty-hex-0.2.1 \
+		pretty_env_logger-0.4.0 \
+		proc-macro-crate-0.1.5 \
+		proc-macro-crate-1.1.3 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.43 \
+		quick-error-1.2.3 \
+		quick-xml-0.22.0 \
+		quote-1.0.21 \
+		rand-0.8.5 \
+		rand_chacha-0.3.1 \
+		rand_core-0.6.3 \
+		redox_syscall-0.2.13 \
+		regex-1.5.5 \
+		regex-syntax-0.6.25 \
+		remove_dir_all-0.5.3 \
+		rgb-0.8.32 \
+		rgb_derivation-0.2.0 \
+		rug-1.16.0 \
+		rustc_version-0.3.3 \
+		ryu-1.0.10 \
+		scopeguard-1.1.0 \
+		semver-0.11.0 \
+		semver-parser-0.10.2 \
+		serde-1.0.136 \
+		serde_derive-1.0.136 \
+		serde_json-1.0.81 \
+		serde_repr-0.1.8 \
+		sha1-0.6.1 \
+		sha1_smol-1.0.0 \
+		sha2-0.10.2 \
+		slab-0.4.5 \
+		smallvec-1.8.0 \
+		socket2-0.4.4 \
+		srgb-0.3.0 \
+		static_assertions-1.1.0 \
+		strum-0.18.0 \
+		strum_macros-0.18.0 \
+		syn-1.0.99 \
+		system-deps-1.3.2 \
+		system-deps-6.0.2 \
+		temp-dir-0.1.11 \
+		tempfile-3.3.0 \
+		termcolor-1.1.3 \
+		thiserror-1.0.30 \
+		thiserror-impl-1.0.30 \
+		thread_local-1.1.4 \
+		toml-0.5.8 \
+		typenum-1.15.0 \
+		ucd-trie-0.1.3 \
+		uds_windows-1.0.2 \
+		unicode-ident-1.0.3 \
+		unicode-segmentation-1.9.0 \
+		version-compare-0.0.10 \
+		version-compare-0.1.0 \
+		version_check-0.9.4 \
+		waker-fn-1.1.0 \
+		wasi-0.10.2+wasi-snapshot-preview1 \
+		wepoll-ffi-0.1.2 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		zbus-2.2.0 \
+		zbus_macros-2.2.0 \
+		zbus_names-2.1.0 \
+		zvariant-3.2.1 \
+		zvariant_derive-3.2.1
diff --git a/audio/gnome-metronome/Makefile b/audio/gnome-metronome/Makefile
index 7557df63b9cf..0e1d4ff30baf 100644
--- a/audio/gnome-metronome/Makefile
+++ b/audio/gnome-metronome/Makefile
@@ -22,111 +22,10 @@ GL_ACCOUNT=	World
 GL_COMMIT=	26fb83ff4ca32bf801260c3e32af6dcef19f5e59
 SHEBANG_FILES=	build-aux/meson_post_install.py
 MAKE_ENV=	${CARGO_ENV}
-GLIB_SCHEMAS=	com.adrienplazas.Metronome.gschema.xml
-
-CARGO_CRATES=	aho-corasick-0.7.18 \
-		anyhow-1.0.56 \
-		atty-0.2.14 \
-		autocfg-1.1.0 \
-		bitflags-1.3.2 \
-		block-0.1.6 \
-		cc-1.0.73 \
-		cfg-expr-0.10.2 \
-		cfg-if-1.0.0 \
-		either-1.6.1 \
-		env_logger-0.7.1 \
-		field-offset-0.3.4 \
-		futures-channel-0.3.21 \
-		futures-core-0.3.21 \
-		futures-executor-0.3.21 \
-		futures-io-0.3.21 \
-		futures-macro-0.3.21 \
-		futures-task-0.3.21 \
-		futures-util-0.3.21 \
-		gettext-rs-0.7.0 \
-		gettext-sys-0.21.3 \
-		glib-0.10.3 \
-		glib-macros-0.10.1 \
-		glib-sys-0.10.1 \
-		gobject-sys-0.10.0 \
-		gstreamer-0.16.7 \
-		gstreamer-base-0.16.5 \
-		gstreamer-base-sys-0.9.1 \
-		gstreamer-player-0.16.5 \
-		gstreamer-player-sys-0.9.1 \
-		gstreamer-sys-0.9.1 \
-		gstreamer-video-0.16.7 \
-		gstreamer-video-sys-0.9.1 \
-		gtk-macros-0.3.0 \
-		heck-0.3.3 \
-		heck-0.4.0 \
-		hermit-abi-0.1.19 \
-		humantime-1.3.0 \
-		itertools-0.9.0 \
-		lazy_static-1.4.0 \
-		libc-0.2.123 \
-		locale_config-0.3.0 \
-		log-0.4.16 \
-		malloc_buf-0.0.6 \
-		memchr-2.4.1 \
-		memoffset-0.6.5 \
-		muldiv-0.2.1 \
-		num-integer-0.1.44 \
-		num-rational-0.3.2 \
-		num-traits-0.2.14 \
-		objc-0.2.7 \
-		objc-foundation-0.1.1 \
-		objc_id-0.1.1 \
-		once_cell-1.10.0 \
-		paste-1.0.7 \
-		pest-2.1.3 \
-		pin-project-lite-0.2.8 \
-		pin-utils-0.1.0 \
-		pkg-config-0.3.25 \
-		pretty-hex-0.2.1 \
-		pretty_env_logger-0.4.0 \
-		proc-macro-crate-0.1.5 \
-		proc-macro-crate-1.1.3 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.37 \
-		quick-error-1.2.3 \
-		quick-xml-0.22.0 \
-		quote-1.0.18 \
-		regex-1.5.5 \
-		regex-syntax-0.6.25 \
-		rustc_version-0.3.3 \
-		semver-0.11.0 \
-		semver-parser-0.10.2 \
-		serde-1.0.136 \
-		slab-0.4.6 \
-		smallvec-1.8.0 \
-		strum-0.18.0 \
-		strum_macros-0.18.0 \
-		syn-1.0.91 \
-		system-deps-1.3.2 \
-		system-deps-6.0.2 \
-		temp-dir-0.1.11 \
-		termcolor-1.1.3 \
-		thiserror-1.0.30 \
-		thiserror-impl-1.0.30 \
-		toml-0.5.8 \
-		ucd-trie-0.1.3 \
-		unicode-segmentation-1.9.0 \
-		unicode-xid-0.2.2 \
-		version-compare-0.0.10 \
-		version-compare-0.1.0 \
-		version_check-0.9.4 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		gdk4,gdk4-sys,gsk4,gsk4-sys,gtk4,gtk4-macros,gtk4-sys@git+https://github.com/gtk-rs/gtk4-rs\#851001b57ce913bc7f416845d401a8922630c64a \
-		cairo-rs,cairo-sys-rs,gdk-pixbuf,gdk-pixbuf-sys,gio,gio-sys,glib,glib-macros,glib-sys,gobject-sys,graphene-rs,graphene-sys,pango,pango-sys@git+https://github.com/gtk-rs/gtk-rs-core\#597c827646a7ab73346226c9433b7fb9631e4ad4 \
-		libadwaita,libadwaita-sys@git+https://gitlab.gnome.org/World/Rust/libadwaita-rs\#9d5e5e7eba9257ad557e9f16b68ef9f6c99e5d3e
 CARGO_BUILD=	no
 CARGO_INSTALL=	no
 CARGO_TEST=	no
+GLIB_SCHEMAS=	com.adrienplazas.Metronome.gschema.xml
 
 post-patch:
 # Make each cargo subcommand very verbose
diff --git a/audio/gnome-metronome/Makefile.crates b/audio/gnome-metronome/Makefile.crates
new file mode 100644
index 000000000000..13f5c1b42692
--- /dev/null
+++ b/audio/gnome-metronome/Makefile.crates
@@ -0,0 +1,100 @@
+CARGO_CRATES=	aho-corasick-0.7.18 \
+		anyhow-1.0.56 \
+		atty-0.2.14 \
+		autocfg-1.1.0 \
+		bitflags-1.3.2 \
+		block-0.1.6 \
+		cc-1.0.73 \
+		cfg-expr-0.10.2 \
+		cfg-if-1.0.0 \
+		either-1.6.1 \
+		env_logger-0.7.1 \
+		field-offset-0.3.4 \
+		futures-channel-0.3.21 \
+		futures-core-0.3.21 \
+		futures-executor-0.3.21 \
+		futures-io-0.3.21 \
+		futures-macro-0.3.21 \
+		futures-task-0.3.21 \
+		futures-util-0.3.21 \
+		gettext-rs-0.7.0 \
+		gettext-sys-0.21.3 \
+		glib-0.10.3 \
+		glib-macros-0.10.1 \
+		glib-sys-0.10.1 \
+		gobject-sys-0.10.0 \
+		gstreamer-0.16.7 \
+		gstreamer-base-0.16.5 \
+		gstreamer-base-sys-0.9.1 \
+		gstreamer-player-0.16.5 \
+		gstreamer-player-sys-0.9.1 \
+		gstreamer-sys-0.9.1 \
+		gstreamer-video-0.16.7 \
+		gstreamer-video-sys-0.9.1 \
+		gtk-macros-0.3.0 \
+		heck-0.3.3 \
+		heck-0.4.0 \
+		hermit-abi-0.1.19 \
+		humantime-1.3.0 \
+		itertools-0.9.0 \
+		lazy_static-1.4.0 \
+		libc-0.2.123 \
+		locale_config-0.3.0 \
+		log-0.4.16 \
+		malloc_buf-0.0.6 \
+		memchr-2.4.1 \
+		memoffset-0.6.5 \
+		muldiv-0.2.1 \
+		num-integer-0.1.44 \
+		num-rational-0.3.2 \
+		num-traits-0.2.14 \
+		objc-0.2.7 \
+		objc-foundation-0.1.1 \
+		objc_id-0.1.1 \
+		once_cell-1.10.0 \
+		paste-1.0.7 \
+		pest-2.1.3 \
+		pin-project-lite-0.2.8 \
+		pin-utils-0.1.0 \
+		pkg-config-0.3.25 \
+		pretty-hex-0.2.1 \
+		pretty_env_logger-0.4.0 \
+		proc-macro-crate-0.1.5 \
+		proc-macro-crate-1.1.3 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.37 \
+		quick-error-1.2.3 \
+		quick-xml-0.22.0 \
+		quote-1.0.18 \
+		regex-1.5.5 \
+		regex-syntax-0.6.25 \
+		rustc_version-0.3.3 \
+		semver-0.11.0 \
+		semver-parser-0.10.2 \
+		serde-1.0.136 \
+		slab-0.4.6 \
+		smallvec-1.8.0 \
+		strum-0.18.0 \
+		strum_macros-0.18.0 \
+		syn-1.0.91 \
+		system-deps-1.3.2 \
+		system-deps-6.0.2 \
+		temp-dir-0.1.11 \
+		termcolor-1.1.3 \
+		thiserror-1.0.30 \
+		thiserror-impl-1.0.30 \
+		toml-0.5.8 \
+		ucd-trie-0.1.3 \
+		unicode-segmentation-1.9.0 \
+		unicode-xid-0.2.2 \
+		version-compare-0.0.10 \
+		version-compare-0.1.0 \
+		version_check-0.9.4 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		gdk4,gdk4-sys,gsk4,gsk4-sys,gtk4,gtk4-macros,gtk4-sys@git+https://github.com/gtk-rs/gtk4-rs\#851001b57ce913bc7f416845d401a8922630c64a \
+		cairo-rs,cairo-sys-rs,gdk-pixbuf,gdk-pixbuf-sys,gio,gio-sys,glib,glib-macros,glib-sys,gobject-sys,graphene-rs,graphene-sys,pango,pango-sys@git+https://github.com/gtk-rs/gtk-rs-core\#597c827646a7ab73346226c9433b7fb9631e4ad4 \
+		libadwaita,libadwaita-sys@git+https://gitlab.gnome.org/World/Rust/libadwaita-rs\#9d5e5e7eba9257ad557e9f16b68ef9f6c99e5d3e
diff --git a/audio/gnome-podcasts/Makefile b/audio/gnome-podcasts/Makefile
index d7f3d88e9306..3e2aefdd1768 100644
--- a/audio/gnome-podcasts/Makefile
+++ b/audio/gnome-podcasts/Makefile
@@ -27,296 +27,10 @@ GL_ACCOUNT=	World
 GL_COMMIT=	c86f7bfdef7692bbf20f315a90450321f6ca9ce7
 SHEBANG_FILES=	scripts/cargo.sh scripts/compile-gschema.py
 MAKE_ENV=	${CARGO_ENV}
-GLIB_SCHEMAS=	org.gnome.Podcasts.gschema.xml
-
-CARGO_CRATES=	aho-corasick-0.7.18 \
-		ammonia-3.1.2 \
-		ansi_term-0.12.1 \
-		anyhow-1.0.52 \
-		atk-0.14.0 \
-		atk-sys-0.14.0 \
-		atom_syndication-0.11.0 \
-		atty-0.2.14 \
-		autocfg-1.0.1 \
-		base64-0.13.0 \
-		bitflags-1.3.2 \
-		bumpalo-3.8.0 \
-		byteorder-1.4.3 \
-		bytes-1.1.0 \
-		cairo-rs-0.14.9 \
-		cairo-sys-rs-0.14.9 \
-		cc-1.0.72 \
-		cfg-expr-0.8.1 \
-		cfg-if-1.0.0 \
-		chrono-0.4.19 \
-		core-foundation-0.9.2 \
-		core-foundation-sys-0.8.3 \
-		crossbeam-channel-0.5.1 \
-		crossbeam-deque-0.8.1 \
-		crossbeam-epoch-0.9.5 \
-		crossbeam-utils-0.8.5 \
-		ctor-0.1.21 \
-		darling-0.10.2 \
-		darling-0.12.4 \
-		darling_core-0.10.2 \
-		darling_core-0.12.4 \
-		darling_macro-0.10.2 \
-		darling_macro-0.12.4 \
-		dbus-0.6.5 \
-		derive_builder-0.9.0 \
-		derive_builder-0.10.2 \
-		derive_builder_core-0.9.0 \
-		derive_builder_core-0.10.2 \
-		derive_builder_macro-0.10.2 \
-		diesel-1.4.8 \
-		diesel_derives-1.4.1 \
-		diesel_migrations-1.4.0 \
-		diff-0.1.12 \
-		diligent-date-parser-0.1.3 \
-		dirs-3.0.2 \
-		dirs-sys-0.3.6 \
-		either-1.6.1 \
-		encoding_rs-0.8.30 \
-		env_logger-0.7.1 \
-		field-offset-0.3.4 \
-		fnv-1.0.7 \
-		foreign-types-0.3.2 \
-		foreign-types-shared-0.1.1 \
-		form_urlencoded-1.0.1 \
-		fragile-1.0.0 \
-		fuchsia-cprng-0.1.1 \
-		futf-0.1.4 \
-		futures-0.3.19 \
-		futures-channel-0.3.19 \
-		futures-core-0.3.19 \
-		futures-executor-0.3.19 \
-		futures-io-0.3.19 \
-		futures-macro-0.3.19 \
-		futures-sink-0.3.19 \
-		futures-task-0.3.19 \
-		futures-util-0.3.19 \
-		gdk-0.14.3 \
-		gdk-pixbuf-0.14.0 \
-		gdk-pixbuf-sys-0.14.0 \
-		gdk-sys-0.14.0 \
-		getrandom-0.1.16 \
-		getrandom-0.2.3 \
-		gio-0.14.8 \
-		gio-sys-0.14.0 \
-		glib-0.10.3 \
-		glib-0.14.8 \
-		glib-macros-0.10.1 \
-		glib-macros-0.14.1 \
-		glib-sys-0.10.1 \
-		glib-sys-0.14.0 \
-		glob-0.3.0 \
-		gobject-sys-0.10.0 \
-		gobject-sys-0.14.0 \
-		gstreamer-0.17.4 \
-		gstreamer-base-0.17.2 \
-		gstreamer-base-sys-0.17.0 \
-		gstreamer-player-0.17.0 \
-		gstreamer-player-sys-0.17.0 \
-		gstreamer-sys-0.17.3 \
-		gstreamer-video-0.17.2 \
-		gstreamer-video-sys-0.17.0 \
-		gtk-0.14.3 \
-		gtk-sys-0.14.0 \
-		gtk3-macros-0.14.0 \
-		h2-0.3.9 \
-		hashbrown-0.11.2 \
-		heck-0.3.3 \
-		hermit-abi-0.1.19 \
-		html2text-0.2.1 \
-		html5ever-0.25.1 \
-		http-0.2.6 \
-		http-body-0.4.4 \
-		httparse-1.5.1 \
-		httpdate-1.0.2 \
-		humansize-1.1.1 \
-		humantime-1.3.0 \
-		hyper-0.14.16 \
-		hyper-tls-0.5.0 \
-		ident_case-1.0.1 \
-		idna-0.2.3 \
-		indexmap-1.7.0 \
-		instant-0.1.12 \
-		ipnet-2.3.1 \
-		itertools-0.9.0 \
-		itertools-0.10.3 \
-		itoa-0.4.8 \
-		itoa-1.0.1 \
-		js-sys-0.3.55 \
-		lazy_static-1.4.0 \
-		libc-0.2.112 \
-		libdbus-sys-0.2.2 \
-		libhandy-0.8.0 \
-		libhandy-sys-0.8.0 \
-		libsqlite3-sys-0.22.2 \
-		locale_config-0.2.3 \
-		lock_api-0.4.5 \
-		log-0.4.14 \
-		mac-0.1.1 \
-		maplit-1.0.2 \
-		markup5ever-0.10.1 \
-		markup5ever_rcdom-0.1.0 \
-		matches-0.1.9 \
-		memchr-2.4.1 \
-		memoffset-0.6.5 \
-		migrations_internals-1.4.1 \
-		migrations_macros-1.4.2 \
-		mime-0.3.16 \
-		mime_guess-2.0.3 \
-		mio-0.7.14 \
-		miow-0.3.7 \
-		mpris-player-0.6.1 \
-		muldiv-1.0.0 \
-		native-tls-0.2.8 \
-		never-0.1.0 \
-		new_debug_unreachable-1.0.4 \
-		ntapi-0.3.6 \
-		num-integer-0.1.44 \
-		num-rational-0.4.0 \
-		num-traits-0.2.14 \
-		num_cpus-1.13.1 \
-		once_cell-1.9.0 \
-		open-2.0.2 \
-		openssl-0.10.38 \
-		openssl-probe-0.1.4 \
-		openssl-sys-0.9.72 \
-		output_vt100-0.1.2 \
-		pango-0.14.8 \
-		pango-sys-0.14.0 \
-		parking_lot-0.11.2 \
-		parking_lot_core-0.8.5 \
-		paste-1.0.6 \
-		pathdiff-0.2.1 \
-		percent-encoding-2.1.0 \
-		pest-2.1.3 \
-		phf-0.8.0 \
-		phf_codegen-0.8.0 \
-		phf_generator-0.8.0 \
-		phf_shared-0.8.0 \
-		pin-project-lite-0.2.8 \
-		pin-utils-0.1.0 \
-		pkg-config-0.3.24 \
-		ppv-lite86-0.2.16 \
-		precomputed-hash-0.1.1 \
-		pretty-hex-0.2.1 \
-		pretty_assertions-1.0.0 \
-		pretty_env_logger-0.4.0 \
-		proc-macro-crate-0.1.5 \
-		proc-macro-crate-1.1.0 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.36 \
-		quick-error-1.2.3 \
-		quick-xml-0.22.0 \
-		quote-1.0.14 \
-		r2d2-0.8.9 \
-		rand-0.4.6 \
-		rand-0.7.3 \
-		rand-0.8.4 \
-		rand_chacha-0.2.2 \
-		rand_chacha-0.3.1 \
-		rand_core-0.3.1 \
-		rand_core-0.4.2 \
-		rand_core-0.5.1 \
-		rand_core-0.6.3 \
-		rand_hc-0.2.0 \
-		rand_hc-0.3.1 \
-		rand_pcg-0.2.1 \
-		rayon-1.5.1 \
-		rayon-core-1.9.1 \
-		rdrand-0.4.0 \
-		redox_syscall-0.2.10 \
-		redox_users-0.4.0 \
-		regex-1.5.4 \
-		regex-syntax-0.6.25 \
-		remove_dir_all-0.5.3 \
-		reqwest-0.11.8 \
-		rfc822_sanitizer-0.3.4 \
-		rss-2.0.0 \
-		rustc_version-0.3.3 \
-		ryu-1.0.9 \
-		schannel-0.1.19 \
-		scheduled-thread-pool-0.2.5 \
-		scopeguard-1.1.0 \
-		security-framework-2.4.2 \
-		security-framework-sys-2.4.2 \
-		semver-0.11.0 \
-		semver-parser-0.10.2 \
-		serde-1.0.133 \
-		serde_json-1.0.74 \
-		serde_urlencoded-0.7.0 \
-		siphasher-0.3.7 \
-		slab-0.4.5 \
-		smallvec-1.7.0 \
-		socket2-0.4.2 \
-		string_cache-0.8.2 \
-		string_cache_codegen-0.5.1 \
-		strsim-0.9.3 \
-		strsim-0.10.0 \
-		strum-0.18.0 \
-		strum-0.21.0 \
-		strum_macros-0.18.0 \
-		strum_macros-0.21.1 \
-		syn-1.0.84 \
-		system-deps-1.3.2 \
-		system-deps-3.2.0 \
-		tempdir-0.3.7 \
-		tempfile-3.2.0 \
-		tendril-0.4.2 \
-		termcolor-1.1.2 \
-		thiserror-1.0.30 \
-		thiserror-impl-1.0.30 \
-		time-0.1.43 \
-		tinyvec-1.5.1 \
-		tinyvec_macros-0.1.0 \
-		tokio-1.15.0 \
-		tokio-macros-1.7.0 \
-		tokio-native-tls-0.3.0 \
-		tokio-util-0.6.9 \
-		toml-0.5.8 \
-		tower-service-0.3.1 \
-		tracing-0.1.29 \
-		tracing-core-0.1.21 \
-		try-lock-0.2.3 \
-		ucd-trie-0.1.3 \
-		unicase-2.6.0 \
-		unicode-bidi-0.3.7 \
-		unicode-normalization-0.1.19 \
-		unicode-segmentation-1.8.0 \
-		unicode-width-0.1.9 \
-		unicode-xid-0.2.2 \
-		url-2.2.2 \
-		utf-8-0.7.6 \
-		vcpkg-0.2.15 \
-		version-compare-0.0.10 \
-		version-compare-0.0.11 \
-		version_check-0.9.4 \
-		want-0.3.0 \
-		wasi-0.9.0+wasi-snapshot-preview1 \
-		wasi-0.10.2+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.78 \
-		wasm-bindgen-backend-0.2.78 \
-		wasm-bindgen-futures-0.4.28 \
-		wasm-bindgen-macro-0.2.78 \
-		wasm-bindgen-macro-support-0.2.78 \
-		wasm-bindgen-shared-0.2.78 \
-		web-sys-0.3.55 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		winreg-0.7.0 \
-		xdg-2.4.0 \
-		xml-rs-0.8.4 \
-		xml5ever-0.16.2 \
-		gettext-rs,gettext-sys@git+https://github.com/danigm/gettext-rs?branch=no-gettext\#61938b9f5f1d3bdc31f9839f53fabe5ccf136a78
 CARGO_BUILD=	no
 CARGO_INSTALL=	no
 CARGO_TEST=	no
+GLIB_SCHEMAS=	org.gnome.Podcasts.gschema.xml
 
 post-patch:
 	@${REINPLACE_CMD} -e '/dependency.*openssl/d' \
diff --git a/audio/gnome-podcasts/Makefile.crates b/audio/gnome-podcasts/Makefile.crates
new file mode 100644
index 000000000000..9d457db5d5f8
--- /dev/null
+++ b/audio/gnome-podcasts/Makefile.crates
@@ -0,0 +1,285 @@
+CARGO_CRATES=	aho-corasick-0.7.18 \
+		ammonia-3.1.2 \
+		ansi_term-0.12.1 \
+		anyhow-1.0.52 \
+		atk-0.14.0 \
+		atk-sys-0.14.0 \
+		atom_syndication-0.11.0 \
+		atty-0.2.14 \
+		autocfg-1.0.1 \
+		base64-0.13.0 \
+		bitflags-1.3.2 \
+		bumpalo-3.8.0 \
+		byteorder-1.4.3 \
+		bytes-1.1.0 \
+		cairo-rs-0.14.9 \
+		cairo-sys-rs-0.14.9 \
+		cc-1.0.72 \
+		cfg-expr-0.8.1 \
+		cfg-if-1.0.0 \
+		chrono-0.4.19 \
+		core-foundation-0.9.2 \
+		core-foundation-sys-0.8.3 \
+		crossbeam-channel-0.5.1 \
+		crossbeam-deque-0.8.1 \
+		crossbeam-epoch-0.9.5 \
+		crossbeam-utils-0.8.5 \
+		ctor-0.1.21 \
+		darling-0.10.2 \
+		darling-0.12.4 \
+		darling_core-0.10.2 \
+		darling_core-0.12.4 \
+		darling_macro-0.10.2 \
+		darling_macro-0.12.4 \
+		dbus-0.6.5 \
+		derive_builder-0.9.0 \
+		derive_builder-0.10.2 \
+		derive_builder_core-0.9.0 \
+		derive_builder_core-0.10.2 \
+		derive_builder_macro-0.10.2 \
+		diesel-1.4.8 \
+		diesel_derives-1.4.1 \
+		diesel_migrations-1.4.0 \
+		diff-0.1.12 \
+		diligent-date-parser-0.1.3 \
+		dirs-3.0.2 \
+		dirs-sys-0.3.6 \
+		either-1.6.1 \
+		encoding_rs-0.8.30 \
+		env_logger-0.7.1 \
+		field-offset-0.3.4 \
+		fnv-1.0.7 \
+		foreign-types-0.3.2 \
+		foreign-types-shared-0.1.1 \
+		form_urlencoded-1.0.1 \
+		fragile-1.0.0 \
+		fuchsia-cprng-0.1.1 \
+		futf-0.1.4 \
+		futures-0.3.19 \
+		futures-channel-0.3.19 \
+		futures-core-0.3.19 \
+		futures-executor-0.3.19 \
+		futures-io-0.3.19 \
+		futures-macro-0.3.19 \
+		futures-sink-0.3.19 \
+		futures-task-0.3.19 \
+		futures-util-0.3.19 \
+		gdk-0.14.3 \
+		gdk-pixbuf-0.14.0 \
+		gdk-pixbuf-sys-0.14.0 \
+		gdk-sys-0.14.0 \
+		getrandom-0.1.16 \
+		getrandom-0.2.3 \
+		gio-0.14.8 \
+		gio-sys-0.14.0 \
+		glib-0.10.3 \
+		glib-0.14.8 \
+		glib-macros-0.10.1 \
+		glib-macros-0.14.1 \
+		glib-sys-0.10.1 \
+		glib-sys-0.14.0 \
+		glob-0.3.0 \
+		gobject-sys-0.10.0 \
+		gobject-sys-0.14.0 \
+		gstreamer-0.17.4 \
+		gstreamer-base-0.17.2 \
+		gstreamer-base-sys-0.17.0 \
+		gstreamer-player-0.17.0 \
+		gstreamer-player-sys-0.17.0 \
+		gstreamer-sys-0.17.3 \
+		gstreamer-video-0.17.2 \
+		gstreamer-video-sys-0.17.0 \
+		gtk-0.14.3 \
+		gtk-sys-0.14.0 \
+		gtk3-macros-0.14.0 \
+		h2-0.3.9 \
+		hashbrown-0.11.2 \
+		heck-0.3.3 \
+		hermit-abi-0.1.19 \
+		html2text-0.2.1 \
+		html5ever-0.25.1 \
+		http-0.2.6 \
+		http-body-0.4.4 \
+		httparse-1.5.1 \
+		httpdate-1.0.2 \
+		humansize-1.1.1 \
+		humantime-1.3.0 \
+		hyper-0.14.16 \
+		hyper-tls-0.5.0 \
+		ident_case-1.0.1 \
+		idna-0.2.3 \
+		indexmap-1.7.0 \
+		instant-0.1.12 \
+		ipnet-2.3.1 \
+		itertools-0.9.0 \
+		itertools-0.10.3 \
+		itoa-0.4.8 \
+		itoa-1.0.1 \
+		js-sys-0.3.55 \
+		lazy_static-1.4.0 \
+		libc-0.2.112 \
+		libdbus-sys-0.2.2 \
+		libhandy-0.8.0 \
+		libhandy-sys-0.8.0 \
+		libsqlite3-sys-0.22.2 \
+		locale_config-0.2.3 \
+		lock_api-0.4.5 \
+		log-0.4.14 \
+		mac-0.1.1 \
+		maplit-1.0.2 \
+		markup5ever-0.10.1 \
+		markup5ever_rcdom-0.1.0 \
+		matches-0.1.9 \
+		memchr-2.4.1 \
+		memoffset-0.6.5 \
+		migrations_internals-1.4.1 \
+		migrations_macros-1.4.2 \
+		mime-0.3.16 \
+		mime_guess-2.0.3 \
+		mio-0.7.14 \
+		miow-0.3.7 \
+		mpris-player-0.6.1 \
+		muldiv-1.0.0 \
+		native-tls-0.2.8 \
+		never-0.1.0 \
+		new_debug_unreachable-1.0.4 \
+		ntapi-0.3.6 \
+		num-integer-0.1.44 \
+		num-rational-0.4.0 \
+		num-traits-0.2.14 \
+		num_cpus-1.13.1 \
+		once_cell-1.9.0 \
+		open-2.0.2 \
+		openssl-0.10.38 \
+		openssl-probe-0.1.4 \
+		openssl-sys-0.9.72 \
+		output_vt100-0.1.2 \
+		pango-0.14.8 \
+		pango-sys-0.14.0 \
+		parking_lot-0.11.2 \
+		parking_lot_core-0.8.5 \
+		paste-1.0.6 \
+		pathdiff-0.2.1 \
+		percent-encoding-2.1.0 \
+		pest-2.1.3 \
+		phf-0.8.0 \
+		phf_codegen-0.8.0 \
+		phf_generator-0.8.0 \
+		phf_shared-0.8.0 \
+		pin-project-lite-0.2.8 \
+		pin-utils-0.1.0 \
+		pkg-config-0.3.24 \
+		ppv-lite86-0.2.16 \
+		precomputed-hash-0.1.1 \
+		pretty-hex-0.2.1 \
+		pretty_assertions-1.0.0 \
+		pretty_env_logger-0.4.0 \
+		proc-macro-crate-0.1.5 \
+		proc-macro-crate-1.1.0 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.36 \
+		quick-error-1.2.3 \
+		quick-xml-0.22.0 \
+		quote-1.0.14 \
+		r2d2-0.8.9 \
+		rand-0.4.6 \
+		rand-0.7.3 \
+		rand-0.8.4 \
+		rand_chacha-0.2.2 \
+		rand_chacha-0.3.1 \
+		rand_core-0.3.1 \
+		rand_core-0.4.2 \
+		rand_core-0.5.1 \
+		rand_core-0.6.3 \
+		rand_hc-0.2.0 \
+		rand_hc-0.3.1 \
+		rand_pcg-0.2.1 \
+		rayon-1.5.1 \
+		rayon-core-1.9.1 \
+		rdrand-0.4.0 \
+		redox_syscall-0.2.10 \
+		redox_users-0.4.0 \
+		regex-1.5.4 \
+		regex-syntax-0.6.25 \
+		remove_dir_all-0.5.3 \
+		reqwest-0.11.8 \
+		rfc822_sanitizer-0.3.4 \
+		rss-2.0.0 \
+		rustc_version-0.3.3 \
+		ryu-1.0.9 \
+		schannel-0.1.19 \
+		scheduled-thread-pool-0.2.5 \
+		scopeguard-1.1.0 \
+		security-framework-2.4.2 \
+		security-framework-sys-2.4.2 \
+		semver-0.11.0 \
+		semver-parser-0.10.2 \
+		serde-1.0.133 \
+		serde_json-1.0.74 \
+		serde_urlencoded-0.7.0 \
+		siphasher-0.3.7 \
+		slab-0.4.5 \
+		smallvec-1.7.0 \
+		socket2-0.4.2 \
+		string_cache-0.8.2 \
+		string_cache_codegen-0.5.1 \
+		strsim-0.9.3 \
+		strsim-0.10.0 \
+		strum-0.18.0 \
+		strum-0.21.0 \
+		strum_macros-0.18.0 \
+		strum_macros-0.21.1 \
+		syn-1.0.84 \
+		system-deps-1.3.2 \
+		system-deps-3.2.0 \
+		tempdir-0.3.7 \
+		tempfile-3.2.0 \
+		tendril-0.4.2 \
+		termcolor-1.1.2 \
+		thiserror-1.0.30 \
+		thiserror-impl-1.0.30 \
+		time-0.1.43 \
+		tinyvec-1.5.1 \
+		tinyvec_macros-0.1.0 \
+		tokio-1.15.0 \
+		tokio-macros-1.7.0 \
+		tokio-native-tls-0.3.0 \
+		tokio-util-0.6.9 \
+		toml-0.5.8 \
+		tower-service-0.3.1 \
+		tracing-0.1.29 \
+		tracing-core-0.1.21 \
+		try-lock-0.2.3 \
+		ucd-trie-0.1.3 \
+		unicase-2.6.0 \
+		unicode-bidi-0.3.7 \
+		unicode-normalization-0.1.19 \
+		unicode-segmentation-1.8.0 \
+		unicode-width-0.1.9 \
+		unicode-xid-0.2.2 \
+		url-2.2.2 \
+		utf-8-0.7.6 \
+		vcpkg-0.2.15 \
+		version-compare-0.0.10 \
+		version-compare-0.0.11 \
+		version_check-0.9.4 \
+		want-0.3.0 \
+		wasi-0.9.0+wasi-snapshot-preview1 \
+		wasi-0.10.2+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.78 \
+		wasm-bindgen-backend-0.2.78 \
+		wasm-bindgen-futures-0.4.28 \
+		wasm-bindgen-macro-0.2.78 \
+		wasm-bindgen-macro-support-0.2.78 \
+		wasm-bindgen-shared-0.2.78 \
+		web-sys-0.3.55 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		winreg-0.7.0 \
+		xdg-2.4.0 \
+		xml-rs-0.8.4 \
+		xml5ever-0.16.2 \
+		gettext-rs,gettext-sys@git+https://github.com/danigm/gettext-rs?branch=no-gettext\#61938b9f5f1d3bdc31f9839f53fabe5ccf136a78
diff --git a/audio/lewton/Makefile b/audio/lewton/Makefile
index f1258c65f1ea..bdd8dc10cf19 100644
--- a/audio/lewton/Makefile
+++ b/audio/lewton/Makefile
@@ -22,66 +22,6 @@ USE_LDCONFIG=	yes
 GH_ACCOUNT=	RustAudio
 PLIST_SUB=	VERSION=${DISTVERSION:C/-.*//}
 
-CARGO_CRATES=	al-sys-0.6.1 \
-		alto-3.0.4 \
-		autocfg-1.0.0 \
-		byteorder-1.3.2 \
-		bytes-0.4.12 \
-		cc-1.0.50 \
-		cfg-if-0.1.10 \
-		cmake-0.1.42 \
-		curl-0.4.25 \
-		curl-sys-0.4.25 \
-		fuchsia-cprng-0.1.1 \
-		futures-0.1.29 \
-		gcc-0.3.55 \
-		iovec-0.1.4 \
-		lazy_static-0.2.11 \
-		lazy_static-1.4.0 \
-		libc-0.2.66 \
-		libloading-0.5.2 \
-		libz-sys-1.0.25 \
-		log-0.4.8 \
-		maybe-uninit-2.0.0 \
-		ogg-0.8.0 \
-		ogg-sys-0.0.9 \
-		openssl-probe-0.1.2 \
-		openssl-sys-0.9.54 \
-		owning_ref-0.3.3 \
-		parking_lot-0.4.8 \
-		parking_lot_core-0.2.14 \
-		pkg-config-0.3.17 \
-		proc-macro2-1.0.8 \
-		quote-1.0.2 \
-		rand-0.3.23 \
-		rand-0.4.6 \
-		rand_core-0.3.1 \
-		rand_core-0.4.2 \
-		rdrand-0.4.0 \
-		redox_syscall-0.1.56 \
-		rental-0.5.5 \
-		rental-impl-0.5.5 \
-		rustc-serialize-0.3.24 \
-		schannel-0.1.16 \
-		sha2-0.1.2 \
-		smallvec-0.6.13 \
-		socket2-0.3.11 \
-		stable_deref_trait-1.1.1 \
-		syn-1.0.14 \
-		test-assets-0.2.0 \
-		tinyvec-1.0.1 \
-		tinyvec_macros-0.1.0 \
-		tokio-io-0.1.12 \
-		unicode-xid-0.2.0 \
-		vcpkg-0.2.8 \
-		vorbis-0.1.0 \
-		vorbis-encoder-0.1.4 \
-		vorbis-sys-0.0.8 \
-		vorbisfile-sys-0.0.8 \
-		winapi-0.3.8 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-x86_64-pc-windows-gnu-0.4.0
-
 do-build:
 	@${CARGO_CARGO_RUN} cbuild \
 		--verbose \
diff --git a/audio/lewton/Makefile.crates b/audio/lewton/Makefile.crates
new file mode 100644
index 000000000000..3e527dcefbe2
--- /dev/null
+++ b/audio/lewton/Makefile.crates
@@ -0,0 +1,59 @@
+CARGO_CRATES=	al-sys-0.6.1 \
+		alto-3.0.4 \
+		autocfg-1.0.0 \
+		byteorder-1.3.2 \
+		bytes-0.4.12 \
+		cc-1.0.50 \
+		cfg-if-0.1.10 \
+		cmake-0.1.42 \
+		curl-0.4.25 \
+		curl-sys-0.4.25 \
+		fuchsia-cprng-0.1.1 \
+		futures-0.1.29 \
+		gcc-0.3.55 \
+		iovec-0.1.4 \
+		lazy_static-0.2.11 \
+		lazy_static-1.4.0 \
+		libc-0.2.66 \
+		libloading-0.5.2 \
+		libz-sys-1.0.25 \
+		log-0.4.8 \
+		maybe-uninit-2.0.0 \
+		ogg-0.8.0 \
+		ogg-sys-0.0.9 \
+		openssl-probe-0.1.2 \
+		openssl-sys-0.9.54 \
+		owning_ref-0.3.3 \
+		parking_lot-0.4.8 \
+		parking_lot_core-0.2.14 \
+		pkg-config-0.3.17 \
+		proc-macro2-1.0.8 \
+		quote-1.0.2 \
+		rand-0.3.23 \
+		rand-0.4.6 \
+		rand_core-0.3.1 \
+		rand_core-0.4.2 \
+		rdrand-0.4.0 \
+		redox_syscall-0.1.56 \
+		rental-0.5.5 \
+		rental-impl-0.5.5 \
+		rustc-serialize-0.3.24 \
+		schannel-0.1.16 \
+		sha2-0.1.2 \
+		smallvec-0.6.13 \
+		socket2-0.3.11 \
+		stable_deref_trait-1.1.1 \
+		syn-1.0.14 \
+		test-assets-0.2.0 \
+		tinyvec-1.0.1 \
+		tinyvec_macros-0.1.0 \
+		tokio-io-0.1.12 \
+		unicode-xid-0.2.0 \
+		vcpkg-0.2.8 \
+		vorbis-0.1.0 \
+		vorbis-encoder-0.1.4 \
+		vorbis-sys-0.0.8 \
+		vorbisfile-sys-0.0.8 \
+		winapi-0.3.8 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-x86_64-pc-windows-gnu-0.4.0
diff --git a/audio/mousai-devel/Makefile b/audio/mousai-devel/Makefile
index b1b5b791de83..8c1f8dee2beb 100644
--- a/audio/mousai-devel/Makefile
+++ b/audio/mousai-devel/Makefile
@@ -24,150 +24,10 @@ USE_GSTREAMER=	bad good ogg opus pulse
 GH_ACCOUNT=	SeaDve
 GH_PROJECT=	Mousai
 MAKE_ENV=	${CARGO_ENV}
-GLIB_SCHEMAS=	io.github.seadve.Mousai.gschema.xml
-
-CARGO_CRATES=	aho-corasick-0.7.19 \
-		anyhow-1.0.66 \
-		async-trait-0.1.58 \
-		atomic_refcell-0.1.8 \
-		autocfg-1.1.0 \
-		bitflags-1.3.2 \
-		block-0.1.6 \
-		cairo-rs-0.16.1 \
-		cairo-sys-rs-0.16.0 \
-		cc-1.0.74 \
-		cfg-expr-0.11.0 \
-		cfg-if-1.0.0 \
-		ctor-0.1.26 \
-		dbus-0.6.5 \
-		erased-serde-0.3.23 \
-		field-offset-0.3.4 \
-		futures-channel-0.3.25 \
-		futures-core-0.3.25 \
-		futures-executor-0.3.25 \
-		futures-io-0.3.25 \
-		futures-macro-0.3.25 \
-		futures-task-0.3.25 \
-		futures-util-0.3.25 \
-		fuzzy-matcher-0.3.7 \
-		gdk-pixbuf-0.16.0 \
-		gdk-pixbuf-sys-0.16.0 \
-		gdk4-0.5.0 \
-		gdk4-sys-0.5.0 \
-		gettext-rs-0.7.0 \
-		gettext-sys-0.21.3 \
-		ghost-0.1.6 \
-		gio-0.16.2 \
-		gio-sys-0.16.0 \
-		glib-0.15.12 \
-		glib-0.16.2 \
-		glib-macros-0.15.11 \
-		glib-macros-0.16.0 \
-		glib-sys-0.15.10 \
-		glib-sys-0.16.0 \
-		gobject-sys-0.15.10 \
-		gobject-sys-0.16.0 \
-		graphene-rs-0.16.0 \
-		graphene-sys-0.16.0 \
-		gsettings-macro-0.1.14 \
-		gsk4-0.5.0 \
-		gsk4-sys-0.5.0 \
-		gstreamer-0.19.1 \
-		gstreamer-base-0.19.1 \
-		gstreamer-base-sys-0.19.0 \
-		gstreamer-player-0.19.0 \
-		gstreamer-player-sys-0.19.0 \
-		gstreamer-sys-0.19.0 \
-		gstreamer-video-0.19.0 \
-		gstreamer-video-sys-0.19.0 \
-		gtk4-0.5.1 \
-		gtk4-macros-0.5.0 \
-		gtk4-sys-0.5.0 \
-		hashbrown-0.12.3 \
-		heck-0.4.0 \
-		indexmap-1.9.1 \
-		inventory-0.3.2 \
-		itoa-1.0.4 \
-		lazy_static-1.4.0 \
-		libadwaita-0.2.0 \
-		libadwaita-sys-0.2.0 \
-		libc-0.2.137 \
-		libdbus-sys-0.2.2 \
-		libpulse-binding-2.26.0 \
-		libpulse-glib-binding-2.25.1 \
-		libpulse-mainloop-glib-sys-1.19.2 \
-		libpulse-sys-1.19.3 \
-		locale_config-0.3.0 \
-		log-0.4.17 \
-		malloc_buf-0.0.6 \
-		memchr-2.5.0 \
-		memoffset-0.6.5 \
-		mpris-player-0.6.2 \
-		muldiv-1.0.1 \
-		nu-ansi-term-0.46.0 \
-		num-derive-0.3.3 \
-		num-integer-0.1.45 \
-		num-rational-0.4.1 \
-		num-traits-0.2.15 \
-		objc-0.2.7 \
-		objc-foundation-0.1.1 \
-		objc_id-0.1.1 \
-		once_cell-1.16.0 \
-		option-operations-0.5.0 \
-		overload-0.1.1 \
-		pango-0.16.0 \
-		pango-sys-0.16.0 \
-		paste-1.0.9 \
-		pest-2.4.0 \
-		pin-project-lite-0.2.9 \
-		pin-utils-0.1.0 \
-		pkg-config-0.3.26 \
-		pretty-hex-0.3.0 \
-		proc-macro-crate-1.2.1 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.47 \
-		quick-xml-0.25.0 \
-		quote-1.0.21 \
-		regex-1.6.0 \
-		regex-syntax-0.6.27 \
-		rustc_version-0.3.3 \
-		ryu-1.0.11 \
-		semver-0.11.0 \
-		semver-parser-0.10.2 \
-		serde-1.0.147 \
-		serde_derive-1.0.147 \
-		serde_json-1.0.87 \
-		sharded-slab-0.1.4 \
-		slab-0.4.7 \
-		smallvec-1.10.0 \
-		soup3-0.3.1 \
-		soup3-sys-0.3.1 \
-		syn-1.0.103 \
-		system-deps-6.0.3 \
-		temp-dir-0.1.11 \
-		thiserror-1.0.37 \
-		thiserror-impl-1.0.37 \
-		thread_local-1.1.4 \
-		toml-0.5.9 \
-		tracing-0.1.37 \
-		tracing-attributes-0.1.23 \
-		tracing-core-0.1.30 \
-		tracing-log-0.1.3 \
-		tracing-subscriber-0.3.16 \
-		typetag-0.2.3 \
-		typetag-impl-0.2.3 \
-		ucd-trie-0.1.5 \
-		unicode-ident-1.0.5 \
-		valuable-0.1.0 \
-		version-compare-0.1.0 \
-		version_check-0.9.4 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-x86_64-pc-windows-gnu-0.4.0
 CARGO_BUILD=	no
 CARGO_INSTALL=	no
 CARGO_TEST=	no
+GLIB_SCHEMAS=	io.github.seadve.Mousai.gschema.xml
 
 post-patch:
 	@${REINPLACE_CMD} -e '/update_desktop_database/d' \
diff --git a/audio/mousai-devel/Makefile.crates b/audio/mousai-devel/Makefile.crates
new file mode 100644
index 000000000000..95410ec9ab3c
--- /dev/null
+++ b/audio/mousai-devel/Makefile.crates
@@ -0,0 +1,139 @@
+CARGO_CRATES=	aho-corasick-0.7.19 \
+		anyhow-1.0.66 \
+		async-trait-0.1.58 \
+		atomic_refcell-0.1.8 \
+		autocfg-1.1.0 \
+		bitflags-1.3.2 \
+		block-0.1.6 \
+		cairo-rs-0.16.1 \
+		cairo-sys-rs-0.16.0 \
+		cc-1.0.74 \
+		cfg-expr-0.11.0 \
+		cfg-if-1.0.0 \
+		ctor-0.1.26 \
+		dbus-0.6.5 \
+		erased-serde-0.3.23 \
+		field-offset-0.3.4 \
+		futures-channel-0.3.25 \
+		futures-core-0.3.25 \
+		futures-executor-0.3.25 \
+		futures-io-0.3.25 \
+		futures-macro-0.3.25 \
+		futures-task-0.3.25 \
+		futures-util-0.3.25 \
+		fuzzy-matcher-0.3.7 \
+		gdk-pixbuf-0.16.0 \
+		gdk-pixbuf-sys-0.16.0 \
+		gdk4-0.5.0 \
+		gdk4-sys-0.5.0 \
+		gettext-rs-0.7.0 \
+		gettext-sys-0.21.3 \
+		ghost-0.1.6 \
+		gio-0.16.2 \
+		gio-sys-0.16.0 \
+		glib-0.15.12 \
+		glib-0.16.2 \
+		glib-macros-0.15.11 \
+		glib-macros-0.16.0 \
+		glib-sys-0.15.10 \
+		glib-sys-0.16.0 \
+		gobject-sys-0.15.10 \
+		gobject-sys-0.16.0 \
+		graphene-rs-0.16.0 \
+		graphene-sys-0.16.0 \
+		gsettings-macro-0.1.14 \
+		gsk4-0.5.0 \
+		gsk4-sys-0.5.0 \
+		gstreamer-0.19.1 \
+		gstreamer-base-0.19.1 \
+		gstreamer-base-sys-0.19.0 \
+		gstreamer-player-0.19.0 \
+		gstreamer-player-sys-0.19.0 \
+		gstreamer-sys-0.19.0 \
+		gstreamer-video-0.19.0 \
+		gstreamer-video-sys-0.19.0 \
+		gtk4-0.5.1 \
+		gtk4-macros-0.5.0 \
+		gtk4-sys-0.5.0 \
+		hashbrown-0.12.3 \
+		heck-0.4.0 \
+		indexmap-1.9.1 \
+		inventory-0.3.2 \
+		itoa-1.0.4 \
+		lazy_static-1.4.0 \
+		libadwaita-0.2.0 \
+		libadwaita-sys-0.2.0 \
+		libc-0.2.137 \
+		libdbus-sys-0.2.2 \
+		libpulse-binding-2.26.0 \
+		libpulse-glib-binding-2.25.1 \
+		libpulse-mainloop-glib-sys-1.19.2 \
+		libpulse-sys-1.19.3 \
+		locale_config-0.3.0 \
+		log-0.4.17 \
+		malloc_buf-0.0.6 \
+		memchr-2.5.0 \
+		memoffset-0.6.5 \
+		mpris-player-0.6.2 \
+		muldiv-1.0.1 \
+		nu-ansi-term-0.46.0 \
+		num-derive-0.3.3 \
+		num-integer-0.1.45 \
+		num-rational-0.4.1 \
+		num-traits-0.2.15 \
+		objc-0.2.7 \
+		objc-foundation-0.1.1 \
+		objc_id-0.1.1 \
+		once_cell-1.16.0 \
+		option-operations-0.5.0 \
+		overload-0.1.1 \
+		pango-0.16.0 \
+		pango-sys-0.16.0 \
+		paste-1.0.9 \
+		pest-2.4.0 \
+		pin-project-lite-0.2.9 \
+		pin-utils-0.1.0 \
+		pkg-config-0.3.26 \
+		pretty-hex-0.3.0 \
+		proc-macro-crate-1.2.1 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.47 \
+		quick-xml-0.25.0 \
+		quote-1.0.21 \
+		regex-1.6.0 \
+		regex-syntax-0.6.27 \
+		rustc_version-0.3.3 \
+		ryu-1.0.11 \
+		semver-0.11.0 \
+		semver-parser-0.10.2 \
+		serde-1.0.147 \
+		serde_derive-1.0.147 \
+		serde_json-1.0.87 \
+		sharded-slab-0.1.4 \
+		slab-0.4.7 \
+		smallvec-1.10.0 \
+		soup3-0.3.1 \
+		soup3-sys-0.3.1 \
+		syn-1.0.103 \
+		system-deps-6.0.3 \
+		temp-dir-0.1.11 \
+		thiserror-1.0.37 \
+		thiserror-impl-1.0.37 \
+		thread_local-1.1.4 \
+		toml-0.5.9 \
+		tracing-0.1.37 \
+		tracing-attributes-0.1.23 \
+		tracing-core-0.1.30 \
+		tracing-log-0.1.3 \
+		tracing-subscriber-0.3.16 \
+		typetag-0.2.3 \
+		typetag-impl-0.2.3 \
+		ucd-trie-0.1.5 \
+		unicode-ident-1.0.5 \
+		valuable-0.1.0 \
+		version-compare-0.1.0 \
+		version_check-0.9.4 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-x86_64-pc-windows-gnu-0.4.0
diff --git a/audio/shortwave/Makefile b/audio/shortwave/Makefile
index 79558baad981..82c85caeb8d2 100644
--- a/audio/shortwave/Makefile
+++ b/audio/shortwave/Makefile
@@ -22,302 +22,10 @@ GL_ACCOUNT=	World
 GL_PROJECT=	Shortwave
 GL_COMMIT=	de062d5f2a2f395bb2c3f8149793d4203593e912
 MAKE_ENV=	${CARGO_ENV}
-GLIB_SCHEMAS=	de.haeckerfelix.Shortwave.gschema.xml
-
-CARGO_CRATES=	Inflector-0.11.4 \
-		addr2line-0.17.0 \
-		adler-1.0.2 \
-		aho-corasick-0.7.19 \
-		android_system_properties-0.1.5 \
-		anyhow-1.0.65 \
-		array-init-2.0.1 \
-		async-channel-1.7.1 \
-		async-executor-1.4.1 \
-		async-global-executor-2.3.0 \
-		async-io-1.9.0 \
-		async-lock-2.5.0 \
-		async-std-1.12.0 \
-		async-std-resolver-0.20.4 \
-		async-task-4.3.0 \
-		async-trait-0.1.57 \
-		atomic-waker-1.0.0 \
-		atty-0.2.14 \
-		autocfg-1.1.0 \
-		backtrace-0.3.66 \
-		bitflags-1.3.2 \
-		block-0.1.6 \
-		blocking-1.2.0 \
-		bumpalo-3.11.0 \
-		byteorder-1.4.3 \
-		bytes-1.2.1 \
-		c_linked_list-1.1.1 \
-		cache-padded-1.2.0 \
-		cairo-rs-0.15.12 \
-		cairo-sys-rs-0.15.1 \
-		castaway-0.1.2 \
-		cc-1.0.73 \
-		cfg-expr-0.10.3 \
-		cfg-if-0.1.10 \
-		cfg-if-1.0.0 \
-		chrono-0.4.22 \
-		codespan-reporting-0.11.1 \
-		concurrent-queue-1.2.4 \
-		core-foundation-sys-0.8.3 \
-		crossbeam-utils-0.8.12 \
-		ctor-0.1.23 \
-		curl-0.4.44 \
-		curl-sys-0.4.56+curl-7.83.1 \
-		cxx-1.0.78 \
-		cxx-build-1.0.78 \
-		cxxbridge-flags-1.0.78 \
-		cxxbridge-macro-1.0.78 \
-		data-encoding-2.3.2 \
-		dbus-0.6.5 \
-		diesel-1.4.8 \
-		diesel_derives-1.4.1 \
-		diesel_migrations-1.4.0 \
-		dns-parser-0.8.0 \
-		either-1.8.0 \
-		encoding_rs-0.8.31 \
-		enum-as-inner-0.3.4 \
-		env_logger-0.7.1 \
-		error-chain-0.12.4 \
-		event-listener-2.5.3 \
-		fastrand-1.8.0 \
-		field-offset-0.3.4 \
-		fnv-1.0.7 \
-		foreign-types-0.3.2 \
-		foreign-types-shared-0.1.1 \
-		form_urlencoded-1.1.0 \
-		fuchsia-zircon-0.3.3 \
-		fuchsia-zircon-sys-0.3.3 \
-		futures-0.3.24 \
-		futures-channel-0.3.24 \
-		futures-core-0.3.24 \
-		futures-executor-0.3.24 \
-		futures-io-0.3.24 \
-		futures-lite-1.12.0 \
-		futures-macro-0.3.24 \
-		futures-sink-0.3.24 \
-		futures-task-0.3.24 \
-		futures-util-0.3.24 \
-		gcc-0.3.55 \
-		gdk-pixbuf-0.15.11 \
-		gdk-pixbuf-sys-0.15.10 \
-		gdk4-0.4.8 \
-		gdk4-sys-0.4.8 \
-		get_if_addrs-0.5.3 \
-		get_if_addrs-sys-0.1.1 \
-		getrandom-0.2.7 \
-		gettext-rs-0.7.0 \
-		gettext-sys-0.21.3 \
-		gimli-0.26.2 \
-		gio-0.15.12 \
-		gio-sys-0.15.10 \
-		glib-0.15.12 \
-		glib-macros-0.15.11 \
-		glib-sys-0.15.10 \
-		gloo-timers-0.2.4 \
-		gobject-sys-0.15.10 \
-		graphene-rs-0.15.1 \
-		graphene-sys-0.15.10 \
-		gsk4-0.4.8 \
-		gsk4-sys-0.4.8 \
-		gstreamer-0.18.8 \
-		gstreamer-audio-0.18.7 \
-		gstreamer-audio-sys-0.18.3 \
-		gstreamer-base-0.18.0 \
-		gstreamer-base-sys-0.18.0 \
-		gstreamer-sys-0.18.0 \
-		gtk-macros-0.3.0 \
-		gtk4-0.4.8 \
-		gtk4-macros-0.4.8 \
-		gtk4-sys-0.4.8 \
-		hashbrown-0.12.3 \
-		heck-0.3.3 \
-		heck-0.4.0 \
-		hermit-abi-0.1.19 \
-		hostname-0.3.1 \
-		http-0.2.8 \
-		humantime-1.3.0 \
-		iana-time-zone-0.1.51 \
-		iana-time-zone-haiku-0.1.0 \
-		idna-0.2.3 \
-		idna-0.3.0 \
-		indexmap-1.9.1 \
-		instant-0.1.12 \
-		iovec-0.1.4 \
-		ipconfig-0.2.2 \
-		ipnet-2.5.0 \
-		isahc-1.7.2 \
-		itoa-1.0.4 \
-		js-sys-0.3.60 \
-		kernel32-sys-0.2.2 \
-		kv-log-macro-1.0.7 \
-		lazy_static-1.4.0 \
-		libadwaita-0.2.0-alpha.3 \
-		libadwaita-sys-0.2.0-alpha.3 \
-		libc-0.2.134 \
-		libdbus-sys-0.2.2 \
-		libnghttp2-sys-0.1.7+1.45.0 \
-		libshumate-0.1.1 \
-		libshumate-sys-0.1.1 \
-		libsqlite3-sys-0.22.2 \
-		libz-sys-1.1.8 \
-		link-cplusplus-1.0.7 \
-		linked-hash-map-0.5.6 \
-		locale_config-0.3.0 \
-		lock_api-0.4.9 \
-		log-0.4.17 \
-		lru-cache-0.1.2 \
-		malloc_buf-0.0.6 \
-		match_cfg-0.1.0 \
-		matches-0.1.9 \
-		mdns-0.3.2 \
-		memchr-2.5.0 \
-		memoffset-0.6.5 \
-		migrations_internals-1.4.1 \
-		migrations_macros-1.4.2 \
-		mime-0.3.16 \
-		miniz_oxide-0.5.4 \
-		mio-0.6.23 \
-		miow-0.2.2 \
-		mpris-player-0.6.2 \
-		muldiv-1.0.0 \
-		net2-0.2.37 \
-		num-integer-0.1.45 \
-		num-rational-0.4.1 \
-		num-traits-0.2.15 \
-		objc-0.2.7 \
-		objc-foundation-0.1.1 \
-		objc_id-0.1.1 \
-		object-0.29.0 \
-		once_cell-1.15.0 \
-		openssl-0.10.42 \
-		openssl-macros-0.1.0 \
-		openssl-probe-0.1.5 \
-		openssl-sys-0.9.76 \
-		option-operations-0.4.1 \
-		pango-0.15.10 \
-		pango-sys-0.15.10 \
-		parking-2.0.0 \
-		parking_lot-0.11.2 \
-		parking_lot-0.12.1 \
-		parking_lot_core-0.8.5 \
-		parking_lot_core-0.9.3 \
-		paste-1.0.9 \
-		percent-encoding-2.2.0 \
-		pest-2.4.0 \
-		pin-project-1.0.12 \
-		pin-project-internal-1.0.12 \
-		pin-project-lite-0.2.9 \
-		pin-utils-0.1.0 \
-		pkg-config-0.3.25 \
-		polling-2.3.0 \
-		ppv-lite86-0.2.16 \
-		pretty-hex-0.3.0 \
-		pretty_env_logger-0.4.0 \
-		proc-macro-crate-1.2.1 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.46 \
-		protobuf-2.20.0 \
-		protobuf-codegen-2.20.0 \
-		protoc-2.20.0 \
-		protoc-rust-2.20.0 \
-		quick-error-1.2.3 \
-		quick-xml-0.22.0 \
-		quote-1.0.21 \
-		r2d2-0.8.10 \
-		rand-0.8.5 \
-		rand_chacha-0.3.1 \
-		rand_core-0.6.4 \
-		redox_syscall-0.2.16 \
-		regex-1.6.0 \
-		regex-syntax-0.6.27 \
-		remove_dir_all-0.5.3 \
-		resolv-conf-0.7.0 \
-		rust_cast-0.16.0 \
-		rustc-demangle-0.1.21 \
-		rustc_version-0.3.3 \
-		ryu-1.0.11 \
-		sanitize-filename-0.3.0 \
-		schannel-0.1.20 \
-		scheduled-thread-pool-0.2.6 \
-		scopeguard-1.1.0 \
-		scratch-1.0.2 \
-		semver-0.11.0 \
-		semver-parser-0.10.2 \
-		serde-1.0.145 \
-		serde_derive-1.0.145 \
-		serde_json-1.0.85 \
-		serde_urlencoded-0.7.1 \
-		slab-0.4.7 \
-		sluice-0.5.5 \
-		smallvec-1.10.0 \
-		socket2-0.3.19 \
-		socket2-0.4.7 \
-		strum-0.20.0 \
-		strum_macros-0.20.1 \
-		syn-1.0.102 \
-		system-deps-6.0.2 \
-		temp-dir-0.1.11 \
-		tempfile-3.3.0 \
-		termcolor-1.1.3 \
-		thiserror-1.0.37 \
-		thiserror-impl-1.0.37 \
-		time-0.1.44 \
-		tinyvec-1.6.0 \
-		tinyvec_macros-0.1.0 \
-		toml-0.5.9 \
-		tracing-0.1.37 \
-		tracing-attributes-0.1.23 \
-		tracing-core-0.1.30 \
-		tracing-futures-0.2.5 \
-		trust-dns-proto-0.20.4 \
-		trust-dns-resolver-0.20.4 \
-		ucd-trie-0.1.5 \
-		unicode-bidi-0.3.8 \
-		unicode-ident-1.0.4 \
-		unicode-normalization-0.1.22 \
-		unicode-segmentation-1.10.0 \
-		unicode-width-0.1.10 \
-		url-2.3.1 \
-		uuid-0.8.2 \
-		value-bag-1.0.0-alpha.9 \
-		vcpkg-0.2.15 \
-		version-compare-0.1.0 \
-		version_check-0.9.4 \
-		waker-fn-1.1.0 \
-		wasi-0.10.0+wasi-snapshot-preview1 \
-		wasi-0.11.0+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.83 \
-		wasm-bindgen-backend-0.2.83 \
-		wasm-bindgen-futures-0.4.33 \
-		wasm-bindgen-macro-0.2.83 \
-		wasm-bindgen-macro-support-0.2.83 \
-		wasm-bindgen-shared-0.2.83 \
-		web-sys-0.3.60 \
-		wepoll-ffi-0.1.2 \
-		which-4.3.0 \
-		widestring-0.4.3 \
-		winapi-0.2.8 \
-		winapi-0.3.9 \
-		winapi-build-0.1.1 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		windows-sys-0.36.1 \
-		windows_aarch64_msvc-0.36.1 \
-		windows_i686_gnu-0.36.1 \
-		windows_i686_msvc-0.36.1 \
-		windows_x86_64_gnu-0.36.1 \
-		windows_x86_64_msvc-0.36.1 \
-		winreg-0.6.2 \
-		ws2_32-sys-0.2.1
 CARGO_BUILD=	no
 CARGO_INSTALL=	no
 CARGO_TEST=	no
+GLIB_SCHEMAS=	de.haeckerfelix.Shortwave.gschema.xml
 
 OPTIONS_DEFINE=	PULSEAUDIO
 OPTIONS_DEFAULT=PULSEAUDIO
diff --git a/audio/shortwave/Makefile.crates b/audio/shortwave/Makefile.crates
new file mode 100644
index 000000000000..ba890c1e5acc
--- /dev/null
+++ b/audio/shortwave/Makefile.crates
@@ -0,0 +1,291 @@
+CARGO_CRATES=	Inflector-0.11.4 \
+		addr2line-0.17.0 \
+		adler-1.0.2 \
+		aho-corasick-0.7.19 \
+		android_system_properties-0.1.5 \
+		anyhow-1.0.65 \
+		array-init-2.0.1 \
+		async-channel-1.7.1 \
+		async-executor-1.4.1 \
+		async-global-executor-2.3.0 \
+		async-io-1.9.0 \
+		async-lock-2.5.0 \
+		async-std-1.12.0 \
+		async-std-resolver-0.20.4 \
+		async-task-4.3.0 \
+		async-trait-0.1.57 \
+		atomic-waker-1.0.0 \
+		atty-0.2.14 \
+		autocfg-1.1.0 \
+		backtrace-0.3.66 \
+		bitflags-1.3.2 \
+		block-0.1.6 \
+		blocking-1.2.0 \
+		bumpalo-3.11.0 \
+		byteorder-1.4.3 \
+		bytes-1.2.1 \
+		c_linked_list-1.1.1 \
+		cache-padded-1.2.0 \
+		cairo-rs-0.15.12 \
+		cairo-sys-rs-0.15.1 \
+		castaway-0.1.2 \
+		cc-1.0.73 \
+		cfg-expr-0.10.3 \
+		cfg-if-0.1.10 \
+		cfg-if-1.0.0 \
+		chrono-0.4.22 \
+		codespan-reporting-0.11.1 \
+		concurrent-queue-1.2.4 \
+		core-foundation-sys-0.8.3 \
+		crossbeam-utils-0.8.12 \
+		ctor-0.1.23 \
+		curl-0.4.44 \
+		curl-sys-0.4.56+curl-7.83.1 \
+		cxx-1.0.78 \
+		cxx-build-1.0.78 \
+		cxxbridge-flags-1.0.78 \
+		cxxbridge-macro-1.0.78 \
+		data-encoding-2.3.2 \
+		dbus-0.6.5 \
+		diesel-1.4.8 \
+		diesel_derives-1.4.1 \
+		diesel_migrations-1.4.0 \
+		dns-parser-0.8.0 \
+		either-1.8.0 \
+		encoding_rs-0.8.31 \
+		enum-as-inner-0.3.4 \
+		env_logger-0.7.1 \
+		error-chain-0.12.4 \
+		event-listener-2.5.3 \
+		fastrand-1.8.0 \
+		field-offset-0.3.4 \
+		fnv-1.0.7 \
+		foreign-types-0.3.2 \
+		foreign-types-shared-0.1.1 \
+		form_urlencoded-1.1.0 \
+		fuchsia-zircon-0.3.3 \
+		fuchsia-zircon-sys-0.3.3 \
+		futures-0.3.24 \
+		futures-channel-0.3.24 \
+		futures-core-0.3.24 \
+		futures-executor-0.3.24 \
+		futures-io-0.3.24 \
+		futures-lite-1.12.0 \
+		futures-macro-0.3.24 \
+		futures-sink-0.3.24 \
+		futures-task-0.3.24 \
+		futures-util-0.3.24 \
+		gcc-0.3.55 \
+		gdk-pixbuf-0.15.11 \
+		gdk-pixbuf-sys-0.15.10 \
+		gdk4-0.4.8 \
+		gdk4-sys-0.4.8 \
+		get_if_addrs-0.5.3 \
+		get_if_addrs-sys-0.1.1 \
+		getrandom-0.2.7 \
+		gettext-rs-0.7.0 \
+		gettext-sys-0.21.3 \
+		gimli-0.26.2 \
+		gio-0.15.12 \
+		gio-sys-0.15.10 \
+		glib-0.15.12 \
+		glib-macros-0.15.11 \
+		glib-sys-0.15.10 \
+		gloo-timers-0.2.4 \
+		gobject-sys-0.15.10 \
+		graphene-rs-0.15.1 \
+		graphene-sys-0.15.10 \
+		gsk4-0.4.8 \
+		gsk4-sys-0.4.8 \
+		gstreamer-0.18.8 \
+		gstreamer-audio-0.18.7 \
+		gstreamer-audio-sys-0.18.3 \
+		gstreamer-base-0.18.0 \
+		gstreamer-base-sys-0.18.0 \
+		gstreamer-sys-0.18.0 \
+		gtk-macros-0.3.0 \
+		gtk4-0.4.8 \
+		gtk4-macros-0.4.8 \
+		gtk4-sys-0.4.8 \
+		hashbrown-0.12.3 \
+		heck-0.3.3 \
+		heck-0.4.0 \
+		hermit-abi-0.1.19 \
+		hostname-0.3.1 \
+		http-0.2.8 \
+		humantime-1.3.0 \
+		iana-time-zone-0.1.51 \
+		iana-time-zone-haiku-0.1.0 \
+		idna-0.2.3 \
+		idna-0.3.0 \
+		indexmap-1.9.1 \
+		instant-0.1.12 \
+		iovec-0.1.4 \
+		ipconfig-0.2.2 \
+		ipnet-2.5.0 \
+		isahc-1.7.2 \
+		itoa-1.0.4 \
+		js-sys-0.3.60 \
+		kernel32-sys-0.2.2 \
+		kv-log-macro-1.0.7 \
+		lazy_static-1.4.0 \
+		libadwaita-0.2.0-alpha.3 \
+		libadwaita-sys-0.2.0-alpha.3 \
+		libc-0.2.134 \
+		libdbus-sys-0.2.2 \
+		libnghttp2-sys-0.1.7+1.45.0 \
+		libshumate-0.1.1 \
+		libshumate-sys-0.1.1 \
+		libsqlite3-sys-0.22.2 \
+		libz-sys-1.1.8 \
+		link-cplusplus-1.0.7 \
+		linked-hash-map-0.5.6 \
+		locale_config-0.3.0 \
+		lock_api-0.4.9 \
+		log-0.4.17 \
+		lru-cache-0.1.2 \
+		malloc_buf-0.0.6 \
+		match_cfg-0.1.0 \
+		matches-0.1.9 \
+		mdns-0.3.2 \
+		memchr-2.5.0 \
+		memoffset-0.6.5 \
+		migrations_internals-1.4.1 \
+		migrations_macros-1.4.2 \
+		mime-0.3.16 \
+		miniz_oxide-0.5.4 \
+		mio-0.6.23 \
+		miow-0.2.2 \
+		mpris-player-0.6.2 \
+		muldiv-1.0.0 \
+		net2-0.2.37 \
+		num-integer-0.1.45 \
+		num-rational-0.4.1 \
+		num-traits-0.2.15 \
+		objc-0.2.7 \
+		objc-foundation-0.1.1 \
+		objc_id-0.1.1 \
+		object-0.29.0 \
+		once_cell-1.15.0 \
+		openssl-0.10.42 \
+		openssl-macros-0.1.0 \
+		openssl-probe-0.1.5 \
+		openssl-sys-0.9.76 \
+		option-operations-0.4.1 \
+		pango-0.15.10 \
+		pango-sys-0.15.10 \
+		parking-2.0.0 \
+		parking_lot-0.11.2 \
+		parking_lot-0.12.1 \
+		parking_lot_core-0.8.5 \
+		parking_lot_core-0.9.3 \
+		paste-1.0.9 \
+		percent-encoding-2.2.0 \
+		pest-2.4.0 \
+		pin-project-1.0.12 \
+		pin-project-internal-1.0.12 \
+		pin-project-lite-0.2.9 \
+		pin-utils-0.1.0 \
+		pkg-config-0.3.25 \
+		polling-2.3.0 \
+		ppv-lite86-0.2.16 \
+		pretty-hex-0.3.0 \
+		pretty_env_logger-0.4.0 \
+		proc-macro-crate-1.2.1 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.46 \
+		protobuf-2.20.0 \
+		protobuf-codegen-2.20.0 \
+		protoc-2.20.0 \
+		protoc-rust-2.20.0 \
+		quick-error-1.2.3 \
+		quick-xml-0.22.0 \
+		quote-1.0.21 \
+		r2d2-0.8.10 \
+		rand-0.8.5 \
+		rand_chacha-0.3.1 \
+		rand_core-0.6.4 \
+		redox_syscall-0.2.16 \
+		regex-1.6.0 \
+		regex-syntax-0.6.27 \
+		remove_dir_all-0.5.3 \
+		resolv-conf-0.7.0 \
+		rust_cast-0.16.0 \
+		rustc-demangle-0.1.21 \
+		rustc_version-0.3.3 \
+		ryu-1.0.11 \
+		sanitize-filename-0.3.0 \
+		schannel-0.1.20 \
+		scheduled-thread-pool-0.2.6 \
+		scopeguard-1.1.0 \
+		scratch-1.0.2 \
+		semver-0.11.0 \
+		semver-parser-0.10.2 \
+		serde-1.0.145 \
+		serde_derive-1.0.145 \
+		serde_json-1.0.85 \
+		serde_urlencoded-0.7.1 \
+		slab-0.4.7 \
+		sluice-0.5.5 \
+		smallvec-1.10.0 \
+		socket2-0.3.19 \
+		socket2-0.4.7 \
+		strum-0.20.0 \
+		strum_macros-0.20.1 \
+		syn-1.0.102 \
+		system-deps-6.0.2 \
+		temp-dir-0.1.11 \
+		tempfile-3.3.0 \
+		termcolor-1.1.3 \
+		thiserror-1.0.37 \
+		thiserror-impl-1.0.37 \
+		time-0.1.44 \
+		tinyvec-1.6.0 \
+		tinyvec_macros-0.1.0 \
+		toml-0.5.9 \
+		tracing-0.1.37 \
+		tracing-attributes-0.1.23 \
+		tracing-core-0.1.30 \
+		tracing-futures-0.2.5 \
+		trust-dns-proto-0.20.4 \
+		trust-dns-resolver-0.20.4 \
+		ucd-trie-0.1.5 \
+		unicode-bidi-0.3.8 \
+		unicode-ident-1.0.4 \
+		unicode-normalization-0.1.22 \
+		unicode-segmentation-1.10.0 \
+		unicode-width-0.1.10 \
+		url-2.3.1 \
+		uuid-0.8.2 \
+		value-bag-1.0.0-alpha.9 \
+		vcpkg-0.2.15 \
+		version-compare-0.1.0 \
+		version_check-0.9.4 \
+		waker-fn-1.1.0 \
+		wasi-0.10.0+wasi-snapshot-preview1 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.83 \
+		wasm-bindgen-backend-0.2.83 \
+		wasm-bindgen-futures-0.4.33 \
+		wasm-bindgen-macro-0.2.83 \
+		wasm-bindgen-macro-support-0.2.83 \
+		wasm-bindgen-shared-0.2.83 \
+		web-sys-0.3.60 \
+		wepoll-ffi-0.1.2 \
+		which-4.3.0 \
+		widestring-0.4.3 \
+		winapi-0.2.8 \
+		winapi-0.3.9 \
+		winapi-build-0.1.1 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		windows-sys-0.36.1 \
+		windows_aarch64_msvc-0.36.1 \
+		windows_i686_gnu-0.36.1 \
+		windows_i686_msvc-0.36.1 \
+		windows_x86_64_gnu-0.36.1 \
+		windows_x86_64_msvc-0.36.1 \
+		winreg-0.6.2 \
+		ws2_32-sys-0.2.1
diff --git a/deskutils/health/Makefile b/deskutils/health/Makefile
index 2075a193238b..d4a20cda8973 100644
--- a/deskutils/health/Makefile
+++ b/deskutils/health/Makefile
@@ -26,208 +26,10 @@ GL_ACCOUNT=	World
 GL_PROJECT=	Health
 GL_COMMIT=	d664384370bb55f0e46a78da094c567a5a7e97c6
 MAKE_ENV=	${CARGO_ENV}
-GLIB_SCHEMAS=	dev.Cogitri.Health.gschema.xml
-
-CARGO_CRATES=	adler-1.0.2 \
-		aead-0.4.3 \
-		aho-corasick-0.7.18 \
-		anyhow-1.0.58 \
-		async-trait-0.1.56 \
-		autocfg-1.1.0 \
-		base64-0.13.0 \
-		bit-set-0.5.2 \
-		bit-vec-0.6.3 \
-		bitflags-1.3.2 \
-		block-0.1.6 \
-		block-buffer-0.10.2 \
-		bstr-0.2.17 \
-		bumpalo-3.10.0 \
-		bytes-1.2.0 \
-		cairo-rs-0.15.12 \
-		cairo-sys-rs-0.15.1 \
-		cc-1.0.73 \
-		cfg-expr-0.10.3 \
-		cfg-if-1.0.0 \
-		chacha20-0.8.2 \
-		chacha20poly1305-0.9.1 \
-		chrono-0.4.19 \
-		chunked_transfer-1.4.0 \
-		cipher-0.3.0 \
-		cpufeatures-0.2.2 \
-		crc32fast-1.3.2 \
-		crypto-common-0.1.6 \
-		csv-1.1.6 \
-		csv-core-0.1.10 \
-		darling-0.14.1 \
-		darling_core-0.14.1 \
-		darling_macro-0.14.1 \
-		delegate-0.7.0 \
-		derive_builder-0.11.2 \
-		derive_builder_core-0.11.2 \
-		derive_builder_macro-0.11.2 \
-		digest-0.10.3 \
-		dyn-clonable-0.9.0 \
-		dyn-clonable-impl-0.9.0 \
-		dyn-clone-1.0.8 \
-		easy-ext-1.0.0 \
-		either-1.7.0 \
-		fancy-regex-0.8.0 \
-		fastrand-1.7.0 \
-		field-offset-0.3.4 \
-		flate2-1.0.24 \
-		float_eq-1.0.0 \
-		fnv-1.0.7 \
-		form_urlencoded-1.0.1 \
-		futures-channel-0.3.21 \
-		futures-core-0.3.21 \
-		futures-executor-0.3.21 \
-		futures-io-0.3.21 \
-		futures-task-0.3.21 \
-		futures-util-0.3.21 \
-		gdk-pixbuf-0.15.11 \
-		gdk-pixbuf-sys-0.15.10 \
-		gdk4-0.4.8 \
-		gdk4-sys-0.4.8 \
-		generic-array-0.14.5 \
-		getrandom-0.2.7 \
-		gettext-rs-0.7.0 \
-		gettext-sys-0.21.3 \
-		gio-0.15.12 \
-		gio-sys-0.15.10 \
-		glib-0.15.12 \
-		glib-macros-0.15.11 \
-		glib-sys-0.15.10 \
-		glob-0.3.0 \
-		gobject-sys-0.15.10 \
-		graphene-rs-0.15.1 \
-		graphene-sys-0.15.10 \
-		gsk4-0.4.8 \
-		gsk4-sys-0.4.8 \
-		gtk-macros-0.3.0 \
-		gtk4-0.4.8 \
-		gtk4-macros-0.4.8 \
-		gtk4-sys-0.4.8 \
-		heck-0.4.0 \
-		http-0.2.8 \
-		ident_case-1.0.1 \
-		idna-0.2.3 \
-		instant-0.1.12 \
-		itertools-0.10.3 \
-		itoa-0.4.8 \
-		itoa-1.0.2 \
-		js-sys-0.3.58 \
-		lazy_static-1.4.0 \
-		libadwaita-0.1.1 \
-		libadwaita-sys-0.1.0 \
-		libc-0.2.126 \
-		libsecret-0.1.4 \
-		libsecret-sys-0.1.4 \
-		locale_config-0.3.0 \
-		log-0.4.17 \
-		malloc_buf-0.0.6 \
-		matches-0.1.9 \
-		memchr-2.5.0 \
-		memoffset-0.6.5 \
-		miniz_oxide-0.5.3 \
-		num-derive-0.3.3 \
-		num-integer-0.1.45 \
-		num-traits-0.2.15 \
-		num_threads-0.1.6 \
-		oauth2-4.2.3 \
-		objc-0.2.7 \
-		objc-foundation-0.1.1 \
-		objc_id-0.1.1 \
-		once_cell-1.13.0 \
-		opaque-debug-0.3.0 \
-		pango-0.15.10 \
-		pango-sys-0.15.10 \
-		pangocairo-0.15.1 \
-		pangocairo-sys-0.15.1 \
-		paste-1.0.7 \
-		percent-encoding-2.1.0 \
-		pest-2.1.3 \
-		pin-project-lite-0.2.9 \
-		pin-utils-0.1.0 \
-		pkg-config-0.3.25 \
-		poly1305-0.7.2 \
-		ppv-lite86-0.2.16 \
-		proc-macro-crate-1.1.3 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.40 \
-		quick-error-2.0.1 \
-		quick-xml-0.22.0 \
-		quote-1.0.20 \
-		rand-0.8.5 \
-		rand_chacha-0.3.1 \
-		rand_core-0.6.3 \
-		redox_syscall-0.2.13 \
-		regex-1.6.0 \
-		regex-automata-0.1.10 \
-		regex-syntax-0.6.27 \
-		remove_dir_all-0.5.3 \
-		ring-0.16.20 \
-		rustc_version-0.3.3 \
-		rustls-0.20.6 \
-		rustversion-1.0.8 \
-		ryu-1.0.10 \
-		sct-0.7.0 \
-		semver-0.11.0 \
-		semver-parser-0.10.2 \
-		serde-1.0.139 \
-		serde_derive-1.0.139 \
-		serde_json-1.0.82 \
-		serde_path_to_error-0.1.7 \
-		serde_test-1.0.139 \
-		sha2-0.10.2 \
-		slab-0.4.7 \
-		smallvec-1.9.0 \
-		spin-0.5.2 \
-		strsim-0.10.0 \
-		strum-0.24.1 \
-		strum_macros-0.24.2 \
-		subtle-2.4.1 \
-		syn-1.0.98 \
-		system-deps-6.0.2 \
-		temp-dir-0.1.11 \
-		tempfile-3.3.0 \
-		thiserror-1.0.31 \
-		thiserror-impl-1.0.31 \
-		time-0.3.11 \
-		tinyvec-1.6.0 \
-		tinyvec_macros-0.1.0 \
-		toml-0.5.9 \
-		tracker-rs-0.2.3 \
-		tracker-sys-0.2.1 \
-		typenum-1.15.0 \
-		ucd-trie-0.1.4 \
-		unicode-bidi-0.3.8 \
-		unicode-ident-1.0.2 \
-		unicode-normalization-0.1.21 \
-		universal-hash-0.4.1 \
-		untrusted-0.7.1 \
-		uom-0.33.0 \
-		ureq-2.5.0 \
-		url-2.2.2 \
-		version-compare-0.1.0 \
-		version_check-0.9.4 \
-		wasi-0.11.0+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.81 \
-		wasm-bindgen-backend-0.2.81 \
-		wasm-bindgen-macro-0.2.81 \
-		wasm-bindgen-macro-support-0.2.81 \
-		wasm-bindgen-shared-0.2.81 \
-		web-sys-0.3.58 \
-		webpki-0.22.0 \
-		webpki-roots-0.22.4 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		zeroize-1.5.6 \
-		zxcvbn-2.2.1
 CARGO_BUILD=	no
 CARGO_INSTALL=	no
 CARGO_TEST=	no
+GLIB_SCHEMAS=	dev.Cogitri.Health.gschema.xml
 
 post-patch:
 # Make each cargo subcommand very verbose
diff --git a/deskutils/health/Makefile.crates b/deskutils/health/Makefile.crates
new file mode 100644
index 000000000000..478b2b825c35
--- /dev/null
+++ b/deskutils/health/Makefile.crates
@@ -0,0 +1,197 @@
+CARGO_CRATES=	adler-1.0.2 \
+		aead-0.4.3 \
+		aho-corasick-0.7.18 \
+		anyhow-1.0.58 \
+		async-trait-0.1.56 \
+		autocfg-1.1.0 \
+		base64-0.13.0 \
+		bit-set-0.5.2 \
+		bit-vec-0.6.3 \
+		bitflags-1.3.2 \
+		block-0.1.6 \
+		block-buffer-0.10.2 \
+		bstr-0.2.17 \
+		bumpalo-3.10.0 \
+		bytes-1.2.0 \
+		cairo-rs-0.15.12 \
+		cairo-sys-rs-0.15.1 \
+		cc-1.0.73 \
+		cfg-expr-0.10.3 \
+		cfg-if-1.0.0 \
+		chacha20-0.8.2 \
+		chacha20poly1305-0.9.1 \
+		chrono-0.4.19 \
+		chunked_transfer-1.4.0 \
+		cipher-0.3.0 \
+		cpufeatures-0.2.2 \
+		crc32fast-1.3.2 \
+		crypto-common-0.1.6 \
+		csv-1.1.6 \
+		csv-core-0.1.10 \
+		darling-0.14.1 \
+		darling_core-0.14.1 \
+		darling_macro-0.14.1 \
+		delegate-0.7.0 \
+		derive_builder-0.11.2 \
+		derive_builder_core-0.11.2 \
+		derive_builder_macro-0.11.2 \
+		digest-0.10.3 \
+		dyn-clonable-0.9.0 \
+		dyn-clonable-impl-0.9.0 \
+		dyn-clone-1.0.8 \
+		easy-ext-1.0.0 \
+		either-1.7.0 \
+		fancy-regex-0.8.0 \
+		fastrand-1.7.0 \
+		field-offset-0.3.4 \
+		flate2-1.0.24 \
+		float_eq-1.0.0 \
+		fnv-1.0.7 \
+		form_urlencoded-1.0.1 \
+		futures-channel-0.3.21 \
+		futures-core-0.3.21 \
+		futures-executor-0.3.21 \
+		futures-io-0.3.21 \
+		futures-task-0.3.21 \
+		futures-util-0.3.21 \
+		gdk-pixbuf-0.15.11 \
+		gdk-pixbuf-sys-0.15.10 \
+		gdk4-0.4.8 \
+		gdk4-sys-0.4.8 \
+		generic-array-0.14.5 \
+		getrandom-0.2.7 \
+		gettext-rs-0.7.0 \
+		gettext-sys-0.21.3 \
+		gio-0.15.12 \
+		gio-sys-0.15.10 \
+		glib-0.15.12 \
+		glib-macros-0.15.11 \
+		glib-sys-0.15.10 \
+		glob-0.3.0 \
+		gobject-sys-0.15.10 \
+		graphene-rs-0.15.1 \
+		graphene-sys-0.15.10 \
+		gsk4-0.4.8 \
+		gsk4-sys-0.4.8 \
+		gtk-macros-0.3.0 \
+		gtk4-0.4.8 \
+		gtk4-macros-0.4.8 \
+		gtk4-sys-0.4.8 \
+		heck-0.4.0 \
+		http-0.2.8 \
+		ident_case-1.0.1 \
+		idna-0.2.3 \
+		instant-0.1.12 \
+		itertools-0.10.3 \
+		itoa-0.4.8 \
+		itoa-1.0.2 \
+		js-sys-0.3.58 \
+		lazy_static-1.4.0 \
+		libadwaita-0.1.1 \
+		libadwaita-sys-0.1.0 \
+		libc-0.2.126 \
+		libsecret-0.1.4 \
+		libsecret-sys-0.1.4 \
+		locale_config-0.3.0 \
+		log-0.4.17 \
+		malloc_buf-0.0.6 \
+		matches-0.1.9 \
+		memchr-2.5.0 \
+		memoffset-0.6.5 \
+		miniz_oxide-0.5.3 \
+		num-derive-0.3.3 \
+		num-integer-0.1.45 \
+		num-traits-0.2.15 \
+		num_threads-0.1.6 \
+		oauth2-4.2.3 \
+		objc-0.2.7 \
+		objc-foundation-0.1.1 \
+		objc_id-0.1.1 \
+		once_cell-1.13.0 \
+		opaque-debug-0.3.0 \
+		pango-0.15.10 \
+		pango-sys-0.15.10 \
+		pangocairo-0.15.1 \
+		pangocairo-sys-0.15.1 \
+		paste-1.0.7 \
+		percent-encoding-2.1.0 \
+		pest-2.1.3 \
+		pin-project-lite-0.2.9 \
+		pin-utils-0.1.0 \
+		pkg-config-0.3.25 \
+		poly1305-0.7.2 \
+		ppv-lite86-0.2.16 \
+		proc-macro-crate-1.1.3 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.40 \
+		quick-error-2.0.1 \
+		quick-xml-0.22.0 \
+		quote-1.0.20 \
+		rand-0.8.5 \
+		rand_chacha-0.3.1 \
+		rand_core-0.6.3 \
+		redox_syscall-0.2.13 \
+		regex-1.6.0 \
+		regex-automata-0.1.10 \
+		regex-syntax-0.6.27 \
+		remove_dir_all-0.5.3 \
+		ring-0.16.20 \
+		rustc_version-0.3.3 \
+		rustls-0.20.6 \
+		rustversion-1.0.8 \
+		ryu-1.0.10 \
+		sct-0.7.0 \
+		semver-0.11.0 \
+		semver-parser-0.10.2 \
+		serde-1.0.139 \
+		serde_derive-1.0.139 \
+		serde_json-1.0.82 \
+		serde_path_to_error-0.1.7 \
+		serde_test-1.0.139 \
+		sha2-0.10.2 \
+		slab-0.4.7 \
+		smallvec-1.9.0 \
+		spin-0.5.2 \
+		strsim-0.10.0 \
+		strum-0.24.1 \
+		strum_macros-0.24.2 \
+		subtle-2.4.1 \
+		syn-1.0.98 \
+		system-deps-6.0.2 \
+		temp-dir-0.1.11 \
+		tempfile-3.3.0 \
+		thiserror-1.0.31 \
+		thiserror-impl-1.0.31 \
+		time-0.3.11 \
+		tinyvec-1.6.0 \
+		tinyvec_macros-0.1.0 \
+		toml-0.5.9 \
+		tracker-rs-0.2.3 \
+		tracker-sys-0.2.1 \
+		typenum-1.15.0 \
+		ucd-trie-0.1.4 \
+		unicode-bidi-0.3.8 \
+		unicode-ident-1.0.2 \
+		unicode-normalization-0.1.21 \
+		universal-hash-0.4.1 \
+		untrusted-0.7.1 \
+		uom-0.33.0 \
+		ureq-2.5.0 \
+		url-2.2.2 \
+		version-compare-0.1.0 \
+		version_check-0.9.4 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.81 \
+		wasm-bindgen-backend-0.2.81 \
+		wasm-bindgen-macro-0.2.81 \
+		wasm-bindgen-macro-support-0.2.81 \
+		wasm-bindgen-shared-0.2.81 \
+		web-sys-0.3.58 \
+		webpki-0.22.0 \
+		webpki-roots-0.22.4 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		zeroize-1.5.6 \
+		zxcvbn-2.2.1
diff --git a/deskutils/solanum/Makefile b/deskutils/solanum/Makefile
index b527d44afd38..cb65387ad329 100644
--- a/deskutils/solanum/Makefile
+++ b/deskutils/solanum/Makefile
@@ -24,108 +24,10 @@ GL_PROJECT=	Solanum
 GL_COMMIT=	3f84b1d0c46fe1a3daef2940b1d0747222023984
 SHEBANG_FILES=	build-aux/meson/postinstall.py
 MAKE_ENV=	${CARGO_ENV}
-GLIB_SCHEMAS=	org.gnome.Solanum.gschema.xml
-
-CARGO_CRATES=	aho-corasick-0.7.18 \
-		anyhow-1.0.41 \
-		autocfg-1.0.1 \
-		bitflags-1.2.1 \
-		cairo-rs-0.14.7 \
-		cairo-sys-rs-0.14.0 \
-		cc-1.0.68 \
-		cfg-expr-0.7.4 \
-		cfg-expr-0.9.0 \
-		cfg-if-1.0.0 \
-		either-1.6.1 \
-		field-offset-0.3.4 \
-		futures-channel-0.3.15 \
-		futures-core-0.3.15 \
-		futures-executor-0.3.15 \
-		futures-io-0.3.15 \
-		futures-task-0.3.15 \
-		futures-util-0.3.15 \
-		gdk-pixbuf-0.14.0 \
-		gdk-pixbuf-sys-0.14.0 \
-		gdk4-0.3.0 \
-		gdk4-sys-0.3.0 \
-		gettext-rs-0.4.4 \
-		gettext-sys-0.19.9 \
-		gio-0.14.6 \
-		gio-sys-0.14.0 \
-		glib-0.14.5 \
-		glib-macros-0.14.1 \
-		glib-sys-0.14.0 \
-		gobject-sys-0.14.0 \
-		graphene-rs-0.14.0 \
-		graphene-sys-0.14.0 \
-		gsk4-0.3.0 \
-		gsk4-sys-0.3.0 \
-		gstreamer-0.17.4 \
-		gstreamer-base-0.17.2 \
-		gstreamer-base-sys-0.17.0 \
-		gstreamer-player-0.17.0 \
-		gstreamer-player-sys-0.17.0 \
-		gstreamer-sys-0.17.3 \
-		gstreamer-video-0.17.2 \
-		gstreamer-video-sys-0.17.0 \
-		gtk-macros-0.2.0 \
-		gtk4-0.3.0 \
-		gtk4-macros-0.3.0 \
-		gtk4-sys-0.3.0 \
-		heck-0.3.3 \
-		itertools-0.10.1 \
-		lazy_static-1.4.0 \
-		libadwaita-0.1.0-alpha-6 \
-		libadwaita-sys-0.1.0-alpha-6 \
-		libc-0.2.97 \
-		locale_config-0.2.3 \
-		memchr-2.4.0 \
-		memoffset-0.6.4 \
-		muldiv-1.0.0 \
-		num-integer-0.1.44 \
-		num-rational-0.4.0 \
-		num-traits-0.2.14 \
-		once_cell-1.8.0 \
-		pango-0.14.3 \
-		pango-sys-0.14.0 \
-		paste-1.0.5 \
-		pest-2.1.3 \
-		pin-project-lite-0.2.6 \
-		pin-utils-0.1.0 \
-		pkg-config-0.3.19 \
-		pretty-hex-0.2.1 \
-		proc-macro-crate-1.0.0 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.27 \
-		quote-1.0.9 \
-		regex-1.5.4 \
-		regex-syntax-0.6.25 \
-		rustc_version-0.3.3 \
-		semver-0.11.0 \
-		semver-parser-0.10.2 \
-		serde-1.0.126 \
-		slab-0.4.3 \
-		smallvec-1.6.1 \
-		strum-0.20.0 \
-		strum_macros-0.20.1 \
-		syn-1.0.73 \
-		system-deps-3.1.1 \
-		system-deps-4.0.0 \
-		thiserror-1.0.25 \
-		thiserror-impl-1.0.25 \
-		toml-0.5.8 \
-		ucd-trie-0.1.3 \
-		unicode-segmentation-1.7.1 \
-		unicode-xid-0.2.2 \
-		version-compare-0.0.11 \
-		version_check-0.9.3 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-x86_64-pc-windows-gnu-0.4.0
 CARGO_BUILD=	no
 CARGO_INSTALL=	no
 CARGO_TEST=	no
+GLIB_SCHEMAS=	org.gnome.Solanum.gschema.xml
 
 post-patch:
 # Make each cargo subcommand very verbose
diff --git a/deskutils/solanum/Makefile.crates b/deskutils/solanum/Makefile.crates
new file mode 100644
index 000000000000..7fb4c7d7a44d
--- /dev/null
+++ b/deskutils/solanum/Makefile.crates
@@ -0,0 +1,97 @@
+CARGO_CRATES=	aho-corasick-0.7.18 \
+		anyhow-1.0.41 \
+		autocfg-1.0.1 \
+		bitflags-1.2.1 \
+		cairo-rs-0.14.7 \
+		cairo-sys-rs-0.14.0 \
+		cc-1.0.68 \
+		cfg-expr-0.7.4 \
+		cfg-expr-0.9.0 \
+		cfg-if-1.0.0 \
+		either-1.6.1 \
+		field-offset-0.3.4 \
+		futures-channel-0.3.15 \
+		futures-core-0.3.15 \
+		futures-executor-0.3.15 \
+		futures-io-0.3.15 \
+		futures-task-0.3.15 \
+		futures-util-0.3.15 \
+		gdk-pixbuf-0.14.0 \
+		gdk-pixbuf-sys-0.14.0 \
+		gdk4-0.3.0 \
+		gdk4-sys-0.3.0 \
+		gettext-rs-0.4.4 \
+		gettext-sys-0.19.9 \
+		gio-0.14.6 \
+		gio-sys-0.14.0 \
+		glib-0.14.5 \
+		glib-macros-0.14.1 \
+		glib-sys-0.14.0 \
+		gobject-sys-0.14.0 \
+		graphene-rs-0.14.0 \
+		graphene-sys-0.14.0 \
+		gsk4-0.3.0 \
+		gsk4-sys-0.3.0 \
+		gstreamer-0.17.4 \
+		gstreamer-base-0.17.2 \
+		gstreamer-base-sys-0.17.0 \
+		gstreamer-player-0.17.0 \
+		gstreamer-player-sys-0.17.0 \
+		gstreamer-sys-0.17.3 \
+		gstreamer-video-0.17.2 \
+		gstreamer-video-sys-0.17.0 \
+		gtk-macros-0.2.0 \
+		gtk4-0.3.0 \
+		gtk4-macros-0.3.0 \
+		gtk4-sys-0.3.0 \
+		heck-0.3.3 \
+		itertools-0.10.1 \
+		lazy_static-1.4.0 \
+		libadwaita-0.1.0-alpha-6 \
+		libadwaita-sys-0.1.0-alpha-6 \
+		libc-0.2.97 \
+		locale_config-0.2.3 \
+		memchr-2.4.0 \
+		memoffset-0.6.4 \
+		muldiv-1.0.0 \
+		num-integer-0.1.44 \
+		num-rational-0.4.0 \
+		num-traits-0.2.14 \
+		once_cell-1.8.0 \
+		pango-0.14.3 \
+		pango-sys-0.14.0 \
+		paste-1.0.5 \
+		pest-2.1.3 \
+		pin-project-lite-0.2.6 \
+		pin-utils-0.1.0 \
+		pkg-config-0.3.19 \
+		pretty-hex-0.2.1 \
+		proc-macro-crate-1.0.0 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.27 \
+		quote-1.0.9 \
+		regex-1.5.4 \
+		regex-syntax-0.6.25 \
+		rustc_version-0.3.3 \
+		semver-0.11.0 \
+		semver-parser-0.10.2 \
+		serde-1.0.126 \
+		slab-0.4.3 \
+		smallvec-1.6.1 \
+		strum-0.20.0 \
+		strum_macros-0.20.1 \
+		syn-1.0.73 \
+		system-deps-3.1.1 \
+		system-deps-4.0.0 \
+		thiserror-1.0.25 \
+		thiserror-impl-1.0.25 \
+		toml-0.5.8 \
+		ucd-trie-0.1.3 \
+		unicode-segmentation-1.7.1 \
+		unicode-xid-0.2.2 \
+		version-compare-0.0.11 \
+		version_check-0.9.3 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-x86_64-pc-windows-gnu-0.4.0
diff --git a/devel/cargo-c/Makefile b/devel/cargo-c/Makefile
index 3002cd7476a5..b7f46933296d 100644
--- a/devel/cargo-c/Makefile
+++ b/devel/cargo-c/Makefile
@@ -25,141 +25,6 @@ PLIST_FILES=	bin/cargo-capi \
 		bin/cargo-ctest \
 		${NULL}
 
-CARGO_CRATES=	adler-1.0.2 \
-		aho-corasick-0.7.18 \
-		ansi_term-0.12.1 \
-		anyhow-1.0.55 \
-		arrayvec-0.5.2 \
-		atty-0.2.14 \
-		autocfg-1.1.0 \
-		bitflags-1.3.2 \
-		bitmaps-2.1.0 \
-		bstr-0.2.17 \
-		bytesize-1.1.0 \
-		cargo-0.60.0 \
-		cargo-platform-0.1.2 \
-		cargo-util-0.1.2 \
-		cbindgen-0.20.0 \
-		cc-1.0.73 \
-		cfg-if-1.0.0 \
-		clap-2.34.0 \
-		commoncrypto-0.2.0 \
-		commoncrypto-sys-0.2.0 \
-		core-foundation-0.9.3 \
-		core-foundation-sys-0.8.3 \
-		crates-io-0.33.1 \
-		crc32fast-1.3.2 \
-		crossbeam-utils-0.8.7 \
-		crypto-hash-0.3.4 \
-		curl-0.4.42 \
-		curl-sys-0.4.52+curl-7.81.0 \
-		either-1.6.1 \
-		env_logger-0.9.0 \
-		fastrand-1.7.0 \
-		filetime-0.2.15 \
-		flate2-1.0.22 \
-		fnv-1.0.7 \
-		foreign-types-0.3.2 \
-		foreign-types-shared-0.1.1 \
-		form_urlencoded-1.0.1 \
-		fwdansi-1.1.0 \
-		git2-0.13.25 \
-		git2-curl-0.14.1 \
-		glob-0.3.0 \
-		globset-0.4.8 \
-		hashbrown-0.11.2 \
-		heck-0.3.3 \
-		hermit-abi-0.1.19 \
-		hex-0.3.2 \
-		hex-0.4.3 \
-		home-0.5.3 \
-		humantime-2.1.0 \
-		idna-0.2.3 \
-		ignore-0.4.18 \
-		im-rc-15.0.0 \
-		indexmap-1.8.0 \
-		instant-0.1.12 \
-		itertools-0.10.3 \
-		itoa-1.0.1 \
-		jobserver-0.1.24 \
-		lazy_static-1.4.0 \
-		lazycell-1.3.0 \
-		libc-0.2.119 \
-		libgit2-sys-0.12.26+1.3.0 \
-		libnghttp2-sys-0.1.7+1.45.0 \
-		libssh2-sys-0.2.23 \
-		libz-sys-1.1.3 \
-		log-0.4.14 \
-		matches-0.1.9 \
-		memchr-2.4.1 \
-		miniz_oxide-0.4.4 \
-		miow-0.3.7 \
-		num_cpus-1.13.1 \
-		once_cell-1.9.0 \
-		opener-0.5.0 \
-		openssl-0.10.38 \
-		openssl-probe-0.1.5 \
-		openssl-src-111.17.0+1.1.1m \
-		openssl-sys-0.9.72 \
-		os_info-3.2.0 \
-		percent-encoding-2.1.0 \
-		pkg-config-0.3.24 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.36 \
-		quote-1.0.15 \
-		rand_core-0.5.1 \
-		rand_xoshiro-0.4.0 \
-		redox_syscall-0.2.10 \
-		regex-1.5.4 \
-		regex-automata-0.1.10 \
-		regex-syntax-0.6.25 \
-		remove_dir_all-0.5.3 \
-		rustc-workspace-hack-1.0.0 \
-		rustfix-0.6.0 \
-		ryu-1.0.9 \
-		same-file-1.0.6 \
-		schannel-0.1.19 \
-		semver-1.0.6 \
-		serde-1.0.136 \
-		serde_derive-1.0.136 \
-		serde_ignored-0.1.2 \
-		serde_json-1.0.79 \
-		shell-escape-0.1.5 \
-		sized-chunks-0.6.5 \
-		socket2-0.4.4 \
-		strip-ansi-escapes-0.1.1 \
-		strsim-0.8.0 \
-		structopt-0.3.26 \
-		structopt-derive-0.4.18 \
-		syn-1.0.86 \
-		tar-0.4.38 \
-		tempfile-3.3.0 \
-		termcolor-1.1.2 \
-		textwrap-0.11.0 \
-		thread_local-1.1.4 \
-		tinyvec-1.5.1 \
-		tinyvec_macros-0.1.0 \
-		toml-0.5.8 \
-		typenum-1.15.0 \
-		unicode-bidi-0.3.7 \
-		unicode-normalization-0.1.19 \
-		unicode-segmentation-1.9.0 \
-		unicode-width-0.1.9 \
-		unicode-xid-0.2.2 \
-		url-2.2.2 \
-		utf8parse-0.2.0 \
-		vcpkg-0.2.15 \
-		vec_map-0.8.2 \
-		version_check-0.9.4 \
-		vte-0.10.1 \
-		vte_generate_state_changes-0.1.1 \
-		walkdir-2.3.2 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-x86_64-pc-windows-gnu-0.4.0
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,libdir.join("pkgconfig,prefix.join("libdata/pkgconfig,' \
 		${WRKSRC}/src/install.rs
diff --git a/devel/cargo-c/Makefile.crates b/devel/cargo-c/Makefile.crates
new file mode 100644
index 000000000000..6c17ec1c7551
--- /dev/null
+++ b/devel/cargo-c/Makefile.crates
@@ -0,0 +1,134 @@
+CARGO_CRATES=	adler-1.0.2 \
+		aho-corasick-0.7.18 \
+		ansi_term-0.12.1 \
+		anyhow-1.0.55 \
+		arrayvec-0.5.2 \
+		atty-0.2.14 \
+		autocfg-1.1.0 \
+		bitflags-1.3.2 \
+		bitmaps-2.1.0 \
+		bstr-0.2.17 \
+		bytesize-1.1.0 \
+		cargo-0.60.0 \
+		cargo-platform-0.1.2 \
+		cargo-util-0.1.2 \
+		cbindgen-0.20.0 \
+		cc-1.0.73 \
+		cfg-if-1.0.0 \
+		clap-2.34.0 \
+		commoncrypto-0.2.0 \
+		commoncrypto-sys-0.2.0 \
+		core-foundation-0.9.3 \
+		core-foundation-sys-0.8.3 \
+		crates-io-0.33.1 \
+		crc32fast-1.3.2 \
+		crossbeam-utils-0.8.7 \
+		crypto-hash-0.3.4 \
+		curl-0.4.42 \
+		curl-sys-0.4.52+curl-7.81.0 \
+		either-1.6.1 \
+		env_logger-0.9.0 \
+		fastrand-1.7.0 \
+		filetime-0.2.15 \
+		flate2-1.0.22 \
+		fnv-1.0.7 \
+		foreign-types-0.3.2 \
+		foreign-types-shared-0.1.1 \
+		form_urlencoded-1.0.1 \
+		fwdansi-1.1.0 \
+		git2-0.13.25 \
+		git2-curl-0.14.1 \
+		glob-0.3.0 \
+		globset-0.4.8 \
+		hashbrown-0.11.2 \
+		heck-0.3.3 \
+		hermit-abi-0.1.19 \
+		hex-0.3.2 \
+		hex-0.4.3 \
+		home-0.5.3 \
+		humantime-2.1.0 \
+		idna-0.2.3 \
+		ignore-0.4.18 \
+		im-rc-15.0.0 \
+		indexmap-1.8.0 \
+		instant-0.1.12 \
+		itertools-0.10.3 \
+		itoa-1.0.1 \
+		jobserver-0.1.24 \
+		lazy_static-1.4.0 \
+		lazycell-1.3.0 \
+		libc-0.2.119 \
+		libgit2-sys-0.12.26+1.3.0 \
+		libnghttp2-sys-0.1.7+1.45.0 \
+		libssh2-sys-0.2.23 \
+		libz-sys-1.1.3 \
+		log-0.4.14 \
+		matches-0.1.9 \
+		memchr-2.4.1 \
+		miniz_oxide-0.4.4 \
+		miow-0.3.7 \
+		num_cpus-1.13.1 \
+		once_cell-1.9.0 \
+		opener-0.5.0 \
+		openssl-0.10.38 \
+		openssl-probe-0.1.5 \
+		openssl-src-111.17.0+1.1.1m \
+		openssl-sys-0.9.72 \
+		os_info-3.2.0 \
+		percent-encoding-2.1.0 \
+		pkg-config-0.3.24 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.36 \
+		quote-1.0.15 \
+		rand_core-0.5.1 \
+		rand_xoshiro-0.4.0 \
+		redox_syscall-0.2.10 \
+		regex-1.5.4 \
+		regex-automata-0.1.10 \
+		regex-syntax-0.6.25 \
+		remove_dir_all-0.5.3 \
+		rustc-workspace-hack-1.0.0 \
+		rustfix-0.6.0 \
+		ryu-1.0.9 \
+		same-file-1.0.6 \
+		schannel-0.1.19 \
+		semver-1.0.6 \
+		serde-1.0.136 \
+		serde_derive-1.0.136 \
+		serde_ignored-0.1.2 \
+		serde_json-1.0.79 \
+		shell-escape-0.1.5 \
+		sized-chunks-0.6.5 \
+		socket2-0.4.4 \
+		strip-ansi-escapes-0.1.1 \
+		strsim-0.8.0 \
+		structopt-0.3.26 \
+		structopt-derive-0.4.18 \
+		syn-1.0.86 \
+		tar-0.4.38 \
+		tempfile-3.3.0 \
+		termcolor-1.1.2 \
+		textwrap-0.11.0 \
+		thread_local-1.1.4 \
+		tinyvec-1.5.1 \
+		tinyvec_macros-0.1.0 \
+		toml-0.5.8 \
+		typenum-1.15.0 \
+		unicode-bidi-0.3.7 \
+		unicode-normalization-0.1.19 \
+		unicode-segmentation-1.9.0 \
+		unicode-width-0.1.9 \
+		unicode-xid-0.2.2 \
+		url-2.2.2 \
+		utf8parse-0.2.0 \
+		vcpkg-0.2.15 \
+		vec_map-0.8.2 \
+		version_check-0.9.4 \
+		vte-0.10.1 \
+		vte_generate_state_changes-0.1.1 \
+		walkdir-2.3.2 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0
diff --git a/games/jumpy/Makefile b/games/jumpy/Makefile
index 06573ac69b19..d373769002f5 100644
--- a/games/jumpy/Makefile
+++ b/games/jumpy/Makefile
@@ -24,113 +24,6 @@ GH_ACCOUNT=	fishfolks
 PLIST_FILES=	bin/${PORTNAME}
 PORTDATA=	*
 
-CARGO_CRATES=	adler32-1.2.0 \
-		ahash-0.4.7 \
-		ahash-0.7.6 \
-		async-trait-0.1.52 \
-		audir-sles-0.1.0 \
-		audrey-0.3.0 \
-		autocfg-1.1.0 \
-		base-x-0.2.8 \
-		bitflags-1.3.2 \
-		bumpalo-3.9.1 \
-		bytemuck-1.7.3 \
-		byteorder-1.4.3 \
-		cc-1.0.73 \
-		cfg-if-1.0.0 \
-		color_quant-1.1.0 \
-		core-foundation-0.6.4 \
-		core-foundation-sys-0.6.2 \
-		crc32fast-1.3.2 \
-		dasp_frame-0.11.0 \
-		dasp_sample-0.11.0 \
-		deflate-0.8.6 \
-		discard-1.0.4 \
-		ff-particles-0.1.2 \
-		fnv-1.0.7 \
-		fontdue-0.5.2 \
-		getrandom-0.2.4 \
-		gilrs-0.8.2 \
-		gilrs-core-0.3.2 \
-		glam-0.14.0 \
-		hashbrown-0.9.1 \
-		hashbrown-0.12.0 \
-		hecs-0.7.6 \
-		hound-3.4.0 \
-		image-0.23.14 \
-		io-kit-sys-0.1.0 \
-		itoa-1.0.1 \
-		js-sys-0.3.56 \
-		lazy_static-1.4.0 \
-		lewton-0.9.4 \
-		libc-0.2.118 \
-		libudev-sys-0.1.4 \
-		log-0.4.14 \
-		mach-0.2.3 \
-		macroquad-0.3.13 \
-		macroquad-platformer-0.1.2 \
-		macroquad_macro-0.1.7 \
-		maybe-uninit-2.0.0 \
-		memoffset-0.6.5 \
-		miniquad-0.3.0-alpha.42 \
-		miniz_oxide-0.3.7 \
-		ndk-sys-0.2.2 \
-		nix-0.23.1 \
-		num-integer-0.1.44 \
-		num-iter-0.1.42 \
-		num-rational-0.3.2 \
-		num-traits-0.2.14 \
-		ogg-0.7.1 \
-		once_cell-1.9.0 \
-		pkg-config-0.3.24 \
-		png-0.16.8 \
-		proc-macro2-1.0.36 \
-		quad-alsa-sys-0.3.2 \
-		quad-rand-0.2.1 \
-		quad-snd-0.2.3 \
-		quote-1.0.15 \
-		rustc_version-0.2.3 \
-		rusty-xinput-1.2.0 \
-		ryu-1.0.9 \
-		sapp-android-0.1.14 \
-		sapp-darwin-0.1.6 \
-		sapp-dummy-0.1.5 \
-		sapp-ios-0.1.2 \
-		sapp-linux-0.1.13 \
-		sapp-wasm-0.1.26 \
-		sapp-windows-0.2.19 \
-		semver-0.9.0 \
-		semver-parser-0.7.0 \
-		serde-1.0.136 \
-		serde_derive-1.0.136 \
-		serde_json-1.0.79 \
-		sha1-0.6.1 \
-		sha1_smol-1.0.0 \
-		smallvec-0.6.14 \
-		spin-0.9.2 \
-		stdweb-0.4.20 \
-		stdweb-derive-0.5.3 \
-		stdweb-internal-macros-0.2.9 \
-		stdweb-internal-runtime-0.1.5 \
-		syn-1.0.86 \
-		toml-0.5.8 \
-		ttf-parser-0.12.3 \
-		unicode-xid-0.2.2 \
-		uuid-0.8.2 \
-		vec_map-0.8.2 \
-		version_check-0.9.4 \
-		wasi-0.10.2+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.79 \
-		wasm-bindgen-backend-0.2.79 \
-		wasm-bindgen-macro-0.2.79 \
-		wasm-bindgen-macro-support-0.2.79 \
-		wasm-bindgen-shared-0.2.79 \
-		web-sys-0.3.56 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		fishsticks@git+https://github.com/fishfight/fishsticks\#95b45b717e427fb5fa1671f3bdf686d7270ad8a1
-
 post-patch:
 # Search assets under PREFIX instead of current directory
 	@${REINPLACE_CMD} '/_dir/s,"\.,"${DATADIR},' ${WRKSRC}/src/main.rs
diff --git a/games/jumpy/Makefile.crates b/games/jumpy/Makefile.crates
new file mode 100644
index 000000000000..c84cf1f6e05b
--- /dev/null
+++ b/games/jumpy/Makefile.crates
@@ -0,0 +1,106 @@
+CARGO_CRATES=	adler32-1.2.0 \
+		ahash-0.4.7 \
+		ahash-0.7.6 \
+		async-trait-0.1.52 \
+		audir-sles-0.1.0 \
+		audrey-0.3.0 \
+		autocfg-1.1.0 \
+		base-x-0.2.8 \
+		bitflags-1.3.2 \
+		bumpalo-3.9.1 \
+		bytemuck-1.7.3 \
+		byteorder-1.4.3 \
+		cc-1.0.73 \
+		cfg-if-1.0.0 \
+		color_quant-1.1.0 \
+		core-foundation-0.6.4 \
+		core-foundation-sys-0.6.2 \
+		crc32fast-1.3.2 \
+		dasp_frame-0.11.0 \
+		dasp_sample-0.11.0 \
+		deflate-0.8.6 \
+		discard-1.0.4 \
+		ff-particles-0.1.2 \
+		fnv-1.0.7 \
+		fontdue-0.5.2 \
+		getrandom-0.2.4 \
+		gilrs-0.8.2 \
+		gilrs-core-0.3.2 \
+		glam-0.14.0 \
+		hashbrown-0.9.1 \
+		hashbrown-0.12.0 \
+		hecs-0.7.6 \
+		hound-3.4.0 \
+		image-0.23.14 \
+		io-kit-sys-0.1.0 \
+		itoa-1.0.1 \
+		js-sys-0.3.56 \
+		lazy_static-1.4.0 \
+		lewton-0.9.4 \
+		libc-0.2.118 \
+		libudev-sys-0.1.4 \
+		log-0.4.14 \
+		mach-0.2.3 \
+		macroquad-0.3.13 \
+		macroquad-platformer-0.1.2 \
+		macroquad_macro-0.1.7 \
+		maybe-uninit-2.0.0 \
+		memoffset-0.6.5 \
+		miniquad-0.3.0-alpha.42 \
+		miniz_oxide-0.3.7 \
+		ndk-sys-0.2.2 \
+		nix-0.23.1 \
+		num-integer-0.1.44 \
+		num-iter-0.1.42 \
+		num-rational-0.3.2 \
+		num-traits-0.2.14 \
+		ogg-0.7.1 \
+		once_cell-1.9.0 \
+		pkg-config-0.3.24 \
+		png-0.16.8 \
+		proc-macro2-1.0.36 \
+		quad-alsa-sys-0.3.2 \
+		quad-rand-0.2.1 \
+		quad-snd-0.2.3 \
+		quote-1.0.15 \
+		rustc_version-0.2.3 \
+		rusty-xinput-1.2.0 \
+		ryu-1.0.9 \
+		sapp-android-0.1.14 \
+		sapp-darwin-0.1.6 \
+		sapp-dummy-0.1.5 \
+		sapp-ios-0.1.2 \
+		sapp-linux-0.1.13 \
+		sapp-wasm-0.1.26 \
+		sapp-windows-0.2.19 \
+		semver-0.9.0 \
+		semver-parser-0.7.0 \
+		serde-1.0.136 \
+		serde_derive-1.0.136 \
+		serde_json-1.0.79 \
+		sha1-0.6.1 \
+		sha1_smol-1.0.0 \
+		smallvec-0.6.14 \
+		spin-0.9.2 \
+		stdweb-0.4.20 \
+		stdweb-derive-0.5.3 \
+		stdweb-internal-macros-0.2.9 \
+		stdweb-internal-runtime-0.1.5 \
+		syn-1.0.86 \
+		toml-0.5.8 \
+		ttf-parser-0.12.3 \
+		unicode-xid-0.2.2 \
+		uuid-0.8.2 \
+		vec_map-0.8.2 \
+		version_check-0.9.4 \
+		wasi-0.10.2+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.79 \
+		wasm-bindgen-backend-0.2.79 \
+		wasm-bindgen-macro-0.2.79 \
+		wasm-bindgen-macro-support-0.2.79 \
+		wasm-bindgen-shared-0.2.79 \
+		web-sys-0.3.56 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		fishsticks@git+https://github.com/fishfight/fishsticks\#95b45b717e427fb5fa1671f3bdf686d7270ad8a1
diff --git a/games/punchy/Makefile b/games/punchy/Makefile
index 852c10dca04e..1c0abbcd6d8f 100644
--- a/games/punchy/Makefile
+++ b/games/punchy/Makefile
@@ -22,428 +22,6 @@ GH_ACCOUNT=	fishfolks
 PLIST_FILES=	bin/${PORTNAME}
 PORTDATA=	*
 
-CARGO_CRATES=	ab_glyph-0.2.16 \
-		ab_glyph_rasterizer-0.1.5 \
-		adler-1.0.2 \
-		adler32-1.2.0 \
-		ahash-0.7.6 \
-		aho-corasick-0.7.18 \
-		alsa-0.6.0 \
-		alsa-sys-0.3.1 \
-		android_log-sys-0.2.0 \
-		android_logger-0.10.1 \
-		android_system_properties-0.1.4 \
-		ansi_term-0.12.1 \
-		anyhow-1.0.62 \
-		approx-0.5.1 \
-		arboard-2.1.1 \
-		arrayvec-0.7.2 \
-		ash-0.37.0+1.3.209 \
-		async-channel-1.7.1 \
-		async-executor-1.4.1 \
-		async-task-4.3.0 \
-		atomic-arena-0.1.1 \
-		atomic_refcell-0.1.8 \
-		atty-0.2.14 \
-		autocfg-1.1.0 \
-		base64-0.13.0 \
-		bevy-0.8.1 \
-		bevy-inspector-egui-0.12.1 \
-		bevy-inspector-egui-derive-0.12.0 \
-		bevy-inspector-egui-rapier-0.5.0 \
-		bevy-parallax-0.2.0 \
-		bevy_app-0.8.1 \
-		bevy_asset-0.8.1 \
-		bevy_core-0.8.1 \
-		bevy_core_pipeline-0.8.1 \
-		bevy_derive-0.8.1 \
-		bevy_diagnostic-0.8.1 \
-		bevy_ecs-0.8.1 \
-		bevy_ecs_macros-0.8.1 \
-		bevy_egui-0.15.1 \
-		bevy_encase_derive-0.8.1 \
-		bevy_fluent-0.4.0 \
-		bevy_gilrs-0.8.1 \
-		bevy_hierarchy-0.8.1 \
-		bevy_input-0.8.1 \
-		bevy_internal-0.8.1 \
-		bevy_kira_audio-0.11.0 \
-		bevy_log-0.8.1 \
-		bevy_macro_utils-0.8.1 \
-		bevy_math-0.8.1 \
-		bevy_mikktspace-0.8.1 \
-		bevy_mod_debugdump-0.5.0 \
-		bevy_pbr-0.8.1 \
-		bevy_ptr-0.8.1 \
-		bevy_rapier2d-0.16.2 \
-		bevy_reflect-0.8.1 \
-		bevy_reflect_derive-0.8.1 \
-		bevy_render-0.8.1 \
-		bevy_render_macros-0.8.1 \
-		bevy_scene-0.8.1 \
-		bevy_sprite-0.8.1 \
-		bevy_tasks-0.8.1 \
-		bevy_text-0.8.1 \
-		bevy_time-0.8.1 \
-		bevy_transform-0.8.1 \
-		bevy_ui-0.8.1 \
-		bevy_utils-0.8.1 \
-		bevy_window-0.8.1 \
-		bevy_winit-0.8.1 \
-		bindgen-0.59.2 \
-		bit-set-0.5.3 \
-		bit-vec-0.6.3 \
-		bitflags-1.3.2 \
-		block-0.1.6 \
-		bstr-0.2.17 \
-		bumpalo-3.11.0 \
-		bytemuck-1.12.1 \
-		bytemuck_derive-1.2.1 \
-		byteorder-1.4.3 \
-		bytes-1.2.1 \
-		cache-padded-1.2.0 \
-		calloop-0.9.3 \
-		cc-1.0.73 \
-		cesu8-1.1.0 \
-		cexpr-0.6.0 \
-		cfg-if-0.1.10 \
-		cfg-if-1.0.0 \
-		cfg_aliases-0.1.1 \
-		clang-sys-1.3.3 \
-		clap-2.34.0 \
-		clipboard-win-4.4.2 \
-		cocoa-0.24.0 \
-		cocoa-foundation-0.1.0 \
-		codespan-reporting-0.11.1 \
-		color_quant-1.1.0 \
-		combine-4.6.6 \
-		concurrent-queue-1.2.4 \
-		console_error_panic_hook-0.1.7 \
-		const_panic-0.2.4 \
-		copyless-0.1.5 \
-		core-foundation-0.7.0 \
-		core-foundation-0.9.3 \
-		core-foundation-sys-0.7.0 \
-		core-foundation-sys-0.8.3 \
-		core-graphics-0.19.2 \
-		core-graphics-0.22.3 \
-		core-graphics-types-0.1.1 \
-		core-video-sys-0.1.4 \
-		coreaudio-rs-0.10.0 \
-		coreaudio-sys-0.2.10 \
-		cpal-0.13.5 \
-		crc32fast-1.3.2 \
-		crossbeam-0.8.2 \
-		crossbeam-channel-0.5.6 \
-		crossbeam-deque-0.8.2 \
-		crossbeam-epoch-0.9.10 \
-		crossbeam-queue-0.3.6 \
-		crossbeam-utils-0.8.11 \
-		cstr_core-0.2.6 \
-		cty-0.2.2 \
-		d3d12-0.5.0 \
-		darling-0.13.4 \
-		darling_core-0.13.4 \
-		darling_macro-0.13.4 \
-		deflate-0.8.6 \
-		deflate-1.0.0 \
-		derive_more-0.99.17 \
-		directories-4.0.1 \
-		dirs-sys-0.3.7 \
-		dispatch-0.2.0 \
-		dlib-0.5.0 \
-		downcast-rs-1.2.0 \
-		egui-0.18.1 \
-		egui_extras-0.18.0 \
-		either-1.8.0 \
-		emath-0.18.0 \
-		encase-0.3.0 \
-		encase_derive-0.3.0 \
-		encase_derive_impl-0.3.0 \
-		encoding_rs-0.8.31 \
-		env_logger-0.8.4 \
-		epaint-0.18.1 \
-		erased-serde-0.3.23 \
-		error-code-2.3.1 \
-		euclid-0.22.7 \
-		event-listener-2.5.3 \
-		fastrand-1.8.0 \
-		filetime-0.2.17 \
-		fixedbitset-0.4.2 \
-		fluent-0.16.0 \
-		fluent-bundle-0.15.2 \
-		fluent-langneg-0.13.0 \
-		fluent-syntax-0.11.0 \
-		fnv-1.0.7 \
-		foreign-types-0.3.2 \
-		foreign-types-shared-0.1.1 \
-		form_urlencoded-1.0.1 \
-		fsevent-sys-4.1.0 \
-		futures-core-0.3.24 \
-		futures-io-0.3.24 \
-		futures-lite-1.12.0 \
-		fxhash-0.2.1 \
-		gethostname-0.2.3 \
-		getrandom-0.2.7 \
-		gilrs-0.9.0 \
-		gilrs-core-0.4.1 \
-		glam-0.21.3 \
-		glob-0.3.0 \
-		globset-0.4.9 \
-		glow-0.11.2 \
-		glyph_brush_layout-0.2.3 \
-		gpu-alloc-0.5.3 \
-		gpu-alloc-types-0.2.0 \
-		gpu-descriptor-0.2.3 \
-		gpu-descriptor-types-0.1.1 \
-		guillotiere-0.6.2 \
-		hash32-0.2.1 \
-		hash32-derive-0.1.1 \
-		hashbrown-0.12.3 \
-		heck-0.3.3 \
-		hermit-abi-0.1.19 \
-		hex-0.4.3 \
-		hexasphere-7.2.0 \
-		hexf-parse-0.2.1 \
-		ident_case-1.0.1 \
-		idna-0.2.3 \
-		image-0.23.14 \
-		image-0.24.3 \
-		indexmap-1.9.1 \
-		inotify-0.9.6 \
-		inotify-sys-0.1.5 \
-		inplace_it-0.3.4 \
-		instant-0.1.12 \
-		intl-memoizer-0.5.1 \
-		intl_pluralrules-7.0.1 \
-		io-kit-sys-0.2.0 \
-		itertools-0.10.3 \
-		itoa-1.0.3 \
-		iyes_loopless-0.7.1 \
-		jni-0.19.0 \
-		jni-sys-0.3.0 \
-		jobserver-0.1.24 \
-		jpeg-decoder-0.1.22 \
-		js-sys-0.3.59 \
-		khronos-egl-4.1.0 \
-		kira-0.6.1 \
-		kqueue-1.0.6 \
-		kqueue-sys-1.0.3 \
-		lazy_static-1.4.0 \
-		lazycell-1.3.0 \
-		leafwing-input-manager-0.5.2 \
-		leafwing_input_manager_macros-0.5.0 \
-		libc-0.2.132 \
-		libloading-0.7.3 \
-		libm-0.2.5 \
-		libudev-sys-0.1.4 \
-		lock_api-0.4.8 \
-		log-0.4.17 \
-		mach-0.3.2 \
-		malloc_buf-0.0.6 \
-		matchers-0.1.0 \
-		matches-0.1.9 \
-		matrixmultiply-0.3.2 \
-		memchr-2.5.0 \
-		memmap2-0.3.1 \
-		memoffset-0.6.5 \
-		metal-0.24.0 \
-		minimal-lexical-0.2.1 \
-		miniz_oxide-0.3.7 \
-		miniz_oxide-0.4.4 \
-		miniz_oxide-0.5.3 \
-		mio-0.8.4 \
-		naga-0.9.0 \
-		nalgebra-0.31.1 \
-		nalgebra-macros-0.1.0 \
-		ndk-0.5.0 \
-		ndk-0.6.0 \
-		ndk-context-0.1.1 \
-		ndk-glue-0.5.2 \
-		ndk-glue-0.6.2 \
-		ndk-macro-0.3.0 \
-		ndk-sys-0.2.2 \
-		ndk-sys-0.3.0 \
-		nix-0.22.3 \
-		nix-0.23.1 \
-		nix-0.24.2 \
-		nohash-hasher-0.2.0 \
-		nom-7.1.1 \
-		notify-5.0.0-pre.15 \
-		num-complex-0.4.2 \
-		num-derive-0.3.3 \
-		num-integer-0.1.45 \
-		num-iter-0.1.43 \
-		num-rational-0.3.2 \
-		num-rational-0.4.1 \
-		num-traits-0.2.15 \
-		num_cpus-1.13.1 \
-		num_enum-0.5.7 \
-		num_enum_derive-0.5.7 \
-		objc-0.2.7 \
-		objc-foundation-0.1.1 \
-		objc_exception-0.1.2 \
-		objc_id-0.1.1 \
-		oboe-0.4.6 \
-		oboe-sys-0.4.5 \
-		once_cell-1.13.1 \
-		optional-0.5.0 \
-		owned_ttf_parser-0.15.1 \
-		parking-2.0.0 \
-		parking_lot-0.11.2 \
-		parking_lot-0.12.1 \
-		parking_lot_core-0.8.5 \
-		parking_lot_core-0.9.3 \
-		parry2d-0.9.0 \
-		paste-1.0.8 \
-		peeking_take_while-0.1.2 \
-		percent-encoding-2.1.0 \
-		petgraph-0.6.2 \
-		petitset-0.2.1 \
-		pin-project-lite-0.2.9 \
-		pkg-config-0.3.25 \
-		png-0.16.8 \
-		png-0.17.5 \
-		pp-rs-0.2.1 \
-		ppv-lite86-0.2.16 \
-		pretty-type-name-1.0.0 \
-		proc-macro-crate-1.2.1 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.43 \
-		profiling-1.0.6 \
-		quote-1.0.21 \
-		radsort-0.1.0 \
-		rand-0.8.5 \
-		rand_chacha-0.3.1 \
-		rand_core-0.6.3 \
-		range-alloc-0.1.2 \
-		rapier2d-0.14.0 \
-		raw-window-handle-0.4.3 \
-		rawpointer-0.2.1 \
-		rectangle-pack-0.4.2 \
-		redox_syscall-0.2.16 \
-		redox_users-0.4.3 \
-		regex-1.6.0 \
-		regex-automata-0.1.10 \
-		regex-syntax-0.6.27 \
-		renderdoc-sys-0.7.1 \
-		ringbuf-0.2.8 \
-		robust-0.2.3 \
-		ron-0.7.1 \
-		rustc-hash-1.1.0 \
-		rusty-xinput-1.2.0 \
-		ryu-1.0.11 \
-		safe_arch-0.6.0 \
-		same-file-1.0.6 \
-		scoped-tls-1.0.0 \
-		scopeguard-1.1.0 \
-		self_cell-0.10.2 \
-		serde-1.0.144 \
-		serde_derive-1.0.144 \
-		serde_yaml-0.9.10 \
-		sha1_smol-1.0.0 \
-		sharded-slab-0.1.4 \
-		shlex-1.1.0 \
-		simba-0.7.2 \
-		slab-0.4.7 \
-		slotmap-1.0.6 \
-		smallvec-1.9.0 \
-		smithay-client-toolkit-0.15.4 \
-		spade-2.0.0 \
-		spirv-0.2.0+1.5.4 \
-		stdweb-0.1.3 \
-		str-buf-1.0.6 \
-		strsim-0.8.0 \
-		strsim-0.10.0 \
-		structopt-0.3.26 \
-		structopt-derive-0.4.18 \
-		svg_fmt-0.4.1 \
-		symphonia-0.5.1 \
-		symphonia-bundle-mp3-0.5.1 \
-		symphonia-codec-vorbis-0.5.1 \
-		symphonia-core-0.5.1 \
-		symphonia-format-ogg-0.5.1 \
-		symphonia-metadata-0.5.1 \
-		symphonia-utils-xiph-0.5.1 \
-		syn-1.0.99 \
-		sys-locale-0.2.1 \
-		taffy-0.1.0 \
-		termcolor-1.1.3 \
-		textwrap-0.11.0 \
-		thiserror-1.0.32 \
-		thiserror-impl-1.0.32 \
-		thread_local-1.1.4 \
-		tiff-0.6.1 \
-		tinystr-0.3.4 \
-		tinyvec-1.6.0 \
-		tinyvec_macros-0.1.0 \
-		toml-0.5.9 \
-		tracing-0.1.36 \
-		tracing-attributes-0.1.22 \
-		tracing-core-0.1.29 \
-		tracing-log-0.1.3 \
-		tracing-subscriber-0.3.15 \
-		tracing-wasm-0.2.1 \
-		ttf-parser-0.15.2 \
-		type-map-0.4.0 \
-		typenum-1.15.0 \
-		unic-langid-0.9.0 \
-		unic-langid-impl-0.9.0 \
-		unicode-bidi-0.3.8 \
-		unicode-ident-1.0.3 \
-		unicode-normalization-0.1.21 \
-		unicode-segmentation-1.9.0 \
-		unicode-width-0.1.9 \
-		unicode-xid-0.2.3 \
-		unsafe-libyaml-0.2.2 \
-		url-2.2.2 \
-		uuid-1.1.2 \
-		valuable-0.1.0 \
-		vec_map-0.8.2 \
-		version_check-0.9.4 \
-		waker-fn-1.1.0 \
-		walkdir-2.3.2 \
-		wasi-0.11.0+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.82 \
-		wasm-bindgen-backend-0.2.82 \
-		wasm-bindgen-futures-0.4.32 \
-		wasm-bindgen-macro-0.2.82 \
-		wasm-bindgen-macro-support-0.2.82 \
-		wasm-bindgen-shared-0.2.82 \
-		wayland-client-0.29.5 \
-		wayland-commons-0.29.5 \
-		wayland-cursor-0.29.5 \
-		wayland-protocols-0.29.5 \
-		wayland-scanner-0.29.5 \
-		wayland-sys-0.29.5 \
-		web-sys-0.3.59 \
-		webbrowser-0.7.1 \
-		weezl-0.1.7 \
-		wgpu-0.13.1 \
-		wgpu-core-0.13.2 \
-		wgpu-hal-0.13.2 \
-		wgpu-types-0.13.2 \
-		wide-0.7.4 \
-		widestring-0.5.1 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-wsapoll-0.1.1 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		windows-sys-0.36.1 \
-		windows_aarch64_msvc-0.36.1 \
-		windows_i686_gnu-0.36.1 \
-		windows_i686_msvc-0.36.1 \
-		windows_x86_64_gnu-0.36.1 \
-		windows_x86_64_msvc-0.36.1 \
-		winit-0.26.1 \
-		x11-dl-2.20.0 \
-		x11rb-0.9.0 \
-		xcursor-0.3.4 \
-		xi-unicode-0.3.0 \
-		xml-rs-0.8.4
-
 post-patch:
 # Search assets under PREFIX instead of current directory
 	@${REINPLACE_CMD} 's,assets",../${DATADIR_REL}/&,' \
diff --git a/games/punchy/Makefile.crates b/games/punchy/Makefile.crates
new file mode 100644
index 000000000000..f43dfd5e51df
--- /dev/null
+++ b/games/punchy/Makefile.crates
@@ -0,0 +1,421 @@
+CARGO_CRATES=	ab_glyph-0.2.16 \
+		ab_glyph_rasterizer-0.1.5 \
+		adler-1.0.2 \
+		adler32-1.2.0 \
+		ahash-0.7.6 \
+		aho-corasick-0.7.18 \
+		alsa-0.6.0 \
+		alsa-sys-0.3.1 \
+		android_log-sys-0.2.0 \
+		android_logger-0.10.1 \
+		android_system_properties-0.1.4 \
+		ansi_term-0.12.1 \
+		anyhow-1.0.62 \
+		approx-0.5.1 \
+		arboard-2.1.1 \
+		arrayvec-0.7.2 \
+		ash-0.37.0+1.3.209 \
+		async-channel-1.7.1 \
+		async-executor-1.4.1 \
+		async-task-4.3.0 \
+		atomic-arena-0.1.1 \
+		atomic_refcell-0.1.8 \
+		atty-0.2.14 \
+		autocfg-1.1.0 \
+		base64-0.13.0 \
+		bevy-0.8.1 \
+		bevy-inspector-egui-0.12.1 \
+		bevy-inspector-egui-derive-0.12.0 \
+		bevy-inspector-egui-rapier-0.5.0 \
+		bevy-parallax-0.2.0 \
+		bevy_app-0.8.1 \
+		bevy_asset-0.8.1 \
+		bevy_core-0.8.1 \
+		bevy_core_pipeline-0.8.1 \
+		bevy_derive-0.8.1 \
+		bevy_diagnostic-0.8.1 \
+		bevy_ecs-0.8.1 \
+		bevy_ecs_macros-0.8.1 \
+		bevy_egui-0.15.1 \
+		bevy_encase_derive-0.8.1 \
+		bevy_fluent-0.4.0 \
+		bevy_gilrs-0.8.1 \
+		bevy_hierarchy-0.8.1 \
+		bevy_input-0.8.1 \
+		bevy_internal-0.8.1 \
+		bevy_kira_audio-0.11.0 \
+		bevy_log-0.8.1 \
+		bevy_macro_utils-0.8.1 \
+		bevy_math-0.8.1 \
+		bevy_mikktspace-0.8.1 \
+		bevy_mod_debugdump-0.5.0 \
+		bevy_pbr-0.8.1 \
+		bevy_ptr-0.8.1 \
+		bevy_rapier2d-0.16.2 \
+		bevy_reflect-0.8.1 \
+		bevy_reflect_derive-0.8.1 \
+		bevy_render-0.8.1 \
+		bevy_render_macros-0.8.1 \
+		bevy_scene-0.8.1 \
+		bevy_sprite-0.8.1 \
+		bevy_tasks-0.8.1 \
+		bevy_text-0.8.1 \
+		bevy_time-0.8.1 \
+		bevy_transform-0.8.1 \
+		bevy_ui-0.8.1 \
+		bevy_utils-0.8.1 \
+		bevy_window-0.8.1 \
+		bevy_winit-0.8.1 \
+		bindgen-0.59.2 \
+		bit-set-0.5.3 \
+		bit-vec-0.6.3 \
+		bitflags-1.3.2 \
+		block-0.1.6 \
+		bstr-0.2.17 \
+		bumpalo-3.11.0 \
+		bytemuck-1.12.1 \
+		bytemuck_derive-1.2.1 \
+		byteorder-1.4.3 \
+		bytes-1.2.1 \
+		cache-padded-1.2.0 \
+		calloop-0.9.3 \
+		cc-1.0.73 \
+		cesu8-1.1.0 \
+		cexpr-0.6.0 \
+		cfg-if-0.1.10 \
+		cfg-if-1.0.0 \
+		cfg_aliases-0.1.1 \
+		clang-sys-1.3.3 \
+		clap-2.34.0 \
+		clipboard-win-4.4.2 \
+		cocoa-0.24.0 \
+		cocoa-foundation-0.1.0 \
+		codespan-reporting-0.11.1 \
+		color_quant-1.1.0 \
+		combine-4.6.6 \
+		concurrent-queue-1.2.4 \
+		console_error_panic_hook-0.1.7 \
+		const_panic-0.2.4 \
+		copyless-0.1.5 \
+		core-foundation-0.7.0 \
+		core-foundation-0.9.3 \
+		core-foundation-sys-0.7.0 \
+		core-foundation-sys-0.8.3 \
+		core-graphics-0.19.2 \
+		core-graphics-0.22.3 \
+		core-graphics-types-0.1.1 \
+		core-video-sys-0.1.4 \
+		coreaudio-rs-0.10.0 \
+		coreaudio-sys-0.2.10 \
+		cpal-0.13.5 \
+		crc32fast-1.3.2 \
+		crossbeam-0.8.2 \
+		crossbeam-channel-0.5.6 \
+		crossbeam-deque-0.8.2 \
+		crossbeam-epoch-0.9.10 \
+		crossbeam-queue-0.3.6 \
+		crossbeam-utils-0.8.11 \
+		cstr_core-0.2.6 \
+		cty-0.2.2 \
+		d3d12-0.5.0 \
+		darling-0.13.4 \
+		darling_core-0.13.4 \
+		darling_macro-0.13.4 \
+		deflate-0.8.6 \
+		deflate-1.0.0 \
+		derive_more-0.99.17 \
+		directories-4.0.1 \
+		dirs-sys-0.3.7 \
+		dispatch-0.2.0 \
+		dlib-0.5.0 \
+		downcast-rs-1.2.0 \
+		egui-0.18.1 \
+		egui_extras-0.18.0 \
+		either-1.8.0 \
+		emath-0.18.0 \
+		encase-0.3.0 \
+		encase_derive-0.3.0 \
+		encase_derive_impl-0.3.0 \
+		encoding_rs-0.8.31 \
+		env_logger-0.8.4 \
+		epaint-0.18.1 \
+		erased-serde-0.3.23 \
+		error-code-2.3.1 \
+		euclid-0.22.7 \
+		event-listener-2.5.3 \
+		fastrand-1.8.0 \
+		filetime-0.2.17 \
+		fixedbitset-0.4.2 \
+		fluent-0.16.0 \
+		fluent-bundle-0.15.2 \
+		fluent-langneg-0.13.0 \
+		fluent-syntax-0.11.0 \
+		fnv-1.0.7 \
+		foreign-types-0.3.2 \
+		foreign-types-shared-0.1.1 \
+		form_urlencoded-1.0.1 \
+		fsevent-sys-4.1.0 \
+		futures-core-0.3.24 \
+		futures-io-0.3.24 \
+		futures-lite-1.12.0 \
+		fxhash-0.2.1 \
+		gethostname-0.2.3 \
+		getrandom-0.2.7 \
+		gilrs-0.9.0 \
+		gilrs-core-0.4.1 \
+		glam-0.21.3 \
+		glob-0.3.0 \
+		globset-0.4.9 \
+		glow-0.11.2 \
+		glyph_brush_layout-0.2.3 \
+		gpu-alloc-0.5.3 \
+		gpu-alloc-types-0.2.0 \
+		gpu-descriptor-0.2.3 \
+		gpu-descriptor-types-0.1.1 \
+		guillotiere-0.6.2 \
+		hash32-0.2.1 \
+		hash32-derive-0.1.1 \
+		hashbrown-0.12.3 \
+		heck-0.3.3 \
+		hermit-abi-0.1.19 \
+		hex-0.4.3 \
+		hexasphere-7.2.0 \
+		hexf-parse-0.2.1 \
+		ident_case-1.0.1 \
+		idna-0.2.3 \
+		image-0.23.14 \
+		image-0.24.3 \
+		indexmap-1.9.1 \
+		inotify-0.9.6 \
+		inotify-sys-0.1.5 \
+		inplace_it-0.3.4 \
+		instant-0.1.12 \
+		intl-memoizer-0.5.1 \
+		intl_pluralrules-7.0.1 \
+		io-kit-sys-0.2.0 \
+		itertools-0.10.3 \
+		itoa-1.0.3 \
+		iyes_loopless-0.7.1 \
+		jni-0.19.0 \
+		jni-sys-0.3.0 \
+		jobserver-0.1.24 \
+		jpeg-decoder-0.1.22 \
+		js-sys-0.3.59 \
+		khronos-egl-4.1.0 \
+		kira-0.6.1 \
+		kqueue-1.0.6 \
+		kqueue-sys-1.0.3 \
+		lazy_static-1.4.0 \
+		lazycell-1.3.0 \
+		leafwing-input-manager-0.5.2 \
+		leafwing_input_manager_macros-0.5.0 \
+		libc-0.2.132 \
+		libloading-0.7.3 \
+		libm-0.2.5 \
+		libudev-sys-0.1.4 \
+		lock_api-0.4.8 \
+		log-0.4.17 \
+		mach-0.3.2 \
+		malloc_buf-0.0.6 \
+		matchers-0.1.0 \
+		matches-0.1.9 \
+		matrixmultiply-0.3.2 \
+		memchr-2.5.0 \
+		memmap2-0.3.1 \
+		memoffset-0.6.5 \
+		metal-0.24.0 \
+		minimal-lexical-0.2.1 \
+		miniz_oxide-0.3.7 \
+		miniz_oxide-0.4.4 \
+		miniz_oxide-0.5.3 \
+		mio-0.8.4 \
+		naga-0.9.0 \
+		nalgebra-0.31.1 \
+		nalgebra-macros-0.1.0 \
+		ndk-0.5.0 \
+		ndk-0.6.0 \
+		ndk-context-0.1.1 \
+		ndk-glue-0.5.2 \
+		ndk-glue-0.6.2 \
+		ndk-macro-0.3.0 \
+		ndk-sys-0.2.2 \
+		ndk-sys-0.3.0 \
+		nix-0.22.3 \
+		nix-0.23.1 \
+		nix-0.24.2 \
+		nohash-hasher-0.2.0 \
+		nom-7.1.1 \
+		notify-5.0.0-pre.15 \
+		num-complex-0.4.2 \
+		num-derive-0.3.3 \
+		num-integer-0.1.45 \
+		num-iter-0.1.43 \
+		num-rational-0.3.2 \
+		num-rational-0.4.1 \
+		num-traits-0.2.15 \
+		num_cpus-1.13.1 \
+		num_enum-0.5.7 \
+		num_enum_derive-0.5.7 \
+		objc-0.2.7 \
+		objc-foundation-0.1.1 \
+		objc_exception-0.1.2 \
+		objc_id-0.1.1 \
+		oboe-0.4.6 \
+		oboe-sys-0.4.5 \
+		once_cell-1.13.1 \
+		optional-0.5.0 \
+		owned_ttf_parser-0.15.1 \
+		parking-2.0.0 \
+		parking_lot-0.11.2 \
+		parking_lot-0.12.1 \
+		parking_lot_core-0.8.5 \
+		parking_lot_core-0.9.3 \
+		parry2d-0.9.0 \
+		paste-1.0.8 \
+		peeking_take_while-0.1.2 \
+		percent-encoding-2.1.0 \
+		petgraph-0.6.2 \
+		petitset-0.2.1 \
+		pin-project-lite-0.2.9 \
+		pkg-config-0.3.25 \
+		png-0.16.8 \
+		png-0.17.5 \
+		pp-rs-0.2.1 \
+		ppv-lite86-0.2.16 \
+		pretty-type-name-1.0.0 \
+		proc-macro-crate-1.2.1 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.43 \
+		profiling-1.0.6 \
+		quote-1.0.21 \
+		radsort-0.1.0 \
+		rand-0.8.5 \
+		rand_chacha-0.3.1 \
+		rand_core-0.6.3 \
+		range-alloc-0.1.2 \
+		rapier2d-0.14.0 \
+		raw-window-handle-0.4.3 \
+		rawpointer-0.2.1 \
+		rectangle-pack-0.4.2 \
+		redox_syscall-0.2.16 \
+		redox_users-0.4.3 \
+		regex-1.6.0 \
+		regex-automata-0.1.10 \
+		regex-syntax-0.6.27 \
+		renderdoc-sys-0.7.1 \
+		ringbuf-0.2.8 \
+		robust-0.2.3 \
+		ron-0.7.1 \
+		rustc-hash-1.1.0 \
+		rusty-xinput-1.2.0 \
+		ryu-1.0.11 \
+		safe_arch-0.6.0 \
+		same-file-1.0.6 \
+		scoped-tls-1.0.0 \
+		scopeguard-1.1.0 \
+		self_cell-0.10.2 \
+		serde-1.0.144 \
+		serde_derive-1.0.144 \
+		serde_yaml-0.9.10 \
+		sha1_smol-1.0.0 \
+		sharded-slab-0.1.4 \
+		shlex-1.1.0 \
+		simba-0.7.2 \
+		slab-0.4.7 \
+		slotmap-1.0.6 \
+		smallvec-1.9.0 \
+		smithay-client-toolkit-0.15.4 \
+		spade-2.0.0 \
+		spirv-0.2.0+1.5.4 \
+		stdweb-0.1.3 \
+		str-buf-1.0.6 \
+		strsim-0.8.0 \
+		strsim-0.10.0 \
+		structopt-0.3.26 \
+		structopt-derive-0.4.18 \
+		svg_fmt-0.4.1 \
+		symphonia-0.5.1 \
+		symphonia-bundle-mp3-0.5.1 \
+		symphonia-codec-vorbis-0.5.1 \
+		symphonia-core-0.5.1 \
+		symphonia-format-ogg-0.5.1 \
+		symphonia-metadata-0.5.1 \
+		symphonia-utils-xiph-0.5.1 \
+		syn-1.0.99 \
+		sys-locale-0.2.1 \
+		taffy-0.1.0 \
+		termcolor-1.1.3 \
+		textwrap-0.11.0 \
+		thiserror-1.0.32 \
+		thiserror-impl-1.0.32 \
+		thread_local-1.1.4 \
+		tiff-0.6.1 \
+		tinystr-0.3.4 \
+		tinyvec-1.6.0 \
+		tinyvec_macros-0.1.0 \
+		toml-0.5.9 \
+		tracing-0.1.36 \
+		tracing-attributes-0.1.22 \
+		tracing-core-0.1.29 \
+		tracing-log-0.1.3 \
+		tracing-subscriber-0.3.15 \
+		tracing-wasm-0.2.1 \
+		ttf-parser-0.15.2 \
+		type-map-0.4.0 \
+		typenum-1.15.0 \
+		unic-langid-0.9.0 \
+		unic-langid-impl-0.9.0 \
+		unicode-bidi-0.3.8 \
+		unicode-ident-1.0.3 \
+		unicode-normalization-0.1.21 \
+		unicode-segmentation-1.9.0 \
+		unicode-width-0.1.9 \
+		unicode-xid-0.2.3 \
+		unsafe-libyaml-0.2.2 \
+		url-2.2.2 \
+		uuid-1.1.2 \
+		valuable-0.1.0 \
+		vec_map-0.8.2 \
+		version_check-0.9.4 \
+		waker-fn-1.1.0 \
+		walkdir-2.3.2 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.82 \
+		wasm-bindgen-backend-0.2.82 \
+		wasm-bindgen-futures-0.4.32 \
+		wasm-bindgen-macro-0.2.82 \
+		wasm-bindgen-macro-support-0.2.82 \
+		wasm-bindgen-shared-0.2.82 \
+		wayland-client-0.29.5 \
+		wayland-commons-0.29.5 \
+		wayland-cursor-0.29.5 \
+		wayland-protocols-0.29.5 \
+		wayland-scanner-0.29.5 \
+		wayland-sys-0.29.5 \
+		web-sys-0.3.59 \
+		webbrowser-0.7.1 \
+		weezl-0.1.7 \
+		wgpu-0.13.1 \
+		wgpu-core-0.13.2 \
+		wgpu-hal-0.13.2 \
+		wgpu-types-0.13.2 \
+		wide-0.7.4 \
+		widestring-0.5.1 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-wsapoll-0.1.1 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		windows-sys-0.36.1 \
+		windows_aarch64_msvc-0.36.1 \
+		windows_i686_gnu-0.36.1 \
+		windows_i686_msvc-0.36.1 \
+		windows_x86_64_gnu-0.36.1 \
+		windows_x86_64_msvc-0.36.1 \
+		winit-0.26.1 \
+		x11-dl-2.20.0 \
+		x11rb-0.9.0 \
+		xcursor-0.3.4 \
+		xi-unicode-0.3.0 \
+		xml-rs-0.8.4
diff --git a/games/veloren/Makefile b/games/veloren/Makefile
index 8741ea71d1b6..61a958fded1f 100644
--- a/games/veloren/Makefile
+++ b/games/veloren/Makefile
@@ -35,717 +35,6 @@ PLIST_FILES=	bin/${PORTNAME}-server-cli \
 		share/pixmaps/net.veloren.veloren.png
 PORTDATA=	*
 
-CARGO_CRATES=	ab_glyph-0.2.15 \
-		ab_glyph_rasterizer-0.1.5 \
-		addr2line-0.17.0 \
-		adler-1.0.2 \
-		adler32-1.2.0 \
-		ahash-0.3.8 \
-		ahash-0.4.7 \
-		ahash-0.7.6 \
-		aho-corasick-0.7.18 \
-		alsa-0.6.0 \
-		alsa-sys-0.3.1 \
-		andrew-0.3.1 \
-		ansi-parser-0.8.0 \
-		ansi_term-0.12.1 \
-		approx-0.3.2 \
-		approx-0.4.0 \
-		approx-0.5.1 \
-		arr_macro-0.1.3 \
-		arr_macro_impl-0.1.3 \
-		arrayref-0.3.6 \
-		arrayvec-0.5.2 \
-		arrayvec-0.7.2 \
-		as-slice-0.1.5 \
-		ash-0.32.1 \
-		assets_manager-0.8.1 \
-		async-channel-1.6.1 \
-		async-trait-0.1.53 \
-		atom-0.3.6 \
-		atomic_refcell-0.1.8 \
-		atomicwrites-0.3.1 \
-		atty-0.2.14 \
-		autocfg-1.1.0 \
-		backtrace-0.3.65 \
-		base-x-0.2.8 \
-		base64-0.13.0 \
-		bincode-1.3.3 \
-		bindgen-0.56.0 \
-		bit-set-0.5.2 \
-		bit-vec-0.6.3 \
-		bitflags-1.3.2 \
-		bitvec-0.22.3 \
-		blake2b_simd-0.5.11 \
-		block-0.1.6 \
-		block-buffer-0.10.2 \
-		bstr-0.2.17 \
-		bumpalo-3.9.1 \
-		bytecheck-0.6.7 \
-		bytecheck_derive-0.6.7 \
-		bytemuck-1.9.1 \
-		bytemuck_derive-1.1.0 \
-		byteorder-1.4.3 \
-		bytes-1.1.0 \
-		cache-padded-1.2.0 \
-		calloop-0.6.5 \
-		cassowary-0.3.0 \
-		cast-0.2.7 \
-		cc-1.0.73 \
-		cesu8-1.1.0 \
-		cexpr-0.4.0 \
-		cfg-if-0.1.10 \
-		cfg-if-1.0.0 \
-		cfg_aliases-0.1.1 \
-		chrono-0.4.19 \
-		chrono-tz-0.6.1 \
-		chrono-tz-build-0.0.2 \
-		chumsky-0.8.0 \
-		clang-sys-1.3.1 \
-		clap-2.34.0 \
-		clap-3.1.10 \
-		clap_derive-3.1.7 \
-		clap_lex-0.1.1 \
-		clipboard-win-3.1.1 \
-		clipboard-win-4.4.1 \
-		clipboard_macos-0.1.0 \
-		clipboard_wayland-0.2.0 \
-		clipboard_x11-0.3.1 \
-		cloudabi-0.0.3 \
-		cmake-0.1.45 \
-		cocoa-0.24.0 \
-		cocoa-foundation-0.1.0 \
-		codespan-reporting-0.11.1 \
-		color_quant-1.1.0 \
-		combine-4.6.3 \
-		concurrent-queue-1.2.2 \
-		const-random-0.1.13 \
-		const-random-macro-0.1.13 \
-		constant_time_eq-0.1.5 \
-		copy_dir-0.1.2 \
-		copyless-0.1.5 \
-		copypasta-0.7.1 \
-		core-foundation-0.6.4 \
-		core-foundation-0.7.0 \
-		core-foundation-0.9.3 \
-		core-foundation-sys-0.6.2 \
-		core-foundation-sys-0.7.0 \
-		core-foundation-sys-0.8.3 \
-		core-graphics-0.19.2 \
-		core-graphics-0.22.3 \
-		core-graphics-types-0.1.1 \
-		core-video-sys-0.1.4 \
-		coreaudio-rs-0.10.0 \
-		coreaudio-sys-0.2.9 \
-		cpal-0.13.5 \
-		cpufeatures-0.2.2 \
-		cranelift-bforest-0.76.0 \
-		cranelift-codegen-0.76.0 \
-		cranelift-codegen-meta-0.76.0 \
-		cranelift-codegen-shared-0.76.0 \
-		cranelift-entity-0.76.0 \
-		cranelift-frontend-0.76.0 \
-		crc32fast-1.3.2 \
-		criterion-0.3.4 \
-		criterion-plot-0.4.4 \
-		crossbeam-0.8.1 \
-		crossbeam-channel-0.5.4 \
-		crossbeam-deque-0.7.4 \
-		crossbeam-deque-0.8.1 \
-		crossbeam-epoch-0.8.2 \
-		crossbeam-epoch-0.9.8 \
-		crossbeam-queue-0.3.5 \
-		crossbeam-utils-0.7.2 \
-		crossbeam-utils-0.8.8 \
-		crossterm-0.17.7 \
-		crossterm-0.23.2 \
-		crossterm_winapi-0.6.2 \
-		crossterm_winapi-0.9.0 \
-		crunchy-0.2.2 \
-		crypto-common-0.1.3 \
-		csv-1.1.6 \
-		csv-core-0.1.10 \
-		ct-logs-0.8.0 \
-		cty-0.2.2 \
-		d3d12-0.4.1 \
-		daggy-0.5.0 \
-		darling-0.10.2 \
-		darling-0.13.2 \
-		darling_core-0.10.2 \
-		darling_core-0.13.2 \
-		darling_macro-0.10.2 \
-		darling_macro-0.13.2 \
-		deflate-1.0.0 \
-		deunicode-1.3.1 \
-		digest-0.10.3 \
-		directories-next-2.0.0 \
-		dirs-4.0.0 \
-		dirs-next-2.0.0 \
-		dirs-sys-0.3.7 \
-		dirs-sys-next-0.1.2 \
-		discard-1.0.4 \
-		dispatch-0.1.4 \
-		dispatch-0.2.0 \
-		dlib-0.4.2 \
-		dlib-0.5.0 \
-		dot_vox-4.1.0 \
-		downcast-rs-1.2.0 \
-		egui-0.12.0 \
-		egui_winit_platform-0.8.0 \
-		either-1.6.1 \
-		emath-0.12.0 \
-		endian-type-0.1.2 \
-		enum-iterator-0.7.0 \
-		enum-iterator-derive-0.7.0 \
-		enumset-1.0.9 \
-		enumset_derive-0.5.6 \
-		env_logger-0.8.4 \
-		epaint-0.12.0 \
-		epi-0.12.0 \
-		errno-0.2.8 \
-		errno-dragonfly-0.1.2 \
-		error-code-2.3.1 \
-		etagere-0.2.7 \
-		euc-0.5.3 \
-		euclid-0.22.7 \
-		event-listener-2.5.2 \
-		fallible-iterator-0.2.0 \
-		fallible-streaming-iterator-0.1.9 \
-		fastrand-1.7.0 \
-		fd-lock-3.0.5 \
-		fehler-1.0.0 \
-		fehler-macros-1.0.0 \
-		filetime-0.2.15 \
-		find_folder-0.3.0 \
-		fixedbitset-0.1.9 \
-		fixedbitset-0.2.0 \
-		fixedbitset-0.4.1 \
-		flate2-1.0.24 \
-		float-cmp-0.9.0 \
-		fnv-1.0.7 \
-		foreign-types-0.3.2 \
-		foreign-types-shared-0.1.1 \
-		form_urlencoded-1.0.1 \
-		fsevent-sys-4.1.0 \
-		funty-1.2.0 \
-		futures-0.3.21 \
-		futures-channel-0.3.21 \
-		futures-core-0.3.21 \
-		futures-executor-0.3.21 \
-		futures-io-0.3.21 \
-		futures-macro-0.3.21 \
-		futures-sink-0.3.21 \
-		futures-task-0.3.21 \
-		futures-util-0.3.21 \
-		fxhash-0.2.1 \
-		generator-0.7.0 \
-		generic-array-0.12.4 \
-		generic-array-0.13.3 \
-		generic-array-0.14.5 \
-		gethostname-0.2.3 \
-		getrandom-0.1.16 \
-		getrandom-0.2.6 \
-		gilrs-0.8.2 \
-		gilrs-core-0.3.2 \
-		gimli-0.25.0 \
-		gimli-0.26.1 \
-		git2-0.14.2 \
-		glam-0.10.2 \
-		glob-0.3.0 \
-		glow-0.9.0 \
-		glyph_brush-0.7.3 \
-		glyph_brush_draw_cache-0.1.5 \
-		glyph_brush_layout-0.2.3 \
-		gpu-alloc-0.4.7 \
-		gpu-alloc-types-0.2.0 \
-		gpu-descriptor-0.1.1 \
-		gpu-descriptor-types-0.1.1 \
-		guillotiere-0.6.2 \
-		h2-0.3.13 \
-		half-1.8.2 \
-		hash32-0.1.1 \
-		hashbrown-0.9.1 \
-		hashbrown-0.11.2 \
-		hashbrown-0.12.0 \
-		hashlink-0.6.0 \
-		heapless-0.5.6 \
-		heapless-0.6.1 \
-		heck-0.3.3 \
-		heck-0.4.0 \
-		hermit-abi-0.1.19 \
-		hex-0.3.2 \
-		hibitset-0.6.3 \
-		http-0.2.6 \
-		http-body-0.4.4 \
-		httparse-1.6.0 \
-		httpdate-1.0.2 \
-		humantime-2.1.0 \
-		hyper-0.14.18 \
-		hyper-rustls-0.22.1 \
-		ident_case-1.0.1 \
-		idna-0.2.3 \
-		image-0.24.2 \
-		indexmap-1.8.1 \
-		inline_tweak-1.0.8 \
-		inotify-0.9.6 \
-		inotify-sys-0.1.5 \
-		inplace_it-0.3.3 \
-		instant-0.1.12 \
-		io-kit-sys-0.1.0 \
-		io-lifetimes-0.6.1 \
-		itertools-0.10.3 \
-		itoa-0.4.8 \
-		itoa-1.0.1 \
-		jni-0.19.0 \
-		jni-sys-0.3.0 \
-		jobserver-0.1.24 \
-		jpeg-decoder-0.2.6 \
-		js-sys-0.3.56 \
-		kernel32-sys-0.2.2 \
-		khronos-egl-4.1.0 \
-		kiddo-0.1.7 \
-		kiddo-0.2.4 \
-		kqueue-1.0.4 \
-		kqueue-sys-1.0.3 \
-		lazy-bytes-cast-5.0.1 \
-		lazy_static-1.4.0 \
-		lazycell-1.3.0 \
-		leb128-0.2.5 \
-		lewton-0.10.2 \
-		libc-0.2.121 \
-		libgit2-sys-0.13.2+1.4.2 \
-		libloading-0.6.7 \
-		libloading-0.7.3 \
-		libm-0.1.4 \
-		libm-0.2.2 \
-		libmimalloc-sys-0.1.25 \
-		libsqlite3-sys-0.20.1 \
-		libudev-sys-0.1.4 \
-		libz-sys-1.1.5 \
-		linked-hash-map-0.5.4 \
-		linux-raw-sys-0.0.42 \
-		lock_api-0.3.4 \
-		lock_api-0.4.7 \
-		log-0.4.16 \
-		loom-0.5.4 \
-		loupe-0.1.3 \
-		loupe-derive-0.1.3 \
-		lz-fear-0.1.1 \
-		mach-0.2.3 \
-		mach-0.3.2 \
-		malloc_buf-0.0.6 \
-		matchers-0.1.0 \
-		matches-0.1.9 \
-		maybe-uninit-2.0.0 \
-		memchr-2.4.1 \
-		memmap-0.7.0 \
-		memmap2-0.1.0 \
-		memmap2-0.3.1 \
-		memmap2-0.5.3 \
-		memoffset-0.5.6 \
-		memoffset-0.6.5 \
-		metal-0.22.0 \
-		mimalloc-0.1.29 \
-		minifb-0.22.0 \
-		minimal-lexical-0.2.1 \
-		miniz_oxide-0.5.1 \
-		mio-0.7.14 \
-		mio-0.8.2 \
-		mio-misc-1.2.2 \
-		miow-0.3.7 \
-		mopa-0.2.2 \
-		more-asserts-0.2.2 \
-		mumble-link-0.1.0 \
-		native-dialog-0.6.3 \
-		ndk-0.3.0 \
-		ndk-0.6.0 \
-		ndk-context-0.1.0 \
-		ndk-glue-0.3.0 \
-		ndk-glue-0.6.1 \
-		ndk-macro-0.2.0 \
-		ndk-macro-0.3.0 \
-		ndk-sys-0.2.2 \
-		ndk-sys-0.3.0 \
-		nibble_vec-0.1.0 \
-		nix-0.18.0 \
-		nix-0.20.0 \
-		nix-0.22.3 \
-		nix-0.23.1 \
-		noise-0.7.0 \
-		nom-4.2.3 \
-		nom-5.1.2 \
-		nom-7.1.1 \
-		notify-5.0.0-pre.15 \
-		ntapi-0.3.7 \
-		num-0.2.1 \
-		num-0.4.0 \
-		num-bigint-0.2.6 \
-		num-bigint-0.4.3 \
-		num-complex-0.2.4 \
-		num-complex-0.4.0 \
-		num-derive-0.3.3 \
-		num-integer-0.1.44 \
-		num-iter-0.1.42 \
-		num-rational-0.2.4 \
-		num-rational-0.4.0 \
-		num-traits-0.2.14 \
-		num_cpus-1.13.1 \
-		num_enum-0.5.7 \
-		num_enum_derive-0.5.7 \
-		num_threads-0.1.5 \
-		objc-0.2.7 \
-		objc-foundation-0.1.1 \
-		objc_exception-0.1.2 \
-		objc_id-0.1.1 \
-		object-0.28.3 \
-		oboe-0.4.5 \
-		oboe-sys-0.4.5 \
-		ogg-0.8.0 \
-		once_cell-1.10.0 \
-		oorandom-11.1.3 \
-		openssl-probe-0.1.5 \
-		orbclient-0.3.32 \
-		ordered-float-1.1.1 \
-		ordered-float-2.10.0 \
-		ordered-float-3.0.0 \
-		os_str_bytes-6.0.0 \
-		owned_ttf_parser-0.6.0 \
-		owned_ttf_parser-0.15.0 \
-		packed_simd_2-0.3.8 \
-		parking_lot-0.10.2 \
-		parking_lot-0.11.2 \
-		parking_lot-0.12.0 \
-		parking_lot_core-0.7.2 \
-		parking_lot_core-0.8.5 \
-		parking_lot_core-0.9.2 \
-		parse-zoneinfo-0.3.0 \
-		pdqselect-0.1.0 \
-		peeking_take_while-0.1.2 \
-		pem-1.0.2 \
-		percent-encoding-2.1.0 \
-		petgraph-0.4.13 \
-		petgraph-0.5.1 \
-		petgraph-0.6.0 \
-		phf-0.10.1 \
-		phf_codegen-0.10.0 \
-		phf_generator-0.10.0 \
-		phf_shared-0.10.0 \
-		pin-project-lite-0.2.8 \
-		pin-utils-0.1.0 \
-		piston-float-0.3.0 \
-		piston-viewport-0.5.0 \
-		pistoncore-input-0.24.0 \
-		pkg-config-0.3.25 \
-		plotters-0.3.0 \
-		plotters-backend-0.3.2 \
-		plotters-svg-0.3.1 \
-		png-0.17.5 \
-		ppv-lite86-0.2.16 \
-		proc-macro-crate-0.1.5 \
-		proc-macro-crate-1.1.3 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro-hack-0.5.19 \
-		proc-macro2-0.4.30 \
-		proc-macro2-1.0.40 \
-		profiling-1.0.6 \
-		profiling-procmacros-1.0.6 \
-		prometheus-0.13.0 \
-		prometheus-hyper-0.1.4 \
-		ptr_meta-0.1.4 \
-		ptr_meta_derive-0.1.4 \
-		quick-xml-0.22.0 \
-		quinn-0.8.2 \
-		quinn-proto-0.8.2 \
-		quinn-udp-0.1.1 \
-		quote-0.6.13 \
-		quote-1.0.20 \
-		radium-0.6.2 \
-		radix_trie-0.2.1 \
-		rand-0.7.3 \
-		rand-0.8.5 \
-		rand_chacha-0.2.2 \
-		rand_chacha-0.3.1 \
-		rand_core-0.5.1 \
-		rand_core-0.6.3 \
-		rand_distr-0.4.3 \
-		rand_hc-0.2.0 \
-		rand_xorshift-0.2.0 \
-		raw-window-handle-0.3.4 \
-		raw-window-handle-0.4.3 \
-		rayon-1.5.1 \
-		rayon-core-1.9.1 \
-		rcgen-0.9.2 \
-		redox_syscall-0.1.57 \
-		redox_syscall-0.2.13 \
-		redox_users-0.4.3 \
-		regalloc-0.0.31 \
-		regex-1.5.5 \
-		regex-automata-0.1.10 \
-		regex-syntax-0.6.25 \
-		region-3.0.0 \
-		remove_dir_all-0.5.3 \
-		rend-0.3.6 \
-		renderdoc-sys-0.7.1 \
-		ring-0.16.20 \
-		rkyv-0.7.37 \
-		rkyv_derive-0.7.37 \
-		rodio-0.15.0 \
-		ron-0.6.6 \
-		ron-0.7.0 \
-		roots-0.0.6 \
-		rose_tree-0.2.0 \
-		roxmltree-0.14.1 \
-		rstar-0.9.2 \
-		rusqlite-0.24.2 \
-		rust-argon2-0.8.3 \
-		rustc-demangle-0.1.21 \
-		rustc-hash-1.1.0 \
-		rustc_version-0.2.3 \
-		rustc_version-0.4.0 \
-		rustix-0.34.1 \
-		rustls-0.19.1 \
-		rustls-0.20.4 \
-		rustls-native-certs-0.5.0 \
-		rustls-native-certs-0.6.1 \
-		rustls-pemfile-0.2.1 \
-		rustls-pemfile-1.0.0 \
-		rusttype-0.7.9 \
-		rusttype-0.8.3 \
-		rusttype-0.9.2 \
-		rustversion-1.0.6 \
-		rusty-xinput-1.2.0 \
-		rustyline-9.1.2 \
-		ryu-1.0.9 \
-		same-file-1.0.6 \
-		schannel-0.1.19 \
-		scoped-tls-1.0.0 \
-		scopeguard-1.1.0 \
-		sct-0.6.1 \
-		sct-0.7.0 \
-		sdl2-0.35.2 \
-		sdl2-sys-0.35.2 \
-		seahash-4.1.0 \
-		security-framework-2.6.1 \
-		security-framework-sys-2.6.1 \
-		semver-0.9.0 \
-		semver-1.0.7 \
-		semver-parser-0.7.0 \
-		serde-1.0.136 \
-		serde_bytes-0.11.5 \
-		serde_cbor-0.11.2 \
-		serde_derive-1.0.136 \
-		serde_json-1.0.79 \
-		serde_repr-0.1.7 \
-		sha1-0.6.1 \
-		sha1_smol-1.0.0 \
-		sha2-0.10.2 \
-		shaderc-0.8.0 \
-		shaderc-sys-0.8.0 \
-		sharded-slab-0.1.4 \
-		shell-words-1.1.0 \
-		shellexpand-2.1.0 \
-		shlex-0.1.1 \
-		shred-0.13.0 \
-		shred-derive-0.6.3 \
-		shrev-1.1.1 \
-		signal-hook-0.1.17 \
-		signal-hook-0.3.13 \
-		signal-hook-mio-0.2.3 \
-		signal-hook-registry-1.4.0 \
-		siphasher-0.3.10 \
-		slab-0.4.6 \
-		slotmap-0.4.3 \
-		slotmap-1.0.6 \
-		smallvec-1.8.0 \
-		smithay-client-toolkit-0.12.3 \
-		smithay-client-toolkit-0.15.3 \
-		smithay-clipboard-0.6.5 \
-		socket2-0.4.4 \
-		specs-0.18.0 \
-		specs-derive-0.4.1 \
-		spin-0.5.2 \
-		spin_sleep-1.1.1 \
-		spirv_cross-0.23.1 \
-		spirv_headers-1.5.0 \
-		stable_deref_trait-1.2.0 \
-		static_assertions-1.1.0 \
-		stb_truetype-0.3.1 \
-		stdweb-0.1.3 \
-		stdweb-0.4.20 \
-		stdweb-derive-0.5.3 \
-		stdweb-internal-macros-0.2.9 \
-		stdweb-internal-runtime-0.1.5 \
-		storage-map-0.3.0 \
-		str-buf-1.0.5 \
-		strsim-0.8.0 \
-		strsim-0.9.3 \
-		strsim-0.10.0 \
-		structopt-0.3.26 \
-		structopt-derive-0.4.18 \
-		strum-0.24.0 \
-		strum_macros-0.24.0 \
-		sum_type-0.2.0 \
-		svg_fmt-0.4.1 \
-		syn-0.15.44 \
-		syn-1.0.98 \
-		tap-1.0.1 \
-		tar-0.4.38 \
-		target-lexicon-0.12.3 \
-		tempfile-3.3.0 \
-		termcolor-1.1.3 \
-		textwrap-0.11.0 \
-		textwrap-0.15.0 \
-		thiserror-1.0.30 \
-		thiserror-impl-1.0.30 \
-		thread_local-1.1.4 \
-		thunderdome-0.4.2 \
-		time-0.1.44 \
-		time-0.3.9 \
-		tiny-keccak-2.0.2 \
-		tinytemplate-1.2.1 \
-		tinyvec-1.5.1 \
-		tinyvec_macros-0.1.0 \
-		tokio-1.17.0 \
-		tokio-macros-1.7.0 \
-		tokio-rustls-0.22.0 \
-		tokio-stream-0.1.8 \
-		tokio-util-0.7.1 \
-		toml-0.5.8 \
-		tower-service-0.3.1 \
-		tracing-0.1.32 \
-		tracing-appender-0.2.2 \
-		tracing-attributes-0.1.20 \
-		tracing-core-0.1.24 \
-		tracing-log-0.1.2 \
-		tracing-subscriber-0.3.10 \
-		tracing-tracy-0.9.0 \
-		tracy-client-0.13.2 \
-		tracy-client-sys-0.17.0 \
-		treeculler-0.2.0 \
-		try-lock-0.2.3 \
-		ttf-parser-0.6.2 \
-		ttf-parser-0.15.0 \
-		tuple_utils-0.4.0 \
-		twox-hash-1.6.2 \
-		tynm-0.1.6 \
-		typenum-1.15.0 \
-		uncased-0.9.6 \
-		unicode-bidi-0.3.7 \
-		unicode-ident-1.0.1 \
-		unicode-normalization-0.1.19 \
-		unicode-segmentation-1.9.0 \
-		unicode-width-0.1.9 \
-		unicode-xid-0.1.0 \
-		untrusted-0.7.1 \
-		url-2.2.2 \
-		utf8parse-0.2.0 \
-		uuid-0.8.2 \
-		valuable-0.1.0 \
-		vcpkg-0.2.15 \
-		vec_map-0.8.2 \
-		vek-0.14.1 \
-		version-compare-0.1.0 \
-		version_check-0.1.5 \
-		version_check-0.9.4 \
-		walkdir-0.1.8 \
-		walkdir-2.3.2 \
-		want-0.3.0 \
-		wasi-0.9.0+wasi-snapshot-preview1 \
-		wasi-0.10.0+wasi-snapshot-preview1 \
-		wasi-0.11.0+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.79 \
-		wasm-bindgen-backend-0.2.79 \
-		wasm-bindgen-futures-0.4.29 \
-		wasm-bindgen-macro-0.2.79 \
-		wasm-bindgen-macro-support-0.2.79 \
-		wasm-bindgen-shared-0.2.79 \
-		wasmer-2.2.1 \
-		wasmer-compiler-2.2.1 \
-		wasmer-compiler-cranelift-2.2.1 \
-		wasmer-derive-2.2.1 \
-		wasmer-engine-2.2.1 \
-		wasmer-engine-dylib-2.2.1 \
-		wasmer-engine-universal-2.2.1 \
-		wasmer-object-2.2.1 \
-		wasmer-types-2.2.1 \
-		wasmer-vm-2.2.1 \
-		wasmparser-0.78.2 \
-		wast-39.0.0 \
-		wat-1.0.41 \
-		wavefront-0.2.2 \
-		wayland-client-0.28.6 \
-		wayland-client-0.29.4 \
-		wayland-commons-0.28.6 \
-		wayland-commons-0.29.4 \
-		wayland-cursor-0.28.6 \
-		wayland-cursor-0.29.4 \
-		wayland-protocols-0.28.6 \
-		wayland-protocols-0.29.4 \
-		wayland-scanner-0.28.6 \
-		wayland-scanner-0.29.4 \
-		wayland-sys-0.28.6 \
-		wayland-sys-0.29.4 \
-		web-sys-0.3.50 \
-		webpki-0.21.4 \
-		webpki-0.22.0 \
-		wfd-0.1.7 \
-		which-3.1.1 \
-		which-4.2.5 \
-		winapi-0.2.8 \
-		winapi-0.3.9 \
-		winapi-build-0.1.1 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-wsapoll-0.1.1 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		window_clipboard-0.2.2 \
-		windows-sys-0.30.0 \
-		windows-sys-0.34.0 \
-		windows_aarch64_msvc-0.30.0 \
-		windows_aarch64_msvc-0.34.0 \
-		windows_i686_gnu-0.30.0 \
-		windows_i686_gnu-0.34.0 \
-		windows_i686_msvc-0.30.0 \
-		windows_i686_msvc-0.34.0 \
-		windows_x86_64_gnu-0.30.0 \
-		windows_x86_64_gnu-0.34.0 \
-		windows_x86_64_msvc-0.30.0 \
-		windows_x86_64_msvc-0.34.0 \
-		winit-0.25.0 \
-		winres-0.1.12 \
-		wio-0.2.2 \
-		wyz-0.4.0 \
-		x11-clipboard-0.5.3 \
-		x11-dl-2.19.1 \
-		x11rb-0.8.1 \
-		xattr-0.2.2 \
-		xcb-0.9.0 \
-		xcb-0.10.1 \
-		xcursor-0.3.4 \
-		xdg-2.4.1 \
-		xi-unicode-0.3.0 \
-		xkb-0.2.1 \
-		xkbcommon-sys-0.7.5 \
-		xml-rs-0.8.4 \
-		xmlparser-0.13.3 \
-		yasna-0.5.0 \
-		wgpu-profiler@git+https://github.com/Imberflur/wgpu-profiler?tag=wgpu-0.8\#b156eb145bc223386ef344860d9b33b3c181650c \
-		tui@git+https://github.com/fdehau/tui-rs.git?branch=paragraph-scroll\#54b841fab6cfdb38e8dc1382176e965787964b4c \
-		xkbcommon-sys@git+https://github.com/Frinksy/rust-xkbcommon-sys.git?rev=8f615dd6cd90a4ab77c45627830dde49b592b9b5\#8f615dd6cd90a4ab77c45627830dde49b592b9b5 \
-		conrod_core,conrod_derive,conrod_winit@git+https://gitlab.com/veloren/conrod.git?branch=copypasta_0.7\#ca9fd429ca7db854e018acc6dcb2cd8abd9e070d \
-		auth-common,authc@git+https://gitlab.com/veloren/auth.git?rev=fb3dcbc4962b367253f8f2f92760ef44d2679c9a\#fb3dcbc4962b367253f8f2f92760ef44d2679c9a \
-		iced_core,iced_futures,iced_graphics,iced_native,iced_style,iced_winit@git+https://github.com/Imberflur/iced?tag=winit-0.25\#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb \
-		specs-idvs@git+https://gitlab.com/veloren/specs-idvs.git?rev=c17abc638f23ef221ce7384c7dd77eef757b82f4\#c17abc638f23ef221ce7384c7dd77eef757b82f4 \
-		naga@git+https://github.com/gfx-rs/naga?tag=gfx-25\#057d03ad86f18e3bb3866b20901d8d4e892dd3d6 \
-		gfx-auxil,gfx-backend-dx11,gfx-backend-dx12,gfx-backend-empty,gfx-backend-gl,gfx-backend-metal,gfx-backend-vulkan,gfx-hal,range-alloc@git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521\#27a1dae3796d33d23812f2bb8c7e3b5aea18b521 \
-		wgpu,wgpu-core,wgpu-types@git+https://github.com/gfx-rs/wgpu.git?rev=179ea209374a92837cde252f1d9ee01f628cae08\#179ea209374a92837cde252f1d9ee01f628cae08 \
-		refinery,refinery-core,refinery-macros@git+https://gitlab.com/veloren/refinery.git?rev=8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e\#8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e \
-		portpicker@git+https://github.com/xMAC94x/portpicker-rs?rev=df6b37872f3586ac3b21d08b56c8ec7cd92fb172\#df6b37872f3586ac3b21d08b56c8ec7cd92fb172 \
-		egui_wgpu_backend@git+https://github.com/hasenbanck/egui_wgpu_backend.git?rev=63a002c6a9b6c016e45806dd065864431caab621\#63a002c6a9b6c016e45806dd065864431caab621 \
-		vek@git+https://github.com/yoanlcq/vek.git?rev=84d5cb65841d46599a986c5477341bea4456be26\#84d5cb65841d46599a986c5477341bea4456be26 \
-		keyboard-keynames@git+https://gitlab.com/Frinksy/keyboard-keynames.git?branch=develop\#1ae010ca032a57dfe0ba01d4346a3b03bde36de0
-
 # https://gitlab.com/veloren/veloren/issues/264
 CARGO_ENV+=		RUSTC_BOOTSTRAP=1
 # XXX https://github.com/rust-lang/cargo/issues/4101
diff --git a/games/veloren/Makefile.crates b/games/veloren/Makefile.crates
new file mode 100644
index 000000000000..08ee65ef44f7
--- /dev/null
+++ b/games/veloren/Makefile.crates
@@ -0,0 +1,710 @@
+CARGO_CRATES=	ab_glyph-0.2.15 \
+		ab_glyph_rasterizer-0.1.5 \
+		addr2line-0.17.0 \
+		adler-1.0.2 \
+		adler32-1.2.0 \
+		ahash-0.3.8 \
+		ahash-0.4.7 \
+		ahash-0.7.6 \
+		aho-corasick-0.7.18 \
+		alsa-0.6.0 \
+		alsa-sys-0.3.1 \
+		andrew-0.3.1 \
+		ansi-parser-0.8.0 \
+		ansi_term-0.12.1 \
+		approx-0.3.2 \
+		approx-0.4.0 \
+		approx-0.5.1 \
+		arr_macro-0.1.3 \
+		arr_macro_impl-0.1.3 \
+		arrayref-0.3.6 \
+		arrayvec-0.5.2 \
+		arrayvec-0.7.2 \
+		as-slice-0.1.5 \
+		ash-0.32.1 \
+		assets_manager-0.8.1 \
+		async-channel-1.6.1 \
+		async-trait-0.1.53 \
+		atom-0.3.6 \
+		atomic_refcell-0.1.8 \
+		atomicwrites-0.3.1 \
+		atty-0.2.14 \
+		autocfg-1.1.0 \
+		backtrace-0.3.65 \
+		base-x-0.2.8 \
+		base64-0.13.0 \
+		bincode-1.3.3 \
+		bindgen-0.56.0 \
+		bit-set-0.5.2 \
+		bit-vec-0.6.3 \
+		bitflags-1.3.2 \
+		bitvec-0.22.3 \
+		blake2b_simd-0.5.11 \
+		block-0.1.6 \
+		block-buffer-0.10.2 \
+		bstr-0.2.17 \
+		bumpalo-3.9.1 \
+		bytecheck-0.6.7 \
+		bytecheck_derive-0.6.7 \
+		bytemuck-1.9.1 \
+		bytemuck_derive-1.1.0 \
+		byteorder-1.4.3 \
+		bytes-1.1.0 \
+		cache-padded-1.2.0 \
+		calloop-0.6.5 \
+		cassowary-0.3.0 \
+		cast-0.2.7 \
+		cc-1.0.73 \
+		cesu8-1.1.0 \
+		cexpr-0.4.0 \
+		cfg-if-0.1.10 \
+		cfg-if-1.0.0 \
+		cfg_aliases-0.1.1 \
+		chrono-0.4.19 \
+		chrono-tz-0.6.1 \
+		chrono-tz-build-0.0.2 \
+		chumsky-0.8.0 \
+		clang-sys-1.3.1 \
+		clap-2.34.0 \
+		clap-3.1.10 \
+		clap_derive-3.1.7 \
+		clap_lex-0.1.1 \
+		clipboard-win-3.1.1 \
+		clipboard-win-4.4.1 \
+		clipboard_macos-0.1.0 \
+		clipboard_wayland-0.2.0 \
+		clipboard_x11-0.3.1 \
+		cloudabi-0.0.3 \
+		cmake-0.1.45 \
+		cocoa-0.24.0 \
+		cocoa-foundation-0.1.0 \
+		codespan-reporting-0.11.1 \
+		color_quant-1.1.0 \
+		combine-4.6.3 \
+		concurrent-queue-1.2.2 \
+		const-random-0.1.13 \
+		const-random-macro-0.1.13 \
+		constant_time_eq-0.1.5 \
+		copy_dir-0.1.2 \
+		copyless-0.1.5 \
+		copypasta-0.7.1 \
+		core-foundation-0.6.4 \
+		core-foundation-0.7.0 \
+		core-foundation-0.9.3 \
+		core-foundation-sys-0.6.2 \
+		core-foundation-sys-0.7.0 \
+		core-foundation-sys-0.8.3 \
+		core-graphics-0.19.2 \
+		core-graphics-0.22.3 \
+		core-graphics-types-0.1.1 \
+		core-video-sys-0.1.4 \
+		coreaudio-rs-0.10.0 \
+		coreaudio-sys-0.2.9 \
+		cpal-0.13.5 \
+		cpufeatures-0.2.2 \
+		cranelift-bforest-0.76.0 \
+		cranelift-codegen-0.76.0 \
+		cranelift-codegen-meta-0.76.0 \
+		cranelift-codegen-shared-0.76.0 \
+		cranelift-entity-0.76.0 \
+		cranelift-frontend-0.76.0 \
+		crc32fast-1.3.2 \
+		criterion-0.3.4 \
+		criterion-plot-0.4.4 \
+		crossbeam-0.8.1 \
+		crossbeam-channel-0.5.4 \
+		crossbeam-deque-0.7.4 \
+		crossbeam-deque-0.8.1 \
+		crossbeam-epoch-0.8.2 \
+		crossbeam-epoch-0.9.8 \
+		crossbeam-queue-0.3.5 \
+		crossbeam-utils-0.7.2 \
+		crossbeam-utils-0.8.8 \
+		crossterm-0.17.7 \
+		crossterm-0.23.2 \
+		crossterm_winapi-0.6.2 \
+		crossterm_winapi-0.9.0 \
+		crunchy-0.2.2 \
+		crypto-common-0.1.3 \
+		csv-1.1.6 \
+		csv-core-0.1.10 \
+		ct-logs-0.8.0 \
+		cty-0.2.2 \
+		d3d12-0.4.1 \
+		daggy-0.5.0 \
+		darling-0.10.2 \
+		darling-0.13.2 \
+		darling_core-0.10.2 \
+		darling_core-0.13.2 \
+		darling_macro-0.10.2 \
+		darling_macro-0.13.2 \
+		deflate-1.0.0 \
+		deunicode-1.3.1 \
+		digest-0.10.3 \
+		directories-next-2.0.0 \
+		dirs-4.0.0 \
+		dirs-next-2.0.0 \
+		dirs-sys-0.3.7 \
+		dirs-sys-next-0.1.2 \
+		discard-1.0.4 \
+		dispatch-0.1.4 \
+		dispatch-0.2.0 \
+		dlib-0.4.2 \
+		dlib-0.5.0 \
+		dot_vox-4.1.0 \
+		downcast-rs-1.2.0 \
+		egui-0.12.0 \
+		egui_winit_platform-0.8.0 \
+		either-1.6.1 \
+		emath-0.12.0 \
+		endian-type-0.1.2 \
+		enum-iterator-0.7.0 \
+		enum-iterator-derive-0.7.0 \
+		enumset-1.0.9 \
+		enumset_derive-0.5.6 \
+		env_logger-0.8.4 \
+		epaint-0.12.0 \
+		epi-0.12.0 \
+		errno-0.2.8 \
+		errno-dragonfly-0.1.2 \
+		error-code-2.3.1 \
+		etagere-0.2.7 \
+		euc-0.5.3 \
+		euclid-0.22.7 \
+		event-listener-2.5.2 \
+		fallible-iterator-0.2.0 \
+		fallible-streaming-iterator-0.1.9 \
+		fastrand-1.7.0 \
+		fd-lock-3.0.5 \
+		fehler-1.0.0 \
+		fehler-macros-1.0.0 \
+		filetime-0.2.15 \
+		find_folder-0.3.0 \
+		fixedbitset-0.1.9 \
+		fixedbitset-0.2.0 \
+		fixedbitset-0.4.1 \
+		flate2-1.0.24 \
+		float-cmp-0.9.0 \
+		fnv-1.0.7 \
+		foreign-types-0.3.2 \
+		foreign-types-shared-0.1.1 \
+		form_urlencoded-1.0.1 \
+		fsevent-sys-4.1.0 \
+		funty-1.2.0 \
+		futures-0.3.21 \
+		futures-channel-0.3.21 \
+		futures-core-0.3.21 \
+		futures-executor-0.3.21 \
+		futures-io-0.3.21 \
+		futures-macro-0.3.21 \
+		futures-sink-0.3.21 \
+		futures-task-0.3.21 \
+		futures-util-0.3.21 \
+		fxhash-0.2.1 \
+		generator-0.7.0 \
+		generic-array-0.12.4 \
+		generic-array-0.13.3 \
+		generic-array-0.14.5 \
+		gethostname-0.2.3 \
+		getrandom-0.1.16 \
+		getrandom-0.2.6 \
+		gilrs-0.8.2 \
+		gilrs-core-0.3.2 \
+		gimli-0.25.0 \
+		gimli-0.26.1 \
+		git2-0.14.2 \
+		glam-0.10.2 \
+		glob-0.3.0 \
+		glow-0.9.0 \
+		glyph_brush-0.7.3 \
+		glyph_brush_draw_cache-0.1.5 \
+		glyph_brush_layout-0.2.3 \
+		gpu-alloc-0.4.7 \
+		gpu-alloc-types-0.2.0 \
+		gpu-descriptor-0.1.1 \
+		gpu-descriptor-types-0.1.1 \
+		guillotiere-0.6.2 \
+		h2-0.3.13 \
+		half-1.8.2 \
+		hash32-0.1.1 \
+		hashbrown-0.9.1 \
+		hashbrown-0.11.2 \
+		hashbrown-0.12.0 \
+		hashlink-0.6.0 \
+		heapless-0.5.6 \
+		heapless-0.6.1 \
+		heck-0.3.3 \
+		heck-0.4.0 \
+		hermit-abi-0.1.19 \
+		hex-0.3.2 \
+		hibitset-0.6.3 \
+		http-0.2.6 \
+		http-body-0.4.4 \
+		httparse-1.6.0 \
+		httpdate-1.0.2 \
+		humantime-2.1.0 \
+		hyper-0.14.18 \
+		hyper-rustls-0.22.1 \
+		ident_case-1.0.1 \
+		idna-0.2.3 \
+		image-0.24.2 \
+		indexmap-1.8.1 \
+		inline_tweak-1.0.8 \
+		inotify-0.9.6 \
+		inotify-sys-0.1.5 \
+		inplace_it-0.3.3 \
+		instant-0.1.12 \
+		io-kit-sys-0.1.0 \
+		io-lifetimes-0.6.1 \
+		itertools-0.10.3 \
+		itoa-0.4.8 \
+		itoa-1.0.1 \
+		jni-0.19.0 \
+		jni-sys-0.3.0 \
+		jobserver-0.1.24 \
+		jpeg-decoder-0.2.6 \
+		js-sys-0.3.56 \
+		kernel32-sys-0.2.2 \
+		khronos-egl-4.1.0 \
+		kiddo-0.1.7 \
+		kiddo-0.2.4 \
+		kqueue-1.0.4 \
+		kqueue-sys-1.0.3 \
+		lazy-bytes-cast-5.0.1 \
+		lazy_static-1.4.0 \
+		lazycell-1.3.0 \
+		leb128-0.2.5 \
+		lewton-0.10.2 \
+		libc-0.2.121 \
+		libgit2-sys-0.13.2+1.4.2 \
+		libloading-0.6.7 \
+		libloading-0.7.3 \
+		libm-0.1.4 \
+		libm-0.2.2 \
+		libmimalloc-sys-0.1.25 \
+		libsqlite3-sys-0.20.1 \
+		libudev-sys-0.1.4 \
+		libz-sys-1.1.5 \
+		linked-hash-map-0.5.4 \
+		linux-raw-sys-0.0.42 \
+		lock_api-0.3.4 \
+		lock_api-0.4.7 \
+		log-0.4.16 \
+		loom-0.5.4 \
+		loupe-0.1.3 \
+		loupe-derive-0.1.3 \
+		lz-fear-0.1.1 \
+		mach-0.2.3 \
+		mach-0.3.2 \
+		malloc_buf-0.0.6 \
+		matchers-0.1.0 \
+		matches-0.1.9 \
+		maybe-uninit-2.0.0 \
+		memchr-2.4.1 \
+		memmap-0.7.0 \
+		memmap2-0.1.0 \
+		memmap2-0.3.1 \
+		memmap2-0.5.3 \
+		memoffset-0.5.6 \
+		memoffset-0.6.5 \
+		metal-0.22.0 \
+		mimalloc-0.1.29 \
+		minifb-0.22.0 \
+		minimal-lexical-0.2.1 \
+		miniz_oxide-0.5.1 \
+		mio-0.7.14 \
+		mio-0.8.2 \
+		mio-misc-1.2.2 \
+		miow-0.3.7 \
+		mopa-0.2.2 \
+		more-asserts-0.2.2 \
+		mumble-link-0.1.0 \
+		native-dialog-0.6.3 \
+		ndk-0.3.0 \
+		ndk-0.6.0 \
+		ndk-context-0.1.0 \
+		ndk-glue-0.3.0 \
+		ndk-glue-0.6.1 \
+		ndk-macro-0.2.0 \
+		ndk-macro-0.3.0 \
+		ndk-sys-0.2.2 \
+		ndk-sys-0.3.0 \
+		nibble_vec-0.1.0 \
+		nix-0.18.0 \
+		nix-0.20.0 \
+		nix-0.22.3 \
+		nix-0.23.1 \
+		noise-0.7.0 \
+		nom-4.2.3 \
+		nom-5.1.2 \
+		nom-7.1.1 \
+		notify-5.0.0-pre.15 \
+		ntapi-0.3.7 \
+		num-0.2.1 \
+		num-0.4.0 \
+		num-bigint-0.2.6 \
+		num-bigint-0.4.3 \
+		num-complex-0.2.4 \
+		num-complex-0.4.0 \
+		num-derive-0.3.3 \
+		num-integer-0.1.44 \
+		num-iter-0.1.42 \
+		num-rational-0.2.4 \
+		num-rational-0.4.0 \
+		num-traits-0.2.14 \
+		num_cpus-1.13.1 \
+		num_enum-0.5.7 \
+		num_enum_derive-0.5.7 \
+		num_threads-0.1.5 \
+		objc-0.2.7 \
+		objc-foundation-0.1.1 \
+		objc_exception-0.1.2 \
+		objc_id-0.1.1 \
+		object-0.28.3 \
+		oboe-0.4.5 \
+		oboe-sys-0.4.5 \
+		ogg-0.8.0 \
+		once_cell-1.10.0 \
+		oorandom-11.1.3 \
+		openssl-probe-0.1.5 \
+		orbclient-0.3.32 \
+		ordered-float-1.1.1 \
+		ordered-float-2.10.0 \
+		ordered-float-3.0.0 \
+		os_str_bytes-6.0.0 \
+		owned_ttf_parser-0.6.0 \
+		owned_ttf_parser-0.15.0 \
+		packed_simd_2-0.3.8 \
+		parking_lot-0.10.2 \
+		parking_lot-0.11.2 \
+		parking_lot-0.12.0 \
+		parking_lot_core-0.7.2 \
+		parking_lot_core-0.8.5 \
+		parking_lot_core-0.9.2 \
+		parse-zoneinfo-0.3.0 \
+		pdqselect-0.1.0 \
+		peeking_take_while-0.1.2 \
+		pem-1.0.2 \
+		percent-encoding-2.1.0 \
+		petgraph-0.4.13 \
+		petgraph-0.5.1 \
+		petgraph-0.6.0 \
+		phf-0.10.1 \
+		phf_codegen-0.10.0 \
+		phf_generator-0.10.0 \
+		phf_shared-0.10.0 \
+		pin-project-lite-0.2.8 \
+		pin-utils-0.1.0 \
+		piston-float-0.3.0 \
+		piston-viewport-0.5.0 \
+		pistoncore-input-0.24.0 \
+		pkg-config-0.3.25 \
+		plotters-0.3.0 \
+		plotters-backend-0.3.2 \
+		plotters-svg-0.3.1 \
+		png-0.17.5 \
+		ppv-lite86-0.2.16 \
+		proc-macro-crate-0.1.5 \
+		proc-macro-crate-1.1.3 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro-hack-0.5.19 \
+		proc-macro2-0.4.30 \
+		proc-macro2-1.0.40 \
+		profiling-1.0.6 \
+		profiling-procmacros-1.0.6 \
+		prometheus-0.13.0 \
+		prometheus-hyper-0.1.4 \
+		ptr_meta-0.1.4 \
+		ptr_meta_derive-0.1.4 \
+		quick-xml-0.22.0 \
+		quinn-0.8.2 \
+		quinn-proto-0.8.2 \
+		quinn-udp-0.1.1 \
+		quote-0.6.13 \
+		quote-1.0.20 \
+		radium-0.6.2 \
+		radix_trie-0.2.1 \
+		rand-0.7.3 \
+		rand-0.8.5 \
+		rand_chacha-0.2.2 \
+		rand_chacha-0.3.1 \
+		rand_core-0.5.1 \
+		rand_core-0.6.3 \
+		rand_distr-0.4.3 \
+		rand_hc-0.2.0 \
+		rand_xorshift-0.2.0 \
+		raw-window-handle-0.3.4 \
+		raw-window-handle-0.4.3 \
+		rayon-1.5.1 \
+		rayon-core-1.9.1 \
+		rcgen-0.9.2 \
+		redox_syscall-0.1.57 \
+		redox_syscall-0.2.13 \
+		redox_users-0.4.3 \
+		regalloc-0.0.31 \
+		regex-1.5.5 \
+		regex-automata-0.1.10 \
+		regex-syntax-0.6.25 \
+		region-3.0.0 \
+		remove_dir_all-0.5.3 \
+		rend-0.3.6 \
+		renderdoc-sys-0.7.1 \
+		ring-0.16.20 \
+		rkyv-0.7.37 \
+		rkyv_derive-0.7.37 \
+		rodio-0.15.0 \
+		ron-0.6.6 \
+		ron-0.7.0 \
+		roots-0.0.6 \
+		rose_tree-0.2.0 \
+		roxmltree-0.14.1 \
+		rstar-0.9.2 \
+		rusqlite-0.24.2 \
+		rust-argon2-0.8.3 \
+		rustc-demangle-0.1.21 \
+		rustc-hash-1.1.0 \
+		rustc_version-0.2.3 \
+		rustc_version-0.4.0 \
+		rustix-0.34.1 \
+		rustls-0.19.1 \
+		rustls-0.20.4 \
+		rustls-native-certs-0.5.0 \
+		rustls-native-certs-0.6.1 \
+		rustls-pemfile-0.2.1 \
+		rustls-pemfile-1.0.0 \
+		rusttype-0.7.9 \
+		rusttype-0.8.3 \
+		rusttype-0.9.2 \
+		rustversion-1.0.6 \
+		rusty-xinput-1.2.0 \
+		rustyline-9.1.2 \
+		ryu-1.0.9 \
+		same-file-1.0.6 \
+		schannel-0.1.19 \
+		scoped-tls-1.0.0 \
+		scopeguard-1.1.0 \
+		sct-0.6.1 \
+		sct-0.7.0 \
+		sdl2-0.35.2 \
+		sdl2-sys-0.35.2 \
+		seahash-4.1.0 \
+		security-framework-2.6.1 \
+		security-framework-sys-2.6.1 \
+		semver-0.9.0 \
+		semver-1.0.7 \
+		semver-parser-0.7.0 \
+		serde-1.0.136 \
+		serde_bytes-0.11.5 \
+		serde_cbor-0.11.2 \
+		serde_derive-1.0.136 \
+		serde_json-1.0.79 \
+		serde_repr-0.1.7 \
+		sha1-0.6.1 \
+		sha1_smol-1.0.0 \
+		sha2-0.10.2 \
+		shaderc-0.8.0 \
+		shaderc-sys-0.8.0 \
+		sharded-slab-0.1.4 \
+		shell-words-1.1.0 \
+		shellexpand-2.1.0 \
+		shlex-0.1.1 \
+		shred-0.13.0 \
+		shred-derive-0.6.3 \
+		shrev-1.1.1 \
+		signal-hook-0.1.17 \
+		signal-hook-0.3.13 \
+		signal-hook-mio-0.2.3 \
+		signal-hook-registry-1.4.0 \
+		siphasher-0.3.10 \
+		slab-0.4.6 \
+		slotmap-0.4.3 \
+		slotmap-1.0.6 \
+		smallvec-1.8.0 \
+		smithay-client-toolkit-0.12.3 \
+		smithay-client-toolkit-0.15.3 \
+		smithay-clipboard-0.6.5 \
+		socket2-0.4.4 \
+		specs-0.18.0 \
+		specs-derive-0.4.1 \
+		spin-0.5.2 \
+		spin_sleep-1.1.1 \
+		spirv_cross-0.23.1 \
+		spirv_headers-1.5.0 \
+		stable_deref_trait-1.2.0 \
+		static_assertions-1.1.0 \
+		stb_truetype-0.3.1 \
+		stdweb-0.1.3 \
+		stdweb-0.4.20 \
+		stdweb-derive-0.5.3 \
+		stdweb-internal-macros-0.2.9 \
+		stdweb-internal-runtime-0.1.5 \
+		storage-map-0.3.0 \
+		str-buf-1.0.5 \
+		strsim-0.8.0 \
+		strsim-0.9.3 \
+		strsim-0.10.0 \
+		structopt-0.3.26 \
+		structopt-derive-0.4.18 \
+		strum-0.24.0 \
+		strum_macros-0.24.0 \
+		sum_type-0.2.0 \
+		svg_fmt-0.4.1 \
+		syn-0.15.44 \
+		syn-1.0.98 \
+		tap-1.0.1 \
+		tar-0.4.38 \
+		target-lexicon-0.12.3 \
+		tempfile-3.3.0 \
+		termcolor-1.1.3 \
+		textwrap-0.11.0 \
+		textwrap-0.15.0 \
+		thiserror-1.0.30 \
+		thiserror-impl-1.0.30 \
+		thread_local-1.1.4 \
+		thunderdome-0.4.2 \
+		time-0.1.44 \
+		time-0.3.9 \
+		tiny-keccak-2.0.2 \
+		tinytemplate-1.2.1 \
+		tinyvec-1.5.1 \
+		tinyvec_macros-0.1.0 \
+		tokio-1.17.0 \
+		tokio-macros-1.7.0 \
+		tokio-rustls-0.22.0 \
+		tokio-stream-0.1.8 \
+		tokio-util-0.7.1 \
+		toml-0.5.8 \
+		tower-service-0.3.1 \
+		tracing-0.1.32 \
+		tracing-appender-0.2.2 \
+		tracing-attributes-0.1.20 \
+		tracing-core-0.1.24 \
+		tracing-log-0.1.2 \
+		tracing-subscriber-0.3.10 \
+		tracing-tracy-0.9.0 \
+		tracy-client-0.13.2 \
+		tracy-client-sys-0.17.0 \
+		treeculler-0.2.0 \
+		try-lock-0.2.3 \
+		ttf-parser-0.6.2 \
+		ttf-parser-0.15.0 \
+		tuple_utils-0.4.0 \
+		twox-hash-1.6.2 \
+		tynm-0.1.6 \
+		typenum-1.15.0 \
+		uncased-0.9.6 \
+		unicode-bidi-0.3.7 \
+		unicode-ident-1.0.1 \
+		unicode-normalization-0.1.19 \
+		unicode-segmentation-1.9.0 \
+		unicode-width-0.1.9 \
+		unicode-xid-0.1.0 \
+		untrusted-0.7.1 \
+		url-2.2.2 \
+		utf8parse-0.2.0 \
+		uuid-0.8.2 \
+		valuable-0.1.0 \
+		vcpkg-0.2.15 \
+		vec_map-0.8.2 \
+		vek-0.14.1 \
+		version-compare-0.1.0 \
+		version_check-0.1.5 \
+		version_check-0.9.4 \
+		walkdir-0.1.8 \
+		walkdir-2.3.2 \
+		want-0.3.0 \
+		wasi-0.9.0+wasi-snapshot-preview1 \
+		wasi-0.10.0+wasi-snapshot-preview1 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.79 \
+		wasm-bindgen-backend-0.2.79 \
+		wasm-bindgen-futures-0.4.29 \
+		wasm-bindgen-macro-0.2.79 \
+		wasm-bindgen-macro-support-0.2.79 \
+		wasm-bindgen-shared-0.2.79 \
+		wasmer-2.2.1 \
+		wasmer-compiler-2.2.1 \
+		wasmer-compiler-cranelift-2.2.1 \
+		wasmer-derive-2.2.1 \
+		wasmer-engine-2.2.1 \
+		wasmer-engine-dylib-2.2.1 \
+		wasmer-engine-universal-2.2.1 \
+		wasmer-object-2.2.1 \
+		wasmer-types-2.2.1 \
+		wasmer-vm-2.2.1 \
+		wasmparser-0.78.2 \
+		wast-39.0.0 \
+		wat-1.0.41 \
+		wavefront-0.2.2 \
+		wayland-client-0.28.6 \
+		wayland-client-0.29.4 \
+		wayland-commons-0.28.6 \
+		wayland-commons-0.29.4 \
+		wayland-cursor-0.28.6 \
+		wayland-cursor-0.29.4 \
+		wayland-protocols-0.28.6 \
+		wayland-protocols-0.29.4 \
+		wayland-scanner-0.28.6 \
+		wayland-scanner-0.29.4 \
+		wayland-sys-0.28.6 \
+		wayland-sys-0.29.4 \
+		web-sys-0.3.50 \
+		webpki-0.21.4 \
+		webpki-0.22.0 \
+		wfd-0.1.7 \
+		which-3.1.1 \
+		which-4.2.5 \
+		winapi-0.2.8 \
+		winapi-0.3.9 \
+		winapi-build-0.1.1 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-wsapoll-0.1.1 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		window_clipboard-0.2.2 \
+		windows-sys-0.30.0 \
+		windows-sys-0.34.0 \
+		windows_aarch64_msvc-0.30.0 \
+		windows_aarch64_msvc-0.34.0 \
+		windows_i686_gnu-0.30.0 \
+		windows_i686_gnu-0.34.0 \
+		windows_i686_msvc-0.30.0 \
+		windows_i686_msvc-0.34.0 \
+		windows_x86_64_gnu-0.30.0 \
+		windows_x86_64_gnu-0.34.0 \
+		windows_x86_64_msvc-0.30.0 \
+		windows_x86_64_msvc-0.34.0 \
+		winit-0.25.0 \
+		winres-0.1.12 \
+		wio-0.2.2 \
+		wyz-0.4.0 \
+		x11-clipboard-0.5.3 \
+		x11-dl-2.19.1 \
+		x11rb-0.8.1 \
+		xattr-0.2.2 \
+		xcb-0.9.0 \
+		xcb-0.10.1 \
+		xcursor-0.3.4 \
+		xdg-2.4.1 \
+		xi-unicode-0.3.0 \
+		xkb-0.2.1 \
+		xkbcommon-sys-0.7.5 \
+		xml-rs-0.8.4 \
+		xmlparser-0.13.3 \
+		yasna-0.5.0 \
+		wgpu-profiler@git+https://github.com/Imberflur/wgpu-profiler?tag=wgpu-0.8\#b156eb145bc223386ef344860d9b33b3c181650c \
+		tui@git+https://github.com/fdehau/tui-rs.git?branch=paragraph-scroll\#54b841fab6cfdb38e8dc1382176e965787964b4c \
+		xkbcommon-sys@git+https://github.com/Frinksy/rust-xkbcommon-sys.git?rev=8f615dd6cd90a4ab77c45627830dde49b592b9b5\#8f615dd6cd90a4ab77c45627830dde49b592b9b5 \
+		conrod_core,conrod_derive,conrod_winit@git+https://gitlab.com/veloren/conrod.git?branch=copypasta_0.7\#ca9fd429ca7db854e018acc6dcb2cd8abd9e070d \
+		auth-common,authc@git+https://gitlab.com/veloren/auth.git?rev=fb3dcbc4962b367253f8f2f92760ef44d2679c9a\#fb3dcbc4962b367253f8f2f92760ef44d2679c9a \
+		iced_core,iced_futures,iced_graphics,iced_native,iced_style,iced_winit@git+https://github.com/Imberflur/iced?tag=winit-0.25\#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb \
+		specs-idvs@git+https://gitlab.com/veloren/specs-idvs.git?rev=c17abc638f23ef221ce7384c7dd77eef757b82f4\#c17abc638f23ef221ce7384c7dd77eef757b82f4 \
+		naga@git+https://github.com/gfx-rs/naga?tag=gfx-25\#057d03ad86f18e3bb3866b20901d8d4e892dd3d6 \
+		gfx-auxil,gfx-backend-dx11,gfx-backend-dx12,gfx-backend-empty,gfx-backend-gl,gfx-backend-metal,gfx-backend-vulkan,gfx-hal,range-alloc@git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521\#27a1dae3796d33d23812f2bb8c7e3b5aea18b521 \
+		wgpu,wgpu-core,wgpu-types@git+https://github.com/gfx-rs/wgpu.git?rev=179ea209374a92837cde252f1d9ee01f628cae08\#179ea209374a92837cde252f1d9ee01f628cae08 \
+		refinery,refinery-core,refinery-macros@git+https://gitlab.com/veloren/refinery.git?rev=8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e\#8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e \
+		portpicker@git+https://github.com/xMAC94x/portpicker-rs?rev=df6b37872f3586ac3b21d08b56c8ec7cd92fb172\#df6b37872f3586ac3b21d08b56c8ec7cd92fb172 \
+		egui_wgpu_backend@git+https://github.com/hasenbanck/egui_wgpu_backend.git?rev=63a002c6a9b6c016e45806dd065864431caab621\#63a002c6a9b6c016e45806dd065864431caab621 \
+		vek@git+https://github.com/yoanlcq/vek.git?rev=84d5cb65841d46599a986c5477341bea4456be26\#84d5cb65841d46599a986c5477341bea4456be26 \
+		keyboard-keynames@git+https://gitlab.com/Frinksy/keyboard-keynames.git?branch=develop\#1ae010ca032a57dfe0ba01d4346a3b03bde36de0
diff --git a/graphics/dssim/Makefile b/graphics/dssim/Makefile
index 5fd7cecc6d98..50fa56ff38d3 100644
--- a/graphics/dssim/Makefile
+++ b/graphics/dssim/Makefile
@@ -16,77 +16,4 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES=		cargo
 PLIST_FILES=	bin/${PORTNAME}
 
-CARGO_CRATES=	adler-1.0.2 \
-		ahash-0.7.6 \
-		aom-decode-0.2.4 \
-		arrayvec-0.7.2 \
-		autocfg-1.1.0 \
-		avif-parse-1.0.0 \
-		bitreader-0.3.6 \
-		bytemuck-1.12.1 \
-		byteorder-1.4.3 \
-		cc-1.0.73 \
-		cfg-if-1.0.0 \
-		cmake-0.1.48 \
-		crc32fast-1.3.2 \
-		crossbeam-channel-0.5.6 \
-		crossbeam-deque-0.8.2 \
-		crossbeam-epoch-0.9.10 \
-		crossbeam-utils-0.8.11 \
-		dssim-core-3.2.5 \
-		dunce-1.0.2 \
-		either-1.8.0 \
-		fallible_collections-0.4.5 \
-		flate2-1.0.24 \
-		foreign-types-0.5.0 \
-		foreign-types-macros-0.2.2 \
-		foreign-types-shared-0.3.1 \
-		getopts-0.2.21 \
-		getrandom-0.2.7 \
-		hashbrown-0.12.3 \
-		hermit-abi-0.1.19 \
-		imgref-1.9.4 \
-		itertools-0.10.4 \
-		jobserver-0.1.24 \
-		lcms2-5.4.1 \
-		lcms2-sys-3.1.10 \
-		libaom-sys-0.12.1 \
-		libc-0.2.132 \
-		libwebp-0.1.2 \
-		libwebp-sys2-0.1.4 \
-		load_image-2.16.4 \
-		lodepng-3.7.0 \
-		log-0.4.17 \
-		memoffset-0.6.5 \
-		miniz_oxide-0.5.4 \
-		mozjpeg-0.9.4 \
-		mozjpeg-sys-1.0.3 \
-		nasm-rs-0.2.4 \
-		num-0.4.0 \
-		num-bigint-0.4.3 \
-		num-complex-0.4.2 \
-		num-integer-0.1.45 \
-		num-iter-0.1.43 \
-		num-rational-0.4.1 \
-		num-traits-0.2.15 \
-		num_cpus-1.13.1 \
-		once_cell-1.14.0 \
-		pkg-config-0.3.25 \
-		proc-macro2-1.0.43 \
-		quick-error-2.0.1 \
-		quote-1.0.21 \
-		rayon-1.5.3 \
-		rayon-core-1.9.3 \
-		rexif-0.7.3 \
-		rgb-0.8.33 \
-		scopeguard-1.1.0 \
-		static_assertions-1.1.0 \
-		syn-1.0.99 \
-		unicode-ident-1.0.4 \
-		unicode-width-0.1.10 \
-		vcpkg-0.2.15 \
-		version_check-0.9.4 \
-		wasi-0.11.0+wasi-snapshot-preview1 \
-		yuv-0.1.5
-
 .include <bsd.port.mk>
diff --git a/graphics/dssim/Makefile.crates b/graphics/dssim/Makefile.crates
new file mode 100644
index 000000000000..865eb1423f5a
--- /dev/null
+++ b/graphics/dssim/Makefile.crates
@@ -0,0 +1,72 @@
+CARGO_CRATES=	adler-1.0.2 \
+		ahash-0.7.6 \
+		aom-decode-0.2.4 \
+		arrayvec-0.7.2 \
+		autocfg-1.1.0 \
+		avif-parse-1.0.0 \
+		bitreader-0.3.6 \
+		bytemuck-1.12.1 \
+		byteorder-1.4.3 \
+		cc-1.0.73 \
+		cfg-if-1.0.0 \
+		cmake-0.1.48 \
+		crc32fast-1.3.2 \
+		crossbeam-channel-0.5.6 \
+		crossbeam-deque-0.8.2 \
+		crossbeam-epoch-0.9.10 \
+		crossbeam-utils-0.8.11 \
+		dssim-core-3.2.5 \
+		dunce-1.0.2 \
+		either-1.8.0 \
+		fallible_collections-0.4.5 \
+		flate2-1.0.24 \
+		foreign-types-0.5.0 \
+		foreign-types-macros-0.2.2 \
+		foreign-types-shared-0.3.1 \
+		getopts-0.2.21 \
+		getrandom-0.2.7 \
+		hashbrown-0.12.3 \
+		hermit-abi-0.1.19 \
+		imgref-1.9.4 \
+		itertools-0.10.4 \
+		jobserver-0.1.24 \
+		lcms2-5.4.1 \
+		lcms2-sys-3.1.10 \
+		libaom-sys-0.12.1 \
+		libc-0.2.132 \
+		libwebp-0.1.2 \
+		libwebp-sys2-0.1.4 \
+		load_image-2.16.4 \
+		lodepng-3.7.0 \
+		log-0.4.17 \
+		memoffset-0.6.5 \
+		miniz_oxide-0.5.4 \
+		mozjpeg-0.9.4 \
+		mozjpeg-sys-1.0.3 \
+		nasm-rs-0.2.4 \
+		num-0.4.0 \
+		num-bigint-0.4.3 \
+		num-complex-0.4.2 \
+		num-integer-0.1.45 \
+		num-iter-0.1.43 \
+		num-rational-0.4.1 \
+		num-traits-0.2.15 \
+		num_cpus-1.13.1 \
+		once_cell-1.14.0 \
+		pkg-config-0.3.25 \
+		proc-macro2-1.0.43 \
+		quick-error-2.0.1 \
+		quote-1.0.21 \
+		rayon-1.5.3 \
+		rayon-core-1.9.3 \
+		rexif-0.7.3 \
+		rgb-0.8.33 \
+		scopeguard-1.1.0 \
+		static_assertions-1.1.0 \
+		syn-1.0.99 \
+		unicode-ident-1.0.4 \
+		unicode-width-0.1.10 \
+		vcpkg-0.2.15 \
+		version_check-0.9.4 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		yuv-0.1.5
diff --git a/multimedia/ab-av1/Makefile b/multimedia/ab-av1/Makefile
index d48f9608101b..28a1104cbbed 100644
--- a/multimedia/ab-av1/Makefile
+++ b/multimedia/ab-av1/Makefile
@@ -22,93 +22,6 @@ PLIST_FILES=	bin/${PORTNAME} \
 		share/fish/vendor_completions.d/${PORTNAME}.fish \
 		share/zsh/site-functions/_${PORTNAME}
 
-CARGO_CRATES=	anyhow-1.0.65 \
-		atty-0.2.14 \
-		autocfg-1.1.0 \
-		bitflags-1.3.2 \
-		bytes-1.2.1 \
-		cc-1.0.73 \
-		cfg-if-1.0.0 \
-		clap-3.2.22 \
-		clap_complete-3.2.5 \
-		clap_derive-3.2.18 \
-		clap_lex-0.2.4 \
-		console-0.15.1 \
-		encode_unicode-0.3.6 \
-		errno-0.2.8 \
-		errno-dragonfly-0.1.2 \
-		ffprobe-0.3.3 \
-		futures-0.3.24 \
-		futures-channel-0.3.24 \
-		futures-core-0.3.24 \
-		futures-executor-0.3.24 \
-		futures-io-0.3.24 \
-		futures-macro-0.3.24 \
-		futures-sink-0.3.24 \
-		futures-task-0.3.24 \
-		futures-util-0.3.24 \
-		getrandom-0.2.7 \
-		hashbrown-0.12.3 \
-		heck-0.4.0 \
-		hermit-abi-0.1.19 \
-		humantime-2.1.0 \
-		indexmap-1.9.1 \
-		indicatif-0.17.1 \
-		itoa-1.0.3 \
-		libc-0.2.134 \
-		log-0.4.17 \
-		memchr-2.5.0 \
-		mio-0.8.4 \
-		num_cpus-1.13.1 \
-		num_threads-0.1.6 \
-		number_prefix-0.4.0 \
-		once_cell-1.15.0 \
-		os_str_bytes-6.3.0 \
-		pin-project-lite-0.2.9 \
-		pin-utils-0.1.0 \
-		ppv-lite86-0.2.16 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.46 \
-		quote-1.0.21 \
-		rand-0.8.5 \
-		rand_chacha-0.3.1 \
-		rand_core-0.6.4 \
-		ryu-1.0.11 \
-		serde-1.0.145 \
-		serde_derive-1.0.145 \
-		serde_json-1.0.85 \
-		shell-escape-0.1.5 \
-		signal-hook-registry-1.4.0 \
-		slab-0.4.7 \
-		strsim-0.10.0 \
-		syn-1.0.101 \
-		termcolor-1.1.3 \
-		terminal_size-0.1.17 \
-		textwrap-0.15.1 \
-		time-0.3.14 \
-		time-macros-0.2.4 \
-		tokio-1.21.2 \
-		tokio-macros-1.8.0 \
-		tokio-process-stream-0.3.0 \
-		tokio-stream-0.1.10 \
-		tokio-util-0.7.4 \
-		unicode-ident-1.0.4 \
-		unicode-width-0.1.10 \
-		unix-named-pipe-0.2.0 \
-		version_check-0.9.4 \
-		wasi-0.11.0+wasi-snapshot-preview1 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		windows-sys-0.36.1 \
-		windows_aarch64_msvc-0.36.1 \
-		windows_i686_gnu-0.36.1 \
-		windows_i686_msvc-0.36.1 \
-		windows_x86_64_gnu-0.36.1 \
-		windows_x86_64_msvc-0.36.1
-
 post-install:
 .for _shell in bash fish zsh
 	@${ECHO_MSG} "Generating ${STAGEDIR}${PREFIX}/${PLIST_FILES:M*${_shell}*}"
diff --git a/multimedia/ab-av1/Makefile.crates b/multimedia/ab-av1/Makefile.crates
new file mode 100644
index 000000000000..c623abd045d1
--- /dev/null
+++ b/multimedia/ab-av1/Makefile.crates
@@ -0,0 +1,86 @@
+CARGO_CRATES=	anyhow-1.0.65 \
+		atty-0.2.14 \
+		autocfg-1.1.0 \
+		bitflags-1.3.2 \
+		bytes-1.2.1 \
+		cc-1.0.73 \
+		cfg-if-1.0.0 \
+		clap-3.2.22 \
+		clap_complete-3.2.5 \
+		clap_derive-3.2.18 \
+		clap_lex-0.2.4 \
+		console-0.15.1 \
+		encode_unicode-0.3.6 \
+		errno-0.2.8 \
+		errno-dragonfly-0.1.2 \
+		ffprobe-0.3.3 \
+		futures-0.3.24 \
+		futures-channel-0.3.24 \
+		futures-core-0.3.24 \
+		futures-executor-0.3.24 \
+		futures-io-0.3.24 \
+		futures-macro-0.3.24 \
+		futures-sink-0.3.24 \
+		futures-task-0.3.24 \
+		futures-util-0.3.24 \
+		getrandom-0.2.7 \
+		hashbrown-0.12.3 \
+		heck-0.4.0 \
+		hermit-abi-0.1.19 \
+		humantime-2.1.0 \
+		indexmap-1.9.1 \
+		indicatif-0.17.1 \
+		itoa-1.0.3 \
+		libc-0.2.134 \
+		log-0.4.17 \
+		memchr-2.5.0 \
+		mio-0.8.4 \
+		num_cpus-1.13.1 \
+		num_threads-0.1.6 \
+		number_prefix-0.4.0 \
+		once_cell-1.15.0 \
+		os_str_bytes-6.3.0 \
+		pin-project-lite-0.2.9 \
+		pin-utils-0.1.0 \
+		ppv-lite86-0.2.16 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.46 \
+		quote-1.0.21 \
+		rand-0.8.5 \
+		rand_chacha-0.3.1 \
+		rand_core-0.6.4 \
+		ryu-1.0.11 \
+		serde-1.0.145 \
+		serde_derive-1.0.145 \
+		serde_json-1.0.85 \
+		shell-escape-0.1.5 \
+		signal-hook-registry-1.4.0 \
+		slab-0.4.7 \
+		strsim-0.10.0 \
+		syn-1.0.101 \
+		termcolor-1.1.3 \
+		terminal_size-0.1.17 \
+		textwrap-0.15.1 \
+		time-0.3.14 \
+		time-macros-0.2.4 \
+		tokio-1.21.2 \
+		tokio-macros-1.8.0 \
+		tokio-process-stream-0.3.0 \
+		tokio-stream-0.1.10 \
+		tokio-util-0.7.4 \
+		unicode-ident-1.0.4 \
+		unicode-width-0.1.10 \
+		unix-named-pipe-0.2.0 \
+		version_check-0.9.4 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		windows-sys-0.36.1 \
+		windows_aarch64_msvc-0.36.1 \
+		windows_i686_gnu-0.36.1 \
+		windows_i686_msvc-0.36.1 \
+		windows_x86_64_gnu-0.36.1 \
+		windows_x86_64_msvc-0.36.1
diff --git a/multimedia/av1an/Makefile b/multimedia/av1an/Makefile
index e02a6a1af2a0..56619d15f28d 100644
--- a/multimedia/av1an/Makefile
+++ b/multimedia/av1an/Makefile
@@ -25,207 +25,6 @@ GH_ACCOUNT=	master-of-zen
 GH_PROJECT=	Av1an
 PLIST_FILES=	bin/${PORTNAME}
 
-CARGO_CRATES=	addr2line-0.17.0 \
-		adler-1.0.2 \
-		affinity-0.1.2 \
-		aho-corasick-0.7.18 \
-		ansi_term-0.12.1 \
-		anyhow-1.0.52 \
-		arbitrary-0.4.7 \
-		arg_enum_proc_macro-0.3.2 \
-		arrayvec-0.7.2 \
-		atty-0.2.14 \
-		autocfg-1.0.1 \
-		av-bitstream-0.1.2 \
-		av-data-0.3.0 \
-		av-format-0.3.1 \
-		av-ivf-0.2.3 \
-		av-scenechange-0.7.2 \
-		backtrace-0.3.63 \
-		bindgen-0.54.0 \
-		bitflags-1.3.2 \
-		bitstream-io-1.2.0 \
-		bumpalo-3.9.1 \
-		byte-slice-cast-1.2.0 \
-		bytes-1.1.0 \
-		cc-1.0.72 \
-		cexpr-0.4.0 \
-		cfg-expr-0.7.4 \
-		cfg-if-0.1.10 \
-		cfg-if-1.0.0 \
-		chrono-0.4.19 \
-		clang-sys-0.29.3 \
-		clap-3.0.7 \
-		clap_derive-3.0.6 \
-		console-0.15.0 \
-		core-foundation-sys-0.8.3 \
-		crossbeam-channel-0.5.2 \
-		crossbeam-deque-0.8.1 \
-		crossbeam-epoch-0.9.6 \
-		crossbeam-utils-0.8.6 \
-		dashmap-5.0.0 \
-		either-1.6.1 \
-		encode_unicode-0.3.6 \
-		enum-iterator-0.7.0 \
-		enum-iterator-derive-0.7.0 \
-		err-derive-0.2.4 \
-		errno-0.2.8 \
-		errno-dragonfly-0.1.2 \
-		failure-0.1.8 \
-		failure_derive-0.1.8 \
-		ffmpeg-next-4.4.0 \
-		ffmpeg-sys-next-4.4.0 \
-		flexi_logger-0.22.2 \
-		form_urlencoded-1.0.1 \
-		getrandom-0.2.4 \
-		getset-0.1.2 \
-		gimli-0.26.1 \
-		git2-0.13.25 \
-		glob-0.3.0 \
-		hashbrown-0.11.2 \
-		heck-0.3.3 \
-		heck-0.4.0 \
-		hermit-abi-0.1.19 \
-		idna-0.2.3 \
-		indexmap-1.8.0 \
-		indicatif-0.17.0-rc.1 \
-		instant-0.1.12 \
-		interpolate_name-0.2.3 \
-		itertools-0.10.3 \
-		itoa-0.4.8 \
-		itoa-1.0.1 \
-		jobserver-0.1.24 \
-		js-sys-0.3.55 \
-		lazy_static-1.4.0 \
-		lazycell-1.3.0 \
-		libc-0.2.112 \
-		libfuzzer-sys-0.3.5 \
-		libgit2-sys-0.12.26+1.3.0 \
-		libloading-0.5.2 \
-		libz-sys-1.1.3 \
-		lock_api-0.4.5 \
-		log-0.4.14 \
-		matches-0.1.9 \
-		memchr-2.4.1 \
-		memoffset-0.6.5 \
-		minimal-lexical-0.2.1 \
-		miniz_oxide-0.4.4 \
-		mio-0.7.14 \
-		miow-0.3.7 \
-		nasm-rs-0.2.3 \
-		nom-5.1.2 \
-		nom-7.1.0 \
-		noop_proc_macro-0.3.0 \
-		ntapi-0.3.6 \
-		num-bigint-0.3.3 \
-		num-derive-0.3.3 \
-		num-integer-0.1.44 \
-		num-rational-0.3.2 \
-		num-traits-0.2.14 \
-		num_cpus-1.13.1 \
-		number_prefix-0.4.0 \
-		object-0.27.1 \
-		once_cell-1.9.0 \
-		os_str_bytes-6.0.0 \
-		parking_lot-0.11.2 \
-		parking_lot_core-0.8.5 \
-		paste-1.0.6 \
-		path_abs-0.5.1 \
-		peeking_take_while-0.1.2 \
-		percent-encoding-2.1.0 \
-		pin-project-lite-0.2.8 \
-		pkg-config-0.3.24 \
-		plotters-0.3.1 \
-		plotters-backend-0.3.2 \
-		plotters-svg-0.3.1 \
-		ppv-lite86-0.2.16 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.36 \
-		quote-1.0.14 \
-		rand-0.8.4 \
-		rand_chacha-0.3.1 \
-		rand_core-0.6.3 \
-		rand_hc-0.3.1 \
-		rav1e-0.5.1 \
-		rayon-1.5.1 \
-		rayon-core-1.9.1 \
-		redox_syscall-0.2.10 \
-		regex-1.5.4 \
-		regex-syntax-0.6.25 \
-		rust_hawktracer-0.7.0 \
-		rust_hawktracer_normal_macro-0.4.1 \
-		rust_hawktracer_proc_macro-0.4.1 \
-		rustc-demangle-0.1.21 \
-		rustc-hash-1.1.0 \
-		rustc_version-0.4.0 \
-		rustversion-1.0.6 \
-		ryu-1.0.9 \
-		scopeguard-1.1.0 \
-		semver-1.0.4 \
-		serde-1.0.133 \
-		serde_derive-1.0.133 \
-		serde_json-1.0.75 \
-		shlex-0.1.1 \
-		shlex-1.1.0 \
-		signal-hook-registry-1.4.0 \
-		simd_helpers-0.1.0 \
-		simdutf8-0.1.3 \
-		smallvec-1.8.0 \
-		smawk-0.3.1 \
-		splines-4.0.3 \
-		std_prelude-0.2.12 \
-		stfu8-0.2.4 \
-		strsim-0.10.0 \
-		strum-0.21.0 \
-		strum-0.23.0 \
-		strum_macros-0.21.1 \
-		strum_macros-0.23.1 \
-		syn-1.0.85 \
-		synstructure-0.12.6 \
-		sysinfo-0.22.5 \
-		system-deps-3.1.2 \
-		termcolor-1.1.2 \
-		terminal_size-0.1.17 \
-		textwrap-0.14.2 \
-		thiserror-1.0.30 \
-		thiserror-impl-1.0.30 \
-		time-0.1.44 \
-		time-0.3.5 \
-		time-macros-0.2.3 \
-		tinyvec-1.5.1 \
-		tinyvec_macros-0.1.0 \
-		tokio-1.15.0 \
-		toml-0.5.8 \
-		unicode-bidi-0.3.7 \
-		unicode-linebreak-0.1.2 \
-		unicode-normalization-0.1.19 \
-		unicode-segmentation-1.8.0 \
-		unicode-width-0.1.9 \
-		unicode-xid-0.2.2 \
-		url-2.2.2 \
-		v_frame-0.2.5 \
-		vapoursynth-0.3.0 \
-		vapoursynth-sys-0.3.0 \
-		vcpkg-0.2.15 \
-		vergen-3.2.0 \
-		vergen-6.0.0 \
-		version-compare-0.0.11 \
-		version_check-0.9.4 \
-		wasi-0.10.0+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.78 \
-		wasm-bindgen-backend-0.2.78 \
-		wasm-bindgen-macro-0.2.78 \
-		wasm-bindgen-macro-support-0.2.78 \
-		wasm-bindgen-shared-0.2.78 \
-		web-sys-0.3.55 \
-		which-4.2.2 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		y4m-0.7.0
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,"llvm-config,&${LLVM_DEFAULT},' \
 		${WRKSRC}/cargo-crates/clang-sys-*/build/common.rs \
diff --git a/multimedia/av1an/Makefile.crates b/multimedia/av1an/Makefile.crates
new file mode 100644
index 000000000000..f354b819c6a7
--- /dev/null
+++ b/multimedia/av1an/Makefile.crates
@@ -0,0 +1,200 @@
+CARGO_CRATES=	addr2line-0.17.0 \
+		adler-1.0.2 \
+		affinity-0.1.2 \
+		aho-corasick-0.7.18 \
+		ansi_term-0.12.1 \
+		anyhow-1.0.52 \
+		arbitrary-0.4.7 \
+		arg_enum_proc_macro-0.3.2 \
+		arrayvec-0.7.2 \
+		atty-0.2.14 \
+		autocfg-1.0.1 \
+		av-bitstream-0.1.2 \
+		av-data-0.3.0 \
+		av-format-0.3.1 \
+		av-ivf-0.2.3 \
+		av-scenechange-0.7.2 \
+		backtrace-0.3.63 \
+		bindgen-0.54.0 \
+		bitflags-1.3.2 \
+		bitstream-io-1.2.0 \
+		bumpalo-3.9.1 \
+		byte-slice-cast-1.2.0 \
+		bytes-1.1.0 \
+		cc-1.0.72 \
+		cexpr-0.4.0 \
+		cfg-expr-0.7.4 \
+		cfg-if-0.1.10 \
+		cfg-if-1.0.0 \
+		chrono-0.4.19 \
+		clang-sys-0.29.3 \
+		clap-3.0.7 \
+		clap_derive-3.0.6 \
+		console-0.15.0 \
+		core-foundation-sys-0.8.3 \
+		crossbeam-channel-0.5.2 \
+		crossbeam-deque-0.8.1 \
+		crossbeam-epoch-0.9.6 \
+		crossbeam-utils-0.8.6 \
+		dashmap-5.0.0 \
+		either-1.6.1 \
+		encode_unicode-0.3.6 \
+		enum-iterator-0.7.0 \
+		enum-iterator-derive-0.7.0 \
+		err-derive-0.2.4 \
+		errno-0.2.8 \
+		errno-dragonfly-0.1.2 \
+		failure-0.1.8 \
+		failure_derive-0.1.8 \
+		ffmpeg-next-4.4.0 \
+		ffmpeg-sys-next-4.4.0 \
+		flexi_logger-0.22.2 \
+		form_urlencoded-1.0.1 \
+		getrandom-0.2.4 \
+		getset-0.1.2 \
+		gimli-0.26.1 \
+		git2-0.13.25 \
+		glob-0.3.0 \
+		hashbrown-0.11.2 \
+		heck-0.3.3 \
+		heck-0.4.0 \
+		hermit-abi-0.1.19 \
+		idna-0.2.3 \
+		indexmap-1.8.0 \
+		indicatif-0.17.0-rc.1 \
+		instant-0.1.12 \
+		interpolate_name-0.2.3 \
+		itertools-0.10.3 \
+		itoa-0.4.8 \
+		itoa-1.0.1 \
+		jobserver-0.1.24 \
+		js-sys-0.3.55 \
+		lazy_static-1.4.0 \
+		lazycell-1.3.0 \
+		libc-0.2.112 \
+		libfuzzer-sys-0.3.5 \
+		libgit2-sys-0.12.26+1.3.0 \
+		libloading-0.5.2 \
+		libz-sys-1.1.3 \
+		lock_api-0.4.5 \
+		log-0.4.14 \
+		matches-0.1.9 \
+		memchr-2.4.1 \
+		memoffset-0.6.5 \
+		minimal-lexical-0.2.1 \
+		miniz_oxide-0.4.4 \
+		mio-0.7.14 \
+		miow-0.3.7 \
+		nasm-rs-0.2.3 \
+		nom-5.1.2 \
+		nom-7.1.0 \
+		noop_proc_macro-0.3.0 \
+		ntapi-0.3.6 \
+		num-bigint-0.3.3 \
+		num-derive-0.3.3 \
+		num-integer-0.1.44 \
+		num-rational-0.3.2 \
+		num-traits-0.2.14 \
+		num_cpus-1.13.1 \
+		number_prefix-0.4.0 \
+		object-0.27.1 \
+		once_cell-1.9.0 \
+		os_str_bytes-6.0.0 \
+		parking_lot-0.11.2 \
+		parking_lot_core-0.8.5 \
+		paste-1.0.6 \
+		path_abs-0.5.1 \
+		peeking_take_while-0.1.2 \
+		percent-encoding-2.1.0 \
+		pin-project-lite-0.2.8 \
+		pkg-config-0.3.24 \
+		plotters-0.3.1 \
+		plotters-backend-0.3.2 \
+		plotters-svg-0.3.1 \
+		ppv-lite86-0.2.16 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.36 \
+		quote-1.0.14 \
+		rand-0.8.4 \
+		rand_chacha-0.3.1 \
+		rand_core-0.6.3 \
+		rand_hc-0.3.1 \
+		rav1e-0.5.1 \
+		rayon-1.5.1 \
+		rayon-core-1.9.1 \
+		redox_syscall-0.2.10 \
+		regex-1.5.4 \
+		regex-syntax-0.6.25 \
+		rust_hawktracer-0.7.0 \
+		rust_hawktracer_normal_macro-0.4.1 \
+		rust_hawktracer_proc_macro-0.4.1 \
+		rustc-demangle-0.1.21 \
+		rustc-hash-1.1.0 \
+		rustc_version-0.4.0 \
+		rustversion-1.0.6 \
+		ryu-1.0.9 \
+		scopeguard-1.1.0 \
+		semver-1.0.4 \
+		serde-1.0.133 \
+		serde_derive-1.0.133 \
+		serde_json-1.0.75 \
+		shlex-0.1.1 \
+		shlex-1.1.0 \
+		signal-hook-registry-1.4.0 \
+		simd_helpers-0.1.0 \
+		simdutf8-0.1.3 \
+		smallvec-1.8.0 \
+		smawk-0.3.1 \
+		splines-4.0.3 \
+		std_prelude-0.2.12 \
+		stfu8-0.2.4 \
+		strsim-0.10.0 \
+		strum-0.21.0 \
+		strum-0.23.0 \
+		strum_macros-0.21.1 \
+		strum_macros-0.23.1 \
+		syn-1.0.85 \
+		synstructure-0.12.6 \
+		sysinfo-0.22.5 \
+		system-deps-3.1.2 \
+		termcolor-1.1.2 \
+		terminal_size-0.1.17 \
+		textwrap-0.14.2 \
+		thiserror-1.0.30 \
+		thiserror-impl-1.0.30 \
+		time-0.1.44 \
+		time-0.3.5 \
+		time-macros-0.2.3 \
+		tinyvec-1.5.1 \
+		tinyvec_macros-0.1.0 \
+		tokio-1.15.0 \
+		toml-0.5.8 \
+		unicode-bidi-0.3.7 \
+		unicode-linebreak-0.1.2 \
+		unicode-normalization-0.1.19 \
+		unicode-segmentation-1.8.0 \
+		unicode-width-0.1.9 \
+		unicode-xid-0.2.2 \
+		url-2.2.2 \
+		v_frame-0.2.5 \
+		vapoursynth-0.3.0 \
+		vapoursynth-sys-0.3.0 \
+		vcpkg-0.2.15 \
+		vergen-3.2.0 \
+		vergen-6.0.0 \
+		version-compare-0.0.11 \
+		version_check-0.9.4 \
+		wasi-0.10.0+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.78 \
+		wasm-bindgen-backend-0.2.78 \
+		wasm-bindgen-macro-0.2.78 \
+		wasm-bindgen-macro-support-0.2.78 \
+		wasm-bindgen-shared-0.2.78 \
+		web-sys-0.3.55 \
+		which-4.2.2 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		y4m-0.7.0
diff --git a/multimedia/gstreamer1-plugins-rust/Makefile b/multimedia/gstreamer1-plugins-rust/Makefile
index 50258f124610..2ef6ed33c06e 100644
--- a/multimedia/gstreamer1-plugins-rust/Makefile
+++ b/multimedia/gstreamer1-plugins-rust/Makefile
@@ -25,401 +25,6 @@ GL_ACCOUNT=	gstreamer
 GL_PROJECT=	gst-plugins-rs
 GL_COMMIT=	18c9bd0355e0fc1ab20072d805807112945ad5bb
 MAKE_ENV=	${CARGO_ENV}
-
-CARGO_CRATES=	adler-1.0.2 \
-		adler32-1.2.0 \
-		aes-0.6.0 \
-		aes-ctr-0.6.0 \
-		aes-soft-0.6.4 \
-		aesni-0.10.0 \
-		aho-corasick-0.7.18 \
-		ansi_term-0.12.1 \
-		anyhow-1.0.57 \
-		arbitrary-0.4.7 \
-		arg_enum_proc_macro-0.3.2 \
-		array-init-2.0.0 \
-		arrayvec-0.7.2 \
-		async-compression-0.3.12 \
-		async-task-4.2.0 \
-		async-trait-0.1.53 \
-		async-tungstenite-0.17.2 \
-		atomic_refcell-0.1.8 \
-		atty-0.2.14 \
-		autocfg-1.1.0 \
-		backoff-0.4.0 \
-		base-x-0.2.10 \
-		base32-0.4.0 \
-		base64-0.13.0 \
-		bincode-1.3.3 \
-		bindgen-0.59.2 \
-		bitflags-1.3.2 \
-		bitstream-io-1.3.0 \
-		block-buffer-0.9.0 \
-		block-buffer-0.10.2 \
-		build_const-0.2.2 \
-		bumpalo-3.9.1 \
-		byte-slice-cast-1.2.1 \
-		bytemuck-1.9.1 \
-		byteorder-1.4.3 \
-		bytes-1.1.0 \
-		cache-padded-1.2.0 \
-		cc-1.0.73 \
-		cdg-0.1.0 \
-		cdg_renderer-0.7.0 \
-		cexpr-0.6.0 \
-		cfg-expr-0.7.4 \
-		cfg-expr-0.10.2 \
-		cfg-if-0.1.10 \
-		cfg-if-1.0.0 \
-		chrono-0.4.19 \
-		cipher-0.2.5 \
-		clang-sys-1.3.1 \
-		clap-2.34.0 \
-		clap-3.1.12 \
-		clap_derive-3.1.7 \
-		clap_lex-0.1.1 \
-		claxon-0.4.3 \
-		color_quant-1.1.0 \
-		concurrent-queue-1.2.2 \
-		const_fn-0.4.9 \
-		cookie-0.15.1 \
-		cookie_store-0.15.1 \
-		core-foundation-0.9.3 \
-		core-foundation-sys-0.8.3 \
-		cpufeatures-0.2.2 \
-		crc-1.8.1 \
-		crc-3.0.0 \
-		crc-catalog-2.1.0 \
-		crc32fast-1.3.2 \
-		crossbeam-channel-0.5.4 \
-		crossbeam-deque-0.8.1 \
-		crossbeam-epoch-0.9.8 \
-		crossbeam-utils-0.8.8 \
-		crypto-common-0.1.3 \
-		crypto-mac-0.11.1 \
-		csound-0.1.8 \
-		csound-sys-0.1.2 \
-		ctor-0.1.22 \
-		ctr-0.6.0 \
-		dasp_frame-0.11.0 \
-		dasp_sample-0.11.0 \
-		dav1d-0.8.0 \
-		dav1d-sys-0.5.0 \
-		deflate-1.0.0 \
-		diff-0.1.12 \
-		digest-0.9.0 \
-		digest-0.10.3 \
-		dirs-next-2.0.0 \
-		dirs-sys-next-0.1.2 \
-		discard-1.0.4 \
-		ebur128-0.1.6 \
-		ed25519-1.4.1 \
-		either-1.6.1 \
-		encoding_rs-0.8.31 \
-		env_logger-0.8.4 \
-		env_logger-0.9.0 \
-		fastrand-1.7.0 \
-		field-offset-0.3.4 \
-		flate2-1.0.23 \
-		fnv-1.0.7 \
-		foreign-types-0.3.2 \
-		foreign-types-shared-0.1.1 \
-		form_urlencoded-1.0.1 \
-		fragile-1.2.0 \
-		fst-0.4.7 \
-		futures-0.3.21 \
-		futures-channel-0.3.21 \
-		futures-core-0.3.21 \
-		futures-executor-0.3.21 \
-		futures-io-0.3.21 \
-		futures-macro-0.3.21 \
-		futures-sink-0.3.21 \
-		futures-task-0.3.21 \
-		futures-util-0.3.21 \
-		generic-array-0.14.5 \
-		getopts-0.2.21 \
-		getrandom-0.2.6 \
-		gif-0.11.3 \
-		glob-0.3.0 \
-		h2-0.3.13 \
-		hashbrown-0.11.2 \
-		headers-0.3.7 \
-		headers-core-0.2.0 \
-		heck-0.3.3 \
-		heck-0.4.0 \
-		hermit-abi-0.1.19 \
-		hex-0.4.3 \
-		hmac-0.11.0 \
-		hostname-0.3.1 \
-		hrtf-0.8.0 \
-		http-0.2.6 \
-		http-body-0.4.4 \
-		httparse-1.7.0 \
-		httpdate-1.0.2 \
-		humantime-2.1.0 \
-		hyper-0.14.18 \
-		hyper-proxy-0.9.1 \
-		hyper-tls-0.5.0 \
-		hyphenation-0.8.4 \
-		hyphenation_commons-0.8.4 \
-		idna-0.2.3 \
-		if-addrs-0.6.7 \
-		if-addrs-sys-0.3.2 \
-		image-0.24.1 \
-		indexmap-1.8.1 \
-		instant-0.1.12 \
-		interpolate_name-0.2.3 \
-		ipnet-2.5.0 \
-		itertools-0.10.3 \
-		itoa-1.0.1 \
-		jobserver-0.1.24 \
-		js-sys-0.3.57 \
-		lazy_static-1.4.0 \
-		lazycell-1.3.0 \
-		lewton-0.10.2 \
-		libc-0.2.124 \
-		libfuzzer-sys-0.3.5 \
-		libloading-0.7.3 \
-		libm-0.2.2 \
-		libmdns-0.6.2 \
-		librespot-0.3.1 \
-		librespot-audio-0.3.1 \
-		librespot-connect-0.3.1 \
-		librespot-core-0.3.1 \
-		librespot-discovery-0.3.1 \
-		librespot-metadata-0.3.1 \
-		librespot-playback-0.3.1 \
-		librespot-protocol-0.3.1 \
-		libsodium-sys-0.2.7 \
-		libwebp-sys2-0.1.2 \
-		lock_api-0.4.7 \
-		log-0.4.16 \
-		m3u8-rs-4.0.0 \
-		match_cfg-0.1.0 \
-		matches-0.1.9 \
-		md-5-0.9.1 \
-		memchr-2.4.1 \
-		memoffset-0.6.5 \
-		mime-0.3.16 \
-		minimal-lexical-0.2.1 \
-		miniz_oxide-0.5.1 \
-		mio-0.8.2 \
-		miow-0.3.7 \
-		more-asserts-0.2.2 \
-		muldiv-1.0.0 \
-		multimap-0.8.3 \
-		nasm-rs-0.2.4 \
-		native-tls-0.2.10 \
-		nnnoiseless-0.4.0 \
-		nom-7.1.1 \
-		noop_proc_macro-0.3.0 \
-		ntapi-0.3.7 \
-		num-bigint-0.4.3 \
-		num-complex-0.4.0 \
-		num-derive-0.3.3 \
-		num-integer-0.1.44 \
-		num-iter-0.1.42 \
-		num-rational-0.4.0 \
-		num-traits-0.2.14 \
-		num_cpus-1.13.1 \
-		ogg-0.8.0 \
-		once_cell-1.10.0 \
-		opaque-debug-0.3.0 \
-		openssl-0.10.38 \
-		openssl-probe-0.1.5 \
-		openssl-sys-0.9.72 \
-		option-operations-0.4.0 \
-		os_str_bytes-6.0.0 \
-		output_vt100-0.1.3 \
-		parking_lot-0.12.0 \
-		parking_lot_core-0.9.2 \
-		paste-1.0.7 \
-		pbkdf2-0.8.0 \
-		peeking_take_while-0.1.2 \
-		percent-encoding-2.1.0 \
-		pest-2.1.3 \
-		pin-project-lite-0.2.8 \
-		pin-utils-0.1.0 \
-		pkg-config-0.3.25 \
-		png-0.17.5 \
-		pocket-resources-0.3.2 \
-		polling-2.2.0 \
-		ppv-lite86-0.2.16 \
-		pretty-hex-0.3.0 \
-		pretty_assertions-1.2.1 \
-		primal-check-0.3.1 \
-		priority-queue-1.2.1 \
-		proc-macro-crate-1.1.3 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro-hack-0.5.19 \
-		proc-macro2-1.0.37 \
-		protobuf-2.27.1 \
-		protobuf-codegen-2.27.1 \
-		protobuf-codegen-pure-2.27.1 \
-		psl-types-2.0.10 \
-		publicsuffix-2.1.1 \
-		quick-xml-0.22.0 \
-		quote-1.0.18 \
-		rand-0.8.5 \
-		rand_chacha-0.3.1 \
-		rand_core-0.6.3 \
-		rand_distr-0.4.3 \
-		rav1e-0.5.1 \
-		rayon-1.5.2 \
-		rayon-core-1.9.2 \
-		realfft-2.0.1 \
-		redox_syscall-0.2.13 \
-		redox_users-0.4.3 \
-		regex-1.5.5 \
-		regex-syntax-0.6.25 \
-		remove_dir_all-0.5.3 \
-		reqwest-0.11.10 \
-		rpassword-5.0.1 \
-		rubato-0.10.1 \
-		rusoto_core-0.48.0 \
-		rusoto_credential-0.48.0 \
-		rusoto_s3-0.48.0 \
-		rusoto_signature-0.48.0 \
-		rust_hawktracer-0.7.0 \
-		rust_hawktracer_normal_macro-0.4.1 \
-		rust_hawktracer_proc_macro-0.4.1 \
-		rustc-hash-1.1.0 \
-		rustc_version-0.2.3 \
-		rustc_version-0.3.3 \
-		rustc_version-0.4.0 \
-		rustfft-6.0.1 \
-		ryu-1.0.9 \
-		same-file-1.0.6 \
-		schannel-0.1.19 \
-		scopeguard-1.1.0 \
-		security-framework-2.6.1 \
-		security-framework-sys-2.6.1 \
-		semver-0.9.0 \
-		semver-0.11.0 \
-		semver-1.0.7 \
-		semver-parser-0.7.0 \
-		semver-parser-0.10.2 \
-		serde-1.0.136 \
-		serde_bytes-0.11.5 \
-		serde_derive-1.0.136 \
-		serde_json-1.0.79 \
-		serde_urlencoded-0.7.1 \
-		sha-1-0.9.8 \
-		sha-1-0.10.0 \
-		sha1-0.6.1 \
-		sha1_smol-1.0.0 \
-		sha2-0.9.9 \
-		shannon-0.2.0 \
-		shell-words-1.1.0 \
-		shlex-1.1.0 \
-		signal-hook-registry-1.4.0 \
-		signature-1.5.0 \
-		simd_helpers-0.1.0 \
-		slab-0.4.6 \
-		smallvec-1.8.0 \
-		smawk-0.3.1 \
-		socket2-0.4.4 \
-		sodiumoxide-0.2.7 \
-		standback-0.2.17 \
-		stdweb-0.4.20 \
-		stdweb-derive-0.5.3 \
-		stdweb-internal-macros-0.2.9 \
-		stdweb-internal-runtime-0.1.5 \
-		strength_reduce-0.2.3 \
-		strsim-0.8.0 \
-		strsim-0.10.0 \
-		structopt-0.3.26 \
-		structopt-derive-0.4.18 \
-		strum-0.21.0 \
-		strum_macros-0.21.1 \
-		subtle-2.4.1 \
-		syn-1.0.91 \
-		synstructure-0.12.6 \
-		system-deps-3.1.2 \
-		system-deps-6.0.2 \
-		tempfile-3.3.0 \
-		termcolor-1.1.3 \
-		textwrap-0.11.0 \
-		textwrap-0.15.0 \
-		thiserror-1.0.30 \
-		thiserror-impl-1.0.30 \
-		time-0.1.43 \
-		time-0.2.27 \
-		time-macros-0.1.1 \
-		time-macros-impl-0.1.2 \
-		tinyvec-1.6.0 \
-		tinyvec_macros-0.1.0 \
-		tokio-1.17.0 \
-		tokio-macros-1.7.0 \
-		tokio-native-tls-0.3.0 \
-		tokio-stream-0.1.8 \
-		tokio-util-0.6.9 \
-		tokio-util-0.7.1 \
-		toml-0.5.9 \
-		tower-service-0.3.1 \
-		tracing-0.1.34 \
-		tracing-attributes-0.1.20 \
-		tracing-core-0.1.26 \
-		transpose-0.2.1 \
-		try-lock-0.2.3 \
-		tungstenite-0.17.2 \
-		typenum-1.15.0 \
-		ucd-trie-0.1.3 \
-		unicode-bidi-0.3.7 \
-		unicode-linebreak-0.1.2 \
-		unicode-normalization-0.1.19 \
-		unicode-segmentation-1.9.0 \
-		unicode-width-0.1.9 \
-		unicode-xid-0.2.2 \
-		url-2.2.2 \
-		utf-8-0.7.6 \
-		uuid-0.8.2 \
-		uuid-1.0.0 \
-		v_frame-0.2.5 \
-		va_list-0.1.4 \
-		vcpkg-0.2.15 \
-		vec_map-0.8.2 \
-		vergen-3.2.0 \
-		version-compare-0.0.11 \
-		version-compare-0.1.0 \
-		version_check-0.9.4 \
-		waker-fn-1.1.0 \
-		walkdir-2.3.2 \
-		want-0.3.0 \
-		wasi-0.10.2+wasi-snapshot-preview1 \
-		wasi-0.11.0+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.80 \
-		wasm-bindgen-backend-0.2.80 \
-		wasm-bindgen-futures-0.4.30 \
-		wasm-bindgen-macro-0.2.80 \
-		wasm-bindgen-macro-support-0.2.80 \
-		wasm-bindgen-shared-0.2.80 \
-		web-sys-0.3.57 \
-		weezl-0.1.6 \
-		wepoll-ffi-0.1.2 \
-		which-4.2.5 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		windows-sys-0.34.0 \
-		windows_aarch64_msvc-0.34.0 \
-		windows_i686_gnu-0.34.0 \
-		windows_i686_msvc-0.34.0 \
-		windows_x86_64_gnu-0.34.0 \
-		windows_x86_64_msvc-0.34.0 \
-		winreg-0.10.1 \
-		xml-rs-0.8.4 \
-		zerocopy-0.3.0 \
-		zerocopy-derive-0.2.0 \
-		zeroize-1.5.4 \
-		cairo-rs,cairo-sys-rs,gdk-pixbuf,gdk-pixbuf-sys,gio,gio-sys,glib,glib-macros,glib-sys,gobject-sys,graphene-rs,graphene-sys,pango,pango-sys,pangocairo,pangocairo-sys@git+https://github.com/gtk-rs/gtk-rs-core?branch=0.15\#59eea5774c06bfd323e9298240f615ad2f7ced9e \
-		gstreamer,gstreamer-app,gstreamer-app-sys,gstreamer-audio,gstreamer-audio-sys,gstreamer-base,gstreamer-base-sys,gstreamer-check,gstreamer-check-sys,gstreamer-net,gstreamer-net-sys,gstreamer-rtp,gstreamer-rtp-sys,gstreamer-sys,gstreamer-video,gstreamer-video-sys@git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.18\#9ee22baa07d2c4e67742baeafb2be49e1db9befe \
-		gdk4,gdk4-sys,gsk4,gsk4-sys,gtk4,gtk4-macros,gtk4-sys@git+https://github.com/gtk-rs/gtk4-rs?branch=0.4\#36aa4108f8e221536e194f62d8ee3be8ea6191f0 \
-		ffv1@git+https://github.com/rust-av/ffv1.git?rev=2afb025a327173ce891954c052e804d0f880368a\#2afb025a327173ce891954c052e804d0f880368a \
-		flavors@git+https://github.com/rust-av/flavors\#c48542aef94b7da36d6f306f4016bee9c79e09ba \
-		atk,atk-sys,gdk,gdk-sys,gtk,gtk-sys,gtk3-macros@git+https://github.com/gtk-rs/gtk3-rs?branch=0.15\#51df5c22fbe02ec57c5052a3e5a91cc9671a0e83
 CARGO_BUILD=	no
 CARGO_INSTALL=	no
 CARGO_TEST=	no
diff --git a/multimedia/gstreamer1-plugins-rust/Makefile.crates b/multimedia/gstreamer1-plugins-rust/Makefile.crates
new file mode 100644
index 000000000000..44797336a568
--- /dev/null
+++ b/multimedia/gstreamer1-plugins-rust/Makefile.crates
@@ -0,0 +1,394 @@
+CARGO_CRATES=	adler-1.0.2 \
+		adler32-1.2.0 \
+		aes-0.6.0 \
+		aes-ctr-0.6.0 \
+		aes-soft-0.6.4 \
+		aesni-0.10.0 \
+		aho-corasick-0.7.18 \
+		ansi_term-0.12.1 \
+		anyhow-1.0.57 \
+		arbitrary-0.4.7 \
+		arg_enum_proc_macro-0.3.2 \
+		array-init-2.0.0 \
+		arrayvec-0.7.2 \
+		async-compression-0.3.12 \
+		async-task-4.2.0 \
+		async-trait-0.1.53 \
+		async-tungstenite-0.17.2 \
+		atomic_refcell-0.1.8 \
+		atty-0.2.14 \
+		autocfg-1.1.0 \
+		backoff-0.4.0 \
+		base-x-0.2.10 \
+		base32-0.4.0 \
+		base64-0.13.0 \
+		bincode-1.3.3 \
+		bindgen-0.59.2 \
+		bitflags-1.3.2 \
+		bitstream-io-1.3.0 \
+		block-buffer-0.9.0 \
+		block-buffer-0.10.2 \
+		build_const-0.2.2 \
+		bumpalo-3.9.1 \
+		byte-slice-cast-1.2.1 \
+		bytemuck-1.9.1 \
+		byteorder-1.4.3 \
+		bytes-1.1.0 \
+		cache-padded-1.2.0 \
+		cc-1.0.73 \
+		cdg-0.1.0 \
+		cdg_renderer-0.7.0 \
+		cexpr-0.6.0 \
+		cfg-expr-0.7.4 \
+		cfg-expr-0.10.2 \
+		cfg-if-0.1.10 \
+		cfg-if-1.0.0 \
+		chrono-0.4.19 \
+		cipher-0.2.5 \
+		clang-sys-1.3.1 \
+		clap-2.34.0 \
+		clap-3.1.12 \
+		clap_derive-3.1.7 \
+		clap_lex-0.1.1 \
+		claxon-0.4.3 \
+		color_quant-1.1.0 \
+		concurrent-queue-1.2.2 \
+		const_fn-0.4.9 \
+		cookie-0.15.1 \
+		cookie_store-0.15.1 \
+		core-foundation-0.9.3 \
+		core-foundation-sys-0.8.3 \
+		cpufeatures-0.2.2 \
+		crc-1.8.1 \
+		crc-3.0.0 \
+		crc-catalog-2.1.0 \
+		crc32fast-1.3.2 \
+		crossbeam-channel-0.5.4 \
+		crossbeam-deque-0.8.1 \
+		crossbeam-epoch-0.9.8 \
+		crossbeam-utils-0.8.8 \
+		crypto-common-0.1.3 \
+		crypto-mac-0.11.1 \
+		csound-0.1.8 \
+		csound-sys-0.1.2 \
+		ctor-0.1.22 \
+		ctr-0.6.0 \
+		dasp_frame-0.11.0 \
+		dasp_sample-0.11.0 \
+		dav1d-0.8.0 \
+		dav1d-sys-0.5.0 \
+		deflate-1.0.0 \
+		diff-0.1.12 \
+		digest-0.9.0 \
+		digest-0.10.3 \
+		dirs-next-2.0.0 \
+		dirs-sys-next-0.1.2 \
+		discard-1.0.4 \
+		ebur128-0.1.6 \
+		ed25519-1.4.1 \
+		either-1.6.1 \
+		encoding_rs-0.8.31 \
+		env_logger-0.8.4 \
+		env_logger-0.9.0 \
+		fastrand-1.7.0 \
+		field-offset-0.3.4 \
+		flate2-1.0.23 \
+		fnv-1.0.7 \
+		foreign-types-0.3.2 \
+		foreign-types-shared-0.1.1 \
+		form_urlencoded-1.0.1 \
+		fragile-1.2.0 \
+		fst-0.4.7 \
+		futures-0.3.21 \
+		futures-channel-0.3.21 \
+		futures-core-0.3.21 \
+		futures-executor-0.3.21 \
+		futures-io-0.3.21 \
+		futures-macro-0.3.21 \
+		futures-sink-0.3.21 \
+		futures-task-0.3.21 \
+		futures-util-0.3.21 \
+		generic-array-0.14.5 \
+		getopts-0.2.21 \
+		getrandom-0.2.6 \
+		gif-0.11.3 \
+		glob-0.3.0 \
+		h2-0.3.13 \
+		hashbrown-0.11.2 \
+		headers-0.3.7 \
+		headers-core-0.2.0 \
+		heck-0.3.3 \
+		heck-0.4.0 \
+		hermit-abi-0.1.19 \
+		hex-0.4.3 \
+		hmac-0.11.0 \
+		hostname-0.3.1 \
+		hrtf-0.8.0 \
+		http-0.2.6 \
+		http-body-0.4.4 \
+		httparse-1.7.0 \
+		httpdate-1.0.2 \
+		humantime-2.1.0 \
+		hyper-0.14.18 \
+		hyper-proxy-0.9.1 \
+		hyper-tls-0.5.0 \
+		hyphenation-0.8.4 \
+		hyphenation_commons-0.8.4 \
+		idna-0.2.3 \
+		if-addrs-0.6.7 \
+		if-addrs-sys-0.3.2 \
+		image-0.24.1 \
+		indexmap-1.8.1 \
+		instant-0.1.12 \
+		interpolate_name-0.2.3 \
+		ipnet-2.5.0 \
+		itertools-0.10.3 \
+		itoa-1.0.1 \
+		jobserver-0.1.24 \
+		js-sys-0.3.57 \
+		lazy_static-1.4.0 \
+		lazycell-1.3.0 \
+		lewton-0.10.2 \
+		libc-0.2.124 \
+		libfuzzer-sys-0.3.5 \
+		libloading-0.7.3 \
+		libm-0.2.2 \
+		libmdns-0.6.2 \
+		librespot-0.3.1 \
+		librespot-audio-0.3.1 \
+		librespot-connect-0.3.1 \
+		librespot-core-0.3.1 \
+		librespot-discovery-0.3.1 \
+		librespot-metadata-0.3.1 \
+		librespot-playback-0.3.1 \
+		librespot-protocol-0.3.1 \
+		libsodium-sys-0.2.7 \
+		libwebp-sys2-0.1.2 \
+		lock_api-0.4.7 \
+		log-0.4.16 \
+		m3u8-rs-4.0.0 \
+		match_cfg-0.1.0 \
+		matches-0.1.9 \
+		md-5-0.9.1 \
+		memchr-2.4.1 \
+		memoffset-0.6.5 \
+		mime-0.3.16 \
+		minimal-lexical-0.2.1 \
+		miniz_oxide-0.5.1 \
+		mio-0.8.2 \
+		miow-0.3.7 \
+		more-asserts-0.2.2 \
+		muldiv-1.0.0 \
+		multimap-0.8.3 \
+		nasm-rs-0.2.4 \
+		native-tls-0.2.10 \
+		nnnoiseless-0.4.0 \
+		nom-7.1.1 \
+		noop_proc_macro-0.3.0 \
+		ntapi-0.3.7 \
+		num-bigint-0.4.3 \
+		num-complex-0.4.0 \
+		num-derive-0.3.3 \
+		num-integer-0.1.44 \
+		num-iter-0.1.42 \
+		num-rational-0.4.0 \
+		num-traits-0.2.14 \
+		num_cpus-1.13.1 \
+		ogg-0.8.0 \
+		once_cell-1.10.0 \
+		opaque-debug-0.3.0 \
+		openssl-0.10.38 \
+		openssl-probe-0.1.5 \
+		openssl-sys-0.9.72 \
+		option-operations-0.4.0 \
+		os_str_bytes-6.0.0 \
+		output_vt100-0.1.3 \
+		parking_lot-0.12.0 \
+		parking_lot_core-0.9.2 \
+		paste-1.0.7 \
+		pbkdf2-0.8.0 \
+		peeking_take_while-0.1.2 \
+		percent-encoding-2.1.0 \
+		pest-2.1.3 \
+		pin-project-lite-0.2.8 \
+		pin-utils-0.1.0 \
+		pkg-config-0.3.25 \
+		png-0.17.5 \
+		pocket-resources-0.3.2 \
+		polling-2.2.0 \
+		ppv-lite86-0.2.16 \
+		pretty-hex-0.3.0 \
+		pretty_assertions-1.2.1 \
+		primal-check-0.3.1 \
+		priority-queue-1.2.1 \
+		proc-macro-crate-1.1.3 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro-hack-0.5.19 \
+		proc-macro2-1.0.37 \
+		protobuf-2.27.1 \
+		protobuf-codegen-2.27.1 \
+		protobuf-codegen-pure-2.27.1 \
+		psl-types-2.0.10 \
+		publicsuffix-2.1.1 \
+		quick-xml-0.22.0 \
+		quote-1.0.18 \
+		rand-0.8.5 \
+		rand_chacha-0.3.1 \
+		rand_core-0.6.3 \
+		rand_distr-0.4.3 \
+		rav1e-0.5.1 \
+		rayon-1.5.2 \
+		rayon-core-1.9.2 \
+		realfft-2.0.1 \
+		redox_syscall-0.2.13 \
+		redox_users-0.4.3 \
+		regex-1.5.5 \
+		regex-syntax-0.6.25 \
+		remove_dir_all-0.5.3 \
+		reqwest-0.11.10 \
+		rpassword-5.0.1 \
+		rubato-0.10.1 \
+		rusoto_core-0.48.0 \
+		rusoto_credential-0.48.0 \
+		rusoto_s3-0.48.0 \
+		rusoto_signature-0.48.0 \
+		rust_hawktracer-0.7.0 \
+		rust_hawktracer_normal_macro-0.4.1 \
+		rust_hawktracer_proc_macro-0.4.1 \
+		rustc-hash-1.1.0 \
+		rustc_version-0.2.3 \
+		rustc_version-0.3.3 \
+		rustc_version-0.4.0 \
+		rustfft-6.0.1 \
+		ryu-1.0.9 \
+		same-file-1.0.6 \
+		schannel-0.1.19 \
+		scopeguard-1.1.0 \
+		security-framework-2.6.1 \
+		security-framework-sys-2.6.1 \
+		semver-0.9.0 \
+		semver-0.11.0 \
+		semver-1.0.7 \
+		semver-parser-0.7.0 \
+		semver-parser-0.10.2 \
+		serde-1.0.136 \
+		serde_bytes-0.11.5 \
+		serde_derive-1.0.136 \
+		serde_json-1.0.79 \
+		serde_urlencoded-0.7.1 \
+		sha-1-0.9.8 \
+		sha-1-0.10.0 \
+		sha1-0.6.1 \
+		sha1_smol-1.0.0 \
+		sha2-0.9.9 \
+		shannon-0.2.0 \
+		shell-words-1.1.0 \
+		shlex-1.1.0 \
+		signal-hook-registry-1.4.0 \
+		signature-1.5.0 \
+		simd_helpers-0.1.0 \
+		slab-0.4.6 \
+		smallvec-1.8.0 \
+		smawk-0.3.1 \
+		socket2-0.4.4 \
+		sodiumoxide-0.2.7 \
+		standback-0.2.17 \
+		stdweb-0.4.20 \
+		stdweb-derive-0.5.3 \
+		stdweb-internal-macros-0.2.9 \
+		stdweb-internal-runtime-0.1.5 \
+		strength_reduce-0.2.3 \
+		strsim-0.8.0 \
+		strsim-0.10.0 \
+		structopt-0.3.26 \
+		structopt-derive-0.4.18 \
+		strum-0.21.0 \
+		strum_macros-0.21.1 \
+		subtle-2.4.1 \
+		syn-1.0.91 \
+		synstructure-0.12.6 \
+		system-deps-3.1.2 \
+		system-deps-6.0.2 \
+		tempfile-3.3.0 \
+		termcolor-1.1.3 \
+		textwrap-0.11.0 \
+		textwrap-0.15.0 \
+		thiserror-1.0.30 \
+		thiserror-impl-1.0.30 \
+		time-0.1.43 \
+		time-0.2.27 \
+		time-macros-0.1.1 \
+		time-macros-impl-0.1.2 \
+		tinyvec-1.6.0 \
+		tinyvec_macros-0.1.0 \
+		tokio-1.17.0 \
+		tokio-macros-1.7.0 \
+		tokio-native-tls-0.3.0 \
+		tokio-stream-0.1.8 \
+		tokio-util-0.6.9 \
+		tokio-util-0.7.1 \
+		toml-0.5.9 \
+		tower-service-0.3.1 \
+		tracing-0.1.34 \
+		tracing-attributes-0.1.20 \
+		tracing-core-0.1.26 \
+		transpose-0.2.1 \
+		try-lock-0.2.3 \
+		tungstenite-0.17.2 \
+		typenum-1.15.0 \
+		ucd-trie-0.1.3 \
+		unicode-bidi-0.3.7 \
+		unicode-linebreak-0.1.2 \
+		unicode-normalization-0.1.19 \
+		unicode-segmentation-1.9.0 \
+		unicode-width-0.1.9 \
+		unicode-xid-0.2.2 \
+		url-2.2.2 \
+		utf-8-0.7.6 \
+		uuid-0.8.2 \
+		uuid-1.0.0 \
+		v_frame-0.2.5 \
+		va_list-0.1.4 \
+		vcpkg-0.2.15 \
+		vec_map-0.8.2 \
+		vergen-3.2.0 \
+		version-compare-0.0.11 \
+		version-compare-0.1.0 \
+		version_check-0.9.4 \
+		waker-fn-1.1.0 \
+		walkdir-2.3.2 \
+		want-0.3.0 \
+		wasi-0.10.2+wasi-snapshot-preview1 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.80 \
+		wasm-bindgen-backend-0.2.80 \
+		wasm-bindgen-futures-0.4.30 \
+		wasm-bindgen-macro-0.2.80 \
+		wasm-bindgen-macro-support-0.2.80 \
+		wasm-bindgen-shared-0.2.80 \
+		web-sys-0.3.57 \
+		weezl-0.1.6 \
+		wepoll-ffi-0.1.2 \
+		which-4.2.5 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		windows-sys-0.34.0 \
+		windows_aarch64_msvc-0.34.0 \
+		windows_i686_gnu-0.34.0 \
+		windows_i686_msvc-0.34.0 \
+		windows_x86_64_gnu-0.34.0 \
+		windows_x86_64_msvc-0.34.0 \
+		winreg-0.10.1 \
+		xml-rs-0.8.4 \
+		zerocopy-0.3.0 \
+		zerocopy-derive-0.2.0 \
+		zeroize-1.5.4 \
+		cairo-rs,cairo-sys-rs,gdk-pixbuf,gdk-pixbuf-sys,gio,gio-sys,glib,glib-macros,glib-sys,gobject-sys,graphene-rs,graphene-sys,pango,pango-sys,pangocairo,pangocairo-sys@git+https://github.com/gtk-rs/gtk-rs-core?branch=0.15\#59eea5774c06bfd323e9298240f615ad2f7ced9e \
+		gstreamer,gstreamer-app,gstreamer-app-sys,gstreamer-audio,gstreamer-audio-sys,gstreamer-base,gstreamer-base-sys,gstreamer-check,gstreamer-check-sys,gstreamer-net,gstreamer-net-sys,gstreamer-rtp,gstreamer-rtp-sys,gstreamer-sys,gstreamer-video,gstreamer-video-sys@git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.18\#9ee22baa07d2c4e67742baeafb2be49e1db9befe \
+		gdk4,gdk4-sys,gsk4,gsk4-sys,gtk4,gtk4-macros,gtk4-sys@git+https://github.com/gtk-rs/gtk4-rs?branch=0.4\#36aa4108f8e221536e194f62d8ee3be8ea6191f0 \
+		ffv1@git+https://github.com/rust-av/ffv1.git?rev=2afb025a327173ce891954c052e804d0f880368a\#2afb025a327173ce891954c052e804d0f880368a \
+		flavors@git+https://github.com/rust-av/flavors\#c48542aef94b7da36d6f306f4016bee9c79e09ba \
+		atk,atk-sys,gdk,gdk-sys,gtk,gtk-sys,gtk3-macros@git+https://github.com/gtk-rs/gtk3-rs?branch=0.15\#51df5c22fbe02ec57c5052a3e5a91cc9671a0e83
diff --git a/multimedia/helvum/Makefile b/multimedia/helvum/Makefile
index 551e79e58cfe..b9da281d1469 100644
--- a/multimedia/helvum/Makefile
+++ b/multimedia/helvum/Makefile
@@ -23,132 +23,6 @@ GL_COMMIT=	094681637ec8f9f2acdb993230e10da88aa3fedb
 MAKE_ENV=	${CARGO_ENV}
 PLIST_FILES=	bin/${PORTNAME}
 
-CARGO_CRATES=	aho-corasick-0.7.15 \
-		ansi_term-0.12.1 \
-		anyhow-1.0.53 \
-		arrayvec-0.5.2 \
-		atty-0.2.14 \
-		autocfg-1.0.1 \
-		bindgen-0.59.2 \
-		bitflags-1.3.2 \
-		bitvec-0.19.6 \
-		cairo-rs-0.15.1 \
-		cairo-sys-rs-0.15.1 \
-		cc-1.0.72 \
-		cexpr-0.6.0 \
-		cfg-expr-0.8.1 \
-		cfg-expr-0.9.1 \
-		cfg-if-0.1.10 \
-		cfg-if-1.0.0 \
-		clang-sys-1.3.0 \
-		clap-2.34.0 \
-		cookie-factory-0.3.2 \
-		either-1.6.1 \
-		env_logger-0.9.0 \
-		errno-0.2.8 \
-		errno-dragonfly-0.1.2 \
-		field-offset-0.3.4 \
-		funty-1.1.0 \
-		futures-channel-0.3.19 \
-		futures-core-0.3.19 \
-		futures-executor-0.3.19 \
-		futures-io-0.3.19 \
-		futures-task-0.3.19 \
-		futures-util-0.3.19 \
-		gdk-pixbuf-0.15.4 \
-		gdk-pixbuf-sys-0.15.1 \
-		gdk4-0.4.6 \
-		gdk4-sys-0.4.2 \
-		gio-0.15.4 \
-		gio-sys-0.15.4 \
-		glib-0.15.4 \
-		glib-macros-0.15.3 \
-		glib-sys-0.15.4 \
-		glob-0.3.0 \
-		gobject-sys-0.15.1 \
-		graphene-rs-0.15.1 \
-		graphene-sys-0.15.1 \
-		gsk4-0.4.6 \
-		gsk4-sys-0.4.2 \
-		gtk4-0.4.6 \
-		gtk4-macros-0.4.3 \
-		gtk4-sys-0.4.5 \
-		heck-0.3.3 \
-		heck-0.4.0 \
-		hermit-abi-0.1.19 \
-		humantime-2.1.0 \
-		itertools-0.10.3 \
-		lazy_static-1.4.0 \
-		lazycell-1.3.0 \
-		lexical-core-0.7.6 \
-		libc-0.2.116 \
-		libloading-0.7.3 \
-		libspa-0.4.1 \
-		libspa-sys-0.4.1 \
-		log-0.4.14 \
-		memchr-2.3.4 \
-		memoffset-0.6.5 \
-		minimal-lexical-0.2.1 \
-		nix-0.14.1 \
-		nom-6.2.1 \
-		nom-7.1.0 \
-		once_cell-1.9.0 \
-		pango-0.15.2 \
-		pango-sys-0.15.1 \
-		peeking_take_while-0.1.2 \
-		pest-2.1.3 \
-		pin-project-lite-0.2.8 \
-		pin-utils-0.1.0 \
-		pipewire-0.4.1 \
-		pipewire-sys-0.4.1 \
-		pkg-config-0.3.24 \
-		proc-macro-crate-1.1.0 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.36 \
-		quote-1.0.15 \
-		radium-0.5.3 \
-		regex-1.4.6 \
-		regex-syntax-0.6.25 \
-		rustc-hash-1.1.0 \
-		rustc_version-0.3.3 \
-		ryu-1.0.9 \
-		semver-0.11.0 \
-		semver-parser-0.10.2 \
-		serde-1.0.136 \
-		shlex-1.1.0 \
-		signal-0.7.0 \
-		slab-0.4.5 \
-		smallvec-1.8.0 \
-		static_assertions-1.1.0 \
-		strsim-0.8.0 \
-		strum-0.21.0 \
-		strum_macros-0.21.1 \
-		syn-1.0.86 \
-		system-deps-3.2.0 \
-		system-deps-6.0.1 \
-		tap-1.0.1 \
-		termcolor-1.1.2 \
-		textwrap-0.11.0 \
-		thiserror-1.0.30 \
-		thiserror-impl-1.0.30 \
-		toml-0.5.8 \
-		ucd-trie-0.1.3 \
-		unicode-segmentation-1.8.0 \
-		unicode-width-0.1.9 \
-		unicode-xid-0.2.2 \
-		vec_map-0.8.2 \
-		version-compare-0.0.11 \
-		version-compare-0.1.0 \
-		version_check-0.9.4 \
-		void-1.0.2 \
-		which-4.2.4 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		wyz-0.2.0
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,"llvm-config,&${LLVM_DEFAULT},' \
 		${WRKSRC}/cargo-crates/clang-sys-*/build/common.rs \
diff --git a/multimedia/helvum/Makefile.crates b/multimedia/helvum/Makefile.crates
new file mode 100644
index 000000000000..028675d1f2fc
--- /dev/null
+++ b/multimedia/helvum/Makefile.crates
@@ -0,0 +1,125 @@
+CARGO_CRATES=	aho-corasick-0.7.15 \
+		ansi_term-0.12.1 \
+		anyhow-1.0.53 \
+		arrayvec-0.5.2 \
+		atty-0.2.14 \
+		autocfg-1.0.1 \
+		bindgen-0.59.2 \
+		bitflags-1.3.2 \
+		bitvec-0.19.6 \
+		cairo-rs-0.15.1 \
+		cairo-sys-rs-0.15.1 \
+		cc-1.0.72 \
+		cexpr-0.6.0 \
+		cfg-expr-0.8.1 \
+		cfg-expr-0.9.1 \
+		cfg-if-0.1.10 \
+		cfg-if-1.0.0 \
+		clang-sys-1.3.0 \
+		clap-2.34.0 \
+		cookie-factory-0.3.2 \
+		either-1.6.1 \
+		env_logger-0.9.0 \
+		errno-0.2.8 \
+		errno-dragonfly-0.1.2 \
+		field-offset-0.3.4 \
+		funty-1.1.0 \
+		futures-channel-0.3.19 \
+		futures-core-0.3.19 \
+		futures-executor-0.3.19 \
+		futures-io-0.3.19 \
+		futures-task-0.3.19 \
+		futures-util-0.3.19 \
+		gdk-pixbuf-0.15.4 \
+		gdk-pixbuf-sys-0.15.1 \
+		gdk4-0.4.6 \
+		gdk4-sys-0.4.2 \
+		gio-0.15.4 \
+		gio-sys-0.15.4 \
+		glib-0.15.4 \
+		glib-macros-0.15.3 \
+		glib-sys-0.15.4 \
+		glob-0.3.0 \
+		gobject-sys-0.15.1 \
+		graphene-rs-0.15.1 \
+		graphene-sys-0.15.1 \
+		gsk4-0.4.6 \
+		gsk4-sys-0.4.2 \
+		gtk4-0.4.6 \
+		gtk4-macros-0.4.3 \
+		gtk4-sys-0.4.5 \
+		heck-0.3.3 \
+		heck-0.4.0 \
+		hermit-abi-0.1.19 \
+		humantime-2.1.0 \
+		itertools-0.10.3 \
+		lazy_static-1.4.0 \
+		lazycell-1.3.0 \
+		lexical-core-0.7.6 \
+		libc-0.2.116 \
+		libloading-0.7.3 \
+		libspa-0.4.1 \
+		libspa-sys-0.4.1 \
+		log-0.4.14 \
+		memchr-2.3.4 \
+		memoffset-0.6.5 \
+		minimal-lexical-0.2.1 \
+		nix-0.14.1 \
+		nom-6.2.1 \
+		nom-7.1.0 \
+		once_cell-1.9.0 \
+		pango-0.15.2 \
+		pango-sys-0.15.1 \
+		peeking_take_while-0.1.2 \
+		pest-2.1.3 \
+		pin-project-lite-0.2.8 \
+		pin-utils-0.1.0 \
+		pipewire-0.4.1 \
+		pipewire-sys-0.4.1 \
+		pkg-config-0.3.24 \
+		proc-macro-crate-1.1.0 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.36 \
+		quote-1.0.15 \
+		radium-0.5.3 \
+		regex-1.4.6 \
+		regex-syntax-0.6.25 \
+		rustc-hash-1.1.0 \
+		rustc_version-0.3.3 \
+		ryu-1.0.9 \
+		semver-0.11.0 \
+		semver-parser-0.10.2 \
+		serde-1.0.136 \
+		shlex-1.1.0 \
+		signal-0.7.0 \
+		slab-0.4.5 \
+		smallvec-1.8.0 \
+		static_assertions-1.1.0 \
+		strsim-0.8.0 \
+		strum-0.21.0 \
+		strum_macros-0.21.1 \
+		syn-1.0.86 \
+		system-deps-3.2.0 \
+		system-deps-6.0.1 \
+		tap-1.0.1 \
+		termcolor-1.1.2 \
+		textwrap-0.11.0 \
+		thiserror-1.0.30 \
+		thiserror-impl-1.0.30 \
+		toml-0.5.8 \
+		ucd-trie-0.1.3 \
+		unicode-segmentation-1.8.0 \
+		unicode-width-0.1.9 \
+		unicode-xid-0.2.2 \
+		vec_map-0.8.2 \
+		version-compare-0.0.11 \
+		version-compare-0.1.0 \
+		version_check-0.9.4 \
+		void-1.0.2 \
+		which-4.2.4 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		wyz-0.2.0
diff --git a/multimedia/kooha/Makefile b/multimedia/kooha/Makefile
index 3cb6fa467040..f53727f5d719 100644
--- a/multimedia/kooha/Makefile
+++ b/multimedia/kooha/Makefile
@@ -22,150 +22,10 @@ USE_GSTREAMER=	good opus pulse vpx
 GH_ACCOUNT=	SeaDve
 GH_PROJECT=	Kooha
 MAKE_ENV=	${CARGO_ENV}
-GLIB_SCHEMAS=	io.github.seadve.Kooha.gschema.xml
-
-CARGO_CRATES=	aho-corasick-0.7.19 \
-		android_system_properties-0.1.5 \
-		ansi_term-0.12.1 \
-		anyhow-1.0.65 \
-		atomic_refcell-0.1.8 \
-		autocfg-1.1.0 \
-		bitflags-1.3.2 \
-		block-0.1.6 \
-		bumpalo-3.11.0 \
-		cairo-rs-0.15.12 \
-		cairo-sys-rs-0.15.1 \
-		cc-1.0.73 \
-		cfg-expr-0.10.3 \
-		cfg-if-1.0.0 \
-		chrono-0.4.22 \
-		color_quant-1.1.0 \
-		core-foundation-sys-0.8.3 \
-		field-offset-0.3.4 \
-		fragile-1.2.1 \
-		futures-channel-0.3.24 \
-		futures-core-0.3.24 \
-		futures-executor-0.3.24 \
-		futures-io-0.3.24 \
-		futures-task-0.3.24 \
-		futures-util-0.3.24 \
-		gdk-pixbuf-0.15.11 \
-		gdk-pixbuf-sys-0.15.10 \
-		gdk4-0.4.8 \
-		gdk4-sys-0.4.8 \
-		gdk4-wayland-0.4.8 \
-		gdk4-wayland-sys-0.4.8 \
-		gdk4-x11-0.4.8 \
-		gdk4-x11-sys-0.4.8 \
-		gettext-rs-0.7.0 \
-		gettext-sys-0.21.3 \
-		gif-0.11.4 \
-		gio-0.15.12 \
-		gio-sys-0.15.10 \
-		glib-0.15.12 \
-		glib-macros-0.15.11 \
-		glib-sys-0.15.10 \
-		gobject-sys-0.15.10 \
-		graphene-rs-0.15.1 \
-		graphene-sys-0.15.10 \
-		gsettings-macro-0.1.14 \
-		gsk4-0.4.8 \
-		gsk4-sys-0.4.8 \
-		gst-plugin-gif-0.8.0 \
-		gst-plugin-gtk4-0.1.1 \
-		gst-plugin-version-helper-0.7.3 \
-		gstreamer-0.18.8 \
-		gstreamer-audio-sys-0.18.3 \
-		gstreamer-base-0.18.0 \
-		gstreamer-base-sys-0.18.0 \
-		gstreamer-pbutils-0.18.7 \
-		gstreamer-pbutils-sys-0.18.0 \
-		gstreamer-sys-0.18.0 \
-		gstreamer-video-0.18.7 \
-		gstreamer-video-sys-0.18.3 \
-		gtk4-0.4.8 \
-		gtk4-macros-0.4.8 \
-		gtk4-sys-0.4.8 \
-		heck-0.4.0 \
-		iana-time-zone-0.1.48 \
-		js-sys-0.3.60 \
-		lazy_static-1.4.0 \
-		libadwaita-0.2.0-alpha.2 \
-		libadwaita-sys-0.2.0-alpha.2 \
-		libc-0.2.132 \
-		libpulse-binding-2.26.0 \
-		libpulse-glib-binding-2.25.1 \
-		libpulse-mainloop-glib-sys-1.19.2 \
-		libpulse-sys-1.19.3 \
-		locale_config-0.3.0 \
-		log-0.4.17 \
-		malloc_buf-0.0.6 \
-		memchr-2.5.0 \
-		memoffset-0.6.5 \
-		muldiv-1.0.0 \
-		num-derive-0.3.3 \
-		num-integer-0.1.45 \
-		num-rational-0.4.1 \
-		num-traits-0.2.15 \
-		objc-0.2.7 \
-		objc-foundation-0.1.1 \
-		objc_id-0.1.1 \
-		once_cell-1.14.0 \
-		option-operations-0.4.1 \
-		pango-0.15.10 \
-		pango-sys-0.15.10 \
-		paste-1.0.9 \
-		pest-2.3.1 \
-		pin-project-lite-0.2.9 \
-		pin-utils-0.1.0 \
-		pkg-config-0.3.25 \
-		pretty-hex-0.3.0 \
-		proc-macro-crate-1.2.1 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.43 \
-		quick-xml-0.22.0 \
-		quick-xml-0.25.0 \
-		quote-1.0.21 \
-		regex-1.6.0 \
-		regex-syntax-0.6.27 \
-		rustc_version-0.3.3 \
-		semver-0.11.0 \
-		semver-parser-0.10.2 \
-		serde-1.0.144 \
-		serde_derive-1.0.144 \
-		sharded-slab-0.1.4 \
-		slab-0.4.7 \
-		smallvec-1.9.0 \
-		syn-1.0.99 \
-		system-deps-6.0.2 \
-		temp-dir-0.1.11 \
-		thiserror-1.0.35 \
-		thiserror-impl-1.0.35 \
-		thread_local-1.1.4 \
-		toml-0.5.9 \
-		tracing-0.1.36 \
-		tracing-attributes-0.1.22 \
-		tracing-core-0.1.29 \
-		tracing-log-0.1.3 \
-		tracing-subscriber-0.3.15 \
-		ucd-trie-0.1.5 \
-		unicode-ident-1.0.4 \
-		valuable-0.1.0 \
-		version-compare-0.1.0 \
-		version_check-0.9.4 \
-		wasm-bindgen-0.2.83 \
-		wasm-bindgen-backend-0.2.83 \
-		wasm-bindgen-macro-0.2.83 \
-		wasm-bindgen-macro-support-0.2.83 \
-		wasm-bindgen-shared-0.2.83 \
-		weezl-0.1.7 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-x86_64-pc-windows-gnu-0.4.0
 CARGO_BUILD=	no
 CARGO_INSTALL=	no
 CARGO_TEST=	no
+GLIB_SCHEMAS=	io.github.seadve.Kooha.gschema.xml
 
 post-patch:
 	@${REINPLACE_CMD} -e '/update_desktop_database/d' \
diff --git a/multimedia/kooha/Makefile.crates b/multimedia/kooha/Makefile.crates
new file mode 100644
index 000000000000..3edfeb854caf
--- /dev/null
+++ b/multimedia/kooha/Makefile.crates
@@ -0,0 +1,139 @@
+CARGO_CRATES=	aho-corasick-0.7.19 \
+		android_system_properties-0.1.5 \
+		ansi_term-0.12.1 \
+		anyhow-1.0.65 \
+		atomic_refcell-0.1.8 \
+		autocfg-1.1.0 \
+		bitflags-1.3.2 \
+		block-0.1.6 \
+		bumpalo-3.11.0 \
+		cairo-rs-0.15.12 \
+		cairo-sys-rs-0.15.1 \
+		cc-1.0.73 \
+		cfg-expr-0.10.3 \
+		cfg-if-1.0.0 \
+		chrono-0.4.22 \
+		color_quant-1.1.0 \
+		core-foundation-sys-0.8.3 \
+		field-offset-0.3.4 \
+		fragile-1.2.1 \
+		futures-channel-0.3.24 \
+		futures-core-0.3.24 \
+		futures-executor-0.3.24 \
+		futures-io-0.3.24 \
+		futures-task-0.3.24 \
+		futures-util-0.3.24 \
+		gdk-pixbuf-0.15.11 \
+		gdk-pixbuf-sys-0.15.10 \
+		gdk4-0.4.8 \
+		gdk4-sys-0.4.8 \
+		gdk4-wayland-0.4.8 \
+		gdk4-wayland-sys-0.4.8 \
+		gdk4-x11-0.4.8 \
+		gdk4-x11-sys-0.4.8 \
+		gettext-rs-0.7.0 \
+		gettext-sys-0.21.3 \
+		gif-0.11.4 \
+		gio-0.15.12 \
+		gio-sys-0.15.10 \
+		glib-0.15.12 \
+		glib-macros-0.15.11 \
+		glib-sys-0.15.10 \
+		gobject-sys-0.15.10 \
+		graphene-rs-0.15.1 \
+		graphene-sys-0.15.10 \
+		gsettings-macro-0.1.14 \
+		gsk4-0.4.8 \
+		gsk4-sys-0.4.8 \
+		gst-plugin-gif-0.8.0 \
+		gst-plugin-gtk4-0.1.1 \
+		gst-plugin-version-helper-0.7.3 \
+		gstreamer-0.18.8 \
+		gstreamer-audio-sys-0.18.3 \
+		gstreamer-base-0.18.0 \
+		gstreamer-base-sys-0.18.0 \
+		gstreamer-pbutils-0.18.7 \
+		gstreamer-pbutils-sys-0.18.0 \
+		gstreamer-sys-0.18.0 \
+		gstreamer-video-0.18.7 \
+		gstreamer-video-sys-0.18.3 \
+		gtk4-0.4.8 \
+		gtk4-macros-0.4.8 \
+		gtk4-sys-0.4.8 \
+		heck-0.4.0 \
+		iana-time-zone-0.1.48 \
+		js-sys-0.3.60 \
+		lazy_static-1.4.0 \
+		libadwaita-0.2.0-alpha.2 \
+		libadwaita-sys-0.2.0-alpha.2 \
+		libc-0.2.132 \
+		libpulse-binding-2.26.0 \
+		libpulse-glib-binding-2.25.1 \
+		libpulse-mainloop-glib-sys-1.19.2 \
+		libpulse-sys-1.19.3 \
+		locale_config-0.3.0 \
+		log-0.4.17 \
+		malloc_buf-0.0.6 \
+		memchr-2.5.0 \
+		memoffset-0.6.5 \
+		muldiv-1.0.0 \
+		num-derive-0.3.3 \
+		num-integer-0.1.45 \
+		num-rational-0.4.1 \
+		num-traits-0.2.15 \
+		objc-0.2.7 \
+		objc-foundation-0.1.1 \
+		objc_id-0.1.1 \
+		once_cell-1.14.0 \
+		option-operations-0.4.1 \
+		pango-0.15.10 \
+		pango-sys-0.15.10 \
+		paste-1.0.9 \
+		pest-2.3.1 \
+		pin-project-lite-0.2.9 \
+		pin-utils-0.1.0 \
+		pkg-config-0.3.25 \
+		pretty-hex-0.3.0 \
+		proc-macro-crate-1.2.1 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.43 \
+		quick-xml-0.22.0 \
+		quick-xml-0.25.0 \
+		quote-1.0.21 \
+		regex-1.6.0 \
+		regex-syntax-0.6.27 \
+		rustc_version-0.3.3 \
+		semver-0.11.0 \
+		semver-parser-0.10.2 \
+		serde-1.0.144 \
+		serde_derive-1.0.144 \
+		sharded-slab-0.1.4 \
+		slab-0.4.7 \
+		smallvec-1.9.0 \
+		syn-1.0.99 \
+		system-deps-6.0.2 \
+		temp-dir-0.1.11 \
+		thiserror-1.0.35 \
+		thiserror-impl-1.0.35 \
+		thread_local-1.1.4 \
+		toml-0.5.9 \
+		tracing-0.1.36 \
+		tracing-attributes-0.1.22 \
+		tracing-core-0.1.29 \
+		tracing-log-0.1.3 \
+		tracing-subscriber-0.3.15 \
+		ucd-trie-0.1.5 \
+		unicode-ident-1.0.4 \
+		valuable-0.1.0 \
+		version-compare-0.1.0 \
+		version_check-0.9.4 \
+		wasm-bindgen-0.2.83 \
+		wasm-bindgen-backend-0.2.83 \
+		wasm-bindgen-macro-0.2.83 \
+		wasm-bindgen-macro-support-0.2.83 \
+		wasm-bindgen-shared-0.2.83 \
+		weezl-0.1.7 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-x86_64-pc-windows-gnu-0.4.0
diff --git a/multimedia/rav1e/Makefile b/multimedia/rav1e/Makefile
index 4ef2caa30cb3..cf45af58a57c 100644
--- a/multimedia/rav1e/Makefile
+++ b/multimedia/rav1e/Makefile
@@ -19,177 +19,6 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	xiph
 PLIST_FILES?=	bin/${PORTNAME}
 
-CARGO_CRATES=	addr2line-0.17.0 \
-		adler-1.0.2 \
-		adler32-1.2.0 \
-		aho-corasick-0.7.18 \
-		ansi_term-0.12.1 \
-		anyhow-1.0.51 \
-		aom-sys-0.3.0 \
-		arbitrary-0.4.7 \
-		arg_enum_proc_macro-0.3.2 \
-		arrayvec-0.7.2 \
-		assert_cmd-2.0.2 \
-		atty-0.2.14 \
-		autocfg-1.0.1 \
-		av-metrics-0.7.2 \
-		backtrace-0.3.63 \
-		bindgen-0.58.1 \
-		bitflags-1.3.2 \
-		bitstream-io-1.2.0 \
-		bstr-0.2.17 \
-		bumpalo-3.8.0 \
-		bytemuck-1.7.2 \
-		byteorder-1.4.3 \
-		cast-0.2.7 \
-		cc-1.0.72 \
-		cexpr-0.4.0 \
-		cfg-expr-0.7.4 \
-		cfg-if-1.0.0 \
-		chrono-0.4.19 \
-		clang-sys-1.3.0 \
-		clap-2.34.0 \
-		cmake-0.1.46 \
-		color_quant-1.1.0 \
-		console-0.14.1 \
-		crc32fast-1.3.0 \
-		criterion-0.3.5 \
-		criterion-plot-0.4.4 \
-		crossbeam-0.8.1 \
-		crossbeam-channel-0.5.1 \
-		crossbeam-deque-0.8.1 \
-		crossbeam-epoch-0.9.5 \
-		crossbeam-queue-0.3.2 \
-		crossbeam-utils-0.8.5 \
-		csv-1.1.6 \
-		csv-core-0.1.10 \
-		ctor-0.1.21 \
-		dav1d-sys-0.3.4 \
-		deflate-0.8.6 \
-		diff-0.1.12 \
-		difflib-0.4.0 \
-		doc-comment-0.3.3 \
-		either-1.6.1 \
-		encode_unicode-0.3.6 \
-		env_logger-0.8.4 \
-		fern-0.6.0 \
-		getrandom-0.2.3 \
-		gimli-0.26.1 \
-		glob-0.3.0 \
-		half-1.8.2 \
-		heck-0.3.3 \
-		hermit-abi-0.1.19 \
-		humantime-2.1.0 \
-		image-0.23.14 \
-		interpolate_name-0.2.3 \
-		itertools-0.8.2 \
-		itertools-0.10.3 \
-		itoa-0.4.8 \
-		jobserver-0.1.24 \
-		js-sys-0.3.55 \
-		lab-0.11.0 \
-		lazy_static-1.4.0 \
-		lazycell-1.3.0 \
-		libc-0.2.112 \
-		libfuzzer-sys-0.3.5 \
-		libloading-0.7.2 \
-		log-0.4.14 \
-		memchr-2.4.1 \
-		memoffset-0.6.5 \
-		miniz_oxide-0.3.7 \
-		miniz_oxide-0.4.4 \
-		nasm-rs-0.2.2 \
-		nom-5.1.2 \
-		noop_proc_macro-0.3.0 \
-		num-derive-0.3.3 \
-		num-integer-0.1.44 \
-		num-iter-0.1.42 \
-		num-rational-0.3.2 \
-		num-traits-0.2.14 \
-		num_cpus-1.13.0 \
-		object-0.27.1 \
-		oorandom-11.1.3 \
-		output_vt100-0.1.2 \
-		paste-1.0.6 \
-		peeking_take_while-0.1.2 \
-		pkg-config-0.3.24 \
-		plotters-0.3.1 \
-		plotters-backend-0.3.2 \
-		plotters-svg-0.3.1 \
-		png-0.16.8 \
-		ppv-lite86-0.2.15 \
-		predicates-2.1.0 \
-		predicates-core-1.0.2 \
-		predicates-tree-1.0.4 \
-		pretty_assertions-0.7.2 \
-		proc-macro2-1.0.33 \
-		quote-1.0.10 \
-		rand-0.8.4 \
-		rand_chacha-0.3.1 \
-		rand_core-0.6.3 \
-		rand_hc-0.3.1 \
-		rayon-1.5.1 \
-		rayon-core-1.9.1 \
-		regex-1.5.4 \
-		regex-automata-0.1.10 \
-		regex-syntax-0.6.25 \
-		rust_hawktracer-0.7.0 \
-		rust_hawktracer_normal_macro-0.4.1 \
-		rust_hawktracer_proc_macro-0.4.1 \
-		rust_hawktracer_sys-0.4.2 \
-		rustc-demangle-0.1.21 \
-		rustc-hash-1.1.0 \
-		rustc_version-0.4.0 \
-		ryu-1.0.9 \
-		same-file-1.0.6 \
-		scan_fmt-0.2.6 \
-		scopeguard-1.1.0 \
-		semver-1.0.4 \
-		serde-1.0.131 \
-		serde_cbor-0.11.2 \
-		serde_derive-1.0.131 \
-		serde_json-1.0.72 \
-		shlex-1.1.0 \
-		signal-hook-0.3.12 \
-		signal-hook-registry-1.4.0 \
-		simd_helpers-0.1.0 \
-		smallvec-1.7.0 \
-		strsim-0.8.0 \
-		strum-0.21.0 \
-		strum_macros-0.21.1 \
-		syn-1.0.82 \
-		system-deps-3.1.2 \
-		termcolor-1.1.2 \
-		terminal_size-0.1.17 \
-		termtree-0.2.3 \
-		textwrap-0.11.0 \
-		thiserror-1.0.30 \
-		thiserror-impl-1.0.30 \
-		time-0.1.43 \
-		tinytemplate-1.2.1 \
-		toml-0.5.8 \
-		unicode-segmentation-1.8.0 \
-		unicode-width-0.1.9 \
-		unicode-xid-0.2.2 \
-		vec_map-0.8.2 \
-		version-compare-0.0.11 \
-		version_check-0.9.3 \
-		wait-timeout-0.2.0 \
-		walkdir-2.3.2 \
-		wasi-0.10.2+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.78 \
-		wasm-bindgen-backend-0.2.78 \
-		wasm-bindgen-macro-0.2.78 \
-		wasm-bindgen-macro-support-0.2.78 \
-		wasm-bindgen-shared-0.2.78 \
-		web-sys-0.3.55 \
-		which-3.1.1 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		y4m-0.7.0
-
 post-patch:
 # Extract (snapshot) version from the port instead of CARGO_PKG_VERSION
 	@${REINPLACE_CMD} 's/env!("VERGEN_SEMVER_LIGHTWEIGHT")/"${DISTVERSIONFULL}"/' \
diff --git a/multimedia/rav1e/Makefile.crates b/multimedia/rav1e/Makefile.crates
new file mode 100644
index 000000000000..0bad86aa1b4c
--- /dev/null
+++ b/multimedia/rav1e/Makefile.crates
@@ -0,0 +1,170 @@
+CARGO_CRATES=	addr2line-0.17.0 \
+		adler-1.0.2 \
+		adler32-1.2.0 \
+		aho-corasick-0.7.18 \
+		ansi_term-0.12.1 \
+		anyhow-1.0.51 \
+		aom-sys-0.3.0 \
+		arbitrary-0.4.7 \
+		arg_enum_proc_macro-0.3.2 \
+		arrayvec-0.7.2 \
+		assert_cmd-2.0.2 \
+		atty-0.2.14 \
+		autocfg-1.0.1 \
+		av-metrics-0.7.2 \
+		backtrace-0.3.63 \
+		bindgen-0.58.1 \
+		bitflags-1.3.2 \
+		bitstream-io-1.2.0 \
+		bstr-0.2.17 \
+		bumpalo-3.8.0 \
+		bytemuck-1.7.2 \
+		byteorder-1.4.3 \
+		cast-0.2.7 \
+		cc-1.0.72 \
+		cexpr-0.4.0 \
+		cfg-expr-0.7.4 \
+		cfg-if-1.0.0 \
+		chrono-0.4.19 \
+		clang-sys-1.3.0 \
+		clap-2.34.0 \
+		cmake-0.1.46 \
+		color_quant-1.1.0 \
+		console-0.14.1 \
+		crc32fast-1.3.0 \
+		criterion-0.3.5 \
+		criterion-plot-0.4.4 \
+		crossbeam-0.8.1 \
+		crossbeam-channel-0.5.1 \
+		crossbeam-deque-0.8.1 \
+		crossbeam-epoch-0.9.5 \
+		crossbeam-queue-0.3.2 \
+		crossbeam-utils-0.8.5 \
+		csv-1.1.6 \
+		csv-core-0.1.10 \
+		ctor-0.1.21 \
+		dav1d-sys-0.3.4 \
+		deflate-0.8.6 \
+		diff-0.1.12 \
+		difflib-0.4.0 \
+		doc-comment-0.3.3 \
+		either-1.6.1 \
+		encode_unicode-0.3.6 \
+		env_logger-0.8.4 \
+		fern-0.6.0 \
+		getrandom-0.2.3 \
+		gimli-0.26.1 \
+		glob-0.3.0 \
+		half-1.8.2 \
+		heck-0.3.3 \
+		hermit-abi-0.1.19 \
+		humantime-2.1.0 \
+		image-0.23.14 \
+		interpolate_name-0.2.3 \
+		itertools-0.8.2 \
+		itertools-0.10.3 \
+		itoa-0.4.8 \
+		jobserver-0.1.24 \
+		js-sys-0.3.55 \
+		lab-0.11.0 \
+		lazy_static-1.4.0 \
+		lazycell-1.3.0 \
+		libc-0.2.112 \
+		libfuzzer-sys-0.3.5 \
+		libloading-0.7.2 \
+		log-0.4.14 \
+		memchr-2.4.1 \
+		memoffset-0.6.5 \
+		miniz_oxide-0.3.7 \
+		miniz_oxide-0.4.4 \
+		nasm-rs-0.2.2 \
+		nom-5.1.2 \
+		noop_proc_macro-0.3.0 \
+		num-derive-0.3.3 \
+		num-integer-0.1.44 \
+		num-iter-0.1.42 \
+		num-rational-0.3.2 \
+		num-traits-0.2.14 \
+		num_cpus-1.13.0 \
+		object-0.27.1 \
+		oorandom-11.1.3 \
+		output_vt100-0.1.2 \
+		paste-1.0.6 \
+		peeking_take_while-0.1.2 \
+		pkg-config-0.3.24 \
+		plotters-0.3.1 \
+		plotters-backend-0.3.2 \
+		plotters-svg-0.3.1 \
+		png-0.16.8 \
+		ppv-lite86-0.2.15 \
+		predicates-2.1.0 \
+		predicates-core-1.0.2 \
+		predicates-tree-1.0.4 \
+		pretty_assertions-0.7.2 \
+		proc-macro2-1.0.33 \
+		quote-1.0.10 \
+		rand-0.8.4 \
+		rand_chacha-0.3.1 \
+		rand_core-0.6.3 \
+		rand_hc-0.3.1 \
+		rayon-1.5.1 \
+		rayon-core-1.9.1 \
+		regex-1.5.4 \
+		regex-automata-0.1.10 \
+		regex-syntax-0.6.25 \
+		rust_hawktracer-0.7.0 \
+		rust_hawktracer_normal_macro-0.4.1 \
+		rust_hawktracer_proc_macro-0.4.1 \
+		rust_hawktracer_sys-0.4.2 \
+		rustc-demangle-0.1.21 \
+		rustc-hash-1.1.0 \
+		rustc_version-0.4.0 \
+		ryu-1.0.9 \
+		same-file-1.0.6 \
+		scan_fmt-0.2.6 \
+		scopeguard-1.1.0 \
+		semver-1.0.4 \
+		serde-1.0.131 \
+		serde_cbor-0.11.2 \
+		serde_derive-1.0.131 \
+		serde_json-1.0.72 \
+		shlex-1.1.0 \
+		signal-hook-0.3.12 \
+		signal-hook-registry-1.4.0 \
+		simd_helpers-0.1.0 \
+		smallvec-1.7.0 \
+		strsim-0.8.0 \
+		strum-0.21.0 \
+		strum_macros-0.21.1 \
+		syn-1.0.82 \
+		system-deps-3.1.2 \
+		termcolor-1.1.2 \
+		terminal_size-0.1.17 \
+		termtree-0.2.3 \
+		textwrap-0.11.0 \
+		thiserror-1.0.30 \
+		thiserror-impl-1.0.30 \
+		time-0.1.43 \
+		tinytemplate-1.2.1 \
+		toml-0.5.8 \
+		unicode-segmentation-1.8.0 \
+		unicode-width-0.1.9 \
+		unicode-xid-0.2.2 \
+		vec_map-0.8.2 \
+		version-compare-0.0.11 \
+		version_check-0.9.3 \
+		wait-timeout-0.2.0 \
+		walkdir-2.3.2 \
+		wasi-0.10.2+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.78 \
+		wasm-bindgen-backend-0.2.78 \
+		wasm-bindgen-macro-0.2.78 \
+		wasm-bindgen-macro-support-0.2.78 \
+		wasm-bindgen-shared-0.2.78 \
+		web-sys-0.3.55 \
+		which-3.1.1 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		y4m-0.7.0
diff --git a/multimedia/video-trimmer/Makefile b/multimedia/video-trimmer/Makefile
index 23ce996fa899..09d5242cddf6 100644
--- a/multimedia/video-trimmer/Makefile
+++ b/multimedia/video-trimmer/Makefile
@@ -21,170 +21,10 @@ GL_SITE=	https://gitlab.gnome.org
 GL_ACCOUNT=	YaLTeR
 GL_COMMIT=	58ae3bffe98025543af8e563659f60438ee586d6
 MAKE_ENV=	${CARGO_ENV}
-GLIB_SCHEMAS=	org.gnome.gitlab.YaLTeR.VideoTrimmer.gschema.xml
-
-CARGO_CRATES=	aho-corasick-0.7.19 \
-		anyhow-1.0.65 \
-		ashpd-0.3.2 \
-		async-broadcast-0.4.1 \
-		async-channel-1.7.1 \
-		async-executor-1.4.1 \
-		async-io-1.9.0 \
-		async-lock-2.5.0 \
-		async-recursion-0.3.2 \
-		async-task-4.3.0 \
-		async-trait-0.1.57 \
-		autocfg-1.1.0 \
-		bitflags-1.3.2 \
-		block-0.1.6 \
-		byteorder-1.4.3 \
-		cache-padded-1.2.0 \
-		cairo-rs-0.15.12 \
-		cairo-sys-rs-0.15.1 \
-		cc-1.0.73 \
-		cfg-expr-0.10.3 \
-		cfg-if-1.0.0 \
-		concurrent-queue-1.2.4 \
-		derivative-2.2.0 \
-		dirs-4.0.0 \
-		dirs-sys-0.3.7 \
-		enumflags2-0.7.5 \
-		enumflags2_derive-0.7.4 \
-		event-listener-2.5.3 \
-		fastrand-1.8.0 \
-		field-offset-0.3.4 \
-		futures-0.3.24 \
-		futures-channel-0.3.24 \
-		futures-core-0.3.24 \
-		futures-executor-0.3.24 \
-		futures-io-0.3.24 \
-		futures-lite-1.12.0 \
-		futures-macro-0.3.24 \
-		futures-sink-0.3.24 \
-		futures-task-0.3.24 \
-		futures-util-0.3.24 \
-		gdk-pixbuf-0.15.11 \
-		gdk-pixbuf-sys-0.15.10 \
-		gdk4-0.4.8 \
-		gdk4-sys-0.4.8 \
-		gdk4-wayland-0.4.8 \
-		gdk4-wayland-sys-0.4.8 \
-		gdk4-x11-0.4.8 \
-		gdk4-x11-sys-0.4.8 \
-		getrandom-0.2.7 \
-		gettext-rs-0.7.0 \
-		gettext-sys-0.21.3 \
-		gio-0.15.12 \
-		gio-sys-0.15.10 \
-		glib-0.15.12 \
-		glib-macros-0.15.11 \
-		glib-sys-0.15.10 \
-		gobject-sys-0.15.10 \
-		graphene-rs-0.15.1 \
-		graphene-sys-0.15.10 \
-		gsk4-0.4.8 \
-		gsk4-sys-0.4.8 \
-		gtk4-0.4.8 \
-		gtk4-macros-0.4.8 \
-		gtk4-sys-0.4.8 \
-		heck-0.4.0 \
-		hex-0.4.3 \
-		instant-0.1.12 \
-		json-0.12.4 \
-		lazy_static-1.4.0 \
-		libadwaita-0.2.0-alpha.3 \
-		libadwaita-sys-0.2.0-alpha.3 \
-		libc-0.2.134 \
-		locale_config-0.3.0 \
-		lock_api-0.4.9 \
-		log-0.4.17 \
-		malloc_buf-0.0.6 \
-		memchr-2.5.0 \
-		memoffset-0.6.5 \
-		mime-0.3.16 \
-		mime_guess-2.0.4 \
-		minimal-lexical-0.2.1 \
-		nix-0.23.1 \
-		nom-7.1.1 \
-		objc-0.2.7 \
-		objc-foundation-0.1.1 \
-		objc_id-0.1.1 \
-		once_cell-1.15.0 \
-		ordered-stream-0.0.1 \
-		pango-0.15.10 \
-		pango-sys-0.15.10 \
-		parking-2.0.0 \
-		parking_lot-0.12.1 \
-		parking_lot_core-0.9.3 \
-		pest-2.4.0 \
-		pin-project-lite-0.2.9 \
-		pin-utils-0.1.0 \
-		pkg-config-0.3.25 \
-		polling-2.3.0 \
-		ppv-lite86-0.2.16 \
-		proc-macro-crate-1.2.1 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.46 \
-		quick-xml-0.22.0 \
-		quote-1.0.21 \
-		rand-0.8.5 \
-		rand_chacha-0.3.1 \
-		rand_core-0.6.4 \
-		redox_syscall-0.2.16 \
-		redox_users-0.4.3 \
-		regex-1.6.0 \
-		regex-syntax-0.6.27 \
-		remove_dir_all-0.5.3 \
-		rustc_version-0.3.3 \
-		scopeguard-1.1.0 \
-		semver-0.11.0 \
-		semver-parser-0.10.2 \
-		serde-1.0.145 \
-		serde_derive-1.0.145 \
-		serde_repr-0.1.9 \
-		sha1-0.6.1 \
-		sha1_smol-1.0.0 \
-		slab-0.4.7 \
-		smallvec-1.10.0 \
-		socket2-0.4.7 \
-		static_assertions-1.1.0 \
-		syn-1.0.101 \
-		system-deps-6.0.2 \
-		temp-dir-0.1.11 \
-		tempfile-3.3.0 \
-		thiserror-1.0.37 \
-		thiserror-impl-1.0.37 \
-		toml-0.5.9 \
-		tracing-0.1.36 \
-		tracing-attributes-0.1.22 \
-		tracing-core-0.1.29 \
-		ucd-trie-0.1.5 \
-		uds_windows-1.0.2 \
-		unicase-2.6.0 \
-		unicode-ident-1.0.4 \
-		version-compare-0.1.0 \
-		version_check-0.9.4 \
-		waker-fn-1.1.0 \
-		wasi-0.11.0+wasi-snapshot-preview1 \
-		wepoll-ffi-0.1.2 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		windows-sys-0.36.1 \
-		windows_aarch64_msvc-0.36.1 \
-		windows_i686_gnu-0.36.1 \
-		windows_i686_msvc-0.36.1 \
-		windows_x86_64_gnu-0.36.1 \
-		windows_x86_64_msvc-0.36.1 \
-		zbus-2.3.2 \
-		zbus_macros-2.3.2 \
-		zbus_names-2.2.0 \
-		zvariant-3.7.1 \
-		zvariant_derive-3.7.1
 CARGO_BUILD=	no
 CARGO_INSTALL=	no
 CARGO_TEST=	no
+GLIB_SCHEMAS=	org.gnome.gitlab.YaLTeR.VideoTrimmer.gschema.xml
 
 post-patch:
 # Make each cargo subcommand very verbose
diff --git a/multimedia/video-trimmer/Makefile.crates b/multimedia/video-trimmer/Makefile.crates
new file mode 100644
index 000000000000..264f721e6c14
--- /dev/null
+++ b/multimedia/video-trimmer/Makefile.crates
@@ -0,0 +1,159 @@
+CARGO_CRATES=	aho-corasick-0.7.19 \
+		anyhow-1.0.65 \
+		ashpd-0.3.2 \
+		async-broadcast-0.4.1 \
+		async-channel-1.7.1 \
+		async-executor-1.4.1 \
+		async-io-1.9.0 \
+		async-lock-2.5.0 \
+		async-recursion-0.3.2 \
+		async-task-4.3.0 \
+		async-trait-0.1.57 \
+		autocfg-1.1.0 \
+		bitflags-1.3.2 \
+		block-0.1.6 \
+		byteorder-1.4.3 \
+		cache-padded-1.2.0 \
+		cairo-rs-0.15.12 \
+		cairo-sys-rs-0.15.1 \
+		cc-1.0.73 \
+		cfg-expr-0.10.3 \
+		cfg-if-1.0.0 \
+		concurrent-queue-1.2.4 \
+		derivative-2.2.0 \
+		dirs-4.0.0 \
+		dirs-sys-0.3.7 \
+		enumflags2-0.7.5 \
+		enumflags2_derive-0.7.4 \
+		event-listener-2.5.3 \
+		fastrand-1.8.0 \
+		field-offset-0.3.4 \
+		futures-0.3.24 \
+		futures-channel-0.3.24 \
+		futures-core-0.3.24 \
+		futures-executor-0.3.24 \
+		futures-io-0.3.24 \
+		futures-lite-1.12.0 \
+		futures-macro-0.3.24 \
+		futures-sink-0.3.24 \
+		futures-task-0.3.24 \
+		futures-util-0.3.24 \
+		gdk-pixbuf-0.15.11 \
+		gdk-pixbuf-sys-0.15.10 \
+		gdk4-0.4.8 \
+		gdk4-sys-0.4.8 \
+		gdk4-wayland-0.4.8 \
+		gdk4-wayland-sys-0.4.8 \
+		gdk4-x11-0.4.8 \
+		gdk4-x11-sys-0.4.8 \
+		getrandom-0.2.7 \
+		gettext-rs-0.7.0 \
+		gettext-sys-0.21.3 \
+		gio-0.15.12 \
+		gio-sys-0.15.10 \
+		glib-0.15.12 \
+		glib-macros-0.15.11 \
+		glib-sys-0.15.10 \
+		gobject-sys-0.15.10 \
+		graphene-rs-0.15.1 \
+		graphene-sys-0.15.10 \
+		gsk4-0.4.8 \
+		gsk4-sys-0.4.8 \
+		gtk4-0.4.8 \
+		gtk4-macros-0.4.8 \
+		gtk4-sys-0.4.8 \
+		heck-0.4.0 \
+		hex-0.4.3 \
+		instant-0.1.12 \
+		json-0.12.4 \
+		lazy_static-1.4.0 \
+		libadwaita-0.2.0-alpha.3 \
+		libadwaita-sys-0.2.0-alpha.3 \
+		libc-0.2.134 \
+		locale_config-0.3.0 \
+		lock_api-0.4.9 \
+		log-0.4.17 \
+		malloc_buf-0.0.6 \
+		memchr-2.5.0 \
+		memoffset-0.6.5 \
+		mime-0.3.16 \
+		mime_guess-2.0.4 \
+		minimal-lexical-0.2.1 \
+		nix-0.23.1 \
+		nom-7.1.1 \
+		objc-0.2.7 \
+		objc-foundation-0.1.1 \
+		objc_id-0.1.1 \
+		once_cell-1.15.0 \
+		ordered-stream-0.0.1 \
+		pango-0.15.10 \
+		pango-sys-0.15.10 \
+		parking-2.0.0 \
+		parking_lot-0.12.1 \
+		parking_lot_core-0.9.3 \
+		pest-2.4.0 \
+		pin-project-lite-0.2.9 \
+		pin-utils-0.1.0 \
+		pkg-config-0.3.25 \
+		polling-2.3.0 \
+		ppv-lite86-0.2.16 \
+		proc-macro-crate-1.2.1 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.46 \
+		quick-xml-0.22.0 \
+		quote-1.0.21 \
+		rand-0.8.5 \
+		rand_chacha-0.3.1 \
+		rand_core-0.6.4 \
+		redox_syscall-0.2.16 \
+		redox_users-0.4.3 \
+		regex-1.6.0 \
+		regex-syntax-0.6.27 \
+		remove_dir_all-0.5.3 \
+		rustc_version-0.3.3 \
+		scopeguard-1.1.0 \
+		semver-0.11.0 \
+		semver-parser-0.10.2 \
+		serde-1.0.145 \
+		serde_derive-1.0.145 \
+		serde_repr-0.1.9 \
+		sha1-0.6.1 \
+		sha1_smol-1.0.0 \
+		slab-0.4.7 \
+		smallvec-1.10.0 \
+		socket2-0.4.7 \
+		static_assertions-1.1.0 \
+		syn-1.0.101 \
+		system-deps-6.0.2 \
+		temp-dir-0.1.11 \
+		tempfile-3.3.0 \
+		thiserror-1.0.37 \
+		thiserror-impl-1.0.37 \
+		toml-0.5.9 \
+		tracing-0.1.36 \
+		tracing-attributes-0.1.22 \
+		tracing-core-0.1.29 \
+		ucd-trie-0.1.5 \
+		uds_windows-1.0.2 \
+		unicase-2.6.0 \
+		unicode-ident-1.0.4 \
+		version-compare-0.1.0 \
+		version_check-0.9.4 \
+		waker-fn-1.1.0 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		wepoll-ffi-0.1.2 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		windows-sys-0.36.1 \
+		windows_aarch64_msvc-0.36.1 \
+		windows_i686_gnu-0.36.1 \
+		windows_i686_msvc-0.36.1 \
+		windows_x86_64_gnu-0.36.1 \
+		windows_x86_64_msvc-0.36.1 \
+		zbus-2.3.2 \
+		zbus_macros-2.3.2 \
+		zbus_names-2.2.0 \
+		zvariant-3.7.1 \
+		zvariant_derive-3.7.1
diff --git a/security/authenticator/Makefile b/security/authenticator/Makefile
index be8b744f3998..0e2a8af421d9 100644
--- a/security/authenticator/Makefile
+++ b/security/authenticator/Makefile
@@ -26,371 +26,10 @@ GL_PROJECT=	Authenticator
 GL_COMMIT=	fc8624342b3b4aa599b4efdefdda84514c223b18
 CARGO_ENV=	ZBAR_INCLUDE_DIRS="${LOCALBASE}/include" ZBAR_LIB_DIRS="${LOCALBASE}/lib"
 MAKE_ENV=	${CARGO_ENV}
-GLIB_SCHEMAS=	com.belmoussaoui.Authenticator.gschema.xml
-
-CARGO_CRATES=	adler-1.0.2 \
-		adler32-1.2.0 \
-		aead-0.4.3 \
-		aes-0.7.5 \
-		aes-0.8.1 \
-		aes-gcm-0.9.4 \
-		aho-corasick-0.7.18 \
-		ansi_term-0.12.1 \
-		anyhow-1.0.57 \
-		arrayref-0.3.6 \
-		arrayvec-0.7.2 \
-		ashpd-0.3.2 \
-		async-broadcast-0.4.0 \
-		async-channel-1.6.1 \
-		async-executor-1.4.1 \
-		async-io-1.7.0 \
-		async-lock-2.5.0 \
-		async-recursion-0.3.2 \
-		async-task-4.2.0 \
-		async-trait-0.1.56 \
-		atty-0.2.14 \
-		autocfg-1.1.0 \
-		base64-0.13.0 \
-		base64ct-1.5.0 \
-		binascii-0.1.4 \
-		bindgen-0.59.2 \
-		bitflags-1.3.2 \
-		blake2b_simd-1.0.0 \
-		block-0.1.6 \
-		block-buffer-0.10.2 \
-		block-padding-0.3.2 \
-		bumpalo-3.10.0 \
-		bytemuck-1.9.1 \
-		byteorder-1.4.3 \
-		bytes-1.1.0 \
-		cache-padded-1.2.0 \
-		cairo-rs-0.15.11 \
-		cairo-sys-rs-0.15.1 \
-		cbc-0.1.2 \
-		cc-1.0.73 \
-		cexpr-0.6.0 \
-		cfg-expr-0.10.3 \
-		cfg-if-0.1.10 \
-		cfg-if-1.0.0 \
-		checked_int_cast-1.0.0 \
-		chrono-0.4.19 \
-		cipher-0.3.0 \
-		cipher-0.4.3 \
-		clang-sys-1.3.3 \
-		clap-2.34.0 \
-		color_quant-1.1.0 \
-		concurrent-queue-1.2.2 \
-		constant_time_eq-0.1.5 \
-		cookie-factory-0.3.2 \
-		core-foundation-0.9.3 \
-		core-foundation-sys-0.8.3 \
-		cpufeatures-0.2.2 \
-		crc32fast-1.3.2 \
-		crossbeam-utils-0.8.8 \
-		crypto-common-0.1.3 \
-		ctr-0.8.0 \
-		deflate-1.0.0 \
-		derivative-2.2.0 \
-		diesel-1.4.8 \
-		diesel_derives-1.4.1 \
-		diesel_migrations-1.4.0 \
-		digest-0.10.3 \
-		dirs-4.0.0 \
-		dirs-sys-0.3.7 \
-		doc-comment-0.3.3 \
-		easy-parallel-3.2.0 \
-		either-1.6.1 \
-		encoding_rs-0.8.31 \
-		enum-ordinalize-3.1.11 \
-		enumflags2-0.7.5 \
-		enumflags2_derive-0.7.4 \
-		env_logger-0.9.0 \
-		errno-0.2.8 \
-		errno-dragonfly-0.1.2 \
-		event-listener-2.5.2 \
-		fastrand-1.7.0 \
-		field-offset-0.3.4 \
-		fnv-1.0.7 \
-		foreign-types-0.3.2 \
-		foreign-types-shared-0.1.1 \
-		form_urlencoded-1.0.1 \
-		fragile-1.2.0 \
-		futures-0.3.21 \
-		futures-channel-0.3.21 \
-		futures-core-0.3.21 \
-		futures-executor-0.3.21 \
-		futures-io-0.3.21 \
-		futures-lite-1.12.0 \
-		futures-macro-0.3.21 \
-		futures-sink-0.3.21 \
-		futures-task-0.3.21 \
-		futures-util-0.3.21 \
-		gdk-pixbuf-0.15.11 \
-		gdk-pixbuf-sys-0.15.10 \
-		gdk4-0.4.8 \
-		gdk4-sys-0.4.8 \
-		gdk4-wayland-0.4.8 \
-		gdk4-wayland-sys-0.4.8 \
-		gdk4-x11-0.4.8 \
-		gdk4-x11-sys-0.4.8 \
-		generic-array-0.14.5 \
-		getrandom-0.2.6 \
-		gettext-rs-0.7.0 \
-		gettext-sys-0.21.3 \
-		ghash-0.4.4 \
-		gio-0.15.11 \
-		gio-sys-0.15.10 \
-		glib-0.15.11 \
-		glib-macros-0.15.11 \
-		glib-sys-0.15.10 \
-		glob-0.3.0 \
-		gobject-sys-0.15.10 \
-		graphene-rs-0.15.1 \
-		graphene-sys-0.15.10 \
-		gsk4-0.4.8 \
-		gsk4-sys-0.4.8 \
-		gst-plugin-gtk4-0.1.1 \
-		gst-plugin-version-helper-0.7.3 \
-		gstreamer-0.18.8 \
-		gstreamer-base-0.18.0 \
-		gstreamer-base-sys-0.18.0 \
-		gstreamer-sys-0.18.0 \
-		gstreamer-video-0.18.7 \
-		gstreamer-video-sys-0.18.3 \
-		gtk-macros-0.3.0 \
-		gtk4-0.4.8 \
-		gtk4-macros-0.4.8 \
-		gtk4-sys-0.4.8 \
-		h2-0.3.13 \
-		hashbrown-0.11.2 \
-		heck-0.4.0 \
-		hermit-abi-0.1.19 \
-		hex-0.4.3 \
-		hkdf-0.12.3 \
-		hmac-0.12.1 \
-		http-0.2.7 \
-		http-body-0.4.5 \
-		httparse-1.7.1 \
-		httpdate-1.0.2 \
-		humantime-2.1.0 \
-		hyper-0.14.19 \
-		hyper-tls-0.5.0 \
-		idna-0.2.3 \
-		image-0.23.14 \
-		image-0.24.2 \
-		indexmap-1.8.2 \
-		inout-0.1.3 \
-		instant-0.1.12 \
-		ipnet-2.5.0 \
-		itertools-0.10.3 \
-		itoa-1.0.2 \
-		js-sys-0.3.57 \
-		lazy_static-1.4.0 \
-		lazycell-1.3.0 \
-		libadwaita-0.1.1 \
-		libadwaita-sys-0.1.0 \
-		libc-0.2.126 \
-		libloading-0.7.3 \
-		libspa-0.5.0 \
-		libspa-sys-0.5.0 \
-		libsqlite3-sys-0.22.2 \
-		locale_config-0.3.0 \
-		lock_api-0.4.7 \
-		log-0.4.17 \
-		malloc_buf-0.0.6 \
-		matches-0.1.9 \
-		memchr-2.5.0 \
-		memoffset-0.6.5 \
-		migrations_internals-1.4.1 \
-		migrations_macros-1.4.2 \
-		mime-0.3.16 \
-		minimal-lexical-0.2.1 \
-		miniz_oxide-0.5.3 \
-		mio-0.8.3 \
-		muldiv-1.0.0 \
-		native-tls-0.2.10 \
-		nix-0.14.1 \
-		nix-0.23.1 \
-		nom-7.1.1 \
-		num-0.4.0 \
-		num-bigint-0.4.3 \
-		num-complex-0.4.1 \
-		num-integer-0.1.45 \
-		num-iter-0.1.43 \
-		num-rational-0.3.2 \
-		num-rational-0.4.0 \
-		num-traits-0.2.15 \
-		num_cpus-1.13.1 \
-		objc-0.2.7 \
-		objc-foundation-0.1.1 \
-		objc_id-0.1.1 \
-		once_cell-1.12.0 \
-		oo7-0.1.0-alpha.5 \
-		opaque-debug-0.3.0 \
-		openssl-0.10.40 \
-		openssl-macros-0.1.0 \
-		openssl-probe-0.1.5 \
-		openssl-sys-0.9.74 \
-		option-operations-0.4.0 \
-		ordered-stream-0.0.1 \
-		pango-0.15.10 \
-		pango-sys-0.15.10 \
-		parking-2.0.0 \
-		parking_lot-0.11.2 \
-		parking_lot-0.12.1 \
-		parking_lot_core-0.8.5 \
-		parking_lot_core-0.9.3 \
-		password-hash-0.4.1 \
-		paste-1.0.7 \
-		pbkdf2-0.11.0 \
-		peeking_take_while-0.1.2 \
-		percent-encoding-2.1.0 \
-		pest-2.1.3 \
-		pin-project-lite-0.2.9 \
-		pin-utils-0.1.0 \
-		pipewire-0.5.0 \
-		pipewire-sys-0.5.0 \
-		pkg-config-0.3.25 \
-		png-0.17.5 \
-		polling-2.2.0 \
-		polyval-0.5.3 \
-		ppv-lite86-0.2.16 \
-		pretty-hex-0.3.0 \
-		proc-macro-crate-1.1.3 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.39 \
-		prost-0.10.4 \
-		prost-derive-0.10.1 \
-		qrcode-0.12.0 \
-		quick-xml-0.22.0 \
-		quote-1.0.18 \
-		r2d2-0.8.9 \
-		rand-0.8.5 \
-		rand_chacha-0.3.1 \
-		rand_core-0.6.3 \
-		redox_syscall-0.2.13 \
-		redox_users-0.4.3 \
-		regex-1.5.6 \
-		regex-syntax-0.6.26 \
-		remove_dir_all-0.5.3 \
-		reqwest-0.11.10 \
-		ring-0.16.20 \
-		roxmltree-0.13.1 \
-		rust-argon2-1.0.0 \
-		rustc-hash-1.1.0 \
-		rustc_version-0.3.3 \
-		rustc_version-0.4.0 \
-		ryu-1.0.10 \
-		salsa20-0.10.2 \
-		schannel-0.1.20 \
-		scheduled-thread-pool-0.2.6 \
-		scopeguard-1.1.0 \
-		scrypt-0.10.0 \
-		search-provider-0.3.0 \
-		security-framework-2.6.1 \
-		security-framework-sys-2.6.1 \
-		semver-0.11.0 \
-		semver-1.0.9 \
-		semver-parser-0.10.2 \
-		serde-1.0.137 \
-		serde_derive-1.0.137 \
-		serde_json-1.0.81 \
-		serde_repr-0.1.8 \
-		serde_urlencoded-0.7.1 \
-		sha1-0.6.1 \
-		sha1_smol-1.0.0 \
-		sha2-0.10.2 \
-		sharded-slab-0.1.4 \
-		shlex-1.1.0 \
-		signal-0.7.0 \
-		slab-0.4.6 \
-		smallvec-1.8.0 \
-		socket2-0.4.4 \
-		spin-0.5.2 \
-		static_assertions-1.1.0 \
-		strsim-0.8.0 \
-		subtle-2.4.1 \
-		svg_metadata-0.4.2 \
-		syn-1.0.96 \
-		synstructure-0.12.6 \
-		system-deps-6.0.2 \
-		temp-dir-0.1.11 \
-		tempfile-3.3.0 \
-		termcolor-1.1.3 \
-		textwrap-0.11.0 \
-		thiserror-1.0.31 \
-		thiserror-impl-1.0.31 \
-		thread_local-1.1.4 \
-		tinyvec-1.6.0 \
-		tinyvec_macros-0.1.0 \
-		tokio-1.19.1 \
-		tokio-macros-1.8.0 \
-		tokio-native-tls-0.3.0 \
-		tokio-util-0.7.3 \
-		toml-0.5.9 \
-		tower-service-0.3.1 \
-		tracing-0.1.34 \
-		tracing-attributes-0.1.21 \
-		tracing-core-0.1.26 \
-		tracing-log-0.1.3 \
-		tracing-subscriber-0.3.11 \
-		try-lock-0.2.3 \
-		typenum-1.15.0 \
-		ucd-trie-0.1.3 \
-		uds_windows-1.0.2 \
-		unicase-2.6.0 \
-		unicode-bidi-0.3.8 \
-		unicode-ident-1.0.0 \
-		unicode-normalization-0.1.19 \
-		unicode-width-0.1.9 \
-		unicode-xid-0.2.3 \
-		universal-hash-0.4.1 \
-		untrusted-0.7.1 \
-		url-2.2.2 \
-		uuid-1.1.1 \
-		valuable-0.1.0 \
-		vcpkg-0.2.15 \
-		vec_map-0.8.2 \
-		version-compare-0.1.0 \
-		version_check-0.9.4 \
-		void-1.0.2 \
-		waker-fn-1.1.0 \
-		want-0.3.0 \
-		wasi-0.10.2+wasi-snapshot-preview1 \
-		wasi-0.11.0+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.80 \
-		wasm-bindgen-backend-0.2.80 \
-		wasm-bindgen-futures-0.4.30 \
-		wasm-bindgen-macro-0.2.80 \
-		wasm-bindgen-macro-support-0.2.80 \
-		wasm-bindgen-shared-0.2.80 \
-		web-sys-0.3.57 \
-		wepoll-ffi-0.1.2 \
-		which-4.2.5 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		windows-sys-0.36.1 \
-		windows_aarch64_msvc-0.36.1 \
-		windows_i686_gnu-0.36.1 \
-		windows_i686_msvc-0.36.1 \
-		windows_x86_64_gnu-0.36.1 \
-		windows_x86_64_msvc-0.36.1 \
-		winreg-0.10.1 \
-		xmlparser-0.13.3 \
-		zbar-rust-0.0.19 \
-		zbus-2.2.0 \
-		zbus_macros-2.2.0 \
-		zbus_names-2.1.0 \
-		zeroize-1.5.5 \
-		zeroize_derive-1.3.2 \
-		zvariant-3.2.1 \
-		zvariant_derive-3.2.1
 CARGO_BUILD=	no
 CARGO_INSTALL=	no
 CARGO_TEST=	no
+GLIB_SCHEMAS=	com.belmoussaoui.Authenticator.gschema.xml
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,"llvm-config,&${LLVM_DEFAULT},' \
diff --git a/security/authenticator/Makefile.crates b/security/authenticator/Makefile.crates
new file mode 100644
index 000000000000..cfb77ce4161e
--- /dev/null
+++ b/security/authenticator/Makefile.crates
@@ -0,0 +1,360 @@
+CARGO_CRATES=	adler-1.0.2 \
+		adler32-1.2.0 \
+		aead-0.4.3 \
+		aes-0.7.5 \
+		aes-0.8.1 \
+		aes-gcm-0.9.4 \
+		aho-corasick-0.7.18 \
+		ansi_term-0.12.1 \
+		anyhow-1.0.57 \
+		arrayref-0.3.6 \
+		arrayvec-0.7.2 \
+		ashpd-0.3.2 \
+		async-broadcast-0.4.0 \
+		async-channel-1.6.1 \
+		async-executor-1.4.1 \
+		async-io-1.7.0 \
+		async-lock-2.5.0 \
+		async-recursion-0.3.2 \
+		async-task-4.2.0 \
+		async-trait-0.1.56 \
+		atty-0.2.14 \
+		autocfg-1.1.0 \
+		base64-0.13.0 \
+		base64ct-1.5.0 \
+		binascii-0.1.4 \
+		bindgen-0.59.2 \
+		bitflags-1.3.2 \
+		blake2b_simd-1.0.0 \
+		block-0.1.6 \
+		block-buffer-0.10.2 \
+		block-padding-0.3.2 \
+		bumpalo-3.10.0 \
+		bytemuck-1.9.1 \
+		byteorder-1.4.3 \
+		bytes-1.1.0 \
+		cache-padded-1.2.0 \
+		cairo-rs-0.15.11 \
+		cairo-sys-rs-0.15.1 \
+		cbc-0.1.2 \
+		cc-1.0.73 \
+		cexpr-0.6.0 \
+		cfg-expr-0.10.3 \
+		cfg-if-0.1.10 \
+		cfg-if-1.0.0 \
+		checked_int_cast-1.0.0 \
+		chrono-0.4.19 \
+		cipher-0.3.0 \
+		cipher-0.4.3 \
+		clang-sys-1.3.3 \
+		clap-2.34.0 \
+		color_quant-1.1.0 \
+		concurrent-queue-1.2.2 \
+		constant_time_eq-0.1.5 \
+		cookie-factory-0.3.2 \
+		core-foundation-0.9.3 \
+		core-foundation-sys-0.8.3 \
+		cpufeatures-0.2.2 \
+		crc32fast-1.3.2 \
+		crossbeam-utils-0.8.8 \
+		crypto-common-0.1.3 \
+		ctr-0.8.0 \
+		deflate-1.0.0 \
+		derivative-2.2.0 \
+		diesel-1.4.8 \
+		diesel_derives-1.4.1 \
+		diesel_migrations-1.4.0 \
+		digest-0.10.3 \
+		dirs-4.0.0 \
+		dirs-sys-0.3.7 \
+		doc-comment-0.3.3 \
+		easy-parallel-3.2.0 \
+		either-1.6.1 \
+		encoding_rs-0.8.31 \
+		enum-ordinalize-3.1.11 \
+		enumflags2-0.7.5 \
+		enumflags2_derive-0.7.4 \
+		env_logger-0.9.0 \
+		errno-0.2.8 \
+		errno-dragonfly-0.1.2 \
+		event-listener-2.5.2 \
+		fastrand-1.7.0 \
+		field-offset-0.3.4 \
+		fnv-1.0.7 \
+		foreign-types-0.3.2 \
+		foreign-types-shared-0.1.1 \
+		form_urlencoded-1.0.1 \
+		fragile-1.2.0 \
+		futures-0.3.21 \
+		futures-channel-0.3.21 \
+		futures-core-0.3.21 \
+		futures-executor-0.3.21 \
+		futures-io-0.3.21 \
+		futures-lite-1.12.0 \
+		futures-macro-0.3.21 \
+		futures-sink-0.3.21 \
+		futures-task-0.3.21 \
+		futures-util-0.3.21 \
+		gdk-pixbuf-0.15.11 \
+		gdk-pixbuf-sys-0.15.10 \
+		gdk4-0.4.8 \
+		gdk4-sys-0.4.8 \
+		gdk4-wayland-0.4.8 \
+		gdk4-wayland-sys-0.4.8 \
+		gdk4-x11-0.4.8 \
+		gdk4-x11-sys-0.4.8 \
+		generic-array-0.14.5 \
+		getrandom-0.2.6 \
+		gettext-rs-0.7.0 \
+		gettext-sys-0.21.3 \
+		ghash-0.4.4 \
+		gio-0.15.11 \
+		gio-sys-0.15.10 \
+		glib-0.15.11 \
+		glib-macros-0.15.11 \
+		glib-sys-0.15.10 \
+		glob-0.3.0 \
+		gobject-sys-0.15.10 \
+		graphene-rs-0.15.1 \
+		graphene-sys-0.15.10 \
+		gsk4-0.4.8 \
+		gsk4-sys-0.4.8 \
+		gst-plugin-gtk4-0.1.1 \
+		gst-plugin-version-helper-0.7.3 \
+		gstreamer-0.18.8 \
+		gstreamer-base-0.18.0 \
+		gstreamer-base-sys-0.18.0 \
+		gstreamer-sys-0.18.0 \
+		gstreamer-video-0.18.7 \
+		gstreamer-video-sys-0.18.3 \
+		gtk-macros-0.3.0 \
+		gtk4-0.4.8 \
+		gtk4-macros-0.4.8 \
+		gtk4-sys-0.4.8 \
+		h2-0.3.13 \
+		hashbrown-0.11.2 \
+		heck-0.4.0 \
+		hermit-abi-0.1.19 \
+		hex-0.4.3 \
+		hkdf-0.12.3 \
+		hmac-0.12.1 \
+		http-0.2.7 \
+		http-body-0.4.5 \
+		httparse-1.7.1 \
+		httpdate-1.0.2 \
+		humantime-2.1.0 \
+		hyper-0.14.19 \
+		hyper-tls-0.5.0 \
+		idna-0.2.3 \
+		image-0.23.14 \
+		image-0.24.2 \
+		indexmap-1.8.2 \
+		inout-0.1.3 \
+		instant-0.1.12 \
+		ipnet-2.5.0 \
+		itertools-0.10.3 \
+		itoa-1.0.2 \
+		js-sys-0.3.57 \
+		lazy_static-1.4.0 \
+		lazycell-1.3.0 \
+		libadwaita-0.1.1 \
+		libadwaita-sys-0.1.0 \
+		libc-0.2.126 \
+		libloading-0.7.3 \
+		libspa-0.5.0 \
+		libspa-sys-0.5.0 \
+		libsqlite3-sys-0.22.2 \
+		locale_config-0.3.0 \
+		lock_api-0.4.7 \
+		log-0.4.17 \
+		malloc_buf-0.0.6 \
+		matches-0.1.9 \
+		memchr-2.5.0 \
+		memoffset-0.6.5 \
+		migrations_internals-1.4.1 \
+		migrations_macros-1.4.2 \
+		mime-0.3.16 \
+		minimal-lexical-0.2.1 \
+		miniz_oxide-0.5.3 \
+		mio-0.8.3 \
+		muldiv-1.0.0 \
+		native-tls-0.2.10 \
+		nix-0.14.1 \
+		nix-0.23.1 \
+		nom-7.1.1 \
+		num-0.4.0 \
+		num-bigint-0.4.3 \
+		num-complex-0.4.1 \
+		num-integer-0.1.45 \
+		num-iter-0.1.43 \
+		num-rational-0.3.2 \
+		num-rational-0.4.0 \
+		num-traits-0.2.15 \
+		num_cpus-1.13.1 \
+		objc-0.2.7 \
+		objc-foundation-0.1.1 \
+		objc_id-0.1.1 \
+		once_cell-1.12.0 \
+		oo7-0.1.0-alpha.5 \
+		opaque-debug-0.3.0 \
+		openssl-0.10.40 \
+		openssl-macros-0.1.0 \
+		openssl-probe-0.1.5 \
+		openssl-sys-0.9.74 \
+		option-operations-0.4.0 \
+		ordered-stream-0.0.1 \
+		pango-0.15.10 \
+		pango-sys-0.15.10 \
+		parking-2.0.0 \
+		parking_lot-0.11.2 \
+		parking_lot-0.12.1 \
+		parking_lot_core-0.8.5 \
+		parking_lot_core-0.9.3 \
+		password-hash-0.4.1 \
+		paste-1.0.7 \
+		pbkdf2-0.11.0 \
+		peeking_take_while-0.1.2 \
+		percent-encoding-2.1.0 \
+		pest-2.1.3 \
+		pin-project-lite-0.2.9 \
+		pin-utils-0.1.0 \
+		pipewire-0.5.0 \
+		pipewire-sys-0.5.0 \
+		pkg-config-0.3.25 \
+		png-0.17.5 \
+		polling-2.2.0 \
+		polyval-0.5.3 \
+		ppv-lite86-0.2.16 \
+		pretty-hex-0.3.0 \
+		proc-macro-crate-1.1.3 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.39 \
+		prost-0.10.4 \
+		prost-derive-0.10.1 \
+		qrcode-0.12.0 \
+		quick-xml-0.22.0 \
+		quote-1.0.18 \
+		r2d2-0.8.9 \
+		rand-0.8.5 \
+		rand_chacha-0.3.1 \
+		rand_core-0.6.3 \
+		redox_syscall-0.2.13 \
+		redox_users-0.4.3 \
+		regex-1.5.6 \
+		regex-syntax-0.6.26 \
+		remove_dir_all-0.5.3 \
+		reqwest-0.11.10 \
+		ring-0.16.20 \
+		roxmltree-0.13.1 \
+		rust-argon2-1.0.0 \
+		rustc-hash-1.1.0 \
+		rustc_version-0.3.3 \
+		rustc_version-0.4.0 \
+		ryu-1.0.10 \
+		salsa20-0.10.2 \
+		schannel-0.1.20 \
+		scheduled-thread-pool-0.2.6 \
+		scopeguard-1.1.0 \
+		scrypt-0.10.0 \
+		search-provider-0.3.0 \
+		security-framework-2.6.1 \
+		security-framework-sys-2.6.1 \
+		semver-0.11.0 \
+		semver-1.0.9 \
+		semver-parser-0.10.2 \
+		serde-1.0.137 \
+		serde_derive-1.0.137 \
+		serde_json-1.0.81 \
+		serde_repr-0.1.8 \
+		serde_urlencoded-0.7.1 \
+		sha1-0.6.1 \
+		sha1_smol-1.0.0 \
+		sha2-0.10.2 \
+		sharded-slab-0.1.4 \
+		shlex-1.1.0 \
+		signal-0.7.0 \
+		slab-0.4.6 \
+		smallvec-1.8.0 \
+		socket2-0.4.4 \
+		spin-0.5.2 \
+		static_assertions-1.1.0 \
+		strsim-0.8.0 \
+		subtle-2.4.1 \
+		svg_metadata-0.4.2 \
+		syn-1.0.96 \
+		synstructure-0.12.6 \
+		system-deps-6.0.2 \
+		temp-dir-0.1.11 \
+		tempfile-3.3.0 \
+		termcolor-1.1.3 \
+		textwrap-0.11.0 \
+		thiserror-1.0.31 \
+		thiserror-impl-1.0.31 \
+		thread_local-1.1.4 \
+		tinyvec-1.6.0 \
+		tinyvec_macros-0.1.0 \
+		tokio-1.19.1 \
+		tokio-macros-1.8.0 \
+		tokio-native-tls-0.3.0 \
+		tokio-util-0.7.3 \
+		toml-0.5.9 \
+		tower-service-0.3.1 \
+		tracing-0.1.34 \
+		tracing-attributes-0.1.21 \
+		tracing-core-0.1.26 \
+		tracing-log-0.1.3 \
+		tracing-subscriber-0.3.11 \
+		try-lock-0.2.3 \
+		typenum-1.15.0 \
+		ucd-trie-0.1.3 \
+		uds_windows-1.0.2 \
+		unicase-2.6.0 \
+		unicode-bidi-0.3.8 \
+		unicode-ident-1.0.0 \
+		unicode-normalization-0.1.19 \
+		unicode-width-0.1.9 \
+		unicode-xid-0.2.3 \
+		universal-hash-0.4.1 \
+		untrusted-0.7.1 \
+		url-2.2.2 \
+		uuid-1.1.1 \
+		valuable-0.1.0 \
+		vcpkg-0.2.15 \
+		vec_map-0.8.2 \
+		version-compare-0.1.0 \
+		version_check-0.9.4 \
+		void-1.0.2 \
+		waker-fn-1.1.0 \
+		want-0.3.0 \
+		wasi-0.10.2+wasi-snapshot-preview1 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.80 \
+		wasm-bindgen-backend-0.2.80 \
+		wasm-bindgen-futures-0.4.30 \
+		wasm-bindgen-macro-0.2.80 \
+		wasm-bindgen-macro-support-0.2.80 \
+		wasm-bindgen-shared-0.2.80 \
+		web-sys-0.3.57 \
+		wepoll-ffi-0.1.2 \
+		which-4.2.5 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		windows-sys-0.36.1 \
+		windows_aarch64_msvc-0.36.1 \
+		windows_i686_gnu-0.36.1 \
+		windows_i686_msvc-0.36.1 \
+		windows_x86_64_gnu-0.36.1 \
+		windows_x86_64_msvc-0.36.1 \
+		winreg-0.10.1 \
+		xmlparser-0.13.3 \
+		zbar-rust-0.0.19 \
+		zbus-2.2.0 \
+		zbus_macros-2.2.0 \
+		zbus_names-2.1.0 \
+		zeroize-1.5.5 \
+		zeroize_derive-1.3.2 \
+		zvariant-3.2.1 \
+		zvariant_derive-3.2.1
diff --git a/sysutils/czkawka/Makefile b/sysutils/czkawka/Makefile
index 95507d8c5f50..2d8d9fe31108 100644
--- a/sysutils/czkawka/Makefile
+++ b/sysutils/czkawka/Makefile
@@ -24,326 +24,6 @@ PLIST_FILES=	bin/${PORTNAME}_cli \
 		share/metainfo/com.github.qarmin.czkawka.metainfo.xml \
 		${NULL}
 
-CARGO_CRATES=	adler-1.0.2 \
-		adler32-1.2.0 \
-		aes-0.6.0 \
-		aes-0.7.5 \
-		aes-soft-0.6.4 \
-		aesni-0.10.0 \
-		aho-corasick-0.7.18 \
-		android_system_properties-0.1.5 \
-		anyhow-1.0.62 \
-		arrayref-0.3.6 \
-		arrayvec-0.7.2 \
-		atty-0.2.14 \
-		audio_checker-0.1.0 \
-		autocfg-1.1.0 \
-		base64-0.13.0 \
-		base64-0.20.0-alpha.1 \
-		base64ct-1.0.1 \
-		bincode-1.3.3 \
-		bit_field-0.10.1 \
-		bitflags-1.3.2 \
-		bk-tree-0.4.0 \
-		blake3-1.3.1 \
-		block-0.1.6 \
-		block-buffer-0.9.0 \
-		block-buffer-0.10.2 \
-		block-modes-0.7.0 \
-		block-padding-0.2.1 \
-		bumpalo-3.11.0 \
-		bytemuck-1.12.1 \
-		byteorder-1.4.3 \
-		bzip2-0.4.3 \
-		bzip2-sys-0.1.11+1.0.8 \
-		cairo-rs-0.15.12 \
-		cairo-sys-rs-0.15.1 \
-		cc-1.0.73 \
-		cfb-0.7.3 \
-		cfg-expr-0.10.3 \
-		cfg-if-1.0.0 \
-		chrono-0.4.22 \
-		cipher-0.2.5 \
-		cipher-0.3.0 \
-		clap-3.2.18 \
-		clap_derive-3.2.18 \
-		clap_lex-0.2.4 \
-		color_quant-1.1.0 \
-		constant_time_eq-0.1.5 \
-		core-foundation-sys-0.8.3 \
-		cpufeatures-0.2.4 \
-		crc32fast-1.3.2 \
-		crossbeam-channel-0.5.6 \
-		crossbeam-deque-0.8.2 \
-		crossbeam-epoch-0.9.10 \
-		crossbeam-utils-0.8.11 \
-		crypto-common-0.1.6 \
-		dashmap-5.3.4 \
-		deflate-0.9.1 \
-		deflate-1.0.0 \
-		digest-0.9.0 \
-		digest-0.10.3 \
-		directories-next-2.0.0 \
-		dirs-sys-next-0.1.2 \
-		doc-comment-0.3.3 \
-		either-1.8.0 \
-		encoding_rs-0.8.31 \
-		enumn-0.1.5 \
-		exr-1.5.0 \
-		fastrand-1.8.0 \
-		fax-0.1.1 \
-		fax_derive-0.1.0 \
-		ffmpeg_cmdline_utils-0.1.2 \
-		field-offset-0.3.4 \
-		find-crate-0.6.3 \
-		flate2-1.0.24 \
-		fluent-0.16.0 \
-		fluent-bundle-0.15.2 \
-		fluent-langneg-0.13.0 \
-		fluent-syntax-0.11.0 \
-		flume-0.10.14 \
-		fnv-1.0.7 \
-		form_urlencoded-1.0.1 \
-		fs_extra-1.2.0 \
-		futures-0.3.24 \
-		futures-channel-0.3.24 \
-		futures-core-0.3.24 \
-		futures-executor-0.3.24 \
-		futures-io-0.3.24 \
-		futures-macro-0.3.24 \
-		futures-sink-0.3.24 \
-		futures-task-0.3.24 \
-		futures-util-0.3.24 \
-		gdk-pixbuf-0.15.11 \
-		gdk-pixbuf-sys-0.15.10 \
-		gdk4-0.4.8 \
-		gdk4-sys-0.4.8 \
-		generic-array-0.14.6 \
-		getrandom-0.2.7 \
-		gif-0.11.4 \
-		gio-0.15.12 \
-		gio-sys-0.15.10 \
-		glib-0.15.12 \
-		glib-macros-0.15.11 \
-		glib-sys-0.15.10 \
-		glob-0.3.0 \
-		gobject-sys-0.15.10 \
-		graphene-rs-0.15.1 \
-		graphene-sys-0.15.10 \
-		gsk4-0.4.8 \
-		gsk4-sys-0.4.8 \
-		gtk4-0.4.8 \
-		gtk4-macros-0.4.8 \
-		gtk4-sys-0.4.8 \
-		half-1.8.2 \
-		hamming-0.1.3 \
-		hashbrown-0.12.3 \
-		heck-0.4.0 \
-		hermit-abi-0.1.19 \
-		hmac-0.12.1 \
-		humansize-1.1.1 \
-		i18n-config-0.4.2 \
-		i18n-embed-0.13.4 \
-		i18n-embed-fl-0.6.4 \
-		i18n-embed-impl-0.8.0 \
-		iana-time-zone-0.1.47 \
-		idna-0.2.3 \
-		image-0.24.3 \
-		image_hasher-1.0.0 \
-		imagepipe-0.5.0 \
-		indexmap-1.9.1 \
-		infer-0.9.0 \
-		inflate-0.4.5 \
-		instant-0.1.12 \
-		intl-memoizer-0.5.1 \
-		intl_pluralrules-7.0.1 \
-		itertools-0.10.3 \
-		itoa-1.0.3 \
-		jpeg-decoder-0.1.22 \
-		jpeg-decoder-0.2.6 \
-		js-sys-0.3.59 \
-		lazy_static-1.4.0 \
-		lebe-0.5.2 \
-		libc-0.2.132 \
-		libheif-rs-0.15.0 \
-		libheif-sys-1.12.0 \
-		linked-hash-map-0.5.6 \
-		locale_config-0.3.0 \
-		lock_api-0.4.8 \
-		lofty-0.8.0 \
-		lofty_attr-0.3.0 \
-		log-0.4.17 \
-		malloc_buf-0.0.6 \
-		matches-0.1.9 \
-		md5-0.7.0 \
-		memchr-2.5.0 \
-		memoffset-0.6.5 \
-		mime-0.3.16 \
-		mime_guess-2.0.4 \
-		miniz_oxide-0.5.3 \
-		multicache-0.6.1 \
-		nanorand-0.7.0 \
-		num-complex-0.3.1 \
-		num-integer-0.1.45 \
-		num-rational-0.4.1 \
-		num-traits-0.2.15 \
-		num_cpus-1.13.1 \
-		num_threads-0.1.6 \
-		objc-0.2.7 \
-		objc-foundation-0.1.1 \
-		objc_id-0.1.1 \
-		ogg_pager-0.3.2 \
-		once_cell-1.13.1 \
-		opaque-debug-0.3.0 \
-		open-3.0.2 \
-		ordermap-0.4.2 \
-		os_str_bytes-6.3.0 \
-		pango-0.15.10 \
-		pango-sys-0.15.10 \
-		parking_lot-0.12.1 \
-		parking_lot_core-0.9.3 \
-		password-hash-0.3.2 \
-		paste-1.0.8 \
-		pathdiff-0.2.1 \
-		pbkdf2-0.10.1 \
-		pdf-0.7.2 \
-		pdf_derive-0.1.22 \
-		percent-encoding-2.1.0 \
-		pest-2.3.0 \
-		pin-project-1.0.12 \
-		pin-project-internal-1.0.12 \
-		pin-project-lite-0.2.9 \
-		pin-utils-0.1.0 \
-		pkg-config-0.3.25 \
-		png-0.17.5 \
-		ppv-lite86-0.2.16 \
-		primal-check-0.3.2 \
-		proc-macro-crate-1.2.1 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.43 \
-		quick-xml-0.22.0 \
-		quote-1.0.21 \
-		rand-0.8.5 \
-		rand_chacha-0.3.1 \
-		rand_core-0.6.3 \
-		rawloader-0.37.1 \
-		rayon-1.5.3 \
-		rayon-core-1.9.3 \
-		redox_syscall-0.2.16 \
-		redox_users-0.4.3 \
-		regex-1.6.0 \
-		regex-syntax-0.6.27 \
-		remove_dir_all-0.5.3 \
-		rust-embed-6.4.0 \
-		rust-embed-impl-6.2.0 \
-		rust-embed-utils-7.2.0 \
-		rustc-hash-1.1.0 \
-		rustc_version-0.3.3 \
-		rustc_version-0.4.0 \
-		rustdct-0.5.1 \
-		rustdct-0.6.0 \
-		rustfft-4.1.0 \
-		rustfft-5.1.1 \
-		ryu-1.0.11 \
-		same-file-1.0.6 \
-		scoped_threadpool-0.1.9 \
-		scopeguard-1.1.0 \
-		self_cell-0.10.2 \
-		semver-0.11.0 \
-		semver-1.0.13 \
-		semver-parser-0.10.2 \
-		serde-1.0.144 \
-		serde_derive-1.0.144 \
-		serde_json-1.0.85 \
-		serde_yaml-0.8.26 \
-		sha1-0.10.2 \
-		sha2-0.9.9 \
-		sha2-0.10.3 \
-		slab-0.4.7 \
-		smallvec-1.9.0 \
-		snafu-0.6.10 \
-		snafu-derive-0.6.10 \
-		spin-0.9.4 \
-		strength_reduce-0.2.3 \
-		stringprep-0.1.2 \
-		strsim-0.10.0 \
-		subtle-2.4.1 \
-		symphonia-0.5.1 \
-		symphonia-bundle-flac-0.5.1 \
-		symphonia-bundle-mp3-0.5.1 \
-		symphonia-codec-aac-0.5.1 \
-		symphonia-codec-alac-0.5.1 \
-		symphonia-codec-pcm-0.5.1 \
-		symphonia-codec-vorbis-0.5.1 \
-		symphonia-core-0.5.1 \
-		symphonia-format-isomp4-0.5.1 \
-		symphonia-format-mkv-0.5.1 \
-		symphonia-format-ogg-0.5.1 \
-		symphonia-format-wav-0.5.1 \
-		symphonia-metadata-0.5.1 \
-		symphonia-utils-xiph-0.5.1 \
-		syn-1.0.99 \
-		system-deps-6.0.2 \
-		tempfile-3.3.0 \
-		termcolor-1.1.3 \
-		textwrap-0.15.0 \
-		thiserror-1.0.32 \
-		thiserror-impl-1.0.32 \
-		threadpool-1.8.1 \
-		tiff-0.7.3 \
-		time-0.1.44 \
-		time-0.3.14 \
-		time-macros-0.2.4 \
-		tinystr-0.3.4 \
-		tinyvec-1.6.0 \
-		tinyvec_macros-0.1.0 \
-		toml-0.5.9 \
-		transpose-0.2.1 \
-		trash-2.1.5 \
-		triple_accel-0.3.4 \
-		type-map-0.4.0 \
-		typenum-1.15.0 \
-		ucd-trie-0.1.4 \
-		unic-langid-0.9.0 \
-		unic-langid-impl-0.9.0 \
-		unicase-2.6.0 \
-		unicode-bidi-0.3.8 \
-		unicode-ident-1.0.3 \
-		unicode-normalization-0.1.21 \
-		url-2.2.2 \
-		uuid-1.1.2 \
-		version-compare-0.1.0 \
-		version_check-0.9.4 \
-		vid_dup_finder_lib-0.1.1 \
-		walkdir-2.3.2 \
-		wasi-0.10.0+wasi-snapshot-preview1 \
-		wasi-0.11.0+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.82 \
-		wasm-bindgen-backend-0.2.82 \
-		wasm-bindgen-macro-0.2.82 \
-		wasm-bindgen-macro-support-0.2.82 \
-		wasm-bindgen-shared-0.2.82 \
-		weezl-0.1.7 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		windows-0.37.0 \
-		windows-sys-0.36.1 \
-		windows_aarch64_msvc-0.36.1 \
-		windows_aarch64_msvc-0.37.0 \
-		windows_i686_gnu-0.36.1 \
-		windows_i686_gnu-0.37.0 \
-		windows_i686_msvc-0.36.1 \
-		windows_i686_msvc-0.37.0 \
-		windows_x86_64_gnu-0.36.1 \
-		windows_x86_64_gnu-0.37.0 \
-		windows_x86_64_msvc-0.36.1 \
-		windows_x86_64_msvc-0.37.0 \
-		xxhash-rust-0.8.5 \
-		yaml-rust-0.4.5 \
-		zip-0.6.2
 # XXX https://github.com/rust-lang/cargo/issues/4101
 CARGO_INSTALL_PATH=	${PLIST_FILES:Mbin/*:T}
 
diff --git a/sysutils/czkawka/Makefile.crates b/sysutils/czkawka/Makefile.crates
new file mode 100644
index 000000000000..f31d294e67c5
--- /dev/null
+++ b/sysutils/czkawka/Makefile.crates
@@ -0,0 +1,320 @@
+CARGO_CRATES=	adler-1.0.2 \
+		adler32-1.2.0 \
+		aes-0.6.0 \
+		aes-0.7.5 \
+		aes-soft-0.6.4 \
+		aesni-0.10.0 \
+		aho-corasick-0.7.18 \
+		android_system_properties-0.1.5 \
+		anyhow-1.0.62 \
+		arrayref-0.3.6 \
+		arrayvec-0.7.2 \
+		atty-0.2.14 \
+		audio_checker-0.1.0 \
+		autocfg-1.1.0 \
+		base64-0.13.0 \
+		base64-0.20.0-alpha.1 \
+		base64ct-1.0.1 \
+		bincode-1.3.3 \
+		bit_field-0.10.1 \
+		bitflags-1.3.2 \
+		bk-tree-0.4.0 \
+		blake3-1.3.1 \
+		block-0.1.6 \
+		block-buffer-0.9.0 \
+		block-buffer-0.10.2 \
+		block-modes-0.7.0 \
+		block-padding-0.2.1 \
+		bumpalo-3.11.0 \
+		bytemuck-1.12.1 \
+		byteorder-1.4.3 \
+		bzip2-0.4.3 \
+		bzip2-sys-0.1.11+1.0.8 \
+		cairo-rs-0.15.12 \
+		cairo-sys-rs-0.15.1 \
+		cc-1.0.73 \
+		cfb-0.7.3 \
+		cfg-expr-0.10.3 \
+		cfg-if-1.0.0 \
+		chrono-0.4.22 \
+		cipher-0.2.5 \
+		cipher-0.3.0 \
+		clap-3.2.18 \
+		clap_derive-3.2.18 \
+		clap_lex-0.2.4 \
+		color_quant-1.1.0 \
+		constant_time_eq-0.1.5 \
+		core-foundation-sys-0.8.3 \
+		cpufeatures-0.2.4 \
+		crc32fast-1.3.2 \
+		crossbeam-channel-0.5.6 \
+		crossbeam-deque-0.8.2 \
+		crossbeam-epoch-0.9.10 \
+		crossbeam-utils-0.8.11 \
+		crypto-common-0.1.6 \
+		dashmap-5.3.4 \
+		deflate-0.9.1 \
+		deflate-1.0.0 \
+		digest-0.9.0 \
+		digest-0.10.3 \
+		directories-next-2.0.0 \
+		dirs-sys-next-0.1.2 \
+		doc-comment-0.3.3 \
+		either-1.8.0 \
+		encoding_rs-0.8.31 \
+		enumn-0.1.5 \
+		exr-1.5.0 \
+		fastrand-1.8.0 \
+		fax-0.1.1 \
+		fax_derive-0.1.0 \
+		ffmpeg_cmdline_utils-0.1.2 \
+		field-offset-0.3.4 \
+		find-crate-0.6.3 \
+		flate2-1.0.24 \
+		fluent-0.16.0 \
+		fluent-bundle-0.15.2 \
+		fluent-langneg-0.13.0 \
+		fluent-syntax-0.11.0 \
+		flume-0.10.14 \
+		fnv-1.0.7 \
+		form_urlencoded-1.0.1 \
+		fs_extra-1.2.0 \
+		futures-0.3.24 \
+		futures-channel-0.3.24 \
+		futures-core-0.3.24 \
+		futures-executor-0.3.24 \
+		futures-io-0.3.24 \
+		futures-macro-0.3.24 \
+		futures-sink-0.3.24 \
+		futures-task-0.3.24 \
+		futures-util-0.3.24 \
+		gdk-pixbuf-0.15.11 \
+		gdk-pixbuf-sys-0.15.10 \
+		gdk4-0.4.8 \
+		gdk4-sys-0.4.8 \
+		generic-array-0.14.6 \
+		getrandom-0.2.7 \
+		gif-0.11.4 \
+		gio-0.15.12 \
+		gio-sys-0.15.10 \
+		glib-0.15.12 \
+		glib-macros-0.15.11 \
+		glib-sys-0.15.10 \
+		glob-0.3.0 \
+		gobject-sys-0.15.10 \
+		graphene-rs-0.15.1 \
+		graphene-sys-0.15.10 \
+		gsk4-0.4.8 \
+		gsk4-sys-0.4.8 \
+		gtk4-0.4.8 \
+		gtk4-macros-0.4.8 \
+		gtk4-sys-0.4.8 \
+		half-1.8.2 \
+		hamming-0.1.3 \
+		hashbrown-0.12.3 \
+		heck-0.4.0 \
+		hermit-abi-0.1.19 \
+		hmac-0.12.1 \
+		humansize-1.1.1 \
+		i18n-config-0.4.2 \
+		i18n-embed-0.13.4 \
+		i18n-embed-fl-0.6.4 \
+		i18n-embed-impl-0.8.0 \
+		iana-time-zone-0.1.47 \
+		idna-0.2.3 \
+		image-0.24.3 \
+		image_hasher-1.0.0 \
+		imagepipe-0.5.0 \
+		indexmap-1.9.1 \
+		infer-0.9.0 \
+		inflate-0.4.5 \
+		instant-0.1.12 \
+		intl-memoizer-0.5.1 \
+		intl_pluralrules-7.0.1 \
+		itertools-0.10.3 \
+		itoa-1.0.3 \
+		jpeg-decoder-0.1.22 \
+		jpeg-decoder-0.2.6 \
+		js-sys-0.3.59 \
+		lazy_static-1.4.0 \
+		lebe-0.5.2 \
+		libc-0.2.132 \
+		libheif-rs-0.15.0 \
+		libheif-sys-1.12.0 \
+		linked-hash-map-0.5.6 \
+		locale_config-0.3.0 \
+		lock_api-0.4.8 \
+		lofty-0.8.0 \
+		lofty_attr-0.3.0 \
+		log-0.4.17 \
+		malloc_buf-0.0.6 \
+		matches-0.1.9 \
+		md5-0.7.0 \
+		memchr-2.5.0 \
+		memoffset-0.6.5 \
+		mime-0.3.16 \
+		mime_guess-2.0.4 \
+		miniz_oxide-0.5.3 \
+		multicache-0.6.1 \
+		nanorand-0.7.0 \
+		num-complex-0.3.1 \
+		num-integer-0.1.45 \
+		num-rational-0.4.1 \
+		num-traits-0.2.15 \
+		num_cpus-1.13.1 \
+		num_threads-0.1.6 \
+		objc-0.2.7 \
+		objc-foundation-0.1.1 \
+		objc_id-0.1.1 \
+		ogg_pager-0.3.2 \
+		once_cell-1.13.1 \
+		opaque-debug-0.3.0 \
+		open-3.0.2 \
+		ordermap-0.4.2 \
+		os_str_bytes-6.3.0 \
+		pango-0.15.10 \
+		pango-sys-0.15.10 \
+		parking_lot-0.12.1 \
+		parking_lot_core-0.9.3 \
+		password-hash-0.3.2 \
+		paste-1.0.8 \
+		pathdiff-0.2.1 \
+		pbkdf2-0.10.1 \
+		pdf-0.7.2 \
+		pdf_derive-0.1.22 \
+		percent-encoding-2.1.0 \
+		pest-2.3.0 \
+		pin-project-1.0.12 \
+		pin-project-internal-1.0.12 \
+		pin-project-lite-0.2.9 \
+		pin-utils-0.1.0 \
+		pkg-config-0.3.25 \
+		png-0.17.5 \
+		ppv-lite86-0.2.16 \
+		primal-check-0.3.2 \
+		proc-macro-crate-1.2.1 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.43 \
+		quick-xml-0.22.0 \
+		quote-1.0.21 \
+		rand-0.8.5 \
+		rand_chacha-0.3.1 \
+		rand_core-0.6.3 \
+		rawloader-0.37.1 \
+		rayon-1.5.3 \
+		rayon-core-1.9.3 \
+		redox_syscall-0.2.16 \
+		redox_users-0.4.3 \
+		regex-1.6.0 \
+		regex-syntax-0.6.27 \
+		remove_dir_all-0.5.3 \
+		rust-embed-6.4.0 \
+		rust-embed-impl-6.2.0 \
+		rust-embed-utils-7.2.0 \
+		rustc-hash-1.1.0 \
+		rustc_version-0.3.3 \
+		rustc_version-0.4.0 \
+		rustdct-0.5.1 \
+		rustdct-0.6.0 \
+		rustfft-4.1.0 \
+		rustfft-5.1.1 \
+		ryu-1.0.11 \
+		same-file-1.0.6 \
+		scoped_threadpool-0.1.9 \
+		scopeguard-1.1.0 \
+		self_cell-0.10.2 \
+		semver-0.11.0 \
+		semver-1.0.13 \
+		semver-parser-0.10.2 \
+		serde-1.0.144 \
+		serde_derive-1.0.144 \
+		serde_json-1.0.85 \
+		serde_yaml-0.8.26 \
+		sha1-0.10.2 \
+		sha2-0.9.9 \
+		sha2-0.10.3 \
+		slab-0.4.7 \
+		smallvec-1.9.0 \
+		snafu-0.6.10 \
+		snafu-derive-0.6.10 \
+		spin-0.9.4 \
+		strength_reduce-0.2.3 \
+		stringprep-0.1.2 \
+		strsim-0.10.0 \
+		subtle-2.4.1 \
+		symphonia-0.5.1 \
+		symphonia-bundle-flac-0.5.1 \
+		symphonia-bundle-mp3-0.5.1 \
+		symphonia-codec-aac-0.5.1 \
+		symphonia-codec-alac-0.5.1 \
+		symphonia-codec-pcm-0.5.1 \
+		symphonia-codec-vorbis-0.5.1 \
+		symphonia-core-0.5.1 \
+		symphonia-format-isomp4-0.5.1 \
+		symphonia-format-mkv-0.5.1 \
+		symphonia-format-ogg-0.5.1 \
+		symphonia-format-wav-0.5.1 \
+		symphonia-metadata-0.5.1 \
+		symphonia-utils-xiph-0.5.1 \
+		syn-1.0.99 \
+		system-deps-6.0.2 \
+		tempfile-3.3.0 \
+		termcolor-1.1.3 \
+		textwrap-0.15.0 \
+		thiserror-1.0.32 \
+		thiserror-impl-1.0.32 \
+		threadpool-1.8.1 \
+		tiff-0.7.3 \
+		time-0.1.44 \
+		time-0.3.14 \
+		time-macros-0.2.4 \
+		tinystr-0.3.4 \
+		tinyvec-1.6.0 \
+		tinyvec_macros-0.1.0 \
+		toml-0.5.9 \
+		transpose-0.2.1 \
+		trash-2.1.5 \
+		triple_accel-0.3.4 \
+		type-map-0.4.0 \
+		typenum-1.15.0 \
+		ucd-trie-0.1.4 \
+		unic-langid-0.9.0 \
+		unic-langid-impl-0.9.0 \
+		unicase-2.6.0 \
+		unicode-bidi-0.3.8 \
+		unicode-ident-1.0.3 \
+		unicode-normalization-0.1.21 \
+		url-2.2.2 \
+		uuid-1.1.2 \
+		version-compare-0.1.0 \
+		version_check-0.9.4 \
+		vid_dup_finder_lib-0.1.1 \
+		walkdir-2.3.2 \
+		wasi-0.10.0+wasi-snapshot-preview1 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.82 \
+		wasm-bindgen-backend-0.2.82 \
+		wasm-bindgen-macro-0.2.82 \
+		wasm-bindgen-macro-support-0.2.82 \
+		wasm-bindgen-shared-0.2.82 \
+		weezl-0.1.7 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		windows-0.37.0 \
+		windows-sys-0.36.1 \
+		windows_aarch64_msvc-0.36.1 \
+		windows_aarch64_msvc-0.37.0 \
+		windows_i686_gnu-0.36.1 \
+		windows_i686_gnu-0.37.0 \
+		windows_i686_msvc-0.36.1 \
+		windows_i686_msvc-0.37.0 \
+		windows_x86_64_gnu-0.36.1 \
+		windows_x86_64_gnu-0.37.0 \
+		windows_x86_64_msvc-0.36.1 \
+		windows_x86_64_msvc-0.37.0 \
+		xxhash-rust-0.8.5 \
+		yaml-rust-0.4.5 \
+		zip-0.6.2
diff --git a/textproc/mdbook-linkcheck/Makefile b/textproc/mdbook-linkcheck/Makefile
index 386909c2e613..8cde76d75165 100644
--- a/textproc/mdbook-linkcheck/Makefile
+++ b/textproc/mdbook-linkcheck/Makefile
@@ -16,221 +16,6 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	Michael-F-Bryan
 PLIST_FILES=	bin/${PORTNAME}
 
-CARGO_CRATES=	adler-1.0.2 \
-		aho-corasick-0.7.19 \
-		android_system_properties-0.1.5 \
-		ansi_term-0.11.0 \
-		ansi_term-0.12.1 \
-		anyhow-1.0.65 \
-		atty-0.2.14 \
-		autocfg-1.1.0 \
-		base64-0.13.0 \
-		bincode-1.3.3 \
-		bitflags-1.3.2 \
-		block-buffer-0.10.3 \
-		bstr-0.2.17 \
-		build-info-0.0.21 \
-		build-info-build-0.0.21 \
-		build-info-common-0.0.21 \
-		build-info-proc-0.0.21 \
-		bumpalo-3.11.0 \
-		byteorder-1.4.3 \
-		bytes-1.2.1 \
-		bzip2-0.4.3 \
-		bzip2-sys-0.1.11+1.0.8 \
-		cargo-platform-0.1.2 \
-		cargo_metadata-0.12.3 \
-		cc-1.0.73 \
-		cfg-if-1.0.0 \
-		chrono-0.4.22 \
-		clap-2.34.0 \
-		clap-3.2.22 \
-		clap_complete-3.2.5 \
-		clap_lex-0.2.4 \
-		codespan-0.11.1 \
-		codespan-reporting-0.11.1 \
-		convert_case-0.4.0 \
-		core-foundation-0.9.3 \
-		core-foundation-sys-0.8.3 \
-		cpufeatures-0.2.5 \
-		crc32fast-1.3.2 \
-		crypto-common-0.1.6 \
-		ctor-0.1.23 \
-		derive_more-0.99.17 \
-		diff-0.1.13 \
-		difference-2.0.0 \
-		digest-0.10.5 \
-		dunce-1.0.2 \
-		encoding_rs-0.8.31 \
-		env_logger-0.8.4 \
-		env_logger-0.9.1 \
-		fastrand-1.8.0 \
-		flate2-1.0.24 \
-		fnv-1.0.7 \
-		foreign-types-0.3.2 \
-		foreign-types-shared-0.1.1 \
-		form_urlencoded-1.1.0 \
-		format-buf-1.0.0 \
-		futures-0.3.24 \
-		futures-channel-0.3.24 \
-		futures-core-0.3.24 \
-		futures-executor-0.3.24 \
-		futures-io-0.3.24 \
-		futures-macro-0.3.24 \
-		futures-sink-0.3.24 \
-		futures-task-0.3.24 \
-		futures-util-0.3.24 \
-		generic-array-0.14.6 \
-		getopts-0.2.21 \
-		git2-0.13.25 \
-		glob-0.3.0 \
-		h2-0.3.14 \
-		handlebars-4.3.4 \
-		hashbrown-0.12.3 \
-		heck-0.3.3 \
-		hermit-abi-0.1.19 \
-		http-0.2.8 \
-		http-body-0.4.5 \
-		httparse-1.8.0 \
-		httpdate-1.0.2 \
-		humantime-2.1.0 \
-		hyper-0.14.20 \
-		hyper-tls-0.5.0 \
-		iana-time-zone-0.1.50 \
-		idna-0.3.0 \
-		indexmap-1.9.1 \
-		instant-0.1.12 \
-		ipnet-2.5.0 \
-		itoa-1.0.3 \
-		jobserver-0.1.25 \
-		js-sys-0.3.60 \
-		lazy_static-1.4.0 \
-		libc-0.2.134 \
-		libgit2-sys-0.12.26+1.3.0 \
-		libz-sys-1.1.8 \
-		linkcheck-0.4.1 \
-		linkify-0.7.0 \
-		log-0.4.17 \
-		lzma-sys-0.1.19 \
-		mdbook-0.4.21 \
-		memchr-2.5.0 \
-		mime-0.3.16 \
-		miniz_oxide-0.5.4 \
-		mio-0.8.4 \
-		native-tls-0.2.10 \
-		num-bigint-0.3.3 \
-		num-integer-0.1.45 \
-		num-traits-0.2.15 \
-		num_cpus-1.13.1 \
-		once_cell-1.15.0 \
-		opener-0.5.0 \
-		openssl-0.10.42 \
-		openssl-macros-0.1.0 \
-		openssl-probe-0.1.5 \
-		openssl-src-111.22.0+1.1.1q \
-		openssl-sys-0.9.76 \
-		os_str_bytes-6.3.0 \
-		output_vt100-0.1.3 \
-		percent-encoding-2.2.0 \
-		pest-2.4.0 \
-		pest_derive-2.4.0 \
-		pest_generator-2.4.0 \
-		pest_meta-2.4.0 \
-		pin-project-lite-0.2.9 \
-		pin-utils-0.1.0 \
-		pkg-config-0.3.25 \
-		pretty_assertions-0.6.1 \
-		pretty_assertions-1.3.0 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro-hack-0.5.19 \
-		proc-macro2-1.0.46 \
-		pulldown-cmark-0.8.0 \
-		pulldown-cmark-0.9.2 \
-		quote-1.0.21 \
-		redox_syscall-0.2.16 \
-		regex-1.6.0 \
-		regex-automata-0.1.10 \
-		regex-syntax-0.6.27 \
-		remove_dir_all-0.5.3 \
-		reqwest-0.11.12 \
-		rustc_version-0.3.3 \
-		rustc_version-0.4.0 \
-		ryu-1.0.11 \
-		schannel-0.1.20 \
-		security-framework-2.7.0 \
-		security-framework-sys-2.6.1 \
-		semver-0.11.0 \
-		semver-1.0.14 \
-		semver-parser-0.10.2 \
-		serde-1.0.145 \
-		serde_derive-1.0.145 \
-		serde_json-1.0.85 \
-		serde_urlencoded-0.7.1 \
-		sha1-0.10.5 \
-		shlex-1.1.0 \
-		slab-0.4.7 \
-		socket2-0.4.7 \
-		strsim-0.8.0 \
-		strsim-0.10.0 \
-		structopt-0.3.26 \
-		structopt-derive-0.4.18 \
-		syn-1.0.101 \
-		tempfile-3.3.0 \
-		termcolor-1.1.3 \
-		textwrap-0.11.0 \
-		textwrap-0.15.1 \
-		thiserror-1.0.37 \
-		thiserror-impl-1.0.37 \
-		time-0.1.44 \
-		tinyvec-1.6.0 \
-		tinyvec_macros-0.1.0 \
-		tokio-1.21.2 \
-		tokio-native-tls-0.3.0 \
-		tokio-util-0.7.4 \
-		toml-0.5.9 \
-		topological-sort-0.1.0 \
-		tower-service-0.3.2 \
-		tracing-0.1.36 \
-		tracing-core-0.1.29 \
-		try-lock-0.2.3 \
-		typenum-1.15.0 \
-		ucd-trie-0.1.5 \
-		unicase-2.6.0 \
-		unicode-bidi-0.3.8 \
-		unicode-ident-1.0.4 \
-		unicode-normalization-0.1.22 \
-		unicode-segmentation-1.10.0 \
-		unicode-width-0.1.10 \
-		url-2.3.1 \
-		vcpkg-0.2.15 \
-		vec_map-0.8.2 \
-		version_check-0.9.4 \
-		want-0.3.0 \
-		wasi-0.10.0+wasi-snapshot-preview1 \
-		wasi-0.11.0+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.83 \
-		wasm-bindgen-backend-0.2.83 \
-		wasm-bindgen-futures-0.4.33 \
-		wasm-bindgen-macro-0.2.83 \
-		wasm-bindgen-macro-support-0.2.83 \
-		wasm-bindgen-shared-0.2.83 \
-		web-sys-0.3.60 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		windows-sys-0.36.1 \
-		windows_aarch64_msvc-0.36.1 \
-		windows_i686_gnu-0.36.1 \
-		windows_i686_msvc-0.36.1 \
-		windows_x86_64_gnu-0.36.1 \
-		windows_x86_64_msvc-0.36.1 \
-		winreg-0.10.1 \
-		xz2-0.1.7 \
-		yansi-0.5.1 \
-		zip-0.5.13
-
 post-patch:
 	@${REINPLACE_CMD} -e '/native-tls/s/-vendored//' \
 		${WRKSRC}/Cargo.toml
diff --git a/textproc/mdbook-linkcheck/Makefile.crates b/textproc/mdbook-linkcheck/Makefile.crates
new file mode 100644
index 000000000000..bc1ab7520236
--- /dev/null
+++ b/textproc/mdbook-linkcheck/Makefile.crates
@@ -0,0 +1,214 @@
+CARGO_CRATES=	adler-1.0.2 \
+		aho-corasick-0.7.19 \
+		android_system_properties-0.1.5 \
+		ansi_term-0.11.0 \
+		ansi_term-0.12.1 \
+		anyhow-1.0.65 \
+		atty-0.2.14 \
+		autocfg-1.1.0 \
+		base64-0.13.0 \
+		bincode-1.3.3 \
+		bitflags-1.3.2 \
+		block-buffer-0.10.3 \
+		bstr-0.2.17 \
+		build-info-0.0.21 \
+		build-info-build-0.0.21 \
+		build-info-common-0.0.21 \
+		build-info-proc-0.0.21 \
+		bumpalo-3.11.0 \
+		byteorder-1.4.3 \
+		bytes-1.2.1 \
+		bzip2-0.4.3 \
+		bzip2-sys-0.1.11+1.0.8 \
+		cargo-platform-0.1.2 \
+		cargo_metadata-0.12.3 \
+		cc-1.0.73 \
+		cfg-if-1.0.0 \
+		chrono-0.4.22 \
+		clap-2.34.0 \
+		clap-3.2.22 \
+		clap_complete-3.2.5 \
+		clap_lex-0.2.4 \
+		codespan-0.11.1 \
+		codespan-reporting-0.11.1 \
+		convert_case-0.4.0 \
+		core-foundation-0.9.3 \
+		core-foundation-sys-0.8.3 \
+		cpufeatures-0.2.5 \
+		crc32fast-1.3.2 \
+		crypto-common-0.1.6 \
+		ctor-0.1.23 \
+		derive_more-0.99.17 \
+		diff-0.1.13 \
+		difference-2.0.0 \
+		digest-0.10.5 \
+		dunce-1.0.2 \
+		encoding_rs-0.8.31 \
+		env_logger-0.8.4 \
+		env_logger-0.9.1 \
+		fastrand-1.8.0 \
+		flate2-1.0.24 \
+		fnv-1.0.7 \
+		foreign-types-0.3.2 \
+		foreign-types-shared-0.1.1 \
+		form_urlencoded-1.1.0 \
+		format-buf-1.0.0 \
+		futures-0.3.24 \
+		futures-channel-0.3.24 \
+		futures-core-0.3.24 \
+		futures-executor-0.3.24 \
+		futures-io-0.3.24 \
+		futures-macro-0.3.24 \
+		futures-sink-0.3.24 \
+		futures-task-0.3.24 \
+		futures-util-0.3.24 \
+		generic-array-0.14.6 \
+		getopts-0.2.21 \
+		git2-0.13.25 \
+		glob-0.3.0 \
+		h2-0.3.14 \
+		handlebars-4.3.4 \
+		hashbrown-0.12.3 \
+		heck-0.3.3 \
+		hermit-abi-0.1.19 \
+		http-0.2.8 \
+		http-body-0.4.5 \
+		httparse-1.8.0 \
+		httpdate-1.0.2 \
+		humantime-2.1.0 \
+		hyper-0.14.20 \
+		hyper-tls-0.5.0 \
+		iana-time-zone-0.1.50 \
+		idna-0.3.0 \
+		indexmap-1.9.1 \
+		instant-0.1.12 \
+		ipnet-2.5.0 \
+		itoa-1.0.3 \
+		jobserver-0.1.25 \
+		js-sys-0.3.60 \
+		lazy_static-1.4.0 \
+		libc-0.2.134 \
+		libgit2-sys-0.12.26+1.3.0 \
+		libz-sys-1.1.8 \
+		linkcheck-0.4.1 \
+		linkify-0.7.0 \
+		log-0.4.17 \
+		lzma-sys-0.1.19 \
+		mdbook-0.4.21 \
+		memchr-2.5.0 \
+		mime-0.3.16 \
+		miniz_oxide-0.5.4 \
+		mio-0.8.4 \
+		native-tls-0.2.10 \
+		num-bigint-0.3.3 \
+		num-integer-0.1.45 \
+		num-traits-0.2.15 \
+		num_cpus-1.13.1 \
+		once_cell-1.15.0 \
+		opener-0.5.0 \
+		openssl-0.10.42 \
+		openssl-macros-0.1.0 \
+		openssl-probe-0.1.5 \
+		openssl-src-111.22.0+1.1.1q \
+		openssl-sys-0.9.76 \
+		os_str_bytes-6.3.0 \
+		output_vt100-0.1.3 \
+		percent-encoding-2.2.0 \
+		pest-2.4.0 \
+		pest_derive-2.4.0 \
+		pest_generator-2.4.0 \
+		pest_meta-2.4.0 \
+		pin-project-lite-0.2.9 \
+		pin-utils-0.1.0 \
+		pkg-config-0.3.25 \
+		pretty_assertions-0.6.1 \
+		pretty_assertions-1.3.0 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro-hack-0.5.19 \
+		proc-macro2-1.0.46 \
+		pulldown-cmark-0.8.0 \
+		pulldown-cmark-0.9.2 \
+		quote-1.0.21 \
+		redox_syscall-0.2.16 \
+		regex-1.6.0 \
+		regex-automata-0.1.10 \
+		regex-syntax-0.6.27 \
+		remove_dir_all-0.5.3 \
+		reqwest-0.11.12 \
+		rustc_version-0.3.3 \
+		rustc_version-0.4.0 \
+		ryu-1.0.11 \
+		schannel-0.1.20 \
+		security-framework-2.7.0 \
+		security-framework-sys-2.6.1 \
+		semver-0.11.0 \
+		semver-1.0.14 \
+		semver-parser-0.10.2 \
+		serde-1.0.145 \
+		serde_derive-1.0.145 \
+		serde_json-1.0.85 \
+		serde_urlencoded-0.7.1 \
+		sha1-0.10.5 \
+		shlex-1.1.0 \
+		slab-0.4.7 \
+		socket2-0.4.7 \
+		strsim-0.8.0 \
+		strsim-0.10.0 \
+		structopt-0.3.26 \
+		structopt-derive-0.4.18 \
+		syn-1.0.101 \
+		tempfile-3.3.0 \
+		termcolor-1.1.3 \
+		textwrap-0.11.0 \
+		textwrap-0.15.1 \
+		thiserror-1.0.37 \
+		thiserror-impl-1.0.37 \
+		time-0.1.44 \
+		tinyvec-1.6.0 \
+		tinyvec_macros-0.1.0 \
+		tokio-1.21.2 \
+		tokio-native-tls-0.3.0 \
+		tokio-util-0.7.4 \
+		toml-0.5.9 \
+		topological-sort-0.1.0 \
+		tower-service-0.3.2 \
+		tracing-0.1.36 \
+		tracing-core-0.1.29 \
+		try-lock-0.2.3 \
+		typenum-1.15.0 \
+		ucd-trie-0.1.5 \
+		unicase-2.6.0 \
+		unicode-bidi-0.3.8 \
+		unicode-ident-1.0.4 \
+		unicode-normalization-0.1.22 \
+		unicode-segmentation-1.10.0 \
+		unicode-width-0.1.10 \
+		url-2.3.1 \
+		vcpkg-0.2.15 \
+		vec_map-0.8.2 \
+		version_check-0.9.4 \
+		want-0.3.0 \
+		wasi-0.10.0+wasi-snapshot-preview1 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.83 \
+		wasm-bindgen-backend-0.2.83 \
+		wasm-bindgen-futures-0.4.33 \
+		wasm-bindgen-macro-0.2.83 \
+		wasm-bindgen-macro-support-0.2.83 \
+		wasm-bindgen-shared-0.2.83 \
+		web-sys-0.3.60 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		windows-sys-0.36.1 \
+		windows_aarch64_msvc-0.36.1 \
+		windows_i686_gnu-0.36.1 \
+		windows_i686_msvc-0.36.1 \
+		windows_x86_64_gnu-0.36.1 \
+		windows_x86_64_msvc-0.36.1 \
+		winreg-0.10.1 \
+		xz2-0.1.7 \
+		yansi-0.5.1 \
+		zip-0.5.13
diff --git a/textproc/mdbook-mermaid/Makefile b/textproc/mdbook-mermaid/Makefile
index c2cc3b14bb0b..ee2396d6dd77 100644
--- a/textproc/mdbook-mermaid/Makefile
+++ b/textproc/mdbook-mermaid/Makefile
@@ -16,116 +16,4 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	badboy
 PLIST_FILES=	bin/${PORTNAME}
 
-CARGO_CRATES=	aho-corasick-0.7.19 \
-		android_system_properties-0.1.5 \
-		anyhow-1.0.65 \
-		assert_cmd-2.0.4 \
-		atty-0.2.14 \
-		autocfg-1.1.0 \
-		bitflags-1.3.2 \
-		block-buffer-0.10.3 \
-		bstr-0.2.17 \
-		bumpalo-3.11.0 \
-		bytes-1.2.1 \
-		cc-1.0.73 \
-		cfg-if-1.0.0 \
-		chrono-0.4.22 \
-		clap-3.2.22 \
-		clap_complete-3.2.5 \
-		clap_lex-0.2.4 \
-		codespan-reporting-0.11.1 \
-		combine-4.6.6 \
-		core-foundation-sys-0.8.3 \
-		cpufeatures-0.2.5 \
-		crypto-common-0.1.6 \
-		ctor-0.1.23 \
-		cxx-1.0.78 \
-		cxx-build-1.0.78 \
-		cxxbridge-flags-1.0.78 \
-		cxxbridge-macro-1.0.78 \
-		diff-0.1.13 \
-		difflib-0.4.0 \
-		digest-0.10.5 \
-		doc-comment-0.3.3 \
-		either-1.8.0 \
-		env_logger-0.9.1 \
-		fastrand-1.8.0 \
-		generic-array-0.14.6 \
-		handlebars-4.3.5 \
-		hashbrown-0.12.3 \
-		hermit-abi-0.1.19 \
-		humantime-2.1.0 \
-		iana-time-zone-0.1.51 \
-		iana-time-zone-haiku-0.1.0 \
-		indexmap-1.9.1 \
-		instant-0.1.12 \
-		itertools-0.10.5 \
-		itoa-1.0.4 \
-		js-sys-0.3.60 \
-		lazy_static-1.4.0 \
-		libc-0.2.135 \
-		link-cplusplus-1.0.7 \
-		log-0.4.17 \
-		mdbook-0.4.21 \
-		memchr-2.5.0 \
-		num-integer-0.1.45 \
-		num-traits-0.2.15 \
-		once_cell-1.15.0 \
-		opener-0.5.0 \
-		os_str_bytes-6.3.0 \
-		output_vt100-0.1.3 \
-		pest-2.4.0 \
-		pest_derive-2.4.0 \
-		pest_generator-2.4.0 \
-		pest_meta-2.4.0 \
-		predicates-2.1.1 \
-		predicates-core-1.0.3 \
-		predicates-tree-1.0.5 \
-		pretty_assertions-1.3.0 \
-		proc-macro2-1.0.46 \
-		pulldown-cmark-0.9.2 \
-		quote-1.0.21 \
-		redox_syscall-0.2.16 \
-		regex-1.6.0 \
-		regex-automata-0.1.10 \
-		regex-syntax-0.6.27 \
-		remove_dir_all-0.5.3 \
-		ryu-1.0.11 \
-		scratch-1.0.2 \
-		serde-1.0.145 \
-		serde_derive-1.0.145 \
-		serde_json-1.0.86 \
-		sha1-0.10.5 \
-		shlex-1.1.0 \
-		strsim-0.10.0 \
-		syn-1.0.102 \
-		tempfile-3.3.0 \
-		termcolor-1.1.3 \
-		termtree-0.2.4 \
-		textwrap-0.15.1 \
-		thiserror-1.0.37 \
-		thiserror-impl-1.0.37 \
-		time-0.1.44 \
-		toml-0.5.9 \
-		toml_edit-0.14.4 \
-		topological-sort-0.1.0 \
-		typenum-1.15.0 \
-		ucd-trie-0.1.5 \
-		unicase-2.6.0 \
-		unicode-ident-1.0.5 \
-		unicode-width-0.1.10 \
-		version_check-0.9.4 \
-		wait-timeout-0.2.0 \
-		wasi-0.10.0+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.83 \
-		wasm-bindgen-backend-0.2.83 \
-		wasm-bindgen-macro-0.2.83 \
-		wasm-bindgen-macro-support-0.2.83 \
-		wasm-bindgen-shared-0.2.83 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		yansi-0.5.1
-
 .include <bsd.port.mk>
diff --git a/textproc/mdbook-mermaid/Makefile.crates b/textproc/mdbook-mermaid/Makefile.crates
new file mode 100644
index 000000000000..b047e09f3635
--- /dev/null
+++ b/textproc/mdbook-mermaid/Makefile.crates
@@ -0,0 +1,111 @@
+CARGO_CRATES=	aho-corasick-0.7.19 \
+		android_system_properties-0.1.5 \
+		anyhow-1.0.65 \
+		assert_cmd-2.0.4 \
+		atty-0.2.14 \
+		autocfg-1.1.0 \
+		bitflags-1.3.2 \
+		block-buffer-0.10.3 \
+		bstr-0.2.17 \
+		bumpalo-3.11.0 \
+		bytes-1.2.1 \
+		cc-1.0.73 \
+		cfg-if-1.0.0 \
+		chrono-0.4.22 \
+		clap-3.2.22 \
+		clap_complete-3.2.5 \
+		clap_lex-0.2.4 \
+		codespan-reporting-0.11.1 \
+		combine-4.6.6 \
+		core-foundation-sys-0.8.3 \
+		cpufeatures-0.2.5 \
+		crypto-common-0.1.6 \
+		ctor-0.1.23 \
+		cxx-1.0.78 \
+		cxx-build-1.0.78 \
+		cxxbridge-flags-1.0.78 \
+		cxxbridge-macro-1.0.78 \
+		diff-0.1.13 \
+		difflib-0.4.0 \
+		digest-0.10.5 \
+		doc-comment-0.3.3 \
+		either-1.8.0 \
+		env_logger-0.9.1 \
+		fastrand-1.8.0 \
+		generic-array-0.14.6 \
+		handlebars-4.3.5 \
+		hashbrown-0.12.3 \
+		hermit-abi-0.1.19 \
+		humantime-2.1.0 \
+		iana-time-zone-0.1.51 \
+		iana-time-zone-haiku-0.1.0 \
+		indexmap-1.9.1 \
+		instant-0.1.12 \
+		itertools-0.10.5 \
+		itoa-1.0.4 \
+		js-sys-0.3.60 \
+		lazy_static-1.4.0 \
+		libc-0.2.135 \
+		link-cplusplus-1.0.7 \
+		log-0.4.17 \
+		mdbook-0.4.21 \
+		memchr-2.5.0 \
+		num-integer-0.1.45 \
+		num-traits-0.2.15 \
+		once_cell-1.15.0 \
+		opener-0.5.0 \
+		os_str_bytes-6.3.0 \
+		output_vt100-0.1.3 \
+		pest-2.4.0 \
+		pest_derive-2.4.0 \
+		pest_generator-2.4.0 \
+		pest_meta-2.4.0 \
+		predicates-2.1.1 \
+		predicates-core-1.0.3 \
+		predicates-tree-1.0.5 \
+		pretty_assertions-1.3.0 \
+		proc-macro2-1.0.46 \
+		pulldown-cmark-0.9.2 \
+		quote-1.0.21 \
+		redox_syscall-0.2.16 \
+		regex-1.6.0 \
+		regex-automata-0.1.10 \
+		regex-syntax-0.6.27 \
+		remove_dir_all-0.5.3 \
+		ryu-1.0.11 \
+		scratch-1.0.2 \
+		serde-1.0.145 \
+		serde_derive-1.0.145 \
+		serde_json-1.0.86 \
+		sha1-0.10.5 \
+		shlex-1.1.0 \
+		strsim-0.10.0 \
+		syn-1.0.102 \
+		tempfile-3.3.0 \
+		termcolor-1.1.3 \
+		termtree-0.2.4 \
+		textwrap-0.15.1 \
+		thiserror-1.0.37 \
+		thiserror-impl-1.0.37 \
+		time-0.1.44 \
+		toml-0.5.9 \
+		toml_edit-0.14.4 \
+		topological-sort-0.1.0 \
+		typenum-1.15.0 \
+		ucd-trie-0.1.5 \
+		unicase-2.6.0 \
+		unicode-ident-1.0.5 \
+		unicode-width-0.1.10 \
+		version_check-0.9.4 \
+		wait-timeout-0.2.0 \
+		wasi-0.10.0+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.83 \
+		wasm-bindgen-backend-0.2.83 \
+		wasm-bindgen-macro-0.2.83 \
+		wasm-bindgen-macro-support-0.2.83 \
+		wasm-bindgen-shared-0.2.83 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		yansi-0.5.1
diff --git a/x11/kickoff/Makefile b/x11/kickoff/Makefile
index b0a85c648a4e..fd22eae53b99 100644
--- a/x11/kickoff/Makefile
+++ b/x11/kickoff/Makefile
@@ -19,222 +19,4 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	j0ru
 PLIST_FILES=	bin/${PORTNAME}
 
-CARGO_CRATES=	adler-1.0.2 \
-		adler32-1.2.0 \
-		ahash-0.7.6 \
-		aho-corasick-0.7.18 \
-		async-broadcast-0.4.0 \
-		async-channel-1.6.1 \
-		async-executor-1.4.1 \
-		async-io-1.7.0 \
-		async-lock-2.5.0 \
-		async-recursion-0.3.2 \
-		async-task-4.2.0 \
-		async-trait-0.1.56 \
-		atty-0.2.14 \
-		autocfg-1.1.0 \
-		bit_field-0.10.1 \
-		bitflags-1.3.2 \
-		block-0.1.6 \
-		bumpalo-3.10.0 \
-		bytemuck-1.9.1 \
-		byteorder-1.4.3 \
-		bytes-1.1.0 \
-		cache-padded-1.2.0 \
-		calloop-0.9.3 \
-		cc-1.0.73 \
-		cfg-if-1.0.0 \
-		clap-3.2.1 \
-		clap_derive-3.2.1 \
-		clap_lex-0.2.2 \
-		color_quant-1.1.0 \
-		concurrent-queue-1.2.2 \
-		const-cstr-0.3.0 \
-		crc32fast-1.3.2 \
-		crossbeam-channel-0.5.4 \
-		crossbeam-deque-0.8.1 \
-		crossbeam-epoch-0.9.8 \
-		crossbeam-utils-0.8.8 \
-		css-color-0.2.4 \
-		deflate-1.0.0 \
-		derivative-2.2.0 \
-		dirs-4.0.0 \
-		dirs-next-2.0.0 \
-		dirs-sys-0.3.7 \
-		dirs-sys-next-0.1.2 \
-		dlib-0.5.0 \
-		downcast-rs-1.2.0 \
-		easy-parallel-3.2.0 \
-		either-1.6.1 \
-		enumflags2-0.7.5 \
-		enumflags2_derive-0.7.4 \
-		env_logger-0.9.0 \
-		errno-0.2.8 \
-		errno-dragonfly-0.1.2 \
-		event-listener-2.5.2 \
-		exec-0.3.1 \
-		exr-1.4.2 \
-		fastrand-1.7.0 \
-		flate2-1.0.24 \
-		flume-0.10.13 \
-		fontconfig-0.5.0 \
-		fontdue-0.7.2 \
-		futures-core-0.3.21 \
-		futures-io-0.3.21 \
-		futures-lite-1.12.0 \
-		futures-sink-0.3.21 \
-		futures-task-0.3.21 \
-		futures-util-0.3.21 \
-		fuzzy-matcher-0.3.7 \
-		getrandom-0.2.6 \
-		gif-0.11.3 \
-		half-1.8.2 \
-		hashbrown-0.11.2 \
-		heck-0.3.3 \
-		heck-0.4.0 \
-		hermit-abi-0.1.19 \
-		hex-0.4.3 \
-		humantime-2.1.0 \
-		image-0.24.2 \
-		indexmap-1.8.2 \
-		inflate-0.4.5 \
-		instant-0.1.12 \
-		itoa-1.0.2 \
-		jpeg-decoder-0.2.6 \
-		js-sys-0.3.57 \
-		lazy_static-1.4.0 \
-		lebe-0.5.1 \
-		libc-0.2.126 \
-		libloading-0.7.3 \
-		lock_api-0.4.7 \
-		log-0.4.17 \
-		mac-notification-sys-0.5.2 \
-		malloc_buf-0.0.6 \
-		memchr-2.5.0 \
-		memmap2-0.3.1 \
-		memoffset-0.6.5 \
-		minimal-lexical-0.2.1 \
-		miniz_oxide-0.5.3 \
-		nanorand-0.7.0 \
-		nix-0.22.3 \
-		nix-0.23.1 \
-		nix-0.24.1 \
-		nom-7.1.1 \
-		notify-rust-4.5.8 \
-		num-integer-0.1.45 \
-		num-iter-0.1.43 \
-		num-rational-0.4.0 \
-		num-traits-0.2.15 \
-		num_cpus-1.13.1 \
-		num_threads-0.1.6 \
-		objc-0.2.7 \
-		objc-foundation-0.1.1 \
-		objc_id-0.1.1 \
-		once_cell-1.12.0 \
-		ordered-stream-0.0.1 \
-		os_str_bytes-6.1.0 \
-		parking-2.0.0 \
-		parking_lot-0.11.2 \
-		parking_lot_core-0.8.5 \
-		pin-project-1.0.10 \
-		pin-project-internal-1.0.10 \
-		pin-project-lite-0.2.9 \
-		pin-utils-0.1.0 \
-		pkg-config-0.3.25 \
-		png-0.17.5 \
-		polling-2.2.0 \
-		ppv-lite86-0.2.16 \
-		proc-macro-crate-1.1.3 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.39 \
-		quote-1.0.18 \
-		rand-0.8.5 \
-		rand_chacha-0.3.1 \
-		rand_core-0.6.3 \
-		rayon-1.5.3 \
-		rayon-core-1.9.3 \
-		redox_syscall-0.2.13 \
-		redox_users-0.4.3 \
-		regex-1.5.6 \
-		regex-syntax-0.6.26 \
-		remove_dir_all-0.5.3 \
-		ryu-1.0.10 \
-		scoped-tls-1.0.0 \
-		scoped_threadpool-0.1.9 \
-		scopeguard-1.1.0 \
-		serde-1.0.137 \
-		serde_derive-1.0.137 \
-		serde_json-1.0.81 \
-		serde_repr-0.1.8 \
-		sha1-0.6.1 \
-		sha1_smol-1.0.0 \
-		shellwords-1.1.0 \
-		slab-0.4.6 \
-		smallvec-1.8.0 \
-		smithay-client-toolkit-0.15.4 \
-		smithay-clipboard-0.6.5 \
-		socket2-0.4.4 \
-		spin-0.9.3 \
-		static_assertions-1.1.0 \
-		strsim-0.10.0 \
-		strum-0.22.0 \
-		strum_macros-0.22.0 \
-		syn-1.0.96 \
-		tempfile-3.3.0 \
-		termcolor-1.1.3 \
-		textwrap-0.15.0 \
-		thiserror-1.0.31 \
-		thiserror-impl-1.0.31 \
-		thread_local-1.1.4 \
-		threadpool-1.8.1 \
-		tiff-0.7.2 \
-		time-0.3.9 \
-		tokio-1.19.2 \
-		tokio-macros-1.8.0 \
-		toml-0.5.9 \
-		tracing-0.1.35 \
-		tracing-attributes-0.1.21 \
-		tracing-core-0.1.27 \
-		ttf-parser-0.15.1 \
-		uds_windows-1.0.2 \
-		unicode-ident-1.0.0 \
-		unicode-segmentation-1.9.0 \
-		version_check-0.9.4 \
-		waker-fn-1.1.0 \
-		wasi-0.10.2+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.80 \
-		wasm-bindgen-backend-0.2.80 \
-		wasm-bindgen-macro-0.2.80 \
-		wasm-bindgen-macro-support-0.2.80 \
-		wasm-bindgen-shared-0.2.80 \
-		wayland-client-0.29.4 \
-		wayland-commons-0.29.4 \
-		wayland-cursor-0.29.4 \
-		wayland-protocols-0.29.4 \
-		wayland-scanner-0.29.4 \
-		wayland-sys-0.29.4 \
-		weezl-0.1.6 \
-		wepoll-ffi-0.1.2 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		windows-0.24.0 \
-		windows_i686_gnu-0.24.0 \
-		windows_i686_msvc-0.24.0 \
-		windows_x86_64_gnu-0.24.0 \
-		windows_x86_64_msvc-0.24.0 \
-		winrt-notification-0.5.1 \
-		x11-keysymdef-0.2.0 \
-		xcursor-0.3.4 \
-		xdg-2.4.1 \
-		xml-rs-0.8.4 \
-		yeslogic-fontconfig-sys-3.0.1 \
-		zbus-2.3.0 \
-		zbus_macros-2.3.0 \
-		zbus_names-2.1.0 \
-		zvariant-3.3.0 \
-		zvariant_derive-3.3.0
-
 .include <bsd.port.mk>
diff --git a/x11/kickoff/Makefile.crates b/x11/kickoff/Makefile.crates
new file mode 100644
index 000000000000..0f9d56a06c71
--- /dev/null
+++ b/x11/kickoff/Makefile.crates
@@ -0,0 +1,217 @@
+CARGO_CRATES=	adler-1.0.2 \
+		adler32-1.2.0 \
+		ahash-0.7.6 \
+		aho-corasick-0.7.18 \
+		async-broadcast-0.4.0 \
+		async-channel-1.6.1 \
+		async-executor-1.4.1 \
+		async-io-1.7.0 \
+		async-lock-2.5.0 \
+		async-recursion-0.3.2 \
+		async-task-4.2.0 \
+		async-trait-0.1.56 \
+		atty-0.2.14 \
+		autocfg-1.1.0 \
+		bit_field-0.10.1 \
+		bitflags-1.3.2 \
+		block-0.1.6 \
+		bumpalo-3.10.0 \
+		bytemuck-1.9.1 \
+		byteorder-1.4.3 \
+		bytes-1.1.0 \
+		cache-padded-1.2.0 \
+		calloop-0.9.3 \
+		cc-1.0.73 \
+		cfg-if-1.0.0 \
+		clap-3.2.1 \
+		clap_derive-3.2.1 \
+		clap_lex-0.2.2 \
+		color_quant-1.1.0 \
+		concurrent-queue-1.2.2 \
+		const-cstr-0.3.0 \
+		crc32fast-1.3.2 \
+		crossbeam-channel-0.5.4 \
+		crossbeam-deque-0.8.1 \
+		crossbeam-epoch-0.9.8 \
+		crossbeam-utils-0.8.8 \
+		css-color-0.2.4 \
+		deflate-1.0.0 \
+		derivative-2.2.0 \
+		dirs-4.0.0 \
+		dirs-next-2.0.0 \
+		dirs-sys-0.3.7 \
+		dirs-sys-next-0.1.2 \
+		dlib-0.5.0 \
+		downcast-rs-1.2.0 \
+		easy-parallel-3.2.0 \
+		either-1.6.1 \
+		enumflags2-0.7.5 \
+		enumflags2_derive-0.7.4 \
+		env_logger-0.9.0 \
+		errno-0.2.8 \
+		errno-dragonfly-0.1.2 \
+		event-listener-2.5.2 \
+		exec-0.3.1 \
+		exr-1.4.2 \
+		fastrand-1.7.0 \
+		flate2-1.0.24 \
+		flume-0.10.13 \
+		fontconfig-0.5.0 \
+		fontdue-0.7.2 \
+		futures-core-0.3.21 \
+		futures-io-0.3.21 \
+		futures-lite-1.12.0 \
+		futures-sink-0.3.21 \
+		futures-task-0.3.21 \
+		futures-util-0.3.21 \
+		fuzzy-matcher-0.3.7 \
+		getrandom-0.2.6 \
+		gif-0.11.3 \
+		half-1.8.2 \
+		hashbrown-0.11.2 \
+		heck-0.3.3 \
+		heck-0.4.0 \
+		hermit-abi-0.1.19 \
+		hex-0.4.3 \
+		humantime-2.1.0 \
+		image-0.24.2 \
+		indexmap-1.8.2 \
+		inflate-0.4.5 \
+		instant-0.1.12 \
+		itoa-1.0.2 \
+		jpeg-decoder-0.2.6 \
+		js-sys-0.3.57 \
+		lazy_static-1.4.0 \
+		lebe-0.5.1 \
+		libc-0.2.126 \
+		libloading-0.7.3 \
+		lock_api-0.4.7 \
+		log-0.4.17 \
+		mac-notification-sys-0.5.2 \
+		malloc_buf-0.0.6 \
+		memchr-2.5.0 \
+		memmap2-0.3.1 \
+		memoffset-0.6.5 \
+		minimal-lexical-0.2.1 \
+		miniz_oxide-0.5.3 \
+		nanorand-0.7.0 \
+		nix-0.22.3 \
+		nix-0.23.1 \
+		nix-0.24.1 \
+		nom-7.1.1 \
+		notify-rust-4.5.8 \
+		num-integer-0.1.45 \
+		num-iter-0.1.43 \
+		num-rational-0.4.0 \
+		num-traits-0.2.15 \
+		num_cpus-1.13.1 \
+		num_threads-0.1.6 \
+		objc-0.2.7 \
+		objc-foundation-0.1.1 \
+		objc_id-0.1.1 \
+		once_cell-1.12.0 \
+		ordered-stream-0.0.1 \
+		os_str_bytes-6.1.0 \
+		parking-2.0.0 \
+		parking_lot-0.11.2 \
+		parking_lot_core-0.8.5 \
+		pin-project-1.0.10 \
+		pin-project-internal-1.0.10 \
+		pin-project-lite-0.2.9 \
+		pin-utils-0.1.0 \
+		pkg-config-0.3.25 \
+		png-0.17.5 \
+		polling-2.2.0 \
+		ppv-lite86-0.2.16 \
+		proc-macro-crate-1.1.3 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.39 \
+		quote-1.0.18 \
+		rand-0.8.5 \
+		rand_chacha-0.3.1 \
+		rand_core-0.6.3 \
+		rayon-1.5.3 \
+		rayon-core-1.9.3 \
+		redox_syscall-0.2.13 \
+		redox_users-0.4.3 \
+		regex-1.5.6 \
+		regex-syntax-0.6.26 \
+		remove_dir_all-0.5.3 \
+		ryu-1.0.10 \
+		scoped-tls-1.0.0 \
+		scoped_threadpool-0.1.9 \
+		scopeguard-1.1.0 \
+		serde-1.0.137 \
+		serde_derive-1.0.137 \
+		serde_json-1.0.81 \
+		serde_repr-0.1.8 \
+		sha1-0.6.1 \
+		sha1_smol-1.0.0 \
+		shellwords-1.1.0 \
+		slab-0.4.6 \
+		smallvec-1.8.0 \
+		smithay-client-toolkit-0.15.4 \
+		smithay-clipboard-0.6.5 \
+		socket2-0.4.4 \
+		spin-0.9.3 \
+		static_assertions-1.1.0 \
+		strsim-0.10.0 \
+		strum-0.22.0 \
+		strum_macros-0.22.0 \
+		syn-1.0.96 \
+		tempfile-3.3.0 \
+		termcolor-1.1.3 \
+		textwrap-0.15.0 \
+		thiserror-1.0.31 \
+		thiserror-impl-1.0.31 \
+		thread_local-1.1.4 \
+		threadpool-1.8.1 \
+		tiff-0.7.2 \
+		time-0.3.9 \
+		tokio-1.19.2 \
+		tokio-macros-1.8.0 \
+		toml-0.5.9 \
+		tracing-0.1.35 \
+		tracing-attributes-0.1.21 \
+		tracing-core-0.1.27 \
+		ttf-parser-0.15.1 \
+		uds_windows-1.0.2 \
+		unicode-ident-1.0.0 \
+		unicode-segmentation-1.9.0 \
+		version_check-0.9.4 \
+		waker-fn-1.1.0 \
+		wasi-0.10.2+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.80 \
+		wasm-bindgen-backend-0.2.80 \
+		wasm-bindgen-macro-0.2.80 \
+		wasm-bindgen-macro-support-0.2.80 \
+		wasm-bindgen-shared-0.2.80 \
+		wayland-client-0.29.4 \
+		wayland-commons-0.29.4 \
+		wayland-cursor-0.29.4 \
+		wayland-protocols-0.29.4 \
+		wayland-scanner-0.29.4 \
+		wayland-sys-0.29.4 \
+		weezl-0.1.6 \
+		wepoll-ffi-0.1.2 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		windows-0.24.0 \
+		windows_i686_gnu-0.24.0 \
+		windows_i686_msvc-0.24.0 \
+		windows_x86_64_gnu-0.24.0 \
+		windows_x86_64_msvc-0.24.0 \
+		winrt-notification-0.5.1 \
+		x11-keysymdef-0.2.0 \
+		xcursor-0.3.4 \
+		xdg-2.4.1 \
+		xml-rs-0.8.4 \
+		yeslogic-fontconfig-sys-3.0.1 \
+		zbus-2.3.0 \
+		zbus_macros-2.3.0 \
+		zbus_names-2.1.0 \
+		zvariant-3.3.0 \
+		zvariant_derive-3.3.0
diff --git a/x11/salut/Makefile b/x11/salut/Makefile
index aaa8981008f6..e9a06f72bf15 100644
--- a/x11/salut/Makefile
+++ b/x11/salut/Makefile
@@ -18,237 +18,4 @@ GL_ACCOUNT=	snakedye
 GL_COMMIT=	bb53391bac0c379dffdddb3cb35b423a8738a962
 PLIST_FILES=	bin/${PORTNAME}
 
-CARGO_CRATES=	adler-1.0.2 \
-		ahash-0.7.6 \
-		aho-corasick-0.7.19 \
-		android_system_properties-0.1.5 \
-		arrayref-0.3.6 \
-		arrayvec-0.7.2 \
-		async-broadcast-0.4.1 \
-		async-channel-1.7.1 \
-		async-executor-1.4.1 \
-		async-io-1.10.0 \
-		async-lock-2.6.0 \
-		async-recursion-0.3.2 \
-		async-task-4.3.0 \
-		async-trait-0.1.58 \
-		autocfg-1.1.0 \
-		base64-0.13.1 \
-		bit_field-0.10.1 \
-		bitflags-1.3.2 \
-		bumpalo-3.11.1 \
-		bytemuck-1.12.2 \
-		byteorder-1.4.3 \
-		cache-padded-1.2.0 \
-		calloop-0.10.1 \
-		cc-1.0.74 \
-		cfg-if-1.0.0 \
-		chrono-0.4.22 \
-		codespan-reporting-0.11.1 \
-		color_quant-1.1.0 \
-		concurrent-queue-1.2.4 \
-		configparser-1.0.0 \
-		const-cstr-0.3.0 \
-		core-foundation-sys-0.8.3 \
-		crc32fast-1.3.2 \
-		crossbeam-channel-0.5.6 \
-		crossbeam-deque-0.8.2 \
-		crossbeam-epoch-0.9.11 \
-		crossbeam-utils-0.8.12 \
-		crunchy-0.2.2 \
-		cxx-1.0.80 \
-		cxx-build-1.0.80 \
-		cxxbridge-flags-1.0.80 \
-		cxxbridge-macro-1.0.80 \
-		data-url-0.2.0 \
-		derivative-2.2.0 \
-		dirs-4.0.0 \
-		dirs-sys-0.3.7 \
-		dlib-0.5.0 \
-		downcast-rs-1.2.0 \
-		either-1.8.0 \
-		enumflags2-0.7.5 \
-		enumflags2_derive-0.7.4 \
-		event-listener-2.5.3 \
-		exr-1.5.2 \
-		fastrand-1.8.0 \
-		flate2-1.0.24 \
-		float-cmp-0.9.0 \
-		flume-0.10.14 \
-		fontconfig-0.5.0 \
-		fontconfig-parser-0.5.1 \
-		fontdb-0.9.3 \
-		fontdue-0.7.2 \
-		futures-channel-0.3.25 \
-		futures-core-0.3.25 \
-		futures-io-0.3.25 \
-		futures-lite-1.12.0 \
-		futures-sink-0.3.25 \
-		futures-task-0.3.25 \
-		futures-util-0.3.25 \
-		getrandom-0.2.8 \
-		gif-0.11.4 \
-		half-2.1.0 \
-		hashbrown-0.11.2 \
-		hermit-abi-0.1.19 \
-		hex-0.4.3 \
-		iana-time-zone-0.1.53 \
-		iana-time-zone-haiku-0.1.1 \
-		image-0.24.4 \
-		ini-1.3.0 \
-		instant-0.1.12 \
-		io-lifetimes-1.0.0-rc1 \
-		jpeg-decoder-0.2.6 \
-		js-sys-0.3.60 \
-		kurbo-0.8.3 \
-		lazy_static-1.4.0 \
-		lebe-0.5.2 \
-		libc-0.2.137 \
-		libloading-0.7.3 \
-		link-cplusplus-1.0.7 \
-		lock_api-0.4.9 \
-		log-0.4.17 \
-		memchr-2.5.0 \
-		memmap2-0.5.7 \
-		memoffset-0.6.5 \
-		minimal-lexical-0.2.1 \
-		miniz_oxide-0.5.4 \
-		miniz_oxide-0.6.2 \
-		nanorand-0.7.0 \
-		nix-0.24.2 \
-		nix-0.25.0 \
-		nom-7.1.1 \
-		num-integer-0.1.45 \
-		num-rational-0.4.1 \
-		num-traits-0.2.15 \
-		num_cpus-1.13.1 \
-		once_cell-1.16.0 \
-		ordered-stream-0.0.1 \
-		parking-2.0.0 \
-		parking_lot-0.12.1 \
-		parking_lot_core-0.9.4 \
-		pico-args-0.5.0 \
-		pin-project-1.0.12 \
-		pin-project-internal-1.0.12 \
-		pin-project-lite-0.2.9 \
-		pin-utils-0.1.0 \
-		pkg-config-0.3.26 \
-		png-0.17.7 \
-		polling-2.4.0 \
-		ppv-lite86-0.2.16 \
-		proc-macro-crate-1.2.1 \
-		proc-macro2-1.0.47 \
-		quick-xml-0.23.1 \
-		quote-1.0.21 \
-		rand-0.8.5 \
-		rand_chacha-0.3.1 \
-		rand_core-0.6.4 \
-		rayon-1.5.3 \
-		rayon-core-1.9.3 \
-		rctree-0.5.0 \
-		redox_syscall-0.2.16 \
-		redox_users-0.4.3 \
-		regex-1.6.0 \
-		regex-syntax-0.6.27 \
-		remove_dir_all-0.5.3 \
-		resvg-0.25.0 \
-		rgb-0.8.34 \
-		roxmltree-0.15.1 \
-		rustybuzz-0.6.0 \
-		scoped-tls-1.0.0 \
-		scoped_threadpool-0.1.9 \
-		scopeguard-1.1.0 \
-		scratch-1.0.2 \
-		serde-1.0.147 \
-		serde_derive-1.0.147 \
-		serde_repr-0.1.9 \
-		sha1-0.6.1 \
-		sha1_smol-1.0.0 \
-		simplecss-0.2.1 \
-		siphasher-0.3.10 \
-		slab-0.4.7 \
-		slotmap-1.0.6 \
-		smallvec-1.10.0 \
-		socket2-0.4.7 \
-		spin-0.9.4 \
-		static_assertions-1.1.0 \
-		strict-num-0.1.0 \
-		svgtypes-0.8.2 \
-		syn-1.0.103 \
-		tempfile-3.3.0 \
-		termcolor-1.1.3 \
-		thiserror-1.0.37 \
-		thiserror-impl-1.0.37 \
-		threadpool-1.8.1 \
-		tiff-0.7.4 \
-		time-0.1.44 \
-		tiny-skia-0.8.2 \
-		tiny-skia-path-0.8.2 \
-		toml-0.5.9 \
-		tracing-0.1.37 \
-		tracing-attributes-0.1.23 \
-		tracing-core-0.1.30 \
-		ttf-parser-0.15.2 \
-		ttf-parser-0.17.1 \
-		uds_windows-1.0.2 \
-		unicode-bidi-0.3.8 \
-		unicode-bidi-mirroring-0.1.0 \
-		unicode-ccc-0.1.2 \
-		unicode-general-category-0.6.0 \
-		unicode-ident-1.0.5 \
-		unicode-script-0.5.5 \
-		unicode-vo-0.1.0 \
-		unicode-width-0.1.10 \
-		usvg-0.25.0 \
-		vec_map-0.8.2 \
-		version_check-0.9.4 \
-		waker-fn-1.1.0 \
-		wasi-0.10.0+wasi-snapshot-preview1 \
-		wasi-0.11.0+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.83 \
-		wasm-bindgen-backend-0.2.83 \
-		wasm-bindgen-macro-0.2.83 \
-		wasm-bindgen-macro-support-0.2.83 \
-		wasm-bindgen-shared-0.2.83 \
-		wayland-backend-0.1.0-beta.12 \
-		wayland-client-0.30.0-beta.12 \
-		wayland-cursor-0.30.0-beta.12 \
-		wayland-protocols-0.30.0-beta.12 \
-		wayland-protocols-wlr-0.1.0-beta.12 \
-		wayland-scanner-0.30.0-beta.12 \
-		wayland-sys-0.30.0-beta.12 \
-		weezl-0.1.7 \
-		wepoll-ffi-0.1.2 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		windows-sys-0.36.1 \
-		windows-sys-0.42.0 \
-		windows_aarch64_gnullvm-0.42.0 \
-		windows_aarch64_msvc-0.36.1 \
-		windows_aarch64_msvc-0.42.0 \
-		windows_i686_gnu-0.36.1 \
-		windows_i686_gnu-0.42.0 \
-		windows_i686_msvc-0.36.1 \
-		windows_i686_msvc-0.42.0 \
-		windows_x86_64_gnu-0.36.1 \
-		windows_x86_64_gnu-0.42.0 \
-		windows_x86_64_gnullvm-0.42.0 \
-		windows_x86_64_msvc-0.36.1 \
-		windows_x86_64_msvc-0.42.0 \
-		xcursor-0.3.4 \
-		xkbcommon-0.5.0 \
-		xmlparser-0.13.5 \
-		xmlwriter-0.1.0 \
-		yeslogic-fontconfig-sys-3.2.0 \
-		zbus-3.3.0 \
-		zbus_macros-3.3.0 \
-		zbus_names-2.2.0 \
-		zvariant-3.7.1 \
-		zvariant_derive-3.7.1 \
-		smithay-client-toolkit@git+https://github.com/Smithay/client-toolkit.git\#4d8a0dd09bb8b5a36e83234ba132b9503c53499e \
-		snui-adwaita@git+https://gitlab.com/snakedye/snui-adwaita.git\#957429b19920ab443aaeca721d381c4cd2115252 \
-		snui,snui-derive,snui-wayland@git+https://gitlab.com/snakedye/snui.git\#8bad73755f4a1eb8ab4a2cbe077dc70270293cad
-
 .include <bsd.port.mk>
diff --git a/x11/salut/Makefile.crates b/x11/salut/Makefile.crates
new file mode 100644
index 000000000000..904734b6981a
--- /dev/null
+++ b/x11/salut/Makefile.crates
@@ -0,0 +1,232 @@
+CARGO_CRATES=	adler-1.0.2 \
+		ahash-0.7.6 \
+		aho-corasick-0.7.19 \
+		android_system_properties-0.1.5 \
+		arrayref-0.3.6 \
+		arrayvec-0.7.2 \
+		async-broadcast-0.4.1 \
+		async-channel-1.7.1 \
+		async-executor-1.4.1 \
+		async-io-1.10.0 \
+		async-lock-2.6.0 \
+		async-recursion-0.3.2 \
+		async-task-4.3.0 \
+		async-trait-0.1.58 \
+		autocfg-1.1.0 \
+		base64-0.13.1 \
+		bit_field-0.10.1 \
+		bitflags-1.3.2 \
+		bumpalo-3.11.1 \
+		bytemuck-1.12.2 \
+		byteorder-1.4.3 \
+		cache-padded-1.2.0 \
+		calloop-0.10.1 \
+		cc-1.0.74 \
+		cfg-if-1.0.0 \
+		chrono-0.4.22 \
+		codespan-reporting-0.11.1 \
+		color_quant-1.1.0 \
+		concurrent-queue-1.2.4 \
+		configparser-1.0.0 \
+		const-cstr-0.3.0 \
+		core-foundation-sys-0.8.3 \
+		crc32fast-1.3.2 \
+		crossbeam-channel-0.5.6 \
+		crossbeam-deque-0.8.2 \
+		crossbeam-epoch-0.9.11 \
+		crossbeam-utils-0.8.12 \
+		crunchy-0.2.2 \
+		cxx-1.0.80 \
+		cxx-build-1.0.80 \
+		cxxbridge-flags-1.0.80 \
+		cxxbridge-macro-1.0.80 \
+		data-url-0.2.0 \
+		derivative-2.2.0 \
+		dirs-4.0.0 \
+		dirs-sys-0.3.7 \
+		dlib-0.5.0 \
+		downcast-rs-1.2.0 \
+		either-1.8.0 \
+		enumflags2-0.7.5 \
+		enumflags2_derive-0.7.4 \
+		event-listener-2.5.3 \
+		exr-1.5.2 \
+		fastrand-1.8.0 \
+		flate2-1.0.24 \
+		float-cmp-0.9.0 \
+		flume-0.10.14 \
+		fontconfig-0.5.0 \
+		fontconfig-parser-0.5.1 \
+		fontdb-0.9.3 \
+		fontdue-0.7.2 \
+		futures-channel-0.3.25 \
+		futures-core-0.3.25 \
+		futures-io-0.3.25 \
+		futures-lite-1.12.0 \
+		futures-sink-0.3.25 \
+		futures-task-0.3.25 \
+		futures-util-0.3.25 \
+		getrandom-0.2.8 \
+		gif-0.11.4 \
+		half-2.1.0 \
+		hashbrown-0.11.2 \
+		hermit-abi-0.1.19 \
+		hex-0.4.3 \
+		iana-time-zone-0.1.53 \
+		iana-time-zone-haiku-0.1.1 \
+		image-0.24.4 \
+		ini-1.3.0 \
+		instant-0.1.12 \
+		io-lifetimes-1.0.0-rc1 \
+		jpeg-decoder-0.2.6 \
+		js-sys-0.3.60 \
+		kurbo-0.8.3 \
+		lazy_static-1.4.0 \
+		lebe-0.5.2 \
+		libc-0.2.137 \
+		libloading-0.7.3 \
+		link-cplusplus-1.0.7 \
+		lock_api-0.4.9 \
+		log-0.4.17 \
+		memchr-2.5.0 \
+		memmap2-0.5.7 \
+		memoffset-0.6.5 \
+		minimal-lexical-0.2.1 \
+		miniz_oxide-0.5.4 \
+		miniz_oxide-0.6.2 \
+		nanorand-0.7.0 \
+		nix-0.24.2 \
+		nix-0.25.0 \
+		nom-7.1.1 \
+		num-integer-0.1.45 \
+		num-rational-0.4.1 \
+		num-traits-0.2.15 \
+		num_cpus-1.13.1 \
+		once_cell-1.16.0 \
+		ordered-stream-0.0.1 \
+		parking-2.0.0 \
+		parking_lot-0.12.1 \
+		parking_lot_core-0.9.4 \
+		pico-args-0.5.0 \
+		pin-project-1.0.12 \
+		pin-project-internal-1.0.12 \
+		pin-project-lite-0.2.9 \
+		pin-utils-0.1.0 \
+		pkg-config-0.3.26 \
+		png-0.17.7 \
+		polling-2.4.0 \
+		ppv-lite86-0.2.16 \
+		proc-macro-crate-1.2.1 \
+		proc-macro2-1.0.47 \
+		quick-xml-0.23.1 \
+		quote-1.0.21 \
+		rand-0.8.5 \
+		rand_chacha-0.3.1 \
+		rand_core-0.6.4 \
+		rayon-1.5.3 \
+		rayon-core-1.9.3 \
+		rctree-0.5.0 \
+		redox_syscall-0.2.16 \
+		redox_users-0.4.3 \
+		regex-1.6.0 \
+		regex-syntax-0.6.27 \
+		remove_dir_all-0.5.3 \
+		resvg-0.25.0 \
+		rgb-0.8.34 \
+		roxmltree-0.15.1 \
+		rustybuzz-0.6.0 \
+		scoped-tls-1.0.0 \
+		scoped_threadpool-0.1.9 \
+		scopeguard-1.1.0 \
+		scratch-1.0.2 \
+		serde-1.0.147 \
+		serde_derive-1.0.147 \
+		serde_repr-0.1.9 \
+		sha1-0.6.1 \
+		sha1_smol-1.0.0 \
+		simplecss-0.2.1 \
+		siphasher-0.3.10 \
+		slab-0.4.7 \
+		slotmap-1.0.6 \
+		smallvec-1.10.0 \
+		socket2-0.4.7 \
+		spin-0.9.4 \
+		static_assertions-1.1.0 \
+		strict-num-0.1.0 \
+		svgtypes-0.8.2 \
+		syn-1.0.103 \
+		tempfile-3.3.0 \
+		termcolor-1.1.3 \
+		thiserror-1.0.37 \
+		thiserror-impl-1.0.37 \
+		threadpool-1.8.1 \
+		tiff-0.7.4 \
+		time-0.1.44 \
+		tiny-skia-0.8.2 \
+		tiny-skia-path-0.8.2 \
+		toml-0.5.9 \
+		tracing-0.1.37 \
+		tracing-attributes-0.1.23 \
+		tracing-core-0.1.30 \
+		ttf-parser-0.15.2 \
+		ttf-parser-0.17.1 \
+		uds_windows-1.0.2 \
+		unicode-bidi-0.3.8 \
+		unicode-bidi-mirroring-0.1.0 \
+		unicode-ccc-0.1.2 \
+		unicode-general-category-0.6.0 \
+		unicode-ident-1.0.5 \
+		unicode-script-0.5.5 \
+		unicode-vo-0.1.0 \
+		unicode-width-0.1.10 \
+		usvg-0.25.0 \
+		vec_map-0.8.2 \
+		version_check-0.9.4 \
+		waker-fn-1.1.0 \
+		wasi-0.10.0+wasi-snapshot-preview1 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.83 \
+		wasm-bindgen-backend-0.2.83 \
+		wasm-bindgen-macro-0.2.83 \
+		wasm-bindgen-macro-support-0.2.83 \
+		wasm-bindgen-shared-0.2.83 \
+		wayland-backend-0.1.0-beta.12 \
+		wayland-client-0.30.0-beta.12 \
+		wayland-cursor-0.30.0-beta.12 \
+		wayland-protocols-0.30.0-beta.12 \
+		wayland-protocols-wlr-0.1.0-beta.12 \
+		wayland-scanner-0.30.0-beta.12 \
+		wayland-sys-0.30.0-beta.12 \
+		weezl-0.1.7 \
+		wepoll-ffi-0.1.2 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		windows-sys-0.36.1 \
+		windows-sys-0.42.0 \
+		windows_aarch64_gnullvm-0.42.0 \
+		windows_aarch64_msvc-0.36.1 \
+		windows_aarch64_msvc-0.42.0 \
+		windows_i686_gnu-0.36.1 \
+		windows_i686_gnu-0.42.0 \
+		windows_i686_msvc-0.36.1 \
+		windows_i686_msvc-0.42.0 \
+		windows_x86_64_gnu-0.36.1 \
+		windows_x86_64_gnu-0.42.0 \
+		windows_x86_64_gnullvm-0.42.0 \
+		windows_x86_64_msvc-0.36.1 \
+		windows_x86_64_msvc-0.42.0 \
+		xcursor-0.3.4 \
+		xkbcommon-0.5.0 \
+		xmlparser-0.13.5 \
+		xmlwriter-0.1.0 \
+		yeslogic-fontconfig-sys-3.2.0 \
+		zbus-3.3.0 \
+		zbus_macros-3.3.0 \
+		zbus_names-2.2.0 \
+		zvariant-3.7.1 \
+		zvariant_derive-3.7.1 \
+		smithay-client-toolkit@git+https://github.com/Smithay/client-toolkit.git\#4d8a0dd09bb8b5a36e83234ba132b9503c53499e \
+		snui-adwaita@git+https://gitlab.com/snakedye/snui-adwaita.git\#957429b19920ab443aaeca721d381c4cd2115252 \
+		snui,snui-derive,snui-wayland@git+https://gitlab.com/snakedye/snui.git\#8bad73755f4a1eb8ab4a2cbe077dc70270293cad
diff --git a/x11/sirula/Makefile b/x11/sirula/Makefile
index 184a0c05d9cb..32621f030215 100644
--- a/x11/sirula/Makefile
+++ b/x11/sirula/Makefile
@@ -19,115 +19,6 @@ USE_GNOME=	cairo gdkpixbuf2 gtk30
 GH_ACCOUNT=	DorianRudolph
 PLIST_FILES=	bin/${PORTNAME}
 
-CARGO_CRATES=	aho-corasick-0.7.18 \
-		anyhow-1.0.44 \
-		arrayref-0.3.6 \
-		arrayvec-0.5.2 \
-		atk-0.14.0 \
-		atk-sys-0.14.0 \
-		autocfg-1.0.1 \
-		base64-0.13.0 \
-		bitflags-1.3.2 \
-		bitvec-0.19.5 \
-		blake2b_simd-0.5.11 \
-		cairo-rs-0.14.7 \
-		cairo-sys-rs-0.14.0 \
-		cfg-expr-0.8.1 \
-		cfg-if-1.0.0 \
-		constant_time_eq-0.1.5 \
-		crossbeam-utils-0.8.5 \
-		dirs-1.0.5 \
-		either-1.6.1 \
-		field-offset-0.3.4 \
-		freedesktop_entry_parser-1.2.0 \
-		funty-1.1.0 \
-		futures-0.3.17 \
-		futures-channel-0.3.17 \
-		futures-core-0.3.17 \
-		futures-executor-0.3.17 \
-		futures-io-0.3.17 \
-		futures-macro-0.3.17 \
-		futures-sink-0.3.17 \
-		futures-task-0.3.17 \
-		futures-util-0.3.17 \
-		fuzzy-matcher-0.3.7 \
-		gdk-0.14.3 \
-		gdk-pixbuf-0.14.0 \
-		gdk-pixbuf-sys-0.14.0 \
-		gdk-sys-0.14.0 \
-		getrandom-0.1.16 \
-		gio-0.14.8 \
-		gio-sys-0.14.0 \
-		glib-0.14.8 \
-		glib-macros-0.14.1 \
-		glib-sys-0.14.0 \
-		gobject-sys-0.14.0 \
-		gtk-0.14.3 \
-		gtk-layer-shell-0.2.2 \
-		gtk-layer-shell-sys-0.2.3 \
-		gtk-sys-0.14.0 \
-		gtk3-macros-0.14.0 \
-		heck-0.3.3 \
-		itertools-0.8.2 \
-		itertools-0.10.1 \
-		lazy_static-1.4.0 \
-		lexical-core-0.7.6 \
-		libc-0.2.103 \
-		locale-types-0.4.0 \
-		memchr-2.4.1 \
-		memoffset-0.6.4 \
-		nom-6.1.2 \
-		once_cell-1.8.0 \
-		osstrtools-0.2.2 \
-		pango-0.14.8 \
-		pango-sys-0.14.0 \
-		pest-2.1.3 \
-		pin-project-lite-0.2.7 \
-		pin-utils-0.1.0 \
-		pkg-config-0.3.20 \
-		proc-macro-crate-1.1.0 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro-hack-0.5.19 \
-		proc-macro-nested-0.1.7 \
-		proc-macro2-1.0.29 \
-		quote-1.0.10 \
-		radium-0.5.3 \
-		redox_syscall-0.1.57 \
-		redox_users-0.3.5 \
-		regex-1.5.4 \
-		regex-syntax-0.6.25 \
-		rust-argon2-0.8.3 \
-		rustc_version-0.3.3 \
-		ryu-1.0.5 \
-		semver-0.11.0 \
-		semver-parser-0.10.2 \
-		serde-1.0.130 \
-		serde_derive-1.0.130 \
-		slab-0.4.4 \
-		smallvec-1.7.0 \
-		static_assertions-1.1.0 \
-		strum-0.21.0 \
-		strum_macros-0.21.1 \
-		syn-1.0.80 \
-		system-deps-3.2.0 \
-		tap-1.0.1 \
-		thiserror-1.0.30 \
-		thiserror-impl-1.0.30 \
-		thread_local-1.1.3 \
-		toml-0.5.8 \
-		ucd-trie-0.1.3 \
-		unicode-segmentation-1.8.0 \
-		unicode-xid-0.2.2 \
-		version-compare-0.0.11 \
-		version_check-0.9.3 \
-		wasi-0.9.0+wasi-snapshot-preview1 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		wyz-0.2.0 \
-		xdg-2.3.0
-
 post-patch:
 # Respect PREFIX for system config
 	@${REINPLACE_CMD} -e 's,/usr/share,${DATADIR:H},' \
diff --git a/x11/sirula/Makefile.crates b/x11/sirula/Makefile.crates
new file mode 100644
index 000000000000..6d8222fd5f17
--- /dev/null
+++ b/x11/sirula/Makefile.crates
@@ -0,0 +1,108 @@
+CARGO_CRATES=	aho-corasick-0.7.18 \
+		anyhow-1.0.44 \
+		arrayref-0.3.6 \
+		arrayvec-0.5.2 \
+		atk-0.14.0 \
+		atk-sys-0.14.0 \
+		autocfg-1.0.1 \
+		base64-0.13.0 \
+		bitflags-1.3.2 \
+		bitvec-0.19.5 \
+		blake2b_simd-0.5.11 \
+		cairo-rs-0.14.7 \
+		cairo-sys-rs-0.14.0 \
+		cfg-expr-0.8.1 \
+		cfg-if-1.0.0 \
+		constant_time_eq-0.1.5 \
+		crossbeam-utils-0.8.5 \
+		dirs-1.0.5 \
+		either-1.6.1 \
+		field-offset-0.3.4 \
+		freedesktop_entry_parser-1.2.0 \
+		funty-1.1.0 \
+		futures-0.3.17 \
+		futures-channel-0.3.17 \
+		futures-core-0.3.17 \
+		futures-executor-0.3.17 \
+		futures-io-0.3.17 \
+		futures-macro-0.3.17 \
+		futures-sink-0.3.17 \
+		futures-task-0.3.17 \
+		futures-util-0.3.17 \
+		fuzzy-matcher-0.3.7 \
+		gdk-0.14.3 \
+		gdk-pixbuf-0.14.0 \
+		gdk-pixbuf-sys-0.14.0 \
+		gdk-sys-0.14.0 \
+		getrandom-0.1.16 \
+		gio-0.14.8 \
+		gio-sys-0.14.0 \
+		glib-0.14.8 \
+		glib-macros-0.14.1 \
+		glib-sys-0.14.0 \
+		gobject-sys-0.14.0 \
+		gtk-0.14.3 \
+		gtk-layer-shell-0.2.2 \
+		gtk-layer-shell-sys-0.2.3 \
+		gtk-sys-0.14.0 \
+		gtk3-macros-0.14.0 \
+		heck-0.3.3 \
+		itertools-0.8.2 \
+		itertools-0.10.1 \
+		lazy_static-1.4.0 \
+		lexical-core-0.7.6 \
+		libc-0.2.103 \
+		locale-types-0.4.0 \
+		memchr-2.4.1 \
+		memoffset-0.6.4 \
+		nom-6.1.2 \
+		once_cell-1.8.0 \
+		osstrtools-0.2.2 \
+		pango-0.14.8 \
+		pango-sys-0.14.0 \
+		pest-2.1.3 \
+		pin-project-lite-0.2.7 \
+		pin-utils-0.1.0 \
+		pkg-config-0.3.20 \
+		proc-macro-crate-1.1.0 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro-hack-0.5.19 \
+		proc-macro-nested-0.1.7 \
+		proc-macro2-1.0.29 \
+		quote-1.0.10 \
+		radium-0.5.3 \
+		redox_syscall-0.1.57 \
+		redox_users-0.3.5 \
+		regex-1.5.4 \
+		regex-syntax-0.6.25 \
+		rust-argon2-0.8.3 \
+		rustc_version-0.3.3 \
+		ryu-1.0.5 \
+		semver-0.11.0 \
+		semver-parser-0.10.2 \
+		serde-1.0.130 \
+		serde_derive-1.0.130 \
+		slab-0.4.4 \
+		smallvec-1.7.0 \
+		static_assertions-1.1.0 \
+		strum-0.21.0 \
+		strum_macros-0.21.1 \
+		syn-1.0.80 \
+		system-deps-3.2.0 \
+		tap-1.0.1 \
+		thiserror-1.0.30 \
+		thiserror-impl-1.0.30 \
+		thread_local-1.1.3 \
+		toml-0.5.8 \
+		ucd-trie-0.1.3 \
+		unicode-segmentation-1.8.0 \
+		unicode-xid-0.2.2 \
+		version-compare-0.0.11 \
+		version_check-0.9.3 \
+		wasi-0.9.0+wasi-snapshot-preview1 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		wyz-0.2.0 \
+		xdg-2.3.0
diff --git a/x11/squeekboard/Makefile b/x11/squeekboard/Makefile
index 7725e3254e94..1e0df6c227b6 100644
--- a/x11/squeekboard/Makefile
+++ b/x11/squeekboard/Makefile
@@ -29,6 +29,11 @@ GL_ACCOUNT=	World/Phosh
 GL_COMMIT=	2faa98d85f1142383ec8ad1487616c1a7ad1882f
 SHEBANG_FILES=	tools/entry.py
 MAKE_ENV=	${CARGO_ENV}
+CARGO_BUILD=	no
+CARGO_INSTALL=	no
+CARGO_TEST=	no
+TARGET_ORDER_OVERRIDE=	750:cargo-configure
+CARGO_CARGOTOML=	${BUILD_WRKSRC}/Cargo.toml
 MESON_ARGS=	-Dstrict=false
 MESON_ARGS+=	-Donline=false # XXX Cargo.lock
 PLIST_FILES=	bin/${PORTNAME} \
@@ -50,57 +55,6 @@ PLIST_FILES=	bin/${PORTNAME} \
 		share/locale/uk/LC_MESSAGES/${PORTNAME}.mo \
 		${NULL}
 
-CARGO_CRATES=	atk-0.7.0 \
-		atk-sys-0.9.1 \
-		autocfg-1.1.0 \
-		bitflags-1.2.1 \
-		cairo-rs-0.7.1 \
-		cairo-sys-rs-0.9.2 \
-		cc-1.0.73 \
-		clap-2.33.4 \
-		fragile-0.3.0 \
-		gdk-0.11.0 \
-		gdk-pixbuf-0.7.0 \
-		gdk-pixbuf-sys-0.9.1 \
-		gdk-sys-0.9.1 \
-		gio-0.7.0 \
-		gio-sys-0.9.1 \
-		glib-0.8.2 \
-		glib-sys-0.9.1 \
-		gobject-sys-0.9.1 \
-		gtk-0.7.0 \
-		gtk-sys-0.9.2 \
-		hashbrown-0.11.2 \
-		indexmap-1.8.0 \
-		lazy_static-1.4.0 \
-		libc-0.2.119 \
-		linked-hash-map-0.5.4 \
-		maplit-1.0.2 \
-		memmap-0.7.0 \
-		pango-0.7.0 \
-		pango-sys-0.9.1 \
-		pkg-config-0.3.24 \
-		proc-macro2-1.0.36 \
-		quote-1.0.15 \
-		ryu-1.0.9 \
-		serde-1.0.136 \
-		serde_derive-1.0.136 \
-		serde_yaml-0.8.23 \
-		syn-1.0.86 \
-		textwrap-0.11.0 \
-		unicode-width-0.1.9 \
-		unicode-xid-0.2.2 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		xkbcommon-0.4.0 \
-		yaml-rust-0.4.5
-CARGO_BUILD=	no
-CARGO_INSTALL=	no
-CARGO_TEST=	no
-TARGET_ORDER_OVERRIDE=	750:cargo-configure
-CARGO_CARGOTOML=	${BUILD_WRKSRC}/Cargo.toml
-
 post-patch:
 # Make each cargo subcommand very verbose
 	@${REINPLACE_CMD} -e '/^cargo/s/"$$@"/--verbose --verbose &/' \
diff --git a/x11/squeekboard/Makefile.crates b/x11/squeekboard/Makefile.crates
new file mode 100644
index 000000000000..6d3a4cdfcf5e
--- /dev/null
+++ b/x11/squeekboard/Makefile.crates
@@ -0,0 +1,45 @@
+CARGO_CRATES=	atk-0.7.0 \
+		atk-sys-0.9.1 \
+		autocfg-1.1.0 \
+		bitflags-1.2.1 \
+		cairo-rs-0.7.1 \
+		cairo-sys-rs-0.9.2 \
+		cc-1.0.73 \
+		clap-2.33.4 \
+		fragile-0.3.0 \
+		gdk-0.11.0 \
+		gdk-pixbuf-0.7.0 \
+		gdk-pixbuf-sys-0.9.1 \
+		gdk-sys-0.9.1 \
+		gio-0.7.0 \
+		gio-sys-0.9.1 \
+		glib-0.8.2 \
+		glib-sys-0.9.1 \
+		gobject-sys-0.9.1 \
+		gtk-0.7.0 \
+		gtk-sys-0.9.2 \
+		hashbrown-0.11.2 \
+		indexmap-1.8.0 \
+		lazy_static-1.4.0 \
+		libc-0.2.119 \
+		linked-hash-map-0.5.4 \
+		maplit-1.0.2 \
+		memmap-0.7.0 \
+		pango-0.7.0 \
+		pango-sys-0.9.1 \
+		pkg-config-0.3.24 \
+		proc-macro2-1.0.36 \
+		quote-1.0.15 \
+		ryu-1.0.9 \
+		serde-1.0.136 \
+		serde_derive-1.0.136 \
+		serde_yaml-0.8.23 \
+		syn-1.0.86 \
+		textwrap-0.11.0 \
+		unicode-width-0.1.9 \
+		unicode-xid-0.2.2 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		xkbcommon-0.4.0 \
+		yaml-rust-0.4.5
diff --git a/x11/swayr/Makefile b/x11/swayr/Makefile
index 5f0716c43a18..eac771aa8e59 100644
--- a/x11/swayr/Makefile
+++ b/x11/swayr/Makefile
@@ -17,67 +17,6 @@ USES=		cargo
 PLIST_FILES=	bin/${PORTNAME} \
 		bin/${PORTNAME}d
 
-CARGO_CRATES=	aho-corasick-0.7.19 \
-		atty-0.2.14 \
-		autocfg-1.1.0 \
-		bitflags-1.3.2 \
-		cfg-if-1.0.0 \
-		clap-3.2.22 \
-		clap_derive-3.2.18 \
-		clap_lex-0.2.4 \
-		directories-4.0.1 \
-		dirs-sys-0.3.7 \
-		env_logger-0.9.1 \
-		getrandom-0.2.7 \
-		hashbrown-0.12.3 \
-		heck-0.4.0 \
-		hermit-abi-0.1.19 \
-		humantime-2.1.0 \
-		indexmap-1.9.1 \
-		itoa-1.0.3 \
-		lazy_static-1.4.0 \
-		libc-0.2.133 \
-		log-0.4.17 \
-		memchr-2.5.0 \
-		once_cell-1.15.0 \
-		os_str_bytes-6.3.0 \
-		peg-0.8.1 \
-		peg-macros-0.8.1 \
-		peg-runtime-0.8.1 \
-		ppv-lite86-0.2.16 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.44 \
-		quote-1.0.21 \
-		rand-0.8.5 \
-		rand_chacha-0.3.1 \
-		rand_core-0.6.4 \
-		redox_syscall-0.2.16 \
-		redox_users-0.4.3 \
-		regex-1.6.0 \
-		regex-syntax-0.6.27 \
-		rt-format-0.3.1 \
-		ryu-1.0.11 \
-		serde-1.0.145 \
-		serde_derive-1.0.145 \
-		serde_json-1.0.85 \
-		strsim-0.10.0 \
-		swayipc-3.0.1 \
-		swayipc-types-1.1.2 \
-		syn-1.0.101 \
-		termcolor-1.1.3 \
-		textwrap-0.15.1 \
-		thiserror-1.0.36 \
-		thiserror-impl-1.0.36 \
-		toml-0.5.9 \
-		unicode-ident-1.0.4 \
-		version_check-0.9.4 \
-		wasi-0.11.0+wasi-snapshot-preview1 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-x86_64-pc-windows-gnu-0.4.0
-
 post-patch:
 # Respect PREFIX for config and icons
 	@${REINPLACE_CMD} -e 's,/usr/share,${DATADIR:H},' \
diff --git a/x11/swayr/Makefile.crates b/x11/swayr/Makefile.crates
new file mode 100644
index 000000000000..5a285da54b18
--- /dev/null
+++ b/x11/swayr/Makefile.crates
@@ -0,0 +1,60 @@
+CARGO_CRATES=	aho-corasick-0.7.19 \
+		atty-0.2.14 \
+		autocfg-1.1.0 \
+		bitflags-1.3.2 \
+		cfg-if-1.0.0 \
+		clap-3.2.22 \
+		clap_derive-3.2.18 \
+		clap_lex-0.2.4 \
+		directories-4.0.1 \
+		dirs-sys-0.3.7 \
+		env_logger-0.9.1 \
+		getrandom-0.2.7 \
+		hashbrown-0.12.3 \
+		heck-0.4.0 \
+		hermit-abi-0.1.19 \
+		humantime-2.1.0 \
+		indexmap-1.9.1 \
+		itoa-1.0.3 \
+		lazy_static-1.4.0 \
+		libc-0.2.133 \
+		log-0.4.17 \
+		memchr-2.5.0 \
+		once_cell-1.15.0 \
+		os_str_bytes-6.3.0 \
+		peg-0.8.1 \
+		peg-macros-0.8.1 \
+		peg-runtime-0.8.1 \
+		ppv-lite86-0.2.16 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.44 \
+		quote-1.0.21 \
+		rand-0.8.5 \
+		rand_chacha-0.3.1 \
+		rand_core-0.6.4 \
+		redox_syscall-0.2.16 \
+		redox_users-0.4.3 \
+		regex-1.6.0 \
+		regex-syntax-0.6.27 \
+		rt-format-0.3.1 \
+		ryu-1.0.11 \
+		serde-1.0.145 \
+		serde_derive-1.0.145 \
+		serde_json-1.0.85 \
+		strsim-0.10.0 \
+		swayipc-3.0.1 \
+		swayipc-types-1.1.2 \
+		syn-1.0.101 \
+		termcolor-1.1.3 \
+		textwrap-0.15.1 \
+		thiserror-1.0.36 \
+		thiserror-impl-1.0.36 \
+		toml-0.5.9 \
+		unicode-ident-1.0.4 \
+		version_check-0.9.4 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0
diff --git a/x11/swayrbar/Makefile b/x11/swayrbar/Makefile
index e022edc6be00..55ccf00cc4dd 100644
--- a/x11/swayrbar/Makefile
+++ b/x11/swayrbar/Makefile
@@ -16,97 +16,6 @@ LICENSE_FILE=	${_LICENSE_STORE}/GPLv3
 USES=		cargo
 PLIST_FILES=	bin/${PORTNAME}
 
-CARGO_CRATES=	aho-corasick-0.7.19 \
-		android_system_properties-0.1.5 \
-		atty-0.2.14 \
-		autocfg-1.1.0 \
-		battery-0.7.8 \
-		bitflags-1.3.2 \
-		bumpalo-3.11.0 \
-		cc-1.0.73 \
-		cfg-if-1.0.0 \
-		chrono-0.4.22 \
-		clap-3.2.22 \
-		clap_derive-3.2.18 \
-		clap_lex-0.2.4 \
-		core-foundation-0.7.0 \
-		core-foundation-sys-0.7.0 \
-		core-foundation-sys-0.8.3 \
-		crossbeam-channel-0.5.6 \
-		crossbeam-deque-0.8.2 \
-		crossbeam-epoch-0.9.10 \
-		crossbeam-utils-0.8.11 \
-		directories-4.0.1 \
-		dirs-sys-0.3.7 \
-		either-1.8.0 \
-		env_logger-0.9.1 \
-		getrandom-0.2.7 \
-		hashbrown-0.12.3 \
-		heck-0.4.0 \
-		hermit-abi-0.1.19 \
-		humantime-2.1.0 \
-		iana-time-zone-0.1.50 \
-		indexmap-1.9.1 \
-		itoa-1.0.3 \
-		js-sys-0.3.60 \
-		lazy_static-1.4.0 \
-		lazycell-1.3.0 \
-		libc-0.2.133 \
-		log-0.4.17 \
-		mach-0.3.2 \
-		memchr-2.5.0 \
-		memoffset-0.6.5 \
-		nix-0.19.1 \
-		ntapi-0.4.0 \
-		num-integer-0.1.45 \
-		num-traits-0.2.15 \
-		num_cpus-1.13.1 \
-		once_cell-1.15.0 \
-		os_str_bytes-6.3.0 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.44 \
-		quote-1.0.21 \
-		rayon-1.5.3 \
-		rayon-core-1.9.3 \
-		redox_syscall-0.2.16 \
-		redox_users-0.4.3 \
-		regex-1.6.0 \
-		regex-syntax-0.6.27 \
-		rt-format-0.3.1 \
-		ryu-1.0.11 \
-		scopeguard-1.1.0 \
-		serde-1.0.145 \
-		serde_derive-1.0.145 \
-		serde_json-1.0.85 \
-		strsim-0.10.0 \
-		swaybar-types-3.0.0 \
-		swayipc-3.0.1 \
-		swayipc-types-1.1.2 \
-		syn-1.0.101 \
-		sysinfo-0.26.4 \
-		termcolor-1.1.3 \
-		textwrap-0.15.1 \
-		thiserror-1.0.36 \
-		thiserror-impl-1.0.36 \
-		time-0.1.44 \
-		toml-0.5.9 \
-		typenum-1.15.0 \
-		unicode-ident-1.0.4 \
-		uom-0.30.0 \
-		version_check-0.9.4 \
-		wasi-0.10.0+wasi-snapshot-preview1 \
-		wasi-0.11.0+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.83 \
-		wasm-bindgen-backend-0.2.83 \
-		wasm-bindgen-macro-0.2.83 \
-		wasm-bindgen-macro-support-0.2.83 \
-		wasm-bindgen-shared-0.2.83 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-x86_64-pc-windows-gnu-0.4.0
-
 post-patch:
 # Respect PREFIX for config
 	@${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \
diff --git a/x11/swayrbar/Makefile.crates b/x11/swayrbar/Makefile.crates
new file mode 100644
index 000000000000..b3e368516c75
--- /dev/null
+++ b/x11/swayrbar/Makefile.crates
@@ -0,0 +1,90 @@
+CARGO_CRATES=	aho-corasick-0.7.19 \
+		android_system_properties-0.1.5 \
+		atty-0.2.14 \
+		autocfg-1.1.0 \
+		battery-0.7.8 \
+		bitflags-1.3.2 \
+		bumpalo-3.11.0 \
+		cc-1.0.73 \
+		cfg-if-1.0.0 \
+		chrono-0.4.22 \
+		clap-3.2.22 \
+		clap_derive-3.2.18 \
+		clap_lex-0.2.4 \
+		core-foundation-0.7.0 \
+		core-foundation-sys-0.7.0 \
+		core-foundation-sys-0.8.3 \
+		crossbeam-channel-0.5.6 \
+		crossbeam-deque-0.8.2 \
+		crossbeam-epoch-0.9.10 \
+		crossbeam-utils-0.8.11 \
+		directories-4.0.1 \
+		dirs-sys-0.3.7 \
+		either-1.8.0 \
+		env_logger-0.9.1 \
+		getrandom-0.2.7 \
+		hashbrown-0.12.3 \
+		heck-0.4.0 \
+		hermit-abi-0.1.19 \
+		humantime-2.1.0 \
+		iana-time-zone-0.1.50 \
+		indexmap-1.9.1 \
+		itoa-1.0.3 \
+		js-sys-0.3.60 \
+		lazy_static-1.4.0 \
+		lazycell-1.3.0 \
+		libc-0.2.133 \
+		log-0.4.17 \
+		mach-0.3.2 \
+		memchr-2.5.0 \
+		memoffset-0.6.5 \
+		nix-0.19.1 \
+		ntapi-0.4.0 \
+		num-integer-0.1.45 \
+		num-traits-0.2.15 \
+		num_cpus-1.13.1 \
+		once_cell-1.15.0 \
+		os_str_bytes-6.3.0 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.44 \
+		quote-1.0.21 \
+		rayon-1.5.3 \
+		rayon-core-1.9.3 \
+		redox_syscall-0.2.16 \
+		redox_users-0.4.3 \
+		regex-1.6.0 \
+		regex-syntax-0.6.27 \
+		rt-format-0.3.1 \
+		ryu-1.0.11 \
+		scopeguard-1.1.0 \
+		serde-1.0.145 \
+		serde_derive-1.0.145 \
+		serde_json-1.0.85 \
+		strsim-0.10.0 \
+		swaybar-types-3.0.0 \
+		swayipc-3.0.1 \
+		swayipc-types-1.1.2 \
+		syn-1.0.101 \
+		sysinfo-0.26.4 \
+		termcolor-1.1.3 \
+		textwrap-0.15.1 \
+		thiserror-1.0.36 \
+		thiserror-impl-1.0.36 \
+		time-0.1.44 \
+		toml-0.5.9 \
+		typenum-1.15.0 \
+		unicode-ident-1.0.4 \
+		uom-0.30.0 \
+		version_check-0.9.4 \
+		wasi-0.10.0+wasi-snapshot-preview1 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.83 \
+		wasm-bindgen-backend-0.2.83 \
+		wasm-bindgen-macro-0.2.83 \
+		wasm-bindgen-macro-support-0.2.83 \
+		wasm-bindgen-shared-0.2.83 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0
diff --git a/x11/wezterm/Makefile b/x11/wezterm/Makefile
index 36cc1f7540cd..249c456c6761 100644
--- a/x11/wezterm/Makefile
+++ b/x11/wezterm/Makefile
@@ -40,540 +40,14 @@ PLIST_FILES=	bin/strip-ansi-escapes \
 		share/nautilus-python/extensions/${PORTNAME}-nautilus.py \
 		${NULL}
 
+# XXX https://github.com/rust-lang/cargo/issues/4101
+CARGO_INSTALL_PATH=	${PLIST_FILES:Mbin/*:T}
+
 .if exists(/usr/bin/tic)
 PKGMESSAGE=	${NONEXISTENT}
 PLIST_FILES+=	share/site-terminfo/${PORTNAME:C,^.,&/&,}
 .endif
 
-CARGO_CRATES=	addr2line-0.17.0 \
-		adler-1.0.2 \
-		adler32-1.2.0 \
-		ahash-0.7.6 \
-		aho-corasick-0.7.19 \
-		android_system_properties-0.1.5 \
-		anyhow-1.0.64 \
-		arrayref-0.3.6 \
-		arrayvec-0.7.2 \
-		assert_fs-1.0.7 \
-		async-broadcast-0.4.1 \
-		async-channel-1.7.1 \
-		async-executor-1.4.1 \
-		async-fs-1.6.0 \
-		async-global-executor-2.3.0 \
-		async-io-1.9.0 \
-		async-lock-2.5.0 \
-		async-net-1.7.0 \
-		async-process-1.5.0 \
-		async-recursion-0.3.2 \
-		async-std-1.12.0 \
-		async-task-4.3.0 \
-		async-trait-0.1.57 \
-		atomic-waker-1.0.0 \
-		atty-0.2.14 \
-		autocfg-1.1.0 \
-		backtrace-0.3.66 \
-		base64-0.13.0 \
-		benchmarking-0.4.11 \
-		bit_field-0.10.1 \
-		bitflags-1.3.2 \
-		block-0.1.6 \
-		block-buffer-0.9.0 \
-		block-buffer-0.10.3 \
-		blocking-1.2.0 \
-		bstr-0.1.4 \
-		bstr-0.2.17 \
-		bumpalo-3.11.0 \
-		bytemuck-1.12.1 \
-		byteorder-1.4.3 \
-		bytes-1.2.1 \
-		cache-advisor-1.0.11 \
-		cache-padded-1.2.0 \
-		camino-1.1.1 \
-		cassowary-0.3.0 \
-		cast-0.3.0 \
-		cc-1.0.73 \
-		cfg-if-0.1.10 \
-		cfg-if-1.0.0 \
-		cgl-0.3.2 \
-		chrono-0.4.22 \
-		clap-2.34.0 \
-		clap-3.2.20 \
-		clap_complete-3.2.4 \
-		clap_complete_fig-3.2.4 \
-		clap_derive-3.2.18 \
-		clap_lex-0.2.4 \
-		clipboard-win-2.2.0 \
-		clipboard_macos-0.1.0 \
-		cocoa-0.20.2 \
-		color_quant-1.1.0 \
-		colored-1.9.3 \
-		colorgrad-0.6.1 \
-		concurrent-queue-1.2.4 \
-		core-foundation-0.7.0 \
-		core-foundation-0.9.3 \
-		core-foundation-sys-0.7.0 \
-		core-foundation-sys-0.8.3 \
-		core-graphics-0.19.2 \
-		core-graphics-0.22.3 \
-		core-graphics-types-0.1.1 \
-		core-text-19.2.0 \
-		cpufeatures-0.2.5 \
-		crc32fast-1.3.2 \
-		criterion-0.3.6 \
-		criterion-plot-0.4.5 \
-		crossbeam-0.8.2 \
-		crossbeam-channel-0.5.6 \
-		crossbeam-deque-0.8.2 \
-		crossbeam-epoch-0.9.10 \
-		crossbeam-queue-0.3.6 \
-		crossbeam-utils-0.8.11 \
-		crypto-common-0.1.6 \
-		csscolorparser-0.6.2 \
-		csv-1.1.6 \
-		csv-core-0.1.10 \
-		ctor-0.1.23 \
-		cty-0.2.2 \
-		darling-0.14.1 \
-		darling_core-0.14.1 \
-		darling_macro-0.14.1 \
-		dashmap-5.4.0 \
-		data-encoding-2.3.2 \
-		deflate-1.0.0 \
-		deltae-0.3.0 \
-		derivative-2.2.0 \
-		diff-0.1.13 \
-		difflib-0.4.0 \
-		digest-0.9.0 \
-		digest-0.10.3 \
-		dirs-2.0.2 \
-		dirs-4.0.0 \
-		dirs-next-2.0.0 \
-		dirs-sys-0.3.7 \
-		dirs-sys-next-0.1.2 \
-		dlib-0.5.0 \
-		doc-comment-0.3.3 \
-		downcast-rs-1.2.0 \
-		dwrote-0.11.0 \
-		either-1.8.0 \
-		embed-resource-1.7.3 \
-		emojis-0.4.0 \
-		encoding_rs-0.8.31 \
-		enum-display-derive-0.1.1 \
-		enumflags2-0.7.5 \
-		enumflags2_derive-0.7.4 \
-		env_logger-0.9.0 \
-		euclid-0.22.7 \
-		event-listener-2.5.3 \
-		exr-1.5.0 \
-		fallible-iterator-0.2.0 \
-		fallible-streaming-iterator-0.1.9 \
-		fastrand-1.8.0 \
-		filenamegen-0.2.4 \
-		filetime-0.2.17 \
-		fixedbitset-0.4.2 \
-		flate2-1.0.24 \
-		float-cmp-0.9.0 \
-		flume-0.10.14 \
-		fnv-1.0.7 \
-		foreign-types-0.3.2 \
-		foreign-types-shared-0.1.1 \
-		form_urlencoded-1.0.1 \
-		fsevent-sys-4.1.0 \
-		futures-0.3.24 \
-		futures-channel-0.3.24 \
-		futures-core-0.3.24 \
-		futures-executor-0.3.24 \
-		futures-io-0.3.24 \
-		futures-lite-1.12.0 \
-		futures-macro-0.3.24 \
-		futures-sink-0.3.24 \
-		futures-task-0.3.24 \
-		futures-timer-3.0.2 \
-		futures-util-0.3.24 \
-		fuzzy-matcher-0.3.7 \
-		generic-array-0.14.6 \
-		getopts-0.2.21 \
-		getrandom-0.1.16 \
-		getrandom-0.2.7 \
-		gif-0.11.4 \
-		gimli-0.26.2 \
-		git2-0.14.4 \
-		gl_generator-0.14.0 \
-		glium-0.31.0 \
-		globset-0.4.9 \
-		globwalk-0.8.1 \
-		gloo-timers-0.2.4 \
-		governor-0.4.2 \
-		guillotiere-0.6.2 \
-		h2-0.3.14 \
-		half-1.8.2 \
-		hashbrown-0.11.2 \
-		hashbrown-0.12.3 \
-		hashlink-0.7.0 \
-		hdrhistogram-7.5.1 \
-		heck-0.4.0 \
-		hermit-abi-0.1.19 \
-		hex-0.4.3 \
-		hostname-0.3.1 \
-		http-0.2.8 \
-		http-body-0.4.5 \
-		http_req-0.8.1 \
-		httparse-1.8.0 \
-		httpdate-1.0.2 \
-		humantime-2.1.0 \
-		hyper-0.14.20 \
-		hyper-tls-0.5.0 \
-		iana-time-zone-0.1.47 \
-		ident_case-1.0.1 \
-		idna-0.2.3 \
-		ignore-0.4.18 \
-		image-0.24.3 \
-		indexmap-1.9.1 \
-		inotify-0.9.6 \
-		inotify-sys-0.1.5 \
-		instant-0.1.12 \
-		ioctl-rs-0.1.6 \
-		ipnet-2.5.0 \
-		itertools-0.10.3 \
-		itoa-0.4.8 \
-		itoa-1.0.3 \
-		jobserver-0.1.24 \
-		jpeg-decoder-0.2.6 \
-		js-sys-0.3.59 \
-		k9-0.11.5 \
-		khronos_api-3.1.0 \
-		kqueue-1.0.6 \
-		kqueue-sys-1.0.3 \
-		kv-log-macro-1.0.7 \
-		lab-0.11.0 \
-		lazy_static-1.4.0 \
-		lazycell-1.3.0 \
-		leb128-0.2.5 \
-		lebe-0.5.2 \
-		libc-0.2.132 \
-		libflate-1.2.0 \
-		libflate_lz77-1.1.0 \
-		libgit2-sys-0.13.4+1.4.2 \
-		libloading-0.6.7 \
-		libloading-0.7.3 \
-		libsqlite3-sys-0.24.2 \
-		libssh2-sys-0.2.23 \
-		libz-sys-1.1.8 \
-		line-wrap-0.1.1 \
-		line_drawing-0.8.1 \
-		linked-hash-map-0.5.6 \
-		lock_api-0.4.8 \
-		log-0.4.17 \
-		lru-0.7.8 \
-		lua-src-544.0.1 \
-		luajit-src-210.4.1+restyaa7a722 \
-		mach-0.3.2 \
-		malloc_buf-0.0.6 \
-		maplit-1.0.2 \
-		match_cfg-0.1.0 \
-		matches-0.1.9 \
-		memchr-2.5.0 \
-		memmap2-0.2.3 \
-		memmap2-0.3.1 \
-		memmap2-0.5.7 \
-		memmem-0.1.1 \
-		memoffset-0.6.5 \
-		metrics-0.17.1 \
-		metrics-macros-0.4.1 \
-		mime-0.3.16 \
-		minimal-lexical-0.2.1 \
-		miniz_oxide-0.4.4 \
-		miniz_oxide-0.5.4 \
-		mio-0.8.4 \
-		mlua-0.8.3 \
-		names-0.12.0 \
-		nanorand-0.7.0 \
-		native-tls-0.2.10 \
-		nix-0.22.3 \
-		nix-0.23.1 \
-		nix-0.24.2 \
-		nix-0.25.0 \
-		no-std-compat-0.4.1 \
-		nom-5.1.2 \
-		nom-7.1.1 \
-		nonzero_ext-0.3.0 \
-		normalize-line-endings-0.3.0 \
-		notify-5.0.0 \
-		ntapi-0.3.7 \
-		num-0.3.1 \
-		num-bigint-0.3.3 \
-		num-complex-0.3.1 \
-		num-derive-0.3.3 \
-		num-integer-0.1.45 \
-		num-iter-0.1.43 \
-		num-rational-0.3.2 \
-		num-rational-0.4.1 \
-		num-traits-0.2.15 \
-		num_cpus-1.13.1 \
-		num_threads-0.1.6 \
-		objc-0.2.7 \
-		objc-foundation-0.1.1 \
-		objc_id-0.1.1 \
-		object-0.29.0 \
-		once_cell-1.14.0 \
-		oorandom-11.1.3 \
-		opaque-debug-0.3.0 \
-		open-3.0.2 \
-		openssl-0.10.38 \
-		openssl-probe-0.1.5 \
-		openssl-src-300.0.9+3.0.5 \
-		openssl-sys-0.9.71 \
-		ordered-float-3.0.0 \
-		ordered-stream-0.0.1 \
-		os_str_bytes-6.3.0 \
-		parking-2.0.0 \
-		parking_lot-0.11.2 \
-		parking_lot-0.12.1 \
-		parking_lot_core-0.8.5 \
-		parking_lot_core-0.9.3 \
-		pathdiff-0.2.1 \
-		pem-1.1.0 \
-		percent-encoding-2.1.0 \
-		pest-2.3.0 \
-		pest_derive-2.3.0 \
-		pest_generator-2.3.0 \
-		pest_meta-2.3.0 \
-		phf-0.8.0 \
-		phf-0.10.1 \
-		phf-0.11.1 \
-		phf_codegen-0.8.0 \
-		phf_generator-0.8.0 \
-		phf_generator-0.11.1 \
-		phf_macros-0.11.1 \
-		phf_shared-0.8.0 \
-		phf_shared-0.10.0 \
-		phf_shared-0.11.1 \
-		pin-project-1.0.12 \
-		pin-project-internal-1.0.12 \
-		pin-project-lite-0.2.9 \
-		pin-utils-0.1.0 \
-		pkg-config-0.3.25 \
-		plist-1.3.1 \
-		plotters-0.3.3 \
-		plotters-backend-0.3.4 \
-		plotters-svg-0.3.3 \
-		png-0.17.5 \
-		polling-2.3.0 \
-		ppv-lite86-0.2.16 \
-		predicates-2.1.1 \
-		predicates-core-1.0.3 \
-		predicates-tree-1.0.5 \
-		proc-macro-crate-1.2.1 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.43 \
-		pulldown-cmark-0.9.2 \
-		pure-rust-locales-0.5.6 \
-		quanta-0.9.3 \
-		quick-xml-0.22.0 \
-		quote-1.0.21 \
-		rand-0.7.3 \
-		rand-0.8.5 \
-		rand_chacha-0.2.2 \
-		rand_chacha-0.3.1 \
-		rand_core-0.5.1 \
-		rand_core-0.6.3 \
-		rand_hc-0.2.0 \
-		rand_pcg-0.2.1 \
-		raw-cpuid-10.5.0 \
-		raw-window-handle-0.3.4 \
-		raw-window-handle-0.4.3 \
-		rayon-1.5.3 \
-		rayon-core-1.9.3 \
-		rcgen-0.9.3 \
-		redox_syscall-0.2.16 \
-		redox_users-0.4.3 \
-		regex-1.6.0 \
-		regex-automata-0.1.10 \
-		regex-syntax-0.6.27 \
-		remove_dir_all-0.5.3 \
-		reqwest-0.11.11 \
-		resize-0.5.5 \
-		rgb-0.8.33 \
-		ring-0.16.20 \
-		rle-decode-fast-1.0.3 \
-		rstest-0.15.0 \
-		rstest_macros-0.14.0 \
-		rusqlite-0.27.0 \
-		rustc-demangle-0.1.21 \
-		rustc-hash-1.1.0 \
-		rustc_version-0.4.0 \
-		ryu-1.0.11 \
-		safemem-0.3.3 \
-		same-file-1.0.6 \
-		schannel-0.1.20 \
-		scoped-tls-1.0.0 \
-		scoped_threadpool-0.1.9 \
-		scopeguard-1.1.0 \
-		security-framework-2.7.0 \
-		security-framework-sys-2.6.1 \
-		semver-0.11.0 \
-		semver-1.0.13 \
-		semver-parser-0.10.2 \
-		serde-1.0.144 \
-		serde_cbor-0.11.2 \
-		serde_derive-1.0.144 \
-		serde_json-1.0.85 \
-		serde_repr-0.1.9 \
-		serde_urlencoded-0.7.1 \
-		serde_with-2.0.0 \
-		serde_with_macros-2.0.0 \
-		serde_yaml-0.9.11 \
-		serial-0.4.0 \
-		serial-core-0.4.0 \
-		serial-unix-0.4.0 \
-		serial-windows-0.4.0 \
-		sha-1-0.10.0 \
-		sha1-0.6.1 \
-		sha1_smol-1.0.0 \
-		sha2-0.9.9 \
-		shared_library-0.1.9 \
-		shell-words-1.1.0 \
-		shlex-1.1.0 \
-		signal-hook-0.1.17 \
-		signal-hook-0.3.14 \
-		signal-hook-registry-1.4.0 \
-		siphasher-0.3.10 \
-		slab-0.4.7 \
-		smallvec-1.9.0 \
-		smawk-0.3.1 \
-		smithay-client-toolkit-0.15.4 \
-		smol-1.2.5 \
-		smol-potat-1.1.2 \
-		smol-potat-macro-0.6.0 \
-		socket2-0.4.7 \
-		spa-0.3.0 \
-		spin-0.5.2 \
-		spin-0.9.4 \
-		sqlite-cache-0.1.3 \
-		ssh2-0.9.3 \
-		starship-battery-0.7.9 \
-		static_assertions-1.1.0 \
-		strict-num-0.1.0 \
-		strsim-0.10.0 \
-		svg_fmt-0.4.1 \
-		syn-1.0.99 \
-		takeable-option-0.5.0 \
-		tar-0.4.38 \
-		tempfile-3.3.0 \
-		term_size-0.3.2 \
-		termcolor-1.1.3 \
-		terminfo-0.7.3 \
-		termios-0.2.2 \
-		termios-0.3.3 \
-		termtree-0.2.4 \
-		textwrap-0.11.0 \
-		textwrap-0.15.0 \
-		thiserror-1.0.34 \
-		thiserror-impl-1.0.34 \
-		thread_local-1.1.4 \
-		threadpool-1.8.1 \
-		tiff-0.7.3 \
-		time-0.1.43 \
-		time-0.3.14 \
-		tiny-skia-0.8.1 \
-		tiny-skia-path-0.8.1 \
-		tinytemplate-1.2.1 \
-		tinyvec-1.6.0 \
-		tinyvec_macros-0.1.0 \
-		tokio-1.21.0 \
-		tokio-macros-1.8.0 \
-		tokio-native-tls-0.3.0 \
-		tokio-util-0.7.3 \
-		toml-0.5.8 \
-		tower-service-0.3.2 \
-		tracing-0.1.36 \
-		tracing-attributes-0.1.22 \
-		tracing-core-0.1.29 \
-		try-lock-0.2.3 \
-		typenum-1.15.0 \
-		ucd-trie-0.1.5 \
-		uds_windows-1.0.2 \
-		unicase-2.6.0 \
-		unicode-bidi-0.3.8 \
-		unicode-ident-1.0.3 \
-		unicode-linebreak-0.1.2 \
-		unicode-normalization-0.1.21 \
-		unicode-segmentation-1.9.0 \
-		unicode-width-0.1.9 \
-		unsafe-libyaml-0.2.2 \
-		untrusted-0.7.1 \
-		uom-0.30.0 \
-		url-2.2.2 \
-		utf8parse-0.2.0 \
-		value-bag-1.0.0-alpha.9 \
-		varbincode-0.1.0 \
-		vcpkg-0.2.15 \
-		version_check-0.9.4 \
-		vswhom-0.1.0 \
-		vswhom-sys-0.1.1 \
-		waker-fn-1.1.0 \
-		walkdir-2.3.2 \
-		want-0.3.0 \
-		wasi-0.9.0+wasi-snapshot-preview1 \
-		wasi-0.10.2+wasi-snapshot-preview1 \
-		wasi-0.11.0+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.82 \
-		wasm-bindgen-backend-0.2.82 \
-		wasm-bindgen-futures-0.4.32 \
-		wasm-bindgen-macro-0.2.82 \
-		wasm-bindgen-macro-support-0.2.82 \
-		wasm-bindgen-shared-0.2.82 \
-		wayland-client-0.29.5 \
-		wayland-commons-0.29.5 \
-		wayland-cursor-0.29.5 \
-		wayland-egl-0.29.5 \
-		wayland-protocols-0.29.5 \
-		wayland-scanner-0.29.5 \
-		wayland-sys-0.29.5 \
-		web-sys-0.3.59 \
-		weezl-0.1.7 \
-		wepoll-ffi-0.1.2 \
-		whoami-1.2.1 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		windows-0.33.0 \
-		windows-sys-0.36.1 \
-		windows_aarch64_msvc-0.33.0 \
-		windows_aarch64_msvc-0.36.1 \
-		windows_i686_gnu-0.33.0 \
-		windows_i686_gnu-0.36.1 \
-		windows_i686_msvc-0.33.0 \
-		windows_i686_msvc-0.36.1 \
-		windows_x86_64_gnu-0.33.0 \
-		windows_x86_64_gnu-0.36.1 \
-		windows_x86_64_msvc-0.33.0 \
-		windows_x86_64_msvc-0.36.1 \
-		winreg-0.10.1 \
-		wio-0.2.2 \
-		x11-2.20.0 \
-		xattr-0.2.3 \
-		xcursor-0.3.4 \
-		xkbcommon-0.5.0 \
-		xml-rs-0.8.4 \
-		yaml-rust-0.4.5 \
-		yasna-0.5.0 \
-		zbus-3.0.0 \
-		zbus_macros-3.0.0 \
-		zbus_names-2.2.0 \
-		zstd-0.11.2+zstd.1.5.2 \
-		zstd-safe-5.0.2+zstd.1.5.2 \
-		zstd-sys-2.0.1+zstd.1.5.2 \
-		zvariant-3.6.0 \
-		zvariant_derive-3.6.0 \
-		xcb-imdkit@git+https://github.com/wez/xcb-imdkit-rs.git?rev=ede7c71b85fe2537efef6cf999a45690316211cf\#ede7c71b85fe2537efef6cf999a45690316211cf \
-		xcb@git+https://github.com/wez/rust-xcb?branch=ffi\#990a0212230acea2baf6f658e68e2f44bf7a8a1f \
-		libssh-rs,libssh-rs-sys@git+https://github.com/wez/libssh-rs.git\#d36e5648274063c187968fd5ce0b1a7aa350a025
-# XXX https://github.com/rust-lang/cargo/issues/4101
-CARGO_INSTALL_PATH=	${PLIST_FILES:Mbin/*:T}
-
 OPTIONS_DEFINE=	DOCS
 
 DOCS_USES=		python:3.4+,build
diff --git a/x11/wezterm/Makefile.crates b/x11/wezterm/Makefile.crates
new file mode 100644
index 000000000000..8245d7db1205
--- /dev/null
+++ b/x11/wezterm/Makefile.crates
@@ -0,0 +1,526 @@
+CARGO_CRATES=	addr2line-0.17.0 \
+		adler-1.0.2 \
+		adler32-1.2.0 \
+		ahash-0.7.6 \
+		aho-corasick-0.7.19 \
+		android_system_properties-0.1.5 \
+		anyhow-1.0.64 \
+		arrayref-0.3.6 \
+		arrayvec-0.7.2 \
+		assert_fs-1.0.7 \
+		async-broadcast-0.4.1 \
+		async-channel-1.7.1 \
+		async-executor-1.4.1 \
+		async-fs-1.6.0 \
+		async-global-executor-2.3.0 \
+		async-io-1.9.0 \
+		async-lock-2.5.0 \
+		async-net-1.7.0 \
+		async-process-1.5.0 \
+		async-recursion-0.3.2 \
+		async-std-1.12.0 \
+		async-task-4.3.0 \
+		async-trait-0.1.57 \
+		atomic-waker-1.0.0 \
+		atty-0.2.14 \
+		autocfg-1.1.0 \
+		backtrace-0.3.66 \
+		base64-0.13.0 \
+		benchmarking-0.4.11 \
+		bit_field-0.10.1 \
+		bitflags-1.3.2 \
+		block-0.1.6 \
+		block-buffer-0.9.0 \
+		block-buffer-0.10.3 \
+		blocking-1.2.0 \
+		bstr-0.1.4 \
+		bstr-0.2.17 \
+		bumpalo-3.11.0 \
+		bytemuck-1.12.1 \
+		byteorder-1.4.3 \
+		bytes-1.2.1 \
+		cache-advisor-1.0.11 \
+		cache-padded-1.2.0 \
+		camino-1.1.1 \
+		cassowary-0.3.0 \
+		cast-0.3.0 \
+		cc-1.0.73 \
+		cfg-if-0.1.10 \
+		cfg-if-1.0.0 \
+		cgl-0.3.2 \
+		chrono-0.4.22 \
+		clap-2.34.0 \
+		clap-3.2.20 \
+		clap_complete-3.2.4 \
+		clap_complete_fig-3.2.4 \
+		clap_derive-3.2.18 \
+		clap_lex-0.2.4 \
+		clipboard-win-2.2.0 \
+		clipboard_macos-0.1.0 \
+		cocoa-0.20.2 \
+		color_quant-1.1.0 \
+		colored-1.9.3 \
+		colorgrad-0.6.1 \
+		concurrent-queue-1.2.4 \
+		core-foundation-0.7.0 \
+		core-foundation-0.9.3 \
+		core-foundation-sys-0.7.0 \
+		core-foundation-sys-0.8.3 \
+		core-graphics-0.19.2 \
+		core-graphics-0.22.3 \
+		core-graphics-types-0.1.1 \
+		core-text-19.2.0 \
+		cpufeatures-0.2.5 \
+		crc32fast-1.3.2 \
+		criterion-0.3.6 \
+		criterion-plot-0.4.5 \
+		crossbeam-0.8.2 \
+		crossbeam-channel-0.5.6 \
+		crossbeam-deque-0.8.2 \
+		crossbeam-epoch-0.9.10 \
+		crossbeam-queue-0.3.6 \
+		crossbeam-utils-0.8.11 \
+		crypto-common-0.1.6 \
+		csscolorparser-0.6.2 \
+		csv-1.1.6 \
+		csv-core-0.1.10 \
+		ctor-0.1.23 \
+		cty-0.2.2 \
+		darling-0.14.1 \
+		darling_core-0.14.1 \
+		darling_macro-0.14.1 \
+		dashmap-5.4.0 \
+		data-encoding-2.3.2 \
+		deflate-1.0.0 \
+		deltae-0.3.0 \
+		derivative-2.2.0 \
+		diff-0.1.13 \
+		difflib-0.4.0 \
+		digest-0.9.0 \
+		digest-0.10.3 \
+		dirs-2.0.2 \
+		dirs-4.0.0 \
+		dirs-next-2.0.0 \
+		dirs-sys-0.3.7 \
+		dirs-sys-next-0.1.2 \
+		dlib-0.5.0 \
+		doc-comment-0.3.3 \
+		downcast-rs-1.2.0 \
+		dwrote-0.11.0 \
+		either-1.8.0 \
+		embed-resource-1.7.3 \
+		emojis-0.4.0 \
+		encoding_rs-0.8.31 \
+		enum-display-derive-0.1.1 \
+		enumflags2-0.7.5 \
+		enumflags2_derive-0.7.4 \
+		env_logger-0.9.0 \
+		euclid-0.22.7 \
+		event-listener-2.5.3 \
+		exr-1.5.0 \
+		fallible-iterator-0.2.0 \
+		fallible-streaming-iterator-0.1.9 \
+		fastrand-1.8.0 \
+		filenamegen-0.2.4 \
+		filetime-0.2.17 \
+		fixedbitset-0.4.2 \
+		flate2-1.0.24 \
+		float-cmp-0.9.0 \
+		flume-0.10.14 \
+		fnv-1.0.7 \
+		foreign-types-0.3.2 \
+		foreign-types-shared-0.1.1 \
+		form_urlencoded-1.0.1 \
+		fsevent-sys-4.1.0 \
+		futures-0.3.24 \
+		futures-channel-0.3.24 \
+		futures-core-0.3.24 \
+		futures-executor-0.3.24 \
+		futures-io-0.3.24 \
+		futures-lite-1.12.0 \
+		futures-macro-0.3.24 \
+		futures-sink-0.3.24 \
+		futures-task-0.3.24 \
+		futures-timer-3.0.2 \
+		futures-util-0.3.24 \
+		fuzzy-matcher-0.3.7 \
+		generic-array-0.14.6 \
+		getopts-0.2.21 \
+		getrandom-0.1.16 \
+		getrandom-0.2.7 \
+		gif-0.11.4 \
+		gimli-0.26.2 \
+		git2-0.14.4 \
+		gl_generator-0.14.0 \
+		glium-0.31.0 \
+		globset-0.4.9 \
+		globwalk-0.8.1 \
+		gloo-timers-0.2.4 \
+		governor-0.4.2 \
+		guillotiere-0.6.2 \
+		h2-0.3.14 \
+		half-1.8.2 \
+		hashbrown-0.11.2 \
+		hashbrown-0.12.3 \
+		hashlink-0.7.0 \
+		hdrhistogram-7.5.1 \
+		heck-0.4.0 \
+		hermit-abi-0.1.19 \
+		hex-0.4.3 \
+		hostname-0.3.1 \
+		http-0.2.8 \
+		http-body-0.4.5 \
+		http_req-0.8.1 \
+		httparse-1.8.0 \
+		httpdate-1.0.2 \
+		humantime-2.1.0 \
+		hyper-0.14.20 \
+		hyper-tls-0.5.0 \
+		iana-time-zone-0.1.47 \
+		ident_case-1.0.1 \
+		idna-0.2.3 \
+		ignore-0.4.18 \
+		image-0.24.3 \
+		indexmap-1.9.1 \
+		inotify-0.9.6 \
+		inotify-sys-0.1.5 \
+		instant-0.1.12 \
+		ioctl-rs-0.1.6 \
+		ipnet-2.5.0 \
+		itertools-0.10.3 \
+		itoa-0.4.8 \
+		itoa-1.0.3 \
+		jobserver-0.1.24 \
+		jpeg-decoder-0.2.6 \
+		js-sys-0.3.59 \
+		k9-0.11.5 \
+		khronos_api-3.1.0 \
+		kqueue-1.0.6 \
+		kqueue-sys-1.0.3 \
+		kv-log-macro-1.0.7 \
+		lab-0.11.0 \
+		lazy_static-1.4.0 \
+		lazycell-1.3.0 \
+		leb128-0.2.5 \
+		lebe-0.5.2 \
+		libc-0.2.132 \
+		libflate-1.2.0 \
+		libflate_lz77-1.1.0 \
+		libgit2-sys-0.13.4+1.4.2 \
+		libloading-0.6.7 \
+		libloading-0.7.3 \
+		libsqlite3-sys-0.24.2 \
+		libssh2-sys-0.2.23 \
+		libz-sys-1.1.8 \
+		line-wrap-0.1.1 \
+		line_drawing-0.8.1 \
+		linked-hash-map-0.5.6 \
+		lock_api-0.4.8 \
+		log-0.4.17 \
+		lru-0.7.8 \
+		lua-src-544.0.1 \
+		luajit-src-210.4.1+restyaa7a722 \
+		mach-0.3.2 \
+		malloc_buf-0.0.6 \
+		maplit-1.0.2 \
+		match_cfg-0.1.0 \
+		matches-0.1.9 \
+		memchr-2.5.0 \
+		memmap2-0.2.3 \
+		memmap2-0.3.1 \
+		memmap2-0.5.7 \
+		memmem-0.1.1 \
+		memoffset-0.6.5 \
+		metrics-0.17.1 \
+		metrics-macros-0.4.1 \
+		mime-0.3.16 \
+		minimal-lexical-0.2.1 \
+		miniz_oxide-0.4.4 \
+		miniz_oxide-0.5.4 \
+		mio-0.8.4 \
+		mlua-0.8.3 \
+		names-0.12.0 \
+		nanorand-0.7.0 \
+		native-tls-0.2.10 \
+		nix-0.22.3 \
+		nix-0.23.1 \
+		nix-0.24.2 \
+		nix-0.25.0 \
+		no-std-compat-0.4.1 \
+		nom-5.1.2 \
+		nom-7.1.1 \
+		nonzero_ext-0.3.0 \
+		normalize-line-endings-0.3.0 \
+		notify-5.0.0 \
+		ntapi-0.3.7 \
+		num-0.3.1 \
+		num-bigint-0.3.3 \
+		num-complex-0.3.1 \
+		num-derive-0.3.3 \
+		num-integer-0.1.45 \
+		num-iter-0.1.43 \
+		num-rational-0.3.2 \
+		num-rational-0.4.1 \
+		num-traits-0.2.15 \
+		num_cpus-1.13.1 \
+		num_threads-0.1.6 \
+		objc-0.2.7 \
+		objc-foundation-0.1.1 \
+		objc_id-0.1.1 \
+		object-0.29.0 \
+		once_cell-1.14.0 \
+		oorandom-11.1.3 \
+		opaque-debug-0.3.0 \
+		open-3.0.2 \
+		openssl-0.10.38 \
+		openssl-probe-0.1.5 \
+		openssl-src-300.0.9+3.0.5 \
+		openssl-sys-0.9.71 \
+		ordered-float-3.0.0 \
+		ordered-stream-0.0.1 \
+		os_str_bytes-6.3.0 \
+		parking-2.0.0 \
+		parking_lot-0.11.2 \
+		parking_lot-0.12.1 \
+		parking_lot_core-0.8.5 \
+		parking_lot_core-0.9.3 \
+		pathdiff-0.2.1 \
+		pem-1.1.0 \
+		percent-encoding-2.1.0 \
+		pest-2.3.0 \
+		pest_derive-2.3.0 \
+		pest_generator-2.3.0 \
+		pest_meta-2.3.0 \
+		phf-0.8.0 \
+		phf-0.10.1 \
+		phf-0.11.1 \
+		phf_codegen-0.8.0 \
+		phf_generator-0.8.0 \
+		phf_generator-0.11.1 \
+		phf_macros-0.11.1 \
+		phf_shared-0.8.0 \
+		phf_shared-0.10.0 \
+		phf_shared-0.11.1 \
+		pin-project-1.0.12 \
+		pin-project-internal-1.0.12 \
+		pin-project-lite-0.2.9 \
+		pin-utils-0.1.0 \
+		pkg-config-0.3.25 \
+		plist-1.3.1 \
+		plotters-0.3.3 \
+		plotters-backend-0.3.4 \
+		plotters-svg-0.3.3 \
+		png-0.17.5 \
+		polling-2.3.0 \
+		ppv-lite86-0.2.16 \
+		predicates-2.1.1 \
+		predicates-core-1.0.3 \
+		predicates-tree-1.0.5 \
+		proc-macro-crate-1.2.1 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.43 \
+		pulldown-cmark-0.9.2 \
+		pure-rust-locales-0.5.6 \
+		quanta-0.9.3 \
+		quick-xml-0.22.0 \
+		quote-1.0.21 \
+		rand-0.7.3 \
+		rand-0.8.5 \
+		rand_chacha-0.2.2 \
+		rand_chacha-0.3.1 \
+		rand_core-0.5.1 \
+		rand_core-0.6.3 \
+		rand_hc-0.2.0 \
+		rand_pcg-0.2.1 \
+		raw-cpuid-10.5.0 \
+		raw-window-handle-0.3.4 \
+		raw-window-handle-0.4.3 \
+		rayon-1.5.3 \
+		rayon-core-1.9.3 \
+		rcgen-0.9.3 \
+		redox_syscall-0.2.16 \
+		redox_users-0.4.3 \
+		regex-1.6.0 \
+		regex-automata-0.1.10 \
+		regex-syntax-0.6.27 \
+		remove_dir_all-0.5.3 \
+		reqwest-0.11.11 \
+		resize-0.5.5 \
+		rgb-0.8.33 \
+		ring-0.16.20 \
+		rle-decode-fast-1.0.3 \
+		rstest-0.15.0 \
+		rstest_macros-0.14.0 \
+		rusqlite-0.27.0 \
+		rustc-demangle-0.1.21 \
+		rustc-hash-1.1.0 \
+		rustc_version-0.4.0 \
+		ryu-1.0.11 \
+		safemem-0.3.3 \
+		same-file-1.0.6 \
+		schannel-0.1.20 \
+		scoped-tls-1.0.0 \
+		scoped_threadpool-0.1.9 \
+		scopeguard-1.1.0 \
+		security-framework-2.7.0 \
+		security-framework-sys-2.6.1 \
+		semver-0.11.0 \
+		semver-1.0.13 \
+		semver-parser-0.10.2 \
+		serde-1.0.144 \
+		serde_cbor-0.11.2 \
+		serde_derive-1.0.144 \
+		serde_json-1.0.85 \
+		serde_repr-0.1.9 \
+		serde_urlencoded-0.7.1 \
+		serde_with-2.0.0 \
+		serde_with_macros-2.0.0 \
+		serde_yaml-0.9.11 \
+		serial-0.4.0 \
+		serial-core-0.4.0 \
+		serial-unix-0.4.0 \
+		serial-windows-0.4.0 \
+		sha-1-0.10.0 \
+		sha1-0.6.1 \
+		sha1_smol-1.0.0 \
+		sha2-0.9.9 \
+		shared_library-0.1.9 \
+		shell-words-1.1.0 \
+		shlex-1.1.0 \
+		signal-hook-0.1.17 \
+		signal-hook-0.3.14 \
+		signal-hook-registry-1.4.0 \
+		siphasher-0.3.10 \
+		slab-0.4.7 \
+		smallvec-1.9.0 \
+		smawk-0.3.1 \
+		smithay-client-toolkit-0.15.4 \
+		smol-1.2.5 \
+		smol-potat-1.1.2 \
+		smol-potat-macro-0.6.0 \
+		socket2-0.4.7 \
+		spa-0.3.0 \
+		spin-0.5.2 \
+		spin-0.9.4 \
+		sqlite-cache-0.1.3 \
+		ssh2-0.9.3 \
+		starship-battery-0.7.9 \
+		static_assertions-1.1.0 \
+		strict-num-0.1.0 \
+		strsim-0.10.0 \
+		svg_fmt-0.4.1 \
+		syn-1.0.99 \
+		takeable-option-0.5.0 \
+		tar-0.4.38 \
+		tempfile-3.3.0 \
+		term_size-0.3.2 \
+		termcolor-1.1.3 \
+		terminfo-0.7.3 \
+		termios-0.2.2 \
+		termios-0.3.3 \
+		termtree-0.2.4 \
+		textwrap-0.11.0 \
+		textwrap-0.15.0 \
+		thiserror-1.0.34 \
+		thiserror-impl-1.0.34 \
+		thread_local-1.1.4 \
+		threadpool-1.8.1 \
+		tiff-0.7.3 \
+		time-0.1.43 \
+		time-0.3.14 \
+		tiny-skia-0.8.1 \
+		tiny-skia-path-0.8.1 \
+		tinytemplate-1.2.1 \
+		tinyvec-1.6.0 \
+		tinyvec_macros-0.1.0 \
+		tokio-1.21.0 \
+		tokio-macros-1.8.0 \
+		tokio-native-tls-0.3.0 \
+		tokio-util-0.7.3 \
+		toml-0.5.8 \
+		tower-service-0.3.2 \
+		tracing-0.1.36 \
+		tracing-attributes-0.1.22 \
+		tracing-core-0.1.29 \
+		try-lock-0.2.3 \
+		typenum-1.15.0 \
+		ucd-trie-0.1.5 \
+		uds_windows-1.0.2 \
+		unicase-2.6.0 \
+		unicode-bidi-0.3.8 \
+		unicode-ident-1.0.3 \
+		unicode-linebreak-0.1.2 \
+		unicode-normalization-0.1.21 \
+		unicode-segmentation-1.9.0 \
+		unicode-width-0.1.9 \
+		unsafe-libyaml-0.2.2 \
+		untrusted-0.7.1 \
+		uom-0.30.0 \
+		url-2.2.2 \
+		utf8parse-0.2.0 \
+		value-bag-1.0.0-alpha.9 \
+		varbincode-0.1.0 \
+		vcpkg-0.2.15 \
+		version_check-0.9.4 \
+		vswhom-0.1.0 \
+		vswhom-sys-0.1.1 \
+		waker-fn-1.1.0 \
+		walkdir-2.3.2 \
+		want-0.3.0 \
+		wasi-0.9.0+wasi-snapshot-preview1 \
+		wasi-0.10.2+wasi-snapshot-preview1 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.82 \
+		wasm-bindgen-backend-0.2.82 \
+		wasm-bindgen-futures-0.4.32 \
+		wasm-bindgen-macro-0.2.82 \
+		wasm-bindgen-macro-support-0.2.82 \
+		wasm-bindgen-shared-0.2.82 \
+		wayland-client-0.29.5 \
+		wayland-commons-0.29.5 \
+		wayland-cursor-0.29.5 \
+		wayland-egl-0.29.5 \
+		wayland-protocols-0.29.5 \
+		wayland-scanner-0.29.5 \
+		wayland-sys-0.29.5 \
+		web-sys-0.3.59 \
+		weezl-0.1.7 \
+		wepoll-ffi-0.1.2 \
+		whoami-1.2.1 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		windows-0.33.0 \
+		windows-sys-0.36.1 \
+		windows_aarch64_msvc-0.33.0 \
+		windows_aarch64_msvc-0.36.1 \
+		windows_i686_gnu-0.33.0 \
+		windows_i686_gnu-0.36.1 \
+		windows_i686_msvc-0.33.0 \
+		windows_i686_msvc-0.36.1 \
+		windows_x86_64_gnu-0.33.0 \
+		windows_x86_64_gnu-0.36.1 \
+		windows_x86_64_msvc-0.33.0 \
+		windows_x86_64_msvc-0.36.1 \
+		winreg-0.10.1 \
+		wio-0.2.2 \
+		x11-2.20.0 \
+		xattr-0.2.3 \
+		xcursor-0.3.4 \
+		xkbcommon-0.5.0 \
+		xml-rs-0.8.4 \
+		yaml-rust-0.4.5 \
+		yasna-0.5.0 \
+		zbus-3.0.0 \
+		zbus_macros-3.0.0 \
+		zbus_names-2.2.0 \
+		zstd-0.11.2+zstd.1.5.2 \
+		zstd-safe-5.0.2+zstd.1.5.2 \
+		zstd-sys-2.0.1+zstd.1.5.2 \
+		zvariant-3.6.0 \
+		zvariant_derive-3.6.0 \
+		xcb-imdkit@git+https://github.com/wez/xcb-imdkit-rs.git?rev=ede7c71b85fe2537efef6cf999a45690316211cf\#ede7c71b85fe2537efef6cf999a45690316211cf \
+		xcb@git+https://github.com/wez/rust-xcb?branch=ffi\#990a0212230acea2baf6f658e68e2f44bf7a8a1f \
+		libssh-rs,libssh-rs-sys@git+https://github.com/wez/libssh-rs.git\#d36e5648274063c187968fd5ce0b1a7aa350a025
diff --git a/x11/wmfocus/Makefile b/x11/wmfocus/Makefile
index 0d4d4b1734ed..fccff5f03560 100644
--- a/x11/wmfocus/Makefile
+++ b/x11/wmfocus/Makefile
@@ -26,100 +26,6 @@ GH_ACCOUNT=	svenstaro
 CARGO_FEATURES=	i3
 PLIST_FILES=	bin/${PORTNAME}
 
-CARGO_CRATES=	aho-corasick-0.7.18 \
-		ansi_term-0.11.0 \
-		anyhow-1.0.42 \
-		atty-0.2.14 \
-		autocfg-1.0.1 \
-		bitflags-1.2.1 \
-		cairo-rs-0.14.1 \
-		cairo-sys-rs-0.14.0 \
-		cc-1.0.68 \
-		cfg-expr-0.7.4 \
-		cfg-if-1.0.0 \
-		clap-2.33.3 \
-		cmake-0.1.45 \
-		core-foundation-0.9.1 \
-		core-foundation-sys-0.8.2 \
-		core-graphics-0.22.2 \
-		core-graphics-types-0.1.1 \
-		core-text-19.2.0 \
-		css-color-parser-0.1.2 \
-		either-1.6.1 \
-		env_logger-0.7.1 \
-		expat-sys-2.1.6 \
-		font-loader-0.11.0 \
-		foreign-types-0.3.2 \
-		foreign-types-shared-0.1.1 \
-		freetype-sys-0.13.1 \
-		futures-channel-0.3.15 \
-		futures-core-0.3.15 \
-		futures-executor-0.3.15 \
-		futures-task-0.3.15 \
-		futures-util-0.3.15 \
-		glib-0.14.2 \
-		glib-macros-0.14.1 \
-		glib-sys-0.14.0 \
-		gobject-sys-0.14.0 \
-		heck-0.3.3 \
-		hermit-abi-0.1.19 \
-		humantime-1.3.0 \
-		itertools-0.10.1 \
-		itoa-0.4.7 \
-		lazy_static-0.1.16 \
-		lazy_static-1.4.0 \
-		libc-0.2.98 \
-		log-0.4.14 \
-		memchr-2.4.0 \
-		once_cell-1.8.0 \
-		pin-project-lite-0.2.7 \
-		pin-utils-0.1.0 \
-		pkg-config-0.3.19 \
-		pretty_env_logger-0.4.0 \
-		proc-macro-crate-1.0.0 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.27 \
-		quick-error-1.2.3 \
-		quote-1.0.9 \
-		regex-1.5.4 \
-		regex-syntax-0.6.25 \
-		ryu-1.0.5 \
-		serde-1.0.126 \
-		serde_derive-1.0.126 \
-		serde_json-1.0.64 \
-		servo-fontconfig-0.5.1 \
-		servo-fontconfig-sys-5.1.0 \
-		slab-0.4.3 \
-		smallvec-1.6.1 \
-		strsim-0.8.0 \
-		structopt-0.3.22 \
-		structopt-derive-0.4.15 \
-		strum-0.21.0 \
-		strum_macros-0.21.1 \
-		syn-1.0.73 \
-		system-deps-3.1.2 \
-		termcolor-1.1.2 \
-		textwrap-0.11.0 \
-		thiserror-1.0.26 \
-		thiserror-impl-1.0.26 \
-		toml-0.5.8 \
-		unicode-segmentation-1.8.0 \
-		unicode-width-0.1.8 \
-		unicode-xid-0.2.2 \
-		vec_map-0.8.2 \
-		version-compare-0.0.11 \
-		version_check-0.9.3 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		x11-2.18.2 \
-		xcb-0.9.0 \
-		xcb-util-0.3.0 \
-		xkbcommon-0.4.0 \
-		swayipc,swayipc-types@git+https://github.com/JayceFayne/swayipc-rs\#f6b045f6dff3b8135c74c996cb95a39c874e4939
-
 post-patch:
 # lang/python3 cannot be used as a dependency
 	@${REINPLACE_CMD} -e 's/"python3"/"${PYTHON_CMD:T}"/' \
diff --git a/x11/wmfocus/Makefile.crates b/x11/wmfocus/Makefile.crates
new file mode 100644
index 000000000000..d481b2bd9280
--- /dev/null
+++ b/x11/wmfocus/Makefile.crates
@@ -0,0 +1,93 @@
+CARGO_CRATES=	aho-corasick-0.7.18 \
+		ansi_term-0.11.0 \
+		anyhow-1.0.42 \
+		atty-0.2.14 \
+		autocfg-1.0.1 \
+		bitflags-1.2.1 \
+		cairo-rs-0.14.1 \
+		cairo-sys-rs-0.14.0 \
+		cc-1.0.68 \
+		cfg-expr-0.7.4 \
+		cfg-if-1.0.0 \
+		clap-2.33.3 \
+		cmake-0.1.45 \
+		core-foundation-0.9.1 \
+		core-foundation-sys-0.8.2 \
+		core-graphics-0.22.2 \
+		core-graphics-types-0.1.1 \
+		core-text-19.2.0 \
+		css-color-parser-0.1.2 \
+		either-1.6.1 \
+		env_logger-0.7.1 \
+		expat-sys-2.1.6 \
+		font-loader-0.11.0 \
+		foreign-types-0.3.2 \
+		foreign-types-shared-0.1.1 \
+		freetype-sys-0.13.1 \
+		futures-channel-0.3.15 \
+		futures-core-0.3.15 \
+		futures-executor-0.3.15 \
+		futures-task-0.3.15 \
+		futures-util-0.3.15 \
+		glib-0.14.2 \
+		glib-macros-0.14.1 \
+		glib-sys-0.14.0 \
+		gobject-sys-0.14.0 \
+		heck-0.3.3 \
+		hermit-abi-0.1.19 \
+		humantime-1.3.0 \
+		itertools-0.10.1 \
+		itoa-0.4.7 \
+		lazy_static-0.1.16 \
+		lazy_static-1.4.0 \
+		libc-0.2.98 \
+		log-0.4.14 \
+		memchr-2.4.0 \
+		once_cell-1.8.0 \
+		pin-project-lite-0.2.7 \
+		pin-utils-0.1.0 \
+		pkg-config-0.3.19 \
+		pretty_env_logger-0.4.0 \
+		proc-macro-crate-1.0.0 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.27 \
+		quick-error-1.2.3 \
+		quote-1.0.9 \
+		regex-1.5.4 \
+		regex-syntax-0.6.25 \
+		ryu-1.0.5 \
+		serde-1.0.126 \
+		serde_derive-1.0.126 \
+		serde_json-1.0.64 \
+		servo-fontconfig-0.5.1 \
+		servo-fontconfig-sys-5.1.0 \
+		slab-0.4.3 \
+		smallvec-1.6.1 \
+		strsim-0.8.0 \
+		structopt-0.3.22 \
+		structopt-derive-0.4.15 \
+		strum-0.21.0 \
+		strum_macros-0.21.1 \
+		syn-1.0.73 \
+		system-deps-3.1.2 \
+		termcolor-1.1.2 \
+		textwrap-0.11.0 \
+		thiserror-1.0.26 \
+		thiserror-impl-1.0.26 \
+		toml-0.5.8 \
+		unicode-segmentation-1.8.0 \
+		unicode-width-0.1.8 \
+		unicode-xid-0.2.2 \
+		vec_map-0.8.2 \
+		version-compare-0.0.11 \
+		version_check-0.9.3 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		x11-2.18.2 \
+		xcb-0.9.0 \
+		xcb-util-0.3.0 \
+		xkbcommon-0.4.0 \
+		swayipc,swayipc-types@git+https://github.com/JayceFayne/swayipc-rs\#f6b045f6dff3b8135c74c996cb95a39c874e4939