diff --git a/cad/horizon-eda/Makefile b/cad/horizon-eda/Makefile
index 42eb5c7b8893..e20f9d7d8a3c 100644
--- a/cad/horizon-eda/Makefile
+++ b/cad/horizon-eda/Makefile
@@ -1,60 +1,61 @@
 PORTNAME=	horizon-eda
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5.0
+PORTREVISION=	1
 CATEGORIES=	cad
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES=	1efad3028a1953af2cf62b518a54ffeb309977bc.patch:-p1 # https://github.com/horizon-eda/horizon/issues/727
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	EDA package for printed circuit board design
 WWW=		https://horizon-eda.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/optional.hpp:devel/boost-libs \
 		cppzmq>0:net/cppzmq \
 		glm>0:math/glm
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libepoxy.so:graphics/libepoxy \
 		libgit2.so:devel/libgit2 \
 		libharfbuzz.so:print/harfbuzz \
 		libpng16.so:graphics/png \
 		libpodofo09.so:graphics/podofo09 \
 		libTKSTEP.so:cad/opencascade \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libzip.so:archivers/libzip \
 		libzmq.so:net/libzmq4
 
 USES=		desktop-file-utils gmake gnome libarchive localbase pkgconfig python:build sqlite # compiler:c++17-lang
 USE_GNOME=	atkmm gdkpixbuf2 gtkmm30 librsvg2
 
 USE_GITHUB=	yes
 GH_PROJECT=	horizon
 
 MAKE_ARGS=	DEBUGFLAGS= OPTIMIZE=
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 LLVM_VER=	12 # workaround for bug#263870
 BUILD_DEPENDS+=	clang${LLVM_VER}:devel/llvm${LLVM_VER}
 CPP=		clang-cpp${LLVM_VER}
 CC=		clang${LLVM_VER}
 CXX=		clang++${LLVM_VER}
 
 # Patch sources to force using include files installed by graphics/podofo09
 post-patch:
 	@${REINPLACE_CMD} -e '/^#include/s|podofo/podofo.h|podofo09/podofo.h|' \
 		${WRKSRC}/src/export_pdf/export_pdf.cpp \
 		${WRKSRC}/src/export_pdf/export_pdf_board.cpp \
 		${WRKSRC}/src/python_module/board.cpp \
 		${WRKSRC}/src/python_module/schematic.cpp \
 		${WRKSRC}/src/imp/pdf_export_window.cpp \
 		${WRKSRC}/src/export_pdf/export_pdf_util.hpp \
 		${WRKSRC}/src/export_pdf/canvas_pdf.hpp
 
 post-install: # https://github.com/horizon-eda/horizon/issues/558
 	@cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} horizon-eda horizon-imp
 
 .include <bsd.port.mk>
diff --git a/deskutils/basket/Makefile b/deskutils/basket/Makefile
index 24cf7d670e0c..a6ff4168c365 100644
--- a/deskutils/basket/Makefile
+++ b/deskutils/basket/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	basket
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.49a-46
 DISTVERSIONSUFFIX=	-g60e38c6
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	deskutils kde
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Desktop organization tool
 WWW=		https://basket-notepads.github.io/
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libgpg-error.so:security/libgpg-error \
 		libgpgme.so:security/gpgme \
 		libgit2.so:devel/libgit2
 
 USES=		cmake compiler:c++11-lang desktop-file-utils gettext-tools \
 		kde:5 pkgconfig qt:5 shared-mime-info tar:bzip2 xorg
 USE_KDE=	ecm archive auth codecs completion config configwidgets \
 		coreaddons crash dbusaddons doctools filemetadata globalaccel \
 		guiaddons i18n iconthemes jobwidgets kcmutils kio \
 		notifications parts service solid sonnet textwidgets \
 		widgetsaddons windowsystem xmlgui
 USE_QT=		concurrent core dbus gui network phonon4 testlib widgets xml \
 		buildtools:build qmake:build
 USE_XORG=	x11
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	basket-notepads
 
 PLIST_SUB=	QT5_VERSION=${QT5_VERSION}
 
 .include <bsd.port.mk>
