Date: Tue, 5 Oct 1999 23:59:07 +0100 (BST) From: Mark Ovens <mark@ukug.uk.freebsd.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/14148: [PATCH] Re-submitted patch for bochs-990925a Message-ID: <199910052259.XAA04941@marder-1.>
next in thread | raw e-mail | index | archive | help
>Number: 14148
>Category: ports
>Synopsis: [PATCH] Re-submitted patch for bochs-990925a
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Oct 5 16:10:00 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator: Mark Ovens
>Release: FreeBSD 3.3-STABLE i386
>Organization:
>Environment:
FreeBSD marder-1 3.3-STABLE FreeBSD 3.3-STABLE #0:
Thu Sep 30 01:04:46 BST 1999
mark@marder-1:/usr/src/sys/compile/MARDER-1 i386
>Description:
New patches to upgrade the bochs port to 990925 source. This
will allow Win95 to be installed without bombing on reboot.
>How-To-Repeat:
>Fix:
--- Makefile.orig Tue Oct 5 23:46:39 1999
+++ Makefile Tue Oct 5 23:47:58 1999
@@ -7,10 +7,10 @@
#
VGABIOS= VGABIOS-elpin-2.20
-BIOS= BIOS-bochs-990907a
-DATE= 990907
+BIOS= BIOS-bochs-990925a
+DATE= 990925
-DISTNAME= bochs-${DATE}b
+DISTNAME= bochs-${DATE}a
CATEGORIES= emulators
MASTER_SITES= ftp://ftp.bochs.com/pub/
@@ -21,7 +21,7 @@
CONFIGURE_ARGS= --enable-cpu-level=4 --enable-vga \
--with-x11 --prefix=${PREFIX}
-WRKSRC= ${WRKDIR}/bochs-${DATE}b
+WRKSRC= ${WRKDIR}/bochs-${DATE}a
RESTRICTED= "Commercial software"
NO_CDROM= ${RESTRICTED}
--- patch-aa.orig Tue Oct 5 23:32:58 1999
+++ patch-aa Tue Oct 5 23:39:25 1999
@@ -1,5 +1,5 @@
---- .bochsrc.orig Thu Jul 8 09:57:11 1999
-+++ .bochsrc Mon Jul 12 18:42:12 1999
+--- .bochsrc.orig Tue Oct 5 23:36:21 1999
++++ .bochsrc Tue Oct 5 23:37:20 1999
@@ -3,7 +3,7 @@
megs: 16
#megs: 8
@@ -9,16 +9,16 @@
# You many now use double quotes around pathnames, in case
# your pathname includes spaces.
-@@ -60,7 +60,7 @@
- #romimage: file=bios/rombios.bin, address=0xf0000
+@@ -64,7 +64,7 @@
#romimage: file=../cbios961203
#romimage: file=../r980820.rom, address=0xe0000
--romimage: file=bios/BIOS-bochs-990623a, address=0xf0000
-+romimage: file=/usr/local/lib/bochs/bios/BIOS-bochs-990623a, address=0xf0000
+ #romimage: file=bios/BIOS-bochs-990907a, address=0xf0000
+-romimage: file=bios/BIOS-bochs-990925a, address=0xf0000
++romimage: file=/usr/local/lib/bochs/bios/BIOS-bochs-990925a, address=0xf0000
- #romimage: file=bios/BIOS-bochs-990218a, address=0xf0000
- #romimage: file=../dttest.bin, address=0xf0000
-@@ -69,8 +69,8 @@
+ #romimage: file=/home/kpl/floating_point/bios/rombios.bin, address=0xf0000
+
+@@ -75,8 +75,8 @@
#vgaromimage: ../vgacbios961111
#romimage: ../cbios961203
--- md5.orig Tue Oct 5 23:33:39 1999
+++ md5 Tue Oct 5 23:28:42 1999
@@ -1 +1 @@
-MD5 (bochs-990907b.tar.gz) = c7d0462f750a91403185717e455dd678
+MD5 (bochs-990925a.tar.gz) = 4f09417be44db162cbda299cb3f9974d
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199910052259.XAA04941>