Index: lang/rust-nightly/Makefile
===================================================================
--- lang/rust-nightly/Makefile
+++ lang/rust-nightly/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rust-nightly
-PORTVERSION=	1.3.0.20150703
+PORTVERSION=	1.4.0.20150912
 CATEGORIES=	lang
 MASTER_SITES=	http://static.rust-lang.org/stage0-snapshots/:bootstrap
 DISTFILES=	${RUST_BOOT}:bootstrap
@@ -12,6 +12,15 @@
 		${DISTFILE_jemalloc} \
 		${DISTFILE_rust_installer}
 
+MAINTAINER=	dumbbell@FreeBSD.org
+COMMENT=	Language with a focus on memory safety and concurrency
+
+LICENSE=	APACHE20 \
+		MIT
+LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE-APACHE \
+		${WRKSRC}/LICENSE-MIT
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	rust-lang
 GH_PROJECT=	rust \
@@ -19,24 +28,18 @@
 		hoedown:hoedown \
 		jemalloc:jemalloc \
 		rust-installer:rust_installer
-GH_TAGNAME=	7b148381c7 \
+GH_TAGNAME=	d89a10b0a6 \
 		58ab642:compiler_rt \
-		238c4d5:hoedown \
+		8ff3d82:hoedown \
 		e24a1a0:jemalloc \
-		8e4f8ea:rust_installer
-
-MAINTAINER=	dumbbell@FreeBSD.org
-COMMENT=	Language with a focus on memory safety and concurrency
-
-LICENSE=	APACHE20 \
-		MIT
-LICENSE_COMB=	dual
-LICENSE_FILE=	${WRKSRC}/LICENSE-APACHE \
-		${WRKSRC}/LICENSE-MIT
+		c37d374:rust_installer
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	requires prebuilt bootstrap compiler
 
+RUST_PLATFORM=	${OPSYS:tl}
+RUST_ARCH=	${ARCH:C/amd64/x86_64/}
+
 # FIXME: The bootstrapped rustc adds -L/usr/local/lib in front of
 # the LDFLAGS. When stage0's rustc is linked, it picks the installed
 # librust*so and fails.
@@ -45,7 +48,7 @@
 CONFLICTS_INSTALL=	rust-nightly
 
 RUST_BOOT=	rust-stage0-${RUST_BOOT_SIG}.tar.bz2
-RUST_BOOT_SIG=	2015-05-24-ba0e1cd-freebsd-x86_64-370db40613f5c08563ed7e38357826dd42d4e0f8
+RUST_BOOT_SIG=	2015-08-11-1af31d4-${RUST_PLATFORM}-${RUST_ARCH}-de1f36592bac0eeb90c049a8421246652c511b9e
 
 # Rust's libraries are named librustc_${component}-${RUST_VSN_HASH}.so.
 # The hash depends on Rust version and, if the channel is not "stable",
@@ -55,7 +58,7 @@
 RUST_VSN_HASH!=	/usr/bin/printf '%s' ${RUST_VSN}-${RUST_CHANNEL} | /sbin/md5 -q | cut -c 1-8
 PLIST_SUB+=	RUST_VSN_HASH=${RUST_VSN_HASH}
 
-PLIST_SUB+=	RUST_TARGET=x86_64-unknown-${OPSYS:tl}
+PLIST_SUB+=	RUST_TARGET=${RUST_ARCH}-unknown-${RUST_PLATFORM}
 
 USES=		gmake libedit python:2,build
 HAS_CONFIGURE=	yes
