summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--emulators/bochs/Makefile9
-rw-r--r--emulators/bochs/PLIST6
-rw-r--r--emulators/bochs/distinfo9
-rw-r--r--emulators/bochs/patches/patch-aa46
-rw-r--r--emulators/bochs/patches/patch-ac16
5 files changed, 35 insertions, 51 deletions
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index c4c1dc7c1c1..716be405401 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2001/12/13 18:03:52 fredb Exp $
+# $NetBSD: Makefile,v 1.17 2002/05/13 14:12:03 fredb Exp $
-DISTNAME= bochs-1.3
+DISTNAME= bochs-1.4
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bochs/}
@@ -14,6 +14,7 @@ USE_GMAKE= yes
# performance. The number of processors can be either 1 (default), 2, or 4.
#CONFIGURE_ARGS+= --enable-debugger --enable-disasm
#CONFIGURE_ARGS+= --enable-processors=2
+CONFIGURE_ENV+= CXXFLAGS=-I${X11BASE}/include
USE_X11= yes
BOCHS_MAINDIR= ${PREFIX}/share/bochs
@@ -35,8 +36,8 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/bios/BIOS-bochs-latest ${BOCHS_BIOSDIR}
${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-elpin-2.40 ${BOCHS_BIOSDIR}
${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-elpin-LICENSE ${BOCHS_BIOSDIR}
- ${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-cbothamy-0.2a ${BOCHS_BIOSDIR}
- ${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-cbothamy-0.2a-README ${BOCHS_BIOSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-lgpl-0.3a ${BOCHS_BIOSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-lgpl-README ${BOCHS_BIOSDIR}
${INSTALL_DATA_DIR} ${BOCHS_DOCDIR}
${INSTALL_DATA} ${WRKSRC}/docs-html/00README ${BOCHS_DOCDIR}
${INSTALL_DATA} ${WRKSRC}/docs-html/*.gif ${BOCHS_DOCDIR}
diff --git a/emulators/bochs/PLIST b/emulators/bochs/PLIST
index d0d6df471d1..d980bec07b1 100644
--- a/emulators/bochs/PLIST
+++ b/emulators/bochs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/12/13 18:03:52 fredb Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/05/13 14:12:03 fredb Exp $
bin/bochs
share/doc/html/bochs/00README
share/doc/html/bochs/3rdparty.license.html
@@ -31,8 +31,8 @@ share/doc/html/bochs/win32.html
share/bochs/bios/BIOS-bochs-2-processors
share/bochs/bios/BIOS-bochs-4-processors
share/bochs/bios/BIOS-bochs-latest
-share/bochs/bios/VGABIOS-cbothamy-0.2a
-share/bochs/bios/VGABIOS-cbothamy-0.2a-README
+share/bochs/bios/VGABIOS-lgpl-0.3a
+share/bochs/bios/VGABIOS-lgpl-README
share/bochs/bios/VGABIOS-elpin-2.40
share/bochs/bios/VGABIOS-elpin-LICENSE
share/bochs/xfonts/fonts.dir
diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo
index 83ea4f6a084..b20bd88cc4b 100644
--- a/emulators/bochs/distinfo
+++ b/emulators/bochs/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.5 2001/12/13 18:03:52 fredb Exp $
+$NetBSD: distinfo,v 1.6 2002/05/13 14:12:03 fredb Exp $
-SHA1 (bochs-1.3.tar.gz) = cbec3868d6f99d0813c3d82344967647d498339f
-Size (bochs-1.3.tar.gz) = 1147490 bytes
-SHA1 (patch-aa) = d97c2b6e814d876e9cf164b5977ee4608bed4305
+SHA1 (bochs-1.4.tar.gz) = db5f1763c8d048831daad34fa81b0f3b15e5e0a8
+Size (bochs-1.4.tar.gz) = 1389919 bytes
+SHA1 (patch-aa) = a7fdb6c2e4d4f13a80ea44b0c857d5cf52f6d2c6
SHA1 (patch-ab) = 340261dc14c65626b44abd2f7665cf2a87b233b4
-SHA1 (patch-ac) = 1dab10b3236022a41e529a9244bd23943094df56
SHA1 (patch-ae) = 05b4d7663735594f427a236428d6cea9510c080e
diff --git a/emulators/bochs/patches/patch-aa b/emulators/bochs/patches/patch-aa
index af0f8853335..450625e3910 100644
--- a/emulators/bochs/patches/patch-aa
+++ b/emulators/bochs/patches/patch-aa
@@ -1,41 +1,41 @@
-$NetBSD: patch-aa,v 1.5 2001/12/13 18:03:53 fredb Exp $
+$NetBSD: patch-aa,v 1.6 2002/05/13 14:12:04 fredb Exp $
---- .bochsrc.orig Mon Nov 19 08:36:26 2001
+--- .bochsrc.orig Thu Mar 28 01:49:52 2002
+++ .bochsrc
-@@ -9,10 +9,11 @@
+@@ -9,9 +9,9 @@
# directory, named BIOS-bochs-yymmdd. Use the latest one in there.
#=======================================================================
#romimage: bios/BIOS-bochs-970717a
-romimage: file=bios/BIOS-bochs-latest, address=0xf0000
-+#romimage: file=bios/BIOS-bochs-latest, address=0xf0000
- #romimage: file=bios/BIOS-bochs-2-processors, address=0xf0000
- #romimage: file=bios/BIOS-bochs-4-processors, address=0xf0000
- #romimage: file=bios/rombios.bin, address=0xf0000
+-#romimage: file=bios/BIOS-bochs-2-processors, address=0xf0000
+-#romimage: file=bios/BIOS-bochs-4-processors, address=0xf0000
+romimage: file=XXXPREFIXXXX/share/bochs/bios/BIOS-bochs-latest, address=0xf0000
++#romimage: file=XXXPREFIXXXX/share/bios/BIOS-bochs-2-processors, address=0xf0000
++#romimage: file=XXXPREFIXXXX/share/bios/BIOS-bochs-4-processors, address=0xf0000
+ #romimage: file=bios/rombios.bin, address=0xf0000
#=======================================================================
- # MEGS
-@@ -33,7 +34,8 @@
+@@ -32,8 +32,8 @@
+ # VGAROMIMAGE
# You now need to load a VGA ROM BIOS into C0000.
#=======================================================================
- #vgaromimage: bios/VGABIOS-cbothamy-0.2a
+-#vgaromimage: bios/VGABIOS-lgpl-0.3a
-vgaromimage: bios/VGABIOS-elpin-2.40
-+#vgaromimage: bios/VGABIOS-elpin-2.40
++#vgaromimage: XXXPREFIXXXX/share/bios/VGABIOS-lgpl-0.3a
+vgaromimage: XXXPREFIXXXX/share/bochs/bios/VGABIOS-elpin-2.40
#=======================================================================
# FLOPPYA:
-@@ -57,7 +59,8 @@
- #floppya: file=../1.44, status=ejected
- #floppya: 1_44=/dev/fd0H1440, status=ejected
- #floppya: 1_2=../1_2, status=ejected
--floppya: 1_44=a.img, status=inserted
-+#floppya: 1_44=a.img, status=inserted
-+floppya: 1_44=/dev/rfd0a, status=inserted
-
+@@ -52,7 +52,7 @@
+ # drive letters such as a: or b: as the path. Raw floppy access is not
+ # supported on Windows 95 and 98.
#=======================================================================
- # FLOPPYB:
-@@ -78,7 +81,7 @@
+-floppya: 1_44=/dev/fd0, status=inserted
++floppya: 1_44=/dev/rfd0a, status=inserted
+ #floppya: file=../1.44, status=inserted
+ #floppya: 1_44=/dev/fd0H1440, status=inserted
+ #floppya: 1_2=../1_2, status=inserted
+@@ -84,7 +84,7 @@
# diskc: file=112M.sample, cyl=900, heads=15, spt=17
# diskc: file=483M.sample, cyl=1024, heads=15, spt=63
#=======================================================================
@@ -44,9 +44,9 @@ $NetBSD: patch-aa,v 1.5 2001/12/13 18:03:53 fredb Exp $
#=======================================================================
# DISKD:
-@@ -109,8 +112,8 @@
- # boot: c
+@@ -125,8 +125,8 @@
# boot: a
+ # boot: cdrom
#=======================================================================
-#boot: a
-boot: c
diff --git a/emulators/bochs/patches/patch-ac b/emulators/bochs/patches/patch-ac
deleted file mode 100644
index 56b80285400..00000000000
--- a/emulators/bochs/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2001/12/13 18:03:53 fredb Exp $
-
---- iodev/keyboard.cc.orig Sat Dec 8 08:02:57 2001
-+++ iodev/keyboard.cc
-@@ -973,6 +973,11 @@
- kbd_enQ(0xEE); // return same byte (EEh) as echo diagnostic
- return;
- break;
-+
-+ case 0xf0: // set scancode - let OS time out
-+ //bx_printf("KBD: set scancode command received\n");
-+ return;
-+ break;
-
- case 0xf2: // identify keyboard
- BX_INFO(("identify keyboard command received"));
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 21:32:08 +0000