emulators/bochs: Update to 2.7

4 files changed, 145 insertions, 166 deletions

diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 834baafb70fc..441d2165932c 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,7 +1,7 @@
 # Created by: alex
 
 PORTNAME=	bochs
-PORTVERSION=	2.6.11
+PORTVERSION=	2.7
 PORTEPOCH=	2
 CATEGORIES=	emulators
 MASTER_SITES=	SF
@@ -11,14 +11,15 @@ COMMENT=	IA-32 (x86) PC emulator that runs DOS, Win 95, and more
 
 LICENSE=	LGPL21
 
-BROKEN_i386=		does not build on i386 (../cpu.h:4513:117: error: 'regparm' parameter must be between 0 and 3 inclusive)
+BROKEN_i386=	does not build on i386 (../cpu.h:4513:117: error: 'regparm' parameter must be between 0 and 3 inclusive)
 
 USES=		gmake libtool:keepla pkgconfig xorg
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_header_alsa_asoundlib_h=no \
 		ac_cv_header_ltdl_h=no
-CONFIGURE_ARGS=	--disable-docbook --disable-instrumentation
+CONFIGURE_ARGS=	--disable-docbook \
+		--disable-instrumentation
 
 SUB_FILES=	pkg-message
 
@@ -27,181 +28,178 @@ CXXFLAGS+=	-fno-exceptions
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=		A20_PIN ALIGN_CHECK ASSERT_CHECK AVX BUSMOUSE \
-			CDROM CHAINING CLGD54XX CONF_MSRS \
-			DEBUGGER DEBUGGER_GUI DEBUGGER_X86 DISASM DOCS \
-			E1000 ES1370 EVEX FPU \
-			GAMEPORT GDB_STUB IDLE_HACK IODEBUG \
-			LARGE_RAMFILE LOGGING LONG_PHY_ADDR MEMTYPE MWAIT \
-			NE2000 OPTIMIZATIONS \
-			PCI PERFMON PNIC PLUGINS USB USB_OHCI USB_XHCI \
-			RAW_SERIAL READLINE REPEAT_SPEED \
-			SB16 SHOW_IPS SMP STATS SVM TRACE_LINK \
-			VMX VOODOO X86_64 XPM
+OPTIONS_DEFINE=		A20_PIN ALIGN_CHECK ASSERT_CHECK AVX BUSMOUSE CDROM \
+			CHAINING CLGD54XX CONF_MSRS DEBUGGER DEBUGGER_GUI \
+			DEBUGGER_X86 DISASM DOCS E1000 ES1370 EVEX FPU GAMEPORT \
+			GDB_STUB IDLE_HACK IODEBUG LARGE_RAMFILE LOGGING \
+			LONG_PHY_ADDR MEMTYPE MWAIT NE2000 OPTIMIZATIONS PCI \
+			PERFMON PLUGINS PNIC RAW_SERIAL READLINE REPEAT_SPEED \
+			SB16 SHOW_IPS SMP STATS SVM TRACE_LINK USB USB_OHCI \
+			USB_XHCI VMX VOODOO X86_64 XPM
 OPTIONS_DEFINE_i386=	FAST_FUNCCALL
 OPTIONS_GROUP=		UI
 OPTIONS_GROUP_UI=	RFB SDL1 SDL2 SVGALIB TERM VNCSERVER WXGTK X11
 OPTIONS_DEFAULT=	A20_PIN ALIGN_CHECK CDROM CONF_MSRS DISASM FPU \
-			LARGE_RAMFILE LOGGING NE2000 OPTIMIZATIONS PCI \
-			SB16 SHOW_IPS STATS X11
+			LARGE_RAMFILE LOGGING NE2000 OPTIMIZATIONS PCI SB16 \
+			SHOW_IPS STATS X11
 
-A20_PIN_DESC=		Support for A20 pin
+A20_PIN_DESC=			Support for A20 pin
 A20_PIN_CONFIGURE_ENABLE=	a20-pin
-ALIGN_CHECK_DESC=	Alignment check support
+ALIGN_CHECK_DESC=		Alignment check support
 ALIGN_CHECK_CONFIGURE_ENABLE=	alignment-check
-ASSERT_CHECK_DESC=	BX_ASSERT checks
+ASSERT_CHECK_DESC=		BX_ASSERT checks
 ASSERT_CHECK_CONFIGURE_ENABLE=	assert-checks
