Update to upstream version 1.16.0

5 files changed, 21 insertions, 149 deletions

diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index b2829ffa5705..0de339f3a6e9 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rust
-PORTVERSION?=	1.15.1
+PORTVERSION?=	1.16.0
 CATEGORIES=	lang
 MASTER_SITES=	http://static.rust-lang.org/dist/:src \
 		https://static.rust-lang.org/dist/:rust_bootstrap \
@@ -43,12 +43,12 @@ CONFLICTS_BUILD?=	rust-nightly
 CONFLICTS_BUILD+=	${PKGBASE}
 CONFLICTS_INSTALL?=	rust-nightly
 
-RUST_BOOTSTRAP_DIR?=		2016-12-18
-RUST_BOOTSTRAP_VERSION?=	1.14.0
+RUST_BOOTSTRAP_DIR?=		2017-02-09
+RUST_BOOTSTRAP_VERSION?=	1.15.1
 RUSTC_BOOTSTRAP=		${RUST_BOOTSTRAP_DIR}/rustc-${RUST_BOOTSTRAP_VERSION}-${RUST_TARGET}.tar.gz
 RUST_STD_BOOTSTRAP=		${RUST_BOOTSTRAP_DIR}/rust-std-${RUST_BOOTSTRAP_VERSION}-${RUST_TARGET}.tar.gz
 
-CARGO_BOOTSTRAP_DIR?=		fbeea902d2c9a5be6d99cc35681565d8f7832592
+CARGO_BOOTSTRAP_DIR?=		6e0c18cccc8b0c06fba8a8d76486f81a792fb420
 CARGO_BOOTSTRAP_VERSION?=	nightly
 CARGO_BOOTSTRAP=		${CARGO_BOOTSTRAP_DIR}/cargo-${CARGO_BOOTSTRAP_VERSION}-${RUST_TARGET}.tar.gz
 CARGO_REGISTRY=			${PORTNAME}-registry-${DISTVERSIONFULL}.tar.xz
