Index: head/Mk/Uses/cargo.mk =================================================================== --- head/Mk/Uses/cargo.mk +++ head/Mk/Uses/cargo.mk @@ -43,7 +43,7 @@ CARGO_BUILDDEP?= yes .if ${CARGO_BUILDDEP:tl} == "yes" -BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.34.2:lang/${RUST_DEFAULT} +BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.35.0:lang/${RUST_DEFAULT} .endif # Location of cargo binary (default to lang/rust's Cargo binary) Index: head/audio/spotifyd/Makefile =================================================================== --- head/audio/spotifyd/Makefile +++ head/audio/spotifyd/Makefile @@ -3,7 +3,7 @@ PORTNAME= spotifyd DISTVERSIONPREFIX= v DISTVERSION= 0.2.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MAINTAINER= tobik@FreeBSD.org Index: head/benchmarks/hyperfine/Makefile =================================================================== --- head/benchmarks/hyperfine/Makefile +++ head/benchmarks/hyperfine/Makefile @@ -3,7 +3,7 @@ PORTNAME= hyperfine DISTVERSIONPREFIX= v DISTVERSION= 1.5.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= benchmarks MAINTAINER= pizzamig@FreeBSD.org Index: head/devel/bingrep/Makefile =================================================================== --- head/devel/bingrep/Makefile +++ head/devel/bingrep/Makefile @@ -2,7 +2,7 @@ PORTNAME= bingrep PORTVERSION= 0.6.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= CRATESIO DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Index: head/devel/git-absorb/Makefile =================================================================== --- head/devel/git-absorb/Makefile +++ head/devel/git-absorb/Makefile @@ -2,7 +2,7 @@ PORTNAME= git-absorb DISTVERSION= 0.3.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= greg@unrelenting.technology Index: head/devel/interactive_rebase_tool/Makefile =================================================================== --- head/devel/interactive_rebase_tool/Makefile +++ head/devel/interactive_rebase_tool/Makefile @@ -2,7 +2,7 @@ PORTNAME= interactive_rebase_tool DISTVERSION= 1.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= petteri.valkonen@iki.fi Index: head/devel/pijul/Makefile =================================================================== --- head/devel/pijul/Makefile +++ head/devel/pijul/Makefile @@ -3,7 +3,7 @@ PORTNAME= pijul PORTVERSION= 0.12.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= https://pijul.org/releases/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Index: head/devel/racer/Makefile =================================================================== --- head/devel/racer/Makefile +++ head/devel/racer/Makefile @@ -4,7 +4,7 @@ PORTNAME= racer DISTVERSIONPREFIX= v DISTVERSION= 2.1.21 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= beyert@cs.ucr.edu Index: head/devel/racerd/Makefile =================================================================== --- head/devel/racerd/Makefile +++ head/devel/racerd/Makefile @@ -5,7 +5,7 @@ DISTVERSIONPREFIX= v DISTVERSION= 0.1.1-56 DISTVERSIONSUFFIX= -g29cd4c6 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= devel MAINTAINER= ultima@FreeBSD.org Index: head/devel/rust-bindgen/Makefile =================================================================== --- head/devel/rust-bindgen/Makefile +++ head/devel/rust-bindgen/Makefile @@ -2,6 +2,7 @@ PORTNAME= bindgen DISTVERSION= 0.49.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= CRATESIO PKGNAMEPREFIX= rust- Index: head/devel/rust-cbindgen/Makefile =================================================================== --- head/devel/rust-cbindgen/Makefile +++ head/devel/rust-cbindgen/Makefile @@ -2,7 +2,7 @@ PORTNAME= cbindgen DISTVERSION= 0.8.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= CRATESIO PKGNAMEPREFIX= rust- Index: head/devel/sccache/Makefile =================================================================== --- head/devel/sccache/Makefile +++ head/devel/sccache/Makefile @@ -2,7 +2,7 @@ PORTNAME= sccache DISTVERSION= 0.2.8 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= devel Index: head/devel/tokei/Makefile =================================================================== --- head/devel/tokei/Makefile +++ head/devel/tokei/Makefile @@ -3,7 +3,7 @@ PORTNAME= tokei DISTVERSIONPREFIX= v DISTVERSION= 9.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MAINTAINER= tobik@FreeBSD.org Index: head/dns/doh-proxy/Makefile =================================================================== --- head/dns/doh-proxy/Makefile +++ head/dns/doh-proxy/Makefile @@ -3,6 +3,7 @@ PORTNAME= doh-proxy DISTVERSION= 0.1.15 +PORTREVISION= 1 CATEGORIES= dns MAINTAINER= mat@FreeBSD.org Index: head/editors/kak-lsp/Makefile =================================================================== --- head/editors/kak-lsp/Makefile +++ head/editors/kak-lsp/Makefile @@ -3,7 +3,7 @@ PORTNAME= kak-lsp DISTVERSIONPREFIX= v DISTVERSION= 6.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MAINTAINER= tobik@FreeBSD.org Index: head/editors/parinfer-rust/Makefile =================================================================== --- head/editors/parinfer-rust/Makefile +++ head/editors/parinfer-rust/Makefile @@ -3,7 +3,7 @@ PORTNAME= parinfer-rust DISTVERSIONPREFIX= v DISTVERSION= 0.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MAINTAINER= tobik@FreeBSD.org Index: head/editors/xi-core/Makefile =================================================================== --- head/editors/xi-core/Makefile +++ head/editors/xi-core/Makefile @@ -2,7 +2,7 @@ PORTNAME= xi-core DISTVERSION= g20190420 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MAINTAINER= ed.arrakis@gmail.com Index: head/editors/xi-term/Makefile =================================================================== --- head/editors/xi-term/Makefile +++ head/editors/xi-term/Makefile @@ -2,7 +2,7 @@ PORTNAME= xi-term DISTVERSION= g20190328 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MAINTAINER= ed.arrakis@gmail.com Index: head/games/genact/Makefile =================================================================== --- head/games/genact/Makefile +++ head/games/genact/Makefile @@ -2,7 +2,7 @@ PORTNAME= genact DISTVERSION= 0.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MAINTAINER= 0mp@FreeBSD.org Index: head/games/jaggedalliance2/Makefile =================================================================== --- head/games/jaggedalliance2/Makefile +++ head/games/jaggedalliance2/Makefile @@ -4,7 +4,7 @@ PORTNAME= ja2 DISTVERSIONPREFIX= v DISTVERSION= 0.16.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MAINTAINER= tobik@FreeBSD.org Index: head/graphics/librsvg2-rust/Makefile =================================================================== --- head/graphics/librsvg2-rust/Makefile +++ head/graphics/librsvg2-rust/Makefile @@ -3,6 +3,7 @@ PORTNAME= librsvg PORTVERSION= 2.45.6 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= GNOME PKGNAMESUFFIX= 2-rust Index: head/lang/rust/Makefile =================================================================== --- head/lang/rust/Makefile +++ head/lang/rust/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rust -PORTVERSION?= 1.34.2 +PORTVERSION?= 1.35.0 PORTREVISION?= 0 CATEGORIES= lang MASTER_SITES= http://static.rust-lang.org/dist/:src \ @@ -42,13 +42,17 @@ CONFLICTS_INSTALL?= rust-nightly # See WRKSRC/src/stage0.txt for this date and version values. -BOOTSTRAPS_DATE?= 2019-02-28 +BOOTSTRAPS_DATE?= 2019-05-14 -RUST_BOOTSTRAP_VERSION?= 1.33.0 +RUST_BOOTSTRAP_VERSION?= 1.34.2 +RUST_BOOTSTRAP_VERSION_aarch64?= 1.34.0 +RUST_BOOTSTRAP_VERSION_armv6?= 1.34.0 +RUST_BOOTSTRAP_VERSION_armv7?= 1.34.0 +RUST_BOOTSTRAP_VERSION_powerpc64?= 1.34.0 RUSTC_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz RUST_STD_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz -CARGO_BOOTSTRAP_VERSION?= 0.34.0 +CARGO_BOOTSTRAP_VERSION?= 0.35.0 CARGO_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/cargo-${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz CARGO_VENDOR_DIR?= ${WRKSRC}/vendor Index: head/lang/rust/distinfo =================================================================== --- head/lang/rust/distinfo +++ head/lang/rust/distinfo @@ -1,39 +1,39 @@ -TIMESTAMP = 1557852472 -SHA256 (rust/rustc-1.34.2-src.tar.xz) = 2b3b3a5462aa31d07f39721af73ef394803ceae3472e2470f28b7ee0b12e38ef -SIZE (rust/rustc-1.34.2-src.tar.xz) = 95048792 -SHA256 (rust/2019-02-28/rustc-1.33.0-aarch64-unknown-freebsd.tar.gz) = 142c3419b0df1bacf97bf6ed6d2d3bcb37a6439b5bf11f258178edac6e3053b3 -SIZE (rust/2019-02-28/rustc-1.33.0-aarch64-unknown-freebsd.tar.gz) = 64575877 -SHA256 (rust/2019-02-28/rust-std-1.33.0-aarch64-unknown-freebsd.tar.gz) = bbb2ec53d4fcade7002665d4c9c64740ddc14a07d3726555c7a2ffe01b07fd9e -SIZE (rust/2019-02-28/rust-std-1.33.0-aarch64-unknown-freebsd.tar.gz) = 70714457 -SHA256 (rust/2019-02-28/cargo-0.34.0-aarch64-unknown-freebsd.tar.gz) = 92bda14b874591342e7584d94a90ce0bd6532f29d638c89eaa50b9d80a8aa0fb -SIZE (rust/2019-02-28/cargo-0.34.0-aarch64-unknown-freebsd.tar.gz) = 5823541 -SHA256 (rust/2019-02-28/rustc-1.33.0-x86_64-unknown-freebsd.tar.gz) = 8bfc7fc50c50294cf4ded35360b41b590180401a0d2e84256f5931c7c1ff35cd -SIZE (rust/2019-02-28/rustc-1.33.0-x86_64-unknown-freebsd.tar.gz) = 74812594 -SHA256 (rust/2019-02-28/rust-std-1.33.0-x86_64-unknown-freebsd.tar.gz) = 8eec7a21a3368890fdf0b826e7bc1928775724c0a4bd14d86304cc7e48309237 -SIZE (rust/2019-02-28/rust-std-1.33.0-x86_64-unknown-freebsd.tar.gz) = 71459727 -SHA256 (rust/2019-02-28/cargo-0.34.0-x86_64-unknown-freebsd.tar.gz) = 0108a0f2e2c4663b4e5cddd5bee04fd7cf5d2c94feb3fc527254a606ee856928 -SIZE (rust/2019-02-28/cargo-0.34.0-x86_64-unknown-freebsd.tar.gz) = 6358006 -SHA256 (rust/2019-02-28/rustc-1.33.0-armv6-unknown-freebsd.tar.gz) = 9119a1c743c0dda2d65727e6436f453ab85428c7587d623e21b473e4df44a3ba -SIZE (rust/2019-02-28/rustc-1.33.0-armv6-unknown-freebsd.tar.gz) = 67496083 -SHA256 (rust/2019-02-28/rust-std-1.33.0-armv6-unknown-freebsd.tar.gz) = 29ac9b289ae493b6ae5efb2c3dd8bf367466b8f0573007e92d020743eab3d607 -SIZE (rust/2019-02-28/rust-std-1.33.0-armv6-unknown-freebsd.tar.gz) = 72846229 -SHA256 (rust/2019-02-28/cargo-0.34.0-armv6-unknown-freebsd.tar.gz) = 3f518ce75bdc1b7ed2c600a5a6e6f522d608efe66d0dbff442cad16fd68d36e7 -SIZE (rust/2019-02-28/cargo-0.34.0-armv6-unknown-freebsd.tar.gz) = 5993902 -SHA256 (rust/2019-02-28/rustc-1.33.0-armv7-unknown-freebsd.tar.gz) = 9649fa7830648725143dff25e40f1edcacbd50f76a63c84d9b45f264705d2f9a -SIZE (rust/2019-02-28/rustc-1.33.0-armv7-unknown-freebsd.tar.gz) = 66337581 -SHA256 (rust/2019-02-28/rust-std-1.33.0-armv7-unknown-freebsd.tar.gz) = 3848af717da0a5b87925d34524b74f76225167ea0261fc2c6d6627115469e4e9 -SIZE (rust/2019-02-28/rust-std-1.33.0-armv7-unknown-freebsd.tar.gz) = 72078355 -SHA256 (rust/2019-02-28/cargo-0.34.0-armv7-unknown-freebsd.tar.gz) = 7b6c04ec6eddc09367e9b720c8a126363ecbf4c6d787490498a133e8bdec3c4b -SIZE (rust/2019-02-28/cargo-0.34.0-armv7-unknown-freebsd.tar.gz) = 5036799 -SHA256 (rust/2019-02-28/rustc-1.33.0-i686-unknown-freebsd.tar.gz) = f788ef1806f6e51c7df05dc2614f8b95d3d1a59177786dc9c895c16c0d5201aa -SIZE (rust/2019-02-28/rustc-1.33.0-i686-unknown-freebsd.tar.gz) = 76140989 -SHA256 (rust/2019-02-28/rust-std-1.33.0-i686-unknown-freebsd.tar.gz) = 00325440bf2c832f9063042bf8999756466cec23f747b62ad3268a316dae39a9 -SIZE (rust/2019-02-28/rust-std-1.33.0-i686-unknown-freebsd.tar.gz) = 72221278 -SHA256 (rust/2019-02-28/cargo-0.34.0-i686-unknown-freebsd.tar.gz) = 7943c30e3451972ed1a99f26b079c53a1a7317f63ff60cca1ceeebb80a99dc66 -SIZE (rust/2019-02-28/cargo-0.34.0-i686-unknown-freebsd.tar.gz) = 6134900 -SHA256 (rust/2019-02-28/rustc-1.33.0-powerpc64-unknown-freebsd.tar.gz) = 1ad1e9a0ae5fbc279c7ca5079d80bfd6d8e7861811a689902ca83c95fe92b011 -SIZE (rust/2019-02-28/rustc-1.33.0-powerpc64-unknown-freebsd.tar.gz) = 74228636 -SHA256 (rust/2019-02-28/rust-std-1.33.0-powerpc64-unknown-freebsd.tar.gz) = fbd83a5d73329f82180922e4da0aeef529a5c834e5446f7befadb69db2b968f7 -SIZE (rust/2019-02-28/rust-std-1.33.0-powerpc64-unknown-freebsd.tar.gz) = 74552190 -SHA256 (rust/2019-02-28/cargo-0.34.0-powerpc64-unknown-freebsd.tar.gz) = 5bedf357c0ce018f85cbea6ba5f9c380602761ebca295e264afc4fbf92766c68 -SIZE (rust/2019-02-28/cargo-0.34.0-powerpc64-unknown-freebsd.tar.gz) = 6960371 +TIMESTAMP = 1558437668 +SHA256 (rust/rustc-1.35.0-src.tar.xz) = 169756df2298957bcf02da6a612996c24a51b9ac3b23409e6507d69eb2e6f523 +SIZE (rust/rustc-1.35.0-src.tar.xz) = 96543548 +SHA256 (rust/2019-05-14/rustc-1.34.0-aarch64-unknown-freebsd.tar.gz) = 521a164f3bafe11947ba163de817ab32bdb535fcc3c0d35fc88b451921709fbc +SIZE (rust/2019-05-14/rustc-1.34.0-aarch64-unknown-freebsd.tar.gz) = 59053376 +SHA256 (rust/2019-05-14/rust-std-1.34.0-aarch64-unknown-freebsd.tar.gz) = 4dc7f6058f346d5db57881bf161dfbe1e2f710529ade244eaecfa8645854c3bb +SIZE (rust/2019-05-14/rust-std-1.34.0-aarch64-unknown-freebsd.tar.gz) = 68781150 +SHA256 (rust/2019-05-14/cargo-0.35.0-aarch64-unknown-freebsd.tar.gz) = e5856f47edb72bf210c950871d8b534d59f53339f0e21aeef7cfd786aea7473f +SIZE (rust/2019-05-14/cargo-0.35.0-aarch64-unknown-freebsd.tar.gz) = 5505884 +SHA256 (rust/2019-05-14/rustc-1.34.2-x86_64-unknown-freebsd.tar.gz) = 30bc49291e7771eade08b056804f132f0dddff2e6dd9bd87a4d30adddca02a3a +SIZE (rust/2019-05-14/rustc-1.34.2-x86_64-unknown-freebsd.tar.gz) = 69846157 +SHA256 (rust/2019-05-14/rust-std-1.34.2-x86_64-unknown-freebsd.tar.gz) = 7ea9cee4c270e6206bce716e0935e1b1f614d1d62ef266fb7ed4895169ff1d23 +SIZE (rust/2019-05-14/rust-std-1.34.2-x86_64-unknown-freebsd.tar.gz) = 70076845 +SHA256 (rust/2019-05-14/cargo-0.35.0-x86_64-unknown-freebsd.tar.gz) = e14302d97a7046fb547358f4d0015b20f1df4cacceb232724b45601192ae6b28 +SIZE (rust/2019-05-14/cargo-0.35.0-x86_64-unknown-freebsd.tar.gz) = 6131299 +SHA256 (rust/2019-05-14/rustc-1.34.0-armv6-unknown-freebsd.tar.gz) = c3c85989402b5c5e443a8c49bc48c4dc945dd5205724eeaa21e6e354c769a86d +SIZE (rust/2019-05-14/rustc-1.34.0-armv6-unknown-freebsd.tar.gz) = 61494916 +SHA256 (rust/2019-05-14/rust-std-1.34.0-armv6-unknown-freebsd.tar.gz) = 017819e6c5fe4cc165a682ab0cf79e010b7984370ace6b9adba872cc8635a9a2 +SIZE (rust/2019-05-14/rust-std-1.34.0-armv6-unknown-freebsd.tar.gz) = 70541302 +SHA256 (rust/2019-05-14/cargo-0.35.0-armv6-unknown-freebsd.tar.gz) = 2b103752fb6be013680718a19109d437a0ab81a454c668d6cd7732b30675c314 +SIZE (rust/2019-05-14/cargo-0.35.0-armv6-unknown-freebsd.tar.gz) = 5660964 +SHA256 (rust/2019-05-14/rustc-1.34.0-armv7-unknown-freebsd.tar.gz) = 0301ae64e4fd8662b421348b73d99608876e1f6f5deaa0a616d26bb882fef8b3 +SIZE (rust/2019-05-14/rustc-1.34.0-armv7-unknown-freebsd.tar.gz) = 60346931 +SHA256 (rust/2019-05-14/rust-std-1.34.0-armv7-unknown-freebsd.tar.gz) = a7f7297b6bb985eb04ffe4df647fe6da9d011f757a7d2149c6a6b2e79a16c6f8 +SIZE (rust/2019-05-14/rust-std-1.34.0-armv7-unknown-freebsd.tar.gz) = 69721929 +SHA256 (rust/2019-05-14/cargo-0.35.0-armv7-unknown-freebsd.tar.gz) = 56bb29fc514193028b2647aaa4c6b9c0dc1f3c41d1aaef166c4f84bde9636a5e +SIZE (rust/2019-05-14/cargo-0.35.0-armv7-unknown-freebsd.tar.gz) = 4714518 +SHA256 (rust/2019-05-14/rustc-1.34.2-i686-unknown-freebsd.tar.gz) = e3e0d079d9503df31809e1ac5cd54747280b8369277a45e3115e5da2c311b8f2 +SIZE (rust/2019-05-14/rustc-1.34.2-i686-unknown-freebsd.tar.gz) = 70559585 +SHA256 (rust/2019-05-14/rust-std-1.34.2-i686-unknown-freebsd.tar.gz) = bd21daff1729105860594a8e9bd869175e6b20c2a79d0d4799c4c364108bc2b1 +SIZE (rust/2019-05-14/rust-std-1.34.2-i686-unknown-freebsd.tar.gz) = 70611007 +SHA256 (rust/2019-05-14/cargo-0.35.0-i686-unknown-freebsd.tar.gz) = 6fade11a0058b5d515808dc1094433aef2cd7c6bfdf220f491b47aa3911d1261 +SIZE (rust/2019-05-14/cargo-0.35.0-i686-unknown-freebsd.tar.gz) = 5894063 +SHA256 (rust/2019-05-14/rustc-1.34.0-powerpc64-unknown-freebsd.tar.gz) = 3ad25cf511292383d8abf7268330f5d8d0b1d3019bd88c532c67e7898acd754c +SIZE (rust/2019-05-14/rustc-1.34.0-powerpc64-unknown-freebsd.tar.gz) = 69066288 +SHA256 (rust/2019-05-14/rust-std-1.34.0-powerpc64-unknown-freebsd.tar.gz) = d14847c3aeb3bc85727b5178bb5b3bbedddec15020c19174d2f08fa97fbe9720 +SIZE (rust/2019-05-14/rust-std-1.34.0-powerpc64-unknown-freebsd.tar.gz) = 72555046 +SHA256 (rust/2019-05-14/cargo-0.35.0-powerpc64-unknown-freebsd.tar.gz) = fd547c834fd8fba61513e5e4741428dac85b129ae49939fe774b45d3e38a9863 +SIZE (rust/2019-05-14/cargo-0.35.0-powerpc64-unknown-freebsd.tar.gz) = 6676349 Index: head/lang/rust/files/patch-src_bootstrap_bootstrap.py =================================================================== --- head/lang/rust/files/patch-src_bootstrap_bootstrap.py +++ head/lang/rust/files/patch-src_bootstrap_bootstrap.py @@ -1,13 +0,0 @@ ---- src/bootstrap/bootstrap.py.orig 2019-01-16 09:30:27 UTC -+++ src/bootstrap/bootstrap.py -@@ -269,6 +273,10 @@ def default_build_triple(): - cputype = 'arm' - if ostype == 'linux-android': - ostype = 'linux-androideabi' -+ elif ostype == 'unknown-freebsd': -+ cputype = subprocess.check_output( -+ ['uname', '-p']).strip().decode(default_encoding) -+ ostype = 'unknown-freebsd' - elif cputype == 'armv6l': - cputype = 'arm' - if ostype == 'linux-android': Index: head/lang/rust/files/patch-src_bootstrap_native.rs =================================================================== --- head/lang/rust/files/patch-src_bootstrap_native.rs +++ head/lang/rust/files/patch-src_bootstrap_native.rs @@ -1,7 +1,29 @@ ---- src/bootstrap/native.rs.orig 2019-04-08 12:42:31 UTC +Avoid unnecessarily restarting the LLVM build and installing it +into STAGEDIR during the install phase. + +--- src/bootstrap/native.rs.orig 2019-05-22 05:39:52 UTC +++ src/bootstrap/native.rs -@@ -209,6 +209,10 @@ impl Step for Llvm { +@@ -92,17 +92,9 @@ impl Step for Llvm { + .join(exe("llvm-config", &*builder.config.build)); + let done_stamp = out_dir.join("llvm-finished-building"); + +- if let Some(llvm_commit) = llvm_info.sha() { + if done_stamp.exists() { +- let done_contents = t!(fs::read(&done_stamp)); +- +- // If LLVM was already built previously and the submodule's commit didn't change +- // from the previous build, then no action is required. +- if done_contents == llvm_commit.as_bytes() { +- return build_llvm_config +- } ++ return build_llvm_config } +- } + + let _folder = builder.fold_output(|| "llvm"); + let descriptor = if emscripten { "Emscripten " } else { "" }; +@@ -218,6 +210,10 @@ impl Step for Llvm { + } } + if target == "powerpc64-unknown-freebsd" { @@ -11,3 +33,14 @@ // http://llvm.org/docs/HowToCrossCompileLLVM.html if target != builder.config.build && !emscripten { builder.ensure(Llvm { +@@ -283,9 +279,7 @@ impl Step for Llvm { + + cfg.build(); + +- if let Some(llvm_commit) = llvm_info.sha() { +- t!(fs::write(&done_stamp, llvm_commit)); +- } ++ t!(fs::write(&done_stamp, "done building LLVM")); + + build_llvm_config + } Index: head/lang/rust/files/patch-src_librustc__target_spec_armv6__unknown__freebsd.rs =================================================================== --- head/lang/rust/files/patch-src_librustc__target_spec_armv6__unknown__freebsd.rs +++ head/lang/rust/files/patch-src_librustc__target_spec_armv6__unknown__freebsd.rs @@ -1,27 +0,0 @@ ---- src/librustc_target/spec/armv6_unknown_freebsd.rs.orig 2019-04-08 21:09:22 UTC -+++ src/librustc_target/spec/armv6_unknown_freebsd.rs -@@ -0,0 +1,24 @@ -+use crate::spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; -+ -+pub fn target() -> TargetResult { -+ let base = super::freebsd_base::opts(); -+ Ok(Target { -+ llvm_target: "armv6-unknown-freebsd-gnueabihf".to_string(), -+ target_endian: "little".to_string(), -+ target_pointer_width: "32".to_string(), -+ target_c_int_width: "32".to_string(), -+ data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(), -+ arch: "arm".to_string(), -+ target_os: "freebsd".to_string(), -+ target_env: "gnueabihf".to_string(), -+ target_vendor: "unknown".to_string(), -+ linker_flavor: LinkerFlavor::Gcc, -+ -+ options: TargetOptions { -+ features: "+v6,+vfp2".to_string(), -+ max_atomic_width: Some(64), -+ abi_blacklist: super::arm_base::abi_blacklist(), -+ .. base -+ } -+ }) -+} Index: head/lang/rust/files/patch-src_librustc__target_spec_armv7__unknown__freebsd.rs =================================================================== --- head/lang/rust/files/patch-src_librustc__target_spec_armv7__unknown__freebsd.rs +++ head/lang/rust/files/patch-src_librustc__target_spec_armv7__unknown__freebsd.rs @@ -1,27 +0,0 @@ ---- src/librustc_target/spec/armv7_unknown_freebsd.rs.orig 2019-04-08 21:09:22 UTC -+++ src/librustc_target/spec/armv7_unknown_freebsd.rs -@@ -0,0 +1,24 @@ -+use crate::spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; -+ -+pub fn target() -> TargetResult { -+ let base = super::freebsd_base::opts(); -+ Ok(Target { -+ llvm_target: "armv7-unknown-freebsd-gnueabihf".to_string(), -+ target_endian: "little".to_string(), -+ target_pointer_width: "32".to_string(), -+ target_c_int_width: "32".to_string(), -+ data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(), -+ arch: "arm".to_string(), -+ target_os: "freebsd".to_string(), -+ target_env: "gnueabihf".to_string(), -+ target_vendor: "unknown".to_string(), -+ linker_flavor: LinkerFlavor::Gcc, -+ -+ options: TargetOptions { -+ features: "+v7,+vfp3,+d16,+thumb2,-neon".to_string(), -+ max_atomic_width: Some(64), -+ abi_blacklist: super::arm_base::abi_blacklist(), -+ .. base -+ } -+ }) -+} Index: head/lang/rust/files/patch-src_librustc__target_spec_mod.rs =================================================================== --- head/lang/rust/files/patch-src_librustc__target_spec_mod.rs +++ head/lang/rust/files/patch-src_librustc__target_spec_mod.rs @@ -1,11 +0,0 @@ ---- src/librustc_target/spec/mod.rs.orig 2019-04-08 12:42:31 UTC -+++ src/librustc_target/spec/mod.rs -@@ -376,6 +376,8 @@ supported_targets! { - ("aarch64-linux-android", aarch64_linux_android), - - ("aarch64-unknown-freebsd", aarch64_unknown_freebsd), -+ ("armv6-unknown-freebsd", armv6_unknown_freebsd), -+ ("armv7-unknown-freebsd", armv7_unknown_freebsd), - ("i686-unknown-freebsd", i686_unknown_freebsd), - ("powerpc64-unknown-freebsd", powerpc64_unknown_freebsd), - ("x86_64-unknown-freebsd", x86_64_unknown_freebsd), Index: head/lang/rust/files/patch-src_libstd_sys_unix_stack__overflow.rs =================================================================== --- head/lang/rust/files/patch-src_libstd_sys_unix_stack__overflow.rs +++ head/lang/rust/files/patch-src_libstd_sys_unix_stack__overflow.rs @@ -1,20 +0,0 @@ ---- src/libstd/sys/unix/stack_overflow.rs.orig 2019-04-08 12:42:31 UTC -+++ src/libstd/sys/unix/stack_overflow.rs -@@ -141,6 +141,7 @@ mod imp { - #[cfg(any(target_os = "linux", - target_os = "macos", - target_os = "bitrig", -+ target_os = "freebsd", - target_os = "netbsd", - target_os = "openbsd", - target_os = "solaris"))] -@@ -148,8 +149,7 @@ mod imp { - libc::stack_t { ss_sp: get_stackp(), ss_flags: 0, ss_size: SIGSTKSZ } - } - -- #[cfg(any(target_os = "freebsd", -- target_os = "dragonfly"))] -+ #[cfg(target_os = "dragonfly")] - unsafe fn get_stack() -> libc::stack_t { - libc::stack_t { ss_sp: get_stackp() as *mut i8, ss_flags: 0, ss_size: SIGSTKSZ } - } Index: head/lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_aarch64.rs =================================================================== --- head/lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_aarch64.rs +++ head/lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_aarch64.rs @@ -1,24 +0,0 @@ -error: `[7:4]` cannot be resolved, ignoring it... - --> src/libstd/../stdsimd/stdsimd/arch/detect/os/aarch64.rs:9:27 - | -9 | //! when ID_AA64ISAR0_EL1[7:4] is >= 1, AES is supported; when it's >= 2, PMULL is supported. - | ^^^ cannot be resolved, ignoring - | -note: lint level defined here - --> src/libstd/lib.rs:215:9 - | -21| #![deny(intra_doc_link_resolution_failure)] - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - = help: to escape `[` and `]` characters, just add '\' before them like `\[` or `\]` - ---- src/stdsimd/crates/std_detect/src/detect/os/aarch64.rs.orig 2019-04-08 12:42:49 UTC -+++ src/stdsimd/crates/std_detect/src/detect/os/aarch64.rs -@@ -6,7 +6,7 @@ - //! AArch64 system registers ID_AA64ISAR0_EL1, ID_AA64PFR0_EL1, ID_AA64ISAR1_EL1 - //! have bits dedicated to features like AdvSIMD, CRC32, AES, atomics (LSE), etc. - //! Each part of the register indicates the level of support for a certain feature, e.g. --//! when ID_AA64ISAR0_EL1[7:4] is >= 1, AES is supported; when it's >= 2, PMULL is supported. -+//! when ID_AA64ISAR0_EL1\[7:4\] is >= 1, AES is supported; when it's >= 2, PMULL is supported. - //! - //! For proper support of [SoCs where different cores have different capabilities](https://medium.com/@jadr2ddude/a-big-little-problem-a-tale-of-big-little-gone-wrong-e7778ce744bb), - //! the OS has to always report only the features supported by all cores, like [FreeBSD does](https://reviews.freebsd.org/D17137#393947). Index: head/lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_freebsd_auxvec.rs =================================================================== --- head/lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_freebsd_auxvec.rs +++ head/lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_freebsd_auxvec.rs @@ -45,7 +45,7 @@ + +/// Tries to read the `key` from the auxiliary vector. +fn archauxv(key: usize) -> Result { -+ use mem; ++ use crate::mem; + + #[derive (Copy, Clone)] + #[repr(C)] Index: head/lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_freebsd_mod.rs =================================================================== --- head/lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_freebsd_mod.rs +++ head/lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_freebsd_mod.rs @@ -1,4 +1,4 @@ ---- src/stdsimd/crates/std_detect/src/detect/os/freebsd/mod.rs.orig 2019-04-24 21:07:30 UTC +--- src/stdsimd/crates/std_detect/src/detect/os/freebsd/mod.rs.orig 2019-05-20 12:10:32 UTC +++ src/stdsimd/crates/std_detect/src/detect/os/freebsd/mod.rs @@ -1,9 +1,17 @@ //! Run-time feature detection on FreeBSD @@ -16,5 +16,5 @@ + mod powerpc; + pub use self::powerpc::check_for; } else { - use arch::detect::Feature; + use crate::arch::detect::Feature; /// Performs run-time feature detection. Index: head/lang/rust/files/patch-vendor_compiler__builtins_build.rs =================================================================== --- head/lang/rust/files/patch-vendor_compiler__builtins_build.rs +++ head/lang/rust/files/patch-vendor_compiler__builtins_build.rs @@ -1,13 +0,0 @@ ---- vendor/compiler_builtins/build.rs.orig 2019-04-08 14:18:23 UTC -+++ vendor/compiler_builtins/build.rs -@@ -311,6 +311,10 @@ mod c { - ], - ); - -+ if target_os == "freebsd" { -+ sources.extend(&["clear_cache.c"]); -+ } -+ - // First of all aeabi_cdcmp and aeabi_cfcmp are never called by LLVM. - // Second are little-endian only, so build fail on big-endian targets. - // Temporally workaround: exclude these files for big-endian targets. Index: head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_dragonfly_mod.rs =================================================================== --- head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_dragonfly_mod.rs +++ head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_dragonfly_mod.rs @@ -1,7 +0,0 @@ ---- vendor/libc/src/unix/bsd/freebsdlike/dragonfly/mod.rs.orig 2018-06-19 05:52:22 UTC -+++ vendor/libc/src/unix/bsd/freebsdlike/dragonfly/mod.rs -@@ -1,3 +1,4 @@ -+pub type c_char = i8; - pub type clock_t = u64; - pub type ino_t = u64; - pub type lwpid_t = i32; Index: head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_aarch64.rs =================================================================== --- head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_aarch64.rs +++ head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_aarch64.rs @@ -1,7 +0,0 @@ ---- vendor/libc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs.orig 2018-06-19 05:52:22 UTC -+++ vendor/libc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs -@@ -1,3 +1,4 @@ -+pub type c_char = u8; - pub type c_long = i64; - pub type c_ulong = u64; - pub type time_t = i64; Index: head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_arm.rs =================================================================== --- head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_arm.rs +++ head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_arm.rs @@ -1,40 +0,0 @@ ---- vendor/libc/src/unix/bsd/freebsdlike/freebsd/arm.rs.orig 2019-02-15 13:41:07 UTC -+++ vendor/libc/src/unix/bsd/freebsdlike/freebsd/arm.rs -@@ -0,0 +1,37 @@ -+pub type c_char = u8; -+pub type c_long = i32; -+pub type c_ulong = u32; -+pub type time_t = i64; -+pub type suseconds_t = i32; -+ -+s! { -+ pub struct stat { -+ pub st_dev: ::dev_t, -+ pub st_ino: ::ino_t, -+ pub st_mode: ::mode_t, -+ pub st_nlink: ::nlink_t, -+ pub st_uid: ::uid_t, -+ pub st_gid: ::gid_t, -+ pub st_rdev: ::dev_t, -+ pub st_atime: ::time_t, -+ pub st_atime_nsec: ::c_long, -+ pub st_atime_pad: ::c_long, -+ pub st_mtime: ::time_t, -+ pub st_mtime_nsec: ::c_long, -+ pub st_mtime_pad: ::c_long, -+ pub st_ctime: ::time_t, -+ pub st_ctime_nsec: ::c_long, -+ pub st_ctime_pad: ::c_long, -+ pub st_size: ::off_t, -+ pub st_blocks: ::blkcnt_t, -+ pub st_blksize: ::blksize_t, -+ pub st_flags: ::fflags_t, -+ pub st_gen: ::uint32_t, -+ pub st_lspare: ::int32_t, -+ pub st_birthtime: ::time_t, -+ pub st_birthtime_nsec: ::c_long, -+ pub st_birthtime_pad: ::c_long, -+ } -+} -+ -+pub const MAP_32BIT: ::c_int = 0x00080000; Index: head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_mod.rs =================================================================== --- head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_mod.rs +++ head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_mod.rs @@ -1,15 +0,0 @@ ---- vendor/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig 2019-04-08 14:18:24 UTC -+++ vendor/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs -@@ -1155,6 +1155,12 @@ cfg_if! { - } else if #[cfg(target_arch = "aarch64")] { - mod aarch64; - pub use self::aarch64::*; -+ } else if #[cfg(target_arch = "arm")] { -+ mod arm; -+ pub use self::arm::*; -+ } else if #[cfg(target_arch = "powerpc64")] { -+ mod powerpc64; -+ pub use self::powerpc64::*; - } else { - // Unknown target_arch - } Index: head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_powerpc64.rs =================================================================== --- head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_powerpc64.rs +++ head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_powerpc64.rs @@ -1,34 +0,0 @@ ---- vendor/libc/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs.orig 2019-02-15 13:41:07 UTC -+++ vendor/libc/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs -@@ -0,0 +1,31 @@ -+pub type c_char = u8; -+pub type c_long = i64; -+pub type c_ulong = u64; -+pub type time_t = i64; -+pub type suseconds_t = i64; -+ -+s! { -+ pub struct stat { -+ pub st_dev: ::dev_t, -+ pub st_ino: ::ino_t, -+ pub st_mode: ::mode_t, -+ pub st_nlink: ::nlink_t, -+ pub st_uid: ::uid_t, -+ pub st_gid: ::gid_t, -+ pub st_rdev: ::dev_t, -+ pub st_atime: ::time_t, -+ pub st_atime_nsec: ::c_long, -+ pub st_mtime: ::time_t, -+ pub st_mtime_nsec: ::c_long, -+ pub st_ctime: ::time_t, -+ pub st_ctime_nsec: ::c_long, -+ pub st_size: ::off_t, -+ pub st_blocks: ::blkcnt_t, -+ pub st_blksize: ::blksize_t, -+ pub st_flags: ::fflags_t, -+ pub st_gen: ::uint32_t, -+ pub st_lspare: ::int32_t, -+ pub st_birthtime: ::time_t, -+ pub st_birthtime_nsec: ::c_long, -+ } -+} Index: head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86.rs =================================================================== --- head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86.rs +++ head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86.rs @@ -1,7 +0,0 @@ ---- vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86.rs.orig 2018-06-19 05:52:22 UTC -+++ vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86.rs -@@ -1,3 +1,4 @@ -+pub type c_char = i8; - pub type c_long = i32; - pub type c_ulong = u32; - pub type time_t = i32; Index: head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86__64.rs =================================================================== --- head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86__64.rs +++ head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86__64.rs @@ -1,7 +0,0 @@ ---- vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs.orig 2018-06-19 05:52:22 UTC -+++ vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs -@@ -1,3 +1,4 @@ -+pub type c_char = i8; - pub type c_long = i64; - pub type c_ulong = u64; - pub type time_t = i64; Index: head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_mod.rs =================================================================== --- head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_mod.rs +++ head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_mod.rs @@ -1,17 +0,0 @@ ---- vendor/libc/src/unix/bsd/freebsdlike/mod.rs.orig 2019-01-16 11:06:08 UTC -+++ vendor/libc/src/unix/bsd/freebsdlike/mod.rs -@@ -1,4 +1,3 @@ --pub type c_char = i8; - pub type dev_t = u32; - pub type mode_t = u16; - pub type pthread_attr_t = *mut ::c_void; -@@ -83,8 +82,7 @@ s! { - } - - pub struct stack_t { -- // In FreeBSD 11 and later, ss_sp is actually a void* -- pub ss_sp: *mut ::c_char, -+ pub ss_sp: *mut ::c_void, - pub ss_size: ::size_t, - pub ss_flags: ::c_int, - } Index: head/lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_armv6__unknown__freebsd.rs =================================================================== --- head/lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_armv6__unknown__freebsd.rs +++ head/lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_armv6__unknown__freebsd.rs @@ -1,27 +0,0 @@ ---- vendor/rustc-ap-rustc_target/spec/armv6_unknown_freebsd.rs.orig 2019-02-15 13:41:07 UTC -+++ vendor/rustc-ap-rustc_target/spec/armv6_unknown_freebsd.rs -@@ -0,0 +1,24 @@ -+use crate::spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; -+ -+pub fn target() -> TargetResult { -+ let base = super::freebsd_base::opts(); -+ Ok(Target { -+ llvm_target: "armv6-unknown-freebsd-gnueabihf".to_string(), -+ target_endian: "little".to_string(), -+ target_pointer_width: "32".to_string(), -+ target_c_int_width: "32".to_string(), -+ data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(), -+ arch: "arm".to_string(), -+ target_os: "freebsd".to_string(), -+ target_env: "gnueabihf".to_string(), -+ target_vendor: "unknown".to_string(), -+ linker_flavor: LinkerFlavor::Gcc, -+ -+ options: TargetOptions { -+ features: "+v6,+vfp2".to_string(), -+ max_atomic_width: Some(64), -+ abi_blacklist: super::arm_base::abi_blacklist(), -+ .. base -+ } -+ }) -+} Index: head/lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_armv7__unknown__freebsd.rs =================================================================== --- head/lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_armv7__unknown__freebsd.rs +++ head/lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_armv7__unknown__freebsd.rs @@ -1,27 +0,0 @@ ---- vendor/rustc-ap-rustc_target/spec/armv7_unknown_freebsd.rs.orig 2019-02-15 13:41:07 UTC -+++ vendor/rustc-ap-rustc_target/spec/armv7_unknown_freebsd.rs -@@ -0,0 +1,24 @@ -+use crate::spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; -+ -+pub fn target() -> TargetResult { -+ let base = super::freebsd_base::opts(); -+ Ok(Target { -+ llvm_target: "armv7-unknown-freebsd-gnueabihf".to_string(), -+ target_endian: "little".to_string(), -+ target_pointer_width: "32".to_string(), -+ target_c_int_width: "32".to_string(), -+ data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(), -+ arch: "arm".to_string(), -+ target_os: "freebsd".to_string(), -+ target_env: "gnueabihf".to_string(), -+ target_vendor: "unknown".to_string(), -+ linker_flavor: LinkerFlavor::Gcc, -+ -+ options: TargetOptions { -+ features: "+v7,+vfp3,+d16,+thumb2,-neon".to_string(), -+ max_atomic_width: Some(64), -+ abi_blacklist: super::arm_base::abi_blacklist(), -+ .. base -+ } -+ }) -+} Index: head/lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_mod.rs =================================================================== --- head/lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_mod.rs +++ head/lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_mod.rs @@ -1,11 +0,0 @@ ---- vendor/rustc-ap-rustc_target/spec/mod.rs.orig 2019-04-08 14:18:26 UTC -+++ vendor/rustc-ap-rustc_target/spec/mod.rs -@@ -368,6 +368,8 @@ supported_targets! { - ("aarch64-linux-android", aarch64_linux_android), - - ("aarch64-unknown-freebsd", aarch64_unknown_freebsd), -+ ("armv6-unknown-freebsd", armv6_unknown_freebsd), -+ ("armv7-unknown-freebsd", armv7_unknown_freebsd), - ("i686-unknown-freebsd", i686_unknown_freebsd), - ("powerpc64-unknown-freebsd", powerpc64_unknown_freebsd), - ("x86_64-unknown-freebsd", x86_64_unknown_freebsd), Index: head/mail/thunderbird/Makefile =================================================================== --- head/mail/thunderbird/Makefile +++ head/mail/thunderbird/Makefile @@ -3,6 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 60.7.0 +PORTREVISION= 1 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source Index: head/multimedia/rav1e/Makefile =================================================================== --- head/multimedia/rav1e/Makefile +++ head/multimedia/rav1e/Makefile @@ -2,6 +2,7 @@ PORTNAME= rav1e PORTVERSION= s20190522 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org Index: head/net-im/fractal/Makefile =================================================================== --- head/net-im/fractal/Makefile +++ head/net-im/fractal/Makefile @@ -2,7 +2,7 @@ PORTNAME= fractal DISTVERSION= 4.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im MASTER_SITES= https://gitlab.gnome.org/World/fractal/uploads/${GL_HASH}/ Index: head/net/boringtun/Makefile =================================================================== --- head/net/boringtun/Makefile +++ head/net/boringtun/Makefile @@ -3,7 +3,7 @@ PORTNAME= boringtun DISTVERSIONPREFIX= v DISTVERSION= 0.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ Index: head/net/rabbiteer/Makefile =================================================================== --- head/net/rabbiteer/Makefile +++ head/net/rabbiteer/Makefile @@ -2,7 +2,7 @@ PORTNAME= rabbiteer DISTVERSION= 1.4.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net MAINTAINER= dch@FreeBSD.org Index: head/net/routinator/Makefile =================================================================== --- head/net/routinator/Makefile +++ head/net/routinator/Makefile @@ -3,7 +3,7 @@ PORTNAME= routinator PORTVERSION= 0.3.3 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MAINTAINER= jaap@NLnetLabs.nl Index: head/security/cargo-audit/Makefile =================================================================== --- head/security/cargo-audit/Makefile +++ head/security/cargo-audit/Makefile @@ -3,7 +3,7 @@ PORTNAME= cargo-audit DISTVERSIONPREFIX= v DISTVERSION= 0.6.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= security MAINTAINER= tobik@FreeBSD.org Index: head/security/kr/Makefile =================================================================== --- head/security/kr/Makefile +++ head/security/kr/Makefile @@ -3,7 +3,7 @@ PORTNAME= kr PORTVERSION= 2.3.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= security MAINTAINER= feld@FreeBSD.org Index: head/security/suricata/Makefile =================================================================== --- head/security/suricata/Makefile +++ head/security/suricata/Makefile @@ -3,7 +3,7 @@ PORTNAME= suricata DISTVERSION= 4.1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= https://www.openinfosecfoundation.org/download/ Index: head/shells/ion/Makefile =================================================================== --- head/shells/ion/Makefile +++ head/shells/ion/Makefile @@ -2,7 +2,7 @@ PORTNAME= ion DISTVERSION= 1.0.5-900 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= shells PKGNAMESUFFIX= -shell Index: head/sysutils/exa/Makefile =================================================================== --- head/sysutils/exa/Makefile +++ head/sysutils/exa/Makefile @@ -3,7 +3,7 @@ PORTNAME= exa DISTVERSIONPREFIX= v DISTVERSION= 0.8.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= sysutils MAINTAINER= tobik@FreeBSD.org Index: head/sysutils/fd/Makefile =================================================================== --- head/sysutils/fd/Makefile +++ head/sysutils/fd/Makefile @@ -4,7 +4,7 @@ PORTNAME= fd DISTVERSIONPREFIX= v DISTVERSION= 7.3.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils PKGNAMESUFFIX= -find Index: head/sysutils/flowgger/Makefile =================================================================== --- head/sysutils/flowgger/Makefile +++ head/sysutils/flowgger/Makefile @@ -3,7 +3,7 @@ PORTNAME= flowgger DISTVERSION= 0.2.6-28 DISTVERSIONSUFFIX= -gab572a0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= sysutils MAINTAINER= ports@FreeBSD.org Index: head/sysutils/fusefs-sandboxfs/Makefile =================================================================== --- head/sysutils/fusefs-sandboxfs/Makefile +++ head/sysutils/fusefs-sandboxfs/Makefile @@ -3,7 +3,7 @@ PORTNAME= sandboxfs DISTVERSIONPREFIX= sandboxfs- DISTVERSION= 0.1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils PKGNAMEPREFIX= fusefs- Index: head/sysutils/hexyl/Makefile =================================================================== --- head/sysutils/hexyl/Makefile +++ head/sysutils/hexyl/Makefile @@ -3,7 +3,7 @@ PORTNAME= hexyl DISTVERSIONPREFIX= v DISTVERSION= 0.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= tobik@FreeBSD.org Index: head/sysutils/potnet/Makefile =================================================================== --- head/sysutils/potnet/Makefile +++ head/sysutils/potnet/Makefile @@ -2,7 +2,7 @@ PORTNAME= potnet DISTVERSION= 0.1.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MAINTAINER= pizzamig@FreeBSD.org Index: head/textproc/bat/Makefile =================================================================== --- head/textproc/bat/Makefile +++ head/textproc/bat/Makefile @@ -3,7 +3,7 @@ PORTNAME= bat DISTVERSIONPREFIX= v DISTVERSION= 0.10.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= textproc MAINTAINER= pizzamig@FreeBSD.org Index: head/textproc/ripgrep/Makefile =================================================================== --- head/textproc/ripgrep/Makefile +++ head/textproc/ripgrep/Makefile @@ -5,7 +5,7 @@ PORTNAME= ripgrep DISTVERSION= 11.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MAINTAINER= petteri.valkonen@iki.fi Index: head/textproc/sd/Makefile =================================================================== --- head/textproc/sd/Makefile +++ head/textproc/sd/Makefile @@ -3,7 +3,7 @@ PORTNAME= sd DISTVERSIONPREFIX= sd- DISTVERSION= 0.5.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= textproc MAINTAINER= tobik@FreeBSD.org Index: head/textproc/sonic/Makefile =================================================================== --- head/textproc/sonic/Makefile +++ head/textproc/sonic/Makefile @@ -3,7 +3,7 @@ PORTNAME= sonic DISTVERSIONPREFIX= v DISTVERSION= 1.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MAINTAINER= tobik@FreeBSD.org Index: head/textproc/xsv-rs/Makefile =================================================================== --- head/textproc/xsv-rs/Makefile +++ head/textproc/xsv-rs/Makefile @@ -2,7 +2,7 @@ PORTNAME= xsv DISTVERSION= 0.13.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= textproc PKGNAMESUFFIX= -rs Index: head/www/cliqz/Makefile =================================================================== --- head/www/cliqz/Makefile +++ head/www/cliqz/Makefile @@ -2,6 +2,7 @@ PORTNAME= cliqz DISTVERSION= 1.26.5 +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: head/www/ffsend/Makefile =================================================================== --- head/www/ffsend/Makefile +++ head/www/ffsend/Makefile @@ -3,7 +3,7 @@ PORTNAME= ffsend DISTVERSIONPREFIX= v DISTVERSION= 0.2.45 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MAINTAINER= 0mp@FreeBSD.org Index: head/www/firefox-esr/Makefile =================================================================== --- head/www/firefox-esr/Makefile +++ head/www/firefox-esr/Makefile @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 60.7.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ Index: head/www/firefox/Makefile =================================================================== --- head/www/firefox/Makefile +++ head/www/firefox/Makefile @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 67.0 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Index: head/www/geckodriver/Makefile =================================================================== --- head/www/geckodriver/Makefile +++ head/www/geckodriver/Makefile @@ -3,7 +3,7 @@ PORTNAME= geckodriver DISTVERSIONPREFIX= v DISTVERSION= 0.23.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= www MAINTAINER= daniel@blodan.se Index: head/www/miniserve/Makefile =================================================================== --- head/www/miniserve/Makefile +++ head/www/miniserve/Makefile @@ -3,7 +3,7 @@ PORTNAME= miniserve DISTVERSIONPREFIX= v DISTVERSION= 0.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MAINTAINER= tobik@FreeBSD.org Index: head/www/newsboat/Makefile =================================================================== --- head/www/newsboat/Makefile +++ head/www/newsboat/Makefile @@ -3,7 +3,7 @@ PORTNAME= newsboat PORTVERSION= 2.15 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= https://newsboat.org/releases/${PORTVERSION}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Index: head/www/seamonkey/Makefile =================================================================== --- head/www/seamonkey/Makefile +++ head/www/seamonkey/Makefile @@ -3,7 +3,7 @@ PORTNAME= seamonkey DISTVERSION= 2.49.4 -PORTREVISION= 26 +PORTREVISION= 27 MOZILLA_VER= 52 # above + 3 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Index: head/www/websocat/Makefile =================================================================== --- head/www/websocat/Makefile +++ head/www/websocat/Makefile @@ -4,7 +4,7 @@ PORTNAME= websocat DISTVERSIONPREFIX= v DISTVERSION= 1.4.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MAINTAINER= osa@FreeBSD.org Index: head/x11/admiral/Makefile =================================================================== --- head/x11/admiral/Makefile +++ head/x11/admiral/Makefile @@ -4,7 +4,7 @@ DISTVERSIONPREFIX= v DISTVERSION= 1.0.0-7 DISTVERSIONSUFFIX= -g5a9f33b -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= x11 MAINTAINER= rigoletto@FreeBSD.org Index: head/x11/alacritty/Makefile =================================================================== --- head/x11/alacritty/Makefile +++ head/x11/alacritty/Makefile @@ -3,7 +3,7 @@ PORTNAME= alacritty PORTVERSION= 0.3.2 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MAINTAINER= tobik@FreeBSD.org