-ASSERT_CHECK_IMPLIES=	DEBUGGER
-AVX_DESC=		AVX instructions support
-AVX_CONFIGURE_ENABLE=	avx
-AVX_IMPLIES=		X86_64
-BUSMOUSE_DESC=		Busmouse support
+ASSERT_CHECK_IMPLIES=		DEBUGGER
+AVX_DESC=			AVX instructions support
+AVX_CONFIGURE_ENABLE=		avx
+AVX_IMPLIES=			X86_64
+BUSMOUSE_DESC=			Busmouse support
 BUSMOUSE_CONFIGURE_ENABLE=	busmouse
-CDROM_DESC=		CDROM support
-CDROM_CONFIGURE_ENABLE=	cdrom
-CHAINING_DESC=		Support handlers-chaining emulation speedups
+CDROM_DESC=			CDROM support
+CDROM_CONFIGURE_ENABLE=		cdrom
+CHAINING_DESC=			Support handlers-chaining emulation speedups
 CHAINING_CONFIGURE_ENABLE=	handlers-chaining
-CHAINING_PREVENTS=	ASSERT_CHECK DEBUGGER DEBUGGER_GUI IODEBUG GDB_STUB \
-			READLINE
-CLGD54XX_DESC=		Cirrus Logic GD54xx video card
+CHAINING_PREVENTS=		ASSERT_CHECK DEBUGGER DEBUGGER_GUI GDB_STUB \
+				IODEBUG READLINE
+CLGD54XX_DESC=			Cirrus Logic GD54xx video card
 CLGD54XX_CONFIGURE_ENABLE=	clgd54xx
-CONF_MSRS_DESC=		Configurable MSR registers support
+CONF_MSRS_DESC=			Configurable MSR registers support
 CONF_MSRS_CONFIGURE_ENABLE=	configurable-msrs
-DEBUGGER_DESC=		Debugger support
+DEBUGGER_DESC=			Debugger support
 DEBUGGER_CONFIGURE_ENABLE=	debugger
-DEBUGGER_IMPLIES=	DISASM
-DEBUGGER_GUI_DESC=	GTK+ 2 GUI debugger support
-DEBUGGER_GUI_USES=	gnome
-DEBUGGER_GUI_USE=	GNOME=gtk20
+DEBUGGER_IMPLIES=		DISASM
+DEBUGGER_GUI_DESC=		GTK+ 2 GUI debugger support
+DEBUGGER_GUI_USES=		gnome
+DEBUGGER_GUI_USE=		GNOME=gtk20
 DEBUGGER_GUI_CONFIGURE_ENABLE=	debugger-gui
-DEBUGGER_GUI_IMPLIES=	DEBUGGER
-DEBUGGER_X86_DESC=	X86 hardware debugger
+DEBUGGER_GUI_IMPLIES=		DEBUGGER
+DEBUGGER_X86_DESC=		X86 hardware debugger
 DEBUGGER_X86_CONFIGURE_ENABLE=	x86-debugger
-DISASM_DESC=		Disassemler support
+DISASM_DESC=			Disassemler support
 DISASM_CONFIGURE_ENABLE=	disasm
-E1000_DESC=		Intel(R) Gigabit Ethernet support
-E1000_CONFIGURE_ENABLE=	e1000
-E1000_IMPLIES=		PCI
-ES1370_DESC=		ES1370 soundcard support
+E1000_DESC=			Intel(R) Gigabit Ethernet support
+E1000_CONFIGURE_ENABLE=		e1000
+E1000_IMPLIES=			PCI
+ES1370_DESC=			ES1370 soundcard support
 ES1370_CONFIGURE_ENABLE=	es1370
-ES1370_IMPLIES=		PCI
-EVEX_DESC=		EVEX prefix and AVX-512 extensios support
-EVEX_CONFIGURE_ENABLE=	evex
-EVEX_IMPLIES=		AVX
-FAST_FUNCCALL_DESC=	Support for fast function calls (x86 only)
+ES1370_IMPLIES=			PCI
+EVEX_DESC=			EVEX prefix and AVX-512 extensios support
+EVEX_CONFIGURE_ENABLE=		evex
+EVEX_IMPLIES=			AVX
+FAST_FUNCCALL_DESC=		Support for fast function calls (x86 only)
 FAST_FUNCCALL_CONFIGURE_ENABLE=	fast-function-calls
-FPU_DESC=		FPU emulator
-FPU_CONFIGURE_ENABLE=	fpu
-FPU_VARS_OFF=		WITH_CPU_LEVEL=3
-GAMEPORT_DESC=		Standard PC gameport support
+FPU_DESC=			FPU emulator
+FPU_CONFIGURE_ENABLE=		fpu
+FPU_VARS_OFF=			WITH_CPU_LEVEL=3
+GAMEPORT_DESC=			Standard PC gameport support
 GAMEPORT_CONFIGURE_ENABLE=	gameport
-GDB_STUB_DESC=		GDB stub support
+GDB_STUB_DESC=			GDB stub support
 GDB_STUB_CONFIGURE_ENABLE=	gdb-stub
-GDB_STUB_PREVENTS=	ASSERT_CHECK DEBUGGER DEBUGGER_GUI IODEBUG
-IDLE_HACK_DESC=		Keep Bochs from using all CPU time
+GDB_STUB_PREVENTS=		ASSERT_CHECK DEBUGGER DEBUGGER_GUI IODEBUG
+IDLE_HACK_DESC=			Keep Bochs from using all CPU time
 IDLE_HACK_CONFIGURE_ENABLE=	idle-hack
-IODEBUG_DESC=		I/O interface to debugger
+IODEBUG_DESC=			I/O interface to debugger
 IODEBUG_CONFIGURE_ENABLE=	iodebug
-IODEBUG_IMPLIES=	DEBUGGER
-LARGE_RAMFILE_DESC=	Large ramfile support
+IODEBUG_IMPLIES=		DEBUGGER
+LARGE_RAMFILE_DESC=		Large ramfile support
 LARGE_RAMFILE_CONFIGURE_ENABLE=	large-ramfile
-LOGGING_DESC=		Logging support
+LOGGING_DESC=			Logging support
 LOGGING_CONFIGURE_ENABLE=	logging
-LONG_PHY_ADDR_DESC=	Support for physical address >= 32bit
+LONG_PHY_ADDR_DESC=		Support for physical address >= 32bit
 LONG_PHY_ADDR_CONFIGURE_ENABLE=	long-phy-address
-MEMTYPE_DESC=		Memory type calculation support
+MEMTYPE_DESC=			Memory type calculation support
 MEMTYPE_CONFIGURE_ENABLE=	memtype
-MWAIT_DESC=		MONITOR/MWAIT instructions support (experimemtal)
-MWAIT_CONFIGURE_ENABLE=	monitor-mwait
-NE2000_DESC=		NE2000 support
+MWAIT_DESC=			MONITOR/MWAIT instructions support (experimemtal)
+MWAIT_CONFIGURE_ENABLE=		monitor-mwait
+NE2000_DESC=			NE2000 support
 NE2000_CONFIGURE_ENABLE=	ne2000
-OPTIMIZATIONS_DESC=	Compile in all safe speed optimizations
+OPTIMIZATIONS_DESC=		Compile in all safe speed optimizations
 OPTIMIZATIONS_CONFIGURE_ENABLE=	all-optimizations
-OPTIMIZATIONS_IMPLIES=	CHAINING FAST_FUNCCALL REPEAT_SPEED TRACE_LINK
-OPTIMIZATIONS_PREVENTS=	ASSERT_CHECK DEBUGGER DEBUGGER_GUI IODEBUG GDB_STUB \
-			READLINE
-PCI_DESC=		Intel(R) i440FX PCI support
-PCI_CONFIGURE_ENABLE=	pci
-PERFMON_DESC=		Hardware performance monitoring emulation (experimental)
+OPTIMIZATIONS_IMPLIES=		CHAINING FAST_FUNCCALL REPEAT_SPEED TRACE_LINK
+OPTIMIZATIONS_PREVENTS=		ASSERT_CHECK DEBUGGER DEBUGGER_GUI GDB_STUB \
+				IODEBUG READLINE
+PCI_DESC=			Intel(R) i440FX PCI support
+PCI_CONFIGURE_ENABLE=		pci
+PERFMON_DESC=			Hardware performance monitoring emulation (experimental)
 PERFMON_CONFIGURE_ENABLE=	perfmon
 PLUGINS_CONFIGURE_ENABLE=	plugins
-PNIC_DESC=		PCI pseudo NIC (network card) support
-PNIC_CONFIGURE_ENABLE=	pnic
-PNIC_IMPLIES=		PCI
-RAW_SERIAL_DESC=	Raw serial port access
+PNIC_DESC=			PCI pseudo NIC (network card) support
+PNIC_CONFIGURE_ENABLE=		pnic
+PNIC_IMPLIES=			PCI
+RAW_SERIAL_DESC=		Raw serial port access
 RAW_SERIAL_CONFIGURE_ENABLE=	raw-serial
