diff --git a/devel/electron36/Makefile b/devel/electron36/Makefile
index 75f94a0d8088..5aac5aa4aa79 100644
--- a/devel/electron36/Makefile
+++ b/devel/electron36/Makefile
@@ -1,460 +1,459 @@
 PORTNAME=	electron
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${ELECTRON_VER}
-PORTREVISION=	1
 PULSEMV=	16
 PULSEV=		${PULSEMV}.1
 CATEGORIES=	devel
-MASTER_SITES=	https://github.com/tagattie/FreeBSD-Electron/releases/download/v36.4.0/:chromium \
+MASTER_SITES=	https://github.com/tagattie/FreeBSD-Electron/releases/download/v36.5.0/:chromium \
 		https://freedesktop.org/software/pulseaudio/releases/:pulseaudio
 PKGNAMESUFFIX=	${ELECTRON_VER_MAJOR}
 DISTFILES=	chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.0:chromium \
 		chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.1:chromium \
 		chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.2:chromium \
 		pulseaudio-${PULSEV}.tar.gz:pulseaudio \
 		electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	chromium-${CHROMIUM_VER}${EXTRACT_SUFX} \
 		${DISTFILES:C/:[^:]+$//:C/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}\.[0-9]//}
 
 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${NODEJS_SUFFIX}>0:www/yarn${NODEJS_SUFFIX}
 EXTRACT_DEPENDS=yarn${NODEJS_SUFFIX}>0:www/yarn${NODEJS_SUFFIX}
 PATCH_DEPENDS=	git:devel/git \
 		jq:textproc/jq
 BUILD_DEPENDS=	gperf:devel/gperf \
 		bindgen:devel/rust-bindgen-cli \
 		yasm:devel/yasm \
 		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri \
 		rustc:lang/rust \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 		node${NODEJS_VERSION}>0:www/node${NODEJS_VERSION} \
 		npm${NODEJS_SUFFIX}>0:www/npm${NODEJS_SUFFIX}
 LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-core \
 		libatspi.so:accessibility/at-spi2-core \
 		libFLAC.so:audio/flac \
 		libopus.so:audio/opus \
 		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${NODEJS_SUFFIX}>0:www/npm${NODEJS_SUFFIX}
 
 USES=		bison compiler:c++17-lang cpe gettext-tools gl gmake gnome \
 		iconv:wchar_t jpeg localbase:ldflags ninja nodejs:22,build \
 		pkgconfig python:build,test shebangfix tar:xz xorg
 
 CPE_VENDOR=	electronjs
 USE_GITHUB=	yes
 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 \
 		EngFlow:reclient-configs:${ENGFLOW_RECLIENT_CONFIGS_VER}:reclient_configs
 USE_GL=		gbm gl glesv2
 USE_GNOME=	atk cairo gdkpixbuf gtk30 libxml2 libxslt pango
 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 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}
 BUNDLE_LIBS=	yes
 
 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=true \
 		use_custom_libunwind=true \
 		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_cflags="${CFLAGS}" \
 		extra_cxxflags="${CXXFLAGS} -I${LOCALBASE}/include/libepoll-shim ${PINCLUDES}" \
 		extra_ldflags="${LDFLAGS}" \
 		ffmpeg_branding="${FFMPEG_BRAND}" \
 		override_electron_version="${ELECTRON_VER}"
 
 # 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 PIPEWIRE
 OPTIONS_DEFAULT=	CODECS CUPS DRIVER KERBEROS PIPEWIRE ALSA PULSEAUDIO 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)
 PIPEWIRE_DESC=		Screen capture via PipeWire
 
 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_MAKE_ENV=		ELECTRON_OUT_DIR=Debug
 DEBUG_MAKE_ENV_OFF=	ELECTRON_OUT_DIR=Release
 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=	libkrb5.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=	libkrb5.so.3:security/krb5
 
 PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
 PIPEWIRE_VARS=		GN_ARGS+=rtc_use_pipewire=true \
 			GN_ARGS+=rtc_link_pipewire=true
 PIPEWIRE_VARS_OFF=	GN_ARGS+=rtc_use_pipewire=false \
 			GN_ARGS+=rtc_link_pipewire=false
 
 PULSEAUDIO_VARS=	GN_ARGS+=use_pulseaudio=true \
 			PINCLUDES="-I${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/pulseaudio-${PULSEV}/src -DPA_MAJOR=${PULSEMV}"
 PULSEAUDIO_VARS_OFF=	GN_ARGS+=use_pulseaudio=false
 
 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=			136.0.7103.149
