upgrade to 1.4.1.

-------------------------------------------------------------------------
Changes in 1.4.1 (June 22, 2002):

- now cdrom is enabled in configure, unless you specifically disable
  it with --disable-cdrom. (Christophe)
- fix compile error in main.cc when SMP or APIC is enabled (Dave)
- the runtime menu now displays 11 (continue) by default (Bryce)
- initialize DMA controller before floppy and SB16
- fix DMA panic when installing win95 (Volker)
- first character of the vga bitmap is blank on win32 (Volker)
  Before, it was incorrectly coded as a '@'.
- AltGr key on European keyboards works now on win32 (Volker)
- fix problem with console/serial port on Bochs exit (Volker)
- enable serial port for GNU and GNU/Linux (Volker)
- small documentation fixes (Volker)
- remove unnecessary include statements for X11 (Volker)
- italian keymap added (Emanuele Goldoni)
- fix win32 ethernet frames error. It will no longer reject packets
  that are less than 60 bytes long. (Peter Tattam)
- BIOS fixes :
  - win2k cd-boot (Christophe)
  - emm386 crash (Dave)
  - cs=0 at boot time (Christophe)
  - keyboard failure in scandisk (Dave)
- fix bug in forming the 64-bit APIC base address from two 32-bit registers.
  A compiler warning in cpu/proc_ctrl.cc pointed this out.
- fix default choice in the runtime options menu

3 files changed, 7 insertions, 35 deletions

diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index bfffe9722f8..d034ea690f0 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2002/06/06 23:19:45 grant Exp $
+# $NetBSD: Makefile,v 1.22 2002/07/12 03:39:15 itojun Exp $
 
-DISTNAME=		bochs-1.4
-PKGREVISION=		1
+DISTNAME=		bochs-1.4.1
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bochs/}
 
diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo
index 06b1faf2bd0..59dbe416c07 100644
--- a/emulators/bochs/distinfo
+++ b/emulators/bochs/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.8 2002/05/14 13:52:51 fredb Exp $
+$NetBSD: distinfo,v 1.9 2002/07/12 03:39:15 itojun Exp $
 
-SHA1 (bochs-1.4.tar.gz) = db5f1763c8d048831daad34fa81b0f3b15e5e0a8
-Size (bochs-1.4.tar.gz) = 1389919 bytes
+SHA1 (bochs-1.4.1.tar.gz) = 990924632c000ea15ea02ac9198de4c37938fb31
+Size (bochs-1.4.1.tar.gz) = 1395173 bytes
 SHA1 (patch-aa) = 8c65fa102f606dc7d34611cfc5e5b7ab8542cfb6
 SHA1 (patch-ab) = 13ef85883d8f66862194f3ee3ffc577a3676fb3a
 SHA1 (patch-ac) = 1536b5a110c05452aa423f1581cd09c8f4a486f4
-SHA1 (patch-ad) = 941d696a9556ddf8575362e1128463fadcd8c1af
+SHA1 (patch-ad) = b5d295145a1ba98adce99fd8b0aafdb0717cc400
 SHA1 (patch-ae) = 05b4d7663735594f427a236428d6cea9510c080e
 SHA1 (patch-af) = b76fa463ade0d95e3aa9f1c4f8759e8361d51d57
 SHA1 (patch-ag) = a22ca6f8abf0db67de714f53e3db94cb06e33db6
diff --git a/emulators/bochs/patches/patch-ad b/emulators/bochs/patches/patch-ad
index 7229ecee440..1c91789f17a 100644
--- a/emulators/bochs/patches/patch-ad
+++ b/emulators/bochs/patches/patch-ad
@@ -1,16 +1,7 @@
-$NetBSD: patch-ad,v 1.3 2002/05/14 13:52:52 fredb Exp $
+$NetBSD: patch-ad,v 1.4 2002/07/12 03:39:16 itojun Exp $
 
 --- iodev/cdrom.cc.orig	Tue Mar 19 19:24:16 2002
 +++ iodev/cdrom.cc
-@@ -65,7 +65,7 @@
- #define BX_CD_FRAMESIZE 2048
- #endif
- 
--#if (defined(__OpenBSD__) || defined(__FreeBSD__))
-+#if (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__))
- // OpenBSD pre version 2.7 may require extern "C" { } structure around
- // all the includes, because the i386 sys/disklabel.h contains code which 
- // c++ considers invalid.
 @@ -357,6 +357,22 @@
      return(true);
  }
@@ -34,21 +25,3 @@ $NetBSD: patch-ad,v 1.3 2002/05/14 13:52:52 fredb Exp $
  
    void
  cdrom_interface::eject_cdrom()
-@@ -365,7 +381,7 @@
-   // some ioctl() calls to really eject the CD as well.
- 
-   if (fd >= 0) {
--#if (defined(__OpenBSD__) || defined(__FreeBSD__))
-+#if (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__))
-     (void) ioctl (fd, CDIOCALLOW);
-     if (ioctl (fd, CDIOCEJECT) < 0)
- 	  BX_DEBUG(( "eject_cdrom: eject returns error." ));
-@@ -495,7 +511,7 @@
- 
-   return true;
-   }
--#elif (defined(__OpenBSD__) || defined(__FreeBSD__))
-+#elif (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__))
-   {
-   struct ioc_toc_header h;
-   struct ioc_read_toc_entry t;