lang/rust: Update to 1.50.0

  - Use bundled libgit/libssh, the versions in ports are too old
  - Update lang/rust-nightly to 2021-02-12
  - Update devel/racer to 2.1.41
  - Import upstream patch to fix build issue for Firefox and related ports (https://bugzilla.mozilla.org/show_bug.cgi?id=1684261)

Changes: https://github.com/rust-lang/rust/releases/tag/1.50.0

Tested by:	mikael, pkubaj
Differential Revision:	https://reviews.freebsd.org/D28616

7 files changed, 158 insertions, 103 deletions

diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile
index 9e421c8d3d84..ac90b6eb17f2 100644
--- a/lang/rust-nightly/Makefile
+++ b/lang/rust-nightly/Makefile
@@ -1,13 +1,13 @@
 # Created by: Jean-Sébastien Pédron <dumbbell@FreeBSD.org>
 # $FreeBSD$
 
-PORTVERSION=	1.49.0.${NIGHTLY_DATE:C,-,,g}
+PORTVERSION=	1.50.0.${NIGHTLY_DATE:C,-,,g}
 # Always set PORTREVISION explicitly as otherwise it is inherited from lang/rust
 PORTREVISION=	0
 PKGNAMESUFFIX=	-nightly
 DISTNAME=	rustc-nightly-src
 
-ONLY_FOR_ARCHS=	amd64 i386
+ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	upstream does not provide bootstraps for other architectures
 
 CONFLICTS_INSTALL=	rust
@@ -18,10 +18,10 @@ DISTINFO_FILE=	${.CURDIR}/distinfo
 
 # Get latest from top level 'date' key in
 # https://static.rust-lang.org/dist/channel-rust-nightly.toml
-NIGHTLY_DATE=	2020-11-21
+NIGHTLY_DATE=	2021-02-12
 
 # See WRKSRC/src/stage0.txt for this date
-BOOTSTRAPS_DATE=		2020-10-16
+BOOTSTRAPS_DATE=		2020-12-30
 RUST_BOOTSTRAP_VERSION=		beta
 CARGO_BOOTSTRAP_VERSION=	beta
 
diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo
index 01e95bd11440..e3e1e89dece3 100644
--- a/lang/rust-nightly/distinfo
+++ b/lang/rust-nightly/distinfo
@@ -1,15 +1,9 @@
-TIMESTAMP = 1605964504
-SHA256 (rust/2020-11-21/rustc-nightly-src.tar.xz) = 97430e42133336dbcbacb361342ff6375302ff0d277b3e60f7f03c9204702546
-SIZE (rust/2020-11-21/rustc-nightly-src.tar.xz) = 108377700
-SHA256 (rust/2020-10-16/rustc-beta-x86_64-unknown-freebsd.tar.xz) = c258c675a6d09bc0b8407ccede21fa792e1913740340f801abd51e27328c4c44
-SIZE (rust/2020-10-16/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 48993584
-SHA256 (rust/2020-10-16/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 37dc4d9d7ab59dd18c37681804b1512b7799614ba5a3d8e573a397bceb17b9cd
-SIZE (rust/2020-10-16/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 22344056
-SHA256 (rust/2020-10-16/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 4fbe6cea11143293d9f5dfab56b5fea0149cfe066a8250b1a51d616eb6aa6ff7
-SIZE (rust/2020-10-16/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 5481392
-SHA256 (rust/2020-10-16/rustc-beta-i686-unknown-freebsd.tar.xz) = 3e771f48d32bdff2e8eb39c94dea9bc8ad8da8fbc3217cc847a7cd9d90536529
-SIZE (rust/2020-10-16/rustc-beta-i686-unknown-freebsd.tar.xz) = 50175840
-SHA256 (rust/2020-10-16/rust-std-beta-i686-unknown-freebsd.tar.xz) = da379d71172ecdb0607e14f2b014d8f32c839056ba9084f548004a9231a4997b
-SIZE (rust/2020-10-16/rust-std-beta-i686-unknown-freebsd.tar.xz) = 21481324
-SHA256 (rust/2020-10-16/cargo-beta-i686-unknown-freebsd.tar.xz) = ddf1b84df56c4f33e8b1ffa209f1f79dc94b5673d60a5dca30d55d1c0a74a1ba
-SIZE (rust/2020-10-16/cargo-beta-i686-unknown-freebsd.tar.xz) = 5445848
+TIMESTAMP = 1613114410
+SHA256 (rust/2021-02-12/rustc-nightly-src.tar.xz) = 6f3f451d02460a108014e1f639f10f78c98a00864a4afbe8ba05b90f6f716a54
+SIZE (rust/2021-02-12/rustc-nightly-src.tar.xz) = 109753924
+SHA256 (rust/2020-12-30/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 1350d6ca6dfea5b87dec31fa980b26397f81c135c04b488766efc511845f74bd
+SIZE (rust/2020-12-30/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 79072020
+SHA256 (rust/2020-12-30/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 6bb842028d940676e68756c3391736e7b71da239fcdadc01f34042ad6a69463a
+SIZE (rust/2020-12-30/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 25098800
+SHA256 (rust/2020-12-30/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 2e087d04a75bc55ccaa9fa6d2ff97aa79873c4bd2a718ef11ff14ebbc128749e
+SIZE (rust/2020-12-30/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 6265016
diff --git a/lang/rust-nightly/files/patch-src_bootstrap_install.rs b/lang/rust-nightly/files/patch-src_bootstrap_install.rs
deleted file mode 100644
index ac89792be1f9..000000000000
--- a/lang/rust-nightly/files/patch-src_bootstrap_install.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-https://github.com/rust-lang/rust/issues/74545
-
---- src/bootstrap/install.rs.orig	2020-07-20 14:00:24 UTC
-+++ src/bootstrap/install.rs
-@@ -112,9 +112,14 @@ fn install_sh(
-         pkgname(builder, name)
-     };
- 
-+    let install_script = tmpdir(builder).join(&package_name).join("install.sh");
-+    if !install_script.exists() {
-+        return;
-+    }
-+
-     let mut cmd = Command::new("sh");
-     cmd.current_dir(&empty_dir)
--        .arg(sanitize_sh(&tmpdir(builder).join(&package_name).join("install.sh")))
-+        .arg(sanitize_sh(&install_script))
-         .arg(format!("--prefix={}", sanitize_sh(&prefix)))
-         .arg(format!("--sysconfdir={}", sanitize_sh(&sysconfdir)))
-         .arg(format!("--datadir={}", sanitize_sh(&datadir)))
diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 9a98edad067a..bf7e8c864c69 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rust
-PORTVERSION?=	1.49.0
+PORTVERSION?=	1.50.0
 PORTREVISION?=	0
 CATEGORIES=	lang
 MASTER_SITES=	https://static.rust-lang.org/dist/:src \
@@ -31,17 +31,12 @@ ONLY_FOR_ARCHS?=	aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON?=	requires prebuilt bootstrap compiler
 
 BUILD_DEPENDS=	cmake:devel/cmake \
-		libgit2>=1.0.0:devel/libgit2 \
 		ninja:devel/ninja
-LIB_DEPENDS=	libcurl.so:ftp/curl \
-		libgit2.so:devel/libgit2 \
-		libssh2.so:security/libssh2
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		pkgconfig python:3.6+,build ssl tar:xz
 
 MAKE_ENV=	DESTDIR=${STAGEDIR} \
-		LIBGIT2_SYS_USE_PKG_CONFIG=1 \
-		LIBSSH2_SYS_USE_PKG_CONFIG=1 \
 		OPENSSL_DIR="${OPENSSLBASE}" \
 		RUST_BACKTRACE=1
 TEST_ENV=	${MAKE_ENV} \
@@ -69,8 +64,8 @@ WASM_VARS=		_RUST_BUILD_WASM=true \
 WASM_VARS_OFF=		_RUST_BUILD_WASM=false
 
 # See WRKSRC/src/stage0.txt for the date and version values.
-BOOTSTRAPS_DATE?=		2020-11-19
-RUST_BOOTSTRAP_VERSION?=	1.48.0
+BOOTSTRAPS_DATE?=		2020-12-31
+RUST_BOOTSTRAP_VERSION?=	1.49.0
 
 BOOTSTRAPS_SUFFIX?=		${BOOTSTRAPS_SUFFIX_${ARCH}}
 BOOTSTRAPS_SUFFIX_powerpc64?=	-${PPC_ABI:tl}
@@ -101,8 +96,9 @@ BUILD_DEPENDS+=	gcc9:lang/gcc9
 USE_GCC=	yes
 .endif
 
-.if ${ARCH} == aarch64 && ${OSVERSION} < 1200502
-IGNORE=	fails to run due to a bug in rtld, update to 12-STABLE r342847 or 13-CURRENT r342113
+# remove when 11.4 is EOL
+.if ${ARCH} == aarch64 && ${OSVERSION} < 1202000
+IGNORE=	fails to run due to a bug in rtld, update to 12.2-RELEASE or newer
 .endif
 
 .ifdef QEMU_EMULATING
@@ -124,8 +120,7 @@ do-configure:
 		${SH} ${SCRIPTSDIR}/rust-compat11-canary.sh
 .for _component in cargo rust-std rustc
 	@cd ${WRKDIR}/${_component}-*-${OPSYS:tl} && \
-		${SH} install.sh --prefix=${WRKDIR}/bootstrap \
-		--verbose
+		${SH} install.sh --prefix=${WRKDIR}/bootstrap --verbose
 .endfor
 	@${ECHO_CMD} '[build]' > ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'vendor=true' >> ${WRKSRC}/config.toml
diff --git a/lang/rust/distinfo b/lang/rust/distinfo
index 2669fad00e19..2ce10c195495 100644
--- a/lang/rust/distinfo
+++ b/lang/rust/distinfo
@@ -1,51 +1,51 @@
-TIMESTAMP = 1609603291
-SHA256 (rust/rustc-1.49.0-src.tar.xz) = ebe910edc824a0a037a10be443446a0511923ba8342fa3c331ec8a22481d5d15
-SIZE (rust/rustc-1.49.0-src.tar.xz) = 108330280
-SHA256 (rust/2020-11-19/rustc-1.48.0-aarch64-unknown-freebsd.tar.xz) = 0f46a12e34343b2b79062a5378ed9b1586d0668662faad9fcab17158d221a488
-SIZE (rust/2020-11-19/rustc-1.48.0-aarch64-unknown-freebsd.tar.xz) = 35695192
-SHA256 (rust/2020-11-19/rust-std-1.48.0-aarch64-unknown-freebsd.tar.xz) = 5c14b9eb10b0733d5206fc2c6d5d20f100c3b6909adc8f83ffa2ce943a50194f
-SIZE (rust/2020-11-19/rust-std-1.48.0-aarch64-unknown-freebsd.tar.xz) = 16890332
-SHA256 (rust/2020-11-19/cargo-1.48.0-aarch64-unknown-freebsd.tar.xz) = d5ca68a96002eb60a0598a0c22a9e7c26631c6b38650f42eb6d565a91e0f5d27
-SIZE (rust/2020-11-19/cargo-1.48.0-aarch64-unknown-freebsd.tar.xz) = 4145184
-SHA256 (rust/2020-11-19/rustc-1.48.0-x86_64-unknown-freebsd.tar.xz) = 60306c65024dd56fc23ad23f3815bd2a405603eb9ca2f0695954127bc0c36308
-SIZE (rust/2020-11-19/rustc-1.48.0-x86_64-unknown-freebsd.tar.xz) = 38980996
-SHA256 (rust/2020-11-19/rust-std-1.48.0-x86_64-unknown-freebsd.tar.xz) = 2240679f9b4b94fa8dd028f215872d4255a67a6d8c119faeb73624e9a161ce60
-SIZE (rust/2020-11-19/rust-std-1.48.0-x86_64-unknown-freebsd.tar.xz) = 19142612
-SHA256 (rust/2020-11-19/cargo-1.48.0-x86_64-unknown-freebsd.tar.xz) = 284fc96854d9f189288a6b2e3039f0606ea64f937bae0ac63d55fd970bcc016a
-SIZE (rust/2020-11-19/cargo-1.48.0-x86_64-unknown-freebsd.tar.xz) = 4822700
-SHA256 (rust/2020-11-19/rustc-1.48.0-armv6-unknown-freebsd.tar.xz) = 632ebc660a62d64ce96862bb1078a2402c69e9b0532efa9d7eed819067c24797
-SIZE (rust/2020-11-19/rustc-1.48.0-armv6-unknown-freebsd.tar.xz) = 37503040
-SHA256 (rust/2020-11-19/rust-std-1.48.0-armv6-unknown-freebsd.tar.xz) = e9545ce421149cfdd33ba0063b61c4e4a763ec76e3abc6abac6746974abe0b24
-SIZE (rust/2020-11-19/rust-std-1.48.0-armv6-unknown-freebsd.tar.xz) = 16662048
-SHA256 (rust/2020-11-19/cargo-1.48.0-armv6-unknown-freebsd.tar.xz) = f04648e7a4261d5bcc5c33c016ec6d6fe6a98c240e9d9556b1f2a28d9af4c39a
-SIZE (rust/2020-11-19/cargo-1.48.0-armv6-unknown-freebsd.tar.xz) = 4249176
-SHA256 (rust/2020-11-19/rustc-1.48.0-armv7-unknown-freebsd.tar.xz) = 2b3ee9ba4d45bbb58f075dd7509d00ec5dd40c69dace6fc89787cc2fcac5d8c4
-SIZE (rust/2020-11-19/rustc-1.48.0-armv7-unknown-freebsd.tar.xz) = 37253044
-SHA256 (rust/2020-11-19/rust-std-1.48.0-armv7-unknown-freebsd.tar.xz) = 55f819747717c538c619dce10d3b7c4b8ec64f836b91d15bea50027427dab693
-SIZE (rust/2020-11-19/rust-std-1.48.0-armv7-unknown-freebsd.tar.xz) = 17000840
-SHA256 (rust/2020-11-19/cargo-1.48.0-armv7-unknown-freebsd.tar.xz) = fca3bc8228ba3f0b87464ec88cd65054dbec7e462d716e4977632d0474b89da0
-SIZE (rust/2020-11-19/cargo-1.48.0-armv7-unknown-freebsd.tar.xz) = 4251736
-SHA256 (rust/2020-11-19/rustc-1.48.0-i686-unknown-freebsd.tar.xz) = 333946b1e923bd47166cefb4cb79b23ad2455ab2d59da0c0ba3e598c18861735
-SIZE (rust/2020-11-19/rustc-1.48.0-i686-unknown-freebsd.tar.xz) = 40390492
-SHA256 (rust/2020-11-19/rust-std-1.48.0-i686-unknown-freebsd.tar.xz) = 3b60d571ae6898a5d945f3636151339443a01e3c95fd0724a93cc4cdf1cf7e7b
-SIZE (rust/2020-11-19/rust-std-1.48.0-i686-unknown-freebsd.tar.xz) = 19066848
-SHA256 (rust/2020-11-19/cargo-1.48.0-i686-unknown-freebsd.tar.xz) = 31ff75bcf7b05f37030732dbf3e69becd9f170d7360b04fe64e2db86337493d6
-SIZE (rust/2020-11-19/cargo-1.48.0-i686-unknown-freebsd.tar.xz) = 4908060
-SHA256 (rust/2020-11-19/rustc-1.48.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 5047ec64a5ddc12d9413e53e4101f19332761bf27842b2c32e44c985d008f0db
-SIZE (rust/2020-11-19/rustc-1.48.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 43681308
-SHA256 (rust/2020-11-19/rust-std-1.48.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = d466b3e3c01dd0455b235956677b6aa4e95a020ee71173961aaf156e0b833877
-SIZE (rust/2020-11-19/rust-std-1.48.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 16659968
-SHA256 (rust/2020-11-19/cargo-1.48.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = a4671cbe5bab5fd75b1373f35d6c91b60760e944bdd9bf3ff3dc8601ea42066e
-SIZE (rust/2020-11-19/cargo-1.48.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 4715748
-SHA256 (rust/2020-11-19/rustc-1.48.0-powerpc64le-unknown-freebsd.tar.xz) = 9c044d7498c12aa4179a0121aa5339a8293abc2c75ec71c1bdcf97ec3f4d93ff
-SIZE (rust/2020-11-19/rustc-1.48.0-powerpc64le-unknown-freebsd.tar.xz) = 38987020
-SHA256 (rust/2020-11-19/rust-std-1.48.0-powerpc64le-unknown-freebsd.tar.xz) = 6dddd82c3842d7da26aeacc6445cbe7ca65e96f0cdb7f1b4d3369030f6f91215
-SIZE (rust/2020-11-19/rust-std-1.48.0-powerpc64le-unknown-freebsd.tar.xz) = 16742116
-SHA256 (rust/2020-11-19/cargo-1.48.0-powerpc64le-unknown-freebsd.tar.xz) = e287c3216d92326b5703287fb58ebea7d9690c2744021872e1097335715ab5fd
-SIZE (rust/2020-11-19/cargo-1.48.0-powerpc64le-unknown-freebsd.tar.xz) = 4656276
-SHA256 (rust/2020-11-19/rustc-1.48.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 0e3bbb22a95d338fa4ee80e9fe65eaa4b1d3a826fa3bc1fa20522aa10d4ef119
-SIZE (rust/2020-11-19/rustc-1.48.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 37129484
-SHA256 (rust/2020-11-19/rust-std-1.48.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 79bd3ccb036153e63df229bc4d65a45e8f5f0daba930214dc1c70cb76e66cd8f
-SIZE (rust/2020-11-19/rust-std-1.48.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 16631184
-SHA256 (rust/2020-11-19/cargo-1.48.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 7f6ab7edf18c87997fb0b6f563ab776a6af22dcbb655acc6d7c81b0a6fe0837c
-SIZE (rust/2020-11-19/cargo-1.48.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 4412520
+TIMESTAMP = 1613066854
+SHA256 (rust/rustc-1.50.0-src.tar.xz) = f54adf9204ed3cb3998cdc1baa5645b346d8cf8f18205e3b15fcae194ba5457c
+SIZE (rust/rustc-1.50.0-src.tar.xz) = 108666272
+SHA256 (rust/2020-12-31/cargo-1.49.0-aarch64-unknown-freebsd.tar.xz) = 1f29206d9bdebc4f7a85bc40e26bed20919a7efc374493ef6dc8fcb76d9dd757
+SIZE (rust/2020-12-31/cargo-1.49.0-aarch64-unknown-freebsd.tar.xz) = 4124680
+SHA256 (rust/2020-12-31/rust-std-1.49.0-aarch64-unknown-freebsd.tar.xz) = b326929f61f90ca47d9e5ca683a1bd0c72da308e15758f3b1358707c39763890
+SIZE (rust/2020-12-31/rust-std-1.49.0-aarch64-unknown-freebsd.tar.xz) = 16758184
+SHA256 (rust/2020-12-31/rustc-1.49.0-aarch64-unknown-freebsd.tar.xz) = aa469cc62df63c4718106a6c47c6a3b9e4d294691a61d03e446ceea1f182557e
+SIZE (rust/2020-12-31/rustc-1.49.0-aarch64-unknown-freebsd.tar.xz) = 36458176
+SHA256 (rust/2020-12-31/rustc-1.49.0-x86_64-unknown-freebsd.tar.xz) = 6e4b19b96663042bfe94634025565d57c944ad6e1c6c40dd7b1c56f72eaa2808
+SIZE (rust/2020-12-31/rustc-1.49.0-x86_64-unknown-freebsd.tar.xz) = 39597956
+SHA256 (rust/2020-12-31/rust-std-1.49.0-x86_64-unknown-freebsd.tar.xz) = 55fabca711092c67bbffb3e3fec886acf6b90094b256c10998e4f77f90281805
+SIZE (rust/2020-12-31/rust-std-1.49.0-x86_64-unknown-freebsd.tar.xz) = 19435648
+SHA256 (rust/2020-12-31/cargo-1.49.0-x86_64-unknown-freebsd.tar.xz) = 8af89e8c81beaa3222c2da65a43d8fda5e887552684601ceb35666184ae54294
+SIZE (rust/2020-12-31/cargo-1.49.0-x86_64-unknown-freebsd.tar.xz) = 4877948
+SHA256 (rust/2020-12-31/rustc-1.49.0-armv6-unknown-freebsd.tar.xz) = c713f8c1662abf2e1d55183907b1ddae17888352bafafd88bc67952da7abc3a5
+SIZE (rust/2020-12-31/rustc-1.49.0-armv6-unknown-freebsd.tar.xz) = 38281092
+SHA256 (rust/2020-12-31/rust-std-1.49.0-armv6-unknown-freebsd.tar.xz) = a867971dcceecc41e3bb19befef2f77513a130d512df961a2b0954b6236aff3e
+SIZE (rust/2020-12-31/rust-std-1.49.0-armv6-unknown-freebsd.tar.xz) = 17007160
+SHA256 (rust/2020-12-31/cargo-1.49.0-armv6-unknown-freebsd.tar.xz) = b416f6df6cbf22a0cf656b9ae462859062abaa26cf66c62cf90688558e90a814
+SIZE (rust/2020-12-31/cargo-1.49.0-armv6-unknown-freebsd.tar.xz) = 4283936
+SHA256 (rust/2020-12-31/rustc-1.49.0-armv7-unknown-freebsd.tar.xz) = 812f52a37c15da4f344bd2e6f4ef13482931013dc51ddf8a340fb7d7045aa7cd
+SIZE (rust/2020-12-31/rustc-1.49.0-armv7-unknown-freebsd.tar.xz) = 37941452
+SHA256 (rust/2020-12-31/rust-std-1.49.0-armv7-unknown-freebsd.tar.xz) = a73f9b10f537ea3538d7139414ec1dd38926a9f892d03f85df7ce779421117ba
+SIZE (rust/2020-12-31/rust-std-1.49.0-armv7-unknown-freebsd.tar.xz) = 17139628
+SHA256 (rust/2020-12-31/cargo-1.49.0-armv7-unknown-freebsd.tar.xz) = 0e47d84c6caa9fbcece0a1affefb730466b66de03422d666a0ad12acb2ef8504
+SIZE (rust/2020-12-31/cargo-1.49.0-armv7-unknown-freebsd.tar.xz) = 4273576
+SHA256 (rust/2020-12-31/rustc-1.49.0-i686-unknown-freebsd.tar.xz) = 38e60e3870d7be62bd38dd27418821e0bda403663941b245eb1e06d16cb15254
+SIZE (rust/2020-12-31/rustc-1.49.0-i686-unknown-freebsd.tar.xz) = 40971152
+SHA256 (rust/2020-12-31/rust-std-1.49.0-i686-unknown-freebsd.tar.xz) = 0c14316074c3ae6690b0f9169fd40c2889aab54baa856a55ebd814a5aed23081
+SIZE (rust/2020-12-31/rust-std-1.49.0-i686-unknown-freebsd.tar.xz) = 19461844
+SHA256 (rust/2020-12-31/cargo-1.49.0-i686-unknown-freebsd.tar.xz) = 4b3e30c79baef4ca4bb7f061e61a97652289d42f2c10653ccbe99a82b60ba345
+SIZE (rust/2020-12-31/cargo-1.49.0-i686-unknown-freebsd.tar.xz) = 4942980
+SHA256 (rust/2020-12-31/rustc-1.49.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 1557c59eeaa7db5f037b51e01787f55dfcccb00aa01f32dfab5b22880a8c3f0a
+SIZE (rust/2020-12-31/rustc-1.49.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 44844340
+SHA256 (rust/2020-12-31/rust-std-1.49.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = d1807da240efabe0dfc038ce9bf71170d2d0ef6d5a8c14d206cb42a08bb84b55
+SIZE (rust/2020-12-31/rust-std-1.49.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 16862016
+SHA256 (rust/2020-12-31/cargo-1.49.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = e2d032d66a14a5fba1a0c74da283f49b09dd0d9f795d87defad661fe59c433b5
+SIZE (rust/2020-12-31/cargo-1.49.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 4752512
+SHA256 (rust/2020-12-31/rustc-1.49.0-powerpc64le-unknown-freebsd.tar.xz) = 7885b37a3b68ce9faa6dcc3d400157a514d57483af3e1d383774a0be7d3845df
+SIZE (rust/2020-12-31/rustc-1.49.0-powerpc64le-unknown-freebsd.tar.xz) = 39868780
+SHA256 (rust/2020-12-31/rust-std-1.49.0-powerpc64le-unknown-freebsd.tar.xz) = 2997b1593c5ec28e32040d2bb643712f9a555a257e7a32bb0b5db4e3bc3f95c5
+SIZE (rust/2020-12-31/rust-std-1.49.0-powerpc64le-unknown-freebsd.tar.xz) = 17006712
+SHA256 (rust/2020-12-31/cargo-1.49.0-powerpc64le-unknown-freebsd.tar.xz) = 0fd8651dda85b1548986ba5b9286c8de70543adabba547d065c45ee6a96c831b
+SIZE (rust/2020-12-31/cargo-1.49.0-powerpc64le-unknown-freebsd.tar.xz) = 4693276
+SHA256 (rust/2020-12-31/rustc-1.49.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 04144ce50f91a175ea5b9954909c2d408c265e7191d7175f2c8c316ad8eab12a
+SIZE (rust/2020-12-31/rustc-1.49.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 38025780
+SHA256 (rust/2020-12-31/rust-std-1.49.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 43a08e6459bfb4498a395b07c194a4bbc38915e7027ba2ec4e8939087abeeb7a
+SIZE (rust/2020-12-31/rust-std-1.49.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 16795244
+SHA256 (rust/2020-12-31/cargo-1.49.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = cae1f2f35330bbfd82a5ab1e3f3b82d3981f7b22541becf69659323edb9a6a8c
+SIZE (rust/2020-12-31/cargo-1.49.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 4447368
diff --git a/lang/spidermonkey78/Makefile b/lang/spidermonkey78/Makefile
index c3566df624db..438836fe5a48 100644
--- a/lang/spidermonkey78/Makefile
+++ b/lang/spidermonkey78/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	spidermonkey
 DISTVERSION=	78.7.0
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	MOZILLA/firefox/releases/${DISTVERSION}esr/source
 PKGNAMESUFFIX=	${SP_VER}
diff --git a/lang/spidermonkey78/files/patch-bug1684261 b/lang/spidermonkey78/files/patch-bug1684261
new file mode 100644
index 000000000000..04349bb197c1
--- /dev/null
+++ b/lang/spidermonkey78/files/patch-bug1684261
@@ -0,0 +1,85 @@
+
+# HG changeset patch
+# User Emilio Cobos Álvarez <emilio@crisal.io>
+# Date 1609006565 0
+# Node ID 0e8f444683cb9c4079d3b2250f32f986043ea582
+# Parent  55097a5cf353f1b2a2228820bdf26bb69a1372a0
+Bug 1684261 - Fix build with rust nightly. r=jrmuizel, a=RyanVM
+
+Fixes errors like:
+
+  dependency (nix) specification is ambiguous. Only one of `branch`, `tag` or `rev` is allowed.
+
+I've left the most specific dependency, but for wgpu the rev is not
+right, so I've kept the branch which effectively preserves behavior.
+
+Differential Revision: https://phabricator.services.mozilla.com/D100485
+
+diff --git a/.cargo/config.in b/.cargo/config.in
+--- .cargo/config.in
++++ .cargo/config.in
+@@ -1,16 +1,16 @@
+ # This file contains vendoring instructions for cargo.
+ # It was generated by `mach vendor rust`.
+ # Please do not edit.
+ 
+ [source."https://github.com/shravanrn/nix/"]
+-branch = "r0.13.1"
+ git = "https://github.com/shravanrn/nix/"
+ replace-with = "vendored-sources"
++rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e"
+ 
+ [source."https://github.com/mozilla/rkv"]
+ git = "https://github.com/mozilla/rkv"
+ replace-with = "vendored-sources"
+ rev = "e3c3388e6632cf55e08d773b32e58b1cab9b2731"
+ 
+ [source."https://github.com/mozilla/neqo"]
+ git = "https://github.com/mozilla/neqo"
+diff --git a/Cargo.lock b/Cargo.lock
+--- Cargo.lock
++++ Cargo.lock
+@@ -3195,17 +3195,17 @@ source = "registry+https://github.com/ru
+ checksum = "0cdc457076c78ab54d5e0d6fa7c47981757f1e34dc39ff92787f217dede586c4"
+ dependencies = [
+  "unreachable",
+ ]
+ 
+ [[package]]
+ name = "nix"
+ version = "0.13.1"
+-source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
++source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
+ dependencies = [
+  "bitflags",
+  "cc",
+  "cfg-if",
+  "libc",
+  "void",
+ ]
+ 
+diff --git a/Cargo.toml b/Cargo.toml
+--- Cargo.toml
++++ Cargo.toml
+@@ -63,18 +63,18 @@ opt-level = 2
+ rpath = false
+ debug-assertions = false
+ panic = "abort"
+ 
+ [patch.crates-io]
+ libudev-sys = { path = "dom/webauthn/libudev-sys" }
+ packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }
+ rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
+-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
+-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
++nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
++spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" }
+ # failure's backtrace feature might break our builds, see bug 1608157.
+ failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
+ failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
+ 
+ [patch.crates-io.cranelift-codegen]
+ git = "https://github.com/bytecodealliance/wasmtime"
+ rev = "b7cfd39b531680217537cfcf5294a22077a0a58d"
+ 
+