update to 2000_0104c

changes since 991023a:
-various bugfixes
-soundblaster emulation
-cdrom emulation
-new fpu emulator
moved out of ${X11BASE}, there is little reason to have it there

6 files changed, 38 insertions, 27 deletions

diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 53a9e5c41e5..fbf251c663d 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 1999/10/25 16:05:37 drochner Exp $
+# $NetBSD: Makefile,v 1.7 2000/01/31 21:18:43 drochner Exp $
 
-DISTNAME=		bochs-991023a
+DISTNAME=		bochs-2000_0104c
+PKGNAME=		bochs-2000.01.04c
 CATEGORIES=		emulators
 MASTER_SITES=		ftp://bochs.com/pub/
 
@@ -11,7 +12,8 @@ NOT_FOR_PLATFORM=	*-*-alpha	#runs, SEGV.
 
 LICENSE=		shareware
 GNU_CONFIGURE=		yes
-USE_X11BASE=		yes
+#CONFIGURE_ARGS=		--enable-debugger --enable-disasm
+USE_X11=		yes
 
 post-configure:
 	${SED} -e 's@XXXPREFIXXXX@${PREFIX}@' < ${WRKSRC}/.bochsrc > ${WRKSRC}/bochsrc
diff --git a/emulators/bochs/files/md5 b/emulators/bochs/files/md5
index 97dba7cbe05..0b2eceff0c3 100644
--- a/emulators/bochs/files/md5
+++ b/emulators/bochs/files/md5
@@ -1,2 +1,3 @@
-$NetBSD: md5,v 1.2 1999/10/25 16:05:38 drochner Exp $
-MD5 (bochs-991023a.tar.gz) = 1f693993033bca6620f7f68d004ff113
+$NetBSD: md5,v 1.3 2000/01/31 21:18:44 drochner Exp $
+
+MD5 (bochs-2000_0104c.tar.gz) = f0d9ba161382b971451bace7101a7ce7
diff --git a/emulators/bochs/files/patch-sum b/emulators/bochs/files/patch-sum
index 8d4f94ce1b4..acc760504ee 100644
--- a/emulators/bochs/files/patch-sum
+++ b/emulators/bochs/files/patch-sum
@@ -1,6 +1,7 @@
-$NetBSD: patch-sum,v 1.2 1999/10/25 16:05:38 drochner Exp $
+$NetBSD: patch-sum,v 1.3 2000/01/31 21:18:44 drochner Exp $
 
-MD5 (patch-aa) = 448b1fcc6096d0225d8ee5d81d3fda91
+MD5 (patch-aa) = b82b3ed0921f2df488905a56caec57db
 MD5 (patch-ab) = 73d5e0a72d694ca148a23e154105dab4
 MD5 (patch-ac) = aa14eccc54c9bb8b5c26eb8583a13ae9
 MD5 (patch-ad) = 702e68d23534f772c21aacb7680fc136
+MD5 (patch-ae) = 1ac76cbf8a8e539e2ca56cd4ccfac5e1
diff --git a/emulators/bochs/patches/patch-aa b/emulators/bochs/patches/patch-aa
index ea2872db727..7fa686c814c 100644
--- a/emulators/bochs/patches/patch-aa
+++ b/emulators/bochs/patches/patch-aa
@@ -1,6 +1,7 @@
-$NetBSD: patch-aa,v 1.2 1999/10/25 16:05:38 drochner Exp $
---- .bochsrc.orig	Sat Oct 23 08:23:24 1999
-+++ .bochsrc	Mon Oct 25 17:37:19 1999
+$NetBSD: patch-aa,v 1.3 2000/01/31 21:18:44 drochner Exp $
+
+--- .bochsrc.orig	Tue Nov  2 02:17:08 1999
++++ .bochsrc	Sat Jan 29 21:43:48 2000
 @@ -2,8 +2,8 @@
  megs: 32
  #megs: 16
@@ -12,25 +13,16 @@ $NetBSD: patch-aa,v 1.2 1999/10/25 16:05:38 drochner Exp $
  
  # You many now use double quotes around pathnames, in case
  # your pathname includes spaces.