+CHROMIUM_VER=			136.0.7103.168
 # See ${WRKSRC}/electron/DEPS for NODE_VER
-NODE_VER=			22.15.1
+NODE_VER=			22.16.0
 # See ${WRKSRC}/electron/DEPS for NAN_VER
 NAN_VER=			e14bdcd1f72d62bca1d541b66da43130384ec213
 # 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
 # See ${WRKSRC}/electron/DEPS for ENGFLOW_RECLIENT_CONFIGS_VER
 ENGFLOW_RECLIENT_CONFIGS_VER=	955335c30a752e9ef7bff375baab5e0819b6c00d
 
 YARN_TIMESTAMP=	61171200
 
 .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
 
 LLVM_DEFAULT=		19
 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}
 CFLAGS+=		-Wno-error=implicit-function-declaration
 
 .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
 
 # rust
 RUSTC_VERSION!=	rustc -V 2>/dev/null || true
 MAKE_ENV+=	RUSTC_BOOTSTRAP=1
 GN_ARGS+=	enable_rust=true \
 		rust_sysroot_absolute="${LOCALBASE}" \
 		rustc_version="${RUSTC_VERSION}"
 
 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-fetch:
 	@if [ ! -f ${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX} ]; then \
 		${CAT} ${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.? > \
 			${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}; \
 	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}/${GH_PROJECT_reclient_configs}-${ENGFLOW_RECLIENT_CONFIGS_VER} \
 		${WRKSRC}/third_party/engflow-reclient-configs
 # 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 harfbuzz-ng libdrm libpng \
 		libusb libwebp libxml libxslt openh264 opus || ${FALSE}
 	# Chromium uses an unreleased version of FFmpeg, so configure it
 	cd ${WRKSRC}/media/ffmpeg && \
 		${PYTHON_CMD} 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
 	touch ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/pulseaudio-${PULSEV}/src/pulse/version.h
 	@${REINPLACE_CMD} -e 's|$${LOCALBASE}|${LOCALBASE}|;s|$${MODCLANG_VERSION}|${LLVM_DEFAULT}|' \
 		${WRKSRC}/build/rust/rust_bindgen.gni \
 		${WRKSRC}/build/rust/rust_bindgen_generator.gni
 
 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}'
 
 	# Make GN available to python scripts called during build
 	${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKDIR}/.bin
 
 	# 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/electron36/Makefile.version b/devel/electron36/Makefile.version
