Index: devel/cargo/Makefile
===================================================================
--- devel/cargo/Makefile
+++ devel/cargo/Makefile
@@ -39,6 +39,7 @@
 DISTFILES+=	${CARGO_REGISTRY}:registry
 .endif
 DISTINFO_FILE=	${.CURDIR}/distinfo.${ARCH}
+DIST_SUBDIR=	${PORTNAME}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rust-lang
Index: devel/cargo/distinfo.amd64
===================================================================
--- devel/cargo/distinfo.amd64
+++ devel/cargo/distinfo.amd64
@@ -1,9 +1,9 @@
 TIMESTAMP = 1484954237
-SHA256 (cargo-registry-0.15.0.tar.xz) = 9dcc9747b86f6e647ad429de5df854c69fb4d259c2f4619f22a02a8af6bb6d92
-SIZE (cargo-registry-0.15.0.tar.xz) = 21559740
-SHA256 (cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 4d5e6203d8f6825debb99b4a9e4c8ac2177c55dd2d13458ad6fb972e947bf933
-SIZE (cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 4516956
-SHA256 (rust-lang-cargo-0.15.0_GH0.tar.gz) = 6ebe9e0de255d5bd912528bef0f57db7746e162c6d9875a89c6c8b2b40a21d64
-SIZE (rust-lang-cargo-0.15.0_GH0.tar.gz) = 631157
-SHA256 (rust-lang-rust-installer-755bc3d_GH0.tar.gz) = 103a502bad7af80eef7ccd2dd2969a272a6fa3f237ebeaca083315a45878f07f
-SIZE (rust-lang-rust-installer-755bc3d_GH0.tar.gz) = 19193
+SHA256 (cargo/cargo-registry-0.15.0.tar.xz) = 9dcc9747b86f6e647ad429de5df854c69fb4d259c2f4619f22a02a8af6bb6d92
+SIZE (cargo/cargo-registry-0.15.0.tar.xz) = 21559740
+SHA256 (cargo/cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 4d5e6203d8f6825debb99b4a9e4c8ac2177c55dd2d13458ad6fb972e947bf933
+SIZE (cargo/cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 4516956
+SHA256 (cargo/rust-lang-cargo-0.15.0_GH0.tar.gz) = 6ebe9e0de255d5bd912528bef0f57db7746e162c6d9875a89c6c8b2b40a21d64
+SIZE (cargo/rust-lang-cargo-0.15.0_GH0.tar.gz) = 631157
+SHA256 (cargo/rust-lang-rust-installer-755bc3d_GH0.tar.gz) = 103a502bad7af80eef7ccd2dd2969a272a6fa3f237ebeaca083315a45878f07f
+SIZE (cargo/rust-lang-rust-installer-755bc3d_GH0.tar.gz) = 19193
Index: devel/cargo/distinfo.i386
===================================================================
--- devel/cargo/distinfo.i386
+++ devel/cargo/distinfo.i386
@@ -1,9 +1,9 @@
 TIMESTAMP = 1484954237
-SHA256 (cargo-registry-0.15.0.tar.xz) = 9dcc9747b86f6e647ad429de5df854c69fb4d259c2f4619f22a02a8af6bb6d92
-SIZE (cargo-registry-0.15.0.tar.xz) = 21559740
-SHA256 (cargo-nightly-i686-unknown-freebsd.tar.gz) = bfa152e787369f629294c8d85e2d6afce3730fe78bd469e2fbc3be731c795f7f
-SIZE (cargo-nightly-i686-unknown-freebsd.tar.gz) = 4795563
-SHA256 (rust-lang-cargo-0.15.0_GH0.tar.gz) = 6ebe9e0de255d5bd912528bef0f57db7746e162c6d9875a89c6c8b2b40a21d64
-SIZE (rust-lang-cargo-0.15.0_GH0.tar.gz) = 631157
-SHA256 (rust-lang-rust-installer-755bc3d_GH0.tar.gz) = 103a502bad7af80eef7ccd2dd2969a272a6fa3f237ebeaca083315a45878f07f
-SIZE (rust-lang-rust-installer-755bc3d_GH0.tar.gz) = 19193
+SHA256 (cargo/cargo-registry-0.15.0.tar.xz) = 9dcc9747b86f6e647ad429de5df854c69fb4d259c2f4619f22a02a8af6bb6d92
+SIZE (cargo/cargo-registry-0.15.0.tar.xz) = 21559740
+SHA256 (cargo/cargo-nightly-i686-unknown-freebsd.tar.gz) = 417084d11dfbb0a37b19cbf8da1950a68e812d2ab60b13996f7c28c1058c8fa3
+SIZE (cargo/cargo-nightly-i686-unknown-freebsd.tar.gz) = 4427612
+SHA256 (cargo/rust-lang-cargo-0.15.0_GH0.tar.gz) = 6ebe9e0de255d5bd912528bef0f57db7746e162c6d9875a89c6c8b2b40a21d64
+SIZE (cargo/rust-lang-cargo-0.15.0_GH0.tar.gz) = 631157
+SHA256 (cargo/rust-lang-rust-installer-755bc3d_GH0.tar.gz) = 103a502bad7af80eef7ccd2dd2969a272a6fa3f237ebeaca083315a45878f07f
+SIZE (cargo/rust-lang-rust-installer-755bc3d_GH0.tar.gz) = 19193