sysutils/edk2: Add qemu_x64 and qemu_i386 as new FLAVORs of edk2

Instead of having a separate sysutils/uefi-edk2-qemu port, add qemu_x64
and qemu_i386 as FLAVORs of sysutils/edk2 and delete sysutils/uefi-edk2-qemu.

Differential Revision: https://reviews.freebsd.org/D35408
Approved by: manu

MOVED

@@ -17191,3 +17191,4 @@ www/rubygem-faraday110|www/rubygem-faraday|2022-06-03|Obsolete, please use www/r
 www/npm-node17|www/npm-node18|2022-06-03|Renamed for www/node update to v18
 www/yarn-node17|www/yarn-node18|2022-06-03|Renamed for www/node update to v18
 security/keepassx-devel||2022-06-05|Has expired: KeePassX had been stopped development/maintenance, please consider using security/keepassxc instead
+sysutils/uefi-edk2-qemu|sysutils/edk2@qemu|2022-06-05|No more need for this port: please use sysutils/edk2 FLAVOR qemu instead

sysutils/Makefile

@@ -1476,7 +1476,6 @@
     SUBDIR += ucspi-unix
     SUBDIR += udfclient
     SUBDIR += uefi-edk2-bhyve-csm
-    SUBDIR += uefi-edk2-qemu
     SUBDIR += ufetch
     SUBDIR += ufs_copy
     SUBDIR += uhidd

sysutils/edk2/Makefile

@@ -12,7 +12,7 @@ ONLY_FOR_ARCHS=		aarch64 amd64
 ONLY_FOR_ARCHS_REASON=	only provides firmware for aarch64 and amd64
 
 PKGNAMESUFFIX=	-${FLAVOR:C/_/-/g}
-FLAVORS=	macchiatobin fvp rpi3 rpi4 xen_x64 bhyve
+FLAVORS=	macchiatobin fvp rpi3 rpi4 xen_x64 bhyve qemu_x64 qemu_i386
 
 USES=	cpe gmake python:3.7+,build
 CPE_VENDOR=	tianocore
@@ -111,6 +111,36 @@ 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}_GCC5/FV/OVMF.fd
+PLAT_RESULT_CODE=	OvmfX64/${PLAT_TARGET}_GCC5/FV/OVMF_CODE.fd
+PLAT_RESULT_VARS=	OvmfX64/${PLAT_TARGET}_GCC5/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}_GCC5/FV/OVMF.fd
+PLAT_RESULT_CODE=       OvmfIa32/${PLAT_TARGET}_GCC5/FV/OVMF_CODE.fd
+PLAT_RESULT_VARS=       OvmfIa32/${PLAT_TARGET}_GCC5/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}