3 files changed, 16 insertions, 28 deletions

diff --git a/devel/cargo/Makefile b/devel/cargo/Makefile
index cb2fd5c867b5..7d8606d9bd69 100644
--- a/devel/cargo/Makefile
+++ b/devel/cargo/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cargo
-PORTVERSION=	0.9.0
+PORTVERSION=	0.10.0
 CATEGORIES=	devel
 
 MAINTAINER=	dumbbell@FreeBSD.org
@@ -33,7 +33,7 @@ LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
 #   This is a collection of mainly shell scripts which are used to
 #   install Cargo.
 
-MASTER_SITES=	https://static.rust-lang.org/cargo-dist/2015-04-02/:bootstrap \
+MASTER_SITES=	https://static.rust-lang.org/cargo-dist/2016-04-10/:bootstrap \
 		LOCAL/jbeich:registry
 .if !defined(SKIP_CARGO_REGISTRY)
 DISTFILES+=	${CARGO_REGISTRY}:registry
@@ -50,9 +50,6 @@ ONLY_FOR_ARCHS_REASON=	requires prebuilt bootstrap cargo
 CARGO_BOOT_SIG=	${ARCH:S/amd64/x86_64/}-unknown-${OPSYS:tl}
 CARGO_BOOT=	${PORTNAME}-nightly-${CARGO_BOOT_SIG}${EXTRACT_SUFX}
 CARGO_REGISTRY=	${PORTNAME}-registry-${DISTVERSIONFULL}.tar.xz
-CARGO_REGISTRY_BOOT_HASH=	1ecc6299db9ec823
-# Like above but with: pnacl-build-helper, libressl-pnacl-sys
-CARGO_REGISTRY_CUR_HASH=	88ac128001ac3a9a
 
 # We don't USES=cmake here, because cmake is not Cargo's build system.
 # It's used by a bundled dependency (libgit2).
@@ -79,11 +76,9 @@ OPTIONS_DEFAULT=BOOTSTRAP
 
 BOOTSTRAP_DESC=		Bootstrap using pre-built vendor snapshot
 BOOTSTRAP_CONFIGURE_OFF=--local-cargo="$$(command -v cargo)" # respect PATH
-BOOTSTRAP_VARS_OFF=	EXTRACT_AFTER_ARGS="-s/${CARGO_REGISTRY_BOOT_HASH}/${CARGO_REGISTRY_CUR_HASH}/"
 BOOTSTRAP_DISTFILES=	${CARGO_BOOT}:bootstrap
 BOOTSTRAP_EXTRACT_ONLY=	${DISTFILES:N*\:bootstrap:C/:.*//}
 BOOTSTRAP_MAKE_ENV=	LD_LIBRARY_PATH="${WRKSRC}/target/snapshot/cargo/lib"
-BOOTSTRAP_VARS=		EXTRACT_AFTER_ARGS="-s/${CARGO_REGISTRY_CUR_HASH}/${CARGO_REGISTRY_BOOT_HASH}/"
 .if !exists(/usr/lib/libssl.so.8) # OPENSSL_SHLIBVER
 BOOTSTRAP_VARS+=	WITH_OPENSSL_PORT=yes
 .endif
diff --git a/devel/cargo/distinfo b/devel/cargo/distinfo
index d0a54dbe4724..6f0d1226c504 100644
--- a/devel/cargo/distinfo
+++ b/devel/cargo/distinfo
@@ -1,10 +1,8 @@
-SHA256 (cargo-registry-0.9.0.tar.xz) = b0cb23b46fbb081c2c3903e241fcdd3c4c15108b389feaf0bb0ba4a985ed386d
-SIZE (cargo-registry-0.9.0.tar.xz) = 22063596
-SHA256 (cargo-nightly-x86_64-unknown-dragonfly.tar.gz) = 49d70c798362fba7d691144a4c97ce1be29a921c3a38d2fe8ffa76f9daf628ab
-SIZE (cargo-nightly-x86_64-unknown-dragonfly.tar.gz) = 2621548
-SHA256 (cargo-nightly-x86_64-unknown-freebsd.tar.gz) = de678e858de5d2923cc206b7aa1cc84ddc67be00748160f66fc9b7325409e7c7
-SIZE (cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 7663548
-SHA256 (rust-lang-cargo-0.9.0_GH0.tar.gz) = 4cadc436be442505851f3a8e9ffff1ef10b6379101a7f8e0afa9fa80f5198f89
-SIZE (rust-lang-cargo-0.9.0_GH0.tar.gz) = 532747
+SHA256 (cargo-registry-0.10.0.tar.xz) = 4f8059fb2827025a124ce76ea0165a5e4e757077e858fddfa7ef1a8e071213ac
+SIZE (cargo-registry-0.10.0.tar.xz) = 18434540
+SHA256 (cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 5ea0869878b85b5cf290ae0edb7bcbfe64f4cdad9fb5c492575fe5e5da5e1fd6
+SIZE (cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 5461785
+SHA256 (rust-lang-cargo-0.10.0_GH0.tar.gz) = 1e73c038681fe308195427b71322a6350c65d3b8cbea199e45c7b672b4754e0e
+SIZE (rust-lang-cargo-0.10.0_GH0.tar.gz) = 553862
 SHA256 (rust-lang-rust-installer-4915c75_GH0.tar.gz) = 022116173684c97d61e014940aada20f3830d2d3e1670887bf1861997133c234
 SIZE (rust-lang-rust-installer-4915c75_GH0.tar.gz) = 19234
diff --git a/devel/cargo/files/patch-src_snapshots.txt b/devel/cargo/files/patch-src_snapshots.txt
index c33e8b282529..d0a33e8a5176 100644
--- a/devel/cargo/files/patch-src_snapshots.txt
+++ b/devel/cargo/files/patch-src_snapshots.txt
@@ -7,17 +7,12 @@
       raise Exception("no snapshot for the triple '%s'" % triple)
   Exception: no snapshot for the triple 'x86_64-unknown-freebsd'
 
---- src/snapshots.txt.orig	2016-02-29 19:32:24 UTC
+--- src/snapshots.txt.orig	2016-04-08 20:31:50 UTC
 +++ src/snapshots.txt
-@@ -1,11 +1,3 @@
--2016-01-31
--  linux-i386 7e2f9c82e1af5aa43ef3ee2692b985a5f2398f0a
--  linux-x86_64 4c03a3fd2474133c7ad6d8bb5f6af9915ca5292a
--  macos-i386 4d84d31449a5926f9e7ceb344540d6e5ea530b88
--  macos-x86_64 f8baef5b0b3e6f9825be1f1709594695ac0f0abc
--  winnt-i386 8702f7e3c49ef4a4eb9ffed2f1ca94ac288e48ff
--  winnt-x86_64 a531f9a7399cdcc6aa14a0f070df4ff3851772fa
--
- 2015-04-02
-   dragonfly-x86_64 7d330a67ad82701ee65a08a47a51c3b0b26697bc
-   freebsd-x86_64 2e0ade0901864ea67200f990cb289343b08959e7
+@@ -1,3 +1,6 @@
++2016-04-10
++  freebsd-x86_64 8c459cbdc890cedb43c0952ad7f1ef0b7fcbe535
++
+ 2016-03-21
+   linux-i386 ac401c16ff53e0c51b88707579b4f95d7d4c4763
+   linux-x86_64 84266cf626ca4fcdc290bca8f1a74e6ad9e8b3d9