Index: devel/cargo/Makefile
===================================================================
--- devel/cargo/Makefile
+++ devel/cargo/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cargo
-PORTVERSION=	0.17.0
+PORTVERSION=	0.18.0
 CATEGORIES=	devel
 
 MAINTAINER=	dumbbell@FreeBSD.org
@@ -33,7 +33,8 @@
 #   This is a collection of mainly shell scripts which are used to
 #   install Cargo.
 
-MASTER_SITES=	https://s3.amazonaws.com/rust-lang-ci/cargo-builds/:cargo_bootstrap
+MASTER_SITES=	https://s3.amazonaws.com/rust-lang-ci/cargo-builds/:cargo_bootstrap \
+		LOCAL/dumbbell/rust:cargo_bootstrap
 .if !defined(SKIP_CARGO_REGISTRY)
 MASTER_SITES+=	LOCAL/dumbbell/rust:registry
 DISTFILES+=	${CARGO_REGISTRY}:registry
@@ -43,27 +44,30 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	rust-lang
 GH_PROJECT=	rust-installer:rust_installer
-GH_TAGNAME=	755bc3d:rust_installer
+GH_TAGNAME=	4f99485:rust_installer
 GH_SUBDIR=	src/rust-installer:rust_installer
 
-ONLY_FOR_ARCHS=	amd64 i386
+ONLY_FOR_ARCHS=		aarch64 amd64 i386
 ONLY_FOR_ARCHS_REASON=	requires prebuilt bootstrap cargo
 
 # Rust's target arch string is different from *BSD arch strings
-RUST_ARCH_x86_64=	x86_64 # dragonfly
+RUST_ARCH_aarch64=	aarch64
 RUST_ARCH_amd64=	x86_64
 RUST_ARCH_i386=		i686
+RUST_ARCH_x86_64=	x86_64 # dragonfly
 RUST_TARGET=		${RUST_ARCH_${ARCH}}-unknown-${OPSYS:tl}
 
-CARGO_BOOTSTRAP_DIR?=		fbeea902d2c9a5be6d99cc35681565d8f7832592
+CARGO_BOOTSTRAP_DIR?=		6b05583d71f982bcad049b9fa094c637c062e751
+CARGO_BOOTSTRAP_DIR_aarch64?=	2017-04-24
 CARGO_BOOTSTRAP_VERSION?=	nightly
-CARGO_BOOTSTRAP=		${CARGO_BOOTSTRAP_DIR}/cargo-${CARGO_BOOTSTRAP_VERSION}-${RUST_TARGET}${EXTRACT_SUFX}
+CARGO_BOOTSTRAP_VERSION_aarch64?=0.18.0
+CARGO_BOOTSTRAP=		${CARGO_BOOTSTRAP_DIR_${ARCH}:U${CARGO_BOOTSTRAP_DIR}}/cargo-${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}-${RUST_TARGET}${EXTRACT_SUFX}
 CARGO_REGISTRY=			${PORTNAME}-registry-${DISTVERSIONFULL}.tar.xz
 
 # We don't USES=cmake here, because cmake is not Cargo's build system.
 # It's used by a bundled dependency (libgit2).
 BUILD_DEPENDS=	cmake:devel/cmake \
-		${RUST_PORT:T}>=1.14.0:${RUST_PORT}
+		${RUST_PORT:T}>=1.17.0:${RUST_PORT}
 LIB_DEPENDS=	libssh2.so:security/libssh2 \
 		libcurl.so:ftp/curl
 RUN_DEPENDS=	rustc:${RUST_PORT}
@@ -82,7 +86,7 @@
 OPTIONS_DEFAULT=BOOTSTRAP
 
 BOOTSTRAP_DESC=		Bootstrap using pre-built vendor snapshot
-BOOTSTRAP_CONFIGURE_ON=	--cargo="${WRKDIR}/${PORTNAME}-nightly-${RUST_TARGET}/cargo/bin/cargo"
+BOOTSTRAP_CONFIGURE_ON=	--cargo="${WRKDIR}/${PORTNAME}-${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}-${RUST_TARGET}/cargo/bin/cargo"
 BOOTSTRAP_CONFIGURE_OFF=--cargo="$$(command -v cargo)" # respect PATH
 BOOTSTRAP_DISTFILES=	${CARGO_BOOTSTRAP}:cargo_bootstrap
 BOOTSTRAP_MAKE_ENV=	LD_LIBRARY_PATH="${WRKSRC}/target/snapshot/cargo/lib"
Index: devel/cargo/distinfo
===================================================================
--- devel/cargo/distinfo
+++ devel/cargo/distinfo
@@ -1,11 +1,13 @@
-TIMESTAMP = 1489831804
-SHA256 (rust/cargo-registry-0.17.0.tar.xz) = 3cd3855141f6d2e24e32c5e49b0db3853fa4c7f0b28421899611ec74c3560a98
-SIZE (rust/cargo-registry-0.17.0.tar.xz) = 21855340
-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/fbeea902d2c9a5be6d99cc35681565d8f7832592/cargo-nightly-i686-unknown-freebsd.tar.gz) = ed027f7fae62001c6bcc3682143d77faac336acde72aa8e539662bb4c5691259
-SIZE (rust/fbeea902d2c9a5be6d99cc35681565d8f7832592/cargo-nightly-i686-unknown-freebsd.tar.gz) = 4500714
-SHA256 (rust/rust-lang-cargo-0.17.0_GH0.tar.gz) = fc689ca7a09f1e6a1c31e69f0e2616a93576a68e0e1d7f0ae4c0d3301ff21ff8
-SIZE (rust/rust-lang-cargo-0.17.0_GH0.tar.gz) = 638004
-SHA256 (rust/rust-lang-rust-installer-755bc3d_GH0.tar.gz) = 103a502bad7af80eef7ccd2dd2969a272a6fa3f237ebeaca083315a45878f07f
-SIZE (rust/rust-lang-rust-installer-755bc3d_GH0.tar.gz) = 19193
+TIMESTAMP = 1495524471
+SHA256 (rust/cargo-registry-0.18.0.tar.xz) = c0668d0c402f8039186a3956249d9d96ea3e0955693a8326644491b864516406
+SIZE (rust/cargo-registry-0.18.0.tar.xz) = 18271080
+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/6b05583d71f982bcad049b9fa094c637c062e751/cargo-nightly-i686-unknown-freebsd.tar.gz) = d78cf656a4393e2b65d03391e29081fa6e337fd2cf4ad896227a385cbbec7cf4
+SIZE (rust/6b05583d71f982bcad049b9fa094c637c062e751/cargo-nightly-i686-unknown-freebsd.tar.gz) = 4793178
+SHA256 (rust/2017-04-24/cargo-0.18.0-aarch64-unknown-freebsd.tar.gz) = 8cdbf046bfc98e1cb92b89c306e4389b92a8df9db44b8f7c784aaac25ad52877
+SIZE (rust/2017-04-24/cargo-0.18.0-aarch64-unknown-freebsd.tar.gz) = 2935624
+SHA256 (rust/rust-lang-cargo-0.18.0_GH0.tar.gz) = 19b5c142c194fc2f940d93b4679850980ed077db0ff7c558122c7ef865e24983
+SIZE (rust/rust-lang-cargo-0.18.0_GH0.tar.gz) = 646126
+SHA256 (rust/rust-lang-rust-installer-4f99485_GH0.tar.gz) = daa34a28d8fe64dd358e5a0c3a83b7018da6df41c9b4420d28ffdb8b05a82478
+SIZE (rust/rust-lang-rust-installer-4f99485_GH0.tar.gz) = 19990