diff --git a/deskutils/subsurface/Makefile b/deskutils/subsurface/Makefile
index 4beb9f6f30ac..0ee4da6a1b84 100644
--- a/deskutils/subsurface/Makefile
+++ b/deskutils/subsurface/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	subsurface
 DISTVERSIONPREFIX=v
 DISTVERSION=	5.0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	Manage and display dive computer data
 WWW=		https://subsurface-divelog.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libdivecomputer.so:comms/libdc \
 		libzip.so:archivers/libzip \
 		libgit2.so:devel/libgit2 \
 		libcurl.so:ftp/curl \
 		libssh2.so:security/libssh2
 
 USES=		cmake:noninja desktop-file-utils gmake pkgconfig qt:5 gnome qmake:no_configure sqlite
 USE_GITHUB=	yes
 GH_TUPLE=	subsurface:googlemaps:7ce7124b385b2ebac0f72c38b094f436d4fe5c58:subsurface/googlemaps
 USE_GNOME=	libxml2 libxslt
 USE_QT=		buildtools concurrent connectivity core declarative declarative-test:build gui linguisttools:build location network printsupport quickcontrols2 svg testlib webkit widgets
 
 MAKE_ENV+=	DESTDIR=${STAGEDIR}
 
 pre-configure:
 	(cd ${WRKSRC}/googlemaps && ${QMAKE})
 
 pre-build:
 	(cd ${WRKSRC}/googlemaps && ${MAKE})
 
 pre-install:
 	(cd ${WRKSRC}/googlemaps && ${SETENV} INSTALL_ROOT=${STAGEDIR} make install)
 
 post-build:
 	${MV} ${WRKSRC}/Documentation/user-manual.html.git ${BUILD_WRKSRC}/Documentation/user-manual.html
 
 dxo-install:
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/subsurface ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/subsurface.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	${INSTALL_DATA} ${WRKSRC}/icons/subsurface-icon.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "Documentation theme printing_templates translations" ${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-gert/Makefile b/devel/R-cran-gert/Makefile
index 0e8cd759d666..dd8f71cbe26c 100644
--- a/devel/R-cran-gert/Makefile
+++ b/devel/R-cran-gert/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	gert
 DISTVERSION=	1.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	jpbeconne@free.fr
 COMMENT=	Simple Git Client for R
 WWW=		https://docs.ropensci.org/gert/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-askpass>0:security/R-cran-askpass \
 		R-cran-credentials>=1.2.1:security/R-cran-credentials \
 		R-cran-openssl>=1.4.1:security/R-cran-openssl \
 		R-cran-rstudioapi>=0.11:devel/R-cran-rstudioapi \
 		R-cran-sys>0:devel/R-cran-sys \
 		R-cran-zip>=2.1.0:archivers/R-cran-zip
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 USES=		cran:auto-plist
 
 #Bogus stage-qa as this is $ARCH dependent
 NO_ARCH_IGNORE=	gert.so
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/R/library/gert/libs/gert.so
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-git2r/Makefile b/devel/R-cran-git2r/Makefile
index cb503981f86e..03fe4c80c9a2 100644
--- a/devel/R-cran-git2r/Makefile
+++ b/devel/R-cran-git2r/Makefile
@@ -1,17 +1,17 @@
 PORTNAME=	git2r
 DISTVERSION=	0.27.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	jpbeconne@free.fr
 COMMENT=	Provides Access to Git Repositories
 WWW=		https://CRAN.R-project.org/package=git2r
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 USES=		cran:auto-plist,compiles pkgconfig
 
 .include <bsd.port.mk>
diff --git a/devel/cargo-generate/Makefile b/devel/cargo-generate/Makefile
index fabd9db2a7d4..f01695b6cbbe 100644
--- a/devel/cargo-generate/Makefile
+++ b/devel/cargo-generate/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	cargo-generate
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.18.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 
 MAINTAINER=	lcook@FreeBSD.org
 COMMENT=	Quickly generate Rust project templates from existing git repositories
 WWW=		https://github.com/ashleygwilliams/cargo-generate
 
 LICENSE=	APACHE20 MIT
 LICENSE_COMB=	dual
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-APACHE
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libgit2.so:devel/libgit2 \
 		libssh2.so:security/libssh2
 
 USES=		cargo localbase ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	ashleygwilliams
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	CHANGELOG.md CODE_OF_CONDUCT.md CONTRIBUTING.md README.md \
 		TEMPLATES.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/criterion/Makefile b/devel/criterion/Makefile
index df99d0bc3014..c674bd81f2c9 100644
--- a/devel/criterion/Makefile
+++ b/devel/criterion/Makefile
@@ -1,60 +1,61 @@
 PORTNAME=	criterion
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.4.2
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C and C++ unit testing framework for the 21st century
 WWW=		https://github.com/Snaipe/Criterion
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/klib/khash.h:devel/klib \
 		${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${PY_FLAVOR} \
 		nanopb>0:devel/nanopb \
 		cmake:devel/cmake-core \
 		protoc:devel/protobuf
 LIB_DEPENDS=	libboxfort.so:devel/boxfort \
 		libffi.so:devel/libffi \
 		libgit2.so:devel/libgit2 \
 		libnanomsg.so:net/nanomsg
 RUN_DEPENDS=	nanopb>0:devel/nanopb
 
 USES=		gettext localbase:ldflags meson python pkgconfig shebangfix
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Snaipe
 GH_PROJECT=	Criterion
 GH_TUPLE=	MrAnno:debugbreak:83bf7e9:debugbreak
 
 SHEBANG_FILES=	src/protocol/gen-pb.py
 
 CFLAGS+=	-fPIC \
 		-I${LOCALBASE}/include/klib \
 		-I${WRKSRC_debugbreak}
 
 MESON_ARGS=	-Dtests=false -Dsamples=false
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
 quick-test:
 	@cd ${TEST_WRKSRC} && \
 		${CC} ${CFLAGS} ${LDFLAGS} -I${STAGEDIR}${PREFIX}/include \
 			${STAGEDIR}${PREFIX}/lib/libcriterion.a \
 			-L${LOCALBASE}/lib -lboxfort -lprotobuf-nanopb -lgit2 -lnanomsg -lintl \
 			${FILESDIR}/example.c && \
 		./a.out # test succeeds when simple::Test fails with assertion
 
 do-test:
 	cd ${WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} --reconfigure ${CONFIGURE_ARGS} -Dtests=true && \
 	cd ${BUILD_WRKSRC} && \
 		${DO_MAKE_BUILD} ${ALL_TARGET} test
 
 .include <bsd.port.mk>
diff --git a/devel/dura/Makefile b/devel/dura/Makefile
index 3a2227fa6952..ae6e5a7dff53 100644
--- a/devel/dura/Makefile
+++ b/devel/dura/Makefile
@@ -1,123 +1,123 @@
 PORTNAME=	dura
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Background process that watches Git repositories and backs up data
 WWW=		https://github.com/tkellogg/dura
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgit2.so:devel/libgit2 \
 		libssh2.so:security/libssh2
 
 USES=		cargo ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tkellogg
 
 CARGO_CRATES=	ansi_term-0.12.1 \
 		atty-0.2.14 \
 		autocfg-1.0.1 \
 		bitflags-1.3.2 \
 		bytes-1.1.0 \
 		cc-1.0.72 \
 		cfg-if-1.0.0 \
 		chrono-0.4.19 \
 		clap-3.1.6 \
 		dirs-4.0.0 \
 		dirs-sys-0.3.6 \
 		fastrand-1.6.0 \
 		form_urlencoded-1.0.1 \
 		getrandom-0.2.3 \
 		git2-0.13.25 \
 		hashbrown-0.11.2 \
 		hermit-abi-0.1.19 \
 		idna-0.2.3 \
 		indexmap-1.8.0 \
 		instant-0.1.12 \
 		itoa-1.0.1 \
 		jobserver-0.1.24 \
 		lazy_static-1.4.0 \
 		libc-0.2.112 \
 		libgit2-sys-0.12.26+1.3.0 \
 		libssh2-sys-0.2.23 \
 		libz-sys-1.1.3 \
 		lock_api-0.4.5 \
 		log-0.4.14 \
 		matchers-0.1.0 \
 		matches-0.1.9 \
 		memchr-2.4.1 \
 		mio-0.7.14 \
 		miow-0.3.7 \
 		ntapi-0.3.6 \
 		num-integer-0.1.44 \
 		num-traits-0.2.14 \
 		num_cpus-1.13.1 \
 		once_cell-1.9.0 \
 		openssl-probe-0.1.4 \
 		openssl-sys-0.9.72 \
 		os_str_bytes-6.0.0 \
 		parking_lot-0.11.2 \
 		parking_lot_core-0.8.5 \
 		percent-encoding-2.1.0 \
 		pin-project-lite-0.2.8 \
 		pkg-config-0.3.24 \
 		proc-macro2-1.0.36 \
 		quote-1.0.14 \
 		redox_syscall-0.2.10 \
 		redox_users-0.4.0 \
 		regex-1.5.5 \
 		regex-automata-0.1.10 \
 		regex-syntax-0.6.25 \
 		remove_dir_all-0.5.3 \
 		ryu-1.0.9 \
 		scopeguard-1.1.0 \
 		serde-1.0.133 \
 		serde_derive-1.0.133 \
 		serde_json-1.0.74 \
 		serial_test-0.5.1 \
 		serial_test_derive-0.5.1 \
 		sharded-slab-0.1.4 \
 		signal-hook-registry-1.4.0 \
 		smallvec-1.7.0 \
 		strsim-0.10.0 \
 		syn-1.0.85 \
 		tempfile-3.3.0 \
 		termcolor-1.1.2 \
 		textwrap-0.15.0 \
 		thread_local-1.1.4 \
 		time-0.1.44 \
 		tinyvec-1.5.1 \
 		tinyvec_macros-0.1.0 \
 		tokio-1.15.0 \
 		tokio-macros-1.7.0 \
 		toml-0.5.8 \
 		tracing-0.1.29 \
 		tracing-attributes-0.1.18 \
 		tracing-core-0.1.21 \
 		tracing-log-0.1.2 \
 		tracing-subscriber-0.3.5 \
 		unicode-bidi-0.3.7 \
 		unicode-normalization-0.1.19 \
 		unicode-xid-0.2.2 \
 		url-2.2.2 \
 		vcpkg-0.2.15 \
 		wasi-0.10.0+wasi-snapshot-preview1 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-util-0.1.5 \
 		winapi-x86_64-pc-windows-gnu-0.4.0
 
 OPENSSLINC=	/usr/include
 OPENSSLLIB=	/usr/lib
 
 PLIST_FILES=	bin/${PORTNAME}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/devel/gbump/Makefile b/devel/gbump/Makefile
index 9e18d9ae5281..47feecdcd9a8 100644
--- a/devel/gbump/Makefile
+++ b/devel/gbump/Makefile
@@ -1,76 +1,76 @@
 PORTNAME=	gbump
 PORTVERSION=	1.0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	CRATESIO
 DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${CARGO_CRATE_EXT}
 
 MAINTAINER=	nbari@tequila.io
 COMMENT=	Git tag semantic version bumper
 WWW=		https://github.com/nbari/gbump
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgit2.so:devel/libgit2 \
 		libssh2.so:security/libssh2
 
 USES=		cargo localbase ssl
 
 BROKEN_SSL=	openssl30 openssl31
 BROKEN_SSL_REASON=	Fails to find OpenSSL development headers
 
 CARGO_CRATES=	aho-corasick-1.0.2 \
 		atty-0.2.14 \
 		autocfg-1.1.0 \
 		bitflags-1.3.2 \
 		cc-1.0.79 \
 		clap-3.2.25 \
 		clap_lex-0.2.4 \
 		form_urlencoded-1.2.0 \
 		git2-0.17.2 \
 		hashbrown-0.12.3 \
 		hermit-abi-0.1.19 \
 		idna-0.4.0 \
 		indexmap-1.9.3 \
 		jobserver-0.1.26 \
 		libc-0.2.146 \
 		libgit2-sys-0.15.2+1.6.4 \
 		libssh2-sys-0.3.0 \
 		libz-sys-1.1.9 \
 		log-0.4.18 \
 		memchr-2.5.0 \
 		openssl-probe-0.1.5 \
 		openssl-sys-0.9.88 \
 		os_str_bytes-6.5.0 \
 		percent-encoding-2.3.0 \
 		pkg-config-0.3.27 \
 		regex-1.8.4 \
 		regex-syntax-0.7.2 \
 		strsim-0.10.0 \
 		termcolor-1.2.0 \
 		textwrap-0.16.0 \
 		tinyvec-1.6.0 \
 		tinyvec_macros-0.1.1 \
 		unicode-bidi-0.3.13 \
 		unicode-normalization-0.1.22 \
 		url-2.4.0 \
 		vcpkg-0.2.15 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-util-0.1.5 \
 		winapi-x86_64-pc-windows-gnu-0.4.0
 
 PLIST_FILES=	bin/gbump
 
 .include <bsd.port.options.mk>
 
 .if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl3*}
 BROKEN_SSL=	base openssl30 openssl31
 BROKEN_SSL_REASON=	Fails to find OpenSSL 3 development headers
 .endif
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gbump
 
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-git-changebar/Makefile b/devel/geany-plugin-git-changebar/Makefile
index fa89874106ee..836e837bac9c 100644
--- a/devel/geany-plugin-git-changebar/Makefile
+++ b/devel/geany-plugin-git-changebar/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	geany-plugin-git-changebar
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 WWW=		https://plugins.geany.org/git-changebar.html
 
 LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 OPTIONS_DEFINE=	DOCS
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-workbench/Makefile b/devel/geany-plugin-workbench/Makefile
index af2a2d33696e..6f62df75ae6d 100644
--- a/devel/geany-plugin-workbench/Makefile
+++ b/devel/geany-plugin-workbench/Makefile
@@ -1,13 +1,13 @@
 PORTNAME=	geany-plugin-workbench
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 WWW=		https://plugins.geany.org/workbench.html
 
 LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/git-absorb/Makefile b/devel/git-absorb/Makefile
index 86a224b222cd..a683ef4dab92 100644
--- a/devel/git-absorb/Makefile
+++ b/devel/git-absorb/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	git-absorb
 DISTVERSION=	0.6.10
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Git command for automating fixup/autosquash commits
 WWW=		https://github.com/tummychow/git-absorb
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 USES=		cargo
 USE_GITHUB=	yes
 GH_ACCOUNT=	tummychow
 
 PLIST_FILES=	bin/git-absorb
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/git-absorb
 
 .include <bsd.port.mk>
diff --git a/devel/gitg/Makefile b/devel/gitg/Makefile
index 78e4d5dda994..8fd23ae2d378 100644
--- a/devel/gitg/Makefile
+++ b/devel/gitg/Makefile
@@ -1,53 +1,54 @@
 PORTNAME=	gitg
 PORTVERSION=	41
+PORTREVISION=	1
 CATEGORIES=	devel deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 PATCH_SITES=	https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/
 PATCHFILES+=	1978973b1284.patch:-p1 # https://gitlab.gnome.org/GNOME/gitg/-/merge_requests/175
 
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	GTK-based git repository viewer
 WWW=		https://wiki.gnome.org/Apps/Gitg
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
 		libenchant.so:textproc/enchant \
 		libgee-0.8.so:devel/libgee \
 		libgit2.so:devel/libgit2 \
 		libgit2-glib-1.0.so:devel/libgit2-glib \
 		libjson-glib-1.0.so:devel/json-glib \
 		libpeas-1.0.so:devel/libpeas \
 		libgspell-1.so:textproc/gspell \
 		libdazzle-1.0.so:x11-toolkits/libdazzle \
 		libsecret-1.so:security/libsecret
 RUN_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
 CONFLICTS=	gitg0
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c11 desktop-file-utils gettext gnome localbase \
 		meson pathfix pkgconfig python:build tar:xz vala:build
 USE_GNOME=	cairo gdkpixbuf2 gtk30 gtksourceview4 intltool introspection
 
 USE_LDCONFIG=	yes
 GLIB_SCHEMAS=	org.gnome.gitg.gschema.xml
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
 OPTIONS_DEFINE=	PYTHON
 OPTIONS_SUB=	yes
 
 PYTHON_USES=	python
 PYTHON_MESON_TRUE=	python
 PYTHON_USE=	GNOME=pygobject3
 
 post-install-PYTHON-on:
 	(cd ${STAGEDIR}${PREFIX} \
 		&& ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
 
 .include <bsd.port.mk>
diff --git a/devel/gitui/Makefile b/devel/gitui/Makefile
index 83a79ccbb37b..dbf2161aba74 100644
--- a/devel/gitui/Makefile
+++ b/devel/gitui/Makefile
@@ -1,247 +1,247 @@
 PORTNAME=	gitui
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.24.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Terminal UI for git
 WWW=		https://github.com/extrawurst/gitui
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BROKEN_armv7=	error: conflicting types for 'get_proc_total', see https://github.com/FillZpp/sys-info-rs/issues/80
 BROKEN_i386=	error: conflicting types for 'get_proc_total', see https://github.com/FillZpp/sys-info-rs/issues/80
 BROKEN_powerpc=	error: conflicting types for 'get_proc_total', see https://github.com/FillZpp/sys-info-rs/issues/80
 
 BUILD_DEPENDS=	bash:shells/bash \
 		gmake:devel/gmake
 LIB_DEPENDS=	libgit2.so:devel/libgit2 \
 		libssh2.so:security/libssh2
 
 USES=		cargo pkgconfig localbase:ldflags perl5 python:build xorg
 USE_XORG=	xcb
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	extrawurst
 
 CARGO_CRATES=	addr2line-0.19.0 \
 		adler-1.0.2 \
 		aho-corasick-1.0.2 \
 		android-tzdata-0.1.1 \
 		android_system_properties-0.1.5 \
 		anyhow-1.0.75 \
 		autocfg-1.1.0 \
 		backtrace-0.3.67 \
 		base64-0.13.1 \
 		bincode-1.3.3 \
 		bit-set-0.5.3 \
 		bit-vec-0.6.3 \
 		bitflags-1.3.2 \
 		bugreport-0.5.0 \
 		bumpalo-3.12.0 \
 		bwrap-1.3.0 \
 		bytesize-1.3.0 \
 		cassowary-0.3.0 \
 		cc-1.0.79 \
 		cfg-if-1.0.0 \
 		chrono-0.4.26 \
 		clap-4.1.14 \
 		clap_builder-4.1.14 \
 		clap_lex-0.4.0 \
 		codespan-reporting-0.11.1 \
 		core-foundation-sys-0.8.3 \
 		crc32fast-1.3.2 \
 		crossbeam-channel-0.5.8 \
 		crossbeam-deque-0.8.2 \
 		crossbeam-epoch-0.9.13 \
 		crossbeam-utils-0.8.14 \
 		crossterm-0.26.1 \
 		crossterm_winapi-0.9.0 \
 		cxx-1.0.90 \
 		cxx-build-1.0.90 \
 		cxxbridge-flags-1.0.90 \
 		cxxbridge-macro-1.0.90 \
 		dashmap-5.4.0 \
 		diff-0.1.13 \
 		dirs-5.0.1 \
 		dirs-sys-0.4.1 \
 		easy-cast-0.5.2 \
 		either-1.8.1 \
 		env_logger-0.10.0 \
 		errno-0.2.8 \
 		errno-dragonfly-0.1.2 \
 		fancy-regex-0.11.0 \
 		fastrand-1.9.0 \
 		filetime-0.2.20 \
 		flate2-1.0.25 \
 		fnv-1.0.7 \
 		form_urlencoded-1.2.0 \
 		fsevent-sys-4.1.0 \
 		futures-0.3.26 \
 		futures-channel-0.3.26 \
 		futures-core-0.3.26 \
 		futures-executor-0.3.26 \
 		futures-io-0.3.26 \
 		futures-sink-0.3.26 \
 		futures-task-0.3.26 \
 		futures-util-0.3.26 \
 		fuzzy-matcher-0.3.7 \
 		getrandom-0.2.8 \
 		gh-emoji-1.0.7 \
 		gimli-0.27.3 \
 		git-version-0.3.5 \
 		git-version-macro-0.3.5 \
 		git2-0.17.2 \
 		hashbrown-0.12.3 \
 		hermit-abi-0.3.2 \
 		humantime-2.1.0 \
 		iana-time-zone-0.1.53 \
 		iana-time-zone-haiku-0.1.1 \
 		idna-0.4.0 \
 		indexmap-1.9.3 \
 		inotify-0.9.6 \
 		inotify-sys-0.1.5 \
 		instant-0.1.12 \
 		io-lifetimes-1.0.5 \
 		is-terminal-0.4.3 \
 		itertools-0.11.0 \
 		itoa-1.0.8 \
 		jobserver-0.1.25 \
 		js-sys-0.3.61 \
 		kqueue-1.0.7 \
 		kqueue-sys-1.0.3 \
 		lazy_static-1.4.0 \
 		libc-0.2.139 \
 		libgit2-sys-0.15.2+1.6.4 \
 		libssh2-sys-0.3.0 \
 		libz-sys-1.1.8 \
 		link-cplusplus-1.0.8 \
 		linux-raw-sys-0.1.4 \
 		lock_api-0.4.10 \
 		log-0.4.20 \
 		memchr-2.5.0 \
 		memoffset-0.7.1 \
 		miniz_oxide-0.6.2 \
 		mio-0.8.5 \
 		notify-5.2.0 \
 		notify-debouncer-mini-0.2.1 \
 		num-traits-0.2.15 \
 		num_cpus-1.16.0 \
 		object-0.30.3 \
 		once_cell-1.18.0 \
 		onig-6.4.0 \
 		onig_sys-69.8.1 \
 		openssl-probe-0.1.5 \
 		openssl-src-111.25.0+1.1.1t \
 		openssl-sys-0.9.92 \
 		option-ext-0.2.0 \
 		parking_lot-0.12.1 \
 		parking_lot_core-0.9.7 \
 		percent-encoding-2.3.0 \
 		phf-0.11.1 \
 		phf_shared-0.11.1 \
 		pin-project-lite-0.2.9 \
 		pin-utils-0.1.0 \
 		pkg-config-0.3.26 \
 		pretty_assertions-1.4.0 \
 		proc-macro-error-1.0.4 \
 		proc-macro-error-attr-1.0.4 \
 		proc-macro-hack-0.5.20+deprecated \
 		proc-macro2-1.0.63 \
 		quote-1.0.29 \
 		ratatui-0.21.0 \
 		rayon-core-1.11.0 \
 		redox_syscall-0.2.16 \
 		redox_users-0.4.3 \
 		regex-1.9.1 \
 		regex-automata-0.3.4 \
 		regex-syntax-0.7.4 \
 		ron-0.8.0 \
 		rustc-demangle-0.1.21 \
 		rustix-0.36.8 \
 		ryu-1.0.14 \
 		same-file-1.0.6 \
 		scopeguard-1.2.0 \
 		scratch-1.0.3 \
 		serde-1.0.156 \
 		serde_derive-1.0.156 \
 		serde_json-1.0.93 \
 		serial_test-1.0.0 \
 		serial_test_derive-1.0.0 \
 		shell-escape-0.1.5 \
 		shellexpand-3.1.0 \
 		signal-hook-0.3.15 \
 		signal-hook-mio-0.2.3 \
 		signal-hook-registry-1.4.1 \
 		simplelog-0.12.1 \
 		siphasher-0.3.10 \
 		slab-0.4.8 \
 		smallvec-1.11.0 \
 		strsim-0.10.0 \
 		struct-patch-0.2.3 \
 		struct-patch-derive-0.2.3 \
 		syn-1.0.107 \
 		syntect-5.1.0 \
 		sys-info-0.9.1 \
 		tempfile-3.4.0 \
 		termcolor-1.2.0 \
 		thiserror-1.0.39 \
 		thiserror-impl-1.0.39 \
 		thread_local-1.1.7 \
 		time-0.3.22 \
 		time-core-0.1.1 \
 		time-macros-0.2.9 \
 		tinyvec-1.6.0 \
 		tinyvec_macros-0.1.1 \
 		unicode-bidi-0.3.10 \
 		unicode-ident-1.0.6 \
 		unicode-normalization-0.1.22 \
 		unicode-segmentation-1.10.1 \
 		unicode-truncate-0.2.0 \
 		unicode-width-0.1.10 \
 		url-2.4.1 \
 		vcpkg-0.2.15 \
 		version_check-0.9.4 \
 		walkdir-2.3.3 \
 		wasi-0.11.0+wasi-snapshot-preview1 \
 		wasm-bindgen-0.2.84 \
 		wasm-bindgen-backend-0.2.84 \
 		wasm-bindgen-macro-0.2.84 \
 		wasm-bindgen-macro-support-0.2.84 \
 		wasm-bindgen-shared-0.2.84 \
 		which-4.4.0 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-util-0.1.5 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
 		windows-sys-0.42.0 \
 		windows-sys-0.45.0 \
 		windows-sys-0.48.0 \
 		windows-targets-0.42.1 \
 		windows-targets-0.48.1 \
 		windows_aarch64_gnullvm-0.42.1 \
 		windows_aarch64_gnullvm-0.48.0 \
 		windows_aarch64_msvc-0.42.1 \
 		windows_aarch64_msvc-0.48.0 \
 		windows_i686_gnu-0.42.1 \
 		windows_i686_gnu-0.48.0 \
 		windows_i686_msvc-0.42.1 \
 		windows_i686_msvc-0.48.0 \
 		windows_x86_64_gnu-0.42.1 \
 		windows_x86_64_gnu-0.48.0 \
 		windows_x86_64_gnullvm-0.42.1 \
 		windows_x86_64_gnullvm-0.48.0 \
 		windows_x86_64_msvc-0.42.1 \
 		windows_x86_64_msvc-0.48.0 \
 		yansi-0.5.1
 RUSTFLAGS+=	--cap-lints=warn
 PLIST_FILES=	bin/${PORTNAME}
 
 BINARY_ALIAS=	python3=${PYTHON_CMD} # xcb requires python3
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/devel/gnome-builder/Makefile b/devel/gnome-builder/Makefile
index 615b7b2a0261..88ace06c141a 100644
--- a/devel/gnome-builder/Makefile
+++ b/devel/gnome-builder/Makefile
@@ -1,91 +1,91 @@
 PORTNAME=	gnome-builder
 PORTVERSION=	42.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	IDE for writing software for GNOME
 WWW=		https://wiki.gnome.org/Apps/Builder
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcmark.so:textproc/cmark \
 		libdazzle-1.0.so:x11-toolkits/libdazzle \
 		libdevhelp-3.so:devel/devhelp \
 		libenchant-2.so:textproc/enchant2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libgit2-glib-1.0.so:devel/libgit2-glib \
 		libgit2.so:devel/libgit2 \
 		libgladeui-2.so:devel/glade \
 		libgspell-1.so:textproc/gspell \
 		libhandy-1.so:x11-toolkits/libhandy \
 		libjson-glib-1.0.so:devel/json-glib \
 		libjsonrpc-glib-1.0.so:devel/jsonrpc-glib \
 		libpcre.so:devel/pcre \
 		libpeas-1.0.so:devel/libpeas \
 		libportal.so:deskutils/libportal \
 		libportal-gtk3.so:deskutils/libportal-gtk3 \
 		libsoup-2.4.so:devel/libsoup \
 		libtemplate_glib-1.0.so:devel/template-glib \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk3
 
 PORTSCOUT=	limitw:1,even
 PORTDOCS=	*
 
 CONFLICTS_BUILD=	gnome-builder-3.16.*
 
 USES=		compiler:c++11-lang desktop-file-utils gettext gnome \
 		localbase:lfdlags meson pkgconfig python:build shebangfix \
 		tar:xz vala:lib
 USE_GNOME=	cairo gtksourceview4 introspection libxml2 vte3
 SHEBANG_FILES=	${WRKSRC}/src/plugins/gradle/gradle_plugin.py \
 		${WRKSRC}/src/plugins/maven/maven_plugin.py
 USE_LDCONFIG=	yes
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
 MESON_ARGS=	-Dplugin_color_picker=false \
 		-Dplugin_flatpak=false \
 		-Dplugin_jhbuild=false \
 		-Dplugin_qemu=false \
 		-Dplugin_sysprof=false \
 		-Dplugin_update_manager=false
 
 PLIST_SUB=	BUILDER_VERSION=${PORTVERSION:R}
 
 GLIB_SCHEMAS=	org.gnome.builder.build.gschema.xml \
 		org.gnome.builder.clang.gschema.xml \
 		org.gnome.builder.code-insight.gschema.xml \
 		org.gnome.builder.editor.gschema.xml \
 		org.gnome.builder.editor.language.gschema.xml \
 		org.gnome.builder.extension-type.gschema.xml \
 		org.gnome.builder.gnome-code-assistance.gschema.xml \
 		org.gnome.builder.gschema.xml \
 		org.gnome.builder.plugin.gschema.xml \
 		org.gnome.builder.plugins.copyright.gschema.xml \
 		org.gnome.builder.plugins.eslint.gschema.xml \
 		org.gnome.builder.plugins.stylelint.gschema.xml \
 		org.gnome.builder.project-tree.gschema.xml \
 		org.gnome.builder.project.gschema.xml \
 		org.gnome.builder.rust-analyzer.gschema.xml \
 		org.gnome.builder.terminal.gschema.xml \
 		org.gnome.builder.workbench.gschema.xml
 
 OPTIONS_SUB=		YES
 OPTIONS_DEFINE=		CLANG DOCS
 OPTIONS_DEFAULT=	CLANG
 
 # track the latest llvm/clang version, the config script picks the newest available
 CLANG_DESC=		Build the clang plugin
 CLANG_MESON_TRUE=	plugin_clang
 CLANG_USES=		llvm:build,run
 CLANG_CONFIGURE_ENV=	LLVM_CONFIG=${LLVM_CONFIG}
 
 # 11.1 and older has issues with vala generated code.
 post-patch:
 	${REINPLACE_CMD} -e '/-Werror=return-type/d' \
 		${WRKSRC}/meson.build
 
 .include <bsd.port.mk>
diff --git a/devel/grv/Makefile b/devel/grv/Makefile
index e5b82cd9d726..3a745d68692f 100644
--- a/devel/grv/Makefile
+++ b/devel/grv/Makefile
@@ -1,53 +1,53 @@
 PORTNAME=	grv
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.2
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	devel
 
 MAINTAINER=	dmgk@FreeBSD.org
 COMMENT=	Terminal interface for viewing git repositories
 WWW=		https://github.com/rgburke/grv
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 USES=		go ncurses pkgconfig readline
 USE_GITHUB=	yes
 GH_ACCOUNT=	rgburke
 GH_SUBDIR=	src/github.com/rgburke/grv
 GH_TUPLE=	bradfitz:slice:2b758aa:slice/vendor/github.com/bradfitz/slice \
 		camlistore:go4:94abd69:reflectutil/vendor/go4.org \
 		davecgh:go-spew:d8f796a:spew/vendor/github.com/davecgh/go-spew \
 		gobwas:glob:e7a84e9:glob/vendor/github.com/gobwas/glob \
 		golang:crypto:a1f597e:crypto/vendor/golang.org/x/crypto \
 		golang:sys:v0.6.0:sys/vendor/golang.org/x/sys \
 		mattn:go-runewidth:703b5e6:runewidth/vendor/github.com/mattn/go-runewidth \
 		pmezard:go-difflib:5d4384e:difflib/vendor/github.com/pmezard/go-difflib \
 		rgburke:goncurses:74f667a:goncurses/vendor/github.com/rgburke/goncurses \
 		rjeczalik:notify:629144b:notify/vendor/github.com/rjeczalik/notify \
 		Sirupsen:logrus:v1.4.0:logrus/vendor/github.com/Sirupsen/logrus \
 		stretchr:objx:c61a9df:objx/vendor/github.com/stretchr/objx \
 		stretchr:testify:34c6fa2:testify/vendor/github.com/stretchr/testify \
 		tchap:go-patricia:v2.3.0:patricia/vendor/github.com/tchap/go-patricia \
 		libgit2:git2go:ecaeb7a:git2go/vendor/gopkg.in/libgit2/git2go.v27 # Keep this in sync with devel/libgit2 version
 
 GO_TARGET=	./cmd/grv
 GO_BUILDFLAGS=	-ldflags "-X main.version=${PORTVERSION}"
 
 PLIST_FILES=	bin/grv
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	*
 
 do-test:
 	cd ${WRKSRC}; \
 		${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} test ${GO_BUILDLAGS} ${GO_TARGET}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/interactive_rebase_tool/Makefile b/devel/interactive_rebase_tool/Makefile
index a53f661e1e27..ae26caf3f155 100644
--- a/devel/interactive_rebase_tool/Makefile
+++ b/devel/interactive_rebase_tool/Makefile
@@ -1,166 +1,166 @@
 PORTNAME=	interactive_rebase_tool
 DISTVERSION=	2.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	petteri.valkonen@iki.fi
 COMMENT=	Improved sequence editor for Git
 WWW=		https://gitrebasetool.mitmaro.ca/
 
 LICENSE=	GPLv3+
 
 LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 USES=		cargo
 USE_GITHUB=	yes
 GH_ACCOUNT=	MitMaro
 GH_PROJECT=	git-interactive-rebase-tool
 
 CARGO_CRATES=	aho-corasick-1.0.2 \
 		android-tzdata-0.1.1 \
 		android_system_properties-0.1.4 \
 		anyhow-1.0.72 \
 		arrayvec-0.7.2 \
 		autocfg-1.1.0 \
 		bitflags-1.3.2 \
 		bumpalo-3.13.0 \
 		captur-0.1.0 \
 		cc-1.0.73 \
 		cfg-if-1.0.0 \
 		chrono-0.4.26 \
 		core-foundation-sys-0.8.3 \
 		crossbeam-channel-0.5.8 \
 		crossbeam-utils-0.8.8 \
 		crossterm-0.26.1 \
 		crossterm_winapi-0.9.0 \
 		dashmap-5.3.3 \
 		diff-0.1.12 \
 		errno-0.3.1 \
 		errno-dragonfly-0.1.2 \
 		fastrand-1.7.0 \
 		form_urlencoded-1.0.1 \
 		futures-0.3.21 \
 		futures-channel-0.3.21 \
 		futures-core-0.3.21 \
 		futures-executor-0.3.21 \
 		futures-io-0.3.21 \
 		futures-macro-0.3.21 \
 		futures-sink-0.3.21 \
 		futures-task-0.3.21 \
 		futures-timer-3.0.2 \
 		futures-util-0.3.21 \
 		getrandom-0.2.6 \
 		git2-0.15.0 \
 		glob-0.3.1 \
 		hashbrown-0.12.3 \
 		hermit-abi-0.3.2 \
 		iana-time-zone-0.1.45 \
 		idna-0.2.3 \
 		if_chain-1.0.2 \
 		instant-0.1.12 \
 		io-lifetimes-1.0.11 \
 		itoa-1.0.4 \
 		jobserver-0.1.24 \
 		js-sys-0.3.59 \
 		lazy_static-1.4.0 \
 		libc-0.2.147 \
 		libgit2-sys-0.14.2+1.5.1 \
 		libz-sys-1.1.6 \
 		linux-raw-sys-0.3.8 \
 		lock_api-0.4.7 \
 		log-0.4.16 \
 		matches-0.1.9 \
 		memchr-2.5.0 \
 		mio-0.8.2 \
 		miow-0.3.7 \
 		ntapi-0.3.7 \
 		num-format-0.4.4 \
 		num-traits-0.2.14 \
 		once_cell-1.13.1 \
 		parking_lot-0.12.1 \
 		parking_lot_core-0.9.2 \
 		percent-encoding-2.1.0 \
 		pico-args-0.5.0 \
 		pin-project-lite-0.2.9 \
 		pin-utils-0.1.0 \
 		pkg-config-0.3.25 \
 		ppv-lite86-0.2.16 \
 		pretty_assertions-1.4.0 \
 		proc-macro2-1.0.66 \
 		quote-1.0.29 \
 		rand-0.8.5 \
 		rand_chacha-0.3.1 \
 		rand_core-0.6.3 \
 		redox_syscall-0.2.13 \
 		redox_syscall-0.3.5 \
 		regex-1.9.1 \
 		regex-automata-0.3.3 \
 		regex-syntax-0.7.4 \
 		relative-path-1.8.0 \
 		rstest-0.18.1 \
 		rstest_macros-0.18.1 \
 		rustc_version-0.4.0 \
 		rustix-0.37.23 \
 		scopeguard-1.1.0 \
 		semver-1.0.7 \
 		serial_test-2.0.0 \
 		serial_test_derive-2.0.0 \
 		signal-hook-0.3.13 \
 		signal-hook-mio-0.2.3 \
 		signal-hook-registry-1.4.0 \
 		slab-0.4.6 \
 		smallvec-1.8.0 \
 		syn-1.0.104 \
 		syn-2.0.26 \
 		tempfile-3.6.0 \
 		thiserror-1.0.43 \
 		thiserror-impl-1.0.43 \
 		time-0.1.44 \
 		tinyvec-1.6.0 \
 		tinyvec_macros-0.1.0 \
 		unicode-bidi-0.3.8 \
 		unicode-ident-1.0.5 \
 		unicode-normalization-0.1.19 \
 		unicode-segmentation-1.10.1 \
 		unicode-width-0.1.10 \
 		url-2.2.2 \
 		uuid-1.4.1 \
 		vcpkg-0.2.15 \
 		version-track-0.1.0 \
 		wasi-0.10.0+wasi-snapshot-preview1 \
 		wasi-0.11.0+wasi-snapshot-preview1 \
 		wasm-bindgen-0.2.82 \
 		wasm-bindgen-backend-0.2.82 \
 		wasm-bindgen-macro-0.2.82 \
 		wasm-bindgen-macro-support-0.2.82 \
 		wasm-bindgen-shared-0.2.82 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
 		windows-sys-0.34.0 \
 		windows-sys-0.48.0 \
 		windows-targets-0.48.1 \
 		windows_aarch64_gnullvm-0.48.0 \
 		windows_aarch64_msvc-0.34.0 \
 		windows_aarch64_msvc-0.48.0 \
 		windows_i686_gnu-0.34.0 \
 		windows_i686_gnu-0.48.0 \
 		windows_i686_msvc-0.34.0 \
 		windows_i686_msvc-0.48.0 \
 		windows_x86_64_gnu-0.34.0 \
 		windows_x86_64_gnu-0.48.0 \
 		windows_x86_64_gnullvm-0.48.0 \
 		windows_x86_64_msvc-0.34.0 \
 		windows_x86_64_msvc-0.48.0 \
 		xi-unicode-0.3.0 \
 		yansi-0.5.1 \
 		claim@git+https://github.com/Turbo87/rust-claim.git?rev=23892a3\#23892a345d38e1434303143a73033925284ad04d
 
 PLIST_FILES=	bin/interactive-rebase-tool \
 		man/man1/interactive-rebase-tool.1.gz
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/interactive-rebase-tool
 	${INSTALL_MAN} ${WRKSRC}/src/interactive-rebase-tool.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/devel/kf5-ktexteditor/Makefile b/devel/kf5-ktexteditor/Makefile
index 12e9d69324af..61b187b0e52f 100644
--- a/devel/kf5-ktexteditor/Makefile
+++ b/devel/kf5-ktexteditor/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	ktexteditor
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 advanced embeddable text editor
 
 LIB_DEPENDS=	libgit2.so:devel/libgit2 \
 		libeditorconfig.so:editors/editorconfig-core-c
 
 USES=		cmake compiler:c++11-lib gettext kde:5 cpe pkgconfig \
 		qt:5 tar:xz xorg
 USE_KDE=	archive auth codecs completion config configwidgets \
 		coreaddons guiaddons i18n iconthemes itemviews \
 		jobwidgets kio parts service solid sonnet syntaxhighlighting \
 		textwidgets widgetsaddons windowsystem xmlgui \
 		ecm:build
 USE_QT=		concurrent core dbus declarative gui network printsupport \
 		script widgets xml xmlpatterns \
 		buildtools:build qmake:build
 USE_XORG=	x11
 
 .include <bsd.port.mk>
diff --git a/devel/libegit2/Makefile b/devel/libegit2/Makefile
index ba897c82afa6..5cc2fffdd4db 100644
--- a/devel/libegit2/Makefile
+++ b/devel/libegit2/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	libegit2
 DISTVERSION=	g20200515
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Emacs bindings for libgit2
 WWW=		https://github.com/magit/libegit2
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 USES=		cmake:noninja emacs pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 GH_TAGNAME=	0ef8b13
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	USE_SYSTEM_LIBGIT2
 
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	${REINPLACE_CMD} \
 		's,%%LIBEGIT2_INSTALL_DIR%%,${PREFIX}/${EMACS_VERSION_SITE_LISPDIR},' \
 		${WRKSRC}/libgit.el
 
 post-build:
 	(cd ${WRKSRC} \
 	&& ${EMACS_CMD} -Q -batch -L . -f batch-byte-compile libgit.el)
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/../.build/libegit2.so \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/libgit.el ${WRKSRC}/libgit.elc \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/libgit2-glib/Makefile b/devel/libgit2-glib/Makefile
index a31cb2df8206..80694229b995 100644
--- a/devel/libgit2-glib/Makefile
+++ b/devel/libgit2-glib/Makefile
@@ -1,37 +1,38 @@
 # Also update devel/libgit2, devel/rubygem-rugged, devel/py-pygit2
 
 PORTNAME=	libgit2-glib
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Glib wrapper library around the libgit2 git access library
 WWW=		https://gitlab.gnome.org/GNOME/libgit2-glib
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 USES=		compiler:c11 gnome localbase \
 		meson pkgconfig python:build tar:xz vala:build
 USE_GNOME=	glib20 introspection
 USE_LDCONFIG=	yes
 MESON_ARGS=	-Dpython=false
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
 # XXX: meson_vapi_link.py does not respect STAGEDIR for some reason and silently
 # fails when building as user and touches the external fs when building as root.
 # Neutralize it.  We replicate what it does in post-install.
 post-patch:
 	@${ECHO_CMD} '#!/bin/sh' > ${WRKSRC}/meson_vapi_link.py
 
 post-install:
 	${RLN} ${STAGEDIR}${PREFIX}/share/vala/vapi/libgit2-glib-1.0.deps \
 		${STAGEDIR}${PREFIX}/share/vala/vapi/ggit-1.0.deps
 	${RLN} ${STAGEDIR}${PREFIX}/share/vala/vapi/libgit2-glib-1.0.vapi \
 		${STAGEDIR}${PREFIX}/share/vala/vapi/ggit-1.0.vapi
 
 .include <bsd.port.mk>
diff --git a/devel/sentry-cli/Makefile b/devel/sentry-cli/Makefile
index c9862d43bd77..761caae12341 100644
--- a/devel/sentry-cli/Makefile
+++ b/devel/sentry-cli/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	sentry-cli
 DISTVERSION=	2.20.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	lcook@FreeBSD.org
 COMMENT=	Command line utility to work with Sentry
 WWW=		https://docs.sentry.io/cli/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libgit2.so:devel/libgit2 \
 		libzstd.so:archivers/zstd
 
 USES=		cargo ssl:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	getsentry
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	CHANGELOG.md README.md
 
 OPTIONS_DEFINE=		DOCS REPORTING
 OPTIONS_DEFAULT=	REPORTING
 
 REPORTING_DESC=	Enable crash reporting
 REPORTING_VARS=	CARGO_FEATURES+=with_crash_reporting
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/editors/elementary-code/Makefile b/editors/elementary-code/Makefile
index 9629b1174e35..28bb7b020556 100644
--- a/editors/elementary-code/Makefile
+++ b/editors/elementary-code/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=	elementary-code
 DISTVERSION=	7.1.0
+PORTREVISION=	1
 CATEGORIES=	editors
 
 MAINTAINER=	miguel@gocobachi.dev
 COMMENT=	Code editor designed for elementary OS
 WWW=		https://github.com/elementary/code
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libeditorconfig.so:editors/editorconfig-core-c \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libgee-0.8.so:devel/libgee \
 		libgit2-glib-1.0.so:devel/libgit2-glib \
 		libgranite.so:x11-toolkits/granite \
 		libgtkspell3-3.so:textproc/gtkspell3 \
 		libhandy-1.so:x11-toolkits/libhandy \
 		libpeas-1.0.so:devel/libpeas \
 		libpeas-gtk-1.0.so:devel/libpeas \
 		libsoup-2.4.so:devel/libsoup \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk3
 RUN_DEPENDS=	droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf \
 		pkcheck:sysutils/polkit
 
 USES=		compiler:c++11-lang desktop-file-utils gettext gnome meson \
 		ninja pkgconfig python:build vala:lib xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	elementary
 GH_PROJECT=	code
 USE_GNOME=	atk cairo glib20 gtk30 gtksourceview4 pango vte3
 GLIB_SCHEMAS=	io.elementary.code.gschema.xml \
 		io.elementary.code.plugins.spell.gschema.xml
 USE_LDCONFIG=	yes
 USE_XORG=	x11
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 do-test:
 	cd ${WRKSRC}/${MESON_BUILD_DIR} && ninja test
 
 .include <bsd.port.mk>
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index edd7a551e6c5..75d46bc2eea0 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	gedit-plugins
 PORTVERSION=	43.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors gnome
 MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Plugins for GEdit
 WWW=		https://wiki.gnome.org/Apps/Gedit/PluginsLists
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gedit>=0:editors/gedit \
 		itstool:textproc/itstool \
 		${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR}
 LIB_DEPENDS=	libpeas-1.0.so:devel/libpeas \
 		libgit2-glib-1.0.so:devel/libgit2-glib \
 		libgucharmap_2_90.so:deskutils/gucharmap
 RUN_DEPENDS=	gedit>=0:editors/gedit \
 		${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR}
 
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c11 gettext gnome localbase meson pkgconfig \
 		python shebangfix tar:xz vala:build
 USE_GNOME=	cairo gdkpixbuf2 gtk30 gtksourceview4 intlhack introspection \
 		vte3
 USE_CSTD=	c11
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 SHEBANG_FILES=	plugins/synctex/synctex/evince_dbus.py
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 GLIB_SCHEMAS=	org.gnome.gedit.plugins.drawspaces.gschema.xml \
 		org.gnome.gedit.plugins.wordcompletion.gschema.xml \
 		org.gnome.gedit.plugins.terminal.gschema.xml
 
 .include <bsd.port.mk>
diff --git a/editors/jucipp/Makefile b/editors/jucipp/Makefile
index 1a2e5bd813dd..6b71bfcc0939 100644
--- a/editors/jucipp/Makefile
+++ b/editors/jucipp/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	jucipp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 
 MAINTAINER=	info@babaei.net
 COMMENT=	Lightweight C++-IDE with support for C++11, C++14 and C++17
 WWW=		https://gitlab.com/cppit/jucipp
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT}
 LIB_DEPENDS=	libaspell.so:textproc/aspell \
 		libboost_filesystem.so:devel/boost-libs \
 		libgit2.so:devel/libgit2 \
 		libharfbuzz.so:print/harfbuzz
 RUN_DEPENDS=	llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \
 		uctags:devel/universal-ctags
 
 USES=		cmake compiler:c++14-lang desktop-file-utils gnome pkgconfig
 USE_GITLAB=	yes
 GL_ACCOUNT=	cppit
 GL_TAGNAME=	692f3de1f0aad00051096579975e515bccc3802a
 GL_TUPLE=	cppit:libclangmm:9704b9b6de0982a588fa41741157d5640afedf30:libclangmm/lib/libclangmm \
 		eidheim:tiny-process-library:839ff806dc447ff49af80f9a9eaa7949f770f8e5:tinyprocesslibrary/lib/tiny-process-library
 USE_GNOME=	gdkpixbuf2 gtkmm30 gtksourceviewmm3
 
 CMAKE_ARGS=	-DCMAKE_INCLUDE_PATH=${LOCALBASE}/llvm${LLVM_DEFAULT}/include \
 		-DCMAKE_LIBRARY_PATH=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib
 
 PLIST_FILES=	bin/juci \
 		share/applications/juci.desktop \
 		share/icons/hicolor/scalable/apps/juci.svg
 OPTIONS_DEFINE=	TEST
 
 TEST_CMAKE_BOOL=	BUILD_TESTING BUILD_FUZZING
 
 .include <bsd.port.mk>
diff --git a/editors/kate/Makefile b/editors/kate/Makefile
index c2d79fe86e49..d6cac7097e8a 100644
--- a/editors/kate/Makefile
+++ b/editors/kate/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	kate
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	editors kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic editor framework for the KDE system
 WWW=		https://kate-editor.org/
 
 BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
 		docbook-xml>0:textproc/docbook-xml
 LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 USES=		cmake compiler:c++11-lang desktop-file-utils gettext \
 		pkgconfig kde:5 qt:5 tar:xz cpe xorg
 USE_KDE=	activities attica auth bookmarks codecs completion config \
 		configwidgets coreaddons crash dbusaddons \
 		guiaddons i18n iconthemes init itemmodels itemviews \
 		jobwidgets kio newstuff package parts plasma-framework \
 		service solid sonnet syntaxhighlighting texteditor textwidgets \
 		threadweaver wallet widgetsaddons windowsystem xmlgui \
 		doctools:build ecm:build
 USE_QT=		concurrent core dbus gui network script sql widgets xml \
 		buildtools:build qmake:build testlib:build
 USE_XORG=	x11
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/editors/lapce/Makefile b/editors/lapce/Makefile
index 691032b302e8..59d7550ef4bd 100644
--- a/editors/lapce/Makefile
+++ b/editors/lapce/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	lapce
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.8	# remove openssl-src-* from CARGO-CRATES each update
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Lightning-fast and Powerful Code Editor
 WWW=		https://lapce.dev/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 NOT_FOR_ARCHS=	i386
 NOT_FOR_ARCHS_REASON_i386=	doesn't build: [zstd-sys 2.0.1+zstd.1.5.2] AR_i686_unknown_freebsd = None
 
 BUILD_DEPENDS=	p5-Cairo-GObject>0:devel/p5-Cairo-GObject \
 		p5-FindBin-libs>0:devel/p5-FindBin-libs
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libgit2.so:devel/libgit2 \
 		libssh2.so:security/libssh2
 
 USES=		cargo gmake gnome localbase:ldflags perl5 pkgconfig ssl
 USE_GITHUB=	yes
 USE_GNOME=	atk gdkpixbuf2 gtk30 pango
 
 PLIST_FILES=	bin/lapce \
 		bin/lapce-proxy
 
 #patch druid manually since it's not yet patched upstream
 post-patch:
 	@${FIND} ${WRKSRC}/../druid-0b9c00fcda238e392e758382f25166cd748fd305 \
 		 -name "*.toml" -o -name "*.rs" | ${XARGS} ${REINPLACE_CMD} -i '' -e 's|openbsd|freebsd|g'
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lapce
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lapce-proxy
 
 .include <bsd.port.mk>
diff --git a/editors/pluma-plugins/Makefile b/editors/pluma-plugins/Makefile
index 3469075b2e4e..851663a22b9b 100644
--- a/editors/pluma-plugins/Makefile
+++ b/editors/pluma-plugins/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	pluma-plugins
 PORTVERSION=	1.26.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Plugins for Pluma
 WWW=		https://mate-desktop.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	pluma>=0:editors/pluma \
 		itstool:textproc/itstool \
 		${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR}
 
 LIB_DEPENDS=	libpeas-1.0.so:devel/libpeas \
  		libgit2-glib-1.0.so:devel/libgit2-glib \
 		libgucharmap_2_90.so:deskutils/gucharmap
 RUN_DEPENDS=	pluma>=0:editors/pluma \
 		${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR}
 
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c11 gettext gnome localbase gmake pkgconfig \
 		python shebangfix tar:xz
 USE_GNOME=	cairo gdkpixbuf2 gtk30 gtksourceview4 intlhack introspection \
 		intltool vte3
 USE_CSTD=	c11
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.mate.pluma.plugins.sourcecodebrowser.gschema.xml \
 		org.mate.pluma.plugins.terminal.gschema.xml \
 		org.mate.pluma.plugins.wordcompletion.gschema.xml
 
 .include <bsd.port.mk>
diff --git a/lang/julia/Makefile b/lang/julia/Makefile
index daaf8c24240d..81eff1301518 100644
--- a/lang/julia/Makefile
+++ b/lang/julia/Makefile
@@ -1,137 +1,138 @@
 PORTNAME=	julia
 DISTVERSION=	1.9.3
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-full
 CATEGORIES=	lang math
 MASTER_SITES=	https://github.com/JuliaLang/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Implementation of Julia, a language for technical computing
 WWW=		https://julialang.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 ONLY_FOR_ARCHS=		amd64
 ONLY_FOR_ARCHS_REASON=	Has not been ported to this platform for freebsd
 
 MY_DEPENDS=	7zz:archivers/7-zip
 BUILD_DEPENDS=	patchelf:sysutils/patchelf \
 		cmake:devel/cmake-core \
 		${MY_DEPENDS}
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libgit2.so:devel/libgit2 \
 		libgmp.so:math/gmp \
 		libmbedtls.so:security/mbedtls \
 		libmpfr.so:math/mpfr \
 		libpcre2-8.so:devel/pcre2 \
 		libssh2.so:security/libssh2 \
 		libutf8proc.so:textproc/utf8proc \
 		libnghttp2.so:www/libnghttp2 \
 		libunwind.so:devel/libunwind \
 		libopenlibm.so:math/openlibm
 RUN_DEPENDS=	${MY_DEPENDS}
 
 USES=		gmake cpe fortran python perl5 blaslapack:openblas
 
 CPE_VENDOR=	julialang
 
 USE_CXXSTD=	c++14
 USE_LDCONFIG=	yes
 
 MAKE_ARGS+=	NO_GIT=1 \
 		USE_BINARYBUILDER=0 \
 		prefix=${PREFIX} \
 		JCXXFLAGS="${CXXFLAGS}" \
 		USE_GPL_LIBS=0 \
 		ARCH=x86_64 \
 		JULIA_CPU_TARGET=generic \
 		USE_SYSTEM_CURL=1 \
 		USE_SYSTEM_GMP=1 \
 		USE_SYSTEM_OPENLIBM=1 \
 		USE_SYSTEM_LAPACK=1 \
 		USE_SYSTEM_LIBGIT2=1 \
 		USE_SYSTEM_LIBSSH2=1 \
 		USE_SYSTEM_MBEDTLS=1 \
 		USE_SYSTEM_MPFR=1 \
 		USE_SYSTEM_PATCHELF=1 \
 		USE_SYSTEM_PCRE=1 \
 		USE_SYSTEM_UTF8PROC=1 \
 		USE_SYSTEM_P7ZIP=1 \
 		USE_SYSTEM_BLAS=1 \
 		USE_SYSTEM_NGHTTP2=1 \
 		USE_SYSTEM_CSL=1 \
 		USE_SYSTEM_ZLIB=1 \
 		USE_SYSTEM_LIBUNWIND=1
 ALL_TARGET=	default
 INSTALL_TARGET=	install
 TEST_TARGET=	test
 
 CFLAGS+=	-fpic
 
 BINARY_ALIAS=	python3=${PYTHON_CMD} gfortran=gfortran${_GCC_VER}
 
 WRKSRC=		${WRKDIR}/julia-${DISTVERSION}
 
 PLIST_SUB=	VERSION="${PORTVERSION:R}"
 PORTDOCS=	html
 
 OPTIONS_DEFINE=		DEBUG DOCS NATIVE
 OPTIONS_DEFAULT=	DOCS
 OPTIONS_SUB=		yes
 
 NATIVE_DESC=		Build with native CPU JIT tuning
 NATIVE_MAKE_ARGS=	JULIA_CPU_TARGET=native
 
 DEBUG_MAKE_ARGS=	FORCE_ASSERTIONS=1 \
 			ALL_TARGET=all \
 			BUNDLE_DEBUG_LIBS=1
 
 DOCS_VARS=		INSTALL_TARGET+=install-docs
 
 post-patch:
 	echo "override TAGGED_RELEASE_BANNER=\"FreeBSD port lang/${PORTNAME} build\"" >> ${WRKSRC}/Make.user
 	# unset ARCH for auto-detection
 	# Julia build script uses the name x86_86/x86, which are different from ports framework
 	echo "ARCH=" >> ${WRKSRC}/Make.user
 	echo "LIBBLAS=-lopenblas -L${LOCALBASE}/lib" >> ${WRKSRC}/Make.user
 	echo "LIBBLASNAME=libopenblas" >> ${WRKSRC}/Make.user
 	echo 'LIBLAPACK= $$(LIBBLAS)' >> ${WRKSRC}/Make.user
 	echo 'LIBLAPACKNAME= $$(LIBBLASNAME)' >> ${WRKSRC}/Make.user
 
 post-configure:
 	${CC} ${CFLAGS} -lopenblas ${LDFLAGS} -o ${WRKSRC}/check_openblas \
 		${FILESDIR}/check_openblas.c
 	${WRKSRC}/check_openblas && ( \
 		echo "USE_BLAS64=1" >> ${WRKSRC}/Make.user \
 	) || ( \
 		echo "USE_BLAS64=0" >> ${WRKSRC}/Make.user \
 	)
 
 pre-install:
 	${CP} ${WRKSRC}/deps/srccache/cacert-2022-10-11.pem ${WRKSRC}/usr/share/julia/cert.pem
 
 post-install:
 	# clean up for Pkg3.jl
 .for file in .codecov.yml .travis.yml appveyor.yml bors.toml .gitignore source-extracted *.orig
 	${FIND} ${STAGEDIR}${PREFIX}/share/julia/ -name "${file}" -delete
 .endfor
 .for dir in Statistics SuiteSparse ArgTools Pkg Downloads LibCURL NetworkOptions Tar
 	${RM} -fr ${STAGEDIR}${PREFIX}/share/julia/stdlib/v${PORTVERSION:R}/${dir}/.github/
 .endfor
 	${RM} -rf ${STAGEDIR}${PREFIX}/share/julia/compiled
 
 post-install-DEBUG-off:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/julia*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libjulia.so*
 .for bin in libccalltest.so libllvmcalltest.so libjulia-internal.so* libblastrampoline.so libdSFMT.so libuv.so* libLLVM* sys.so libjulia-codegen.so*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/julia/${bin}
 .endfor
 .for bin in lld dsymutil
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/julia/${bin}
 .endfor
 	${FIND} ${STAGEDIR}${PREFIX}/share/julia/compiled -name "*.so" | ${XARGS} ${STRIP_CMD}
 
 post-install-DOCS-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc
 
 .include <bsd.port.mk>
diff --git a/misc/broot/Makefile b/misc/broot/Makefile
index 4837a11a7bfc..fb14489d99df 100644
--- a/misc/broot/Makefile
+++ b/misc/broot/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	broot
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.25.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 
 MAINTAINER=	lcook@FreeBSD.org
 COMMENT=	Quick and easy new way to see and navigate directory trees
 WWW=		https://dystroy.org/broot/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgit2.so:devel/libgit2 \
 		libonig.so:devel/oniguruma
 RUN_DEPENDS=	git:devel/git
 
 USES=		cargo
 USE_GITHUB=	yes
 GH_ACCOUNT=	canop
 
 SUB_FILES=	pkg-message
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz
 PORTDOCS=	CHANGELOG.md README.md features.md
 
 OPTIONS_DEFINE=		CLIPBOARD DOCS
 OPTIONS_DEFAULT=	CLIPBOARD
 
 CLIPBOARD_DESC=	Enable terminal X11 clipboard support
 
 CLIPBOARD_USES=		python:build xorg
 CLIPBOARD_USE=		XORG=xcb
 CLIPBOARD_BINARY_ALIAS=	python3=${PYTHON_CMD}
 CLIPBOARD_VARS=		CARGO_FEATURES+=clipboard
 
 _BUILD_VERSION=	${DISTVERSION}
 _BUILD_DATE=	$$(date +'%Y/%m/%d')
 
 pre-build:
 	@${MV} ${WRKSRC}/man/page \
 		${WRKSRC}/man/${PORTNAME}.1
 	@${REINPLACE_CMD} -e 's|#version|${_BUILD_VERSION}|g' \
 		-e "s|#date|${_BUILD_DATE}|g" \
 		${WRKSRC}/man/${PORTNAME}.1
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} \
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/security/cargo-audit/Makefile b/security/cargo-audit/Makefile
index fbf0426c9dd2..89de1528430a 100644
--- a/security/cargo-audit/Makefile
+++ b/security/cargo-audit/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	cargo-audit
 DISTVERSIONPREFIX=	${PORTNAME}/v
 DISTVERSION=	0.17.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 
 MAINTAINER=	mikael@FreeBSD.org
 COMMENT=	Audit Cargo.lock for crates with security vulnerabilities
 WWW=		https://rustsec.org/
 
 LICENSE=	APACHE20 MIT
 LICENSE_COMB=	dual
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-APACHE
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
 
 LIB_DEPENDS=	libgit2.so:devel/libgit2 \
 		libssh2.so:security/libssh2
 
 USES=		cargo localbase ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	RustSec
 GH_PROJECT=	rustsec
 
 NO_TEST=	yes
 
 PLIST_FILES=	bin/cargo-audit
 
 WRKSRC_SUBDIR=	cargo-audit
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cargo-audit
 
 .include <bsd.port.mk>
