diff --git a/deskutils/podman-desktop/Makefile b/deskutils/podman-desktop/Makefile
index daf391298928..0ded6e568e53 100644
--- a/deskutils/podman-desktop/Makefile
+++ b/deskutils/podman-desktop/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	podman-desktop
 PORTVERSION=	1.21.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	deskutils
 MASTER_SITES=	https://github.com/arrowd/podman-desktop/releases/download/v${PORTVERSION}/ \
 		https://raw.githubusercontent.com/podman-desktop/podman-desktop/refs/tags/v${PORTVERSION}/buildResources/:icon
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		icon.svg:icon
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	Graphical tool for developing on containers and Kubernetes
 WWW=		https://podman-desktop.io/
 
 LICENSE=	APACHE20
 
 ONLY_FOR_ARCHS=	amd64
 
 RUN_DEPENDS=	bash:shells/bash \
 		kubectl:sysutils/kubectl \
 		minikube:sysutils/minikube \
 		podman-compose:sysutils/podman-compose
 
 USES=		desktop-file-utils electronfix:37 shared-mime-info
 
 ELECTRONFIX_MAIN_EXECUTABLE=	podman-desktop
 SUB_FILES=	podman-desktop
 NO_BUILD=	yes
 DIST_SUBDIR=	${PORTNAME}
 
 do-install:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/podman-desktop ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${PATCHDIR}/podman-desktop.desktop ${STAGEDIR}${DESKTOPDIR}/podman-desktop.desktop
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/icon.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/
 
 .include <bsd.port.mk>
