On Sun, Nov 27, 2011 at 10:46:56PM -0500, Brad wrote:
> An update to Bochs 2.5.
>
> Tested on amd64.
An updated diff removing a CONFIGURE_ARGS option I didn't
mean to leave in.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/emulators/bochs/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- Makefile 23 Mar 2011 11:27:39 -0000 1.50
+++ Makefile 28 Nov 2011 23:02:42 -0000
@@ -2,7 +2,7 @@
COMMENT= x86 machine simulator
-DISTNAME= bochs-2.4.6
+DISTNAME= bochs-2.5
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bochs/}
@@ -13,38 +13,39 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
+
WANTLIB= c m stdc++ termlib
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --enable-acpi \
- --enable-all-optimizations \
- --enable-fpu \
- --enable-ne2000 \
- --enable-pci \
- --enable-smp \
- --enable-x86-64 \
- --enable-usb \
- --enable-usb-ohci \
- --with-term
+CONFIGURE_ARGS= --enable-all-optimizations \
+ --enable-avx \
+ --enable-large-ramfile \
+ --enable-ne2000 \
+ --enable-pci \
+ --enable-smp \
+ --enable-x86-64 \
+ --enable-usb \
+ --enable-usb-ohci \
+ --enable-vmx=2 \
+ --with-term
FLAVORS= debug no_x11
FLAVOR?=
.if ${FLAVOR:L:Mdebug}
-CONFIGURE_ARGS+= --disable-debugger-gui \
- --enable-debugger \
- --enable-x86-debugger \
- --enable-readline
+CONFIGURE_ARGS+=--disable-debugger-gui \
+ --enable-debugger \
+ --enable-x86-debugger \
+ --enable-readline
WANTLIB+= curses readline
.endif
.if ${FLAVOR:L:Mno_x11}
-CONFIGURE_ARGS+= --with-nogui
+CONFIGURE_ARGS+=--with-nogui
.else
-CONFIGURE_ARGS+= --with-x11
-WANTLIB+= ICE SM X11 Xau Xdmcp Xext Xpm Xrandr Xrender \
- pthread-stubs xcb
+CONFIGURE_ARGS+=--with-x11
+WANTLIB+= ICE SM X11 Xext Xpm Xrandr Xrender xcb
.endif
NO_REGRESS= Yes
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/emulators/bochs/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo 23 Mar 2011 11:27:39 -0000 1.15
+++ distinfo 28 Nov 2011 02:55:27 -0000
@@ -1,5 +1,5 @@
-MD5 (bochs-2.4.6.tar.gz) = QTggvCsf8rChu+5O0e11Zw==
-RMD160 (bochs-2.4.6.tar.gz) = 2Zp1HmZeM2QJLgXWhTwLlXYOXX4=
-SHA1 (bochs-2.4.6.tar.gz) = 623Ih84PVoYTAe62Eyh4KoJ17I4=
-SHA256 (bochs-2.4.6.tar.gz) = aJ3MX8z9cMg0ClSYbwy5woJACe1gJxiAKGgzPamsU7k=
-SIZE (bochs-2.4.6.tar.gz) = 4067147
+MD5 (bochs-2.5.tar.gz) = 80zLdWo4w9Xs+eM5BoeWew==
+RMD160 (bochs-2.5.tar.gz) = 7U8J9/zOPHg4Hf+29djGAXaIwwI=
+SHA1 (bochs-2.5.tar.gz) = zxK9F++0Af4rZzhelLQiOJi9iP8=
+SHA256 (bochs-2.5.tar.gz) = pkSpq1lnglKhkt5uU+REcgozYMHcEsvAkHs2/NVbI0s=
+SIZE (bochs-2.5.tar.gz) = 4117999
Index: patches/patch-Makefile_in
===================================================================
RCS file: /home/cvs/ports/emulators/bochs/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 8 Jul 2010 15:40:11 -0000 1.4
+++ patches/patch-Makefile_in 28 Nov 2011 02:56:06 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.4 2010/07/08 15:40:11 giovanni Exp $
---- Makefile.in.orig Fri Feb 26 09:18:18 2010
-+++ Makefile.in Fri Jun 18 18:49:22 2010
-@@ -385,8 +385,8 @@ install_docbook: build_docbook
+--- Makefile.in.orig Sun Nov 27 11:12:35 2011
++++ Makefile.in Sun Nov 27 21:55:47 2011
+@@ -392,8 +392,8 @@ install_docbook: build_docbook
install_man::
-mkdir -p $(DESTDIR)$(man1dir)
-mkdir -p $(DESTDIR)$(man5dir)
Index: patches/patch-_bochsrc
===================================================================
RCS file: /home/cvs/ports/emulators/bochs/patches/patch-_bochsrc,v
retrieving revision 1.6
diff -u -p -r1.6 patch-_bochsrc
--- patches/patch-_bochsrc 23 Mar 2011 11:27:39 -0000 1.6
+++ patches/patch-_bochsrc 28 Nov 2011 02:56:03 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-_bochsrc,v 1.6 2011/03/23 11:27:39 giovanni Exp $
---- .bochsrc.orig Sat Feb 12 09:00:34 2011
-+++ .bochsrc Mon Feb 28 22:11:24 2011
-@@ -295,13 +295,13 @@ vga: extension=vbe
+--- .bochsrc.orig Sun Nov 27 11:12:35 2011
++++ .bochsrc Sun Nov 27 21:55:47 2011
+@@ -379,13 +379,13 @@ vgaromimage: file=$BXSHARE/VGABIOS-lgpl-latest
# The optional parameter 'write_protected' can be used to control the media
# write protect switch. By default it is turned off.
#=======================================================================
@@ -17,7 +17,7 @@ $OpenBSD: patch-_bochsrc,v 1.6 2011/03/2
#=======================================================================
# FLOPPYB:
-@@ -440,7 +440,7 @@ boot: disk
+@@ -524,7 +524,7 @@ boot: disk
#
# Default value are sync=none, time0=local
#=======================================================================
@@ -26,7 +26,7 @@ $OpenBSD: patch-_bochsrc,v 1.6 2011/03/2
#=======================================================================
-@@ -464,8 +464,8 @@ floppy_bootsig_check: disabled=0
+@@ -548,8 +548,8 @@ floppy_bootsig_check: disabled=0
# log: ./bochs.out
# log: /dev/tty
#=======================================================================
Index: patches/patch-iodev_cdrom_cc
===================================================================
RCS file: patches/patch-iodev_cdrom_cc
diff -N patches/patch-iodev_cdrom_cc
--- patches/patch-iodev_cdrom_cc 8 Jul 2010 15:40:11 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-iodev_cdrom_cc,v 1.4 2010/07/08 15:40:11 giovanni Exp $
---- iodev/cdrom.cc.orig Fri Dec 4 14:50:26 2009
-+++ iodev/cdrom.cc Fri Jun 18 18:49:22 2010
-@@ -91,6 +91,9 @@ extern "C" {
- #include <sys/param.h>
- #include <sys/file.h>
- #include <sys/cdio.h>
-+#if defined(__OpenBSD__)
-+#include <sys/dkio.h>
-+#endif
- #include <sys/ioctl.h>
- #include <sys/disklabel.h>
- // ntohl(x) et al have been moved out of sys/param.h in FreeBSD 5
Index: patches/patch-iodev_serial_cc
===================================================================
RCS file: patches/patch-iodev_serial_cc
diff -N patches/patch-iodev_serial_cc
--- patches/patch-iodev_serial_cc 23 Mar 2011 11:27:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-iodev_serial_cc,v 1.1 2011/03/23 11:27:39 giovanni Exp $
---- iodev/serial.cc.orig Mon Feb 28 22:18:50 2011
-+++ iodev/serial.cc Mon Feb 28 22:20:00 2011
-@@ -31,6 +31,7 @@
- #define BX_PLUGGABLE
-
- #ifndef WIN32
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <netdb.h>
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/emulators/bochs/pkg/PLIST,v
retrieving revision 1.19
diff -u -p -r1.19 PLIST
--- pkg/PLIST 23 Jun 2009 16:03:58 -0000 1.19
+++ pkg/PLIST 28 Nov 2011 03:09:34 -0000
@@ -37,4 +37,4 @@ share/doc/bochs/
@comment share/doc/bochs/COPYING
share/doc/bochs/README
@comment share/doc/bochs/TODO
-share/doc/bochs/cosimulation.html
+share/doc/bochs/bxdebugger.html
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
