Hi,
Here an update for devel/cargo.
Few things for cargo it self.
This diff includes some changes to cargo.port.mk:
- remove MODCARGO_EXTRA_CRATES : it isn't as useful as expected. I
expected to use it for external crates (not present on crates.io),
but as there are generally declared as git repositories, patching of
Cargo.toml is required anywhere. So just get ride of it.
- make MODCARGO_configure to be reentrant (only useful when working on
port if configure fails)
- make MODCARGO_CRATES_UPDATE to work with multiple crates to update.
Thanks.
--
Sebastien Marie
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/cargo/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 26 Dec 2016 13:55:11 -0000 1.8
+++ Makefile 30 Dec 2016 13:58:08 -0000
@@ -4,12 +4,11 @@ COMMENT = package manager for Rust langu
ONLY_FOR_ARCHS = amd64 i386
# cargo version
-CARGO_VERSION = 0.14.0
-REVISION = 0
+CARGO_VERSION = 0.15.0
# cargo version used for bootstrapping
-BV-amd64 = 0.14.0-20161112
-BV-i386 = 0.14.0-20161204
+BV-amd64 = 0.15.0-20161230
+BV-i386 = 0.15.0-20161230
BOOTSTRAP_VERSION = ${BV-${MACHINE_ARCH}}
# rust-install submodule version in cargo/src/rust-installer
@@ -32,11 +31,10 @@ MODCARGO_DIST_SUBDIR =
# - MIT
# - Unlicense/MIT
# - MIT/Apache-2.0
-# - MPL-2.0
#
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB = c crypto curl m pthread ssh2 ssl z
+WANTLIB = c crypto curl git2 m pthread ssh2 ssl z
MASTER_SITES = https://github.com/rust-lang/
DISTFILES +=
cargo-${CARGO_VERSION}.tar.gz{cargo/archive/${CARGO_VERSION}.tar.gz}
@@ -44,35 +42,33 @@ DISTFILES += rust-installer-${RUSTINSTAL
MODCARGO_CRATES += advapi32-sys-0.2.0 # MIT
MODCARGO_CRATES += aho-corasick-0.5.3 # Unlicense/MIT
-MODCARGO_CRATES += bitflags-0.1.1 # MIT/Apache-2.0
MODCARGO_CRATES += bitflags-0.7.0 # MIT/Apache-2.0
MODCARGO_CRATES += bufstream-0.1.2 # MIT/Apache-2.0
MODCARGO_CRATES += cfg-if-0.1.0 # MIT/Apache-2.0
-MODCARGO_CRATES += cmake-0.1.17 # MIT/Apache-2.0
-MODCARGO_CRATES += crossbeam-0.2.9 # Apache-2.0/MIT
-MODCARGO_CRATES += curl-0.3.9 # MIT
-MODCARGO_CRATES += curl-sys-0.2.4 # MIT
-MODCARGO_CRATES += docopt-0.6.82 # Unlicense/MIT
-MODCARGO_CRATES += env_logger-0.3.4 # MIT/Apache-2.0
+MODCARGO_CRATES += cmake-0.1.18 # MIT/Apache-2.0
+MODCARGO_CRATES += crossbeam-0.2.10 # Apache-2.0/MIT
+MODCARGO_CRATES += curl-0.4.1 # MIT
+MODCARGO_CRATES += curl-sys-0.3.6 # MIT
+MODCARGO_CRATES += docopt-0.6.86 # Unlicense/MIT
+MODCARGO_CRATES += env_logger-0.3.5 # MIT/Apache-2.0
MODCARGO_CRATES += filetime-0.1.10 # MIT/Apache-2.0
MODCARGO_CRATES += flate2-0.2.14 # MIT/Apache-2.0
-MODCARGO_CRATES += fs2-0.2.5 # MIT/Apache-2.0
-MODCARGO_CRATES += gcc-0.3.35 # MIT/Apache-2.0
+MODCARGO_CRATES += fs2-0.3.0 # MIT/Apache-2.0
+MODCARGO_CRATES += gcc-0.3.38 # MIT/Apache-2.0
MODCARGO_CRATES += gdi32-sys-0.2.0 # MIT
-MODCARGO_CRATES += git2-0.4.4 # MIT/Apache-2.0
-MODCARGO_CRATES += git2-curl-0.5.0 # MIT/Apache-2.0
+MODCARGO_CRATES += git2-0.6.3 # MIT/Apache-2.0
+MODCARGO_CRATES += git2-curl-0.7.0 # MIT/Apache-2.0
MODCARGO_CRATES += glob-0.2.11 # MIT/Apache-2.0
MODCARGO_CRATES += hamcrest-0.1.1 # MIT/Apache-2.0
MODCARGO_CRATES += idna-0.1.0 # MIT/Apache-2.0
MODCARGO_CRATES += kernel32-sys-0.2.2 # MIT
-MODCARGO_CRATES += lazy_static-0.2.1 # MIT
+MODCARGO_CRATES += lazy_static-0.2.2 # MIT
MODCARGO_CRATES += libc-0.2.18 # MIT/Apache-2.0
-MODCARGO_CRATES += libgit2-sys-0.4.5 # MIT/Apache-2.0
-MODCARGO_CRATES += libressl-pnacl-sys-2.1.6 # MIT
-MODCARGO_CRATES += libssh2-sys-0.1.39 # MIT/Apache-2.0
-MODCARGO_CRATES += libz-sys-1.0.6 # MIT/Apache-2.0
+MODCARGO_CRATES += libgit2-sys-0.6.4 # MIT/Apache-2.0
+MODCARGO_CRATES += libssh2-sys-0.2.4 # MIT/Apache-2.0
+MODCARGO_CRATES += libz-sys-1.0.10 # MIT/Apache-2.0
MODCARGO_CRATES += log-0.3.6 # MIT/Apache-2.0
-MODCARGO_CRATES += matches-0.1.2 # MIT
+MODCARGO_CRATES += matches-0.1.4 # MIT
MODCARGO_CRATES += memchr-0.1.11 # Unlicense/MIT
MODCARGO_CRATES += miniz-sys-0.1.7 # MIT/Apache-2.0
MODCARGO_CRATES += miow-0.1.3 # MIT/Apache-2.0
@@ -84,29 +80,28 @@ MODCARGO_CRATES += num-integer-0.1.32 #
MODCARGO_CRATES += num-iter-0.1.32 # MIT/Apache-2.0
MODCARGO_CRATES += num-rational-0.1.35 # MIT/Apache-2.0
MODCARGO_CRATES += num-traits-0.1.36 # MIT/Apache-2.0
-MODCARGO_CRATES += num_cpus-1.0.0 # MIT/Apache-2.0
-MODCARGO_CRATES += openssl-0.7.14 # Apache-2.0
-MODCARGO_CRATES += openssl-sys-0.7.14 # MIT
-MODCARGO_CRATES += openssl-sys-extras-0.7.14 # MIT
+MODCARGO_CRATES += rand-0.3.14 # MIT/Apache-2.0
+MODCARGO_CRATES += num_cpus-1.1.0 # MIT/Apache-2.0
+MODCARGO_CRATES += openssl-0.9.4 # Apache-2.0
+MODCARGO_CRATES += openssl-probe-0.1.0 # MIT/Apache-2.0
+MODCARGO_CRATES += openssl-sys-0.9.4 # MIT
MODCARGO_CRATES += pkg-config-0.3.8 # MIT/Apache-2.0
-MODCARGO_CRATES += pnacl-build-helper-1.4.10 # MPL-2.0
MODCARGO_CRATES += psapi-sys-0.1.0 # MIT
-MODCARGO_CRATES += rand-0.3.14 # MIT/Apache-2.0
-MODCARGO_CRATES += regex-0.1.77 # MIT/Apache-2.0
-MODCARGO_CRATES += regex-syntax-0.3.5 # MIT/Apache-2.0
-MODCARGO_CRATES += rustc-serialize-0.3.19 # MIT/Apache-2.0
+MODCARGO_CRATES += regex-0.1.80 # MIT/Apache-2.0
+MODCARGO_CRATES += regex-syntax-0.3.9 # MIT/Apache-2.0
+MODCARGO_CRATES += rustc-serialize-0.3.21 # MIT/Apache-2.0
MODCARGO_CRATES += semver-0.5.1 # MIT/Apache-2.0
MODCARGO_CRATES += semver-parser-0.6.1 # MIT/Apache-2.0
-MODCARGO_CRATES += strsim-0.3.0 # MIT
+MODCARGO_CRATES += strsim-0.5.1 # MIT
MODCARGO_CRATES += tar-0.4.8 # MIT/Apache-2.0
MODCARGO_CRATES += tempdir-0.3.5 # MIT/Apache-2.0
MODCARGO_CRATES += term-0.4.4 # MIT/Apache-2.0
MODCARGO_CRATES += thread-id-2.0.0 # Apache-2.0
-MODCARGO_CRATES += thread_local-0.2.6 # Apache-2.0/MIT
-MODCARGO_CRATES += toml-0.2.0 # MIT/Apache-2.0
+MODCARGO_CRATES += thread_local-0.2.7 # Apache-2.0/MIT
+MODCARGO_CRATES += toml-0.2.1 # MIT/Apache-2.0
MODCARGO_CRATES += unicode-bidi-0.2.3 # MIT / Apache-2.0
-MODCARGO_CRATES += unicode-normalization-0.1.2 # MIT/Apache-2.0
-MODCARGO_CRATES += url-1.2.0 # MIT/Apache-2.0
+MODCARGO_CRATES += url-1.2.3 # MIT/Apache-2.0
+MODCARGO_CRATES += unicode-normalization-0.1.2 # MIT/Apache-2.0
MODCARGO_CRATES += user32-sys-0.2.0 # MIT
MODCARGO_CRATES += utf8-ranges-0.1.3 # Unlicense/MIT
MODCARGO_CRATES += winapi-0.2.8 # MIT
@@ -115,6 +110,8 @@ MODCARGO_CRATES += ws2_32-sys-0.2.1 # MI
# use libc-0.2.18 instead of libc-0.2.17: the patch for i386 is smaller
MODCARGO_CRATES_UPDATE += libc
+# use openssl-0.9.4 which has support for LibreSSL
+MODCARGO_CRATES_UPDATE += openssl-sys openssl
MASTER_SITES0 = http://kapouay.odns.fr/pub/cargo/
DISTFILES += cargo-bootstrap-${MACHINE_ARCH}-${BOOTSTRAP_VERSION}.tar.gz:0
@@ -140,11 +137,11 @@ MODPY_RUNDEP = No
USE_GMAKE = Yes
-BUILD_DEPENDS = devel/libgit2/libgit2 \
- devel/cmake \
- lang/rust>=1.13,<1.15
+BUILD_DEPENDS = devel/cmake \
+ lang/rust>=1.14,<1.15
LIB_DEPENDS = net/curl \
+ devel/libgit2/libgit2 \
security/libssh2
RUN_DEPENDS = lang/rust
@@ -153,15 +150,15 @@ CONFIGURE_STYLE = cargo \
simple
CONFIGURE_ARGS += --prefix=${LOCALBASE} \
--mandir=${LOCALBASE}/man \
+ --release-channel=stable \
--local-rust-root=${LOCALBASE} \
- --local-cargo=${MODCARGO_CARGO_BIN}
+ --rustc=${LOCALBASE}/bin/rustc \
+ --rustdoc=${LOCALBASE}/bin/rustdoc \
+ --cargo=${MODCARGO_CARGO_BIN}
MAKE_ENV += ${MODCARGO_ENV} \
VERBOSE=1 \
LIBGIT2_SYS_USE_PKG_CONFIG=1
-
-# make testsuite using the *same* binaries as build
-TEST_ENV += CARGOFLAGS="--release --no-fail-fast"
post-extract:
# place rust-installer inside WRKSRC
Index: cargo.port.mk
===================================================================
RCS file: /cvs/ports/devel/cargo/cargo.port.mk,v
retrieving revision 1.1
diff -u -p -r1.1 cargo.port.mk
--- cargo.port.mk 26 Dec 2016 13:55:11 -0000 1.1
+++ cargo.port.mk 30 Dec 2016 13:58:08 -0000
@@ -4,9 +4,7 @@ CATEGORIES += lang/rust
# List of static dependencies. The format is cratename-version.
# MODCARGO_CRATES will be downloaded from MASTER_SITES_CRATESIO.
-# MODCARGO_EXTRA_CRATES should be downloaded by the port itself.
MODCARGO_CRATES ?=
-MODCARGO_EXTRA_CRATES ?=
# List of features to build (space separated list).
MODCARGO_FEATURES ?=
@@ -49,13 +47,13 @@ DISTFILES += ${_MODCARGO_DIST_SUBDIR}${_
MODCARGO_post-extract = \
${ECHO_MSG} "[modcargo] moving crates to ${MODCARGO_VENDOR_DIR}" ; \
mkdir ${MODCARGO_VENDOR_DIR} ;
-.for _crate in ${MODCARGO_CRATES} ${MODCARGO_EXTRA_CRATES}
+.for _crate in ${MODCARGO_CRATES}
MODCARGO_post-extract += \
mv ${WRKDIR}/${_crate} ${MODCARGO_VENDOR_DIR}/${_crate} ;
.endfor
# post-patch target for generating metadata of crates.
-.for _crate in ${MODCARGO_CRATES} ${MODCARGO_EXTRA_CRATES}
+.for _crate in ${MODCARGO_CRATES}
MODCARGO_post-patch += \
${ECHO_MSG} "[modcargo] Generating metadata for ${_crate}" ; \
${LOCALBASE}/bin/cargo-generate-vendor \
@@ -68,22 +66,30 @@ MODCARGO_post-patch += \
MODCARGO_configure = \
mkdir -p ${WRKDIR}/.cargo; \
\
- echo "[source.modcargo]" >>${WRKDIR}/.cargo/config; \
+ echo "[source.modcargo]" >${WRKDIR}/.cargo/config; \
echo "directory = '${MODCARGO_VENDOR_DIR}'" \
>>${WRKDIR}/.cargo/config; \
echo "[source.crates-io]" >>${WRKDIR}/.cargo/config; \
echo "replace-with = 'modcargo'" >>${WRKDIR}/.cargo/config; \
\
- echo "" >>${MODCARGO_CARGOTOML}; \
- echo "[profile.release]" >>${MODCARGO_CARGOTOML}; \
- echo "opt-level = 2" >>${MODCARGO_CARGOTOML}; \
- echo "debug = false" >>${MODCARGO_CARGOTOML};
+ if ! grep -qF '[profile.release]' ${MODCARGO_CARGOTOML}; then \
+ echo "" >>${MODCARGO_CARGOTOML}; \
+ echo "[profile.release]" >>${MODCARGO_CARGOTOML}; \
+ echo "opt-level = 2" >>${MODCARGO_CARGOTOML}; \
+ echo "debug = false" >>${MODCARGO_CARGOTOML}; \
+ fi ;
+# Update crates: place all crates on the same command line.
+.if defined(MODCARGO_CRATES_UPDATE)
+MODCARGO_configure += \
+ ${MODCARGO_CARGO_UPDATE}
.for _crate in ${MODCARGO_CRATES_UPDATE}
MODCARGO_configure += \
- ${MODCARGO_CARGO_UPDATE} ${_crate} ;
+ --package ${_crate}
.endfor
+MODCARGO_configure += ;
+.endif
# Build dependencies.
MODCARGO_BUILD_DEPENDS = devel/cargo \
@@ -140,8 +146,7 @@ MODCARGO_TEST_ARGS += --features='${MODC
MODCARGO_CARGO_UPDATE = \
${MODCARGO_CARGO_RUN} update \
--manifest-path ${MODCARGO_CARGOTOML} \
- --verbose \
- --package
+ --verbose
# Use module targets ?
MODCARGO_BUILD ?= Yes
@@ -192,8 +197,12 @@ do-test:
# Helper targets for port maintainer
#
+# modcargo-metadata: regenerate metadata. useful target when working on a port.
+modcargo-metadata: patch
+ @${MODCARGO_post-patch}
+
# modcargo-crates-1 will output crates list from Cargo.lock file.
-modcargo-crates-1: patch
+modcargo-crates-1: extract
@awk '/"checksum / { print "MODCARGO_CRATES += " $$2 "-" $$3 }' \
<${WRKSRC}/Cargo.lock
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/cargo/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 26 Dec 2016 13:55:11 -0000 1.5
+++ distinfo 30 Dec 2016 13:58:08 -0000
@@ -1,37 +1,35 @@
SHA256 (cargo/advapi32-sys-0.2.0.tar.gz) =
4GWICAyxnQrLZzmAiq+l8mv7LKAVsrY3ACi0TPfLipo=
SHA256 (cargo/aho-corasick-0.5.3.tar.gz) =
ypcsLqX3Qr/OVoe5rvdVBqdk9h03+PZJBHhGqWht22Y=
-SHA256 (cargo/bitflags-0.1.1.tar.gz) =
KmV3UX7NDuCTT0inKVqJqu8+bfr+rEBPlMCzRIUY3f4=
SHA256 (cargo/bitflags-0.7.0.tar.gz) =
qtGJN6Yo7Gq80m0UiQEswOGMIXmCEPSRr2ne2biBEG0=
SHA256 (cargo/bufstream-0.1.2.tar.gz) =
e0jb4v8OmPovAzd9IEqWN9PJgWzUMb/gWoq70OoR0HQ=
-SHA256 (cargo/cargo-0.14.0.tar.gz) =
kOwOZEWGlZ9i5uNOZJulfbb3SqN7iekJcvgXxJsYdTE=
-SHA256 (cargo/cargo-bootstrap-amd64-0.14.0-20161112.tar.gz) =
DzwS882KmKVg95PSXcjEkVpJt0gLerGuEJ0IrIkSL3c=
-SHA256 (cargo/cargo-bootstrap-i386-0.14.0-20161204.tar.gz) =
erN8sChnzwHHg+9eKjMOtOzcu6dDcJ35jUVrqaIWLTQ=
+SHA256 (cargo/cargo-0.15.0.tar.gz) =
br6eDeJV1b2RJSi+8PV9t3RuFixtmHWonGyLK0CiHWQ=
+SHA256 (cargo/cargo-bootstrap-amd64-0.15.0-20161230.tar.gz) =
qcSZfY/j29rGuU+t8oEFFf+1fzvWN+wbHa8IaUr1Y+0=
+SHA256 (cargo/cargo-bootstrap-i386-0.15.0-20161230.tar.gz) =
xFMrNpaNIJpFcSMcnAHnOetEdHx9JHK0JoBjIcA8uUQ=
SHA256 (cargo/cfg-if-0.1.0.tar.gz) =
3h52DXtlNa9CQfyovYrfaOLn7azGsp9dOZBQxeSM+Iw=
-SHA256 (cargo/cmake-0.1.17.tar.gz) =
389bzs5W75U7jqBCUJ6dy9/peCC34g2GvrU98w7ZSXg=
-SHA256 (cargo/crossbeam-0.2.9.tar.gz) =
+5dPg16QOQxfnfrADwWwbcEXKZ9epOhfvHu0Q69JEcw=
-SHA256 (cargo/curl-0.3.9.tar.gz) = +vVNknx1KwktPpnqIn2cfJtKPohaM2ism/oolY8hUQA=
-SHA256 (cargo/curl-sys-0.2.4.tar.gz) =
TxmNEDeKO8HxsOO8Oi3lybueCJOEYN7Fe6ZmfZpl+8M=
-SHA256 (cargo/docopt-0.6.82.tar.gz) =
jyABYJO05UXcz2rUoBCZ3gtpX5vJmwghDmj2Ql2y030=
-SHA256 (cargo/env_logger-0.3.4.tar.gz) =
gty5zu04aKA7M1ZXuFoVlzbJYZAPfndH07C5e5zLXMs=
+SHA256 (cargo/cmake-0.1.18.tar.gz) =
DlvPJ+CXoYTB30Q3ZU7ZjfPXpRboUIprpF2LCSu98oM=
+SHA256 (cargo/crossbeam-0.2.10.tar.gz) =
DF6iFWZMomTaip2cO+gNLq8wkjwlnQPocDiOuSdQj5c=
+SHA256 (cargo/curl-0.4.1.tar.gz) = j9Wh/c69saWVeMVYPmb/7S0ThQ6sT1H/cw7fbdYRHqw=
+SHA256 (cargo/curl-sys-0.3.6.tar.gz) =
IYoUkgjh9OX34g8dDtHpQxoIamtDM/+V26giN76cKDo=
+SHA256 (cargo/docopt-0.6.86.tar.gz) =
Sn7zBEVgf2/Icg8KCix0QihLYpzw0EkoaGD64j5xxNk=
+SHA256 (cargo/env_logger-0.3.5.tar.gz) =
FavXgORbPqT3a06aJv9IQyWN2KPu0ndaDnNowueTbC8=
SHA256 (cargo/filetime-0.1.10.tar.gz) =
U2OrjkE5uFaKYjfbUkhkblqKL4m9XMsCCSGCsR/T6SI=
SHA256 (cargo/flate2-0.2.14.tar.gz) =
PutIHpVzBBeNLngvLaElfxQ03+y66IO6+2Gtoqn+o7s=
-SHA256 (cargo/fs2-0.2.5.tar.gz) = vNQU5aGpebkxu5L0G3pUEG0/bS5sJT6c6UO3zUaCUe8=
-SHA256 (cargo/gcc-0.3.35.tar.gz) = kezQN3Hv+wyWj9aVCzfolHaleKrxxwKX2OkrZRbsMxI=
+SHA256 (cargo/fs2-0.3.0.tar.gz) = ZAAB4b2GXHwygGKSgiRFr1dqaGYXW1IlqiCHyl495VE=
+SHA256 (cargo/gcc-0.3.38.tar.gz) = VT8RQ5ve/nVb82ayZIIPHacPOq85JOWUuIa+ucgxvPU=
SHA256 (cargo/gdi32-sys-0.2.0.tar.gz) =
CRJRWo/yS6kAQi7NqAC1L0AWpWJRki05fFdr+SxpBRg=
-SHA256 (cargo/git2-0.4.4.tar.gz) = M6lu7vInQDAGzbWepuBbqtjN3ea3mr7XU9lszuE2utI=
-SHA256 (cargo/git2-curl-0.5.0.tar.gz) =
PV92bYBOPPK5Dhard8Pd7cscpdJFbK23s/kHNF+MNJg=
+SHA256 (cargo/git2-0.6.3.tar.gz) = BTTKhmQMajoGh8xr7p7EAyUJoNES2X6CQfprfgdfYRk=
+SHA256 (cargo/git2-curl-0.7.0.tar.gz) =
aGdrx4S/C++DJ4iYkpv2SiUeh8A0ByPQuT+glsnFv44=
SHA256 (cargo/glob-0.2.11.tar.gz) =
i+GN4JpWtg7Q7fhLyd8AfjAEBpGves0cQYdPqsWJW/s=
SHA256 (cargo/hamcrest-0.1.1.tar.gz) =
vwiPBCpGcInpuqSXL1f5JH5CoMxUm6Jkx6BPu47LidQ=
SHA256 (cargo/idna-0.1.0.tar.gz) = EFMjbgDOT2aK7KSnaaCbO/WmgtgCq9bzyzk3T2sWLBE=
SHA256 (cargo/kernel32-sys-0.2.2.tar.gz) =
dQdiSylINDHAui2Crs6Mps26k4K/9N3Q90kFYMBWCY0=
-SHA256 (cargo/lazy_static-0.2.1.tar.gz) =
SSR+wqKFuz3LI8vZw1GTwCXnJRv853wdXal+Y2Lf/n8=
+SHA256 (cargo/lazy_static-0.2.2.tar.gz) =
ar4O4udYzWvIos1WcmNZAHdI+/QSjamYtl0LcPiB4Zs=
SHA256 (cargo/libc-0.2.18.tar.gz) =
pRgi/IR+eoEBUU0dRONUui/6fUwZTcq0iHB0DjJ8rHA=
-SHA256 (cargo/libgit2-sys-0.4.5.tar.gz) =
MpPclRaaY1HFoD7KS/VUnzqaBjNqAAMVh2/xFlpfuhA=
-SHA256 (cargo/libressl-pnacl-sys-2.1.6.tar.gz) =
y8BYlRq2o+81yhZGLXZCxIZ+ZANSCBHyhTek4vLbPnE=
-SHA256 (cargo/libssh2-sys-0.1.39.tar.gz) =
HevX5W0ZZV63hvgnZ13FX21TDebXuB520T0a/GNdbAc=
-SHA256 (cargo/libz-sys-1.0.6.tar.gz) =
QPLfdzC10pQmw+RM5NCI2MXe9kccLJO6mFhbifsgHOY=
+SHA256 (cargo/libgit2-sys-0.6.4.tar.gz) =
tKclORIueeVMxcTVp6W1PwO2Z/fCLHoEQEM+ZYzwRA8=
+SHA256 (cargo/libssh2-sys-0.2.4.tar.gz) =
7QiRhqu0aKePcXAXcwR1GAXjPCDnrvS4KYiEziCAtd4=
+SHA256 (cargo/libz-sys-1.0.10.tar.gz) =
kFxyoMJgvNid3KWvocRr69KbUoeKPVjIaGXqQkAviOY=
SHA256 (cargo/log-0.3.6.tar.gz) = q4NJe/i/TtKnQlnByAI1H81npluqhjlLa6c8NvSDgFQ=
-SHA256 (cargo/matches-0.1.2.tar.gz) =
FTBWVoCc5aSAWx/ylGiSgQmSGXzhJw/3m63thSGHlC4=
+SHA256 (cargo/matches-0.1.4.tar.gz) =
79diLjAi4abqpgLEzqiRIlTlWCycaS6RZ3FBgiRIAbE=
SHA256 (cargo/memchr-0.1.11.tar.gz) =
2LYp+1FDdsZ1uYwUIegLFR04F6xC18ZncX0oJ2FBjSA=
SHA256 (cargo/miniz-sys-0.1.7.tar.gz) =
nR9NM3oBwy4fISJRD+1GOT1TyjWn9CnLBFCrrt+j7VQ=
SHA256 (cargo/miow-0.1.3.tar.gz) = 1b/GeCUwrIrOl68QpUAFSjcSa2OwcC3aqiQ7c7V0W5o=
@@ -43,30 +41,29 @@ SHA256 (cargo/num-integer-0.1.32.tar.gz)
SHA256 (cargo/num-iter-0.1.32.tar.gz) =
KHocmWmoRwVeESLsDqelxdb3Kq2Xk04THIPVwIq05Fw=
SHA256 (cargo/num-rational-0.1.35.tar.gz) =
VP9gO4M0py+7J/5mlIqsCrqqQCMbPOzRiedhYvbziq8=
SHA256 (cargo/num-traits-0.1.36.tar.gz) =
oWpChWolaznG00hPCX9nE+FP6s2b+wIpCReQT65GyBw=
-SHA256 (cargo/num_cpus-1.0.0.tar.gz) =
qFkEHL96cOoezkuH0aLG7zZNy2h0nIjbH5cwS57AnV8=
-SHA256 (cargo/openssl-0.7.14.tar.gz) =
xBF7YkSqxC7QFQpgGbTZU9KCR8Xdaub0auRptfIxhzM=
-SHA256 (cargo/openssl-sys-0.7.14.tar.gz) =
uKxenZEd1MMgK79BObc7x6EjH30KOUMsb4k3RfDgQSA=
-SHA256 (cargo/openssl-sys-extras-0.7.14.tar.gz) =
EcXh26fT0D2A8EW/DWARHcaSE7Z2UefIiVJ6O62rufo=
+SHA256 (cargo/num_cpus-1.1.0.tar.gz) =
iJDmCEcj1X0N+NJyCw1gxu5n1sk+cWljDkNx6Idl3K0=
+SHA256 (cargo/openssl-0.9.4.tar.gz) =
ZXTuIT7vLIOSUsXSyhEJBRYocIW+xiXTu6ymVHV+tlU=
+SHA256 (cargo/openssl-probe-0.1.0.tar.gz) =
dW1JyEJEg6PfO11zURK02iIQnO2agpTx9c34D7OBCRk=
+SHA256 (cargo/openssl-sys-0.9.4.tar.gz) =
XiM3TNrKICtlWTf/bRrWiH7cOR2f83Hz9INQw+n60AE=
SHA256 (cargo/pkg-config-0.3.8.tar.gz) =
jO6ATsx+ryAaSiByQUcsyHDoJSBvbAMePuKnL6Ql8vo=
-SHA256 (cargo/pnacl-build-helper-1.4.10.tar.gz) =
YckjHTGuqEUAdEPWL8u1i7aUmrnBgIHuHgmSDgzxEYs=
SHA256 (cargo/psapi-sys-0.1.0.tar.gz) =
q81dGgfTYOKXJ/dXqd7LPOi8bg76iWnPqtZpqDF6JHg=
SHA256 (cargo/rand-0.3.14.tar.gz) =
J5HYjG3vrHmcPyDXTwlMozuTMmEtmu+QeFGcguT+BKU=
-SHA256 (cargo/regex-0.1.77.tar.gz) =
ZLA0RsRm01tC8qiyA8jgPti5HA8XtW4fhPchCiV6pmU=
-SHA256 (cargo/regex-syntax-0.3.5.tar.gz) =
J5QBAXrjHPThU0SqPwhdDi5cHnAGconvkGkG/b6SyP0=
+SHA256 (cargo/regex-0.1.80.tar.gz) =
T9Ss5qjPeGBxSiwigNbB9+akE0hsEymLvIb9PaAZQC8=
+SHA256 (cargo/regex-syntax-0.3.9.tar.gz) =
+ewALDXoZ5GCXtKUtQAI7qnd/I3vRCAST7xrCNuDSVc=
SHA256 (cargo/rust-installer-4f994850808a572e2cc8d43f968893c8e942e9bf.tar.gz)
= 3HJA1gqGn6JKaMhzT7fIEMJ8ygptrVLfYnmGXk6Of64=
-SHA256 (cargo/rustc-serialize-0.3.19.tar.gz) =
YVnk5uVZyBvXBq/pyP1o9UfT6FHOEudrHeeRS6thaRs=
+SHA256 (cargo/rustc-serialize-0.3.21.tar.gz) =
v/n8HHny3sdrJTJz0HaC6UqXi9jxMt7QcRiBIrKvmBg=
SHA256 (cargo/semver-0.5.1.tar.gz) =
ri/2Ds2xnCVYQcBmy/pfjCpK2h6zrkfHerZmcSjacfU=
SHA256 (cargo/semver-parser-0.6.1.tar.gz) =
6I5DpadN0qEXB/nCHf1KQjxmvYcd+BMie7Cj5486Guk=
-SHA256 (cargo/strsim-0.3.0.tar.gz) =
5Nc6LDak0JXtGm31y+rBWYYxc0R/eoKz9HV0JoRKuCU=
+SHA256 (cargo/strsim-0.5.1.tar.gz) =
UMBp35LksBQlqL81dtXUF5Q6anJy+6uvW9gLGqp2RC4=
SHA256 (cargo/tar-0.4.8.tar.gz) = EuG5WfY3wuTGnb2/TX3GCe26ram4w10ML8mALQI4O2U=
SHA256 (cargo/tempdir-0.3.5.tar.gz) =
h5dKb1wd+zRNczBVYBZQBZozY94qYQSBkpO6/2YhMtY=
SHA256 (cargo/term-0.4.4.tar.gz) = Pe/4orO2YH1tfMMqwlwLM3CUU8qczqwAbKrFHpY8+Uo=
SHA256 (cargo/thread-id-2.0.0.tar.gz) =
qVOdtWAQLRzvRri3jOc3/wu2Tn4Y01sqVoj30JfQ/wM=
-SHA256 (cargo/thread_local-0.2.6.tar.gz) =
Vd2WPbrq3Aiqcma/f5HDFUp4BeMruUuCC3adLvO0dE0=
-SHA256 (cargo/toml-0.2.0.tar.gz) = pELfwTUI5gPD92MnQ2Hbf3nXRpoOlcQRzeU2Yqsw/HI=
+SHA256 (cargo/thread_local-0.2.7.tar.gz) =
hXbbv8rvlkFFLVzw35sOfuq3aUlW3TO7YVFfuPGM/dU=
+SHA256 (cargo/toml-0.2.1.tar.gz) = c2tgJJyyUze8GW+qQ+4SxwXkJvPVXCFNc6Tnvgb5LLQ=
SHA256 (cargo/unicode-bidi-0.2.3.tar.gz) =
wffOuWr9/u3uQrreZaDVhaagEG9oG2dJyP9Nqo3zCz8=
SHA256 (cargo/unicode-normalization-0.1.2.tar.gz) =
JmQ6L4O6xV8ZdvtxbBAjRIX5IC3NZc+9+dpJhnsnEXI=
-SHA256 (cargo/url-1.2.0.tar.gz) = r+nsVLxNsUvIdEt/7QYNeFrHVnkUUJWbIkhEMxnVsRk=
+SHA256 (cargo/url-1.2.3.tar.gz) = SMz3vYeoG3ac+ErVVuA0VB+5DhzW1Lw3XIIu2VAM2dc=
SHA256 (cargo/user32-sys-0.2.0.tar.gz) =
TvRxHRB7IbQQo6l0sSBNmszIsQ2tddgyS111XeFhfUc=
SHA256 (cargo/utf8-ranges-0.1.3.tar.gz) =
ocoTwIxBycPgQiTtn/gEYdl+EhWJ/yfHU6FssQgwrg8=
SHA256 (cargo/winapi-0.2.8.tar.gz) =
Fn3J1pSam4V/NFEnXpEcP0QlWELB96dvM8VRA6kJCHo=
@@ -74,38 +71,36 @@ SHA256 (cargo/winapi-build-0.1.1.tar.gz)
SHA256 (cargo/ws2_32-sys-0.2.1.tar.gz) =
1Zzv69DIkvot1t5YHpNzAdhVLLREic3/A1xhh8tj+l4=
SIZE (cargo/advapi32-sys-0.2.0.tar.gz) = 7217
SIZE (cargo/aho-corasick-0.5.3.tar.gz) = 252052
-SIZE (cargo/bitflags-0.1.1.tar.gz) = 8719
SIZE (cargo/bitflags-0.7.0.tar.gz) = 10851
SIZE (cargo/bufstream-0.1.2.tar.gz) = 7477
-SIZE (cargo/cargo-0.14.0.tar.gz) = 625305
-SIZE (cargo/cargo-bootstrap-amd64-0.14.0-20161112.tar.gz) = 7333945
-SIZE (cargo/cargo-bootstrap-i386-0.14.0-20161204.tar.gz) = 7137895
+SIZE (cargo/cargo-0.15.0.tar.gz) = 631157
+SIZE (cargo/cargo-bootstrap-amd64-0.15.0-20161230.tar.gz) = 7896659
+SIZE (cargo/cargo-bootstrap-i386-0.15.0-20161230.tar.gz) = 7637045
SIZE (cargo/cfg-if-0.1.0.tar.gz) = 2758
-SIZE (cargo/cmake-0.1.17.tar.gz) = 10222
-SIZE (cargo/crossbeam-0.2.9.tar.gz) = 35449
-SIZE (cargo/curl-0.3.9.tar.gz) = 53146
-SIZE (cargo/curl-sys-0.2.4.tar.gz) = 3196957
-SIZE (cargo/docopt-0.6.82.tar.gz) = 40647
-SIZE (cargo/env_logger-0.3.4.tar.gz) = 5641
+SIZE (cargo/cmake-0.1.18.tar.gz) = 11546
+SIZE (cargo/crossbeam-0.2.10.tar.gz) = 32993
+SIZE (cargo/curl-0.4.1.tar.gz) = 53884
+SIZE (cargo/curl-sys-0.3.6.tar.gz) = 3196287
+SIZE (cargo/docopt-0.6.86.tar.gz) = 41141
+SIZE (cargo/env_logger-0.3.5.tar.gz) = 5950
SIZE (cargo/filetime-0.1.10.tar.gz) = 8884
SIZE (cargo/flate2-0.2.14.tar.gz) = 46692
-SIZE (cargo/fs2-0.2.5.tar.gz) = 12661
-SIZE (cargo/gcc-0.3.35.tar.gz) = 23869
+SIZE (cargo/fs2-0.3.0.tar.gz) = 11874
+SIZE (cargo/gcc-0.3.38.tar.gz) = 24427
SIZE (cargo/gdi32-sys-0.2.0.tar.gz) = 7643
-SIZE (cargo/git2-0.4.4.tar.gz) = 121616
-SIZE (cargo/git2-curl-0.5.0.tar.gz) = 4060
+SIZE (cargo/git2-0.6.3.tar.gz) = 126947
+SIZE (cargo/git2-curl-0.7.0.tar.gz) = 4097
SIZE (cargo/glob-0.2.11.tar.gz) = 18065
SIZE (cargo/hamcrest-0.1.1.tar.gz) = 9217
SIZE (cargo/idna-0.1.0.tar.gz) = 234027
SIZE (cargo/kernel32-sys-0.2.2.tar.gz) = 24537
-SIZE (cargo/lazy_static-0.2.1.tar.gz) = 688253
+SIZE (cargo/lazy_static-0.2.2.tar.gz) = 5026
SIZE (cargo/libc-0.2.18.tar.gz) = 114209
-SIZE (cargo/libgit2-sys-0.4.5.tar.gz) = 4133755
-SIZE (cargo/libressl-pnacl-sys-2.1.6.tar.gz) = 2697179
-SIZE (cargo/libssh2-sys-0.1.39.tar.gz) = 389357
-SIZE (cargo/libz-sys-1.0.6.tar.gz) = 601369
+SIZE (cargo/libgit2-sys-0.6.4.tar.gz) = 4210492
+SIZE (cargo/libssh2-sys-0.2.4.tar.gz) = 410058
+SIZE (cargo/libz-sys-1.0.10.tar.gz) = 602079
SIZE (cargo/log-0.3.6.tar.gz) = 16110
-SIZE (cargo/matches-0.1.2.tar.gz) = 665
+SIZE (cargo/matches-0.1.4.tar.gz) = 1530
SIZE (cargo/memchr-0.1.11.tar.gz) = 6977
SIZE (cargo/miniz-sys-0.1.7.tar.gz) = 53361
SIZE (cargo/miow-0.1.3.tar.gz) = 18874
@@ -117,30 +112,29 @@ SIZE (cargo/num-integer-0.1.32.tar.gz) =
SIZE (cargo/num-iter-0.1.32.tar.gz) = 2896
SIZE (cargo/num-rational-0.1.35.tar.gz) = 7759
SIZE (cargo/num-traits-0.1.36.tar.gz) = 15071
-SIZE (cargo/num_cpus-1.0.0.tar.gz) = 5959
-SIZE (cargo/openssl-0.7.14.tar.gz) = 63824
-SIZE (cargo/openssl-sys-0.7.14.tar.gz) = 10156
-SIZE (cargo/openssl-sys-extras-0.7.14.tar.gz) = 3871
+SIZE (cargo/num_cpus-1.1.0.tar.gz) = 6381
+SIZE (cargo/openssl-0.9.4.tar.gz) = 84759
+SIZE (cargo/openssl-probe-0.1.0.tar.gz) = 5638
+SIZE (cargo/openssl-sys-0.9.4.tar.gz) = 27399
SIZE (cargo/pkg-config-0.3.8.tar.gz) = 10814
-SIZE (cargo/pnacl-build-helper-1.4.10.tar.gz) = 5470
SIZE (cargo/psapi-sys-0.1.0.tar.gz) = 973
SIZE (cargo/rand-0.3.14.tar.gz) = 54768
-SIZE (cargo/regex-0.1.77.tar.gz) = 185559
-SIZE (cargo/regex-syntax-0.3.5.tar.gz) = 116666
+SIZE (cargo/regex-0.1.80.tar.gz) = 185806
+SIZE (cargo/regex-syntax-0.3.9.tar.gz) = 117427
SIZE (cargo/rust-installer-4f994850808a572e2cc8d43f968893c8e942e9bf.tar.gz) =
20024
-SIZE (cargo/rustc-serialize-0.3.19.tar.gz) = 40870
+SIZE (cargo/rustc-serialize-0.3.21.tar.gz) = 45393
SIZE (cargo/semver-0.5.1.tar.gz) = 15586
SIZE (cargo/semver-parser-0.6.1.tar.gz) = 4860
-SIZE (cargo/strsim-0.3.0.tar.gz) = 4320
+SIZE (cargo/strsim-0.5.1.tar.gz) = 598561
SIZE (cargo/tar-0.4.8.tar.gz) = 35295
SIZE (cargo/tempdir-0.3.5.tar.gz) = 10605
SIZE (cargo/term-0.4.4.tar.gz) = 35853
SIZE (cargo/thread-id-2.0.0.tar.gz) = 6108
-SIZE (cargo/thread_local-0.2.6.tar.gz) = 10801
-SIZE (cargo/toml-0.2.0.tar.gz) = 46886
+SIZE (cargo/thread_local-0.2.7.tar.gz) = 10954
+SIZE (cargo/toml-0.2.1.tar.gz) = 47258
SIZE (cargo/unicode-bidi-0.2.3.tar.gz) = 1744003
SIZE (cargo/unicode-normalization-0.1.2.tar.gz) = 612931
-SIZE (cargo/url-1.2.0.tar.gz) = 68332
+SIZE (cargo/url-1.2.3.tar.gz) = 68790
SIZE (cargo/user32-sys-0.2.0.tar.gz) = 10624
SIZE (cargo/utf8-ranges-0.1.3.tar.gz) = 8422
SIZE (cargo/winapi-0.2.8.tar.gz) = 455145
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 26 Dec 2016 13:55:11 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2016/12/26 13:55:11 landry Exp $
-Permit running testsuite with SEPARATE_BUILD
---- Makefile.in.orig Wed Dec 14 13:26:43 2016
-+++ Makefile.in Wed Dec 14 13:32:23 2016
-@@ -99,7 +99,7 @@ cargo-$(1): $$(CARGO) target/openssl/$(1).stamp
-
- test-unit-$(1): $$(CARGO)
- @mkdir -p target/$(1)/cit
-- $$(CARGO) test --target $(1) $$(CARGOFLAGS) $$(VERBOSE_FLAG) $$(only)
-+ cd $(S) && $$(CARGO) test --target $(1) $$(CARGOFLAGS) $$(VERBOSE_FLAG)
$$(only)
- endef
- $(foreach target,$(CFG_TARGET),$(eval $(call CARGO_TARGET,$(target))))
-
-@@ -113,10 +113,10 @@ $(TARGET_ROOT)/snapshot/bin/cargo$(X): $(S)src/snapsho
- test: style no-exes $(foreach target,$(CFG_TARGET),test-unit-$(target))
-
- style:
-- sh tests/check-style.sh
-+ cd $(S) && sh tests/check-style.sh
-
- no-exes:
-- find $$(git ls-files) -type f \
-+ cd $(S) && find $$(git ls-files) -type f \
- \( -perm -u+x -or -perm -g+x -or -perm -o+x \) \
- -not -name configure -not -name '*.sh' -not -name '*.rs' \
- -not -name '*.py' -not -wholename "*/rust-installer/*" | \
Index: patches/patch-tests_cargotest_support_paths_rs
===================================================================
RCS file:
/cvs/ports/devel/cargo/patches/patch-tests_cargotest_support_paths_rs,v
retrieving revision 1.2
diff -u -p -r1.2 patch-tests_cargotest_support_paths_rs
--- patches/patch-tests_cargotest_support_paths_rs 26 Dec 2016 13:55:11
-0000 1.2
+++ patches/patch-tests_cargotest_support_paths_rs 30 Dec 2016 13:58:08
-0000
@@ -1,18 +1,21 @@
$OpenBSD: patch-tests_cargotest_support_paths_rs,v 1.2 2016/12/26 13:55:11
landry Exp $
use MODCARGO_TARGET_DIR as temporary directory for testing.
---- tests/cargotest/support/paths.rs.orig Sun Aug 21 20:00:19 2016
-+++ tests/cargotest/support/paths.rs Sun Aug 21 20:09:38 2016
+--- tests/cargotest/support/paths.rs.orig Tue Dec 20 22:16:05 2016
++++ tests/cargotest/support/paths.rs Fri Dec 30 06:06:19 2016
@@ -1,4 +1,3 @@
-use std::env;
use std::cell::Cell;
use std::fs;
use std::io::{self, ErrorKind};
-@@ -30,19 +29,7 @@ fn init() {
+@@ -30,22 +29,7 @@ fn init() {
}
fn global_root() -> PathBuf {
- let mut path = t!(env::current_exe());
- path.pop(); // chop off exe name
+- if path.ends_with("deps") {
+- path.pop();
+- }
- path.pop(); // chop off 'debug'
-
- // If `cargo test` is run manually then our path looks like