diff --git a/shells/starship/Makefile b/shells/starship/Makefile
index c5f3110623b0..d68442bc1ac0 100644
--- a/shells/starship/Makefile
+++ b/shells/starship/Makefile
@@ -1,413 +1,413 @@
 PORTNAME=	starship
 DISTVERSION=	1.16.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	shells
 MASTER_SITES=	CRATESIO
 DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${CARGO_CRATE_EXT}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Cross-shell prompt for astronauts
 WWW=		https://starship.rs/
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	cargo crashes on shells/starship on i386, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=267529
 
 LIB_DEPENDS=	libgit2.so:devel/libgit2 \
 		libssh2.so:security/libssh2
 
 USES=		cargo ssl
 
 CARGO_CRATES=	adler-1.0.2 \
 		ahash-0.8.3 \
 		aho-corasick-1.0.2 \
 		android-tzdata-0.1.1 \
 		android_system_properties-0.1.5 \
 		anstream-0.3.2 \
 		anstyle-1.0.1 \
 		anstyle-parse-0.2.1 \
 		anstyle-query-1.0.0 \
 		anstyle-wincon-1.0.1 \
 		anyhow-1.0.71 \
 		arc-swap-1.6.0 \
 		arrayvec-0.7.4 \
 		async-broadcast-0.5.1 \
 		async-channel-1.8.0 \
 		async-executor-1.5.1 \
 		async-fs-1.6.0 \
 		async-io-1.13.0 \
 		async-lock-2.7.0 \
 		async-process-1.7.0 \
 		async-recursion-1.0.4 \
 		async-task-4.4.0 \
 		async-trait-0.1.68 \
 		atomic-waker-1.1.1 \
 		autocfg-1.1.0 \
 		base64-0.13.1 \
 		bitflags-1.3.2 \
 		bitflags-2.3.3 \
 		block-0.1.6 \
 		block-buffer-0.9.0 \
 		block-buffer-0.10.4 \
 		blocking-1.3.1 \
 		bstr-1.5.0 \
 		btoi-0.4.3 \
 		bumpalo-3.13.0 \
 		byteorder-1.4.3 \
 		bytesize-1.2.0 \
 		cc-1.0.79 \
 		cfg-if-1.0.0 \
 		chrono-0.4.26 \
 		clap-4.3.19 \
 		clap_builder-4.3.19 \
 		clap_complete-4.3.2 \
 		clap_derive-4.3.12 \
 		clap_lex-0.5.0 \
 		clru-0.6.1 \
 		cmake-0.1.50 \
 		colorchoice-1.0.0 \
 		concurrent-queue-2.2.0 \
 		const-random-0.1.15 \
 		const-random-macro-0.1.15 \
 		const_format-0.2.31 \
 		const_format_proc_macros-0.2.31 \
 		core-foundation-0.9.3 \
 		core-foundation-sys-0.8.4 \
 		cpufeatures-0.2.8 \
 		crc32fast-1.3.2 \
 		crossbeam-0.8.2 \
 		crossbeam-channel-0.5.8 \
 		crossbeam-deque-0.8.3 \
 		crossbeam-epoch-0.9.15 \
 		crossbeam-queue-0.3.8 \
 		crossbeam-utils-0.8.16 \
 		crunchy-0.2.2 \
 		crypto-common-0.1.6 \
 		deelevate-0.2.0 \
 		derivative-2.2.0 \
 		difflib-0.4.0 \
 		digest-0.9.0 \
 		digest-0.10.7 \
 		dirs-4.0.0 \
 		dirs-next-2.0.0 \
 		dirs-sys-0.3.7 \
 		dirs-sys-next-0.1.2 \
 		dlv-list-0.5.0 \
 		downcast-0.11.0 \
 		dunce-1.0.4 \
 		dyn-clone-1.0.11 \
 		either-1.8.1 \
 		encoding_rs-0.8.32 \
 		enumflags2-0.7.7 \
 		enumflags2_derive-0.7.7 \
 		equivalent-1.0.0 \
 		errno-0.2.8 \
 		errno-0.3.1 \
 		errno-dragonfly-0.1.2 \
 		event-listener-2.5.3 \
 		fastrand-1.9.0 \
 		fastrand-2.0.0 \
 		filedescriptor-0.8.2 \
 		filetime-0.2.21 \
 		flate2-1.0.26 \
 		float-cmp-0.9.0 \
 		fnv-1.0.7 \
 		form_urlencoded-1.2.0 \
 		fragile-2.0.0 \
 		futures-core-0.3.28 \
 		futures-io-0.3.28 \
 		futures-lite-1.13.0 \
 		futures-sink-0.3.28 \
 		futures-task-0.3.28 \
 		futures-util-0.3.28 \
 		generic-array-0.14.7 \
 		gethostname-0.4.3 \
 		getrandom-0.2.10 \
 		gix-0.50.1 \
 		gix-actor-0.24.1 \
 		gix-attributes-0.16.0 \
 		gix-bitmap-0.2.6 \
 		gix-chunk-0.4.4 \
 		gix-command-0.2.8 \
 		gix-commitgraph-0.18.1 \
 		gix-config-0.26.1 \
 		gix-config-value-0.12.5 \
 		gix-credentials-0.17.1 \
 		gix-date-0.7.1 \
 		gix-diff-0.33.1 \
 		gix-discover-0.22.1 \
 		gix-features-0.31.1 \
 		gix-features-0.32.1 \
 		gix-filter-0.2.0 \
 		gix-fs-0.3.0 \
 		gix-fs-0.4.1 \
 		gix-glob-0.10.1 \
 		gix-hash-0.11.4 \
 		gix-hashtable-0.2.4 \
 		gix-ignore-0.5.1 \
 		gix-index-0.21.1 \
 		gix-lock-7.0.1 \
 		gix-mailmap-0.16.1 \
 		gix-negotiate-0.5.1 \
 		gix-object-0.33.1 \
 		gix-odb-0.50.1 \
 		gix-pack-0.40.2 \
 		gix-packetline-blocking-0.16.4 \
 		gix-path-0.8.4 \
 		gix-prompt-0.5.4 \
 		gix-quote-0.4.6 \
 		gix-ref-0.33.2 \
 		gix-refspec-0.14.1 \
 		gix-revision-0.18.1 \
 		gix-revwalk-0.4.1 \
 		gix-sec-0.8.4 \
 		gix-tempfile-7.0.0 \
 		gix-trace-0.1.3 \
 		gix-traverse-0.30.1 \
 		gix-url-0.21.1 \
 		gix-utils-0.1.5 \
 		gix-validate-0.7.7 \
 		gix-worktree-0.23.0 \
 		guess_host_triple-0.1.3 \
 		hashbrown-0.12.3 \
 		hashbrown-0.13.2 \
 		hashbrown-0.14.0 \
 		heck-0.4.1 \
 		hermit-abi-0.3.1 \
 		hex-0.4.3 \
 		home-0.5.5 \
 		iana-time-zone-0.1.57 \
 		iana-time-zone-haiku-0.1.2 \
 		idna-0.4.0 \
 		imara-diff-0.1.5 \
 		indexmap-1.9.3 \
 		indexmap-2.0.0 \
 		instant-0.1.12 \
 		io-close-0.3.7 \
 		io-lifetimes-1.0.11 \
 		is-docker-0.2.0 \
 		is-terminal-0.4.8 \
 		is-wsl-0.4.0 \
 		is_debug-1.0.1 \
 		itertools-0.10.5 \
 		itoa-1.0.6 \
 		js-sys-0.3.64 \
 		jwalk-0.8.1 \
 		kstring-2.0.0 \
 		lazy_static-1.4.0 \
 		lazycell-1.3.0 \
 		libc-0.2.147 \
 		libz-ng-sys-1.1.9 \
 		libz-sys-1.1.9 \
 		linked-hash-map-0.5.6 \
 		linux-raw-sys-0.3.8 \
 		linux-raw-sys-0.4.3 \
 		lock_api-0.4.10 \
 		log-0.4.19 \
 		mac-notification-sys-0.5.6 \
 		mach2-0.4.1 \
 		malloc_buf-0.0.6 \
 		memchr-2.5.0 \
 		memmap2-0.7.1 \
 		memmem-0.1.1 \
 		memoffset-0.7.1 \
 		memoffset-0.9.0 \
 		minimal-lexical-0.2.1 \
 		miniz_oxide-0.7.1 \
 		mockall-0.11.4 \
 		mockall_derive-0.11.4 \
 		nix-0.26.2 \
 		nom-5.1.3 \
 		nom-7.1.3 \
 		normalize-line-endings-0.3.0 \
 		notify-rust-4.8.0 \
 		nu-ansi-term-0.49.0 \
 		num-derive-0.3.3 \
 		num-traits-0.2.15 \
 		num_cpus-1.16.0 \
 		num_threads-0.1.6 \
 		objc-0.2.7 \
 		objc-foundation-0.1.1 \
 		objc_id-0.1.1 \
 		once_cell-1.18.0 \
 		opaque-debug-0.3.0 \
 		open-5.0.0 \
 		ordered-float-2.10.0 \
 		ordered-multimap-0.6.0 \
 		ordered-stream-0.2.0 \
 		os_info-3.7.0 \
 		parking-2.1.0 \
 		parking_lot-0.12.1 \
 		parking_lot_core-0.9.8 \
 		path-slash-0.2.1 \
 		pathdiff-0.2.1 \
 		pathsearch-0.2.0 \
 		percent-encoding-2.3.0 \
 		pest-2.7.1 \
 		pest_derive-2.7.1 \
 		pest_generator-2.7.1 \
 		pest_meta-2.7.1 \
 		phf-0.11.2 \
 		phf_codegen-0.11.2 \
 		phf_generator-0.11.2 \
 		phf_shared-0.11.2 \
 		pin-project-lite-0.2.9 \
 		pin-utils-0.1.0 \
 		pkg-config-0.3.27 \
 		polling-2.8.0 \
 		ppv-lite86-0.2.17 \
 		predicates-2.1.5 \
 		predicates-core-1.0.6 \
 		predicates-tree-1.0.9 \
 		proc-macro-crate-1.3.1 \
 		proc-macro-hack-0.5.20+deprecated \
 		proc-macro2-1.0.63 \
 		process_control-4.0.3 \
 		prodash-25.0.0 \
 		quick-xml-0.23.1 \
 		quick-xml-0.30.0 \
 		quote-1.0.29 \
 		rand-0.8.5 \
 		rand_chacha-0.3.1 \
 		rand_core-0.6.4 \
 		rayon-1.7.0 \
 		rayon-core-1.11.0 \
 		redox_syscall-0.2.16 \
 		redox_syscall-0.3.5 \
 		redox_users-0.4.3 \
 		regex-1.9.1 \
 		regex-automata-0.1.10 \
 		regex-automata-0.3.1 \
 		regex-syntax-0.7.3 \
 		rust-ini-0.19.0 \
 		rustix-0.37.21 \
 		rustix-0.38.4 \
 		ryu-1.0.13 \
 		same-file-1.0.6 \
 		schemars-0.8.12 \
 		schemars_derive-0.8.12 \
 		scopeguard-1.1.0 \
 		semver-0.11.0 \
 		semver-1.0.18 \
 		semver-parser-0.10.2 \
 		serde-1.0.178 \
 		serde_derive-1.0.178 \
 		serde_derive_internals-0.26.0 \
 		serde_json-1.0.104 \
 		serde_repr-0.1.12 \
 		serde_spanned-0.6.3 \
 		sha1-0.10.5 \
 		sha1-asm-0.5.1 \
 		sha1_smol-1.0.0 \
 		sha2-0.9.9 \
 		sha2-0.10.7 \
 		shadow-rs-0.23.0 \
 		shared_library-0.1.9 \
 		shell-words-1.1.0 \
 		signal-hook-0.1.17 \
 		signal-hook-0.3.15 \
 		signal-hook-registry-1.4.1 \
 		siphasher-0.3.10 \
 		slab-0.4.8 \
 		smallvec-1.10.0 \
 		socket2-0.4.9 \
 		starship-battery-0.8.1 \
 		static_assertions-1.1.0 \
 		strsim-0.10.0 \
 		syn-1.0.109 \
 		syn-2.0.25 \
 		systemstat-0.2.3 \
 		tauri-winrt-notification-0.1.1 \
 		tempfile-3.7.0 \
 		terminal_size-0.2.6 \
 		terminfo-0.7.5 \
 		termios-0.3.3 \
 		termtree-0.4.1 \
 		termwiz-0.15.0 \
 		thiserror-1.0.40 \
 		thiserror-impl-1.0.40 \
 		time-0.3.22 \
 		time-core-0.1.1 \
 		time-macros-0.2.9 \
 		tiny-keccak-2.0.2 \
 		tinyvec-1.6.0 \
 		tinyvec_macros-0.1.1 \
 		toml-0.5.11 \
 		toml-0.7.6 \
 		toml_datetime-0.6.3 \
 		toml_edit-0.19.14 \
 		tracing-0.1.37 \
 		tracing-attributes-0.1.26 \
 		tracing-core-0.1.31 \
 		typenum-1.16.0 \
 		ucd-trie-0.1.5 \
 		uds_windows-1.0.2 \
 		uluru-3.0.0 \
 		unicase-2.6.0 \
 		unicode-bidi-0.3.13 \
 		unicode-bom-2.0.2 \
 		unicode-ident-1.0.9 \
 		unicode-normalization-0.1.22 \
 		unicode-segmentation-1.10.1 \
 		unicode-width-0.1.10 \
 		unicode-xid-0.2.4 \
 		uom-0.34.0 \
 		url-2.4.0 \
 		urlencoding-2.1.3 \
 		utf8parse-0.2.1 \
 		vcpkg-0.2.15 \
 		version_check-0.9.4 \
 		versions-5.0.0 \
 		vtparse-0.6.2 \
 		waker-fn-1.1.0 \
 		walkdir-2.3.3 \
 		wasi-0.11.0+wasi-snapshot-preview1 \
 		wasm-bindgen-0.2.87 \
 		wasm-bindgen-backend-0.2.87 \
 		wasm-bindgen-macro-0.2.87 \
 		wasm-bindgen-macro-support-0.2.87 \
 		wasm-bindgen-shared-0.2.87 \
 		which-4.4.0 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-util-0.1.5 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
 		windows-0.39.0 \
 		windows-0.48.0 \
 		windows-sys-0.48.0 \
 		windows-targets-0.48.1 \
 		windows_aarch64_gnullvm-0.48.0 \
 		windows_aarch64_msvc-0.39.0 \
 		windows_aarch64_msvc-0.48.0 \
 		windows_i686_gnu-0.39.0 \
 		windows_i686_gnu-0.48.0 \
 		windows_i686_msvc-0.39.0 \
 		windows_i686_msvc-0.48.0 \
 		windows_x86_64_gnu-0.39.0 \
 		windows_x86_64_gnu-0.48.0 \
 		windows_x86_64_gnullvm-0.48.0 \
 		windows_x86_64_msvc-0.39.0 \
 		windows_x86_64_msvc-0.48.0 \
 		winnow-0.5.0 \
 		winres-0.1.12 \
 		xdg-home-1.0.0 \
 		yaml-rust-0.4.5 \
 		zbus-3.14.1 \
 		zbus_macros-3.14.1 \
 		zbus_names-2.6.0 \
 		zvariant-3.15.0 \
 		zvariant_derive-3.15.0 \
 		zvariant_utils-1.0.1
 
 #CARGO_FEATURES=	notify-rust
 PLIST_FILES=	bin/${PORTNAME}
 
 OPTIONS_DEFINE=		FONTS
 FONTS_DESC=		Install fonts
 FONTS_RUN_DEPENDS=	nerd-fonts>0:x11-fonts/nerd-fonts
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/sysutils/exa/Makefile b/sysutils/exa/Makefile
index c4291236d2ee..d959a8f947dd 100644
--- a/sysutils/exa/Makefile
+++ b/sysutils/exa/Makefile
@@ -1,79 +1,79 @@
 PORTNAME=	exa
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.10.1
-PORTREVISION=	24
+PORTREVISION=	25
 CATEGORIES=	sysutils
 
 MAINTAINER=	mikael@FreeBSD.org
 COMMENT=	Modern replacement for ls
 WWW=		https://the.exa.website/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
 LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 USES=		cargo
 USE_GITHUB=	yes
 GH_ACCOUNT=	ogham
 
 CARGO_CRATES=	ansi_term-0.12.1 \
 		autocfg-1.0.1 \
 		bitflags-1.2.1 \
 		byteorder-1.4.3 \
 		cc-1.0.67 \
 		cfg-if-1.0.0 \
 		datetime-0.5.2 \
 		form_urlencoded-1.0.1 \
 		git2-0.13.17 \
 		glob-0.3.0 \
 		hermit-abi-0.1.18 \
 		idna-0.2.2 \
 		jobserver-0.1.21 \
 		lazy_static-1.4.0 \
 		libc-0.2.93 \
 		libgit2-sys-0.12.18+1.1.0 \
 		libz-sys-1.1.2 \
 		locale-0.2.2 \
 		log-0.4.14 \
 		matches-0.1.8 \
 		natord-1.0.9 \
 		num_cpus-1.13.0 \
 		number_prefix-0.4.0 \
 		openssl-src-111.15.0+1.1.1k \
 		openssl-sys-0.9.61 \
 		pad-0.1.6 \
 		percent-encoding-2.1.0 \
 		pkg-config-0.3.19 \
 		redox_syscall-0.1.57 \
 		scoped_threadpool-0.1.9 \
 		term_grid-0.1.7 \
 		term_size-0.3.2 \
 		tinyvec-1.2.0 \
 		tinyvec_macros-0.1.0 \
 		unicode-bidi-0.3.5 \
 		unicode-normalization-0.1.17 \
 		unicode-width-0.1.8 \
 		url-2.2.1 \
 		users-0.11.0 \
 		vcpkg-0.2.11 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
 		zoneinfo_compiled-0.5.1
 
 PLIST_FILES=	bin/exa \
 		etc/bash_completion.d/exa.bash \
 		share/fish/completions/exa.fish \
 		share/zsh/site-functions/_exa
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/completions/completions.bash ${STAGEDIR}${PREFIX}/etc/bash_completion.d/exa.bash
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions
 	${INSTALL_DATA} ${WRKSRC}/completions/completions.fish ${STAGEDIR}${PREFIX}/share/fish/completions/exa.fish
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/completions/completions.zsh ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_exa
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/exa
 
 .include <bsd.port.mk>
