Update to upstream version 1.17.0

Submitted by:	dumbbell (see phabric URL)
Reviewed by:	riggs
Differential Revision:	https://reviews.freebsd.org/D10691

6 files changed, 23 insertions, 89 deletions

diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index c98a7de..b97f2ac 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rust
-PORTVERSION?=	1.16.0
+PORTVERSION?=	1.17.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?=		2017-02-09
-RUST_BOOTSTRAP_VERSION?=	1.15.1
+RUST_BOOTSTRAP_DIR?=		2017-03-11
+RUST_BOOTSTRAP_VERSION?=	1.16.0
 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?=		6e0c18cccc8b0c06fba8a8d76486f81a792fb420
+CARGO_BOOTSTRAP_DIR?=		6b05583d71f982bcad049b9fa094c637c062e751
 CARGO_BOOTSTRAP_VERSION?=	nightly
 CARGO_BOOTSTRAP=		${CARGO_BOOTSTRAP_DIR}/cargo-${CARGO_BOOTSTRAP_VERSION}-${RUST_TARGET}.tar.gz
 CARGO_REGISTRY=			${PORTNAME}-registry-${DISTVERSIONFULL}.tar.xz
@@ -86,7 +86,7 @@ LLNEXTGEN_BUILD_DEPENDS=	LLnextgen:devel/llnextgen
 PORT_LLVM_DESC=	Build against devel/llvm${LLVM_VER} instead of bundled version
 PORT_LLVM_BUILD_DEPENDS=	${LLVM_PREFIX}/bin/FileCheck:devel/llvm${LLVM_VER}
 PORT_LLVM_CONFIGURE_ON=		--llvm-root=${LLVM_PREFIX}
-LLVM_VER?=			39
+LLVM_VER?=			40
 LLVM_PREFIX=			${LOCALBASE}/llvm${LLVM_VER}
 
 # Note that make test does not work when rust is already installed
@@ -216,7 +216,7 @@ post-install:
 gen-registry:
 	${MAKE} -C${.CURDIR} -DSKIP_CARGO_REGISTRY makesum
 	${MAKE} -C${.CURDIR} -DSKIP_CARGO_REGISTRY
-	${TAR} cJvf ${_DISTDIR}/${DIST_SUBDIR}/${CARGO_REGISTRY} -C${WRKDIR} \
+	${TAR} cJvf ${DISTDIR}/${DIST_SUBDIR}/${CARGO_REGISTRY} -C${WRKDIR} \
 		--uid 0 --gid 0 \
 		--exclude 'src/*/benches/' \
 		--exclude 'src/*/ci/' \