diff --git a/devel/RStudio/Makefile b/devel/RStudio/Makefile
index b7d9268777a6..a68555664e72 100644
--- a/devel/RStudio/Makefile
+++ b/devel/RStudio/Makefile
@@ -1,297 +1,297 @@
 # This port opens too many files during build, more than the default setting.
 # Its build is known to succeed with MAX_FILES_RStudio=4096 in poudriere.conf
 
 PORTNAME=	RStudio
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2025.09.2+418
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel math java
 MASTER_SITES=	https://s3.amazonaws.com/rstudio-buildtools/dictionaries/:dictionaries \
 		https://rstudio-buildtools.s3.amazonaws.com/rstudio-buildtools/:gin \
 		https://rstudio-buildtools.s3.us-east-1.amazonaws.com/gwt/:gwt \
 		https://rstudio-buildtools.s3.us-east-1.amazonaws.com/gwt/:mathjax \
 		https://github.com/quarto-dev/quarto/archive/:quarto_mono
 DISTFILES=	core-dictionaries.zip:dictionaries \
 		gin-${GIN_VERSION}.zip:gin \
 		gwt-${GWT_VERSION}.tar.gz:gwt \
 		mathjax-27.zip:mathjax \
 		${QUARTO_MONO_COMMIT}.tar.gz:quarto_mono
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Integrated development environment (IDE) for R
 WWW=		https://www.rstudio.com/ \
 		https://github.com/rstudio/rstudio
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_i386=	fails to resolve 'org.rstudio.studio.client.workbench.views.vcs.common.diff.LineActionButtonRenderer.GrayResources' via deferred binding
 
 BUILD_DEPENDS=	ant:devel/apache-ant \
 		${LOCALBASE}/include/sys/sysinfo.h:devel/libsysinfo \
 		node:www/node \
 		pandoc:textproc/hs-pandoc \
 		R-cran-rstudioapi>0:devel/R-cran-rstudioapi \
 		${LOCALBASE}/include/gsl/gsl-lite.hpp:devel/gsl-lite \
 		${LOCALBASE}/include/rapidjson/rapidjson.h:devel/rapidjson \
 		${LOCALBASE}/include/websocketpp/version.hpp:devel/websocketpp \
 		${LOCALBASE}/include/tl/expected.hpp:devel/tl-expected
 LIB_DEPENDS=	libR.so:math/R \
 		libboost_thread.so:devel/boost-libs \
 		libinotify.so:devel/libinotify \
 		libsoci_core.so:databases/soci \
 		libuuid.so:misc/libuuid \
 		libyaml-cpp.so:devel/yaml-cpp \
 		libfmt.so:devel/libfmt \
 		libhunspell-1.7.so:textproc/hunspell
 BUILD_DEPENDS+=	quarto:textproc/quarto
 RUN_DEPENDS=	quarto:textproc/quarto
 
 FLAVORS=	desktop server
 FLAVOR?=	${FLAVORS:[1]}
 server_PKGNAMESUFFIX=	-server
 server_BROKEN=		does not build with the latest RStudio version, needs to be fixed
 
 USES=		cmake fortran java:build localbase:ldflags pgsql pkgconfig sqlite ssl
 JAVA_VERSION=	17 # Build requires Java 17 target
 USE_GITHUB=	yes
 GH_PROJECT=	${PORTNAME:tl}
 GH_TUPLE=	rstudio:r2d3:v0.2.0:r2d3/dependencies/common/r2d3 \
 		rstudio:rmarkdown:aed26ac:rmarkdown/dependencies/common/rmarkdown \
 		rstudio:rsconnect:03c379b:rsconnect/dependencies/common/rsconnect \
 		trestletech:plumber:v0.4.6:plumber/dependencies/common/plumber
 
 CMAKE_ARGS=	-DFREEBSD_RSTUDIO_VERSION:STRING=${PORTVERSION} \
 		-DFREEBSD_LIBDIR:STRING=${PREFIX}/lib \
 		-DRSTUDIO_DEPENDENCIES_QUARTO_DIR:STRING=${LOCALBASE}/share/quarto
 CMAKE_ARGS+=	-DQT_QMAKE_EXECUTABLE:STRING=${QMAKE}
 CMAKE_ARGS+=	-DRSTUDIO_BOOST_SIGNALS_VERSION=2
 CMAKE_ARGS+=	-DFREEBSD_PORT_VERSION:STRING=${DISTVERSION}
 CMAKE_ARGS+=	-DFREEBSD_LOCALBASE:STRING=${LOCALBASE} # SOCI package is looked up here, see patch patch-src_cpp_CMakeLists.txt
 #CMAKE_ON=	RSTUDIO_USE_SYSTEM_DEPENDENCIES
 CMAKE_ON=	RSTUDIO_USE_SYSTEM_YAML_CPP \
 		RSTUDIO_USE_SYSTEM_BOOST \
 		RSTUDIO_USE_SYSTEM_HUNSPELL \
 		RSTUDIO_USE_SYSTEM_SOCI \
 		RSTUDIO_USE_SYSTEM_FMT \
 		RSTUDIO_USE_SYSTEM_GSL_LITE \
 		RSTUDIO_USE_SYSTEM_RAPIDJSON \
 		RSTUDIO_USE_SYSTEM_WEBSOCKETPP \
 		RSTUDIO_USE_SYSTEM_TL_EXPECTED \
 		RSTUDIO_INSTALL_FREEDESKTOP
 CMAKE_OFF=	BUILD_TESTING \
 		RSTUDIO_UNIT_TESTS_ENABLED
 MAKE_ENV=	HOME=${WRKDIR} \
 		JAVA_HOME=${JAVA_HOME} \
 		PATH=${JAVA_HOME}/bin:${PATH} \
 		ANT_OPTS="-Duser.home=${WRKDIR}"
 LDFLAGS+=	-lexecinfo
 
 GWT_VERSION=	2.12.2 # GWT_VER in src/gwt/tools/build-gwt
 GIN_VERSION=	2.1.2
 QUARTO_VERSION=	1.7.32 # Version expected by RStudio for panmirror build
 QUARTO_MONO_COMMIT=	591b3520eafbb4da7b26b9f31aac6948801f19d8 # Commit from quarto monorepo with panmirror
 
 .if ${FLAVOR:U} == desktop
 COMMENT+=	(desktop UI version)
 USES+=		desktop-file-utils shared-mime-info
 FETCH_DEPENDS+=	npm:www/npm \
 		yarn:www/yarn
 BUILD_DEPENDS+=	npm:www/npm \
 		yarn:www/yarn \
 		electron37:devel/electron37 \
 		zip:archivers/zip
 RUN_DEPENDS+=	electron37:devel/electron37
 CMAKE_ARGS+=	-DRSTUDIO_TARGET=Electron
 MAKE_ENV+=	ELECTRON_SKIP_BINARY_DOWNLOAD=1 \
 		npm_config_nodedir=${WRKDIR}/.electron-headers \
 		ELECTRON_ZIP_DIR=${WRKDIR}/.electron-zip
 LDFLAGS+=	-linotify
 INSTALL_SUBDIR=	${PORTNAME:tl}
 EXECUTABLE=	${PORTNAME:tl}
 # npm dependencies are pre-fetched during post-fetch phase
 NPM_DISTDIR=	${DISTDIR}/${PORTNAME}
 NPM_TARBALL=	${PORTNAME}-desktop-node_modules-${DISTVERSION}${EXTRACT_SUFX}
 # quarto/panmirror dependencies (uses yarn workspaces)
 QUARTO_TARBALL=	${PORTNAME}-quarto-node_modules-${DISTVERSION}${EXTRACT_SUFX}
 # Add npm tarballs to DISTFILES for checksum verification
 #DISTFILES+=	${PORTNAME}/${NPM_TARBALL}:prefetch \
 		${PORTNAME}/${QUARTO_TARBALL}:prefetch
 .endif
 
 .if ${FLAVOR:U} == server
 COMMENT+=	(web UI version)
 CMAKE_ARGS+=	-DRSTUDIO_TARGET=Server
 LDFLAGS+=	-linotify
 INSTALL_SUBDIR=	${PORTNAME:tl}-server
 EXECUTABLE=	rserver
 USER=		nobody
 SUB_LIST=	USER=${USER}
 USE_RC_SUBR=	${PORTNAME:tl}-server
 .endif
 
 OPTIONS_DEFINE=		COPILOT WITH_QUARTO
 OPTIONS_DEFAULT=	COPILOT WITH_QUARTO
 
 COPILOT_DESC=		Build with Copilot support
 COPILOT_CMAKE_BOOL=	RSTUDIO_ENABLE_COPILOT
 COPILOT_RUN_DEPENDS=	copilot-language-server:misc/github-copilot-language-server
 
 WITH_QUARTO_DESC=	Build with support for Quarto
 WITH_QUARTO_CMAKE_BOOL=	QUARTO_ENABLED
 
 # Custom fetch for desktop npm dependencies
 .if ${FLAVOR:U} == desktop
 post-fetch:
 	@if ! [ -f ${NPM_DISTDIR}/${NPM_TARBALL} ]; then \
 		${MKDIR} ${NPM_DISTDIR} && \
 		${ECHO_MSG} "====> Fetching npm dependencies for desktop..." && \
 		${MKDIR} ${WRKDIR}/tmp/rstudio-npm-fetch && \
 		${FETCH_CMD} -q "https://raw.githubusercontent.com/rstudio/rstudio/v${DISTVERSION}/src/node/desktop/package.json" -o ${WRKDIR}/tmp/rstudio-npm-fetch/package.json && \
 		${FETCH_CMD} -q "https://raw.githubusercontent.com/rstudio/rstudio/v${DISTVERSION}/src/node/desktop/package-lock.json" -o ${WRKDIR}/tmp/rstudio-npm-fetch/package-lock.json && \
 		cd ${WRKDIR}/tmp/rstudio-npm-fetch && \
 		HOME=${WRKDIR}/tmp/rstudio-npm-fetch npm ci --ignore-scripts && \
 		${FIND} node_modules -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; 2>/dev/null; \
 		${TAR} -czf ${NPM_DISTDIR}/${NPM_TARBALL} node_modules && \
 		${RM} -rf ${WRKDIR}/tmp/rstudio-npm-fetch && \
 		${ECHO_MSG} "====> Created npm dependencies tarball ${NPM_DISTDIR}/${NPM_TARBALL}"; \
 	fi
 	@if ! [ -f ${NPM_DISTDIR}/${QUARTO_TARBALL} ]; then \
 		${MKDIR} ${NPM_DISTDIR} && \
 		${ECHO_MSG} "====> Fetching quarto/panmirror npm dependencies..." && \
 		${MKDIR} ${WRKDIR}/tmp/rstudio-quarto-fetch && \
 		cd ${WRKDIR}/tmp/rstudio-quarto-fetch && \
 		${FETCH_CMD} -q "https://github.com/quarto-dev/quarto/archive/${QUARTO_MONO_COMMIT}.tar.gz" -o quarto.tar.gz && \
 		${TAR} -xzf quarto.tar.gz && \
 		cd quarto-${QUARTO_MONO_COMMIT} && \
 		HOME=${WRKDIR}/tmp/rstudio-quarto-fetch yarn install --ignore-scripts --network-timeout 240000 && \
 		cd apps/panmirror && PANMIRROR_OUTDIR=dist-rstudio yarn build --minify true --sourcemap true && cd ../.. && \
 		${FIND} node_modules apps/*/node_modules packages/*/node_modules apps/panmirror/dist-rstudio -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; 2>/dev/null; \
 		${TAR} -czf ${NPM_DISTDIR}/${QUARTO_TARBALL} node_modules apps/*/node_modules packages/*/node_modules apps/panmirror/dist-rstudio && \
 		${RM} -rf ${WRKDIR}/tmp/rstudio-quarto-fetch && \
 		${ECHO_MSG} "====> Created quarto npm dependencies tarball"; \
 	fi
 .endif
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/dependencies/dictionaries && ${MV} ${WRKDIR}/en_* ${WRKSRC}/dependencies/dictionaries/
 	@${MV} ${WRKDIR}/mathjax-* ${WRKSRC}/dependencies/
 	# GWT libraries go into dependencies/common/gwtproject
 	@${MKDIR} ${WRKSRC}/dependencies/common/gwtproject/gwt && ${MV} ${WRKDIR}/gwt/gwt-rstudio ${WRKSRC}/dependencies/common/gwtproject/gwt/
 	@${MKDIR} ${WRKSRC}/dependencies/common/gwtproject/gin/${GIN_VERSION}
 	@${MV} ${WRKDIR}/gin-${GIN_VERSION}.jar ${WRKSRC}/dependencies/common/gwtproject/gin/${GIN_VERSION}/
 	@${MV} ${WRKDIR}/aopalliance.jar ${WRKSRC}/dependencies/common/gwtproject/gin/${GIN_VERSION}/
 	@${MV} ${WRKDIR}/guice-*.jar ${WRKSRC}/dependencies/common/gwtproject/gin/${GIN_VERSION}/
 	@${MV} ${WRKDIR}/javax.inject.jar ${WRKSRC}/dependencies/common/gwtproject/gin/${GIN_VERSION}/
 	# Copy other gwtproject dependencies from extracted gwt tarball
 	@${MV} ${WRKDIR}/elemental2 ${WRKSRC}/dependencies/common/gwtproject/
 	@${MV} ${WRKDIR}/jsinterop ${WRKSRC}/dependencies/common/gwtproject/
 	@${MV} ${WRKDIR}/jspecify ${WRKSRC}/dependencies/common/gwtproject/
 	# Setup quarto monorepo for panmirror build
 	# Copy entire quarto monorepo structure (needed for yarn workspaces)
 	@${MV} ${WRKDIR}/quarto-${QUARTO_MONO_COMMIT} ${WRKSRC}/src/gwt/lib/quarto
 	# add hunspell discovery module
 	@${CP} ${FILESDIR}/Findhunspell.cmake ${WRKSRC}/cmake/modules
 .if ${FLAVOR:U} == desktop
 	# Extract pre-fetched npm node_modules for desktop electron build
 	@${ECHO_MSG} "====> Extracting pre-fetched npm dependencies..."
 	@cd ${WRKSRC}/src/node/desktop && ${TAR} -xzf ${NPM_DISTDIR}/${NPM_TARBALL}
 	# Extract pre-fetched quarto/panmirror npm dependencies
 	@${ECHO_MSG} "====> Extracting pre-fetched quarto npm dependencies..."
 	@cd ${WRKSRC}/src/gwt/lib/quarto && ${TAR} -xzf ${NPM_DISTDIR}/${QUARTO_TARBALL}
 	# Patch native modules binding.gyp to support FreeBSD (treat as Linux)
 	@${REINPLACE_CMD} "s/'OS==\"linux\"'/'OS==\"linux\" or OS==\"freebsd\"'/" \
 		${WRKSRC}/src/node/desktop/node_modules/node-system-fonts/binding.gyp
 	# For msgpackr-extract: add FreeBSD support and set compiler to cc
 	@${REINPLACE_CMD} -e "s/\"OS=='linux'\"/\"OS=='linux' or OS=='freebsd'\"/" \
 		-e 's/"os_linux_compiler%": "gcc"/"os_linux_compiler%": "cc"/' \
 		${WRKSRC}/src/node/desktop/node_modules/msgpackr-extract/binding.gyp
 .endif
 
 post-patch:
 	# quarto node_modules are pre-fetched and extracted
 	# Add Java 17+ compatibility args for GWT/Guice reflection
 	@${REINPLACE_CMD} -e ' \
 		s|</java>|<jvmarg value="-Duser.home=${WRKDIR}"/><jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/></java>|' \
 		${WRKSRC}/src/gwt/build.xml
 	@${REINPLACE_CMD} -e ' \
 		s|rHomePaths.push_back|//rHomePaths.push_back|; \
 		s|//rHomePaths.push_back(FilePath("/usr/local/lib/|rHomePaths.push_back(FilePath("${PREFIX}/lib/|' \
 		${WRKSRC}/src/cpp/core/r_util/RVersionsPosix.cpp
 	@${REINPLACE_CMD} -e ' \
 		s|<condition property="node.bin" value="../../../$${node.dir}/bin/node">|<condition property="node.bin" value="${LOCALBASE}/bin/node">|' \
 		${WRKSRC}/src/gwt/build.xml
 	# quarto dependency
 	${LN} -s ${LOCALBASE}/share/quarto ${WRKSRC}/dependencies/quarto
 	# add $PREFIX/bin to PATH for the server daemon
 .if ${FLAVOR:U} == server
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/src/cpp/session/modules/SessionGit.cpp
 .endif
 	# substitute LOCALBASE for copilot-language-server path
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/src/cpp/session/include/session/SessionConstants.hpp
 	# correct for boost-1.87+ class replacement
 	@${FIND} ${WRKSRC} -name "*.cpp" -o -name "*.hpp" | ${XARGS} ${REINPLACE_CMD} -i "" -e 's/io_service/io_context/g'
 
 pre-build:
 	#@${CP} ${FILESDIR}/global-setenv.h ${WRKSRC}/src/cpp/desktop/
 	#@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/cpp/desktop/global-setenv.h
 .if ${FLAVOR:U} == desktop
 	# Create proper electron headers structure for node-gyp
 	# node-gyp expects common.gypi at root and headers at include/node
 	@${MKDIR} ${WRKDIR}/.electron-headers
 	@${LN} -sf ${LOCALBASE}/share/electron37/node_headers/include ${WRKDIR}/.electron-headers/include
 	@${LN} -sf ${LOCALBASE}/share/electron37/node_headers/include/node/common.gypi ${WRKDIR}/.electron-headers/common.gypi
 	# Create electron ZIP for electron-packager (expects electron-v{VERSION}-linux-x64.zip)
 	@${MKDIR} ${WRKDIR}/.electron-zip
 	@cd ${LOCALBASE}/share/electron37 && zip -rq ${WRKDIR}/.electron-zip/electron-v37.6.1-linux-x64.zip \
 		electron chromedriver *.so *.pak *.bin *.json locales resources version LICENSE LICENSES.chromium.html
 .endif
 
 post-install:
 .if ${FLAVOR:U} == desktop
 	# Desktop flavor: create launcher script that uses electron37
 	@(echo "#!/bin/sh"; \
 	  echo ""; \
 	  echo "if ! [ -d /proc/curproc ]; then"; \
 	  echo "  echo \"${PORTNAME} needs /proc to be mounted as procfs\" >&2"; \
 	  echo "  exit 1"; \
 	  echo "fi"; \
 	  echo ""; \
 	  echo "# Environment setup"; \
 	  echo "export LD_PRELOAD=${PREFIX}/lib/gcc${GCC_DEFAULT}/libgcc_s.so"; \
 	  echo "export JAVA_HOME=${JAVA_HOME}"; \
 	  echo "export ELECTRON_IS_DEV=0"; \
 	  echo "export ELECTRON_FORCE_IS_PACKAGED=true"; \
 	  echo ""; \
 	  echo "exec ${PREFIX}/bin/electron37 ${PREFIX}/resources/app \"\$$@\"" \
 	) > ${STAGEDIR}${PREFIX}/bin/${EXECUTABLE}
 	@${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${EXECUTABLE}
 	-${REINPLACE_CMD} -i '' -e 's|^Exec=.*/rstudio|Exec=${PREFIX}/bin/${EXECUTABLE}|' ${STAGEDIR}${PREFIX}/share/applications/${EXECUTABLE}.desktop 2>/dev/null || true
 .else
 	# Server flavor: create launcher script for rserver
 	@(echo "#!/bin/sh"; \
 	  echo ""; \
 	  echo "if ! [ -d /proc/curproc ]; then"; \
 	  echo "  echo \"${PORTNAME} needs /proc to be mounted as procfs\" >&2"; \
 	  echo "  exit 1"; \
 	  echo "fi"; \
 	  echo ""; \
 	  echo "# workaround for the problem that RStudio passes /lib with LD_LIBRARY_PATH that causes the /lib/libgcc_s.so.1 conflict with gcc"; \
 	  echo "LD_PRELOAD=${PREFIX}/lib/gcc${GCC_DEFAULT}/libgcc_s.so JAVA_HOME=${JAVA_HOME} ${PREFIX}/lib/${INSTALL_SUBDIR}/bin/${EXECUTABLE} \"\$$@\"" \
 	) > ${STAGEDIR}${PREFIX}/bin/${EXECUTABLE}
 	@${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${EXECUTABLE}
 .endif
 .if ${FLAVOR:U} == server
 	${RM} ${STAGEDIR}${LOCALBASE}/lib/${INSTALL_SUBDIR}/bin/rstudio-server # not compatible with FreeBSD
 .endif
 	# Remove quarto files since quarto is installed by the quarto port
 	${RM} -rf ${STAGEDIR}${PREFIX}/bin/quarto
 	# Some functions expect the pandoc symlink.
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${INSTALL_SUBDIR}/bin/pandoc
 	@cd ${STAGEDIR}${PREFIX}/lib/${INSTALL_SUBDIR}/bin/pandoc && ${LN} -s ../../../../bin/pandoc
 	# There is a variability in .js file names due to use of random numbers, so we use the automatic plist.
 	@${SETENV} ${CO_ENV} ${SH} ${SCRIPTSDIR}/check-stagedir.sh makeplist | ${GREP} -v ^\/ | ${SED} -e 's|%%WWWDIR%%|www/rstudio| ; s|%%CMAKE_BUILD_TYPE%%|${CMAKE_BUILD_TYPE:tl}|' > ${TMPPLIST}
 
 DISTINFO_FILE=	${.CURDIR}/distinfo.${FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/graphics/drawio/Makefile b/graphics/drawio/Makefile
index 43e2f1c5604d..87d9b67304e2 100644
--- a/graphics/drawio/Makefile
+++ b/graphics/drawio/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	drawio
 PORTVERSION=	28.0.6
-PORTREVISION=	14
+PORTREVISION=	15
 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:37 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/deltachat-desktop/Makefile b/net-im/deltachat-desktop/Makefile
index 781178dd905c..2899a970ec9b 100644
--- a/net-im/deltachat-desktop/Makefile
+++ b/net-im/deltachat-desktop/Makefile
@@ -1,71 +1,71 @@
 PORTNAME=	deltachat-desktop
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.33.0
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES+=	LOCAL/feld:npmcache
 DISTFILES+=	${PORTNAME}-${DISTVERSIONFULL}-node-deps.tgz:npmcache
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Cross-platform decentralized encrypted messaging service
 WWW=		https://delta.chat/
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ELECTRON_VER=	37
 
 # Important to keep the RPC server core in sync with the Desktop release
 RUN_DEPENDS=	deltachat-rpc-server>=2.33<2.34:net/deltachat-rpc-server
 BUILD_DEPENDS=	electron${ELECTRON_VER}:devel/electron${ELECTRON_VER} \
 		npm:www/npm${NODEJS_SUFFIX}
 USES=		desktop-file-utils nodejs:22,build pkgconfig
 
 # Possible to support more arches, but need their binary
 # esbuilds included in the npmcache
 ONLY_FOR_ARCHS=	amd64
 
 SUB_FILES+=	deltachat-desktop.sh deltachat.desktop
 SUB_LIST+=	ELECTRON_VER=${ELECTRON_VER}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	deltachat
 GH_PROJECT=	deltachat-desktop
 
 MAKE_ENV+=	ELECTRON_SKIP_BINARY_DOWNLOAD=1 \
 		ELECTRON_OVERRIDE_DIST_PATH=${LOCALBASE}/share/electron${ELECTRON_VER} \
 		PATH=${PATH}:${WRKSRC}/node_modules/.bin/ \
 		VERSION_INFO_GIT_REF=${GH_TAGNAME}
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/packages/target-electron/src/deltachat/controller.ts
 	# Have to mv, it won't build with symlinks
 	@${MV} ${WRKDIR}/node_modules ${WRKSRC}/node_modules
 	@${MV} ${WRKDIR}/packages/target-electron/node_modules ${WRKSRC}/packages/target-electron/node_modules
 	@${MV} ${WRKDIR}/packages/frontend/node_modules ${WRKSRC}/packages/frontend/node_modules
 	@${MV} ${WRKDIR}/packages/runtime/node_modules ${WRKSRC}/packages/runtime/node_modules
 	@${MV} ${WRKDIR}/packages/shared/node_modules ${WRKSRC}/packages/shared/node_modules
 
 do-build:
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} pnpm -w --filter=@deltachat-desktop/target-electron build
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && node bin/writeFlatDependencies.js packages/target-electron ${STAGEDIR}${DATADIR}/node_modules
 	cd ${WRKSRC}/node_modules/.pnpm/@deltachat+stdio-rpc-server@*/node_modules/@deltachat/ && \
 		${COPYTREE_SHARE} stdio-rpc-server/ ${STAGEDIR}${DATADIR}/node_modules/@deltachat/
 	cd ${WRKSRC}/packages/target-electron && \
 		${INSTALL} package.json ${STAGEDIR}${DATADIR}/ && \
 		${INSTALL} index.js ${STAGEDIR}${DATADIR}/ && \
 		${COPYTREE_SHARE} bundle_out ${STAGEDIR}${DATADIR}/ && \
 		${COPYTREE_SHARE} html-dist ${STAGEDIR}${DATADIR}/
 	cd ${WRKSRC} && ${COPYTREE_SHARE} _locales ${STAGEDIR}${DATADIR}/
 	${INSTALL_SCRIPT} ${WRKDIR}/deltachat-desktop.sh ${STAGEDIR}${PREFIX}/bin/deltachat-desktop
 	${INSTALL} ${WRKDIR}/deltachat.desktop ${STAGEDIR}${PREFIX}/share/applications/deltachat.desktop
 	${MKDIR} ${STAGEDIR}${DATADIR}/icons
 	${INSTALL} ${FILESDIR}/delta-v7-pathed.svg ${STAGEDIR}${DATADIR}/icons/deltachat.svg
 
 .include <bsd.port.post.mk>
diff --git a/net-im/signal-desktop/Makefile b/net-im/signal-desktop/Makefile
index c34138ec389f..f5515aa17947 100644
--- a/net-im/signal-desktop/Makefile
+++ b/net-im/signal-desktop/Makefile
@@ -1,194 +1,195 @@
 PORTNAME=	signal-desktop
 DISTVERSIONPREFIX=	v
 DISTVERSION=	7.82.0
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	LOCAL/mikael/signal-desktop/:npm \
 		https://registry.npmjs.org/@esbuild/freebsd-arm64/-/:esbuildarm64 \
 		https://registry.npmjs.org/@esbuild/freebsd-x64/-/:esbuildx64
 DISTFILES=	signal-desktop-${DISTVERSION}-npm-cache.tar.gz:npm \
 		freebsd-arm64-${ESBUILD_VERS}.tgz:esbuildarm64 \
 		freebsd-x64-${ESBUILD_VERS}.tgz:esbuildx64
 
 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
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libringrtc.so:multimedia/ringrtc \
 		${LOCALBASE}/lib/libsignal_node.so:net-im/libsignal-node \
 		${LOCALBASE}/lib/libsignal_sqlcipher_extension.a:devel/signal-sqlcipher-extension \
 		${LOCALBASE}/lib/node_sqlcipher.node:security/node-sqlcipher \
 		app-builder>0:devel/app-builder \
 		electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \
 		npm:www/npm${NODEJS_SUFFIX}
 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 \
 		libsndio.so:audio/sndio \
 		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 nodejs:22,build pkgconfig ssl xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	signalapp
 GH_PROJECT=	Signal-Desktop
 
 USE_GL=		gbm gl
 USE_GNOME=	atk cairo gdkpixbuf 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:${WRKSRC}/pnpmbin/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
 
 ESBUILD_BINARY_PATH=${WRKSRC}/node_modules/.pnpm/@esbuild+freebsd-${ESBUILD_ARCH}@${ESBUILD_VERS}/node_modules/@esbuild/freebsd-${ESBUILD_ARCH}/package/bin/esbuild
 
 _BUILD_DATE=	$$(date +'%s')
 
 ELECTRON_VER_MAJOR=	37
 ESBUILD_VERS=		0.25.9
 PNPM_VERS=		10.18.1
 
 NODE_ARCH=	${ARCH:S/aarch64/arm64/:S/amd64/x64/}
 ESBUILD_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/}
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == aarch64
 PLIST_SUB+=	NOT_AARCH64="@comment "
 .elif ${ARCH} == amd64
 PLIST_SUB+=	NOT_AARCH64=""
 .endif
 
 do-build:
 # electron-builder is stupid and tries to open ${LOCALBASE}/share/electron37/electron with WRITE priv
 # copy ${LOCALBASE}/share/electron37 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}
 
 	${ECHO_CMD} offline=true >> ${WRKSRC}/.npmrc
 	${ECHO_CMD} store-dir=true >> ${WRKSRC}/.pnpm-store
 
 	${CP} ${FILESDIR}/pnpm-lock.yaml ${WRKSRC}
 	${CP} ${FILESDIR}/pnpmfile.cjs ${WRKSRC}/.pnpmfile.cjs
 
 	# Install pnpm in its own dir otherwise all hell breaks loose
 	${MKDIR} ${WRKSRC}/pnpmbin
 	${CP} ${FILESDIR}/pnpm/package* ${WRKSRC}/pnpmbin
 	cd ${WRKSRC}/pnpmbin && \
 		${SETENV} ${MAKE_ENV} npm install --ignore-scripts pnpm@${PNPM_VERS}
 
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ESBUILD_BINARY_PATH=${ESBUILD_BINARY_PATH} npm_config_nodedir=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers pnpm install --ignore-scripts || ${TRUE}
 
 	# Install libsignal_node.so, libringrtc.so and node_sqlcipher.node binaries in node_modules
 	${MKDIR} ${WRKSRC}/node_modules/@signalapp/libsignal-client/prebuilds/freebsd-${NODE_ARCH} \
 		 ${WRKSRC}/node_modules/@signalapp/ringrtc/build/freebsd \
 		 ${WRKSRC}/node_modules/@signalapp/sqlcipher/prebuilds/freebsd-${NODE_ARCH}
 
 	${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} ${LOCALBASE}/lib/node_sqlcipher.node \
 		${WRKSRC}/node_modules/@signalapp/sqlcipher/prebuilds/freebsd-${NODE_ARCH}
 
 	# don't ask me why
 	${MKDIR} ${WRKSRC}/node_modules/.pnpm/@esbuild+freebsd-${ESBUILD_ARCH}@${ESBUILD_VERS}/node_modules/@esbuild/freebsd-${ESBUILD_ARCH}
 	${TAR} xf ${DISTDIR}/freebsd-${ESBUILD_ARCH}-${ESBUILD_VERS}.tgz -C ${WRKSRC}/node_modules/.pnpm/@esbuild+freebsd-${ESBUILD_ARCH}@${ESBUILD_VERS}/node_modules/@esbuild/freebsd-${ESBUILD_ARCH}
 
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ESBUILD_BINARY_PATH=${ESBUILD_BINARY_PATH} npm_config_nodedir=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers pnpm install
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} pnpm run clean-transpile
 
 	# found in reproducible-builds/docker-entrypoint.sh
 	cd ${WRKSRC}/sticker-creator && \
 		${SETENV} ${MAKE_ENV} pnpm install --frozen-lock
 	cd ${WRKSRC}/sticker-creator && \
 		${SETENV} ${MAKE_ENV} pnpm run build
 
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} pnpm run generate
 
 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.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
 
 	${RM} -r ${STAGEDIR}${DATADIR}/resources/app.asar.unpacked/node_modules/pnpm
 
 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 pnpm
 
 .include <bsd.port.post.mk>
diff --git a/textproc/obsidian/Makefile b/textproc/obsidian/Makefile
index 80f81b5435c3..5f0e7ade9b38 100644
--- a/textproc/obsidian/Makefile
+++ b/textproc/obsidian/Makefile
@@ -1,44 +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 electron`make -V electronfix_ARGS`
 # make USE_PACKAGE_DEPENDS_ONLY=yes install clean
 
 PORTNAME=	obsidian
 PORTVERSION=	1.9.14
-PORTREVISION=	6
+PORTREVISION=	7
 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:37
 
 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>