5 files changed, 18 insertions, 14 deletions

diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index dd6782fdf0ca..4640f6ccdafb 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rust
-PORTVERSION=	1.6.0
+PORTVERSION=	1.7.0
 CATEGORIES=	lang
 MASTER_SITES=	http://static.rust-lang.org/dist/:src \
 		http://static.rust-lang.org/stage0-snapshots/:bootstrap
@@ -35,8 +35,8 @@ CONFLICTS_INSTALL=	rust-nightly
 RUST_SOURCE=	${DISTNAME}-src${EXTRACT_SUFX}
 RUST_BOOT=	rust-stage0-${RUST_BOOT_SIG_${ARCH}}.tar.bz2
 
-RUST_BOOT_SIG_amd64=	2015-08-11-1af31d4-freebsd-x86_64-de1f36592bac0eeb90c049a8421246652c511b9e
-RUST_BOOT_SIG_i386=	2015-08-11-1af31d4-freebsd-i386-3cd4a44fb97b3135be3d1b760bea604a381e85dc
+RUST_BOOT_SIG_amd64=	2015-12-18-3391630-freebsd-x86_64-91724d4e655807a2a2e940ac50992ebeaac16ea9
+RUST_BOOT_SIG_i386=	2015-12-18-3391630-freebsd-i386-7e624c50494402e1feb14c743d659fbd71b448f5
 
 # Rust's libraries are named librustc_${component}-${RUST_VSN_HASH}.so.
 # The hash depends on Rust version and, if the channel is not "stable",
@@ -111,7 +111,7 @@ pre-fetch:
 post-extract:
 	@${MKDIR} ${WRKSRC}/dl
 	${LN} -sf ${DISTDIR}/${RUST_BOOT} ${WRKSRC}/dl
-	(cd ${WRKSRC} && ${FIND} . -type d -exec chmod 0755 {} \;)
+	(cd ${WRKSRC} && ${FIND} . -type d -exec ${CHMOD} 0755 {} \;)
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
diff --git a/lang/rust/distinfo.amd64 b/lang/rust/distinfo.amd64
index 2ba233fc318f..956ef169314e 100644
--- a/lang/rust/distinfo.amd64
+++ b/lang/rust/distinfo.amd64
@@ -1,4 +1,4 @@
-SHA256 (rustc-1.6.0-src.tar.gz) = 3002a4a00004b0727709abeefe1ab1b2731845e4dab74566f363861801bb3326
-SIZE (rustc-1.6.0-src.tar.gz) = 24978399
-SHA256 (rust-stage0-2015-08-11-1af31d4-freebsd-x86_64-de1f36592bac0eeb90c049a8421246652c511b9e.tar.bz2) = e609347d8bf2d69b613068b8d7f158199e509fc14e859d343ba6d65c9ad76e24
-SIZE (rust-stage0-2015-08-11-1af31d4-freebsd-x86_64-de1f36592bac0eeb90c049a8421246652c511b9e.tar.bz2) = 13973360
+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
diff --git a/lang/rust/distinfo.i386 b/lang/rust/distinfo.i386
index 4cd3bd70449b..bca169213eb2 100644
--- a/lang/rust/distinfo.i386
+++ b/lang/rust/distinfo.i386
@@ -1,4 +1,4 @@
-SHA256 (rustc-1.6.0-src.tar.gz) = 3002a4a00004b0727709abeefe1ab1b2731845e4dab74566f363861801bb3326
-SIZE (rustc-1.6.0-src.tar.gz) = 24978399
-SHA256 (rust-stage0-2015-08-11-1af31d4-freebsd-i386-3cd4a44fb97b3135be3d1b760bea604a381e85dc.tar.bz2) = 7ec34452c645ee6a7287ac58ac3bec94c1eb713777d98c5339fa57fc4f0ee49e
-SIZE (rust-stage0-2015-08-11-1af31d4-freebsd-i386-3cd4a44fb97b3135be3d1b760bea604a381e85dc.tar.bz2) = 14488008
+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
diff --git a/lang/rust/files/patch-mk_cfg_i686-unknown-freebsd.mk b/lang/rust/files/patch-mk_cfg_i686-unknown-freebsd.mk
index 407deef73bab..bc88caaa47b4 100644
--- a/lang/rust/files/patch-mk_cfg_i686-unknown-freebsd.mk
+++ b/lang/rust/files/patch-mk_cfg_i686-unknown-freebsd.mk
@@ -1,10 +1,10 @@
---- mk/cfg/i686-unknown-freebsd.mk.orig	2015-09-15 21:28:41 UTC
+--- mk/cfg/i686-unknown-freebsd.mk.orig	2016-03-01 19:18:54 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 -arch i386 -I/usr/local/include $(CFLAGS)
+-CFG_JEMALLOC_CFLAGS_i686-unknown-freebsd := -m32 -I/usr/local/include $(CFLAGS)
 -CFG_GCCISH_CFLAGS_i686-unknown-freebsd := -Wall -Werror -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)
diff --git a/lang/rust/pkg-plist b/lang/rust/pkg-plist
index ccf098838087..b71a98c98975 100644
--- a/lang/rust/pkg-plist
+++ b/lang/rust/pkg-plist
@@ -18,6 +18,7 @@ lib/librustc_lint-%%RUST_VSN_HASH%%.so
 lib/librustc_llvm-%%RUST_VSN_HASH%%.so
 lib/librustc_metadata-%%RUST_VSN_HASH%%.so
 lib/librustc_mir-%%RUST_VSN_HASH%%.so
+lib/librustc_passes-%%RUST_VSN_HASH%%.so
 lib/librustc_platform_intrinsics-%%RUST_VSN_HASH%%.so
 lib/librustc_plugin-%%RUST_VSN_HASH%%.so
 lib/librustc_privacy-%%RUST_VSN_HASH%%.so
@@ -28,6 +29,7 @@ lib/librustdoc-%%RUST_VSN_HASH%%.so
 lib/libserialize-%%RUST_VSN_HASH%%.so
 lib/libstd-%%RUST_VSN_HASH%%.so
 lib/libsyntax-%%RUST_VSN_HASH%%.so
+lib/libsyntax_ext-%%RUST_VSN_HASH%%.so
 lib/libterm-%%RUST_VSN_HASH%%.so
 lib/libtest-%%RUST_VSN_HASH%%.so
 lib/rustlib/components
@@ -70,6 +72,7 @@ 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
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_mir-%%RUST_VSN_HASH%%.so
+lib/rustlib/%%RUST_TARGET%%/lib/librustc_passes-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_platform_intrinsics-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_plugin-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_privacy-%%RUST_VSN_HASH%%.so
@@ -83,6 +86,7 @@ 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
 lib/rustlib/%%RUST_TARGET%%/lib/libsyntax-%%RUST_VSN_HASH%%.so
+lib/rustlib/%%RUST_TARGET%%/lib/libsyntax_ext-%%RUST_VSN_HASH%%.so
 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