lang/rust: Update to 1.48.0

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

Reviewed by:	jbeich
Tested by:	bdragon, jbeich, mikael
Differential Revision:	https://reviews.freebsd.org/D27293

9 files changed, 70 insertions, 71 deletions

diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 998c00981bc9..822042ea8a35 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rust
-PORTVERSION?=	1.47.0
+PORTVERSION?=	1.48.0
 PORTREVISION?=	0
 CATEGORIES=	lang
 MASTER_SITES=	https://static.rust-lang.org/dist/:src \
@@ -37,7 +37,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libgit2.so:devel/libgit2 \
 		libssh2.so:security/libssh2
 
-USES=		pkgconfig python:3.3+,build ssl tar:xz
+USES=		pkgconfig python:3.6+,build ssl tar:xz
 
 MAKE_ENV=	DESTDIR=${STAGEDIR} \
 		LIBGIT2_SYS_USE_PKG_CONFIG=1 \
@@ -69,9 +69,9 @@ 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-08-27
-RUST_BOOTSTRAP_VERSION?=	1.46.0
-CARGO_BOOTSTRAP_VERSION?=	0.47.0
+BOOTSTRAPS_DATE?=		2020-10-08
+RUST_BOOTSTRAP_VERSION?=	1.47.0
+CARGO_BOOTSTRAP_VERSION?=	0.48.0
 
 BOOTSTRAPS_SUFFIX?=		${BOOTSTRAPS_SUFFIX_${ARCH}}
 BOOTSTRAPS_SUFFIX_powerpc64?=	-${PPC_ABI:tl}
@@ -180,12 +180,10 @@ do-configure:
 .endif
 	@${REINPLACE_CMD} 's,%CC%,${CC},g' \
 		${WRKSRC}/src/bootstrap/native.rs
-# src/librustc_llvm has moved to compiler/rustc_llvm in nightly
-# this reinplace_cmd is used for ppc64-elfv1
-.if !defined(NIGHTLY_DATE)
+# this reinplace_cmd is used for ppc64-elfv1, don't remove it
+# even if sed_checked.sh says it's unused
 	@${REINPLACE_CMD} 's,%CC%,${CC},g' \
-		${WRKSRC}/src/librustc_llvm/build.rs
-.endif
+		${WRKSRC}/compiler/rustc_llvm/build.rs
 
 do-build:
 	@cd ${WRKSRC} && \
