Hi, Here the update for devel/cargo to go with lang/rust 1.11.0.
Thanks. -- Sebastien Marie Index: Makefile =================================================================== RCS file: /cvs/ports/devel/cargo/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile 13 Aug 2016 07:40:43 -0000 1.2 +++ Makefile 21 Aug 2016 18:19:30 -0000 @@ -2,7 +2,7 @@ COMMENT = package manager for Rust language # cargo version -CARGO_VERSION = 0.10.0 +CARGO_VERSION = 0.12.0 # rust-install submodule version # in cargo/src/rust-installer @@ -10,18 +10,17 @@ RUSTINSTALL_INDEX = c37d3747da75c280237d # crates.io commit for CARGO_VERSION # https://github.com/rust-lang/crates.io-index/commits/master/ca/rg/cargo -CRATESIO_INDEX = 9df16a42b9f2e03378292a6bb1743c0473adec35 +CRATESIO_INDEX = 2a052b0552fc80dc174ddfa20bc66d097189dca3 # cargo version used for bootstrapping -BOOTSTRAP_VERSION = 0.10.0-20160523 +BOOTSTRAP_VERSION = 0.12.0-20160821 # registry index # see ${WRKDIR}/cargo-home/registry/index/github.com-${REGISTRY_INDEX} -REGISTRY_INDEX = 88ac128001ac3a9a +REGISTRY_INDEX = 1ecc6299db9ec823 DISTNAME = cargo-${CARGO_VERSION} -REVISION = 0 CATEGORIES = devel HOMEPAGE = https://doc.crates.io/ @@ -53,58 +52,56 @@ DISTFILES += crates.io-index-${CRATESIO_ CRATES += advapi32-sys-0.1.2 # MIT CRATES += aho-corasick-0.5.1 # Unlicense/MIT CRATES += bitflags-0.1.1 # MIT/Apache-2.0 -CRATES += bufstream-0.1.1 # MIT/Apache-2.0 +CRATES += bufstream-0.1.1 # MIT/Apache-2.0 (test only) +CRATES += cfg-if-0.1.0 # MIT/Apache-2.0 CRATES += cmake-0.1.16 # MIT/Apache-2.0 CRATES += crossbeam-0.2.8 # MIT/Apache-2.0 -CRATES += curl-0.2.18 # MIT -CRATES += curl-sys-0.1.34 # MIT +CRATES += curl-0.3.0 # MIT +CRATES += curl-sys-0.2.0 # MIT CRATES += docopt-0.6.78 # Unlicense/MIT CRATES += env_logger-0.3.2 # MIT/Apache-2.0 CRATES += filetime-0.1.10 # MIT/Apache-2.0 CRATES += flate2-0.2.13 # MIT/Apache-2.0 CRATES += fs2-0.2.3 # MIT/Apache-2.0 CRATES += gcc-0.3.26 # MIT/Apache-2.0 -CRATES += gdi32-sys-0.1.1 # MIT -CRATES += git2-0.4.2 # MIT/Apache-2.0 -CRATES += git2-curl-0.4.0 # MIT/Apache-2.0 +CRATES += git2-0.4.3 # MIT/Apache-2.0 +CRATES += git2-curl-0.5.0 # MIT/Apache-2.0 CRATES += glob-0.2.11 # MIT/Apache-2.0 -CRATES += hamcrest-0.1.0 # no license indication (testsuite only) +CRATES += hamcrest-0.1.0 # no license indication (test only) +CRATES += idna-0.1.0 # MIT/Apache-2.0 CRATES += kernel32-sys-0.2.1 # MIT CRATES += libc-0.2.8 # MIT/Apache-2.0 -CRATES += libgit2-sys-0.4.2 # MIT/Apache-2.0 -CRATES += libressl-pnacl-sys-2.1.6 # MIT +CRATES += libgit2-sys-0.4.3 # MIT/Apache-2.0 CRATES += libssh2-sys-0.1.37 # MIT/Apache-2.0 CRATES += libz-sys-1.0.2 # MIT/Apache-2.0 CRATES += log-0.3.5 # MIT/Apache-2.0 CRATES += matches-0.1.2 # MIT CRATES += memchr-0.1.10 # Unlicense/MIT CRATES += miniz-sys-0.1.7 # MIT/Apache-2.0 +CRATES += miow-0.1.2 # MIT/Apache-2.0 +CRATES += net2-0.2.24 # MIT/Apache-2.0 CRATES += nom-1.2.2 # MIT -CRATES += num-0.1.31 # MIT/Apache-2.0 +CRATES += num-0.1.31 # MIT/Apache-2.0 (test) CRATES += num_cpus-0.2.11 # MIT CRATES += openssl-sys-0.7.8 # MIT CRATES += pkg-config-0.3.8 # MIT/Apache-2.0 -CRATES += pnacl-build-helper-1.4.10 # MPL-2.0 CRATES += rand-0.3.14 # MIT/Apache-2.0 CRATES += regex-0.1.58 # MIT/Apache-2.0 CRATES += regex-syntax-0.3.0 # MIT/Apache-2.0 CRATES += rustc-serialize-0.3.18 # MIT/Apache-2.0 CRATES += semver-0.2.3 # MIT/Apache-2.0 CRATES += strsim-0.3.0 # MIT -CRATES += tar-0.4.4 # MIT/Apache-2.0 +CRATES += tar-0.4.5 # MIT/Apache-2.0 CRATES += tempdir-0.3.4 # MIT/Apache-2.0 CRATES += term-0.4.4 # MIT/Apache-2.0 -CRATES += time-0.1.34 # MIT/Apache-2.0 -CRATES += toml-0.1.28 # MIT/Apache-2.0 +CRATES += toml-0.1.30 # MIT/Apache-2.0 CRATES += unicode-bidi-0.2.3 # MIT/Apache-2.0 CRATES += unicode-normalization-0.1.2 # MIT/Apache-2.0 -CRATES += url-0.2.38 # MIT/Apache-2.0 -CRATES += url-0.5.7 # MIT/Apache-2.0 -CRATES += user32-sys-0.1.2 # MIT +CRATES += url-1.1.0 # MIT/Apache-2.0 CRATES += utf8-ranges-0.1.3 # Unlicense/MIT -CRATES += uuid-0.1.18 # MIT/Apache-2.0 CRATES += winapi-0.2.6 # MIT CRATES += winapi-build-0.1.1 # MIT +CRATES += ws2_32-sys-0.2.1 # MIT MASTER_SITES0 = https://crates.io/api/v1/crates/ .for _crate in ${CRATES} @@ -121,7 +118,7 @@ USE_GMAKE = Yes BUILD_DEPENDS = devel/libgit2/libgit2 \ devel/cmake \ - lang/rust>=1.8.0p1 + lang/rust>=1.11.0 LIB_DEPENDS = net/curl \ security/libssh2 @@ -159,11 +156,10 @@ post-extract: SUBST_VARS += WRKBUILD pre-test: - ${SUBST_CMD} ${WRKSRC}/tests/support/paths.rs + ${SUBST_CMD} ${WRKSRC}/tests/cargotest/support/paths.rs post-install: rm -rf ${PREFIX}/lib/rustlib - rm -rf ${PREFIX}/man ; mv ${PREFIX}/share/man ${PREFIX}/man mkdir -p ${PREFIX}/share/bash-completion/completions mv ${PREFIX}${SYSCONFDIR}/bash_completion.d/cargo \ ${PREFIX}/share/bash-completion/completions Index: distinfo =================================================================== RCS file: /cvs/ports/devel/cargo/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 30 May 2016 04:30:53 -0000 1.1.1.1 +++ distinfo 21 Aug 2016 18:19:30 -0000 @@ -2,40 +2,41 @@ SHA256 (cargo/advapi32-sys-0.1.2.tar.gz) SHA256 (cargo/aho-corasick-0.5.1.tar.gz) = Zwd0ePCgOVK+0uZ4YzjUANQMJemDbgitUK+WYHMX/QM= SHA256 (cargo/bitflags-0.1.1.tar.gz) = KmV3UX7NDuCTT0inKVqJqu8+bfr+rEBPlMCzRIUY3f4= SHA256 (cargo/bufstream-0.1.1.tar.gz) = fkk95qiu1RaXCI423FJF6j7dNOaHLjLHMuX5lu1bI7I= -SHA256 (cargo/cargo-0.10.0.tar.gz) = HnPAOGgf4wgZVCe3EyKmNQxl07jL6hmeRce2crR1Tg4= -SHA256 (cargo/cargo-bootstrap-0.10.0-20160523.tar.gz) = HG6j5m2zrAYca0jZB3jZo7pm1TAlfznQqDQjm0MiQ1E= +SHA256 (cargo/cargo-0.12.0.tar.gz) = QIDXa1a4IC998nG0u319IqvqX/jCYa70Lm5dJIyllys= +SHA256 (cargo/cargo-bootstrap-0.12.0-20160821.tar.gz) = rBhFqBzFHoLrTkY1GsdeIhuvguwthCwIlajCh8y65Vc= +SHA256 (cargo/cfg-if-0.1.0.tar.gz) = 3h52DXtlNa9CQfyovYrfaOLn7azGsp9dOZBQxeSM+Iw= SHA256 (cargo/cmake-0.1.16.tar.gz) = 62Go07Zfjgr1KsV5kj7Ei91cpOM1wP3kBx5YYOtlBTI= -SHA256 (cargo/crates.io-index-9df16a42b9f2e03378292a6bb1743c0473adec35.tar.gz) = x1j7F8fdDWvWiIxDwVZjDnyPjkm9+znvZGrMKzWVng0= +SHA256 (cargo/crates.io-index-2a052b0552fc80dc174ddfa20bc66d097189dca3.tar.gz) = kKgL7TuJj3dBhIEc7kTy+lV8J/K32Aq5m251NWk/0FE= SHA256 (cargo/crossbeam-0.2.8.tar.gz) = NIIozp+T0g/8MMGOV1+C+kG5yL8GSAbGXUHrpHcVlaA= -SHA256 (cargo/curl-0.2.18.tar.gz) = Kki3LGahuPxnZ/5PPNp9a5vfq48/FoNEuDDt276OLaA= -SHA256 (cargo/curl-sys-0.1.34.tar.gz) = kxlmaPdalH2Enh8tuSdyI4hOzjrxacv/PTbO7q93NrA= +SHA256 (cargo/curl-0.3.0.tar.gz) = Jvojd7rP+yeKRy3MLHQldzFlJ9KozliEVRJ8b/RSGEY= +SHA256 (cargo/curl-sys-0.2.0.tar.gz) = eAweKVkD8SywWY1zcD+FBhX2he7rTyMj+9KRHvM32n4= SHA256 (cargo/docopt-0.6.78.tar.gz) = VXkspbuTPlWj4XiIg4iD+FSwKZRTEMmg6k9l69o2YVU= SHA256 (cargo/env_logger-0.3.2.tar.gz) = trvnwLYZyBuaH9Eiqzx+8Zp7J826PISGMUtvJ1yiEaQ= SHA256 (cargo/filetime-0.1.10.tar.gz) = U2OrjkE5uFaKYjfbUkhkblqKL4m9XMsCCSGCsR/T6SI= SHA256 (cargo/flate2-0.2.13.tar.gz) = +eb8aeBQkzb/WKLlq5HHqWKct4utJuZ9jESJ9aZIrds= SHA256 (cargo/fs2-0.2.3.tar.gz) = ok9pP9k9BAmZYil9zboFeLSQ157ybgEFIEF5UgaYv5E= SHA256 (cargo/gcc-0.3.26.tar.gz) = Mze/Te7I3TPDMaYrWXCPW0OHebgImxiI1Wl2rCwyXT4= -SHA256 (cargo/gdi32-sys-0.1.1.tar.gz) = ZSVuxNwlkubwW/wco7lWpOBpiqkLHf8fVofVWlo/1Zo= -SHA256 (cargo/git2-0.4.2.tar.gz) = HGY+BkmOrO2QzNgwrCMzK1tSG5qe6C0JVSCzOUtekJg= -SHA256 (cargo/git2-curl-0.4.0.tar.gz) = wT2vumG3ncn6RbQLBHilGWyrK1caNVEoZn+ulRuy0Mw= +SHA256 (cargo/git2-0.4.3.tar.gz) = xPBNA2J+u46sK05fNBEEFYPoYzirmPy7jxyOdNH17vc= +SHA256 (cargo/git2-curl-0.5.0.tar.gz) = PV92bYBOPPK5Dhard8Pd7cscpdJFbK23s/kHNF+MNJg= SHA256 (cargo/glob-0.2.11.tar.gz) = i+GN4JpWtg7Q7fhLyd8AfjAEBpGves0cQYdPqsWJW/s= SHA256 (cargo/hamcrest-0.1.0.tar.gz) = J8GAtAm5iHYKAY5ctfCBK9Z+h/QCNuQdO5N10wRuBKs= +SHA256 (cargo/idna-0.1.0.tar.gz) = EFMjbgDOT2aK7KSnaaCbO/WmgtgCq9bzyzk3T2sWLBE= SHA256 (cargo/kernel32-sys-0.2.1.tar.gz) = tbXn7fN15tJiQ73hcvHV7RRG9Kdm/JtwBuH9JyWCQ/E= SHA256 (cargo/libc-0.2.8.tar.gz) = UvRfTU113pbPf4sON7ao4vlmGXSbgL15qp9aMQDWMgg= -SHA256 (cargo/libgit2-sys-0.4.2.tar.gz) = cQZAVOSmPVVYeT7DqWxeNS6zmBex+Zr6qqnyKmkctTg= -SHA256 (cargo/libressl-pnacl-sys-2.1.6.tar.gz) = y8BYlRq2o+81yhZGLXZCxIZ+ZANSCBHyhTek4vLbPnE= +SHA256 (cargo/libgit2-sys-0.4.3.tar.gz) = 3IheLZb43wa/8IFOalCp6Tr3qxiEdMQ9N3DKIE5MggI= SHA256 (cargo/libssh2-sys-0.1.37.tar.gz) = xF+6hO4foFuDDLRxdB7zDUHrHDuXFguK2NlVr4JN6IA= SHA256 (cargo/libz-sys-1.0.2.tar.gz) = qmtT+YBvUDVpu/PCm28OP9yG5+/zbwyeVTgftAD4tP0= SHA256 (cargo/log-0.3.5.tar.gz) = A4tdExiaFOW2rDhP23xpGkXvCIX20t3b9CLmw1BrgjQ= SHA256 (cargo/matches-0.1.2.tar.gz) = FTBWVoCc5aSAWx/ylGiSgQmSGXzhJw/3m63thSGHlC4= SHA256 (cargo/memchr-0.1.10.tar.gz) = yYrbWXJj4kXG/+SNxQ0zi1GsuMxT6Oez6cIfU8CkEcs= SHA256 (cargo/miniz-sys-0.1.7.tar.gz) = nR9NM3oBwy4fISJRD+1GOT1TyjWn9CnLBFCrrt+j7VQ= +SHA256 (cargo/miow-0.1.2.tar.gz) = TpPWM9NLj/ZaJFZtZ9SXA+elx6woRNYTmp/EQaeZ6Jo= +SHA256 (cargo/net2-0.2.24.tar.gz) = B4sNYCL4k67rKutO0LQWg6Cal+w8PFZfp0pdNTnSVhg= SHA256 (cargo/nom-1.2.2.tar.gz) = bKqxLF+XqjFssklyWqMhFRGOFSK0ReJsJX3XfK1f/U4= SHA256 (cargo/num-0.1.31.tar.gz) = vkWz40FSJWRBWgcRjXz0SJbQkZ56G7IdWa2Cr0glYyQ= SHA256 (cargo/num_cpus-0.2.11.tar.gz) = Uf7a6XoF9zU2Ev4BercFo35tuPTWfFxv5zmp5w1u7Qk= SHA256 (cargo/openssl-sys-0.7.8.tar.gz) = Bl6Zwtynq/4wW9glTSIZUrRtR+qaHIW21nTDjwg3ZeY= SHA256 (cargo/pkg-config-0.3.8.tar.gz) = jO6ATsx+ryAaSiByQUcsyHDoJSBvbAMePuKnL6Ql8vo= -SHA256 (cargo/pnacl-build-helper-1.4.10.tar.gz) = YckjHTGuqEUAdEPWL8u1i7aUmrnBgIHuHgmSDgzxEYs= SHA256 (cargo/rand-0.3.14.tar.gz) = J5HYjG3vrHmcPyDXTwlMozuTMmEtmu+QeFGcguT+BKU= SHA256 (cargo/regex-0.1.58.tar.gz) = Pddln4FDEgaIC45ur655vwYOZG3ic3ElzAjDD2rRrr4= SHA256 (cargo/regex-syntax-0.3.0.tar.gz) = kfAlWSxkrKCEsesfVW/KycAW2pambb69X5p72m+StUA= @@ -43,58 +44,56 @@ SHA256 (cargo/rust-installer-c37d3747da7 SHA256 (cargo/rustc-serialize-0.3.18.tar.gz) = nPgVGM1Xn4qcWMCnEyi9ub4Vx1QYEmHaglgwktyKf/A= SHA256 (cargo/semver-0.2.3.tar.gz) = LVt2OKHwOBXZTojLOzwI6H8NtNaD70mdGDaq9wpFYj8= SHA256 (cargo/strsim-0.3.0.tar.gz) = 5Nc6LDak0JXtGm31y+rBWYYxc0R/eoKz9HV0JoRKuCU= -SHA256 (cargo/tar-0.4.4.tar.gz) = yCaS2aDmY7jI+ULqsIiQHYDLc2XzYJZ1YvI3FI0XktM= +SHA256 (cargo/tar-0.4.5.tar.gz) = udMnN2xrt2bV6vEweEozHJGqCT73sql3N3ybyTzr8OE= SHA256 (cargo/tempdir-0.3.4.tar.gz) = C2KTOj+WzVWXAGYsNPi6uIHZ41QCiftPNoQZx/E6Wqk= SHA256 (cargo/term-0.4.4.tar.gz) = Pe/4orO2YH1tfMMqwlwLM3CUU8qczqwAbKrFHpY8+Uo= -SHA256 (cargo/time-0.1.34.tar.gz) = jErqoclZdPV2PDpawNuVoZeTWJvOpdIuFhtVh+Oq0Ck= -SHA256 (cargo/toml-0.1.28.tar.gz) = /NJ6BMpQmv8za6XrKrxY1Fb1LE/2TZck2IrLherVYLY= +SHA256 (cargo/toml-0.1.30.tar.gz) = BZDXIYLlDoecTaOxHGSI2uGPzLGuDHo+2hjhZ5WER5Y= 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-0.2.38.tar.gz) = y6qDd6Fi2I59FdsM8RDIUjRT7cvFvGbStv/8z/o0oGg= -SHA256 (cargo/url-0.5.7.tar.gz) = DPrT8vbIveynlKuhpA9bSzjOSZSET1/rdGagrdv1o20= -SHA256 (cargo/user32-sys-0.1.2.tar.gz) = ZxcSneWsJT9WQvx4pR0Mfeb59T1hf8lOm65/bnHPVQQ= +SHA256 (cargo/url-1.1.0.tar.gz) = rvTgOU7cvxWCrEhfU0LCxGTNGF8yKtyojWMZPdiPxoU= SHA256 (cargo/utf8-ranges-0.1.3.tar.gz) = ocoTwIxBycPgQiTtn/gEYdl+EhWJ/yfHU6FssQgwrg8= -SHA256 (cargo/uuid-0.1.18.tar.gz) = eMWQtb157RCq2Pt18HilnY20Ra9sdD5VxKUyJ/wBwT8= SHA256 (cargo/winapi-0.2.6.tar.gz) = Tfqqj72qYY+mkUtZsnadaQ3XUhkgoY2EtC0lRnjdX9Q= SHA256 (cargo/winapi-build-0.1.1.tar.gz) = LTFe7js0rKR5ey2msT7Ygmbm1hJWKgxGOQr4KZ/Gmbw= +SHA256 (cargo/ws2_32-sys-0.2.1.tar.gz) = 1Zzv69DIkvot1t5YHpNzAdhVLLREic3/A1xhh8tj+l4= SIZE (cargo/advapi32-sys-0.1.2.tar.gz) = 7052 SIZE (cargo/aho-corasick-0.5.1.tar.gz) = 29015 SIZE (cargo/bitflags-0.1.1.tar.gz) = 8719 SIZE (cargo/bufstream-0.1.1.tar.gz) = 7437 -SIZE (cargo/cargo-0.10.0.tar.gz) = 553862 -SIZE (cargo/cargo-bootstrap-0.10.0-20160523.tar.gz) = 8277650 +SIZE (cargo/cargo-0.12.0.tar.gz) = 574902 +SIZE (cargo/cargo-bootstrap-0.12.0-20160821.tar.gz) = 8316832 +SIZE (cargo/cfg-if-0.1.0.tar.gz) = 2758 SIZE (cargo/cmake-0.1.16.tar.gz) = 10125 -SIZE (cargo/crates.io-index-9df16a42b9f2e03378292a6bb1743c0473adec35.tar.gz) = 1686495 +SIZE (cargo/crates.io-index-2a052b0552fc80dc174ddfa20bc66d097189dca3.tar.gz) = 2136978 SIZE (cargo/crossbeam-0.2.8.tar.gz) = 31266 -SIZE (cargo/curl-0.2.18.tar.gz) = 19455 -SIZE (cargo/curl-sys-0.1.34.tar.gz) = 3374363 +SIZE (cargo/curl-0.3.0.tar.gz) = 45799 +SIZE (cargo/curl-sys-0.2.0.tar.gz) = 3126940 SIZE (cargo/docopt-0.6.78.tar.gz) = 40287 SIZE (cargo/env_logger-0.3.2.tar.gz) = 5144 SIZE (cargo/filetime-0.1.10.tar.gz) = 8884 SIZE (cargo/flate2-0.2.13.tar.gz) = 45773 SIZE (cargo/fs2-0.2.3.tar.gz) = 12692 SIZE (cargo/gcc-0.3.26.tar.gz) = 21465 -SIZE (cargo/gdi32-sys-0.1.1.tar.gz) = 4886 -SIZE (cargo/git2-0.4.2.tar.gz) = 113631 -SIZE (cargo/git2-curl-0.4.0.tar.gz) = 3810 +SIZE (cargo/git2-0.4.3.tar.gz) = 115276 +SIZE (cargo/git2-curl-0.5.0.tar.gz) = 4060 SIZE (cargo/glob-0.2.11.tar.gz) = 18065 SIZE (cargo/hamcrest-0.1.0.tar.gz) = 4027 +SIZE (cargo/idna-0.1.0.tar.gz) = 234027 SIZE (cargo/kernel32-sys-0.2.1.tar.gz) = 24530 SIZE (cargo/libc-0.2.8.tar.gz) = 76683 -SIZE (cargo/libgit2-sys-0.4.2.tar.gz) = 2505947 -SIZE (cargo/libressl-pnacl-sys-2.1.6.tar.gz) = 2697179 +SIZE (cargo/libgit2-sys-0.4.3.tar.gz) = 4132633 SIZE (cargo/libssh2-sys-0.1.37.tar.gz) = 337082 SIZE (cargo/libz-sys-1.0.2.tar.gz) = 601095 SIZE (cargo/log-0.3.5.tar.gz) = 16181 SIZE (cargo/matches-0.1.2.tar.gz) = 665 SIZE (cargo/memchr-0.1.10.tar.gz) = 6771 SIZE (cargo/miniz-sys-0.1.7.tar.gz) = 53361 +SIZE (cargo/miow-0.1.2.tar.gz) = 18425 +SIZE (cargo/net2-0.2.24.tar.gz) = 18007 SIZE (cargo/nom-1.2.2.tar.gz) = 64533 SIZE (cargo/num-0.1.31.tar.gz) = 88366 SIZE (cargo/num_cpus-0.2.11.tar.gz) = 2043 SIZE (cargo/openssl-sys-0.7.8.tar.gz) = 9668 SIZE (cargo/pkg-config-0.3.8.tar.gz) = 10814 -SIZE (cargo/pnacl-build-helper-1.4.10.tar.gz) = 5470 SIZE (cargo/rand-0.3.14.tar.gz) = 54768 SIZE (cargo/regex-0.1.58.tar.gz) = 155004 SIZE (cargo/regex-syntax-0.3.0.tar.gz) = 106499 @@ -102,17 +101,14 @@ SIZE (cargo/rust-installer-c37d3747da75c SIZE (cargo/rustc-serialize-0.3.18.tar.gz) = 40116 SIZE (cargo/semver-0.2.3.tar.gz) = 18500 SIZE (cargo/strsim-0.3.0.tar.gz) = 4320 -SIZE (cargo/tar-0.4.4.tar.gz) = 259223 +SIZE (cargo/tar-0.4.5.tar.gz) = 30191 SIZE (cargo/tempdir-0.3.4.tar.gz) = 8469 SIZE (cargo/term-0.4.4.tar.gz) = 35853 -SIZE (cargo/time-0.1.34.tar.gz) = 26771 -SIZE (cargo/toml-0.1.28.tar.gz) = 42323 +SIZE (cargo/toml-0.1.30.tar.gz) = 45082 SIZE (cargo/unicode-bidi-0.2.3.tar.gz) = 1744003 SIZE (cargo/unicode-normalization-0.1.2.tar.gz) = 612931 -SIZE (cargo/url-0.2.38.tar.gz) = 48716 -SIZE (cargo/url-0.5.7.tar.gz) = 281829 -SIZE (cargo/user32-sys-0.1.2.tar.gz) = 10676 +SIZE (cargo/url-1.1.0.tar.gz) = 65323 SIZE (cargo/utf8-ranges-0.1.3.tar.gz) = 8422 -SIZE (cargo/uuid-0.1.18.tar.gz) = 13316 SIZE (cargo/winapi-0.2.6.tar.gz) = 741153 SIZE (cargo/winapi-build-0.1.1.tar.gz) = 669 +SIZE (cargo/ws2_32-sys-0.2.1.tar.gz) = 4697 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/devel/cargo/patches/patch-configure,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-configure --- patches/patch-configure 30 May 2016 04:30:53 -0000 1.1.1.1 +++ patches/patch-configure 21 Aug 2016 18:19:30 -0000 @@ -1,9 +1,9 @@ $OpenBSD: patch-configure,v 1.1.1.1 2016/05/30 04:30:53 semarie Exp $ - found python2.7 - remove need of curl or wget ---- configure.orig Sun Jan 24 14:12:38 2016 -+++ configure Sun Jan 24 14:12:46 2016 -@@ -341,8 +341,7 @@ validate_opt +--- configure.orig Mon Jul 4 09:44:08 2016 ++++ configure Sun Aug 21 19:54:03 2016 +@@ -342,8 +342,7 @@ validate_opt step_msg "looking for build programs" Index: patches/patch-tests_cargotest_support_paths_rs =================================================================== RCS file: patches/patch-tests_cargotest_support_paths_rs diff -N patches/patch-tests_cargotest_support_paths_rs --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-tests_cargotest_support_paths_rs 21 Aug 2016 18:19:30 -0000 @@ -0,0 +1,30 @@ +$OpenBSD$ +use WRKBUILD 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 +@@ -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() { + } + + fn global_root() -> PathBuf { +- let mut path = t!(env::current_exe()); +- path.pop(); // chop off exe name +- path.pop(); // chop off 'debug' +- +- // If `cargo test` is run manually then our path looks like +- // `target/debug/foo`, in which case our `path` is already pointing at +- // `target`. If, however, `cargo test --target $target` is used then the +- // output is `target/$target/debug/foo`, so our path is pointing at +- // `target/$target`. Here we conditionally pop the `$target` name. +- if path.file_name().and_then(|s| s.to_str()) != Some("target") { +- path.pop(); +- } +- ++ let path = PathBuf::from("/data/semarie/obj/ports/cargo-0.12.0/cargo-0.12.0/target/debug"); + path.join(CARGO_INTEGRATION_TEST_DIR) + } + Index: patches/patch-tests_support_paths_rs =================================================================== RCS file: patches/patch-tests_support_paths_rs diff -N patches/patch-tests_support_paths_rs --- patches/patch-tests_support_paths_rs 30 May 2016 04:30:53 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,29 +0,0 @@ -$OpenBSD: patch-tests_support_paths_rs,v 1.1.1.1 2016/05/30 04:30:53 semarie Exp $ -use WRKBUILD as temporary directory for testing. ---- tests/support/paths.rs.orig Fri Apr 8 22:31:50 2016 -+++ tests/support/paths.rs Thu May 19 08:27:23 2016 -@@ -1,4 +1,3 @@ --use std::env; - use std::fs; - use std::io::{self, ErrorKind}; - use std::path::{Path, PathBuf}; -@@ -12,18 +11,7 @@ static NEXT_ID: AtomicUsize = ATOMIC_USIZE_INIT; - thread_local!(static TASK_ID: usize = NEXT_ID.fetch_add(1, Ordering::SeqCst)); - - pub fn root() -> PathBuf { -- let mut path = env::current_exe().unwrap(); -- path.pop(); // chop off exe name -- path.pop(); // chop off 'debug' -- -- // If `cargo test` is run manually then our path looks like -- // `target/debug/foo`, in which case our `path` is already pointing at -- // `target`. If, however, `cargo test --target $target` is used then the -- // output is `target/$target/debug/foo`, so our path is pointing at -- // `target/$target`. Here we conditionally pop the `$target` name. -- if path.file_name().and_then(|s| s.to_str()) != Some("target") { -- path.pop(); -- } -+ let path = PathBuf::from("${WRKBUILD}/target/debug"); - - path.join(CARGO_INTEGRATION_TEST_DIR) - .join(&TASK_ID.with(|my_id| format!("t{}", my_id))) Index: patches/patch-tests_test_cargo_new_rs =================================================================== RCS file: patches/patch-tests_test_cargo_new_rs diff -N patches/patch-tests_test_cargo_new_rs --- patches/patch-tests_test_cargo_new_rs 30 May 2016 04:30:53 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-tests_test_cargo_new_rs,v 1.1.1.1 2016/05/30 04:30:53 semarie Exp $ -obsolete config. backport https://github.com/rust-lang/cargo/pull/2719 ---- tests/test_cargo_new.rs.orig Fri Apr 8 22:31:50 2016 -+++ tests/test_cargo_new.rs Thu May 19 21:10:53 2016 -@@ -217,7 +217,7 @@ test!(author_prefers_cargo { - [cargo-new] - name = "new-foo" - email = "new-bar" -- git = false -+ vcs = "none" - "#).unwrap(); - - assert_that(cargo_process("new").arg("foo").env("USER", "foo"), Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/cargo/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 30 May 2016 04:30:53 -0000 1.1.1.1 +++ pkg/PLIST 21 Aug 2016 18:19:30 -0000 @@ -1,5 +1,19 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2016/05/30 04:30:53 semarie Exp $ @bin bin/cargo +@man man/man1/cargo-bench.1 +@man man/man1/cargo-build.1 +@man man/man1/cargo-clean.1 +@man man/man1/cargo-doc.1 +@man man/man1/cargo-init.1 +@man man/man1/cargo-install.1 +@man man/man1/cargo-new.1 +@man man/man1/cargo-owner.1 +@man man/man1/cargo-package.1 +@man man/man1/cargo-publish.1 +@man man/man1/cargo-run.1 +@man man/man1/cargo-search.1 +@man man/man1/cargo-test.1 +@man man/man1/cargo-update.1 @man man/man1/cargo.1 @comment share/bash-completion/ @comment share/bash-completion/completions/ @@ -9,4 +23,6 @@ share/doc/cargo/LICENSE-APACHE share/doc/cargo/LICENSE-MIT share/doc/cargo/LICENSE-THIRD-PARTY share/doc/cargo/README.md +share/zsh/ +share/zsh/site-functions/ share/zsh/site-functions/_cargo
