rust: properly sort out patches and cargo checksum patching.

[Havard Eidnes <he%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Sat Jan 28 15:21:46 2023 +0000
Changeset:	178b744d058df3fd33d31b0a282f0337d558e940

Modified Files:
	rust/Makefile
	rust/distinfo
	rust/patches/patch-vendor_crossbeam-utils-0.8.12_no__atomic.rs
	rust/patches/patch-vendor_crossbeam-utils-0.8.8_no__atomic.rs

Log Message:
rust: properly sort out patches and cargo checksum patching.

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

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

diffstat:
 rust/Makefile                                              | 14 +++++++-------
 rust/distinfo                                              |  5 +++--
 .../patch-vendor_crossbeam-utils-0.8.12_no__atomic.rs      |  6 +++---
 .../patch-vendor_crossbeam-utils-0.8.8_no__atomic.rs       |  6 +++---
 4 files changed, 16 insertions(+), 15 deletions(-)

diffs:
diff --git a/rust/Makefile b/rust/Makefile
index 70a21bdb5e..de04d15410 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -449,21 +449,21 @@ CKSUM_CRATES+=	vendor/kqueue
 CKSUMS+=	900a966152b8fdccc4e953df94fa27024cb473f57f49df06cd8f2acaac869787
 CKSUMS+=	9bf215b1d26d7f12def8cbc3cdc2f89eabe9249f040911c4a44792fb417cc0fd
 
+CKSUM_CRATES+=	vendor/crossbeam-utils
+CKSUMS+=	3314524d2afa0360c947455a6e6566fb54ebf909c99479ca3b7435741fd3293e
+CKSUMS+=	eaef167dea04efa811cf0d53de98feac6063ec2196eccd315d345ef86c551aaa
+
 CKSUM_CRATES+=	vendor/crossbeam-utils-0.8.8
 CKSUMS+=	71b5f78fd701ce604aa766dd3d825fa5bed774282aae4d6c31d7acb01b1b242f
-CKSUMS+=	8fe3bafee993fe92ef421e066b4ed3b75c52efd5f8676b8950d1b868f3a7abba
+CKSUMS+=	e2253c519f2a9368f54dac633205eca786ec111a8f68c24eb8b17be68d84b0c8
 
 CKSUM_CRATES+=	vendor/crossbeam-utils-0.8.12
 CKSUMS+=	f58085b9d0666ccf62e0ae17fb5dae937c0a86fcc55dc0ae04ad8659e696a49c
-CKSUMS+=	edd00ed29d88c1324bf15008e83394dbb5e09f723a7f040c322f8be1d50e41ea
 CKSUMS+=	ea445a2f85068957d0347fa384c8f9c7c2726a65e930f4352d1b10476cddd851
-CKSUMS+=	edd00ed29d88c1324bf15008e83394dbb5e09f723a7f040c322f8be1d50e41ea
 
 CKSUM_CRATES+=	vendor/crossbeam-epoch-0.9.11
-CKSUMS+=	f58085b9d0666ccf62e0ae17fb5dae937c0a86fcc55dc0ae04ad8659e696a49c
-CKSUMS+=	ea445a2f85068957d0347fa384c8f9c7c2726a65e930f4352d1b10476cddd851
-CKSUMS+=	edd00ed29d88c1324bf15008e83394dbb5e09f723a7f040c322f8be1d50e41ea
-CKSUMS+=	ea445a2f85068957d0347fa384c8f9c7c2726a65e930f4352d1b10476cddd851
+#CKSUMS+=	f58085b9d0666ccf62e0ae17fb5dae937c0a86fcc55dc0ae04ad8659e696a49c
+#CKSUMS+=	ea445a2f85068957d0347fa384c8f9c7c2726a65e930f4352d1b10476cddd851
 
 CKSUM_CRATES+=	vendor/crossbeam-epoch-0.9.6
 CKSUMS+=	3529c0833bcd1e09a352d3bd1696d3666850c9b09fe2111bf1a783ec16a5f467
diff --git a/rust/distinfo b/rust/distinfo
index 8826c0d120..666a7ccdb7 100644
--- a/rust/distinfo
+++ b/rust/distinfo
@@ -140,8 +140,9 @@ SHA1 (patch-vendor_cc_src_lib.rs) = dc40f4fb0f7508b886d6d93b27e9936403a96765
 SHA1 (patch-vendor_crossbeam-epoch-0.9.11_no__atomic.rs) = 9e14b7f56f024781859cbc94be53daef6d96a0b7
 SHA1 (patch-vendor_crossbeam-epoch-0.9.6_no__atomic.rs) = 96334fb4ceee3332b5f1c7750c93664485b01365
 SHA1 (patch-vendor_crossbeam-epoch_no__atomic.rs) = ee6294d0cef62e843aa7d4e693cc72b1347ff6e1
-SHA1 (patch-vendor_crossbeam-utils-0.8.12_no__atomic.rs) = 1618b1fefa13dc3f28ceaaf130246a61cd2e4bf0
-SHA1 (patch-vendor_crossbeam-utils-0.8.8_no__atomic.rs) = 7f31d6c45ef843eb2595df58e46b0e44dded0cc9
+SHA1 (patch-vendor_crossbeam-utils-0.8.12_no__atomic.rs) = f3ff91232bbc00abee7d8de87909cd670655986e
+SHA1 (patch-vendor_crossbeam-utils-0.8.8_no__atomic.rs) = b3c1257f34ff3d43c4b2333bc869abfa77d79ac7
+SHA1 (patch-vendor_crossbeam-utils_no__atomic.rs) = a6eb53457777770083c072bf4c49e971311ce135
 SHA1 (patch-vendor_kqueue_src_time.rs) = 21950e7d79fb88257bdb11b988f2a3ae0084ba3d
 SHA1 (patch-vendor_libc-0.2.127_src_unix_bsd_netbsdlike_netbsd_mips.rs) = 64d86908ef334e061ba8f1a2b84493f777aedce2
 SHA1 (patch-vendor_libc-0.2.127_src_unix_bsd_netbsdlike_netbsd_mod.rs) = b091cadfd78996452ed5c3012b2022d6b2b4cac1
diff --git a/rust/patches/patch-vendor_crossbeam-utils-0.8.12_no__atomic.rs b/rust/patches/patch-vendor_crossbeam-utils-0.8.12_no__atomic.rs
index 8f4af722c1..80b46b365b 100644
--- a/rust/patches/patch-vendor_crossbeam-utils-0.8.12_no__atomic.rs
+++ b/rust/patches/patch-vendor_crossbeam-utils-0.8.12_no__atomic.rs
@@ -2,11 +2,11 @@ $NetBSD$
 
 --- vendor/crossbeam-utils-0.8.12/no_atomic.rs.orig	2023-01-25 01:49:15.000000000 +0000
 +++ vendor/crossbeam-utils-0.8.12/no_atomic.rs
-@@ -41,6 +41,7 @@ const NO_ATOMIC_64: &[&str] = &[
+@@ -40,6 +40,7 @@ const NO_ATOMIC_64: &[&str] = &[
+     "mipsel-unknown-linux-gnu",
      "mipsel-unknown-linux-musl",
      "mipsel-unknown-linux-uclibc",
-     "mipsel-unknown-none",
 +    "mipsel-unknown-netbsd",
+     "mipsel-unknown-none",
      "mipsisa32r6-unknown-linux-gnu",
      "mipsisa32r6el-unknown-linux-gnu",
-     "msp430-none-elf",
diff --git a/rust/patches/patch-vendor_crossbeam-utils-0.8.8_no__atomic.rs b/rust/patches/patch-vendor_crossbeam-utils-0.8.8_no__atomic.rs
index 6757627c15..7ff032c999 100644
--- a/rust/patches/patch-vendor_crossbeam-utils-0.8.8_no__atomic.rs
+++ b/rust/patches/patch-vendor_crossbeam-utils-0.8.8_no__atomic.rs
@@ -5,11 +5,11 @@ native 64-bit atomic ops.
 
 --- vendor/crossbeam-utils-0.8.8/no_atomic.rs.orig	2022-09-19 15:35:01.000000000 +0000
 +++ vendor/crossbeam-utils-0.8.8/no_atomic.rs
-@@ -36,6 +36,7 @@ const NO_ATOMIC_64: &[&str] = &[
+@@ -35,6 +35,7 @@ const NO_ATOMIC_64: &[&str] = &[
+     "mipsel-unknown-linux-gnu",
      "mipsel-unknown-linux-musl",
      "mipsel-unknown-linux-uclibc",
-     "mipsel-unknown-none",
 +    "mipsel-unknown-netbsd",
+     "mipsel-unknown-none",
      "mipsisa32r6-unknown-linux-gnu",
      "mipsisa32r6el-unknown-linux-gnu",
-     "msp430-none-elf",