pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

rust194: reduce diffs to pkgsrc



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sat Mar 28 12:27:35 2026 +0100
Changeset:	f564276c159f2aad052c30e5865785b610163525

Modified Files:
	rust194/Makefile
	rust194/cargo.mk
	rust194/cross.mk
	rust194/options.mk
	rust194/patches/patch-compiler_rustc__llvm_build.rs
	rust194/patches/patch-compiler_rustc__target_src_spec_targets_aarch64__be__unknown__netbsd.rs
	rust194/patches/patch-compiler_rustc__target_src_spec_targets_aarch64__unknown__netbsd.rs
	rust194/patches/patch-compiler_rustc__target_src_spec_targets_mipsel__unknown__netbsd.rs
	rust194/patches/patch-library_backtrace_src_symbolize_gimli.rs
	rust194/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs
	rust194/patches/patch-src_bootstrap_bootstrap.py
	rust194/patches/patch-src_bootstrap_src_core_build__steps_compile.rs
	rust194/patches/patch-src_bootstrap_src_core_builder_cargo.rs
	rust194/patches/patch-src_llvm-project_llvm_CMakeLists.txt
	rust194/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h
	rust194/patches/patch-src_tools_cargo_tests_testsuite_build.rs
	rust194/patches/patch-tests_assembly-llvm_targets_targets-elf.rs
	rust194/patches/patch-vendor_crossbeam-utils-0.8.18_no__atomic.rs
	rust194/patches/patch-vendor_libc-0.2.155_src_unix_bsd_netbsdlike_netbsd_mod.rs
	rust194/patches/patch-vendor_libc-0.2.155_src_unix_solarish_mod.rs
	rust194/patches/patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_mod.rs
	rust194/patches/patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
	rust194/patches/patch-vendor_libc-0.2.168_src_unix_solarish_mod.rs
	rust194/patches/patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_mod.rs
	rust194/patches/patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
	rust194/patches/patch-vendor_libc-0.2.169_src_unix_solarish_mod.rs
	rust194/patches/patch-vendor_libc-0.2.171_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
	rust194/patches/patch-vendor_libc-0.2.172_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
	rust194/patches/patch-vendor_libc-0.2.172_src_unix_solarish_mod.rs
	rust194/patches/patch-vendor_libc-0.2.174_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
	rust194/patches/patch-vendor_line-index-0.1.2_src_lib.rs
	rust194/patches/patch-vendor_lzma-sys-0.1.20_config.h
	rust194/patches/patch-vendor_memchr-2.7.4_src_arch_aarch64_memchr.rs
	rust194/patches/patch-vendor_memchr-2.7.4_src_arch_aarch64_mod.rs
	rust194/patches/patch-vendor_memchr-2.7.4_src_memchr.rs
	rust194/patches/patch-vendor_memchr-2.7.4_src_memmem_searcher.rs
	rust194/patches/patch-vendor_memchr-2.7.4_src_vector.rs
	rust194/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_Configurations_10-main.conf
	rust194/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_crypto_aria_aria.c
	rust194/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_Configurations_10-main.conf
	rust194/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_crypto_aria_aria.c
	rust194/patches/patch-vendor_openssl-sys-0.9.107_build_find__normal.rs
	rust194/patches/patch-vendor_openssl-sys-0.9.107_build_main.rs
	rust194/patches/patch-vendor_openssl-sys-0.9.109_build_find__normal.rs
	rust194/patches/patch-vendor_openssl-sys-0.9.109_build_main.rs
	rust194/patches/patch-vendor_openssl-sys-0.9.92_build_find__normal.rs
	rust194/patches/patch-vendor_openssl-sys-0.9.92_build_main.rs
	rust194/patches/patch-vendor_zerocopy-0.7.32_src_lib.rs
	rust194/patches/patch-vendor_zerocopy-0.7.35_src_lib.rs
	rust194/patches/patch-vendor_zeroize-1.8.1_src_lib.rs
	rust194/platform.mk
	rust194/rust.mk