diff --git a/sysutils/onefetch/Makefile b/sysutils/onefetch/Makefile
index 962729dd9729..272daf6624d8 100644
--- a/sysutils/onefetch/Makefile
+++ b/sysutils/onefetch/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	onefetch
 DISTVERSION=	2.18.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils devel
 
 MAINTAINER=	lcook@FreeBSD.org
 COMMENT=	Git repository summary on your terminal
 WWW=		https://github.com/o2sh/onefetch
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 LIB_DEPENDS=	libgit2.so:devel/libgit2
 RUN_DEPENDS=	git:devel/git
 
 USES=		cargo
 USE_GITHUB=	yes
 GH_ACCOUNT=	o2sh
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	CONTRIBUTING.md README.md
 
 OPTIONS_DEFINE=		DOCS MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 
 MANPAGES_PLIST_FILES=	man/man1/${PORTNAME}.1.gz
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 post-install-MANPAGES-on:
 	${INSTALL_MAN} ${WRKSRC}/docs/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/textproc/bat/Makefile b/textproc/bat/Makefile
index 9e02dfba06c8..287191669f78 100644
--- a/textproc/bat/Makefile
+++ b/textproc/bat/Makefile
@@ -1,197 +1,197 @@
 PORTNAME=	bat
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.23.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 
 MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	Clone of cat with syntax highlighting
 WWW=		https://github.com/sharkdp/bat
 
 LICENSE=	APACHE20
 
 LIB_DEPENDS=	libgit2.so:devel/libgit2 \
 		libonig.so:devel/oniguruma
 
 USES=		cargo cpe
 CPE_VENDOR=	${PORTNAME}_project
 USE_GITHUB=	yes
 GH_ACCOUNT=	sharkdp
 
 PLIST_FILES=	bin/bat \
 		share/zsh/site-functions/_bat \
 		man/man1/bat.1.gz
 
 CARGO_CRATES=	adler-1.0.2 \
 		aho-corasick-0.7.19 \
 		ansi_colours-1.2.1 \
 		assert_cmd-2.0.8 \
 		atty-0.2.14 \
 		autocfg-1.1.0 \
 		base64-0.13.0 \
 		bincode-1.3.3 \
 		bit-set-0.5.3 \
 		bit-vec-0.6.3 \
 		bitflags-1.3.2 \
 		bstr-1.1.0 \
 		bugreport-0.5.0 \
 		bytemuck-1.12.1 \
 		bytesize-1.1.0 \
 		cc-1.0.73 \
 		cfg-if-1.0.0 \
 		clap-4.1.8 \
 		clap_lex-0.3.2 \
 		clircle-0.3.0 \
 		console-0.15.5 \
 		content_inspector-0.2.4 \
 		crc32fast-1.3.2 \
 		difflib-0.4.0 \
 		dirs-5.0.0 \
 		dirs-sys-0.4.0 \
 		dissimilar-1.0.5 \
 		doc-comment-0.3.3 \
 		either-1.8.0 \
 		encode_unicode-0.3.6 \
 		encoding-0.2.33 \
 		encoding-index-japanese-1.20141219.5 \
 		encoding-index-korean-1.20141219.5 \
 		encoding-index-simpchinese-1.20141219.5 \
 		encoding-index-singlebyte-1.20141219.5 \
 		encoding-index-tradchinese-1.20141219.5 \
 		encoding_index_tests-0.1.4 \
 		errno-0.2.8 \
 		errno-dragonfly-0.1.2 \
 		expect-test-1.4.0 \
 		fancy-regex-0.7.1 \
 		fastrand-1.8.0 \
 		flate2-1.0.25 \
 		float-cmp-0.9.0 \
 		fnv-1.0.7 \
 		form_urlencoded-1.1.0 \
 		getrandom-0.2.7 \
 		git-version-0.3.5 \
 		git-version-macro-0.3.5 \
 		git2-0.16.1 \
 		glob-0.3.0 \
 		globset-0.4.10 \
 		grep-cli-0.1.7 \
 		hashbrown-0.12.3 \
 		hermit-abi-0.1.19 \
 		hermit-abi-0.3.1 \
 		idna-0.3.0 \
 		indexmap-1.9.1 \
 		instant-0.1.12 \
 		io-lifetimes-1.0.5 \
 		is-terminal-0.4.4 \
 		itertools-0.10.5 \
 		itoa-1.0.3 \
 		jobserver-0.1.25 \
 		lazy_static-1.4.0 \
 		libc-0.2.137 \
 		libgit2-sys-0.14.2+1.5.1 \
 		libz-sys-1.1.8 \
 		line-wrap-0.1.1 \
 		linked-hash-map-0.5.6 \
 		linux-raw-sys-0.1.4 \
 		lock_api-0.4.9 \
 		log-0.4.17 \
 		memchr-2.5.0 \
 		miniz_oxide-0.6.2 \
 		nix-0.26.2 \
 		normalize-line-endings-0.3.0 \
 		nu-ansi-term-0.47.0 \
 		num-traits-0.2.15 \
 		num_threads-0.1.6 \
 		once_cell-1.17.0 \
 		onig-6.4.0 \
 		onig_sys-69.8.1 \
 		os_str_bytes-6.3.0 \
 		parking_lot-0.11.2 \
 		parking_lot_core-0.8.5 \
 		path_abs-0.5.1 \
 		percent-encoding-2.2.0 \
 		pkg-config-0.3.25 \
 		plist-1.3.1 \
 		predicates-2.1.5 \
 		predicates-core-1.0.3 \
 		predicates-tree-1.0.5 \
 		proc-macro-error-1.0.4 \
 		proc-macro-error-attr-1.0.4 \
 		proc-macro-hack-0.5.19 \
 		proc-macro2-1.0.46 \
 		quote-1.0.21 \
 		redox_syscall-0.2.16 \
 		redox_users-0.4.3 \
 		regex-1.7.0 \
 		regex-automata-0.1.10 \
 		regex-syntax-0.6.27 \
 		remove_dir_all-0.5.3 \
 		rgb-0.8.34 \
 		rustix-0.36.8 \
 		rustversion-1.0.9 \
 		ryu-1.0.11 \
 		safemem-0.3.3 \
 		same-file-1.0.6 \
 		scopeguard-1.1.0 \
 		semver-1.0.16 \
 		serde-1.0.152 \
 		serde_derive-1.0.152 \
 		serde_json-1.0.85 \
 		serde_yaml-0.8.26 \
 		serial_test-0.6.0 \
 		serial_test_derive-0.6.0 \
 		shell-escape-0.1.5 \
 		shell-words-1.1.0 \
 		smallvec-1.10.0 \
 		static_assertions-1.1.0 \
 		std_prelude-0.2.12 \
 		strsim-0.10.0 \
 		syn-1.0.104 \
 		syntect-5.0.0 \
 		sys-info-0.9.1 \
 		tempfile-3.3.0 \
 		termcolor-1.1.3 \
 		terminal_size-0.2.5 \
 		termtree-0.2.4 \
 		thiserror-1.0.38 \
 		thiserror-impl-1.0.38 \
 		time-0.3.14 \
 		tinyvec-1.6.0 \
 		tinyvec_macros-0.1.0 \
 		unicode-bidi-0.3.8 \
 		unicode-ident-1.0.4 \
 		unicode-normalization-0.1.22 \
 		unicode-width-0.1.10 \
 		url-2.3.1 \
 		vcpkg-0.2.15 \
 		version_check-0.9.4 \
 		wait-timeout-0.2.0 \
 		walkdir-2.3.2 \
 		wasi-0.11.0+wasi-snapshot-preview1 \
 		wild-2.1.0 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-util-0.1.5 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
 		windows-sys-0.42.0 \
 		windows-sys-0.45.0 \
 		windows-targets-0.42.1 \
 		windows_aarch64_gnullvm-0.42.1 \
 		windows_aarch64_msvc-0.42.1 \
 		windows_i686_gnu-0.42.1 \
 		windows_i686_msvc-0.42.1 \
 		windows_x86_64_gnu-0.42.1 \
 		windows_x86_64_gnullvm-0.42.1 \
 		windows_x86_64_msvc-0.42.1 \
 		xml-rs-0.8.4 \
 		yaml-rust-0.4.5
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bat
 	${FIND} ${WRKDIR}/target -name "bat.1" -exec ${CP} {} ${WRKSRC}/doc/bat.1 \;
 	${FIND} ${WRKDIR}/target -name "bat.zsh" -exec ${CP} {} ${WRKSRC}/doc/bat.zsh \;
 	${INSTALL_MAN} ${WRKSRC}/doc/bat.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/doc/bat.zsh ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_bat
 
 .include <bsd.port.mk>
