svn commit: r436758 - in head/devel/cargo: . files

[Jean-Sébastien Pédron]

Author: dumbbell
Date: Thu Mar 23 08:48:00 2017
New Revision: 436758
URL: https://svnweb.freebsd.org/changeset/ports/436758

Log:
  devel/cargo: Update to 0.17.0
  
  Beside the new upstream release, the port was cleaned up a bit to be
  closer to the lang/rust* ports.
  
  PR:		217338
  Reported by:	jbeich
  Approved by:	antoine
  Differential Revision:	https://reviews.freebsd.org/D9906

Added:
  head/devel/cargo/distinfo   (contents, props changed)
Deleted:
  head/devel/cargo/distinfo.amd64
  head/devel/cargo/distinfo.i386
  head/devel/cargo/files/
Modified:
  head/devel/cargo/Makefile
  head/devel/cargo/pkg-plist

Modified: head/devel/cargo/Makefile
==============================================================================
--- head/devel/cargo/Makefile	Thu Mar 23 08:24:38 2017	(r436757)
+++ head/devel/cargo/Makefile	Thu Mar 23 08:48:00 2017	(r436758)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cargo
-PORTVERSION=	0.15.0
-PORTREVISION=	2
+PORTVERSION=	0.17.0
 CATEGORIES=	devel
 
 MAINTAINER=	dumbbell at FreeBSD.org
@@ -21,7 +20,7 @@ LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
 # Main source archive from GitHub
 #   This is the source of Cargo, taken from GitHub.
 #
-# :bootstrap
+# :cargo_bootstrap
 #   Like Rust, this is a prebuilt "cargo" used to bootstrap it, because
 #   Cargo is a standard Rust package itself.
 #
@@ -34,12 +33,12 @@ 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/:bootstrap \
-		LOCAL/dumbbell/rust:registry
+MASTER_SITES=	https://s3.amazonaws.com/rust-lang-ci/cargo-builds/:cargo_bootstrap
 .if !defined(SKIP_CARGO_REGISTRY)
+MASTER_SITES+=	LOCAL/dumbbell/rust:registry
 DISTFILES+=	${CARGO_REGISTRY}:registry
 .endif
-DISTINFO_FILE=	${.CURDIR}/distinfo.${ARCH}
+DIST_SUBDIR?=	rust
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rust-lang
@@ -55,13 +54,16 @@ RUST_ARCH_x86_64=	x86_64 # dragonfly
 RUST_ARCH_amd64=	x86_64
 RUST_ARCH_i386=		i686
 RUST_TARGET=		${RUST_ARCH_${ARCH}}-unknown-${OPSYS:tl}
-CARGO_BOOT=	2016-11-02/${PORTNAME}-nightly-${RUST_TARGET}${EXTRACT_SUFX}
-CARGO_REGISTRY=	${PORTNAME}-registry-${DISTVERSIONFULL}_${PORTREVISION}.tar.xz
+
+CARGO_BOOTSTRAP_DIR?=		fbeea902d2c9a5be6d99cc35681565d8f7832592
+CARGO_BOOTSTRAP_VERSION?=	nightly
+CARGO_BOOTSTRAP=		${CARGO_BOOTSTRAP_DIR}/cargo-${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.5.0:${RUST_PORT}
+		${RUST_PORT:T}>=1.14.0:${RUST_PORT}
 LIB_DEPENDS=	libssh2.so:security/libssh2 \
 		libcurl.so:ftp/curl
 RUN_DEPENDS=	rustc:${RUST_PORT}
@@ -82,13 +84,9 @@ 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_OFF=--cargo="$$(command -v cargo)" # respect PATH
-BOOTSTRAP_DISTFILES=	${CARGO_BOOT}:bootstrap
+BOOTSTRAP_DISTFILES=	${CARGO_BOOTSTRAP}:cargo_bootstrap
 BOOTSTRAP_MAKE_ENV=	LD_LIBRARY_PATH="${WRKSRC}/target/snapshot/cargo/lib"
 
-post-extract-BOOTSTRAP-on:
-	@${MKDIR} ${WRKSRC}/target/dl
-	${LN} -sf ${DISTDIR}/${CARGO_BOOT} ${WRKSRC}/target/dl/
-
 post-patch:
 # Fix mandir and don't install licenses outside of ${_LICENSE_DIR}
 	@${REINPLACE_CMD} -e 's,share/man,man,' \

Added: head/devel/cargo/distinfo
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/cargo/distinfo	Thu Mar 23 08:48:00 2017	(r436758)
@@ -0,0 +1,11 @@
+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

Modified: head/devel/cargo/pkg-plist
==============================================================================
--- head/devel/cargo/pkg-plist	Thu Mar 23 08:24:38 2017	(r436757)
+++ head/devel/cargo/pkg-plist	Thu Mar 23 08:48:00 2017	(r436758)
@@ -3,6 +3,7 @@ etc/bash_completion.d/cargo
 lib/rustlib/manifest-cargo
 man/man1/cargo-bench.1.gz
 man/man1/cargo-build.1.gz
+man/man1/cargo-check.1.gz
 man/man1/cargo-clean.1.gz
 man/man1/cargo-doc.1.gz
 man/man1/cargo-fetch.1.gz