diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 0d80037cf7e4..d2e9273fbf6f 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -1,317 +1,294 @@
 PORTNAME=	rust
 PORTVERSION?=	1.66.1
 PORTREVISION?=	0
 CATEGORIES=	lang
 MASTER_SITES=	https://static.rust-lang.org/dist/:src \
 		https://dev-static.rust-lang.org/dist/:src \
 		LOCAL/rust:bootstrap \
 		https://static.rust-lang.org/dist/:bootstrap
 DISTNAME?=	${PORTNAME}c-${PORTVERSION}-src
 DISTFILES?=	${NIGHTLY_DATE:D${NIGHTLY_DATE}/}${DISTNAME}${EXTRACT_SUFX}:src \
 		${_RUSTC_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX}:bootstrap \
 		${_RUST_STD_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX}:bootstrap \
 		${_CARGO_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX}:bootstrap
 DIST_SUBDIR?=	rust
 
 MAINTAINER=	rust@FreeBSD.org
 COMMENT=	Language with a focus on memory safety and concurrency
 WWW=		https://www.rust-lang.org/
 
 LICENSE=	APACHE20 MIT
 LICENSE_COMB=	dual
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-APACHE
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
 
 IGNORE_FreeBSD_12_powerpc=	is missing a bootstrap for FreeBSD 12.x powerpc
