diff --git a/devel/electron25/Makefile b/devel/electron25/Makefile
index bdcd90640843..2c29ffba43ca 100644
--- a/devel/electron25/Makefile
+++ b/devel/electron25/Makefile
@@ -1,426 +1,431 @@
 PORTNAME=	electron
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${ELECTRON_VER:S/-beta./.b/}
 CATEGORIES=	devel
-MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/:chromium \
+MASTER_SITES=	https://github.com/tagattie/FreeBSD-Electron/releases/download/v25.3.1/:chromium \
+		https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \
 		https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts
 PKGNAMESUFFIX=	${ELECTRON_VER_MAJOR}
 DISTFILES=	chromium-${CHROMIUM_VER}${EXTRACT_SUFX}:chromium \
+		${CHROMIUM_NODE_MODULES_HASH}:chromium_node \
 		${CHROMIUM_TEST_FONTS_HASH}:chromium_testfonts \
 		electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Build cross-platform desktop apps with JavaScript, HTML, and CSS
 WWW=		https://electronjs.org/
 
 LICENSE=	BSD3CLAUSE LGPL21 MPL11 MIT
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/electron/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386
 
 FETCH_DEPENDS=	yarn-node18>0:www/yarn-node18
 EXTRACT_DEPENDS=yarn-node18>0:www/yarn-node18
 PATCH_DEPENDS=	git:devel/git
 BUILD_DEPENDS=	gperf:devel/gperf \
 		yasm:devel/yasm \
 		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 		node18>0:www/node18 \
 		npm-node18>0:www/npm-node18
 LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-core \
 		libatspi.so:accessibility/at-spi2-core \
 		libsnappy.so:archivers/snappy \
 		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 \
 		libfreetype.so:print/freetype2 \
 		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
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 TEST_DEPENDS=	git:devel/git \
 		${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR} \
 		npm-node18>0:www/npm-node18
 
 USES=		bison compiler:c++17-lang cpe gettext-tools gl gmake gnome \
 		iconv:wchar_t jpeg localbase:ldflags ninja pkgconfig \
 		python:build,test shebangfix tar:xz xorg
 
 CPE_VENDOR=	electronjs
 USE_GITHUB=	yes
 GH_TAGNAME=	${DISTVERSIONPREFIX}${ELECTRON_VER}
 GH_TUPLE=	nodejs:node:v${NODE_VER}:node \
 		nodejs:nan:${NAN_VER}:nan \
 		Squirrel:Squirrel.Mac:${SQUIRREL_MAC_VER}:squirrel_mac \
 		ReactiveCocoa:ReactiveObjC:${REACTIVEOBJC_VER}:reactiveobjc \
 		Mantle:Mantle:${MANTLE_VER}:mantle
 USE_GL=		gbm gl glesv2
 USE_GNOME=	atk cairo gdkpixbuf2 gtk30 libxml2 libxslt pango
 USE_LDCONFIG=	${DATADIR}
 USE_XORG=	x11 xcb xcomposite xcursor xdamage xext xfixes xi xrandr \
 		xrender xscrnsaver xtst
 
 SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format
 
 MAKE_ARGS=	-C out/${BUILDTYPE}
 MAKE_ENV+=	C_INCLUDE_PATH=${LOCALBASE}/include \
 		CPLUS_INCLUDE_PATH=${LOCALBASE}/include
 ALL_TARGET=	electron third_party/electron_node:headers
 POST_BUILD_TARGETS=	licenses version
 POST_BUILD_DIST_TARGETS=electron_dist_zip electron_chromedriver_zip \
 			electron_mksnapshot_zip
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 NO_WRKSUBDIR=	yes
 WRKSRC_SUBDIR=	src
 
 GN_ARGS+=	clang_use_chrome_plugins=false \
 		enable_backup_ref_ptr_support=false \
 		enable_hangout_services_extension=true \
 		enable_nacl=false \
 		enable_remoting=false \
 		fatal_linker_warnings=false \
 		icu_use_data_file=false \
 		is_clang=true \
 		optimize_webui=true \
 		toolkit_views=true \
 		treat_warnings_as_errors=false \
 		use_allocator_shim=false \
 		use_aura=true \
 		use_custom_libcxx=false \
 		use_gnome_keyring=false \
 		use_lld=true \
 		use_partition_alloc=true \
 		use_partition_alloc_as_malloc=false \
 		use_sysroot=false \
 		use_system_freetype=false \
 		use_system_harfbuzz=true \
 		use_system_libffi=true \
 		use_system_libjpeg=true \
 		use_udev=false \
 		chrome_pgo_phase=0 \
 		extra_cxxflags="${CXXFLAGS}" \
 		extra_ldflags="${LDFLAGS}" \
 		ffmpeg_branding="${FFMPEG_BRAND}"
 
 # TODO: investigate building with these options:
 # use_system_minigbm
 GN_BOOTSTRAP_FLAGS=	--no-clean --no-rebuild --skip-generate-buildfiles
 
 PLIST_SUB=	ELECTRON_VER=${ELECTRON_VER} \
 		ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR}
 
 OPTIONS_DEFINE=		CODECS CUPS DEBUG DIST DRIVER KERBEROS LTO
 OPTIONS_DEFAULT=	CODECS CUPS DRIVER KERBEROS SNDIO
 OPTIONS_EXCLUDE_aarch64=LTO
 OPTIONS_GROUP=		AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO SNDIO
 OPTIONS_RADIO=		KERBEROS
 OPTIONS_RADIO_KERBEROS=	HEIMDAL HEIMDAL_BASE MIT
 OPTIONS_SUB=		yes
 CODECS_DESC=		Compile and enable patented codecs like H.264
 DIST_DESC=		Build distribution zip files
 DRIVER_DESC=		Install chromedriver
 HEIMDAL_BASE_DESC=	Heimdal Kerberos (base)
 HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
 MIT_DESC=		MIT Kerberos (security/krb5)
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
 			alsa-lib>=1.1.1_1:audio/alsa-lib
 ALSA_VARS=		GN_ARGS+=use_alsa=true
 ALSA_VARS_OFF=		GN_ARGS+=use_alsa=false
 
 CODECS_VARS=		GN_ARGS+=proprietary_codecs=true \
 			FFMPEG_BRAND="Chrome"
 CODECS_VARS_OFF=	GN_ARGS+=proprietary_codecs=false \
 			FFMPEG_BRAND="Chromium"
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_VARS=		GN_ARGS+=use_cups=true
 CUPS_VARS_OFF=		GN_ARGS+=use_cups=false
 
 DEBUG_BUILD_DEPENDS=	esbuild:devel/esbuild
 DEBUG_VARS=		BUILDTYPE=Debug \
 			GN_FILE=testing.gn \
 			GN_ARGS+=is_debug=true \
 			GN_ARGS+=is_component_build=false \
 			GN_ARGS+=symbol_level=1 \
 			GN_BOOTSTRAP_FLAGS+=--debug \
 			WANTSPACE="21 GB"
 DEBUG_VARS_OFF=		BUILDTYPE=Release \
 			GN_FILE=release.gn \
 			GN_ARGS+=blink_symbol_level=0 \
 			GN_ARGS+=is_debug=false \
 			GN_ARGS+=is_official_build=true \
 			GN_ARGS+=symbol_level=0 \
 			WANTSPACE="14 GB"
 
 DIST_IMPLIES=		DRIVER
 DRIVER_MAKE_ARGS=	chromedriver
 
 HEIMDAL_LIB_DEPENDS=	libkrb.so.26:security/heimdal
 KERBEROS_VARS=		GN_ARGS+=use_kerberos=true
 KERBEROS_VARS_OFF=	GN_ARGS+=use_kerberos=false
 
 LTO_VARS=		GN_ARGS+=use_thin_lto=true \
 			GN_ARGS+=thin_lto_enable_optimizations=true \
 			WANTSPACE="14 GB"
 LTO_VARS_OFF=		GN_ARGS+=use_thin_lto=false
 
 MIT_LIB_DEPENDS=	libkrb.so.3:security/krb5
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_VARS=	GN_ARGS+=use_pulseaudio=true
 PULSEAUDIO_VARS_OFF=	GN_ARGS+=use_pulseaudio=false
 
 # With SNDIO=on we exclude audio_manager_linux from the build (see
 # media/audio/BUILD.gn) and use audio_manager_openbsd which does not
 # support falling back to ALSA or PulseAudio.
 SNDIO_PREVENTS=		ALSA PULSEAUDIO
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_VARS=		GN_ARGS+=use_sndio=true
 SNDIO_VARS_OFF=		GN_ARGS+=use_sndio=false
 
 # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
