Update to 2.5
from Brad
This commit is contained in:
giovanni
parent
13e8687552
commit
2ed965c98b
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.50 2011/03/23 11:27:39 giovanni Exp $
|
||||
# $OpenBSD: Makefile,v 1.51 2011/11/29 17:22:01 giovanni Exp $
|
||||
|
||||
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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
$OpenBSD: patch-Makefile_in,v 1.5 2011/11/29 17:22:01 giovanni Exp $
|
||||
--- 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)
|
||||
|
||||
@ -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
|
||||
$OpenBSD: patch-_bochsrc,v 1.7 2011/11/29 17:22:01 giovanni Exp $
|
||||
--- .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/23 11:27:39 giovanni Exp $
|
||||
|
||||
#=======================================================================
|
||||
# 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/23 11:27:39 giovanni Exp $
|
||||
|
||||
|
||||
#=======================================================================
|
||||
@@ -464,8 +464,8 @@ floppy_bootsig_check: disabled=0
|
||||
@@ -548,8 +548,8 @@ floppy_bootsig_check: disabled=0
|
||||
# log: ./bochs.out
|
||||
# log: /dev/tty
|
||||
#=======================================================================
|
||||
|
||||
@ -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
|
||||
@ -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>
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.19 2009/06/23 16:03:58 pirofti Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.20 2011/11/29 17:22:01 giovanni Exp $
|
||||
@bin bin/bochs
|
||||
@bin bin/bxcommit
|
||||
@bin bin/bximage
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user