Index: head/devel/cargo/Makefile =================================================================== --- head/devel/cargo/Makefile +++ head/devel/cargo/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cargo -PORTVERSION= 0.14.0 +PORTVERSION= 0.15.0 CATEGORIES= devel MAINTAINER= dumbbell@FreeBSD.org @@ -34,10 +34,11 @@ # install Cargo. MASTER_SITES= https://static.rust-lang.org/cargo-dist/2016-11-02/:bootstrap \ - LOCAL/dumbbell/cargo:registry + LOCAL/dumbbell/rust:registry .if !defined(SKIP_CARGO_REGISTRY) DISTFILES+= ${CARGO_REGISTRY}:registry .endif +DISTINFO_FILE= ${.CURDIR}/distinfo.${ARCH} USE_GITHUB= yes GH_ACCOUNT= rust-lang @@ -45,11 +46,15 @@ GH_TAGNAME= 755bc3d:rust_installer GH_SUBDIR= src/rust-installer:rust_installer -ONLY_FOR_ARCHS= amd64 +ONLY_FOR_ARCHS= amd64 i386 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} +# Rust's target arch string is different from *BSD arch strings +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= ${PORTNAME}-nightly-${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. @@ -73,12 +78,15 @@ OPTIONS_DEFAULT=BOOTSTRAP BOOTSTRAP_DESC= Bootstrap using pre-built vendor snapshot -BOOTSTRAP_CONFIGURE_OFF=--local-cargo="$$(command -v cargo)" # respect PATH +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_EXTRACT_ONLY= ${DISTFILES:N*\:bootstrap:C/:.*//} BOOTSTRAP_MAKE_ENV= LD_LIBRARY_PATH="${WRKSRC}/target/snapshot/cargo/lib" .if !exists(/usr/lib/libssl.so.8) # OPENSSL_SHLIBVER BOOTSTRAP_VARS+= WITH_OPENSSL_PORT=yes +BOOTSTRAP_MAKE_ENV+= OPENSSL_DIR=${LOCALBASE} +.else +BOOTSTRAP_MAKE_ENV+= OPENSSL_DIR=/usr .endif post-extract-BOOTSTRAP-on: Index: head/devel/cargo/distinfo =================================================================== --- head/devel/cargo/distinfo +++ head/devel/cargo/distinfo @@ -1,9 +0,0 @@ -TIMESTAMP = 1479719948 -SHA256 (cargo-registry-0.14.0.tar.xz) = 3ed1d9847c7171d87fccf33e1469629e9eba30162329443998909dc2d591dd93 -SIZE (cargo-registry-0.14.0.tar.xz) = 21137544 -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.14.0_GH0.tar.gz) = 90ec0e644586959f62e6e34e649ba57db6f74aa37b89e90972f817c49b187531 -SIZE (rust-lang-cargo-0.14.0_GH0.tar.gz) = 625305 -SHA256 (rust-lang-rust-installer-755bc3d_GH0.tar.gz) = 103a502bad7af80eef7ccd2dd2969a272a6fa3f237ebeaca083315a45878f07f -SIZE (rust-lang-rust-installer-755bc3d_GH0.tar.gz) = 19193 Index: head/devel/cargo/distinfo.amd64 =================================================================== --- head/devel/cargo/distinfo.amd64 +++ head/devel/cargo/distinfo.amd64 @@ -0,0 +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 Index: head/devel/cargo/distinfo.i386 =================================================================== --- head/devel/cargo/distinfo.i386 +++ head/devel/cargo/distinfo.i386 @@ -0,0 +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 Index: head/devel/cargo/files/patch-configure =================================================================== --- head/devel/cargo/files/patch-configure +++ head/devel/cargo/files/patch-configure @@ -1,10 +0,0 @@ ---- configure.orig 2016-08-19 21:24:29 UTC -+++ configure -@@ -346,7 +346,6 @@ fi - - step_msg "looking for build programs" - --probe_need CFG_CURLORWGET curl wget - probe_need CFG_PYTHON python2.7 python2 python - probe_need CFG_CC cc gcc clang - Index: head/devel/cargo/files/patch-src_snapshots.txt =================================================================== --- head/devel/cargo/files/patch-src_snapshots.txt +++ head/devel/cargo/files/patch-src_snapshots.txt @@ -1,18 +0,0 @@ -2016-01-31 lacks snapshots for any BSD system, skip them to use 2015-04-02. - - gmake[2]: Entering directory '.../cargo-0.9.0' - /usr/local/bin/python2.7 src/etc/dl-snapshot.py x86_64-unknown-freebsd - Traceback (most recent call last): - File "src/etc/dl-snapshot.py", line 57, in - raise Exception("no snapshot for the triple '%s'" % triple) - Exception: no snapshot for the triple 'x86_64-unknown-freebsd' - ---- src/snapshots.txt.orig 2016-04-08 20:31:50 UTC -+++ src/snapshots.txt -@@ -1,3 +1,6 @@ -+2016-11-02 -+ freebsd-x86_64 5ef450453f6ba199c73c5de22460997a24d216a7 -+ - 2016-03-21 - linux-i386 ac401c16ff53e0c51b88707579b4f95d7d4c4763 - linux-x86_64 84266cf626ca4fcdc290bca8f1a74e6ad9e8b3d9