-CHROMIUM_VER=			114.0.5735.134
+CHROMIUM_VER=			114.0.5735.243
+# See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH
+CHROMIUM_NODE_MODULES_HASH=	de0af8ec3401004cd1a420ab25892880330464c8
 # See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH
 CHROMIUM_TEST_FONTS_HASH=	336e775eec536b2d785cc80eff6ac39051931286
 # See ${WRKSRC}/electron/DEPS for NODE_VER
 NODE_VER=			18.15.0
 # See ${WRKSRC}/electron/DEPS for NAN_VER
 NAN_VER=			16fa32231e2ccd89d2804b3f765319128b20c4ac
 # See ${WRKSRC}/electron/DEPS for SQUIRREL_MAC_VER
 SQUIRREL_MAC_VER=		0e5d146ba13101a1302d59ea6e6e0b3cace4ae38
 # See ${WRKSRC}/electron/DEPS for REACTIVEOBJC_VER
 REACTIVEOBJC_VER=		74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76
 # See ${WRKSRC}/electron/DEPS for MANTLE_VER
 MANTLE_VER=			78d3966b3c331292ea29ec38661b25df0a245948
 
-YARN_TIMESTAMP=	1687657399
+YARN_TIMESTAMP=	1689920505
 
 .include "Makefile.version"
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so)
 IGNORE=		you have selected HEIMDAL_BASE but do not have Heimdal installed in base
 .endif
 
 .if ${COMPILER_VERSION} < 150
 LLVM_DEFAULT=		15
 BUILD_DEPENDS+=		clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 BINARY_ALIAS+=		cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
 			cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \
 			c++=${LOCALBASE}/bin/clang++${LLVM_DEFAULT} \
 			ar=${LOCALBASE}/bin/llvm-ar${LLVM_DEFAULT} \
 			nm=${LOCALBASE}/bin/llvm-nm${LLVM_DEFAULT} \
 			ld=${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT}
 .else
 BINARY_ALIAS+=		ar=/usr/bin/llvm-ar \
 			nm=/usr/bin/llvm-nm
 .endif
 
 .if ${ARCH} == "aarch64"
 PLIST_SUB+=	AARCH64="" \
 		AMD64="@comment " \
 		I386="@comment " \
 		NOT_AARCH64="@comment "
 FFMPEG_TARGET=	arm64
 .elif ${ARCH} == "amd64"
 BUILD_DEPENDS+=	nasm:devel/nasm
 PLIST_SUB+=	AARCH64="@comment " \
 		AMD64="" \
 		I386="@comment " \
 		NOT_AARCH64=""
 FFMPEG_TARGET=	x64
 .elif ${ARCH} == "i386"
 BUILD_DEPENDS+=	nasm:devel/nasm
 PLIST_SUB+=	AARCH64="@comment " \
 		AMD64="@comment " \
 		I386="" \
 		NOT_AARCH64=""
 FFMPEG_TARGET=	ia32
 .endif
 
 FFMPEG_BDIR=	${WRKSRC}/third_party/ffmpeg/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND}
 FFMPEG_CDIR=	${WRKSRC}/third_party/ffmpeg/chromium/config/${FFMPEG_BRAND}/freebsd/${FFMPEG_TARGET}
 
 # Allow relocations against read-only segments (override lld default)
 LDFLAGS_i386=	-Wl,-znotext
 
 # TODO: -isystem, would be just as ugly as this approach, but more reliably
 # build would fail without C_INCLUDE_PATH/CPLUS_INCLUDE_PATH env var set.
 MAKE_ENV+=	C_INCLUDE_PATH=${LOCALBASE}/include \
 		CPLUS_INCLUDE_PATH=${LOCALBASE}/include
 
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "To build electron, you should have around 2GB of memory"
 	@${ECHO_MSG} "and around ${WANTSPACE} of free disk space."
 	@${ECHO_MSG}
 
 pre-fetch:
 	@${MKDIR} ${DISTDIR}/${DIST_SUBDIR}
 	if [ ! -f ${DISTDIR}/${DIST_SUBDIR}/electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX} ]; \
 		then ${MKDIR} ${WRKDIR}; \
 		${ECHO_CMD} 'yarn-offline-mirror "./yarn-offline-cache"' >> \
 			${WRKDIR}/.yarnrc; \
 		${CP} ${FILESDIR}/package.json ${FILESDIR}/yarn.lock ${WRKDIR}; \
 		cd ${WRKDIR} && ${SETENV} HOME=${WRKDIR} XDG_CACHE_HOME=${WRKDIR}/.cache \
 			yarn --frozen-lockfile --ignore-scripts; \
 		${MTREE_CMD} -cbnSp yarn-offline-cache | ${MTREE_CMD} -C | ${SED} \
 			-e 's:time=[0-9.]*:time=${YARN_TIMESTAMP}.000000000:' \
 			-e 's:\([gu]id\)=[0-9]*:\1=0:g' \
 			-e 's:mode=\([0-9]\)7[0-9][0-9]:mode=\1755:' \
 			-e 's:mode=\([0-9]\)6[0-9][0-9]:mode=\1644:' \
 			-e 's:flags=.*:flags=none:' \
 			-e 's:^\.:./yarn-offline-cache:' > yarn-offline-cache.mtree; \
 		${TAR} cJf ${DISTDIR}/${DIST_SUBDIR}/electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX} \
 			@yarn-offline-cache.mtree; \
 		${RM} -r ${WRKDIR}; \
 	fi
 
 post-extract:
 # Move extracted sources to appropriate locations
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_VER} ${WRKSRC}
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${PORTNAME}-${ELECTRON_VER} ${WRKSRC}/electron
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_nan}-${NAN_VER} \
 		${WRKSRC}/third_party/nan
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_node}-${NODE_VER} \
 		${WRKSRC}/third_party/electron_node
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_squirrel_mac}-${SQUIRREL_MAC_VER} \
 		${WRKSRC}/third_party/squirrel.mac
 	${MKDIR} ${WRKSRC}/third_party/squirrel.mac/vendor
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_reactiveobjc}-${REACTIVEOBJC_VER} \
 		${WRKSRC}/third_party/squirrel.mac/vendor/ReactiveObjC
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_mantle}-${MANTLE_VER} \
 		${WRKSRC}/third_party/squirrel.mac/vendor/Mantle
