Mk/Uses/cargo.mk: Remove cross-compilation options for Rust-based ports

Reasons: * Port build shouldn't use cross-compilation mode because it buids for the same architecture. * RUSTFLAGS isn't passed to the build of all or some Rust ports in the cross-compilation mode. Essential changes: * Remove the CARGO_BUILD_TARGET make variable. * Remove CARGO_BUILD_TARGET and CARGO_TARGET_* from CARGO_ENV. * Update many ports that used CARGO_BUILD_TARGET. * Build paths now don't include the architecture triplet part. Immadiate benefits: * Unbreak build on architectures like i386 that sometimes require special RUSTFLAGS that were not effective in the cross-compilation mode. Ports that really need cross-compilation for some reason should enable it on case-by-case basis. Example: net-p2p/cncli (Not sure why does net-p2p/cncli actually need it, but it only builds with these options.) PR: 280305 Approved by: rust@FreeBSD.org (maintainer's timeout; 98 days)
2024-11-18 00:10:04 +00:00 · 2024-10-22 20:00:55 -07:00 · 2024-10-22 20:00:55 -07:00 · f99a708957
commit f99a708957
parent b6290a4432
82 changed files with 110 additions and 125 deletions
--- a/Mk/Uses/cargo.mk
+++ b/Mk/Uses/cargo.mk
@ -110,9 +110,6 @@ RUSTDOC?=	${LOCALBASE}/bin/rustdoc
 # Location of the cargo output directory.
 CARGO_TARGET_DIR?=	${WRKDIR}/target

-# Default target platform (affects some RUSTFLAGS if passed)
-CARGO_BUILD_TARGET?=	${_CARGO_RUST_ARCH_${ARCH}:U${ARCH}}-unknown-${OPSYS:tl}
-
 _CARGO_RUST_ARCH_amd64=		x86_64
 _CARGO_RUST_ARCH_i386=		i686
 _CARGO_RUST_ARCH_riscv64=	riscv64gc
@ -128,9 +125,7 @@ _CARGO_RUST_ARCH_riscv64=	riscv64gc
 CARGO_ENV+= \
 	CARGO_HOME=${WRKDIR}/cargo-home \
 	CARGO_BUILD_JOBS=${MAKE_JOBS_NUMBER} \
-	CARGO_BUILD_TARGET=${CARGO_BUILD_TARGET} \
 	CARGO_TARGET_DIR=${CARGO_TARGET_DIR} \
-	CARGO_TARGET_${CARGO_BUILD_TARGET:S/-/_/g:tu}_LINKER="${CC}" \
 	RUSTC=${RUSTC} \
 	RUSTDOC=${RUSTDOC} \
 	RUSTFLAGS="${RUSTFLAGS} ${LDFLAGS:C/.+/-C link-arg=&/}"
--- a/audio/amberol/Makefile
+++ b/audio/amberol/Makefile
@ -32,7 +32,6 @@ post-patch:
 # Make each cargo subcommand very verbose
 # Add explicit <triple> subdir for --target from USES=cargo
 	@${REINPLACE_CMD} -e "/cargo_options =/s/ '--/&verbose', &verbose', &/" \
-		-e "/cp/s,'src',& / '${CARGO_BUILD_TARGET}'," \
 		${WRKSRC}/src/meson.build

 .include <bsd.port.mk>
--- a/audio/gnome-metronome/Makefile
+++ b/audio/gnome-metronome/Makefile
@ -31,7 +31,6 @@ post-patch:
 # Make each cargo subcommand very verbose
 # Add explicit <triple> subdir for --target from USES=cargo
 	@${REINPLACE_CMD} -e "/cargo_options =/s/ '--/&verbose', &verbose', &/" \
-		-e "/cp/s,'src',& / '${CARGO_BUILD_TARGET}'," \
 		${WRKSRC}/src/meson.build

 .include <bsd.port.mk>
--- a/audio/gnome-podcasts/Makefile
+++ b/audio/gnome-podcasts/Makefile
@ -39,7 +39,6 @@ post-patch:
 # Make each cargo subcommand very verbose
 # Add explicit <triple> subdir for --target from USES=cargo
 	@${REINPLACE_CMD} -e "/cargo_options =/s/ '--/&verbose', &verbose', &/" \
-		-e "/cp/s,'${PORTNAME}-gtk' / 'src',& / '${CARGO_BUILD_TARGET}'," \
 		${WRKSRC}/${PORTNAME}-gtk/src/meson.build

 .include <bsd.port.mk>
--- a/audio/mousai/Makefile
+++ b/audio/mousai/Makefile
@ -33,7 +33,6 @@ post-patch:
 # Make each cargo subcommand very verbose
 # Add explicit <triple> subdir for --target from USES=cargo
 	@${REINPLACE_CMD} -e "/cargo_options =/s/ '--/&verbose', &verbose', &/" \
-		-e "/cp/s,'src',& / '${CARGO_BUILD_TARGET}'," \
 		${WRKSRC}/src/meson.build

 .include <bsd.port.mk>
--- a/audio/shortwave/Makefile
+++ b/audio/shortwave/Makefile
@ -41,7 +41,6 @@ post-patch:
 # Make each cargo subcommand very verbose
 # Add explicit <triple> subdir for --target from USES=cargo
 	@${REINPLACE_CMD} -e "/cargo_options =/s/ '--/&verbose', &verbose', &/" \
-		-e "/cp/s,'target',& / '${CARGO_BUILD_TARGET}'," \
 		${WRKSRC}/src/meson.build

 .include <bsd.port.mk>
--- a/databases/greptimedb/Makefile
+++ b/databases/greptimedb/Makefile
@ -983,7 +983,7 @@ do-install:
 	# binaries (workaround for error: found a virtual manifest at `xx` instead of a package manifest)
 .for p in ${PROGS}
 	${INSTALL_PROGRAM} \
-		${WRKDIR}/target/*/release/${p} \
+		${WRKDIR}/target/release/${p} \
 		${STAGEDIR}${PREFIX}/bin
 .endfor
 	# config files
--- a/databases/redisjson/Makefile
+++ b/databases/redisjson/Makefile
@ -115,6 +115,6 @@ CARGO_CRATES=	addr2line-0.17.0 \
 PLIST_FILES=	lib/librejson.so

 do-install:
-	${INSTALL_LIB} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/librejson.so ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${CARGO_TARGET_DIR}/*/librejson.so ${STAGEDIR}${PREFIX}/lib

 .include <bsd.port.mk>
--- a/deskutils/health/Makefile
+++ b/deskutils/health/Makefile
@ -37,7 +37,6 @@ post-patch:
 # Make each cargo subcommand very verbose
 # Add explicit <triple> subdir for --target from USES=cargo
 	@${REINPLACE_CMD} -e "/cargo_options =/s/ '--/&verbose', &verbose', &/" \
-		-e "/cp/s,'src',& / '${CARGO_BUILD_TARGET}'," \
 		${WRKSRC}/src/meson.build

 .include <bsd.port.mk>