index a7152ae86c24..b4583b2ce488 100644
--- a/devel/electron36/Makefile.version
+++ b/devel/electron36/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER=	36.4.0
+ELECTRON_VER=	36.5.0
 ELECTRON_VER_MAJOR=	${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron36/distinfo b/devel/electron36/distinfo
index 523b9e1b6fcc..c5e00f8cbf57 100644
--- a/devel/electron36/distinfo
+++ b/devel/electron36/distinfo
@@ -1,25 +1,25 @@
-TIMESTAMP = 1749038859
-SHA256 (electron/chromium-136.0.7103.149.tar.xz.0) = 397ba16511dc4516dd0bd763a9a1c18a1c9dcccc52fc28144739346a37cb93be
-SIZE (electron/chromium-136.0.7103.149.tar.xz.0) = 2000000000
-SHA256 (electron/chromium-136.0.7103.149.tar.xz.1) = 8fbd4de2f24a03d9af8d74ba6695f78e1237c4a63f62ac7dfaf68f5c4ac25da1
-SIZE (electron/chromium-136.0.7103.149.tar.xz.1) = 2000000000
-SHA256 (electron/chromium-136.0.7103.149.tar.xz.2) = 03f78c06ecf0174f11724c2710c1431544ebe53e21baa13869314b7ab8488682
-SIZE (electron/chromium-136.0.7103.149.tar.xz.2) = 248486308
+TIMESTAMP = 1750254398
+SHA256 (electron/chromium-136.0.7103.168.tar.xz.0) = 570faa3373d4dfce5db59072d49312dda929b6816682ff77a79216a376daf09c
+SIZE (electron/chromium-136.0.7103.168.tar.xz.0) = 2000000000
+SHA256 (electron/chromium-136.0.7103.168.tar.xz.1) = b37cb75f196d4a6b5503783ac87be3049a2f4ba39b43d64ad2c8c5ab64aaddb0
+SIZE (electron/chromium-136.0.7103.168.tar.xz.1) = 2000000000
+SHA256 (electron/chromium-136.0.7103.168.tar.xz.2) = 707eb3336740faf9ec8306f8e1f1cd621dca075b1e7091b78da98359253f64e1
+SIZE (electron/chromium-136.0.7103.168.tar.xz.2) = 248411304
 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111
-SHA256 (electron/electron-yarn-cache-36.4.0.tar.xz) = 12d724437444b7425d85ad5bb3ecabafee10ca23a91185ca4d3cc4e5a9e5411b
-SIZE (electron/electron-yarn-cache-36.4.0.tar.xz) = 30310152
-SHA256 (electron/electron-electron-v36.4.0_GH0.tar.gz) = c0b4ae19b1729327b5b17031ffc0d3a7d57c0d4c814fd8bc3b21859885d1c2c3
-SIZE (electron/electron-electron-v36.4.0_GH0.tar.gz) = 15774121
-SHA256 (electron/nodejs-node-v22.15.1_GH0.tar.gz) = 71c357ee1a2df8d58509fa2a88b2028698e3113a0f1cbfdb849e808bef0b18ff
-SIZE (electron/nodejs-node-v22.15.1_GH0.tar.gz) = 122830007
+SHA256 (electron/electron-yarn-cache-36.5.0.tar.xz) = 12d724437444b7425d85ad5bb3ecabafee10ca23a91185ca4d3cc4e5a9e5411b
+SIZE (electron/electron-yarn-cache-36.5.0.tar.xz) = 30310152
+SHA256 (electron/electron-electron-v36.5.0_GH0.tar.gz) = 1abd064f4a46b792b15f47a88123151d6d15e1f97b3fac3aa041ba58db292e2c
+SIZE (electron/electron-electron-v36.5.0_GH0.tar.gz) = 15791712
+SHA256 (electron/nodejs-node-v22.16.0_GH0.tar.gz) = 00d7c2a8f315f201fe30e2f7ac5a137663ab1c79a5c6873df553aff0409ce291
+SIZE (electron/nodejs-node-v22.16.0_GH0.tar.gz) = 122982623
 SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb
 SIZE (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 180646
 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
 SHA256 (electron/EngFlow-reclient-configs-955335c30a752e9ef7bff375baab5e0819b6c00d_GH0.tar.gz) = c148f76220fc41a89ffeaf370c2cc175577be184688b12aa6fec5f8ac6c714c4
 SIZE (electron/EngFlow-reclient-configs-955335c30a752e9ef7bff375baab5e0819b6c00d_GH0.tar.gz) = 13014
diff --git a/devel/electron36/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/devel/electron36/files/patch-chrome_browser_ui_views_frame_browser__view.cc
index 96b1190ca49f..831092db20b7 100644
--- a/devel/electron36/files/patch-chrome_browser_ui_views_frame_browser__view.cc
+++ b/devel/electron36/files/patch-chrome_browser_ui_views_frame_browser__view.cc
@@ -1,20 +1,20 @@
---- chrome/browser/ui/views/frame/browser_view.cc.orig	2025-04-22 20:15:27 UTC
+--- chrome/browser/ui/views/frame/browser_view.cc.orig	2025-06-09 18:58:16 UTC
 +++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -2581,7 +2581,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
+@@ -2584,7 +2584,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
  }
  
  void BrowserView::TabDraggingStatusChanged(bool is_dragging) {
 -#if !BUILDFLAG(IS_LINUX)
 +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
    GetContentsWebView()->SetFastResize(is_dragging);
    if (multi_contents_view_) {
      multi_contents_view_->GetInactiveContentsView()->SetFastResize(is_dragging);
-@@ -5825,7 +5825,7 @@ void BrowserView::MaybeShowSupervisedUserProfileSignIn
+@@ -5828,7 +5828,7 @@ void BrowserView::MaybeShowSupervisedUserProfileSignIn
  }
  
  void BrowserView::MaybeShowSupervisedUserProfileSignInIPH() {
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (!ShouldShowAvatarToolbarIPH()) {
      return;
    }
diff --git a/devel/electron36/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron36/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
index 6467ac92650c..a8f025d7e547 100644
--- a/devel/electron36/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
+++ b/devel/electron36/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
@@ -1,77 +1,77 @@
---- electron/shell/browser/api/electron_api_web_contents.cc.orig	2025-05-27 16:50:03 UTC
+--- electron/shell/browser/api/electron_api_web_contents.cc.orig	2025-06-16 21:48:02 UTC
 +++ electron/shell/browser/api/electron_api_web_contents.cc
-@@ -159,11 +159,11 @@
+@@ -160,11 +160,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/aura/window.h"
  #include "ui/gfx/font_render_params.h"
  #endif
-@@ -195,7 +195,7 @@
+@@ -196,7 +196,7 @@
  #include "content/public/browser/plugin_service.h"
  #endif
  
 -#if !IS_MAS_BUILD()
 +#if !IS_MAS_BUILD() && !BUILDFLAG(IS_BSD)
  #include "chrome/browser/hang_monitor/hang_crash_dump.h"  // nogncheck
  #endif
  
-@@ -569,7 +569,7 @@ std::optional<base::TimeDelta> GetCursorBlinkInterval(
+@@ -570,7 +570,7 @@ std::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)
-@@ -929,7 +929,7 @@ void WebContents::InitWithSessionAndOptions(
+@@ -930,7 +930,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));
-@@ -2665,13 +2665,13 @@ void WebContents::ForcefullyCrashRenderer() {
+@@ -2672,13 +2672,13 @@ 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();
  #else
      // Try to generate a crash report for the hung process.
 -#if !IS_MAS_BUILD()
 +#if !IS_MAS_BUILD() && !BUILDFLAG(IS_BSD)
      CrashDumpHungChildProcess(rph->GetProcess().Handle());
  #endif
      rph->Shutdown(content::RESULT_CODE_HUNG);
-@@ -3342,7 +3342,7 @@ void WebContents::Focus() {
+@@ -3355,7 +3355,7 @@ void WebContents::Focus() {
  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
-@@ -4218,7 +4218,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
+@@ -4236,7 +4236,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/electron36/files/patch-electron_shell_browser_api_electron__api__web__contents.h b/devel/electron36/files/patch-electron_shell_browser_api_electron__api__web__contents.h
index 721d3e2c67dd..067cdf21a89b 100644
--- a/devel/electron36/files/patch-electron_shell_browser_api_electron__api__web__contents.h
+++ b/devel/electron36/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	2025-05-07 07:36:13 UTC
+--- electron/shell/browser/api/electron_api_web_contents.h.orig	2025-06-16 21:48:02 UTC
 +++ electron/shell/browser/api/electron_api_web_contents.h
-@@ -739,7 +739,7 @@ class WebContents final : public ExclusiveAccessContex
+@@ -741,7 +741,7 @@ class WebContents final : public ExclusiveAccessContex
  #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/electron36/files/patch-electron_shell_browser_ui_file__dialog.h b/devel/electron36/files/patch-electron_shell_browser_ui_file__dialog.h
index dccc81864b78..4bc5a5b0d881 100644
--- a/devel/electron36/files/patch-electron_shell_browser_ui_file__dialog.h
+++ b/devel/electron36/files/patch-electron_shell_browser_ui_file__dialog.h
@@ -1,11 +1,11 @@
---- electron/shell/browser/ui/file_dialog.h.orig	2025-05-10 23:09:28 UTC
+--- electron/shell/browser/ui/file_dialog.h.orig	2025-06-16 21:48:02 UTC
 +++ electron/shell/browser/ui/file_dialog.h
-@@ -77,7 +77,7 @@ void ShowSaveDialog(const DialogSettings& settings,
+@@ -79,7 +79,7 @@ void ShowSaveDialog(const DialogSettings& settings,
  void ShowSaveDialog(const DialogSettings& settings,
                      gin_helper::Promise<gin_helper::Dictionary> promise);
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // Rewrite of SelectFileDialogLinuxPortal equivalent functions with primary
  // difference being that dbus_thread_linux::GetSharedSessionBus is not used
  // so that version detection can be initiated and compeleted on the dbus thread
diff --git a/devel/electron36/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron36/files/patch-electron_spec_api-browser-window-spec.ts
index d896186706bd..bc476e7e91fd 100644
--- a/devel/electron36/files/patch-electron_spec_api-browser-window-spec.ts
+++ b/devel/electron36/files/patch-electron_spec_api-browser-window-spec.ts
@@ -1,182 +1,182 @@
---- electron/spec/api-browser-window-spec.ts.orig	2025-05-12 02:18:43 UTC
+--- electron/spec/api-browser-window-spec.ts.orig	2025-06-16 21:48:02 UTC
 +++ electron/spec/api-browser-window-spec.ts
 @@ -69,7 +69,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');
 @@ -296,7 +296,7 @@ describe('BrowserWindow module', () => {
      });
    });
  
 -  ifdescribe(process.platform !== 'linux')('BrowserWindow.getContentProtection', () => {
 +  ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('BrowserWindow.getContentProtection', () => {
      afterEach(closeAllWindows);
      it('can set content protection', async () => {
        const w = new BrowserWindow({ show: false });
-@@ -1170,7 +1170,7 @@ describe('BrowserWindow module', () => {
+@@ -1167,7 +1167,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;
-@@ -1187,7 +1187,7 @@ describe('BrowserWindow module', () => {
+@@ -1184,7 +1184,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();
-@@ -1252,7 +1252,7 @@ describe('BrowserWindow module', () => {
+@@ -1249,7 +1249,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 });
-@@ -1354,7 +1354,7 @@ describe('BrowserWindow module', () => {
+@@ -1351,7 +1351,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 });
-@@ -1813,7 +1813,7 @@ describe('BrowserWindow module', () => {
+@@ -1810,7 +1810,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');
-@@ -2023,7 +2023,7 @@ describe('BrowserWindow module', () => {
+@@ -2020,7 +2020,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');
-@@ -2987,7 +2987,7 @@ describe('BrowserWindow module', () => {
+@@ -2984,7 +2984,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);
-@@ -3013,7 +3013,7 @@ describe('BrowserWindow module', () => {
+@@ -3010,7 +3010,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);
-@@ -3224,7 +3224,7 @@ describe('BrowserWindow module', () => {
+@@ -3221,7 +3221,7 @@ describe('BrowserWindow module', () => {
        expect(overlayRectPreMax.height).to.equal(size);
  
        // 'maximize' event is not emitted on Linux in CI.
 -      if (process.platform !== 'linux' && !w.isMaximized()) {
 +      if ((process.platform !== 'linux' && process.platform !== 'freebsd') && !w.isMaximized()) {
          const maximize = once(w, 'maximize');
          w.show();
          w.maximize();
-@@ -3290,7 +3290,7 @@ describe('BrowserWindow module', () => {
+@@ -3287,7 +3287,7 @@ describe('BrowserWindow module', () => {
          expect(preMaxHeight).to.equal(size);
  
          // 'maximize' event is not emitted on Linux in CI.
 -        if (process.platform !== 'linux' && !w.isMaximized()) {
 +        if ((process.platform !== 'linux' && process.platform !== 'freebsd') && !w.isMaximized()) {
            const maximize = once(w, 'maximize');
            w.show();
            w.maximize();
-@@ -3955,7 +3955,7 @@ describe('BrowserWindow module', () => {
+@@ -3952,7 +3952,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 {
-@@ -4460,7 +4460,7 @@ describe('BrowserWindow module', () => {
+@@ -4457,7 +4457,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 });
-@@ -4731,7 +4731,7 @@ describe('BrowserWindow module', () => {
+@@ -4728,7 +4728,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();
-@@ -4748,7 +4748,7 @@ describe('BrowserWindow module', () => {
+@@ -4745,7 +4745,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 });
-@@ -4785,7 +4785,7 @@ describe('BrowserWindow module', () => {
+@@ -4782,7 +4782,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();
-@@ -5271,7 +5271,7 @@ describe('BrowserWindow module', () => {
+@@ -5268,7 +5268,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');
  
-@@ -5481,7 +5481,7 @@ describe('BrowserWindow module', () => {
+@@ -5478,7 +5478,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);
  
-@@ -6680,7 +6680,7 @@ describe('BrowserWindow module', () => {
+@@ -6677,7 +6677,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/electron36/files/patch-electron_spec_api-web-contents-spec.ts b/devel/electron36/files/patch-electron_spec_api-web-contents-spec.ts
index 4980d258f3a8..91ee421c5a05 100644
--- a/devel/electron36/files/patch-electron_spec_api-web-contents-spec.ts
+++ b/devel/electron36/files/patch-electron_spec_api-web-contents-spec.ts
@@ -1,11 +1,11 @@
---- electron/spec/api-web-contents-spec.ts.orig	2025-05-07 07:36:13 UTC
+--- electron/spec/api-web-contents-spec.ts.orig	2025-06-16 21:48:02 UTC
 +++ electron/spec/api-web-contents-spec.ts
-@@ -2684,7 +2684,7 @@ describe('webContents module', () => {
+@@ -2754,7 +2754,7 @@ describe('webContents module', () => {
      });
  
      // TODO(codebytere): OOPIF printing is disabled on Linux at the moment due to crashes.
 -    ifit(process.platform !== 'linux')('can print cross-origin iframes', async () => {
 +    ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('can print cross-origin iframes', async () => {
        server = http.createServer((_, res) => {
          res.writeHead(200);
          res.end(`