Log Message:
rust194: reduce diffs to pkgsrc

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f564276c159f2aad052c30e5865785b610163525

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 rust194/Makefile                                           |  2 +-
 rust194/cargo.mk                                           |  2 +-
 rust194/cross.mk                                           |  2 +-
 rust194/options.mk                                         | 11 ++---------
 rust194/patches/patch-compiler_rustc__llvm_build.rs        |  2 +-
 ...target_src_spec_targets_aarch64__be__unknown__netbsd.rs |  2 +-
 ...tc__target_src_spec_targets_aarch64__unknown__netbsd.rs |  2 +-
 ...stc__target_src_spec_targets_mipsel__unknown__netbsd.rs |  2 +-
 .../patches/patch-library_backtrace_src_symbolize_gimli.rs |  2 +-
 .../patch-library_backtrace_src_symbolize_gimli_elf.rs     |  2 +-
 rust194/patches/patch-src_bootstrap_bootstrap.py           |  2 +-
 .../patch-src_bootstrap_src_core_build__steps_compile.rs   |  2 +-
 .../patches/patch-src_bootstrap_src_core_builder_cargo.rs  |  2 +-
 rust194/patches/patch-src_llvm-project_llvm_CMakeLists.txt |  2 +-
 ...vm-project_llvm_include_llvm_Analysis_ConstantFolding.h |  2 +-
 .../patches/patch-src_tools_cargo_tests_testsuite_build.rs |  2 +-
 .../patch-tests_assembly-llvm_targets_targets-elf.rs       |  2 +-
 .../patch-vendor_crossbeam-utils-0.8.18_no__atomic.rs      |  2 +-
 ...ndor_libc-0.2.155_src_unix_bsd_netbsdlike_netbsd_mod.rs |  2 +-
 .../patch-vendor_libc-0.2.155_src_unix_solarish_mod.rs     |  2 +-
 ...ndor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_mod.rs |  2 +-
 ..._libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_riscv64.rs |  2 +-
 .../patch-vendor_libc-0.2.168_src_unix_solarish_mod.rs     |  2 +-
 ...ndor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_mod.rs |  2 +-
 ..._libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_riscv64.rs |  2 +-
 .../patch-vendor_libc-0.2.169_src_unix_solarish_mod.rs     |  2 +-
 ..._libc-0.2.171_src_unix_bsd_netbsdlike_netbsd_riscv64.rs |  2 +-
 ..._libc-0.2.172_src_unix_bsd_netbsdlike_netbsd_riscv64.rs |  2 +-
 .../patch-vendor_libc-0.2.172_src_unix_solarish_mod.rs     |  2 +-
 ..._libc-0.2.174_src_unix_bsd_netbsdlike_netbsd_riscv64.rs |  2 +-
 rust194/patches/patch-vendor_line-index-0.1.2_src_lib.rs   |  2 +-
 rust194/patches/patch-vendor_lzma-sys-0.1.20_config.h      |  2 +-
 .../patch-vendor_memchr-2.7.4_src_arch_aarch64_memchr.rs   |  2 +-
 .../patch-vendor_memchr-2.7.4_src_arch_aarch64_mod.rs      |  2 +-
 rust194/patches/patch-vendor_memchr-2.7.4_src_memchr.rs    |  2 +-
 .../patch-vendor_memchr-2.7.4_src_memmem_searcher.rs       |  2 +-
 rust194/patches/patch-vendor_memchr-2.7.4_src_vector.rs    |  2 +-
 ...src-111.28.2+1.1.1w_openssl_Configurations_10-main.conf |  2 +-
 ..._openssl-src-111.28.2+1.1.1w_openssl_crypto_aria_aria.c |  2 +-
 ...l-src-300.5.0+3.5.0_openssl_Configurations_10-main.conf |  2 +-
 ...or_openssl-src-300.5.0+3.5.0_openssl_crypto_aria_aria.c |  2 +-
 .../patch-vendor_openssl-sys-0.9.107_build_find__normal.rs |  2 +-
 .../patches/patch-vendor_openssl-sys-0.9.107_build_main.rs |  2 +-
 .../patch-vendor_openssl-sys-0.9.109_build_find__normal.rs |  2 +-
 .../patches/patch-vendor_openssl-sys-0.9.109_build_main.rs |  2 +-
 .../patch-vendor_openssl-sys-0.9.92_build_find__normal.rs  |  2 +-
 .../patches/patch-vendor_openssl-sys-0.9.92_build_main.rs  |  2 +-
 rust194/patches/patch-vendor_zerocopy-0.7.32_src_lib.rs    |  2 +-
 rust194/patches/patch-vendor_zerocopy-0.7.35_src_lib.rs    |  2 +-
 rust194/patches/patch-vendor_zeroize-1.8.1_src_lib.rs      |  2 +-
 rust194/platform.mk                                        |  6 +++---
 rust194/rust.mk                                            | 14 +++++++++-----
 52 files changed, 63 insertions(+), 66 deletions(-)

diffs:
diff --git a/rust194/Makefile b/rust194/Makefile
index 88973e64d0..a8b326bba1 100644
--- a/rust194/Makefile
+++ b/rust194/Makefile
@@ -675,7 +675,7 @@ do-install:
 
 .if ${MACHINE_PLATFORM:MNetBSD-*-i386}
 USE_TOOLS+=	paxctl
-# Turn off Address space layout randomization
+# Turn off address space layout randomization
 # so that we can build firefox natively:
 post-install:
 	${TOOLS_PLATFORM.paxctl} +a ${DESTDIR}${PREFIX}/bin/rustc
diff --git a/rust194/cargo.mk b/rust194/cargo.mk
index 5eb1aaa9ef..c5bade5b1a 100644
--- a/rust194/cargo.mk
+++ b/rust194/cargo.mk
@@ -1,4 +1,4 @@
-# $NetBSD: cargo.mk,v 1.41 2025/04/04 21:29:22 riastradh Exp $
+# $NetBSD: cargo.mk,v 1.44 2025/08/25 17:51:11 wiz Exp $
 #
 # Common logic that can be used by packages that depend on cargo crates
 # from crates.io. This lets existing pkgsrc infrastructure fetch and verify
diff --git a/rust194/cross.mk b/rust194/cross.mk
index 1eab112867..db485880d7 100644
--- a/rust194/cross.mk
+++ b/rust194/cross.mk
@@ -24,7 +24,7 @@
 #CROSS_ROOT=		/u/riscv64
 #CROSS_ROOT=		/u/m68k
 #CROSS_ROOT=		/
-MAKE_ENV+=		CROSS_ROOT=${CROSS_ROOT}
+#MAKE_ENV+=		CROSS_ROOT=${CROSS_ROOT}
 
 # The GNU cross target designation
 #GNU_CROSS_TARGET=	armv7--netbsdelf-eabihf
diff --git a/rust194/options.mk b/rust194/options.mk
index 2afe0cb9ee..66cd13d04a 100644
--- a/rust194/options.mk
+++ b/rust194/options.mk
@@ -19,12 +19,6 @@ PKG_SUGGESTED_OPTIONS+=		rust-internal-llvm
 PKG_SUGGESTED_OPTIONS+=		rust-internal-llvm
 .endif
 
