git: 675ef8421cde - main - sysutils/edk2: Fix build with GCC 12

The branch main has been updated by salvadore:

URL: https://cgit.FreeBSD.org/ports/commit/?id=675ef8421cde2569121e3b623c481f25d2de6c34

commit 675ef8421cde2569121e3b623c481f25d2de6c34
Author:     Oleg Sidorkin <osidorkin@gmail.com>
AuthorDate: 2022-09-09 22:02:50 +0000
Commit:     Lorenzo Salvadore <salvadore@FreeBSD.org>
CommitDate: 2022-09-09 22:19:51 +0000

    sysutils/edk2: Fix build with GCC 12
    
    - Backport two upstreamed patches.
    - Fix ar path.
    
    While here, pet portlint.
    
    PR:             263543
    Reported by:    exp-run (antoine)
    Approved by:    manu
---
 sysutils/edk2/Makefile | 11 ++++++++---
 sysutils/edk2/distinfo |  6 +++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/sysutils/edk2/Makefile b/sysutils/edk2/Makefile
index 2a69e0725b6e..c1745cd284ce 100644
--- a/sysutils/edk2/Makefile
+++ b/sysutils/edk2/Makefile
@@ -3,6 +3,10 @@ PORTVERSION=	g202202
 PORTREVISION=	1
 CATEGORIES=	sysutils
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES=	22130dcd98b4d4b76ac8d922adb4a2dbc86fa52c.patch:-p1 \
+		85021f8cf22d1bd4114803c6c610dea5ef0059f1.patch:-p1
+
 MAINTAINER=	uboot@FreeBSD.org
 COMMENT=	EDK2 Firmware for ${FLAVOR}
 
@@ -38,6 +42,7 @@ GH_TUPLE=	tianocore:edk2-platforms:${PLATFORM_TAG}:platforms \
 
 BINARY_ALIAS=	make=${LOCALBASE}/bin/gmake \
 		dtc=${LOCALBASE}/bin/dtc \
+		ar=${AR} \
 		gcc=${LOCALBASE}/bin/gcc${GCC_DEFAULT} \
 		gcc-ar=${LOCALBASE}/bin/gcc-ar${GCC_DEFAULT} \
 		g++=${LOCALBASE}/bin/g++${GCC_DEFAULT} \
@@ -98,7 +103,7 @@ PLAT_FILENAME=	XEN_X64_EFI.fd
 
 .if ${FLAVOR} == bhyve
 ONLY_FOR_ARCHS=	amd64
-ONLY_FOR_ARCHS_REASON= Bhyve only runs on x64
+ONLY_FOR_ARCHS_REASON=	Bhyve only runs on x64
 PLAT=		bhyve
 PLAT_ARCH=	X64
 PLAT_TARGET=	RELEASE
@@ -107,8 +112,8 @@ PLAT_RESULT=	BhyveX64/${PLAT_TARGET}_GCC5/FV/BHYVE.fd
 PLAT_RESULT_CODE=	BhyveX64/${PLAT_TARGET}_GCC5/FV/BHYVE_CODE.fd
 PLAT_RESULT_VARS=	BhyveX64/${PLAT_TARGET}_GCC5/FV/BHYVE_VARS.fd
 PLAT_FILENAME=	BHYVE_UEFI.fd
-PLAT_FILENAME_CODE	= BHYVE_UEFI_CODE.fd
-PLAT_FILENAME_VARS	= BHYVE_UEFI_VARS.fd
+PLAT_FILENAME_CODE=	BHYVE_UEFI_CODE.fd
+PLAT_FILENAME_VARS=	BHYVE_UEFI_VARS.fd
 .endif
 
 .if ${FLAVOR} == qemu_x64
diff --git a/sysutils/edk2/distinfo b/sysutils/edk2/distinfo
index 1513f8ccf451..bdc6e79e8afd 100644
--- a/sysutils/edk2/distinfo
+++ b/sysutils/edk2/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1651509764
+TIMESTAMP = 1653575598
 SHA256 (tianocore-edk2-g202202-edk2-stable202202_GH0.tar.gz) = 072e84dfe3c8fbb35bb058dcc8b0f623fe831cead74ba81b0f8236d00a03e947
 SIZE (tianocore-edk2-g202202-edk2-stable202202_GH0.tar.gz) = 14208170
 SHA256 (tianocore-edk2-platforms-38855c56_GH0.tar.gz) = 87324cb01f3460a681155b5d12b2e19fa00638a0366c300813c507a1cbe081cb
@@ -15,3 +15,7 @@ SHA256 (google-brotli-v1.0.9-35-gf4153a0_GH0.tar.gz) = 8deff90317f030d770ab912fb
 SIZE (google-brotli-v1.0.9-35-gf4153a0_GH0.tar.gz) = 512041
 SHA256 (akheron-jansson-v2.13.1_GH0.tar.gz) = f22901582138e3203959c9257cf83eba9929ac41d7be4a42557213a22ebcc7a0
 SIZE (akheron-jansson-v2.13.1_GH0.tar.gz) = 144979
+SHA256 (22130dcd98b4d4b76ac8d922adb4a2dbc86fa52c.patch) = d7e7e46f5c84abc222343182c7c4dfef26cbb78b5a0269514466221211fe050b
+SIZE (22130dcd98b4d4b76ac8d922adb4a2dbc86fa52c.patch) = 1672
+SHA256 (85021f8cf22d1bd4114803c6c610dea5ef0059f1.patch) = d4e68faead64d7b808b32bb37aac110f0d7dd98433ec5d145e8de016d6d9ba0a
+SIZE (85021f8cf22d1bd4114803c6c610dea5ef0059f1.patch) = 2068