rust: patch against homebrew hack

[Adam <adam%netbsd.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Adam <adam%netbsd.org@localhost>
Pushed By:	adam
Date:		Tue Jun 20 14:44:54 2023 +0200
Changeset:	8ab3a44d75f1fa529c13b3c667320319aae2c405

Modified Files:
	rust/Makefile
	rust/distinfo
Added Files:
	rust/patches/patch-vendor_openssl-sys_build_find__normal.rs

Log Message:
rust: patch against homebrew hack

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

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

diffstat:
 rust/Makefile                                      | 12 ++--------
 rust/distinfo                                      |  1 +
 .../patch-vendor_openssl-sys_build_find__normal.rs | 28 ++++++++++++++++++++++
 3 files changed, 31 insertions(+), 10 deletions(-)

diffs:
diff --git a/rust/Makefile b/rust/Makefile
index 226c4cead4..909c9a663b 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -419,10 +419,6 @@ SUBST_VARS.rpath=	PREFIX
 # updating and verification.
 #
 
-#CKSUM_CRATES+=	vendor/cc
-#CKSUMS+=	2403bbe39ff511ea5a517c0841d825173a4fdc8a0899c64282bba49127f0dc33
-#CKSUMS+=	a8e8ff94141ffd6760f10e9359a206badc792ce068f3fed8a5b5e06ebe9a72a4
-
 CKSUM_CRATES+=	vendor/libc
 CKSUMS+=	6442ed05eb390d44a03daa9800af1030f2ee3e61db98675262c227b28de51937
 CKSUMS+=	ec554c837999c718786debfcfe2241984193751fcd52156323b418d96319aa95
@@ -433,8 +429,6 @@ CKSUM_CRATES+=	vendor/libc-0.2.139
 CKSUMS+=	107a4aa396b8383c66e0ace2f941450b4b69146558cdc4d9fbe33eeab51760f1
 CKSUMS+=	129f7ffc0ebf799f2ed817c443d4de8eede26d35f629387e08951cbcd2914f4a
 
-#CKSUM_CRATES+=	vendor/libc-0.2.138
-
 CKSUM_CRATES+=	vendor/lzma-sys
 CKSUMS+=	6fd5e9245db34c6f557b8bfcaf03db82fc88c3b06dbfbb5f03b2bcd138983ef9
 CKSUMS+=	5e252578b5d266f6a4c8dc9f71ca7a91536ccb8c5c7d7753b82f12ec886459ef
@@ -443,10 +437,6 @@ CKSUM_CRATES+=	vendor/stacker
 CKSUMS+=	59ca847887cf19387119d18c57f08d5a8520d714876ca0142b8f1c001ecde06b
 CKSUMS+=	03be8ae293b713fe6e9703e4809dd68caaec992bae6777914ffddae8da2a9bc7
 
-#CKSUM_CRATES+=	vendor/kqueue
-#CKSUMS+=	900a966152b8fdccc4e953df94fa27024cb473f57f49df06cd8f2acaac869787
-#CKSUMS+=	9bf215b1d26d7f12def8cbc3cdc2f89eabe9249f040911c4a44792fb417cc0fd
-
 CKSUM_CRATES+=	vendor/crossbeam-epoch
 CKSUM_CRATES+=	vendor/crossbeam-utils
 CKSUMS+=	3314524d2afa0360c947455a6e6566fb54ebf909c99479ca3b7435741fd3293e
@@ -463,6 +453,8 @@ CKSUMS+=	dadfaa4a6a749a3d14a8cb76e25a72627973939f54ca4236182665e4a1fd9640
 CKSUM_CRATES+=	vendor/openssl-sys
 CKSUMS+=	d04538b63898180949bc7d9ced4806395011a3f6c5d374d4ebfdf2b30cd9cc33
 CKSUMS+=	5972bc8c1549820108b53df23ee1a9fb7c3d40c2c198a855a5afdf563cbafb26
+CKSUMS+=	1f9233e5993c3537767d39b66fa5a43f5268a9bf89b70884886652cfa7e869c6
+CKSUMS+=	93dd56b8ea8c24678cf390232a1de7bbf0de64a5eaa40da95848e22e611c6dcb
 
 CKSUM_CRATES+=	vendor/nix
 CKSUMS+=	c3e13a2edea54d190a4b051f62efc97953c00b5051a9fda0e39e3bc732a31939
diff --git a/rust/distinfo b/rust/distinfo
index a41530acf4..d4aa94fa12 100644
--- a/rust/distinfo
+++ b/rust/distinfo
@@ -156,6 +156,7 @@ SHA1 (patch-vendor_lzma-sys_config.h) = b654c7e129fa02697734bc87173f89b3056a5437
 SHA1 (patch-vendor_nix_src_sys_signal.rs) = bf4fcdc5b71d8d73b3d7e8acfccd0554d822c131
 SHA1 (patch-vendor_openssl-src_openssl_Configurations_10-main.conf) = 1c4e1d5520776e70d588f3da0fd54b6f956835b5
 SHA1 (patch-vendor_openssl-src_src_lib.rs) = 918fac850f3a6e948d25ef3f673ef62345de386f
+SHA1 (patch-vendor_openssl-sys_build_find__normal.rs) = 8c4311cdd2bd66882fa8406e28119a0144df5301
 SHA1 (patch-vendor_openssl-sys_build_main.rs) = 20618b13b56cc93bb5c051f96046604dd4977345
 SHA1 (patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = 4e86aec4c89db9a331950a12f8ec7b8aaa50eed7
 SHA1 (patch-vendor_stacker_src_lib.rs) = e00a1e95eb16540ff182715db778bf97ebd07a5e
diff --git a/rust/patches/patch-vendor_openssl-sys_build_find__normal.rs b/rust/patches/patch-vendor_openssl-sys_build_find__normal.rs
new file mode 100644
index 0000000000..5d651c130d
--- /dev/null
+++ b/rust/patches/patch-vendor_openssl-sys_build_find__normal.rs
@@ -0,0 +1,28 @@
+$NetBSD: patch-vendor_openssl-sys_build_find__normal.rs,v 1.1 2023/06/19 14:46:47 bsiegert Exp $
+
+--- vendor/openssl-sys/build/find_normal.rs.orig	2023-05-31 21:44:49.000000000 +0000
++++ vendor/openssl-sys/build/find_normal.rs
+@@ -72,23 +72,6 @@ fn resolve_with_wellknown_location(dir:
+ fn find_openssl_dir(target: &str) -> OsString {
+     let host = env::var("HOST").unwrap();
+ 
+-    if host == target && target.ends_with("-apple-darwin") {
+-        let homebrew_dir = match target {
+-            "aarch64-apple-darwin" => "/opt/homebrew",
+-            _ => "/usr/local",
+-        };
+-
+-        if let Some(dir) = resolve_with_wellknown_homebrew_location(homebrew_dir) {
+-            return dir.into();
+-        } else if let Some(dir) = resolve_with_wellknown_location("/opt/pkg") {
+-            // pkgsrc
+-            return dir.into();
+-        } else if let Some(dir) = resolve_with_wellknown_location("/opt/local") {
+-            // MacPorts
+-            return dir.into();
+-        }
+-    }
+-
+     try_pkg_config();
+     try_vcpkg();
+