--- a/deskutils/rwpspread/Makefile
+++ b/deskutils/rwpspread/Makefile
@ -200,8 +200,8 @@ post-install:
 		${STAGEDIR}${PREFIX}/share/bash-completion/completions \
 		${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions
-	${INSTALL_DATA} ${WRKDIR}/target/*-freebsd/release/completions/${PORTNAME}.bash ${STAGEDIR}${PREFIX}/share/bash-completion/completions/${PORTNAME}
-	${INSTALL_DATA} ${WRKDIR}/target/*-freebsd/release/completions/${PORTNAME}.fish ${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d
-	${INSTALL_DATA} ${WRKDIR}/target/*-freebsd/release/completions/_${PORTNAME} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
+	${INSTALL_DATA} ${WRKDIR}/target/release/completions/${PORTNAME}.bash ${STAGEDIR}${PREFIX}/share/bash-completion/completions/${PORTNAME}
+	${INSTALL_DATA} ${WRKDIR}/target/release/completions/${PORTNAME}.fish ${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d
+	${INSTALL_DATA} ${WRKDIR}/target/release/completions/_${PORTNAME} ${STAGEDIR}${PREFIX}/share/zsh/site-functions

 .include <bsd.port.mk>
--- a/deskutils/solanum/Makefile
+++ b/deskutils/solanum/Makefile
@ -31,7 +31,6 @@ post-patch:
 # Make each cargo subcommand very verbose
 # Add explicit <triple> subdir for --target from USES=cargo
 	@${REINPLACE_CMD} -e "/cargo_options =/s/ '--/&verbose', &verbose', &/" \
-		-e "/cp/s,'src',& / '${CARGO_BUILD_TARGET}'," \
 		${WRKSRC}/src/meson.build

 .include <bsd.port.mk>
--- a/devel/evcxr-jupyter/Makefile
+++ b/devel/evcxr-jupyter/Makefile
@ -311,7 +311,7 @@ LDFLAGS+=	-L/usr/local/lib/gcc${GCC_DEFAULT} -latomic
 .endif

 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/target/*-unknown-freebsd/release/evcxr ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKDIR}/target/*-unknown-freebsd/release/evcxr_jupyter ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKDIR}/target/release/evcxr ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKDIR}/target/release/evcxr_jupyter ${STAGEDIR}${PREFIX}/bin

 .include <bsd.port.mk>
--- a/devel/jetbrains-restarter/Makefile
+++ b/devel/jetbrains-restarter/Makefile
@ -27,7 +27,7 @@ PLIST_FILES=	share/jetbrains/${PORTNAME}/restarter
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} \
-		${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/restarter \
+		${CARGO_TARGET_DIR}/*/restarter \
 		${STAGEDIR}${DATADIR}

 post-install:
--- a/devel/jujutsu/Makefile
+++ b/devel/jujutsu/Makefile
@ -23,7 +23,7 @@ GH_PROJECT=	jj
 PLIST_FILES=	bin/jj

 do-install:
-		${INSTALL_PROGRAM} ${WRKDIR}/target/*-unknown-freebsd/release/jj \
+		${INSTALL_PROGRAM} ${WRKDIR}/target/release/jj \
 			${STAGEDIR}${PREFIX}/bin/

 .include <bsd.port.mk>
--- a/devel/libdatadog/Makefile
+++ b/devel/libdatadog/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	libdatadog
 PORTVERSION=	12.0.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel

@ -31,15 +32,15 @@ post-patch:
 	@${SED} -i '' -e '/get_cpu/ s|unsigned long|uint64_t|; /get_proc_total/ s|unsigned long|uint64_t|' ${WRKSRC}/cargo-crates/sys-info-0.9.1/c/*.[ch]

 post-build:
-	@${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/release/dedup_headers \
+	@${CARGO_TARGET_DIR}/release/dedup_headers \
 		${CARGO_TARGET_DIR}/include/datadog/common.h \
 		${CARGO_TARGET_DIR}/include/datadog/crashtracker.h \
 		${CARGO_TARGET_DIR}/include/datadog/profiling.h \
 		${CARGO_TARGET_DIR}/include/datadog/telemetry.h \
 		${CARGO_TARGET_DIR}/include/datadog/data-pipeline.h
-	@${CC} -I ${CARGO_TARGET_DIR}/include/ -L ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/release/ -ldatadog_profiling_ffi \
+	@${CC} -I ${CARGO_TARGET_DIR}/include/ -L ${CARGO_TARGET_DIR}/release/ -ldatadog_profiling_ffi \
 		${WRKSRC}/crashtracker/libdatadog-crashtracking-receiver.c -o ${WRKSRC}/libdatadog-crashtracking-receiver
-	@${MV} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/release/libtest_spawn_from_lib.so ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/release/libtest_spawn_from_lib.so.skip
+	@${MV} ${CARGO_TARGET_DIR}/release/libtest_spawn_from_lib.so ${CARGO_TARGET_DIR}/release/libtest_spawn_from_lib.so.skip

 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/datadog/
@ -48,8 +49,8 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/libdatadog-crashtracking-receiver ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_DATA} ${CARGO_TARGET_DIR}/include/datadog/*.h ${STAGEDIR}${PREFIX}/include/datadog/
 	${INSTALL_DATA} ${WRKSRC}/*.cmake ${STAGEDIR}${PREFIX}/lib/cmake/libdatadog/
-	${INSTALL_DATA} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/release/*.a ${STAGEDIR}${PREFIX}/lib/
-	${INSTALL_LIB} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/release/*.so ${STAGEDIR}${PREFIX}/lib/
+	${INSTALL_DATA} ${CARGO_TARGET_DIR}/release/*.a ${STAGEDIR}${PREFIX}/lib/
+	${INSTALL_LIB} ${CARGO_TARGET_DIR}/release/*.so ${STAGEDIR}${PREFIX}/lib/
 	${INSTALL_DATA} ${WRKSRC}/datadog_profiling*.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/

 .include <bsd.port.mk>
--- a/devel/libdatadog/pkg-plist
+++ b/devel/libdatadog/pkg-plist
@ -9,12 +9,15 @@ lib/cmake/libdatadog/DataPipelineConfig.cmake
 lib/cmake/libdatadog/DatadogConfig.cmake
 lib/libdata_pipeline_ffi.a
 lib/libdata_pipeline_ffi.so
+lib/libdatadog_ipc_macros.so
 lib/libdatadog_profiling_ffi.a
 lib/libdatadog_profiling_ffi.so
 lib/libdatadog_sidecar_ffi.a
 lib/libdatadog_sidecar_ffi.so
+lib/libdatadog_sidecar_macros.so
 lib/libddtelemetry_ffi.a
 lib/libddtelemetry_ffi.so
+lib/libtarpc_plugins.so
 libdata/pkgconfig/datadog_profiling-static.pc
 libdata/pkgconfig/datadog_profiling.pc
 libdata/pkgconfig/datadog_profiling_with_rpath.pc
--- a/devel/librashader/Makefile
+++ b/devel/librashader/Makefile
@ -34,7 +34,7 @@ DEBUG_VARS_OFF=	_PROFILE=release
 # grep '#define LIBRASHADER_CURRENT_ABI' ${WRKSRC}/include/librashader.h | cut -d' ' -f3
 _ABI=		1

-_OUT=		${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/${_PROFILE}
+_OUT=		${CARGO_TARGET_DIR}/${_PROFILE}

 post-patch:
 	${REINPLACE_CMD} 's|/usr/local|${PREFIX}|g' \
@ -42,7 +42,7 @@ post-patch:

 do-build:
 	${CARGO_CARGO_RUN} run -p librashader-build-script -- --profile \
-		${_PROFILE} --target ${CARGO_BUILD_TARGET} --stable
+		${_PROFILE} --stable
 	patchelf --set-soname librashader.so.${_ABI} ${_OUT}/librashader.so

 do-install:
--- a/devel/libwasmtime/Makefile
+++ b/devel/libwasmtime/Makefile
@ -447,7 +447,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/crates/c-api/include/wasm.h ${STAGEDIR}${PREFIX}/include
 	(cd ${WRKSRC}/crates/c-api/include && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include)
 	${RM} ${STAGEDIR}${PREFIX}/include/wasmtime/conf.h.in
-	${INSTALL_LIB} ${WRKDIR}/target/*-unknown-freebsd/release/libwasmtime.a ${STAGEDIR}${PREFIX}/lib
-	${INSTALL_LIB} ${WRKDIR}/target/*-unknown-freebsd/release/libwasmtime.so ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${WRKDIR}/target/release/libwasmtime.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${WRKDIR}/target/release/libwasmtime.so ${STAGEDIR}${PREFIX}/lib

 .include <bsd.port.mk>
--- a/devel/nextest/Makefile
+++ b/devel/nextest/Makefile
@ -416,7 +416,7 @@ do-install:
 	# workaround for error: found a virtual manifest at `xx` instead of a package manifest
 .for p in ${PROGS}
 	${INSTALL_PROGRAM} \
-		${WRKDIR}/target/*/release/${p} \
+		${WRKDIR}/target/release/${p} \
 		${STAGEDIR}${PREFIX}/bin
 .endfor

--- a/devel/pijul/Makefile
+++ b/devel/pijul/Makefile
@ -448,6 +448,6 @@ post-patch:
 	${MV} ${WRKSRC}/cargo-crates/pijul-1.0.0-beta.9/* ${WRKSRC}/

 do-install:
-	${INSTALL_SCRIPT} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/pijul ${STAGEDIR}${PREFIX}/bin/pijul
+	${INSTALL_SCRIPT} ${CARGO_TARGET_DIR}/*/pijul ${STAGEDIR}${PREFIX}/bin/pijul

 .include <bsd.port.mk>
--- a/devel/ruff/Makefile
+++ b/devel/ruff/Makefile
@ -9,8 +9,6 @@ WWW=		https://github.com/charliermarsh/ruff
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE

-BROKEN_i386=	compilation fails: evaluation of constant value failed, see https://github.com/briansmith/ring/issues/2006
-
 BUILD_DEPENDS=	gmake:devel/gmake
 LIB_DEPENDS=	libzstd.so:archivers/zstd

@ -38,17 +36,17 @@ do-install:
 	# workaround for error: found a virtual manifest at `xx` instead of a package manifest
 .for p in ${PROGS}
 	${INSTALL_PROGRAM} \
-		${WRKDIR}/target/*/release/${p} \
+		${WRKDIR}/target/release/${p} \
 		${STAGEDIR}${PREFIX}/bin
 .endfor
 	# generate shell completions
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions
-	${WRKDIR}/target/*/release/${PORTNAME} generate-shell-completion bash > ${STAGEDIR}${PREFIX}/share/bash-completion/completions/${PORTNAME}
+	${WRKDIR}/target/release/${PORTNAME} generate-shell-completion bash > ${STAGEDIR}${PREFIX}/share/bash-completion/completions/${PORTNAME}
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/elvish/lib
-	${WRKDIR}/target/*/release/${PORTNAME} generate-shell-completion elvish > ${STAGEDIR}${PREFIX}/share/elvish/lib/${PORTNAME}.elv
+	${WRKDIR}/target/release/${PORTNAME} generate-shell-completion elvish > ${STAGEDIR}${PREFIX}/share/elvish/lib/${PORTNAME}.elv
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d
-	${WRKDIR}/target/*/release/${PORTNAME} generate-shell-completion fish > ${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d/${PORTNAME}.fish
+	${WRKDIR}/target/release/${PORTNAME} generate-shell-completion fish > ${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d/${PORTNAME}.fish
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
-	${WRKDIR}/target/*/release/${PORTNAME} generate-shell-completion zsh > ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_${PORTNAME}
+	${WRKDIR}/target/release/${PORTNAME} generate-shell-completion zsh > ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_${PORTNAME}

 .include <bsd.port.mk>
--- a/devel/rustc-demangle/Makefile
+++ b/devel/rustc-demangle/Makefile
@ -35,7 +35,7 @@ PLIST_FILES=	include/rustc_demangle.h \

 do-install:
 	${INSTALL_DATA} ${WRKSRC}/../../crates/capi/include/rustc_demangle.h ${STAGEDIR}${PREFIX}/include
-	${INSTALL_DATA} ${WRKDIR}/target/*-freebsd/release/librustc_demangle.a ${STAGEDIR}${PREFIX}/lib
-	${INSTALL_LIB} ${WRKDIR}/target/*-freebsd/release/librustc_demangle.so ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKDIR}/target/release/librustc_demangle.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${WRKDIR}/target/release/librustc_demangle.so ${STAGEDIR}${PREFIX}/lib

 .include <bsd.port.mk>
--- a/devel/rye/Makefile
+++ b/devel/rye/Makefile
@ -328,7 +328,7 @@ PLIST_FILES=	bin/${PORTNAME}
 do-install:
 	# binaries (workaround for error: found a virtual manifest at `xx` instead of a package manifest)
 	${INSTALL_PROGRAM} \
-		${WRKDIR}/target/*/release/${PORTNAME} \
+		${WRKDIR}/target/release/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin

 .include <bsd.port.mk>
--- a/devel/signal-fts5-extension/Makefile
+++ b/devel/signal-fts5-extension/Makefile
@ -89,6 +89,6 @@ CARGO_CRATES=	atty-0.2.14 \
 PLIST_FILES=	lib/libsignal_tokenizer.a

 do-install:
-	${INSTALL_DATA} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/libsignal_tokenizer.a ${STAGEDIR}${LOCALBASE}/lib/
+	${INSTALL_DATA} ${CARGO_TARGET_DIR}/*/libsignal_tokenizer.a ${STAGEDIR}${LOCALBASE}/lib/

 .include <bsd.port.mk>
--- a/devel/spr/Makefile
+++ b/devel/spr/Makefile
@ -259,7 +259,7 @@ PLIST_FILES=	bin/${PORTNAME}
 do-install:
 	# workaround for error: found a virtual manifest at `xx` instead of a package manifest
 	${INSTALL_PROGRAM} \
-		${WRKDIR}/target/*/release/${PORTNAME} \
+		${WRKDIR}/target/release/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}

 .include <bsd.port.mk>
--- a/devel/tabby/Makefile
+++ b/devel/tabby/Makefile
@ -640,7 +640,7 @@ PLIST_FILES=	bin/${PORTNAME}
 do-install:
 	# binaries (workaround for error: found a virtual manifest at `xx` instead of a package manifest)
 	${INSTALL_PROGRAM} \
-		${WRKDIR}/target/*/release/${PORTNAME} \
+		${WRKDIR}/target/release/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin

 .include <bsd.port.mk>
--- a/devel/uv/Makefile
+++ b/devel/uv/Makefile
@ -37,7 +37,7 @@ do-install:
 # workaround for error: found a virtual manifest at `xx` instead of a package manifest
 .for p in ${PROGS}
 	${INSTALL_PROGRAM} \
-		${WRKDIR}/target/*/release/${p} \
+		${WRKDIR}/target/release/${p} \
 		${STAGEDIR}${PREFIX}/bin
 .endfor

--- a/devel/xtensa-esp-elf/Makefile
+++ b/devel/xtensa-esp-elf/Makefile
@ -163,7 +163,7 @@ do-install:
 	    ${XARGS} ${CHMOD} +x

 	# xtensa-toolchian-wrapper
-	${INSTALL_PROGRAM} ${WRKSRC2}/target/*-unknown-freebsd/release/xtensa-toolchian-wrapper \
+	${INSTALL_PROGRAM} ${WRKSRC2}/target/release/xtensa-toolchian-wrapper \
 	    ${STAGEDIR}${PREFIX}/${PKGBASE}/bin
 .for chip in ${XTENSA_CHIPS}
 .for wrap in ${XTENSA_WRAPPED}
--- a/editors/parinfer-rust/Makefile
+++ b/editors/parinfer-rust/Makefile
@ -108,7 +108,7 @@ PLIST_FILES=	bin/parinfer-rust \
 		share/vim/vimfiles/plugin/parinfer.vim

 post-install:
-	${INSTALL_LIB} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/libparinfer_rust.so \
+	${INSTALL_LIB} ${CARGO_TARGET_DIR}/*/libparinfer_rust.so \
 		${STAGEDIR}${PREFIX}/lib
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/kak/rc/extra \
 		${STAGEDIR}${PREFIX}/share/vim/vimfiles/doc \
--- a/finance/hyperswitch/Makefile
+++ b/finance/hyperswitch/Makefile
@ -747,7 +747,7 @@ do-install:
 	# binaries (workaround for error: found a virtual manifest at `xx` instead of a package manifest)
 .for p in ${PROGS}
 	${INSTALL_PROGRAM} \
-		${WRKDIR}/target/*/release/${p} \
+		${WRKDIR}/target/release/${p} \
 		${STAGEDIR}${PREFIX}/bin
 .endfor

--- a/games/veloren-weekly/Makefile
+++ b/games/veloren-weekly/Makefile
@ -65,7 +65,7 @@ post-patch:
 do-install:
 # XXX [workspace.dependencies] breaks rebuild in subdirs
 .for f in ${CARGO_INSTALL_PATH}
-	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/*/*/${PORTNAME}-$f \
+	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/*/${PORTNAME}-$f \
 		${STAGEDIR}${PREFIX}/bin
 .endfor

--- a/graphics/librsvg2-rust/Makefile
+++ b/graphics/librsvg2-rust/Makefile
@ -32,7 +32,6 @@ CONFIGURE_ARGS=	--disable-Bsymbolic \
 		--enable-vala
 CONFIGURE_ENV=	${CARGO_ENV}
 MAKE_ENV=	${CARGO_ENV}
-CARGO_ENV=	RUST_TARGET=${CARGO_BUILD_TARGET}
 CARGO_BUILD=	no
 CARGO_INSTALL=	no
 CARGO_TEST=	no
@ -48,9 +47,4 @@ DOCS_CONFIGURE_ENABLE=	gtk-doc

 TESTING_UNSAFE=	ld: error: undefined symbol: pthread_condattr_init

-post-patch:
-# Add explicit <triple> subdir for --target from USES=cargo
-	@${REINPLACE_CMD} 's/test "x$$cross_compiling" = "xyes"/true/' \
-		${WRKSRC}/configure
-
 .include <bsd.port.mk>
--- a/graphics/ocrs/Makefile
+++ b/graphics/ocrs/Makefile
@ -126,7 +126,7 @@ PLIST_FILES=	bin/${PORTNAME}
 do-install:
 	# binaries (workaround for error: found a virtual manifest at `xx` instead of a package manifest)
 	${INSTALL_PROGRAM} \
-		${WRKDIR}/target/*/release/${PORTNAME} \
+		${WRKDIR}/target/release/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin

 .include <bsd.port.mk>
--- a/graphics/oxipng/Makefile
+++ b/graphics/oxipng/Makefile
@ -18,7 +18,7 @@ PLIST_FILES=	bin/${PORTNAME} \
 		share/man/man1/${PORTNAME}.1.gz

 post-install:
-	${INSTALL_MAN} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/assets/*.1 \
+	${INSTALL_MAN} ${CARGO_TARGET_DIR}/*/assets/*.1 \
 		${STAGEDIR}${PREFIX}/share/man/man1

 .include <bsd.port.mk>
--- a/graphics/resvg-capi/Makefile
+++ b/graphics/resvg-capi/Makefile
@ -86,7 +86,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/resvg.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/ResvgQt.h ${STAGEDIR}${PREFIX}/include
 	cd ${WRKDIR}/target && \
-		${INSTALL_LIB} */release/libresvg.so ${STAGEDIR}${PREFIX}/lib && \
-		${INSTALL_DATA} */release/libresvg.a ${STAGEDIR}${PREFIX}/lib
+		${INSTALL_LIB} release/libresvg.so ${STAGEDIR}${PREFIX}/lib && \
+		${INSTALL_DATA} release/libresvg.a ${STAGEDIR}${PREFIX}/lib

 .include <bsd.port.mk>
--- a/japanese/sudachi/Makefile
+++ b/japanese/sudachi/Makefile
@ -175,7 +175,7 @@ post-patch:
 do-install:
 	# install binaries (workaround for error: found a virtual manifest at `xx` instead of a package manifest)
 	${INSTALL_PROGRAM} \
-		${WRKDIR}/target/*/release/${PORTNAME} \
+		${WRKDIR}/target/release/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin
 	# install the resources directory
 	@cd ${WRKSRC} && \
--- a/lang/cairo/Makefile
+++ b/lang/cairo/Makefile
@ -447,7 +447,7 @@ PLIST_FILES=	bin/cairo-compile bin/cairo-format bin/cairo-language-server bin/ca
 do-install: # workaround for error: found a virtual manifest at `/usr/ports/lang/cairo/work/cairo-2.0.1/Cargo.toml` instead of a package manifest
 	# executables
 .for e in ${PLIST_FILES:S/bin\///}
-	${INSTALL_PROGRAM} ${WRKDIR}/target/*-freebsd/release/${e} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKDIR}/target/release/${e} ${STAGEDIR}${PREFIX}/bin
 .endfor
 	# corelib
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/cairo-lang
--- a/lang/inko/Makefile
+++ b/lang/inko/Makefile
@ -127,10 +127,10 @@ CARGO_CRATES=	addr2line-0.21.0 \

 do-install:
 	# executable
-	${INSTALL_PROGRAM} ${WRKDIR}/target/*-freebsd/release/inko ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKDIR}/target/release/inko ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	# runtime library
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/inko/runtime
-	${INSTALL_DATA} ${WRKDIR}/target/*-freebsd/release/libinko.a ${STAGEDIR}${PREFIX}/lib/inko/runtime
+	${INSTALL_DATA} ${WRKDIR}/target/release/libinko.a ${STAGEDIR}${PREFIX}/lib/inko/runtime
 	# standard library
 	cd ${WRKSRC}/std/src && ${COPYTREE_SHARE} std ${STAGEDIR}${PREFIX}/lib/inko

--- a/lang/numbat/Makefile
+++ b/lang/numbat/Makefile
@ -284,7 +284,7 @@ PLIST_FILES=	bin/${PORTNAME}
 do-install:
 	# workaround for error: found a virtual manifest at `xx` instead of a package manifest
 	${INSTALL_PROGRAM} \
-		${WRKDIR}/target/*/release/${PORTNAME} \
+		${WRKDIR}/target/release/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}

 .include <bsd.port.mk>
--- a/lang/prql/Makefile
+++ b/lang/prql/Makefile
@ -508,7 +508,7 @@ PLIST_FILES=	bin/prqlc
 do-install:
 	# workaround for error: found a virtual manifest at `xx` instead of a package manifest
 	${INSTALL_PROGRAM} \
-		${WRKDIR}/target/*/release/prqlc \
+		${WRKDIR}/target/release/prqlc \
 		${STAGEDIR}${PREFIX}/bin/prqlc

 .include <bsd.port.mk>
--- a/lang/starlark-rust/Makefile
+++ b/lang/starlark-rust/Makefile
@ -248,7 +248,7 @@ PLIST_FILES=	bin/starlark
 do-install:
 	# binaries (workaround for error: found a virtual manifest at `xx` instead of a package manifest)
 	${INSTALL_PROGRAM} \
-		${WRKDIR}/target/*/release/starlark \
+		${WRKDIR}/target/release/starlark \
 		${STAGEDIR}${PREFIX}/bin

 .include <bsd.port.mk>
--- a/math/fend/Makefile
+++ b/math/fend/Makefile
@ -122,7 +122,7 @@ PLIST_FILES=	bin/${PORTNAME}
 do-install:
 	# workaround for error: found a virtual manifest at `xx` instead of a package manifest
 	${INSTALL_PROGRAM} \
-		${WRKDIR}/target/*/release/${PORTNAME} \
+		${WRKDIR}/target/release/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}

 .include <bsd.port.mk>
--- a/misc/py-pyqir/Makefile
+++ b/misc/py-pyqir/Makefile
@ -94,7 +94,7 @@ TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}

 do-install:
 	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}
-	${INSTALL_LIB} ${WRKDIR}/target/*-unknown-freebsd/release/libpyqir.so ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/_native.abi3.so
+	${INSTALL_LIB} ${WRKDIR}/target/release/libpyqir.so ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/_native.abi3.so
 	${INSTALL_DATA} ${WRKSRC}/pyqir/pyqir/*.py ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}

 .include <bsd.port.mk>
--- a/misc/quary/Makefile
+++ b/misc/quary/Makefile
@ -534,7 +534,7 @@ LDFLAGS+=	-L/usr/local/lib/gcc${GCC_DEFAULT} -latomic

 do-install:
 	${INSTALL_PROGRAM} \
-		${WRKDIR}/target/*/release/${PORTNAME} \
+		${WRKDIR}/target/release/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin

 .include <bsd.port.mk>
--- a/multimedia/helvum/Makefile
+++ b/multimedia/helvum/Makefile
@ -37,7 +37,6 @@ post-patch:
 # Make each cargo subcommand very verbose
 # Add explicit <triple> subdir for --target from USES=cargo
 	@${REINPLACE_CMD} -e "/cargo_options =/s/ '--/&verbose', &verbose', &/" \
-		-e "/cp/s,'src',& / '${CARGO_BUILD_TARGET}'," \
 		${WRKSRC}/src/meson.build

 .include <bsd.port.mk>
--- a/multimedia/kooha/Makefile
+++ b/multimedia/kooha/Makefile
@ -32,7 +32,6 @@ post-patch:
 # Make each cargo subcommand very verbose
 # Add explicit <triple> subdir for --target from USES=cargo
 	@${REINPLACE_CMD} -e "/cargo_options =/s/ '--/&verbose', &verbose', &/" \
-		-e "/cp/s,'src',& / '${CARGO_BUILD_TARGET}'," \
 		${WRKSRC}/src/meson.build

 .include <bsd.port.mk>
--- a/multimedia/ringrtc/Makefile
+++ b/multimedia/ringrtc/Makefile
@ -171,7 +171,7 @@ pre-build:
 # it's not intended to be used outside of signal-desktop, put that in
 # /usr/local/share/ringrtc instead?
 do-install:
-	${INSTALL_LIB} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/release/libringrtc.so \
+	${INSTALL_LIB} ${CARGO_TARGET_DIR}/release/libringrtc.so \
 		${STAGEDIR}${PREFIX}/lib/

 .include <bsd.port.mk>
--- a/multimedia/video-trimmer/Makefile
+++ b/multimedia/video-trimmer/Makefile
@ -30,7 +30,6 @@ post-patch:
 # Make each cargo subcommand very verbose
 # Add explicit <triple> subdir for --target from USES=cargo
 	@${REINPLACE_CMD} -e '/cargo/s/ --/&verbose&verbose&/' \
-		-Ee '/cp/s,/(release|debug)/,/${CARGO_BUILD_TARGET}&,' \
 		${WRKSRC}/build-aux/cargo.sh

 .include <bsd.port.mk>
--- a/multimedia/wl-screenrec/Makefile
+++ b/multimedia/wl-screenrec/Makefile
@ -29,7 +29,7 @@ post-patch:
 post-install:
 .for _shell in bash fish zsh
 	@${ECHO_MSG} "Generating ${STAGEDIR}${PREFIX}/${PLIST_FILES:M*${_shell}*}"
-	${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/${PORTNAME} \
+	${CARGO_TARGET_DIR}/*/${PORTNAME} \
 		--generate-completions ${_shell} \
 		>${STAGEDIR}${PREFIX}/${PLIST_FILES:M*${_shell}*}
 .endfor
--- a/net-im/fractal/files/patch-scripts_cargo.sh
+++ b/net-im/fractal/files/patch-scripts_cargo.sh
@ -12,9 +12,9 @@
 then
     echo "DEBUG MODE"
 -    cargo build --manifest-path $1/Cargo.toml -p fractal-gtk && cp "$CARGO_TARGET_DIR"/debug/fractal-gtk "$OUTPUT"
-+    cargo build --manifest-path $1/Cargo.toml -p fractal-gtk && cp "$CARGO_TARGET_DIR"/"$CARGO_BUILD_TARGET"/debug/fractal-gtk "$OUTPUT"
+    cargo build --manifest-path $1/Cargo.toml -p fractal-gtk && cp "$CARGO_TARGET_DIR"/debug/fractal-gtk "$OUTPUT"
 else
     echo "RELEASE MODE"
 -    cargo build --manifest-path $1/Cargo.toml --release -p fractal-gtk && cp "$CARGO_TARGET_DIR"/release/fractal-gtk "$OUTPUT"
-+    cargo build --manifest-path $1/Cargo.toml --release -p fractal-gtk && cp "$CARGO_TARGET_DIR"/"$CARGO_BUILD_TARGET"/release/fractal-gtk "$OUTPUT"
+    cargo build --manifest-path $1/Cargo.toml --release -p fractal-gtk && cp "$CARGO_TARGET_DIR"/release/fractal-gtk "$OUTPUT"
 fi
--- a/net-im/libsignal-client/Makefile
+++ b/net-im/libsignal-client/Makefile
@ -247,7 +247,7 @@ MAKE_ENV=		CARGO_PROFILE_RELEASE_LTO=thin \
 PLIST_FILES=		lib/libsignal_jni.so

 do-install:
-	${INSTALL_LIB} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/libsignal_jni.so \
+	${INSTALL_LIB} ${CARGO_TARGET_DIR}/*/libsignal_jni.so \
 		${STAGEDIR}${PREFIX}/lib/

 .include <bsd.port.mk>
--- a/net-im/zkgroup/Makefile
+++ b/net-im/zkgroup/Makefile
@ -135,7 +135,7 @@ CARGO_CRATES=	aead-0.4.1 \
 PLIST_FILES=	lib/lib${PORTNAME}.so

 do-install:
-	${INSTALL_LIB} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/lib${PORTNAME}.so \
+	${INSTALL_LIB} ${CARGO_TARGET_DIR}/*/lib${PORTNAME}.so \
 		${STAGEDIR}${PREFIX}/lib/

 .include <bsd.port.mk>
--- a/net-mgmt/gping/Makefile
+++ b/net-mgmt/gping/Makefile
@ -19,7 +19,7 @@ PLIST_FILES=	bin/gping \
 		share/man/man1/gping.1.gz

 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/target/*/release/${PORTNAME} \
+	${INSTALL_PROGRAM} ${WRKDIR}/target/release/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/gping.1 ${STAGEDIR}${PREFIX}/share/man/man1

--- a/net-p2p/cncli/Makefile
+++ b/net-p2p/cncli/Makefile
@ -27,6 +27,11 @@ CARGO_ENV=	SODIUM_LIB_DIR=${LIBS_PREFIX}${PREFIX}/lib SODIUM_INCLUDE_DIR=${LIBS_

 PLIST_FILES=	bin/cncli

+CARGO_BUILD_TARGET=	${_CARGO_RUST_ARCH_${ARCH}:U${ARCH}}-unknown-${OPSYS:tl}
+CARGO_ENV+= \
+		CARGO_BUILD_TARGET=${CARGO_BUILD_TARGET} \
+		CARGO_TARGET_${CARGO_BUILD_TARGET:S/-/_/g:tu}_LINKER="${CC}"
+
 pre-build:
 		cd ${WRKSRC_sodium} && ./autogen.sh
 		cd ${WRKSRC_sodium} && ./configure --prefix=${PREFIX} --with-pthreads --disable-shared
--- a/net/narrowlink/Makefile
+++ b/net/narrowlink/Makefile
@ -335,7 +335,7 @@ do-install:
 	# workaround for error: found a virtual manifest at `xx` instead of a package manifest
 .for prog in ${PROGRAMS}
 	${INSTALL_PROGRAM} \
-		${WRKDIR}/target/*/release/${prog} \
+		${WRKDIR}/target/release/${prog} \
 		${STAGEDIR}${PREFIX}/bin
 .endfor
 	# install config files
--- a/net/ntpd-rs/Makefile
+++ b/net/ntpd-rs/Makefile
@ -30,7 +30,7 @@ post-patch:

 do-install:
 .for f in ${BINFILES}
-	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/${f} ${STAGEDIR}${LOCALBASE}/bin
+	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/*/${f} ${STAGEDIR}${LOCALBASE}/bin
 .endfor
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/ntp.server.toml ${STAGEDIR}${ETCDIR}/ntp.server.toml.sample
--- a/net/quiche/Makefile
+++ b/net/quiche/Makefile
@ -47,13 +47,13 @@ post-patch:
 # install quiche apps and libquiche
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/quiche/include/quiche.h ${STAGEDIR}${PREFIX}/include
-	${INSTALL_DATA} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/quiche.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
-	${INSTALL_LIB} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/libquiche.so ${STAGEDIR}${PREFIX}/lib/libquiche.so.${DISTVERSION}
+	${INSTALL_DATA} ${CARGO_TARGET_DIR}/*/quiche.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
+	${INSTALL_LIB} ${CARGO_TARGET_DIR}/*/libquiche.so ${STAGEDIR}${PREFIX}/lib/libquiche.so.${DISTVERSION}
 	${RLN} ${STAGEDIR}${PREFIX}/lib/libquiche.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libquiche.so.${MAJOR_VER}
 	${RLN} ${STAGEDIR}${PREFIX}/lib/libquiche.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libquiche.so
-	${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
+	${INSTALL_LIB} ${CARGO_TARGET_DIR}/*/libquiche.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/*/quiche-server ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/*/quiche-client ${STAGEDIR}${PREFIX}/bin

 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
--- a/net/trippy/Makefile
+++ b/net/trippy/Makefile
@ -32,7 +32,7 @@ SUID_PLIST_FILES_OFF=	"@(,,0100) bin/trip"

 post-build-MANPAGES-on:
 	help2man -s 1 -Nn "${COMMENT}" \
-		${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/trip \
+		${CARGO_TARGET_DIR}/*/trip \
 		-o ${WRKSRC}/trip.1

 post-install-MANPAGES-on:
--- a/ports-mgmt/sccache-overlay/Makefile
+++ b/ports-mgmt/sccache-overlay/Makefile
@ -398,8 +398,8 @@ CARGO_CRATES=	addr2line-0.14.1 \
 		zstd-sys-1.4.19+zstd.1.4.8
 CARGO_FEATURES=	--no-default-features
 QA_ENV=		IGNORE_QA_proxydeps=1
-LDFLAGS+=	-Wl,-rpath=\$$ORIGIN/../lib \
-		-Wl,-dynamic-linker,/tmp/sccache-overlay/ld-elf.so.1
+#LDFLAGS+=	-Wl,-rpath=\$$ORIGIN/lib \
+#		-Wl,-dynamic-linker,/tmp/sccache-overlay/ld-elf.so.1
 SUB_FILES=	pkg-message

 post-install:
--- a/security/arti/Makefile
+++ b/security/arti/Makefile
@ -26,7 +26,7 @@ CARGO_FEATURES=	tokio rustls
 CARGO_INSTALL=	no

 do-install:
-	${INSTALL_SCRIPT} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/arti ${STAGEDIR}${PREFIX}/bin/arti
+	${INSTALL_SCRIPT} ${CARGO_TARGET_DIR}/*/arti ${STAGEDIR}${PREFIX}/bin/arti

 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}/var/log/arti ${STAGEDIR}/var/run/arti ${STAGEDIR}/var/db/arti
--- a/security/authenticator/Makefile
+++ b/security/authenticator/Makefile
@ -36,7 +36,6 @@ post-patch:
 # Make each cargo subcommand very verbose
 # Add explicit <triple> subdir for --target from USES=cargo
 	@${REINPLACE_CMD} -e "/cargo_options =/s/ '--/&verbose', &verbose', &/" \
-		-e "/cp/s,'src',& / '${CARGO_BUILD_TARGET}'," \
 		${WRKSRC}/src/meson.build

 .include <bsd.port.mk>
--- a/security/pam_rssh/Makefile
+++ b/security/pam_rssh/Makefile
@ -64,6 +64,6 @@ CARGO_CRATES=	base64-0.13.1 \
 PLIST_FILES=	lib/pam_rssh.so

 do-install:
-	${INSTALL_LIB} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/release/libpam_rssh.so ${STAGEDIR}${PREFIX}/lib/pam_rssh.so
+	${INSTALL_LIB} ${CARGO_TARGET_DIR}/release/libpam_rssh.so ${STAGEDIR}${PREFIX}/lib/pam_rssh.so

 .include <bsd.port.mk>
--- a/security/rage-encryption/Makefile
+++ b/security/rage-encryption/Makefile
@ -31,7 +31,7 @@ PLIST_FILES=	bin/rage \

 do-install:
 .for f in rage rage-keygen rage-mount
-	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/${f} \
+	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/*/${f} \
 		${STAGEDIR}${PREFIX}/bin
 .endfor

--- a/security/rpm-sequoia/Makefile
+++ b/security/rpm-sequoia/Makefile
@ -270,7 +270,7 @@ PLIST_FILES=	lib/librpm_sequoia.so \
 do-install:
 	# .so lib
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib
-	${INSTALL_LIB} ${WRKDIR}/target/*-unknown-freebsd/release/librpm_sequoia.so ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${WRKDIR}/target/release/librpm_sequoia.so ${STAGEDIR}${PREFIX}/lib
 	# .pc file
 	${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig
 	${INSTALL_DATA} ${WRKDIR}/target/release/rpm-sequoia.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/rpm-sequoia.pc
--- a/security/solana/Makefile
+++ b/security/solana/Makefile
@ -695,7 +695,7 @@ MAKE_ENV=	${XARCH}_UNKNOWN_FREEBSD_OPENSSL_INCLUDE_DIR=${OPENSSLINC} \
 BINARY_ALIAS=	llvm-config=${LOCALBASE}/bin/${LLVM_CONFIG}

 do-install:
-	for f in ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/${PORTNAME}*; do \
+	for f in ${CARGO_TARGET_DIR}/*/${PORTNAME}*; do \
 		if [ -f $$f -a -x $$f ]; then \
 			${INSTALL_PROGRAM} $$f ${STAGEDIR}${PREFIX}/bin; \
 		fi \
--- a/shells/atuin/Makefile
+++ b/shells/atuin/Makefile
@ -475,7 +475,7 @@ PLIST_FILES=	bin/${PORTNAME}
 do-install:
 	# binaries (workaround for error: found a virtual manifest at `xx` instead of a package manifest)
 	${INSTALL_PROGRAM} \
-		${WRKDIR}/target/*/release/${PORTNAME} \
+		${WRKDIR}/target/release/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin

 .include <bsd.port.mk>
--- a/sysutils/bkt/Makefile
+++ b/sysutils/bkt/Makefile
@ -22,7 +22,7 @@ MANPAGES_BUILD_DEPENDS=	help2man:misc/help2man

 post-build-MANPAGES-on:
 	help2man -s 1 -Nn "${COMMENT}" \
-		${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/${PORTNAME} \
+		${CARGO_TARGET_DIR}/*/${PORTNAME} \
 		-o ${WRKSRC}/${PORTNAME}.1

 post-install-MANPAGES-on:
--- a/sysutils/fd/Makefile
+++ b/sysutils/fd/Makefile
@ -28,8 +28,8 @@ PLIST_FILES=	bin/fd \

 post-build:
 	${MKDIR} ${WRKSRC}/autocomplete
-	${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/release/fd --gen-completions bash > ${WRKSRC}/autocomplete/fd.bash
-	${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/release/fd --gen-completions fish > ${WRKSRC}/autocomplete/fd.fish
+	${CARGO_TARGET_DIR}/release/fd --gen-completions bash > ${WRKSRC}/autocomplete/fd.bash
+	${CARGO_TARGET_DIR}/release/fd --gen-completions fish > ${WRKSRC}/autocomplete/fd.fish

 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/fd.1 \
--- a/sysutils/rust-coreutils/Makefile
+++ b/sysutils/rust-coreutils/Makefile
@ -22,29 +22,29 @@ BINPREFIX=	uu-
 PLIST_SUB=	BINPREFIX=${BINPREFIX}

 post-build:
-	${INSTALL_SCRIPT} ${FILESDIR}/symlink-install-helper.sh.in ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/symlink-install-helper.sh
+	${INSTALL_SCRIPT} ${FILESDIR}/symlink-install-helper.sh.in ${CARGO_TARGET_DIR}/symlink-install-helper.sh
 	@${REINPLACE_CMD} -e 's|%%GREP%%|${GREP}|g' \
-		${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/symlink-install-helper.sh
+		${CARGO_TARGET_DIR}/symlink-install-helper.sh
 	@${REINPLACE_CMD} -e 's|%%CARGO_TARGET_DIR%%|${CARGO_TARGET_DIR}|g' \
-		${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/symlink-install-helper.sh
+		${CARGO_TARGET_DIR}/symlink-install-helper.sh
 	@${REINPLACE_CMD} -e 's|%%CARGO_BUILD_TARGET%%|${CARGO_BUILD_TARGET}|g' \
-		${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/symlink-install-helper.sh
+		${CARGO_TARGET_DIR}/symlink-install-helper.sh
 	@${REINPLACE_CMD} -e 's|%%SED%%|${SED}|g' \
-		${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/symlink-install-helper.sh
+		${CARGO_TARGET_DIR}/symlink-install-helper.sh
 	@${REINPLACE_CMD} -e 's|%%TR%%|${TR}|g' \
-		${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/symlink-install-helper.sh
+		${CARGO_TARGET_DIR}/symlink-install-helper.sh
 	@${REINPLACE_CMD} -e 's|%%RLN%%|${RLN}|g' \
-		${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/symlink-install-helper.sh
+		${CARGO_TARGET_DIR}/symlink-install-helper.sh
 	@${REINPLACE_CMD} -e 's|%%STAGEDIR%%|${STAGEDIR}|g' \
-		${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/symlink-install-helper.sh
+		${CARGO_TARGET_DIR}/symlink-install-helper.sh
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/symlink-install-helper.sh
+		${CARGO_TARGET_DIR}/symlink-install-helper.sh
 	@${REINPLACE_CMD} -e 's|%%BINPREFIX%%|${BINPREFIX}|g' \
-		${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/symlink-install-helper.sh
+		${CARGO_TARGET_DIR}/symlink-install-helper.sh

 do-install:
-	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/release/coreutils \
+	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/release/coreutils \
 		${STAGEDIR}${PREFIX}/bin/${BINPREFIX}coreutils
-	${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/symlink-install-helper.sh
+	${CARGO_TARGET_DIR}/symlink-install-helper.sh

 .include <bsd.port.mk>
--- a/sysutils/systeroid/Makefile
+++ b/sysutils/systeroid/Makefile
@ -196,7 +196,7 @@ do-install:
 	# binaries (workaround for error: found a virtual manifest at `xx` instead of a package manifest)
 .for p in ${PROGS}
 	${INSTALL_PROGRAM} \
-		${WRKDIR}/target/*/release/${p} \
+		${WRKDIR}/target/release/${p} \
 		${STAGEDIR}${PREFIX}/bin
 .endfor

--- a/textproc/jql/Makefile
+++ b/textproc/jql/Makefile
@ -123,6 +123,6 @@ CARGO_CRATES=	addr2line-0.24.1 \
 PLIST_FILES=	bin/${PORTNAME}

 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/target/*/release/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} # otherwise there's error: found a virtual manifest at `xx` instead of a package manifest
+	${INSTALL_PROGRAM} ${WRKDIR}/target/release/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} # otherwise there's error: found a virtual manifest at `xx` instead of a package manifest

 .include <bsd.port.mk>
--- a/textproc/tokay/Makefile
+++ b/textproc/tokay/Makefile
@ -125,6 +125,6 @@ CARGO_CRATES=	aho-corasick-1.1.3 \
 PLIST_FILES=	bin/${PORTNAME}

 do-install: # workaround this error in do-install: There are multiple `tokay` packages in your project, and the specification `tokay` is ambiguous.
-	${INSTALL_PROGRAM} ${WRKDIR}/target/*-unknown-freebsd/release/tokay ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKDIR}/target/release/tokay ${STAGEDIR}${PREFIX}/bin/${PORTNAME}

 .include <bsd.port.mk>
--- a/textproc/typst/Makefile
+++ b/textproc/typst/Makefile
@ -23,6 +23,6 @@ LTO_UNSAFE=	yes
 .endif

 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/target/*/release/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKDIR}/target/release/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}

 .include <bsd.port.mk>
--- a/www/deno-dom/Makefile
+++ b/www/deno-dom/Makefile
@ -91,7 +91,7 @@ do-install:
 	# binaries (workaround for error: found a virtual manifest at `xx` instead of a package manifest)
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/deno-plugins
 	${INSTALL_LIB} \
-		${WRKDIR}/target/*/release/libplugin.so \
+		${WRKDIR}/target/release/libplugin.so \
 		${STAGEDIR}${PREFIX}/lib/deno-plugins/deno_dom.so

 .include <bsd.port.mk>
--- a/www/deno/Makefile
+++ b/www/deno/Makefile
@ -60,6 +60,6 @@ post-patch:
 	${CP} ${WRKSRC}/cargo-crates/deno_core_icudata-0.0.73/src/icudtl.dat ${WRKSRC}/cargo-crates/v8-${V8_VERS}/third_party/icu/common/

 do-install:
-	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/deno ${STAGEDIR}${LOCALBASE}/bin
+	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/*/deno ${STAGEDIR}${LOCALBASE}/bin

 .include <bsd.port.mk>
--- a/www/varnish-libvmod-fileserver/Makefile
+++ b/www/varnish-libvmod-fileserver/Makefile
@ -98,6 +98,6 @@ BINARY_ALIAS=	python3=${PYTHON_CMD}

 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/varnish/vmods/
-	${INSTALL_LIB} ${WRKDIR}/target/*freebsd/release/libvmod_fileserver.so ${STAGEDIR}${PREFIX}/lib/varnish/vmods/
+	${INSTALL_LIB} ${WRKDIR}/target/release/libvmod_fileserver.so ${STAGEDIR}${PREFIX}/lib/varnish/vmods/

 .include <bsd.port.mk>
--- a/x11/clipcat/Makefile
+++ b/x11/clipcat/Makefile
@ -517,7 +517,7 @@ do-install:
 .for p in ${PROGRAMS}
 	# workaround for error: found a virtual manifest at `xx` instead of a package manifest
 	${INSTALL_PROGRAM} \
-		${WRKDIR}/target/*/release/${p} \
+		${WRKDIR}/target/release/${p} \
 		${STAGEDIR}${PREFIX}/bin/${p}
 .endfor

--- a/x11/rio/Makefile
+++ b/x11/rio/Makefile
@ -434,6 +434,6 @@ PLIST_FILES=	bin/${PORTNAME}

 do-install:
 	# workaround for error: found a virtual manifest at `/usr/ports/x11/rio/work/rio-4636f43/Cargo.toml` instead of a package manifest
-	${INSTALL_PROGRAM} ${WRKDIR}/target/*-freebsd/release/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKDIR}/target/release/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}

 .include <bsd.port.mk>
--- a/x11/shotman/Makefile
+++ b/x11/shotman/Makefile
@ -46,7 +46,7 @@ do-install-MANPAGES-on:
 post-install:
 .for _shell in bash fish zsh
 	@${ECHO_MSG} "Generating ${STAGEDIR}${PREFIX}/${PLIST_FILES:M*${_shell}*}"
-	${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/${PORTNAME}_completions ${_shell} \
+	${CARGO_TARGET_DIR}/*/${PORTNAME}_completions ${_shell} \
 		>${STAGEDIR}${PREFIX}/${PLIST_FILES:M*${_shell}*}
 .endfor

--- a/x11/squeekboard/files/patch-cargo__build.py
+++ b/x11/squeekboard/files/patch-cargo__build.py
@ -15,7 +15,7 @@ Add explicit <triple> subdir for --target from USES=cargo
     filename = filename or out_basename
     subprocess.run(['cp', '-a',
 -        './{}/{}'.format(binary_dir, filename),
-+        os.path.join('.', os.getenv('CARGO_BUILD_TARGET', ''), binary_dir, filename),
+        os.path.join('.', binary_dir, filename),
         out_path],
         check=True)
 
--- a/x11/swww/Makefile
+++ b/x11/swww/Makefile
@ -27,7 +27,7 @@ post-build:
 	${WRKSRC}/doc/gen.sh

 post-install:
-	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/release/swww-daemon \
+	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/release/swww-daemon \
 		${STAGEDIR}${PREFIX}/bin/
 	(cd ${WRKSRC}/doc/generated && \
 		${INSTALL_MAN} *.1 ${STAGEDIR}${PREFIX}/share/man/man1/)
--- a/x11/xdg-desktop-portal-luminous/Makefile
+++ b/x11/xdg-desktop-portal-luminous/Makefile
@ -36,7 +36,7 @@ post-patch:
 # Add explicit <triple> subdir for --target from USES=cargo
 # Adjust for CARGO_TARGET_DIR outside of meson.global_source_root()
 	@${REINPLACE_CMD} -e "s/'build',/ & '--verbose', '--verbose',/" \
-		-e "s,'target','..' / & / '${CARGO_BUILD_TARGET}'," \
+		-e "s,'target','..' / & ," \
 		${WRKSRC}/meson.build

 .include <bsd.port.mk>