Date: Wed, 26 Sep 2012 02:22:24 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/171992: emulators/bochs: Update to version 2.6 Message-ID: <20120926022224.f1142ca1763dee7485f021b4@yahoo.com> Resent-Message-ID: <201209251810.q8PIAKwQ019478@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 171992
>Category: ports
>Synopsis: emulators/bochs: Update to version 2.6
>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: Tue Sep 25 18:10:20 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Update to version 2.6
New file
files/patch-iodev__network__eth_fbsd.cc
Remove file:
files/patch-iodev-eth_fbsd.cc
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/emulators/bochs/Makefile emulators/bochs/Makefile
--- /usr/ports/emulators/bochs/Makefile 2012-06-08 20:58:48.000000000 +0900
+++ emulators/bochs/Makefile 2012-09-25 03:21:14.000000000 +0900
@@ -1,13 +1,8 @@
-# Ports collection makefile for: bochs
-# Date created: 16 December 1997
-# Whom: alex
-#
+# Created by: alex
# $FreeBSD: ports/emulators/bochs/Makefile,v 1.95 2012/06/08 11:58:48 madpilot Exp $
-#
PORTNAME= bochs
-PORTVERSION= 2.5.1
-PORTREVISION= 1
+PORTVERSION= 2.6
PORTEPOCH= 2
CATEGORIES= emulators
MASTER_SITES= SF
@@ -16,17 +11,21 @@
COMMENT= An IA-32 (x86) PC emulator that runs DOS, Win 95, and more
LICENSE= LGPL21
-LICENSE_FILE= ${WRKSRC}/COPYING
-OPTIONS_DEFINE= A20_PIN ALIGN_CHECK ASSERT_CHECK CDROM CHAINING CLGD54XX CONF_MSRS CPP_SUFX \
- DEBUG DEBUGGER_X86 DISASM DOCS ES1370 FAST_FUNCCALL FPU GAMEPORT IDLE_HACK \
- INSTRUMENT IODEBUG LARGE_RAMFILE LOGGING LONG_PHY_ADDR MISALIGNEDSSE MWAIT NE2000 \
- OPTIMIZATIONS PCI PLUGINS PNIC RAW_SERIAL READLINE REPEAT_SPEED RFB SB16 SDL \
- SHOW_IPS SMP SVGA TERM USB USB_OHCI USB_XHCI VMX WX X11 X86_64 XPM
+OPTIONS_DEFINE= A20_PIN ALIGN_CHECK ASSERT_CHECK \
+ CDROM CHAINING CLGD54XX CONF_MSRS CPP_SUFX \
+ DEBUG DEBUGGER_X86 DISASM DOCS \
+ E1000 ES1370 FAST_FUNCCALL FPU \
+ GAMEPORT IDLE_HACK IODEBUG \
+ LARGE_RAMFILE LOGGING LONG_PHY_ADDR \
+ MISALIGNEDSSE 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
OPTIONS_SINGLE= DEBUG
OPTIONS_SINGLE_DEBUG= DEBUGGER GDB_STUB
-OPTIONS_DEFAULT= A20_PIN ALIGN_CHECK CDROM CONF_MSRS DISASM FPU LOGGING NE2000 \
- OPTIMIZATIONS SB16 X11
+OPTIONS_DEFAULT=A20_PIN ALIGN_CHECK CDROM CONF_MSRS DISASM FPU LOGGING \
+ NE2000 OPTIMIZATIONS SB16 X11
A20_PIN_DESC= Enable support for A20 pin
ALIGN_CHECK_DESC= Enable alignment check support
@@ -40,13 +39,13 @@
DEBUGGER_DESC= Enable debugger support
DEBUGGER_X86_DESC= Enable x86 hardware debugger
DISASM_DESC= Enable disassemler support
+E1000_DESC= Enable Intel(R) Gigabit Ethernet support
ES1370_DESC= Enable ES1370 soundcard support
FAST_FUNCCALL_DESC= Enable fast function calls support (x86 only)
FPU_DESC= Enable FPU emulator
GAMEPORT_DESC= Enable standard PC gameport support
GDB_STUB_DESC= Enable GDB stub support
IDLE_HACK_DESC= Keep Bochs from using all CPU time
-INSTRUMENT_DESC= Enable support for instrumentation
IODEBUG_DESC= Enable I/O interface to debugger
LARGE_RAMFILE_DESC= Enable large ramfile support
LOGGING_DESC= Enable logging
@@ -67,6 +66,7 @@
SHOW_IPS_DESC= Enable logging of measured IPS
SMP_DESC= Enable SMP simulation support (CPU level 6)
SVGA_DESC= Enable SVGAlib support
+SVM_DESC= Enable SVM (AMD: secure virtual machine) emulation
TERM_DESC= Use text only, console based interface
USB_DESC= Enable limited USB UHCI support
USB_OHCI_DESC= Enable limited USB OHCI support
@@ -78,7 +78,7 @@
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ARGS= --disable-docbook
+CONFIGURE_ARGS= --disable-docbook --disable-instrumentation
MAKE_JOBS_SAFE= yes
CFLAGS+= -fno-exceptions -fomit-frame-pointer ${CPPFLAGS}
@@ -94,7 +94,7 @@
.include <bsd.port.options.mk>
-.if !${PORT_OPTIONS:MTERM} && !${PORT_OPTIONS:MWX} && ${PORT_OPTIONS:MX!!}
+.if !${PORT_OPTIONS:MTERM} && !${PORT_OPTIONS:MWX} && !${PORT_OPTIONS:MX11}
CONFIGURE_ARGS+=--with-nogui
.endif
@@ -164,6 +164,18 @@
CONFIGURE_ARGS+=--disable-disasm
.endif
+.if ${PORT_OPTIONS:ME1000}
+CONFIGURE_ARGS+=--enable-e1000
+.else
+CONFIGURE_ARGS+=--disable-e1000
+.endif
+
+.if ${PORT_OPTIONS:MES1370}
+CONFIGURE_ARGS+=--enable-es1370
+.else
+CONFIGURE_ARGS+=--disable-es1370
+.endif
+
.if ${PORT_OPTIONS:MFAST_FUNCCALL}
CONFIGURE_ARGS+=--enable-fast-function-calls
.else
@@ -194,13 +206,6 @@
CONFIGURE_ARGS+=--disable-idle-hack
.endif
-.if ${PORT_OPTIONS:MINSTRUMENT}
-BROKEN= currently unbuildable
-CONFIGURE_ARGS+=--enable-instrumentation
-.else
-CONFIGURE_ARGS+=--disable-instrumentation
-.endif
-
.if ${PORT_OPTIONS:MIODEBUG}
CONFIGURE_ARGS+=--enable-iodebug
.else
@@ -274,6 +279,7 @@
.endif
.if ${PORT_OPTIONS:MREADLINE}
+USE_READLINE= yes
CONFIGURE_ARGS+=--enable-readline
.else
CONFIGURE_ARGS+=--disable-readline
@@ -312,12 +318,22 @@
.endif
.if ${PORT_OPTIONS:MSVGA}
-LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib
+LIB_DEPENDS+= vga:${PORTSDIR}/graphics/svgalib
CONFIGURE_ARGS+=--with-svga
+.else
+CONFIGURE_ARGS+=--without-svga
+.endif
+
+.if ${PORT_OPTIONS:MSVM}
+CONFIGURE_ARGS+=--enable-svm
+.else
+CONFIGURE_ARGS+=--disable-svm
.endif
.if ${PORT_OPTIONS:MTERM}
CONFIGURE_ARGS+=--with-term
+.else
+CONFIGURE_ARGS+=--without-term
.endif
.if ${PORT_OPTIONS:MUSB}
@@ -379,7 +395,7 @@
.endif
.if ${PORT_OPTIONS:MSB16} || ${PORT_OPTIONS:MES1370}
-LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+= asound:${PORTSDIR}/audio/alsa-lib
CONFIGURE_ENV+= SOUND_LINK_OPTS="-L${LOCALBASE}/lib"
.endif
diff -urN /usr/ports/emulators/bochs/distinfo emulators/bochs/distinfo
--- /usr/ports/emulators/bochs/distinfo 2012-01-29 02:50:20.000000000 +0900
+++ emulators/bochs/distinfo 2012-09-03 23:32:49.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (bochs-2.5.1.tar.gz) = 8d3f2ccd8fc3df2aff7ea370afc521cadd4a4f545faf6b0421013453ce3ea26e
-SIZE (bochs-2.5.1.tar.gz) = 4126651
+SHA256 (bochs-2.6.tar.gz) = 65123e44a6d2c1148d741da025d16311b9ccd600ef268b911aba73c67eaf86e1
+SIZE (bochs-2.6.tar.gz) = 4212828
diff -urN /usr/ports/emulators/bochs/files/patch-iodev-eth_fbsd.cc emulators/bochs/files/patch-iodev-eth_fbsd.cc
--- /usr/ports/emulators/bochs/files/patch-iodev-eth_fbsd.cc 2006-11-20 00:09:53.000000000 +0900
+++ emulators/bochs/files/patch-iodev-eth_fbsd.cc 1970-01-01 09:00:00.000000000 +0900
@@ -1,17 +0,0 @@
---- iodev/eth_fbsd.cc.orig Sat Dec 10 19:37:35 2005
-+++ iodev/eth_fbsd.cc Sun Nov 19 15:56:46 2006
-@@ -227,6 +227,14 @@
- return;
- }
-
-+ v = 1;
-+ if (ioctl(this->bpf_fd, BIOCIMMEDIATE, &v) < 0) {
-+ BX_PANIC(("eth_freebsd: could not enable immediate mode"));
-+ close(this->bpf_fd);
-+ this->bpf_fd = -1;
-+ return;
-+ }
-+
- // Set up non-blocking i/o
- v = 1;
- if (ioctl(this->bpf_fd, FIONBIO, &v) < 0) {
diff -urN /usr/ports/emulators/bochs/files/patch-iodev__network__eth_fbsd.cc emulators/bochs/files/patch-iodev__network__eth_fbsd.cc
--- /usr/ports/emulators/bochs/files/patch-iodev__network__eth_fbsd.cc 1970-01-01 09:00:00.000000000 +0900
+++ emulators/bochs/files/patch-iodev__network__eth_fbsd.cc 2012-09-03 23:44:06.000000000 +0900
@@ -0,0 +1,17 @@
+--- iodev/network/eth_fbsd.cc.orig 2012-09-02 20:30:11.000000000 +0900
++++ iodev/network/eth_fbsd.cc 2012-09-03 23:41:03.000000000 +0900
+@@ -235,6 +235,14 @@
+ return;
+ }
+
++ v = 1;
++ if (ioctl(this->bpf_fd, BIOCIMMEDIATE, &v) < 0) {
++ BX_PANIC(("eth_freebsd: could not enable immediate mode"));
++ close(this->bpf_fd);
++ this->bpf_fd = -1;
++ return;
++ }
++
+ // Set up non-blocking i/o
+ v = 1;
+ if (ioctl(this->bpf_fd, FIONBIO, &v) < 0) {
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120926022224.f1142ca1763dee7485f021b4>