-READLINE_DESC=		Readline support in debugger
-READLINE_USES=		readline
+READLINE_DESC=			Readline support in debugger
+READLINE_USES=			readline
 READLINE_CONFIGURE_ENABLE=	readline
-READLINE_IMPLIES=	DEBUGGER
-REPEAT_SPEED_DESC=	Support repeated IO and mem copy speedups
+READLINE_IMPLIES=		DEBUGGER
+REPEAT_SPEED_DESC=		Support repeated IO and mem copy speedups
 REPEAT_SPEED_CONFIGURE_ENABLE=	repeat-speedups
-RFB_DESC=		RFB protocol support (works with VNC viewer)
-RFB_CONFIGURE_WITH=	rfb
-SB16_DESC=		Sound Blaster 16 emulation
-SB16_CONFIGURE_ENABLE=	sb16
-SDL1_DESC=		Simple Direct Media Layer 1 support
-SDL1_USES=		sdl
-SDL1_USE=		SDL=sdl
-SDL1_CONFIGURE_WITH=	sdl
-SDL1_PREVENTS=		SDL2
-SDL2_DESC=		Simple Direct Media Layer 2 support
-SDL2_USES=		sdl
-SDL2_USE=		SDL=sdl2
-SDL2_CONFIGURE_WITH=	sdl2
-SHOW_IPS_DESC=		Show IPS in status bar or log file
+RFB_DESC=			RFB protocol support (works with VNC viewer)
+RFB_CONFIGURE_WITH=		rfb
+SB16_DESC=			Sound Blaster 16 emulation
+SB16_CONFIGURE_ENABLE=		sb16
+SDL1_DESC=			Simple Direct Media Layer 1 support
+SDL1_USES=			sdl
+SDL1_USE=			SDL=sdl
+SDL1_CONFIGURE_WITH=		sdl
+SDL1_PREVENTS=			SDL2
+SDL2_DESC=			Simple Direct Media Layer 2 support
+SDL2_USES=			sdl
+SDL2_USE=			SDL=sdl2
+SDL2_CONFIGURE_WITH=		sdl2
+SHOW_IPS_DESC=			Show IPS in status bar or log file
 SHOW_IPS_CONFIGURE_ENABLE=	show-ips
-SMP_DESC=		Support for SMP configurations (CPU level 6)
-SMP_CONFIGURE_ENABLE=	smp
-SMP_VARS=		WITH_CPU_LEVEL=6
-SMP_IMPLIES=		FPU
-SMP_PREVENTS=		GDB_STUB
-STATS_DESC=		Statistics collection
-STATS_CONFIGURE_ENABLE=	stats
-SVGALIB_LIB_DEPENDS=	libvga.so:graphics/svgalib
-SVGALIB_CONFIGURE_WITH=	svga
-SVM_DESC=		SVM (AMD: secure virtual machine) emulation
-SVM_CONFIGURE_ENABLE=	svm
-SVM_VARS=		WITH_CPU_LEVEL=6
-SVM_IMPLIES=		X86_64
-TERM_DESC=		Use text only, console based interface
-TERM_CONFIGURE_WITH=	term
-TRACE_LINK_DESC=	Support trace linking speedups
+SMP_DESC=			Support for SMP configurations (CPU level 6)
+SMP_CONFIGURE_ENABLE=		smp
+SMP_VARS=			WITH_CPU_LEVEL=6
+SMP_IMPLIES=			FPU
+SMP_PREVENTS=			GDB_STUB
+STATS_DESC=			Statistics collection
+STATS_CONFIGURE_ENABLE=		stats
+SVGALIB_LIB_DEPENDS=		libvga.so:graphics/svgalib
+SVGALIB_CONFIGURE_WITH=		svga
+SVM_DESC=			SVM (AMD: secure virtual machine) emulation
+SVM_CONFIGURE_ENABLE=		svm
+SVM_VARS=			WITH_CPU_LEVEL=6
+SVM_IMPLIES=			X86_64
+TERM_DESC=			Use text only, console based interface
+TERM_CONFIGURE_WITH=		term
+TRACE_LINK_DESC=		Support trace linking speedups
 TRACE_LINK_CONFIGURE_ENABLE=	trace-linking