-# Rust 1.92.0 needs llvm >= 20, so if we're still on older...
-LLVM_VERSION!=			awk '/^LLVM_VERSION/ { print $$2 }' ../../lang/llvm/version.mk
-.if !empty(LLVM_VERSION:M1[0-9].*)
-PKG_SUGGESTED_OPTIONS+=		rust-internal-llvm
-.endif
-
 PKG_OPTIONS_LEGACY_OPTS+=	rust-llvm:rust-internal-llvm
 
 # Bundle OpenSSL and curl into the cargo binary when producing
@@ -71,14 +65,13 @@ GCC_REQD+=	14
 # Use the internal copy of LLVM or the external one?
 #
 .if empty(PKG_OPTIONS:Mrust-internal-llvm)
-BUILDLINK_API_DEPENDS.llvm+=	llvm>=20.0.0
 .include "../../lang/libunwind/buildlink3.mk"
 .include "../../lang/llvm/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-llvm-link-shared
 CONFIGURE_ARGS+=	--llvm-libunwind=system
 CONFIGURE_ARGS+=	--llvm-root=${BUILDLINK_PREFIX.llvm}
 # Also turn off build of the internal LLD, as the external LLVM
-# may be older (e.g. 18) than the internal LLD (now 19.x), ref.
+# may be older (e.g., 18) than the internal LLD (now 19.x), ref.
 # https://github.com/rust-lang/rust/issues/131291
 CONFIGURE_ARGS+=	--set rust.lld=false
 .endif
@@ -86,7 +79,7 @@ CONFIGURE_ARGS+=	--set rust.lld=false
 # Rust bumps into NetBSD's limit of 256 TLS keys per process, at least
 # on aarch64 with "fatal runtime error: out of TLS keys, aborting"
 # (for some incomprehensible reason this isn't triggered on NetBSD/amd64 10.1)
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*)
+.if ${MACHINE_PLATFORM:MNetBSD-*-aarch64*}
 # So try to bump that per-process limit:
 MAKE_ENV+=		PTHREAD_KEYS_MAX=512
 .endif
diff --git a/rust194/patches/patch-compiler_rustc__llvm_build.rs b/rust194/patches/patch-compiler_rustc__llvm_build.rs
index 74346dbe8e..096133453c 100644
--- a/rust194/patches/patch-compiler_rustc__llvm_build.rs
+++ b/rust194/patches/patch-compiler_rustc__llvm_build.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-compiler_rustc__llvm_build.rs,v 1.17 2024/04/18 09:29:42 pin Exp $
+$NetBSD: patch-compiler_rustc__llvm_build.rs,v 1.20 2025/08/25 17:51:12 wiz Exp $
 
 Fix build on NetBSD HEAD-llvm. XXX there is probably a better way to do this.
 
diff --git a/rust194/patches/patch-compiler_rustc__target_src_spec_targets_aarch64__be__unknown__netbsd.rs b/rust194/patches/patch-compiler_rustc__target_src_spec_targets_aarch64__be__unknown__netbsd.rs
index 64f75d7aa0..764812dc4a 100644
--- a/rust194/patches/patch-compiler_rustc__target_src_spec_targets_aarch64__be__unknown__netbsd.rs
+++ b/rust194/patches/patch-compiler_rustc__target_src_spec_targets_aarch64__be__unknown__netbsd.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-compiler_rustc__target_src_spec_targets_aarch64__be__unknown__netbsd.rs,v 1.3 2025/08/25 17:51:12 wiz Exp $
 
 NetBSD aarch64 has a bug in the thread-local storage implementation,
 ref. PR#58154.  Turn it off for now.
diff --git a/rust194/patches/patch-compiler_rustc__target_src_spec_targets_aarch64__unknown__netbsd.rs b/rust194/patches/patch-compiler_rustc__target_src_spec_targets_aarch64__unknown__netbsd.rs
index 870b6f0931..27ae9671f2 100644
--- a/rust194/patches/patch-compiler_rustc__target_src_spec_targets_aarch64__unknown__netbsd.rs
+++ b/rust194/patches/patch-compiler_rustc__target_src_spec_targets_aarch64__unknown__netbsd.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-compiler_rustc__target_src_spec_targets_aarch64__unknown__netbsd.rs,v 1.3 2025/08/25 17:51:12 wiz Exp $
 
 NetBSD aarch64 has a bug in the thread-local storage implementation,
 ref. PR#58154.  Turn it off for now.
diff --git a/rust194/patches/patch-compiler_rustc__target_src_spec_targets_mipsel__unknown__netbsd.rs b/rust194/patches/patch-compiler_rustc__target_src_spec_targets_mipsel__unknown__netbsd.rs
index 9f9b89dbe0..9a88bd6c8e 100644
--- a/rust194/patches/patch-compiler_rustc__target_src_spec_targets_mipsel__unknown__netbsd.rs
+++ b/rust194/patches/patch-compiler_rustc__target_src_spec_targets_mipsel__unknown__netbsd.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-compiler_rustc__target_src_spec_targets_mipsel__unknown__netbsd.rs,v 1.3 2025/08/25 17:51:12 wiz Exp $
 
 Let's see if turning off thread local storage makes a difference...
 
