Pullup ticket #6436 - requested by he

lang/rust: build fixes

Revisions pulled up:
- lang/rust/Makefile                                            1.221-1.227
- lang/rust/distinfo                                            1.128
- lang/rust/options.mk                                          1.12-1.14

---
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Tue Mar 30 09:50:14 UTC 2021

   Modified Files:
   	pkgsrc/lang/rust: Makefile options.mk

   Log Message:
   rust: normalize workarounds for cargo dependencies on NetBSD

   Havard would like all rusts to be built with rust-cargo-static,
   because this makes it easier to produce working bootstaps.

   In order to do this, we need to handle the OpenSSL and curl
   dependencies in older bootstrap kits properly.

   This means, for the remaining bootstraps that do not yet have
   cargo with static/vendored dependencies:

   - depend on base 8.0 openssl (compat80) on i386.
   - depend on pkgsrc curl on aarch64 and earmv7.
     the armv7 bootstrap is built for 9.0 so does not need compat80.
     the aarch64 bootstrap is built for 8.99.50 so does not need compat80.

---
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Wed Mar 31 16:45:08 UTC 2021

   Modified Files:
   	pkgsrc/lang/rust: Makefile options.mk

   Log Message:
   rust: Only enable rust-cargo-static when building bootstraps.

   The final compiler will be dynamically linked with OpenSSL and curl,
   but this is undesirable in the case of bootstraps where it might be
   built against a version incompatible with version the user has.

   Discussed with he@.

---
   Module Name:	pkgsrc
   Committed By:	he
   Date:		Sun Apr  4 08:36:05 UTC 2021

   Modified Files:
   	pkgsrc/lang/rust: Makefile

   Log Message:
   Bump the rust binary bootstraps to 1.49 for the remaining NetBSD ports.
   The 1.49 cargo binary has a much reduced set of dynamic dependencies,
   increasing the probability that they'll run on the host.

---
   Module Name:	pkgsrc
   Committed By:	he
   Date:		Sun Apr  4 08:40:44 UTC 2021

   Modified Files:
   	pkgsrc/lang/rust: distinfo

   Log Message:
   Recompute checksums after the bootstrap version bump.

---
   Module Name:	pkgsrc
   Committed By:	he
   Date:		Sun Apr  4 08:51:20 UTC 2021

   Modified Files:
   	pkgsrc/lang/rust: options.mk

   Log Message:
   Change rust-cargo-static condition on NetBSD.
   Key off BUILD_TARGET instead of whether we're cross-building,
   as bootstrap kits *can* be built natively (yes, the former state
   was my suggestion, but on second thought this is more correct).

---
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Sun Apr  4 09:23:38 UTC 2021

   Modified Files:
   	pkgsrc/lang/rust: Makefile

   Log Message:
   rust: Remove old NetBSD bootstrap workarounds

---
   Module Name:	pkgsrc
   Committed By:	he
   Date:		Sun Apr  4 10:21:45 UTC 2021

   Modified Files:
   	pkgsrc/lang/rust: Makefile

   Log Message:
   We need curl and openssl buildlinked if BUILD_TARGET is "build".
   This is because in that case we're not using the rust-internal
   copies of those libraries, governed by the rust-cargo-static option.

---
   Module Name:	pkgsrc
   Committed By:	he
   Date:		Sun Apr  4 10:21:45 UTC 2021

   Modified Files:
   	pkgsrc/lang/rust: Makefile

   Log Message:
   We need curl and openssl buildlinked if BUILD_TARGET is "build".
   This is because in that case we're not using the rust-internal
   copies of those libraries, governed by the rust-cargo-static option.

---
   Module Name:	pkgsrc
   Committed By:	he
   Date:		Sun Apr  4 13:30:16 UTC 2021

   Modified Files:
   	pkgsrc/lang/rust: Makefile

   Log Message:
   Undo previous, curl and openssl are already conditionally buildlinked
   in options.mk, nia@ pointed out.

