Hi, Here an update for devel/cargo.
0.16.0 is buildable with rustc 1.14.0 (current version in ports) and with 1.15.0 (upcoming version). Nothing special for cargo itself. I updated cargo.port.mk a bit too: - generate error when DIST_SUBDIR is defined whereas MODCARGO_DIST_SUBDIR isn't the purpose is to keep all MODCARGO_CRATES stuff inside one specific directory of DISTDIR. - use Cargo.toml path (MODCARGO_CARGOTOML variable) to infer Cargo.lock path. -- Sebastien Marie Index: Makefile =================================================================== RCS file: /cvs/ports/devel/cargo/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- Makefile 6 Jan 2017 17:35:56 -0000 1.10 +++ Makefile 5 Feb 2017 15:21:18 -0000 @@ -4,11 +4,11 @@ COMMENT = package manager for Rust langu ONLY_FOR_ARCHS = amd64 i386 # cargo version -CARGO_VERSION = 0.15.0 +CARGO_VERSION = 0.16.0 # cargo version used for bootstrapping -BV-amd64 = 0.15.0-20161230 -BV-i386 = 0.15.0-20161230 +BV-amd64 = 0.16.0-20170204 +BV-i386 = 0.16.0-20170204 BOOTSTRAP_VERSION = ${BV-${MACHINE_ARCH}} # rust-install submodule version in cargo/src/rust-installer @@ -42,73 +42,73 @@ 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.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.18 # 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.19 # 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 += 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.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.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 += filetime-0.1.10 # MIT/Apache-2.0 +MODCARGO_CRATES += flate2-0.2.14 # MIT/Apache-2.0 +MODCARGO_CRATES += fs2-0.3.0 # MIT/Apache-2.0 +MODCARGO_CRATES += gcc-0.3.39 # MIT/Apache-2.0 +MODCARGO_CRATES += gdi32-sys-0.2.0 # MIT +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.2 # MIT -MODCARGO_CRATES += libc-0.2.18 # MIT/Apache-2.0 -MODCARGO_CRATES += libgit2-sys-0.6.4 # MIT/Apache-2.0 +MODCARGO_CRATES += libc-0.2.19 # MIT/Apache-2.0 +MODCARGO_CRATES += libgit2-sys-0.6.5 # 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.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 -MODCARGO_CRATES += net2-0.2.26 # MIT/Apache-2.0 -MODCARGO_CRATES += num-0.1.36 # 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.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 +MODCARGO_CRATES += net2-0.2.26 # MIT/Apache-2.0 +MODCARGO_CRATES += num-0.1.36 # MIT/Apache-2.0 MODCARGO_CRATES += num-bigint-0.1.35 # MIT/Apache-2.0 MODCARGO_CRATES += num-complex-0.1.35 # MIT/Apache-2.0 MODCARGO_CRATES += num-integer-0.1.32 # MIT/Apache-2.0 -MODCARGO_CRATES += num-iter-0.1.32 # MIT/Apache-2.0 +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 += 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 += 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 += psapi-sys-0.1.0 # MIT -MODCARGO_CRATES += regex-0.1.80 # MIT/Apache-2.0 +MODCARGO_CRATES += psapi-sys-0.1.0 # MIT +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-0.5.1 # MIT/Apache-2.0 MODCARGO_CRATES += semver-parser-0.6.1 # MIT/Apache-2.0 -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 += strsim-0.5.1 # MIT +MODCARGO_CRATES += tar-0.4.9 # 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.7 # Apache-2.0/MIT -MODCARGO_CRATES += toml-0.2.1 # MIT/Apache-2.0 +MODCARGO_CRATES += toml-0.2.1 # MIT/Apache-2.0 MODCARGO_CRATES += unicode-bidi-0.2.3 # MIT / Apache-2.0 -MODCARGO_CRATES += url-1.2.3 # 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 +MODCARGO_CRATES += winapi-0.2.8 # MIT MODCARGO_CRATES += winapi-build-0.1.1 # MIT MODCARGO_CRATES += ws2_32-sys-0.2.1 # MIT -# use libc-0.2.18 instead of libc-0.2.17: the patch for i386 is smaller +# use libc-0.2.19 for i386 support MODCARGO_CRATES_UPDATE += libc # use openssl-0.9.4 which has support for LibreSSL MODCARGO_CRATES_UPDATE += openssl-sys openssl @@ -141,7 +141,7 @@ MODPY_RUNDEP = No USE_GMAKE = Yes BUILD_DEPENDS = devel/cmake \ - lang/rust>=1.14,<1.15 + lang/rust>=1.14 LIB_DEPENDS = net/curl \ devel/libgit2/libgit2 \ Index: cargo.port.mk =================================================================== RCS file: /cvs/ports/devel/cargo/cargo.port.mk,v retrieving revision 1.3 diff -u -p -r1.3 cargo.port.mk --- cargo.port.mk 8 Jan 2017 08:51:31 -0000 1.3 +++ cargo.port.mk 5 Feb 2017 15:21:18 -0000 @@ -24,6 +24,9 @@ MASTER_SITES_CRATESIO = https://crates.i # Save crates inside particular DIST_SUBDIR by default. # If you use DIST_SUBDIR, adjust MODCARGO_DIST_SUBDIR. +.if defined(DIST_SUBDIR) && !defined(MODCARGO_DIST_SUBDIR) +ERRORS += "Fatal: MODCARGO_DIST_SUBDIR should be defined if DIST_SUBDIR is defined" +.endif MODCARGO_DIST_SUBDIR ?= cargo .if empty(MODCARGO_DIST_SUBDIR) @@ -204,7 +207,7 @@ modcargo-metadata: patch # modcargo-crates-1 will output crates list from Cargo.lock file. modcargo-crates-1: extract @awk '/"checksum / { print "MODCARGO_CRATES += " $$2 "-" $$3 }' \ - <${WRKSRC}/Cargo.lock + <${MODCARGO_CARGOTOML:toml=lock} # modcargo-crates-2 will try to grab license information from downloaded crates. modcargo-crates-2: configure Index: distinfo =================================================================== RCS file: /cvs/ports/devel/cargo/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 1 Jan 2017 18:49:58 -0000 1.6 +++ distinfo 5 Feb 2017 15:21:18 -0000 @@ -2,11 +2,11 @@ SHA256 (cargo/advapi32-sys-0.2.0.tar.gz) SHA256 (cargo/aho-corasick-0.5.3.tar.gz) = ypcsLqX3Qr/OVoe5rvdVBqdk9h03+PZJBHhGqWht22Y= SHA256 (cargo/bitflags-0.7.0.tar.gz) = qtGJN6Yo7Gq80m0UiQEswOGMIXmCEPSRr2ne2biBEG0= SHA256 (cargo/bufstream-0.1.2.tar.gz) = e0jb4v8OmPovAzd9IEqWN9PJgWzUMb/gWoq70OoR0HQ= -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/cargo-0.16.0.tar.gz) = X3p2adrqFS6Eu/nm1O4MzGyOSd0AQvVGuoBim7wBkaQ= +SHA256 (cargo/cargo-bootstrap-amd64-0.16.0-20170204.tar.gz) = RXlik8Aq16H1zwmlwqHKxak2q6tmL1uQbCYizJZm+h0= +SHA256 (cargo/cargo-bootstrap-i386-0.16.0-20170204.tar.gz) = j8I3gumn4zpI3g58g86hpQu2OnVPVFCGUhd75nRRxQ0= SHA256 (cargo/cfg-if-0.1.0.tar.gz) = 3h52DXtlNa9CQfyovYrfaOLn7azGsp9dOZBQxeSM+Iw= -SHA256 (cargo/cmake-0.1.18.tar.gz) = DlvPJ+CXoYTB30Q3ZU7ZjfPXpRboUIprpF2LCSu98oM= +SHA256 (cargo/cmake-0.1.19.tar.gz) = jr3mVYyqbPm//ldQxmxRfn+dRw1Z/NSLCsvAoC1iqCo= 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= @@ -15,7 +15,7 @@ SHA256 (cargo/env_logger-0.3.5.tar.gz) = 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.3.0.tar.gz) = ZAAB4b2GXHwygGKSgiRFr1dqaGYXW1IlqiCHyl495VE= -SHA256 (cargo/gcc-0.3.38.tar.gz) = VT8RQ5ve/nVb82ayZIIPHacPOq85JOWUuIa+ucgxvPU= +SHA256 (cargo/gcc-0.3.39.tar.gz) = dx5Kl/9vI3zw99X1EC9uKLuXQ4FLYZjWhNpcWLdsEeA= SHA256 (cargo/gdi32-sys-0.2.0.tar.gz) = CRJRWo/yS6kAQi7NqAC1L0AWpWJRki05fFdr+SxpBRg= SHA256 (cargo/git2-0.6.3.tar.gz) = BTTKhmQMajoGh8xr7p7EAyUJoNES2X6CQfprfgdfYRk= SHA256 (cargo/git2-curl-0.7.0.tar.gz) = aGdrx4S/C++DJ4iYkpv2SiUeh8A0ByPQuT+glsnFv44= @@ -24,8 +24,8 @@ SHA256 (cargo/hamcrest-0.1.1.tar.gz) = v 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.2.tar.gz) = ar4O4udYzWvIos1WcmNZAHdI+/QSjamYtl0LcPiB4Zs= -SHA256 (cargo/libc-0.2.18.tar.gz) = pRgi/IR+eoEBUU0dRONUui/6fUwZTcq0iHB0DjJ8rHA= -SHA256 (cargo/libgit2-sys-0.6.4.tar.gz) = tKclORIueeVMxcTVp6W1PwO2Z/fCLHoEQEM+ZYzwRA8= +SHA256 (cargo/libc-0.2.19.tar.gz) = ngMNxyAT7WiZTRssvzapTdDlhBi6lJxLDbfutwp6Y1I= +SHA256 (cargo/libgit2-sys-0.6.5.tar.gz) = UC5QvNz6mN82a91Uk1v/hW9M8R9yXapggJLAKIIFiHo= 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= @@ -55,7 +55,7 @@ SHA256 (cargo/rustc-serialize-0.3.21.tar 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.5.1.tar.gz) = UMBp35LksBQlqL81dtXUF5Q6anJy+6uvW9gLGqp2RC4= -SHA256 (cargo/tar-0.4.8.tar.gz) = EuG5WfY3wuTGnb2/TX3GCe26ram4w10ML8mALQI4O2U= +SHA256 (cargo/tar-0.4.9.tar.gz) = DJBI4nEZ/x/PWw4UfKCTbZEbYH2HRAsELU7KoRG1I+4= 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= @@ -73,11 +73,11 @@ SIZE (cargo/advapi32-sys-0.2.0.tar.gz) = SIZE (cargo/aho-corasick-0.5.3.tar.gz) = 252052 SIZE (cargo/bitflags-0.7.0.tar.gz) = 10851 SIZE (cargo/bufstream-0.1.2.tar.gz) = 7477 -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/cargo-0.16.0.tar.gz) = 628755 +SIZE (cargo/cargo-bootstrap-amd64-0.16.0-20170204.tar.gz) = 7514557 +SIZE (cargo/cargo-bootstrap-i386-0.16.0-20170204.tar.gz) = 7254186 SIZE (cargo/cfg-if-0.1.0.tar.gz) = 2758 -SIZE (cargo/cmake-0.1.18.tar.gz) = 11546 +SIZE (cargo/cmake-0.1.19.tar.gz) = 11698 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 @@ -86,7 +86,7 @@ SIZE (cargo/env_logger-0.3.5.tar.gz) = 5 SIZE (cargo/filetime-0.1.10.tar.gz) = 8884 SIZE (cargo/flate2-0.2.14.tar.gz) = 46692 SIZE (cargo/fs2-0.3.0.tar.gz) = 11874 -SIZE (cargo/gcc-0.3.38.tar.gz) = 24427 +SIZE (cargo/gcc-0.3.39.tar.gz) = 24744 SIZE (cargo/gdi32-sys-0.2.0.tar.gz) = 7643 SIZE (cargo/git2-0.6.3.tar.gz) = 126947 SIZE (cargo/git2-curl-0.7.0.tar.gz) = 4097 @@ -95,8 +95,8 @@ SIZE (cargo/hamcrest-0.1.1.tar.gz) = 921 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.2.tar.gz) = 5026 -SIZE (cargo/libc-0.2.18.tar.gz) = 114209 -SIZE (cargo/libgit2-sys-0.6.4.tar.gz) = 4210492 +SIZE (cargo/libc-0.2.19.tar.gz) = 119222 +SIZE (cargo/libgit2-sys-0.6.5.tar.gz) = 4211865 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 @@ -126,7 +126,7 @@ SIZE (cargo/rustc-serialize-0.3.21.tar.g SIZE (cargo/semver-0.5.1.tar.gz) = 15586 SIZE (cargo/semver-parser-0.6.1.tar.gz) = 4860 SIZE (cargo/strsim-0.5.1.tar.gz) = 598561 -SIZE (cargo/tar-0.4.8.tar.gz) = 35295 +SIZE (cargo/tar-0.4.9.tar.gz) = 36838 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 Index: patches/patch-modcargo-crates_libc-0_2_18_src_unix_bsd_netbsdlike_openbsdlike_mod_rs =================================================================== RCS file: patches/patch-modcargo-crates_libc-0_2_18_src_unix_bsd_netbsdlike_openbsdlike_mod_rs diff -N patches/patch-modcargo-crates_libc-0_2_18_src_unix_bsd_netbsdlike_openbsdlike_mod_rs --- patches/patch-modcargo-crates_libc-0_2_18_src_unix_bsd_netbsdlike_openbsdlike_mod_rs 26 Dec 2016 13:55:11 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-modcargo-crates_libc-0_2_18_src_unix_bsd_netbsdlike_openbsdlike_mod_rs,v 1.1 2016/12/26 13:55:11 landry Exp $ -Proper openbsd i386 support. - -https://github.com/rust-lang/libc/commit/0ac39c5ccf6a04395b7c40dd62321cb91f63f160 ---- modcargo-crates/libc-0.2.18/src/unix/bsd/netbsdlike/openbsdlike/mod.rs.orig Wed Dec 14 06:50:37 2016 -+++ modcargo-crates/libc-0.2.18/src/unix/bsd/netbsdlike/openbsdlike/mod.rs Wed Dec 14 06:51:08 2016 -@@ -1,5 +1,5 @@ - pub type clock_t = i64; --pub type suseconds_t = i64; -+pub type suseconds_t = ::c_long; - pub type dev_t = i32; - pub type sigset_t = ::c_uint; - pub type blksize_t = ::int32_t; -@@ -108,6 +108,9 @@ s! { - pub si_code: ::c_int, - pub si_errno: ::c_int, - pub si_addr: *mut ::c_char, -+ #[cfg(target_pointer_width = "32")] -+ __pad: [u8; 112], -+ #[cfg(target_pointer_width = "64")] - __pad: [u8; 108], - } - 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.3 diff -u -p -r1.3 patch-tests_cargotest_support_paths_rs --- patches/patch-tests_cargotest_support_paths_rs 1 Jan 2017 18:49:58 -0000 1.3 +++ patches/patch-tests_cargotest_support_paths_rs 5 Feb 2017 15:21:18 -0000 @@ -1,21 +1,18 @@ $OpenBSD: patch-tests_cargotest_support_paths_rs,v 1.3 2017/01/01 18:49:58 landry Exp $ use MODCARGO_TARGET_DIR as temporary directory for testing. ---- 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 +--- tests/cargotest/support/paths.rs.orig Fri Jan 27 08:50:00 2017 ++++ tests/cargotest/support/paths.rs Sat Feb 4 07:18:18 2017 @@ -1,4 +1,3 @@ -use std::env; use std::cell::Cell; use std::fs; use std::io::{self, ErrorKind}; -@@ -30,22 +29,7 @@ fn init() { +@@ -30,19 +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 Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/cargo/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- pkg/PLIST 5 Oct 2016 16:51:22 -0000 1.3 +++ pkg/PLIST 5 Feb 2017 15:21:18 -0000 @@ -2,6 +2,7 @@ @bin bin/cargo @man man/man1/cargo-bench.1 @man man/man1/cargo-build.1 +@man man/man1/cargo-check.1 @man man/man1/cargo-clean.1 @man man/man1/cargo-doc.1 @man man/man1/cargo-fetch.1