diff --git a/lang/rust/distinfo b/lang/rust/distinfo
index 481f9023e3d9..0e0debc3af95 100644
--- a/lang/rust/distinfo
+++ b/lang/rust/distinfo
@@ -1,17 +1,17 @@
-TIMESTAMP = 1486996201
-SHA256 (rust/rustc-1.15.1-src.tar.gz) = 2e7daad418a830b45b977cd7ecf181b65f30f73df63ff36e124ea5fe5d1af327
-SIZE (rust/rustc-1.15.1-src.tar.gz) = 28100203
-SHA256 (rust/2016-12-18/rustc-1.14.0-x86_64-unknown-freebsd.tar.gz) = 837459a52ced646cb3af9af3dbd9929694517ccedd3b47656ecb4db1b3575c25
-SIZE (rust/2016-12-18/rustc-1.14.0-x86_64-unknown-freebsd.tar.gz) = 51458608
-SHA256 (rust/2016-12-18/rust-std-1.14.0-x86_64-unknown-freebsd.tar.gz) = 93763e8732477646f8a7e5e4f329da511ca34ca2e8a932811055a0cc8bc606a6
-SIZE (rust/2016-12-18/rust-std-1.14.0-x86_64-unknown-freebsd.tar.gz) = 65210098
-SHA256 (rust/fbeea902d2c9a5be6d99cc35681565d8f7832592/cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 1982409533dc06e32195325e7dabaf372834665d6ab11a07a0029d04d7e3da4a
-SIZE (rust/fbeea902d2c9a5be6d99cc35681565d8f7832592/cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 4584208
-SHA256 (rust/2016-12-18/rustc-1.14.0-i686-unknown-freebsd.tar.gz) = 73e69c57d10763b406e68b1a529426d236722cc72d4b89594f60f723c58ce4eb
-SIZE (rust/2016-12-18/rustc-1.14.0-i686-unknown-freebsd.tar.gz) = 54045887
-SHA256 (rust/2016-12-18/rust-std-1.14.0-i686-unknown-freebsd.tar.gz) = 6da24c6cc5e241ec0d8bdbf9d0574acb4d01e6d4b2753974a05dd4d2e27f2de6
-SIZE (rust/2016-12-18/rust-std-1.14.0-i686-unknown-freebsd.tar.gz) = 67176400
-SHA256 (rust/fbeea902d2c9a5be6d99cc35681565d8f7832592/cargo-nightly-i686-unknown-freebsd.tar.gz) = ed027f7fae62001c6bcc3682143d77faac336acde72aa8e539662bb4c5691259
-SIZE (rust/fbeea902d2c9a5be6d99cc35681565d8f7832592/cargo-nightly-i686-unknown-freebsd.tar.gz) = 4500714
-SHA256 (rust/rust-registry-1.15.1.tar.xz) = 79a27c31e121fdf4dcb94720ffc1ec4f0775bdd2876093f3d8915d4ef8374ccd
-SIZE (rust/rust-registry-1.15.1.tar.xz) = 2752956
+TIMESTAMP = 1489847181
+SHA256 (rust/rustc-1.16.0-src.tar.gz) = f966b31eb1cd9bd2df817c391a338eeb5b9253ae0a19bf8a11960c560f96e8b4
+SIZE (rust/rustc-1.16.0-src.tar.gz) = 28470372
+SHA256 (rust/2017-02-09/rustc-1.15.1-x86_64-unknown-freebsd.tar.gz) = 29803d1ca5cf87a2cd6fca30863ebc92287642e2f8c1d2ca707dd9ec843df210
+SIZE (rust/2017-02-09/rustc-1.15.1-x86_64-unknown-freebsd.tar.gz) = 40550338
+SHA256 (rust/2017-02-09/rust-std-1.15.1-x86_64-unknown-freebsd.tar.gz) = b248153c40700e3837e99a8ff3b02c80b29119587badd7312b2394e2e3117a07
+SIZE (rust/2017-02-09/rust-std-1.15.1-x86_64-unknown-freebsd.tar.gz) = 54025347
+SHA256 (rust/6e0c18cccc8b0c06fba8a8d76486f81a792fb420/cargo-nightly-x86_64-unknown-freebsd.tar.gz) = b6212dc5342a471cba2ee2442d10c00065ed02e630355f2210eabd11933cbd00
+SIZE (rust/6e0c18cccc8b0c06fba8a8d76486f81a792fb420/cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 4982238
+SHA256 (rust/2017-02-09/rustc-1.15.1-i686-unknown-freebsd.tar.gz) = 87475427fcb216c516e47322119271b6044ca6f0d137926af9f040062ec6185f
+SIZE (rust/2017-02-09/rustc-1.15.1-i686-unknown-freebsd.tar.gz) = 42144420
+SHA256 (rust/2017-02-09/rust-std-1.15.1-i686-unknown-freebsd.tar.gz) = b1512971948dc66b09597748848ee9704cec9cc3632b03d90e5bf841ebbb7608
+SIZE (rust/2017-02-09/rust-std-1.15.1-i686-unknown-freebsd.tar.gz) = 55111077
+SHA256 (rust/6e0c18cccc8b0c06fba8a8d76486f81a792fb420/cargo-nightly-i686-unknown-freebsd.tar.gz) = 1c638142658cefda26a35fcec92674e57ee6b45ea4e21b8ec46c3bde93a96cfa
+SIZE (rust/6e0c18cccc8b0c06fba8a8d76486f81a792fb420/cargo-nightly-i686-unknown-freebsd.tar.gz) = 4796346
+SHA256 (rust/rust-registry-1.16.0.tar.xz) = 79a27c31e121fdf4dcb94720ffc1ec4f0775bdd2876093f3d8915d4ef8374ccd
+SIZE (rust/rust-registry-1.16.0.tar.xz) = 2752956
diff --git a/lang/rust/files/patch-src_bootstrap_compile.rs b/lang/rust/files/patch-src_bootstrap_compile.rs
deleted file mode 100644
index 126656a59c9b..000000000000
--- a/lang/rust/files/patch-src_bootstrap_compile.rs
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bootstrap/compile.rs.orig	2017-02-09 01:37:48 UTC
-+++ src/bootstrap/compile.rs
-@@ -187,7 +187,7 @@ pub fn rustc<'a>(build: &'a Build, targe
-     cargo.env("CFG_RELEASE", &build.release)
-          .env("CFG_RELEASE_CHANNEL", &build.config.channel)
-          .env("CFG_VERSION", &build.version)
--         .env("CFG_PREFIX", build.config.prefix.clone().unwrap_or(String::new()))
-+         .env("CFG_PREFIX", build.config.prefix.clone().unwrap_or(PathBuf::new()))
-          .env("CFG_LIBDIR_RELATIVE", "lib");
- 
-     // If we're not building a compiler with debugging information then remove
diff --git a/lang/rust/files/patch-src_bootstrap_config.rs b/lang/rust/files/patch-src_bootstrap_config.rs
deleted file mode 100644
index 921f55ae6b41..000000000000
--- a/lang/rust/files/patch-src_bootstrap_config.rs
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/bootstrap/config.rs.orig	2017-02-09 01:37:48 UTC
-+++ src/bootstrap/config.rs
-@@ -85,10 +85,10 @@ pub struct Config {
-     pub quiet_tests: bool,
-     // Fallback musl-root for all targets
-     pub musl_root: Option<PathBuf>,
--    pub prefix: Option<String>,
--    pub docdir: Option<String>,
--    pub libdir: Option<String>,
--    pub mandir: Option<String>,
-+    pub prefix: Option<PathBuf>,
-+    pub docdir: Option<PathBuf>,
-+    pub libdir: Option<PathBuf>,
-+    pub mandir: Option<PathBuf>,
-     pub codegen_tests: bool,
-     pub nodejs: Option<PathBuf>,
-     pub gdb: Option<PathBuf>,
-@@ -443,16 +443,16 @@ impl Config {
-                     self.channel = value.to_string();
-                 }
-                 "CFG_PREFIX" => {
--                    self.prefix = Some(value.to_string());
-+                    self.prefix = Some(PathBuf::from(value));
-                 }
-                 "CFG_DOCDIR" => {
--                    self.docdir = Some(value.to_string());
-+                    self.docdir = Some(PathBuf::from(value));
-                 }
-                 "CFG_LIBDIR" => {
--                    self.libdir = Some(value.to_string());
-+                    self.libdir = Some(PathBuf::from(value));
-                 }
-                 "CFG_MANDIR" => {
--                    self.mandir = Some(value.to_string());
-+                    self.mandir = Some(PathBuf::from(value));
-                 }
-                 "CFG_LLVM_ROOT" if value.len() > 0 => {
-                     let target = self.target_config.entry(self.build.clone())
diff --git a/lang/rust/files/patch-src_bootstrap_install.rs b/lang/rust/files/patch-src_bootstrap_install.rs
deleted file mode 100644
index 6483edba5a7b..000000000000
--- a/lang/rust/files/patch-src_bootstrap_install.rs
+++ /dev/null
@@ -1,79 +0,0 @@
---- src/bootstrap/install.rs.orig	2017-02-09 01:37:48 UTC
-+++ src/bootstrap/install.rs
-@@ -13,9 +13,9 @@
- //! This module is responsible for installing the standard library,
- //! compiler, and documentation.
- 
-+use std::env;
- use std::fs;
--use std::borrow::Cow;
--use std::path::Path;
-+use std::path::{Path, PathBuf, Component};
- use std::process::Command;
- 
- use Build;
-@@ -23,23 +23,35 @@ use dist::{package_vers, sanitize_sh, tm
- 
- /// Installs everything.
- pub fn install(build: &Build, stage: u32, host: &str) {
--    let prefix = build.config.prefix.as_ref().clone().map(|x| Path::new(x))
--        .unwrap_or(Path::new("/usr/local"));
--    let docdir = build.config.docdir.as_ref().clone().map(|x| Cow::Borrowed(Path::new(x)))
--        .unwrap_or(Cow::Owned(prefix.join("share/doc/rust")));
--    let libdir = build.config.libdir.as_ref().clone().map(|x| Cow::Borrowed(Path::new(x)))
--        .unwrap_or(Cow::Owned(prefix.join("lib")));
--    let mandir = build.config.mandir.as_ref().clone().map(|x| Cow::Borrowed(Path::new(x)))
--        .unwrap_or(Cow::Owned(prefix.join("share/man")));
-+    let prefix_default = PathBuf::from("/usr/local");
-+    let docdir_default = PathBuf::from("share/doc/rust");
-+    let mandir_default = PathBuf::from("share/man");
-+    let libdir_default = PathBuf::from("lib");
-+    let prefix = build.config.prefix.as_ref().unwrap_or(&prefix_default);
-+    let docdir = build.config.docdir.as_ref().unwrap_or(&docdir_default);
-+    let libdir = build.config.libdir.as_ref().unwrap_or(&libdir_default);
-+    let mandir = build.config.mandir.as_ref().unwrap_or(&mandir_default);
-+
-+    let docdir = prefix.join(docdir);
-+    let libdir = prefix.join(libdir);
-+    let mandir = prefix.join(mandir);
-+
-+    let destdir = env::var_os("DESTDIR").map(PathBuf::from);
-+
-+    let prefix = add_destdir(&prefix, &destdir);
-+    let docdir = add_destdir(&docdir, &destdir);
-+    let libdir = add_destdir(&libdir, &destdir);
-+    let mandir = add_destdir(&mandir, &destdir);
-+
-     let empty_dir = build.out.join("tmp/empty_dir");
-     t!(fs::create_dir_all(&empty_dir));
-     if build.config.docs {
--        install_sh(&build, "docs", "rust-docs", stage, host, prefix,
-+        install_sh(&build, "docs", "rust-docs", stage, host, &prefix,
-                    &docdir, &libdir, &mandir, &empty_dir);
-     }
--    install_sh(&build, "std", "rust-std", stage, host, prefix,
-+    install_sh(&build, "std", "rust-std", stage, host, &prefix,
-                &docdir, &libdir, &mandir, &empty_dir);
--    install_sh(&build, "rustc", "rustc", stage, host, prefix,
-+    install_sh(&build, "rustc", "rustc", stage, host, &prefix,
-                &docdir, &libdir, &mandir, &empty_dir);
-     t!(fs::remove_dir_all(&empty_dir));
- }
-@@ -59,3 +71,17 @@ fn install_sh(build: &Build, package: &s
-        .arg("--disable-ldconfig");
-     build.run(&mut cmd);
- }
-+
-+fn add_destdir(path: &Path, destdir: &Option<PathBuf>) -> PathBuf {
-+    let mut ret = match *destdir {
-+        Some(ref dest) => dest.clone(),
-+        None => return path.to_path_buf(),
-+    };
-+    for part in path.components() {
-+        match part {
-+            Component::Normal(s) => ret.push(s),
-+            _ => {}
-+        }
-+    }
-+    return ret
-+}