Updated to version 1.1.2 (bugfix3, 2001-05-16)

- updated Elpin VGA BIOS to version 2.40, and changed pointer in .bochsrc
- fixed .conf.x86 script so that it uses c++ instead of egcs for C++ files
- now Makefile targets that recurse into subdirectories use double colons,
  so that it will always recurse into subdirectories.  Now a single make
  command should notice a modified source file in a subdir.
- fixed bug in bx_panic.  If BX_PANIC_IS_FATAL==0 and a (non-fatal) panic
  occurs, it used to call bx_atexit() and then return.  It should never
  call bx_atexit, which starts to shut down the simulator, unless it's
  really going to quit!
- support 2.88 MB floppy disks
- since dataseghack is checked in as non-executable, invoke it with
  "csh dataseghack"
- double fault patch from Thomas Petazzoni <thomas.petazzoni@ifrance.com>,
  sourceforge patch #423726.
- removed -fno-builtin from fpu makefiles
- redefine u_char, u_short, etc. in order to not conflict with system
  definitions of these same types.
- in cdrom.cc, remove the extern "C" { } structure around some of the
  header files.  This is no longer necessary.
- do not panic on hard disk command 0x1f2 (read sector count)
- in keyboard.cc:
  - apply Todd Fries' reset patch
  - recognize most of the "Grey" insert/delete/home/end/etc. keys the
    same as keypad keys.
  - removed panic on "kbd_ctrl_to_kbd(): got value of 0x??"
  - implement mouse command 0xf6 (set defaults)
- apply Suboner@aol.com's Xwindows timing patch from
  http://sourceforge.net/tracker/index.php?func=detail&aid=418730&group_id=12580
&atid=312580
- remove all patches from patches subdir which have already been applied.
  The remaining ones are under consideration but not applied.

9 files changed, 25 insertions, 87 deletions

diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 04291686b07..7dee847f051 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2001/05/15 22:43:25 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2001/05/25 23:01:30 kei Exp $
 
-DISTNAME=		bochs-bugfix-20010409-beta
-PKGNAME=		bochs-2001.04.09
-WRKSRC=			${WRKDIR}/bochs
+DISTNAME=		bochs-1.1.2
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bochs/}
 
@@ -30,7 +28,8 @@ post-configure:
 do-install:
 	${INSTALL_DATA_DIR} ${BOCHS_BIOSDIR}
 	${INSTALL_DATA} ${WRKSRC}/bios/BIOS-bochs-990925a ${BOCHS_BIOSDIR}
