Index: Mk/Uses/cargo.mk =================================================================== --- Mk/Uses/cargo.mk +++ Mk/Uses/cargo.mk @@ -43,7 +43,7 @@ CARGO_BUILDDEP?= yes .if ${CARGO_BUILDDEP:tl} == "yes" -BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.40.0:lang/${RUST_DEFAULT} +BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.41.0:lang/${RUST_DEFAULT} .endif # Location of cargo binary (default to lang/rust's Cargo binary) @@ -56,6 +56,7 @@ # - CARGO_HOME: local cache of the registry index # - CARGO_BUILD_JOBS: configure number of jobs to run # - CARGO_TARGET_DIR: location of where to place all generated artifacts +# - RUST_BACKTRACE: produce backtraces when something in the build panics # - RUSTC: path of rustc binary (default to lang/rust) # - RUSTDOC: path of rustdoc binary (default to lang/rust) # - RUSTFLAGS: custom flags to pass to all compiler invocations that Cargo performs @@ -63,6 +64,7 @@ CARGO_HOME=${WRKDIR}/cargo-home \ CARGO_BUILD_JOBS=${MAKE_JOBS_NUMBER} \ CARGO_TARGET_DIR=${CARGO_TARGET_DIR} \ + RUST_BACKTRACE=1 \ RUSTC=${LOCALBASE}/bin/rustc \ RUSTDOC=${LOCALBASE}/bin/rustdoc \ RUSTFLAGS="${RUSTFLAGS} -C linker=${CC:Q} ${LDFLAGS:C/.+/-C link-arg=&/}" @@ -279,13 +281,11 @@ do-install: . for path in ${CARGO_INSTALL_PATH} @${CARGO_CARGO_RUN} install \ + --no-track \ --path "${path}" \ --root "${STAGEDIR}${PREFIX}" \ --verbose \ ${CARGO_INSTALL_ARGS} -# Replace with --no-track once it is part of lang/rust - @${RM} -- "${STAGEDIR}${PREFIX}/.crates.toml" - @${RM} -- "${STAGEDIR}${PREFIX}/.crates2.json" . endfor .endif Index: audio/ncspot/Makefile =================================================================== --- audio/ncspot/Makefile +++ audio/ncspot/Makefile @@ -3,7 +3,7 @@ PORTNAME= ncspot DISTVERSIONPREFIX= v DISTVERSION= 0.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MAINTAINER= tobik@FreeBSD.org Index: audio/spotify-tui/Makefile =================================================================== --- audio/spotify-tui/Makefile +++ audio/spotify-tui/Makefile @@ -3,6 +3,7 @@ PORTNAME= spotify-tui DISTVERSIONPREFIX= v DISTVERSION= 0.12.0 +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= vulcan@wired.sh Index: audio/spotifyd/Makefile =================================================================== --- audio/spotifyd/Makefile +++ audio/spotifyd/Makefile @@ -3,6 +3,7 @@ PORTNAME= spotifyd DISTVERSIONPREFIX= v DISTVERSION= 0.2.24 +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= tobik@FreeBSD.org Index: benchmarks/hyperfine/Makefile =================================================================== --- benchmarks/hyperfine/Makefile +++ benchmarks/hyperfine/Makefile @@ -3,7 +3,7 @@ PORTNAME= hyperfine DISTVERSIONPREFIX= v DISTVERSION= 1.9.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= benchmarks MAINTAINER= pizzamig@FreeBSD.org Index: devel/bingrep/Makefile =================================================================== --- devel/bingrep/Makefile +++ devel/bingrep/Makefile @@ -2,6 +2,7 @@ PORTNAME= bingrep PORTVERSION= 0.8.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= CRATESIO DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Index: devel/cargo-c/Makefile =================================================================== --- devel/cargo-c/Makefile +++ devel/cargo-c/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cargo-c -DISTVERSION= 0.5.1 -PORTREVISION= 1 +DISTVERSION= 0.5.2 CATEGORIES= devel MASTER_SITES= CRATESIO # XXX Teach USES=cargo to have proper default @@ -20,66 +19,69 @@ CARGO_CRATES= aho-corasick-0.7.6 \ ansi_term-0.11.0 \ - atty-0.2.13 \ - autocfg-0.1.7 \ + atty-0.2.14 \ + autocfg-1.0.0 \ bitflags-1.2.1 \ c2-chacha-0.2.3 \ cargo_metadata-0.9.1 \ - cbindgen-0.11.0 \ + cbindgen-0.12.2 \ cfg-if-0.1.10 \ chrono-0.4.10 \ clap-2.33.0 \ env_logger-0.6.2 \ - getrandom-0.1.13 \ + getrandom-0.1.14 \ heck-0.3.1 \ + hermit-abi-0.1.6 \ humantime-1.3.0 \ itoa-0.4.4 \ lazy_static-1.4.0 \ libc-0.2.66 \ log-0.4.8 \ - memchr-2.2.1 \ - num-integer-0.1.41 \ - num-traits-0.2.10 \ + memchr-2.3.0 \ + num-integer-0.1.42 \ + num-traits-0.2.11 \ ppv-lite86-0.2.6 \ pretty_env_logger-0.3.1 \ - proc-macro-error-0.2.6 \ - proc-macro2-1.0.6 \ - quick-error-1.2.2 \ + proc-macro-error-0.4.5 \ + proc-macro-error-attr-0.4.5 \ + proc-macro2-1.0.8 \ + quick-error-1.2.3 \ quote-1.0.2 \ - rand-0.7.2 \ + rand-0.7.3 \ rand_chacha-0.2.1 \ rand_core-0.5.1 \ rand_hc-0.2.0 \ redox_syscall-0.1.56 \ - regex-1.3.1 \ - regex-syntax-0.6.12 \ + regex-1.3.3 \ + regex-syntax-0.6.13 \ remove_dir_all-0.5.2 \ + rustversion-1.0.1 \ ryu-1.0.2 \ semver-0.9.0 \ semver-parser-0.7.0 \ - serde-1.0.103 \ - serde_derive-1.0.103 \ + serde-1.0.104 \ + serde_derive-1.0.104 \ serde_json-1.0.44 \ strsim-0.8.0 \ - structopt-0.3.5 \ - structopt-derive-0.3.5 \ - syn-1.0.11 \ + structopt-0.3.8 \ + structopt-derive-0.4.1 \ + syn-1.0.14 \ + syn-mid-0.4.0 \ tempfile-3.1.0 \ - termcolor-1.0.5 \ + termcolor-1.1.0 \ textwrap-0.11.0 \ - thread_local-0.3.6 \ + thread_local-1.0.1 \ time-0.1.42 \ - toml-0.5.5 \ + toml-0.5.6 \ unicode-segmentation-1.6.0 \ unicode-width-0.1.7 \ unicode-xid-0.2.0 \ vec_map-0.8.1 \ - wasi-0.7.0 \ + wasi-0.9.0+wasi-snapshot-preview1 \ winapi-0.3.8 \ winapi-i686-pc-windows-gnu-0.4.0 \ - winapi-util-0.1.2 \ - winapi-x86_64-pc-windows-gnu-0.4.0 \ - wincolor-1.0.2 + winapi-util-0.1.3 \ + winapi-x86_64-pc-windows-gnu-0.4.0 post-patch: @${REINPLACE_CMD} -e 's,libdir.join("pkgconfig,prefix.join("libdata/pkgconfig,' \ Index: devel/cargo-c/distinfo =================================================================== --- devel/cargo-c/distinfo +++ devel/cargo-c/distinfo @@ -1,22 +1,22 @@ -TIMESTAMP = 1576565799 -SHA256 (rust/crates/cargo-c-0.5.1.tar.gz) = e7f4051fafd62ba763379030ac402b3e752f18b6597618cd9673c00dcaeb5688 -SIZE (rust/crates/cargo-c-0.5.1.tar.gz) = 16003 +TIMESTAMP = 1580172040 +SHA256 (rust/crates/cargo-c-0.5.2.tar.gz) = 1cdce9bcb2923c29c7aa5aaa5a436a3c4796373536c0f144c7779c0caa1447c7 +SIZE (rust/crates/cargo-c-0.5.2.tar.gz) = 16259 SHA256 (rust/crates/aho-corasick-0.7.6.tar.gz) = 58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d SIZE (rust/crates/aho-corasick-0.7.6.tar.gz) = 108953 SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b SIZE (rust/crates/ansi_term-0.11.0.tar.gz) = 17087 -SHA256 (rust/crates/atty-0.2.13.tar.gz) = 1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90 -SIZE (rust/crates/atty-0.2.13.tar.gz) = 4764 -SHA256 (rust/crates/autocfg-0.1.7.tar.gz) = 1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2 -SIZE (rust/crates/autocfg-0.1.7.tar.gz) = 12158 +SHA256 (rust/crates/atty-0.2.14.tar.gz) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8 +SIZE (rust/crates/atty-0.2.14.tar.gz) = 5470 +SHA256 (rust/crates/autocfg-1.0.0.tar.gz) = f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d +SIZE (rust/crates/autocfg-1.0.0.tar.gz) = 12870 SHA256 (rust/crates/bitflags-1.2.1.tar.gz) = cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693 SIZE (rust/crates/bitflags-1.2.1.tar.gz) = 16745 SHA256 (rust/crates/c2-chacha-0.2.3.tar.gz) = 214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb SIZE (rust/crates/c2-chacha-0.2.3.tar.gz) = 13336 SHA256 (rust/crates/cargo_metadata-0.9.1.tar.gz) = 46e3374c604fb39d1a2f35ed5e4a4e30e60d01fab49446e08f1b3e9a90aef202 SIZE (rust/crates/cargo_metadata-0.9.1.tar.gz) = 14876 -SHA256 (rust/crates/cbindgen-0.11.0.tar.gz) = d311fcd2cec1a3a71ef9b9f9a183bb31350989042ee9744f3172b29f43ba0aa7 -SIZE (rust/crates/cbindgen-0.11.0.tar.gz) = 135984 +SHA256 (rust/crates/cbindgen-0.12.2.tar.gz) = 1595ec41c4ad8109ad17eb2e38fa52af1244b2321c02144176b5aef0655d5f8e +SIZE (rust/crates/cbindgen-0.12.2.tar.gz) = 143729 SHA256 (rust/crates/cfg-if-0.1.10.tar.gz) = 4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822 SIZE (rust/crates/cfg-if-0.1.10.tar.gz) = 7933 SHA256 (rust/crates/chrono-0.4.10.tar.gz) = 31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01 @@ -25,10 +25,12 @@ SIZE (rust/crates/clap-2.33.0.tar.gz) = 196458 SHA256 (rust/crates/env_logger-0.6.2.tar.gz) = aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3 SIZE (rust/crates/env_logger-0.6.2.tar.gz) = 31078 -SHA256 (rust/crates/getrandom-0.1.13.tar.gz) = e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407 -SIZE (rust/crates/getrandom-0.1.13.tar.gz) = 24581 +SHA256 (rust/crates/getrandom-0.1.14.tar.gz) = 7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb +SIZE (rust/crates/getrandom-0.1.14.tar.gz) = 24698 SHA256 (rust/crates/heck-0.3.1.tar.gz) = 20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205 SIZE (rust/crates/heck-0.3.1.tar.gz) = 54666 +SHA256 (rust/crates/hermit-abi-0.1.6.tar.gz) = eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772 +SIZE (rust/crates/hermit-abi-0.1.6.tar.gz) = 6907 SHA256 (rust/crates/humantime-1.3.0.tar.gz) = df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f SIZE (rust/crates/humantime-1.3.0.tar.gz) = 17020 SHA256 (rust/crates/itoa-0.4.4.tar.gz) = 501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f @@ -39,26 +41,28 @@ SIZE (rust/crates/libc-0.2.66.tar.gz) = 457815 SHA256 (rust/crates/log-0.4.8.tar.gz) = 14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7 SIZE (rust/crates/log-0.4.8.tar.gz) = 31297 -SHA256 (rust/crates/memchr-2.2.1.tar.gz) = 88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e -SIZE (rust/crates/memchr-2.2.1.tar.gz) = 20862 -SHA256 (rust/crates/num-integer-0.1.41.tar.gz) = b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09 -SIZE (rust/crates/num-integer-0.1.41.tar.gz) = 19399 -SHA256 (rust/crates/num-traits-0.2.10.tar.gz) = d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4 -SIZE (rust/crates/num-traits-0.2.10.tar.gz) = 41810 +SHA256 (rust/crates/memchr-2.3.0.tar.gz) = 3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223 +SIZE (rust/crates/memchr-2.3.0.tar.gz) = 22308 +SHA256 (rust/crates/num-integer-0.1.42.tar.gz) = 3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba +SIZE (rust/crates/num-integer-0.1.42.tar.gz) = 19463 +SHA256 (rust/crates/num-traits-0.2.11.tar.gz) = c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096 +SIZE (rust/crates/num-traits-0.2.11.tar.gz) = 42000 SHA256 (rust/crates/ppv-lite86-0.2.6.tar.gz) = 74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b SIZE (rust/crates/ppv-lite86-0.2.6.tar.gz) = 20522 SHA256 (rust/crates/pretty_env_logger-0.3.1.tar.gz) = 717ee476b1690853d222af4634056d830b5197ffd747726a9a1eee6da9f49074 SIZE (rust/crates/pretty_env_logger-0.3.1.tar.gz) = 9077 -SHA256 (rust/crates/proc-macro-error-0.2.6.tar.gz) = aeccfe4d5d8ea175d5f0e4a2ad0637e0f4121d63bd99d356fb1f39ab2e7c6097 -SIZE (rust/crates/proc-macro-error-0.2.6.tar.gz) = 7963 -SHA256 (rust/crates/proc-macro2-1.0.6.tar.gz) = 9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27 -SIZE (rust/crates/proc-macro2-1.0.6.tar.gz) = 35414 -SHA256 (rust/crates/quick-error-1.2.2.tar.gz) = 9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0 -SIZE (rust/crates/quick-error-1.2.2.tar.gz) = 15132 +SHA256 (rust/crates/proc-macro-error-0.4.5.tar.gz) = 1b79a464461615532fcc8a6ed8296fa66cc12350c18460ab3f4594a6cee0fcb6 +SIZE (rust/crates/proc-macro-error-0.4.5.tar.gz) = 12857 +SHA256 (rust/crates/proc-macro-error-attr-0.4.5.tar.gz) = 23832e5eae6bac56bbac190500eef1aaede63776b5cd131eaa4ee7fe120cd892 +SIZE (rust/crates/proc-macro-error-attr-0.4.5.tar.gz) = 6810 +SHA256 (rust/crates/proc-macro2-1.0.8.tar.gz) = 3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548 +SIZE (rust/crates/proc-macro2-1.0.8.tar.gz) = 35657 +SHA256 (rust/crates/quick-error-1.2.3.tar.gz) = a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0 +SIZE (rust/crates/quick-error-1.2.3.tar.gz) = 15066 SHA256 (rust/crates/quote-1.0.2.tar.gz) = 053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe SIZE (rust/crates/quote-1.0.2.tar.gz) = 23023 -SHA256 (rust/crates/rand-0.7.2.tar.gz) = 3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412 -SIZE (rust/crates/rand-0.7.2.tar.gz) = 111438 +SHA256 (rust/crates/rand-0.7.3.tar.gz) = 6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03 +SIZE (rust/crates/rand-0.7.3.tar.gz) = 112246 SHA256 (rust/crates/rand_chacha-0.2.1.tar.gz) = 03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853 SIZE (rust/crates/rand_chacha-0.2.1.tar.gz) = 11475 SHA256 (rust/crates/rand_core-0.5.1.tar.gz) = 90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19 @@ -67,44 +71,48 @@ SIZE (rust/crates/rand_hc-0.2.0.tar.gz) = 11670 SHA256 (rust/crates/redox_syscall-0.1.56.tar.gz) = 2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84 SIZE (rust/crates/redox_syscall-0.1.56.tar.gz) = 17117 -SHA256 (rust/crates/regex-1.3.1.tar.gz) = dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd -SIZE (rust/crates/regex-1.3.1.tar.gz) = 234662 -SHA256 (rust/crates/regex-syntax-0.6.12.tar.gz) = 11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716 -SIZE (rust/crates/regex-syntax-0.6.12.tar.gz) = 289531 +SHA256 (rust/crates/regex-1.3.3.tar.gz) = b5508c1941e4e7cb19965abef075d35a9a8b5cdf0846f30b4050e9b55dc55e87 +SIZE (rust/crates/regex-1.3.3.tar.gz) = 234861 +SHA256 (rust/crates/regex-syntax-0.6.13.tar.gz) = e734e891f5b408a29efbf8309e656876276f49ab6a6ac208600b4419bd893d90 +SIZE (rust/crates/regex-syntax-0.6.13.tar.gz) = 289833 SHA256 (rust/crates/remove_dir_all-0.5.2.tar.gz) = 4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e SIZE (rust/crates/remove_dir_all-0.5.2.tar.gz) = 8907 +SHA256 (rust/crates/rustversion-1.0.1.tar.gz) = 3a0538bd897e17257b0128d2fd95c2ed6df939374073a36166051a79e2eb7986 +SIZE (rust/crates/rustversion-1.0.1.tar.gz) = 12034 SHA256 (rust/crates/ryu-1.0.2.tar.gz) = bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8 SIZE (rust/crates/ryu-1.0.2.tar.gz) = 42001 SHA256 (rust/crates/semver-0.9.0.tar.gz) = 1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403 SIZE (rust/crates/semver-0.9.0.tar.gz) = 17344 SHA256 (rust/crates/semver-parser-0.7.0.tar.gz) = 388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3 SIZE (rust/crates/semver-parser-0.7.0.tar.gz) = 10268 -SHA256 (rust/crates/serde-1.0.103.tar.gz) = 1217f97ab8e8904b57dd22eb61cde455fa7446a9c1cf43966066da047c1f3702 -SIZE (rust/crates/serde-1.0.103.tar.gz) = 73256 -SHA256 (rust/crates/serde_derive-1.0.103.tar.gz) = a8c6faef9a2e64b0064f48570289b4bf8823b7581f1d6157c1b52152306651d0 -SIZE (rust/crates/serde_derive-1.0.103.tar.gz) = 49652 +SHA256 (rust/crates/serde-1.0.104.tar.gz) = 414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449 +SIZE (rust/crates/serde-1.0.104.tar.gz) = 73258 +SHA256 (rust/crates/serde_derive-1.0.104.tar.gz) = 128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64 +SIZE (rust/crates/serde_derive-1.0.104.tar.gz) = 49658 SHA256 (rust/crates/serde_json-1.0.44.tar.gz) = 48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7 SIZE (rust/crates/serde_json-1.0.44.tar.gz) = 70325 SHA256 (rust/crates/strsim-0.8.0.tar.gz) = 8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a SIZE (rust/crates/strsim-0.8.0.tar.gz) = 9309 -SHA256 (rust/crates/structopt-0.3.5.tar.gz) = 30b3a3e93f5ad553c38b3301c8a0a0cec829a36783f6a0c467fc4bf553a5f5bf -SIZE (rust/crates/structopt-0.3.5.tar.gz) = 41425 -SHA256 (rust/crates/structopt-derive-0.3.5.tar.gz) = ea692d40005b3ceba90a9fe7a78fa8d4b82b0ce627eebbffc329aab850f3410e -SIZE (rust/crates/structopt-derive-0.3.5.tar.gz) = 16524 -SHA256 (rust/crates/syn-1.0.11.tar.gz) = dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238 -SIZE (rust/crates/syn-1.0.11.tar.gz) = 193782 +SHA256 (rust/crates/structopt-0.3.8.tar.gz) = df136b42d76b1fbea72e2ab3057343977b04b4a2e00836c3c7c0673829572713 +SIZE (rust/crates/structopt-0.3.8.tar.gz) = 50127 +SHA256 (rust/crates/structopt-derive-0.4.1.tar.gz) = fd50a87d2f7b8958055f3e73a963d78feaccca3836767a9069844e34b5b03c0a +SIZE (rust/crates/structopt-derive-0.4.1.tar.gz) = 19598 +SHA256 (rust/crates/syn-1.0.14.tar.gz) = af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5 +SIZE (rust/crates/syn-1.0.14.tar.gz) = 195286 +SHA256 (rust/crates/syn-mid-0.4.0.tar.gz) = 9fd3937748a7eccff61ba5b90af1a20dbf610858923a9192ea0ecb0cb77db1d0 +SIZE (rust/crates/syn-mid-0.4.0.tar.gz) = 13226 SHA256 (rust/crates/tempfile-3.1.0.tar.gz) = 7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9 SIZE (rust/crates/tempfile-3.1.0.tar.gz) = 25823 -SHA256 (rust/crates/termcolor-1.0.5.tar.gz) = 96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e -SIZE (rust/crates/termcolor-1.0.5.tar.gz) = 14526 +SHA256 (rust/crates/termcolor-1.1.0.tar.gz) = bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f +SIZE (rust/crates/termcolor-1.1.0.tar.gz) = 17193 SHA256 (rust/crates/textwrap-0.11.0.tar.gz) = d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060 SIZE (rust/crates/textwrap-0.11.0.tar.gz) = 17322 -SHA256 (rust/crates/thread_local-0.3.6.tar.gz) = c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b -SIZE (rust/crates/thread_local-0.3.6.tar.gz) = 12388 +SHA256 (rust/crates/thread_local-1.0.1.tar.gz) = d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14 +SIZE (rust/crates/thread_local-1.0.1.tar.gz) = 12609 SHA256 (rust/crates/time-0.1.42.tar.gz) = db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f SIZE (rust/crates/time-0.1.42.tar.gz) = 30005 -SHA256 (rust/crates/toml-0.5.5.tar.gz) = 01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf -SIZE (rust/crates/toml-0.5.5.tar.gz) = 54805 +SHA256 (rust/crates/toml-0.5.6.tar.gz) = ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a +SIZE (rust/crates/toml-0.5.6.tar.gz) = 54341 SHA256 (rust/crates/unicode-segmentation-1.6.0.tar.gz) = e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0 SIZE (rust/crates/unicode-segmentation-1.6.0.tar.gz) = 90703 SHA256 (rust/crates/unicode-width-0.1.7.tar.gz) = caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479 @@ -113,15 +121,13 @@ SIZE (rust/crates/unicode-xid-0.2.0.tar.gz) = 14994 SHA256 (rust/crates/vec_map-0.8.1.tar.gz) = 05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a SIZE (rust/crates/vec_map-0.8.1.tar.gz) = 14959 -SHA256 (rust/crates/wasi-0.7.0.tar.gz) = b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d -SIZE (rust/crates/wasi-0.7.0.tar.gz) = 33941 +SHA256 (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.tar.gz) = cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519 +SIZE (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.tar.gz) = 31521 SHA256 (rust/crates/winapi-0.3.8.tar.gz) = 8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6 SIZE (rust/crates/winapi-0.3.8.tar.gz) = 1128308 SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6 SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = 2918815 -SHA256 (rust/crates/winapi-util-0.1.2.tar.gz) = 7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9 -SIZE (rust/crates/winapi-util-0.1.2.tar.gz) = 7810 +SHA256 (rust/crates/winapi-util-0.1.3.tar.gz) = 4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80 +SIZE (rust/crates/winapi-util-0.1.3.tar.gz) = 9913 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998 -SHA256 (rust/crates/wincolor-1.0.2.tar.gz) = 96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9 -SIZE (rust/crates/wincolor-1.0.2.tar.gz) = 4821 Index: devel/cargo-tree/Makefile =================================================================== --- devel/cargo-tree/Makefile +++ devel/cargo-tree/Makefile @@ -2,6 +2,7 @@ PORTNAME= cargo-tree DISTVERSION= 0.28.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= CRATESIO DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Index: devel/git-absorb/Makefile =================================================================== --- devel/git-absorb/Makefile +++ devel/git-absorb/Makefile @@ -2,7 +2,7 @@ PORTNAME= git-absorb DISTVERSION= 0.5.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MAINTAINER= greg@unrelenting.technology Index: devel/git-delta/Makefile =================================================================== --- devel/git-delta/Makefile +++ devel/git-delta/Makefile @@ -2,7 +2,7 @@ PORTNAME= delta DISTVERSION= 0.0.14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= git- Index: devel/interactive_rebase_tool/Makefile =================================================================== --- devel/interactive_rebase_tool/Makefile +++ devel/interactive_rebase_tool/Makefile @@ -2,7 +2,7 @@ PORTNAME= interactive_rebase_tool DISTVERSION= 1.1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MAINTAINER= petteri.valkonen@iki.fi Index: devel/pijul/Makefile =================================================================== --- devel/pijul/Makefile +++ devel/pijul/Makefile @@ -3,7 +3,7 @@ PORTNAME= pijul PORTVERSION= 0.12.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= devel MASTER_SITES= https://pijul.org/releases/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Index: devel/racer/Makefile =================================================================== --- devel/racer/Makefile +++ devel/racer/Makefile @@ -3,6 +3,7 @@ PORTNAME= racer DISTVERSION= 2.1.29 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= CRATESIO DISTFILES= ${CARGO_DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} Index: devel/racerd/Makefile =================================================================== --- devel/racerd/Makefile +++ devel/racerd/Makefile @@ -14,6 +14,8 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE +BROKEN= fails to build with Rust 1.41.0 + USES= cargo USE_GITHUB= yes GH_ACCOUNT= jwilm Index: devel/rust-bindgen/Makefile =================================================================== --- devel/rust-bindgen/Makefile +++ devel/rust-bindgen/Makefile @@ -2,7 +2,7 @@ PORTNAME= bindgen DISTVERSION= 0.52.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= CRATESIO PKGNAMEPREFIX= rust- Index: devel/rust-cbindgen/Makefile =================================================================== --- devel/rust-cbindgen/Makefile +++ devel/rust-cbindgen/Makefile @@ -2,6 +2,7 @@ PORTNAME= cbindgen DISTVERSION= 0.12.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= CRATESIO PKGNAMEPREFIX= rust- Index: devel/sccache/Makefile =================================================================== --- devel/sccache/Makefile +++ devel/sccache/Makefile @@ -2,7 +2,7 @@ PORTNAME= sccache DISTVERSION= 0.2.12 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= devel Index: devel/tokei/Makefile =================================================================== --- devel/tokei/Makefile +++ devel/tokei/Makefile @@ -3,6 +3,7 @@ PORTNAME= tokei DISTVERSIONPREFIX= v DISTVERSION= 10.1.1 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= tobik@FreeBSD.org Index: dns/doh-proxy/Makefile =================================================================== --- dns/doh-proxy/Makefile +++ dns/doh-proxy/Makefile @@ -3,6 +3,7 @@ PORTNAME= doh-proxy DISTVERSION= 0.2.1 +PORTREVISION= 1 CATEGORIES= dns MAINTAINER= mat@FreeBSD.org Index: editors/kak-lsp/Makefile =================================================================== --- editors/kak-lsp/Makefile +++ editors/kak-lsp/Makefile @@ -3,7 +3,7 @@ PORTNAME= kak-lsp DISTVERSIONPREFIX= v DISTVERSION= 6.2.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= editors MAINTAINER= tobik@FreeBSD.org Index: editors/parinfer-rust/Makefile =================================================================== --- editors/parinfer-rust/Makefile +++ editors/parinfer-rust/Makefile @@ -3,6 +3,7 @@ PORTNAME= parinfer-rust DISTVERSIONPREFIX= v DISTVERSION= 0.4.2 +PORTREVISION= 1 CATEGORIES= editors MAINTAINER= tobik@FreeBSD.org Index: editors/xi-core/Makefile =================================================================== --- editors/xi-core/Makefile +++ editors/xi-core/Makefile @@ -2,7 +2,7 @@ PORTNAME= xi-core DISTVERSION= g20190420 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= editors MAINTAINER= ed.arrakis@gmail.com Index: editors/xi-term/Makefile =================================================================== --- editors/xi-term/Makefile +++ editors/xi-term/Makefile @@ -2,7 +2,7 @@ PORTNAME= xi-term DISTVERSION= g20190328 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= editors MAINTAINER= ed.arrakis@gmail.com Index: games/dose-response/Makefile =================================================================== --- games/dose-response/Makefile +++ games/dose-response/Makefile @@ -3,6 +3,7 @@ PORTNAME= dose-response DISTVERSIONPREFIX= v DISTVERSION= 1.0.0 +PORTREVISION= 1 CATEGORIES= games MAINTAINER= greg@unrelenting.technology Index: games/genact/Makefile =================================================================== --- games/genact/Makefile +++ games/genact/Makefile @@ -2,7 +2,7 @@ PORTNAME= genact DISTVERSION= 0.7.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MAINTAINER= 0mp@FreeBSD.org Index: games/jaggedalliance2/Makefile =================================================================== --- games/jaggedalliance2/Makefile +++ games/jaggedalliance2/Makefile @@ -4,7 +4,7 @@ PORTNAME= ja2 DISTVERSIONPREFIX= v DISTVERSION= 0.16.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= games MAINTAINER= tobik@FreeBSD.org Index: games/veloren/Makefile =================================================================== --- games/veloren/Makefile +++ games/veloren/Makefile @@ -3,7 +3,7 @@ PORTNAME= veloren DISTVERSIONPREFIX= v DISTVERSION= 0.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= https://veloren.net/icons/favicon/:icon \ LOCAL/jbeich:assets Index: graphics/librsvg2-rust/Makefile =================================================================== --- graphics/librsvg2-rust/Makefile +++ graphics/librsvg2-rust/Makefile @@ -3,6 +3,7 @@ PORTNAME= librsvg PORTVERSION= 2.46.4 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= GNOME PKGNAMESUFFIX= 2-rust Index: graphics/rx/Makefile =================================================================== --- graphics/rx/Makefile +++ graphics/rx/Makefile @@ -3,6 +3,7 @@ PORTNAME= rx DISTVERSIONPREFIX= v DISTVERSION= 0.3.2 +PORTREVISION= 1 CATEGORIES= graphics PKGNAMESUFFIX= -editor Index: graphics/svgbob/Makefile =================================================================== --- graphics/svgbob/Makefile +++ graphics/svgbob/Makefile @@ -2,7 +2,7 @@ PORTNAME= svgbob DISTVERSION= g20190412 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MAINTAINER= tobik@FreeBSD.org Index: lang/rust/Makefile =================================================================== --- lang/rust/Makefile +++ lang/rust/Makefile @@ -2,22 +2,18 @@ # $FreeBSD$ PORTNAME= rust -PORTVERSION?= 1.40.0 +PORTVERSION?= 1.41.0 PORTREVISION?= 0 CATEGORIES= lang -MASTER_SITES= https://static.rust-lang.org/dist/:src \ - https://static.rust-lang.org/dist/:bootstrap \ +MASTER_SITES= https://dev-static.rust-lang.org/dist/:src \ + https://pkg.tobik.me/distfiles/rust/:bootstrap \ LOCAL/tobik/rust:bootstrap \ - https://releases.llvm.org/${COMPILER_RT_VERSION}/:compiler_rt \ - https://github.com/llvm/llvm-project/releases/download/llvmorg-${COMPILER_RT_VERSION}/:compiler_rt + https://static.rust-lang.org/dist/:bootstrap DISTNAME?= ${PORTNAME}c-${PORTVERSION}-src DISTFILES?= ${NIGHTLY_SUBDIR}${DISTNAME}${EXTRACT_SUFX}:src \ ${_RUSTC_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX}:bootstrap \ ${_RUST_STD_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX}:bootstrap \ - ${_CARGO_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX}:bootstrap \ - ${DISTFILES_${ARCH}} -DISTFILES_armv6= compiler-rt-${COMPILER_RT_VERSION}.src.tar.xz:compiler_rt -DISTFILES_armv7= compiler-rt-${COMPILER_RT_VERSION}.src.tar.xz:compiler_rt + ${_CARGO_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX}:bootstrap DIST_SUBDIR?= rust EXTRACT_ONLY?= ${DISTFILES:N*\:bootstrap:C/:.*//} @@ -40,6 +36,13 @@ USES= pkgconfig python:3.3+,build ssl tar:xz +MAKE_ENV= LIBGIT2_SYS_USE_PKG_CONFIG=1 \ + LIBSSH2_SYS_USE_PKG_CONFIG=1 \ + OPENSSL_DIR="${OPENSSLBASE}" \ + RUST_BACKTRACE=1 +TEST_ENV= ${MAKE_ENV} \ + ALLOW_NONZERO_RLIMIT_CORE=1 + CONFLICTS_INSTALL?= rust-nightly PLIST_FILES= lib/rustlib/components \ @@ -54,10 +57,9 @@ GDB_RUN_DEPENDS= ${LOCALBASE}/bin/gdb:devel/gdb # See WRKSRC/src/stage0.txt for the date and version values. -BOOTSTRAPS_DATE?= 2019-11-07 -RUST_BOOTSTRAP_VERSION?= 1.39.0 -CARGO_BOOTSTRAP_VERSION?= 0.40.0 -COMPILER_RT_VERSION?= 9.0.0 +BOOTSTRAPS_DATE?= 2020-01-11 +RUST_BOOTSTRAP_VERSION?= 1.40.0 +CARGO_BOOTSTRAP_VERSION?= 0.41.0 BOOTSTRAPS_SUFFIX?= ${BOOTSTRAPS_SUFFIX_${ARCH}} BOOTSTRAPS_SUFFIX_powerpc64?= -${PPC_ABI:tl} @@ -68,7 +70,6 @@ _RUST_ARCH_amd64= x86_64 _RUST_ARCH_i386= i686 _RUST_TARGET= ${_RUST_ARCH_${ARCH}:U${ARCH}}-unknown-${OPSYS:tl} -_LLVM_TARGET= ${ARCH:C/armv.*/ARM/:S/aarch64/AArch64/:S/powerpc64/PowerPC/} _RUSTC_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${_RUST_TARGET} _RUST_STD_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${_RUST_TARGET} @@ -101,12 +102,6 @@ IGNORE= fails to build with qemu-user-static .endif -X_PY_ENV= HOME="${WRKDIR}" \ - LIBGIT2_SYS_USE_PKG_CONFIG=1 \ - LIBSSH2_SYS_USE_PKG_CONFIG=1 \ - OPENSSL_DIR="${OPENSSLBASE}" -X_PY_CMD= ${PYTHON_CMD} ${WRKSRC}/x.py - post-extract: @${MKDIR} ${WRKSRC}/build/cache/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}} ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${_RUSTC_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX} \ @@ -115,9 +110,6 @@ ${WRKSRC}/build/cache/${_RUST_STD_BOOTSTRAP}${EXTRACT_SUFX} ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${_CARGO_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX} \ ${WRKSRC}/build/cache/${_CARGO_BOOTSTRAP}${EXTRACT_SUFX} -.if ${ARCH} == armv6 || ${ARCH} == armv7 - ${LN} -sf ${WRKDIR}/compiler-rt-${COMPILER_RT_VERSION}.src ${WRKSRC}/src/llvm-project/compiler-rt -.endif post-patch: @${REINPLACE_CMD} 's,gdb,${LOCALBASE}/bin/gdb,' ${WRKSRC}/src/etc/rust-gdb @@ -134,7 +126,8 @@ @${ECHO_MSG} "Bootstrap date and version after patching:" @${GREP} -E '^(date|rustc|cargo)' ${WRKSRC}/src/stage0.txt .if ${ARCH} == powerpc64 - @${REINPLACE_CMD} -e 's,powerpc64-unknown-freebsd,powerpc64-unknown-freebsd${OSREL},' \ +# Starting with 13.0 powerpc64 is ELFv2 while 12.0 is ELFv1. Pass the correct LLVM target triple. + @${REINPLACE_CMD} 's,powerpc64-unknown-freebsd,powerpc64-unknown-freebsd${OSREL},' \ ${WRKSRC}/src/librustc_target/spec/powerpc64_unknown_freebsd.rs .endif # Disable vendor checksums @@ -143,7 +136,7 @@ post-patch-SOURCES-off: # Mimic tools in config.toml with just src excluded - @${REINPLACE_CMD} -e 's/config.tools.*"src".*/false;/' \ + @${REINPLACE_CMD} 's,config.tools.*"src".*,false;,' \ ${WRKSRC}/src/bootstrap/install.rs do-configure: @@ -159,7 +152,6 @@ @${ECHO_CMD} '[install]' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'prefix="${PREFIX}"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'sysconfdir="${PREFIX}/etc"' >> ${WRKSRC}/config.toml - @${ECHO_CMD} 'mandir="${MANPREFIX}/man"' >> ${WRKSRC}/config.toml @${ECHO_CMD} '[rust]' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'channel="${PKGNAMESUFFIX:Ustable:S/^-//}"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'default-linker="${CC}"' >> ${WRKSRC}/config.toml @@ -170,35 +162,34 @@ .else @${ECHO_CMD} 'ccache=false' >> ${WRKSRC}/config.toml .endif -# no need to build a crosscompiler for these targets -.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == powerpc64 - @${ECHO_CMD} 'targets="${_LLVM_TARGET}"' >> ${WRKSRC}/config.toml - @${ECHO_CMD} 'experimental-targets=""' >> ${WRKSRC}/config.toml -.endif @${ECHO_CMD} '[target.${_RUST_TARGET}]' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'cc="${CC}"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'cxx="${CXX}"' >> ${WRKSRC}/config.toml +.if ${ARCH} == armv6 +# fails to link with base ld.bfd: rustc_codegen_llvm.e2557spx-cgu.11:(.text._ZN89_$LT$rustc_target..abi..call..CastTarget$u20$as$u20$rustc_codegen_llvm..abi..LlvmType$GT$9llvm_type17h1296210ab461fc57E+0x54): relocation truncated to fit: R_ARM_CALL against symbol `__aeabi_uldivmod' defined in .text.__aeabi_uldivmod section in /tmp/rustcdnGbao/libcompiler_builtins-ee65b414e4115a8f.rlib(compiler_builtins-ee65b414e4115a8f.compiler_builtins.ay8p39ey-cgu.13.rcgu.o) + @${PRINTF} '#!/bin/sh\nexec ${CC} -fuse-ld=lld "$$@"' > ${WRKDIR}/cc-wrapper + @${CHMOD} +x ${WRKDIR}/cc-wrapper + @${ECHO_CMD} 'linker="${WRKDIR}/cc-wrapper"' >> ${WRKSRC}/config.toml +.else @${ECHO_CMD} 'linker="${CC}"' >> ${WRKSRC}/config.toml +.endif @${ECHO_CMD} '[dist]' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'src-tarball=false' >> ${WRKSRC}/config.toml - @${REINPLACE_CMD} -e 's,%CC%,${CC},g' \ + @${REINPLACE_CMD} 's,%CC%,${CC},g' \ ${WRKSRC}/src/librustc_llvm/build.rs \ ${WRKSRC}/src/bootstrap/native.rs do-build: - cd ${WRKSRC} && \ - ${SETENV} ${X_PY_ENV} \ - ${X_PY_CMD} build \ - --config ./config.toml \ - --jobs ${MAKE_JOBS_NUMBER} + @cd ${WRKSRC} && \ + ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} x.py build --config=config.toml \ + --jobs=${MAKE_JOBS_NUMBER} do-install: - cd ${WRKSRC} && \ - ${SETENV} ${X_PY_ENV} \ - DESTDIR=${STAGEDIR} \ - ${X_PY_CMD} 'install' \ - --config ./config.toml \ - --jobs ${MAKE_JOBS_NUMBER} +# DESTDIR not in MAKE_ENV as it would cause the bundled LLVM to be +# staged into it during do-build. + @cd ${WRKSRC} && \ + ${SETENV} ${MAKE_ENV} DESTDIR=${STAGEDIR} ${PYTHON_CMD} \ + x.py install --config=config.toml --jobs=${MAKE_JOBS_NUMBER} # In post-install, we use the manifests generated during Rust install # to in turn generate the PLIST. We do that, instead of the regular @@ -217,8 +208,8 @@ post-install: for f in ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-*; do \ ${REINPLACE_CMD} -i '' -E \ - -e 's|:${STAGEDIR}|:|' \ - -e 's|(man/man[1-9]/.*\.[0-9])|\1.gz|' \ + -e 's,:${STAGEDIR},:,' \ + -e 's,(share/man/man[1-9]/.*\.[0-9]),\1.gz,' \ "$$f"; \ ${ECHO_CMD} "$${f#${STAGEDIR}}" >> ${TMPPLIST}; \ ${AWK} '\ @@ -230,7 +221,7 @@ /^dir:/ { \ dir=$$0; \ sub(/^dir:/, "", dir); \ - system("find ${STAGEDIR}" dir " -type f | ${SED} -E -e \"s|${STAGEDIR}||\""); \ + system("find ${STAGEDIR}" dir " -type f | ${SED} -E -e \"s,${STAGEDIR},,\""); \ }' \ "$$f" >> ${TMPPLIST}; \ done @@ -240,19 +231,14 @@ @${RM} \ ${STAGEDIR}${PREFIX}/lib/rustlib/install.log \ ${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh -# FIXME: Static libraries in lib/rustlib/*/lib/*.rlib are not stripped, -# but they contain non-object files which make strip(1) unhappy. @${FIND} ${STAGEDIR}${PREFIX}/bin -exec ${FILE} -i {} + | ${AWK} -F: \ '/executable|sharedlib/ { print $$1 }' | ${XARGS} ${STRIP_CMD} # Note that make test does not work when rust is already installed. do-test: - cd ${WRKSRC} && \ - ${SETENV} ${X_PY_ENV} \ - ALLOW_NONZERO_RLIMIT_CORE=1 \ - ${X_PY_CMD} test \ - --config ./config.toml \ - --jobs ${MAKE_JOBS_NUMBER} + @cd ${WRKSRC} && \ + ${SETENV} ${TEST_ENV} ${PYTHON_CMD} x.py test --config=config.toml \ + --jobs=${MAKE_JOBS_NUMBER} .if !defined(_RUST_MAKESUM_GUARD) makesum: Index: lang/rust/distinfo =================================================================== --- lang/rust/distinfo +++ lang/rust/distinfo @@ -1,47 +1,45 @@ -TIMESTAMP = 1578730697 -SHA256 (rust/rustc-1.40.0-src.tar.xz) = 6e2aa3a91697f4b225c6b394cbae6b97666f061dba491f666a5281698fe2aace -SIZE (rust/rustc-1.40.0-src.tar.xz) = 92306352 -SHA256 (rust/2019-11-07/rustc-1.39.0-aarch64-unknown-freebsd.tar.xz) = 44098962a570e05d691d3b7c3337b873b1e1f22ac49fd19c0d5d3362c0008eb5 -SIZE (rust/2019-11-07/rustc-1.39.0-aarch64-unknown-freebsd.tar.xz) = 23895952 -SHA256 (rust/2019-11-07/rust-std-1.39.0-aarch64-unknown-freebsd.tar.xz) = 21372596cda35c4acdb11bab0e6d3f62f815a8166eb717e57e223548f3afee08 -SIZE (rust/2019-11-07/rust-std-1.39.0-aarch64-unknown-freebsd.tar.xz) = 164721768 -SHA256 (rust/2019-11-07/cargo-0.40.0-aarch64-unknown-freebsd.tar.xz) = 184f64a67f05c23597f1b52ef13e31c5e12288032ccb94bddfc217f26b77c93f -SIZE (rust/2019-11-07/cargo-0.40.0-aarch64-unknown-freebsd.tar.xz) = 3054584 -SHA256 (rust/2019-11-07/rustc-1.39.0-x86_64-unknown-freebsd.tar.xz) = 802aa5124f15002ba07b33838f6b8ecb394e3d63d2f9bd2de725c85baf8b8bf5 -SIZE (rust/2019-11-07/rustc-1.39.0-x86_64-unknown-freebsd.tar.xz) = 33790600 -SHA256 (rust/2019-11-07/rust-std-1.39.0-x86_64-unknown-freebsd.tar.xz) = 7015a0b0a991af19b0a7d0cbb1b0e2aae612a19cf2a4ab9cdb49f91f9e443201 -SIZE (rust/2019-11-07/rust-std-1.39.0-x86_64-unknown-freebsd.tar.xz) = 189611944 -SHA256 (rust/2019-11-07/cargo-0.40.0-x86_64-unknown-freebsd.tar.xz) = 762c436fa220120bc57a0a4d5256b69f6b55e8d07153744cb6c81e4d064912bf -SIZE (rust/2019-11-07/cargo-0.40.0-x86_64-unknown-freebsd.tar.xz) = 4908636 -SHA256 (rust/2019-11-07/rustc-1.39.0-armv6-unknown-freebsd.tar.xz) = c1f014f8c4f804d413be842dba3655ab69ee70d663b25d1a0027224480e511f3 -SIZE (rust/2019-11-07/rustc-1.39.0-armv6-unknown-freebsd.tar.xz) = 25359460 -SHA256 (rust/2019-11-07/rust-std-1.39.0-armv6-unknown-freebsd.tar.xz) = 09bf68c8aaf0a4de36d7608e15001878ac048f1a9eda3bef7a66338b31bd1cd4 -SIZE (rust/2019-11-07/rust-std-1.39.0-armv6-unknown-freebsd.tar.xz) = 170165620 -SHA256 (rust/2019-11-07/cargo-0.40.0-armv6-unknown-freebsd.tar.xz) = 4c13fee359a77a73ce96f524c58198cca567971692b17e97e41ecb01fe70dc5c -SIZE (rust/2019-11-07/cargo-0.40.0-armv6-unknown-freebsd.tar.xz) = 3183372 -SHA256 (rust/compiler-rt-9.0.0.src.tar.xz) = 56e4cd96dd1d8c346b07b4d6b255f976570c6f2389697347a6c3dcb9e820d10e -SIZE (rust/compiler-rt-9.0.0.src.tar.xz) = 1993084 -SHA256 (rust/2019-11-07/rustc-1.39.0-armv7-unknown-freebsd.tar.xz) = 5902ceb1aefbced859969a928c4ad15063a58e120d79a18cab37dc4d7384d591 -SIZE (rust/2019-11-07/rustc-1.39.0-armv7-unknown-freebsd.tar.xz) = 24862380 -SHA256 (rust/2019-11-07/rust-std-1.39.0-armv7-unknown-freebsd.tar.xz) = 5469b9c844ac9e830d77715a988c3185f287962de9a2408513b89dac9662ac34 -SIZE (rust/2019-11-07/rust-std-1.39.0-armv7-unknown-freebsd.tar.xz) = 169316140 -SHA256 (rust/2019-11-07/cargo-0.40.0-armv7-unknown-freebsd.tar.xz) = 3acfcd4b7ce2a5d1646d0b53d453140d4a3b9216fcb66c435d1d4b83381b2499 -SIZE (rust/2019-11-07/cargo-0.40.0-armv7-unknown-freebsd.tar.xz) = 3134692 -SHA256 (rust/2019-11-07/rustc-1.39.0-i686-unknown-freebsd.tar.xz) = eebab1fb8cbbfa7e348daeb319a8fdf3ab40c7439deb012fd9ceeed322518f7c -SIZE (rust/2019-11-07/rustc-1.39.0-i686-unknown-freebsd.tar.xz) = 34660340 -SHA256 (rust/2019-11-07/rust-std-1.39.0-i686-unknown-freebsd.tar.xz) = bd19a91be5f470c838c524a86a6ff83557247e7fbe498d773c643b06a78be97f -SIZE (rust/2019-11-07/rust-std-1.39.0-i686-unknown-freebsd.tar.xz) = 189894544 -SHA256 (rust/2019-11-07/cargo-0.40.0-i686-unknown-freebsd.tar.xz) = 9daad89cecfa45e85e191f4870613e5b0acfa92742ae8c07eb4f48a1f3f4d9be -SIZE (rust/2019-11-07/cargo-0.40.0-i686-unknown-freebsd.tar.xz) = 4875016 -SHA256 (rust/2019-11-07/rustc-1.39.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 0f0b89fb869a4ff856a3c3b971fa7bd0e317b2d567f5db994159e019100d7d23 -SIZE (rust/2019-11-07/rustc-1.39.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 28846960 -SHA256 (rust/2019-11-07/rust-std-1.39.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 378efabaf53ff15165bda53509b40fb347e3f88275ca4cc81f4cfb185eed981e -SIZE (rust/2019-11-07/rust-std-1.39.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 164834720 -SHA256 (rust/2019-11-07/cargo-0.40.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 707eef9bac71a44db8e1d64c70a771fbac1f81f7ca58a2e3025ec1cc4d263b18 -SIZE (rust/2019-11-07/cargo-0.40.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 3423776 -SHA256 (rust/2019-11-07/rustc-1.39.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 65a7eed0737ae94e54d60a0cf5cc67634fb8ddd978bdfb0ce4e5f46d309daa0a -SIZE (rust/2019-11-07/rustc-1.39.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 24483956 -SHA256 (rust/2019-11-07/rust-std-1.39.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 60782554de07997c25bf2aa279b44baa8009158b25cc3c5364b1496a2d40f2a4 -SIZE (rust/2019-11-07/rust-std-1.39.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 163926244 -SHA256 (rust/2019-11-07/cargo-0.40.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 75ecd88d83e8f394ce33f0213b622a045cbcfc55973f4b5140403de298f73968 -SIZE (rust/2019-11-07/cargo-0.40.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 3268696 +TIMESTAMP = 1580240609 +SHA256 (rust/rustc-1.41.0-src.tar.xz) = 38d6742e5c4c98a835de5d6e12a209e442fb3078a03b2c01bab6ea7afb25be6f +SIZE (rust/rustc-1.41.0-src.tar.xz) = 93763052 +SHA256 (rust/2020-01-11/rustc-1.40.0-aarch64-unknown-freebsd.tar.xz) = b73372fb30198cd9c26927f89cc96c339253038491fcb5629d88285f156f1347 +SIZE (rust/2020-01-11/rustc-1.40.0-aarch64-unknown-freebsd.tar.xz) = 26371388 +SHA256 (rust/2020-01-11/rust-std-1.40.0-aarch64-unknown-freebsd.tar.xz) = 88abe2b1e267309bc87bb0bf9ace0c7d72be21c47a0fec9858364f1ed6cd64f9 +SIZE (rust/2020-01-11/rust-std-1.40.0-aarch64-unknown-freebsd.tar.xz) = 13924444 +SHA256 (rust/2020-01-11/cargo-0.41.0-aarch64-unknown-freebsd.tar.xz) = 492827650d0cf0b796008bbc40d01fa9bbba86c542b3b84d213c6b87a4736261 +SIZE (rust/2020-01-11/cargo-0.41.0-aarch64-unknown-freebsd.tar.xz) = 3722100 +SHA256 (rust/2020-01-11/rustc-1.40.0-x86_64-unknown-freebsd.tar.xz) = e95b3c7c0fec14fb9efd23155812c61bae08e1513fb62cd15fca30fafec7cd5e +SIZE (rust/2020-01-11/rustc-1.40.0-x86_64-unknown-freebsd.tar.xz) = 28440532 +SHA256 (rust/2020-01-11/rust-std-1.40.0-x86_64-unknown-freebsd.tar.xz) = f5aa2fddf200a701eee4fcebe43725e77333283d7714a273ae92c06de3601a9a +SIZE (rust/2020-01-11/rust-std-1.40.0-x86_64-unknown-freebsd.tar.xz) = 14603276 +SHA256 (rust/2020-01-11/cargo-0.41.0-x86_64-unknown-freebsd.tar.xz) = 629de6db56cd659856a28679be68dfadbdb31a28a65c156d65cec769ff43a7e7 +SIZE (rust/2020-01-11/cargo-0.41.0-x86_64-unknown-freebsd.tar.xz) = 4399816 +SHA256 (rust/2020-01-11/rustc-1.40.0-armv6-unknown-freebsd.tar.xz) = 442dc33f751c79044d862d4d20e6512589d78e33712c8731b83e7b9ccded9f01 +SIZE (rust/2020-01-11/rustc-1.40.0-armv6-unknown-freebsd.tar.xz) = 27455140 +SHA256 (rust/2020-01-11/rust-std-1.40.0-armv6-unknown-freebsd.tar.xz) = bdcf05cafe9a6a5fd1d089b763cd4946d24a61049f24eff3993c1033db4af88e +SIZE (rust/2020-01-11/rust-std-1.40.0-armv6-unknown-freebsd.tar.xz) = 13924280 +SHA256 (rust/2020-01-11/cargo-0.41.0-armv6-unknown-freebsd.tar.xz) = d04aba96a043fb798cee1f4b44a63ff83549c1c85ffaadbbda3edc28ebbb01fc +SIZE (rust/2020-01-11/cargo-0.41.0-armv6-unknown-freebsd.tar.xz) = 3811020 +SHA256 (rust/2020-01-11/rustc-1.40.0-armv7-unknown-freebsd.tar.xz) = 9d89a89d0f441e1e074e2d0c9d255e07852971c60bd3f4e533e8d1e9fded60e0 +SIZE (rust/2020-01-11/rustc-1.40.0-armv7-unknown-freebsd.tar.xz) = 27393212 +SHA256 (rust/2020-01-11/rust-std-1.40.0-armv7-unknown-freebsd.tar.xz) = 5e4ef87f5403f273856ecfcb822d439628fc95dd7c77d2bd21ac7f33b7e4cba6 +SIZE (rust/2020-01-11/rust-std-1.40.0-armv7-unknown-freebsd.tar.xz) = 13862568 +SHA256 (rust/2020-01-11/cargo-0.41.0-armv7-unknown-freebsd.tar.xz) = a07620fe97be95523d3f915ae03c4b37fcd467fd4f141d62188670dd069e98a2 +SIZE (rust/2020-01-11/cargo-0.41.0-armv7-unknown-freebsd.tar.xz) = 3808576 +SHA256 (rust/2020-01-11/rustc-1.40.0-i686-unknown-freebsd.tar.xz) = a785bede5f78784a62e5b93557e46fed32263d0625e3abe186847f9d6bee89aa +SIZE (rust/2020-01-11/rustc-1.40.0-i686-unknown-freebsd.tar.xz) = 29109748 +SHA256 (rust/2020-01-11/rust-std-1.40.0-i686-unknown-freebsd.tar.xz) = d44c08d8bc59eec45784c5dd53d5b5a723afa0786a33e52e23a3a169c932242d +SIZE (rust/2020-01-11/rust-std-1.40.0-i686-unknown-freebsd.tar.xz) = 14501104 +SHA256 (rust/2020-01-11/cargo-0.41.0-i686-unknown-freebsd.tar.xz) = e4360a14e9b7bf24c273d72a0f043f276be8500974d8c00df9eb2b56abff5ae3 +SIZE (rust/2020-01-11/cargo-0.41.0-i686-unknown-freebsd.tar.xz) = 4356888 +SHA256 (rust/2020-01-11/rustc-1.40.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = b68ce52ccf2a04d165ac0cc69e6eb6dd1d4b69c5334c7e20e1ada9387f34d788 +SIZE (rust/2020-01-11/rustc-1.40.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 32015204 +SHA256 (rust/2020-01-11/rust-std-1.40.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 9193a9c30fe63f8d0644c99be9c253dc0e685d994812bc22a2e35c8046a64430 +SIZE (rust/2020-01-11/rust-std-1.40.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 13903088 +SHA256 (rust/2020-01-11/cargo-0.41.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = e434e724c635aadac3bd859b49504903133182fca862bdc1c2129659e2129cdd +SIZE (rust/2020-01-11/cargo-0.41.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 4253612 +SHA256 (rust/2020-01-11/rustc-1.40.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 7ef1dcdf471b5ff8fdb106573594589978d96c39931972750e21bd4ab001e856 +SIZE (rust/2020-01-11/rustc-1.40.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 26694028 +SHA256 (rust/2020-01-11/rust-std-1.40.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 8dfaff61d5d631afb04cd7a6235dfac3a803fa1fd13def934746e69b6ec35b38 +SIZE (rust/2020-01-11/rust-std-1.40.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 13866172 +SHA256 (rust/2020-01-11/cargo-0.41.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 10e96fb30baa14a95ffede8074867209feda189af2b49f5da1caf5457c9751b2 +SIZE (rust/2020-01-11/cargo-0.41.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 3982652 Index: lang/rust/files/patch-src_bootstrap_bootstrap.py =================================================================== --- lang/rust/files/patch-src_bootstrap_bootstrap.py +++ /dev/null @@ -1,81 +0,0 @@ -https://github.com/rust-lang/rust/commit/8d56bcc59c92 - ---- src/bootstrap/bootstrap.py.orig 2019-11-04 15:45:21 UTC -+++ src/bootstrap/bootstrap.py -@@ -102,10 +102,10 @@ def verify(path, sha_path, verbose): - return verified - - --def unpack(tarball, dst, verbose=False, match=None): -+def unpack(tarball, tarball_suffix, dst, verbose=False, match=None): - """Unpack the given tarball file""" - print("extracting", tarball) -- fname = os.path.basename(tarball).replace(".tar.gz", "") -+ fname = os.path.basename(tarball).replace(tarball_suffix, "") - with contextlib.closing(tarfile.open(tarball)) as tar: - for member in tar.getnames(): - if "/" not in member: -@@ -331,6 +331,18 @@ class RustBuild(object): - self.use_vendored_sources = '' - self.verbose = False - -+ def support_xz(): -+ try: -+ with tempfile.NamedTemporaryFile(delete=False) as temp_file: -+ temp_path = temp_file.name -+ with tarfile.open(temp_path, "w:xz") as tar: -+ pass -+ return True -+ except tarfile.CompressionError: -+ return False -+ -+ self.tarball_suffix = '.tar.xz' if support_xz() else '.tar.gz' -+ - def download_stage0(self): - """Fetch the build system for Rust, written in Rust - -@@ -349,12 +361,13 @@ class RustBuild(object): - self.program_out_of_date(self.rustc_stamp())): - if os.path.exists(self.bin_root()): - shutil.rmtree(self.bin_root()) -- filename = "rust-std-{}-{}.tar.gz".format( -- rustc_channel, self.build) -+ filename = "rust-std-{}-{}{}".format( -+ rustc_channel, self.build, self.tarball_suffix) - pattern = "rust-std-{}".format(self.build) - self._download_stage0_helper(filename, pattern) - -- filename = "rustc-{}-{}.tar.gz".format(rustc_channel, self.build) -+ filename = "rustc-{}-{}{}".format(rustc_channel, self.build, -+ self.tarball_suffix) - self._download_stage0_helper(filename, "rustc") - self.fix_executable("{}/bin/rustc".format(self.bin_root())) - self.fix_executable("{}/bin/rustdoc".format(self.bin_root())) -@@ -365,14 +378,15 @@ class RustBuild(object): - # libraries/binaries that are included in rust-std with - # the system MinGW ones. - if "pc-windows-gnu" in self.build: -- filename = "rust-mingw-{}-{}.tar.gz".format( -- rustc_channel, self.build) -+ filename = "rust-mingw-{}-{}{}".format( -+ rustc_channel, self.build, self.tarball_suffix) - self._download_stage0_helper(filename, "rust-mingw") - - if self.cargo().startswith(self.bin_root()) and \ - (not os.path.exists(self.cargo()) or - self.program_out_of_date(self.cargo_stamp())): -- filename = "cargo-{}-{}.tar.gz".format(cargo_channel, self.build) -+ filename = "cargo-{}-{}{}".format(cargo_channel, self.build, -+ self.tarball_suffix) - self._download_stage0_helper(filename, "cargo") - self.fix_executable("{}/bin/cargo".format(self.bin_root())) - with output(self.cargo_stamp()) as cargo_stamp: -@@ -388,7 +402,7 @@ class RustBuild(object): - tarball = os.path.join(rustc_cache, filename) - if not os.path.exists(tarball): - get("{}/{}".format(url, filename), tarball, verbose=self.verbose) -- unpack(tarball, self.bin_root(), match=pattern, verbose=self.verbose) -+ unpack(tarball, self.tarball_suffix, self.bin_root(), match=pattern, verbose=self.verbose) - - @staticmethod - def fix_executable(fname): Index: lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs =================================================================== --- lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs +++ lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs @@ -1,11 +1,16 @@ ---- src/librustc_target/spec/i686_unknown_freebsd.rs.orig 2019-04-08 12:42:31 UTC +--- src/librustc_target/spec/i686_unknown_freebsd.rs.orig 2019-12-16 15:38:05 UTC +++ src/librustc_target/spec/i686_unknown_freebsd.rs -@@ -2,7 +2,7 @@ use crate::spec::{LinkerFlavor, Target, TargetResult}; +@@ -2,9 +2,11 @@ use crate::spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { let mut base = super::freebsd_base::opts(); - base.cpu = "pentium4".to_string(); + base.cpu = "pentiumpro".to_string(); base.max_atomic_width = Some(64); - base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-m32".to_string()); +- base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-m32".to_string()); ++ let pre_link_args = base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap(); ++ pre_link_args.push("-m32".to_string()); ++ pre_link_args.push("-Wl,-znotext".to_string()); base.stack_probes = true; + + Ok(Target { Index: lang/rust/files/patch-src_llvm-project_llvm_utils_llvm-build_llvmbuild_main.py =================================================================== --- lang/rust/files/patch-src_llvm-project_llvm_utils_llvm-build_llvmbuild_main.py +++ /dev/null @@ -1,11 +0,0 @@ ---- src/llvm-project/llvm/utils/llvm-build/llvmbuild/main.py.orig 2019-09-20 16:14:30 UTC -+++ src/llvm-project/llvm/utils/llvm-build/llvmbuild/main.py -@@ -657,6 +657,8 @@ def add_magic_target_components(parser, project, opts) - # We handle a few special cases of target names here for historical - # reasons, as these are the names configure currently comes up with. - native_target_name = { 'x86' : 'X86', -+ 'i386' : 'X86', -+ 'amd64' : 'X86', - 'x86_64' : 'X86', - 'Unknown' : None }.get(opts.native_target, - opts.native_target) Index: lang/rust/files/patch-vendor_openssl-sys_build_cfgs.rs =================================================================== --- lang/rust/files/patch-vendor_openssl-sys_build_cfgs.rs +++ /dev/null @@ -1,22 +0,0 @@ ---- vendor/openssl-sys/build/cfgs.rs.orig 2019-05-13 21:50:35 UTC -+++ vendor/openssl-sys/build/cfgs.rs -@@ -13,6 +13,9 @@ pub fn get(openssl_version: Option, libressl_vers - if libressl_version >= 0x2_07_00_00_0 { - cfgs.push("libressl270"); - } -+ if libressl_version >= 0x2_07_01_00_0 { -+ cfgs.push("libressl271"); -+ } - if libressl_version >= 0x2_07_03_00_0 { - cfgs.push("libressl273"); - } -@@ -21,6 +24,9 @@ pub fn get(openssl_version: Option, libressl_vers - } - if libressl_version >= 0x2_08_01_00_0 { - cfgs.push("libressl281"); -+ } -+ if libressl_version >= 0x2_09_01_00_0 { -+ cfgs.push("libressl291"); - } - } else { - let openssl_version = openssl_version.unwrap(); Index: lang/rust/files/patch-vendor_openssl-sys_build_main.rs =================================================================== --- lang/rust/files/patch-vendor_openssl-sys_build_main.rs +++ /dev/null @@ -1,59 +0,0 @@ ---- vendor/openssl-sys/build/main.rs.orig 2019-11-04 17:34:46 UTC -+++ vendor/openssl-sys/build/main.rs -@@ -183,27 +183,32 @@ See rust-openssl README for more information: - if let Some(libressl_version) = libressl_version { - println!("cargo:libressl_version_number={:x}", libressl_version); - -+ let major = (libressl_version >> 28) as u8; - let minor = (libressl_version >> 20) as u8; - let fix = (libressl_version >> 12) as u8; -- let (minor, fix) = match (minor, fix) { -- (5, 0) => ('5', '0'), -- (5, 1) => ('5', '1'), -- (5, 2) => ('5', '2'), -- (5, _) => ('5', 'x'), -- (6, 0) => ('6', '0'), -- (6, 1) => ('6', '1'), -- (6, 2) => ('6', '2'), -- (6, _) => ('6', 'x'), -- (7, _) => ('7', 'x'), -- (8, 0) => ('8', '0'), -- (8, 1) => ('8', '1'), -- (8, _) => ('8', 'x'), -- (9, 0) => ('9', '0'), -+ let (major, minor, fix) = match (major, minor, fix) { -+ (2, 5, 0) => ('2', '5', '0'), -+ (2, 5, 1) => ('2', '5', '1'), -+ (2, 5, 2) => ('2', '5', '2'), -+ (2, 5, _) => ('2', '5', 'x'), -+ (2, 6, 0) => ('2', '6', '0'), -+ (2, 6, 1) => ('2', '6', '1'), -+ (2, 6, 2) => ('2', '6', '2'), -+ (2, 6, _) => ('2', '6', 'x'), -+ (2, 7, _) => ('2', '7', 'x'), -+ (2, 8, 0) => ('2', '8', '0'), -+ (2, 8, 1) => ('2', '8', '1'), -+ (2, 8, _) => ('2', '8', 'x'), -+ (2, 9, 0) => ('2', '9', '0'), -+ (2, 9, _) => ('2', '9', 'x'), -+ (3, 0, 0) => ('3', '0', '0'), -+ (3, 0, 1) => ('3', '0', '1'), -+ (3, 0, _) => ('3', '0', 'x'), - _ => version_error(), - }; - - println!("cargo:libressl=true"); -- println!("cargo:libressl_version=2{}{}", minor, fix); -+ println!("cargo:libressl_version={}{}{}", major, minor, fix); - println!("cargo:version=101"); - Version::Libressl - } else { -@@ -239,7 +244,7 @@ fn version_error() -> ! { - " - - This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5 --through 2.9.0, but a different version of OpenSSL was found. The build is now aborting -+through 3.0.x, but a different version of OpenSSL was found. The build is now aborting - due to this version mismatch. - - " Index: lang/rust/files/patch-vendor_openssl-sys_src_crypto.rs =================================================================== --- lang/rust/files/patch-vendor_openssl-sys_src_crypto.rs +++ /dev/null @@ -1,26 +0,0 @@ ---- vendor/openssl-sys/src/crypto.rs.orig 2019-05-13 21:50:35 UTC -+++ vendor/openssl-sys/src/crypto.rs -@@ -15,7 +15,13 @@ cfg_if! { - if #[cfg(ossl110)] { - pub const CRYPTO_EX_INDEX_SSL: c_int = 0; - pub const CRYPTO_EX_INDEX_SSL_CTX: c_int = 1; -- -+ } else if #[cfg(libressl)] { -+ pub const CRYPTO_EX_INDEX_SSL: c_int = 1; -+ pub const CRYPTO_EX_INDEX_SSL_CTX: c_int = 2; -+ } -+} -+cfg_if! { -+ if #[cfg(any(ossl110, libressl271))] { - extern "C" { - pub fn OpenSSL_version_num() -> c_ulong; - pub fn OpenSSL_version(key: c_int) -> *const c_char; -@@ -64,7 +70,7 @@ pub type CRYPTO_EX_free = unsafe extern "C" fn( - argp: *mut c_void, - ); - extern "C" { -- #[cfg(ossl110)] -+ #[cfg(any(ossl110, libressl))] - pub fn CRYPTO_get_ex_new_index( - class_index: c_int, - argl: c_long, Index: lang/rust/files/patch-vendor_openssl-sys_src_ssl.rs =================================================================== --- lang/rust/files/patch-vendor_openssl-sys_src_ssl.rs +++ /dev/null @@ -1,11 +0,0 @@ ---- vendor/openssl-sys/src/ssl.rs.orig 2019-11-04 17:34:46 UTC -+++ vendor/openssl-sys/src/ssl.rs -@@ -1057,7 +1057,7 @@ extern "C" { - } - - cfg_if! { -- if #[cfg(ossl110)] { -+ if #[cfg(any(ossl110, libressl291))] { - extern "C" { - pub fn TLS_method() -> *const SSL_METHOD; - Index: lang/rust/files/patch-vendor_openssl_build.rs =================================================================== --- lang/rust/files/patch-vendor_openssl_build.rs +++ /dev/null @@ -1,23 +0,0 @@ ---- vendor/openssl/build.rs.orig 2019-05-13 21:50:34 UTC -+++ vendor/openssl/build.rs -@@ -46,12 +46,20 @@ fn main() { - println!("cargo:rustc-cfg=libressl270"); - } - -+ if version >= 0x2_07_01_00_0 { -+ println!("cargo:rustc-cfg=libressl271"); -+ } -+ - if version >= 0x2_07_03_00_0 { - println!("cargo:rustc-cfg=libressl273"); - } - - if version >= 0x2_08_00_00_0 { - println!("cargo:rustc-cfg=libressl280"); -+ } -+ -+ if version >= 0x2_09_01_00_0 { -+ println!("cargo:rustc-cfg=libressl291"); - } - } - } Index: lang/rust/files/patch-vendor_openssl_src_ssl_mod.rs =================================================================== --- lang/rust/files/patch-vendor_openssl_src_ssl_mod.rs +++ /dev/null @@ -1,28 +0,0 @@ ---- vendor/openssl/src/ssl/mod.rs.orig 2019-05-13 21:50:34 UTC -+++ vendor/openssl/src/ssl/mod.rs -@@ -3690,9 +3690,14 @@ cfg_if! { - } - - cfg_if! { -- if #[cfg(ossl110)] { -+ if #[cfg(any(ossl110, libressl291))] { - use ffi::{TLS_method, DTLS_method}; -- -+ } else { -+ use ffi::{SSLv23_method as TLS_method, DTLSv1_method as DTLS_method}; -+ } -+} -+cfg_if! { -+ if #[cfg(ossl110)] { - unsafe fn get_new_idx(f: ffi::CRYPTO_EX_free) -> c_int { - ffi::CRYPTO_get_ex_new_index( - ffi::CRYPTO_EX_INDEX_SSL_CTX, -@@ -3715,8 +3720,6 @@ cfg_if! { - ) - } - } else { -- use ffi::{SSLv23_method as TLS_method, DTLSv1_method as DTLS_method}; -- - unsafe fn get_new_idx(f: ffi::CRYPTO_EX_free) -> c_int { - ffi::SSL_CTX_get_ex_new_index(0, ptr::null_mut(), None, None, Some(f)) - } Index: lang/rust/files/patch-vendor_openssl_src_version.rs =================================================================== --- lang/rust/files/patch-vendor_openssl_src_version.rs +++ /dev/null @@ -1,11 +0,0 @@ ---- vendor/openssl/src/version.rs.orig 2019-05-13 21:50:34 UTC -+++ vendor/openssl/src/version.rs -@@ -14,7 +14,7 @@ - use std::ffi::CStr; - - cfg_if! { -- if #[cfg(ossl110)] { -+ if #[cfg(any(ossl110, libressl271))] { - use ffi::{ - OPENSSL_VERSION, OPENSSL_CFLAGS, OPENSSL_BUILT_ON, OPENSSL_PLATFORM, OPENSSL_DIR, - OpenSSL_version_num, OpenSSL_version, Index: mail/thunderbird/Makefile =================================================================== --- mail/thunderbird/Makefile +++ mail/thunderbird/Makefile @@ -3,7 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 68.4.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source Index: misc/broot/Makefile =================================================================== --- misc/broot/Makefile +++ misc/broot/Makefile @@ -3,6 +3,7 @@ PORTNAME= broot DISTVERSIONPREFIX= v DISTVERSION= 0.12.1 +PORTREVISION= 1 CATEGORIES= misc MAINTAINER= vulcan@wired.sh Index: multimedia/librav1e/Makefile =================================================================== --- multimedia/librav1e/Makefile +++ multimedia/librav1e/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMEPREFIX= lib MASTERDIR= ${.CURDIR}/../rav1e Index: multimedia/rav1e/Makefile =================================================================== --- multimedia/rav1e/Makefile +++ multimedia/rav1e/Makefile @@ -3,7 +3,7 @@ PORTNAME= rav1e DISTVERSIONPREFIX= v DISTVERSION= 0.2.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org Index: multimedia/termplay/Makefile =================================================================== --- multimedia/termplay/Makefile +++ multimedia/termplay/Makefile @@ -2,7 +2,7 @@ PORTNAME= termplay DISTVERSION= 2.0.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= CRATESIO DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Index: net-im/fractal/Makefile =================================================================== --- net-im/fractal/Makefile +++ net-im/fractal/Makefile @@ -2,6 +2,7 @@ PORTNAME= fractal DISTVERSION= 4.2.2 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= https://gitlab.gnome.org/World/fractal/uploads/${GL_HASH}/ Index: net-p2p/parity-ethereum/Makefile =================================================================== --- net-p2p/parity-ethereum/Makefile +++ net-p2p/parity-ethereum/Makefile @@ -3,6 +3,7 @@ PORTNAME= parity-ethereum DISTVERSIONPREFIX= v DISTVERSION= 2.7.0 +PORTREVISION= 1 CATEGORIES= net-p2p MAINTAINER= ale@FreeBSD.org Index: net/proby/Makefile =================================================================== --- net/proby/Makefile +++ net/proby/Makefile @@ -2,6 +2,7 @@ PORTNAME= proby DISTVERSION= 0.4.0 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= yuri@FreeBSD.org Index: net/rabbiteer/Makefile =================================================================== --- net/rabbiteer/Makefile +++ net/rabbiteer/Makefile @@ -2,7 +2,7 @@ PORTNAME= rabbiteer DISTVERSION= 1.4.1 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= net MAINTAINER= dch@FreeBSD.org Index: net/routinator/Makefile =================================================================== --- net/routinator/Makefile +++ net/routinator/Makefile @@ -3,7 +3,7 @@ PORTNAME= routinator PORTVERSION= 0.6.4 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MAINTAINER= jaap@NLnetLabs.nl Index: security/acmed/Makefile =================================================================== --- security/acmed/Makefile +++ security/acmed/Makefile @@ -3,7 +3,7 @@ PORTNAME= acmed DISTVERSIONPREFIX= v DISTVERSION= 0.6.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security MAINTAINER= greg@unrelenting.technology Index: security/cargo-audit/Makefile =================================================================== --- security/cargo-audit/Makefile +++ security/cargo-audit/Makefile @@ -3,6 +3,7 @@ PORTNAME= cargo-audit DISTVERSIONPREFIX= v DISTVERSION= 0.11.0 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= tobik@FreeBSD.org Index: security/cloak/Makefile =================================================================== --- security/cloak/Makefile +++ security/cloak/Makefile @@ -3,7 +3,7 @@ PORTNAME= cloak DISTVERSIONPREFIX= v DISTVERSION= 0.2.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security MAINTAINER= tobik@FreeBSD.org Index: security/suricata/Makefile =================================================================== --- security/suricata/Makefile +++ security/suricata/Makefile @@ -3,6 +3,7 @@ PORTNAME= suricata DISTVERSION= 5.0.1 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://www.openinfosecfoundation.org/download/ Index: security/suricata5/Makefile =================================================================== --- security/suricata5/Makefile +++ security/suricata5/Makefile @@ -3,7 +3,7 @@ PORTNAME= suricata DISTVERSION= 5.0.0-rc1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= https://www.openinfosecfoundation.org/download/ PKGNAMESUFFIX= 5 Index: shells/ion/Makefile =================================================================== --- shells/ion/Makefile +++ shells/ion/Makefile @@ -2,7 +2,7 @@ PORTNAME= ion DISTVERSION= 1.0.5-1355 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= shells PKGNAMESUFFIX= -shell Index: shells/starship/Makefile =================================================================== --- shells/starship/Makefile +++ shells/starship/Makefile @@ -2,7 +2,7 @@ PORTNAME= starship DISTVERSION= 0.13.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= shells MASTER_SITES= CRATESIO DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Index: sysutils/exa/Makefile =================================================================== --- sysutils/exa/Makefile +++ sysutils/exa/Makefile @@ -3,7 +3,7 @@ PORTNAME= exa DISTVERSIONPREFIX= v DISTVERSION= 0.9.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils MAINTAINER= tobik@FreeBSD.org Index: sysutils/fd/Makefile =================================================================== --- sysutils/fd/Makefile +++ sysutils/fd/Makefile @@ -4,7 +4,7 @@ PORTNAME= fd DISTVERSIONPREFIX= v DISTVERSION= 7.4.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils PKGNAMESUFFIX= -find Index: sysutils/flowgger/Makefile =================================================================== --- sysutils/flowgger/Makefile +++ sysutils/flowgger/Makefile @@ -2,6 +2,7 @@ PORTNAME= flowgger DISTVERSION= 0.2.9 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= CRATESIO DISTFILES= ${CARGO_DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} Index: sysutils/fusefs-sandboxfs/Makefile =================================================================== --- sysutils/fusefs-sandboxfs/Makefile +++ sysutils/fusefs-sandboxfs/Makefile @@ -3,7 +3,7 @@ PORTNAME= sandboxfs DISTVERSIONPREFIX= sandboxfs- DISTVERSION= 0.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils PKGNAMEPREFIX= fusefs- Index: sysutils/hexyl/Makefile =================================================================== --- sysutils/hexyl/Makefile +++ sysutils/hexyl/Makefile @@ -3,7 +3,7 @@ PORTNAME= hexyl DISTVERSIONPREFIX= v DISTVERSION= 0.6.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MAINTAINER= tobik@FreeBSD.org Index: sysutils/potnet/Makefile =================================================================== --- sysutils/potnet/Makefile +++ sysutils/potnet/Makefile @@ -2,7 +2,7 @@ PORTNAME= potnet DISTVERSION= 0.4.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MAINTAINER= pizzamig@FreeBSD.org Index: sysutils/tealdeer/Makefile =================================================================== --- sysutils/tealdeer/Makefile +++ sysutils/tealdeer/Makefile @@ -3,6 +3,7 @@ PORTNAME= tealdeer DISTVERSIONPREFIX= v DISTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= vulcan@wired.sh Index: sysutils/vector/Makefile =================================================================== --- sysutils/vector/Makefile +++ sysutils/vector/Makefile @@ -3,6 +3,7 @@ PORTNAME= vector DISTVERSIONPREFIX= v DISTVERSION= 0.7.1 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= greg@unrelenting.technology Index: textproc/bat/Makefile =================================================================== --- textproc/bat/Makefile +++ textproc/bat/Makefile @@ -3,7 +3,7 @@ PORTNAME= bat DISTVERSIONPREFIX= v DISTVERSION= 0.12.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= textproc MAINTAINER= pizzamig@FreeBSD.org Index: textproc/ripgrep/Makefile =================================================================== --- textproc/ripgrep/Makefile +++ textproc/ripgrep/Makefile @@ -5,7 +5,7 @@ PORTNAME= ripgrep DISTVERSION= 11.0.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc MAINTAINER= petteri.valkonen@iki.fi Index: textproc/sd/Makefile =================================================================== --- textproc/sd/Makefile +++ textproc/sd/Makefile @@ -2,7 +2,7 @@ PORTNAME= sd DISTVERSION= 0.6.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= textproc MAINTAINER= tobik@FreeBSD.org Index: textproc/sonic/Makefile =================================================================== --- textproc/sonic/Makefile +++ textproc/sonic/Makefile @@ -3,7 +3,7 @@ PORTNAME= sonic DISTVERSIONPREFIX= v DISTVERSION= 1.2.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc MAINTAINER= tobik@FreeBSD.org Index: textproc/xsv-rs/Makefile =================================================================== --- textproc/xsv-rs/Makefile +++ textproc/xsv-rs/Makefile @@ -2,7 +2,7 @@ PORTNAME= xsv DISTVERSION= 0.13.0 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= textproc PKGNAMESUFFIX= -rs Index: www/cliqz/Makefile =================================================================== --- www/cliqz/Makefile +++ www/cliqz/Makefile @@ -2,6 +2,7 @@ PORTNAME= cliqz DISTVERSION= 1.32.1 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/:amazon \ http://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/${CLIQZ_LAST_BUILD_ID}/:cliqz Index: www/ffsend/Makefile =================================================================== --- www/ffsend/Makefile +++ www/ffsend/Makefile @@ -3,7 +3,7 @@ PORTNAME= ffsend DISTVERSIONPREFIX= v DISTVERSION= 0.2.55 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MAINTAINER= 0mp@FreeBSD.org Index: www/firefox-esr/Makefile =================================================================== --- www/firefox-esr/Makefile +++ www/firefox-esr/Makefile @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 68.4.2 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ Index: www/firefox/Makefile =================================================================== --- www/firefox/Makefile +++ www/firefox/Makefile @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 72.0.2 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Index: www/geckodriver/Makefile =================================================================== --- www/geckodriver/Makefile +++ www/geckodriver/Makefile @@ -2,6 +2,7 @@ PORTNAME= geckodriver DISTVERSION= 0.26.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://hg.mozilla.org/mozilla-central/archive/${DISTNAME}.zip/testing/geckodriver/?dummy=/ DISTNAME= e9783a644016aa9b317887076618425586730d73 Index: www/jwt-cli/Makefile =================================================================== --- www/jwt-cli/Makefile +++ www/jwt-cli/Makefile @@ -3,7 +3,7 @@ PORTNAME= jwt-cli PORTVERSION= 2.5.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MAINTAINER= osa@FreeBSD.org Index: www/miniserve/Makefile =================================================================== --- www/miniserve/Makefile +++ www/miniserve/Makefile @@ -3,7 +3,7 @@ PORTNAME= miniserve DISTVERSIONPREFIX= v DISTVERSION= 0.5.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MAINTAINER= tobik@FreeBSD.org Index: www/newsboat/Makefile =================================================================== --- www/newsboat/Makefile +++ www/newsboat/Makefile @@ -3,7 +3,7 @@ PORTNAME= newsboat PORTVERSION= 2.18 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= https://newsboat.org/releases/${PORTVERSION}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Index: www/websocat/Makefile =================================================================== --- www/websocat/Makefile +++ www/websocat/Makefile @@ -4,7 +4,7 @@ PORTNAME= websocat DISTVERSIONPREFIX= v DISTVERSION= 1.5.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MAINTAINER= osa@FreeBSD.org Index: www/zola/Makefile =================================================================== --- www/zola/Makefile +++ www/zola/Makefile @@ -3,7 +3,7 @@ PORTNAME= zola DISTVERSIONPREFIX= v DISTVERSION= 0.9.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MAINTAINER= tobik@FreeBSD.org Index: x11/admiral/Makefile =================================================================== --- x11/admiral/Makefile +++ x11/admiral/Makefile @@ -4,7 +4,7 @@ DISTVERSIONPREFIX= v DISTVERSION= 1.0.0-7 DISTVERSIONSUFFIX= -g5a9f33b -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= x11 MAINTAINER= rigoletto@FreeBSD.org Index: x11/alacritty/Makefile =================================================================== --- x11/alacritty/Makefile +++ x11/alacritty/Makefile @@ -3,6 +3,7 @@ PORTNAME= alacritty DISTVERSIONPREFIX= v DISTVERSION= 0.4.1 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= tobik@FreeBSD.org Index: x11/squeekboard/Makefile =================================================================== --- x11/squeekboard/Makefile +++ x11/squeekboard/Makefile @@ -3,6 +3,7 @@ PORTNAME= squeekboard DISTVERSIONPREFIX= v DISTVERSION= 1.8.0 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= jbeich@FreeBSD.org