upgrade to Bochs 1.4

--
Ok'd by: MAINTAINER
This commit is contained in:
brad 2002-06-09 16:24:57 +00:00
parent 4e6aa3cda9
commit 3a30259853
7 changed files with 47 additions and 33 deletions

View File

@ -1,11 +1,12 @@
# $OpenBSD: Makefile,v 1.23 2002/05/08 17:19:36 todd Exp $
# $OpenBSD: Makefile,v 1.24 2002/06/09 16:24:57 brad Exp $
# $NetBSD: Makefile,v 1.2 1998/09/22 06:11:36 garbled Exp $
COMMENT= "x86 machine simulator"
DISTNAME= bochs-1.2.1
DISTNAME= bochs-1.4
CATEGORIES= emulators
NEED_VERSION= 1.413
MASTER_SITES= http://prdownloads.sourceforge.net/bochs/
NEED_VERSION= 1.525
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bochs/}
HOMEPAGE= http://bochs.sourceforge.net/
@ -16,11 +17,13 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS= --enable-vga \
--enable-fpu --enable-cdrom
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --enable-cdrom \
--enable-fpu \
--enable-ne2000 \
--enable-vga
FLAVORS= debug i386 i486 i686 pci smp net no_x11 term
FLAVORS= debug i386 i486 i686 pci smp no_x11 term
FLAVOR?=
.if ${FLAVOR:L:Mdebug}
@ -54,13 +57,6 @@ CONFIGURE_ARGS+= --enable-pci
CONFIGURE_ARGS+= --enable-processors=2
.endif
.if ${FLAVOR:L:Mnet}
CONFIGURE_ARGS+= --enable-ne2000
.endif
post-extract:
@rm -f ${WRKSRC}/debug/lexer.c
post-configure:
@sed -e 's@!!PREFIX!!@${PREFIX}@' \
< ${WRKSRC}/.bochsrc > ${WRKSRC}/bochsrc
@ -73,8 +69,9 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/bochs/bios
${INSTALL_DATA_DIR} ${PREFIX}/share/bochs/fonts
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bochs
${INSTALL_PROGRAM} ${WRKBUILD}/bochs ${PREFIX}/bin
cd ${WRKBUILD}; ${INSTALL_PROGRAM} bochs bximage ${PREFIX}/bin
cd ${WRKSRC}/bios; ${INSTALL_DATA} ${BIOS} ${PREFIX}/share/bochs/bios
${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${PREFIX}/man/man1
${INSTALL_DATA} ${WRKSRC}/docs-html/*.html ${PREFIX}/share/doc/bochs
${INSTALL_DATA} ${WRKSRC}/docs-html/*.gif ${PREFIX}/share/doc/bochs
${INSTALL_DATA} ${WRKSRC}/font/hercules.bdf ${PREFIX}/share/bochs/fonts

View File

@ -1,3 +1,3 @@
MD5 (bochs-1.2.1.tar.gz) = 306b58465eb289cfe23921678a41ee93
RMD160 (bochs-1.2.1.tar.gz) = 5e3df4ffbcd81e18b022815455913eb9aa99e71e
SHA1 (bochs-1.2.1.tar.gz) = 39780ae55ee92c2b11b95ef1edd3931caeac7c22
MD5 (bochs-1.4.tar.gz) = e8a6ad67f78c63423545806886f8c66a
RMD160 (bochs-1.4.tar.gz) = 1050ef791c4a5b41c3359150d50e4490f61173df
SHA1 (bochs-1.4.tar.gz) = db5f1763c8d048831daad34fa81b0f3b15e5e0a8

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-configure,v 1.3 2002/06/09 16:24:57 brad Exp $
--- configure.orig Mon May 20 16:33:43 2002
+++ configure Mon May 20 16:33:58 2002
@@ -6169,6 +6169,7 @@ else
cat >conftest.$ac_ext <<_ACEOF
#line 6170 "configure"
#include "confdefs.h"
+#include <sys/types.h>
#include <sys/socket.h>
int

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure_in,v 1.3 2001/09/19 20:44:53 todd Exp $
--- configure.in.orig Wed Sep 19 15:27:16 2001
+++ configure.in Wed Sep 19 15:26:41 2001
@@ -450,7 +450,7 @@ if test "$want_readline" = yes; then
if test "$bx_debugger" = 1; then
# only add readline library if debugger is on
AC_DEFINE(HAVE_LIBREADLINE, 1)
- READLINE_LIB='-lreadline'
+ READLINE_LIB='-lreadline -lcurses'
fi
]
)

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-gui_Makefile_in,v 1.3 2002/06/09 16:24:57 brad Exp $
--- gui/Makefile.in.orig Sun Apr 7 15:35:49 2002
+++ gui/Makefile.in Sun Apr 7 15:36:23 2002
@@ -82,6 +82,9 @@ $(BX_GUI_OBJS) : $(BX_INCLUDES)
beos.o: beos.@CPP_SUFFIX@
$(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(BX_INCDIRS) $(BEOS_CFLAGS) $<
+gui.o: gui.@CPP_SUFFIX@
+ $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(BX_INCDIRS) $(X_CFLAGS) $<
+
x.o: x.@CPP_SUFFIX@
$(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(BX_INCDIRS) $(X_CFLAGS) $<

View File

@ -10,7 +10,6 @@ Flavors:
i686 - emulate 486 instruction set
pci - build with support for i440FX PCI chipset
smp - build with support for SMP (2 CPUs)
net - build with support for NE2000 NIC chipset
no_x11 - do not build with X support
term - build with support for textmode terminal environment

View File

@ -1,5 +1,10 @@
@comment $OpenBSD: PLIST,v 1.8 2001/06/13 16:12:50 todd Exp $
@comment $OpenBSD: PLIST,v 1.9 2002/06/09 16:24:57 brad Exp $
bin/bochs
bin/bximage
man/man1/bochs-dlx.1
man/man1/bochs.1
man/man1/bochsrc.1
man/man1/bximage.1
share/bochs/bios/BIOS-bochs-2-processors
share/bochs/bios/BIOS-bochs-4-processors
share/bochs/bios/BIOS-bochs-latest
@ -29,6 +34,7 @@ share/doc/bochs/guestNT.html
share/doc/bochs/index.html
share/doc/bochs/install.html
share/doc/bochs/instrumentation.html
share/doc/bochs/iodebug.html
share/doc/bochs/mtools.html
share/doc/bochs/smp-simulation.html
share/doc/bochs/sound.html