diff --git a/databases/mongosh/Makefile b/databases/mongosh/Makefile
index 7b7b59fa1ac7..e0628207b236 100644
--- a/databases/mongosh/Makefile
+++ b/databases/mongosh/Makefile
@@ -1,163 +1,163 @@
 PORTNAME=	mongosh
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	databases shells net
 MASTER_SITES=	https://registry.npmjs.org/mongodb-client-encryption/-/:mongocrypt \
 		https://registry.npmjs.org/kerberos/-/:kerberos \
 		https://registry.npmjs.org/os-dns-native/-/:dns \
 		https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/${DISTVERSIONFULL}/:modules
 #		https://nodejs.org/dist/latest-v${NODEJS_VERSION}.x/:node
 DISTFILES=	mongodb-client-encryption-${MONGO_CRYPT_VER}.tgz:mongocrypt \
 		kerberos-${KERBEROS_VER}.tgz:kerberos \
 		os-dns-native-${OSDNSNATIVE_VER}.tgz:dns \
 		${NODE_MODULES_TARBALL}:modules
 #		${NODEJS_TARBALL}:node \
 #		SHASUMS256.txt:node
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTFILE_DEFAULT}
 
 MAINTAINER=	fabien.amelinck+freebsd@advens.fr
 COMMENT=	MongoDB Shell CLI REPL
 WWW=		https://github.com/mongodb-js/mongosh/
 
 LICENSE=	APACHE20
 
 ONLY_FOR_ARCHS=	amd64
 # issue created upstream https://github.com/nrwl/nx/issues/29257
 
 PATCH_DEPENDS=	npm${NODEJS_SUFFIX}>0:www/npm${NODEJS_SUFFIX}
 BUILD_DEPENDS=	objdump:devel/binutils \
 		bash>0:shells/bash \
 		git>0:devel/git
 LIB_DEPENDS=	libbrotlidec.so:archivers/brotli \
 		libcares.so:dns/c-ares \
 		libicui18n.so:devel/icu \
 		libnghttp2.so:www/libnghttp2 \
 		libnghttp3.so:www/libnghttp3 \
 		libngtcp2.so:net/libngtcp2 \
 		libsimdjson.so:devel/simdjson \
 		libuv.so:devel/libuv \
 		libzstd.so:archivers/zstd \
 		libmongocrypt.so:databases/libmongocrypt
 RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 
 USES=		compiler:c++11-lang gmake gssapi:mit localbase nodejs:22,build pkgconfig python:build ssl tar:xz
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	VultureProject
 GH_PROJECT=	mongosh
 
 CUSTOM_ENV=	SEGMENT_API_KEY=dummy GYP_DEFINES="libmongocrypt_link_type=dynamic" PUPPETEER_SKIP_DOWNLOAD=1 NPM_CONFIG_CACHE=${NPM_CACHE_DIR}
 CONFIGURE_ENV=	${CUSTOM_ENV}
 MAKE_ENV=	${CUSTOM_ENV} \
 		NODE_JS_VERSION=file://${DISTDIR}/${DIST_SUBDIR}/${NODEJS_TARBALL} \
 		BOXEDNODE_CONFIGURE_ARGS="--prefix=${PREFIX:S|^${DESTDIR}||},--shared-brotli,--shared-cares,--shared-libuv,--shared-nghttp2,--shared-nghttp3,--shared-ngtcp2,--shared-simdjson,--shared-zlib,--shared-zstd,--shared-openssl,--openssl-use-def-ca-store,--with-intl=system-icu,--without-npm" \
 		BOXEDNODE_MAKE_ARGS="V=0"
 CXXFLAGS+=	-DNODE_API_EXPERIMENTAL \
 		-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT
 
 REINPLACE_ARGS=	-i ''
 
 MPROTECT_DISABLE=	bin/mongosh
 
 MONGO_CRYPT_VER=6.4.0
 KERBEROS_VER=	2.1.0
 OSDNSNATIVE_VER=1.2.1
 NODE_MODULES_DIR=	${WRKSRC}/node_modules
 NODE_MODULES_TARBALL=	${PORTNAME}-${DISTVERSIONFULL}-${ARCH}-node-modules.tar.xz
 NPM_CACHE_DIR=	${TMPDIR}/.npm
 NODEJS_TARBALL=	node-v${NODEJS_PORTVERSION}.tar.gz
 NODEJS_SHAFILE=	node-v${NODEJS_PORTVERSION}-SHASUMS256.txt
 
 post-fetch:
 	if [ ! -r ${DISTDIR}/${DIST_SUBDIR}/${NODEJS_TARBALL} -o ! -r ${DISTDIR}/${DIST_SUBDIR}/${NODEJS_SHAFILE} ]; then \
 		${FETCH_CMD} -o ${DISTDIR}/${DIST_SUBDIR} https://nodejs.org/dist/v${NODEJS_PORTVERSION}/${NODEJS_TARBALL}; \
 		${FETCH_CMD} -o ${DISTDIR}/${DIST_SUBDIR}/${NODEJS_SHAFILE} https://nodejs.org/dist/v${NODEJS_PORTVERSION}/SHASUMS256.txt; \
 	fi
 
 post-extract:
 .if !exists(${NODE_MODULES_DIR})
 	${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${NODE_MODULES_TARBALL} -C ${WRKSRC}
 	${MKDIR} -v ${WRKDIR}/boxednode/mongosh
 	${REINPLACE_CMD} -e "s|'make'|'${GMAKE}'|g" \
 		-e "s/if (inputIsFileUrl)/if (false)/g" \
 		-e 's/(await nv_1.default(range)).pop()/{"version":"${NODEJS_PORTVERSION}"}/g' \
 		-e 's/path_1.default.join(dir, tarballName)/url_1.fileURLToPath(range)/g' \
 		-e "s|\$${releaseBaseUrl}/SHASUMS256.txt|${DISTDIR}/${DIST_SUBDIR}/${NODEJS_SHAFILE}|g" \
 		-e 's/await node_fetch_1.default(shaSumsUrl)/{"ok":1}/g' \
 		-e "s/shaSums.text()/fs_1.promises.readFile(shaSumsUrl, 'utf8')/g" \
 		-e "s/catch (_a) { }/catch (_a) { console.error(_a) }/g" \
 		-e "s|os_1.default.tmpdir()|'${WRKDIR}'|g" \
 		${NODE_MODULES_DIR}/boxednode/lib/index.js
 	${GREP} -A36 "let version;" ${NODE_MODULES_DIR}/boxednode/lib/index.js
 	${REINPLACE_CMD} -e "s|'install', '--ignore-scripts', '--production'|'--version'|g" \
 		${NODE_MODULES_DIR}/boxednode/lib/native-addons.js
 	${GREP} "version" ${NODE_MODULES_DIR}/boxednode/lib/native-addons.js
 .endif
 
 post-patch:
 	${CP} -v ${FILESDIR}/node-patches/* ${WRKSRC}/scripts/nodejs-patches
 
 do-configure:
 	${FIND} ${WRKSRC}/scripts -name "*.orig" -delete
 	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${NODE_MODULES_DIR}/mongodb-client-encryption/binding.gyp ${NODE_MODULES_DIR}/kerberos/binding.gyp
 .for module in mongodb-client-encryption kerberos os-dns-native
 	cd ${NODE_MODULES_DIR}/${module} && ${CONFIGURE_ENV} node-gyp configure --nodedir=${LOCALBASE}
 .endfor
 
 do-build:
 .for module in mongodb-client-encryption kerberos os-dns-native
 	cd ${NODE_MODULES_DIR}/${module} && ${MAKE_ENV} ${MAKE_CMD} BUILDTYPE=Release -C build -d
 .endfor
 	${REINPLACE_CMD} -E 's/"version": ".*"/"version": "${DISTVERSION}"/g' ${WRKSRC}/packages/cli-repl/package.json
 	${RM} -v \
 		${WRKSRC}/scripts/nodejs-patches/005-windows-escape-product-dir-abs-in-openssl-node-56111.patch \
 		${WRKSRC}/scripts/nodejs-patches/006-windows-virtual-terminal-input-libuv-4688.patch
 	cd ${WRKSRC} && ${MAKE_ENV} ${LOCALBASE}/bin/npm run compile-exec || (cat ${WRKSRC}/lerna-debug.log && false)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dist/mongosh ${STAGEDIR}${PREFIX}/bin
 
 npm-pkg-list: extract
 	${GREP} registry.npmjs.org ${WRKSRC}/package-lock.json | \
 		| ${SED} -E 's/^[[:space:]]+//g' \
 		| ${SED} -E 's#^.*org/|.tgz",##g' \
 		| ${SORT} \
 		| /usr/bin/uniq \
 		| ${SED} -E 's/(.*)-([^-])/\1@\2/g' \
 		| ${SED} -E 's|/-/.*@|@|g' \
 		> ${FILESDIR}/npm-pkg.list
 
 .for module in mongodb-client-encryption kerberos os-dns-native mongodb-crypt-library-version glibc-version
 	cd ${NODE_MODULES_DIR}/${module} && ${LOCALBASE}/bin/npm list 2>/dev/null \
 		| ${GREP} UNMET \
 		| ${AWK} 'BEGIN{FS="UNMET DEPENDENCY "}{print $$2}' \
 		> ${FILESDIR}/npm-pkg-${module}.list
 .endfor
 
 node-modules-archive: patch
 #	Comment DISTFILES, post-extract
 	cd ${WRKSRC} && ${LOCALBASE}/bin/npx cross-env ${CONFIGURE_ENV} ${LOCALBASE}/bin/npm clean-install --cache ${NPM_CACHE_DIR} --no-audit --no-fund
 	cd ${WRKSRC} && ${LOCALBASE}/bin/npx cross-env ${CONFIGURE_ENV} ${LOCALBASE}/bin/npm install ipv6-normalize mongodb-redact --cache ${NPM_CACHE_DIR} --no-audit --no-fund
 
 .for module in mongodb-client-encryption kerberos os-dns-native
 	${MKDIR} -v ${NODE_MODULES_DIR}/${module}
 	${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${module}-*.tgz -C ${NODE_MODULES_DIR}/${module} --strip-components 1
 .endfor
 	for f in ${FILESDIR}/node-modules-patches/*; do ${PATCH} -Nd ${WRKSRC} < $$f; done
 	${FIND} ${WRKSRC} -name "*.orig" -or -name "*.bak" -delete
 
 .for module in mongodb-client-encryption kerberos os-dns-native mongodb-crypt-library-version glibc-version native-machine-id
 	cd ${NODE_MODULES_DIR}/${module} && ${CONFIGURE_ENV} ${LOCALBASE}/bin/npm install --ignore-scripts --cache ${NPM_CACHE_DIR} --no-audit --no-fund
 .endfor
 
 	cd ${WRKSRC} && ${TAR} cf - node_modules packages/*/node_modules | ${LOCALBASE}/bin/pv -s $$(/usr/bin/du -sAk node_modules | ${AWK} '{print $$1}')000 | ${XZ_CMD} > ${TMPDIR}/${NODE_MODULES_TARBALL}
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/www/node${NODEJS_VERSION}/Makefile.version"
 NODE_WITH_JIT!= ${BSDMAKE} -C ${PORTSDIR}/www/node${NODEJS_VERSION} showconfig | ${GREP} -o "JIT=on" || ${TRUE}
 .if empty(NODE_WITH_JIT)
 IGNORE=	www/node${NODEJS_VERSION} must be built with JIT enabled. Run '${BSDMAKE} -C ${PORTSDIR}/www/node${NODEJS_VERSION} config' to enable it.
 .endif
 .include <bsd.port.post.mk>
diff --git a/security/bitwarden-cli/Makefile b/security/bitwarden-cli/Makefile
index 3756e4bdf9a5..bac0a0af9213 100644
--- a/security/bitwarden-cli/Makefile
+++ b/security/bitwarden-cli/Makefile
@@ -1,123 +1,123 @@
 PORTNAME=	bitwarden-cli
 DISTVERSIONPREFIX=	cli-v
 DISTVERSION=	2026.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	https://nodejs.org/dist/v${PKG_NODE_VER}/:node
 DISTFILES=	node-v${PKG_NODE_VER}${EXTRACT_SUFX}:node
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Bitwarden client command-line interface
 WWW=		https://bitwarden.com
 
 LICENSE=	BITWARDEN GPLv3
 LICENSE_COMB=	multi
 LICENSE_NAME_BITWARDEN=	BITWARDEN LICENSE AGREEMENT
 LICENSE_FILE_BITWARDEN=	${WRKSRC}/LICENSE_BITWARDEN.txt
 LICENSE_FILE_GPLv3=	${WRKSRC}/LICENSE_GPL.txt
 LICENSE_PERMS_BITWARDEN=none
 
 ONLY_FOR_ARCHS=	aarch64 amd64
 
 LIB_DEPENDS=	libbrotlidec.so:archivers/brotli \
 		libzstd.so:archivers/zstd \
 		libicui18n.so:devel/icu \
 		libuv.so:devel/libuv \
 		libsimdjson.so:devel/simdjson \
 		libcares.so:dns/c-ares \
 		libngtcp2.so:net/libngtcp2 \
 		libnghttp2.so:www/libnghttp2 \
 		libnghttp3.so:www/libnghttp3
 RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		ca_root_nss>0:security/ca_root_nss
 
 USES=		electron:env gmake localbase:ldflags nodejs:22,build \
 		pkgconfig python:build sqlite ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bitwarden
 GH_PROJECT=	clients
 
 MAKE_ENV+=	PYTHONDONTWRITEBYTECODE=1
 
 # don't strip executable upon install since it causes error
 STRIP=		# empty
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 BUILD_WRKSRC=	${WRKSRC}/apps/cli
 
 PLIST_FILES=	bin/bw \
 		share/zsh/site-functions/_bw
 
 PORTDOCS=	CONTRIBUTING.md README.md SECURITY.md
 
 OPTIONS_DEFINE=	DOCS
 
 USE_ELECTRON=	npm:npm prefetch extract
 PKG_NODE_VER=	22.15.1
 PKG_FETCH_VER=	3.5
 PKG_NODE_CONFIGURE_ARGS=--openssl-use-def-ca-store \
 			--shared-brotli \
 			--shared-cares \
 			--shared-libuv \
 			--shared-nghttp2 \
 			--shared-nghttp3 \
 			--shared-openssl \
 			--shared-ngtcp2 \
 			--shared-simdjson \
 			--shared-sqlite \
 			--shared-zlib \
 			--shared-zstd \
 			--with-intl=system-icu
 NODE_ARCH=	${ARCH:S/aarch64/arm64/:S/amd64/x64/:S/i386/ia32/}
 
 post-patch:
 	# apply FreeBSD patches for node
 	@${BSDMAKE} PATCHDIR=${PATCHDIR}/node \
 		WRKSRC=${WRKDIR}/node-v${PKG_NODE_VER} do-patch
 	# apply node patch from pkg-fetch
 	@${PATCH} -s -p1 -d ${WRKDIR}/node-v${PKG_NODE_VER} < \
 		${WRKSRC}/node_modules/@yao-pkg/pkg-fetch/patches/node.v${PKG_NODE_VER}.cpp.patch
 
 pre-build:
 	# build patched node for pkg
 	cd ${WRKDIR}/node-v${PKG_NODE_VER} && \
 		${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} ./configure ${PKG_NODE_CONFIGURE_ARGS} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} -j ${MAKE_JOBS_NUMBER}
 	${MKDIR} ${WRKDIR}/.pkg-cache/v${PKG_FETCH_VER}
 	${MV} ${WRKDIR}/node-v${PKG_NODE_VER}/out/Release/node \
 		${WRKDIR}/.pkg-cache/v${PKG_FETCH_VER}/built-v${PKG_NODE_VER}-freebsd-${NODE_ARCH}
 	${STRIP_CMD} ${WRKDIR}/.pkg-cache/v${PKG_FETCH_VER}/built-v${PKG_NODE_VER}-freebsd-${NODE_ARCH}
 	# rebuild node modules against patched node
 	@for subdir in `${FIND} ${WRKSRC} -type f -name binding.gyp -exec ${DIRNAME} {} ';' 2>/dev/null`; do \
 		${ECHO_MSG} "===>   Rebuilding native modules in $${subdir}"; \
 		cd $${subdir} && \
 		${SETENV} ${MAKE_ENV} \
 			npm_config_runtime=node \
 			npm_config_target=${PKG_NODE_VER} \
 			npm_config_nodedir=${WRKDIR}/node-v${PKG_NODE_VER} \
 			node-gyp rebuild; \
 	done
 
 do-build:
 	cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		npm run build:bit:prod
 	cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		npx pkg . --targets node${NODEJS_VERSION}-freebsd-${NODE_ARCH} --output ./dist/bw
 	cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		./dist/bw completion --shell zsh > _bw
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/dist/bw ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${BUILD_WRKSRC}/_bw \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_bw
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 do-test:
 	cd ${BUILD_WRKSRC} && ${SETENV} ${TEST_ENV} npm run test
 
 .include <bsd.port.mk>