diff --git a/rust194/patches/patch-library_backtrace_src_symbolize_gimli.rs b/rust194/patches/patch-library_backtrace_src_symbolize_gimli.rs
index 9084324dd8..76eba086d0 100644
--- a/rust194/patches/patch-library_backtrace_src_symbolize_gimli.rs
+++ b/rust194/patches/patch-library_backtrace_src_symbolize_gimli.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-library_backtrace_src_symbolize_gimli.rs,v 1.9 2025/08/25 17:51:12 wiz Exp $
 
 Add NetBSD to the family who is in the unix class.
 
diff --git a/rust194/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs b/rust194/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs
index f49e07d14f..ced576df71 100644
--- a/rust194/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs
+++ b/rust194/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-library_backtrace_src_symbolize_gimli_elf.rs,v 1.8 2024/04/18 09:29:42 pin Exp $
+$NetBSD: patch-library_backtrace_src_symbolize_gimli_elf.rs,v 1.10 2025/08/25 17:51:12 wiz Exp $
 
 Make NetBSD also find its debug libraries, if present.
 
diff --git a/rust194/patches/patch-src_bootstrap_bootstrap.py b/rust194/patches/patch-src_bootstrap_bootstrap.py
index 5ef63731ca..d7d8d0ad43 100644
--- a/rust194/patches/patch-src_bootstrap_bootstrap.py
+++ b/rust194/patches/patch-src_bootstrap_bootstrap.py
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-src_bootstrap_bootstrap.py,v 1.28 2026/01/13 20:48:23 wiz Exp $
 
 Use `uname -p` on NetBSD, as that is reliable and sensible there.
 Use @PREFIX@ and not $ORIGIN in rpath.
diff --git a/rust194/patches/patch-src_bootstrap_src_core_build__steps_compile.rs b/rust194/patches/patch-src_bootstrap_src_core_build__steps_compile.rs
index 92eee78647..291b0b70ad 100644
--- a/rust194/patches/patch-src_bootstrap_src_core_build__steps_compile.rs
+++ b/rust194/patches/patch-src_bootstrap_src_core_build__steps_compile.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_bootstrap_src_core_build__steps_compile.rs,v 1.2 2024/04/18 09:29:42 pin Exp $
+$NetBSD: patch-src_bootstrap_src_core_build__steps_compile.rs,v 1.5 2025/08/25 17:51:12 wiz Exp $
 
 On Darwin, do not use @rpath for internal libraries.
 
diff --git a/rust194/patches/patch-src_bootstrap_src_core_builder_cargo.rs b/rust194/patches/patch-src_bootstrap_src_core_builder_cargo.rs
index 0580e7f16a..1825ee8f99 100644
--- a/rust194/patches/patch-src_bootstrap_src_core_builder_cargo.rs
+++ b/rust194/patches/patch-src_bootstrap_src_core_builder_cargo.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-src_bootstrap_src_core_builder_cargo.rs,v 1.3 2025/08/25 17:51:12 wiz Exp $
 
 Find external libunwind and libLLVM in pkgsrc (not just Linux).
 Use @PREFIX@ in rpath.
diff --git a/rust194/patches/patch-src_llvm-project_llvm_CMakeLists.txt b/rust194/patches/patch-src_llvm-project_llvm_CMakeLists.txt
index c175e399cb..8db42c84d3 100644
--- a/rust194/patches/patch-src_llvm-project_llvm_CMakeLists.txt
+++ b/rust194/patches/patch-src_llvm-project_llvm_CMakeLists.txt
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_llvm-project_llvm_CMakeLists.txt,v 1.14 2024/04/18 09:29:42 pin Exp $
+$NetBSD: patch-src_llvm-project_llvm_CMakeLists.txt,v 1.15 2025/08/25 17:51:12 wiz Exp $
 
 Don't implement sys/regset.h workaround, fix source instead.
 
diff --git a/rust194/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h b/rust194/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h
index 7ddeba50e3..bfde112a80 100644
--- a/rust194/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h
+++ b/rust194/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h,v 1.11 2026/01/13 20:48:23 wiz Exp $
 
 Fix SunOS CS conflict not handled by include/llvm-c/DataTypes.h
 
diff --git a/rust194/patches/patch-src_tools_cargo_tests_testsuite_build.rs b/rust194/patches/patch-src_tools_cargo_tests_testsuite_build.rs
index faee0c00f9..093afa591b 100644
--- a/rust194/patches/patch-src_tools_cargo_tests_testsuite_build.rs
+++ b/rust194/patches/patch-src_tools_cargo_tests_testsuite_build.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_tools_cargo_tests_testsuite_build.rs,v 1.14 2024/04/18 09:29:42 pin Exp $
+$NetBSD: patch-src_tools_cargo_tests_testsuite_build.rs,v 1.18 2025/08/25 17:51:12 wiz Exp $
 
 Don't attempt incremental operations on sparc64, ref.
 https://sources.debian.org/patches/cargo/0.29.0-1/2007_sparc64_disable_incremental_build.patch/
diff --git a/rust194/patches/patch-tests_assembly-llvm_targets_targets-elf.rs b/rust194/patches/patch-tests_assembly-llvm_targets_targets-elf.rs
index b435eaa191..84ce0e74eb 100644
--- a/rust194/patches/patch-tests_assembly-llvm_targets_targets-elf.rs
+++ b/rust194/patches/patch-tests_assembly-llvm_targets_targets-elf.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-tests_assembly-llvm_targets_targets-elf.rs,v 1.1 2025/10/18 17:14:35 he Exp $
 
 Fix test suite for mips64el-unknown-netbsd.
 