-	${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-elpin-2.20 ${BOCHS_BIOSDIR}
+	${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-elpin-2.40 ${BOCHS_BIOSDIR}
+	${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-elpin-LICENSE ${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/distinfo b/emulators/bochs/distinfo
index 6573eee8fdb..510e90463ab 100644
--- a/emulators/bochs/distinfo
+++ b/emulators/bochs/distinfo
@@ -1,12 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/05/15 22:43:25 wiz Exp $
+$NetBSD: distinfo,v 1.4 2001/05/25 23:01:31 kei Exp $
 
-SHA1 (bochs-bugfix-20010409-beta.tar.gz) = 7b683cb96e9da177f6253f987cd7bb1a2e412b66
-Size (bochs-bugfix-20010409-beta.tar.gz) = 760497 bytes
-SHA1 (patch-aa) = 20076cf0122711d8abece4697c1fb0ef9d813581
+SHA1 (bochs-1.1.2.tar.gz) = 61b57a87e1103ad5d7c3b620b90113b03dea0893
+Size (bochs-1.1.2.tar.gz) = 770209 bytes
+SHA1 (patch-aa) = d070edc574e3c658e720740cbab5bcadc86c9c83
 SHA1 (patch-ab) = 340261dc14c65626b44abd2f7665cf2a87b233b4
-SHA1 (patch-ac) = 78f8210b9178387da527fd619dc5dfb417d53ec8
-SHA1 (patch-ad) = a5d7ad9fcc4dc3f3f2fccf59bd8853ea94787686
+SHA1 (patch-ac) = f6fd1486756c3d29d37215aa9909059083637843
 SHA1 (patch-ae) = 8ff913377fbc95cb1c2edc133e625d48a47f6900
-SHA1 (patch-af) = 15cea9387f33625b435d5b98dba82d01ec056649
-SHA1 (patch-ag) = 68fcc65439262ea89de8074cca3775d8d703edfb
-SHA1 (patch-ah) = e9e07f99fccce65feb648c54d6b9c0cc6400decf
diff --git a/emulators/bochs/patches/patch-aa b/emulators/bochs/patches/patch-aa
index 7fa686c814c..810df798ffc 100644
--- a/emulators/bochs/patches/patch-aa
+++ b/emulators/bochs/patches/patch-aa
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.3 2000/01/31 21:18:44 drochner Exp $
+$NetBSD: patch-aa,v 1.4 2001/05/25 23:01:31 kei Exp $
 
---- .bochsrc.orig	Tue Nov  2 02:17:08 1999
-+++ .bochsrc	Sat Jan 29 21:43:48 2000
+--- .bochsrc.orig	Wed May 16 15:25:21 2001
++++ .bochsrc	Fri May 25 15:45:28 2001
 @@ -2,8 +2,8 @@
  megs: 32
  #megs: 16
  #megs: 8
 -boot: c
--vgaromimage: bios/VGABIOS-elpin-2.20
+-vgaromimage: bios/VGABIOS-elpin-2.40
 +boot: a
-+vgaromimage: XXXPREFIXXXX/share/bochs/bios/VGABIOS-elpin-2.20
++vgaromimage: XXXPREFIXXXX/share/bochs/bios/VGABIOS-elpin-2.40
  
  # You many now use double quotes around pathnames, in case
  # your pathname includes spaces.
diff --git a/emulators/bochs/patches/patch-ac b/emulators/bochs/patches/patch-ac
index 9f3d7ad964a..ac0d9b08e66 100644
--- a/emulators/bochs/patches/patch-ac
+++ b/emulators/bochs/patches/patch-ac
@@ -1,15 +1,16 @@
-$NetBSD: patch-ac,v 1.1 1999/10/25 16:05:38 drochner Exp $
---- iodev/keyboard.cc.orig	Sun Oct 24 00:17:37 1999
-+++ iodev/keyboard.cc	Sun Oct 24 00:18:02 1999
-@@ -972,6 +972,11 @@
+$NetBSD: patch-ac,v 1.2 2001/05/25 23:01:31 kei Exp $
+
+--- iodev/keyboard.cc.orig	Wed May 16 15:54:39 2001
++++ iodev/keyboard.cc	Fri May 25 15:50:39 2001
+@@ -954,6 +954,11 @@
        return;
        break;
  
-+    case 0xf0: // set scancode - let OS time out
++    case 0xf0:  // set scancode - let OS time out
 +      bx_printf("KBD: set scancode command received\n");
 +      return;
 +      break;
 +
      case 0xf2:  // identify keyboard
-       bx_printf("KBD: indentify keyboard command received\n");
+       bx_printf("KBD: identify keyboard command received\n");
        kbd_enQ(0xFA); // AT sends ACK, MFII sends ACK+ABh+41h
diff --git a/emulators/bochs/patches/patch-ad b/emulators/bochs/patches/patch-ad
deleted file mode 100644
index 760f0bc33ed..00000000000
--- a/emulators/bochs/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.1 1999/10/25 16:05:38 drochner Exp $
---- iodev/harddrv.cc.orig	Sun Oct 24 00:17:53 1999
-+++ iodev/harddrv.cc	Sun Oct 24 00:18:09 1999
-@@ -492,7 +492,10 @@
-         value8 = BX_SELECTED_CONTROLLER.sector_count;
-         goto return_value8;
-         }
--      bx_panic("disk: IO read(0x1f2): current command not read/write\n");
-+      bx_printf("disk: IO read(0x1f2): current command not read/write (%x)\n",
-+	BX_SELECTED_CONTROLLER.current_command);
-+      value8 = 0xff;
-+      goto return_value8;
-       break;
- 
-     case 0x1f3: // sector number
diff --git a/emulators/bochs/patches/patch-af b/emulators/bochs/patches/patch-af
deleted file mode 100644
index ec882551e1d..00000000000
--- a/emulators/bochs/patches/patch-af
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-af,v 1.1 2000/09/01 14:50:45 fvdl Exp $
-
---- main.cc.orig	Tue Jan  4 21:28:26 2000
-+++ main.cc	Fri Sep  1 16:01:16 2000
-@@ -447,8 +447,12 @@
-       if (!strncmp(params[i], "1_44=", 5)) {
-         strcpy(bx_options.floppya.path, &params[i][5]);
-         bx_options.floppya.type = BX_FLOPPY_1_44;
-         }
-+      else if (!strncmp(params[i], "2_88=", 5)) {
-+        strcpy(bx_options.floppya.path, &params[i][5]);
-+        bx_options.floppya.type = BX_FLOPPY_2_88;
-+        }
-       else if (!strncmp(params[i], "1_2=", 4)) {
-         strcpy(bx_options.floppya.path, &params[i][4]);
-         bx_options.floppya.type = BX_FLOPPY_1_2;
-         }
diff --git a/emulators/bochs/patches/patch-ag b/emulators/bochs/patches/patch-ag
deleted file mode 100644
index e9df704e2a5..00000000000
--- a/emulators/bochs/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2000/12/14 14:39:45 kei Exp $
-
---- docs-html/index.html.orig	Wed Dec  6 01:30:21 2000
-+++ docs-html/index.html	Wed Dec  6 01:30:43 2000
-@@ -26,7 +26,7 @@
- <br><A HREF="whatisbochs.html">What is Bochs</A>
- <br><A HREF="faq.html#license">Licensing</A>
- <br><A HREF="developers.html">Developers email-list</A>
--<br><A HREF="ftp://bochs.com/pub/">FTP site</A>
-+<br><A HREF="ftp://bochs.com/bochs/">FTP site</A>
- <br><A HREF="install.html">Compile/Install</A>
- <br><A HREF="configure.html">Using ./configure and it's options</A>
- <br><A HREF="whatisbochs.html#Platforms">Platforms</A>
diff --git a/emulators/bochs/patches/patch-ah b/emulators/bochs/patches/patch-ah
deleted file mode 100644
index cf57279c1c4..00000000000
--- a/emulators/bochs/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2000/12/14 14:39:45 kei Exp $
-
---- docs-html/install.html.orig	Wed Dec  6 01:30:26 2000
-+++ docs-html/install.html	Wed Dec  6 01:30:49 2000
-@@ -35,7 +35,7 @@
- <A NAME="Getting current source code"></A>Getting current source code
- </H2>
- Source code for Bochs, is available via anonymous FTP at
--<A HREF="ftp://bochs.com/pub/">ftp://bochs.com/pub/</A>.
-+<A HREF="ftp://bochs.com/bochs/">ftp://bochs.com/bochs/</A>.
- Release names are of the format bochs-YYMMDD.tar.gz.  Log in as <I>anonymous</I>
- and use your email as the password.
- 
diff --git a/emulators/bochs/pkg/PLIST b/emulators/bochs/pkg/PLIST
index 78079e0f10a..1e91c9d6a44 100644
--- a/emulators/bochs/pkg/PLIST
+++ b/emulators/bochs/pkg/PLIST
@@ -1,18 +1,17 @@
-@comment $NetBSD: PLIST,v 1.6 2000/12/14 14:39:46 kei Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/05/25 23:01:33 kei Exp $
 bin/bochs
 share/doc/html/bochs/00README
 share/doc/html/bochs/3rdparty.license.html
-share/doc/html/bochs/DOS.html
 share/doc/html/bochs/Linux.html
 share/doc/html/bochs/Minix.html
 share/doc/html/bochs/OldWindows95.html
-share/doc/html/bochs/Windows31.html
 share/doc/html/bochs/Windows95.html
 share/doc/html/bochs/changelog.html
 share/doc/html/bochs/codingguidelines.html
 share/doc/html/bochs/configure.html
 share/doc/html/bochs/construction.html
 share/doc/html/bochs/cosimulation.html
+share/doc/html/bochs/cvs-status.html
 share/doc/html/bochs/debugger.html
 share/doc/html/bochs/developers.html
 share/doc/html/bochs/faq.html
@@ -28,7 +27,8 @@ share/doc/html/bochs/undercon.gif
 share/doc/html/bochs/whatisbochs.html
 share/doc/html/bochs/win32.html
 share/bochs/bios/BIOS-bochs-990925a
-share/bochs/bios/VGABIOS-elpin-2.20
+share/bochs/bios/VGABIOS-elpin-2.40
+share/bochs/bios/VGABIOS-elpin-LICENSE
 share/bochs/xfonts/fonts.dir
 share/bochs/xfonts/hercules.bdf
 share/bochs/xfonts/vga.bdf