-ONLY_FOR_ARCHS?=	aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le \
-			powerpc riscv64
+ONLY_FOR_ARCHS?=	aarch64 amd64 armv7 i386 powerpc64 powerpc64le powerpc \
+			riscv64
 ONLY_FOR_ARCHS_REASON?=	requires prebuilt bootstrap compiler
 
 BUILD_DEPENDS=	cmake:devel/cmake-core
 LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		cpe ninja:build pkgconfig python:3.7+,build shebangfix ssl tar:xz
 
 CPE_VENDOR=	rust-lang
 
 MAKE_ENV=	DESTDIR=${STAGEDIR} \
 		LIBGIT2_NO_PKG_CONFIG=1 \
 		OPENSSL_DIR="${OPENSSLBASE}"
 TEST_ENV=	${MAKE_ENV} \
 		ALLOW_NONZERO_RLIMIT_CORE=1
 
 CONFLICTS_INSTALL?=	rust-nightly
 
 # rustc stashes intermediary files in TMPDIR (default /tmp) which
 # might cause issues for users that for some reason space limit
 # their /tmp.  WRKDIR should have plenty of space.
 # ?= to allow users to still overwrite it in make.conf.
 TMPDIR?=	${WRKDIR}
 
 OPTIONS_DEFINE=		DOCS GDB SOURCES WASM
 OPTIONS_DEFAULT=	SOURCES WASM
 .if !defined(NIGHTLY_DATE)
 OPTIONS_EXCLUDE=	DOCS # https://github.com/rust-lang/rust/issues/76526
 .endif
 
 GDB_DESC=	Install ports gdb (necessary for debugging rust programs)
 SOURCES_DESC=	Install source files
 WASM_DESC=	Build the WebAssembly target (wasm32-unknown-unknown)
 
 DOCS_VARS=		_RUST_BUILD_DOCS=true
 DOCS_VARS_OFF=		_RUST_BUILD_DOCS=false
 GDB_RUN_DEPENDS=	${LOCALBASE}/bin/gdb:devel/gdb
 SOURCES_VARS=		_COMPONENTS+=rust-src-${_PACKAGE_VERS} \
 			_RUST_TOOLS+=src
 WASM_VARS=		_COMPONENTS+="rust-analysis-${_PACKAGE_VERS}-wasm32-unknown-unknown rust-std-${_PACKAGE_VERS}-wasm32-unknown-unknown" \
 			_RUST_BUILD_WASM=true \
 			_RUST_TARGETS+=wasm32-unknown-unknown
 WASM_VARS_OFF=		_RUST_BUILD_WASM=false
 
 # See WRKSRC/src/stage0.json for the date and version values
 BOOTSTRAPS_DATE?=		2022-11-03
 RUST_BOOTSTRAP_VERSION?=	1.65.0
 
 BOOTSTRAPS_SUFFIX?=		${BOOTSTRAPS_SUFFIX_${ARCH}}
 BOOTSTRAPS_SUFFIX_powerpc64?=	-${PPC_ABI:tl}
 
 CARGO_VENDOR_DIR?=		${WRKSRC}/vendor
 
 # Rust's target arch string might be different from *BSD arch strings
 _RUST_ARCH_amd64=	x86_64
 _RUST_ARCH_i386=	i686
 _RUST_ARCH_riscv64=	riscv64gc
 _RUST_TARGET=		${_RUST_ARCH_${ARCH}:U${ARCH}}-unknown-${OPSYS:tl}
 _RUST_TARGETS=		${_RUST_TARGET}
 _RUST_TOOLS=		analysis cargo clippy rustfmt
 
 _RUSTC_BOOTSTRAP=	${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${_RUST_TARGET}
 _RUST_STD_BOOTSTRAP=	${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${_RUST_TARGET}
 _CARGO_BOOTSTRAP=	${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/cargo-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${_RUST_TARGET}
 
 _PACKAGE_VERS=		${NIGHTLY_DATE:?nightly:${PORTVERSION}}
 _COMPONENTS+=		cargo-${_PACKAGE_VERS}-${_RUST_TARGET} \
 			clippy-${_PACKAGE_VERS}-${_RUST_TARGET} \
 			rustc-${_PACKAGE_VERS}-${_RUST_TARGET} \
 			rustfmt-${_PACKAGE_VERS}-${_RUST_TARGET} \
 			rust-analysis-${_PACKAGE_VERS}-${_RUST_TARGET} \
 			rust-std-${_PACKAGE_VERS}-${_RUST_TARGET}
 
 # https://github.com/bjorn3/rustc_codegen_cranelift/commit/83d470d91c15d0cb5890705291e6ee9e5be8a842
 # https://github.com/rust-lang/rustc_codegen_gcc/pull/160
 SHEBANG_FILES=		compiler/rustc_codegen_cranelift/scripts/* \
 			compiler/rustc_codegen_gcc/*.sh compiler/rustc_codegen_gcc/build_sysroot/*.sh
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} != FreeBSD
 IGNORE=		is only for FreeBSD
 .endif
 
 .if ${ARCH} == powerpc
 # bfd to link rustc_driver; lld currently can't
 BUILD_DEPENDS+=	ld.bfd:devel/binutils
 LIB_DEPENDS+=	libatomic.so:lang/gcc${GCC_DEFAULT}
 MAKE_ENV+=	RUSTFLAGS="-L/usr/local/lib/gcc${GCC_DEFAULT}"
 .else
 MAKE_ENV+=	RUST_BACKTRACE=1
 .endif
 
 # rls doesn't build on rust nightly
 # rls needs 64-bit atomics: it doesn't build on powerpc
 .if !defined(NIGHTLY_DATE) && ${ARCH} != powerpc
 _RUST_TOOLS+=	rls
 _COMPONENTS+=	rls-${_PACKAGE_VERS}-${_RUST_TARGET}
 .endif
 
 # per https://rust-lang.github.io/rustup/concepts/components.html
 # rustc-dev is only usefull on nightly
 .if defined(NIGHTLY_DATE)
 _COMPONENTS+=	rustc-dev-${_PACKAGE_VERS}-${_RUST_TARGET}
 .endif
 
-.if exists(${PATCHDIR}/${ARCH}${BOOTSTRAPS_SUFFIX})
-EXTRA_PATCHES+=	${PATCHDIR}/${ARCH}${BOOTSTRAPS_SUFFIX}
-.endif
-
 # If the kernel does not return sane kern.proc.pathname values
 # for hardlinks then disable hardlinks in the build to avoid
 # intermittent "can't find crate for `std`" build failures,
 # c.f. PR248184
 #
 # XXX: Avoiding OSVERSION since it is derived from userland but
 # the running kernel might still be newer with sane behavior
 # anyway...
 .if exists(${PATCHDIR}/no-hardlinks)
 _KERN_OSRELDATE!=	${SYSCTL} -n kern.osreldate 2>/dev/null || echo 0
 .  if ${_KERN_OSRELDATE} >= 1400040
 .  elif ${_KERN_OSRELDATE} >= 1300521
 .  else
 EXTRA_PATCHES+=		${PATCHDIR}/no-hardlinks
 .  endif
 .endif
 
-.if defined(PPC_ABI) && ${PPC_ABI} == ELFv1
-# The bootstrap is hardcoded to use gcc9
-# but we can build with a newer or older compiler as provided by USE_GCC=yes
-BUILD_DEPENDS+=	gcc9:lang/gcc9
-USE_GCC=	yes
-STRIP_CMD=	${LOCALBASE}/bin/strip # unsupported e_type with base strip
-.endif
-
 .ifdef QEMU_EMULATING
 IGNORE=	fails to build with qemu-user-static
 .endif
 
 .if make(makesum)
 DISTFILES:=	${DISTFILES:M*\:src} \
-		${ONLY_FOR_ARCHS:O:@_arch@${:!${MAKE} ARCH=${_arch} PPC_ABI=ELFv1 -V'DISTFILES:N*\:src'!}@} \
-		${ONLY_FOR_ARCHS:Mpowerpc64:@_arch@${:!${MAKE} ARCH=${_arch} PPC_ABI=ELFv2 -V'DISTFILES:N*\:src'!}@}
+		${ONLY_FOR_ARCHS:O:@_arch@${:!${MAKE} ARCH=${_arch} -V'DISTFILES:N*\:src'!}@}
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} 's,gdb,${LOCALBASE}/bin/gdb,' ${WRKSRC}/src/etc/rust-gdb
 .if defined(NIGHTLY_DATE)
 	@${REINPLACE_CMD} 's/"rustfmt"/"nothx"/' ${WRKSRC}/src/stage0.json
 .endif
 # Disable vendor checksums
 	@${REINPLACE_CMD} 's,"files":{[^}]*},"files":{},' \
 		${CARGO_VENDOR_DIR}/*/.cargo-checksum.json
-.if defined(PPC_ABI) && ${PPC_ABI} == ELFv1
-	@${REINPLACE_CMD} 's,%CC%,${CC},g' \
-		${WRKSRC}/compiler/rustc_llvm/build.rs \
-		${WRKSRC}/src/bootstrap/native.rs
-.if ${LOCALBASE} != /usr/local
-	@${REINPLACE_CMD} 's,/usr/local/,${LOCALBASE}/,g' \
-		${WRKSRC}/compiler/rustc_llvm/build.rs \
-		${WRKSRC}/src/bootstrap/native.rs
-.endif
-.endif
 
 do-configure:
 # Check that the running kernel has COMPAT_FREEBSD11 required by lang/rust post-ino64
 	@${SETENV} CC="${CC}" OPSYS="${OPSYS}" OSVERSION="${OSVERSION}" WRKDIR="${WRKDIR}" \
 		${SH} ${SCRIPTSDIR}/rust-compat11-canary.sh
 .for _component in cargo rust-std rustc
 	@cd ${WRKDIR}/${_component}-*-${OPSYS:tl} && \
 		${SH} install.sh --prefix=${WRKDIR}/bootstrap --verbose
 .endfor
 	@${ECHO_CMD} 'changelog-seen=2' > ${WRKSRC}/config.toml
 	@${ECHO_CMD} '[build]' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'build-dir="${WRKDIR}/_build"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'build-stage=2' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'doc-stage=2' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'test-stage=2' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'vendor=true' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'extended=true' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'python="${PYTHON_CMD}"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'docs=${_RUST_BUILD_DOCS}' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'verbose=2' >> ${WRKSRC}/config.toml
 .if defined(NIGHTLY_DATE)
 	@${ECHO_CMD} 'profiler=true' >> ${WRKSRC}/config.toml
 .endif
 	@${ECHO_CMD} 'target=[${_RUST_TARGETS:@.target.@"${.target.}"@:ts,}]' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'cargo="${WRKDIR}/bootstrap/bin/cargo"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'rustc="${WRKDIR}/bootstrap/bin/rustc"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'tools=[${_RUST_TOOLS:@.tool.@"${.tool.}"@:ts,}]' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} '[install]' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'prefix="${PREFIX}"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'sysconfdir="${PREFIX}/etc"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} '[rust]' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'channel="${PKGNAMESUFFIX:Ustable:S/^-//}"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'default-linker="${CC}"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'deny-warnings=false' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'verbose-tests=true' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'lld=${_RUST_BUILD_WASM}' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} '[llvm]' >> ${WRKSRC}/config.toml
 .if defined(WITH_CCACHE_BUILD) && !defined(NO_CCACHE)
 	@${ECHO_CMD} 'ccache="${CCACHE_BIN}"' >> ${WRKSRC}/config.toml
 .else
 	@${ECHO_CMD} 'ccache=false' >> ${WRKSRC}/config.toml
 .endif
 	@${ECHO_CMD} 'ninja=true' >> ${WRKSRC}/config.toml
 .if ${ARCH} == powerpc
 # Rust doesn't call the system compiler with the full version of the target.
 # This makes powerpc miscompile due to the secure-plt ABI change.
 # Additionally, force using ld.bfd to work around a linking problem in rustc_mir
 	@${PRINTF} '#!/bin/sh\nexec ${CC} "$$@" --target=powerpc-unknown-freebsd13.0' > ${WRKDIR}/cc-wrapper
 	@${CHMOD} +x ${WRKDIR}/cc-wrapper
 	@${PRINTF} '#!/bin/sh\nexec ${CXX} "$$@" --target=powerpc-unknown-freebsd13.0' > ${WRKDIR}/cxx-wrapper
 	@${CHMOD} +x ${WRKDIR}/cxx-wrapper
 	@${PRINTF} '#!/bin/sh\nexec ${CC} -fuse-ld=bfd "$$@" --target=powerpc-unknown-freebsd13.0' > ${WRKDIR}/ld-wrapper
 	@${CHMOD} +x ${WRKDIR}/ld-wrapper
 .endif
 .for _target in ${_RUST_TARGETS}
 	@${ECHO_CMD} '[target.${_target}]' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'ar="${AR}"' >> ${WRKSRC}/config.toml
 .if ${ARCH} == powerpc
 	@${ECHO_CMD} 'cc="${WRKDIR}/cc-wrapper"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'cxx="${WRKDIR}/cxx-wrapper"' >> ${WRKSRC}/config.toml
 .else
 	@${ECHO_CMD} 'cc="${CC}"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'cxx="${CXX}"' >> ${WRKSRC}/config.toml
 .endif
 .if ${ARCH} == powerpc
 	@${ECHO_CMD} 'linker="${WRKDIR}/ld-wrapper"' >> ${WRKSRC}/config.toml
 .else
 	@${ECHO_CMD} 'linker="${CC}"' >> ${WRKSRC}/config.toml
 .endif
 .endfor
 	@${ECHO_CMD} '[dist]' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'src-tarball=false' >> ${WRKSRC}/config.toml
 .if defined(NIGHTLY_DATE)
 # Don't abort if optional tools fail to build
 	@${ECHO_CMD} 'missing-tools=true' >> ${WRKSRC}/config.toml
 .endif
 
 do-build:
 	@cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${PYTHON_CMD} x.py dist --jobs=${MAKE_JOBS_NUMBER}
 
 do-install:
 	${RM} -r ${WRKDIR}/_extractdist
 .for _c in ${_COMPONENTS}
 	${MKDIR} ${WRKDIR}/_extractdist
 	${TAR} xf ${WRKDIR}/_build/dist/${_c}.tar.xz -C ${WRKDIR}/_extractdist
 	cd ${WRKDIR}/_extractdist/${_c} && \
 		${SH} install.sh \
 		--docdir="${STAGEDIR}${DOCSDIR}" \
 		--mandir="${STAGEDIR}${PREFIX}/share/man" \
 		--prefix="${STAGEDIR}${PREFIX}"
 	${RM} -r ${WRKDIR}/_extractdist
 .endfor
 
 # We autogenerate the plist file.  We do that, instead of the
 # regular pkg-plist, because several libraries have a computed
 # filename based on the absolute path of the source files.  As it
 # is user-specific, we cannot know their filename in advance.
 	@${RM}	${STAGEDIR}${DOCSDIR}/*.old \
 		${STAGEDIR}${PREFIX}/lib/rustlib/components \
 		${STAGEDIR}${PREFIX}/lib/rustlib/install.log \
 		${STAGEDIR}${PREFIX}/lib/rustlib/manifest-* \
 		${STAGEDIR}${PREFIX}/lib/rustlib/rust-installer-version \
 		${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh
 	@${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib \
 		${STAGEDIR}${PREFIX}/libexec -exec ${FILE} -i {} + | \
 		${AWK} -F: '/executable|sharedlib/ { print $$1 }' | ${XARGS} ${STRIP_CMD}
 	@${FIND} ${STAGEDIR}${PREFIX} -not -type d | \
 		${SED} -E -e 's,^${STAGEDIR}${PREFIX}/,,' \
 			-e 's,(share/man/man[1-9]/.*\.[0-9]),\1.gz,' >> ${TMPPLIST}
 
 post-install-DOCS-on:
 # Ignore any left behind empty directories in case some docs fail
 # to build (failures are ignored due to deny-warnings=false).
 	@${FIND} ${STAGEDIR}${DOCSDIR}/html -empty -type d | \
 		${SED} 's,^${STAGEDIR},@comment @dir ,' >> ${TMPPLIST}
 
 post-install-SOURCES-on:
 # Silence stage-qa warnings by sanitizing permissions on sources
 	@${FIND} ${STAGEDIR}${PREFIX}/lib/rustlib/src -type f -exec ${CHMOD} \
 		${SHAREMODE} {} +
 
 # Note that make test does not work when rust is already installed.
 do-test:
 	@cd ${WRKSRC} && \
 		${SETENV} ${TEST_ENV} ${PYTHON_CMD} x.py test --jobs=${MAKE_JOBS_NUMBER}
 
 .include <bsd.port.post.mk>
diff --git a/lang/rust/distinfo b/lang/rust/distinfo
index e7603d96b257..f5c48da1ae4b 100644
--- a/lang/rust/distinfo
+++ b/lang/rust/distinfo
@@ -1,63 +1,51 @@
-TIMESTAMP = 1673442892
+TIMESTAMP = 1674734560
 SHA256 (rust/rustc-1.66.1-src.tar.xz) = 07ac4e6c93e0d8ecfaf3b86c4c78bbbde3f5be675f0334e7fb343cb4a0b81ebe
 SIZE (rust/rustc-1.66.1-src.tar.xz) = 141692940
 SHA256 (rust/2022-11-03/rustc-1.65.0-aarch64-unknown-freebsd.tar.xz) = fb7c58730dde8e40f831116090bda88b7708f78bbb64cafa7d7f9b0b493ef8f4
 SIZE (rust/2022-11-03/rustc-1.65.0-aarch64-unknown-freebsd.tar.xz) = 40676092
 SHA256 (rust/2022-11-03/rust-std-1.65.0-aarch64-unknown-freebsd.tar.xz) = 695a5ac1b0dc4e008685b19324b70da757435288455432cc09ebe25cba16e161
 SIZE (rust/2022-11-03/rust-std-1.65.0-aarch64-unknown-freebsd.tar.xz) = 25828140
 SHA256 (rust/2022-11-03/cargo-1.65.0-aarch64-unknown-freebsd.tar.xz) = a6215af64aae33973e7113f5c23a6d231385a1a300f4b6dcbc8de51aa3502832
 SIZE (rust/2022-11-03/cargo-1.65.0-aarch64-unknown-freebsd.tar.xz) = 4962000
 SHA256 (rust/2022-11-03/rustc-1.65.0-x86_64-unknown-freebsd.tar.xz) = 122bed217dc388ae5bc353e2279ec1f72cd575da19db737102b53fc041608987
 SIZE (rust/2022-11-03/rustc-1.65.0-x86_64-unknown-freebsd.tar.xz) = 38789796
 SHA256 (rust/2022-11-03/rust-std-1.65.0-x86_64-unknown-freebsd.tar.xz) = 9b8af845771ffc9a132e8f55d58e1c5ddbba4ee766cd3a1c2a8de63513215b53
 SIZE (rust/2022-11-03/rust-std-1.65.0-x86_64-unknown-freebsd.tar.xz) = 26461768
 SHA256 (rust/2022-11-03/cargo-1.65.0-x86_64-unknown-freebsd.tar.xz) = cbfd8ea9a34ae3b6a13a4c2637d8bae4dad87450cf4aaaacafbf99ae0c8c08d6
 SIZE (rust/2022-11-03/cargo-1.65.0-x86_64-unknown-freebsd.tar.xz) = 5618512
-SHA256 (rust/2022-11-03/rustc-1.65.0-armv6-unknown-freebsd.tar.xz) = 0f06525899b30fa95af327a9f03ea7706c47bcfb653d55e0d7127a1c385cceb9
-SIZE (rust/2022-11-03/rustc-1.65.0-armv6-unknown-freebsd.tar.xz) = 40501300
-SHA256 (rust/2022-11-03/rust-std-1.65.0-armv6-unknown-freebsd.tar.xz) = a0b96f5c4dfd5e3cb9b46941c9e4d3c986720638d5d27d756c35c26a50934a6f
-SIZE (rust/2022-11-03/rust-std-1.65.0-armv6-unknown-freebsd.tar.xz) = 23893052
-SHA256 (rust/2022-11-03/cargo-1.65.0-armv6-unknown-freebsd.tar.xz) = 2ae79b5045b38bc479eaecfc8b717ab05ab2dfb0154b648e519781361b433c6f
-SIZE (rust/2022-11-03/cargo-1.65.0-armv6-unknown-freebsd.tar.xz) = 4837604
 SHA256 (rust/2022-11-03/rustc-1.65.0-armv7-unknown-freebsd.tar.xz) = 3e287c70d8c72632b7a615534f0aea1a793ce32c837ad00e01bcb563c0ef1a7d
 SIZE (rust/2022-11-03/rustc-1.65.0-armv7-unknown-freebsd.tar.xz) = 40819484
 SHA256 (rust/2022-11-03/rust-std-1.65.0-armv7-unknown-freebsd.tar.xz) = 762687ac0aa3aaa89ff3390221046d22b16154ba749329c3b3dd55e548649c01
 SIZE (rust/2022-11-03/rust-std-1.65.0-armv7-unknown-freebsd.tar.xz) = 24799480
 SHA256 (rust/2022-11-03/cargo-1.65.0-armv7-unknown-freebsd.tar.xz) = a2fc2039988829731df5f3e2a1104e86d90df7022e61a8687c66e0731d1e988c
 SIZE (rust/2022-11-03/cargo-1.65.0-armv7-unknown-freebsd.tar.xz) = 4818596
 SHA256 (rust/2022-11-03/rustc-1.65.0-i686-unknown-freebsd.tar.xz) = 45bb92166ef5a016480ac60559b5d5be475ba1cf79653ff50211d3cc002fbce0
 SIZE (rust/2022-11-03/rustc-1.65.0-i686-unknown-freebsd.tar.xz) = 45655048
 SHA256 (rust/2022-11-03/rust-std-1.65.0-i686-unknown-freebsd.tar.xz) = 6ef0ec8e2874f5a1a47c64e78329f500ccce504d3a0ef93c9dbc64ff5d0781ee
 SIZE (rust/2022-11-03/rust-std-1.65.0-i686-unknown-freebsd.tar.xz) = 26283920
 SHA256 (rust/2022-11-03/cargo-1.65.0-i686-unknown-freebsd.tar.xz) = 2d7934407d67d86e2f382659e3d94eb80932949e3d9cbed832bac36ba3b2af16
 SIZE (rust/2022-11-03/cargo-1.65.0-i686-unknown-freebsd.tar.xz) = 5798924
 SHA256 (rust/2022-11-03/rustc-1.65.0-powerpc-unknown-freebsd.tar.xz) = 22b5d02791697e99b1f96859c941fe9d4af07dbef5c8b1023b040203ac5a287b
 SIZE (rust/2022-11-03/rustc-1.65.0-powerpc-unknown-freebsd.tar.xz) = 44217144
 SHA256 (rust/2022-11-03/rust-std-1.65.0-powerpc-unknown-freebsd.tar.xz) = fc04bbe3f0880756811e234b1f1178f9d4544082cc99c8af53836b7bc0da2339
 SIZE (rust/2022-11-03/rust-std-1.65.0-powerpc-unknown-freebsd.tar.xz) = 23597080
 SHA256 (rust/2022-11-03/cargo-1.65.0-powerpc-unknown-freebsd.tar.xz) = e1cae5f170373c45fed8a55a35312e7dd857e872332b33d9f737ad649d522ed4
 SIZE (rust/2022-11-03/cargo-1.65.0-powerpc-unknown-freebsd.tar.xz) = 5343924
-SHA256 (rust/2022-11-03/rustc-1.65.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 9c939d00e04e1806767cafb5462331ad589ac9a23879dde79ecbbbbbc6b4d545
-SIZE (rust/2022-11-03/rustc-1.65.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 49668500
-SHA256 (rust/2022-11-03/rust-std-1.65.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = ea8d6d26a70102bd6bf1ea5e37af7476aebf432cb859ab7689f6abba743a141d
-SIZE (rust/2022-11-03/rust-std-1.65.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 23810944
-SHA256 (rust/2022-11-03/cargo-1.65.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = dc085ef2e70a9641b8e085e6c976e4047363b1e519226c9463f305a9ed88bc11
-SIZE (rust/2022-11-03/cargo-1.65.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 5497872
+SHA256 (rust/2022-11-03/rustc-1.65.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 696ac81b6fae8ab2777815e6696a840b319c3bc3ef716880e5da9f57dc66978c
+SIZE (rust/2022-11-03/rustc-1.65.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 41458412
+SHA256 (rust/2022-11-03/rust-std-1.65.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = c01867b132e85196f9bd2ffde5fc7711b61c14b94f35abd1fdc57e252ad0dc3a
+SIZE (rust/2022-11-03/rust-std-1.65.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 23729728
+SHA256 (rust/2022-11-03/cargo-1.65.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = d15b86ab084159fa489e765c614c8e2fbd32983eb4cc74e2bbd1019ab4944cb0
+SIZE (rust/2022-11-03/cargo-1.65.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 5106080
 SHA256 (rust/2022-11-03/rustc-1.65.0-powerpc64le-unknown-freebsd.tar.xz) = dab3672acbef082bc0a8f4e2a480563fa5df4c1456d3ecd5c279609d7a76114d
 SIZE (rust/2022-11-03/rustc-1.65.0-powerpc64le-unknown-freebsd.tar.xz) = 43128132
 SHA256 (rust/2022-11-03/rust-std-1.65.0-powerpc64le-unknown-freebsd.tar.xz) = c95301ad42e0cc2732fefbb15a19c159c2057fd49fce65e14cbc1bb9e7031b9c
 SIZE (rust/2022-11-03/rust-std-1.65.0-powerpc64le-unknown-freebsd.tar.xz) = 24011224
 SHA256 (rust/2022-11-03/cargo-1.65.0-powerpc64le-unknown-freebsd.tar.xz) = e87c3cd46495c9077b61a49e2d8e4733051f85a0ce6926a7db4b9ddd7ad871ef
 SIZE (rust/2022-11-03/cargo-1.65.0-powerpc64le-unknown-freebsd.tar.xz) = 5414340
 SHA256 (rust/2022-11-03/rustc-1.65.0-riscv64gc-unknown-freebsd.tar.xz) = 58f1285941e01fba59ed88c025cc1a52d2b5c481480112c537f8dddc2d6fdc0d
 SIZE (rust/2022-11-03/rustc-1.65.0-riscv64gc-unknown-freebsd.tar.xz) = 158130868
 SHA256 (rust/2022-11-03/rust-std-1.65.0-riscv64gc-unknown-freebsd.tar.xz) = b6bd919b2ea4d5e1e09fee9813f23857bb472d00cdc23d93052032c5b809c592
 SIZE (rust/2022-11-03/rust-std-1.65.0-riscv64gc-unknown-freebsd.tar.xz) = 31273336
 SHA256 (rust/2022-11-03/cargo-1.65.0-riscv64gc-unknown-freebsd.tar.xz) = 48a167674d3f7381d8187ca927732255fcd104f258fdbb8ae23470f5398aedb1
 SIZE (rust/2022-11-03/cargo-1.65.0-riscv64gc-unknown-freebsd.tar.xz) = 27593540
-SHA256 (rust/2022-11-03/rustc-1.65.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 696ac81b6fae8ab2777815e6696a840b319c3bc3ef716880e5da9f57dc66978c
-SIZE (rust/2022-11-03/rustc-1.65.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 41458412
-SHA256 (rust/2022-11-03/rust-std-1.65.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = c01867b132e85196f9bd2ffde5fc7711b61c14b94f35abd1fdc57e252ad0dc3a
-SIZE (rust/2022-11-03/rust-std-1.65.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 23729728
-SHA256 (rust/2022-11-03/cargo-1.65.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = d15b86ab084159fa489e765c614c8e2fbd32983eb4cc74e2bbd1019ab4944cb0
-SIZE (rust/2022-11-03/cargo-1.65.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 5106080
diff --git a/lang/rust/files/powerpc64-elfv2/patch-compiler_rustc__target_src_abi_call_powerpc64.rs b/lang/rust/files/patch-compiler_rustc__target_src_abi_call_powerpc64.rs
similarity index 100%
rename from lang/rust/files/powerpc64-elfv2/patch-compiler_rustc__target_src_abi_call_powerpc64.rs
rename to lang/rust/files/patch-compiler_rustc__target_src_abi_call_powerpc64.rs
diff --git a/lang/rust/files/powerpc64-elfv2/patch-compiler_rustc__target_src_spec_powerpc64__unknown__freebsd.rs b/lang/rust/files/patch-compiler_rustc__target_src_spec_powerpc64__unknown__freebsd.rs
similarity index 100%
rename from lang/rust/files/powerpc64-elfv2/patch-compiler_rustc__target_src_spec_powerpc64__unknown__freebsd.rs
rename to lang/rust/files/patch-compiler_rustc__target_src_spec_powerpc64__unknown__freebsd.rs
diff --git a/lang/rust/files/powerpc64-elfv1/patch-compiler_rustc__llvm_build.rs b/lang/rust/files/powerpc64-elfv1/patch-compiler_rustc__llvm_build.rs
deleted file mode 100644
index 7cbcd814aade..000000000000
--- a/lang/rust/files/powerpc64-elfv1/patch-compiler_rustc__llvm_build.rs
+++ /dev/null
@@ -1,18 +0,0 @@
---- compiler/rustc_llvm/build.rs.orig	2019-12-16 15:38:05 UTC
-+++ compiler/rustc_llvm/build.rs
-@@ -273,7 +273,14 @@ fn main() {
-     };
- 
-     // C++ runtime library
--    if !target.contains("msvc") {
-+    if target == "powerpc64-unknown-freebsd" {
-+        if is_crossed {
-+            println!("cargo:rustc-link-search=native=%WRKDIR%/usr/local/lib/%CC%");
-+        } else {
-+            println!("cargo:rustc-link-search=native=/usr/local/lib/%CC%");
-+        }
-+        println!("cargo:rustc-link-lib=static=stdc++");
-+    } else if !target.contains("msvc") {
-         if let Some(s) = llvm_static_stdcpp {
-             assert!(!cxxflags.contains("stdlib=libc++"));
-             let path = PathBuf::from(s);
diff --git a/lang/rust/files/powerpc64-elfv1/patch-src_bootstrap_native.rs b/lang/rust/files/powerpc64-elfv1/patch-src_bootstrap_native.rs
deleted file mode 100644
index c34a7fe90781..000000000000
--- a/lang/rust/files/powerpc64-elfv1/patch-src_bootstrap_native.rs
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/bootstrap/native.rs.orig	2021-09-06 18:42:35 UTC
-+++ src/bootstrap/native.rs
-@@ -277,6 +277,10 @@ impl Step for Llvm {
-             }
-         }
- 
-+        if target == "powerpc64-unknown-freebsd" {
-+            cfg.define("CMAKE_EXE_LINKER_FLAGS", "-Wl,-rpath=/usr/local/lib/%CC% -L/usr/local/lib/%CC%");
-+        }
-+
-         // https://llvm.org/docs/HowToCrossCompileLLVM.html
-         if target != builder.config.build {
-             builder.ensure(Llvm { target: builder.config.build });