---
   Module Name:	pkgsrc
   Committed By:	he
   Date:		Sun Apr  4 17:49:42 UTC 2021

   Modified Files:
   	pkgsrc/lang/rust: Makefile

   Log Message:
   Hopefully today's last mistake: undo my MAKE_JOBS_SAFE mistake.

3 files changed, 53 insertions, 91 deletions

diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 2f877f36142..7275a57531e 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.220 2021/03/29 08:45:34 he Exp $
+# $NetBSD: Makefile,v 1.220.2.1 2021/04/10 08:36:05 bsiegert Exp $
 
 DISTNAME=	rustc-1.49.0-src
 PKGNAME=	${DISTNAME:S/rustc/rust/:S/-src//}
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	https://static.rust-lang.org/dist/
 
@@ -215,7 +216,7 @@ DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.48.0
+RUST_STAGE0_VER=	1.49.0
 RUST_ARCH=		i686-unknown-netbsd
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -240,7 +241,7 @@ DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.48.0
+RUST_STAGE0_VER=	1.49.0
 RUST_ARCH=		powerpc-unknown-netbsd
 
 # Cross-built against NetBSD 9.0
@@ -264,7 +265,7 @@ SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.48.0
+RUST_STAGE0_VER=	1.49.0
 RUST_ARCH=		aarch64-unknown-netbsd
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -285,7 +286,7 @@ pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || make(distinfo) || make (makesum) || make(mdi)
 RUST_ARCH=		armv7-unknown-netbsd-eabihf
-RUST_STAGE0_VER=	1.48.0
+RUST_STAGE0_VER=	1.49.0
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -530,44 +531,9 @@ stage0-bootstrap: install
 #.include "../../www/http-parser/buildlink3.mk"
 #.include "../../devel/jemalloc/buildlink3.mk"
 
-## Issues specific to: bootstrap AND NetBSD follow
-
-# (I wish this worked on powerpc, but it doesn't since
-# I can't build with the internal LLVM, ref.
-# https://github.com/rust-lang/rust/issues/65862)
-
-.if (${OPSYS} == "NetBSD") && \
-		((${MACHINE_ARCH} == "i386") || \
-		 (${MACHINE_ARCH} == "sparc64") || \
-		 (${MACHINE_ARCH} == "powerpc")) \
-	&& (empty(OS_VERSION:M[012345678].*) || \
-	    !empty(OS_VERSION:M8.99.*))
-# Bootstrap kits are built on 8.0, so that a single bootstrap can run
-# on multiple systems.  Thus later versions need the compat80 package.
-# \todo Explain why this is limited to a small list of architectures,
-# and in particular why not x86_64.
-DEPENDS+=	compat80>=0:../../emulators/compat80
-.endif
-
-.if (${OPSYS} == "NetBSD") && \
-		((${MACHINE_ARCH} == "i386")) \
-	&& (empty(OS_VERSION:M[012345678].*) || \
-	    !empty(OS_VERSION:M8.99.*))
-# Bootstrap kits use openssl, which on NetBSD 8 comes from pkgsrc.
-# Therefore the pkgsrc openssl libs need to be present as well.
-# The 1.44.1 i686 bootstrap links with pkgsrc openssl.  The others do
-# not.  When the package is built,
-# cargo links against pkgsrc openssl, so it must be a run-time
-# dependency as well.  Forcing USE_BUILTIN.openssl=no results in a
-# mysterious heimdal error, but straight DEPENDS seems to result in a
-# satisfactory package build.
-# While this is icky, it is for the time being better than no rust package.
-DEPENDS+=	openssl>=1.1:../../security/openssl
-.endif
-
 # This is for when we build natively:
-.if ((${OPSYS} == "NetBSD") && \
-    ((${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "i386")))
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || \
+    !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
 # LLVM needs libatomic for 64-bit atomics on powerpc and i386
 .include "../../devel/libatomic/buildlink3.mk"
 # Make those libraries available via a unique directory:
diff --git a/lang/rust/distinfo b/lang/rust/distinfo
index cfff53dc736..11c58ca4c42 100644
--- a/lang/rust/distinfo
+++ b/lang/rust/distinfo
@@ -1,13 +1,5 @@
-$NetBSD: distinfo,v 1.127 2021/03/29 08:45:34 he Exp $
+$NetBSD: distinfo,v 1.127.2.1 2021/04/10 08:36:05 bsiegert Exp $
 
-SHA1 (rust-1.48.0-aarch64-unknown-netbsd.tar.gz) = 046aa86beba3aebd546f12e5234bf71ada68435e
-RMD160 (rust-1.48.0-aarch64-unknown-netbsd.tar.gz) = c83031fb1471a1eacc19667f8f6bd0f65031b66c
-SHA512 (rust-1.48.0-aarch64-unknown-netbsd.tar.gz) = ccd5ccf317580862b1af57f8ee1ed0632d8ca66109c4a80451239e45bbdb9176894a362bcc01e714a1d6e36030953e00d092ef33deb3e0f756b632cb70bf923a
-Size (rust-1.48.0-aarch64-unknown-netbsd.tar.gz) = 199757993 bytes
-SHA1 (rust-1.48.0-armv7-unknown-netbsd-eabihf.tar.gz) = b6ec3171cb18b4b1dea616f025656c039121b28f
-RMD160 (rust-1.48.0-armv7-unknown-netbsd-eabihf.tar.gz) = b438307f57962c3b4c2e9cb023066c4cc5f7edd2
-SHA512 (rust-1.48.0-armv7-unknown-netbsd-eabihf.tar.gz) = 0765047c3780be51a9c81426380b16624a301789c5260bb47884eee5847903907c58b8e6227729b50ce3c20797160158f797ee0f1c1c55cb3cff3a6a149c5a28
-Size (rust-1.48.0-armv7-unknown-netbsd-eabihf.tar.gz) = 194224743 bytes
 SHA1 (rust-1.48.0-i686-unknown-freebsd.tar.gz) = a5c6f5d2c820a936c8a38c24b25df4b4fa23423c
 RMD160 (rust-1.48.0-i686-unknown-freebsd.tar.gz) = 98dc484371f80b02a3f9fb60a3cd9467c4465df0
 SHA512 (rust-1.48.0-i686-unknown-freebsd.tar.gz) = 17affc369bb539656515fe8c55a9803dc50e06158f744111515382fbf7e7570502d909203e77cde8e986c8ea6011fd505af999884fb62423b630a48f48e0e137
@@ -16,18 +8,6 @@ SHA1 (rust-1.48.0-i686-unknown-linux-gnu.tar.gz) = cb4e5168c67dec2b76f02b1e8353b
 RMD160 (rust-1.48.0-i686-unknown-linux-gnu.tar.gz) = b326b227dc3a8713567a54d75648fbc65345e32e
 SHA512 (rust-1.48.0-i686-unknown-linux-gnu.tar.gz) = af4335e5e50c93711bb304bb65b777dee9affccd27eda1a774ab3bfab8ddb9027bcc9942d8fcedc975eaa0d38b3e46aff67632d1d5eab568825c5aa0c0340ec8
 Size (rust-1.48.0-i686-unknown-linux-gnu.tar.gz) = 267825837 bytes
-SHA1 (rust-1.48.0-i686-unknown-netbsd.tar.gz) = ffcda2e4d67f8e7c5b65996e05e2922de7a9654f
-RMD160 (rust-1.48.0-i686-unknown-netbsd.tar.gz) = 41ceb909bf08f45e5ea83108a0a2b5e44cab19a4
-SHA512 (rust-1.48.0-i686-unknown-netbsd.tar.gz) = 182ec18aa10ca0a15f170846d81c5bc5dcea88c5a506c2545ce62c53996a80ac0c2ce1dc93b7a24c632621024c5ffccd04ad5067168e74493b3eacebd757bf91
-Size (rust-1.48.0-i686-unknown-netbsd.tar.gz) = 213138805 bytes
-SHA1 (rust-1.48.0-powerpc-unknown-netbsd.tar.gz) = 7af71c687c05a3d3fd07d1788e30b07bbdbc4944
-RMD160 (rust-1.48.0-powerpc-unknown-netbsd.tar.gz) = a0a5cefa00a825525aba74597bd5fe480bce0ba1
-SHA512 (rust-1.48.0-powerpc-unknown-netbsd.tar.gz) = 2a2b5b6a655b06742e967ca62143e28c14f99bdea8beaf347004a51bacaf18b633d823a79f96a5babf98e54694bd576e993efd75646e2705e6e0dd86b775da0d
-Size (rust-1.48.0-powerpc-unknown-netbsd.tar.gz) = 224404607 bytes
-SHA1 (rust-1.48.0-powerpc-unknown-netbsd90.tar.gz) = 0d74b8e32a932ac3dbe5a5084626a67d491e6dba
-RMD160 (rust-1.48.0-powerpc-unknown-netbsd90.tar.gz) = 0b917d0cde0e7cbf25b254b0abda0dcf89a8f129
-SHA512 (rust-1.48.0-powerpc-unknown-netbsd90.tar.gz) = 8dbba4c8314ea528cd4e5155a962a424594259d8508ec054ec49b513c5e249cc136b6da0acb9b209b882f17cb86d0da139155a11d3691c3a608c488cdc353f95
-Size (rust-1.48.0-powerpc-unknown-netbsd90.tar.gz) = 224192715 bytes
 SHA1 (rust-1.48.0-x86_64-apple-darwin.tar.gz) = 3197701068ee2d2b40d8c2600f0b71db8a99877e
 RMD160 (rust-1.48.0-x86_64-apple-darwin.tar.gz) = b88c6c0635fe7154e77baa70e2b88ecb9b7c0845
 SHA512 (rust-1.48.0-x86_64-apple-darwin.tar.gz) = a28bf31fc6a184e02bf5ef424d102353478facc8b0150461930214f227a2695d92f148697d3051bd1a607c3b48a27191edde530a50bd13635a33446d59a1f1a8
@@ -48,18 +28,30 @@ SHA1 (rust-1.48.0-x86_64-unknown-netbsd.tar.gz) = a08036afb80f017b195138eab7b367
 RMD160 (rust-1.48.0-x86_64-unknown-netbsd.tar.gz) = 9e61fa3043f0360cd1a027cff5b5ac6bb76afad9
 SHA512 (rust-1.48.0-x86_64-unknown-netbsd.tar.gz) = 411a878d2fe5dc5317ea128382c7879743aeba56ce04017fe20629a1cb681606fe828bafff28339b188998aaf6d46734d856dd84e57e7cd03293486edd21ce6d
 Size (rust-1.48.0-x86_64-unknown-netbsd.tar.gz) = 173093248 bytes
+SHA1 (rust-1.49.0-aarch64-unknown-netbsd.tar.gz) = 97804c99b787a54bf16c0c13665eb74cab6c7bba
+RMD160 (rust-1.49.0-aarch64-unknown-netbsd.tar.gz) = 5940c473d0655dc50efc10d2a7dc4bb7c0b85590
+SHA512 (rust-1.49.0-aarch64-unknown-netbsd.tar.gz) = f8d430fcc2d3b83e37d01c49932395eb3e3882e7e593238fdbab363f98418bd50b478054197760c1fd549cd7df87b34325678f26bee6e9b7ff21d159551af7af
+Size (rust-1.49.0-aarch64-unknown-netbsd.tar.gz) = 259213852 bytes
+SHA1 (rust-1.49.0-armv7-unknown-netbsd-eabihf.tar.gz) = c6ff63c7e8f4c1c23eaf6e70ff5dd9cc598a4bc7
+RMD160 (rust-1.49.0-armv7-unknown-netbsd-eabihf.tar.gz) = 2177ba63fd60de56fe804b86fc48f7e853fe390c
+SHA512 (rust-1.49.0-armv7-unknown-netbsd-eabihf.tar.gz) = 956209fbbc7555a83a2ab4bdc191f5d12f3dbe3b978794be819269e98af054231f57ec2c754944a42d957057c52566f6a40e1aae119b1badb8a3d2237f461a43
+Size (rust-1.49.0-armv7-unknown-netbsd-eabihf.tar.gz) = 241080722 bytes
+SHA1 (rust-1.49.0-i686-unknown-netbsd.tar.gz) = 4f8a5261751fd43495b0e0ef19d8cef448a9004e
+RMD160 (rust-1.49.0-i686-unknown-netbsd.tar.gz) = 9515ae688b8ca3ae878470f5cec23370473ab51e
+SHA512 (rust-1.49.0-i686-unknown-netbsd.tar.gz) = 334570b5a9a88490f3151db36a5821709602f527cab0a0839ccf5c2b5a1bcdd096d65a4d165d88d350589fc7d61330bd613c114d8896685bb727780d6ea7b0b9
+Size (rust-1.49.0-i686-unknown-netbsd.tar.gz) = 274232619 bytes
+SHA1 (rust-1.49.0-powerpc-unknown-netbsd.tar.gz) = 169de8bf536b080722a9f0aad54c895070f8d96b
+RMD160 (rust-1.49.0-powerpc-unknown-netbsd.tar.gz) = 21c1aea54155266c63856f17458a7502a88792dc
+SHA512 (rust-1.49.0-powerpc-unknown-netbsd.tar.gz) = e87b125c01d52b87216db84d5fdb1b795f68a6870663a3cc8f6af2f788103e785da761def347f0b0084cca3c39ddb7feb4999a6cff27b23031433e1b65d1ad8c
+Size (rust-1.49.0-powerpc-unknown-netbsd.tar.gz) = 288330635 bytes
+SHA1 (rust-1.49.0-powerpc-unknown-netbsd90.tar.gz) = 164af24fc8f8e261deb6e7ff393752a9786c5bc4
+RMD160 (rust-1.49.0-powerpc-unknown-netbsd90.tar.gz) = 80db1a2ca0c9de6f718891e42607fcf831bb6107
+SHA512 (rust-1.49.0-powerpc-unknown-netbsd90.tar.gz) = 4499ab421d7a790bb5af115d5777e419c4ff635a5e919fe6969407ae5bd64e5ec6a91631bf1f457e0c947ce79ee2db39f4e8fe3760bb275743bca89055b98e7c
+Size (rust-1.49.0-powerpc-unknown-netbsd90.tar.gz) = 293526410 bytes
 SHA1 (rust-1.49.0-sparc64-unknown-netbsd.tar.gz) = 1ff0966777105cd733e67dc227d960a19d4777d8
 RMD160 (rust-1.49.0-sparc64-unknown-netbsd.tar.gz) = 70fd99278ff73ce4a30a5c43890ac2406b18f294
 SHA512 (rust-1.49.0-sparc64-unknown-netbsd.tar.gz) = b28eabfbbcd7e7e895a102f66a7d87fd0daf88049c7f1ef69247d0288b11482d22d6c9ac09ac89b113ce372550e066fb9350db349a0cf31363848bd5289ac3b9
 Size (rust-1.49.0-sparc64-unknown-netbsd.tar.gz) = 275214266 bytes
-SHA1 (rust-std-1.48.0-aarch64-unknown-netbsd.tar.gz) = daf690730437595e1153bf4bdc214c0c1885ef8c
-RMD160 (rust-std-1.48.0-aarch64-unknown-netbsd.tar.gz) = 23f545e2569c0bc53cc187aec0031cc523f5d8fb
-SHA512 (rust-std-1.48.0-aarch64-unknown-netbsd.tar.gz) = 708ebb35aa06f88bb46f18a72efcde0333426d40273b8301b2af99e3dab5261623e09232c2ef17b1232aa6749bdd510b27443d01c403b6d076bc905f34922646
-Size (rust-std-1.48.0-aarch64-unknown-netbsd.tar.gz) = 24409036 bytes
-SHA1 (rust-std-1.48.0-armv7-unknown-netbsd-eabihf.tar.gz) = 903a617c8039a0bf1a8eab5bcedabde85774f5ff
-RMD160 (rust-std-1.48.0-armv7-unknown-netbsd-eabihf.tar.gz) = c6abd38bd523b924cffa184b154310c99408b4f8
-SHA512 (rust-std-1.48.0-armv7-unknown-netbsd-eabihf.tar.gz) = d7234bc07a7339f1a616e23c64c5cb8ed351cfd26bd2b950dce1d4133bb07d2e41a9ac0c7f0f93187b0c84f9b91f1728ac523dfac080563d9bfc426b9e711e19
-Size (rust-std-1.48.0-armv7-unknown-netbsd-eabihf.tar.gz) = 24295775 bytes
 SHA1 (rust-std-1.48.0-i686-unknown-freebsd.tar.gz) = 6d33cf01cc1f5e69a42fa34f2d81ac4bc5577206
 RMD160 (rust-std-1.48.0-i686-unknown-freebsd.tar.gz) = 14dcd57168d55d9f5c77b4268ee79d5256be06ec
 SHA512 (rust-std-1.48.0-i686-unknown-freebsd.tar.gz) = 0a494e086b43f22f23d6347fae334b0c4214ff8dbba7e2f9bccb36ed97d73395b97a749303f898300e66e6e252f7cab6be47d5f45c79ee2bfcea118a5ab4d3a7
@@ -68,18 +60,6 @@ SHA1 (rust-std-1.48.0-i686-unknown-linux-gnu.tar.gz) = 61177ee70ea27ac4ee7f4b6a8
 RMD160 (rust-std-1.48.0-i686-unknown-linux-gnu.tar.gz) = ebe3f73b95b7aa2875181ec621416c9395c3222d
 SHA512 (rust-std-1.48.0-i686-unknown-linux-gnu.tar.gz) = 9c886eccc52452045a542f2d44020ea35a4caa9c1605002b12b6a30d801f3e72ba6f6eb5f34309eff600b4ad7251e1a386df11414d2d2f4265ef6da2fa1afe3e
 Size (rust-std-1.48.0-i686-unknown-linux-gnu.tar.gz) = 34286860 bytes
-SHA1 (rust-std-1.48.0-i686-unknown-netbsd.tar.gz) = e20bf3cd898985f25c77497f9288467f6e19a9a7
-RMD160 (rust-std-1.48.0-i686-unknown-netbsd.tar.gz) = e3632e9f3b498cb2c5add1ae16c19f718c5d5269
-SHA512 (rust-std-1.48.0-i686-unknown-netbsd.tar.gz) = 7e8b9cbd7c676f378cdae14cc9a013a8835c713aaae76cb2229003364ab41579ea86da0df07b8567e681057fade600294e86a5f86cc42be0bf1dcd705aaa7606
-Size (rust-std-1.48.0-i686-unknown-netbsd.tar.gz) = 30312154 bytes
-SHA1 (rust-std-1.48.0-powerpc-unknown-netbsd.tar.gz) = cbe9973b6938ee62ba9e756b0d2e6ce1ac67cd3d
-RMD160 (rust-std-1.48.0-powerpc-unknown-netbsd.tar.gz) = bf3ad2939009ff9562bafd14ba77e7412a4dd7d9
-SHA512 (rust-std-1.48.0-powerpc-unknown-netbsd.tar.gz) = 8e08cf7657ff9184f81c954614ddc7f7e56afba5a6b690106a534e0f219f991217e2806e28e512dfa03e03fa0a6ac28437c50e1c5d09edea7b5fb2c145ce7133
-Size (rust-std-1.48.0-powerpc-unknown-netbsd.tar.gz) = 23928272 bytes
-SHA1 (rust-std-1.48.0-powerpc-unknown-netbsd90.tar.gz) = c56b571dfdb8e0f682afab71f15dcf4f73156cd3
-RMD160 (rust-std-1.48.0-powerpc-unknown-netbsd90.tar.gz) = fdb2161e5c900b95a0f30e1fec8f80c1d1cbc603
-SHA512 (rust-std-1.48.0-powerpc-unknown-netbsd90.tar.gz) = 58c72965f8a8a155940ca859f31ad02ae98be024998455b61bea3ab506ac0c7cb3693c2b993c77119ccbc5eede474fe431ab115e04746355468e56130c875f99
-Size (rust-std-1.48.0-powerpc-unknown-netbsd90.tar.gz) = 23923923 bytes
 SHA1 (rust-std-1.48.0-x86_64-apple-darwin.tar.gz) = f2e0bd1171fcebb01613b2a648ab5101b475dfd5
 RMD160 (rust-std-1.48.0-x86_64-apple-darwin.tar.gz) = 496b22e26c721f198a8ab038a8d8252edb55c7d8
 SHA512 (rust-std-1.48.0-x86_64-apple-darwin.tar.gz) = 8d32a321de4ca19f73d83cfa36d2fdb0e208746df3ef8514ade3e23c39531703423d539309d803a7c3727b22154f7910e280ad5c011a79a1beb670dbdeb5229b
@@ -96,6 +76,26 @@ SHA1 (rust-std-1.48.0-x86_64-unknown-netbsd.tar.gz) = 2065187a843f778d98fac140e4
 RMD160 (rust-std-1.48.0-x86_64-unknown-netbsd.tar.gz) = ae3dcc4250eddd03b7ed6de582a08745f8cd70c2
 SHA512 (rust-std-1.48.0-x86_64-unknown-netbsd.tar.gz) = 9734a501899a1fcde94b0f51b789584c9c870e4232a963a89be82b9fd07fb444c58bd11b854a0f673f699068b27204621825f2e38b2d74f243b937a1c87b5a53
 Size (rust-std-1.48.0-x86_64-unknown-netbsd.tar.gz) = 33698113 bytes
+SHA1 (rust-std-1.49.0-aarch64-unknown-netbsd.tar.gz) = bec960b56661b1f039233ef75e33f304b6ed176d
+RMD160 (rust-std-1.49.0-aarch64-unknown-netbsd.tar.gz) = f3e70c1b7fa0c75ea668860c3f7c546ad7a97fee
+SHA512 (rust-std-1.49.0-aarch64-unknown-netbsd.tar.gz) = 6a1f31fc63cf6d0b10b461e2dc003b75f87763c586f1fa81e1bc102c2f50fc856f2cd42529bd4d3d0d668a16747cf0568ccf6e1b70c1e01c61a1617caaf03f0c
+Size (rust-std-1.49.0-aarch64-unknown-netbsd.tar.gz) = 24786839 bytes
+SHA1 (rust-std-1.49.0-armv7-unknown-netbsd-eabihf.tar.gz) = b3f82f4c2d2af9be54eb10e313f053d7443107d2
+RMD160 (rust-std-1.49.0-armv7-unknown-netbsd-eabihf.tar.gz) = 58468d07240e082820d844bb2bd512f5e293a7e3
+SHA512 (rust-std-1.49.0-armv7-unknown-netbsd-eabihf.tar.gz) = 7057a8a850e0ed8a70acaee032b3ca69c9dd3f708da5e2124d160e8942e59a63faa6a6782cc2565b9edb7056e37ae06509c281c07aa48a8921663db04ad55d84
+Size (rust-std-1.49.0-armv7-unknown-netbsd-eabihf.tar.gz) = 24763715 bytes
+SHA1 (rust-std-1.49.0-i686-unknown-netbsd.tar.gz) = 82b880a53d18895d413666292705b89910457ec2
+RMD160 (rust-std-1.49.0-i686-unknown-netbsd.tar.gz) = e3d64206873fa9b5d8ca5bef8cc5a07739bf03fc
+SHA512 (rust-std-1.49.0-i686-unknown-netbsd.tar.gz) = 07a47749534cc266092933c334c1876592403bfb7ae929b3035f0eae3d92cf9b3b9bba09980770fdd7f58e92ff083c4ed5e49b886c24245d43ee97f31b2f165a
+Size (rust-std-1.49.0-i686-unknown-netbsd.tar.gz) = 30854538 bytes
+SHA1 (rust-std-1.49.0-powerpc-unknown-netbsd.tar.gz) = ada449dbe578ff7473d91e882f53c2cff0392be3
+RMD160 (rust-std-1.49.0-powerpc-unknown-netbsd.tar.gz) = 79df3bb4cac9bd821ebd54f3d4ca63ff78b7ec0f
+SHA512 (rust-std-1.49.0-powerpc-unknown-netbsd.tar.gz) = 35021e195d7d7c4ab505889b425ba87d53fe839c10c954a21474e6def8f82bdc2d48e4429e3ffb15982780e5382a88756c5efd1ea6cca351be540e625e23d473
+Size (rust-std-1.49.0-powerpc-unknown-netbsd.tar.gz) = 24361787 bytes
+SHA1 (rust-std-1.49.0-powerpc-unknown-netbsd90.tar.gz) = 00f7aeee7efdc6a48529d4a77393858d744cd0b4
+RMD160 (rust-std-1.49.0-powerpc-unknown-netbsd90.tar.gz) = c72c212d69256136ddc49cfa94281a4af90618da
+SHA512 (rust-std-1.49.0-powerpc-unknown-netbsd90.tar.gz) = 93cc2de39630ccfe0ec8ec99248116f692b79ec428e4980e14e33bb66515826099c0fa21b78495efd68a48c81d407cdcb008e154baa3697aa4bbd415b6dc722d
+Size (rust-std-1.49.0-powerpc-unknown-netbsd90.tar.gz) = 24355869 bytes
 SHA1 (rust-std-1.49.0-sparc64-unknown-netbsd.tar.gz) = 04b12a7778944d03446df235a3dd28533d056f81
 RMD160 (rust-std-1.49.0-sparc64-unknown-netbsd.tar.gz) = 4a7f19c5539b012b6e0b10e2cf2d57ffc7a1243b
 SHA512 (rust-std-1.49.0-sparc64-unknown-netbsd.tar.gz) = 7828a1205373d938a1417c23f5ade5f82980db247dae40b0e9a6506319f4f3bdc413b25c6ffc6b82c3eb191030b3d3ee54d30c0caec8d7e4f75b7c5cc4cd439f
diff --git a/lang/rust/options.mk b/lang/rust/options.mk
index b14a8a110a3..84c222fc30b 100644
--- a/lang/rust/options.mk
+++ b/lang/rust/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2021/02/25 08:54:05 wiz Exp $
+# $NetBSD: options.mk,v 1.11.2.1 2021/04/10 08:36:05 bsiegert Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.rust
 PKG_SUPPORTED_OPTIONS+=	rust-cargo-static
@@ -14,13 +14,9 @@ PKG_SUGGESTED_OPTIONS+=		rust-llvm
 .  endif
 .endif
 
-# As of 2021-02-25 cargo is only a static binary in x86_64 and
-# powerpc bootstraps
-.if ${OPSYS} == "NetBSD" && \
-    ${MACHINE_ARCH} != "i386" && \
-    ${MACHINE_ARCH} != "aarch64" && \
-    ${MACHINE_ARCH} != "earmv7hf" && \
-    ${MACHINE_ARCH} != "sparc64"
+# Bundle OpenSSL and curl into the cargo binary when producing
+# bootstraps on NetBSD.
+.if ${OPSYS} == "NetBSD" && ${BUILD_TARGET} == "dist"
 PKG_SUGGESTED_OPTIONS+=	rust-cargo-static
 .endif