4 files changed, 95 insertions, 102 deletions

diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 73e8337af073..8ef2f4079ce9 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rust
-PORTVERSION=	0.11.0
-PORTREVISION=	1
+PORTVERSION=	0.12.0
 CATEGORIES=	lang
 MASTER_SITES=	http://static.rust-lang.org/dist/:src \
 		http://static.rust-lang.org/stage0-snapshots/:bootstrap
@@ -25,7 +24,7 @@ ONLY_FOR_ARCHS_REASON=	requires prebuilt bootstrap compiler
 
 RUST_SOURCE=	${DISTNAME}${EXTRACT_SUFX}
 RUST_BOOT=	rust-stage0-${RUST_BOOT_SIG}.tar.bz2
-RUST_BOOT_SIG=	2014-06-21-db9af1d-freebsd-x86_64-ef2bd0fc0b0efa2bd6f5c1eaa60a2ec8df533254
+RUST_BOOT_SIG=	2014-10-04-749ff5e-freebsd-x86_64-f39d94487d29b3d48217b1295ad2cda8c941e694
 
 USES=		gmake perl5 python:2
 HAS_CONFIGURE=	yes
@@ -56,9 +55,9 @@ post-extract:
 
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/manifest
-	@${STRIP_CMD} `${GREP} -v -e '^@dirrm' -e '^man' -e 'rlib$$' \
+	@${STRIP_CMD} `${GREP} -v -e '^@dir' -e '^man' -e 'rlib$$' \
 		${PLIST} | ${SED} 's:^:${STAGEDIR}${PREFIX}/:'`
-	@${STRIP_CMD} `${GREP} -v -e '^@dirrm' -e '^man' -e 'rlib$$' \
+	@${STRIP_CMD} `${GREP} -v -e '^@dir' -e '^man' -e 'rlib$$' \
 		-e '\.a$$' ${PLIST} | ${SED} 's:^:${STAGEDIR}${PREFIX}/:g'`
 
 .include <bsd.port.post.mk>
diff --git a/lang/rust/distinfo b/lang/rust/distinfo
index 989ee0fa90cc..2a3bd3c16e4d 100644
--- a/lang/rust/distinfo
+++ b/lang/rust/distinfo
@@ -1,4 +1,4 @@
-SHA256 (rust-0.11.0.tar.gz) = d1b3e36448bf12b8c9289024df416de10774b6d3235d7b1d22b248ef634411ba
-SIZE (rust-0.11.0.tar.gz) = 21555837
-SHA256 (rust-stage0-2014-06-21-db9af1d-freebsd-x86_64-ef2bd0fc0b0efa2bd6f5c1eaa60a2ec8df533254.tar.bz2) = 25d052162926e4876e36fb61018c40e84cd7032f215ff954d2b8c26c70115976
-SIZE (rust-stage0-2014-06-21-db9af1d-freebsd-x86_64-ef2bd0fc0b0efa2bd6f5c1eaa60a2ec8df533254.tar.bz2) = 12293226
+SHA256 (rust-0.12.0.tar.gz) = 883e66b24d90d9957c5c538469fcde6f0668e5fb6448beecfc60884060e769b7
+SIZE (rust-0.12.0.tar.gz) = 21223176
+SHA256 (rust-stage0-2014-10-04-749ff5e-freebsd-x86_64-f39d94487d29b3d48217b1295ad2cda8c941e694.tar.bz2) = 3f486b75a92c96b4bb63cb043037e6ff58bf5adde9d29e9e197959d6959de0b2
+SIZE (rust-stage0-2014-10-04-749ff5e-freebsd-x86_64-f39d94487d29b3d48217b1295ad2cda8c941e694.tar.bz2) = 12701560
diff --git a/lang/rust/files/patch-src__libuv__gyp_uv.py b/lang/rust/files/patch-src__libuv__gyp_uv.py
deleted file mode 100644
index fdb69da9c7c5..000000000000
--- a/lang/rust/files/patch-src__libuv__gyp_uv.py
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./src/libuv/gyp_uv.py.orig	2014-06-28 04:53:11.000000000 +0900
-+++ ./src/libuv/gyp_uv.py	2014-07-17 12:32:13.000000000 +0900
-@@ -96,6 +96,9 @@
- 
-   if sys.platform == 'darwin' and '-DOS=android' in sys.argv[1:]:
-     sys.platform='linux'    
-+
-+  if sys.platform.startswith('freebsd'):
-+    args.append('--no-parallel')
-     
-   gyp_args = list(args)
-   print gyp_args
diff --git a/lang/rust/pkg-plist b/lang/rust/pkg-plist
index ca8b4602e4ac..85ae3ab64336 100644
--- a/lang/rust/pkg-plist
+++ b/lang/rust/pkg-plist
@@ -1,85 +1,91 @@
 bin/rustc
 bin/rustdoc
