>Number: 178035
>Category: ports
>Synopsis: emulators/bochs: Update to version 2.6.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Apr 21 18:10:03 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.4-RELEASE-p11 i386
>Organization:
>Environment:
>Description:
- Update to version 2.6.1
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/emulators/bochs/Makefile emulators/bochs/Makefile
--- /usr/ports/emulators/bochs/Makefile 2012-12-11 22:48:03.000000000 +0900
+++ emulators/bochs/Makefile 2013-04-19 22:41:05.000000000 +0900
@@ -2,7 +2,7 @@
# $FreeBSD: head/emulators/bochs/Makefile 308686 2012-12-11 13:05:40Z bapt $
PORTNAME= bochs
-PORTVERSION= 2.6
+PORTVERSION= 2.6.1
PORTEPOCH= 2
CATEGORIES= emulators
MASTER_SITES= SF
@@ -18,10 +18,10 @@
E1000 ES1370 FAST_FUNCCALL FPU \
GAMEPORT IDLE_HACK IODEBUG \
LARGE_RAMFILE LOGGING LONG_PHY_ADDR \
- MISALIGNEDSSE MWAIT NE2000 OPTIMIZATIONS PCI PLUGINS PNIC \
+ MWAIT NE2000 OPTIMIZATIONS PCI PLUGINS PNIC \
RAW_SERIAL READLINE REPEAT_SPEED RFB \
SB16 SDL SHOW_IPS SMP SVGA SVM TERM USB USB_OHCI USB_XHCI \
- VMX WX X11 X86_64 XPM
+ VMX VOODOO WXGTK X11 X86_64 XPM
OPTIONS_RADIO= DEBUG
OPTIONS_RADIO_DEBUG= DEBUGGER GDB_STUB
OPTIONS_DEFAULT=A20_PIN ALIGN_CHECK CDROM CONF_MSRS DISASM FPU LOGGING \
@@ -50,7 +50,6 @@
LARGE_RAMFILE_DESC= Enable large ramfile support
LOGGING_DESC= Enable logging
LONG_PHY_ADDR_DESC= Enable support for physical address >= 32bit
-MISALIGNEDSSE_DESC= Enable misaligned SSE support
MWAIT_DESC= Enable experimental MONITOR/MWAIT support
NE2000_DESC= Enable limited ne2000 support
OPTIMIZATIONS_DESC= Enable all safe speed optimizations
@@ -72,7 +71,7 @@
USB_OHCI_DESC= Enable limited USB OHCI support
USB_XHCI_DESC= Enable limited USB xHCI support
VMX_DESC= Enable Virtialization extensions
-WX_DESC= Use WxWidgets display interface
+VOODOO_DESC= Enable 3dfx Voodoo Graphics emulation
X86_64_DESC= Enable AMD x86-64 support
XPM_DESC= Enable XPM library support
@@ -94,7 +93,7 @@
.include <bsd.port.options.mk>
-.if empty(PORT_OPTIONS:MTERM) && empty(PORT_OPTIONS:MWX) && empty(PORT_OPTIONS:MX11)
+.if empty(PORT_OPTIONS:MTERM) && empty(PORT_OPTIONS:MWXGTK) && empty(PORT_OPTIONS:MX11)
CONFIGURE_ARGS+=--with-nogui
.endif
@@ -186,6 +185,7 @@
CONFIGURE_ARGS+=--enable-fpu
.else
CONFIGURE_ARGS+=--disable-fpu
+WITH_CPU_LEVEL= 3
.endif
.if ${PORT_OPTIONS:MGAMEPORT}
@@ -230,12 +230,6 @@
CONFIGURE_ARGS+=--disable-long-phy-address
.endif
-.if ${PORT_OPTIONS:MMISALIGNEDSSE}
-CONFIGURE_ARGS+=--enable-misaligned-sse
-.else
-CONFIGURE_ARGS+=--disable-misaligned-sse
-.endif
-
.if ${PORT_OPTIONS:MMWAIT}
CONFIGURE_ARGS+=--enable-monitor-mwait
.else
@@ -361,9 +355,14 @@
CONFIGURE_ARGS+=--disable-vmx
.endif
-.if ${PORT_OPTIONS:MWX}
+.if ${PORT_OPTIONS:MVOODOO}
+CONFIGURE_ARGS+=--enable-voodoo
+.else
+CONFIGURE_ARGS+=--disable-voodoo
+.endif
+
+.if ${PORT_OPTIONS:MWXGTK}
USE_WX= 2.4+
-CONFIGURE_ENV= WX_CONFIG="${WX_CONFIG}"
CONFIGURE_ARGS+=--with-wx
.else
CONFIGURE_ARGS+=--disable-debugger-gui
@@ -376,6 +375,7 @@
.if ${PORT_OPTIONS:MX86_64}
CONFIGURE_ARGS+=--enable-x86-64
+WITH_CPU_LEVEL= 6
.else
CONFIGURE_ARGS+=--disable-x86-64
.endif
@@ -403,6 +403,10 @@
IGNORE= GDB_STUB is incompatible with multiprocessor
.endif
+.if empty(PORT_OPTIONS:MPCI) && ${PORT_OPTIONS:MVOODOO}
+IGNORE= 3dfx Voodoo Graphics emulation requires PCI support
+.endif
+
pre-everything::
.if !defined(WITH_CPU_LEVEL)
@${ECHO_CMD}
diff -urN /usr/ports/emulators/bochs/distinfo emulators/bochs/distinfo
--- /usr/ports/emulators/bochs/distinfo 2012-11-08 10:16:50.000000000 +0900
+++ emulators/bochs/distinfo 2013-04-19 19:17:38.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (bochs-2.6.tar.gz) = 65123e44a6d2c1148d741da025d16311b9ccd600ef268b911aba73c67eaf86e1
-SIZE (bochs-2.6.tar.gz) = 4212828
+SHA256 (bochs-2.6.1.tar.gz) = cbc565f644adb80aae9565b6c0a355394b8e554d5d30282ad41c63201334261a
+SIZE (bochs-2.6.1.tar.gz) = 4309970
>Release-Note:
>Audit-Trail:
>Unformatted: