Upgrade to bochs-981102b.

Submitted by:	msmith

4 files changed, 41 insertions, 37 deletions

diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index db9e58ded29e..a13a1b410bd7 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -3,14 +3,14 @@
 # Date created:        16 December 1997
 # Whom:                alex
 #
-# $Id: Makefile,v 1.10 1998/06/07 09:32:33 dburr Exp $
+# $Id: Makefile,v 1.11 1998/09/11 15:40:16 alex Exp $
 #
 
-VGABIOS=	VGABIOS-elpin-2.00A
-BIOS=		BIOS-bochs-980331a
-DATE= 		980513
+VGABIOS=	VGABIOS-elpin-2.20
+BIOS=		BIOS-bochs-980717a
+DATE= 		981102
 
-DISTNAME=	bochs-${DATE}a
+DISTNAME=	bochs-${DATE}b
 CATEGORIES= 	emulators
 MASTER_SITES= 	ftp://ftp.bochs.com/pub/
 
diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo
index af0e2d1a74d3..c8eac0799c66 100644
--- a/emulators/bochs/distinfo
+++ b/emulators/bochs/distinfo
@@ -1 +1 @@
-MD5 (bochs-980513a.tar.gz) = d858055d376aa5ce378cd4a3649f602f
+MD5 (bochs-981102b.tar.gz) = 437e421df6d9843dd9dd734088955323
diff --git a/emulators/bochs/files/patch-aa b/emulators/bochs/files/patch-aa
index 2785a4b0904c..1ea552ba17f3 100644
--- a/emulators/bochs/files/patch-aa
+++ b/emulators/bochs/files/patch-aa
@@ -1,27 +1,28 @@
-*** .bochsrc.orig	Sun Jan 25 17:57:25 1998
---- .bochsrc	Sun Jan 25 17:58:13 1998
-***************
-*** 20,30 ****
-  #floppya: 1_44=../1.44.yodlowsk
-  #floppya: 1_2=../1.2
-  #floppyb: 1_44=../1.680
-! vgaromimage: bios/VGABIOS-elpin-2.00A
-! romimage: bios/BIOS-bochs-980331a
-  #romimage: bios/rombios.bin
-! #log: /dev/null
-! log: ./bochs.out
-  vga_update_interval: 300000 #microseconds
-  keyboard_serial_delay: 200  #microseconds
-  floppy_command_delay: 500   #microseconds
---- 20,30 ----
-  #floppya: 1_44=../1.44.yodlowsk
-  #floppya: 1_2=../1.2
-  #floppyb: 1_44=../1.680
-! vgaromimage: /usr/local/lib/bochs/bios/VGABIOS-elpin-2.00A
-! romimage: /usr/local/lib/bochs/bios/BIOS-bochs-980331a
-  #romimage: bios/rombios.bin
-! log: /dev/null
-! #log: ./bochs.out
-  vga_update_interval: 300000 #microseconds
-  keyboard_serial_delay: 200  #microseconds
-  floppy_command_delay: 500   #microseconds
+--- .bochsrc.old	Mon Nov  2 13:06:25 1998
++++ .bochsrc	Mon Nov  2 13:07:47 1998
+@@ -39,21 +39,21 @@
+ #floppya: 1_44=../1.44.yodlowsk
+ #floppya: 1_2=../1.2
+ #floppyb: 1_44=../1.680
+-vgaromimage: bios/VGABIOS-elpin-2.20
++vgaromimage: /usr/local/lib/bochs/bios/VGABIOS-elpin-2.20
+ #romimage: bios/rombios.bin
+ #romimage: bios/BIOS-bochs-980331a
+ #romimage: bios/BIOS-bochs-980622a
+ #romimage: bios/BIOS-bochs-980702a
+ #romimage: ../cbios961203
+ #romimage: file=../r980820.rom, address=0xe0000
+-romimage: file=bios/BIOS-bochs-980717a, address=0xf0000
++romimage: file=/usr/local/lib/bochs/bios/BIOS-bochs-980717a, address=0xf0000
+ 
+ #romimage: ../cbios961112
+ #vgaromimage: ../vgacbios961111
+ #romimage: ../cbios961203
+ 
+-#log: /dev/null
+-log: ./bochs.out
++log: /dev/null
++#log: ./bochs.out
+ keyboard_serial_delay: 200  #microseconds
+ floppy_command_delay: 500   #microseconds
+ #ips:  1500000
diff --git a/emulators/bochs/pkg-plist b/emulators/bochs/pkg-plist
index 36d6a582860e..073bbb1d49a8 100644
--- a/emulators/bochs/pkg-plist
+++ b/emulators/bochs/pkg-plist
@@ -1,6 +1,6 @@
 bin/bochs
-lib/bochs/bios/VGABIOS-elpin-2.00A
-lib/bochs/bios/BIOS-bochs-980331a
+lib/bochs/bios/VGABIOS-elpin-2.20
+lib/bochs/bios/BIOS-bochs-980717a
 lib/bochs/bochsrc.sample
 share/doc/bochs/3rdparty.license.html
 share/doc/bochs/DOS.html
@@ -10,19 +10,22 @@ share/doc/bochs/Minix.html
 share/doc/bochs/OldWindows95.html
 share/doc/bochs/Windows31.html
 share/doc/bochs/Windows95.html
+share/doc/bochs/bugreports.html
 share/doc/bochs/changelog.html
 share/doc/bochs/company.html
 share/doc/bochs/construction.html
+share/doc/bochs/cosimulation.html
 share/doc/bochs/debugger.html
 share/doc/bochs/developers.html
 share/doc/bochs/drawing_board.html
 share/doc/bochs/features.html
 share/doc/bochs/index.html
 share/doc/bochs/install.html
-share/doc/bochs/jbochs.html
-share/doc/bochs/mtools.html
+share/doc/bochs/instrumentation.html
 share/doc/bochs/licensing.html
+share/doc/bochs/mtools.html
 share/doc/bochs/whatisbochs.html
+share/doc/bochs/win32.html
 @dirrm lib/bochs/bios
 @dirrm lib/bochs
 @dirrm share/doc/bochs