-lib/libarena-b986d21c-0.11.0.so
-lib/libdebug-259338fe-0.11.0.so
-lib/libflate-dd202f5d-0.11.0.so
-lib/libfmt_macros-1d4f94bf-0.11.0.so
-lib/libgetopts-de95cee8-0.11.0.so
-lib/libgraphviz-c1a03dc9-0.11.0.so
-lib/liblog-cd31a5b6-0.11.0.so
-lib/libnative-35e04b6f-0.11.0.so
-lib/libregex-c7058059-0.11.0.so
-lib/librustc-a9826c4a-0.11.0.so
-lib/librustdoc-851f57e3-0.11.0.so
-lib/librustrt-805dca70-0.11.0.so
-lib/libserialize-c021c5fb-0.11.0.so
-lib/libstd-e32fa708-0.11.0.so
-lib/libsync-eaefc6bd-0.11.0.so
-lib/libsyntax-cb63d668-0.11.0.so
-lib/libterm-3510b061-0.11.0.so
-lib/libtest-93b19fbd-0.11.0.so
-lib/libtime-63ba030f-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/liballoc-b6751242-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/libarena-b986d21c-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/libarena-b986d21c-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/libcollections-0ca54e03-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/libcompiler-rt.a
-lib/rustlib/x86_64-unknown-freebsd/lib/libcore-689cffe6-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/libdebug-259338fe-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/libdebug-259338fe-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/libflate-dd202f5d-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/libflate-dd202f5d-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/libfmt_macros-1d4f94bf-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/libfourcc-a33fb22e-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/libgetopts-de95cee8-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/libgetopts-de95cee8-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/libglob-1b430430-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/libglob-1b430430-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/libgraphviz-c1a03dc9-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/libgraphviz-c1a03dc9-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/libgreen-d290d028-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/libgreen-d290d028-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/libhexfloat-9f6f391f-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/liblibc-fad3bb9d-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/liblog-cd31a5b6-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/liblog-cd31a5b6-0.11.0.so
+lib/libgetopts-4e7c5e5c.so
+lib/librustc_llvm-4e7c5e5c.so
+lib/librustdoc-4e7c5e5c.so
+lib/libnative-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/libstd-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libfourcc-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/liblog-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libcollections-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/librbml-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/liballoc-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libuuid-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/libtime-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libgetopts-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/librustc_llvm-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/librustdoc-4e7c5e5c.so
 lib/rustlib/x86_64-unknown-freebsd/lib/libmorestack.a
-lib/rustlib/x86_64-unknown-freebsd/lib/libnative-35e04b6f-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/libnative-35e04b6f-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/libnum-8b683e59-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/libnum-8b683e59-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/librand-96f3f4c6-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/libregex-c7058059-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/libregex-c7058059-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/libregex_macros-eaf06519-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/librlibc-7494a78e-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/librustc-a9826c4a-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/librustdoc-851f57e3-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/librustrt-805dca70-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/librustrt-805dca70-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/librustuv-e71b02d9-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/librustuv-e71b02d9-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/libsemver-9f099863-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/libsemver-9f099863-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/libserialize-c021c5fb-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/libserialize-c021c5fb-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/libstd-e32fa708-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/libstd-e32fa708-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/libsync-eaefc6bd-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/libsync-eaefc6bd-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/libsyntax-cb63d668-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/libterm-3510b061-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/libterm-3510b061-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/libtest-93b19fbd-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/libtest-93b19fbd-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/libtime-63ba030f-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/libtime-63ba030f-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/liburl-49817968-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/liburl-49817968-0.11.0.so
-lib/rustlib/x86_64-unknown-freebsd/lib/libuuid-516f5013-0.11.0.rlib
-lib/rustlib/x86_64-unknown-freebsd/lib/libuuid-516f5013-0.11.0.so
-man/man1/rustc.1.gz
+lib/rustlib/x86_64-unknown-freebsd/lib/libnative-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/libcore-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libhexfloat-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/librustc_back-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/librustrt-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libunicode-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libgetopts-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libflate-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/libsync-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/librlibc-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libflate-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libserialize-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libregex-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/liburl-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libregex_macros-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/libgreen-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libgraphviz-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/libsyntax-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/libdebug-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libnum-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libnative-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/librand-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libterm-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libtest-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libarena-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libcompiler-rt.a
+lib/rustlib/x86_64-unknown-freebsd/lib/libarena-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/libtime-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/liblog-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/libregex-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/librbml-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/libglob-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/libterm-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/libserialize-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/libdebug-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/libnum-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/libsemver-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/libglob-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libtest-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/libgreen-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/librustrt-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/libsemver-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libfmt_macros-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/libgraphviz-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libuuid-4e7c5e5c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libsync-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/libstd-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/liburl-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/librustc-4e7c5e5c.so
+lib/rustlib/x86_64-unknown-freebsd/lib/liblibc-4e7c5e5c.rlib
+lib/librustc_back-4e7c5e5c.so
+lib/libflate-4e7c5e5c.so
+lib/libregex-4e7c5e5c.so
+lib/libgraphviz-4e7c5e5c.so
+lib/libsyntax-4e7c5e5c.so
+lib/libarena-4e7c5e5c.so
+lib/libtime-4e7c5e5c.so
+lib/liblog-4e7c5e5c.so
+lib/librbml-4e7c5e5c.so
+lib/libterm-4e7c5e5c.so
+lib/libserialize-4e7c5e5c.so
+lib/libdebug-4e7c5e5c.so
+lib/libtest-4e7c5e5c.so
+lib/librustrt-4e7c5e5c.so
+lib/libfmt_macros-4e7c5e5c.so
+lib/libsync-4e7c5e5c.so
+lib/libstd-4e7c5e5c.so
+lib/librustc-4e7c5e5c.so
 man/man1/rustdoc.1.gz
-@dirrmtry lib/rustlib/x86_64-unknown-freebsd/lib
-@dirrmtry lib/rustlib/x86_64-unknown-freebsd
-@dirrmtry lib/rustlib
+man/man1/rustc.1.gz
+@dir lib/rustlib/x86_64-unknown-freebsd/lib
+@dir lib/rustlib/x86_64-unknown-freebsd
+@dir lib/rustlib