diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile
index 3a15999d1968..a214d5f97386 100644
--- a/editors/vscode/Makefile
+++ b/editors/vscode/Makefile
@@ -1,308 +1,309 @@
 PORTNAME=	vscode
 DISTVERSION=	1.92.1
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:yarn_cache
 DISTFILES=	yarn-offline-cache-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache \
 		vscode-marketplace-exts-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Visual Studio Code - Open Source ("Code - OSS")
 WWW=		https://code.visualstudio.com/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 ONLY_FOR_ARCHS=	amd64
 
 BUILD_DEPENDS=	zip:archivers/zip \
 		electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \
 		rg:textproc/ripgrep \
 		npm${NODEJS_SUFFIX}>0:www/npm${NODEJS_SUFFIX} \
 		yarn${NODEJS_SUFFIX}>0:www/yarn${NODEJS_SUFFIX}
 LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-core \
 		libatspi.so:accessibility/at-spi2-core \
 		libFLAC.so:audio/flac \
 		libopus.so:audio/opus \
 		libsndio.so:audio/sndio \
 		libdbus-1.so:devel/dbus \
 		libicuuc.so:devel/icu \
 		libepoll-shim.so:devel/libepoll-shim \
 		libevent.so:devel/libevent \
 		libffi.so:devel/libffi \
 		libinotify.so:devel/libinotify \
 		libnotify.so:devel/libnotify \
 		libpci.so:devel/libpci \
 		libnspr4.so:devel/nspr \
 		libpcre2-8.so:devel/pcre2 \
 		libre2.so:devel/re2 \
 		liblcms2.so:graphics/lcms2 \
 		libdrm.so:graphics/libdrm \
 		libpng.so:graphics/png \
 		libwayland-client.so:graphics/wayland \
 		libwebp.so:graphics/webp \
 		libdav1d.so:multimedia/dav1d \
 		libvpx.so:multimedia/libvpx \
 		libopenh264.so:multimedia/openh264 \
 		libpipewire-0.3.so:multimedia/pipewire \
 		libcups.so:print/cups \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libkrb5.so.3:security/krb5 \
 		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
 RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		bash:shells/bash
 TEST_DEPENDS=	electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \
 		bash:shells/bash
 
 USES=		desktop-file-utils gl gmake gnome iconv:wchar_t jpeg \
 		localbase:ldflags nodejs:20,build pkgconfig python:build \
 		shebangfix xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	microsoft
 
 SOURCE_COMMIT_HASH=	eaa41d57266683296de7d118f574d0c2652e1fc4
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 USE_XORG=	x11 xcb xcomposite xcursor xdamage xext xfixes xi xkbfile \
 		xrandr xrender xscrnsaver xtst
 USE_GL=		gbm gl glesv2
 USE_GNOME=	atk cairo pango gdkpixbuf2 gtk30 libxml2 libxslt
 
 USE_LDCONFIG=	${DATADIR}
 
 SHEBANG_REGEX=	./(extensions|resources|scripts|src)/.*\.sh$$
 PATHFIX_FILES=	src/vs/workbench/contrib/debug/node/terminals.ts
 
 DATADIR=	${PREFIX}/share/code-oss
 TMPDIR=		${WRKDIR}
 
 MAKE_ENV+=	BUILD_SOURCEVERSION=${SOURCE_COMMIT_HASH}
 # Don't download electron binary distribution on electron node_modules installation
 MAKE_ENV+=	ELECTRON_SKIP_BINARY_DOWNLOAD=1
 # Don't download browser binaries on playwright node_modules installation
 MAKE_ENV+=	PLAYWRIGHT_BROWSERS_PATH=${WRKDIR}/pw-browsers \
 		PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 # Don't create __pycache__ directory when executing node-gyp
 # This is a workaround to avoid filesystem violations during poudriere build
 MAKE_ENV+=	PYTHONDONTWRITEBYTECODE=1
 
 OPTIONS_DEFINE=	REH
 OPTIONS_DEFAULT=# none
 REH_DESC=	Build remote extension host
 
 NODEJS_DIR=	${.CURDIR:H:H}/www/node20
 .include "${NODEJS_DIR}/Makefile.version"
 ELECTRON_DIR=	${.CURDIR:H:H}/devel/electron30
 .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}
 
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "The limit imposed by poudriere(8) for the maximum number of files allowed to be"
 	@${ECHO_MSG} "opened by a jail (default 1024) is exceeded during the build of ${PORTNAME}."
 	@${ECHO_MSG} "To successfully build ${PORTNAME} with poudriere(8), you must add the following"
 	@${ECHO_MSG} "line to poudriere.conf:"
 	@${ECHO_MSG} "MAX_FILES_${PORTNAME}=8192"
 	@${ECHO_MSG} ""
 
 post-extract:
 	${CP} ${WRKSRC}/build/.moduleignore.linux \
 		${WRKSRC}/build/.moduleignore.freebsd
 
 post-patch:
 	# force use of electron version matching port one
 	${REINPLACE_CMD} -E 's|^(target ").*(")$$|\1${ELECTRON_VER}\2|' \
 		${WRKSRC}/.yarnrc
 	# force use of node version matching port one
 	${REINPLACE_CMD} -E 's|^(target ").*(")$$|\1${NODEJS_PORTVERSION}\2|' \
 		${WRKSRC}/remote/.yarnrc
 	# setup yarnrc for using local node headers
 	${ECHO_CMD} 'nodedir "${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers"' >> \
 		${WRKSRC}/.yarnrc
 	${ECHO_CMD} 'nodedir "${LOCALBASE}"' >> \
 		${WRKSRC}/remote/.yarnrc
 	# setup yarnrc for offline node_modules installation
 	${ECHO_CMD} 'yarn-offline-mirror "../yarn-offline-cache"' >> \
 		${WRKSRC}/.yarnrc
 	${ECHO_CMD} 'yarn-offline-mirror "../../yarn-offline-cache"' >> \
 		${WRKSRC}/remote/.yarnrc
 	(cd ${WRKSRC} && \
 		${FIND} -E . -type f -iregex '${SHEBANG_REGEX}' \
 			-exec ${SED} -i '' -e "s|/usr/bin/pgrep|/bin/pgrep|g" {} ';')
 	(cd ${WRKSRC} && \
 		${FIND} ${PATHFIX_FILES} -type f \
 			-exec ${SED} -i '' -e "s|/usr/bin/pgrep|/bin/pgrep|g" {} ';')
 	${REINPLACE_CMD} -e 's/@@NAME_LONG@@/Code - OSS/; \
 			s/@@NAME_SHORT@@/Code - OSS/; \
 			s/@@PRODNAME@@/Code - OSS/; \
 			s/@@NAME@@/code-oss/g; \
 			s|@@EXEC@@|${PREFIX}/bin/code-oss|; \
 			s/@@ICON@@/com.visualstudio.code.oss/; \
 			s/@@URLPROTOCOL@@/code-oss/; \
 			s/@@LICENSE@@/MIT/; \
 			s/@@APPNAME@@/code-oss/g; \
 			s|/usr/share|${PREFIX}/share|' \
 		${WRKSRC}/resources/completions/bash/code \
 		${WRKSRC}/resources/completions/zsh/_code \
 		${WRKSRC}/resources/linux/bin/code.sh \
 		${WRKSRC}/resources/linux/code.appdata.xml \
 		${WRKSRC}/resources/linux/code.desktop \
 		${WRKSRC}/resources/linux/code-url-handler.desktop
 	(cd ${WRKDIR}/builtInExtensions && \
 		${FIND} . -type f -name '*.sh' \
 			-exec ${SED} -i '' -e "s|/usr/bin/pgrep|/bin/pgrep|g" \
 					-e 's|#!/bin/bash|#!${LOCALBASE}/bin/bash|' {} ';')
 
 pre-build: install-node-modules patch-node-modules rebuild-node-modules copy-rg-binary
 install-node-modules:
 	# install node_modules without executing post-installation scripts
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		yarn --frozen-lockfile --ignore-scripts --offline
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		yarn postinstall --frozen-lockfile --ignore-scripts --offline
 patch-node-modules:
 	# patch install node modules before building native node modules
 	for p in ${PATCHDIR}/node_modules/patch-*; do \
 		${PATCH} -p0 -s -d ${WRKSRC} < $${p}; \
 	done
 rebuild-node-modules:
 	# rebuild native node modules for electron
 	for subdir in `${FIND} ${WRKSRC}/node_modules -type f -name binding.gyp -exec ${DIRNAME} {} ';'`; do \
 		cd $${subdir} && \
 		${SETENV} ${MAKE_ENV} \
 			npm_config_runtime=electron \
 			npm_config_target=${ELECTRON_VER} \
 			npm_config_nodedir=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers \
 			node ${LOCALBASE}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js rebuild; \
 	done
 	cd ${WRKSRC}/extensions && \
 	${SETENV} ${MAKE_ENV} \
 		npm_config_runtime=electron \
 		npm_config_target=${ELECTRON_VER} \
 		npm_config_nodedir=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers \
 		npm rebuild --verbose
 	# rebuild native node modules for node
 .for dir in build remote
 	cd ${WRKSRC}/${dir} && \
 	${SETENV} ${MAKE_ENV} \
 		npm_config_nodedir=${LOCALBASE} \
 		npm rebuild --verbose
 .endfor
 copy-rg-binary:
 	# copy rg binary files to vscode-ripgrep module directory
 	${MKDIR} ${WRKSRC}/node_modules/@vscode/ripgrep/bin
 	${CP} ${LOCALBASE}/bin/rg ${WRKSRC}/node_modules/@vscode/ripgrep/bin
 	${MKDIR} ${WRKSRC}/remote/node_modules/@vscode/ripgrep/bin
 	${CP} ${LOCALBASE}/bin/rg ${WRKSRC}/remote/node_modules/@vscode/ripgrep/bin
 
 do-build:
 	# setup download cache for gulp-atom-electron
 	${MKDIR} ${WRKDIR}/.cache/electron/${ELECTRON_DOWNLOAD_URL_HASH}
 	cd ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} && \
 		zip -q -r ${WRKDIR}/.cache/electron/${ELECTRON_DOWNLOAD_URL_HASH}/electron-v${ELECTRON_VER}-linux-x64.zip .
 	cd ${WRKDIR}/.cache/electron/${ELECTRON_DOWNLOAD_URL_HASH} && \
 		${SHA256} -r *-v${ELECTRON_VER}-linux-*.zip | \
 		${SED} -e 's/ / */' > SHASUMS256.txt
 	# add newline character at the end of the file if not already
 	${AWK} '1' ${WRKSRC}/build/checksums/electron.txt > \
 		${WRKSRC}/build/checksums/electron.txt.new
 	${MV} -f ${WRKSRC}/build/checksums/electron.txt.new \
 		${WRKSRC}/build/checksums/electron.txt
 	cd ${WRKDIR}/.cache/electron/${ELECTRON_DOWNLOAD_URL_HASH} && \
 		${SHA256} -r *-v${ELECTRON_VER}-linux-*.zip | \
 		${SED} -e 's/ / */' >> ${WRKSRC}/build/checksums/electron.txt
 	# build and package vscode
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn run tsc -p build/tsconfig.build.json
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-linux-x64-min
 	# copy marketplace extensions
 	${MV} ${WRKDIR}/builtInExtensions/* ${WRKDIR}/VSCode-linux-x64/resources/app/extensions
 
 do-build-REH-on:
 	# setup download cache for node
 	${MKDIR} ${WRKSRC}/.build/node/v${NODEJS_PORTVERSION}/linux-x64
 	${CP} ${LOCALBASE}/bin/node ${WRKSRC}/.build/node/v${NODEJS_PORTVERSION}/linux-x64
 	# build vscode remote extension host
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-reh-linux-x64-min
 	${MKDIR} ${WRKDIR}/vscode-reh/bin/${SOURCE_COMMIT_HASH}
 	cd ${WRKDIR}/vscode-reh-linux-x64 && ${TAR} -cf - . | \
 		${TAR} -xf - -C ${WRKDIR}/vscode-reh/bin/${SOURCE_COMMIT_HASH}
 	cd ${WRKDIR}/vscode-reh && \
 		${TAR} -czf ../vscode-reh-${DISTVERSION}-${OPSYS:tl}${OSREL:R}-${ARCH}.tar.gz .
 	# cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-reh-web-linux-x64-min
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/resources/completions/bash/code \
 		${STAGEDIR}${PREFIX}/etc/bash_completion.d/code-oss
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/resources/completions/zsh/_code \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_code-oss
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/appdata
 	${INSTALL_DATA} ${WRKSRC}/resources/linux/code.appdata.xml \
 		${STAGEDIR}${PREFIX}/share/appdata/code-oss.appdata.xml
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/applications
 .for f in code.desktop code-url-handler.desktop
 	${INSTALL_DATA} ${WRKSRC}/resources/linux/${f} \
 		${STAGEDIR}${PREFIX}/share/applications/${f:S/code/code-oss/}
 .endfor
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/resources/linux/code.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/com.visualstudio.code.oss.png
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKDIR}/VSCode-linux-x64 && \
 		${TAR} -cf - . | ${TAR} -xf - -C ${STAGEDIR}${DATADIR}
 	cd ${STAGEDIR}${DATADIR}/resources/app/node_modules.asar.unpacked && \
 		${FIND} . -type f -exec ${FILE} {} ';' | \
 		${GREP} 'ELF.*FreeBSD' | ${AWK} -F ':' '{print $$1}' | ${XARGS} ${STRIP_CMD}
 .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
 	${RM} -r ${STAGEDIR}${DATADIR}/resources/completions
 	${RLN} ${STAGEDIR}${DATADIR}/bin/code-oss ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${FILESDIR}/wrapper.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 pre-test:
 	# setup electron dependency for unit tests
 	${MKDIR} ${WRKSRC}/.build/electron
 	cd ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} && \
 		${TAR} -cf - . | ${TAR} -xf - -C ${WRKSRC}/.build/electron
 	cd ${WRKSRC}/.build/electron && ${MV} -f electron code-oss
 
 do-test:
 	# Note: Xvfb or something similar is necessary for headless testing
 	# unit tests
 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ./scripts/test.sh || ${TRUE}
 	# UI smoke tests
 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} yarn smoketest
 
 ### targets for port maintainer(s)
 make-yarn-cache:
 	# do "make configure" before executing this target
 	${RM} -r ${WRKDIR}/yarn-offline-cache
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		yarn --frozen-lockfile --ignore-scripts
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		yarn postinstall --frozen-lockfile --ignore-scripts
 	cd ${WRKDIR} && ${TAR} -czf \
 		yarn-offline-cache-${DISTVERSION}${EXTRACT_SUFX} yarn-offline-cache
 
 make-marketplace-exts:
 	${RM} -r ${WRKSRC}/.build/builtInExtensions
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		yarn download-builtin-extensions && \
 	cd ${WRKSRC}/.build && ${TAR} -czf \
 		${WRKDIR}/vscode-marketplace-exts-${DISTVERSION}${EXTRACT_SUFX} builtInExtensions
 
 .include <bsd.port.mk>
diff --git a/graphics/drawio/Makefile b/graphics/drawio/Makefile
index 3ccb531c3fc8..9babde58e6cf 100644
--- a/graphics/drawio/Makefile
+++ b/graphics/drawio/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	drawio
 PORTVERSION=	24.5.3
-PORTREVISION=	4
+PORTREVISION=	5
 DISTVERSIONPREFIX=	x86_64-
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/jgraph/drawio-desktop/releases/download/v${PORTVERSION}/
 EXTRACT_SUFX=	.rpm
 
 MAINTAINER=	x636808@gmail.com
 COMMENT=	Diagramming and whiteboarding desktop app
 WWW=		https://drawio.com/
 
 LICENSE=	APACHE20
 
 USES=		desktop-file-utils electronfix:30 shared-mime-info
 
 NO_BUILD=	yes
 SUB_FILES=	drawio
 NO_WRKSUBDIR=	yes
 
 ELECTRONFIX_MAIN_EXECUTABLE=	drawio
 
 do-install:
 	cd ${WRKSRC}/opt/ && ${COPYTREE_SHARE} ${PORTNAME} ${STAGEDIR}${PREFIX}/share
 	cd ${WRKSRC}/usr/share && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${FIND} ${STAGEDIR}${PREFIX} -name '*.orig' -delete
 
 .include <bsd.port.mk>
diff --git a/net-im/signal-desktop/Makefile b/net-im/signal-desktop/Makefile
index e49d37599342..ad2b4a8fe94c 100644
--- a/net-im/signal-desktop/Makefile
+++ b/net-im/signal-desktop/Makefile
@@ -1,201 +1,201 @@
 PORTNAME=	signal-desktop
 DISTVERSIONPREFIX=	v
 DISTVERSION=	7.16.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	LOCAL/mikael/signal-desktop/:npm \
 		https://build-artifacts.signal.org/desktop/:sqlcipher
 DISTFILES=	signal-desktop-${DISTVERSION}-npm-cache.tar.gz:npm \
 		${SQLCIPHER}.tar.gz:sqlcipher
 # for online build
 #DISTFILES=	${SQLCIPHER}.tar.gz:sqlcipher
 
 MAINTAINER=	mikael@FreeBSD.org
 COMMENT=	Cross-platform centralized encrypted messaging service
 WWW=		https://signal.org/
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64
 
 EXTRACT_DEPENDS=jq:textproc/jq \
 		npm:www/npm-node20
 BUILD_DEPENDS=	${LOCALBASE}/lib/libcrypto.a:security/openssl \
 		${LOCALBASE}/lib/libringrtc.so:multimedia/ringrtc \
 		${LOCALBASE}/lib/libsignal_node.so:net-im/libsignal-node \
 		${LOCALBASE}/lib/libsignal_tokenizer.a:devel/signal-fts5-extension \
 		app-builder>0:devel/app-builder \
 		electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \
 		jq:textproc/jq \
 		npm:www/npm-node20
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libatk-bridge-2.0.so:accessibility/at-spi2-core \
 		libatspi.so:accessibility/at-spi2-core \
 		libcups.so:print/cups \
 		libdbus-1.so:devel/dbus \
 		libdrm.so:graphics/libdrm \
 		libepoll-shim.so:devel/libepoll-shim \
 		libevent.so:devel/libevent \
 		libexpat.so:textproc/expat2 \
 		libFLAC.so:audio/flac \
 		libffi.so:devel/libffi \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libicuuc.so:devel/icu \
 		libnspr4.so:devel/nspr \
 		libnss3.so:security/nss \
 		libopenh264.so:multimedia/openh264 \
 		libopus.so:audio/opus \
 		libpci.so:devel/libpci \
 		libpng16.so:graphics/png \
 		libsnappy.so:archivers/snappy \
 		libwayland-client.so:graphics/wayland \
 		libwebp.so:graphics/webp \
 		libxkbcommon.so:x11/libxkbcommon \
 		libxshmfence.so:x11/libxshmfence
 
 USES=		desktop-file-utils gettext-runtime gl gnome jpeg xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	signalapp
 GH_PROJECT=	Signal-Desktop
 
 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
 
 PACKAGE_ENV=	SIGNAL_ENV=production \
 		npm_config_runtime=electron \
 		npm_config_target=${ELECTRON_VER_MAJOR} \
 		npm_config_nodedir=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers
 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}
 
 # Don't download electron binary distribution on electron node_modules installation
 MAKE_ENV+=	ELECTRON_SKIP_BINARY_DOWNLOAD=1
 
 # Don't create __pycache__ directory when executing node-gyp
 # This is a workaround to avoid filesystem violations during poudriere build
 MAKE_ENV+=	PYTHONDONTWRITEBYTECODE=1
 
 _BUILD_DATE=	$$(date +'%s')
 
 ELECTRON_VER_MAJOR=	30
 
 SQLCIPHER=	sqlcipher-4.5.5-fts5-fix--3.0.7--0.2.1-ef53ea45ed92b928ecfd33c552d8d405263e86e63dec38e1ec63e1b0193b630b
 
 NODE_ARCH=	${ARCH:S/aarch64/arm64/:S/amd64/x64/}
 APP_OUT_DIR=	linux-${ARCH:S/aarch64/arm64-/:S/amd64//}unpacked
 
 PLIST_SUB=	NODE_ARCH=${NODE_ARCH} \
 		SHARP_ARCH=${ARCH:S/aarch64/arm64v8/:S/amd64/x64/}
 
 NPM_TIMESTAMP=	1661146515
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == aarch64
 PLIST_SUB+=	NOT_AARCH64="@comment "
 .elif ${ARCH} == amd64
 PLIST_SUB+=	NOT_AARCH64=""
 .endif
 
 post-extract:
 	# Update node engine
 	${PREFIX}/bin/jq '.engines.node = ""' ${WRKSRC}/package.json > ${WRKSRC}/package.json.tmp.1
 	${MV} ${WRKSRC}/package.json.tmp.1 ${WRKSRC}/package.json
 	# remove mock-server as it doesn't build and is useless
 	${PREFIX}/bin/jq 'del(.devDependencies."@signalapp/mock-server")' ${WRKSRC}/package.json > ${WRKSRC}/package.json.tmp
 	${MV} ${WRKSRC}/package.json.tmp ${WRKSRC}/package.json
 
 	# for online build
 #	cd ${WRKSRC} && \
 #		${SETENV} ${MAKE_ENV} npm install --ignore-optional --ignore-scripts || ${TRUE}
 
 	# for offline build
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} npm install --ignore-optional --ignore-scripts --offline || ${TRUE}
 
 do-build:
 # electron-builder is stupid and tries to open ${LOCALBASE}/share/electron30/electron with WRITE priv
 # copy ${LOCALBASE}/share/electron30 in WRKDIR
 # it's needed for the do-install phase, it's here because of this issue
 # https://github.com/MikaelUrankar/signal-desktop/issues/6 (I don't know why it fails though)
 	@${RM} -r ${WRKDIR}/electron${ELECTRON_VER_MAJOR}
 	@${CP} -pR ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} ${WRKDIR}/electron${ELECTRON_VER_MAJOR}
 	${CHMOD} -R a+w ${WRKDIR}/electron${ELECTRON_VER_MAJOR}
 
 	# Install libsignal_node.so and libringrtc.so binaries in node_modules
 	${MKDIR} ${WRKSRC}/node_modules/@signalapp/libsignal-client/prebuilds/freebsd-${NODE_ARCH} \
 		 ${WRKSRC}/node_modules/@signalapp/ringrtc/build/freebsd
 	${CP} ${LOCALBASE}/lib/libsignal_node.so \
 		${WRKSRC}/node_modules/@signalapp/libsignal-client/prebuilds/freebsd-${NODE_ARCH}/@signalapp+libsignal-client.node
 	${CP} ${LOCALBASE}/lib/libringrtc.so \
 		${WRKSRC}/node_modules/@signalapp/ringrtc/build/freebsd/libringrtc-${NODE_ARCH}.node
 
 	${CP} ${DISTDIR}/${SQLCIPHER}.tar.gz \
 		${WRKSRC}/node_modules/@signalapp/better-sqlite3/deps/sqlcipher.tar.gz
 
 	# patch-package can't patch sqlite3 on aarch64, patch the yarn cache instead
 	cd ${WRKSRC} && ${PATCH} -s -N -i ${FILESDIR}/sqlite3.gyp.diff
 
 	${CP} ${FILESDIR}/dns-fallback.json ${WRKSRC}/build
 
 	@${RM} -r ${WRKSRC}/node_modules/fs-xattr
 
 	# online build
 #	cd ${WRKSRC} && \
 #		${SETENV} ${MAKE_ENV} npm_config_nodedir=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers npm install --ignore-optional
 #	cd ${WRKSRC} && \
 #		${SETENV} ${MAKE_ENV} npm run generate
 
 	# offline build
 	${ECHO_CMD} offline=true >> ${WRKSRC}/.npmrc
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} npm_config_nodedir=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers npm install --ignore-optional --offline
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} npm run generate --offline
 
 do-install:
 # taken from https://github.com/tagattie/FreeBSD-Electron/blob/master/Mk/Uses/electron.mk#L387
 # and editors/vscode
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${PACKAGE_ENV} npm run build:electron -- \
 			--linux --dir --config.npmRebuild=false \
 			--config.electronVersion=${ELECTRON_VER} \
 			--config.electronDist=${WRKDIR}/electron${ELECTRON_VER_MAJOR}
 
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${BUILD_WRKSRC}/dist/${APP_OUT_DIR} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/images/signal-logo-desktop-linux.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/signal-desktop.png
 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
 
 .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
 	${RM} -r ${STAGEDIR}${DATADIR}/resources/completions
 	${RLN} ${STAGEDIR}${DATADIR}/signal-desktop ${STAGEDIR}${PREFIX}/bin
 
 # This seems to be only required for Windows:
 	${RM} -r ${STAGEDIR}${DATADIR}/resources/app.asar.unpacked/node_modules/@nodert-win10-rs4
 	${RM} -r ${STAGEDIR}${DATADIR}/resources/app.asar.unpacked/node_modules/@signalapp/windows-dummy-keystroke
 
 create-caches-tarball:
 	# do some cleanup first
 	${RM} -r ${WRKDIR}/.npm/_logs ${WRKDIR}/.npm/_update-notifier-last-checked
 
 	cd ${WRKDIR} && \
 		${TAR} czf signal-desktop-${DISTVERSION}-npm-cache.tar.gz .npm
 
 .include <bsd.port.post.mk>
diff --git a/textproc/obsidian/Makefile b/textproc/obsidian/Makefile
index 854f3b81dc59..72de98c5ce86 100644
--- a/textproc/obsidian/Makefile
+++ b/textproc/obsidian/Makefile
@@ -1,43 +1,44 @@
 # This port will not be packaged by the official FreeBSD build cluster, because
 # its license doesn't permit redistribution.
 #
 # To build this port locally with minimal effort use
 # cd <PORTSDIR>/textproc/obsidian
 # pkg install -A `make -V 'electron${ELECTRON_VERSION}'`
 # make USE_PACKAGE_DEPENDS_ONLY=yes install clean
 
 PORTNAME=	obsidian
 PORTVERSION=	1.6.7
+PORTREVISION=	1
 CATEGORIES=	textproc
 # Icon is taken from the Nix build recipe
 # https://github.com/NixOS/nixpkgs/blob/de5448dab588ad41aef40f8c7c0c230981656698/pkgs/applications/misc/obsidian/default.nix#L31-L34
 MASTER_SITES=	https://github.com/obsidianmd/obsidian-releases/releases/download/v${PORTVERSION}/ \
 		https://forum.obsidian.md/uploads/default/original/1X/:icon
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png:icon
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	Powerful and extensible knowledge base application
 WWW=		https://obsidian.md
 
 LICENSE=	EULA
 LICENSE_NAME=	End User License Agreement
 LICENSE_TEXT=	See https://obsidian.md/terms
 LICENSE_PERMS=
 
 USES=		electronfix:30
 
 ELECTRONFIX_MAIN_EXECUTABLE=	obsidian
 SUB_FILES=	obsidian
 NO_BUILD=	yes
 
 do-install:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/obsidian ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${PATCHDIR}/obsidian.desktop ${STAGEDIR}${DESKTOPDIR}/obsidian.desktop
 	${INSTALL_DATA} ${DISTDIR}/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png ${STAGEDIR}${PREFIX}/share/pixmaps/obsidian.png
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/metainfo
 	${INSTALL_DATA} ${FILESDIR}/md.obsidian.obsidian.appdata.xml ${STAGEDIR}${PREFIX}/share/metainfo/
 
 .include <bsd.port.mk>