diff --git a/lang/rust/distinfo b/lang/rust/distinfo
index d714e6b72277..eef2ffbc8e3d 100644
--- a/lang/rust/distinfo
+++ b/lang/rust/distinfo
@@ -1,51 +1,51 @@
-TIMESTAMP = 1602225332
-SHA256 (rust/rustc-1.47.0-src.tar.xz) = ec2c81d2d34890486094a6407589be96161e4e301c238332d32c6dbae4f38ea2
-SIZE (rust/rustc-1.47.0-src.tar.xz) = 104143736
-SHA256 (rust/2020-08-27/rustc-1.46.0-aarch64-unknown-freebsd.tar.xz) = 77d1cad786ca38ad3fb17bb13eb98ee7adeffcbb6925e8aeb3b084b726fffa1a
-SIZE (rust/2020-08-27/rustc-1.46.0-aarch64-unknown-freebsd.tar.xz) = 46123756
-SHA256 (rust/2020-08-27/rust-std-1.46.0-aarch64-unknown-freebsd.tar.xz) = 10c3896a1b10ec0b99351c5c479f2c053923136165befafa39c18eeeb738973b
-SIZE (rust/2020-08-27/rust-std-1.46.0-aarch64-unknown-freebsd.tar.xz) = 12424080
-SHA256 (rust/2020-08-27/cargo-0.47.0-aarch64-unknown-freebsd.tar.xz) = 463dd5338a8600758cac0f7e5c2a62c0068e20e59a3bc7bcfab4efa6da58e99b
-SIZE (rust/2020-08-27/cargo-0.47.0-aarch64-unknown-freebsd.tar.xz) = 3124348
-SHA256 (rust/2020-08-27/rustc-1.46.0-x86_64-unknown-freebsd.tar.xz) = 05f78c027c8fea8b19927b1af84c96959896d96d9692d432ea64210f2540947d
-SIZE (rust/2020-08-27/rustc-1.46.0-x86_64-unknown-freebsd.tar.xz) = 34583796
-SHA256 (rust/2020-08-27/rust-std-1.46.0-x86_64-unknown-freebsd.tar.xz) = 24d011a0f1b48bdffa5577cbc8298758f7f2ac091f647b93442c8251de31e493
-SIZE (rust/2020-08-27/rust-std-1.46.0-x86_64-unknown-freebsd.tar.xz) = 13078008
-SHA256 (rust/2020-08-27/cargo-0.47.0-x86_64-unknown-freebsd.tar.xz) = 5e5fbda34ea2cc3e2ed57090edfbf1b32948ebd8550b4e25bbc64b96b6ef72c0
-SIZE (rust/2020-08-27/cargo-0.47.0-x86_64-unknown-freebsd.tar.xz) = 4635900
-SHA256 (rust/2020-08-27/rustc-1.46.0-armv6-unknown-freebsd.tar.xz) = 8d5f1c519fde1b47062ed63721db43d7edff2483cc33490b4d84a3dd9c41d94a
-SIZE (rust/2020-08-27/rustc-1.46.0-armv6-unknown-freebsd.tar.xz) = 32934396
-SHA256 (rust/2020-08-27/rust-std-1.46.0-armv6-unknown-freebsd.tar.xz) = 744019b69dd9146d024bcbbf3c75edd64b9e2bd21d5e8164cc43b192ea74fada
-SIZE (rust/2020-08-27/rust-std-1.46.0-armv6-unknown-freebsd.tar.xz) = 12370772
-SHA256 (rust/2020-08-27/cargo-0.47.0-armv6-unknown-freebsd.tar.xz) = 8c42654cbda2efd4ffd156f566a1e289052b9d743389e1c668c73235d91a3442
-SIZE (rust/2020-08-27/cargo-0.47.0-armv6-unknown-freebsd.tar.xz) = 4081880
-SHA256 (rust/2020-08-27/rustc-1.46.0-armv7-unknown-freebsd.tar.xz) = d82bd2e50339ca0749812e8f4078ed466217cba7e3f68886d7d2baaf74257c3c
-SIZE (rust/2020-08-27/rustc-1.46.0-armv7-unknown-freebsd.tar.xz) = 33430540
-SHA256 (rust/2020-08-27/rust-std-1.46.0-armv7-unknown-freebsd.tar.xz) = c1417394efb65c264000842eb5dbbd9a00061cdc02415b5f3a5e416753bb3d5f
-SIZE (rust/2020-08-27/rust-std-1.46.0-armv7-unknown-freebsd.tar.xz) = 12358112
-SHA256 (rust/2020-08-27/cargo-0.47.0-armv7-unknown-freebsd.tar.xz) = 32268a102117cf4c51c260945c0627c7f00769fa6d2cb387b05d0148b4a2e48e
-SIZE (rust/2020-08-27/cargo-0.47.0-armv7-unknown-freebsd.tar.xz) = 4070860
-SHA256 (rust/2020-08-27/rustc-1.46.0-i686-unknown-freebsd.tar.xz) = 24a95b887e2a66980052d39a04a02662593b9b57b4d0dc1339c60549208b389e
-SIZE (rust/2020-08-27/rustc-1.46.0-i686-unknown-freebsd.tar.xz) = 35015008
-SHA256 (rust/2020-08-27/rust-std-1.46.0-i686-unknown-freebsd.tar.xz) = 885a0bb88d044b29b07ba31e5acbf18db175eb0dbb4187c8c0f88c4e7115a615
-SIZE (rust/2020-08-27/rust-std-1.46.0-i686-unknown-freebsd.tar.xz) = 12964928
-SHA256 (rust/2020-08-27/cargo-0.47.0-i686-unknown-freebsd.tar.xz) = d04245ea7183d733c03e4f93ed487e1450bcec3fbad0f2bd12d98471d76966f5
-SIZE (rust/2020-08-27/cargo-0.47.0-i686-unknown-freebsd.tar.xz) = 4651612
-SHA256 (rust/2020-08-27/rustc-1.46.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 466790a920feae2932f578d70c01735ddd5bafa7ea6236e4ceac0c5146fa520b
-SIZE (rust/2020-08-27/rustc-1.46.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 38373788
-SHA256 (rust/2020-08-27/rust-std-1.46.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 45e52a1d3a176ad5a47f87dc031b9c1f8c6e85c22c71ce99b186059ebceaf811
-SIZE (rust/2020-08-27/rust-std-1.46.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 12300552
-SHA256 (rust/2020-08-27/cargo-0.47.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = a176b017c751316d90247c8779db7624741f706b4868cb670822e24dbdacb3af
-SIZE (rust/2020-08-27/cargo-0.47.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 4521544
-SHA256 (rust/2020-08-27/rustc-1.46.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 376c921c989182973c1336ee1d3ecb9b90b75ab479fd6632e83cf0391f038b66
-SIZE (rust/2020-08-27/rustc-1.46.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 32563056
-SHA256 (rust/2020-08-27/rust-std-1.46.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 1b67251c2a97ef25e566231baffc38c32689ab7be8d165a6688979ec25858afb
-SIZE (rust/2020-08-27/rust-std-1.46.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 12255592
-SHA256 (rust/2020-08-27/cargo-0.47.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 312c8502aaa49aa339fb8252cec94de7f2f29220d237ddc144c6b19de90334ef
-SIZE (rust/2020-08-27/cargo-0.47.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 4254320
-SHA256 (rust/2020-08-27/cargo-0.47.0-powerpc64le-unknown-freebsd.tar.xz) = 5391388fce390adaa10bb2ab7de9cbdeda8307ab95a64d53d501ced257f99ff2
-SIZE (rust/2020-08-27/cargo-0.47.0-powerpc64le-unknown-freebsd.tar.xz) = 4493584
-SHA256 (rust/2020-08-27/rust-std-1.46.0-powerpc64le-unknown-freebsd.tar.xz) = aa207e73c88f12d512aaa42c704145eb84ce04e48d027dffb0363965e74a8820
-SIZE (rust/2020-08-27/rust-std-1.46.0-powerpc64le-unknown-freebsd.tar.xz) = 12494160
-SHA256 (rust/2020-08-27/rustc-1.46.0-powerpc64le-unknown-freebsd.tar.xz) = 559ee2c55f3614351ca5618166a3bbe8ebcda7bddf0074c5e2c5917734c1d279
-SIZE (rust/2020-08-27/rustc-1.46.0-powerpc64le-unknown-freebsd.tar.xz) = 33672276
+TIMESTAMP = 1605689255
+SHA256 (rust/rustc-1.48.0-src.tar.xz) = ff0a242392a1865d7b2d08eb5ca6c1b3fd0820741d4c13a51a4b2d5d2bb53908
+SIZE (rust/rustc-1.48.0-src.tar.xz) = 105951736
+SHA256 (rust/2020-10-08/rustc-1.47.0-aarch64-unknown-freebsd.tar.xz) = 4809cfc78c13049f3c8da500f33242964dbe7aa4df3b511432a7f745ee9898e8
+SIZE (rust/2020-10-08/rustc-1.47.0-aarch64-unknown-freebsd.tar.xz) = 50672176
+SHA256 (rust/2020-10-08/rust-std-1.47.0-aarch64-unknown-freebsd.tar.xz) = 0278b986c43e04611ee718c13babbd72fbe08d7765fff68d9a8b6d5bdc999831
+SIZE (rust/2020-10-08/rust-std-1.47.0-aarch64-unknown-freebsd.tar.xz) = 16961564
+SHA256 (rust/2020-10-08/cargo-0.48.0-aarch64-unknown-freebsd.tar.xz) = bf8003784eb79710323c86fe46e42a37c901f2c64da6a122e0ea26a278b618a2
+SIZE (rust/2020-10-08/cargo-0.48.0-aarch64-unknown-freebsd.tar.xz) = 3267200
+SHA256 (rust/2020-10-08/rustc-1.47.0-x86_64-unknown-freebsd.tar.xz) = 4a6d872a6f4ba837e65f3a0689b59c3769c3645eede963e80919e374eafcd676
+SIZE (rust/2020-10-08/rustc-1.47.0-x86_64-unknown-freebsd.tar.xz) = 38800024
+SHA256 (rust/2020-10-08/rust-std-1.47.0-x86_64-unknown-freebsd.tar.xz) = 783b5659440331807600d8e391f9da35684465843cd671e6236929fc295faf1d
+SIZE (rust/2020-10-08/rust-std-1.47.0-x86_64-unknown-freebsd.tar.xz) = 18402664
+SHA256 (rust/2020-10-08/cargo-0.48.0-x86_64-unknown-freebsd.tar.xz) = 068d5a21faa84d8d7cf6c0c840f7060b370cb9a61ffd9e42d79bad87e0e2e58f
+SIZE (rust/2020-10-08/cargo-0.48.0-x86_64-unknown-freebsd.tar.xz) = 4817536
+SHA256 (rust/2020-10-08/rustc-1.47.0-armv6-unknown-freebsd.tar.xz) = c1fa3a4f23c79cd7eee9bf876b04fba7f5d137c0ae7eedf52650874c5aaccf73
+SIZE (rust/2020-10-08/rustc-1.47.0-armv6-unknown-freebsd.tar.xz) = 37540840
+SHA256 (rust/2020-10-08/rust-std-1.47.0-armv6-unknown-freebsd.tar.xz) = c80f48a0d2dc1da2767ba53f99005076857a1229687685a759a1558abee9056c
+SIZE (rust/2020-10-08/rust-std-1.47.0-armv6-unknown-freebsd.tar.xz) = 16950080
+SHA256 (rust/2020-10-08/cargo-0.48.0-armv6-unknown-freebsd.tar.xz) = e3a323d54310501ead63da5ee1921355af415eaa4cfc8d9526351469e3b021e2
+SIZE (rust/2020-10-08/cargo-0.48.0-armv6-unknown-freebsd.tar.xz) = 4234128
+SHA256 (rust/2020-10-08/rustc-1.47.0-armv7-unknown-freebsd.tar.xz) = 465abb5c5e9a645f3e45b1a9d5fdc9f6587feae12278ff1c6578ac182c6e04a5
+SIZE (rust/2020-10-08/rustc-1.47.0-armv7-unknown-freebsd.tar.xz) = 37322636
+SHA256 (rust/2020-10-08/rust-std-1.47.0-armv7-unknown-freebsd.tar.xz) = 8c5d8f9257044a95278fc9db563c6421d95c1a5ee74fb7e9717ed3526998947b
+SIZE (rust/2020-10-08/rust-std-1.47.0-armv7-unknown-freebsd.tar.xz) = 16895888
+SHA256 (rust/2020-10-08/cargo-0.48.0-armv7-unknown-freebsd.tar.xz) = 4b0b7de3c50636d57fb9b137b0aacb479e71ec48eb5b0472c204f0420ab5bb76
+SIZE (rust/2020-10-08/cargo-0.48.0-armv7-unknown-freebsd.tar.xz) = 4224144
+SHA256 (rust/2020-10-08/rustc-1.47.0-i686-unknown-freebsd.tar.xz) = 42fe57233c01aee72857363c1a9159edb966ebc8e531bf0567f2ff74e46e3c53
+SIZE (rust/2020-10-08/rustc-1.47.0-i686-unknown-freebsd.tar.xz) = 40170160
+SHA256 (rust/2020-10-08/rust-std-1.47.0-i686-unknown-freebsd.tar.xz) = 724c0f627a2167bfb0d4622a9306eb0385624b966669fecf114f59c1dda61ce9
+SIZE (rust/2020-10-08/rust-std-1.47.0-i686-unknown-freebsd.tar.xz) = 18333648
+SHA256 (rust/2020-10-08/cargo-0.48.0-i686-unknown-freebsd.tar.xz) = ed3cd6121bd5e1a54526d61525ac546706b69cf9fa7ba79f7a0cf94464f3d4cf
+SIZE (rust/2020-10-08/cargo-0.48.0-i686-unknown-freebsd.tar.xz) = 4891828
+SHA256 (rust/2020-10-08/rustc-1.47.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 47e3df2e0a8fce74026bc48da0aad67228b6df7ea3fc75434fa36d0148a7afad
+SIZE (rust/2020-10-08/rustc-1.47.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 43535196
+SHA256 (rust/2020-10-08/rust-std-1.47.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = c4a3c622e987352f6c574ead2c44f5009a64e9dcc292a7dbbb3efeaf2f0e0fb7
+SIZE (rust/2020-10-08/rust-std-1.47.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 16909364
+SHA256 (rust/2020-10-08/cargo-0.48.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 76e97500d41060ae62bcca97e188c7b2200a06744402001aa108643e2fb08ea1
+SIZE (rust/2020-10-08/cargo-0.48.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 4707416
+SHA256 (rust/2020-10-08/rustc-1.47.0-powerpc64le-unknown-freebsd.tar.xz) = dbd867e7dafca668feca05db717ebf6e6d6d31544f09a3ecd28de61edd971342
+SIZE (rust/2020-10-08/rustc-1.47.0-powerpc64le-unknown-freebsd.tar.xz) = 38752420
+SHA256 (rust/2020-10-08/rust-std-1.47.0-powerpc64le-unknown-freebsd.tar.xz) = 91958a7c3d07c47cd017e31c2a9d599c66da2b593002c73d1a1bb3fa97e9f79b
+SIZE (rust/2020-10-08/rust-std-1.47.0-powerpc64le-unknown-freebsd.tar.xz) = 17004748
+SHA256 (rust/2020-10-08/cargo-0.48.0-powerpc64le-unknown-freebsd.tar.xz) = 9409208a1fd44182c08e4111b28542a6ec6ee0a257347d8a5af06b981e9ce35f
+SIZE (rust/2020-10-08/cargo-0.48.0-powerpc64le-unknown-freebsd.tar.xz) = 4651420
+SHA256 (rust/2020-10-08/rustc-1.47.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 86b4ef213c780a5d2c88e85a5ca20ea2219fa919407a6bfc7661f2f23675a55f
+SIZE (rust/2020-10-08/rustc-1.47.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 36841600
+SHA256 (rust/2020-10-08/rust-std-1.47.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 62d951e288b2c56aa11780a95ce16cd9e56b4b13814b0c1bd2c2cc1ed187b283
+SIZE (rust/2020-10-08/rust-std-1.47.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 16841320
+SHA256 (rust/2020-10-08/cargo-0.48.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = b628741be429426848c5f0a76e8aefa00a097c108512d48722795e04231a819e
+SIZE (rust/2020-10-08/cargo-0.48.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 4405904
diff --git a/lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs b/lang/rust/files/patch-compiler_rustc__target_src_spec_i686__unknown__freebsd.rs
index 75c659e6501d..9d3dc5a067aa 100644
--- a/lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs
+++ b/lang/rust/files/patch-compiler_rustc__target_src_spec_i686__unknown__freebsd.rs
@@ -1,5 +1,5 @@
---- src/librustc_target/spec/i686_unknown_freebsd.rs.orig	2020-01-23 19:40:44 UTC
-+++ src/librustc_target/spec/i686_unknown_freebsd.rs
+--- compiler/rustc_target/src/spec/i686_unknown_freebsd.rs.orig	2020-01-23 19:40:44 UTC
++++ compiler/rustc_target/src/spec/i686_unknown_freebsd.rs
 @@ -2,7 +2,7 @@ use crate::spec::{LinkerFlavor, Target, TargetResult};
  
  pub fn target() -> TargetResult {
diff --git a/lang/rust/files/powerpc64-elfv1/patch-src_librustc__llvm_build.rs b/lang/rust/files/powerpc64-elfv1/patch-compiler_rustc__llvm_build.rs
index 7b71799f5eab..7cbcd814aade 100644
--- a/lang/rust/files/powerpc64-elfv1/patch-src_librustc__llvm_build.rs
+++ b/lang/rust/files/powerpc64-elfv1/patch-compiler_rustc__llvm_build.rs
@@ -1,5 +1,5 @@
---- src/librustc_llvm/build.rs.orig	2019-12-16 15:38:05 UTC
-+++ src/librustc_llvm/build.rs
+--- compiler/rustc_llvm/build.rs.orig	2019-12-16 15:38:05 UTC
++++ compiler/rustc_llvm/build.rs
 @@ -273,7 +273,14 @@ fn main() {
      };
  
diff --git a/lang/rust/files/powerpc64-elfv2/patch-src_librustc__target_abi_call_powerpc64.rs b/lang/rust/files/powerpc64-elfv2/patch-compiler_rustc__target_src_abi_call_powerpc64.rs
index fb4f9c166579..2524e1872984 100644
--- a/lang/rust/files/powerpc64-elfv2/patch-src_librustc__target_abi_call_powerpc64.rs
+++ b/lang/rust/files/powerpc64-elfv2/patch-compiler_rustc__target_src_abi_call_powerpc64.rs
@@ -1,5 +1,5 @@
---- src/librustc_target/abi/call/powerpc64.rs.orig	2020-03-09 22:11:17 UTC
-+++ src/librustc_target/abi/call/powerpc64.rs
+--- compiler/rustc_target/src/abi/call/powerpc64.rs.orig	2020-03-09 22:11:17 UTC
++++ compiler/rustc_target/src/abi/call/powerpc64.rs
 @@ -123,7 +123,7 @@ where
          ELFv2
      } else {
diff --git a/lang/rust/files/powerpc64-elfv2/patch-src_librustc__target_spec_powerpc64__unknown__freebsd.rs b/lang/rust/files/powerpc64-elfv2/patch-compiler_rustc__target_src_spec_powerpc64__unknown__freebsd.rs
index e8bf492c91a2..a33881c6af92 100644
--- a/lang/rust/files/powerpc64-elfv2/patch-src_librustc__target_spec_powerpc64__unknown__freebsd.rs
+++ b/lang/rust/files/powerpc64-elfv2/patch-compiler_rustc__target_src_spec_powerpc64__unknown__freebsd.rs
@@ -1,5 +1,5 @@
---- src/librustc_target/spec/powerpc64_unknown_freebsd.rs.orig	2020-07-15 11:31:58 UTC
-+++ src/librustc_target/spec/powerpc64_unknown_freebsd.rs
+--- compiler/rustc_target/src/spec/powerpc64_unknown_freebsd.rs.orig	2020-07-15 11:31:58 UTC
++++ compiler/rustc_target/src/spec/powerpc64_unknown_freebsd.rs
 @@ -17,6 +17,10 @@ pub fn target() -> TargetResult {
          target_env: String::new(),
          target_vendor: "unknown".to_string(),
diff --git a/lang/rust/files/powerpc64le/patch-src_librustc__target_spec_mod.rs b/lang/rust/files/powerpc64le/patch-compiler_rustc__target_src_spec_mod.rs
index ea78389568a1..138d21a72021 100644
--- a/lang/rust/files/powerpc64le/patch-src_librustc__target_spec_mod.rs
+++ b/lang/rust/files/powerpc64le/patch-compiler_rustc__target_src_spec_mod.rs
@@ -1,5 +1,5 @@
---- src/librustc_target/spec/mod.rs.orig        2020-09-30 18:06:16.613040000 -0500
-+++ src/librustc_target/spec/mod.rs     2020-09-30 18:06:47.040460000 -0500
+--- compiler/rustc_target/src/spec/mod.rs.orig        2020-09-30 18:06:16.613040000 -0500
++++ compiler/rustc_target/src/spec/mod.rs     2020-09-30 18:06:47.040460000 -0500
 @@ -553,6 +553,7 @@ supported_targets! {
      ("armv7-unknown-freebsd", armv7_unknown_freebsd),
      ("i686-unknown-freebsd", i686_unknown_freebsd),
diff --git a/lang/rust/files/powerpc64le/patch-src_librustc__target_spec_powerpc64le__unknown__freebsd.rs b/lang/rust/files/powerpc64le/patch-compiler_rustc__target_src_spec_powerpc64le__unknown__freebsd.rs
index 57526d82f0d3..57526d82f0d3 100644
--- a/lang/rust/files/powerpc64le/patch-src_librustc__target_spec_powerpc64le__unknown__freebsd.rs
+++ b/lang/rust/files/powerpc64le/patch-compiler_rustc__target_src_spec_powerpc64le__unknown__freebsd.rs
diff --git a/lang/spidermonkey78/Makefile b/lang/spidermonkey78/Makefile
index 8ba4feac3fb6..60c7d9b58712 100644
--- a/lang/spidermonkey78/Makefile
+++ b/lang/spidermonkey78/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	spidermonkey
 DISTVERSION=	78.4.0
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	MOZILLA/firefox/releases/${DISTVERSION}esr/source
 PKGNAMESUFFIX=	${SP_VER}