6 files changed, 37 insertions, 40 deletions

diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 29fabf848ffd..f6c8051d2d98 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -2,10 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	rust
-PORTVERSION?=	1.8.0
+PORTVERSION?=	1.9.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/stage0-snapshots/:bootstrap \
+		https://github.com/dhuseby/rust-manual-snapshots/raw/master/:bootstrap
 DISTNAME?=	${PORTNAME}c-${PORTVERSION}
 DISTFILES?=	${DISTNAME}-src${EXTRACT_SUFX}:src
 DISTFILES+=	${RUST_BOOT}:bootstrap
@@ -36,9 +37,9 @@ CONFLICTS_INSTALL?=	rust-nightly
 
 RUST_BOOT=	rust-stage0-${RUST_BOOT_SIG_${ARCH}}.tar.bz2
 
-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_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'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 5b1fd2ce33c8..13f538cee4ef 100644
--- a/lang/rust/distinfo.amd64
+++ b/lang/rust/distinfo.amd64
@@ -1,4 +1,5 @@
-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
+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
diff --git a/lang/rust/distinfo.i386 b/lang/rust/distinfo.i386
index fb548e78a8a4..2c72dfdc26ab 100644
--- a/lang/rust/distinfo.i386
+++ b/lang/rust/distinfo.i386
@@ -1,4 +1,5 @@
-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
+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
diff --git a/lang/rust/distinfo.x86_64 b/lang/rust/distinfo.x86_64
index e0a490163d20..20a869b9b299 100644
--- a/lang/rust/distinfo.x86_64
+++ b/lang/rust/distinfo.x86_64
@@ -1,4 +1,5 @@
-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
+TIMESTAMP = 1464724184
+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-dragonfly-x86_64-e790279a7b286ddf2e716ccd3bb1b7f0a386a5c7.tar.bz2) = da27393277ee35fc866be78ecedf37d57232d956cc457391b9680997ea64c5f2
+SIZE (rust-stage0-2016-03-18-235d774-dragonfly-x86_64-e790279a7b286ddf2e716ccd3bb1b7f0a386a5c7.tar.bz2) = 18070513
diff --git a/lang/rust/files/patch-src_snapshots.txt b/lang/rust/files/patch-src_snapshots.txt
index 7a8cb22d0bf2..8a73a59b356f 100644
--- a/lang/rust/files/patch-src_snapshots.txt
+++ b/lang/rust/files/patch-src_snapshots.txt
@@ -1,17 +1,10 @@
---- src/snapshots.txt.orig	2016-04-11 21:22:04 UTC
+--- src/snapshots.txt.orig	2016-05-23 16:29:00 UTC
 +++ src/snapshots.txt
-@@ -1,4 +1,5 @@
- S 2016-02-17 4d3eebf
-+  dragonfly-x86_64 765bb5820ad406e966ec0ac51c8070b656459b02
-   linux-i386 5f194aa7628c0703f0fd48adc4ec7f3cc64b98c7
-   linux-x86_64 d29b7607d13d64078b6324aec82926fb493f59ba
-   macos-i386 4c8e42dd649e247f3576bf9dfa273327b4907f9c
-@@ -6,6 +7,8 @@ S 2016-02-17 4d3eebf
-   winnt-i386 0c336d794a65f8e285c121866c7d59aa2dd0d1e1
-   winnt-x86_64 27e75b1bf99770b3564bcebd7f3230be01135a92
-   openbsd-x86_64 ac957c6b84de2bd67f01df085d9ea515f96e22f3
-+  freebsd-i386 4e2af0b34eb335e173aebff543be693724a956c2
-+  freebsd-x86_64 f38991fbb81c1cd8d0bbda396f98f13a55b42804
+@@ -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 2015-12-18 3391630
-   bitrig-x86_64 6476e1562df02389b55553b4c88b1f4fd121cd40
+ S 2016-02-17 4d3eebf
diff --git a/lang/rust/pkg-plist b/lang/rust/pkg-plist
index b71a98c98975..b8fd8b97c353 100644
--- a/lang/rust/pkg-plist
+++ b/lang/rust/pkg-plist
@@ -11,9 +11,11 @@ lib/librbml-%%RUST_VSN_HASH%%.so
 lib/librustc-%%RUST_VSN_HASH%%.so
 lib/librustc_back-%%RUST_VSN_HASH%%.so
 lib/librustc_borrowck-%%RUST_VSN_HASH%%.so
