diff --git a/devel/codebase-memory-mcp/files/patch-src_ui_http__server.c b/devel/codebase-memory-mcp/files/patch-src_ui_http__server.c
deleted file mode 100644
index 1fd0ad857385..000000000000
--- a/devel/codebase-memory-mcp/files/patch-src_ui_http__server.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/ui/http_server.c.orig	2026-08-18 20:39:59 UTC
-+++ src/ui/http_server.c
-@@ -61,6 +61,10 @@
- #endif
- #ifdef __APPLE__
- #include <mach-o/dyld.h>
-+#endif
-+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
- #endif
- 
- /* ── Constants ────────────────────────────────────────────────── */
-@@ -929,6 +933,15 @@
-         return copy_path(out, outsz, buf);
-     }
-     return false;
-+#elif defined(__FreeBSD__)
-+    /* No /proc by default on FreeBSD; ask the kernel for our own path. */
-+    char buf[1024];
-+    int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};
-+    size_t cb = sizeof(buf);
-+    if (sysctl(mib, 4, buf, &cb, NULL, 0) == 0 && cb > 0) {
-+        return copy_path(out, outsz, buf);
-+    }
-+    return false;
- #else
-     char buf[1024];
-     ssize_t len = readlink("/proc/self/exe", buf, sizeof(buf) - 1);
diff --git a/net-mgmt/pmacct/files/patch-src_nfv9__template.c b/net-mgmt/pmacct/files/patch-src_nfv9__template.c
deleted file mode 100644
index adf595885957..000000000000
--- a/net-mgmt/pmacct/files/patch-src_nfv9__template.c
+++ /dev/null
@@ -1,22 +0,0 @@
-- libcdada >= 0.6.0 added a prev_val out-param to cdada_map_insert_replace()
-
---- src/nfv9_template.c.orig	2022-12-31 19:17:17 UTC
-+++ src/nfv9_template.c
-@@ -1628,7 +1628,7 @@ struct template_cache_entry *handle_template_v2(struct
-   if (tpl_type == 0 || tpl_type == 2) {
-     tpl = compose_template(hdr, (struct sockaddr *)pptrs->f_agent, tpl_type, sid, pens, version, len, seq);
- 
--    ret = cdada_map_insert_replace(tpl_data_map, hash_keyval, tpl);
-+    ret = cdada_map_insert_replace(tpl_data_map, hash_keyval, tpl, NULL);
-     if (ret != CDADA_SUCCESS) {
-       Log(LOG_WARNING, "WARN ( %s/core ): Unable to insert / refresh template in tpl_data_map\n", config.name);
-       goto exit_lane;
-@@ -1638,7 +1638,7 @@ struct template_cache_entry *handle_template_v2(struct
-   else if (tpl_type == 1 || tpl_type == 3) {
-     tpl = compose_opt_template(hdr, (struct sockaddr *)pptrs->f_agent, tpl_type, sid, pens, version, len, seq);
- 
--    ret = cdada_map_insert_replace(tpl_data_map, hash_keyval, tpl);
-+    ret = cdada_map_insert_replace(tpl_data_map, hash_keyval, tpl, NULL);
-     if (ret != CDADA_SUCCESS) {
-       Log(LOG_WARNING, "WARN ( %s/core ): Unable to insert / refresh template in tpl_opt_map\n", config.name);
-       goto exit_lane;
diff --git a/net/pimd/files/patch-src_main.c b/net/pimd/files/patch-src_main.c
deleted file mode 100644
index 75d39d5dc974..000000000000
--- a/net/pimd/files/patch-src_main.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/main.c.orig	2022-08-11 06:59:04 UTC
-+++ src/main.c
-@@ -373,20 +373,24 @@ int main(int argc, char *argv[])
- 	    dup2(fd, STDERR_FILENO);
- 	    close(fd);
- 	}
--#if defined(SYSV) || defined(__linux__)
--	setpgrp();
--#else
--#ifdef TIOCNOTTY
--	fd = open("/dev/tty", 2);
--	if (fd >= 0) {
--	    (void)ioctl(fd, TIOCNOTTY, NULL);
--	    close(fd);
--	}
--#else
-+
-+	/*
-+	 * Become a session leader with no controlling terminal.
-+	 *
-+	 * When pimd is started at boot from an rc script whose session is
-+	 * attached to the (serial) console, the forked child otherwise stays
-+	 * in the console's foreground process group.  An INTR character (^C)
-+	 * on the console then reaches pimd through the tty line discipline
-+	 * (tty_signal_pgrp -> SIGINT) and pimd shuts down.  setsid() detaches
-+	 * us from that session and controlling tty entirely.
-+	 *
-+	 * setsid() is the portable primitive; it supersedes the older
-+	 * setpgrp()/TIOCNOTTY variants below, which on FreeBSD left the child
-+	 * in the console process group because TIOCNOTTY was preferred over
-+	 * setsid().
-+	 */
- 	if (setsid() < 0)
- 	    perror("setsid");
--#endif
--#endif
-     }
- 
-     /*
diff --git a/sysutils/edk2/Makefile b/sysutils/edk2/Makefile
index 05bec1f35924..55e051f2f218 100644
--- a/sysutils/edk2/Makefile
+++ b/sysutils/edk2/Makefile
@@ -1,243 +1,243 @@
 PORTNAME=	edk2
 PORTVERSION=	g202508
-PORTREVISION=	3
+PORTREVISION=	2
 CATEGORIES=	sysutils
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 
 MAINTAINER=	uboot@FreeBSD.org
 COMMENT=	EDK2 Firmware for ${FLAVOR}
 WWW=		https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/
 
 LICENSE=	BSD3CLAUSE
 
 ONLY_FOR_ARCHS=		aarch64 amd64
 ONLY_FOR_ARCHS_REASON=	only provides firmware for aarch64 and amd64
 
 PKGNAMESUFFIX=	-${FLAVOR:C/_/-/g}
 FLAVORS=	bhyve macchiatobin fvp rpi3 rpi4 xen_x64 qemu_x64 qemu_i386
 
 USES=	dos2unix cpe gmake python:build
 CPE_VENDOR=	tianocore
 USE_GCC=	yes:build
 DOS2UNIX_FILES=	UefiCpuPkg/CpuDxe/CpuDxe.inf \
 		UefiCpuPkg/CpuDxe/CpuDxe.c \
 		UefiCpuPkg/CpuDxe/CpuPageTable.c \
 		UefiCpuPkg/CpuDxe/CpuPageTable.h
 
 BUILD_DEPENDS+=	dtc>=1.4.1:sysutils/dtc \
 		bash:shells/bash
 
 # Both platform and non-osi repository don't have release, use latest known to work tag
 PLATFORM_TAG=	aa035ed7f469295802d51c7c001477e32da8a65f
 NONOSI_TAG=	3415f616e08a0d9c7bd264cab674929a7b0f5e33
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tianocore
 GH_TAGNAME=	edk2-stable202508
 GH_TUPLE=	tianocore:edk2-platforms:${PLATFORM_TAG}:platforms \
 		tianocore:edk2-non-osi:${NONOSI_TAG}:nonosi \
 		tianocore:edk2-subhook:83d4e1ebef3588fae48b69a7352cc21801cb70bc:edk2_subhook/UnitTestFrameworkPkg/Library/SubhookLib/subhook \
 		tianocore:edk2-cmocka:1cc9cde3448cdd2e000886a26acf1caac2db7cf1:edk2_cmocka/UnitTestFrameworkPkg/Library/CmockaLib/cmocka \
 		openssl:openssl:aea7aaf2abb04789f5868cbabec406ea43aa84bf:openssl/CryptoPkg/Library/OpensslLib/openssl \
 		kkos:oniguruma:4ef89209a239c1aea328cf13c05a2807e5c146d1:oniguruma/MdeModulePkg/Universal/RegularExpressionDxe/oniguruma \
 		google:googletest:86add13493e5c881d7e4ba77fb91c1f57752b3a4:googletest/UnitTestFrameworkPkg/Library/GoogleTestLib/googletest \
 		google:brotli:f4153a09f87cbb9c826d8fc12c74642bb2d879ea:brotli/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli \
 		devicetree-org:pylibfdt:cfff805481bdea27f900c32698171286542b8d3c:pylibfdt/MdePkg/Library/BaseFdtLib/libfdt \
 		akheron:jansson:e9ebfa7e77a6bee77df44e096b100e7131044059:jansson/RedfishPkg/Library/JsonLib/jansson \
 		MIPI-Alliance:public-mipi-sys-t:370b5944c046bab043dd8b133727b2135af7747a:public_mipi_sys_t/MdePkg/Library/MipiSysTLib/mipisyst \
 		DMTF:libspdm:98ef964e1e9a0c39c7efb67143d3a13a819432e0:libspdm/SecurityPkg/DeviceSecurity/SpdmLib/libspdm \
 		ARMmbed:mbedtls:8c89224991adff88d53cd380f42a2baa36f91454:mbedtls/CryptoPkg/Library/MbedTlsLib/mbedtls
 
 .include <bsd.port.pre.mk>
 
 # Heavily dependent on bsd.port.pre.mk definitions for lang/gcc* details:
 BINARY_ALIAS=	make=${GMAKE} \
 		ar=${AR} \
 		dtc=${LOCALBASE}/bin/dtc \
 		gcc=${LOCALBASE}/bin/${CC} \
 		g++=${LOCALBASE}/bin/${CXX} \
 		gcc-nm=${LOCALBASE}/bin/${CC:S/gcc/&-nm/} \
 		gcc-ar=${LOCALBASE}/bin/${CC:S/gcc/&-ar/} \
 		gcc-ranlib=${LOCALBASE}/bin/${CC:S/gcc/&-ranlib/} \
 		python3=${PYTHON_CMD} python=${PYTHON_CMD}
 
 # Avoid: "ld-elf.so.1: /lib/libgcc_s.so.1: version GCC_4.5.0
 #         required by /usr/local/lib/gcc11/libstdc++.so.6 not found"
 # (that is from /lib/libgcc_s.so.1 having incomplete/inaccurate
 # coverage for aarch64 g++ code generation's use of libgcc_s.so.1 ):
 EXTRA_LDFLAGS+=	-Wl,-rpath=${_GCC_RUNTIME}
 
 # Global args
 PLAT_ARGS=	-D NETWORK_IP6_ENABLE
 
 .if ${FLAVOR} == fvp
 PLAT=		fvp
 PLAT_ARCH=	AARCH64
 PLAT_ARGS+=	-D X64EMU_ENABLE=FALSE -D CAPSULE_ENABLE=FALSE
 PLAT_TARGET=	RELEASE
 PLATFILE=	Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
 PLAT_RESULT=	ArmVExpress-FVP-AArch64/${PLAT_TARGET}_GCC/FV/FVP_AARCH64_EFI.fd
 PLAT_FILENAME=	FVP_AARCH64_EFI.fd
 .endif
 
 .if ${FLAVOR} == macchiatobin
 PLAT=		macchiatobin
 PLAT_ARCH=	AARCH64
 PLAT_ARGS+=	-D X64EMU_ENABLE=TRUE -D CAPSULE_ENABLE=FALSE
 PLAT_TARGET=	RELEASE
 PLATFILE=	Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
 PLAT_RESULT=	Armada80x0McBin-AARCH64/${PLAT_TARGET}_GCC/FV/ARMADA_EFI.fd
 PLAT_FILENAME=	ARMADA_EFI.fd
 .endif
 
 .if ${FLAVOR} == rpi3
 PLAT=		rpi3
 PLAT_ARCH=	AARCH64
 PLAT_ARGS+=	-D X64EMU_ENABLE=FALSE -D CAPSULE_ENABLE=FALSE
 PLAT_TARGET=	RELEASE
 PLATFILE=	Platform/RaspberryPi/RPi3/RPi3.dsc
 PLAT_RESULT=	RPi3/${PLAT_TARGET}_GCC/FV/RPI_EFI.fd
 PLAT_FILENAME=	RPI_EFI.fd
 .endif
 
 .if ${FLAVOR} == rpi4
 PLAT=		rpi4
 PLAT_ARCH=	AARCH64
 PLAT_ARGS+=	-D X64EMU_ENABLE=FALSE -D CAPSULE_ENABLE=FALSE
 PLAT_TARGET=	RELEASE
 PLATFILE=	Platform/RaspberryPi/RPi4/RPi4.dsc
 PLAT_RESULT=	RPi4/${PLAT_TARGET}_GCC/FV/RPI_EFI.fd
 PLAT_FILENAME=	RPI_EFI.fd
 .endif
 
 .if ${FLAVOR} == xen_x64
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	Do not compile on hardware other than amd64
 PLAT=		xen
 PLAT_ARCH=	X64
 PLAT_TARGET=	RELEASE
 PLATFILE=	OvmfPkg/OvmfXen.dsc
 PLAT_RESULT=	OvmfXen/${PLAT_TARGET}_GCC/FV/OVMF.fd
 PLAT_FILENAME=	XEN_X64_EFI.fd
 .endif
 
 .if ${FLAVOR} == bhyve
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	Bhyve only runs on x64
 PLAT=		bhyve
 PLAT_ARCH=	X64
 PLAT_ARGS+=	-D SECURE_BOOT_ENABLE=TRUE -D TPM2_ENABLE=TRUE
 PLAT_TARGET=	RELEASE
 PLATFILE=	OvmfPkg/Bhyve/BhyveX64.dsc
 PLAT_RESULT=	BhyveX64/${PLAT_TARGET}_GCC/FV/BHYVE.fd
 PLAT_RESULT_CODE=	BhyveX64/${PLAT_TARGET}_GCC/FV/BHYVE_CODE.fd
 PLAT_RESULT_VARS=	BhyveX64/${PLAT_TARGET}_GCC/FV/BHYVE_VARS.fd
 PLAT_FILENAME=	BHYVE_UEFI.fd
 PLAT_FILENAME_CODE=	BHYVE_UEFI_CODE.fd
 PLAT_FILENAME_VARS=	BHYVE_UEFI_VARS.fd
 .endif
 
 .if ${FLAVOR} == qemu_x64
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	Do not compile on hardware other than amd64
 PLAT=		qemu
 PLAT_ARCH=	X64
 PLAT_TARGET=	RELEASE
 PLATFILE=	OvmfPkg/OvmfPkgX64.dsc
 PLAT_RESULT=	OvmfX64/${PLAT_TARGET}_GCC/FV/OVMF.fd
 PLAT_RESULT_CODE=	OvmfX64/${PLAT_TARGET}_GCC/FV/OVMF_CODE.fd
 PLAT_RESULT_VARS=	OvmfX64/${PLAT_TARGET}_GCC/FV/OVMF_VARS.fd
 PLAT_FILENAME=	QEMU_UEFI-x86_64.fd
 PLAT_FILENAME_CODE=	QEMU_UEFI_CODE-x86_64.fd
 PLAT_FILENAME_VARS=	QEMU_UEFI_VARS-x86_64.fd
 .endif
 
 .if ${FLAVOR} == qemu_i386
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	Do not compile on hardware other than amd64
 PLAT=		qemu
 PLAT_ARCH=	IA32
 PLAT_TARGET=	RELEASE
 PLATFILE=	OvmfPkg/OvmfPkgIa32.dsc
 PLAT_RESULT=	OvmfIa32/${PLAT_TARGET}_GCC/FV/OVMF.fd
 PLAT_RESULT_CODE=	OvmfIa32/${PLAT_TARGET}_GCC/FV/OVMF_CODE.fd
 PLAT_RESULT_VARS=	OvmfIa32/${PLAT_TARGET}_GCC/FV/OVMF_VARS.fd
 PLAT_FILENAME=	QEMU_UEFI-i386.fd
 PLAT_FILENAME_CODE=	QEMU_UEFI_CODE-i386.fd
 PLAT_FILENAME_VARS=	QEMU_UEFI_VARS-i386.fd
 .endif
 
 PLIST_FILES=	${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME}
 .if defined(PLAT_FILENAME_CODE)
 PLIST_FILES+=	${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME_CODE}
 .endif
 .if defined(PLAT_FILENAME_VARS)
 PLIST_FILES+=	${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME_VARS}
 .endif
 .if ${FLAVOR} == bhyve
 PLIST_FILES+=	${PREFIX}/share/uefi-firmware/${PLAT_FILENAME}
 PLIST_FILES+=	${PREFIX}/share/uefi-firmware/${PLAT_FILENAME_CODE}
 PLIST_FILES+=	${PREFIX}/share/uefi-firmware/${PLAT_FILENAME_VARS}
 .endif
 
 .if ${PLAT_ARCH} == AARCH64 && ${ARCH} != aarch64
 BUILD_DEPENDS+=	aarch64-none-elf-gcc:devel/aarch64-none-elf-gcc
 MAKE_ENV+=	GCC_AARCH64_PREFIX=aarch64-none-elf-
 .endif
 
 .if ${PLAT_ARCH} == X64 || ${PLAT_ARCH} == IA32
 BUILD_DEPENDS+=	nasm:devel/nasm
 .endif
 
 MAKE_ENV+=	PYTHON_COMMAND=python3 \
 		EXTRA_LDFLAGS=${EXTRA_LDFLAGS} \
 		PACKAGES_PATH=${WRKDIR}/edk2-${GH_TAGNAME}:${WRKDIR}/edk2-platforms-${PLATFORM_TAG}:${WRKDIR}/edk2-non-osi-${NONOSI_TAG}
 
 # custom logo for bhyve's ovmf
 .if ${FLAVOR} == bhyve
 MASTER_SITES+= LOCAL/dch/bhyve/
 DISTFILES+=	BhyveLogo.bmp
 EXTRACT_ONLY= ${DISTFILES:M*.gz*:C/.gz:.*/.gz/}
 .endif
 
 post-extract:
 	# We can't have two submodule with the same origin in GH_TUPLE
 	(cd ${WRKDIR}/edk2-${GH_TAGNAME} && ${CP} -a MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/* BaseTools/Source/C/BrotliCompress/brotli)
 
 .if ${FLAVOR} == bhyve
 	(${CP} ${DISTDIR}/BhyveLogo.bmp ${WRKDIR}/edk2-${GH_TAGNAME}/MdeModulePkg/Logo/Logo.bmp)
 .endif
 
 
 do-build:
 	# Just run a bash subshell for build instead of emulating edksetup.sh
 	(bash -c ' \
 		export ${MAKE_ENV} && \
 		cd ${WRKDIR}/edk2-${GH_TAGNAME} && \
 		${MAKE_CMD} -C BaseTools -j ${MAKE_JOBS_NUMBER} && \
 		source edksetup.sh && \
 		build -a ${PLAT_ARCH} -p ${PLATFILE} -n ${MAKE_JOBS_NUMBER} -t GCC -b ${PLAT_TARGET} ${PLAT_ARGS} \
 	')
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/
 	${INSTALL_DATA} ${WRKDIR}/edk2-${GH_TAGNAME}/Build/${PLAT_RESULT} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME}
 .if defined(PLAT_FILENAME_CODE)
 	${INSTALL_DATA} ${WRKDIR}/edk2-${GH_TAGNAME}/Build/${PLAT_RESULT_CODE} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME_CODE}
 .endif
 .if defined(PLAT_FILENAME_VARS)
 	${INSTALL_DATA} ${WRKDIR}/edk2-${GH_TAGNAME}/Build/${PLAT_RESULT_VARS} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME_VARS}
 .endif
 
 .if ${FLAVOR} == bhyve
 	# For now BHYVE cannot load the regular firmware file that contains vars so we just replace it with CODE
 	${INSTALL_DATA} ${WRKDIR}/edk2-${GH_TAGNAME}/Build/${PLAT_RESULT_CODE} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME}
 	# For backwards compatibility
 	${MKDIR} ${STAGEDIR}/${PREFIX}/share/uefi-firmware/
 	${RLN} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME} ${STAGEDIR}/${PREFIX}/share/uefi-firmware/${PLAT_FILENAME}
 	${RLN} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME_CODE} ${STAGEDIR}/${PREFIX}/share/uefi-firmware/${PLAT_FILENAME_CODE}
 	${RLN} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME_VARS} ${STAGEDIR}/${PREFIX}/share/uefi-firmware/${PLAT_FILENAME_VARS}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/edk2/files/patch-OvmfPkg_Bhyve_BhyveX64.dsc b/sysutils/edk2/files/patch-OvmfPkg_Bhyve_BhyveX64.dsc
deleted file mode 100644
index f1b2994f0111..000000000000
--- a/sysutils/edk2/files/patch-OvmfPkg_Bhyve_BhyveX64.dsc
+++ /dev/null
@@ -1,34 +0,0 @@
---- OvmfPkg/Bhyve/BhyveX64.dsc.orig	2025-08-12 17:42:44 UTC
-+++ OvmfPkg/Bhyve/BhyveX64.dsc
-@@ -43,8 +43,8 @@
-   # Network definition
-   #
-   DEFINE NETWORK_TLS_ENABLE             = FALSE
--  DEFINE NETWORK_IP6_ENABLE             = FALSE
--  DEFINE NETWORK_HTTP_BOOT_ENABLE       = FALSE
-+  DEFINE NETWORK_IP6_ENABLE             = TRUE
-+  DEFINE NETWORK_HTTP_BOOT_ENABLE       = TRUE
-   DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE
-   DEFINE NETWORK_ISCSI_ENABLE           = TRUE
- 
-@@ -745,6 +745,20 @@
-   MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
-   MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
-   MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
-+
-+  #
-+  # EFI_RNG_PROTOCOL producer: the NetworkPkg drivers all carry a
-+  # gEfiRngProtocolGuid depex, and bhyve has no virtio-rng device for
-+  # VirtioRngDxe to bind to, so without this they never dispatch.
-+  #
-+  SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf
-+
-+  #
-+  # EFI_HASH2_SERVICE_BINDING_PROTOCOL producer: TcpDxe depends on it,
-+  # and without TcpDxe there is no HttpServiceBinding, so HttpBootDxe
-+  # never binds. OvmfPkgX64.dsc includes this; the Bhyve DSC omitted it.
-+  #
-+  SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.inf
- 
-   #
-   # Network Support
diff --git a/sysutils/edk2/files/patch-OvmfPkg_Bhyve_BhyveX64.fdf b/sysutils/edk2/files/patch-OvmfPkg_Bhyve_BhyveX64.fdf
deleted file mode 100644
index 315f105e7542..000000000000
--- a/sysutils/edk2/files/patch-OvmfPkg_Bhyve_BhyveX64.fdf
+++ /dev/null
@@ -1,21 +0,0 @@
---- OvmfPkg/Bhyve/BhyveX64.fdf.orig	2025-08-12 17:42:44 UTC
-+++ OvmfPkg/Bhyve/BhyveX64.fdf
-@@ -274,6 +274,18 @@ INF MdeModulePkg/Logo/LogoDxe.inf
- INF MdeModulePkg/Logo/LogoDxe.inf
- 
- #
-+# Protocol producers the NetworkPkg drivers depend on, both absent from
-+# the stock Bhyve build:
-+#  - RngDxe: every NetworkPkg depex requires gEfiRngProtocolGuid, and
-+#    bhyve has no virtio-rng device for VirtioRngDxe to bind to.
-+#  - Hash2DxeCrypto: TcpDxe requires gEfiHash2ServiceBindingProtocolGuid;
-+#    without TcpDxe there is no HttpServiceBinding and HttpBootDxe never
-+#    binds. OvmfPkgX64 ships both; the Bhyve platform omitted them.
-+#
-+INF  SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf
-+INF  SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.inf
-+
-+#
- # Network modules
- #
- !if $(E1000_ENABLE)