git: d23dace6ecc6 - main - emulators/virtualbox-ose{,-legacy}: Merge patches and unify patch names for src/VBox/Devices/PC/ipxe/Makefile.kmk

The branch main has been updated by vvd:

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

commit d23dace6ecc6c757cd2142e7e5f60c4aa3a7798a
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2025-02-01 21:32:11 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-02-01 21:32:11 +0000

    emulators/virtualbox-ose{,-legacy}: Merge patches and unify patch names for src/VBox/Devices/PC/ipxe/Makefile.kmk
---
 ...kefile.kmk => patch-src_VBox_Devices_PC_ipxe_Makefile.kmk} |  0
 emulators/virtualbox-ose/Makefile                             |  1 -
 .../files/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk    | 11 -----------
 .../files/patch-src_VBox_Devices_PC_ipxe_Makefile.kmk         | 11 ++++++++++-
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-PC-ipxe-Makefile.kmk b/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Devices_PC_ipxe_Makefile.kmk
similarity index 100%
rename from emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-PC-ipxe-Makefile.kmk
rename to emulators/virtualbox-ose-legacy/files/patch-src_VBox_Devices_PC_ipxe_Makefile.kmk
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 77500e1e992a..ce6fe1e095a2 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -220,7 +220,6 @@ VBOX_LLVM_VER?=	${LLVM_DEFAULT}
 .endif
 .endif
 PATCH_DEPENDS+=	${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild
-EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk
 .endif
 
 .if ${PYTHON_MAJOR_VER} >= 3
diff --git a/emulators/virtualbox-ose/files/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk b/emulators/virtualbox-ose/files/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk
deleted file mode 100644
index c2a39f402b18..000000000000
--- a/emulators/virtualbox-ose/files/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/VBox/Devices/PC/ipxe/Makefile.kmk.orig	2013-11-29 14:23:32.000000000 -0500
-+++ src/VBox/Devices/PC/ipxe/Makefile.kmk	2013-12-13 15:06:45.000000000 -0500
-@@ -35,7 +35,7 @@
- iPxeBiosBin_CLEAN    = \
- 	$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c \
- 
--if1of ($(KBUILD_TARGET), darwin os2 solaris win)
-+if1of ($(KBUILD_TARGET), darwin freebsd os2 solaris win)
-  $$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c: $(PATH_SUB_CURRENT)/iPxeBiosBin.rom $(VBOX_BIN2C) | $$(dir $$@)
- 	$(call MSG_TOOL,bin2c,iPxeBiosBin,$<,$@)
- 	$(QUIET)$(VBOX_BIN2C) -min 32 -max 56 -mask 0x1ff -export NetBiosBinary $< $@
diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Devices_PC_ipxe_Makefile.kmk b/emulators/virtualbox-ose/files/patch-src_VBox_Devices_PC_ipxe_Makefile.kmk
index 5d6e9ee0f2f2..86fda6974519 100644
--- a/emulators/virtualbox-ose/files/patch-src_VBox_Devices_PC_ipxe_Makefile.kmk
+++ b/emulators/virtualbox-ose/files/patch-src_VBox_Devices_PC_ipxe_Makefile.kmk
@@ -1,5 +1,14 @@
---- src/VBox/Devices/PC/ipxe/Makefile.kmk.orig	2021-01-07 15:39:44 UTC
+--- src/VBox/Devices/PC/ipxe/Makefile.kmk.orig	2024-01-11 12:19:38 UTC
 +++ src/VBox/Devices/PC/ipxe/Makefile.kmk
+@@ -35,7 +35,7 @@ iPxeBiosBin_CLEAN    = \
+ iPxeBiosBin_CLEAN    = \
+ 	$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c \
+ 
+-if1of ($(KBUILD_TARGET), darwin os2 solaris win)
++if1of ($(KBUILD_TARGET), darwin freebsd os2 solaris win)
+  $$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c: $(PATH_SUB_CURRENT)/iPxeBiosBin.rom $(VBOX_BIN2C) | $$(dir $$@)
+ 	$(call MSG_TOOL,bin2c,iPxeBiosBin,$<,$@)
+ 	$(QUIET)$(VBOX_BIN2C) -min 32 -max 56 -mask 0x1ff -export NetBiosBinary $< $@
 @@ -121,7 +121,7 @@ endif
  	-falign-loops=1 \
  	-Os \