-UI_DESC=		User Interface
-USB_DESC=		USB UHCI support
-USB_CONFIGURE_ENABLE=	usb
-USB_IMPLIES=		PCI
-USB_OHCI_DESC=		USB OHCI support
+UI_DESC=			User Interface
+USB_DESC=			USB UHCI support
+USB_CONFIGURE_ENABLE=		usb
+USB_IMPLIES=			PCI
+USB_OHCI_DESC=			USB OHCI support
 USB_OHCI_CONFIGURE_ENABLE=	usb-ohci
-USB_OHCI_IMPLIES=	PCI
-USB_XHCI_DESC=		USB xHCI support (experimental)
+USB_OHCI_IMPLIES=		PCI
+USB_XHCI_DESC=			USB xHCI support (experimental)
 USB_XHCI_CONFIGURE_ENABLE=	usb-xhci
-USB_XHCI_IMPLIES=	PCI
-VMX_DESC=		Virtialization extensions
-VMX_VARS=		WITH_CPU_LEVEL=6
-VMX_IMPLIES=		FPU
-VNCSERVER_DESC=		LibVNCServer support (works with VNC viewer)
-VNCSERVER_LIB_DEPENDS=	libvncserver.so:net/libvncserver
+USB_XHCI_IMPLIES=		PCI
+VMX_DESC=			Virtialization extensions
+VMX_VARS=			WITH_CPU_LEVEL=6
+VMX_IMPLIES=			FPU
+VNCSERVER_DESC=			LibVNCServer support (works with VNC viewer)
+VNCSERVER_LIB_DEPENDS=		libvncserver.so:net/libvncserver
 VNCSERVER_CONFIGURE_WITH=	vncsrv
-VOODOO_DESC=		3dfx Voodoo Graphics emulation
+VOODOO_DESC=			3dfx Voodoo Graphics emulation
 VOODOO_CONFIGURE_ENABLE=	voodoo
-VOODOO_IMPLIES=		PCI
-WXGTK_USES=		compiler:c++11-lib
-WXGTK_USE=		WX=3.0
-WXGTK_CONFIGURE_WITH=	wx
-WXGTK_CXXFLAGS_OFF=	-fno-rtti
-WXGTK_CPPFLAGS=		$$(pkg-config --cflags gdk-2.0)
-WXGTK_IMPLIES=		X11
-X11_USE=		XORG=xrandr
-X11_CONFIGURE_WITH=	x11
-X86_64_DESC=		Support for x86-64 instructions
+VOODOO_IMPLIES=			PCI
+WXGTK_USES=			compiler:c++11-lib
+WXGTK_USE=			WX=3.0
+WXGTK_CONFIGURE_WITH=		wx
+WXGTK_CXXFLAGS_OFF=		-fno-rtti
+WXGTK_CPPFLAGS=			$$(pkg-config --cflags gdk-2.0)
+WXGTK_IMPLIES=			X11
+X11_USE=			XORG=xrandr
+X11_CONFIGURE_WITH=		x11
+X86_64_DESC=			Support for x86-64 instructions
 X86_64_CONFIGURE_ENABLE=	x86-64
-X86_64_VARS=		WITH_CPU_LEVEL=6
-X86_64_IMPLIES=		FPU
-XPM_USE=		XORG=xpm
-XPM_CONFIGURE_ENABLE=	xpm
-XPM_IMPLIES=		X11
+X86_64_VARS=			WITH_CPU_LEVEL=6
+X86_64_IMPLIES=			FPU
+XPM_USE=			XORG=xpm
+XPM_CONFIGURE_ENABLE=		xpm
+XPM_IMPLIES=			X11
 
 .include <bsd.port.options.mk>
 
@@ -216,18 +214,18 @@ IGNORE=		option GAMEPORT requires SB16 or ES1370 soundcard support
 .endif
 
 .if ${PORT_OPTIONS:MVMX} && ${PORT_OPTIONS:MX86_64}
-CONFIGURE_ARGS+=--enable-vmx=2
+CONFIGURE_ARGS+=	--enable-vmx=2
 .endif
 
 .if ${PORT_OPTIONS:MVMX} && empty(PORT_OPTIONS:MX86_64)
