diff --git a/databases/compass/Makefile b/databases/compass/Makefile
index c25f167c831e..4bcfb65c19a8 100644
--- a/databases/compass/Makefile
+++ b/databases/compass/Makefile
@@ -1,518 +1,518 @@
 PORTNAME=	compass
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.43.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	databases
 MASTER_SITES=	https://cloud.mongodb.com/static/font/:fonts \
 		https://registry.npmjs.org/fs-xattr/-/:fs_xattr \
 		https://registry.npmjs.org/kerberos/-/:kerberos \
 		https://registry.npmjs.org/mongodb-client-encryption/-/:mongoclienc \
 		https://registry.npmjs.org/os-dns-native/-/:dns
 DISTFILES=	EuclidCircularA-Semibold-WebXL.woff2:fonts \
 		EuclidCircularA-Semibold-WebXL.woff:fonts \
 		EuclidCircularA-SemiboldItalic-WebXL.woff2:fonts \
 		EuclidCircularA-SemiboldItalic-WebXL.woff:fonts \
 		EuclidCircularA-Medium-WebXL.woff2:fonts \
 		EuclidCircularA-Medium-WebXL.woff:fonts \
 		EuclidCircularA-MediumItalic-WebXL.woff2:fonts \
 		EuclidCircularA-MediumItalic-WebXL.woff:fonts \
 		EuclidCircularA-Regular-WebXL.woff2:fonts \
 		EuclidCircularA-Regular-WebXL.woff:fonts \
 		EuclidCircularA-RegularItalic-WebXL.woff2:fonts \
 		EuclidCircularA-RegularItalic-WebXL.woff:fonts \
 		fs-xattr-${NPM_FSXATTR_VER}.tgz:fs_xattr \
 		kerberos-${NPM_KERBEROS_VER}.tgz:kerberos \
 		mongodb-client-encryption-${MONGO_CLIENC_VER}.tgz:mongoclienc \
 		os-dns-native-${NPM_OSDNSNATIVE_VER}.tgz:dns
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTFILE_DEFAULT}
 
 MAINTAINER=	hiroo.ono+freebsd@gmail.com
 COMMENT=	The GUI for MongoDB
 WWW=		https://www.mongodb.com/products/compass/
 
 LICENSE=	SSPLv1
 LICENSE_NAME=	Server Side Public License
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 DEPRECATED=	Depends on expired devel/electron29
 EXPIRATION_DATE=2024-12-31
 
 DISTCACHEFILES=	${DISTCACHEFILE_npm} \
 		${DISTCACHEFILE_gyp} \
 		${DISTCACHEFILE_yarn} \
 		${DISTCACHEFILE_cargo}
 DISTCACHEFILE_npm=	${DISTDIR}/${DIST_SUBDIR}/dotnpm-${DISTVERSION}.tar.xz
 DISTCACHEFILE_gyp=	${DISTDIR}/${DIST_SUBDIR}/dotgyp-${DISTVERSION}.tar.xz
 DISTCACHEFILE_yarn=	${DISTDIR}/${DIST_SUBDIR}/dotyarn-${DISTVERSION}.tar.xz
 DISTCACHEFILE_cargo=	${DISTDIR}/${DIST_SUBDIR}/dotcargo-${DISTVERSION}.tar.xz
 APPMODFILE=	${WRKDIR}/compass_node_modules.tar
 
 ONLY_FOR_ARCHS=	aarch64 amd64
 USES=		gettext-runtime gl gnome iconv jpeg nodejs:env python:build \
 		xorg
 USE_GL=		gbm gl
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk30 libxml2 libxslt pango
 USE_XORG=	x11 xcb xcomposite xdamage xext xfixes xi xrandr xrender xtst
 USE_LDCONFIG=	${DATADIR}
 
 USE_GITHUB=	yes
 GH_TUPLE=	mongodb-js:compass:${DISTVERSIONPREFIX}${DISTVERSION} \
 		mongodb-js:reflux-state-mixin:e050454cb3be029c3e7fd2ee6a08111e4d15161f:reflux \
 		mongodb-js:zstd:${DISTVERSIONPREFIX}${MONGO_ZSTD_VER}:zstd \
 		napi-rs:napi-rs:@napi-rs/cli@${NPM_NAPI_VER}:napi
 
 FETCH_DEPENDS=	npm-node${NODEJS_VERSION}>0:www/npm-node${NODEJS_VERSION} \
 		yarn-node${NODEJS_VERSION}>0:www/yarn-node${NODEJS_VERSION} \
 		cargo:lang/rust
 # Do not use USES=cmake, because compass itself does not build with cmake.
 # The npm module it depends on uses cmake to build.
 BUILD_DEPENDS=	electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \
 		npm-node${NODEJS_VERSION}>0:www/npm-node${NODEJS_VERSION} \
 		yarn-node${NODEJS_VERSION}>0:www/yarn-node${NODEJS_VERSION} \
 		cmake:devel/cmake-core \
 		cargo:lang/rust \
 		pkg-config:devel/pkgconf \
 		zip:archivers/zip
 LIB_DEPENDS=	libmongocrypt.so:databases/libmongocrypt \
 		libatk-bridge-2.0.so:accessibility/at-spi2-core \
 		libatspi.so:accessibility/at-spi2-core \
 		libFLAC.so:audio/flac \
 		libopus.so:audio/opus \
 		libdbus-1.so:devel/dbus \
 		libicuuc.so:devel/icu \
 		libepoll-shim.so:devel/libepoll-shim \
 		libevent.so:devel/libevent \
 		libffi.so:devel/libffi \
 		libnotify.so:devel/libnotify \
 		libpci.so:devel/libpci \
 		libnspr4.so:devel/nspr \
 		libre2.so:devel/re2 \
 		libdrm.so:graphics/libdrm \
 		libpng.so:graphics/png \
 		libwayland-client.so:graphics/wayland \
 		libwebp.so:graphics/webp \
 		libdav1d.so:multimedia/dav1d \
 		libva.so:multimedia/libva \
 		libopenh264.so:multimedia/openh264 \
 		libharfbuzz.so:print/harfbuzz \
 		libsecret-1.so:security/libsecret \
 		libnss3.so:security/nss \
 		libexpat.so:textproc/expat2 \
 		libxkbcommon.so:x11/libxkbcommon \
 		libxshmfence.so:x11/libxshmfence \
 		libfontconfig.so:x11-fonts/fontconfig
 TEST_DEPENDS=	Xvfb:x11-servers/xorg-server@xvfb
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 SNDIO_PREVENTS=		ALSA PULSEAUDIO
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 
 PORTDOCS=	AUTHORS \
 		CODE_OF_CONDUCT.md \
 		CONTRIBUTING.md \
 		README.md \
 		THIRD-PARTY-NOTICES.md
 
 # Options have to be in accord with electron29.
 OPTIONS_DEFINE=		DOCS CUPS PIPEWIRE
 OPTIONS_DEFAULT=	DOCS CUPS PIPEWIRE SNDIO GSSAPI_BASE
 OPTIONS_GROUP=		AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO SNDIO
 OPTIONS_SINGLE=		GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
 GSSAPI_BASE_USES=	gssapi
 GSSAPI_HEIMDAL_USES=	gssapi:heimdal
 GSSAPI_MIT_USES=	gssapi:mit
 
 PATCH_STRIP=	-p1
 
 CXXFLAGS+=	-DNODE_API_EXPERIMENTAL \
 		-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT
 MAKE_ENV+=	${PATH_ENV}
 MAKE_ENV+=	HOME=${WRKDIR}
 MAKE_ENV+=	ELECTRON_SKIP_BINARY_DOWNLOAD=1
 .if defined(QUIET)
 MAKE_ENV+=	QUIET=yes
 .else
 MAKE_ENV+=	DEBUG=true
 .endif
 PATH_ENV=	PATH=$${PATH}:${WRKSRC}/node_modules/.bin
 PATH_ENV_zstd=	PATH=$${PATH}:${MONGO_ZSTD_DIR}/node_modules/.bin
 TEST_ENV+=	HOME=${WRKDIR}
 TEST_ENV+=	PATH=$${PATH}:${WRKSRC}/node_modules/.bin
 HADRON_ENV+=	PATH=$${PATH}:${WRKSRC}/node_modules/.bin
 HADRON_ENV+=	HADRON_SKIP_INSTALLER=true
 HADRON_ENV+=	ELECTRON_SKIP_BINARY_DOWNLOAD=1
 HADRON_ENV+=	APPMOD=${APPMODFILE}
 HADRON_ENV+=	DEBUG=hadron*
 
 ELECTRON_DIR=	${.CURDIR}/../../devel/electron29
 .include	"${ELECTRON_DIR}/Makefile.version"
 ELECTRON_DOWNLOAD_URL=	https://github.com/electron/electron/releases/download/v${ELECTRON_VER}
 ELECTRON_DOWNLOAD_URL_HASH!=	/sbin/sha256 -q -s ${ELECTRON_DOWNLOAD_URL}
 .if defined(ARCH) && ${ARCH} == amd64
 ELECTRON_ARCH=	x64
 NAPI_TARGET=	x86_64-unknown-freebsd
 .elif defined(ARCH) && ${ARCH} == arm64
 ELECTRON_ARCH=	arm64
 NAPI_TARGET=	aarch64-unknown-freebsd
 .endif
 
 MONGO_CLIENC_VER=	6.0.0
 MONGO_ZSTD_VER=		1.0.0
 NPM_FSXATTR_VER=	0.3.1
 NPM_KERBEROS_VER=	2.1.0
 NPM_NAPI_VER=		2.9.0
 COMPASS_DIR=		${WRKSRC}/packages/compass
 MONGO_ZSTD_DIR=		${WRKDIR}/zstd-${MONGO_ZSTD_VER}
 NODE_MODULES_DIR=       ${WRKSRC}/node_modules
 NPM_NAPI_DIR=	${WRKDIR}/napi-rs--napi-rs-cli-${NPM_NAPI_VER}
 DISTTMP_DIR=		${WRKDIR}/dist-tmp
 
 NPM_OSDNSNATIVE_VER=	1.2.1
 
 post-fetch: ${DISTCACHEFILES}
 
 ${DISTCACHEFILE_npm}:
 	# Cache npm modules to avoid network connection at later stages
 	cd ${WRKDIR} && ${SETENV} ${MAKE_ENV} npm cache add \
 		$$(cat ${FILESDIR}/package-*.list)
 
 	${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/${DISTFILE_DEFAULT} -C ${WRKDIR}
 	${MKDIR} ${NODE_MODULES_DIR}
 	${REINPLACE_CMD} -E ' \
 		s,^( *"electron"): *"[0-9~^].*"(.*)$$,\1: "${ELECTRON_VER}"\2,; \
 		' ${WRKSRC}/package-lock.json
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} npm --ignore-scripts -- install
 	cd ${WRKDIR} && ${SETENV} ${MAKE_ENV} npm cache add \
 		electron@${ELECTRON_VER} \
 		$$(npm view electron@${ELECTRON_VER:C/\.[^\.]*$//} version | \
 		${TAIL} -1 | ${SED} -E 's, .*,,')
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} npm --ignore-scripts -- install \
 		electron@~${ELECTRON_VER}
 
 	${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/fs-xattr-${NPM_FSXATTR_VER}.tgz \
 		-C ${WRKDIR}
 	${MKDIR} ${WRKDIR}/package/node_modules
 	cd ${WRKDIR}/package && ${SETENV} ${MAKE_ENV} \
 		PATH=${PATH}:${WRKDIR}/package/node_modules/.bin \
 		npm --ignore-scripts install node-gyp-cache@0.2.1
 	${RM} -rd ${WRKDIR}/package
 
 	${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/mongodb-client-encryption-${MONGO_CLIENC_VER}.tgz \
 		-C ${WRKDIR}
 	${MKDIR} ${WRKDIR}/package/node_modules
 	cd ${WRKDIR}/package && ${SETENV} ${MAKE_ENV} \
 		PATH=${PATH}:${WRKDIR}/package/node_modules/.bin \
 		npm --ignore-scripts install
 	${RM} -rd ${WRKDIR}/package
 
 	${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/os-dns-native-${NPM_OSDNSNATIVE_VER}.tgz \
 		-C ${WRKDIR}
 	${MKDIR} ${WRKDIR}/package/node_modules
 	cd ${WRKDIR}/package && ${SETENV} ${MAKE_ENV} \
 		PATH=${PATH}:${WRKDIR}/package/node_modules/.bin \
 		npm --ignore-scripts install
 	${RM} -rd ${WRKDIR}/package
 
 	${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/${DISTFILE_zstd} -C ${WRKDIR}
 	${MKDIR} ${MONGO_ZSTD_DIR}/node_modules
 	cd ${MONGO_ZSTD_DIR} && \
 		${PATCH} -p1 < ${FILESDIR}/mongodb-js-zstd.patch
 	cd ${MONGO_ZSTD_DIR} && \
 		${SETENV} ${MAKE_ENV} ${PATH_ENV_zstd} \
 		npm --ignore-scripts -- install
 	${RM} -rd ${MONGO_ZSTD_DIR}
 
 	# Without npm cache verify, installing
 	# mongodb-tools@https://codeload... fails.
 	# if npm cache verify fails by 'too many open files',
 	# set MAX_FILES_compass=16384 in poudriere.conf.
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} npm cache verify
 
 	# Back up npm cache
 	cd ${WRKDIR} && ${TAR} cJf ${DISTCACHEFILE_npm} .npm
 
 ${DISTCACHEFILE_gyp}:
 	# To prepare cache cached by node-gyp-cache when rebuilding
 	# fs-xattr, mongodb-client-encryption and os-dns-native,
 	# install node-gyp-cache and do
 	# npm exec node-gyp-cache rebuild for fs-xattr,
 	# npm run install for mongodb-client-encryption and
 	# npm run install for os-dns-native
 	# which is OK to fail here (because of python absent).
 	${ECHO} "node_gyp = node-gyp-cache" >> ${WRKDIR}/.npmrc
 
 	${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/fs-xattr-${NPM_FSXATTR_VER}.tgz \
 		-C ${WRKDIR}
 	${MKDIR} ${WRKDIR}/package/node_modules
 	cd ${WRKDIR}/package && ${SETENV} ${MAKE_ENV} \
 		PATH=${PATH}:${WRKDIR}/package/node_modules/.bin \
 		npm install node-gyp-cache@0.2.1
 	-cd ${WRKDIR}/package && ${SETENV} ${MAKE_ENV} \
 		PATH=${PATH}:${WRKDIR}/package/node_modules/.bin \
 		npm exec node-gyp-cache rebuild
 	${RM} -rd ${WRKDIR}/package /tmp/work
 
 	${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/mongodb-client-encryption-${MONGO_CLIENC_VER}.tgz \
 		-C ${WRKDIR}
 	${MKDIR} ${WRKDIR}/package/node_modules
 	cd ${WRKDIR}/package && ${SETENV} ${MAKE_ENV} \
 		PATH=${PATH}:${WRKDIR}/package/node_modules/.bin \
 		npm install node-gyp-cache@0.2.1
 	-cd ${WRKDIR}/package && ${SETENV} ${MAKE_ENV} \
 		PATH=${PATH}:${WRKDIR}/package/node_modules/.bin \
 		npm run install
 	${RM} -rd ${WRKDIR}/package /tmp/work
 
 	${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/os-dns-native-${NPM_OSDNSNATIVE_VER}.tgz \
 		-C ${WRKDIR}
 	${MKDIR} ${WRKDIR}/package/node_modules
 	cd ${WRKDIR}/package && ${SETENV} ${MAKE_ENV} \
 		PATH=${PATH}:${WRKDIR}/package/node_modules/.bin \
 		npm install node-gyp-cache@0.2.1
 	-cd ${WRKDIR}/package && ${SETENV} ${MAKE_ENV} \
 		PATH=${PATH}:${WRKDIR}/package/node_modules/.bin \
 		npm run install
 
 	# Back up node-gyp-cache cache
 	cd ${WRKDIR} && ${TAR} cJf ${DISTCACHEFILE_gyp} .cache
 
 ${DISTCACHEFILE_yarn}:
 	# Do yarn install to cache node modules for napi-rs-cli.
 	${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/${DISTFILE_napi} -C ${WRKDIR}
 	${MKDIR} ${NPM_NAPI_DIR}/node_modules
 	cd ${NPM_NAPI_DIR} && ${PATCH} -p1 < ${FILESDIR}/napi-cli.patch
 	cd ${NPM_NAPI_DIR} && ${SETENV} ${MAKE_ENV} yarn install
 
 	# Back up yarn cache
 	cd ${NPM_NAPI_DIR} && ${TAR} cJf ${DISTCACHEFILE_yarn} .yarn
 
 ${DISTCACHEFILE_cargo}:
 	# Cache cargo crates for zstd.
 	${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/${DISTFILE_zstd} -C ${WRKDIR}
 	cd ${MONGO_ZSTD_DIR} && ${SETENV} ${MAKE_ENV} \
 		cargo fetch
 	# Back up cargo cache
 	cd ${WRKDIR} && ${TAR} cJf ${DISTCACHEFILE_cargo} .cargo
 
 post-extract:
 	# Restore npm and node-gyp-cache cache
 	${TAR} xf ${DISTCACHEFILE_npm} -C ${WRKDIR}
 	${TAR} xf ${DISTCACHEFILE_gyp} -C ${WRKDIR}
 	${TAR} xf ${DISTCACHEFILE_cargo} -C ${WRKDIR}
 
 	# Fonts
 	-${MKDIR} ${WRKSRC}/packages/compass/src/app/fonts
 	for font in ${DISTDIR}/${DIST_SUBDIR}/*.woff*; do \
 		${INSTALL_DATA} $${font} \
 			${WRKSRC}/packages/compass/src/app/fonts; \
 	done
 
 pre-build:
 	# Prepare kerberos
 	${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/kerberos-${NPM_KERBEROS_VER}.tgz \
 		-C ${WRKDIR}
 	cd ${WRKDIR}/package && ${PATCH} -p1 < ${FILESDIR}/kerberos.patch
 .  if empty(PORT_OPTIONS:MGSSAPI_MIT)
 	cd ${WRKDIR}/package && ${PATCH} -p1 < ${FILESDIR}/kerberos-heimdal.patch
 .  endif
 	${FIND} ${WRKDIR}/package -name \*.orig -or -name \*.bak -delete
 	cd ${WRKDIR} && ${SETENV} ${MAKE_ENV} npm pack file:${WRKDIR}/package
 	${RM} -rd ${WRKDIR}/package
 
 	# Prepare mongodb-client-encryption
 	${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/mongodb-client-encryption-${MONGO_CLIENC_VER}.tgz \
 		-C ${WRKDIR}
 	cd ${WRKDIR}/package && ${PATCH} -p1 < ${FILESDIR}/mongodb-client-encryption.patch
 	${REINPLACE_CMD} -E \
 		's|^(.*\.include_dir.*)$$|\1 "/usr/include", "${PREFIX}/include"|' \
 		${WRKDIR}/package/binding.gyp
 	${REINPLACE_CMD} -E \
 		"s|^( *').*(lib.*-static.*\.a)('.*)$$|\1${PREFIX}/lib/\2\3|" \
 		${WRKDIR}/package/binding.gyp
 	${REINPLACE_CMD} -E \
 		-e 's|("chai"): "\^4\.3\.7"|\1: "^4.0.0"|' \
 		-e 's|("eslint"): "\^8\.46\.0"|\1: "^8.0.0"|' \
 		-e 's|("@typescript-eslint\/parser"): "\^6\.3\.0"|\1: "^6.0.0"|' \
 		${WRKDIR}/package/package.json
 	${FIND} ${WRKDIR}/package -name \*.orig -or -name \*.bak -delete
 	${MKDIR} ${WRKDIR}/package/node_modules
 	cd ${WRKDIR}/package && ${SETENV} ${MAKE_ENV} \
 		PATH=${PATH}:${WRKDIR}/package/node_modules/.bin \
 		npm --offline -- install node-gyp-cache@0.2.1
 	${ECHO} "node_gyp = node-gyp-cache" >> ${WRKDIR}/.npmrc
 	cd ${WRKDIR}/package && ${SETENV} ${MAKE_ENV} \
 		PATH=${PATH}:${WRKDIR}/package/node_modules/.bin \
 		node-gyp rebuild --python=${PYTHON_CMD}
 	cd ${WRKDIR} && ${SETENV} ${MAKE_ENV} npm pack file:${WRKDIR}/package
 	${RM} -rd ${WRKDIR}/package
 
 	# Prepare fs-xattr
 	${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/fs-xattr-${NPM_FSXATTR_VER}.tgz \
 		-C ${WRKDIR}
 	cd ${WRKDIR}/package && ${PATCH} -p1 < ${FILESDIR}/fs-xattr.patch
 	${CP} ${FILESDIR}/xattr.h ${WRKDIR}/package/src
 	${CP} ${FILESDIR}/xattr_api.c ${WRKDIR}/package/src
 	${MKDIR} ${WRKDIR}/package/node_modules
 	cd ${WRKDIR}/package && ${SETENV} ${MAKE_ENV} \
 		PATH=${PATH}:${WRKDIR}/package/node_modules/.bin \
 		npm --offline -- install node-gyp-cache@0.2.1
 	# ${ECHO} "node_gyp = node-gyp-cache" >> ${WRKDIR}/.npmrc
 	cd ${WRKDIR}/package && ${SETENV} ${MAKE_ENV} \
 		PATH=${PATH}:${WRKDIR}/package/node_modules/.bin \
 		npm exec node-gyp-cache rebuild --python=${PYTHON_CMD}
 	${FIND} ${WRKDIR}/package -name \*.orig -or -name \*.bak -delete
 	cd ${WRKDIR} && ${SETENV} ${MAKE_ENV} npm pack file:${WRKDIR}/package
 	${RM} -rd ${WRKDIR}/package
 
 	# Prepare os-dns-native
 	${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/os-dns-native-${NPM_OSDNSNATIVE_VER}.tgz \
 		-C ${WRKDIR}
 	cd ${WRKDIR} && ${PATCH} -p0 < ${FILESDIR}/os-dns-native.patch
 	${MKDIR} ${WRKDIR}/package/node_modules
 	cd ${WRKDIR}/package && ${SETENV} ${MAKE_ENV} \
 		PATH=${PATH}:${WRKDIR}/package/node_modules/.bin \
 		npm --offline -- install node-gyp-cache@0.2.1
 	${ECHO} "node-gyp = node-gyp-cache" >> ${WRKDIR}/.npmrc
 	cd ${WRKDIR}/package && ${SETENV} ${MAKE_ENV} \
 		PATH=${PATH}:${WRKDIR}/package/node_modules/.bin \
 		npm run install
 	${FIND} ${WRKDIR}/package -name \*.orig -or -name \*.bak -delete
 	cd ${WRKDIR} && ${SETENV} ${MAKE_ENV} npm pack file:${WRKDIR}/package
 	${RM} -rd ${WRKDIR}/package
 
 	# Prepare napi-rs-cli (for mongodb-js-zstd)
 	${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/${DISTFILE_napi} -C ${WRKDIR}
 	${TAR} xf ${DISTCACHEFILE_yarn} -C ${NPM_NAPI_DIR}
 	${MKDIR} ${NPM_NAPI_DIR}/node_modules
 	cd ${NPM_NAPI_DIR} && ${PATCH} -p1 < ${FILESDIR}/napi-cli.patch
 	cd ${NPM_NAPI_DIR} && ${SETENV} ${MAKE_ENV} yarn install
 	cd ${NPM_NAPI_DIR} && ${SETENV} ${MAKE_ENV} \
 		PATH=$${PATH}:${NPM_NAPI_DIR}/node_modules/.bin npm run build
 	${FIND} ${NPM_NAPI_DIR} -name \*.orig -or -name \*.bak -delete
 	cd ${WRKDIR} && ${SETENV} ${MAKE_ENV} npm pack file:${NPM_NAPI_DIR}/cli
 
 	# Prepare mongodb-js-zstd.
 	${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/${DISTFILE_zstd} -C ${WRKDIR}
 
 	# Install node_modules for zstd.
 	${MKDIR} ${MONGO_ZSTD_DIR}/node_modules
 	cd ${MONGO_ZSTD_DIR} && \
 		${PATCH} -p1 < ${FILESDIR}/mongodb-js-zstd.patch
 	cd ${MONGO_ZSTD_DIR} && \
 		${SETENV} ${MAKE_ENV} ${PATH_ENV_zstd} \
 		npm --offline -- install \
 		${WRKDIR}/napi-rs-cli-${NPM_NAPI_VER}.tgz
 	cd ${MONGO_ZSTD_DIR} && \
 		${SETENV} ${MAKE_ENV} ${PATH_ENV_zstd} CARGO_NET_OFFLINE=true \
 		napi build --platform --release --target ${NAPI_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${PATH_ENV_zstd} ${INSTALL_LIB} \
 		zstd.freebsd-${ELECTRON_ARCH}.node npm/freebsd-${ELECTRON_ARCH}/
 	${FIND} ${MONGO_ZSTD_DIR} -name \*.orig -or -name \*.bak -delete
 	cd ${WRKDIR} && ${SETENV} ${MAKE_ENV} npm pack file:${MONGO_ZSTD_DIR}
 	cd ${WRKDIR} && ${SETENV} ${MAKE_ENV} npm pack \
 		file:${MONGO_ZSTD_DIR}/npm/freebsd-${ELECTRON_ARCH}
 
 	# Replace "git+ssh:" and "github:" entry with "file:"
 	# to exported tarballs.
 	${REINPLACE_CMD} -E ' \
 		s,"(resolved|from|version)": "git\+ssh:.*/reflux-state-mixin\.git.*","\1": "file://${DISTDIR}/${DIST_SUBDIR}/${DISTFILE_reflux}",; \
 		s,"(reflux-state-mixin|resolved|from)": "(.+@)?github:mongodb-js/reflux-state-mixin(.[0-9a-f]+)?","\1": "file://${DISTDIR}/${DIST_SUBDIR}/${DISTFILE_reflux}",; \
 		' ${WRKSRC}/package-lock.json
 
 	for pjson in $$(find ${WRKSRC} -name package.json -print); do \
 		${REINPLACE_CMD} -E ' \
 		s,"(reflux-state-mixin)": "github:mongodb-js/reflux-state-mixin","\1": "file://${DISTDIR}/${DIST_SUBDIR}/${DISTFILE_reflux}",; \
 		' $${pjson}; done
 
 	# Install node modules
 	${MKDIR} ${NODE_MODULES_DIR}
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} npm install --offline \
 		${DISTDIR}/${DIST_SUBDIR}/${DISTFILE_reflux} \
 		${WRKDIR}/fs-xattr-${NPM_FSXATTR_VER}.tgz \
 		${WRKDIR}/kerberos-${NPM_KERBEROS_VER}.tgz \
 		${WRKDIR}/napi-rs-cli-${NPM_NAPI_VER}.tgz \
 		${WRKDIR}/mongodb-js-zstd-*.tgz \
 		${WRKDIR}/mongodb-client-encryption-${MONGO_CLIENC_VER}.tgz \
 		${WRKDIR}/os-dns-native-${NPM_OSDNSNATIVE_VER}.tgz
 
 	# Install electron without build.
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		npm --offline --omit-dev --ignore-scripts -- install \
 		electron@${ELECTRON_VER}
 
 	# Install node modules for production (APPMOD)
 	${MKDIR} ${DISTTMP_DIR}/node_modules
 	cd ${DISTTMP_DIR} && ${SETENV} ${MAKE_ENV} \
 		npm --offline --omit-dev -- install \
 		${WRKDIR}/kerberos-${NPM_KERBEROS_VER}.tgz \
 		${WRKDIR}/mongodb-client-encryption-${MONGO_CLIENC_VER}.tgz
 	-${RM} ${APPMODFILE}
 	${TAR} -cf ${APPMODFILE} --exclude python3 \
 		-C ${DISTTMP_DIR} node_modules
 
 do-build:
 	# Set up download zip file for electron-packager
 	cd ${WRKSRC}/node_modules/electron-packager/src && \
 		${PATCH} -p1 < ${FILESDIR}/electron-packager.patch
 	cd ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} && \
 		zip -q -r ${WRKDIR}/electron-v${ELECTRON_VER}-freebsd-${ELECTRON_ARCH}.zip .
 
 	# Install electron
 	${CP} -R ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} \
 		${NODE_MODULES_DIR}/electron/dist
 	${ECHO} "electron" > ${NODE_MODULES_DIR}/electron/path.txt
 
 	# Build MongoDB Compass
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} lerna run bootstrap --stream
 	cd ${WRKSRC} && ${SETENV} ${HADRON_ENV} npm run package-compass
 
 do-install:
 	# Install MongoDB Compass
 	-${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/packages/compass/app-icons/linux/mongodb-compass.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 	-${MKDIR} ${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_DATA} ${FILESDIR}/mongodb-compass.desktop \
 		${STAGEDIR}${DESKTOPDIR}/
 	-${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${COMPASS_DIR}/dist/MongoDB* && ${TAR} cf - .  | \
 		${TAR} xf - -C ${STAGEDIR}${DATADIR}
 .for f in chromedriver mksnapshot v8_context_snapshot_generator
 	${RM} ${STAGEDIR}${DATADIR}/${f}
 .endfor
 	${RM} -r ${STAGEDIR}${DATADIR}/gen
 	${RM} -r ${STAGEDIR}${DATADIR}/node_headers
 	${RLN} ${STAGEDIR}${DATADIR}/MongoDB* \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${FIND} ${STAGEDIR}${DATADIR} -name \*.node -exec ${STRIP_CMD} {} \;
 
 	# Install documents
 do-install-DOCS-on:
 	-${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_MAN} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 post-stage:
 	cd ${STAGEDIR}${PREFIX} && \
 		${FIND} ${DATADIR_REL}/resources/app.asar.unpacked/build \
 		-type f -o -type l > ${WRKDIR}/PLIST.unpacked
 	cd ${WRKDIR} && ${SED} -i -e "/PLIST.unpacked/r PLIST.unpacked" ${TMPPLIST}
 
 do-test:
 	cd ${WRKSRC}/packages/compass && \
 		${SETENV} ${TEST_ENV} \
 		xvfb-maybe electron-mocha --no-sandbox "./src/main/*.spec.*"
 
 post-clean:
 .for file in ${DISTCACHEFILES} compass_node_modules.tar
 	${RM} ${DISTDIR}/${DIST_SUBDIR}/${file}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/emscripten/Makefile b/devel/emscripten/Makefile
index 06b4db0aec0b..a532bc26e3d6 100644
--- a/devel/emscripten/Makefile
+++ b/devel/emscripten/Makefile
@@ -1,68 +1,69 @@
 PORTNAME=	emscripten
 DISTVERSION=	3.1.69
+PORTREVISION=	1
 CATEGORIES=	devel www
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	LLVM-to-Web Compiler
 WWW=		https://emscripten.org/
 
 LICENSE=	MIT NCSA
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	bash:shells/bash \
 		binaryen>0:devel/binaryen
 		# the upstream requires to use either the latest llvm version, or their own llvm fork called emscripten-fastcomp
 
 USES=		nodejs:run python shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	emscripten-core
 
 # USES doesn't support llvm:devel, so we add this
 BUILD_DEPENDS=	llvm-devel>0:devel/llvm-devel
 RUN_DEPENDS=	llvm-devel>0:devel/llvm-devel
 LLVM_VERSION=	-devel
 
 SHEBANG_FILES=	${PYSCRIPTS} emcmake system/bin/sdl-config system/bin/sdl2-config
 SHEBANG_GLOB=	*.py *.sh
 
 PYSCRIPTS=	em++ em-config emar embuilder emcc emcmake emconfigure emmake emranlib emrun emscons emsize
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} CLANG_CC=${LOCALBASE}/bin/clang${LLVM_VERSION}
 
 BINARY_ALIAS=	python=${PYTHON_CMD} # for tests
 
 PORTSCOUT=	limit:^\d+\. # prevent i64
 
 post-patch:
 	@${REINPLACE_CMD} -i '' -E " \
 			s|BINARYEN_ROOT = None|BINARYEN_ROOT = '${LOCALBASE}'| ; \
 			s|LLVM_ROOT = None|LLVM_ROOT = '${LOCALBASE}/bin'| ; \
 			s|LLVM_ADD_VERSION = None|LLVM_ADD_VERSION = '${LLVM_VERSION}'| ; \
 			s|CLANG_ADD_VERSION = None|CLANG_ADD_VERSION = '${LLVM_VERSION}'| ; \
 			s|^__rootpath__ = .*|__rootpath__ = '${PREFIX}/lib/${PORTNAME}'| ; \
 			s|find_executable\('llvm-dis'\) or '/usr/bin/llvm-dis'|'${LOCALBASE}/bin/llvm-dis'|" \
 			${WRKSRC}/tools/config.py
 
 do-install: # the native install target installs files into root, see https://github.com/emscripten-core/emscripten/issues/17193
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 	cd ${WRKSRC} && ${CP} -r em* cmake site src system third_party tools ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/
 	${FIND} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} \( -name "*.bat" -o -name "*.orig" \) -delete
 .for s in ${PYSCRIPTS}
 	@(echo "#!/bin/sh"; \
 	  echo ""; \
 	  echo "${PYTHON_CMD} ${PREFIX}/lib/${PORTNAME}/${s}.py \"$$"@"\"" \
 	) > ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${s}
 	@${CHMOD} +x ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${s}
 	${RLN} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${s} ${STAGEDIR}${PREFIX}/bin/${s}
 .endfor
 
 do-test: # some tests fail: Unknown option '--no-stack-ir', see https://github.com/emscripten-core/emscripten/issues/22408
 	@cd ${WRKSRC} && \
 		${SETENV} ${TEST_ENV} test/runner core3.test_*i64* && \
 		${SETENV} ${TEST_ENV} test/runner wasm2js1
 
 .include <bsd.port.mk>
diff --git a/devel/node-thrift/Makefile b/devel/node-thrift/Makefile
index 15f3e4b80f94..ab8fc632e4b8 100644
--- a/devel/node-thrift/Makefile
+++ b/devel/node-thrift/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	thrift
 PORTVERSION=	${THRIFT_PORTVERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	APACHE/thrift/${PORTVERSION}
 PKGNAMEPREFIX=	node-
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Node.js bindings for the Apache Thrift RPC system
 WWW=		https://thrift.apache.org/
 
 USES=		cpe nodejs:run
 CPE_VENDOR=	apache
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 DISTINFO_FILE=	${.CURDIR}/../thrift/distinfo
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/node_modules/thrift
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/node
 	${CP} -R ${WRKSRC}/lib/nodejs/* \
 		${STAGEDIR}${PREFIX}/lib/node_modules/thrift
 	${LN} -s ${PREFIX}/lib/node_modules/thrift/lib/thrift ${STAGEDIR}${PREFIX}/lib/node
 
 .include "${.CURDIR}/../thrift/bsd.thrift.mk"
 .include <bsd.port.mk>
diff --git a/devel/purescript-language-server/Makefile b/devel/purescript-language-server/Makefile
index 6dd51fa1f333..c8068629dd28 100644
--- a/devel/purescript-language-server/Makefile
+++ b/devel/purescript-language-server/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	purescript-language-server
 PORTVERSION=	0.18.2
+PORTREVISION=	1
 CATEGORIES=	devel textproc
 MASTER_SITES=	https://github.com/nwolverson/${PORTNAME}/releases/download/v${PORTVERSION}/${PORTNAME}.js?dummy=/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.js
 EXTRACT_ONLY=
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	LSP provider implementation for PureScript language
 WWW=		https://github.com/nwolverson/purescript-language-server/
 
 LICENSE=	MIT
 
 USES=		nodejs:run
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 PLIST_FILES=	bin/${PORTNAME}
 
 do-install:
 	${INSTALL_SCRIPT} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-execjs/Makefile b/devel/rubygem-execjs/Makefile
index 97622ae44d64..1abab9da5a72 100644
--- a/devel/rubygem-execjs/Makefile
+++ b/devel/rubygem-execjs/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	execjs
 PORTVERSION=	2.10.0
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	ExecJS lets you run JavaScript code from Ruby
 WWW=		https://github.com/rails/execjs
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
 USES=		gem nodejs:run
 
 NO_ARCH=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/lib/execjs/runtimes.rb
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-webpacker-rails60/Makefile b/devel/rubygem-webpacker-rails60/Makefile
index 539d300527dd..967462af1d98 100644
--- a/devel/rubygem-webpacker-rails60/Makefile
+++ b/devel/rubygem-webpacker-rails60/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	webpacker
 PORTVERSION=	5.4.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-rails60
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Use Webpack to manage app-like JavaScript modules in Rails
 WWW=		https://github.com/rails/webpacker
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
 RUN_DEPENDS=	rubygem-activesupport60>=5.2:devel/rubygem-activesupport60 \
 		rubygem-rack-proxy>=0.6.1:www/rubygem-rack-proxy \
 		rubygem-railties60>=5.2:www/rubygem-railties60 \
 		rubygem-semantic_range>=2.3.0:devel/rubygem-semantic_range \
 		yarn${NODEJS_SUFFIX}>=0:www/yarn${NODEJS_SUFFIX}
 
 USES=		gem nodejs:env
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-webpacker-rails61/Makefile b/devel/rubygem-webpacker-rails61/Makefile
index 6cd95f9e1dbf..1aa928ccc15b 100644
--- a/devel/rubygem-webpacker-rails61/Makefile
+++ b/devel/rubygem-webpacker-rails61/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	webpacker
 PORTVERSION=	5.4.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-rails61
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Use Webpack to manage app-like JavaScript modules in Rails
 WWW=		https://github.com/rails/webpacker
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
 RUN_DEPENDS=	rubygem-activesupport61>=5.2:devel/rubygem-activesupport61 \
 		rubygem-rack-proxy>=0.6.1:www/rubygem-rack-proxy \
 		rubygem-railties61>=5.2:www/rubygem-railties61 \
 		rubygem-semantic_range>=2.3.0:devel/rubygem-semantic_range \
 		yarn${NODEJS_SUFFIX}>=0:www/yarn${NODEJS_SUFFIX}
 
 USES=		gem nodejs:env
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-webpacker4-rails60/Makefile b/devel/rubygem-webpacker4-rails60/Makefile
index b392726ac249..4eb6c25349cb 100644
--- a/devel/rubygem-webpacker4-rails60/Makefile
+++ b/devel/rubygem-webpacker4-rails60/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	webpacker
 PORTVERSION=	4.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	4-rails60
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Use Webpack to manage app-like JavaScript modules in Rails
 WWW=		https://github.com/rails/webpacker
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
 RUN_DEPENDS=	rubygem-activesupport60>=4.2:devel/rubygem-activesupport60 \
 		rubygem-rack-proxy>=0.6.1:www/rubygem-rack-proxy \
 		rubygem-railties60>=4.2:www/rubygem-railties60 \
 		yarn${NODEJS_SUFFIX}>=0:www/yarn${NODEJS_SUFFIX}
 
 USES=		gem nodejs:env
 
 NO_ARCH=	yes
 
 PORTSCOUT=	limit:^4\.
 
 .include <bsd.port.mk>
diff --git a/devel/sonar-scanner-cli/Makefile b/devel/sonar-scanner-cli/Makefile
index 6df429d6d74a..eb545f88231a 100644
--- a/devel/sonar-scanner-cli/Makefile
+++ b/devel/sonar-scanner-cli/Makefile
@@ -1,63 +1,63 @@
 PORTNAME=	sonar-scanner-cli
 DISTVERSION=	6.2.1.4610
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel security www java
 MASTER_SITES=	https://binaries.sonarsource.com/Distribution/${PORTNAME}/
 
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Scanner component of SonarQube
 WWW=		https://www.sonarqube.org/
 
 LICENSE=	LGPL3
 
 # node -> JS analysis
 USES=		cpe nodejs:run zip
 CPE_VENDOR=	sonarsource
 CPE_PRODUCT=	sonarqube_scanner
 USE_JAVA=	yes
 
 WRKSRC=		${WRKDIR}/sonar-scanner-${DISTVERSION}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 JAVA_VERSION=	17+
 JAVA_VENDOR=	openjdk
 
 APP_NAME=	${PORTNAME}
 APP_DIR=	libexec/${PORTNAME}
 JAR_VERSION=	${DISTVERSION}
 
 SUB_LIST=	\
 		APP_DIR=${APP_DIR} \
 		JAR_VERSION=${JAR_VERSION}
 
 SUB_FILES=	\
 		sonar-scanner \
 		pkg-message
 
 PLIST_SUB=	\
 		APP_DIR=${APP_DIR} \
 		JAR_VERSION=${JAR_VERSION}
 
 post-extract:
 	${MV} ${WRKSRC}/conf/sonar-scanner.properties ${WRKSRC}/conf/sonar-scanner.properties.sample
 	${RM} ${WRKSRC}/bin/*.bat
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${APP_DIR}
 	${INSTALL} ${WRKDIR}/sonar-scanner ${STAGEDIR}${PREFIX}/bin/
 .for dir in bin conf lib
 	cd ${WRKSRC}; ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${PREFIX}/${APP_DIR} "! -name *\.orig"
 .endfor
 
 gen-plist:
 	${ECHO} '@sample ${APP_DIR}/conf/sonar-scanner.properties.sample' >${PLIST}.new
 	${ECHO} 'bin/sonar-scanner' >>${PLIST}.new
 .for dir in bin conf lib
 	${FIND} ${STAGEDIR}${PREFIX}/${APP_DIR}/${dir} -type f |  \
 	    ${SED} -e "s:${STAGEDIR}${PREFIX}/::g ; \
 		s:${JAR_VERSION}:%%JAR_VERSION%%:g" | \
 	    ${GREP} -v conf/sonar-scanner.properties | ${SORT} >> ${PLIST}.new
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/sonarqube-community/Makefile b/devel/sonarqube-community/Makefile
index 6b3f91fce243..62697418f46c 100644
--- a/devel/sonarqube-community/Makefile
+++ b/devel/sonarqube-community/Makefile
@@ -1,167 +1,167 @@
 PORTNAME=	sonarqube
 DISTVERSION=	10.7.0.96327
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel security www java
 MASTER_SITES=	https://binaries.sonarsource.com/Distribution/sonarqube/:m_core \
 		https://binaries.sonarsource.com/Distribution/sonar-csharp-plugin/:m_csharp \
 		https://binaries.sonarsource.com/Distribution/sonar-java-plugin/:m_java \
 		https://binaries.sonarsource.com/Distribution/sonar-javascript-plugin/:m_javascript \
 		https://binaries.sonarsource.com/Distribution/sonar-php-plugin/:m_php \
 		https://binaries.sonarsource.com/Distribution/sonar-python-plugin/:m_python \
 		https://binaries.sonarsource.com/Distribution/sonar-vbnet-plugin/:m_vbnet
 PKGNAMESUFFIX=	-community
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:m_core \
 		sonar-csharp-plugin-${SONARCSHARP_VER}.jar:m_csharp \
 		sonar-java-plugin-${SONARJAVA_VER}.jar:m_java \
 		sonar-javascript-plugin-${SONARJAVASCRIPT_VER}.jar:m_javascript \
 		sonar-php-plugin-${SONARPHP_VER}.jar:m_php \
 		sonar-python-plugin-${SONARPYTHON_VER}.jar:m_python \
 		sonar-vbnet-plugin-${SONARVBNET_VER}.jar:m_vbnet
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Web-based continuous code inspection tool
 WWW=		https://www.sonarqube.org/
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 #BUILD_DEPENDS=	jna>0:devel/jna
 RUN_DEPENDS=	bash:shells/bash #\
 #		jna>0:devel/jna
 
 USES=		cpe shebangfix zip nodejs:lts,run
 CPE_VENDOR=	sonarsource
 USE_JAVA=	yes
 
 SHEBANG_FILES=	elasticsearch/bin/elasticsearch-cli \
 		elasticsearch/bin/elasticsearch-env
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 JAVA_VERSION=	17+
 JAVA_VENDOR=	openjdk
 USE_RC_SUBR=	${PORTNAME}
 
 APP_NAME=	${PORTNAME}
 APP_DIR=	libexec/${PORTNAME}
 LOG_DIR=	/var/log/${PORTNAME}
 PID_DIR=	/var/run/${PORTNAME}
 JAR_VERSION=	${DISTVERSION}
 DBBASE_DIR=	/var/db/${PORTNAME}
 DATA_DIR=	${DBBASE_DIR}/data
 TEMP_DIR=	${DBBASE_DIR}/temp
 
 # If you want to update plugins, simply update the version number below,
 # and run "make makesum".
 SONARCSHARP_VER=	10.3.0.106239
 SONARJAVA_VER=		8.5.0.37199
 SONARJAVASCRIPT_VER=	10.16.0.27621
 SONARPHP_VER=		3.40.0.12590
 SONARPYTHON_VER=	4.24.0.18631
 SONARVBNET_VER=		${SONARCSHARP_VER}
 
 USERS=		sonarqube
 GROUPS=		sonarqube
 
 SUB_LIST=	\
 		APP_NAME=${APP_NAME} \
 		APP_DIR=${APP_DIR} \
 		JAVA_HOME=${JAVA_HOME} \
 		JAVA=${JAVA} \
 		LOG_DIR=${LOG_DIR} \
 		PID_DIR=${PID_DIR} \
 		JAR_VERSION=${JAR_VERSION} \
 		DATA_DIR=${DATA_DIR} \
 		TEMP_DIR=${TEMP_DIR}
 
 SUB_FILES=	\
 		${APP_NAME} \
 		pkg-message
 
 PLIST_SUB=	APP_NAME=${APP_NAME} \
 		APP_DIR=${APP_DIR} \
 		LOG_DIR=${LOG_DIR} \
 		PID_DIR=${PID_DIR} \
 		JAR_VERSION=${JAR_VERSION} \
 		DBBASE_DIR=${DBBASE_DIR} \
 		DATA_DIR=${DATA_DIR} \
 		TEMP_DIR=${TEMP_DIR} \
 		SONARCSHARP_VER=${SONARCSHARP_VER} \
 		SONARJAVA_VER=${SONARJAVA_VER} \
 		SONARJAVASCRIPT_VER=${SONARJAVASCRIPT_VER} \
 		SONARPHP_VER=${SONARPHP_VER} \
 		SONARPYTHON_VER=${SONARPYTHON_VER} \
 		SONARSCMGIT_VER=${SONARSCMGIT_VER} \
 		SONARSCMSVN_VER=${SONARSCMSVN_VER} \
 		SONARVBNET_VER=${SONARVBNET_VER}
 
 post-extract:
 	${RM} -r ${WRKSRC}/bin ${WRKSRC}/lib/jsw ${WRKSRC}/conf/wrapper.conf
 #	${RM} ${WRKSRC}/elasticsearch/lib/jna*.jar
 	${MV} ${WRKSRC}/conf/sonar.properties ${WRKSRC}/conf/sonar.properties.sample
 .for plugin in sonar-csharp-plugin \
     sonar-java-plugin \
     sonar-javascript-plugin \
     sonar-php-plugin \
     sonar-python-plugin \
     sonar-vbnet-plugin
 	${RM} ${WRKSRC}/lib/extensions/${plugin}-*.jar
 .endfor
 .for plugin in sonar-csharp-plugin-${SONARCSHARP_VER}.jar \
     sonar-java-plugin-${SONARJAVA_VER}.jar \
     sonar-javascript-plugin-${SONARJAVASCRIPT_VER}.jar \
     sonar-php-plugin-${SONARPHP_VER}.jar \
     sonar-python-plugin-${SONARPYTHON_VER}.jar \
     sonar-vbnet-plugin-${SONARVBNET_VER}.jar
 	${CP} ${DISTDIR}/${plugin} ${WRKSRC}/lib/extensions/
 .endfor
 
 post-patch:
 	${REINPLACE_CMD} -e 's:%%LOG_DIR%%:${LOG_DIR}:g ; s:%%DATA_DIR%%:${DATA_DIR}:g ; s:%%TEMP_DIR%%:${TEMP_DIR}:g' ${WRKSRC}/conf/sonar.properties.sample
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${APP_DIR}/elasticsearch/plugins
 	${MKDIR} ${STAGEDIR}${LOG_DIR} ${STAGEDIR}${PID_DIR} \
 		${STAGEDIR}${DATA_DIR} ${STAGEDIR}${TEMP_DIR}
 .for dir in conf elasticsearch extensions lib web
 	cd ${WRKSRC}; ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${PREFIX}/${APP_DIR} "! -name *\.orig"
 .endfor
 #	 ${LN} -s ${JAVASHAREDIR}/classes/jna.jar \
 #		${STAGEDIR}${PREFIX}/${APP_DIR}/elasticsearch/lib/jna.jar
 
 gen-plist:
 	${ECHO} '@sample ${APP_DIR}/conf/sonar.properties.sample' >${PLIST}.new
 	${ECHO} '@dir(sonarqube,sonarqube,755) %%DBBASE_DIR%%' >>${PLIST}.new
 	${ECHO} '@dir(sonarqube,sonarqube,755) %%DATA_DIR%%' >>${PLIST}.new
 	${ECHO} '@dir(sonarqube,sonarqube,755) %%TEMP_DIR%%' >>${PLIST}.new
 	${ECHO} '@dir %%APP_DIR%%/elasticsearch/plugins' >>${PLIST}.new
 #	${ECHO} '@dir(sonarqube,sonarqube,755) %%APP_DIR%%/extensions' >>${PLIST}.new
 .for dir in conf elasticsearch lib web
 	${FIND} ${STAGEDIR}${PREFIX}/${APP_DIR}/${dir} -type f -o -type l |  \
 	    ${SED} -e "s:${STAGEDIR}${PREFIX}/::g ; \
 		s:${JAR_VERSION}:%%JAR_VERSION%%:g ; \
 		s:sonar-csharp-plugin-[0-9.]*.jar:sonar-csharp-plugin-%%SONARCSHARP_VER%%.jar:g ; \
 		s:sonar-java-plugin-[0-9.]*.jar:sonar-java-plugin-%%SONARJAVA_VER%%.jar:g ; \
 		s:sonar-javascript-plugin-[0-9.]*.jar:sonar-javascript-plugin-%%SONARJAVASCRIPT_VER%%.jar:g ; \
 		s:sonar-php-plugin-[0-9.]*.jar:sonar-php-plugin-%%SONARPHP_VER%%.jar:g ; \
 		s:sonar-python-plugin-[0-9.]*.jar:sonar-python-plugin-%%SONARPYTHON_VER%%.jar:g ; \
 		s:sonar-vbnet-plugin-[0-9.]*.jar:sonar-vbnet-plugin-%%SONARVBNET_VER%%.jar:g ; \
 		s:\(.*elasticsearch/bin.*\):@(,,755) \1:g" | \
 	    ${GREP} -v conf/sonar.properties.sample | ${SORT} >> ${PLIST}.new
 .endfor
 	${ECHO} '@owner sonarqube' >>${PLIST}.new
 	${ECHO} '@group sonarqube' >>${PLIST}.new
 .for dir in extensions
 	${FIND} ${STAGEDIR}${PREFIX}/${APP_DIR}/${dir} -type d | \
 	    ${SED} -e "s:${STAGEDIR}${PREFIX}/:@dir(sonarqube,sonarqube,755) :g" | \
 	    ${SORT} >> ${PLIST}.new
 	${FIND} ${STAGEDIR}${PREFIX}/${APP_DIR}/${dir} -type f | \
 	    ${SED} -e "s:${STAGEDIR}${PREFIX}/::g ; \
 		s:${JAR_VERSION}:%%JAR_VERSION%%:g" | \
 	    ${SORT} >> ${PLIST}.new
 .endfor
 	${ECHO} '@dir(sonarqube,sonarqube,755) %%LOG_DIR%%' >> ${PLIST}.new
 	${ECHO} '@dir(sonarqube,sonarqube,755) %%PID_DIR%%' >> ${PLIST}.new
 
 .include <bsd.port.mk>
diff --git a/finance/quba-viewer/Makefile b/finance/quba-viewer/Makefile
index 451700ffc78c..cdf06bd446ad 100644
--- a/finance/quba-viewer/Makefile
+++ b/finance/quba-viewer/Makefile
@@ -1,96 +1,96 @@
 PORTNAME=	quba-viewer
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.4.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	finance deskutils
 MASTER_SITES=	LOCAL/pi/finance/${PORTNAME}/:npm
 DISTFILES=	${PORTNAME}-npm-cache-${DISTVERSION}${EXTRACT_SUFX}:npm
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Cross platform application to display hybrid electronic invoices
 WWW=		https://www.quba-viewer.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 # Will need to be tested on aarch64
 
 .if defined(MAINTAINER_MODE)
 PATCH_DEPENDS=	npm:www/npm-node20
 .endif
 BUILD_DEPENDS=	\
 		app-builder>0:devel/app-builder \
 		electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \
 		npm:www/npm-node20
 LIB_DEPENDS=	\
 		libdrm.so:graphics/libdrm \
 		libepoll-shim.so:devel/libepoll-shim \
 		libffi.so:devel/libffi \
 		libopus.so:audio/opus \
 		libpci.so:devel/libpci
 
 USES=		desktop-file-utils gettext-runtime gl nodejs xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	ZUGFeRD
 USE_GL=		gl
 USE_XORG=	x11 xcb xext xi
 
 MAKE_ENV+=	ELECTRON_OVERRIDE_DIST_PATH=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} \
 		HOME=${WRKDIR} \
 		USE_SYSTEM_APP_BUILDER=true \
 		SOURCE_DATE_EPOCH=${_BUILD_DATE} \
 		PATH=${WRKSRC}/node_modules/.bin:${LOCALBASE}/bin:${PATH}
 
 _BUILD_DATE=	$$(date +'%s')
 
 _ELECTRON_VERSION=	32
 .include <../../devel/electron${_ELECTRON_VERSION}/Makefile.version>
 
 NODE_ARCH=	${ARCH:S/aarch64/arm64/:S/amd64/x64/}
 ELECTRON_DIST=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}
 APP_OUT_DIR=	linux-unpacked
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%ELECTRON_VERSION%%|${ELECTRON_VER}|; s|%%ELECTRON_DIST%%|${ELECTRON_DIST}|' \
 		${WRKSRC}/package.json
 
 do-build:
 	${ECHO_CMD} offline=true >> ${WRKSRC}/.npmrc
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} npm config set cache ${WRKDIR}/node_modules
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} npm install --prefer-offline
 	${CP} ${LOCALBASE}/bin/app-builder ${WRKSRC}/node_modules/app-builder-bin/linux/${NODE_ARCH}/app-builder
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${PACKAGE_ENV} npm run build
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${BUILD_WRKSRC}/release/${APP_OUT_DIR} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/assets/img/logo_small_icon_only.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/quba-desktop.png
 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
 
 	${RLN} ${STAGEDIR}${DATADIR}/quba ${STAGEDIR}${PREFIX}/bin
 
 .if defined(MAINTAINER_MODE)
 _make_npm-cache: extract patch post-patch
 	@${ECHO_MSG} "===> Creating npm cache tarball"
 	${RM} -r ${WRKSRC}/node_modules
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} npm cache clean --force
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} npm config set cache ${WRKDIR}/node_modules
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} npm install
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} npm install --cache ${WRKDIR}/node_modules --prefer-offline
 	cd ${WRKDIR} && ${TAR} -czf \
 		${PORTNAME}-npm-cache-${DISTVERSION}${EXTRACT_SUFX} -C ${WRKDIR} node_modules
 	scp ${WRKDIR}/${PORTNAME}-npm-cache-${DISTVERSION}${EXTRACT_SUFX} \
 		pi@freefall.freebsd.org:public_distfiles/finance/${PORTNAME}/
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/games/wipeclean/Makefile b/games/wipeclean/Makefile
index 54a96b7fb489..355ecef8c81f 100644
--- a/games/wipeclean/Makefile
+++ b/games/wipeclean/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	wipeclean
 PORTVERSION=	1.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	games
 MASTER_SITES=	LOCAL/ehaupt
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	CLI tool to wipe away your error messages in style
 WWW=		https://github.com/JeanJouliaCode/wipeClean
 
 LICENSE=	ISCL
 
 USES=		dos2unix nodejs:run tar:xz
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 do-install:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 	${LN} -fs ${DATADIR}/node_modules/wipeclean/index.js \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 dist: clean
 	@npm install --prefix ${WRKSRC} ${PORTNAME}@${PORTVERSION}
 	@${TAR} -C ${WRKDIR} -cvJpf ${DISTDIR}/${DISTFILES} ${DISTNAME}
 
 .include <bsd.port.mk>
diff --git a/lang/antimony/Makefile b/lang/antimony/Makefile
index 00162ca0c473..ae29fd81ba58 100644
--- a/lang/antimony/Makefile
+++ b/lang/antimony/Makefile
@@ -1,73 +1,73 @@
 PORTNAME=	antimony
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	lang
 PKGNAMESUFFIX=	-language
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Antimony programming language
 WWW=		https://antimony-lang.github.io/antimony/ \
 		https://github.com/antimony-lang/antimony
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cargo nodejs:run
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	antimony-lang
 
 CARGO_CRATES=	aho-corasick-1.0.1 \
 		ansi_term-0.11.0 \
 		atty-0.2.14 \
 		bitflags-1.2.1 \
 		cc-1.0.66 \
 		clap-2.33.3 \
 		either-1.6.1 \
 		heck-0.3.1 \
 		hermit-abi-0.1.17 \
 		inkwell-0.4.0 \
 		inkwell_internals-0.9.0 \
 		lazy_static-1.4.0 \
 		libc-0.2.139 \
 		llvm-sys-100.2.4 \
 		memchr-2.6.3 \
 		once_cell-1.17.0 \
 		proc-macro-error-1.0.4 \
 		proc-macro-error-attr-1.0.4 \
 		proc-macro2-1.0.78 \
 		qbe-1.0.0 \
 		quote-1.0.35 \
 		regex-1.10.4 \
 		regex-automata-0.4.4 \
 		regex-syntax-0.8.2 \
 		rust-embed-5.9.0 \
 		rust-embed-impl-5.9.0 \
 		rust-embed-utils-5.1.0 \
 		same-file-1.0.6 \
 		semver-0.9.0 \
 		semver-parser-0.7.0 \
 		strsim-0.8.0 \
 		structopt-0.3.26 \
 		structopt-derive-0.4.18 \
 		syn-1.0.53 \
 		syn-2.0.48 \
 		textwrap-0.11.0 \
 		thiserror-1.0.56 \
 		thiserror-impl-1.0.56 \
 		unicode-ident-1.0.9 \
 		unicode-segmentation-1.7.1 \
 		unicode-width-0.1.8 \
 		unicode-xid-0.2.2 \
 		vec_map-0.8.2 \
 		version_check-0.9.2 \
 		walkdir-2.3.1 \
 		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/sb
 
 .include <bsd.port.mk>
diff --git a/lang/coffeescript/Makefile b/lang/coffeescript/Makefile
index dd2bce451ea7..e587506aea11 100644
--- a/lang/coffeescript/Makefile
+++ b/lang/coffeescript/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	coffeescript
 DISTVERSION=	2.7.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang
 
 MAINTAINER=	egypcio@FreeBSD.org
 COMMENT=	Unfancy JavaScript
 WWW=		https://coffeescript.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		nodejs:run
 USE_GITHUB=	yes
 GH_ACCOUNT=	jashkenas
 
 PORTEXAMPLES=	*.coffee
 
 CONFLICTS_INSTALL=	cake
 
 OPTIONS_DEFINE=	EXAMPLES
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/node_modules/${PORTNAME}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/cake ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/coffee ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}/*.js \
 		${STAGEDIR}${PREFIX}/lib/node_modules/${PORTNAME}
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/documentation/examples/${PORTEXAMPLES} \
 		${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/lang/dotnet8/Makefile b/lang/dotnet8/Makefile
index 9043f3478359..f00e5aeb444b 100644
--- a/lang/dotnet8/Makefile
+++ b/lang/dotnet8/Makefile
@@ -1,121 +1,122 @@
 PORTNAME=	dotnet
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${DOTNETVERSION}.6
+PORTREVISION=	1
 CATEGORIES=	lang devel
 MASTER_SITES=	https://github.com/dotnet/dotnet/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/release.json?dummy=/:dotnetmanifest \
 		LOCAL/arrowd/dotnet/:bootstrap
 PKGNAMESUFFIX=	8
 DISTFILES=	release.json-${PORTVERSION}:dotnetmanifest \
 		${BOOTSTRAP_SOURCEBUILT_ARTIFACTS_DISTNAME}${EXTRACT_SUFX}:bootstrap \
 		${BOOTSTRAP_SDK_DISTNAME}${EXTRACT_SUFX}:bootstrap
 DIST_SUBDIR=	dotnet
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	Open-source developer platform and a cross-platform runtime for cloud, mobile, desktop, and IoT apps
 WWW=		https://dot.net
 
 LICENSE=	MIT
 
 ONLY_FOR_ARCHS=	aarch64 amd64
 
 BUILD_DEPENDS=	bash:shells/bash \
 		cmake:devel/cmake-core \
 		git:devel/git \
 		ggrep:textproc/gnugrep \
 		terminfo-db>0:misc/terminfo-db
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libinotify.so:devel/libinotify \
 		libunwind.so:devel/libunwind
 RUN_DEPENDS=	terminfo-db>0:misc/terminfo-db
 
 USES=		autoreconf:build gssapi:mit llvm:noexport nodejs pkgconfig \
 		python:build,3.9+ shebangfix ssl
 
 USE_GITHUB=	yes
 
 SHEBANG_FILES=	src/diagnostics/src/Tools/dotnet-trace/*.sh \
 		src/source-build-externals/src/azure-activedirectory-identitymodel-extensions-for-dotnet/updateAssemblyInfo.sh
 
 BINARY_ALIAS=	grep=${LOCALBASE}/bin/ggrep
 DOTNET_ENV=	PYTHON=${PYTHON_CMD}
 
 BOOTSTRAP_DOTNETVERSION=			8.0
 BOOTSTRAP_SDKVERSION=				${BOOTSTRAP_DOTNETVERSION}.100
 BOOTSTRAP_SDKVERSIONSUFFIX=			-rtm.23551.1
 BOOTSTRAP_SOURCEBUILT_ARTIFACTS_DISTNAME=	Private.SourceBuilt.Artifacts.${BOOTSTRAP_SDKVERSION}${BOOTSTRAP_SDKVERSIONSUFFIX}.freebsd.13-${DOTNET_ARCH}
 BOOTSTRAP_SDK_DISTNAME=				dotnet-sdk-${BOOTSTRAP_SDKVERSION}-freebsd-${DOTNET_ARCH}
 
 DOTNETVERSION=			8.0
 SDKVERSION=			${DOTNETVERSION}.106
 SDKVERSIONSUFFIX=		-servicing.24272.10
 SOURCEBUILT_ARTIFACTS_DISTNAME=	Private.SourceBuilt.Artifacts.${SDKVERSION}${SDKVERSIONSUFFIX}.freebsd.13-${DOTNET_ARCH}
 SDK_DISTNAME=			dotnet-sdk-${SDKVERSION}-freebsd-${DOTNET_ARCH}
 DOTNET_ARCH=				${ARCH:S|amd64|x64|:C|aarch64|arm64|}
 
 PLIST_SUB=			DOTNET_ARCH=${DOTNET_ARCH} FULL_DOTNETVERSION=${PORTVERSION} \
 				DOTNETVERSION=${DOTNETVERSION} \
 				SDKVERSION=${SDKVERSION} SDKVERSIONSUFFIX=${SDKVERSIONSUFFIX} \
 				BOOTSTRAP_SDKVERSION=${BOOTSTRAP_SDKVERSION}
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 1400000
 LIB_DEPENDS+=	libcrypto.so.111:misc/compat13x
 .endif
 
 .if ${ARCH} == aarch64
 BROKEN=		"crossgen2" exited with code 139
 .endif
 
 post-extract:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/release.json-${PORTVERSION} ${WRKSRC}/release.json
 
 	@${MKDIR} ${WRKDIR}/packages
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
 		${DISTDIR}/${DIST_SUBDIR}/${BOOTSTRAP_SOURCEBUILT_ARTIFACTS_DISTNAME}${EXTRACT_SUFX} \
 		-C ${WRKDIR}/packages \
 		${EXTRACT_AFTER_ARGS}
 
 	@${MKDIR} ${WRKDIR}/bootstrap_sdk
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
 		${DISTDIR}/${DIST_SUBDIR}/${BOOTSTRAP_SDK_DISTNAME}${EXTRACT_SUFX} \
 		-C ${WRKDIR}/bootstrap_sdk \
 		${EXTRACT_AFTER_ARGS}
 
 	${ELFCTL} -e +noaslr ${WRKDIR}/bootstrap_sdk/dotnet
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${DOTNET_ENV} ./build.sh \
 		--release-manifest release.json \
 		--clean-while-building \
 		--with-sdk ${WRKDIR}/bootstrap_sdk \
 		--with-packages ${WRKDIR}/packages \
 		-- \
 		-maxcpucount:${MAKE_JOBS_NUMBER}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/dotnet
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKSRC}/artifacts/${DOTNET_ARCH}/Release/${SDK_DISTNAME}${EXTRACT_SUFX} -C ${STAGEDIR}${PREFIX}/dotnet ${EXTRACT_AFTER_ARGS}
 	${ELFCTL} -e +noaslr ${STAGEDIR}${PREFIX}/dotnet/dotnet
 
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/dotnet/dotnet
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/dotnet/sdk/${SDKVERSION}/AppHostTemplate/apphost
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/dotnet/packs/Microsoft.NETCore.App.Host.freebsd-${DOTNET_ARCH}/${DISTVERSION}/runtimes/freebsd-${DOTNET_ARCH}/native/apphost
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/dotnet/packs/Microsoft.NETCore.App.Host.freebsd-${DOTNET_ARCH}/${DISTVERSION}/runtimes/freebsd-${DOTNET_ARCH}/native/singlefilehost
 	${FIND} ${STAGEDIR}${PREFIX}/dotnet -name "*.so" -exec ${STRIP_CMD} -s "{}" ";"
 
 	${RLN} ${STAGEDIR}${PREFIX}/dotnet/dotnet ${STAGEDIR}${PREFIX}/bin/dotnet
 
 bootstrap-makesum:
 	cd ${WRKSRC}/artifacts/${DOTNET_ARCH}/Release && sha256 ${SOURCEBUILT_ARTIFACTS_DISTNAME}${EXTRACT_SUFX}
 	@${ECHO_CMD} -n "SIZE (${SOURCEBUILT_ARTIFACTS_DISTNAME}${EXTRACT_SUFX}) = "
 	@${STAT} -f %z ${WRKSRC}/artifacts/${DOTNET_ARCH}/Release/${SOURCEBUILT_ARTIFACTS_DISTNAME}${EXTRACT_SUFX}
 
 	@cd ${WRKSRC}/artifacts/${DOTNET_ARCH}/Release && sha256 ${SDK_DISTNAME}${EXTRACT_SUFX}
 	@${ECHO_CMD} -n "SIZE (${SDK_DISTNAME}${EXTRACT_SUFX}) = "
 	@${STAT} -f %z ${WRKSRC}/artifacts/${DOTNET_ARCH}/Release/${SDK_DISTNAME}${EXTRACT_SUFX}
 
 	@${ECHO_CMD}
 
 .include <bsd.port.post.mk>
diff --git a/textproc/write-good/Makefile b/textproc/write-good/Makefile
index d82ddd1c61c0..16c0ab8eea67 100644
--- a/textproc/write-good/Makefile
+++ b/textproc/write-good/Makefile
@@ -1,77 +1,77 @@
 PORTNAME=	write-good
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	LOCAL/0mp/:npm
 DISTFILES=	${_NPM_DISTFILES}
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Naive linter for English prose
 WWW=		https://github.com/btford/write-good
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	npm:www/npm
 
 USES=		nodejs:run
 USE_GITHUB=	yes
 GH_ACCOUNT=	btford
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	DOCS
 PORTDOCS=	README.md
 
 .if !defined(MAINTAINER_MODE)
 _NPM_DISTFILES=		${_NPM_DISTFILE_cache}:npm \
 			${_NPM_DISTFILE_modules}:npm
 .endif
 _NPM_DISTFILE_cache=	${PORTNAME}-${DISTVERSION}.cache${EXTRACT_SUFX}
 _NPM_DISTFILE_modules=	${PORTNAME}-${DISTVERSION}.modules${EXTRACT_SUFX}
 
 _UNNECESSARY_FILES=	test .dockerignore \
 			.eslintrc .gitignore .npmignore .pre-commit-hooks.yaml \
 			.travis.yml Dockerfile LICENSE README.md
 _LIBEXEC_REL=		libexec/${PORTNAME}
 _LIBEXEC=		${STAGEDIR}${PREFIX}/${_LIBEXEC_REL}
 
 do-install:
 	@${MKDIR} ${_LIBEXEC}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${_LIBEXEC})
 
 	${RLN} ${_LIBEXEC}/bin/${PORTNAME}.js ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${RLN} ${_LIBEXEC}/bin/${PORTNAME}.js ${STAGEDIR}${PREFIX}/bin/writegood
 	${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/writegood
 
 	(cd ${_LIBEXEC} && ${RM} -r ${_UNNECESSARY_FILES})
 
 post-install:
 # Build plist automatically to avoid listing all the node_modules files.
 	(cd ${STAGEDIR}${PREFIX} && \
 		${FIND} ${_LIBEXEC_REL}/node_modules -not -type d >> ${TMPPLIST})
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 # - Requires npm (e.g., from www/npm).
 # - Remember to set MAINTAINER_MODE,
 #   e.g., "make -DMAINTAINER_MODE _npm-regenerate".
 _npm-regenerate:
 	${MAKE} clean patch
 	(cd ${WRKSRC} && ${SETENV} ${_NPM_ENV} npm install --ignore-scripts)
 	${FIND} ${WRKDIR}/.npm ${WRKSRC}/node_modules -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \;
 	(cd ${WRKDIR} && \
 		${FIND} .npm/_cacache -print0 | LC_ALL=C ${SORT} -z | \
 		${TAR} czf ${WRKDIR}/${_NPM_DISTFILE_cache} --format=ustar --uid 0 --gid 0 --options gzip:!timestamp --no-recursion --null -T -)
 	(cd ${WRKDIR} && \
 		${FIND} ${WRKSRC:T}/node_modules -print0 | LC_ALL=C ${SORT} -z | \
 		${TAR} czf ${WRKDIR}/${_NPM_DISTFILE_modules} --format=ustar --uid 0 --gid 0 --options gzip:!timestamp --no-recursion --null -T -)
 	scp ${WRKDIR}/${_NPM_DISTFILE_cache} ${WRKDIR}/${_NPM_DISTFILE_modules} 0mp@freefall.freebsd.org:public_distfiles/
 	cp ${WRKDIR}/${_NPM_DISTFILE_cache} ${WRKDIR}/${_NPM_DISTFILE_modules} ${DISTDIR}/
 
 .include <bsd.port.mk>
diff --git a/www/csso/Makefile b/www/csso/Makefile
index 77864fab1cc3..0355c6c99b3a 100644
--- a/www/csso/Makefile
+++ b/www/csso/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	csso
 PORTVERSION=	1.3.9
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	http://nivit.altervista.org/FreeBSD/ports/distfiles/
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	CSS optimizer
 WWW=		https://github.com/css/csso/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE.txt
 
 USES=		nodejs:run
 USE_GITHUB=	yes
 GH_ACCOUNT=	css
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/bin
 	${INSTALL_DATA} ${WRKSRC}/USAGE ${WRKSRC}/VERSION ${STAGEDIR}${DATADIR}/
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${DATADIR}/bin/${PORTNAME}
 	${LN} -sf ${DATADIR}/bin/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
 	cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/lib
 
 .include <bsd.port.mk>
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index 6357258c76ae..7d5fd34c7bbb 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,10 +1,10 @@
 GITLAB_VERSION=		17.6.1
-GITLAB_PORTREVISION=	1
+GITLAB_PORTREVISION=	2
 
 # Git version gitaly should use (from gitlab mirror)
 # Find current tag from Makefile and .gitlab-ci.yaml
 # and from https://gitlab.com/gitlab-org/git/-/tags
 GITLAB_GIT_VERSION=	2.47.0
 # return something like x.yy
 GITLAB_GIT_VERSION_SHORT=	${GITLAB_GIT_VERSION:C/^([0-9]*\.[0-9]*)\..*/\1/}
 
diff --git a/www/node/Makefile b/www/node/Makefile
index bbcb5d839a30..ae96ffed3b5c 100644
--- a/www/node/Makefile
+++ b/www/node/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	node
 PORTVERSION=	${NODEJS_PORTVERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	V8 JavaScript for client and server (meta port)
 WWW=		https://nodejs.org/ \
 		https://github.com/nodejs/node
 
 USES=		metaport nodejs:run
 
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../node${NODEJS_VERSION}/Makefile.version"
 .include <bsd.port.post.mk>
diff --git a/www/npm/Makefile b/www/npm/Makefile
index 2ddd85c02be5..16d103d5bbd6 100644
--- a/www/npm/Makefile
+++ b/www/npm/Makefile
@@ -1,15 +1,16 @@
 PORTNAME=	npm
 PORTVERSION=	10.9.0
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Node package manager (meta port)
 WWW=		https://www.npmjs.com/package/npm \
 		https://docs.npmjs.com/cli/v10 \
 		https://github.com/npm/cli
 
 RUN_DEPENDS=	npm${NODEJS_SUFFIX}>=0:www/npm${NODEJS_SUFFIX}
 
 USES=		metaport nodejs:env
 
 .include <bsd.port.mk>
diff --git a/www/p5-Nodejs-Util/Makefile b/www/p5-Nodejs-Util/Makefile
index e20d2b88a7a8..a41447bae4ea 100644
--- a/www/p5-Nodejs-Util/Makefile
+++ b/www/p5-Nodejs-Util/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	Nodejs-Util
 PORTVERSION=	0.012
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PERLANCAR
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Utilities related to Node.js
 WWW=		https://metacpan.org/dist/Nodejs-Util
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-File-Which>=0:sysutils/p5-File-Which \
 		p5-IPC-System-Options>=0.330:devel/p5-IPC-System-Options
 TEST_DEPENDS=	p5-File-Slurper>=0:devel/p5-File-Slurper \
 		p5-File-chdir>=0:devel/p5-File-chdir
 
 USES=		nodejs:run perl5
 USE_PERL5=	configure
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/www/yarn/Makefile b/www/yarn/Makefile
index 49c08de1b21f..4ac3d4f83350 100644
--- a/www/yarn/Makefile
+++ b/www/yarn/Makefile
@@ -1,14 +1,14 @@
 PORTNAME=	yarn
 PORTVERSION=	1.22.18
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 
 MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	Package manager for node, alternative to npm (meta port)
 WWW=		https://classic.yarnpkg.com/
 
 RUN_DEPENDS=	yarn${NODEJS_SUFFIX}>=0:www/yarn${NODEJS_SUFFIX}
 
 USES=		metaport nodejs:env
 
 .include <bsd.port.mk>