From 84fcef332c914f78c0c5c2a5c74d079c2492c557 Mon Sep 17 00:00:00 2001 From: brad Date: Mon, 22 Feb 1999 04:52:22 +0000 Subject: [PATCH] upgrade to bochs-990219a --- emulators/bochs/Makefile | 16 ++++----- emulators/bochs/files/md5 | 2 +- emulators/bochs/patches/patch-aa | 56 ++++++++++++++++---------------- emulators/bochs/patches/patch-ab | 9 +++-- emulators/bochs/pkg/PLIST | 13 +++++--- 5 files changed, 48 insertions(+), 48 deletions(-) diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile index 63138fd27ab..b5d4471eba2 100644 --- a/emulators/bochs/Makefile +++ b/emulators/bochs/Makefile @@ -1,17 +1,15 @@ -# $OpenBSD: Makefile,v 1.5 1998/11/18 11:06:52 form Exp $ -# NetBSD: Makefile,v 1.2 1998/09/22 06:11:36 garbled Exp +# $OpenBSD: Makefile,v 1.6 1999/02/22 04:52:22 brad Exp $ +# $NetBSD: Makefile,v 1.2 1998/09/22 06:11:36 garbled Exp $ -DISTNAME= bochs-980707a +DISTNAME= bochs-990219a CATEGORIES= emulators -MASTER_SITES= ftp://ftp.std.com/pub/bochs/ - -#NOT_FOR_ARCHS= alpha #runs, SEGV. +MASTER_SITES= ftp://ftp.bochs.com/pub/ MAINTAINER= form@OpenBSD.ORG -HOMEPAGE= http://world.std.com/~bochs/ +HOMEPAGE= http://www.bochs.com/ LICENSE= shareware -WRKSRC= ${WRKDIR}/bochs-980707 +WRKSRC= ${WRKDIR}/bochs-990219 USE_GMAKE= yes CONFIGURE_ARGS+= --enable-vga #--with-x11 GNU_CONFIGURE= yes @@ -23,7 +21,7 @@ post-configure: do-install: ${MKDIR} ${PREFIX}/share/bochs/bios ${MKDIR} ${PREFIX}/share/bochs/fonts - ${INSTALL_DATA} ${WRKSRC}/bios/BIOS-bochs-980702a ${PREFIX}/share/bochs/bios + ${INSTALL_DATA} ${WRKSRC}/bios/BIOS-bochs-990219a ${PREFIX}/share/bochs/bios ${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-elpin-2.20 ${PREFIX}/share/bochs/bios ${MKDIR} ${PREFIX}/share/doc/bochs ${INSTALL_DATA} ${WRKSRC}/docs-html/* ${PREFIX}/share/doc/bochs diff --git a/emulators/bochs/files/md5 b/emulators/bochs/files/md5 index 15ec1c8c27f..914598bc0d6 100644 --- a/emulators/bochs/files/md5 +++ b/emulators/bochs/files/md5 @@ -1 +1 @@ -MD5 (bochs-980707a.tar.gz) = 1e21b04444d61e2c8a4adb85afcb9b4e +MD5 (bochs-990219a.tar.gz) = d03a10913bf3171bdcaca80c0fedb7d2 diff --git a/emulators/bochs/patches/patch-aa b/emulators/bochs/patches/patch-aa index 902bfe9b2aa..28c6954c3e9 100644 --- a/emulators/bochs/patches/patch-aa +++ b/emulators/bochs/patches/patch-aa @@ -1,38 +1,38 @@ -$NetBSD: patch-aa,v 1.1 1998/09/06 06:51:05 garbled Exp $ ---- .bochsrc.orig Sat Sep 5 16:56:33 1998 -+++ .bochsrc Sat Sep 5 16:59:02 1998 -@@ -20,8 +20,10 @@ - #diskc: file=../rrrr, cyl=1, heads=2, spt=18 - #floppya: 1_44=/vol/dev/aliases/floppy0, status=inserted - -+floppya: 1_44=/dev/rfd0a, status=inserted -+ - #floppya: 1_44=../1.44, status=inserted --floppya: 720k=../720k.dos33, status=inserted -+#floppya: 720k=../720k.dos33, status=inserted - - #floppya: 1_44=../1.44a, status=inserted - #floppyb: 1_44=../1.44b, status=inserted -@@ -30,11 +32,11 @@ - #floppya: 1_44=../1.44.yodlowsk - #floppya: 1_2=../1.2 - #floppyb: 1_44=../1.680 +--- .bochsrc.orig Sat Feb 20 00:48:03 1999 ++++ .bochsrc Sat Feb 20 00:56:25 1999 +@@ -3,7 +3,7 @@ + megs: 16 + #megs: 8 + boot: c -vgaromimage: bios/VGABIOS-elpin-2.20 +vgaromimage: XXXPREFIXXXX/share/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: XXXPREFIXXXX/share/bochs/bios/BIOS-bochs-980702a - #romimage: ../cbios961203 + + # You many now use double quotes around pathnames, in case + # your pathname includes spaces. +@@ -48,7 +48,8 @@ + #floppya: 1_44=../1.44.freebsd, status=inserted + #floppya: 720k=../720k.dos33, status=inserted + +-floppya: 1_44=../1.44a, status=inserted ++floppya: 1_44=/dev/rfd0a, status=inserted ++#floppya: 1_44=../1.44a, status=inserted + #floppyb: 1_44=../1.44b, status=inserted + #floppya: 1_44=/dev/fd0, status=inserted + #floppyb: 1_44=../1.44b, status=inserted +@@ -62,14 +63,14 @@ + #romimage: file=../r980820.rom, address=0xe0000 + #romimage: file=bios/BIOS-bochs-990104a, address=0xf0000 + #romimage: file=bios/BIOS-bochs-990127a, address=0xf0000 +-romimage: file=bios/BIOS-bochs-990218a, address=0xf0000 ++romimage: file=XXXPREFIXXXX/share/bochs/bios/BIOS-bochs-990218a, address=0xf0000 #romimage: ../cbios961112 -@@ -42,7 +44,7 @@ + #vgaromimage: ../vgacbios961111 #romimage: ../cbios961203 #log: /dev/null -log: ./bochs.out +log: XXXPREFIXXXX/share/bochs/bochs.out - keyboard_serial_delay: 200 #microseconds - floppy_command_delay: 500 #microseconds + keyboard_serial_delay: 200 + floppy_command_delay: 500 #ips: 1500000 diff --git a/emulators/bochs/patches/patch-ab b/emulators/bochs/patches/patch-ab index f65a2f7a5b5..345b91227d5 100644 --- a/emulators/bochs/patches/patch-ab +++ b/emulators/bochs/patches/patch-ab @@ -1,6 +1,5 @@ -$NetBSD: patch-ab,v 1.1 1998/09/06 06:51:05 garbled Exp $ ---- Makefile.in.orig Sun Jun 28 22:20:48 1998 -+++ Makefile.in Sat Sep 5 23:09:05 1998 +--- Makefile.in.orig Thu Feb 4 22:33:09 1999 ++++ Makefile.in Thu Feb 4 22:34:58 1999 @@ -27,11 +27,11 @@ CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ @@ -13,6 +12,6 @@ $NetBSD: patch-ab,v 1.1 1998/09/06 06:51:05 garbled Exp $ X_PRE_LIBS = @X_PRE_LIBS@ -GUI_LINK_OPTS_X = $(X_LIBS) $(X_PRE_LIBS) -lX11 +GUI_LINK_OPTS_X = $(LDFLAGS) $(X_LIBS) $(X_PRE_LIBS) -lX11 - GUI_LINK_OPTS_BEOS = + GUI_LINK_OPTS_BEOS = -lbe GUI_LINK_OPTS_WIN32 = -luser32 -lgdi32 -lwinmm -lcomdlg32 -lcomctl32 - GUI_LINK_OPTS_WIN32_VC50 = user32.lib gdi32.lib winmm.lib comdlg32.lib comctl32.lib + GUI_LINK_OPTS_WIN32_VCPP = user32.lib gdi32.lib winmm.lib \ diff --git a/emulators/bochs/pkg/PLIST b/emulators/bochs/pkg/PLIST index 7c071d5c5b9..6866648f6e6 100644 --- a/emulators/bochs/pkg/PLIST +++ b/emulators/bochs/pkg/PLIST @@ -6,28 +6,31 @@ share/doc/bochs/LICENSE share/doc/bochs/Linux.html share/doc/bochs/Minix.html share/doc/bochs/OldWindows95.html -share/doc/bochs/WISHLIST 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/faq.html share/doc/bochs/features.html share/doc/bochs/index.html share/doc/bochs/install.html -share/doc/bochs/jbochs.html -share/doc/bochs/licensing.html share/doc/bochs/mtools.html +share/doc/bochs/instrumentation.html +share/doc/bochs/licensing.html share/doc/bochs/undercon.gif share/doc/bochs/whatisbochs.html share/doc/bochs/win32.html -share/bochs/bios/BIOS-bochs-980702a +share/bochs/bios/BIOS-bochs-990127a share/bochs/bios/VGABIOS-elpin-2.20 share/bochs/fonts/hercules.bdf share/bochs/fonts/vga.bdf +share/bochs/fonts/vga.pcf +share/bochs/fonts/fonts.dir share/bochs/bochsrc @unexec rm -f %D/share/bochs/fonts/vga.pcf* %D/share/bochs/fonts/hercules.pcf* @unexec rm -f %D/share/bochs/fonts/fonts.{alias,dir}