git: f58d0ec0cbe9 - main - emulators/bochs: Update to 3.0

The branch main has been updated by nc:

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

commit f58d0ec0cbe9426620fe601e4212dd8a422b7f43
Author:     Neel Chauhan <nc@FreeBSD.org>
AuthorDate: 2025-02-19 02:33:10 +0000
Commit:     Neel Chauhan <nc@FreeBSD.org>
CommitDate: 2025-02-19 02:34:48 +0000

    emulators/bochs: Update to 3.0
---
 emulators/bochs/Makefile                                  |  2 +-
 emulators/bochs/distinfo                                  |  6 +++---
 emulators/bochs/files/patch-iodev_network_eth__slirp.cc   | 14 ++++++++++++++
 emulators/bochs/files/patch-iodev_network_slirp_compat.cc | 11 -----------
 emulators/bochs/pkg-plist                                 | 13 ++++++++-----
 5 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 58a432c10e83..23a680d540c8 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	bochs
-PORTVERSION=	2.8
+PORTVERSION=	3.0
 PORTEPOCH=	2
 CATEGORIES=	emulators
 MASTER_SITES=	SF
diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo
index 1f9f708b2b82..5ca3c630a2ef 100644
--- a/emulators/bochs/distinfo
+++ b/emulators/bochs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1715538647
-SHA256 (bochs-2.8.tar.gz) = a85b13aff7d8411f7a9f356ba6c33b5f5dc1fbb107eb5018cc23a62639da0059
-SIZE (bochs-2.8.tar.gz) = 5303791
+TIMESTAMP = 1739931187
+SHA256 (bochs-3.0.tar.gz) = cb6f542b51f35a2cc9206b2a980db5602b7cd1b7cf2e4ed4f116acd5507781aa
+SIZE (bochs-3.0.tar.gz) = 5680930
diff --git a/emulators/bochs/files/patch-iodev_network_eth__slirp.cc b/emulators/bochs/files/patch-iodev_network_eth__slirp.cc
new file mode 100644
index 000000000000..523d83921719
--- /dev/null
+++ b/emulators/bochs/files/patch-iodev_network_eth__slirp.cc
@@ -0,0 +1,14 @@
+--- ./iodev/network/eth_slirp.cc.orig	2025-02-16 04:15:29.000000000 -0500
++++ ./iodev/network/eth_slirp.cc	2025-02-18 21:26:22.200515000 -0500
+@@ -20,6 +20,11 @@
+ // eth_slirp.cc  - Bochs port of Qemu's slirp implementation (updated from libslirp 4.8.0)
+ // Portion of this software comes with the following license: BSD-3-Clause
+ 
++#include <netinet/in.h>
++#include <sys/socket.h>
++#include <sys/wait.h>
++#include <sys/types.h>
++
+ #define BX_PLUGGABLE
+ 
+ #ifdef __CYGWIN__
diff --git a/emulators/bochs/files/patch-iodev_network_slirp_compat.cc b/emulators/bochs/files/patch-iodev_network_slirp_compat.cc
deleted file mode 100644
index bc382d530fb3..000000000000
--- a/emulators/bochs/files/patch-iodev_network_slirp_compat.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- iodev/network/slirp/compat.cc.orig	2015-05-01 19:41:08 UTC
-+++ iodev/network/slirp/compat.cc
-@@ -128,6 +128,8 @@ int qemu_socket(int domain, int type, in
- #define CONFIG_SMBD_COMMAND "/usr/sbin/smbd"
- 
- #include <pwd.h>
-+#include <sys/types.h>
-+#include <sys/wait.h>
- 
- /* automatic user mode samba server configuration */
- void slirp_smb_cleanup(Slirp *s, char *smb_tmpdir)
diff --git a/emulators/bochs/pkg-plist b/emulators/bochs/pkg-plist
index 7ca2cd4c0247..a2d15308e684 100644
--- a/emulators/bochs/pkg-plist
+++ b/emulators/bochs/pkg-plist
@@ -3,17 +3,20 @@ bin/bxhub
 bin/bximage
 %%DATADIR%%/BIOS-bochs-latest
 %%DATADIR%%/BIOS-bochs-legacy
+%%DATADIR%%/README-i440fx
 %%DATADIR%%/SeaBIOS-README
 %%DATADIR%%/SeaVGABIOS-README
 %%DATADIR%%/VGABIOS-elpin-2.40
 %%DATADIR%%/VGABIOS-elpin-LICENSE
 %%DATADIR%%/VGABIOS-lgpl-README
-%%DATADIR%%/VGABIOS-lgpl-latest
-%%DATADIR%%/VGABIOS-lgpl-latest-banshee
-%%DATADIR%%/VGABIOS-lgpl-latest-cirrus
-%%DATADIR%%/VGABIOS-lgpl-latest-cirrus-debug
-%%DATADIR%%/VGABIOS-lgpl-latest-debug
+%%DATADIR%%/VGABIOS-lgpl-latest-banshee-debug.bin
+%%DATADIR%%/VGABIOS-lgpl-latest-banshee.bin
+%%DATADIR%%/VGABIOS-lgpl-latest-cirrus-debug.bin
+%%DATADIR%%/VGABIOS-lgpl-latest-cirrus.bin
+%%DATADIR%%/VGABIOS-lgpl-latest-debug.bin
+%%DATADIR%%/VGABIOS-lgpl-latest.bin
 %%DATADIR%%/bios.bin-1.13.0
+%%DATADIR%%/i440fx.bin
 %%DATADIR%%/keymaps/sdl-pc-de.map
 %%DATADIR%%/keymaps/sdl-pc-us.map
 %%DATADIR%%/keymaps/sdl2-pc-de.map