Update to upstream version 1.8.0

While on it:
- Incorporate patch by jbeich (D5897) to allow build with gcc

Differential Revision:	https://reviews.freebsd.org/D5897

5 files changed, 30 insertions, 18 deletions

diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index b29468ea7877..29fabf848ffd 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rust
-PORTVERSION?=	1.7.0
+PORTVERSION?=	1.8.0
 CATEGORIES=	lang
 MASTER_SITES=	http://static.rust-lang.org/dist/:src \
 		http://static.rust-lang.org/stage0-snapshots/:bootstrap
@@ -36,9 +36,9 @@ CONFLICTS_INSTALL?=	rust-nightly
 
 RUST_BOOT=	rust-stage0-${RUST_BOOT_SIG_${ARCH}}.tar.bz2
 
-RUST_BOOT_SIG_x86_64?=	2015-12-18-3391630-dragonfly-x86_64-e74d79488e88ac2de3bd03afd5959d2ae6e2b628
-RUST_BOOT_SIG_amd64?=	2015-12-18-3391630-freebsd-x86_64-91724d4e655807a2a2e940ac50992ebeaac16ea9
-RUST_BOOT_SIG_i386?=	2015-12-18-3391630-freebsd-i386-7e624c50494402e1feb14c743d659fbd71b448f5
+RUST_BOOT_SIG_x86_64?=	2016-02-17-4d3eebf-dragonfly-x86_64-765bb5820ad406e966ec0ac51c8070b656459b02
+RUST_BOOT_SIG_amd64?=	2016-02-17-4d3eebf-freebsd-x86_64-f38991fbb81c1cd8d0bbda396f98f13a55b42804
+RUST_BOOT_SIG_i386?=	2016-02-17-4d3eebf-freebsd-i386-4e2af0b34eb335e173aebff543be693724a956c2
 
 # Rust's libraries are named librustc_${component}-${RUST_VSN_HASH}.so.
 # The hash depends on Rust version and, if the channel is not "stable",
@@ -57,10 +57,11 @@ RUST_ARCH_i386=		i686
 RUST_TARGET=		${RUST_ARCH_${ARCH}}-unknown-${OPSYS:tl}
 PLIST_SUB+=	RUST_TARGET=${RUST_TARGET}
 