-CONFIGURE_ARGS+=--enable-vmx=1
+CONFIGURE_ARGS+=	--enable-vmx=1
 .endif
 
 .if defined(WITH_CPU_LEVEL)
 .if ${WITH_CPU_LEVEL} < 3 || ${WITH_CPU_LEVEL} > 6
 IGNORE=		cannot install: WITH_CPU_LEVEL must be an integer value between 3 and 6
 .endif
-CONFIGURE_ARGS+=--enable-cpu-level=${WITH_CPU_LEVEL}
+CONFIGURE_ARGS+=	--enable-cpu-level=${WITH_CPU_LEVEL}
 .endif
 
 pre-everything::
@@ -256,12 +254,6 @@ post-patch:
 	@${REINPLACE_CMD} -Ee \
 		's|(@GUI_.+FLAGS@)$$|\1 @CPPFLAGS@|' \
 		 ${WRKSRC}/bx_debug/Makefile.in
-	@${REINPLACE_CMD} -e \
-		's|/usr/local/share/bochs|${DATADIR}|; \
-		 s|/usr/local/share/doc/bochs|${DOCSDIR}|' \
-		 ${WRKSRC}/doc/docbook/user/user.dbk ${WRKSRC}/doc/man/*.[15]
-	@${REINPLACE_CMD} -e 's|</usr/include/|<|' \
-		 ${WRKSRC}/gui/svga.cc
 	@${REINPLACE_CMD} -Ee \
 		's|(^LOCAL_CXXFLAGS.+=)|\1 @CPPFLAGS@|; \
 		 s|(-lvgagl)$$|\1 @LDFLAGS@|' \
diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo
index af3f111ac2c9..18b5c3956a30 100644
--- a/emulators/bochs/distinfo
+++ b/emulators/bochs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610828145
-SHA256 (bochs-2.6.11.tar.gz) = 63897b41fbbbdfb1c492d3c4dee1edb4224282a07bbdf442a4a68c19bcc18862
-SIZE (bochs-2.6.11.tar.gz) = 5339730
+TIMESTAMP = 1628530168
+SHA256 (bochs-2.7.tar.gz) = a010ab1bfdc72ac5a08d2e2412cd471c0febd66af1d9349bc0d796879de5b17a
+SIZE (bochs-2.7.tar.gz) = 5298413
diff --git a/emulators/bochs/files/patch-iodev_network_eth__socket.cc b/emulators/bochs/files/patch-iodev_network_eth__socket.cc
deleted file mode 100644
index 72f763a8fe9f..000000000000
--- a/emulators/bochs/files/patch-iodev_network_eth__socket.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- iodev/network/eth_socket.cc.orig	2019-12-09 16:29:23 UTC
-+++ iodev/network/eth_socket.cc
-@@ -95,7 +95,12 @@ extern "C" {
- #include <netinet/in.h>
- #include <net/ethernet.h>
- #include <net/if.h>
-+#if defined(__FreeBSD__)
-+#include <sys/types.h>
-+#else
-+#include <netpacket/packet.h>
- #include <linux/types.h>
-+#endif
- #include <netdb.h>
- #define closesocket(s) close(s)
- typedef int SOCKET;
diff --git a/emulators/bochs/pkg-plist b/emulators/bochs/pkg-plist
index 33b47a641bce..f5e9f51523e3 100644
--- a/emulators/bochs/pkg-plist
+++ b/emulators/bochs/pkg-plist
@@ -8,10 +8,12 @@ man/man5/bochsrc.5.gz
 %%DATADIR%%/BIOS-bochs-latest
 %%DATADIR%%/BIOS-bochs-legacy
 %%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
@@ -28,6 +30,7 @@ man/man5/bochsrc.5.gz
 %%DATADIR%%/keymaps/x11-pc-it.map
 %%DATADIR%%/keymaps/x11-pc-ru.map
 %%DATADIR%%/keymaps/x11-pc-se.map
+%%DATADIR%%/keymaps/x11-pc-sg.map
 %%DATADIR%%/keymaps/x11-pc-si.map
 %%DATADIR%%/keymaps/x11-pc-uk.map
 %%DATADIR%%/keymaps/x11-pc-us.map
@@ -37,7 +40,6 @@ man/man5/bochsrc.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/bochsrc-sample.txt
 %%PORTDOCS%%%%DOCSDIR%%/cpu_configurability.txt
-%%PORTDOCS%%%%DOCSDIR%%/enh_dbg_user_man.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/bxdebugger.html
 %%PORTDOCS%%%%DOCSDIR%%/memory.txt
 %%PORTDOCS%%%%DOCSDIR%%/random.txt