diff --git a/lang/rust/distinfo b/lang/rust/distinfo
index 0e0debc..7d37244 100644
--- a/lang/rust/distinfo
+++ b/lang/rust/distinfo
@@ -1,17 +1,17 @@
-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
+TIMESTAMP = 1494452289
+SHA256 (rust/rustc-1.17.0-src.tar.gz) = 4baba3895b75f2492df6ce5a28a916307ecd1c088dc1fd02dbfa8a8e86174f87
+SIZE (rust/rustc-1.17.0-src.tar.gz) = 31570599
+SHA256 (rust/2017-03-11/rustc-1.16.0-x86_64-unknown-freebsd.tar.gz) = d88e4990850cf8bbcc26c5209008b1ecf18fedec1520c33e9aa991f71dcdd45b
+SIZE (rust/2017-03-11/rustc-1.16.0-x86_64-unknown-freebsd.tar.gz) = 41099546
+SHA256 (rust/2017-03-11/rust-std-1.16.0-x86_64-unknown-freebsd.tar.gz) = d228af9d8600394e5fe706495c715065f8cd03b987bec1e95fb6ca761f252ad5
+SIZE (rust/2017-03-11/rust-std-1.16.0-x86_64-unknown-freebsd.tar.gz) = 54920061
+SHA256 (rust/6b05583d71f982bcad049b9fa094c637c062e751/cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 924b172afe6a990ae19b346ef5ca2a6203f68a22af8d7229039fdc28068ff125
+SIZE (rust/6b05583d71f982bcad049b9fa094c637c062e751/cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 4970379
+SHA256 (rust/2017-03-11/rustc-1.16.0-i686-unknown-freebsd.tar.gz) = 6d32e211c0e9d33adc65f96f06d3996d8e167a29df85ddc6d877d424f82c7443
+SIZE (rust/2017-03-11/rustc-1.16.0-i686-unknown-freebsd.tar.gz) = 42809380
+SHA256 (rust/2017-03-11/rust-std-1.16.0-i686-unknown-freebsd.tar.gz) = 62c2f030cefe475b7c9e349543f134d3a9ad22830b0422db8230f47e7619fc5f
+SIZE (rust/2017-03-11/rust-std-1.16.0-i686-unknown-freebsd.tar.gz) = 56177493
+SHA256 (rust/6b05583d71f982bcad049b9fa094c637c062e751/cargo-nightly-i686-unknown-freebsd.tar.gz) = d78cf656a4393e2b65d03391e29081fa6e337fd2cf4ad896227a385cbbec7cf4
+SIZE (rust/6b05583d71f982bcad049b9fa094c637c062e751/cargo-nightly-i686-unknown-freebsd.tar.gz) = 4793178
+SHA256 (rust/rust-registry-1.17.0.tar.xz) = 6f42ca97bbcc195d8140a3e62db6797c8ed2e86ed763b7c63aaf32edcbcd2556
+SIZE (rust/rust-registry-1.17.0.tar.xz) = 7364540
diff --git a/lang/rust/files/patch-mk_cfg_i686-unknown-freebsd.mk b/lang/rust/files/patch-mk_cfg_i686-unknown-freebsd.mk
deleted file mode 100644
index cde383f6..0000000
--- a/lang/rust/files/patch-mk_cfg_i686-unknown-freebsd.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- mk/cfg/i686-unknown-freebsd.mk.orig	2016-09-27 07:17:04 UTC
-+++ mk/cfg/i686-unknown-freebsd.mk
-@@ -7,9 +7,9 @@ CFG_LIB_NAME_i686-unknown-freebsd=lib$(1
- CFG_STATIC_LIB_NAME_i686-unknown-freebsd=lib$(1).a
- CFG_LIB_GLOB_i686-unknown-freebsd=lib$(1)-*.so
- CFG_LIB_DSYM_GLOB_i686-unknown-freebsd=$(1)-*.dylib.dSYM
--CFG_JEMALLOC_CFLAGS_i686-unknown-freebsd := -m32 -I/usr/local/include $(CFLAGS)
--CFG_GCCISH_CFLAGS_i686-unknown-freebsd :=  -g -fPIC -m32 -arch i386 -I/usr/local/include $(CFLAGS)
--CFG_GCCISH_LINK_FLAGS_i686-unknown-freebsd := -m32 -shared -fPIC -g -pthread -lrt
-+CFG_JEMALLOC_CFLAGS_i686-unknown-freebsd := -I/usr/local/include $(CFLAGS)
-+CFG_GCCISH_CFLAGS_i686-unknown-freebsd :=  -g -fPIC -arch i386 -I/usr/local/include $(CFLAGS)
-+CFG_GCCISH_LINK_FLAGS_i686-unknown-freebsd := -shared -fPIC -g -pthread -lrt
- CFG_GCCISH_DEF_FLAG_i686-unknown-freebsd := -Wl,--export-dynamic,--dynamic-list=
- CFG_LLC_FLAGS_i686-unknown-freebsd :=
- CFG_INSTALL_NAME_i686-unknown-freebsd =
diff --git a/lang/rust/files/patch-mk_install.mk b/lang/rust/files/patch-mk_install.mk
deleted file mode 100644
index 94b5e57..0000000
--- a/lang/rust/files/patch-mk_install.mk
+++ /dev/null
@@ -1,28 +0,0 @@
---- mk/install.mk.orig	2016-03-01 19:18:54 UTC
-+++ mk/install.mk
-@@ -15,12 +15,7 @@ RUN_INSTALLER = cd tmp/empty_dir && \
- 		--mandir="$(DESTDIR)$(CFG_MANDIR)"
- 
- install:
--ifeq (root user, $(USER) $(patsubst %,user,$(SUDO_USER)))
--# Build the dist as the original user
--	$(Q)sudo -u "$$SUDO_USER" $(MAKE) prepare_install
--else
- 	$(Q)$(MAKE) prepare_install
--endif
- ifeq ($(CFG_DISABLE_DOCS),)
- 	$(Q)$(call RUN_INSTALLER,$(DOC_PKG_NAME)-$(CFG_BUILD)) --disable-ldconfig
- endif
-@@ -33,12 +28,7 @@ endif
- prepare_install: dist-tar-bins | tmp/empty_dir
- 
- uninstall:
--ifeq (root user, $(USER) $(patsubst %,user,$(SUDO_USER)))
--# Build the dist as the original user
--	$(Q)sudo -u "$$SUDO_USER" $(MAKE) prepare_uninstall
--else
- 	$(Q)$(MAKE) prepare_uninstall
--endif
- ifeq ($(CFG_DISABLE_DOCS),)
- 	$(Q)$(call RUN_INSTALLER,$(DOC_PKG_NAME)-$(CFG_BUILD)) --uninstall
- endif
diff --git a/lang/rust/files/patch-mk_main.mk b/lang/rust/files/patch-mk_main.mk
deleted file mode 100644
index 5288c86..0000000
--- a/lang/rust/files/patch-mk_main.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- mk/main.mk.orig	2015-09-03 11:50:44 UTC
-+++ mk/main.mk
-@@ -107,7 +107,7 @@ ifneq ($(wildcard $(NON_BUILD_TARGET)),)
- CFG_INFO := $(info cfg: non-build target triples $(NON_BUILD_TARGET))
- endif
- 
--CFG_RUSTC_FLAGS := $(RUSTFLAGS)
-+CFG_RUSTC_FLAGS := $(RUSTFLAGS) -L%%LOCALBASE%%/lib
- CFG_GCCISH_CFLAGS :=
- CFG_GCCISH_LINK_FLAGS :=
- 
diff --git a/lang/rust/files/patch-src_etc_get-stage0.py b/lang/rust/files/patch-src_etc_get-stage0.py
deleted file mode 100644
index 1f624e9..0000000
--- a/lang/rust/files/patch-src_etc_get-stage0.py
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/etc/get-stage0.py.orig	2016-10-01 07:20:20 UTC
-+++ src/etc/get-stage0.py
-@@ -31,7 +31,8 @@ def main(triple):
-     filename = 'rustc-{}-{}.tar.gz'.format(channel, triple)
-     url = 'https://static.rust-lang.org/dist/{}/{}'.format(date, filename)
-     dst = dl_dir + '/' + filename
--    bootstrap.get(url, dst)
-+    if not os.path.exists(dst):
-+            bootstrap.get(url, dst)
- 
-     stage0_dst = triple + '/stage0'
-     if os.path.exists(stage0_dst):