diff --git a/sysutils/intel-pcm/Makefile b/sysutils/intel-pcm/Makefile
index da8d890336f3..fc3d717b827f 100644
--- a/sysutils/intel-pcm/Makefile
+++ b/sysutils/intel-pcm/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	intel-pcm
 DISTVERSION=	202405
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	sysutils
 
 MAINTAINER=	imp@FreeBSD.org
 COMMENT=	Process Count Monitor (PCM) for Intel processors
 WWW=		https://github.com/intel/pcm
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 LIB_DEPENDS=	libsimdjson.so:devel/simdjson
 
 USES=		cmake compiler:c++11-lang
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	intel
 GH_PROJECT=	pcm
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O3 -D_FORTIFY_SOURCE=1|-D_FORTIFY_SOURCE=1|g' \
 	    ${PATCH_WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_DATADIR}/pcm|$${CMAKE_INSTALL_DATADIR}/${PORTNAME}|g' \
 	    ${PATCH_WRKSRC}/src/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_DOCDIR}|$${CMAKE_INSTALL_DATADIR}/doc/${PORTNAME}|g' \
 	    ${PATCH_WRKSRC}/src/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|/usr/share/pcm/|${DATADIR}/|g' \
 	     ${PATCH_WRKSRC}/src/pcm-raw.cpp
 	@${REINPLACE_CMD} -e 's|/usr/share/pcm/|${DATADIR}/|g' \
 	     ${PATCH_WRKSRC}/src/utils.cpp
 
 post-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/share/licenses
 
 .include <bsd.port.mk>