-@@ -32,7 +32,7 @@
- #diskc: file=../585M, cyl=1162, heads=16, spt=63
+@@ -33,7 +33,7 @@
  #diskc: file=../528M, cyl=1024, heads=16, spt=63
  
--diskc: file=../62M.980115, cyl=940, heads=8, spt=17
-+#diskc: file=../62M.980115, cyl=940, heads=8, spt=17
- #diskc: file="../10M.vga", cyl=306, heads=4, spt=17
+ #diskc: file=../62M.980115, cyl=940, heads=8, spt=17
+-diskc: file="../10M.vga", cyl=306, heads=4, spt=17
++#diskc: file="../10M.vga", cyl=306, heads=4, spt=17
  #diskc: file=../10M.dos622, cyl=306, heads=4, spt=17
  #diskc: file=../30M.freebsd, cyl=615, heads=6, spt=17
-@@ -47,7 +47,7 @@
- #diskc: file=../10M.win31, cyl=306, heads=4, spt=17
- #diskc: file=../rrrr, cyl=1, heads=2, spt=18
- 
--cdromd: dev=/dev/cdrom, status=inserted
-+#cdromd: dev=/dev/cdrom, status=inserted
- #cdromd: dev=/dev/cdrom, status=ejected
- 
- 
-@@ -57,7 +57,9 @@
+ #diskc: file=../126M.freeBSD_2.2.8, cyl=256, heads=16, spt=63
+@@ -58,7 +58,9 @@
  #floppya: 1_44=../1.44.freebsd, status=inserted
  #floppya: 720k=../720k.dos33, status=inserted
  
@@ -41,7 +33,7 @@ $NetBSD: patch-aa,v 1.2 1999/10/25 16:05:38 drochner Exp $
  #floppyb: 1_44=../1.44b, status=inserted
  #floppya: 1_44=/dev/fd0, status=inserted
  #floppyb: 1_44=../1.44b, status=inserted
-@@ -67,7 +69,7 @@
+@@ -68,7 +70,7 @@
  #floppya: 1_2=../1.2
  #floppyb: 1_44=../1.680
  
diff --git a/emulators/bochs/patches/patch-ae b/emulators/bochs/patches/patch-ae
new file mode 100644
index 00000000000..d9939e7eb37
--- /dev/null
+++ b/emulators/bochs/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2000/01/31 21:18:44 drochner Exp $
+
+--- debug/lexer.c.orig	Sat Jan 29 22:02:47 2000
++++ debug/lexer.c	Sat Jan 29 22:03:16 2000
+@@ -1272,7 +1272,7 @@
+ case 92:
+ YY_RULE_SETUP
+ #line 108 "lexer.l"
+-{ bxlval.ulval = strtoull(bxtext, NULL, 10); return(BX_TOKEN_LONG_NUMERIC); }
++{ bxlval.ulval = strtouq(bxtext, NULL, 10); return(BX_TOKEN_LONG_NUMERIC); }
+ 	YY_BREAK
+ case 93:
+ YY_RULE_SETUP
diff --git a/emulators/bochs/pkg/PLIST b/emulators/bochs/pkg/PLIST
index 023718a3a7c..fb06e890c71 100644
--- a/emulators/bochs/pkg/PLIST
+++ b/emulators/bochs/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1999/10/25 16:05:38 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/01/31 21:18:45 drochner Exp $
 bin/bochs
 share/bochs/doc/00README
 share/bochs/doc/3rdparty.license.html
@@ -19,11 +19,13 @@ share/bochs/doc/developers.html
 share/bochs/doc/faq.html
 share/bochs/doc/features.html
 share/bochs/doc/fpu.html
+share/bochs/doc/guestNT.html
 share/bochs/doc/index.html
 share/bochs/doc/install.html
 share/bochs/doc/instrumentation.html
 share/bochs/doc/licensing.html
 share/bochs/doc/mtools.html
+share/bochs/doc/sound.html
 share/bochs/doc/undercon.gif
 share/bochs/doc/whatisbochs.html
 share/bochs/doc/win32.html