diff --git a/rust194/patches/patch-vendor_crossbeam-utils-0.8.18_no__atomic.rs b/rust194/patches/patch-vendor_crossbeam-utils-0.8.18_no__atomic.rs
index 8a7b3793fa..f289291ec4 100644
--- a/rust194/patches/patch-vendor_crossbeam-utils-0.8.18_no__atomic.rs
+++ b/rust194/patches/patch-vendor_crossbeam-utils-0.8.18_no__atomic.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_crossbeam-utils-0.8.18_no__atomic.rs,v 1.3 2025/08/25 17:51:12 wiz Exp $
 
 Add NetBSD/mipsel to non-atomic targets.
 
diff --git a/rust194/patches/patch-vendor_libc-0.2.155_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust194/patches/patch-vendor_libc-0.2.155_src_unix_bsd_netbsdlike_netbsd_mod.rs
index 1b6c7088be..24c498026b 100644
--- a/rust194/patches/patch-vendor_libc-0.2.155_src_unix_bsd_netbsdlike_netbsd_mod.rs
+++ b/rust194/patches/patch-vendor_libc-0.2.155_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_libc-0.2.155_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.2 2025/08/25 17:51:12 wiz Exp $
 
 Apply https://github.com/rust-lang/libc/pull/4265/files
 to fix getmntinfo() from rust.
diff --git a/rust194/patches/patch-vendor_libc-0.2.155_src_unix_solarish_mod.rs b/rust194/patches/patch-vendor_libc-0.2.155_src_unix_solarish_mod.rs
index ee6548b217..276db25e8c 100644
--- a/rust194/patches/patch-vendor_libc-0.2.155_src_unix_solarish_mod.rs
+++ b/rust194/patches/patch-vendor_libc-0.2.155_src_unix_solarish_mod.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_libc-0.2.155_src_unix_solarish_mod.rs,v 1.5 2025/10/18 17:14:35 he Exp $
 
 Fix xattr build.
 
diff --git a/rust194/patches/patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust194/patches/patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_mod.rs
index 2127d0f1bc..b33dd8a12f 100644
--- a/rust194/patches/patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_mod.rs
+++ b/rust194/patches/patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.3 2026/01/13 20:48:23 wiz Exp $
 
 Apply https://github.com/rust-lang/libc/pull/4265/files
 to fix getmntinfo() from rust.
diff --git a/rust194/patches/patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_riscv64.rs b/rust194/patches/patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
index 003128b639..15a6cff36f 100644
--- a/rust194/patches/patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
+++ b/rust194/patches/patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_riscv64.rs,v 1.1 2025/08/25 17:51:12 wiz Exp $
 
 Unbreak this module.
 
diff --git a/rust194/patches/patch-vendor_libc-0.2.168_src_unix_solarish_mod.rs b/rust194/patches/patch-vendor_libc-0.2.168_src_unix_solarish_mod.rs
index 6af8f1a783..ea6a93fe86 100644
--- a/rust194/patches/patch-vendor_libc-0.2.168_src_unix_solarish_mod.rs
+++ b/rust194/patches/patch-vendor_libc-0.2.168_src_unix_solarish_mod.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_libc-0.2.168_src_unix_solarish_mod.rs,v 1.4 2025/10/18 17:14:35 he Exp $
 
 Fix xattr build.
 
diff --git a/rust194/patches/patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust194/patches/patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_mod.rs
index 67b812ae9b..b4de45f7bb 100644
--- a/rust194/patches/patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_mod.rs
+++ b/rust194/patches/patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.2 2025/08/25 17:51:12 wiz Exp $
 
 Apply https://github.com/rust-lang/libc/pull/4265/files
 to fix getmntinfo() from rust.
diff --git a/rust194/patches/patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_riscv64.rs b/rust194/patches/patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
index a44e84040e..30d1f3d440 100644
--- a/rust194/patches/patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
+++ b/rust194/patches/patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_riscv64.rs,v 1.2 2025/08/25 17:51:12 wiz Exp $
 
 Unbreak this module.
 
diff --git a/rust194/patches/patch-vendor_libc-0.2.169_src_unix_solarish_mod.rs b/rust194/patches/patch-vendor_libc-0.2.169_src_unix_solarish_mod.rs
index a1339953f1..f1ea8dc605 100644
--- a/rust194/patches/patch-vendor_libc-0.2.169_src_unix_solarish_mod.rs
+++ b/rust194/patches/patch-vendor_libc-0.2.169_src_unix_solarish_mod.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_libc-0.2.169_src_unix_solarish_mod.rs,v 1.5 2025/10/18 17:14:35 he Exp $
 
 Fix xattr build.
 
diff --git a/rust194/patches/patch-vendor_libc-0.2.171_src_unix_bsd_netbsdlike_netbsd_riscv64.rs b/rust194/patches/patch-vendor_libc-0.2.171_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
index fdf24dce61..219b9ea7f7 100644
--- a/rust194/patches/patch-vendor_libc-0.2.171_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
+++ b/rust194/patches/patch-vendor_libc-0.2.171_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_libc-0.2.171_src_unix_bsd_netbsdlike_netbsd_riscv64.rs,v 1.1 2025/08/25 17:51:13 wiz Exp $
 
 Unbreak this module.
 
diff --git a/rust194/patches/patch-vendor_libc-0.2.172_src_unix_bsd_netbsdlike_netbsd_riscv64.rs b/rust194/patches/patch-vendor_libc-0.2.172_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
index 44401fa70e..208337cf90 100644
--- a/rust194/patches/patch-vendor_libc-0.2.172_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
+++ b/rust194/patches/patch-vendor_libc-0.2.172_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_libc-0.2.172_src_unix_bsd_netbsdlike_netbsd_riscv64.rs,v 1.1 2025/08/25 17:51:13 wiz Exp $
 
 Unbreak this module.
 
