diff --git a/audio/gnome-podcasts/files/patch-scripts_cargo.sh b/audio/gnome-podcasts/files/patch-scripts_cargo.sh
new file mode 100644
index 000000000000..b69eb476b59d
--- /dev/null
+++ b/audio/gnome-podcasts/files/patch-scripts_cargo.sh
@@ -0,0 +1,8 @@
+--- scripts/cargo.sh.orig	2021-09-08 13:34:20 UTC
++++ scripts/cargo.sh
+@@ -22,4 +22,4 @@ if test -d vendor; then
+ fi
+ 
+ cargo build ${ARGS[@]} --manifest-path="$1"/Cargo.toml -p podcasts-gtk
+-cp "$CARGO_TARGET_DIR"/${TARGET}/podcasts-gtk "$OUTPUT"
++cp "$CARGO_TARGET_DIR"/${CARGO_BUILD_TARGET}/${TARGET}/podcasts-gtk "$OUTPUT"
diff --git a/audio/shortwave/files/patch-build-aux_cargo.sh b/audio/shortwave/files/patch-build-aux_cargo.sh
new file mode 100644
index 000000000000..80426270cd4f
--- /dev/null
+++ b/audio/shortwave/files/patch-build-aux_cargo.sh
@@ -0,0 +1,15 @@
+--- build-aux/cargo.sh.orig	2021-09-08 13:22:45 UTC
++++ build-aux/cargo.sh
+@@ -17,10 +17,10 @@ then
+     echo "** DEBUG MODE **"
+     cargo build --manifest-path \
+         "$MESON_SOURCE_ROOT"/Cargo.toml && \
+-        cp "$CARGO_TARGET_DIR"/debug/shortwave $APP_OUTPUT
++        cp "$CARGO_TARGET_DIR"/$CARGO_BUILD_TARGET/debug/shortwave $APP_OUTPUT
+ else
+     echo "** RELEASE MODE **"
+     cargo build --manifest-path \
+         "$MESON_SOURCE_ROOT"/Cargo.toml --release && \
+-        cp "$CARGO_TARGET_DIR"/release/shortwave $APP_OUTPUT
++        cp "$CARGO_TARGET_DIR"/$CARGO_BUILD_TARGET/release/shortwave $APP_OUTPUT
+ fi
diff --git a/databases/redisjson/Makefile b/databases/redisjson/Makefile
index 61e06337f68f..09aef0af3dc4 100644
--- a/databases/redisjson/Makefile
+++ b/databases/redisjson/Makefile
@@ -1,115 +1,115 @@
 # Created by: Sergey A. Osokin <osa@FreeBSD.org>
 
 PORTNAME=	redisjson
 PORTVERSION=	0.0.0.0.2021.08.30.01
 CATEGORIES=	databases
 
 MAINTAINER=	osa@FreeBSD.org
 COMMENT=	JSON data type for Redis
 
 LICENSE=	UNKNOWN
 LICENSE_NAME=	Redis Source Available License Agreement
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
 BUILD_DEPENDS=	${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/libclang.so:devel/llvm${LLVM_DEFAULT}
 
 USES=		cargo
 
 USE_GITHUB=	nodefault
 GH_TUPLE=	RedisJSON:redisjson:90bc4a0:redisjson \
 		RedisJSON:jsonpath:14af7aa5435f3e676ceb3441ad78b9c8cb3ffa3a:jsonpath_lib
 
 CARGO_CRATES=	aho-corasick-0.7.15 \
 		ansi_term-0.11.0 \
 		array_tool-1.0.3 \
 		atty-0.2.14 \
 		autocfg-1.0.1 \
 		bindgen-0.59.1 \
 		bitflags-1.3.2 \
 		bitvec-0.19.5 \
 		bson-0.14.1 \
 		byteorder-1.4.3 \
 		cc-1.0.69 \
 		cexpr-0.5.0 \
 		cfg-if-1.0.0 \
 		chrono-0.4.19 \
 		clang-sys-1.2.0 \
 		clap-2.33.3 \
 		enum-primitive-derive-0.1.2 \
 		env_logger-0.8.4 \
 		funty-1.1.0 \
 		getrandom-0.1.16 \
 		glob-0.3.0 \
 		hashbrown-0.11.2 \
 		heck-0.3.3 \
 		hermit-abi-0.1.19 \
 		hex-0.3.2 \
 		humantime-2.1.0 \
 		indexmap-1.7.0 \
 		itoa-0.4.8 \
 		lazy_static-1.4.0 \
 		lazycell-1.3.0 \
 		libc-0.2.100 \
 		libloading-0.7.0 \
 		linked-hash-map-0.5.4 \
 		log-0.4.14 \
 		md5-0.6.1 \
 		memchr-2.3.4 \
 		nom-6.2.1 \
 		num-integer-0.1.44 \
 		num-traits-0.1.43 \
 		num-traits-0.2.14 \
 		peeking_take_while-0.1.2 \
 		ppv-lite86-0.2.10 \
 		proc-macro2-1.0.28 \
 		quote-0.3.15 \
 		quote-1.0.9 \
 		radium-0.5.3 \
 		rand-0.7.3 \
 		rand_chacha-0.2.2 \
 		rand_core-0.5.1 \
 		rand_hc-0.2.0 \
 		redis-module-0.23.0 \
 		regex-1.4.6 \
 		regex-syntax-0.6.25 \
 		rustc-hash-1.1.0 \
 		ryu-1.0.5 \
 		serde-1.0.128 \
 		serde_derive-1.0.128 \
 		serde_json-1.0.66 \
 		shlex-1.0.0 \
 		strsim-0.8.0 \
 		strum_macros-0.21.1 \
 		syn-0.11.11 \
 		syn-1.0.75 \
 		synom-0.11.3 \
 		tap-1.0.1 \
 		termcolor-1.1.2 \
 		textwrap-0.11.0 \
 		time-0.1.44 \
 		unicode-segmentation-1.8.0 \
 		unicode-width-0.1.8 \
 		unicode-xid-0.0.4 \
 		unicode-xid-0.2.2 \
 		vec_map-0.8.2 \
 		version_check-0.9.3 \
 		wasi-0.9.0+wasi-snapshot-preview1 \
 		wasi-0.10.0+wasi-snapshot-preview1 \
 		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 \
 		wyz-0.2.0
 
 CARGO_USE_GITHUB=	yes
 
 WRKSRC=		${WRKDIR}/RedisJSON-90bc4a0
 
 PLIST_FILES=	lib/librejson.so
 
 do-install:
-	${INSTALL_LIB} ${WRKDIR}/target/release/librejson.so ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/librejson.so ${STAGEDIR}${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/deskutils/solanum/files/patch-build-aux_cargo.sh b/deskutils/solanum/files/patch-build-aux_cargo.sh
new file mode 100644
index 000000000000..86989835971b
--- /dev/null
+++ b/deskutils/solanum/files/patch-build-aux_cargo.sh
@@ -0,0 +1,16 @@
+--- build-aux/cargo.sh.orig	2021-09-08 15:16:18 UTC
++++ build-aux/cargo.sh
+@@ -14,11 +14,11 @@ then
+     echo "RELEASE MODE"
+     cargo build --manifest-path \
+         "$MESON_SOURCE_ROOT"/Cargo.toml --release && \
+-        cp "$CARGO_TARGET_DIR"/release/"$APP_BIN" "$OUTPUT"
++        cp "$CARGO_TARGET_DIR"/$CARGO_BUILD_TARGET/release/"$APP_BIN" "$OUTPUT"
+ else
+     echo "DEBUG MODE"
+     cargo build --manifest-path \
+         "$MESON_SOURCE_ROOT"/Cargo.toml --verbose && \
+-        cp "$CARGO_TARGET_DIR"/debug/"$APP_BIN" "$OUTPUT"
++        cp "$CARGO_TARGET_DIR"/$CARGO_BUILD_TARGET/debug/"$APP_BIN" "$OUTPUT"
+ fi
+ 
diff --git a/devel/pijul/Makefile b/devel/pijul/Makefile
index 17bfbdc9cf17..8eea8ce5a542 100644
--- a/devel/pijul/Makefile
+++ b/devel/pijul/Makefile
@@ -1,291 +1,291 @@
 # Created by: Carlo Strub
 
 PORTNAME=	pijul
 PORTVERSION=	1.0.0.a54
 CATEGORIES=	devel
 
 MAINTAINER=	cs@FreeBSD.org
 COMMENT=	Distributed version control system
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libzstd.so:archivers/zstd \
 		libxxhash.so:devel/xxhash
 
 USES=		cargo ssl
 CARGO_INSTALL=	no
 CARGO_CRATES=	${PORTNAME}-1.0.0-alpha.54 \
 		addr2line-0.16.0 \
 		adler-1.0.2 \
 		adler32-1.2.0 \
 		aes-0.7.4 \
 		aho-corasick-0.7.18 \
 		anyhow-1.0.43 \
 		arrayref-0.3.6 \
 		arrayvec-0.7.1 \
 		atty-0.2.14 \
 		autocfg-1.0.1 \
 		backtrace-0.3.61 \
 		base64-0.13.0 \
 		base64ct-1.0.1 \
 		bcrypt-pbkdf-0.6.2 \
 		bincode-1.3.3 \
 		bit-vec-0.6.3 \
 		bitflags-1.3.2 \
 		blake3-1.0.0 \
 		block-buffer-0.9.0 \
 		block-modes-0.8.1 \
 		block-padding-0.2.1 \
 		blowfish-0.8.0 \
 		bs58-0.4.0 \
 		bstr-0.2.16 \
 		bumpalo-3.7.0 \
 		byteorder-1.4.3 \
 		bytes-1.0.1 \
 		canonical-path-2.0.2 \
 		cc-1.0.69 \
 		cfg-if-1.0.0 \
 		chrono-0.4.19 \
 		cipher-0.3.0 \
 		clap-3.0.0-beta.4 \
 		clap_derive-3.0.0-beta.4 \
 		constant_time_eq-0.1.5 \
 		core-foundation-0.9.1 \
 		core-foundation-sys-0.8.2 \
 		cpufeatures-0.1.5 \
 		crc32fast-1.2.1 \
 		crossbeam-deque-0.8.1 \
 		crossbeam-epoch-0.9.5 \
 		crossbeam-utils-0.8.5 \
 		crypto-mac-0.11.1 \
 		cryptovec-0.6.1 \
 		ctr-0.7.0 \
 		ctrlc-3.2.0 \
 		curve25519-dalek-3.2.0 \
 		data-encoding-2.3.2 \
 		diffs-0.4.1 \
 		digest-0.9.0 \
 		dirs-3.0.2 \
 		dirs-next-2.0.0 \
 		dirs-sys-0.3.6 \
 		dirs-sys-next-0.1.2 \
 		ed25519-1.2.0 \
 		ed25519-dalek-1.0.1 \
 		edit-0.1.3 \
 		either-1.6.1 \
 		encoding_rs-0.8.28 \
 		env_logger-0.8.4 \
 		errno-0.2.7 \
 		errno-dragonfly-0.1.1 \
 		filetime-0.2.15 \
 		flate2-1.0.20 \
 		fnv-1.0.7 \
 		foreign-types-0.3.2 \
 		foreign-types-shared-0.1.1 \
 		form_urlencoded-1.0.1 \
 		fs2-0.4.3 \
 		futures-0.3.16 \
 		futures-channel-0.3.16 \
 		futures-core-0.3.16 \
 		futures-executor-0.3.16 \
 		futures-io-0.3.16 \
 		futures-macro-0.3.16 \
 		futures-sink-0.3.16 \
 		futures-task-0.3.16 \
 		futures-util-0.3.16 \
 		gcc-0.3.55 \
 		generic-array-0.14.4 \
 		getrandom-0.1.16 \
 		getrandom-0.2.3 \
 		gimli-0.25.0 \
 		git2-0.13.21 \
 		globset-0.4.8 \
 		h2-0.3.3 \
 		hashbrown-0.11.2 \
 		heck-0.3.3 \
 		hermit-abi-0.1.19 \
 		hmac-0.11.0 \
 		http-0.2.4 \
 		http-body-0.4.3 \
 		httparse-1.4.1 \
 		httpdate-1.0.1 \
 		human-panic-1.0.3 \
 		humantime-2.1.0 \
 		hyper-0.14.11 \
 		hyper-tls-0.5.0 \
 		idna-0.2.3 \
 		ignore-0.4.18 \
 		indexmap-1.7.0 \
 		instant-0.1.10 \
 		ipnet-2.3.1 \
 		itoa-0.4.7 \
 		jobserver-0.1.24 \
 		js-sys-0.3.52 \
 		lazy_static-1.4.0 \
 		libc-0.2.99 \
 		libgit2-sys-0.12.22+1.1.0 \
 		libpijul-1.0.0-alpha.48 \
 		libsodium-sys-0.2.7 \
 		libssh2-sys-0.2.21 \
 		libz-sys-1.1.3 \
 		linked-hash-map-0.5.4 \
 		lock_api-0.4.4 \
 		log-0.4.14 \
 		lru-cache-0.1.2 \
 		matches-0.1.9 \
 		md5-0.7.0 \
 		memchr-2.4.0 \
 		memmap-0.7.0 \
 		memoffset-0.6.4 \
 		mime-0.3.16 \
 		miniz_oxide-0.4.4 \
 		mio-0.7.13 \
 		miow-0.3.7 \
 		native-tls-0.2.8 \
 		nix-0.22.0 \
 		ntapi-0.3.6 \
 		num-bigint-0.4.0 \
 		num-integer-0.1.44 \
 		num-traits-0.2.14 \
 		num_cpus-1.13.0 \
 		object-0.26.0 \
 		once_cell-1.8.0 \
 		opaque-debug-0.3.0 \
 		openssl-0.10.35 \
 		openssl-probe-0.1.4 \
 		openssl-sys-0.9.65 \
 		os_str_bytes-3.1.0 \
 		os_type-2.3.0 \
 		pager-0.16.0 \
 		parking_lot-0.11.1 \
 		parking_lot_core-0.8.3 \
 		password-hash-0.2.2 \
 		path-slash-0.1.4 \
 		pbkdf2-0.8.0 \
 		percent-encoding-2.1.0 \
 		pijul-macros-0.4.0 \
 		pin-project-lite-0.2.7 \
 		pin-utils-0.1.0 \
 		pkg-config-0.3.19 \
 		ppv-lite86-0.2.10 \
 		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.28 \
 		quote-1.0.9 \
 		rand-0.7.3 \
 		rand-0.8.4 \
 		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_hc-0.3.1 \
 		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.4 \
 		rpassword-5.0.1 \
 		rustc-demangle-0.1.20 \
 		ryu-1.0.5 \
 		same-file-1.0.6 \
 		sanakirja-1.2.10 \
 		sanakirja-core-1.2.12 \
 		schannel-0.1.19 \
 		scopeguard-1.1.0 \
 		security-framework-2.3.1 \
 		security-framework-sys-2.3.0 \
 		serde-1.0.127 \
 		serde_bytes-0.11.5 \
 		serde_derive-1.0.127 \
 		serde_json-1.0.66 \
 		serde_urlencoded-0.7.0 \
 		sha2-0.9.5 \
 		signal-hook-registry-1.4.0 \
 		signature-1.3.1 \
 		slab-0.4.4 \
 		smallvec-1.6.1 \
 		socket2-0.4.1 \
 		static_assertions-1.1.0 \
 		strsim-0.10.0 \
 		subtle-2.4.1 \
 		syn-1.0.74 \
 		synstructure-0.12.5 \
 		tar-0.4.37 \
 		tempfile-3.2.0 \
 		termcolor-1.1.2 \
 		terminal_size-0.1.17 \
 		textwrap-0.14.2 \
 		thiserror-1.0.26 \
 		thiserror-impl-1.0.26 \
 		thread_local-1.1.3 \
 		threadpool-1.8.1 \
 		thrussh-0.33.5 \
 		thrussh-config-0.5.0 \
 		thrussh-keys-0.21.0 \
 		thrussh-libsodium-0.2.1 \
 		time-0.1.43 \
 		tinyvec-1.3.1 \
 		tinyvec_macros-0.1.0 \
 		tokio-1.10.0 \
 		tokio-macros-1.3.0 \
 		tokio-native-tls-0.3.0 \
 		tokio-stream-0.1.7 \
 		tokio-util-0.6.7 \
 		toml-0.5.8 \
 		tower-service-0.3.1 \
 		tracing-0.1.26 \
 		tracing-core-0.1.18 \
 		try-lock-0.2.3 \
 		twox-hash-1.6.1 \
 		typenum-1.13.0 \
 		unicode-bidi-0.3.6 \
 		unicode-normalization-0.1.19 \
 		unicode-segmentation-1.8.0 \
 		unicode-width-0.1.8 \
 		unicode-xid-0.2.2 \
 		url-2.2.2 \
 		uuid-0.8.2 \
 		vcpkg-0.2.15 \
 		vec_map-0.8.2 \
 		version_check-0.9.3 \
 		walkdir-2.3.2 \
 		want-0.3.0 \
 		wasi-0.9.0+wasi-snapshot-preview1 \
 		wasi-0.10.2+wasi-snapshot-preview1 \
 		wasm-bindgen-0.2.75 \
 		wasm-bindgen-backend-0.2.75 \
 		wasm-bindgen-futures-0.4.25 \
 		wasm-bindgen-macro-0.2.75 \
 		wasm-bindgen-macro-support-0.2.75 \
 		wasm-bindgen-shared-0.2.75 \
 		web-sys-0.3.52 \
 		which-4.2.2 \
 		whoami-0.9.0 \
 		whoami-1.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 \
 		winreg-0.7.0 \
 		xattr-0.2.2 \
 		yasna-0.4.0 \
 		zeroize-1.3.0 \
 		zeroize_derive-1.1.0 \
 		zstd-seekable-0.1.7
 
 PLIST_FILES=	bin/pijul
 
 post-patch:
 	${MV} ${WRKSRC}/cargo-crates/pijul-1.0.0-alpha.54/* ${WRKSRC}/
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/target/release/pijul ${STAGEDIR}${PREFIX}/bin/pijul
+	${INSTALL_SCRIPT} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/pijul ${STAGEDIR}${PREFIX}/bin/pijul
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pijul
 
 .include <bsd.port.mk>
diff --git a/editors/parinfer-rust/Makefile b/editors/parinfer-rust/Makefile
index 7e5c36020f2e..08acb6f7dcf3 100644
--- a/editors/parinfer-rust/Makefile
+++ b/editors/parinfer-rust/Makefile
@@ -1,130 +1,130 @@
 PORTNAME=	parinfer-rust
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4.3
 PORTREVISION=	15
 CATEGORIES=	editors
 
 MAINTAINER=	mikael@FreeBSD.org
 COMMENT=	Infer parentheses for Clojure, Lisp, and Scheme
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT}
 
 USES=		cargo
 USE_GITHUB=	yes
 GH_ACCOUNT=	eraserhd
 USE_LDCONFIG=	yes
 
 CARGO_CRATES=	aho-corasick-0.7.3 \
 		ansi_term-0.11.0 \
 		atty-0.2.11 \
 		autocfg-0.1.4 \
 		backtrace-0.3.30 \
 		backtrace-sys-0.1.28 \
 		base-x-0.2.5 \
 		bindgen-0.48.1 \
 		bitflags-1.1.0 \
 		bumpalo-2.4.3 \
 		byteorder-1.3.2 \
 		cc-1.0.37 \
 		cexpr-0.3.5 \
 		cfg-if-0.1.9 \
 		clang-sys-0.26.4 \
 		clap-2.33.0 \
 		ctor-0.1.9 \
 		darling-0.9.0 \
 		darling_core-0.9.0 \
 		darling_macro-0.9.0 \
 		discard-1.0.4 \
 		emacs-0.11.0 \
 		emacs-macros-0.11.0 \
 		emacs_module-0.10.0 \
 		env_logger-0.6.1 \
 		failure-0.1.5 \
 		failure_derive-0.1.5 \
 		fnv-1.0.6 \
 		getopts-0.2.19 \
 		glob-0.2.11 \
 		hashbrown-0.1.8 \
 		humantime-1.2.0 \
 		ident_case-1.0.1 \
 		itoa-0.4.4 \
 		lazy_static-1.3.0 \
 		libc-0.2.58 \
 		libloading-0.5.1 \
 		log-0.4.6 \
 		memchr-2.2.0 \
 		nom-4.2.3 \
 		numtoa-0.1.0 \
 		peeking_take_while-0.1.2 \
 		proc-macro2-0.4.30 \
 		quick-error-1.2.2 \
 		quote-0.6.13 \
 		redox_syscall-0.1.54 \
 		redox_termios-0.1.1 \
 		regex-1.1.7 \
 		regex-syntax-0.6.7 \
 		rustc-demangle-0.1.15 \
 		rustc_version-0.2.3 \
 		ryu-0.2.8 \
 		scopeguard-0.3.3 \
 		semver-0.9.0 \
 		semver-parser-0.7.0 \
 		serde-1.0.92 \
 		serde_derive-1.0.92 \
 		serde_json-1.0.39 \
 		sha1-0.6.0 \
 		stdweb-0.4.17 \
 		stdweb-derive-0.5.1 \
 		stdweb-internal-macros-0.2.7 \
 		stdweb-internal-runtime-0.1.4 \
 		strsim-0.7.0 \
 		strsim-0.8.0 \
 		syn-0.15.42 \
 		synstructure-0.10.2 \
 		termcolor-1.0.5 \
 		termion-1.5.2 \
 		textwrap-0.11.0 \
 		thread_local-0.3.6 \
 		ucd-util-0.1.3 \
 		unicode-segmentation-1.3.0 \
 		unicode-width-0.1.5 \
 		unicode-xid-0.1.0 \
 		utf8-ranges-1.0.3 \
 		vec_map-0.8.1 \
 		version_check-0.1.5 \
 		wasm-bindgen-0.2.45 \
 		wasm-bindgen-backend-0.2.45 \
 		wasm-bindgen-macro-0.2.45 \
 		wasm-bindgen-macro-support-0.2.45 \
 		wasm-bindgen-shared-0.2.45 \
 		which-2.0.1 \
 		winapi-0.3.7 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-util-0.1.2 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
 		wincolor-1.0.1
 
 PLIST_FILES=	bin/parinfer-rust \
 		lib/libparinfer_rust.so \
 		share/kak/rc/extra/parinfer.kak \
 		share/vim/vimfiles/doc/parinfer.txt \
 		share/vim/vimfiles/plugin/parinfer.vim
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/parinfer-rust
-	${INSTALL_LIB} ${CARGO_TARGET_DIR}/*/libparinfer_rust.so \
+	${INSTALL_LIB} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/libparinfer_rust.so \
 		${STAGEDIR}${PREFIX}/lib
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/kak/rc/extra \
 		${STAGEDIR}${PREFIX}/share/vim/vimfiles/doc \
 		${STAGEDIR}${PREFIX}/share/vim/vimfiles/plugin
 	${INSTALL_DATA} ${WRKSRC}/rc/parinfer.kak \
 		${STAGEDIR}${PREFIX}/share/kak/rc/extra
 	${INSTALL_DATA} ${WRKSRC}/doc/parinfer.txt \
 		${STAGEDIR}${PREFIX}/share/vim/vimfiles/doc
 	${INSTALL_DATA} ${WRKSRC}/plugin/parinfer.vim \
 		${STAGEDIR}${PREFIX}/share/vim/vimfiles/plugin
 
 .include <bsd.port.mk>
diff --git a/games/abstreet/Makefile b/games/abstreet/Makefile
index e32721315db5..bca365d4ccf2 100644
--- a/games/abstreet/Makefile
+++ b/games/abstreet/Makefile
@@ -1,481 +1,481 @@
 PORTNAME=	abstreet
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.9-49
 DISTVERSIONSUFFIX=	-g74aca40c0
 PORTREVISION=	8
 CATEGORIES=	games
 MASTER_SITES=	LOCAL/yuri:data
 DISTFILES=	${PORTNAME}-data-${DISTVERSION}.tgz:data # updated by the update-data target
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Game exploring how changes to city affect drivers/cyclists/pedestrians
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cargo localbase:ldflags python:build xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	dabreegster
 USE_XORG=	xcb
 
 MAKE_ENV=	ABST_DATA_DIR=${DATADIR} ABST_PLAYER_HOME_DIR=1
 
 GH_TUPLE=	dabreegster:earcutr:e029a11b66fd27f2ca2fd457dd37c403485ebba1:earcutr \
 		dabreegster:seattle_traffic_signals:c2b33cc7fc4b922c8d25d88a8b07fb824d235b9d:seattle_traffic_signals \
 		easbar:fast_paths:192ae1997f9857791826ac5ed16892b2f692920c:fast_paths \
 		michaelkirk:winit:a87ae2661263ff241e8868cbf3ce65aab205863a:michaelkirk_winit
 CARGO_CRATES=	RustyXML-0.1.1 \
 		aabb-quadtree-0.1.0 \
 		adler32-1.0.4 \
 		ahash-0.2.18 \
 		aho-corasick-0.7.10 \
 		andrew-0.2.1 \
 		android_glue-0.2.3 \
 		android_log-sys-0.1.2 \
 		ansi_term-0.11.0 \
 		approx-0.3.2 \
 		arc-swap-0.4.7 \
 		arrayvec-0.5.1 \
 		ascii-canvas-1.0.0 \
 		atty-0.2.14 \
 		autocfg-0.1.7 \
 		autocfg-1.0.0 \
 		backtrace-0.2.3 \
 		backtrace-0.3.46 \
 		backtrace-sys-0.1.35 \
 		base-x-0.2.6 \
 		base64-0.11.0 \
 		base64-0.12.1 \
 		bincode-1.2.1 \
 		bit-set-0.5.1 \
 		bit-vec-0.5.1 \
 		bitflags-1.2.1 \
 		block-0.1.6 \
 		block-buffer-0.7.3 \
 		block-padding-0.1.5 \
 		bstr-0.2.12 \
 		built-0.4.2 \
 		bumpalo-3.2.1 \
 		byte-tools-0.3.1 \
 		bytemuck-1.2.0 \
 		byteorder-1.3.4 \
 		bytes-0.5.4 \
 		bzip2-0.3.3 \
 		bzip2-sys-0.1.9+1.0.8 \
 		calloop-0.4.4 \
 		cargo-lock-4.0.1 \
 		cbindgen-0.9.1 \
 		cc-1.0.50 \
 		cfg-if-0.1.10 \
 		cgl-0.3.2 \
 		chrono-0.4.11 \
 		clap-2.33.0 \
 		cloudabi-0.0.3 \
 		crossbeam-channel-0.4.3 \
 		crossbeam-deque-0.7.3 \
 		crossbeam-epoch-0.8.2 \
 		crossbeam-utils-0.7.2 \
 		cocoa-0.20.1 \
 		colorous-1.0.1 \
 		const-random-0.1.8 \
 		const-random-macro-0.1.8 \
 		contour-0.2.0 \
 		core-foundation-0.7.0 \
 		core-foundation-sys-0.7.0 \
 		core-graphics-0.19.0 \
 		core-video-sys-0.1.4 \
 		cpuprofiler-0.0.3 \
 		crc32fast-1.2.0 \
 		csv-1.1.3 \
 		csv-core-0.1.10 \
 		darling-0.10.2 \
 		darling_core-0.10.2 \
 		darling_macro-0.10.2 \
 		data-url-0.1.0 \
 		dbghelp-sys-0.2.0 \
 		debug_unreachable-0.1.1 \
 		deflate-0.8.4 \
 		derivative-2.1.1 \
 		diff-0.1.12 \
 		digest-0.8.1 \
 		discard-1.0.4 \
 		dispatch-0.2.0 \
 		dlib-0.4.1 \
 		docopt-1.1.0 \
 		downcast-rs-1.1.1 \
 		dtoa-0.4.5 \
 		either-1.5.3 \
 		ena-0.11.0 \
 		encoding-0.2.33 \
 		encoding-index-japanese-1.20141219.5 \
 		encoding-index-korean-1.20141219.5 \
 		encoding-index-simpchinese-1.20141219.5 \
 		encoding-index-singlebyte-1.20141219.5 \
 		encoding-index-tradchinese-1.20141219.5 \
 		encoding_index_tests-0.1.4 \
 		encoding_rs-0.8.22 \
 		enumset-1.0.0 \
 		enumset_derive-0.5.0 \
 		error-chain-0.5.0 \
 		euclid-0.20.10 \
 		failure-0.1.7 \
 		failure_derive-0.1.7 \
 		fake-simd-0.1.2 \
 		fixedbitset-0.1.9 \
 		fixedbitset-0.2.0 \
 		flate2-1.0.14 \
 		float-cmp-0.5.3 \
 		float_next_after-0.1.5 \
 		fnv-1.0.6 \
 		fontdb-0.1.0 \
 		foreign-types-0.3.2 \
 		foreign-types-shared-0.1.1 \
 		fuchsia-cprng-0.1.1 \
 		fuchsia-zircon-0.3.3 \
 		fuchsia-zircon-sys-0.3.3 \
 		futf-0.1.4 \
 		futures-channel-0.3.5 \
 		futures-channel-preview-0.3.0-alpha.19 \
 		futures-core-0.3.5 \
 		futures-core-preview-0.3.0-alpha.19 \
 		futures-executor-preview-0.3.0-alpha.19 \
 		futures-io-0.3.5 \
 		futures-macro-0.3.5 \
 		futures-sink-0.3.5 \
 		futures-task-0.3.5 \
 		futures-util-0.3.5 \
 		futures-util-preview-0.3.0-alpha.19 \
 		gdal-0.6.0 \
 		gdal-sys-0.2.0 \
 		generic-array-0.12.3 \
 		geo-0.13.0 \
 		geo-booleanop-0.3.0 \
 		geo-types-0.4.3 \
 		geo-types-0.5.0 \
 		geojson-0.19.0 \
 		getrandom-0.1.14 \
 		gl_generator-0.13.1 \
 		gl_generator-0.14.0 \
 		glob-0.3.0 \
 		glow-0.5.0 \
 		glutin-0.24.1 \
 		glutin_egl_sys-0.1.4 \
 		glutin_emscripten_sys-0.1.1 \
 		glutin_gles2_sys-0.1.4 \
 		glutin_glx_sys-0.1.6 \
 		glutin_wgl_sys-0.1.4 \
 		h2-0.2.5 \
 		hashbrown-0.6.3 \
 		heck-0.3.1 \
 		hermit-abi-0.1.10 \
 		hex-0.4.2 \
 		histogram-0.6.9 \
 		html2runes-1.0.1 \
 		html5ever-0.13.1 \
 		html5ever-atoms-0.2.2 \
 		htmlescape-0.3.1 \
 		http-0.2.1 \
 		http-body-0.3.1 \
 		httparse-1.3.4 \
 		hyper-0.13.7 \
 		hyper-rustls-0.20.0 \
 		ident_case-1.0.1 \
 		idna-0.2.0 \
 		image-0.23.4 \
 		include_dir-0.5.0 \
 		include_dir_impl-0.5.0 \
 		indexmap-1.3.2 \
 		inflate-0.4.5 \
 		instant-0.1.2 \
 		iovec-0.1.4 \
 		itertools-0.8.2 \
 		itertools-0.9.0 \
 		itoa-0.4.5 \
 		jni-sys-0.3.0 \
 		jobserver-0.1.21 \
 		js-sys-0.3.39 \
 		kernel32-sys-0.2.2 \
 		khronos_api-3.1.0 \
 		kurbo-0.6.1 \
 		lalrpop-0.16.3 \
 		lalrpop-util-0.16.3 \
 		lazy_static-0.2.11 \
 		lazy_static-1.4.0 \
 		lazycell-1.2.1 \
 		libc-0.2.68 \
 		libflate-0.1.27 \
 		libloading-0.5.2 \
 		libm-0.1.4 \
 		libm-0.2.1 \
 		line_drawing-0.7.0 \
 		lock_api-0.3.4 \
 		log-0.4.8 \
 		lru-0.4.3 \
 		lttb-0.2.0 \
 		lyon-0.15.8 \
 		lyon_algorithms-0.15.0 \
 		lyon_geom-0.15.3 \
 		lyon_path-0.15.2 \
 		lyon_tessellation-0.15.8 \
 		mac-0.1.1 \
 		malloc_buf-0.0.6 \
 		maplit-1.0.2 \
 		matches-0.1.8 \
 		maybe-uninit-2.0.0 \
 		md5-0.7.0 \
 		memchr-2.3.3 \
 		memmap-0.7.0 \
 		memmap2-0.1.0 \
 		memoffset-0.5.5 \
 		mime-0.3.16 \
 		mime_guess-2.0.3 \
 		miniz_oxide-0.3.6 \
 		mio-0.6.21 \
 		mio-extras-2.0.6 \
 		mio-named-pipes-0.1.6 \
 		mio-uds-0.6.7 \
 		miow-0.2.1 \
 		miow-0.3.5 \
 		nbez-0.1.0 \
 		ndk-0.1.0 \
 		ndk-glue-0.1.0 \
 		ndk-sys-0.1.0 \
 		net2-0.2.33 \
 		new_debug_unreachable-1.0.4 \
 		nix-0.14.1 \
 		num-integer-0.1.42 \
 		num-iter-0.1.40 \
 		num-rational-0.2.4 \
 		num-traits-0.1.43 \
 		num-traits-0.2.11 \
 		num_cpus-1.12.0 \
 		num_enum-0.4.3 \
 		num_enum_derive-0.4.3 \
 		numtoa-0.1.0 \
 		objc-0.2.7 \
 		once_cell-1.3.1 \
 		opaque-debug-0.2.3 \
 		ordered-float-1.0.2 \
 		ordermap-0.3.5 \
 		osmesa-sys-0.1.2 \
 		parking_lot-0.10.2 \
 		parking_lot_core-0.7.1 \
 		pdqselect-0.1.0 \
 		percent-encoding-2.1.0 \
 		petgraph-0.4.13 \
 		petgraph-0.5.0 \
 		petname-1.0.12 \
 		phf-0.7.24 \
 		phf_codegen-0.7.24 \
 		phf_generator-0.7.24 \
 		phf_shared-0.7.24 \
 		pico-args-0.3.3 \
 		pin-project-0.4.23 \
 		pin-project-internal-0.4.23 \
 		pin-project-lite-0.1.5 \
 		pin-utils-0.1.0 \
 		pkg-config-0.3.17 \
 		png-0.16.3 \
 		podio-0.1.6 \
 		polylabel-2.2.0 \
 		ppv-lite86-0.2.6 \
 		precomputed-hash-0.1.1 \
 		priority-queue-1.0.0 \
 		proc-macro-crate-0.1.4 \
 		proc-macro-hack-0.5.15 \
 		proc-macro-nested-0.1.6 \
 		proc-macro2-0.4.30 \
 		proc-macro2-1.0.10 \
 		procfs-0.7.8 \
 		quick-xml-0.18.1 \
 		quote-0.3.15 \
 		quote-0.6.13 \
 		quote-1.0.3 \
 		rand-0.6.5 \
 		rand-0.7.3 \
 		rand_chacha-0.1.1 \
 		rand_chacha-0.2.2 \
 		rand_core-0.3.1 \
 		rand_core-0.4.2 \
 		rand_core-0.5.1 \
 		rand_distr-0.2.2 \
 		rand_hc-0.1.0 \
 		rand_hc-0.2.0 \
 		rand_isaac-0.1.1 \
 		rand_jitter-0.1.4 \
 		rand_os-0.1.3 \
 		rand_pcg-0.1.2 \
 		rand_xorshift-0.1.1 \
 		rand_xorshift-0.2.0 \
 		raw-window-handle-0.3.3 \
 		rayon-1.4.0 \
 		rayon-core-1.8.0 \
 		rctree-0.3.3 \
 		rdrand-0.4.0 \
 		redox_syscall-0.1.56 \
 		redox_termios-0.1.1 \
 		regex-1.3.6 \
 		regex-automata-0.1.9 \
 		regex-syntax-0.6.17 \
 		remove_dir_all-0.5.2 \
 		reqwest-0.10.6 \
 		ring-0.16.12 \
 		rle-decode-fast-1.0.1 \
 		robust-0.1.2 \
 		roxmltree-0.13.0 \
 		rstar-0.7.1 \
 		rustc-demangle-0.1.16 \
 		rustc-hash-1.1.0 \
 		rustc-serialize-0.3.24 \
 		rustc_version-0.2.3 \
 		rustls-0.17.0 \
 		rusttype-0.7.9 \
 		rusttype-0.8.3 \
 		rustybuzz-0.1.1 \
 		ryu-1.0.3 \
 		same-file-1.0.6 \
 		scoped_threadpool-0.1.9 \
 		scopeguard-1.1.0 \
 		sct-0.6.0 \
 		semver-0.9.0 \
 		semver-parser-0.7.0 \
 		serde-0.9.15 \
 		serde-1.0.110 \
 		serde_derive-1.0.110 \
 		serde_json-1.0.51 \
 		serde_urlencoded-0.6.1 \
 		sha1-0.6.0 \
 		sha2-0.8.1 \
 		shared_library-0.1.9 \
 		sid-0.6.1 \
 		signal-hook-registry-1.2.0 \
 		simplecss-0.2.0 \
 		siphasher-0.2.3 \
 		slab-0.4.2 \
 		slotmap-0.4.0 \
 		smallvec-1.3.0 \
 		smithay-client-toolkit-0.6.6 \
 		socket2-0.3.12 \
 		spin-0.5.2 \
 		stb_truetype-0.3.1 \
 		stdweb-0.4.20 \
 		stdweb-derive-0.5.3 \
 		stdweb-internal-macros-0.2.9 \
 		stdweb-internal-runtime-0.1.5 \
 		stretch-0.3.2 \
 		string_cache-0.4.0 \
 		string_cache-0.7.5 \
 		string_cache_codegen-0.3.1 \
 		string_cache_codegen-0.4.4 \
 		string_cache_shared-0.3.0 \
 		strsim-0.8.0 \
 		strsim-0.9.3 \
 		svg_face-0.1.2 \
 		svgtypes-0.5.0 \
 		syn-0.11.11 \
 		syn-1.0.17 \
 		synom-0.11.3 \
 		synstructure-0.12.3 \
 		take_mut-0.2.2 \
 		tempfile-3.1.0 \
 		tendril-0.2.4 \
 		term-0.4.6 \
 		termion-1.5.5 \
 		textwrap-0.11.0 \
 		thiserror-1.0.14 \
 		thiserror-impl-1.0.14 \
 		thread_local-1.0.1 \
 		time-0.1.42 \
 		tokio-0.2.21 \
 		tokio-macros-0.2.5 \
 		tokio-rustls-0.13.1 \
 		tokio-util-0.3.1 \
 		toml-0.5.6 \
 		tower-service-0.3.0 \
 		tracing-0.1.18 \
 		tracing-core-0.1.13 \
 		try-lock-0.2.2 \
 		ttf-parser-0.6.2 \
 		typenum-1.11.2 \
 		unicase-2.6.0 \
 		unicode-bidi-0.3.4 \
 		unicode-normalization-0.1.12 \
 		unicode-script-0.5.0 \
 		unicode-segmentation-1.6.0 \
 		unicode-vo-0.1.0 \
 		unicode-width-0.1.7 \
 		unicode-xid-0.0.4 \
 		unicode-xid-0.1.0 \
 		unicode-xid-0.2.0 \
 		unreachable-0.1.1 \
 		untrusted-0.7.1 \
 		url-2.1.1 \
 		usvg-0.11.0 \
 		utf-8-0.6.0 \
 		uuid-0.8.1 \
 		vec_map-0.8.1 \
 		version_check-0.9.1 \
 		void-1.0.2 \
 		walkdir-2.3.1 \
 		want-0.3.0 \
 		wasi-0.9.0+wasi-snapshot-preview1 \
 		wasm-bindgen-0.2.62 \
 		wasm-bindgen-backend-0.2.62 \
 		wasm-bindgen-futures-0.4.12 \
 		wasm-bindgen-macro-0.2.62 \
 		wasm-bindgen-macro-support-0.2.62 \
 		wasm-bindgen-shared-0.2.62 \
 		wayland-client-0.23.6 \
 		wayland-commons-0.23.6 \
 		wayland-protocols-0.23.6 \
 		wayland-scanner-0.23.6 \
 		wayland-sys-0.23.6 \
 		web-sys-0.3.39 \
 		webbrowser-0.5.2 \
 		webgl_generator-0.2.0 \
 		webgl_stdweb-0.3.0 \
 		webidl-0.8.0 \
 		webpki-0.21.2 \
 		webpki-roots-0.19.0 \
 		widestring-0.4.0 \
 		winapi-0.2.8 \
 		winapi-0.3.8 \
 		winapi-build-0.1.1 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-util-0.1.4 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
 		winreg-0.7.0 \
 		ws2_32-sys-0.2.1 \
 		x11-dl-2.18.5 \
 		xdg-2.2.0 \
 		xml-rs-0.8.2 \
 		xmlparser-0.13.2 \
 		xmltree-0.10.0 \
 		xmlwriter-0.1.0 \
 		zip-0.5.5
 CARGO_USE_GITHUB=	yes
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 # To update this port:
 # 1. Update CARGO_CRATES based on 'make cargo-crates'
 # 2. Run 'make update-data'
 # 3. Upload the abstreet-data distfile
 # 4. Run 'make makesum clean'
 
 update-data: configure
 	# see https://github.com/dabreegster/abstreet/blob/master/docs/dev.md#getting-started for the list of supported cities
 	# huge_seattle is excluded as per this comment: https://github.com/dabreegster/abstreet/issues/192#issuecomment-657938969
 	@(${ECHO} "runtime: seattle,krakow,berlin" && \
 	  ${ECHO} "input: seattle,krakow,berlin") > ${WRKSRC}/data/config
 	@cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${CARGO_CARGO_RUN} run --bin updater && \
 		${TAR} czf ${DISTDIR}/${PORTNAME}-data-${DISTVERSION}.tgz data/system/cities data/system/maps data/system/prebaked_results data/system/scenarios data/config && \
 		${ECHO} "Please upload the file ${DISTDIR}/${PORTNAME}-data-${DISTVERSION}.tgz"
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/target/release/game ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-game
+	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/game ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-game
 	cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 	cd ${WRKDIR}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/multimedia/kooha/files/patch-build-aux_cargo.sh b/multimedia/kooha/files/patch-build-aux_cargo.sh
new file mode 100644
index 000000000000..058d5e193b37
--- /dev/null
+++ b/multimedia/kooha/files/patch-build-aux_cargo.sh
@@ -0,0 +1,18 @@
+--- build-aux/cargo.sh.orig	2021-09-10 08:14:31 UTC
++++ build-aux/cargo.sh
+@@ -8,13 +8,13 @@ export CARGO_HOME="$MESON_BUILD_ROOT"/cargo-home
+ if [ "$4" = "Devel" ]
+ then
+     echo "DEBUG MODE"
+     cargo build --manifest-path \
+         "$MESON_SOURCE_ROOT"/Cargo.toml && \
+-        cp "$CARGO_TARGET_DIR"/debug/$5 $3
++        cp "$CARGO_TARGET_DIR"/$CARGO_BUILD_TARGET/debug/$5 $3
+ else
+     echo "RELEASE MODE"
+     cargo build --manifest-path \
+         "$MESON_SOURCE_ROOT"/Cargo.toml --release && \
+-        cp "$CARGO_TARGET_DIR"/release/$5 $3
++        cp "$CARGO_TARGET_DIR"/$CARGO_BUILD_TARGET/release/$5 $3
+ fi
+ 
diff --git a/net-im/libsignal-client/Makefile b/net-im/libsignal-client/Makefile
index 56142af35d17..ddd49c1435f4 100644
--- a/net-im/libsignal-client/Makefile
+++ b/net-im/libsignal-client/Makefile
@@ -1,240 +1,240 @@
 PORTNAME=	libsignal-client
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8.3
 PORTREVISION=	1
 CATEGORIES=	net-im java
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Implementation of the Signal client protocol
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	protoc:devel/protobuf
 
 USES=		cargo ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	signalapp
 GH_TUPLE=	signalapp:curve25519-dalek:2694ad3b789635f90f941648ae952f58d59ffc73:curvedalek \
 		signalapp:neon:signal-2021-06-02:neon
 USE_LDCONFIG=	yes
 
 CARGO_CRATES=	addr2line-0.14.1 \
 		adler-1.0.2 \
 		aead-0.4.1 \
 		aes-0.7.4 \
 		aes-gcm-siv-0.10.1 \
 		aho-corasick-0.7.15 \
 		anyhow-1.0.38 \
 		arrayref-0.3.6 \
 		async-trait-0.1.42 \
 		atty-0.2.14 \
 		autocfg-0.1.7 \
 		autocfg-1.0.1 \
 		backtrace-0.3.56 \
 		base64-0.12.3 \
 		bitflags-1.2.1 \
 		block-buffer-0.9.0 \
 		block-modes-0.8.1 \
 		block-padding-0.2.1 \
 		bstr-0.2.15 \
 		bumpalo-3.6.1 \
 		byteorder-1.4.2 \
 		bytes-1.0.1 \
 		cast-0.2.3 \
 		cc-1.0.67 \
 		cesu8-1.1.0 \
 		cfg-if-0.1.10 \
 		cfg-if-1.0.0 \
 		chrono-0.4.19 \
 		cipher-0.3.0 \
 		clap-2.33.3 \
 		combine-4.5.2 \
 		cpufeatures-0.1.5 \
 		cpuid-bool-0.1.2 \
 		criterion-0.3.4 \
 		criterion-plot-0.4.3 \
 		crossbeam-channel-0.5.0 \
 		crossbeam-deque-0.8.0 \
 		crossbeam-epoch-0.9.2 \
 		crossbeam-utils-0.8.2 \
 		crypto-mac-0.9.1 \
 		cslice-0.2.0 \
 		csv-1.1.5 \
 		csv-core-0.1.10 \
 		ctr-0.7.0 \
 		derivative-2.2.0 \
 		digest-0.9.0 \
 		either-1.6.1 \
 		fixedbitset-0.2.0 \
 		foreign-types-0.3.2 \
 		foreign-types-shared-0.1.1 \
 		futures-core-0.3.13 \
 		futures-macro-0.3.13 \
 		futures-task-0.3.13 \
 		futures-util-0.3.13 \
 		generator-0.6.24 \
 		generic-array-0.14.4 \
 		getrandom-0.1.16 \
 		getrandom-0.2.2 \
 		ghash-0.4.2 \
 		gimli-0.23.0 \
 		half-1.7.1 \
 		hashbrown-0.9.1 \
 		heck-0.3.2 \
 		hermit-abi-0.1.18 \
 		hex-0.4.2 \
 		hmac-0.9.0 \
 		indexmap-1.6.1 \
 		itertools-0.9.0 \
 		itertools-0.10.0 \
 		itoa-0.4.7 \
 		jni-0.19.0 \
 		jni-sys-0.3.0 \
 		js-sys-0.3.47 \
 		keccak-0.1.0 \
 		lazy_static-1.4.0 \
 		libc-0.2.97 \
 		libloading-0.6.7 \
 		libm-0.2.1 \
 		linkme-0.2.4 \
 		linkme-impl-0.2.4 \
 		log-0.4.14 \
 		log-panics-2.0.0 \
 		loom-0.4.0 \
 		memchr-2.3.4 \
 		memoffset-0.6.1 \
 		miniz_oxide-0.4.4 \
 		multimap-0.8.2 \
 		num-bigint-0.2.6 \
 		num-bigint-dig-0.6.1 \
 		num-integer-0.1.44 \
 		num-iter-0.1.42 \
 		num-traits-0.2.14 \
 		num_cpus-1.13.0 \
 		num_enum-0.5.1 \
 		num_enum_derive-0.5.1 \
 		object-0.23.0 \
 		oid-0.1.1 \
 		once_cell-1.7.2 \
 		oorandom-11.1.3 \
 		opaque-debug-0.3.0 \
 		openssl-0.10.32 \
 		openssl-sys-0.9.60 \
 		packed_simd-0.3.3 \
 		paste-1.0.4 \
 		pem-0.8.1 \
 		petgraph-0.5.1 \
 		picky-6.2.0 \
 		picky-asn1-0.3.1 \
 		picky-asn1-der-0.2.4 \
 		picky-asn1-x509-0.5.0 \
 		pin-project-lite-0.2.4 \
 		pin-utils-0.1.0 \
 		pkg-config-0.3.19 \
 		plotters-0.3.0 \
 		plotters-backend-0.3.0 \
 		plotters-svg-0.3.0 \
 		polyval-0.5.1 \
 		ppv-lite86-0.2.10 \
 		proc-macro-crate-0.1.5 \
 		proc-macro-hack-0.5.19 \
 		proc-macro-nested-0.1.7 \
 		proc-macro2-1.0.24 \
 		prost-0.7.0 \
 		prost-build-0.7.0 \
 		prost-derive-0.7.0 \
 		prost-types-0.7.0 \
 		quote-1.0.9 \
 		rand-0.7.3 \
 		rand-0.8.3 \
 		rand_chacha-0.2.2 \
 		rand_chacha-0.3.0 \
 		rand_core-0.5.1 \
 		rand_core-0.6.2 \
 		rand_hc-0.2.0 \
 		rand_hc-0.3.0 \
 		rayon-1.5.0 \
 		rayon-core-1.9.0 \
 		redox_syscall-0.2.5 \
 		regex-1.4.3 \
 		regex-automata-0.1.9 \
 		regex-syntax-0.6.22 \
 		remove_dir_all-0.5.3 \
 		rsa-0.3.0 \
 		rustc-demangle-0.1.18 \
 		rustc_version-0.2.3 \
 		rustversion-1.0.4 \
 		ryu-1.0.5 \
 		same-file-1.0.6 \
 		scoped-tls-1.0.0 \
 		scopeguard-1.1.0 \
 		semver-0.9.0 \
 		semver-parser-0.7.0 \
 		serde-1.0.123 \
 		serde_bytes-0.11.5 \
 		serde_cbor-0.11.1 \
 		serde_derive-1.0.123 \
 		serde_json-1.0.62 \
 		sha-1-0.9.4 \
 		sha2-0.9.3 \
 		sha3-0.9.1 \
 		simple_asn1-0.4.1 \
 		slab-0.4.2 \
 		smallvec-1.6.1 \
 		spin-0.5.2 \
 		static_assertions-1.1.0 \
 		subtle-2.4.0 \
 		syn-1.0.60 \
 		syn-mid-0.5.3 \
 		synstructure-0.12.4 \
 		tempfile-3.2.0 \
 		textwrap-0.11.0 \
 		thiserror-1.0.24 \
 		thiserror-impl-1.0.24 \
 		thread_local-1.1.3 \
 		time-0.1.43 \
 		tinytemplate-1.2.0 \
 		toml-0.5.8 \
 		typenum-1.12.0 \
 		unicode-segmentation-1.7.1 \
 		unicode-width-0.1.8 \
 		unicode-xid-0.2.1 \
 		universal-hash-0.4.0 \
 		unzip3-1.0.0 \
 		uuid-0.8.2 \
 		vcpkg-0.2.11 \
 		version_check-0.9.2 \
 		walkdir-2.3.1 \
 		wasi-0.9.0+wasi-snapshot-preview1 \
 		wasi-0.10.2+wasi-snapshot-preview1 \
 		wasm-bindgen-0.2.70 \
 		wasm-bindgen-backend-0.2.70 \
 		wasm-bindgen-macro-0.2.70 \
 		wasm-bindgen-macro-support-0.2.70 \
 		wasm-bindgen-shared-0.2.70 \
 		web-sys-0.3.47 \
 		which-4.0.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 \
 		x25519-dalek-1.1.0 \
 		zeroize-1.2.0 \
 		zeroize_derive-1.0.1
 CARGO_USE_GITHUB=	yes
 CARGO_BUILD_ARGS=	--package libsignal-jni
 CARGO_INSTALL=		no
 # requires nightly features to build:
 # https://github.com/signalapp/libsignal-client/issues/141
 MAKE_ENV=		CARGO_PROFILE_RELEASE_LTO=thin \
 			OPENSSL_INCLUDE_DIR=${OPENSSLINC} \
 			OPENSSL_LIB_DIR=${OPENSSLLIB} \
 			RUSTC_BOOTSTRAP=1
 PLIST_FILES=		lib/libsignal_jni.so
 
 do-install:
-	${INSTALL_LIB} ${CARGO_TARGET_DIR}/release/libsignal_jni.so \
+	${INSTALL_LIB} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/libsignal_jni.so \
 		${STAGEDIR}${PREFIX}/lib/
 
 .include <bsd.port.mk>
diff --git a/net-im/zkgroup/Makefile b/net-im/zkgroup/Makefile
index 9fb9fb7e123e..1d67e4317728 100644
--- a/net-im/zkgroup/Makefile
+++ b/net-im/zkgroup/Makefile
@@ -1,140 +1,140 @@
 PORTNAME=	zkgroup
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.7.3
 PORTREVISION=	2
 CATEGORIES=	net-im
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Library for the Signal Private Group System
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cargo
 USE_GITHUB=	yes
 GH_ACCOUNT=	signalapp
 GH_TUPLE=	signalapp:curve25519-dalek:477356e017c7cc2aa168f956786b34690870768f:curvedalek \
 		signalapp:poksho:v0.7.0:poksho
 USE_JAVA=	yes
 JAVA_VERSION=	11+
 USE_LDCONFIG=	yes
 
 CARGO_CRATES=	aead-0.4.1 \
 		aes-0.7.4 \
 		aes-gcm-siv-0.10.0 \
 		ascii-0.9.3 \
 		atty-0.2.14 \
 		autocfg-1.0.1 \
 		bincode-1.3.3 \
 		bitflags-1.2.1 \
 		block-buffer-0.7.3 \
 		block-padding-0.1.5 \
 		bstr-0.2.16 \
 		bumpalo-3.7.0 \
 		byte-tools-0.3.1 \
 		byteorder-1.4.3 \
 		cast-0.2.6 \
 		cesu8-1.1.0 \
 		cfg-if-0.1.10 \
 		cfg-if-1.0.0 \
 		cipher-0.3.0 \
 		clap-2.33.3 \
 		combine-3.8.1 \
 		cpufeatures-0.1.4 \
 		criterion-0.3.4 \
 		criterion-plot-0.4.3 \
 		crossbeam-channel-0.5.1 \
 		crossbeam-deque-0.8.0 \
 		crossbeam-epoch-0.9.5 \
 		crossbeam-utils-0.8.5 \
 		crypto-mac-0.7.0 \
 		csv-1.1.6 \
 		csv-core-0.1.10 \
 		ctr-0.7.0 \
 		digest-0.8.1 \
 		either-1.6.1 \
 		error-chain-0.12.4 \
 		fake-simd-0.1.2 \
 		generic-array-0.12.4 \
 		generic-array-0.14.4 \
 		getrandom-0.1.16 \
 		half-1.7.1 \
 		hermit-abi-0.1.18 \
 		hex-0.4.3 \
 		hmac-0.7.1 \
 		itertools-0.9.0 \
 		itertools-0.10.0 \
 		itoa-0.4.7 \
 		jni-0.16.0 \
 		jni-sys-0.3.0 \
 		js-sys-0.3.51 \
 		lazy_static-1.4.0 \
 		libc-0.2.95 \
 		log-0.4.14 \
 		memchr-2.4.0 \
 		memoffset-0.6.4 \
 		num-traits-0.2.14 \
 		num_cpus-1.13.0 \
 		oorandom-11.1.3 \
 		opaque-debug-0.2.3 \
 		opaque-debug-0.3.0 \
 		packed_simd-0.3.3 \
 		pest-2.1.3 \
 		plotters-0.3.1 \
 		plotters-backend-0.3.0 \
 		plotters-svg-0.3.0 \
 		polyval-0.5.1 \
 		proc-macro2-1.0.27 \
 		quote-1.0.9 \
 		rand_core-0.5.1 \
 		rayon-1.5.1 \
 		rayon-core-1.9.1 \
 		regex-1.5.4 \
 		regex-automata-0.1.10 \
 		regex-syntax-0.6.25 \
 		rustc_version-0.3.3 \
 		ryu-1.0.5 \
 		same-file-1.0.6 \
 		scopeguard-1.1.0 \
 		semver-0.11.0 \
 		semver-parser-0.10.2 \
 		serde-1.0.126 \
 		serde_cbor-0.11.1 \
 		serde_derive-1.0.126 \
 		serde_json-1.0.64 \
 		sha2-0.8.2 \
 		subtle-1.0.0 \
 		subtle-2.4.0 \
 		syn-1.0.72 \
 		textwrap-0.11.0 \
 		tinytemplate-1.2.1 \
 		typenum-1.13.0 \
 		ucd-trie-0.1.3 \
 		unicode-width-0.1.8 \
 		unicode-xid-0.2.2 \
 		universal-hash-0.4.0 \
 		unreachable-1.0.0 \
 		version_check-0.9.3 \
 		void-1.0.2 \
 		walkdir-2.3.2 \
 		wasi-0.9.0+wasi-snapshot-preview1 \
 		wasm-bindgen-0.2.74 \
 		wasm-bindgen-backend-0.2.74 \
 		wasm-bindgen-macro-0.2.74 \
 		wasm-bindgen-macro-support-0.2.74 \
 		wasm-bindgen-shared-0.2.74 \
 		web-sys-0.3.51 \
 		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 \
 		zeroize-1.3.0
 CARGO_USE_GITHUB=	yes
 
 PLIST_FILES=	lib/lib${PORTNAME}.so
 
 do-install:
-	${INSTALL_LIB} ${WRKDIR}/target/release/lib${PORTNAME}.so \
+	${INSTALL_LIB} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/lib${PORTNAME}.so \
 		${STAGEDIR}${PREFIX}/lib/
 
 .include <bsd.port.mk>
diff --git a/net/quiche/Makefile b/net/quiche/Makefile
index 92408169d2e4..03a77ac30d2b 100644
--- a/net/quiche/Makefile
+++ b/net/quiche/Makefile
@@ -1,160 +1,160 @@
 PORTNAME=	quiche
 PORTVERSION=	0.8.1
 PORTREVISION=	4
 CATEGORIES=	net
 
 MAINTAINER=	junho.choi@gmail.com
 COMMENT=	Savoury implementation of the QUIC transport protocol and HTTP/3
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cargo
 USE_GITHUB=	yes
 GH_ACCOUNT=	cloudflare
 GH_TAGNAME=	${PORTVERSION}
 GH_TUPLE=	google:boringssl:067cfd92f:boringssl/deps/boringssl
 
 CARGO_CRATES=	aho-corasick-0.7.15 \
 		ansi_term-0.11.0 \
 		atty-0.2.14 \
 		autocfg-1.0.1 \
 		bindgen-0.57.0 \
 		bitflags-1.2.1 \
 		boring-sys-1.1.1 \
 		bumpalo-3.6.1 \
 		cc-1.0.67 \
 		cexpr-0.4.0 \
 		cfg-if-0.1.10 \
 		cfg-if-1.0.0 \
 		clang-sys-1.2.0 \
 		clap-2.33.3 \
 		cmake-0.1.45 \
 		darling-0.12.3 \
 		darling_core-0.12.3 \
 		darling_macro-0.12.3 \
 		docopt-1.1.1 \
 		env_logger-0.6.2 \
 		env_logger-0.8.3 \
 		fnv-1.0.7 \
 		fuchsia-zircon-0.3.3 \
 		fuchsia-zircon-sys-0.3.3 \
 		glob-0.3.0 \
 		hashbrown-0.9.1 \
 		hermit-abi-0.1.18 \
 		humantime-1.3.0 \
 		humantime-2.1.0 \
 		ident_case-1.0.1 \
 		idna-0.1.5 \
 		indexmap-1.6.2 \
 		iovec-0.1.4 \
 		itoa-0.4.7 \
 		js-sys-0.3.50 \
 		kernel32-sys-0.2.2 \
 		lazy_static-1.4.0 \
 		lazycell-1.3.0 \
 		libc-0.2.93 \
 		libloading-0.7.0 \
 		libm-0.2.1 \
 		log-0.4.14 \
 		matches-0.1.8 \
 		memchr-2.3.4 \
 		mio-0.6.23 \
 		miow-0.2.2 \
 		net2-0.2.37 \
 		nom-5.1.2 \
 		once_cell-1.7.2 \
 		peeking_take_while-0.1.2 \
 		percent-encoding-1.0.1 \
 		proc-macro2-1.0.26 \
 		quick-error-1.2.3 \
 		quote-1.0.9 \
 		regex-1.4.5 \
 		regex-syntax-0.6.23 \
 		ring-0.16.20 \
 		rustc-hash-1.1.0 \
 		rustversion-1.0.4 \
 		ryu-1.0.5 \
 		serde-1.0.125 \
 		serde_derive-1.0.125 \
 		serde_json-1.0.64 \
 		serde_with-1.8.0 \
 		serde_with_macros-1.4.1 \
 		shlex-0.1.1 \
 		slab-0.4.2 \
 		spin-0.5.2 \
 		strsim-0.8.0 \
 		strsim-0.10.0 \
 		syn-1.0.69 \
 		termcolor-1.1.2 \
 		textwrap-0.11.0 \
 		tinyvec-1.2.0 \
 		tinyvec_macros-0.1.0 \
 		unicode-bidi-0.3.5 \
 		unicode-normalization-0.1.17 \
 		unicode-width-0.1.8 \
 		unicode-xid-0.2.1 \
 		untrusted-0.7.1 \
 		url-1.7.2 \
 		vec_map-0.8.2 \
 		version_check-0.9.3 \
 		wasm-bindgen-0.2.73 \
 		wasm-bindgen-backend-0.2.73 \
 		wasm-bindgen-macro-0.2.73 \
 		wasm-bindgen-macro-support-0.2.73 \
 		wasm-bindgen-shared-0.2.73 \
 		web-sys-0.3.50 \
 		which-3.1.1 \
 		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 \
 		ws2_32-sys-0.2.1
 
 CARGO_CARGOLOCK=	${QUICHEAPPS_CARGOLOCK}
 CARGO_CARGOTOML=	${QUICHEAPPS_CARGOTOML}
 CARGO_FEATURES=	--no-default-features
 
 PLIST_FILES=	bin/quiche-client \
 		bin/quiche-server \
 		include/quiche.h \
 		lib/libquiche.a \
 		lib/libquiche.so
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS QLOG
 OPTIONS_DEFAULT=DOCS QLOG
 
 QLOG_DESC=	Enable qlog support
 QLOG_VARS=	CARGO_FEATURES+=qlog
 
 LIBQUICHE_CARGOTOML=	${WRKSRC}/Cargo.toml
 QUICHEAPPS_CARGOLOCK=	${WRKSRC}/tools/apps/Cargo.lock
 QUICHEAPPS_CARGOTOML=	${WRKSRC}/tools/apps/Cargo.toml
 
 # build libquiche and apps
 do-build:
 	@${CARGO_CARGO_RUN} build \
 		--manifest-path ${LIBQUICHE_CARGOTOML} \
 		--verbose \
 		${CARGO_BUILD_ARGS}
 	@${CARGO_CARGO_RUN} build \
 		--manifest-path ${QUICHEAPPS_CARGOTOML} \
 		--verbose \
 		${CARGO_BUILD_ARGS}
 
 # install quiche apps and libquiche
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/quiche.h ${STAGEDIR}${PREFIX}/include
-	${INSTALL_LIB} ${CARGO_TARGET_DIR}/release/libquiche.so ${STAGEDIR}${PREFIX}/lib
-	${INSTALL_LIB} ${CARGO_TARGET_DIR}/release/libquiche.a ${STAGEDIR}${PREFIX}/lib
-	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/release/quiche-server ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/release/quiche-client ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_LIB} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/libquiche.so ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/libquiche.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/quiche-server ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/quiche-client ${STAGEDIR}${PREFIX}/bin
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/security/arti/Makefile b/security/arti/Makefile
index 3514e8e39769..5aebcc585121 100644
--- a/security/arti/Makefile
+++ b/security/arti/Makefile
@@ -1,296 +1,296 @@
 PORTNAME=	arti
 DISTVERSION=	0.0.0.20210812
 PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	cs@FreeBSD.org
 COMMENT=	Implementation of Tor, in Rust
 
 LICENSE=	MIT
 
 USES=		cargo ssl sqlite
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.torproject.org
 GL_ACCOUNT=	tpo/core
 GL_COMMIT=	d2172b518d40f56d242d6803c16613a33af52e99
 CARGO_INSTALL=	no
 CARGO_CRATES=	adler-1.0.2 \
 		aes-0.7.4 \
 		ahash-0.7.4 \
 		anyhow-1.0.42 \
 		argh-0.1.5 \
 		argh_derive-0.1.5 \
 		argh_shared-0.1.5 \
 		arrayref-0.3.6 \
 		arrayvec-0.5.2 \
 		async-channel-1.6.1 \
 		async-compression-0.3.8 \
 		async-ctrlc-1.2.0 \
 		async-executor-1.4.1 \
 		async-global-executor-2.0.2 \
 		async-io-1.6.0 \
 		async-lock-2.4.0 \
 		async-mutex-1.4.0 \
 		async-native-tls-0.3.3 \
 		async-process-1.2.0 \
 		async-std-1.9.0 \
 		async-task-4.0.3 \
 		async-trait-0.1.51 \
 		async_executors-0.4.2 \
 		asynchronous-codec-0.6.0 \
 		atomic-0.5.0 \
 		atomic-waker-1.0.0 \
 		autocfg-0.1.7 \
 		autocfg-1.0.1 \
 		base64-0.13.0 \
 		base64ct-1.0.0 \
 		bitflags-1.3.1 \
 		blanket-0.2.0 \
 		block-buffer-0.9.0 \
 		block-padding-0.2.1 \
 		blocking-1.0.2 \
 		bounded-vec-deque-0.1.1 \
 		bumpalo-3.7.0 \
 		byteorder-1.4.3 \
 		bytes-1.0.1 \
 		cache-padded-1.1.1 \
 		cargo-husky-1.5.0 \
 		cc-1.0.69 \
 		cfg-if-1.0.0 \
 		chrono-0.4.19 \
 		cipher-0.3.0 \
 		concurrent-queue-1.2.2 \
 		config-0.11.0 \
 		const-oid-0.6.0 \
 		convert_case-0.4.0 \
 		core-foundation-0.9.1 \
 		core-foundation-sys-0.8.2 \
 		cpufeatures-0.1.5 \
 		crc32fast-1.2.1 \
 		crossbeam-queue-0.3.2 \
 		crossbeam-utils-0.8.5 \
 		crypto-bigint-0.2.2 \
 		crypto-mac-0.11.1 \
 		ctor-0.1.20 \
 		ctr-0.7.0 \
 		ctrlc-3.2.0 \
 		curve25519-dalek-3.2.0 \
 		darling-0.12.4 \
 		darling_core-0.12.4 \
 		darling_macro-0.12.4 \
 		der-0.4.1 \
 		derive_builder-0.10.2 \
 		derive_builder_core-0.10.2 \
 		derive_builder_macro-0.10.2 \
 		derive_more-0.99.16 \
 		digest-0.9.0 \
 		directories-3.0.2 \
 		dirs-3.0.2 \
 		dirs-next-2.0.0 \
 		dirs-sys-0.3.6 \
 		dirs-sys-next-0.1.2 \
 		ed25519-1.2.0 \
 		ed25519-dalek-1.0.1 \
 		either-1.6.1 \
 		event-listener-2.5.1 \
 		fallible-iterator-0.2.0 \
 		fallible-streaming-iterator-0.1.9 \
 		fastrand-1.5.0 \
 		flate2-1.0.20 \
 		fnv-1.0.7 \
 		foreign-types-0.3.2 \
 		foreign-types-shared-0.1.1 \
 		form_urlencoded-1.0.1 \
 		fslock-0.1.7 \
 		futures-0.3.16 \
 		futures-await-test-0.3.0 \
 		futures-await-test-macro-0.3.0 \
 		futures-channel-0.3.16 \
 		futures-core-0.3.16 \
 		futures-executor-0.3.16 \
 		futures-io-0.3.16 \
 		futures-lite-1.12.0 \
 		futures-macro-0.3.16 \
 		futures-sink-0.3.16 \
 		futures-task-0.3.16 \
 		futures-util-0.3.16 \
 		generic-array-0.14.4 \
 		getrandom-0.1.16 \
 		getrandom-0.2.3 \
 		gloo-timers-0.2.1 \
 		hashbrown-0.11.2 \
 		hashlink-0.7.0 \
 		heck-0.3.3 \
 		hermit-abi-0.1.19 \
 		hex-0.4.3 \
 		hex-literal-0.3.3 \
 		hkdf-0.11.0 \
 		hmac-0.11.0 \
 		http-0.2.4 \
 		httparse-1.4.1 \
 		httpdate-1.0.1 \
 		humantime-2.1.0 \
 		humantime-serde-1.0.1 \
 		ident_case-1.0.1 \
 		idna-0.2.3 \
 		instant-0.1.10 \
 		itertools-0.10.1 \
 		itoa-0.4.7 \
 		jobserver-0.1.23 \
 		js-sys-0.3.52 \
 		keccak-0.1.0 \
 		kv-log-macro-1.0.7 \
 		lazy_static-1.4.0 \
 		lexical-core-0.7.6 \
 		libc-0.2.99 \
 		libm-0.2.1 \
 		libsqlite3-sys-0.22.2 \
 		log-0.4.14 \
 		lzma-sys-0.1.17 \
 		matches-0.1.9 \
 		memchr-2.4.0 \
 		memmap2-0.3.0 \
 		memoffset-0.6.4 \
 		merlin-2.0.1 \
 		miniz_oxide-0.4.4 \
 		mio-0.7.13 \
 		miow-0.3.7 \
 		native-tls-0.2.8 \
 		nix-0.22.0 \
 		nom-5.1.2 \
 		ntapi-0.3.6 \
 		num-bigint-0.4.0 \
 		num-bigint-dig-0.7.0 \
 		num-integer-0.1.44 \
 		num-iter-0.1.42 \
 		num-traits-0.2.14 \
 		num_cpus-1.13.0 \
 		once_cell-1.8.0 \
 		opaque-debug-0.3.0 \
 		openssl-0.10.35 \
 		openssl-probe-0.1.4 \
 		openssl-sys-0.9.65 \
 		parking-2.0.0 \
 		pem-rfc7468-0.2.0 \
 		percent-encoding-2.1.0 \
 		pest-2.1.3 \
 		phf-0.9.0 \
 		phf_generator-0.9.1 \
 		phf_macros-0.9.0 \
 		phf_shared-0.9.0 \
 		pin-project-1.0.8 \
 		pin-project-internal-1.0.8 \
 		pin-project-lite-0.2.7 \
 		pin-utils-0.1.0 \
 		pkcs1-0.2.3 \
 		pkcs8-0.7.5 \
 		pkg-config-0.3.19 \
 		polling-2.1.0 \
 		postage-0.4.1 \
 		ppv-lite86-0.2.10 \
 		proc-macro-hack-0.5.19 \
 		proc-macro-nested-0.1.7 \
 		proc-macro2-1.0.28 \
 		quote-1.0.9 \
 		rand-0.7.3 \
 		rand-0.8.4 \
 		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_hc-0.3.1 \
 		redox_syscall-0.1.57 \
 		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 \
 		rsa-0.5.0 \
 		rusqlite-0.25.3 \
 		rustc_version-0.3.3 \
 		rustc_version-0.4.0 \
 		ryu-1.0.5 \
 		sanitize-filename-0.3.0 \
 		schannel-0.1.19 \
 		security-framework-2.3.1 \
 		security-framework-sys-2.3.0 \
 		semver-0.11.0 \
 		semver-1.0.4 \
 		semver-parser-0.10.2 \
 		serde-1.0.127 \
 		serde_derive-1.0.127 \
 		serde_test-1.0.127 \
 		sha-1-0.9.7 \
 		sha2-0.9.5 \
 		sha3-0.9.1 \
 		shellexpand-2.1.0 \
 		signal-hook-0.3.9 \
 		signal-hook-registry-1.4.0 \
 		signature-1.3.1 \
 		simple-logging-2.0.2 \
 		simple_asn1-0.5.4 \
 		siphasher-0.3.6 \
 		slab-0.4.4 \
 		smallvec-1.6.1 \
 		socket2-0.4.1 \
 		spin-0.5.2 \
 		spki-0.4.0 \
 		static_assertions-1.1.0 \
 		strsim-0.10.0 \
 		subtle-2.4.1 \
 		syn-1.0.74 \
 		synstructure-0.12.5 \
 		tempfile-3.2.0 \
 		thiserror-1.0.26 \
 		thiserror-impl-1.0.26 \
 		thread-id-3.3.0 \
 		time-0.1.44 \
 		tinyvec-1.3.1 \
 		tinyvec_macros-0.1.0 \
 		tokio-1.10.0 \
 		tokio-native-tls-0.3.0 \
 		tokio-util-0.6.7 \
 		toml-0.5.8 \
 		typenum-1.13.0 \
 		ucd-trie-0.1.3 \
 		unicode-bidi-0.3.5 \
 		unicode-normalization-0.1.19 \
 		unicode-segmentation-1.8.0 \
 		unicode-xid-0.2.2 \
 		url-2.2.2 \
 		value-bag-1.0.0-alpha.7 \
 		vcpkg-0.2.15 \
 		version_check-0.9.3 \
 		waker-fn-1.1.0 \
 		wasi-0.9.0+wasi-snapshot-preview1 \
 		wasi-0.10.0+wasi-snapshot-preview1 \
 		wasm-bindgen-0.2.75 \
 		wasm-bindgen-backend-0.2.75 \
 		wasm-bindgen-futures-0.4.25 \
 		wasm-bindgen-macro-0.2.75 \
 		wasm-bindgen-macro-support-0.2.75 \
 		wasm-bindgen-shared-0.2.75 \
 		weak-table-0.3.0 \
 		web-sys-0.3.52 \
 		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 \
 		x25519-dalek-1.1.1 \
 		xz2-0.1.6 \
 		zeroize-1.4.1 \
 		zeroize_derive-1.1.0 \
 		zstd-0.7.0+zstd.1.4.9 \
 		zstd-safe-3.1.0+zstd.1.4.9 \
 		zstd-sys-1.5.0+zstd.1.4.9
 
 PLIST_FILES=	bin/arti
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/target/release/arti ${STAGEDIR}${PREFIX}/bin/arti
+	${INSTALL_SCRIPT} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/arti ${STAGEDIR}${PREFIX}/bin/arti
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/arti
 
 .include <bsd.port.mk>
diff --git a/security/authenticator/files/patch-build-aux_cargo.sh b/security/authenticator/files/patch-build-aux_cargo.sh
new file mode 100644
index 000000000000..4682a5974221
--- /dev/null
+++ b/security/authenticator/files/patch-build-aux_cargo.sh
@@ -0,0 +1,15 @@
+--- build-aux/cargo.sh.orig	2021-09-08 15:33:49 UTC
++++ build-aux/cargo.sh
+@@ -12,10 +12,10 @@ if [ "$BUILDTYPE" = "release" ]; then
+     echo "RELEASE MODE"
+     cargo build --manifest-path \
+         "$MESON_SOURCE_ROOT"/Cargo.toml --release &&
+-        cp "$CARGO_TARGET_DIR"/release/"$APP_BIN" "$OUTPUT"
++        cp "$CARGO_TARGET_DIR"/$CARGO_BUILD_TARGET/release/"$APP_BIN" "$OUTPUT"
+ else
+     echo "DEBUG MODE"
+     cargo build --manifest-path \
+         "$MESON_SOURCE_ROOT"/Cargo.toml &&
+-        cp "$CARGO_TARGET_DIR"/debug/"$APP_BIN" "$OUTPUT"
++        cp "$CARGO_TARGET_DIR"/$CARGO_BUILD_TARGET/debug/"$APP_BIN" "$OUTPUT"
+ fi
diff --git a/security/sequoia/Makefile b/security/sequoia/Makefile
index df313b4195ea..3fb8334b1899 100644
--- a/security/sequoia/Makefile
+++ b/security/sequoia/Makefile
@@ -1,337 +1,336 @@
 PORTNAME=	sequoia
 PORTVERSION=	0.19.0
 DISTVERSIONPREFIX=	v
 PORTREVISION=	8
 CATEGORIES=	security
 
 MAINTAINER=	phryk-ports@wzff.de
 COMMENT=	Modern PGP implementation, written in rust
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS+=	llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT}
 LIB_DEPENDS+=	libcapnp.so:devel/capnproto
 LIB_DEPENDS+=	libgmp.so:math/gmp
 LIB_DEPENDS+=	libnettle.so:security/nettle
 
 USES=		cargo ssl
 USE_LDCONFIG=	yes
 USE_GITLAB=	yes
 GL_ACCOUNT=	sequoia-pgp
 GL_PROJECT=	sequoia
 GL_COMMIT=	383133f6be990237044900a4df676488bf8dd71e
 CARGO_BUILD_ARGS+=	--all
 
 SOVERS=	${PORTVERSION}
 
 SUB_LIST=	VERSION=${SOVERS}
 SUB_FILES=	sequoia-openpgp.pc
 SUB_FILES+=	sequoia.pc
 
 # autogenerated by make cargo-crates
 CARGO_CRATES=	adler32-1.2.0 \
 		aho-corasick-0.7.13 \
 		ansi_term-0.11.0 \
 		anyhow-1.0.32 \
 		arrayref-0.3.6 \
 		arrayvec-0.5.1 \
 		ascii-canvas-2.0.0 \
 		assert_cli-0.6.3 \
 		atty-0.2.14 \
 		autocfg-0.1.7 \
 		autocfg-1.0.1 \
 		backtrace-0.3.46 \
 		backtrace-sys-0.1.37 \
 		base64-0.11.0 \
 		base64-0.12.3 \
 		bindgen-0.51.1 \
 		bit-set-0.5.2 \
 		bit-vec-0.6.2 \
 		bitflags-1.2.1 \
 		blake2b_simd-0.5.10 \
 		block-buffer-0.7.3 \
 		block-buffer-0.9.0 \
 		block-padding-0.1.5 \
 		bstr-0.2.13 \
 		byte-tools-0.3.1 \
 		byteorder-1.3.4 \
 		bytes-0.4.12 \
 		bzip2-0.3.3 \
 		bzip2-sys-0.1.9+1.0.8 \
 		capnp-0.10.3 \
 		capnp-futures-0.10.1 \
 		capnp-rpc-0.10.0 \
 		capnpc-0.10.2 \
 		cc-1.0.59 \
 		cexpr-0.3.6 \
 		cfg-if-0.1.10 \
 		chrono-0.4.15 \
 		clang-sys-0.28.1 \
 		clap-2.33.3 \
 		cloudabi-0.0.3 \
 		colored-1.9.1 \
 		constant_time_eq-0.1.5 \
 		core-foundation-0.7.0 \
 		core-foundation-sys-0.7.0 \
 		cpuid-bool-0.1.2 \
 		crc32fast-1.2.0 \
 		crossbeam-deque-0.7.3 \
 		crossbeam-epoch-0.8.2 \
 		crossbeam-queue-0.2.3 \
 		crossbeam-utils-0.7.2 \
 		crossterm-0.13.3 \
 		crossterm_winapi-0.4.0 \
 		csv-1.1.3 \
 		csv-core-0.1.10 \
 		ctor-0.1.15 \
 		curve25519-dalek-3.0.0 \
 		diff-0.1.12 \
 		difference-2.0.0 \
 		digest-0.8.1 \
 		digest-0.9.0 \
 		dirs-1.0.5 \
 		dirs-2.0.2 \
 		dirs-sys-0.3.5 \
 		doc-comment-0.3.3 \
 		docopt-1.1.0 \
 		dyn-clone-1.0.1 \
 		ed25519-1.0.1 \
 		ed25519-dalek-1.0.0 \
 		either-1.6.0 \
 		ena-0.13.1 \
 		encode_unicode-0.3.6 \
 		environment-0.1.1 \
 		failure-0.1.8 \
 		failure_derive-0.1.8 \
 		fake-simd-0.1.2 \
 		fallible-iterator-0.2.0 \
 		fallible-streaming-iterator-0.1.9 \
 		filetime-0.2.12 \
 		fixedbitset-0.1.9 \
 		flate2-1.0.14 \
 		fnv-1.0.7 \
 		foreign-types-0.3.2 \
 		foreign-types-shared-0.1.1 \
 		fs2-0.4.3 \
 		fuchsia-cprng-0.1.1 \
 		fuchsia-zircon-0.3.3 \
 		fuchsia-zircon-sys-0.3.3 \
 		futures-0.1.29 \
 		futures-cpupool-0.1.8 \
 		generic-array-0.12.3 \
 		generic-array-0.14.4 \
 		getrandom-0.1.14 \
 		glob-0.3.0 \
 		h2-0.1.26 \
 		hashbrown-0.8.2 \
 		heck-0.3.1 \
 		hermit-abi-0.1.15 \
 		http-0.1.21 \
 		http-body-0.1.0 \
 		httparse-1.3.4 \
 		hyper-0.12.35 \
 		hyper-tls-0.3.2 \
 		idna-0.2.0 \
 		indexmap-1.5.1 \
 		iovec-0.1.4 \
 		itertools-0.8.2 \
 		itoa-0.4.6 \
 		kernel32-sys-0.2.2 \
 		lalrpop-0.17.2 \
 		lalrpop-util-0.17.2 \
 		lazy_static-1.4.0 \
 		libc-0.2.76 \
 		libloading-0.5.2 \
 		libm-0.2.1 \
 		libsqlite3-sys-0.15.0 \
 		linked-hash-map-0.5.3 \
 		lock_api-0.3.4 \
 		log-0.4.11 \
 		lru-cache-0.1.2 \
 		mach_o_sys-0.1.1 \
 		matches-0.1.8 \
 		maybe-uninit-2.0.0 \
 		memchr-2.3.3 \
 		memoffset-0.5.5 \
 		memsec-0.5.7 \
 		miniz_oxide-0.3.7 \
 		mio-0.6.22 \
 		mio-named-pipes-0.1.7 \
 		mio-uds-0.6.8 \
 		miow-0.2.1 \
 		miow-0.3.5 \
 		native-tls-0.2.4 \
 		net2-0.2.34 \
 		nettle-7.0.0 \
 		nettle-src-3.5.1-2 \
 		nettle-sys-2.0.4 \
 		new_debug_unreachable-1.0.4 \
 		nom-4.2.3 \
 		num-bigint-dig-0.6.0 \
 		num-integer-0.1.43 \
 		num-iter-0.1.41 \
 		num-traits-0.2.12 \
 		num_cpus-1.13.0 \
 		opaque-debug-0.2.3 \
 		opaque-debug-0.3.0 \
 		openssl-0.10.30 \
 		openssl-probe-0.1.2 \
 		openssl-sys-0.9.58 \
 		ordermap-0.3.5 \
 		parity-tokio-ipc-0.4.0 \
 		parking_lot-0.9.0 \
 		parking_lot_core-0.6.2 \
 		peeking_take_while-0.1.2 \
 		percent-encoding-2.1.0 \
 		petgraph-0.4.13 \
 		phf_generator-0.7.24 \
 		phf_shared-0.7.24 \
 		pkg-config-0.3.18 \
 		ppv-lite86-0.2.9 \
 		precomputed-hash-0.1.1 \
 		prettytable-rs-0.8.0 \
 		proc-macro-error-1.0.4 \
 		proc-macro-error-attr-1.0.4 \
 		proc-macro2-1.0.19 \
 		quickcheck-0.9.2 \
 		quote-1.0.7 \
 		rand-0.6.5 \
 		rand-0.7.3 \
 		rand_chacha-0.1.1 \
 		rand_chacha-0.2.2 \
 		rand_core-0.3.1 \
 		rand_core-0.4.2 \
 		rand_core-0.5.1 \
 		rand_hc-0.1.0 \
 		rand_hc-0.2.0 \
 		rand_isaac-0.1.1 \
 		rand_jitter-0.1.4 \
 		rand_os-0.1.3 \
 		rand_pcg-0.1.2 \
 		rand_xorshift-0.1.1 \
 		rdrand-0.4.0 \
 		redox_syscall-0.1.57 \
 		redox_users-0.3.4 \
 		regex-1.3.9 \
 		regex-automata-0.1.9 \
 		regex-syntax-0.6.18 \
 		remove_dir_all-0.5.3 \
 		rpassword-4.0.3 \
 		rusqlite-0.19.0 \
 		rust-argon2-0.7.0 \
 		rustc-demangle-0.1.16 \
 		rustc-hash-1.1.0 \
 		rustc_version-0.2.3 \
 		ryu-1.0.5 \
 		schannel-0.1.19 \
 		scoped-tls-0.1.2 \
 		scopeguard-1.1.0 \
 		security-framework-0.4.4 \
 		security-framework-sys-0.4.3 \
 		semver-0.9.0 \
 		semver-parser-0.7.0 \
 		serde-1.0.115 \
 		serde_derive-1.0.115 \
 		serde_json-1.0.57 \
 		sha2-0.8.2 \
 		sha2-0.9.1 \
 		shlex-0.1.1 \
 		signature-1.2.2 \
 		siphasher-0.2.3 \
 		slab-0.4.2 \
 		smallvec-0.6.13 \
 		smallvec-1.4.2 \
 		socket2-0.3.11 \
 		spin-0.5.2 \
 		string-0.2.1 \
 		string_cache-0.7.5 \
 		string_cache_codegen-0.4.4 \
 		string_cache_shared-0.3.0 \
 		strsim-0.8.0 \
 		strsim-0.9.3 \
 		structopt-0.3.16 \
 		structopt-derive-0.4.9 \
 		subtle-2.2.3 \
 		syn-1.0.38 \
 		synstructure-0.12.4 \
 		tempfile-3.1.0 \
 		term-0.5.2 \
 		textwrap-0.11.0 \
 		thiserror-1.0.20 \
 		thiserror-impl-1.0.20 \
 		thread_local-1.0.1 \
 		time-0.1.43 \
 		tokio-0.1.22 \
 		tokio-buf-0.1.1 \
 		tokio-codec-0.1.2 \
 		tokio-core-0.1.17 \
 		tokio-current-thread-0.1.7 \
 		tokio-executor-0.1.10 \
 		tokio-fs-0.1.7 \
 		tokio-io-0.1.13 \
 		tokio-named-pipes-0.1.0 \
 		tokio-reactor-0.1.12 \
 		tokio-sync-0.1.8 \
 		tokio-tcp-0.1.4 \
 		tokio-threadpool-0.1.18 \
 		tokio-timer-0.2.13 \
 		tokio-udp-0.1.6 \
 		tokio-uds-0.2.7 \
 		try-lock-0.2.3 \
 		typenum-1.12.0 \
 		unicode-bidi-0.3.4 \
 		unicode-normalization-0.1.9 \
 		unicode-segmentation-1.6.0 \
 		unicode-width-0.1.8 \
 		unicode-xid-0.1.0 \
 		unicode-xid-0.2.1 \
 		url-2.1.1 \
 		vcpkg-0.2.10 \
 		vec_map-0.8.2 \
 		version_check-0.1.5 \
 		version_check-0.9.2 \
 		want-0.2.0 \
 		wasi-0.9.0+wasi-snapshot-preview1 \
 		win-crypto-ng-0.2.0 \
 		winapi-0.2.8 \
 		winapi-0.3.9 \
 		winapi-build-0.1.1 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
 		ws2_32-sys-0.2.1 \
 		zbase32-0.1.2 \
 		zeroize-1.1.0 \
 		zeroize_derive-1.0.0
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/sequoia \
 		${STAGEDIR}${PREFIX}/etc/bash_completion.d \
 		${STAGEDIR}${PREFIX}/share/fish/completions \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions
-.for f in ffi ffi_macros openpgp_ffi
-	${STRIP_CMD} ${CARGO_TARGET_DIR}/release/libsequoia_${f}.so
-	${INSTALL_LIB} ${CARGO_TARGET_DIR}/release/libsequoia_${f}.so ${STAGEDIR}${PREFIX}/lib/libsequoia_${f}.so.${SOVERS}
+.for f in ffi openpgp_ffi
+	${INSTALL_LIB} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/libsequoia_${f}.so ${STAGEDIR}${PREFIX}/lib/libsequoia_${f}.so.${SOVERS}
 	${LN} -sf libsequoia_${f}.so.${SOVERS} ${STAGEDIR}${PREFIX}/lib/libsequoia_${f}.so
 .endfor
+	${INSTALL_LIB} ${CARGO_TARGET_DIR}/*/libsequoia_ffi_macros.so ${STAGEDIR}${PREFIX}/lib/libsequoia_ffi_macros.so.${SOVERS}
+	${LN} -sf libsequoia_ffi_macros.so.${SOVERS} ${STAGEDIR}${PREFIX}/lib/libsequoia_ffi_macros.so
 .for f in sq sqop sqv
-	${STRIP_CMD} ${CARGO_TARGET_DIR}/release/${f}
-	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/release/${f} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
-	${STRIP_CMD} ${CARGO_TARGET_DIR}/release/sequoia-public-key-store
-	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/release/sequoia-public-key-store ${STAGEDIR}${PREFIX}/lib/sequoia/sequoia-public-key-store
+	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/sequoia-public-key-store ${STAGEDIR}${PREFIX}/lib/sequoia/sequoia-public-key-store
 
 	(cd ${WRKSRC}/ffi/include && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include)
 	(cd ${WRKSRC}/openpgp-ffi/include/sequoia && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/sequoia)
 
 	${INSTALL_DATA} ${CARGO_TARGET_DIR}/sq.bash  ${STAGEDIR}${PREFIX}/etc/bash_completion.d/sq
 	${INSTALL_DATA} ${CARGO_TARGET_DIR}/sqv.bash ${STAGEDIR}${PREFIX}/etc/bash_completion.d/sqv
 	${INSTALL_DATA} ${CARGO_TARGET_DIR}/sq.fish  ${STAGEDIR}${PREFIX}/share/fish/completions
 	${INSTALL_DATA} ${CARGO_TARGET_DIR}/sqv.fish ${STAGEDIR}${PREFIX}/share/fish/completions
 	${INSTALL_DATA} ${CARGO_TARGET_DIR}/_sq  ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${CARGO_TARGET_DIR}/_sqv ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 
 	${INSTALL_DATA} ${WRKDIR}/sequoia.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
 	${INSTALL_DATA} ${WRKDIR}/sequoia-openpgp.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
 
 .include <bsd.port.mk>
diff --git a/security/solana/Makefile b/security/solana/Makefile
index a18de962357b..a2d2d6261873 100644
--- a/security/solana/Makefile
+++ b/security/solana/Makefile
@@ -1,578 +1,578 @@
 PORTNAME=	solana
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7.11
 CATEGORIES=	security
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Web-scale blockchain for decentralized apps and marketplaces
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	Fails on 32-bit systems: https://github.com/solana-labs/solana/issues/16811
 
 BUILD_DEPENDS=	llvm-config${LLVM_VERSION}:devel/llvm${LLVM_VERSION} \
 		protoc:devel/protobuf
 LIB_DEPENDS=	libhidapi.so:comms/hidapi
 
 USES=		cargo pkgconfig ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	solana-labs
 
 CARGO_CRATES=	Inflector-0.11.4 \
 		addr2line-0.12.1 \
 		adler32-1.0.4 \
 		ahash-0.4.6 \
 		ahash-0.6.1 \
 		aho-corasick-0.7.10 \
 		aliasable-0.1.3 \
 		ansi_term-0.11.0 \
 		anyhow-1.0.38 \
 		arc-swap-0.4.8 \
 		arc-swap-1.2.0 \
 		arrayref-0.3.6 \
 		arrayvec-0.5.1 \
 		ascii-0.9.3 \
 		assert_cmd-2.0.0 \
 		assert_matches-1.3.0 \
 		async-stream-0.3.0 \
 		async-stream-impl-0.3.0 \
 		async-trait-0.1.42 \
 		atty-0.2.14 \
 		autocfg-0.1.7 \
 		autocfg-1.0.0 \
 		backoff-0.3.0 \
 		backtrace-0.3.48 \
 		base-x-0.2.6 \
 		base32-0.4.0 \
 		base64-0.9.3 \
 		base64-0.10.1 \
 		base64-0.11.0 \
 		base64-0.12.3 \
 		base64-0.13.0 \
 		bincode-1.3.3 \
 		bindgen-0.57.0 \
 		bit-set-0.5.2 \
 		bit-vec-0.6.3 \
 		bitflags-1.2.1 \
 		blake2b_simd-0.5.10 \
 		blake3-0.3.7 \
 		block-buffer-0.7.3 \
 		block-buffer-0.9.0 \
 		block-padding-0.1.5 \
 		block-padding-0.2.1 \
 		borsh-0.9.0 \
 		borsh-derive-0.9.0 \
 		borsh-derive-internal-0.9.0 \
 		borsh-schema-derive-internal-0.9.0 \
 		bs58-0.3.1 \
 		bstr-0.2.16 \
 		bumpalo-3.3.0 \
 		bv-0.11.1 \
 		byte-tools-0.3.1 \
 		byte-unit-4.0.9 \
 		bytecount-0.6.0 \
 		byteorder-1.3.4 \
 		bytes-0.4.12 \
 		bytes-0.5.4 \
 		bytes-1.0.1 \
 		bytesize-1.0.1 \
 		bzip2-0.3.3 \
 		bzip2-sys-0.1.9+1.0.8 \
 		cargo_metadata-0.12.0 \
 		cast-0.2.3 \
 		cc-1.0.67 \
 		cexpr-0.4.0 \
 		cfg-if-0.1.10 \
 		cfg-if-1.0.0 \
 		chrono-0.4.19 \
 		chrono-humanize-0.2.1 \
 		clang-sys-1.2.0 \
 		clap-2.33.3 \
 		cloudabi-0.0.3 \
 		cloudabi-0.1.0 \
 		combine-3.8.1 \
 		console-0.11.3 \
 		console-0.14.1 \
 		const_fn-0.4.5 \
 		const_format-0.2.14 \
 		const_format_proc_macros-0.2.14 \
 		constant_time_eq-0.1.5 \
 		core-foundation-0.9.1 \
 		core-foundation-sys-0.8.2 \
 		core_affinity-0.5.10 \
 		cpuid-bool-0.1.2 \
 		crc32fast-1.2.0 \
 		criterion-stats-0.3.0 \
 		crossbeam-channel-0.4.4 \
 		crossbeam-channel-0.5.0 \
 		crossbeam-deque-0.8.1 \
 		crossbeam-epoch-0.9.5 \
 		crossbeam-utils-0.7.2 \
 		crossbeam-utils-0.8.5 \
 		crunchy-0.2.2 \
 		crypto-mac-0.7.0 \
 		crypto-mac-0.8.0 \
 		crypto-mac-0.9.1 \
 		crypto-mac-0.10.0 \
 		csv-1.1.3 \
 		csv-core-0.1.10 \
 		ctrlc-3.1.5 \
 		curve25519-dalek-2.1.0 \
 		curve25519-dalek-3.0.0 \
 		dashmap-4.0.2 \
 		derivation-path-0.1.3 \
 		derivative-2.1.1 \
 		derive_more-0.99.11 \
 		dialoguer-0.6.2 \
 		difflib-0.4.0 \
 		digest-0.8.1 \
 		digest-0.9.0 \
 		dir-diff-0.3.2 \
 		dirs-next-2.0.0 \
 		dirs-sys-next-0.1.1 \
 		discard-1.0.4 \
 		dlopen-0.1.8 \
 		dlopen_derive-0.1.4 \
 		doc-comment-0.3.3 \
 		dtoa-0.4.5 \
 		ed25519-1.0.1 \
 		ed25519-dalek-1.0.1 \
 		ed25519-dalek-bip32-0.1.1 \
 		educe-0.4.13 \
 		either-1.5.3 \
 		encode_unicode-0.3.6 \
 		encoding_rs-0.8.23 \
 		enum-iterator-0.6.0 \
 		enum-iterator-derive-0.6.0 \
 		enum-ordinalize-3.1.8 \
 		env_logger-0.8.3 \
 		failure-0.1.8 \
 		failure_derive-0.1.8 \
 		fake-simd-0.1.2 \
 		fast-math-0.1.1 \
 		fd-lock-2.0.0 \
 		feature-probe-0.1.1 \
 		filedescriptor-0.8.0 \
 		filetime-0.2.10 \
 		fixedbitset-0.2.0 \
 		flate2-1.0.14 \
 		fnv-1.0.7 \
 		foreign-types-0.3.2 \
 		foreign-types-shared-0.1.1 \
 		form_urlencoded-1.0.0 \
 		fs_extra-1.2.0 \
 		fuchsia-cprng-0.1.1 \
 		fuchsia-zircon-0.3.3 \
 		fuchsia-zircon-sys-0.3.3 \
 		futures-0.1.29 \
 		futures-0.3.8 \
 		futures-channel-0.3.8 \
 		futures-core-0.3.8 \
 		futures-executor-0.3.8 \
 		futures-io-0.3.8 \
 		futures-macro-0.3.8 \
 		futures-sink-0.3.8 \
 		futures-task-0.3.8 \
 		futures-util-0.3.8 \
 		gag-1.0.0 \
 		generic-array-0.12.3 \
 		generic-array-0.14.3 \
 		gethostname-0.2.1 \
 		getrandom-0.1.14 \
 		getrandom-0.2.0 \
 		gimli-0.21.0 \
 		glob-0.3.0 \
 		globset-0.4.5 \
 		goauth-0.10.0 \
 		goblin-0.3.0 \
 		h2-0.3.3 \
 		half-1.6.0 \
 		hash32-0.1.1 \
 		hashbrown-0.9.1 \
 		hashbrown-0.11.2 \
 		heck-0.3.3 \
 		hermit-abi-0.1.13 \
 		hex-0.4.2 \
 		hidapi-1.2.5 \
 		histogram-0.6.9 \
 		hmac-0.7.1 \
 		hmac-0.8.1 \
 		hmac-0.9.0 \
 		hmac-0.10.1 \
 		hmac-drbg-0.3.0 \
 		http-0.2.1 \
 		http-body-0.4.2 \
 		httparse-1.4.1 \
 		httpdate-1.0.1 \
 		humantime-2.0.1 \
 		hyper-0.10.16 \
 		hyper-0.14.11 \
 		hyper-rustls-0.22.1 \
 		hyper-timeout-0.4.1 \
 		hyper-tls-0.5.0 \
 		idna-0.1.5 \
 		idna-0.2.0 \
 		ieee754-0.2.6 \
 		indexed-0.1.1 \
 		indexmap-1.7.0 \
 		indicatif-0.15.0 \
 		input_buffer-0.3.1 \
 		instant-0.1.6 \
 		iovec-0.1.4 \
 		ipnet-2.3.0 \
 		itertools-0.9.0 \
 		itertools-0.10.1 \
 		itoa-0.4.5 \
 		jobserver-0.1.21 \
 		js-sys-0.3.47 \
 		jsonrpc-client-transports-18.0.0 \
 		jsonrpc-core-18.0.0 \
 		jsonrpc-core-client-18.0.0 \
 		jsonrpc-derive-18.0.0 \
 		jsonrpc-http-server-18.0.0 \
 		jsonrpc-ipc-server-18.0.0 \
 		jsonrpc-pubsub-18.0.0 \
 		jsonrpc-server-utils-18.0.0 \
 		jsonrpc-ws-server-18.0.0 \
 		keccak-0.1.0 \
 		kernel32-sys-0.2.2 \
 		language-tags-0.2.2 \
 		lazy_static-1.4.0 \
 		lazycell-1.2.1 \
 		libc-0.2.98 \
 		libloading-0.6.2 \
 		libloading-0.7.0 \
 		librocksdb-sys-6.17.3 \
 		libsecp256k1-0.5.0 \
 		libsecp256k1-core-0.2.1 \
 		libsecp256k1-gen-ecmult-0.2.0 \
 		libsecp256k1-gen-genmult-0.2.0 \
 		linked-hash-map-0.5.3 \
 		lock_api-0.3.4 \
 		lock_api-0.4.1 \
 		log-0.3.9 \
 		log-0.4.11 \
 		lru-0.6.1 \
 		matches-0.1.8 \
 		maybe-uninit-2.0.0 \
 		memchr-1.0.2 \
 		memchr-2.4.0 \
 		memmap2-0.1.0 \
 		memoffset-0.6.1 \
 		mime-0.2.6 \
 		mime-0.3.16 \
 		miniz_oxide-0.3.6 \
 		mio-0.6.22 \
 		mio-0.7.6 \
 		mio-extras-2.0.6 \
 		miow-0.2.2 \
 		miow-0.3.6 \
 		multimap-0.8.3 \
 		native-tls-0.2.7 \
 		net2-0.2.37 \
 		nix-0.17.0 \
 		nix-0.19.0 \
 		nom-3.2.1 \
 		nom-5.1.1 \
 		ntapi-0.3.4 \
 		num-bigint-0.3.1 \
 		num-derive-0.3.2 \
 		num-integer-0.1.42 \
 		num-traits-0.2.11 \
 		num_cpus-1.13.0 \
 		num_enum-0.5.1 \
 		num_enum_derive-0.5.1 \
 		number_prefix-0.3.0 \
 		object-0.19.0 \
 		once_cell-1.5.2 \
 		opaque-debug-0.2.3 \
 		opaque-debug-0.3.0 \
 		openssl-0.10.29 \
 		openssl-probe-0.1.2 \
 		openssl-sys-0.9.57 \
 		ouroboros-0.10.0 \
 		ouroboros_macro-0.10.0 \
 		parity-tokio-ipc-0.9.0 \
 		parity-ws-0.11.0 \
 		parking_lot-0.9.0 \
 		parking_lot-0.10.2 \
 		parking_lot-0.11.0 \
 		parking_lot_core-0.6.2 \
 		parking_lot_core-0.7.2 \
 		parking_lot_core-0.8.0 \
 		pbkdf2-0.3.0 \
 		pbkdf2-0.4.0 \
 		pbkdf2-0.6.0 \
 		peeking_take_while-0.1.2 \
 		percent-encoding-1.0.1 \
 		percent-encoding-2.1.0 \
 		pest-2.1.3 \
 		petgraph-0.5.1 \
 		pickledb-0.4.1 \
 		pin-project-0.4.23 \
 		pin-project-1.0.1 \
 		pin-project-internal-0.4.23 \
 		pin-project-internal-1.0.1 \
 		pin-project-lite-0.2.7 \
 		pin-utils-0.1.0 \
 		pkg-config-0.3.17 \
 		plain-0.2.3 \
 		ppv-lite86-0.2.8 \
 		predicates-2.0.1 \
 		predicates-core-1.0.0 \
 		predicates-tree-1.0.0 \
 		pretty-hex-0.2.1 \
 		proc-macro-crate-0.1.5 \
 		proc-macro-error-1.0.4 \
 		proc-macro-error-attr-1.0.4 \
 		proc-macro-hack-0.5.19 \
 		proc-macro-nested-0.1.4 \
 		proc-macro2-0.4.30 \
 		proc-macro2-1.0.24 \
 		proptest-1.0.0 \
 		prost-0.8.0 \
 		prost-build-0.8.0 \
 		prost-derive-0.8.0 \
 		prost-types-0.8.0 \
 		qstring-0.7.2 \
 		quick-error-1.2.3 \
 		quick-error-2.0.1 \
 		quote-0.6.13 \
 		quote-1.0.9 \
 		rand-0.4.6 \
 		rand-0.6.5 \
 		rand-0.7.3 \
 		rand-0.8.3 \
 		rand_chacha-0.1.1 \
 		rand_chacha-0.2.2 \
 		rand_chacha-0.3.0 \
 		rand_core-0.3.1 \
 		rand_core-0.4.2 \
 		rand_core-0.5.1 \
 		rand_core-0.6.2 \
 		rand_hc-0.1.0 \
 		rand_hc-0.2.0 \
 		rand_hc-0.3.0 \
 		rand_isaac-0.1.1 \
 		rand_jitter-0.1.4 \
 		rand_os-0.1.3 \
 		rand_pcg-0.1.2 \
 		rand_pcg-0.2.1 \
 		rand_xorshift-0.1.1 \
 		rand_xorshift-0.3.0 \
 		raptorq-1.4.2 \
 		rayon-1.5.0 \
 		rayon-core-1.9.0 \
 		rdrand-0.4.0 \
 		redox_syscall-0.1.56 \
 		redox_users-0.3.4 \
 		reed-solomon-erasure-4.0.2 \
 		regex-1.4.5 \
 		regex-automata-0.1.9 \
 		regex-syntax-0.6.23 \
 		remove_dir_all-0.5.0 \
 		reqwest-0.11.2 \
 		retain_mut-0.1.2 \
 		ring-0.16.20 \
 		rocksdb-0.16.0 \
 		rpassword-4.0.5 \
 		rust-argon2-0.7.0 \
 		rustc-demangle-0.1.16 \
 		rustc-hash-1.1.0 \
 		rustc_version-0.2.3 \
 		rustls-0.19.0 \
 		rustversion-1.0.4 \
 		rusty-fork-0.3.0 \
 		ryu-1.0.4 \
 		safemem-0.3.3 \
 		same-file-1.0.6 \
 		schannel-0.1.19 \
 		scopeguard-1.1.0 \
 		scroll-0.10.1 \
 		scroll_derive-0.10.2 \
 		sct-0.6.0 \
 		security-framework-2.1.2 \
 		security-framework-sys-2.1.1 \
 		semver-0.9.0 \
 		semver-0.11.0 \
 		semver-parser-0.7.0 \
 		semver-parser-0.10.1 \
 		serde-1.0.126 \
 		serde_bytes-0.11.5 \
 		serde_cbor-0.11.1 \
 		serde_derive-1.0.126 \
 		serde_json-1.0.62 \
 		serde_urlencoded-0.7.0 \
 		serde_yaml-0.8.13 \
 		serial_test-0.4.0 \
 		serial_test_derive-0.4.0 \
 		sha-1-0.8.2 \
 		sha1-0.6.0 \
 		sha2-0.8.2 \
 		sha2-0.9.2 \
 		sha3-0.9.1 \
 		shlex-0.1.1 \
 		signal-hook-0.1.15 \
 		signal-hook-registry-1.2.0 \
 		signature-1.1.0 \
 		simpl-0.1.0 \
 		slab-0.4.2 \
 		smallvec-0.6.14 \
 		smallvec-1.6.1 \
 		smpl_jwt-0.6.1 \
 		socket2-0.3.17 \
 		socket2-0.4.1 \
 		solana-frozen-abi-1.7.6 \
 		solana-frozen-abi-macro-1.7.6 \
 		solana-logger-1.7.6 \
 		solana-program-1.7.6 \
 		solana-sdk-macro-1.7.6 \
 		solana_rbpf-0.2.11 \
 		spin-0.5.2 \
 		spl-associated-token-account-1.0.3 \
 		spl-memo-3.0.1 \
 		spl-token-3.2.0 \
 		stable_deref_trait-1.2.0 \
 		standback-0.2.9 \
 		static_assertions-1.1.0 \
 		stdweb-0.4.20 \
 		stdweb-derive-0.5.3 \
 		stdweb-internal-macros-0.2.9 \
 		stdweb-internal-runtime-0.1.5 \
 		strsim-0.8.0 \
 		subtle-1.0.0 \
 		subtle-2.2.2 \
 		symlink-0.1.0 \
 		syn-0.15.44 \
 		syn-1.0.60 \
 		synstructure-0.12.3 \
 		sysctl-0.4.0 \
 		systemstat-0.1.5 \
 		tar-0.4.37 \
 		tarpc-0.24.1 \
 		tarpc-plugins-0.9.0 \
 		tempfile-3.1.0 \
 		termcolor-1.1.0 \
 		terminal_size-0.1.16 \
 		termios-0.3.2 \
 		textwrap-0.11.0 \
 		thiserror-1.0.23 \
 		thiserror-impl-1.0.23 \
 		thread-scoped-1.0.2 \
 		time-0.1.43 \
 		time-0.2.25 \
 		time-macros-0.1.0 \
 		time-macros-impl-0.1.1 \
 		tiny-bip39-0.7.3 \
 		tiny-bip39-0.8.0 \
 		tinyvec-1.1.1 \
 		tinyvec_macros-0.1.0 \
 		tokio-1.8.1 \
 		tokio-codec-0.1.2 \
 		tokio-executor-0.1.10 \
 		tokio-io-0.1.13 \
 		tokio-io-timeout-1.1.1 \
 		tokio-macros-1.3.0 \
 		tokio-native-tls-0.3.0 \
 		tokio-reactor-0.1.12 \
 		tokio-rustls-0.22.0 \
 		tokio-serde-0.8.0 \
 		tokio-stream-0.1.2 \
 		tokio-sync-0.1.8 \
 		tokio-tcp-0.1.4 \
 		tokio-tls-0.2.1 \
 		tokio-util-0.6.3 \
 		toml-0.5.6 \
 		tonic-0.5.0 \
 		tonic-build-0.5.0 \
 		tower-0.4.8 \
 		tower-layer-0.3.1 \
 		tower-service-0.3.0 \
 		tracing-0.1.26 \
 		tracing-attributes-0.1.15 \
 		tracing-core-0.1.18 \
 		tracing-futures-0.2.4 \
 		traitobject-0.1.0 \
 		treeline-0.1.0 \
 		trees-0.2.1 \
 		try-lock-0.2.2 \
 		tungstenite-0.10.1 \
 		typeable-0.1.2 \
 		typenum-1.12.0 \
 		ucd-trie-0.1.3 \
 		unicase-1.4.2 \
 		unicase-2.6.0 \
 		unicode-bidi-0.3.4 \
 		unicode-normalization-0.1.16 \
 		unicode-segmentation-1.8.0 \
 		unicode-width-0.1.7 \
 		unicode-xid-0.1.0 \
 		unicode-xid-0.2.0 \
 		unix_socket2-0.5.4 \
 		unreachable-1.0.0 \
 		untrusted-0.7.1 \
 		uriparse-0.6.3 \
 		url-1.7.2 \
 		url-2.2.0 \
 		users-0.10.0 \
 		utf-8-0.7.5 \
 		utf8-width-0.1.3 \
 		vcpkg-0.2.8 \
 		vec_map-0.8.2 \
 		version_check-0.1.5 \
 		version_check-0.9.2 \
 		void-1.0.2 \
 		wait-timeout-0.2.0 \
 		walkdir-2.3.1 \
 		want-0.3.0 \
 		wasi-0.9.0+wasi-snapshot-preview1 \
 		wasm-bindgen-0.2.70 \
 		wasm-bindgen-backend-0.2.70 \
 		wasm-bindgen-futures-0.4.20 \
 		wasm-bindgen-macro-0.2.70 \
 		wasm-bindgen-macro-support-0.2.70 \
 		wasm-bindgen-shared-0.2.70 \
 		web-sys-0.3.40 \
 		webpki-0.21.2 \
 		webpki-roots-0.21.0 \
 		websocket-0.24.0 \
 		websocket-base-0.24.0 \
 		which-4.0.2 \
 		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 \
 		winreg-0.7.0 \
 		ws2_32-sys-0.2.1 \
 		xattr-0.2.2 \
 		yaml-rust-0.4.3 \
 		zeroize-1.2.0 \
 		zeroize_derive-1.0.0 \
 		zstd-0.5.3+zstd.1.4.5 \
 		zstd-safe-2.0.5+zstd.1.4.5 \
 		zstd-sys-1.4.17+zstd.1.4.5
 
 XARCH=		${ARCH:S/amd64/x86_64/:tu}
 
 MAKE_ENV=	${XARCH}_UNKNOWN_FREEBSD_OPENSSL_INCLUDE_DIR=${OPENSSLINC} \
 		${XARCH}_UNKNOWN_FREEBSD_OPENSSL_LIB_DIR=${OPENSSLLIB}
 
 LLVM_VERSION=	12
 
 BINARY_ALIAS=	llvm-config=${PREFIX}/bin/llvm-config${LLVM_VERSION}
 
 do-install:
-	for f in ${WRKDIR}/target/release/${PORTNAME}*; do \
+	for f in ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/${PORTNAME}*; do \
 		if [ -f $$f -a -x $$f ]; then \
 			${INSTALL_PROGRAM} $$f ${STAGEDIR}${PREFIX}/bin; \
 		fi \
 	done
 
 do-test:
 	@${CARGO_CARGO_RUN} test
 
 .include <bsd.port.mk>
diff --git a/www/deno/Makefile b/www/deno/Makefile
index 589941b81608..6a0b1b64b568 100644
--- a/www/deno/Makefile
+++ b/www/deno/Makefile
@@ -1,467 +1,467 @@
 PORTNAME=	deno
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.14.0
 CATEGORIES=	www
 
 MAINTAINER=	mikael@FreeBSD.org
 COMMENT=	Secure JavaScript and TypeScript runtime
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BROKEN_i386=	cargo:warning=c/freebsd.c:31:10: error: conflicting types for 'get_cpu_speed'
 
 BUILD_DEPENDS=	binutils>0:devel/binutils \
 		gn:devel/gn \
 		libunwind>0:devel/libunwind
 
 USES=		cargo cpe gmake gnome ninja:build pkgconfig:build python:3.6+,build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	denoland
 USE_GNOME=	glib20
 
 RUSTY_VERS=	0.28.0
 
 CARGO_ENV+=	CLANG_BASE_PATH=/usr \
 		GN=${PREFIX}/bin/gn \
 		NINJA=${NINJA_CMD} \
 		V8_FROM_SOURCE=1
 RUSTFLAGS+=	-C link-arg=-fuse-ld=lld
 
 PLIST_FILES=	bin/${PORTNAME}
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 CARGO_CRATES=	Inflector-0.11.4 \
 		abort_on_panic-2.0.0 \
 		adler-1.0.2 \
 		ahash-0.4.7 \
 		ahash-0.7.4 \
 		aho-corasick-0.7.18 \
 		alloc-no-stdlib-2.0.3 \
 		alloc-stdlib-0.2.1 \
 		ansi_term-0.11.0 \
 		anyhow-1.0.43 \
 		arrayvec-0.5.2 \
 		arrayvec-0.7.1 \
 		ash-0.33.2+1.2.186 \
 		ast_node-0.7.3 \
 		async-compression-0.3.8 \
 		async-stream-0.3.2 \
 		async-stream-impl-0.3.2 \
 		async-trait-0.1.51 \
 		atty-0.2.14 \
 		auto_impl-0.4.1 \
 		autocfg-0.1.7 \
 		autocfg-1.0.1 \
 		base64-0.11.0 \
 		base64-0.13.0 \
 		bencher-0.1.5 \
 		bit-set-0.5.2 \
 		bit-vec-0.6.3 \
 		bitflags-1.2.1 \
 		block-0.1.6 \
 		block-buffer-0.9.0 \
 		brotli-3.3.2 \
 		brotli-decompressor-2.3.2 \
 		build_const-0.2.2 \
 		bumpalo-3.7.0 \
 		byteorder-1.4.3 \
 		bytes-1.1.0 \
 		cc-1.0.69 \
 		cfg-if-0.1.10 \
 		cfg-if-1.0.0 \
 		cfg_aliases-0.1.1 \
 		chrono-0.4.19 \
 		clap-2.33.3 \
 		clipboard-win-4.2.1 \
 		codespan-reporting-0.11.1 \
 		const-oid-0.6.0 \
 		convert_case-0.4.0 \
 		copyless-0.1.5 \
 		core-foundation-0.9.1 \
 		core-foundation-sys-0.8.2 \
 		core-graphics-types-0.1.1 \
 		cpufeatures-0.1.5 \
 		crc-1.8.1 \
 		crc32fast-1.2.1 \
 		crossbeam-channel-0.5.1 \
 		crossbeam-utils-0.8.5 \
 		crypto-bigint-0.2.4 \
 		d3d12-0.4.1 \
 		darling-0.10.2 \
 		darling_core-0.10.2 \
 		darling_macro-0.10.2 \
 		dashmap-4.0.2 \
 		data-encoding-2.3.2 \
 		data-url-0.1.0 \
 		deno-libffi-0.0.7 \
 		deno-libffi-sys-0.0.7 \
 		deno_ast-0.2.0 \
 		deno_doc-0.14.0 \
 		deno_graph-0.5.0 \
 		deno_lint-0.16.0 \
 		der-0.4.1 \
 		derive_more-0.99.16 \
 		digest-0.9.0 \
 		dissimilar-1.0.2 \
 		dlopen-0.1.8 \
 		dlopen_derive-0.1.4 \
 		dprint-core-0.46.0 \
 		dprint-plugin-json-0.13.0 \
 		dprint-plugin-markdown-0.10.0 \
 		dprint-plugin-typescript-0.55.0 \
 		dprint-swc-ecma-ast-view-0.35.0 \
 		either-1.6.1 \
 		encoding_rs-0.8.28 \
 		endian-type-0.1.2 \
 		enum-as-inner-0.3.3 \
 		enum_kind-0.2.1 \
 		env_logger-0.8.4 \
 		errno-0.1.8 \
 		errno-0.2.7 \
 		errno-dragonfly-0.1.1 \
 		error-code-2.3.0 \
 		exec-0.3.1 \
 		fallible-iterator-0.2.0 \
 		fallible-streaming-iterator-0.1.9 \
 		fancy-regex-0.7.1 \
 		fd-lock-3.0.0 \
 		filetime-0.2.15 \
 		fixedbitset-0.2.0 \
 		fixedbitset-0.4.0 \
 		flaky_test-0.1.0 \
 		flate2-1.0.20 \
 		fnv-1.0.7 \
 		foreign-types-0.3.2 \
 		foreign-types-shared-0.1.1 \
 		form_urlencoded-1.0.1 \
 		from_variant-0.1.3 \
 		fs3-0.5.0 \
 		fsevent-sys-4.0.0 \
 		fslock-0.1.7 \
 		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 \
 		fwdansi-1.1.0 \
 		fxhash-0.2.1 \
 		gcc-0.3.55 \
 		generic-array-0.14.4 \
 		getrandom-0.1.16 \
 		getrandom-0.2.3 \
 		glow-0.11.0 \
 		gpu-alloc-0.5.0 \
 		gpu-alloc-types-0.2.0 \
 		gpu-descriptor-0.2.1 \
 		gpu-descriptor-types-0.1.1 \
 		h2-0.3.4 \
 		hashbrown-0.9.1 \
 		hashbrown-0.11.2 \
 		hashlink-0.7.0 \
 		heck-0.3.3 \
 		hermit-abi-0.1.19 \
 		hostname-0.3.1 \
 		http-0.2.4 \
 		http-body-0.4.3 \
 		httparse-1.5.1 \
 		httpdate-1.0.1 \
 		humantime-2.1.0 \
 		hyper-0.14.12 \
 		hyper-rustls-0.22.1 \
 		ident_case-1.0.1 \
 		idna-0.2.3 \
 		if_chain-1.0.2 \
 		import_map-0.3.0 \
 		indexmap-1.6.2 \
 		inotify-0.9.3 \
 		inotify-sys-0.1.5 \
 		inplace_it-0.3.3 \
 		input_buffer-0.4.0 \
 		instant-0.1.10 \
 		ipconfig-0.2.2 \
 		ipnet-2.3.1 \
 		is-macro-0.1.9 \
 		itoa-0.4.8 \
 		js-sys-0.3.49 \
 		jsonc-parser-0.17.0 \
 		kernel32-sys-0.2.2 \
 		khronos-egl-4.1.0 \
 		kqueue-1.0.4 \
 		kqueue-sys-1.0.3 \
 		lazy_static-1.4.0 \
 		lexical-5.2.2 \
 		lexical-core-0.7.6 \
 		libc-0.2.101 \
 		libloading-0.7.0 \
 		libm-0.2.1 \
 		libsqlite3-sys-0.22.2 \
 		linked-hash-map-0.5.4 \
 		lock_api-0.4.4 \
 		log-0.4.14 \
 		lru-cache-0.1.2 \
 		lsp-types-0.89.2 \
 		lspower-1.1.0 \
 		lspower-macros-0.2.1 \
 		make-cmd-0.1.0 \
 		malloc_buf-0.0.6 \
 		match_cfg-0.1.0 \
 		matches-0.1.9 \
 		memchr-2.4.1 \
 		memoffset-0.6.4 \
 		metal-0.23.1 \
 		mime-0.3.16 \
 		miniz_oxide-0.4.4 \
 		mio-0.7.13 \
 		miow-0.3.7 \
 		naga-0.6.1 \
 		new_debug_unreachable-1.0.4 \
 		nibble_vec-0.1.0 \
 		nix-0.22.1 \
 		notify-5.0.0-pre.12 \
 		ntapi-0.3.6 \
 		num-bigint-0.2.6 \
 		num-bigint-dig-0.7.0 \
 		num-integer-0.1.44 \
 		num-iter-0.1.42 \
 		num-traits-0.2.14 \
 		num_cpus-1.13.0 \
 		objc-0.2.7 \
 		objc_exception-0.1.2 \
 		once_cell-1.8.0 \
 		opaque-debug-0.3.0 \
 		openssl-probe-0.1.4 \
 		os_pipe-0.9.2 \
 		owning_ref-0.4.1 \
 		parking_lot-0.11.1 \
 		parking_lot_core-0.8.3 \
 		percent-encoding-2.1.0 \
 		pest-2.1.3 \
 		petgraph-0.5.1 \
 		petgraph-0.6.0 \
 		phf-0.8.0 \
 		phf_generator-0.8.0 \
 		phf_macros-0.8.0 \
 		phf_shared-0.8.0 \
 		pin-project-1.0.8 \
 		pin-project-internal-1.0.8 \
 		pin-project-lite-0.2.7 \
 		pin-utils-0.1.0 \
 		pkcs1-0.2.3 \
 		pkcs8-0.7.5 \
 		pkg-config-0.3.19 \
 		pmutil-0.5.3 \
 		ppv-lite86-0.2.10 \
 		precomputed-hash-0.1.1 \
 		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-0.4.30 \
 		proc-macro2-1.0.28 \
 		profiling-1.0.3 \
 		pty-0.2.2 \
 		pulldown-cmark-0.8.0 \
 		quick-error-1.2.3 \
 		quote-0.6.13 \
 		quote-1.0.9 \
 		radix_fmt-1.0.0 \
 		radix_trie-0.2.1 \
 		rand-0.7.3 \
 		rand-0.8.4 \
 		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_hc-0.3.1 \
 		rand_pcg-0.2.1 \
 		range-alloc-0.1.2 \
 		raw-window-handle-0.3.3 \
 		redox_syscall-0.2.10 \
 		regex-1.5.4 \
 		regex-syntax-0.6.25 \
 		relative-path-1.5.0 \
 		remove_dir_all-0.5.3 \
 		renderdoc-sys-0.7.1 \
 		reqwest-0.11.4 \
 		resolv-conf-0.7.0 \
 		retain_mut-0.1.3 \
 		ring-0.16.20 \
 		ron-0.6.4 \
 		rsa-0.5.0 \
 		rusqlite-0.25.3 \
 		rustc_version-0.2.3 \
 		rustc_version-0.3.3 \
 		rustls-0.19.1 \
 		rustls-native-certs-0.5.0 \
 		rusty_v8-0.28.0 \
 		rustyline-9.0.0 \
 		rustyline-derive-0.5.0 \
 		ryu-1.0.5 \
 		same-file-1.0.6 \
 		schannel-0.1.19 \
 		scoped-tls-1.0.0 \
 		scopeguard-1.1.0 \
 		sct-0.6.1 \
 		security-framework-2.3.1 \
 		security-framework-sys-2.4.0 \
 		semver-0.9.0 \
 		semver-0.11.0 \
 		semver-parser-0.7.0 \
 		semver-parser-0.10.2 \
 		serde-1.0.130 \
 		serde_derive-1.0.130 \
 		serde_json-1.0.67 \
 		serde_repr-0.1.7 \
 		serde_urlencoded-0.7.0 \
 		serde_v8-0.11.0 \
 		sha-1-0.9.7 \
 		sha2-0.9.5 \
 		shell-escape-0.1.5 \
 		signal-hook-registry-1.4.0 \
 		siphasher-0.3.6 \
 		slab-0.4.4 \
 		slotmap-1.0.5 \
 		smallvec-1.6.1 \
 		socket2-0.3.19 \
 		socket2-0.4.1 \
 		sourcemap-6.0.1 \
 		spin-0.5.2 \
 		spirv-0.2.0+1.5.4 \
 		spki-0.4.0 \
 		stable_deref_trait-1.2.0 \
 		static_assertions-1.1.0 \
 		str-buf-1.0.5 \
 		string_cache-0.8.1 \
 		string_cache_codegen-0.5.1 \
 		string_enum-0.3.1 \
 		strsim-0.8.0 \
 		strsim-0.9.3 \
 		subtle-2.4.1 \
 		swc_atoms-0.2.7 \
 		swc_bundler-0.58.0 \
 		swc_common-0.12.0 \
 		swc_ecma_ast-0.52.0 \
 		swc_ecma_codegen-0.70.2 \
 		swc_ecma_codegen_macros-0.5.2 \
 		swc_ecma_dep_graph-0.39.1 \
 		swc_ecma_loader-0.18.0 \
 		swc_ecma_parser-0.70.2 \
 		swc_ecma_transforms-0.71.1 \
 		swc_ecma_transforms_base-0.31.1 \
 		swc_ecma_transforms_classes-0.17.1 \
 		swc_ecma_transforms_optimization-0.41.1 \
 		swc_ecma_transforms_proposal-0.38.1 \
 		swc_ecma_transforms_react-0.39.1 \
 		swc_ecma_transforms_typescript-0.40.2 \
 		swc_ecma_utils-0.44.2 \
 		swc_ecma_visit-0.38.1 \
 		swc_ecmascript-0.63.1 \
 		swc_eq_ignore_macros-0.1.0 \
 		swc_macros_common-0.3.3 \
 		swc_visit-0.2.6 \
 		swc_visit_macros-0.2.3 \
 		syn-0.15.44 \
 		syn-1.0.65 \
 		synstructure-0.12.5 \
 		sys-info-0.9.0 \
 		tempfile-3.2.0 \
 		termcolor-1.1.2 \
 		text-size-1.1.0 \
 		text_lines-0.3.0 \
 		textwrap-0.11.0 \
 		thiserror-1.0.26 \
 		thiserror-impl-1.0.26 \
 		time-0.1.44 \
 		tinyvec-1.3.1 \
 		tinyvec_macros-0.1.0 \
 		tokio-1.10.1 \
 		tokio-macros-1.3.0 \
 		tokio-rustls-0.22.0 \
 		tokio-stream-0.1.7 \
 		tokio-test-0.4.2 \
 		tokio-tungstenite-0.14.0 \
 		tokio-util-0.6.7 \
 		toml-0.5.8 \
 		tower-layer-0.3.1 \
 		tower-service-0.3.1 \
 		tower-test-0.4.0 \
 		tracing-0.1.26 \
 		tracing-core-0.1.19 \
 		trust-dns-client-0.20.3 \
 		trust-dns-proto-0.20.3 \
 		trust-dns-resolver-0.20.3 \
 		trust-dns-server-0.20.3 \
 		try-lock-0.2.3 \
 		tungstenite-0.13.0 \
 		twoway-0.2.2 \
 		typenum-1.13.0 \
 		ucd-trie-0.1.3 \
 		unchecked-index-0.2.2 \
 		unic-char-property-0.9.0 \
 		unic-char-range-0.9.0 \
 		unic-common-0.9.0 \
 		unic-ucd-ident-0.9.0 \
 		unic-ucd-version-0.9.0 \
 		unicase-2.6.0 \
 		unicode-bidi-0.3.6 \
 		unicode-normalization-0.1.19 \
 		unicode-segmentation-1.8.0 \
 		unicode-width-0.1.8 \
 		unicode-xid-0.1.0 \
 		unicode-xid-0.2.2 \
 		untrusted-0.7.1 \
 		url-2.2.2 \
 		urlpattern-0.1.2 \
 		utf-8-0.7.6 \
 		utf8parse-0.2.0 \
 		uuid-0.8.2 \
 		vcpkg-0.2.15 \
 		vec_map-0.8.2 \
 		version_check-0.9.3 \
 		walkdir-2.3.2 \
 		want-0.3.0 \
 		wasi-0.9.0+wasi-snapshot-preview1 \
 		wasi-0.10.0+wasi-snapshot-preview1 \
 		wasm-bindgen-0.2.72 \
 		wasm-bindgen-backend-0.2.72 \
 		wasm-bindgen-futures-0.4.22 \
 		wasm-bindgen-macro-0.2.72 \
 		wasm-bindgen-macro-support-0.2.72 \
 		wasm-bindgen-shared-0.2.72 \
 		web-sys-0.3.49 \
 		webpki-0.21.4 \
 		webpki-roots-0.21.1 \
 		wgpu-core-0.10.1 \
 		wgpu-hal-0.10.2 \
 		wgpu-types-0.10.0 \
 		which-4.2.2 \
 		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 \
 		winreg-0.6.2 \
 		winreg-0.7.0 \
 		winres-0.1.11 \
 		zeroize-1.4.1 \
 		zeroize_derive-1.1.0
 
 post-patch:
 	${REINPLACE_CMD} "s|%%LOCALBASE%%|${LOCALBASE}|" \
 		${WRKSRC}/cargo-crates/rusty_v8-${RUSTY_VERS}/build/toolchain/gcc_toolchain.gni \
 		${WRKSRC}/cargo-crates/rusty_v8-${RUSTY_VERS}/buildtools/third_party/libc++/BUILD.gn
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/target/release/deno ${STAGEDIR}${LOCALBASE}/bin
+	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/deno ${STAGEDIR}${LOCALBASE}/bin
 
 .include <bsd.port.mk>