diff --git a/www/node20/Makefile b/www/node20/Makefile
index 3bc28b7d6c0b..925f00248c2d 100644
--- a/www/node20/Makefile
+++ b/www/node20/Makefile
@@ -1,112 +1,113 @@
 PORTNAME=	node
 PORTVERSION=	${NODEJS_PORTVERSION}
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://nodejs.org/dist/v${PORTVERSION}/
 PKGNAMESUFFIX=	${PORTVERSION:R:R}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	V8 JavaScript for client and server
 WWW=		https://nodejs.org/ \
 		https://github.com/nodejs/node
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_SSL=	libressl libressl-devel
 BROKEN_SSL_REASON=	Node.js ${PORTVERSION:R:R}.x requires OpenSSL or the BUNDLED_SSL option enabled
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	objdump:devel/binutils
 LIB_DEPENDS=	libbrotlidec.so:archivers/brotli \
 		libcares.so:dns/c-ares \
 		libicui18n.so:devel/icu \
 		libllhttp.so:www/llhttp \
 		libnghttp2.so:www/libnghttp2 \
 		libnghttp3.so:www/libnghttp3 \
 		libngtcp2.so:net/libngtcp2 \
 		libsimdjson.so:devel/simdjson \
 		libuv.so:devel/libuv
 RUN_DEPENDS=	corepack>=0:www/corepack
 
 USES=		compiler:c++20-lang gmake localbase pkgconfig python:build shebangfix tar:xz
 
 CONFIGURE_ARGS=	--prefix=${PREFIX:S|^${DESTDIR}||} \
 		--shared-brotli \
 		--shared-cares \
 		--shared-http-parser \
 		--shared-http-parser-libname=llhttp \
 		--shared-libuv \
 		--shared-nghttp2 \
 		--shared-nghttp3 \
 		--shared-ngtcp2 \
 		--shared-simdjson \
 		--shared-zlib \
 		--with-intl=system-icu \
 		--without-corepack \
 		--without-npm
 CXXFLAGS_powerpc64=	-mpower8-vector
 HAS_CONFIGURE=	yes
 MAKE_ENV=	CC.host="${CCACHE_BIN} ${CC}" \
 		CFLAGS.host="${CFLAGS}" \
 		CXX.host="${CCACHE_BIN} ${CXX}" \
 		CXXFLAGS.host="${CXXFLAGS}" \
 		LDFLAGS.host="${LDFLAGS}" \
 		LINK.host="${CXX}"
 REINPLACE_ARGS=	-i ''
 
 CONFLICTS_INSTALL=	node[0-9][0-9]
 
 SHEBANG_FILES=	deps/v8/third_party/inspector_protocol/*.py \
 		deps/v8/tools/*.py \
 		tools/*.py \
 		tools/inspector_protocol/*.py
 
 OPTIONS_DEFINE=	BUNDLED_SSL DOCS JIT
 OPTIONS_DEFAULT=JIT
 OPTIONS_SUB=	yes
 BUNDLED_SSL_DESC=	Use bundled OpenSSL implementation from node.js
 JIT_DESC=		Use Just In Time compiler
 
 BUNDLED_SSL_CONFIGURE_OFF=	--openssl-use-def-ca-store --shared-openssl
 BUNDLED_SSL_USES_OFF=	ssl
 JIT_CONFIGURE_OFF=	--v8-lite-mode
 
 .include "Makefile.version"
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64
 CONFIGURE_ARGS+=--openssl-no-asm
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/tools/v8_gypfiles/v8.gyp
 # Clean up bundled libraries
 	@${RM} -r ${WRKSRC}/deps/brotli/
 	@${RM} -r ${WRKSRC}/deps/cares/
 	@${RM} -r ${WRKSRC}/deps/corepack/
 	@${RM} -r ${WRKSRC}/deps/icu-small/
 	@${RM} -r ${WRKSRC}/deps/llhttp/
 	@${RM} -r ${WRKSRC}/deps/nghttp2/
 	@${RM} -r ${WRKSRC}/deps/ngtcp2/
 	@${RM} -r ${WRKSRC}/deps/npm/
 	@${RM} -r ${WRKSRC}/deps/simdjson/
 	@${RM} -r ${WRKSRC}/deps/uv/
 	@${RM} -r ${WRKSRC}/deps/zlib/
 
 post-configure:
 	# Post-process Makefile and *.mk files created by node-gyp and remove
 	# all occurrences of -I${LOCALBASE}/include. C*FLAGS include this
 	# before all -I../deps/* for bundled code. This can cause build
 	# breakages if the dependency is installed in ${LOCALBASE}. The
 	# USES+=localbase above will ensure that we pick up includes for real
 	# external dependencies.
 	@${FIND} ${WRKSRC}/out -type f -print0 | ${XARGS} -0 ${REINPLACE_CMD} -e "s|-I${LOCALBASE}/include||g"
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node
 
 post-install-BUNDLED_SSL-on:
 	cd ${STAGEDIR}${PREFIX} && ${FIND} include/node/openssl/ -type f >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/www/node22/Makefile b/www/node22/Makefile
index d8a10fea03c3..d2fcd9c82edd 100644
--- a/www/node22/Makefile
+++ b/www/node22/Makefile
@@ -1,124 +1,125 @@
 PORTNAME=	node
 PORTVERSION=	${NODEJS_PORTVERSION}
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://nodejs.org/dist/v${PORTVERSION}/
 PKGNAMESUFFIX=	${PORTVERSION:R:R}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	V8 JavaScript for client and server
 WWW=		https://nodejs.org/ \
 		https://github.com/nodejs/node
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_SSL=	libressl libressl-devel
 BROKEN_SSL_REASON=	Node.js ${PORTVERSION:R:R}.x requires OpenSSL or the BUNDLED_SSL option enabled
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	objdump:devel/binutils
 LIB_DEPENDS=	libada.so:devel/libada \
 		libbrotlidec.so:archivers/brotli \
 		libcares.so:dns/c-ares \
 		libicui18n.so:devel/icu \
 		libllhttp.so:www/llhttp \
 		libnghttp2.so:www/libnghttp2 \
 		libnghttp3.so:www/libnghttp3 \
 		libngtcp2.so:net/libngtcp2 \
 		libsimdjson.so:devel/simdjson \
 		libuv.so:devel/libuv \
 		libuvwasi.so:devel/uvwasi \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	corepack>=0:www/corepack
 
 USES=		compiler:c++20-lang gmake localbase pkgconfig python:build shebangfix sqlite tar:xz
 
 CONFIGURE_ARGS=	--prefix=${PREFIX:S|^${DESTDIR}||} \
 		--shared-ada \
 		--shared-brotli \
 		--shared-cares \
 		--shared-http-parser \
 		--shared-http-parser-libname=llhttp \
 		--shared-libuv \
 		--shared-nghttp2 \
 		--shared-nghttp3 \
 		--shared-ngtcp2 \
 		--shared-simdjson \
 		--shared-sqlite \
 		--shared-uvwasi \
 		--shared-uvwasi-includes=${LOCALBASE}/include \
 		--shared-zlib \
 		--shared-zstd \
 		--with-intl=system-icu \
 		--without-corepack \
 		--without-npm
 CXXFLAGS_powerpc64=	-mpower8-vector
 HAS_CONFIGURE=	yes
 MAKE_ENV=	CC.host="${CCACHE_BIN} ${CC}" \
 		CFLAGS.host="${CFLAGS}" \
 		CXX.host="${CCACHE_BIN} ${CXX}" \
 		CXXFLAGS.host="${CXXFLAGS}" \
 		LDFLAGS.host="${LDFLAGS}" \
 		LINK.host="${CXX}"
 REINPLACE_ARGS=	-i ''
 
 CONFLICTS_INSTALL=	node[0-9][0-9]
 
 SHEBANG_FILES=	deps/v8/third_party/inspector_protocol/*.py \
 		deps/v8/tools/*.py \
 		tools/*.py \
 		tools/inspector_protocol/*.py
 
 OPTIONS_DEFINE=	BUNDLED_SSL DOCS JIT
 OPTIONS_DEFAULT=JIT
 OPTIONS_SUB=	yes
 BUNDLED_SSL_DESC=	Use bundled OpenSSL implementation from node.js
 JIT_DESC=		Use Just In Time compiler
 
 BUNDLED_SSL_CONFIGURE_OFF=	--openssl-use-def-ca-store --shared-openssl
 BUNDLED_SSL_USES_OFF=	ssl
 JIT_CONFIGURE_OFF=	--v8-lite-mode
 
 .include "Makefile.version"
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64
 CONFIGURE_ARGS+=--openssl-no-asm
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/tools/v8_gypfiles/v8.gyp
 # Clean up bundled libraries
 	@${RM} -r ${WRKSRC}/deps/ada/
 	@${RM} -r ${WRKSRC}/deps/brotli/
 	@${RM} -r ${WRKSRC}/deps/cares/
 	@${RM} -r ${WRKSRC}/deps/corepack/
 	@${RM} -r ${WRKSRC}/deps/icu-small/
 	@${RM} -r ${WRKSRC}/deps/llhttp/
 	@${RM} -r ${WRKSRC}/deps/nghttp2/
 	@${RM} -r ${WRKSRC}/deps/ngtcp2/
 	@${RM} -r ${WRKSRC}/deps/npm/
 	@${RM} -r ${WRKSRC}/deps/simdjson/
 	@${RM} -r ${WRKSRC}/deps/sqlite/
 	@${RM} -r ${WRKSRC}/deps/uv/
 	@${RM} -r ${WRKSRC}/deps/uvwasi/
 	@${RM} -r ${WRKSRC}/deps/zlib/
 	@${RM} -r ${WRKSRC}/deps/zstd/
 
 post-configure:
 	# Post-process Makefile and *.mk files created by node-gyp and remove
 	# all occurrences of -I${LOCALBASE}/include. C*FLAGS include this
 	# before all -I../deps/* for bundled code. This can cause build
 	# breakages if the dependency is installed in ${LOCALBASE}. The
 	# USES+=localbase above will ensure that we pick up includes for real
 	# external dependencies.
 	@${FIND} ${WRKSRC}/out -type f -print0 | ${XARGS} -0 ${REINPLACE_CMD} -e 's|-I${LOCALBASE}/include||g'
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node
 
 post-install-BUNDLED_SSL-on:
 	cd ${STAGEDIR}${PREFIX} && ${FIND} include/node/openssl/ -type f >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/www/node24/Makefile b/www/node24/Makefile
index 9a6f3776bc4c..9a6790b75a70 100644
--- a/www/node24/Makefile
+++ b/www/node24/Makefile
@@ -1,135 +1,136 @@
 PORTNAME=	node
 PORTVERSION=	${NODEJS_PORTVERSION}
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://nodejs.org/dist/v${PORTVERSION}/
 PKGNAMESUFFIX=	${PORTVERSION:R:R}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	V8 JavaScript for client and server
 WWW=		https://nodejs.org/ \
 		https://github.com/nodejs/node
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_SSL=	libressl libressl-devel
 BROKEN_SSL_REASON=	Node.js ${PORTVERSION:R:R}.x requires OpenSSL or the BUNDLED_SSL option enabled
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	objdump:devel/binutils
 LIB_DEPENDS=	libada.so:devel/libada \
 		libbrotlidec.so:archivers/brotli \
 		libcares.so:dns/c-ares \
 		libgtest.so:devel/googletest \
 		libhdr_histogram.so:graphics/hdr_histogram \
 		libicui18n.so:devel/icu \
 		libllhttp.so:www/llhttp \
 		libmerve.so:devel/merve \
 		libnbytes.so:www/nbytes \
 		libnghttp2.so:www/libnghttp2 \
 		libnghttp3.so:www/libnghttp3 \
 		libngtcp2.so:net/libngtcp2 \
 		libsimdjson.so:devel/simdjson \
 		libuv.so:devel/libuv \
 		libuvwasi.so:devel/uvwasi \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	corepack>=0:www/corepack
 
 USES=		compiler:c++20-lang gmake localbase pkgconfig python:build shebangfix sqlite tar:xz
 
 CONFIGURE_ARGS=	--prefix=${PREFIX:S|^${DESTDIR}||} \
 		--shared-ada \
 		--shared-brotli \
 		--shared-cares \
 		--shared-gtest \
 		--shared-hdr-histogram \
 		--shared-http-parser \
 		--shared-libuv \
 		--shared-merve \
 		--shared-nbytes \
 		--shared-nghttp2 \
 		--shared-nghttp3 \
 		--shared-ngtcp2 \
 		--shared-simdjson \
 		--shared-sqlite \
 		--shared-uvwasi \
 		--shared-uvwasi-includes=${LOCALBASE}/include \
 		--shared-zlib \
 		--shared-zstd \
 		--with-intl=system-icu \
 		--without-corepack \
 		--without-npm
 CXXFLAGS_powerpc64=	-mpower8-vector
 HAS_CONFIGURE=	yes
 MAKE_ENV=	CC.host="${CCACHE_BIN} ${CC}" \
 		CFLAGS.host="${CFLAGS}" \
 		CXX.host="${CCACHE_BIN} ${CXX}" \
 		CXXFLAGS.host="${CXXFLAGS}" \
 		LDFLAGS.host="${LDFLAGS}" \
 		LINK.host="${CXX}"
 REINPLACE_ARGS=	-i ''
 
 CONFLICTS_INSTALL=	node[0-9][0-9]
 
 SHEBANG_FILES=	deps/v8/third_party/inspector_protocol/*.py \
 		deps/v8/tools/*.py \
 		tools/*.py \
 		tools/inspector_protocol/*.py
 
 OPTIONS_DEFINE=	BUNDLED_SSL DOCS JIT
 OPTIONS_DEFAULT=JIT
 OPTIONS_SUB=	yes
 BUNDLED_SSL_DESC=	Use bundled OpenSSL implementation from node.js
 JIT_DESC=		Use Just In Time compiler
 
 BUNDLED_SSL_CONFIGURE_OFF=	--openssl-use-def-ca-store --shared-openssl
 BUNDLED_SSL_USES_OFF=	ssl
 JIT_CONFIGURE_OFF=	--v8-lite-mode
 
 .include "Makefile.version"
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64
 CONFIGURE_ARGS+=--openssl-no-asm
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/tools/v8_gypfiles/v8.gyp
 # Clean up bundled libraries
 	@${RM} -r ${WRKSRC}/deps/ada/
 	@${RM} -r ${WRKSRC}/deps/brotli/
 	@${RM} -r ${WRKSRC}/deps/cares/
 	@${RM} -r ${WRKSRC}/deps/corepack/
 	@${RM} -r ${WRKSRC}/deps/googletest/
 	@${RM} -r ${WRKSRC}/deps/histogram/
 	@${RM} -r ${WRKSRC}/deps/icu-small/
 	@${RM} -r ${WRKSRC}/deps/llhttp/
 	@${RM} -r ${WRKSRC}/deps/merve/
 	@${RM} -r ${WRKSRC}/deps/nbytes/
 	@${RM} -r ${WRKSRC}/deps/nghttp2/
 	@${RM} -r ${WRKSRC}/deps/ngtcp2/
 	@${RM} -r ${WRKSRC}/deps/npm/
 	@${RM} -r ${WRKSRC}/deps/simdjson/
 	@${RM} -r ${WRKSRC}/deps/sqlite/
 	@${RM} -r ${WRKSRC}/deps/uv/
 	@${RM} -r ${WRKSRC}/deps/uvwasi/
 	@${RM} -r ${WRKSRC}/deps/zlib/
 	@${RM} -r ${WRKSRC}/deps/zstd/
 
 post-configure:
 	# Post-process Makefile and *.mk files created by node-gyp and remove
 	# all occurrences of -I${LOCALBASE}/include. C*FLAGS include this
 	# before all -I../deps/* for bundled code. This can cause build
 	# breakages if the dependency is installed in ${LOCALBASE}. The
 	# USES+=localbase above will ensure that we pick up includes for real
 	# external dependencies.
 	@${FIND} ${WRKSRC}/out -type f -print0 | ${XARGS} -0 ${REINPLACE_CMD} -e 's|-I${LOCALBASE}/include||g'
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node
 
 post-install-BUNDLED_SSL-on:
 	cd ${STAGEDIR}${PREFIX} && ${FIND} include/node/openssl/ -type f >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/www/node25/Makefile b/www/node25/Makefile
index 8f73f286932d..88a165d4bf52 100644
--- a/www/node25/Makefile
+++ b/www/node25/Makefile
@@ -1,136 +1,137 @@
 PORTNAME=	node
 PORTVERSION=	${NODEJS_PORTVERSION}
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://nodejs.org/dist/v${PORTVERSION}/
 PKGNAMESUFFIX=	${PORTVERSION:R:R}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	V8 JavaScript for client and server
 WWW=		https://nodejs.org/ \
 		https://github.com/nodejs/node
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_SSL=	libressl libressl-devel
 BROKEN_SSL_REASON=	Node.js ${PORTVERSION:R:R}.x requires OpenSSL or the BUNDLED_SSL option enabled
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	objdump:devel/binutils
 LIB_DEPENDS=	libada.so:devel/libada \
 		libbrotlidec.so:archivers/brotli \
 		libcares.so:dns/c-ares \
 		libgtest.so:devel/googletest \
 		libhdr_histogram.so:graphics/hdr_histogram \
 		libicui18n.so:devel/icu \
 		libLIEF.so:devel/lief \
 		libllhttp.so:www/llhttp \
 		libmerve.so:devel/merve \
 		libnbytes.so:www/nbytes \
 		libnghttp2.so:www/libnghttp2 \
 		libnghttp3.so:www/libnghttp3 \
 		libngtcp2.so:net/libngtcp2 \
 		libsimdjson.so:devel/simdjson \
 		libuv.so:devel/libuv \
 		libuvwasi.so:devel/uvwasi \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	corepack>=0:www/corepack
 
 USES=		compiler:c++20-lang gmake localbase pkgconfig python:build shebangfix sqlite tar:xz
 
 CONFIGURE_ARGS=	--prefix=${PREFIX:S|^${DESTDIR}||} \
 		--shared-ada \
 		--shared-brotli \
 		--shared-cares \
 		--shared-gtest \
 		--shared-hdr-histogram \
 		--shared-http-parser \
 		--shared-libuv \
 		--shared-lief \
 		--shared-merve \
 		--shared-nbytes \
 		--shared-nghttp2 \
 		--shared-nghttp3 \
 		--shared-ngtcp2 \
 		--shared-simdjson \
 		--shared-sqlite \
 		--shared-uvwasi \
 		--shared-uvwasi-includes=${LOCALBASE}/include \
 		--shared-zlib \
 		--shared-zstd \
 		--with-intl=system-icu \
 		--without-npm
 CXXFLAGS_powerpc64=	-mpower8-vector
 HAS_CONFIGURE=	yes
 MAKE_ENV=	CC.host="${CCACHE_BIN} ${CC}" \
 		CFLAGS.host="${CFLAGS}" \
 		CXX.host="${CCACHE_BIN} ${CXX}" \
 		CXXFLAGS.host="${CXXFLAGS}" \
 		LDFLAGS.host="${LDFLAGS}" \
 		LINK.host="${CXX}"
 REINPLACE_ARGS=	-i ''
 
 CONFLICTS_INSTALL=	node[0-9][0-9]
 
 SHEBANG_FILES=	deps/v8/third_party/inspector_protocol/*.py \
 		deps/v8/tools/*.py \
 		tools/*.py \
 		tools/inspector_protocol/*.py
 
 OPTIONS_DEFINE=	BUNDLED_SSL DOCS JIT
 OPTIONS_DEFAULT=JIT
 OPTIONS_SUB=	yes
 BUNDLED_SSL_DESC=	Use bundled OpenSSL implementation from node.js
 JIT_DESC=		Use Just In Time compiler
 
 BUNDLED_SSL_CONFIGURE_OFF=	--openssl-use-def-ca-store --shared-openssl
 BUNDLED_SSL_USES_OFF=	ssl
 JIT_CONFIGURE_OFF=	--v8-lite-mode
 
 .include "Makefile.version"
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64
 CONFIGURE_ARGS+=--openssl-no-asm
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/tools/v8_gypfiles/v8.gyp
 # Clean up bundled libraries
 	@${RM} -r ${WRKSRC}/deps/ada/
 	@${RM} -r ${WRKSRC}/deps/brotli/
 	@${RM} -r ${WRKSRC}/deps/cares/
 	@${RM} -r ${WRKSRC}/deps/googletest/
 	@${RM} -r ${WRKSRC}/deps/histogram/
 	@${RM} -r ${WRKSRC}/deps/icu-small/
 	@${RM} -r ${WRKSRC}/deps/LIEF/
 	@${RM} -r ${WRKSRC}/deps/llhttp/
 	@${RM} -r ${WRKSRC}/deps/merve/
 	@${RM} -r ${WRKSRC}/deps/nbytes/
 	@${RM} -r ${WRKSRC}/deps/nghttp2/
 	@${RM} -r ${WRKSRC}/deps/ngtcp2/
 	@${RM} -r ${WRKSRC}/deps/npm/
 	@${RM} -r ${WRKSRC}/deps/simdjson/
 	@${RM} -r ${WRKSRC}/deps/sqlite/
 	@${RM} -r ${WRKSRC}/deps/uv/
 	@${RM} -r ${WRKSRC}/deps/uvwasi/
 	@${RM} -r ${WRKSRC}/deps/zlib/
 	@${RM} -r ${WRKSRC}/deps/zstd/
 
 post-configure:
 	# Post-process Makefile and *.mk files created by node-gyp and remove
 	# all occurrences of -I${LOCALBASE}/include. C*FLAGS include this
 	# before all -I../deps/* for bundled code. This can cause build
 	# breakages if the dependency is installed in ${LOCALBASE}. The
 	# USES+=localbase above will ensure that we pick up includes for real
 	# external dependencies.
 	@${FIND} ${WRKSRC}/out -type f -print0 | ${XARGS} -0 ${REINPLACE_CMD} -e 's|-I${LOCALBASE}/include||g'
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node
 
 post-install-BUNDLED_SSL-on:
 	cd ${STAGEDIR}${PREFIX} && ${FIND} include/node/openssl/ -type f >> ${TMPPLIST}
 
 .include <bsd.port.mk>