diff --git a/rust194/patches/patch-vendor_libc-0.2.172_src_unix_solarish_mod.rs b/rust194/patches/patch-vendor_libc-0.2.172_src_unix_solarish_mod.rs
index 224b4e930b..293aaab7fa 100644
--- a/rust194/patches/patch-vendor_libc-0.2.172_src_unix_solarish_mod.rs
+++ b/rust194/patches/patch-vendor_libc-0.2.172_src_unix_solarish_mod.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_libc-0.2.172_src_unix_solarish_mod.rs,v 1.4 2025/10/21 08:54:19 jperkin Exp $
 
 Fix xattr build.
 
diff --git a/rust194/patches/patch-vendor_libc-0.2.174_src_unix_bsd_netbsdlike_netbsd_riscv64.rs b/rust194/patches/patch-vendor_libc-0.2.174_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
index bb3c8b5c52..e89c709bdd 100644
--- a/rust194/patches/patch-vendor_libc-0.2.174_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
+++ b/rust194/patches/patch-vendor_libc-0.2.174_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_libc-0.2.174_src_unix_bsd_netbsdlike_netbsd_riscv64.rs,v 1.1 2025/10/18 17:14:35 he Exp $
 
 Unbreak this module.
 
diff --git a/rust194/patches/patch-vendor_line-index-0.1.2_src_lib.rs b/rust194/patches/patch-vendor_line-index-0.1.2_src_lib.rs
index 4d14411866..df65062259 100644
--- a/rust194/patches/patch-vendor_line-index-0.1.2_src_lib.rs
+++ b/rust194/patches/patch-vendor_line-index-0.1.2_src_lib.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_line-index-0.1.2_src_lib.rs,v 1.2 2025/08/25 17:51:13 wiz Exp $
 
 Do not attempt use of neon extension in big-endian mode.
 
diff --git a/rust194/patches/patch-vendor_lzma-sys-0.1.20_config.h b/rust194/patches/patch-vendor_lzma-sys-0.1.20_config.h
index 6eaa429abe..e2824c4f23 100644
--- a/rust194/patches/patch-vendor_lzma-sys-0.1.20_config.h
+++ b/rust194/patches/patch-vendor_lzma-sys-0.1.20_config.h
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_lzma-sys-0.1.20_config.h,v 1.2 2025/08/25 17:51:13 wiz Exp $
 
 clock_gettime() is available also on NetBSD.
 
diff --git a/rust194/patches/patch-vendor_memchr-2.7.4_src_arch_aarch64_memchr.rs b/rust194/patches/patch-vendor_memchr-2.7.4_src_arch_aarch64_memchr.rs
index 06fbbc1f87..1ca0cfa6c0 100644
--- a/rust194/patches/patch-vendor_memchr-2.7.4_src_arch_aarch64_memchr.rs
+++ b/rust194/patches/patch-vendor_memchr-2.7.4_src_arch_aarch64_memchr.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_memchr-2.7.4_src_arch_aarch64_memchr.rs,v 1.3 2025/08/25 17:51:13 wiz Exp $
 
 Don't try to do neon / SIMD on big-endian aarch64.
 
diff --git a/rust194/patches/patch-vendor_memchr-2.7.4_src_arch_aarch64_mod.rs b/rust194/patches/patch-vendor_memchr-2.7.4_src_arch_aarch64_mod.rs
index 3fa3ec8c4d..405f6b67fb 100644
--- a/rust194/patches/patch-vendor_memchr-2.7.4_src_arch_aarch64_mod.rs
+++ b/rust194/patches/patch-vendor_memchr-2.7.4_src_arch_aarch64_mod.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_memchr-2.7.4_src_arch_aarch64_mod.rs,v 1.3 2025/08/25 17:51:13 wiz Exp $
 
 Don't try to do neon / SIMD on big-endian aarch64.
 
diff --git a/rust194/patches/patch-vendor_memchr-2.7.4_src_memchr.rs b/rust194/patches/patch-vendor_memchr-2.7.4_src_memchr.rs
index da85596fc1..382494dc1d 100644
--- a/rust194/patches/patch-vendor_memchr-2.7.4_src_memchr.rs
+++ b/rust194/patches/patch-vendor_memchr-2.7.4_src_memchr.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_memchr-2.7.4_src_memchr.rs,v 1.3 2025/08/25 17:51:13 wiz Exp $
 
 Don't try to do neon / SIMD on big-endian aarch64.
 
diff --git a/rust194/patches/patch-vendor_memchr-2.7.4_src_memmem_searcher.rs b/rust194/patches/patch-vendor_memchr-2.7.4_src_memmem_searcher.rs
index 743d4886ee..ac7b8cd586 100644
--- a/rust194/patches/patch-vendor_memchr-2.7.4_src_memmem_searcher.rs
+++ b/rust194/patches/patch-vendor_memchr-2.7.4_src_memmem_searcher.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_memchr-2.7.4_src_memmem_searcher.rs,v 1.3 2025/08/25 17:51:13 wiz Exp $
 
 Don't try to use neon / SIMD on big-endian aarch64.
 