+	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/node_modules ${WRKSRC}/third_party/node
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/test_fonts ${WRKSRC}/third_party/test_fonts
 # Install node modules for electron
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/yarn-offline-cache ${WRKDIR}
 	${ECHO_CMD} 'yarn-offline-mirror "../../../yarn-offline-cache"' >> ${WRKSRC}/electron/.yarnrc
 	${MV} ${WRKSRC}/electron/package.json ${WRKSRC}/electron/package.json.bak
 	${CP} ${FILESDIR}/package.json ${WRKSRC}/electron
 	cd ${WRKSRC}/electron && \
 		${SETENV} HOME=${WRKDIR} XDG_CACHE_HOME=${WRKDIR}/.cache yarn --frozen-lockfile --offline
 
 pre-patch:
 	${SH} ${FILESDIR}/apply-electron-patches.sh ${WRKSRC}
 	# ${FIND} ${WRKSRC} -type f -name '*.orig' -print -delete
 	# ${FIND} ${WRKSRC} -type f -name '*~' -print -delete
 
 pre-configure:
 	# We used to remove bundled libraries to be sure that chromium uses
 	# system libraries and not shipped ones.
 	# cd ${WRKSRC} && ${PYTHON_CMD} \
 	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
 		./build/linux/unbundle/replace_gn_files.py --system-libraries \
 		dav1d flac fontconfig freetype harfbuzz-ng icu libdrm libevent \
 		libpng libusb libwebp libxml libxslt openh264 opus snappy || ${FALSE}
 	# Chromium uses an unreleased version of FFmpeg, so configure it
 	cd ${WRKSRC}/third_party/ffmpeg && \
 		${PYTHON_CMD} chromium/scripts/build_ffmpeg.py freebsd ${FFMPEG_TARGET} \
 		--config-only --branding=${FFMPEG_BRAND}
 	cd ${FFMPEG_BDIR} && ${GMAKE} ffversion.h
 	${MKDIR} ${FFMPEG_CDIR}
 .for _e in config.h config.asm config_components.h libavcodec libavformat libavutil
 	-${CP} -pR ${FFMPEG_BDIR}/${_e} ${FFMPEG_CDIR}
 .endfor
 
 do-configure:
 	# GN generator bootstrapping and generating ninja files
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \
 		READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \
 		./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS}
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn gen out/${BUILDTYPE} \
 		--args='import("//electron/build/args/${GN_FILE}") ${GN_ARGS}'
 
 	# Setup nodejs dependency
 	@${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd/bin
 	${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd/bin/node
 
 	# Setup buildtools/freebsd
 	@${MKDIR} ${WRKSRC}/buildtools/freebsd
 	${LN} -sf ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd
 	${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKSRC}/buildtools/freebsd
 	${LN} -sf /usr/bin/strip ${WRKSRC}/buildtools/freebsd/strip
 
 post-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} ${POST_BUILD_TARGETS}
 
 post-build-DIST-on:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} ${POST_BUILD_DIST_TARGETS}
 	cd ${WRKSRC}/out/${BUILDTYPE} && \
 		${CP} chromedriver.zip chromedriver-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
 		${CP} dist.zip electron-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
 		${CP} mksnapshot.zip mksnapshot-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
 		${SHA256} -r *-v${ELECTRON_VER}-freebsd-*.zip | ${SED} -e 's/ / */' > SHASUMS256.txt
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 .for f in electron mksnapshot v8_context_snapshot_generator
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 .for f in libEGL.so libGLESv2.so libffmpeg.so libvk_swiftshader.so
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvulkan.so.1 ${STAGEDIR}${DATADIR}/libvulkan.so
 .for f in LICENSE LICENSES.chromium.html snapshot_blob.bin v8_context_snapshot.bin version vk_swiftshader_icd.json
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 .for f in chrome_100_percent.pak chrome_200_percent.pak resources.pak
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${DATADIR}/locales
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/locales/*.pak ${STAGEDIR}${DATADIR}/locales
 	${MKDIR} ${STAGEDIR}${DATADIR}/resources
 .for f in default_app.asar
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/resources/${f} ${STAGEDIR}${DATADIR}/resources
 .endfor
 	cd ${WRKSRC}/out/${BUILDTYPE}/gen && ${COPYTREE_SHARE} node_headers ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/out/${BUILDTYPE} && ${COPYTREE_SHARE} gen/electron/buildflags ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/out/${BUILDTYPE} && ${COPYTREE_SHARE} gen/v8/embedded.S ${STAGEDIR}${DATADIR}
 	${RLN} ${STAGEDIR}${DATADIR}/electron ${STAGEDIR}${PREFIX}/bin/electron${PKGNAMESUFFIX}
 
 post-install-DIST-on:
 	${MKDIR} ${STAGEDIR}${DATADIR}/releases
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/SHASUMS256.txt ${STAGEDIR}${DATADIR}/releases
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*-v${ELECTRON_VER}-freebsd-*.zip ${STAGEDIR}${DATADIR}/releases
 
 post-install-DRIVER-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver.unstripped \
 		${STAGEDIR}${DATADIR}/chromedriver
 
 do-test:
 # Note 1: "npm install" will run before actual tests are executed
 # Note 2: Xvfb or something similar is necessary for headless testing
 	cd ${WRKSRC}/electron && \
 		${SETENV} ${TEST_ENV} ELECTRON_OUT_DIR=${BUILDTYPE} LOCAL_GIT_DIRECTORY=${LOCALBASE} \
 		npm run test -- --ci
 
 .include <bsd.port.post.mk>
diff --git a/devel/electron25/Makefile.version b/devel/electron25/Makefile.version
index 410f0e8b09ae..02856a3b8b67 100644
--- a/devel/electron25/Makefile.version
+++ b/devel/electron25/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER=	25.2.0
+ELECTRON_VER=	25.3.1
 ELECTRON_VER_MAJOR=	${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron25/distinfo b/devel/electron25/distinfo
index c846d20b0890..f9454c9b85d4 100644
--- a/devel/electron25/distinfo
+++ b/devel/electron25/distinfo
@@ -1,19 +1,21 @@
-TIMESTAMP = 1687658600
-SHA256 (electron/chromium-114.0.5735.134.tar.xz) = d95118cc7f23b38761d4563cb426a000a1bccc8e395210f19255d6f6e8fd02c9
-SIZE (electron/chromium-114.0.5735.134.tar.xz) = 1570567768
+TIMESTAMP = 1689924314
+SHA256 (electron/chromium-114.0.5735.243.tar.xz) = 59d3d13796599a22638274a85c77fb4bf273e995ab3c3054314803fc8cbaf225
+SIZE (electron/chromium-114.0.5735.243.tar.xz) = 1414281296
+SHA256 (electron/de0af8ec3401004cd1a420ab25892880330464c8) = 401097f07b4feb3e03ce7c2412e978b32aea5334f4fbaf26f873e60e8bb92647
+SIZE (electron/de0af8ec3401004cd1a420ab25892880330464c8) = 8880520
 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734
-SHA256 (electron/electron-yarn-cache-25.2.0.tar.xz) = a856b07198655aa443fd4ac71c43d74f5951da976d75dd4b89932224e4e2d2f4
-SIZE (electron/electron-yarn-cache-25.2.0.tar.xz) = 41288976
-SHA256 (electron/electron-electron-v25.2.0_GH0.tar.gz) = f39621faed175cfe4023e74c0c720f4bcf277ae7d03205cf02d265e37c6e09ac
-SIZE (electron/electron-electron-v25.2.0_GH0.tar.gz) = 11268356
+SHA256 (electron/electron-yarn-cache-25.3.1.tar.xz) = 9282b310822d9a782b34fd8b8e7e49aee2472c678ae26a88d634039c4b3e6bfa
+SIZE (electron/electron-yarn-cache-25.3.1.tar.xz) = 41289008
+SHA256 (electron/electron-electron-v25.3.1_GH0.tar.gz) = 10fbdf0a327ec6567c5d3e1712225c6543ce3bde5eb5dba7929b61d9aa3e9f32
+SIZE (electron/electron-electron-v25.3.1_GH0.tar.gz) = 11270244
 SHA256 (electron/nodejs-node-v18.15.0_GH0.tar.gz) = 33c4b5b77c98398a3c0d99a146f602d164e014ff3a5713697beef1a971faf573
 SIZE (electron/nodejs-node-v18.15.0_GH0.tar.gz) = 111925667
 SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39
 SIZE (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 179355
 SHA256 (electron/Squirrel-Squirrel.Mac-0e5d146ba13101a1302d59ea6e6e0b3cace4ae38_GH0.tar.gz) = f4ebb40a8d85dbb7ef02aa0571b2f8e22182c6d73b6992484a53c90047779d01
 SIZE (electron/Squirrel-Squirrel.Mac-0e5d146ba13101a1302d59ea6e6e0b3cace4ae38_GH0.tar.gz) = 2112918
 SHA256 (electron/ReactiveCocoa-ReactiveObjC-74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76_GH0.tar.gz) = 88e65f116c7a06fccedb43970fba63080a57a4e5dc29147d2cdfe1ee58dd0546
 SIZE (electron/ReactiveCocoa-ReactiveObjC-74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76_GH0.tar.gz) = 1136238
 SHA256 (electron/Mantle-Mantle-78d3966b3c331292ea29ec38661b25df0a245948_GH0.tar.gz) = a365df6d83e0be3cc000b70bd39734d80c28f0d9983ebe44698337a2ca464bb1
 SIZE (electron/Mantle-Mantle-78d3966b3c331292ea29ec38661b25df0a245948_GH0.tar.gz) = 62962
diff --git a/devel/electron25/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/devel/electron25/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
index 1adafc606d52..e95b3229a42e 100644
--- a/devel/electron25/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
+++ b/devel/electron25/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
@@ -1,180 +1,180 @@
---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig	2023-05-25 00:41:43 UTC
+--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig	2023-07-21 06:38:11 UTC
 +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
 @@ -206,12 +206,12 @@
  #include "components/spellcheck/browser/pref_names.h"
  #endif  // BUILDFLAG(ENABLE_SPELLCHECK)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/enterprise/idle/action.h"
  #include "components/device_signals/core/browser/pref_names.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
      BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
  #include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
 @@ -770,14 +770,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      prefs::kManagedDefaultGeolocationSetting,
      base::Value::Type::INTEGER },
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
 -    || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC)
 +    || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
    { key::kRequireOnlineRevocationChecksForLocalAnchors,
      prefs::kCertRevocationCheckingRequiredLocalAnchors,
      base::Value::Type::BOOLEAN },
  #endif  // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
          // || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC)
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
 -    || BUILDFLAG(IS_FUCHSIA)
 +    || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
    { key::kFullscreenAllowed,
      prefs::kFullscreenAllowed,
      base::Value::Type::BOOLEAN },
-@@ -1431,7 +1431,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
-     base::Value::Type::BOOLEAN },
+@@ -1434,7 +1434,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+     base::Value::Type::INTEGER },
  #endif // BUILDFLAG(IS_CHROMEOS_ASH)
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    { key::kGSSAPILibraryName,
      prefs::kGSSAPILibraryName,
      base::Value::Type::STRING },
-@@ -1501,18 +1501,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1504,18 +1504,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      prefs::kTotalMemoryLimitMb,
      base::Value::Type::INTEGER },
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    { key::kBackgroundModeEnabled,
      prefs::kBackgroundModeEnabled,
      base::Value::Type::BOOLEAN },
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    { key::kUnmanagedDeviceSignalsConsentFlowEnabled,
      device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled,
      base::Value::Type::BOOLEAN },
  #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
 -    || BUILDFLAG(IS_FUCHSIA)
 +    || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
    { key::kDefaultBrowserSettingEnabled,
      prefs::kDefaultBrowserSettingEnabled,
      base::Value::Type::BOOLEAN },
-@@ -1525,7 +1525,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1528,7 +1528,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
          // || BUILDFLAG(IS_FUCHSIA)
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
 -    || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
 +    || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
    { key::kAutoplayAllowed,
      prefs::kAutoplayAllowed,
      base::Value::Type::BOOLEAN },
-@@ -1629,7 +1629,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1632,7 +1632,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::BOOLEAN },
  #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
    { key::kAlternativeBrowserPath,
      browser_switcher::prefs::kAlternativeBrowserPath,
      base::Value::Type::STRING },
-@@ -1725,13 +1725,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1728,13 +1728,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::BOOLEAN },
  #endif // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    { key::kGetDisplayMediaSetSelectAllScreensAllowedForUrls,
      prefs::kManagedGetDisplayMediaSetSelectAllScreensAllowedForUrls,
      base::Value::Type::LIST },
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    { key::kAuthNegotiateDelegateByKdcPolicy,
      prefs::kAuthNegotiateDelegateByKdcPolicy,
      base::Value::Type::BOOLEAN },
-@@ -1762,7 +1762,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1765,7 +1765,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
  #endif  // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
    { key::kEnforceLocalAnchorConstraintsEnabled,
      prefs::kEnforceLocalAnchorConstraintsEnabled,
      base::Value::Type::BOOLEAN },
-@@ -1844,7 +1844,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1847,7 +1847,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      ash::prefs::kUrlParameterToAutofillSAMLUsername,
      base::Value::Type::STRING },
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
    { key::kHighEfficiencyModeEnabled,
      performance_manager::user_tuning::prefs::kHighEfficiencyModeEnabled,
      base::Value::Type::BOOLEAN },
-@@ -1889,7 +1889,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1892,7 +1892,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      policy::policy_prefs::kForceEnablePepperVideoDecoderDevAPI,
      base::Value::Type::BOOLEAN },
  #endif // BUILDFLAG(ENABLE_PPAPI)
 -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    { key::kOutOfProcessSystemDnsResolutionEnabled,
      prefs::kOutOfProcessSystemDnsResolutionEnabled,
      base::Value::Type::BOOLEAN },
-@@ -2156,7 +2156,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2159,7 +2159,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
  #endif  // BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_ANDROID)
 +    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
    handlers->AddHandler(
        std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>());
    handlers->AddHandler(
-@@ -2213,7 +2213,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2216,7 +2216,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
        key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
        chrome_schema));
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
    handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-@@ -2248,7 +2248,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2251,7 +2251,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
    std::vector<std::unique_ptr<ConfigurationPolicyHandler>>
        signin_legacy_policies;
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
 -    BUILDFLAG(IS_LINUX)
 +    BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
        key::kForceBrowserSignin, prefs::kForceBrowserSignin,
        base::Value::Type::BOOLEAN));
-@@ -2604,7 +2604,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2607,7 +2607,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
  #endif
  
  #if BUILDFLAG(ENABLE_SPELLCHECK)
 -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
    handlers->AddHandler(
        std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
-@@ -2612,7 +2612,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2615,7 +2615,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
  #endif  // BUILDFLAG(ENABLE_SPELLCHECK)
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
        key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
        base::Value::Type::BOOLEAN));
-@@ -2625,7 +2625,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2628,7 +2628,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
    handlers->AddHandler(
        std::make_unique<first_party_sets::FirstPartySetsOverridesPolicyHandler>(
            chrome_schema));
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
      BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
    handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>());
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
diff --git a/devel/electron25/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc b/devel/electron25/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc
index 520b4fa9e7bd..b0afcfba590e 100644
--- a/devel/electron25/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc
+++ b/devel/electron25/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc
@@ -1,29 +1,29 @@
---- electron/shell/browser/api/electron_api_desktop_capturer.cc.orig	2023-03-08 02:34:17 UTC
+--- electron/shell/browser/api/electron_api_desktop_capturer.cc.orig	2023-07-19 13:20:24 UTC
 +++ electron/shell/browser/api/electron_api_desktop_capturer.cc
 @@ -36,7 +36,7 @@
  #include "third_party/webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h"
  #include "third_party/webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h"
  #include "ui/display/win/display_info.h"
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #if defined(USE_OZONE_PLATFORM_X11)
  #include "base/logging.h"
  #include "ui/base/x/x11_display_util.h"
 @@ -48,7 +48,7 @@
  #endif  // defined(USE_OZONE_PLATFORM_X11)
  #endif  // BUILDFLAG(IS_WIN)
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // Private function in ui/base/x/x11_display_util.cc
  std::map<x11::RandR::Output, int> GetMonitors(int version,
                                                x11::RandR* randr,
-@@ -296,7 +296,7 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaLi
+@@ -348,7 +348,7 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaLi
      for (auto& source : screen_sources) {
        source.display_id = base::NumberToString(source.media_list_source.id.id);
      }
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #if defined(USE_OZONE_PLATFORM_X11)
      // On Linux, with X11, the source id is the numeric value of the
      // display name atom and the display id is either the EDID or the
diff --git a/devel/electron25/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron25/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
index bdd8f592e20b..76db1edd511d 100644
--- a/devel/electron25/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
+++ b/devel/electron25/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
@@ -1,61 +1,61 @@
---- electron/shell/browser/api/electron_api_web_contents.cc.orig	2023-06-14 06:17:49 UTC
+--- electron/shell/browser/api/electron_api_web_contents.cc.orig	2023-07-19 13:20:24 UTC
 +++ electron/shell/browser/api/electron_api_web_contents.cc
-@@ -153,11 +153,11 @@
+@@ -154,11 +154,11 @@
  #include "ui/base/cocoa/defaults_utils.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "ui/linux/linux_ui.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  #include "ui/gfx/font_render_params.h"
  #endif
  
-@@ -519,7 +519,7 @@ absl::optional<base::TimeDelta> GetCursorBlinkInterval
+@@ -520,7 +520,7 @@ absl::optional<base::TimeDelta> GetCursorBlinkInterval
        ui::TextInsertionCaretBlinkPeriodFromDefaults());
    if (system_value)
      return *system_value;
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (auto* linux_ui = ui::LinuxUi::instance())
      return linux_ui->GetCursorBlinkInterval();
  #elif BUILDFLAG(IS_WIN)
-@@ -989,7 +989,7 @@ void WebContents::InitWithSessionAndOptions(
+@@ -975,7 +975,7 @@ void WebContents::InitWithSessionAndOptions(
    accept_languages.pop_back();
    prefs->accept_languages = accept_languages;
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    // Update font settings.
    static const gfx::FontRenderParams params(
        gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr));
-@@ -2639,7 +2639,7 @@ void WebContents::ForcefullyCrashRenderer() {
+@@ -2627,7 +2627,7 @@ void WebContents::ForcefullyCrashRenderer() {
  
    content::RenderProcessHost* rph = rwh->GetProcess();
    if (rph) {
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
      // A generic |CrashDumpHungChildProcess()| is not implemented for Linux.
      // Instead we send an explicit IPC to crash on the renderer's IO thread.
      rph->ForceCrash();
-@@ -3310,7 +3310,7 @@ void WebContents::CopyImageAt(int x, int y) {
+@@ -3298,7 +3298,7 @@ void WebContents::CopyImageAt(int x, int y) {
  void WebContents::Focus() {
    // Focusing on WebContents does not automatically focus the window on macOS
    // and Linux, do it manually to match the behavior on Windows.
 -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (owner_window())
      owner_window()->Focus(true);
  #endif
-@@ -4122,7 +4122,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
+@@ -4112,7 +4112,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
  }
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  void WebContents::GetDevToolsWindowWMClass(std::string* name,
                                             std::string* class_name) {
    *class_name = Browser::Get()->GetName();
diff --git a/devel/electron25/files/patch-electron_shell_browser_api_electron__api__web__contents.h b/devel/electron25/files/patch-electron_shell_browser_api_electron__api__web__contents.h
index 02680c4e07fd..5493c88bd6b7 100644
--- a/devel/electron25/files/patch-electron_shell_browser_api_electron__api__web__contents.h
+++ b/devel/electron25/files/patch-electron_shell_browser_api_electron__api__web__contents.h
@@ -1,11 +1,11 @@
---- electron/shell/browser/api/electron_api_web_contents.h.orig	2023-05-31 14:28:29 UTC
+--- electron/shell/browser/api/electron_api_web_contents.h.orig	2023-07-19 13:20:24 UTC
 +++ electron/shell/browser/api/electron_api_web_contents.h
-@@ -727,7 +727,7 @@ class WebContents : public ExclusiveAccessContext,
+@@ -731,7 +731,7 @@ class WebContents : public ExclusiveAccessContext,
  #if defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_MAC)
    ui::ImageModel GetDevToolsWindowIcon() override;
  #endif
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    void GetDevToolsWindowWMClass(std::string* name,
                                  std::string* class_name) override;
  #endif
diff --git a/devel/electron25/files/patch-electron_shell_browser_electron__browser__main__parts.cc b/devel/electron25/files/patch-electron_shell_browser_electron__browser__main__parts.cc
index 519f56f304df..c9980fee3cad 100644
--- a/devel/electron25/files/patch-electron_shell_browser_electron__browser__main__parts.cc
+++ b/devel/electron25/files/patch-electron_shell_browser_electron__browser__main__parts.cc
@@ -1,102 +1,102 @@
---- electron/shell/browser/electron_browser_main_parts.cc.orig	2023-05-31 14:28:29 UTC
+--- electron/shell/browser/electron_browser_main_parts.cc.orig	2023-07-19 13:20:24 UTC
 +++ electron/shell/browser/electron_browser_main_parts.cc
 @@ -74,7 +74,7 @@
  #include "ui/wm/core/wm_state.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "base/environment.h"
  #include "device/bluetooth/bluetooth_adapter_factory.h"
  #include "device/bluetooth/dbus/dbus_bluez_manager_wrapper_linux.h"
 @@ -126,7 +126,7 @@ namespace electron {
  
  namespace {
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  class LinuxUiGetterImpl : public ui::LinuxUiGetter {
   public:
    LinuxUiGetterImpl() = default;
 @@ -174,7 +174,7 @@ std::u16string MediaStringProvider(media::MessageId id
    }
  }
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // GTK does not provide a way to check if current theme is dark, so we compare
  // the text and background luminosity to get a result.
  // This trick comes from FireFox.
 @@ -192,7 +192,7 @@ void UpdateDarkThemeSetting() {
  
  }  // namespace
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  class DarkThemeObserver : public ui::NativeThemeObserver {
   public:
    DarkThemeObserver() = default;
 @@ -244,7 +244,7 @@ int ElectronBrowserMainParts::PreEarlyInitialization()
  #if BUILDFLAG(IS_POSIX)
    HandleSIGCHLD();
  #endif
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    DetectOzonePlatform();
    ui::OzonePlatform::PreEarlyInitialization();
  #endif
 @@ -332,7 +332,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
    // happen before the ResourceBundle is loaded
    if (locale.empty())
      l10n_util::OverrideLocaleWithCocoaLocale();
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // l10n_util::GetApplicationLocaleInternal uses g_get_language_names(),
    // which keys off of getenv("LC_ALL").
    // We must set this env first to make ui::ResourceBundle accept the custom
 @@ -363,7 +363,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
    ElectronBrowserClient::SetApplicationLocale(app_locale);
    fake_browser_process_->SetApplicationLocale(app_locale);
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Reset to the original LC_ALL since we should not be changing it.
    if (!locale.empty()) {
      if (lc_all)
 @@ -423,7 +423,7 @@ void ElectronBrowserMainParts::PostDestroyThreads() {
  }
  
  void ElectronBrowserMainParts::ToolkitInitialized() {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    auto* linux_ui = ui::GetDefaultLinuxUi();
    CHECK(linux_ui);
    linux_ui_getter_ = std::make_unique<LinuxUiGetterImpl>();
-@@ -535,7 +535,7 @@ void ElectronBrowserMainParts::WillRunMainMessageLoop(
+@@ -537,7 +537,7 @@ void ElectronBrowserMainParts::WillRunMainMessageLoop(
  }
  
  void ElectronBrowserMainParts::PostCreateMainMessageLoop() {
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
    std::string app_name = electron::Browser::Get()->GetName();
  #endif
  #if BUILDFLAG(IS_LINUX)
-@@ -545,7 +545,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo
+@@ -547,7 +547,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo
        std::move(shutdown_cb),
        content::GetUIThreadTaskRunner({content::BrowserTaskType::kUserInput}));
    bluez::DBusBluezManagerWrapperLinux::Initialize();
 +#endif
  
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Set up crypt config. This needs to be done before anything starts the
    // network service, as the raw encryption key needs to be shared with the
    // network service for encrypted cookie storage.
-@@ -637,7 +639,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun(
+@@ -639,7 +641,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun(
    fake_browser_process_->PostMainMessageLoopRun();
    content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler();
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun();
  #endif
  }
diff --git a/devel/electron25/files/patch-electron_shell_browser_native__window.cc b/devel/electron25/files/patch-electron_shell_browser_native__window.cc
index 95f77ea24f67..74c6be10e6f8 100644
--- a/devel/electron25/files/patch-electron_shell_browser_native__window.cc
+++ b/devel/electron25/files/patch-electron_shell_browser_native__window.cc
@@ -1,11 +1,11 @@
---- electron/shell/browser/native_window.cc.orig	2023-02-06 19:29:11 UTC
+--- electron/shell/browser/native_window.cc.orig	2023-07-19 13:20:24 UTC
 +++ electron/shell/browser/native_window.cc
-@@ -196,7 +196,7 @@ void NativeWindow::InitFromOptions(const gin_helper::D
+@@ -197,7 +197,7 @@ void NativeWindow::InitFromOptions(const gin_helper::D
    } else {
      SetSizeConstraints(size_constraints);
    }
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    bool resizable;
    if (options.Get(options::kResizable, &resizable)) {
      SetResizable(resizable);
diff --git a/devel/electron25/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron25/files/patch-electron_shell_browser_native__window__views.cc
index ae8af6232bfd..3d60b14c9935 100644
--- a/devel/electron25/files/patch-electron_shell_browser_native__window__views.cc
+++ b/devel/electron25/files/patch-electron_shell_browser_native__window__views.cc
@@ -1,128 +1,128 @@
---- electron/shell/browser/native_window_views.cc.orig	2023-06-14 06:17:49 UTC
+--- electron/shell/browser/native_window_views.cc.orig	2023-07-19 13:20:24 UTC
 +++ electron/shell/browser/native_window_views.cc
-@@ -42,7 +42,7 @@
+@@ -43,7 +43,7 @@
  #include "ui/wm/core/shadow_types.h"
  #include "ui/wm/core/window_util.h"
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "base/strings/string_util.h"
  #include "shell/browser/browser.h"
  #include "shell/browser/linux/unity_service.h"
-@@ -276,7 +276,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
+@@ -277,7 +277,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
      params.parent = parent->GetNativeWindow();
  
    params.native_widget = new ElectronDesktopNativeWidgetAura(this);
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    std::string name = Browser::Get()->GetName();
    // Set WM_WINDOW_ROLE.
    params.wm_role_name = "browser-window";
-@@ -301,7 +301,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
+@@ -302,7 +302,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
    std::string window_type;
    options.Get(options::kType, &window_type);
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Set _GTK_THEME_VARIANT to dark if we have "dark-theme" option set.
    bool use_dark_theme = false;
    if (options.Get(options::kDarkTheme, &use_dark_theme) && use_dark_theme) {
-@@ -403,7 +403,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
+@@ -404,7 +404,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
    if (window)
      window->AddPreTargetHandler(this);
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // On linux after the widget is initialized we might have to force set the
    // bounds if the bounds are smaller than the current display
    SetBounds(gfx::Rect(GetPosition(), bounds.size()), false);
-@@ -563,7 +563,7 @@ bool NativeWindowViews::IsVisible() {
+@@ -564,7 +564,7 @@ bool NativeWindowViews::IsVisible() {
  bool NativeWindowViews::IsEnabled() {
  #if BUILDFLAG(IS_WIN)
    return ::IsWindowEnabled(GetAcceleratedWidget());
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #if defined(USE_OZONE_PLATFORM_X11)
    if (IsX11())
      return !event_disabler_.get();
-@@ -621,7 +621,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable
+@@ -622,7 +622,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable
  #endif
  }
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  void NativeWindowViews::Maximize() {
    if (IsVisible()) {
      widget()->Maximize();
-@@ -752,7 +752,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
+@@ -753,7 +753,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
    }
  #endif
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // On Linux and Windows the minimum and maximum size should be updated with
    // window size when window is not resizable.
    if (!resizable_) {
-@@ -988,7 +988,7 @@ bool NativeWindowViews::IsClosable() {
+@@ -989,7 +989,7 @@ bool NativeWindowViews::IsClosable() {
      return false;
    }
    return !(info.fState & MFS_DISABLED);
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    return true;
  #endif
  }
-@@ -1376,7 +1376,7 @@ void NativeWindowViews::SetProgressBar(double progress
+@@ -1377,7 +1377,7 @@ void NativeWindowViews::SetProgressBar(double progress
                                         NativeWindow::ProgressState state) {
  #if BUILDFLAG(IS_WIN)
    taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress, state);
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (unity::IsRunning()) {
      unity::SetProgressFraction(progress);
    }
 @@ -1453,7 +1453,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
  #if BUILDFLAG(IS_WIN)
    window_handle =
        reinterpret_cast<content::DesktopMediaID::Id>(accelerated_widget);
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    window_handle = static_cast<uint32_t>(accelerated_widget);
  #endif
    aura::WindowTreeHost* const host =
 @@ -1551,7 +1551,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
    SendMessage(hwnd, WM_SETICON, ICON_BIG,
                reinterpret_cast<LPARAM>(app_icon_.get()));
  }
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) {
    auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget(
        GetAcceleratedWidget());
 @@ -1621,7 +1621,7 @@ bool NativeWindowViews::CanMaximize() const {
  bool NativeWindowViews::CanMinimize() const {
  #if BUILDFLAG(IS_WIN)
    return minimizable_;
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    return true;
  #endif
  }
 @@ -1673,7 +1673,7 @@ void NativeWindowViews::HandleKeyboardEvent(
    if (widget_destroyed_)
      return;
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (event.windows_key_code == ui::VKEY_BROWSER_BACK)
      NotifyWindowExecuteAppCommand(kBrowserBackward);
    else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD)
 @@ -1692,7 +1692,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
    // Alt+Click should not toggle menu bar.
    root_view_.ResetAltState();
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (event->changed_button_flags() == ui::EF_BACK_MOUSE_BUTTON)
      NotifyWindowExecuteAppCommand(kBrowserBackward);
    else if (event->changed_button_flags() == ui::EF_FORWARD_MOUSE_BUTTON)
diff --git a/devel/electron25/files/patch-electron_shell_common_api_electron__api__clipboard.cc b/devel/electron25/files/patch-electron_shell_common_api_electron__api__clipboard.cc
index 5211303d05b6..efdcecb3146a 100644
--- a/devel/electron25/files/patch-electron_shell_common_api_electron__api__clipboard.cc
+++ b/devel/electron25/files/patch-electron_shell_common_api_electron__api__clipboard.cc
@@ -1,20 +1,20 @@
---- electron/shell/common/api/electron_api_clipboard.cc.orig	2023-01-24 16:58:16 UTC
+--- electron/shell/common/api/electron_api_clipboard.cc.orig	2023-07-19 13:20:24 UTC
 +++ electron/shell/common/api/electron_api_clipboard.cc
-@@ -54,7 +54,7 @@ std::string Clipboard::Read(const std::string& format_
+@@ -55,7 +55,7 @@ std::string Clipboard::Read(const std::string& format_
        ui::ClipboardFormatType::CustomPlatformType(format_string));
    bool rawFormatAvailable = clipboard->IsFormatAvailable(
        rawFormat, ui::ClipboardBuffer::kCopyPaste, /* data_dst = */ nullptr);
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (!rawFormatAvailable) {
      rawFormatAvailable = clipboard->IsFormatAvailable(
          rawFormat, ui::ClipboardBuffer::kSelection, /* data_dst = */ nullptr);
-@@ -70,7 +70,7 @@ std::string Clipboard::Read(const std::string& format_
+@@ -71,7 +71,7 @@ std::string Clipboard::Read(const std::string& format_
    custom_format_names =
        clipboard->ExtractCustomPlatformNames(ui::ClipboardBuffer::kCopyPaste,
                                              /* data_dst = */ nullptr);
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (custom_format_names.find(format_string) == custom_format_names.end()) {
+   if (!base::Contains(custom_format_names, format_string)) {
      custom_format_names =
          clipboard->ExtractCustomPlatformNames(ui::ClipboardBuffer::kSelection,
diff --git a/devel/electron25/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron25/files/patch-electron_spec_api-browser-window-spec.ts
index a579facf2531..51d38c9feeb6 100644
--- a/devel/electron25/files/patch-electron_spec_api-browser-window-spec.ts
+++ b/devel/electron25/files/patch-electron_spec_api-browser-window-spec.ts
@@ -1,155 +1,155 @@
---- electron/spec/api-browser-window-spec.ts.orig	2023-06-20 12:38:26 UTC
+--- electron/spec/api-browser-window-spec.ts.orig	2023-07-19 13:20:24 UTC
 +++ electron/spec/api-browser-window-spec.ts
-@@ -61,7 +61,7 @@ describe('BrowserWindow module', () => {
+@@ -65,7 +65,7 @@ describe('BrowserWindow module', () => {
        }).not.to.throw();
      });
  
 -    ifit(process.platform === 'linux')('does not crash when setting large window icons', async () => {
 +    ifit(process.platform === 'linux' || process.platform === 'freebsd')('does not crash when setting large window icons', async () => {
        const appPath = path.join(fixtures, 'apps', 'xwindow-icon');
        const appProcess = childProcess.spawn(process.execPath, [appPath]);
        await once(appProcess, 'exit');
-@@ -1097,7 +1097,7 @@ describe('BrowserWindow module', () => {
+@@ -1101,7 +1101,7 @@ describe('BrowserWindow module', () => {
  
      describe('BrowserWindow.minimize()', () => {
        // TODO(codebytere): Enable for Linux once maximize/minimize events work in CI.
 -      ifit(process.platform !== 'linux')('should not be visible when the window is minimized', async () => {
 +      ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should not be visible when the window is minimized', async () => {
          const minimize = once(w, 'minimize');
          w.minimize();
          await minimize;
-@@ -1114,7 +1114,7 @@ describe('BrowserWindow module', () => {
+@@ -1118,7 +1118,7 @@ describe('BrowserWindow module', () => {
        });
  
        // TODO(dsanders11): Enable for Linux once CI plays nice with these kinds of tests
 -      ifit(process.platform !== 'linux')('should not restore maximized windows', async () => {
 +      ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should not restore maximized windows', async () => {
          const maximize = once(w, 'maximize');
          const shown = once(w, 'show');
          w.maximize();
-@@ -1151,7 +1151,7 @@ describe('BrowserWindow module', () => {
+@@ -1155,7 +1155,7 @@ describe('BrowserWindow module', () => {
          expect(w.isFocused()).to.equal(true);
        });
  
 -      ifit(process.platform !== 'linux')('acquires focus status from the other windows', async () => {
 +      ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('acquires focus status from the other windows', async () => {
          const w1 = new BrowserWindow({ show: false });
          const w2 = new BrowserWindow({ show: false });
          const w3 = new BrowserWindow({ show: false });
-@@ -1218,7 +1218,7 @@ describe('BrowserWindow module', () => {
+@@ -1222,7 +1222,7 @@ describe('BrowserWindow module', () => {
          expect(w.isFocused()).to.equal(false);
        });
  
 -      ifit(process.platform !== 'linux')('transfers focus status to the next window', async () => {
 +      ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('transfers focus status to the next window', async () => {
          const w1 = new BrowserWindow({ show: false });
          const w2 = new BrowserWindow({ show: false });
          const w3 = new BrowserWindow({ show: false });
-@@ -1618,7 +1618,7 @@ describe('BrowserWindow module', () => {
+@@ -1622,7 +1622,7 @@ describe('BrowserWindow module', () => {
          });
        });
  
 -      ifdescribe(process.platform !== 'linux')('Maximized state', () => {
 +      ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('Maximized state', () => {
          it('checks normal bounds when maximized', async () => {
            const bounds = w.getBounds();
            const maximize = once(w, 'maximize');
-@@ -1798,7 +1798,7 @@ describe('BrowserWindow module', () => {
+@@ -1802,7 +1802,7 @@ describe('BrowserWindow module', () => {
          });
        });
  
 -      ifdescribe(process.platform !== 'linux')('Minimized state', () => {
 +      ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('Minimized state', () => {
          it('checks normal bounds when minimized', async () => {
            const bounds = w.getBounds();
            const minimize = once(w, 'minimize');
-@@ -2764,7 +2764,7 @@ describe('BrowserWindow module', () => {
+@@ -2768,7 +2768,7 @@ describe('BrowserWindow module', () => {
    describe('BrowserWindow.setOpacity(opacity)', () => {
      afterEach(closeAllWindows);
  
 -    ifdescribe(process.platform !== 'linux')(('Windows and Mac'), () => {
 +    ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')(('Windows and Mac'), () => {
        it('make window with initial opacity', () => {
          const w = new BrowserWindow({ show: false, opacity: 0.5 });
          expect(w.getOpacity()).to.equal(0.5);
-@@ -2790,7 +2790,7 @@ describe('BrowserWindow module', () => {
+@@ -2794,7 +2794,7 @@ describe('BrowserWindow module', () => {
        });
      });
  
 -    ifdescribe(process.platform === 'linux')(('Linux'), () => {
 +    ifdescribe(process.platform === 'linux' || process.platform === 'freebsd')(('Linux'), () => {
        it('sets 1 regardless of parameter', () => {
          const w = new BrowserWindow({ show: false });
          w.setOpacity(0);
-@@ -3719,7 +3719,7 @@ describe('BrowserWindow module', () => {
+@@ -3723,7 +3723,7 @@ describe('BrowserWindow module', () => {
          expect(test.nodeTimers).to.equal(true);
          expect(test.nodeUrl).to.equal(true);
  
 -        if (process.platform === 'linux' && test.osSandbox) {
 +        if ((process.platform === 'linux' || process.platform === 'freebsd') && test.osSandbox) {
            expect(test.creationTime).to.be.null('creation time');
            expect(test.systemMemoryInfo).to.be.null('system memory info');
          } else {
-@@ -4225,7 +4225,7 @@ describe('BrowserWindow module', () => {
+@@ -4229,7 +4229,7 @@ describe('BrowserWindow module', () => {
      });
    });
  
 -  ifdescribe(process.platform !== 'linux')('max/minimize events', () => {
 +  ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('max/minimize events', () => {
      afterEach(closeAllWindows);
      it('emits an event when window is maximized', async () => {
        const w = new BrowserWindow({ show: false });
-@@ -4496,7 +4496,7 @@ describe('BrowserWindow module', () => {
+@@ -4500,7 +4500,7 @@ describe('BrowserWindow module', () => {
      // TODO(zcbenz):
      // This test does not run on Linux CI. See:
      // https://github.com/electron/electron/issues/28699
 -    ifit(process.platform === 'linux' && !process.env.CI)('should bring a minimized maximized window back to maximized state', async () => {
 +    ifit((process.platform === 'linux' || process.platform === 'freebsd') && !process.env.CI)('should bring a minimized maximized window back to maximized state', async () => {
        const w = new BrowserWindow({});
        const maximize = once(w, 'maximize');
        w.maximize();
-@@ -4513,7 +4513,7 @@ describe('BrowserWindow module', () => {
+@@ -4517,7 +4517,7 @@ describe('BrowserWindow module', () => {
    });
  
    // TODO(dsanders11): Enable once maximize event works on Linux again on CI
 -  ifdescribe(process.platform !== 'linux')('BrowserWindow.maximize()', () => {
 +  ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('BrowserWindow.maximize()', () => {
      afterEach(closeAllWindows);
      it('should show the window if it is not currently shown', async () => {
        const w = new BrowserWindow({ show: false });
-@@ -4550,7 +4550,7 @@ describe('BrowserWindow module', () => {
+@@ -4554,7 +4554,7 @@ describe('BrowserWindow module', () => {
  
      // TODO(dsanders11): Enable once minimize event works on Linux again.
      //                   See https://github.com/electron/electron/issues/28699
 -    ifit(process.platform !== 'linux')('should not restore a minimized window', async () => {
 +    ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should not restore a minimized window', async () => {
        const w = new BrowserWindow();
        const minimize = once(w, 'minimize');
        w.minimize();
-@@ -4983,7 +4983,7 @@ describe('BrowserWindow module', () => {
+@@ -4987,7 +4987,7 @@ describe('BrowserWindow module', () => {
        });
  
        // On Linux there is no "resizable" property of a window.
 -      ifit(process.platform !== 'linux')('does affect maximizability when disabled and enabled', () => {
 +      ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('does affect maximizability when disabled and enabled', () => {
          const w = new BrowserWindow({ show: false });
          expect(w.resizable).to.be.true('resizable');
  
-@@ -5073,7 +5073,7 @@ describe('BrowserWindow module', () => {
+@@ -5077,7 +5077,7 @@ describe('BrowserWindow module', () => {
      });
    });
  
 -  ifdescribe(process.platform !== 'linux')('window states (excluding Linux)', () => {
 +  ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('window states (excluding Linux)', () => {
      // Not implemented on Linux.
      afterEach(closeAllWindows);
  
-@@ -6179,7 +6179,7 @@ describe('BrowserWindow module', () => {
+@@ -6183,7 +6183,7 @@ describe('BrowserWindow module', () => {
    describe('"transparent" option', () => {
      afterEach(closeAllWindows);
  
 -    ifit(process.platform !== 'linux')('correctly returns isMaximized() when the window is maximized then minimized', async () => {
 +    ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('correctly returns isMaximized() when the window is maximized then minimized', async () => {
        const w = new BrowserWindow({
          frame: false,
          transparent: true
diff --git a/devel/electron25/files/patch-electron_spec_api-menu-spec.ts b/devel/electron25/files/patch-electron_spec_api-menu-spec.ts
index f29fb872ae5d..6f15a1a57231 100644
--- a/devel/electron25/files/patch-electron_spec_api-menu-spec.ts
+++ b/devel/electron25/files/patch-electron_spec_api-menu-spec.ts
@@ -1,11 +1,11 @@
---- electron/spec/api-menu-spec.ts.orig	2023-05-31 14:28:29 UTC
+--- electron/spec/api-menu-spec.ts.orig	2023-07-19 13:20:24 UTC
 +++ electron/spec/api-menu-spec.ts
-@@ -882,7 +882,7 @@ describe('Menu module', function () {
+@@ -886,7 +886,7 @@ describe('Menu module', function () {
      // https://github.com/electron/electron/issues/35724
      // Maximizing window is enough to trigger the bug
      // FIXME(dsanders11): Test always passes on CI, even pre-fix
 -    ifit(process.platform === 'linux' && !process.env.CI)('does not trigger issue #35724', (done) => {
 +    ifit((process.platform === 'linux' || process.platform === 'freebsd') && !process.env.CI)('does not trigger issue #35724', (done) => {
        const showAndCloseMenu = async () => {
          await setTimeout(1000);
          menu.popup({ window: w, x: 50, y: 50 });
diff --git a/devel/electron25/files/patch-electron_spec_api-protocol-spec.ts b/devel/electron25/files/patch-electron_spec_api-protocol-spec.ts
index b5458fcb3f2e..ba7675dd3825 100644
--- a/devel/electron25/files/patch-electron_spec_api-protocol-spec.ts
+++ b/devel/electron25/files/patch-electron_spec_api-protocol-spec.ts
@@ -1,11 +1,11 @@
---- electron/spec/api-protocol-spec.ts.orig	2023-06-14 06:17:49 UTC
+--- electron/spec/api-protocol-spec.ts.orig	2023-07-19 13:20:24 UTC
 +++ electron/spec/api-protocol-spec.ts
-@@ -1513,7 +1513,7 @@ describe('protocol module', () => {
+@@ -1534,7 +1534,7 @@ describe('protocol module', () => {
      });
  
      // TODO(nornagon): this test doesn't pass on Linux currently, investigate.
 -    ifit(process.platform !== 'linux')('is fast', async () => {
 +    ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('is fast', async () => {
        // 128 MB of spaces.
        const chunk = new Uint8Array(128 * 1024 * 1024);
        chunk.fill(' '.charCodeAt(0));
diff --git a/devel/electron25/files/patch-electron_spec_api-tray-spec.ts b/devel/electron25/files/patch-electron_spec_api-tray-spec.ts
index a6fe74a949d7..a02ac62bbcc4 100644
--- a/devel/electron25/files/patch-electron_spec_api-tray-spec.ts
+++ b/devel/electron25/files/patch-electron_spec_api-tray-spec.ts
@@ -1,11 +1,11 @@
---- electron/spec/api-tray-spec.ts.orig	2021-01-22 23:55:24 UTC
+--- electron/spec/api-tray-spec.ts.orig	2023-07-19 13:20:24 UTC
 +++ electron/spec/api-tray-spec.ts
-@@ -125,7 +125,7 @@ describe('tray module', () => {
+@@ -129,7 +129,7 @@ describe('tray module', () => {
    describe('tray.getBounds()', () => {
      afterEach(() => { tray.destroy(); });
  
 -    ifit(process.platform !== 'linux')('returns a bounds object', function () {
 +    ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('returns a bounds object', function () {
        const bounds = tray.getBounds();
        expect(bounds).to.be.an('object').and.to.have.all.keys('x', 'y', 'width', 'height');
      });
diff --git a/devel/electron25/files/patch-electron_spec_chromium-spec.ts b/devel/electron25/files/patch-electron_spec_chromium-spec.ts
index 2378f3d5ffa5..cfc0037995fe 100644
--- a/devel/electron25/files/patch-electron_spec_chromium-spec.ts
+++ b/devel/electron25/files/patch-electron_spec_chromium-spec.ts
@@ -1,44 +1,44 @@
---- electron/spec/chromium-spec.ts.orig	2023-05-31 14:28:29 UTC
+--- electron/spec/chromium-spec.ts.orig	2023-07-19 13:20:24 UTC
 +++ electron/spec/chromium-spec.ts
 @@ -470,13 +470,13 @@ describe('command line switches', () => {
      it('should not set an invalid locale', async () => testLocale('asdfkl', `${currentLocale}|${currentSystemLocale}|${currentPreferredLanguages}`));
  
      const lcAll = String(process.env.LC_ALL);
 -    ifit(process.platform === 'linux')('current process has a valid LC_ALL env', async () => {
 +    ifit(process.platform === 'linux' || process.platform === 'freebsd')('current process has a valid LC_ALL env', async () => {
        // The LC_ALL env should not be set to DOM locale string.
        expect(lcAll).to.not.equal(app.getLocale());
      });
 -    ifit(process.platform === 'linux')('should not change LC_ALL', async () => testLocale('fr', lcAll, true));
 -    ifit(process.platform === 'linux')('should not change LC_ALL when setting invalid locale', async () => testLocale('asdfkl', lcAll, true));
 -    ifit(process.platform === 'linux')('should not change LC_ALL when --lang is not set', async () => testLocale('', lcAll, true));
 +    ifit(process.platform === 'linux' || process.platform === 'freebsd')('should not change LC_ALL', async () => testLocale('fr', lcAll, true));
 +    ifit(process.platform === 'linux' || process.platform === 'freebsd')('should not change LC_ALL when setting invalid locale', async () => testLocale('asdfkl', lcAll, true));
 +    ifit(process.platform === 'linux' || process.platform === 'freebsd')('should not change LC_ALL when --lang is not set', async () => testLocale('', lcAll, true));
    });
  
    describe('--remote-debugging-pipe switch', () => {
-@@ -2283,12 +2283,12 @@ describe('font fallback', () => {
+@@ -2324,12 +2324,12 @@ describe('font fallback', () => {
        expect(fonts[0].familyName).to.equal('Arial');
      } else if (process.platform === 'darwin') {
        expect(fonts[0].familyName).to.equal('Helvetica');
 -    } else if (process.platform === 'linux') {
 +    } else if (process.platform === 'linux' || process.platform === 'freebsd') {
        expect(fonts[0].familyName).to.equal('DejaVu Sans');
      } // I think this depends on the distro? We don't specify a default.
    });
  
 -  ifit(process.platform !== 'linux')('should fall back to Japanese font for sans-serif Japanese script', async function () {
 +  ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should fall back to Japanese font for sans-serif Japanese script', async function () {
      const html = `
      <html lang="ja-JP">
        <head>
-@@ -2682,7 +2682,7 @@ describe('navigator.clipboard.write', () => {
+@@ -2723,7 +2723,7 @@ describe('navigator.clipboard.write', () => {
    });
  });
  
 -ifdescribe((process.platform !== 'linux' || app.isUnityRunning()))('navigator.setAppBadge/clearAppBadge', () => {
 +ifdescribe(((process.platform !== 'linux' && process.platform !== 'freebsd') || app.isUnityRunning()))('navigator.setAppBadge/clearAppBadge', () => {
    let w: BrowserWindow;
  
    const expectedBadgeCount = 42;