Update to upstream version 1.10.0

5 files changed, 17 insertions, 28 deletions

diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index b89eee98e5ee..62eb46ab4b02 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	rust
-PORTVERSION?=	1.9.0
-PORTREVISION=	1
+PORTVERSION?=	1.10.0
 CATEGORIES=	lang
 MASTER_SITES=	http://static.rust-lang.org/dist/:src \
-		http://static.rust-lang.org/stage0-snapshots/:bootstrap \
+		http://static.rust-lang.org/dist/:bootstrap \
 		https://github.com/dhuseby/rust-manual-snapshots/raw/master/:bootstrap
 DISTNAME?=	${PORTNAME}c-${PORTVERSION}
 DISTFILES?=	${DISTNAME}-src${EXTRACT_SUFX}:src
@@ -36,11 +35,8 @@ CONFLICTS_BUILD?=	rust-nightly
 CONFLICTS_BUILD+=	${PKGBASE}
 CONFLICTS_INSTALL?=	rust-nightly
 
-RUST_BOOT=	rust-stage0-${RUST_BOOT_SIG_${ARCH}}.tar.bz2
-
-RUST_BOOT_SIG_x86_64?=	2016-03-18-235d774-dragonfly-x86_64-e790279a7b286ddf2e716ccd3bb1b7f0a386a5c7
-RUST_BOOT_SIG_amd64?=	2016-03-18-235d774-freebsd-x86_64-390b9a9f60f3d0d6a52c04d939a0355f572d03b3
-RUST_BOOT_SIG_i386?=	2016-03-18-235d774-freebsd-i386-b5a87e66e3e3eed5f0b68367ad22f25f0be2d4ea
+RUST_BOOT_VERSION=	1.9.0
+RUST_BOOT=	rustc-${RUST_BOOT_VERSION}-${RUST_TARGET}.tar.gz
 
 # Rust's libraries are named librustc_${component}-${RUST_VSN_HASH}.so.
 # The hash depends on Rust version and, if the channel is not "stable",
diff --git a/lang/rust/distinfo.amd64 b/lang/rust/distinfo.amd64
index 13f538cee4ef..9f95bcd70625 100644
--- a/lang/rust/distinfo.amd64
+++ b/lang/rust/distinfo.amd64
@@ -1,5 +1,5 @@
-TIMESTAMP = 1464541774
-SHA256 (rustc-1.9.0-src.tar.gz) = b19b21193d7d36039debeaaa1f61cbf98787e0ce94bd85c5cbe2a59462d7cfcd
-SIZE (rustc-1.9.0-src.tar.gz) = 25859714
-SHA256 (rust-stage0-2016-03-18-235d774-freebsd-x86_64-390b9a9f60f3d0d6a52c04d939a0355f572d03b3.tar.bz2) = 50e9c7fe6e88eefcb212eec4791df494e1ed82f667ebd501c226630b0d8d0a1a
-SIZE (rust-stage0-2016-03-18-235d774-freebsd-x86_64-390b9a9f60f3d0d6a52c04d939a0355f572d03b3.tar.bz2) = 16164738
+TIMESTAMP = 1468066508
+SHA256 (rustc-1.10.0-src.tar.gz) = a4015aacf4f6d8a8239253c4da46e7abaa8584f8214d1828d2ff0a8f56176869
+SIZE (rustc-1.10.0-src.tar.gz) = 25967780
+SHA256 (rustc-1.9.0-x86_64-unknown-freebsd.tar.gz) = 18f92b24d69ae2e5a542072e0f302f96ac1af096069a752833e9574d559e62ed
+SIZE (rustc-1.9.0-x86_64-unknown-freebsd.tar.gz) = 47969295
diff --git a/lang/rust/distinfo.i386 b/lang/rust/distinfo.i386
index 2c72dfdc26ab..81b90c02333f 100644
--- a/lang/rust/distinfo.i386
+++ b/lang/rust/distinfo.i386
@@ -1,5 +1,5 @@
-TIMESTAMP = 1464553284
-SHA256 (rustc-1.9.0-src.tar.gz) = b19b21193d7d36039debeaaa1f61cbf98787e0ce94bd85c5cbe2a59462d7cfcd
-SIZE (rustc-1.9.0-src.tar.gz) = 25859714
-SHA256 (rust-stage0-2016-03-18-235d774-freebsd-i386-b5a87e66e3e3eed5f0b68367ad22f25f0be2d4ea.tar.bz2) = 8d03f5b90b5b7b191c601967f9742ab727205c9ef45b4088744b8d4546eab7ce
-SIZE (rust-stage0-2016-03-18-235d774-freebsd-i386-b5a87e66e3e3eed5f0b68367ad22f25f0be2d4ea.tar.bz2) = 17492337
+TIMESTAMP = 1468066935
+SHA256 (rustc-1.10.0-src.tar.gz) = a4015aacf4f6d8a8239253c4da46e7abaa8584f8214d1828d2ff0a8f56176869
+SIZE (rustc-1.10.0-src.tar.gz) = 25967780
+SHA256 (rustc-1.9.0-i686-unknown-freebsd.tar.gz) = 7781f654405301292e17fbde635e770a1bc6620278e89cbd6d0dc4eaa7d8a6db
+SIZE (rustc-1.9.0-i686-unknown-freebsd.tar.gz) = 48830795
diff --git a/lang/rust/files/patch-src_snapshots.txt b/lang/rust/files/patch-src_snapshots.txt
deleted file mode 100644
index 8a73a59b356f..000000000000
--- a/lang/rust/files/patch-src_snapshots.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/snapshots.txt.orig	2016-05-23 16:29:00 UTC
-+++ src/snapshots.txt
-@@ -6,6 +6,7 @@ S 2016-03-18 235d774
-   winnt-i386 7703869608cc4192b8f1943e51b19ba1a03c0110
-   winnt-x86_64 8512b5ecc0c53a2cd3552e4f5688577de95cd978
-   openbsd-x86_64 c5b6feda38138a12cd5c05574b585dadebbb5e87
-+  freebsd-i386 b5a87e66e3e3eed5f0b68367ad22f25f0be2d4ea
-   freebsd-x86_64 390b9a9f60f3d0d6a52c04d939a0355f572d03b3
- 
- S 2016-02-17 4d3eebf
diff --git a/lang/rust/pkg-plist b/lang/rust/pkg-plist
index 1a9f8e3c6495..3343aad6736b 100644
--- a/lang/rust/pkg-plist
+++ b/lang/rust/pkg-plist
@@ -58,6 +58,8 @@ lib/rustlib/%%RUST_TARGET%%/lib/libgetopts-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/libgraphviz-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/liblibc-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/liblog-%%RUST_VSN_HASH%%.so
+lib/rustlib/%%RUST_TARGET%%/lib/libpanic_abort-%%RUST_VSN_HASH%%.rlib
+lib/rustlib/%%RUST_TARGET%%/lib/libpanic_unwind-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/librand-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/librbml-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc-%%RUST_VSN_HASH%%.so
@@ -92,5 +94,6 @@ lib/rustlib/%%RUST_TARGET%%/lib/libterm-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/libterm-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/libtest-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/libtest-%%RUST_VSN_HASH%%.so
+lib/rustlib/%%RUST_TARGET%%/lib/libunwind-%%RUST_VSN_HASH%%.rlib
 man/man1/rustc.1.gz
 man/man1/rustdoc.1.gz