diff --git a/rust194/patches/patch-vendor_memchr-2.7.4_src_vector.rs b/rust194/patches/patch-vendor_memchr-2.7.4_src_vector.rs
index 6851a4a4fd..a778790a6b 100644
--- a/rust194/patches/patch-vendor_memchr-2.7.4_src_vector.rs
+++ b/rust194/patches/patch-vendor_memchr-2.7.4_src_vector.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_memchr-2.7.4_src_vector.rs,v 1.3 2025/08/25 17:51:13 wiz Exp $
 
 Don't try to do neon / SIMD on big-endian aarch64.
 
diff --git a/rust194/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_Configurations_10-main.conf b/rust194/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_Configurations_10-main.conf
index 8a3b7874ae..73143bcc7b 100644
--- a/rust194/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_Configurations_10-main.conf
+++ b/rust194/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_Configurations_10-main.conf
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_Configurations_10-main.conf,v 1.4 2025/10/18 17:14:36 he Exp $
 
 Replicate part of
 https://github.com/openssl/openssl/pull/15086
diff --git a/rust194/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_crypto_aria_aria.c b/rust194/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_crypto_aria_aria.c
index be229e5788..9f96455bcb 100644
--- a/rust194/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_crypto_aria_aria.c
+++ b/rust194/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_crypto_aria_aria.c
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_crypto_aria_aria.c,v 1.1 2025/10/18 17:14:36 he Exp $
 
 Make this build if bswap32 is already defined, as for NetBSD/i586.
 
diff --git a/rust194/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_Configurations_10-main.conf b/rust194/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_Configurations_10-main.conf
index 788a38e3d8..8b8658489d 100644
--- a/rust194/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_Configurations_10-main.conf
+++ b/rust194/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_Configurations_10-main.conf
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_openssl-src-300.5.0+3.5.0_openssl_Configurations_10-main.conf,v 1.1 2025/10/18 17:14:36 he Exp $
 
 Replicate part of
 https://github.com/openssl/openssl/pull/15086
diff --git a/rust194/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_crypto_aria_aria.c b/rust194/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_crypto_aria_aria.c
index 34a78253e2..77c8b0f3e0 100644
--- a/rust194/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_crypto_aria_aria.c
+++ b/rust194/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_crypto_aria_aria.c
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_openssl-src-300.5.0+3.5.0_openssl_crypto_aria_aria.c,v 1.1 2025/10/18 17:14:36 he Exp $
 
 Make this build also if bswap32 is already defined, as for NetBSD/i586.
 
diff --git a/rust194/patches/patch-vendor_openssl-sys-0.9.107_build_find__normal.rs b/rust194/patches/patch-vendor_openssl-sys-0.9.107_build_find__normal.rs
index 3f499547d4..ec68e07374 100644
--- a/rust194/patches/patch-vendor_openssl-sys-0.9.107_build_find__normal.rs
+++ b/rust194/patches/patch-vendor_openssl-sys-0.9.107_build_find__normal.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_openssl-sys-0.9.107_build_find__normal.rs,v 1.1 2025/08/25 17:51:13 wiz Exp $
 
 Add hack for Darwin when homebrew is installed.
 
diff --git a/rust194/patches/patch-vendor_openssl-sys-0.9.107_build_main.rs b/rust194/patches/patch-vendor_openssl-sys-0.9.107_build_main.rs
index 7e665d8853..1af0475acb 100644
--- a/rust194/patches/patch-vendor_openssl-sys-0.9.107_build_main.rs
+++ b/rust194/patches/patch-vendor_openssl-sys-0.9.107_build_main.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_openssl-sys-0.9.107_build_main.rs,v 1.1 2025/08/25 17:51:13 wiz Exp $
 
 Patterned after Linux and Android, on 32-bit NetBSD ports
 include -latomic.  Parts of this inspired by
diff --git a/rust194/patches/patch-vendor_openssl-sys-0.9.109_build_find__normal.rs b/rust194/patches/patch-vendor_openssl-sys-0.9.109_build_find__normal.rs
index 31a115a1cc..ae3496cdbc 100644
--- a/rust194/patches/patch-vendor_openssl-sys-0.9.109_build_find__normal.rs
+++ b/rust194/patches/patch-vendor_openssl-sys-0.9.109_build_find__normal.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_openssl-sys-0.9.109_build_find__normal.rs,v 1.1 2025/10/18 17:14:36 he Exp $
 
 Add hack for Darwin when homebrew is installed.
 
diff --git a/rust194/patches/patch-vendor_openssl-sys-0.9.109_build_main.rs b/rust194/patches/patch-vendor_openssl-sys-0.9.109_build_main.rs
index 4a6098ad57..1ac33e4b86 100644
--- a/rust194/patches/patch-vendor_openssl-sys-0.9.109_build_main.rs
+++ b/rust194/patches/patch-vendor_openssl-sys-0.9.109_build_main.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_openssl-sys-0.9.109_build_main.rs,v 1.1 2025/10/18 17:14:36 he Exp $
 
 Patterned after Linux and Android, on 32-bit NetBSD ports
 include -latomic.  Parts of this inspired by
diff --git a/rust194/patches/patch-vendor_openssl-sys-0.9.92_build_find__normal.rs b/rust194/patches/patch-vendor_openssl-sys-0.9.92_build_find__normal.rs
index fd7def4861..eadb21f4b0 100644
--- a/rust194/patches/patch-vendor_openssl-sys-0.9.92_build_find__normal.rs
+++ b/rust194/patches/patch-vendor_openssl-sys-0.9.92_build_find__normal.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_openssl-sys-0.9.92_build_find__normal.rs,v 1.4 2025/10/18 17:14:36 he Exp $
 
 Add hack for Darwin when homebrew is installed.
 
