git: 3023881d2e9b - main - sysutils/edk2@bhyve: Fix main firmware

The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3023881d2e9b0f07aeca701e99caed5039206e06

commit 3023881d2e9b0f07aeca701e99caed5039206e06
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-06-03 08:23:41 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2022-06-03 08:23:41 +0000

    sysutils/edk2@bhyve: Fix main firmware
    
    EDK2 produce multiple files for the bhyve flavor, _CODE and _DATA
    The PLAT_RESULT is just a concat of both.
    But bhyve doesn't support having only one file.
    When it was its own port we just install the _CODE file as the main file
    instead of using the concat one generated during edk2 build.
    For this port we need to use the main PLAT_RESULT files for all flavors
    except bhyve so add a quirks in the install phase that just replace the main
    file with the _CODE one.
    Thanks to Corvin Köhne <CorvinK@beckhoff.com> for helping me understanding
    the issue.
    
    Fixes:          2e6a6ccd15 ("sysutils/edk2: Add bhyve as a new FLAVOR of edk2")
    Sponsored by:   Beckhoff Automation GmbH & Co. KG
    PR:             264338
---
 sysutils/edk2/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sysutils/edk2/Makefile b/sysutils/edk2/Makefile
index 325b85ab166d..d821fd0d4747 100644
--- a/sysutils/edk2/Makefile
+++ b/sysutils/edk2/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	edk2
 PORTVERSION=	g202202
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	uboot@FreeBSD.org
@@ -165,6 +166,7 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR}/Build/${PLAT_RESULT_VARS} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME_VARS}
 .endif
 .if ${FLAVOR} == bhyve
+	${INSTALL_DATA} ${WRKDIR}/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}