diff --git a/textproc/mergestat/Makefile b/textproc/mergestat/Makefile
index d2be673cef66..261f069ece4d 100644
--- a/textproc/mergestat/Makefile
+++ b/textproc/mergestat/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	mergestat
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.4
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	textproc
 
 MAINTAINER=	lcook@FreeBSD.org
 COMMENT=	Query git repositories with SQL
 WWW=		https://www.mergestat.com/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN=		fails to build
 
 BUILD_DEPENDS=	sqlite3>=3.0.0:databases/sqlite3
 LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 USES=		go:modules pkgconfig
 GO_MODULE=	github.com/${PORTNAME}/${PORTNAME}
 
 GO_BUILDFLAGS=	-tags sqlite_vtable,sqlite_json1,system_libgit2
 GO_TESTFLAGS=	${GO_BUILDFLAGS}
 
 CGO_CFLAGS+=	-DUSE_LIBSQLITE3
 CGO_LDFLAGS+=	-Wl,--unresolved-symbols=ignore-in-object-files
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 pre-patch:
 	@${MKDIR} ${WRKSRC}/vendor/go.riyazali.net/sqlite/bridge
 	@${CP} ${FILESDIR}/bridge.h ${FILESDIR}/bridge.c ${WRKSRC}/vendor/go.riyazali.net/sqlite/bridge
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} \
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/www/stagit/Makefile b/www/stagit/Makefile
index 25ec7d7da97f..0171d70fcf65 100644
--- a/www/stagit/Makefile
+++ b/www/stagit/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	stagit
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://codemadness.org/releases/stagit/
 
 MAINTAINER=	nc@FreeBSD.org
 COMMENT=	Static Git page generator
 WWW=		https://codemadness.org/git/stagit/log.html
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 USE_CSTD=	c99
 MAKE_ARGS=	COMPATOBJ="" \
 		LIBGIT_INC="-I${LOCALBASE}/include" \
 		LIBGIT_LIB="-L${LOCALBASE}/lib -lgit2"
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/stagit ${WRKSRC}/stagit-index \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/stagit.1 ${WRKSRC}/stagit-index.1 \
 		${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC} && \
 		${INSTALL_DATA} example_create.sh example_post-receive.sh \
 		favicon.png logo.png style.css ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>