@@ -118,7 +121,7 @@
 	  ${MV} ${WRKSRC_rust_installer} ${WRKSRC}/src/rust-installer)
 	@${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}|' \
Index: lang/rust-nightly/distinfo
===================================================================
--- lang/rust-nightly/distinfo
+++ lang/rust-nightly/distinfo
@@ -1,12 +1,12 @@
-SHA256 (rust-stage0-2015-05-24-ba0e1cd-freebsd-x86_64-370db40613f5c08563ed7e38357826dd42d4e0f8.tar.bz2) = 454530016c6a2f033de5fdfa6086a8caf78a597b99519f1b9a2ecbdd18b001eb
-SIZE (rust-stage0-2015-05-24-ba0e1cd-freebsd-x86_64-370db40613f5c08563ed7e38357826dd42d4e0f8.tar.bz2) = 13137436
-SHA256 (rust-lang-rust-1.3.0.20150703-7b148381c7_GH0.tar.gz) = 3df365a30727ffb733fe1cc20545b04eac7be20461c5bf3a51fc95b880a5fcf4
-SIZE (rust-lang-rust-1.3.0.20150703-7b148381c7_GH0.tar.gz) = 6490885
+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 (rust-lang-rust-1.4.0.20150912-d89a10b0a6_GH0.tar.gz) = 23a5d5566dcd535187f32125ff7e398d68eb3e89eb311772efa63f25a0da0862
+SIZE (rust-lang-rust-1.4.0.20150912-d89a10b0a6_GH0.tar.gz) = 6811545
 SHA256 (rust-lang-compiler-rt-58ab642_GH0.tar.gz) = 5553488bae570271b7faf9f112b2594bb70d802d3d071f9ab0e37919e6327f98
 SIZE (rust-lang-compiler-rt-58ab642_GH0.tar.gz) = 1938952
-SHA256 (rust-lang-hoedown-238c4d5_GH0.tar.gz) = e2e62b68cc4ea415c6d584f5e97a4b94f60023acde30345ec7bd68aa52739368
-SIZE (rust-lang-hoedown-238c4d5_GH0.tar.gz) = 60652
+SHA256 (rust-lang-hoedown-8ff3d82_GH0.tar.gz) = 6fb4557d94bab46bcc8ef16ca5ef98478980d8adf380818276e0fa148b07d322
+SIZE (rust-lang-hoedown-8ff3d82_GH0.tar.gz) = 65840
 SHA256 (rust-lang-jemalloc-e24a1a0_GH0.tar.gz) = c50c61eae80772cbc7af0905110c30fcea267a57bbc930df115bd4a647a5e2e1
 SIZE (rust-lang-jemalloc-e24a1a0_GH0.tar.gz) = 398919
-SHA256 (rust-lang-rust-installer-8e4f8ea_GH0.tar.gz) = c865d4d2542e2a6588d928857caf910e201e32e200005c485964717bde7970aa
-SIZE (rust-lang-rust-installer-8e4f8ea_GH0.tar.gz) = 14602
+SHA256 (rust-lang-rust-installer-c37d374_GH0.tar.gz) = 7cc41029b14de023dd4f250b332470c98cf9d1a77d174a20e93d78d07e4255f1
+SIZE (rust-lang-rust-installer-c37d374_GH0.tar.gz) = 19267
Index: lang/rust/Makefile
===================================================================
--- lang/rust/Makefile
+++ lang/rust/Makefile
@@ -23,6 +23,9 @@
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	requires prebuilt bootstrap compiler
 
+RUST_PLATFORM=	${OPSYS:tl}
+RUST_ARCH=	${ARCH:C/amd64/x86_64/}
+
 # FIXME: The bootstrapped rustc adds -L/usr/local/lib in front of
 # the LDFLAGS. When stage0's rustc is linked, it picks the installed
 # librust*so and fails.
@@ -32,7 +35,7 @@
 
 RUST_SOURCE=	${DISTNAME}-src${EXTRACT_SUFX}
 RUST_BOOT=	rust-stage0-${RUST_BOOT_SIG}.tar.bz2
-RUST_BOOT_SIG=	2015-05-24-ba0e1cd-freebsd-x86_64-370db40613f5c08563ed7e38357826dd42d4e0f8
+RUST_BOOT_SIG=	2015-05-24-ba0e1cd-${RUST_PLATFORM}-${RUST_ARCH}-370db40613f5c08563ed7e38357826dd42d4e0f8
 
 # Rust's libraries are named librustc_${component}-${RUST_VSN_HASH}.so.
 # The hash depends on Rust version and, if the channel is not "stable",
@@ -42,7 +45,7 @@
 RUST_VSN_HASH!=	/usr/bin/printf '%s' ${RUST_VSN} | /sbin/md5 -q | cut -c 1-8
 PLIST_SUB+=	RUST_VSN_HASH=${RUST_VSN_HASH}
 
-PLIST_SUB+=	RUST_TARGET=x86_64-unknown-${OPSYS:tl}
+PLIST_SUB+=	RUST_TARGET=${RUST_ARCH}-unknown-${RUST_PLATFORM}
 
 USES=		gmake libedit python:2,build
 HAS_CONFIGURE=	yes
@@ -97,7 +100,7 @@
 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}|' \