diff --git a/rust194/patches/patch-vendor_openssl-sys-0.9.92_build_main.rs b/rust194/patches/patch-vendor_openssl-sys-0.9.92_build_main.rs
index b7131a38fe..09c1b546a4 100644
--- a/rust194/patches/patch-vendor_openssl-sys-0.9.92_build_main.rs
+++ b/rust194/patches/patch-vendor_openssl-sys-0.9.92_build_main.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_openssl-sys-0.9.92_build_main.rs,v 1.4 2025/10/18 17:14:37 he Exp $
 
 Patterned after Linux and Android, on 32-bit NetBSD ports
 include -latomic.  Parts of this inspired by
diff --git a/rust194/patches/patch-vendor_zerocopy-0.7.32_src_lib.rs b/rust194/patches/patch-vendor_zerocopy-0.7.32_src_lib.rs
index 35ab52f6cb..741f3d8024 100644
--- a/rust194/patches/patch-vendor_zerocopy-0.7.32_src_lib.rs
+++ b/rust194/patches/patch-vendor_zerocopy-0.7.32_src_lib.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_zerocopy-0.7.32_src_lib.rs,v 1.3 2025/08/25 17:51:14 wiz Exp $
 
 Attempt at skipping SIMD / neon on big-endian aarch64,
 ref. https://github.com/rust-lang/rust/issues/129819.
diff --git a/rust194/patches/patch-vendor_zerocopy-0.7.35_src_lib.rs b/rust194/patches/patch-vendor_zerocopy-0.7.35_src_lib.rs
index d71d7d0924..02ae82da04 100644
--- a/rust194/patches/patch-vendor_zerocopy-0.7.35_src_lib.rs
+++ b/rust194/patches/patch-vendor_zerocopy-0.7.35_src_lib.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_zerocopy-0.7.35_src_lib.rs,v 1.3 2025/08/25 17:51:14 wiz Exp $
 
 Attempt at skipping SIMD / neon on big-endian aarch64,
 ref. https://github.com/rust-lang/rust/issues/129819.
diff --git a/rust194/patches/patch-vendor_zeroize-1.8.1_src_lib.rs b/rust194/patches/patch-vendor_zeroize-1.8.1_src_lib.rs
index 990d660c45..17e4970d08 100644
--- a/rust194/patches/patch-vendor_zeroize-1.8.1_src_lib.rs
+++ b/rust194/patches/patch-vendor_zeroize-1.8.1_src_lib.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_zeroize-1.8.1_src_lib.rs,v 1.2 2025/08/25 17:51:14 wiz Exp $
 
 Don't try to use the NEON-specific module in big-endian mode.
 
diff --git a/rust194/platform.mk b/rust194/platform.mk
index 1bd7278159..c4c2911399 100644
--- a/rust194/platform.mk
+++ b/rust194/platform.mk
@@ -1,4 +1,4 @@
-# $NetBSD: platform.mk,v 1.34 2025/10/02 16:59:50 nia Exp $
+# $NetBSD: platform.mk,v 1.35 2026/03/17 07:02:08 nia Exp $
 
 # This file encodes whether a given platform has support for rust.
 
@@ -8,7 +8,7 @@
 .if !defined(PLATFORM_SUPPORTS_RUST)
 
 # Rust needs NetBSD>8
-.for rust_arch in aarch64 earmv6hf earmv7hf i386 powerpc riscv64 sparc64 x86_64
+.for rust_arch in aarch64 earmv7hf i386 powerpc riscv64 sparc64 x86_64
 .  for rust_os in Darwin FreeBSD Linux NetBSD SunOS
 .    if ${OPSYS} != "NetBSD" || empty(OS_VERSION:M[0-8].*)
 RUST_PLATFORMS+=	${rust_os}-*-${rust_arch}
@@ -22,7 +22,7 @@ RUST_PLATFORMS+=	${rust_os}-*-${rust_arch}
 RUST_TYPE?=	bin
 .endif
 
-#RUST_DIR?=	../../lang/rust
+RUST_DIR?=	../../lang/rust
 
 .for rust_platform in ${RUST_PLATFORMS}
 .  if !empty(MACHINE_PLATFORM:M${rust_platform})
diff --git a/rust194/rust.mk b/rust194/rust.mk
index d8a478987f..d62490efb2 100644
--- a/rust194/rust.mk
+++ b/rust194/rust.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rust.mk,v 1.9 2024/07/07 11:00:37 wiz Exp $
+# $NetBSD: rust.mk,v 1.18 2026/03/04 12:17:34 jperkin Exp $
 #
 # This file determines the type of rust package to use.
 #
@@ -8,11 +8,15 @@
 # === User-settable variables ===
 #
 # RUST_TYPE
-#	The preferred type of Rust release to use -
-#	either bootstrap-from-source or an official binary.
+#	The preferred type of Rust release to use - either build from source,
+#	or use a binary installation.
 #
-#	Official Rust binaries are only published for certain platforms,
-#	including Darwin, FreeBSD, Linux, and NetBSD x86_64.
+#	Official Rust binaries are only published for certain platforms.  The
+#	"bin" option uses the lang/rust-bin package, whereas "native" uses
+#	binaries installed on the host system.  If using "native" with a rustup
+#	installation, you will probably also need to set RUSTUP_HOME in your
+#	MAKE_ENV pointing to the 'rustup show home' directory.  This is due to
+#	pkgsrc overwriting the HOME environment variable during build.
 #
 #	Possible values: src bin native
 #	Default: "src", except on 32-bit arm where it's "bin"


Home | Main Index | Thread Index | Old Index