+lib/librustc_const_eval-%%RUST_VSN_HASH%%.so
+lib/librustc_const_math-%%RUST_VSN_HASH%%.so
 lib/librustc_data_structures-%%RUST_VSN_HASH%%.so
 lib/librustc_driver-%%RUST_VSN_HASH%%.so
-lib/librustc_front-%%RUST_VSN_HASH%%.so
+lib/librustc_incremental-%%RUST_VSN_HASH%%.so
 lib/librustc_lint-%%RUST_VSN_HASH%%.so
 lib/librustc_llvm-%%RUST_VSN_HASH%%.so
 lib/librustc_metadata-%%RUST_VSN_HASH%%.so
@@ -23,6 +25,7 @@ lib/librustc_platform_intrinsics-%%RUST_VSN_HASH%%.so
 lib/librustc_plugin-%%RUST_VSN_HASH%%.so
 lib/librustc_privacy-%%RUST_VSN_HASH%%.so
 lib/librustc_resolve-%%RUST_VSN_HASH%%.so
+lib/librustc_save_analysis-%%RUST_VSN_HASH%%.so
 lib/librustc_trans-%%RUST_VSN_HASH%%.so
 lib/librustc_typeck-%%RUST_VSN_HASH%%.so
 lib/librustdoc-%%RUST_VSN_HASH%%.so
@@ -43,31 +46,28 @@ lib/rustlib/uninstall.sh
 lib/rustlib/%%RUST_TARGET%%/lib/liballoc-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/liballoc_jemalloc-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/liballoc_system-%%RUST_VSN_HASH%%.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libarena-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/libarena-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/libcollections-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/libcompiler-rt.a
 lib/rustlib/%%RUST_TARGET%%/lib/libcore-%%RUST_VSN_HASH%%.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libflate-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/libflate-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/libfmt_macros-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/libgetopts-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/libgetopts-%%RUST_VSN_HASH%%.so
-lib/rustlib/%%RUST_TARGET%%/lib/libgraphviz-%%RUST_VSN_HASH%%.rlib
 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%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/liblog-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librand-%%RUST_VSN_HASH%%.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/librbml-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/librbml-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_back-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_bitflags-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_borrowck-%%RUST_VSN_HASH%%.so
+lib/rustlib/%%RUST_TARGET%%/lib/librustc_const_eval-%%RUST_VSN_HASH%%.so
+lib/rustlib/%%RUST_TARGET%%/lib/librustc_const_math-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_data_structures-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_driver-%%RUST_VSN_HASH%%.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_front-%%RUST_VSN_HASH%%.so
+lib/rustlib/%%RUST_TARGET%%/lib/librustc_incremental-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_lint-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_llvm-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_metadata-%%RUST_VSN_HASH%%.so
@@ -77,11 +77,11 @@ lib/rustlib/%%RUST_TARGET%%/lib/librustc_platform_intrinsics-%%RUST_VSN_HASH%%.s
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_plugin-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_privacy-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_resolve-%%RUST_VSN_HASH%%.so
+lib/rustlib/%%RUST_TARGET%%/lib/librustc_save_analysis-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_trans-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_typeck-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_unicode-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/librustdoc-%%RUST_VSN_HASH%%.so
-lib/rustlib/%%RUST_TARGET%%/lib/libserialize-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/libserialize-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/libstd-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/libstd-%%RUST_VSN_HASH%%.so