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.41.0:lang/${RUST_DEFAULT} +BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.41.1:lang/${RUST_DEFAULT} .endif # Location of cargo binary (default to lang/rust's Cargo binary) Index: head/audio/ncspot/Makefile =================================================================== --- head/audio/ncspot/Makefile +++ head/audio/ncspot/Makefile @@ -2,6 +2,7 @@ PORTNAME= ncspot DISTVERSION= 0.1.2 +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= tobik@FreeBSD.org Index: head/audio/spotify-tui/Makefile =================================================================== --- head/audio/spotify-tui/Makefile +++ head/audio/spotify-tui/Makefile @@ -3,6 +3,7 @@ PORTNAME= spotify-tui DISTVERSIONPREFIX= v DISTVERSION= 0.14.0 +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= vulcan@wired.sh Index: head/audio/spotifyd/Makefile =================================================================== --- head/audio/spotifyd/Makefile +++ head/audio/spotifyd/Makefile @@ -3,7 +3,7 @@ PORTNAME= spotifyd DISTVERSIONPREFIX= v DISTVERSION= 0.2.24 -PORTREVISION= 1 +PORTREVISION= 2 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.9.0 -PORTREVISION= 2 +PORTREVISION= 3 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.8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= CRATESIO DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Index: head/devel/cargo-c/Makefile =================================================================== --- head/devel/cargo-c/Makefile +++ head/devel/cargo-c/Makefile @@ -2,6 +2,7 @@ PORTNAME= cargo-c DISTVERSION= 0.5.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= CRATESIO # XXX Teach USES=cargo to have proper default Index: head/devel/cargo-tree/Makefile =================================================================== --- head/devel/cargo-tree/Makefile +++ head/devel/cargo-tree/Makefile @@ -2,7 +2,7 @@ PORTNAME= cargo-tree DISTVERSION= 0.28.0 -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.5.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= greg@unrelenting.technology Index: head/devel/git-delta/Makefile =================================================================== --- head/devel/git-delta/Makefile +++ head/devel/git-delta/Makefile @@ -2,6 +2,7 @@ PORTNAME= delta DISTVERSION= 0.0.16 +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= git- Index: head/devel/interactive_rebase_tool/Makefile =================================================================== --- head/devel/interactive_rebase_tool/Makefile +++ head/devel/interactive_rebase_tool/Makefile @@ -2,6 +2,7 @@ PORTNAME= interactive_rebase_tool DISTVERSION= 1.2.1 +PORTREVISION= 1 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= 10 +PORTREVISION= 11 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 @@ -3,7 +3,7 @@ PORTNAME= racer DISTVERSION= 2.1.29 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= CRATESIO DISTFILES= ${CARGO_DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} Index: head/devel/rust-bindgen/Makefile =================================================================== --- head/devel/rust-bindgen/Makefile +++ head/devel/rust-bindgen/Makefile @@ -2,6 +2,7 @@ PORTNAME= bindgen DISTVERSION= 0.53.1 +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,6 +2,7 @@ PORTNAME= cbindgen DISTVERSION= 0.13.1 +PORTREVISION= 1 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.12 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= devel Index: head/devel/tokei/Makefile =================================================================== --- head/devel/tokei/Makefile +++ head/devel/tokei/Makefile @@ -3,6 +3,7 @@ PORTNAME= tokei DISTVERSIONPREFIX= v DISTVERSION= 10.1.2 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= tobik@FreeBSD.org Index: head/dns/doh-proxy/Makefile =================================================================== --- head/dns/doh-proxy/Makefile +++ head/dns/doh-proxy/Makefile @@ -3,7 +3,7 @@ PORTNAME= doh-proxy DISTVERSION= 0.2.1 -PORTREVISION= 1 +PORTREVISION= 2 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.1 -PORTREVISION= 6 +PORTREVISION= 7 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.4.2 -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 @@ -3,6 +3,7 @@ PORTNAME= xi-core DISTVERSIONPREFIX= v DISTVERSION= 0.3.0 +PORTREVISION= 1 #PORTREVISION= 0 CATEGORIES= editors 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= 8 +PORTREVISION= 9 CATEGORIES= editors MAINTAINER= ed.arrakis@gmail.com Index: head/games/dose-response/Makefile =================================================================== --- head/games/dose-response/Makefile +++ head/games/dose-response/Makefile @@ -3,7 +3,7 @@ PORTNAME= dose-response DISTVERSIONPREFIX= v DISTVERSION= 1.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MAINTAINER= greg@unrelenting.technology Index: head/games/genact/Makefile =================================================================== --- head/games/genact/Makefile +++ head/games/genact/Makefile @@ -2,7 +2,7 @@ PORTNAME= genact DISTVERSION= 0.7.0 -PORTREVISION= 8 +PORTREVISION= 9 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= 12 +PORTREVISION= 13 CATEGORIES= games MAINTAINER= tobik@FreeBSD.org Index: head/games/veloren/Makefile =================================================================== --- head/games/veloren/Makefile +++ head/games/veloren/Makefile @@ -3,6 +3,7 @@ PORTNAME= veloren DISTVERSIONPREFIX= v DISTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= https://veloren.net/icons/favicon/:icon \ LOCAL/jbeich:assets Index: head/graphics/librsvg2-rust/Makefile =================================================================== --- head/graphics/librsvg2-rust/Makefile +++ head/graphics/librsvg2-rust/Makefile @@ -3,7 +3,7 @@ PORTNAME= librsvg PORTVERSION= 2.46.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics gnome MASTER_SITES= GNOME PKGNAMESUFFIX= 2-rust Index: head/graphics/rx/Makefile =================================================================== --- head/graphics/rx/Makefile +++ head/graphics/rx/Makefile @@ -3,6 +3,7 @@ PORTNAME= rx DISTVERSIONPREFIX= v DISTVERSION= 0.4.0 +PORTREVISION= 1 CATEGORIES= graphics PKGNAMESUFFIX= -editor Index: head/graphics/svgbob/Makefile =================================================================== --- head/graphics/svgbob/Makefile +++ head/graphics/svgbob/Makefile @@ -2,7 +2,7 @@ PORTNAME= svgbob DISTVERSION= g20190412 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MAINTAINER= tobik@FreeBSD.org Index: head/lang/rust-bootstrap/Makefile =================================================================== --- head/lang/rust-bootstrap/Makefile +++ head/lang/rust-bootstrap/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= rust -PORTVERSION= 1.41.0 +PORTVERSION= 1.41.1 CATEGORIES= lang MASTER_SITES= https://static.rust-lang.org/dist/:rust \ LOCAL/tobik:armbase \ Index: head/lang/rust-bootstrap/distinfo =================================================================== --- head/lang/rust-bootstrap/distinfo +++ head/lang/rust-bootstrap/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1580247906 -SHA256 (rust/rustc-1.41.0-src.tar.xz) = 38d6742e5c4c98a835de5d6e12a209e442fb3078a03b2c01bab6ea7afb25be6f -SIZE (rust/rustc-1.41.0-src.tar.xz) = 93763052 +TIMESTAMP = 1582654815 +SHA256 (rust/rustc-1.41.1-src.tar.xz) = ebac9861b43c7207af36e24402dfdc5463a4df4bdb015ccb2b165251c0fdcf7c +SIZE (rust/rustc-1.41.1-src.tar.xz) = 93754192 SHA256 (FreeBSD-11.3-RELEASE-arm64.tar.xz) = 0c1ee2bdbec3b6b404edef6858f38f5cdacd727abc53b1dee23910cab939d0c1 SIZE (FreeBSD-11.3-RELEASE-arm64.tar.xz) = 97990888 SHA256 (FreeBSD-11.3-RELEASE-amd64.tar.xz) = 4599023ac136325b86f2fddeec64c1624daa83657e40b00b2ef944c81463a4ff Index: head/lang/rust/Makefile =================================================================== --- head/lang/rust/Makefile +++ head/lang/rust/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rust -PORTVERSION?= 1.41.0 +PORTVERSION?= 1.41.1 PORTREVISION?= 0 CATEGORIES= lang MASTER_SITES= https://static.rust-lang.org/dist/:src \ @@ -44,10 +44,9 @@ CONFLICTS_INSTALL?= rust-nightly -PLIST_FILES= lib/rustlib/components \ - lib/rustlib/rust-installer-version +OPTIONS_DEFINE= DOCS GDB SOURCES WASM +OPTIONS_DEFAULT= SOURCES WASM -OPTIONS_DEFINE= DOCS GDB SOURCES WASM GDB_DESC= Install ports gdb (necessary for debugging rust programs) SOURCES_DESC= Install source files WASM_DESC= Build the WebAssembly target (wasm32-unknown-unknown) @@ -187,59 +186,30 @@ do-build: @cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} x.py build --config=config.toml \ - --jobs=${MAKE_JOBS_NUMBER} + ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} x.py build --jobs=${MAKE_JOBS_NUMBER} do-install: # 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} + x.py install --jobs=${MAKE_JOBS_NUMBER} +# We autogenerate the plist file. We do that, instead of the +# regular pkg-plist, because several libraries have a computed +# filename based on the absolute path of the source files. As it +# is user-specific, we cannot know their filename in advance. + @${RM} -r ${STAGEDIR}${DOCSDIR}/*.old \ + ${STAGEDIR}${DOCSDIR}/html/.lock \ + ${STAGEDIR}${DOCSDIR}/html/.stamp \ + ${STAGEDIR}${PREFIX}/lib/rustlib/install.log \ + ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-* \ + ${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh + @${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -exec ${FILE} -i {} + | \ + ${AWK} -F: '/executable|sharedlib/ { print $$1 }' | ${XARGS} ${STRIP_CMD} + @${FIND} ${STAGEDIR}${PREFIX} -not -type d | \ + ${SED} -E -e 's,^${STAGEDIR}${PREFIX}/,,' \ + -e 's,(share/man/man[1-9]/.*\.[0-9]),\1.gz,' >> ${TMPPLIST} -# In post-install, we use the manifests generated during Rust install -# to in turn generate the PLIST. We do that, instead of the regular -# `pkg-plist`, because several libraries have a computed filename based -# on the absolute path of the source files. As it is user-specific, we -# can't know their filename in advance. -# -# Both rustc and Cargo components install the same README.md and LICENSE -# files. The install process backs up the first copy to install the -# second. Thus here, we need to remove those backups. We also need to -# dedup the entries in the generated PLIST, because both components' -# manifests list them. -# -# We fix manpage entries in the generated manifests because Rust -# installs them uncompressed but the Ports framework compresses them. -post-install: - for f in ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-*; do \ - ${REINPLACE_CMD} -i '' -E \ - -e 's,:${STAGEDIR},:,' \ - -e 's,(share/man/man[1-9]/.*\.[0-9]),\1.gz,' \ - "$$f"; \ - ${ECHO_CMD} "$${f#${STAGEDIR}}" >> ${TMPPLIST}; \ - ${AWK} '\ - /^file:/ { \ - file=$$0; \ - sub(/^file:/, "", file); \ - print file; \ - } \ - /^dir:/ { \ - dir=$$0; \ - sub(/^dir:/, "", dir); \ - system("find ${STAGEDIR}" dir " -type f | ${SED} -E -e \"s,${STAGEDIR},,\""); \ - }' \ - "$$f" >> ${TMPPLIST}; \ - done - ${RM} -r ${STAGEDIR}${PREFIX}/share/doc/rust/*.old - ${SORT} -u < ${TMPPLIST} > ${TMPPLIST}.uniq - ${MV} ${TMPPLIST}.uniq ${TMPPLIST} - @${RM} \ - ${STAGEDIR}${PREFIX}/lib/rustlib/install.log \ - ${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh - @${FIND} ${STAGEDIR}${PREFIX}/bin -exec ${FILE} -i {} + | ${AWK} -F: \ - '/executable|sharedlib/ { print $$1 }' | ${XARGS} ${STRIP_CMD} - post-install-SOURCES-on: # Silence stage-qa warnings by sanitizing permissions on sources @${FIND} ${STAGEDIR}${PREFIX}/lib/rustlib/src -type f -exec ${CHMOD} \ @@ -248,8 +218,7 @@ # Note that make test does not work when rust is already installed. do-test: @cd ${WRKSRC} && \ - ${SETENV} ${TEST_ENV} ${PYTHON_CMD} x.py test --config=config.toml \ - --jobs=${MAKE_JOBS_NUMBER} + ${SETENV} ${TEST_ENV} ${PYTHON_CMD} x.py test --jobs=${MAKE_JOBS_NUMBER} .if !defined(_RUST_MAKESUM_GUARD) makesum: Index: head/lang/rust/distinfo =================================================================== --- head/lang/rust/distinfo +++ head/lang/rust/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1580240609 -SHA256 (rust/rustc-1.41.0-src.tar.xz) = 38d6742e5c4c98a835de5d6e12a209e442fb3078a03b2c01bab6ea7afb25be6f -SIZE (rust/rustc-1.41.0-src.tar.xz) = 93763052 +TIMESTAMP = 1582642993 +SHA256 (rust/rustc-1.41.1-src.tar.xz) = ebac9861b43c7207af36e24402dfdc5463a4df4bdb015ccb2b165251c0fdcf7c +SIZE (rust/rustc-1.41.1-src.tar.xz) = 93754192 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 Index: head/lang/rust/files/patch-vendor_backtrace-sys_build.rs =================================================================== --- head/lang/rust/files/patch-vendor_backtrace-sys_build.rs +++ head/lang/rust/files/patch-vendor_backtrace-sys_build.rs @@ -0,0 +1,17 @@ +https://github.com/rust-lang/backtrace-rs/pull/294 + +--- vendor/backtrace-sys/build.rs.orig 2020-02-19 21:11:31 UTC ++++ vendor/backtrace-sys/build.rs +@@ -60,6 +60,12 @@ fn main() { + File::create(out_dir.join("config.h")).unwrap(); + if target.contains("android") { + maybe_enable_dl_iterate_phdr_android(&mut build); ++ } else if target.contains("freebsd") { ++ build.define("HAVE_DL_ITERATE_PHDR", "1"); ++ build.define("HAVE_KERN_PROC", "1"); ++ } else if target.contains("netbsd") { ++ build.define("HAVE_DL_ITERATE_PHDR", "1"); ++ build.define("HAVE_KERN_PROC_ARGS", "1"); + } else if !target.contains("apple-ios") + && !target.contains("solaris") + && !target.contains("redox") Index: head/lang/rust/files/patch-vendor_backtrace-sys_src_libbacktrace_fileline.c =================================================================== --- head/lang/rust/files/patch-vendor_backtrace-sys_src_libbacktrace_fileline.c +++ head/lang/rust/files/patch-vendor_backtrace-sys_src_libbacktrace_fileline.c @@ -1,44 +1,117 @@ -This file is in the public domain. +https://github.com/ianlancetaylor/libbacktrace/commit/0f06cda953cc4e26f38751c5b9f15ae8dfa5ff2d +https://github.com/rust-lang-nursery/libbacktrace/pull/1 ---- vendor/backtrace-sys/src/libbacktrace/fileline.c.orig 2019-01-16 09:30:44 UTC +--- vendor/backtrace-sys/src/libbacktrace/fileline.c.orig 2020-02-19 21:11:31 UTC +++ vendor/backtrace-sys/src/libbacktrace/fileline.c -@@ -39,8 +39,39 @@ POSSIBILITY OF SUCH DAMAGE. */ +@@ -39,6 +39,10 @@ POSSIBILITY OF SUCH DAMAGE. */ #include #include -+#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) ++#if defined (HAVE_KERN_PROC_ARGS) || defined (HAVE_KERN_PROC) +#include -+#include +#endif + #include "backtrace.h" #include "internal.h" + +@@ -46,6 +50,78 @@ POSSIBILITY OF SUCH DAMAGE. */ + #define getexecname() NULL + #endif + ++#if !defined (HAVE_KERN_PROC_ARGS) && !defined (HAVE_KERN_PROC) + -+#if !defined(HAVE_GETEXECNAME) && defined(KERN_PROC_PATHNAME) -+/* Return pathname of executable or 0 on failure. */ -+#define HAVE_GETEXECNAME -+static char execname[PATH_MAX + 1]; -+static const char * -+getexecname(void) ++#define sysctl_exec_name1(state, error_callback, data) NULL ++#define sysctl_exec_name2(state, error_callback, data) NULL ++ ++#else /* defined (HAVE_KERN_PROC_ARGS) || |defined (HAVE_KERN_PROC) */ ++ ++static char * ++sysctl_exec_name (struct backtrace_state *state, ++ int mib0, int mib1, int mib2, int mib3, ++ backtrace_error_callback error_callback, void *data) +{ -+ size_t path_len = sizeof(execname); -+ int mib[] = { -+ CTL_KERN, -+#if defined(__NetBSD__) -+ KERN_PROC_ARGS, -+ -1, -+ KERN_PROC_PATHNAME, ++ int mib[4]; ++ size_t len; ++ char *name; ++ size_t rlen; ++ ++ mib[0] = mib0; ++ mib[1] = mib1; ++ mib[2] = mib2; ++ mib[3] = mib3; ++ ++ if (sysctl (mib, 4, NULL, &len, NULL, 0) < 0) ++ return NULL; ++ name = (char *) backtrace_alloc (state, len, error_callback, data); ++ if (name == NULL) ++ return NULL; ++ rlen = len; ++ if (sysctl (mib, 4, name, &rlen, NULL, 0) < 0) ++ { ++ backtrace_free (state, name, len, error_callback, data); ++ return NULL; ++ } ++ return name; ++} ++ ++#ifdef HAVE_KERN_PROC_ARGS ++ ++static char * ++sysctl_exec_name1 (struct backtrace_state *state, ++ backtrace_error_callback error_callback, void *data) ++{ ++ /* This variant is used on NetBSD. */ ++ return sysctl_exec_name (state, CTL_KERN, KERN_PROC_ARGS, -1, ++ KERN_PROC_PATHNAME, error_callback, data); ++} ++ +#else -+ KERN_PROC, -+ KERN_PROC_PATHNAME, -+ -1, ++ ++#define sysctl_exec_name1(state, error_callback, data) NULL ++ +#endif -+ }; -+ u_int miblen = sizeof(mib) / sizeof(mib[0]); -+ int rc = sysctl(mib, miblen, execname, &path_len, NULL, 0); -+ return rc ? NULL : execname; ++ ++#ifdef HAVE_KERN_PROC ++ ++static char * ++sysctl_exec_name2 (struct backtrace_state *state, ++ backtrace_error_callback error_callback, void *data) ++{ ++ /* This variant is used on FreeBSD. */ ++ return sysctl_exec_name (state, CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1, ++ error_callback, data); +} -+#endif /* !HAVE_GETEXECNAME && KERN_PROC_PATHNAME */ ++ ++#else ++ ++#define sysctl_exec_name2(state, error_callback, data) NULL ++ ++#endif ++ ++#endif /* defined (HAVE_KERN_PROC_ARGS) || |defined (HAVE_KERN_PROC) */ ++ + /* Initialize the fileline information from the executable. Returns 1 + on success, 0 on failure. */ - #ifndef HAVE_GETEXECNAME - #define getexecname() NULL +@@ -83,7 +159,7 @@ fileline_initialize (struct backtrace_state *state, + + descriptor = -1; + called_error_callback = 0; +- for (pass = 0; pass < 5; ++pass) ++ for (pass = 0; pass < 7; ++pass) + { + int does_not_exist; + +@@ -105,6 +181,12 @@ fileline_initialize (struct backtrace_state *state, + snprintf (buf, sizeof (buf), "/proc/%ld/object/a.out", + (long) getpid ()); + filename = buf; ++ break; ++ case 5: ++ filename = sysctl_exec_name1 (state, error_callback, data); ++ break; ++ case 6: ++ filename = sysctl_exec_name2 (state, error_callback, data); + break; + default: + abort (); Index: head/mail/thunderbird/Makefile =================================================================== --- head/mail/thunderbird/Makefile +++ head/mail/thunderbird/Makefile @@ -3,6 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 68.5.0 +PORTREVISION= 1 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source Index: head/misc/broot/Makefile =================================================================== --- head/misc/broot/Makefile +++ head/misc/broot/Makefile @@ -3,6 +3,7 @@ PORTNAME= broot DISTVERSIONPREFIX= v DISTVERSION= 0.13.1 +PORTREVISION= 1 CATEGORIES= misc MAINTAINER= vulcan@wired.sh Index: head/multimedia/librav1e/Makefile =================================================================== --- head/multimedia/librav1e/Makefile +++ head/multimedia/librav1e/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMEPREFIX= lib MASTERDIR= ${.CURDIR}/../rav1e Index: head/multimedia/rav1e/Makefile =================================================================== --- head/multimedia/rav1e/Makefile +++ head/multimedia/rav1e/Makefile @@ -3,7 +3,7 @@ PORTNAME= rav1e DISTVERSIONPREFIX= v DISTVERSION= 0.3.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org Index: head/multimedia/termplay/Makefile =================================================================== --- head/multimedia/termplay/Makefile +++ head/multimedia/termplay/Makefile @@ -2,7 +2,7 @@ PORTNAME= termplay DISTVERSION= 2.0.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia MASTER_SITES= CRATESIO DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Index: head/net-im/fractal/Makefile =================================================================== --- head/net-im/fractal/Makefile +++ head/net-im/fractal/Makefile @@ -2,7 +2,7 @@ PORTNAME= fractal DISTVERSION= 4.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MASTER_SITES= https://gitlab.gnome.org/World/fractal/uploads/${GL_HASH}/ Index: head/net-p2p/parity-ethereum/Makefile =================================================================== --- head/net-p2p/parity-ethereum/Makefile +++ head/net-p2p/parity-ethereum/Makefile @@ -3,6 +3,7 @@ PORTNAME= parity-ethereum DISTVERSIONPREFIX= v DISTVERSION= 2.7.2 +PORTREVISION= 1 CATEGORIES= net-p2p MAINTAINER= ale@FreeBSD.org Index: head/net/proby/Makefile =================================================================== --- head/net/proby/Makefile +++ head/net/proby/Makefile @@ -2,7 +2,7 @@ PORTNAME= proby DISTVERSION= 0.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MAINTAINER= yuri@FreeBSD.org Index: head/net/rabbiteer/Makefile =================================================================== --- head/net/rabbiteer/Makefile +++ head/net/rabbiteer/Makefile @@ -2,7 +2,7 @@ PORTNAME= rabbiteer DISTVERSION= 1.4.1 -PORTREVISION= 15 +PORTREVISION= 16 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.6.4 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MAINTAINER= jaap@NLnetLabs.nl Index: head/security/acmed/Makefile =================================================================== --- head/security/acmed/Makefile +++ head/security/acmed/Makefile @@ -3,7 +3,7 @@ PORTNAME= acmed DISTVERSIONPREFIX= v DISTVERSION= 0.6.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MAINTAINER= greg@unrelenting.technology Index: head/security/cargo-audit/Makefile =================================================================== --- head/security/cargo-audit/Makefile +++ head/security/cargo-audit/Makefile @@ -3,6 +3,7 @@ PORTNAME= cargo-audit DISTVERSIONPREFIX= v DISTVERSION= 0.11.2 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= tobik@FreeBSD.org Index: head/security/cloak/Makefile =================================================================== --- head/security/cloak/Makefile +++ head/security/cloak/Makefile @@ -3,7 +3,7 @@ PORTNAME= cloak DISTVERSIONPREFIX= v DISTVERSION= 0.2.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MAINTAINER= tobik@FreeBSD.org Index: head/security/suricata/Makefile =================================================================== --- head/security/suricata/Makefile +++ head/security/suricata/Makefile @@ -3,6 +3,7 @@ PORTNAME= suricata DISTVERSION= 5.0.2 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://www.openinfosecfoundation.org/download/ Index: head/security/suricata5/Makefile =================================================================== --- head/security/suricata5/Makefile +++ head/security/suricata5/Makefile @@ -3,7 +3,7 @@ PORTNAME= suricata DISTVERSION= 5.0.0-rc1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security MASTER_SITES= https://www.openinfosecfoundation.org/download/ PKGNAMESUFFIX= 5 Index: head/shells/ion/Makefile =================================================================== --- head/shells/ion/Makefile +++ head/shells/ion/Makefile @@ -2,7 +2,7 @@ PORTNAME= ion DISTVERSION= 1.0.5-1355 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= shells PKGNAMESUFFIX= -shell Index: head/shells/starship/Makefile =================================================================== --- head/shells/starship/Makefile +++ head/shells/starship/Makefile @@ -2,7 +2,7 @@ PORTNAME= starship DISTVERSION= 0.13.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= shells MASTER_SITES= CRATESIO DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Index: head/sysutils/exa/Makefile =================================================================== --- head/sysutils/exa/Makefile +++ head/sysutils/exa/Makefile @@ -3,7 +3,7 @@ PORTNAME= exa DISTVERSIONPREFIX= v DISTVERSION= 0.9.0 -PORTREVISION= 5 +PORTREVISION= 6 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.4.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils PKGNAMESUFFIX= -find Index: head/sysutils/flowgger/Makefile =================================================================== --- head/sysutils/flowgger/Makefile +++ head/sysutils/flowgger/Makefile @@ -2,7 +2,7 @@ PORTNAME= flowgger DISTVERSION= 0.2.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= CRATESIO DISTFILES= ${CARGO_DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} 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.1 -PORTREVISION= 3 +PORTREVISION= 4 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.6.0 -PORTREVISION= 3 +PORTREVISION= 4 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.4.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MAINTAINER= pizzamig@FreeBSD.org Index: head/sysutils/tealdeer/Makefile =================================================================== --- head/sysutils/tealdeer/Makefile +++ head/sysutils/tealdeer/Makefile @@ -3,7 +3,7 @@ PORTNAME= tealdeer DISTVERSIONPREFIX= v DISTVERSION= 1.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= vulcan@wired.sh Index: head/sysutils/vector/Makefile =================================================================== --- head/sysutils/vector/Makefile +++ head/sysutils/vector/Makefile @@ -3,7 +3,7 @@ PORTNAME= vector DISTVERSIONPREFIX= v DISTVERSION= 0.7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= greg@unrelenting.technology Index: head/textproc/bat/Makefile =================================================================== --- head/textproc/bat/Makefile +++ head/textproc/bat/Makefile @@ -3,7 +3,7 @@ PORTNAME= bat DISTVERSIONPREFIX= v DISTVERSION= 0.12.1 -PORTREVISION= 4 +PORTREVISION= 5 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.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= textproc MAINTAINER= petteri.valkonen@iki.fi Index: head/textproc/sd/Makefile =================================================================== --- head/textproc/sd/Makefile +++ head/textproc/sd/Makefile @@ -2,7 +2,7 @@ PORTNAME= sd DISTVERSION= 0.6.5 -PORTREVISION= 6 +PORTREVISION= 7 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.3 -PORTREVISION= 3 +PORTREVISION= 4 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= 16 +PORTREVISION= 17 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.33.0 +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.55 -PORTREVISION= 2 +PORTREVISION= 3 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= 68.5.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ Index: head/www/firefox/Makefile =================================================================== --- head/www/firefox/Makefile +++ head/www/firefox/Makefile @@ -3,6 +3,7 @@ PORTNAME= firefox DISTVERSION= 73.0.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Index: head/www/geckodriver/Makefile =================================================================== --- head/www/geckodriver/Makefile +++ head/www/geckodriver/Makefile @@ -2,7 +2,7 @@ PORTNAME= geckodriver DISTVERSION= 0.26.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= https://hg.mozilla.org/mozilla-central/archive/${DISTNAME}.zip/testing/geckodriver/?dummy=/ DISTNAME= e9783a644016aa9b317887076618425586730d73 Index: head/www/jwt-cli/Makefile =================================================================== --- head/www/jwt-cli/Makefile +++ head/www/jwt-cli/Makefile @@ -3,7 +3,7 @@ PORTNAME= jwt-cli PORTVERSION= 2.5.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MAINTAINER= osa@FreeBSD.org Index: head/www/miniserve/Makefile =================================================================== --- head/www/miniserve/Makefile +++ head/www/miniserve/Makefile @@ -3,7 +3,7 @@ PORTNAME= miniserve DISTVERSIONPREFIX= v DISTVERSION= 0.5.0 -PORTREVISION= 6 +PORTREVISION= 7 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.18 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= https://newsboat.org/releases/${PORTVERSION}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Index: head/www/websocat/Makefile =================================================================== --- head/www/websocat/Makefile +++ head/www/websocat/Makefile @@ -4,7 +4,7 @@ PORTNAME= websocat DISTVERSIONPREFIX= v DISTVERSION= 1.5.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www MAINTAINER= osa@FreeBSD.org Index: head/www/zola/Makefile =================================================================== --- head/www/zola/Makefile +++ head/www/zola/Makefile @@ -3,6 +3,7 @@ PORTNAME= zola DISTVERSIONPREFIX= v DISTVERSION= 0.10.0 +PORTREVISION= 1 CATEGORIES= www MAINTAINER= tobik@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= 16 +PORTREVISION= 17 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 DISTVERSIONPREFIX= v DISTVERSION= 0.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MAINTAINER= tobik@FreeBSD.org Index: head/x11/squeekboard/Makefile =================================================================== --- head/x11/squeekboard/Makefile +++ head/x11/squeekboard/Makefile @@ -3,6 +3,7 @@ PORTNAME= squeekboard DISTVERSIONPREFIX= v DISTVERSION= 1.9.0 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= jbeich@FreeBSD.org