-USES=		gmake libedit python:2,build
+USES=		compiler gmake libedit python:2,build
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-valgrind --disable-docs \
-		--enable-clang --mandir=${MANPREFIX}/man \
+		${CHOSEN_COMPILER_TYPE:Mclang:C/.+/--enable-&/} \
+		--mandir=${MANPREFIX}/man \
 		--release-channel=${RUST_CHANNEL}
 
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
diff --git a/lang/rust/distinfo.amd64 b/lang/rust/distinfo.amd64
index 956ef169314e..5b1fd2ce33c8 100644
--- a/lang/rust/distinfo.amd64
+++ b/lang/rust/distinfo.amd64
@@ -1,4 +1,4 @@
-SHA256 (rustc-1.7.0-src.tar.gz) = 6df96059d87b718676d9cd879672e4e22418b6093396b4ccb5b5b66df37bf13a
-SIZE (rustc-1.7.0-src.tar.gz) = 25097611
-SHA256 (rust-stage0-2015-12-18-3391630-freebsd-x86_64-91724d4e655807a2a2e940ac50992ebeaac16ea9.tar.bz2) = 26bf4aadcb54c1336042fcabb1d50d96ee3630675bd80e8b9be5dacce3681d92
-SIZE (rust-stage0-2015-12-18-3391630-freebsd-x86_64-91724d4e655807a2a2e940ac50992ebeaac16ea9.tar.bz2) = 14884969
+SHA256 (rustc-1.8.0-src.tar.gz) = af4466147e8d4db4de2a46e07494d2dc2d96313c5b37da34237f511c905f7449
+SIZE (rustc-1.8.0-src.tar.gz) = 25641320
+SHA256 (rust-stage0-2016-02-17-4d3eebf-freebsd-x86_64-f38991fbb81c1cd8d0bbda396f98f13a55b42804.tar.bz2) = 6123aa870918555835623548e7edbf79480cd754c649fda844dc3c14e4e142f2
+SIZE (rust-stage0-2016-02-17-4d3eebf-freebsd-x86_64-f38991fbb81c1cd8d0bbda396f98f13a55b42804.tar.bz2) = 15922558
diff --git a/lang/rust/distinfo.i386 b/lang/rust/distinfo.i386
index bca169213eb2..fb548e78a8a4 100644
--- a/lang/rust/distinfo.i386
+++ b/lang/rust/distinfo.i386
@@ -1,4 +1,4 @@
-SHA256 (rustc-1.7.0-src.tar.gz) = 6df96059d87b718676d9cd879672e4e22418b6093396b4ccb5b5b66df37bf13a
-SIZE (rustc-1.7.0-src.tar.gz) = 25097611
-SHA256 (rust-stage0-2015-12-18-3391630-freebsd-i386-7e624c50494402e1feb14c743d659fbd71b448f5.tar.bz2) = 80b8faebc3a917bc83c02a98028e6d0284709d60973e5261555c3126869009b1
-SIZE (rust-stage0-2015-12-18-3391630-freebsd-i386-7e624c50494402e1feb14c743d659fbd71b448f5.tar.bz2) = 15436433
+SHA256 (rustc-1.8.0-src.tar.gz) = af4466147e8d4db4de2a46e07494d2dc2d96313c5b37da34237f511c905f7449
+SIZE (rustc-1.8.0-src.tar.gz) = 25641320
+SHA256 (rust-stage0-2016-02-17-4d3eebf-freebsd-i386-4e2af0b34eb335e173aebff543be693724a956c2.tar.bz2) = 578be492263cf9512020662fa35a493ec0589870e9de2e45e0aa63d40f515a3e
+SIZE (rust-stage0-2016-02-17-4d3eebf-freebsd-i386-4e2af0b34eb335e173aebff543be693724a956c2.tar.bz2) = 17417438
diff --git a/lang/rust/distinfo.x86_64 b/lang/rust/distinfo.x86_64
index 55f15f8dac1a..e0a490163d20 100644
--- a/lang/rust/distinfo.x86_64
+++ b/lang/rust/distinfo.x86_64
@@ -1,4 +1,4 @@
-SHA256 (rustc-1.7.0-src.tar.gz) = 6df96059d87b718676d9cd879672e4e22418b6093396b4ccb5b5b66df37bf13a
-SIZE (rustc-1.7.0-src.tar.gz) = 25097611
-SHA256 (rust-stage0-2015-12-18-3391630-dragonfly-x86_64-e74d79488e88ac2de3bd03afd5959d2ae6e2b628.tar.bz2) = 33b893943bb57885ef113c1a157eb0f4360b81b91f8846fc11ae5768fc49b381
-SIZE (rust-stage0-2015-12-18-3391630-dragonfly-x86_64-e74d79488e88ac2de3bd03afd5959d2ae6e2b628.tar.bz2) = 16913394
+SHA256 (rustc-1.8.0-src.tar.gz) = af4466147e8d4db4de2a46e07494d2dc2d96313c5b37da34237f511c905f7449
+SIZE (rustc-1.8.0-src.tar.gz) = 25641320
+SHA256 (rust-stage0-2016-02-17-4d3eebf-dragonfly-x86_64-765bb5820ad406e966ec0ac51c8070b656459b02.tar.bz2) = 4e4155a410042ffa149ac26e94c1c5cd9f24aae7e647deed54e694f88cf33d5c
+SIZE (rust-stage0-2016-02-17-4d3eebf-dragonfly-x86_64-765bb5820ad406e966ec0ac51c8070b656459b02.tar.bz2) = 18130945
diff --git a/lang/rust/files/patch-src_snapshots.txt b/lang/rust/files/patch-src_snapshots.txt
new file mode 100644
index 000000000000..7ac5835becfb
--- /dev/null
+++ b/lang/rust/files/patch-src_snapshots.txt
@@ -0,0 +1,11 @@
+--- src/snapshots.txt.orig	2016-04-11 21:22:04 UTC
++++ src/snapshots.txt
+@@ -6,6 +6,8 @@ S 2016-02-17 4d3eebf
+   winnt-i386 0c336d794a65f8e285c121866c7d59aa2dd0d1e1
+   winnt-x86_64 27e75b1bf99770b3564bcebd7f3230be01135a92
+   openbsd-x86_64 ac957c6b84de2bd67f01df085d9ea515f96e22f3
++  freebsd-i386 4e2af0b34eb335e173aebff543be693724a956c2
++  freebsd-x86_64 f38991fbb81c1cd8d0bbda396f98f13a55b42804
+ 
+ S 2015-12-18 3391630
+   bitrig-x86_64 6476e1562df02389b55553b4c88b1f4fd121cd40