rust: Apply fix for Darwin if Homebrew is installed.

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

Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Sun Jul 9 20:10:09 2023 +0000
Changeset:	ac632fca602d67ad94569510ebcc85f703946652

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

Log Message:
rust: Apply fix for Darwin if Homebrew is installed.

Pull over bsiegert@'s change from main pkgsrc.

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

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

diffstat:
 rust/Makefile                                               | 4 +++-
 rust/distinfo                                               | 4 ++--
 rust/patches/patch-vendor_openssl-sys_build_find__normal.rs | 2 --
 3 files changed, 5 insertions(+), 5 deletions(-)

diffs:
diff --git a/rust/Makefile b/rust/Makefile
index 3d330a45e9..618114b61e 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.197 2020/09/29 16:45:16 gdt Exp $
+# $NetBSD: Makefile,v 1.284 2023/06/19 14:46:47 bsiegert Exp $
 
 DISTNAME=	rustc-1.70.0-src
 PKGNAME=	${DISTNAME:S/rustc/rust/:S/-src//}
@@ -473,6 +473,8 @@ CKSUMS+=	d04538b63898180949bc7d9ced4806395011a3f6c5d374d4ebfdf2b30cd9cc33
 CKSUMS+=	5972bc8c1549820108b53df23ee1a9fb7c3d40c2c198a855a5afdf563cbafb26
 CKSUMS+=	1f9233e5993c3537767d39b66fa5a43f5268a9bf89b70884886652cfa7e869c6
 CKSUMS+=	93dd56b8ea8c24678cf390232a1de7bbf0de64a5eaa40da95848e22e611c6dcb
+CKSUMS+=	5b3f48d529657f212e69883f9d3f599d0e1fc9a64f1389cc3760029b4ad6a423
+CKSUMS+=	ab6b0ec78a2eefeaf0fc5f45afa783fa254d5efe856401c0b34d4d05ef9b3dd4
 
 CKSUM_CRATES+=	vendor/nix
 CKSUMS+=	c3e13a2edea54d190a4b051f62efc97953c00b5051a9fda0e39e3bc732a31939
diff --git a/rust/distinfo b/rust/distinfo
index b5eeee5e2a..945736ae28 100644
--- a/rust/distinfo
+++ b/rust/distinfo
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: distinfo,v 1.159 2023/06/19 14:46:47 bsiegert Exp $
 
 BLAKE2s (rust-1.69.0-aarch64-apple-darwin.tar.gz) = 2c73f5c31f123054e7027f699e9a1bf8bdfbf9a3d7f108f66f70c13cf5ee0707
 SHA512 (rust-1.69.0-aarch64-apple-darwin.tar.gz) = 69b285e0097cefc8cf29cbb2621d7a85a019c09fbe1145ed913da4241ce2c468c7156f201d16e0d62629041f6b1fe5fb4ef7ef33944dfa0979834ae8e17e41b0
@@ -170,7 +170,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) = 9511c09ed2bf035d3c1e684492bbb8f46d4e58ef
-SHA1 (patch-vendor_openssl-sys_build_find__normal.rs) = 7f8ebfdc011f1a8ab0db61ca3d2b7ec00d80a3fc
+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
index 7f01872a4f..5d651c130d 100644
--- a/rust/patches/patch-vendor_openssl-sys_build_find__normal.rs
+++ b/rust/patches/patch-vendor_openssl-sys_build_find__normal.rs
@@ -1,7 +1,5 @@
 $NetBSD: patch-vendor_openssl-sys_build_find__normal.rs,v 1.1 2023/06/19 14:46:47 bsiegert Exp $
 
-Patch against homebrew hack.
-
 --- 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: