Page MenuHomeFreeBSD
Files F143028193

D9295.id24356.diff
No OneTemporary
Actions

D9295.id24356.diff
View Options

Index: head/devel/cargo/Makefile
===================================================================
--- head/devel/cargo/Makefile
+++ head/devel/cargo/Makefile
@@ -3,6 +3,7 @@
PORTNAME= cargo
PORTVERSION= 0.15.0
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= dumbbell@FreeBSD.org
@@ -33,7 +34,7 @@
# This is a collection of mainly shell scripts which are used to
# install Cargo.
-MASTER_SITES= https://static.rust-lang.org/cargo-dist/2016-11-02/:bootstrap \
+MASTER_SITES= https://static.rust-lang.org/cargo-dist/:bootstrap \
LOCAL/dumbbell/rust:registry
.if !defined(SKIP_CARGO_REGISTRY)
DISTFILES+= ${CARGO_REGISTRY}:registry
@@ -54,7 +55,7 @@
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_BOOT= 2016-11-02/${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.
@@ -69,7 +70,8 @@
USES= gmake python:-2.7,build pkgconfig ssl
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix="${PREFIX}" --mandir="${MANPREFIX}/man"
-MAKE_ENV= ARGS="${CARGO_ARGS}"
+MAKE_ENV= ARGS="${CARGO_ARGS}" \
+ OPENSSL_DIR="${OPENSSLBASE}"
CARGO_ARGS= --jobs ${MAKE_JOBS_NUMBER}
MAKE_ARGS+= VERBOSE=1
@@ -82,12 +84,6 @@
BOOTSTRAP_CONFIGURE_OFF=--cargo="$$(command -v cargo)" # respect PATH
BOOTSTRAP_DISTFILES= ${CARGO_BOOT}:bootstrap
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:
@${MKDIR} ${WRKSRC}/target/dl
Index: head/devel/cargo/distinfo.amd64
===================================================================
--- head/devel/cargo/distinfo.amd64
+++ head/devel/cargo/distinfo.amd64
@@ -1,8 +1,8 @@
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 (2016-11-02/cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 4d5e6203d8f6825debb99b4a9e4c8ac2177c55dd2d13458ad6fb972e947bf933
+SIZE (2016-11-02/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
Index: head/devel/cargo/distinfo.i386
===================================================================
--- head/devel/cargo/distinfo.i386
+++ head/devel/cargo/distinfo.i386
@@ -1,8 +1,8 @@
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 (2016-11-02/cargo-nightly-i686-unknown-freebsd.tar.gz) = 417084d11dfbb0a37b19cbf8da1950a68e812d2ab60b13996f7c28c1058c8fa3
+SIZE (2016-11-02/cargo-nightly-i686-unknown-freebsd.tar.gz) = 4427612
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

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 26, 9:06 AM (6 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28016968
Default Alt Text
D9295.id24356.diff (3 KB)

Event Timeline