Date: Mon, 27 Sep 1999 00:29:02 +0100 (BST) From: Mark Ovens <mark@ukug.uk.freebsd.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/13987: [PATCH] Update to bochs port to 990925 source Message-ID: <199909262329.AAA08624@marder-1.>
next in thread | raw e-mail | index | archive | help
>Number: 13987
>Category: ports
>Synopsis: Update bochs port to the latest version
>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: Sun Sep 26 16:30:00 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator: Mark Ovens
>Release: FreeBSD 3.1-RELEASE i386
>Organization:
>Environment:
FreeBSD marder-1 3.1-RELEASE FreeBSD 3.1-RELEASE #34:
Fri Sep 17 17:35:19 BST 1999
root@marder-1:/usr/src/sys/compile/MARDER-1 i386
>Description:
Update the bochs port to the 990925 source code. This stops
Win95 bombing after the first reboot during installation.
>How-To-Repeat:
>Fix:
diff -crN -x CVS bochs-990708a/Makefile bochs/Makefile
*** bochs-990708a/Makefile Sat Sep 18 22:10:54 1999
--- bochs/Makefile Sun Sep 26 10:50:28 1999
***************
*** 7,14 ****
#
VGABIOS= VGABIOS-elpin-2.20
! BIOS= BIOS-bochs-990623a
! DATE= 990708
DISTNAME= bochs-${DATE}a
CATEGORIES= emulators
--- 7,14 ----
#
VGABIOS= VGABIOS-elpin-2.20
! BIOS= BIOS-bochs-990925a
! DATE= 990925
DISTNAME= bochs-${DATE}a
CATEGORIES= emulators
***************
*** 21,27 ****
CONFIGURE_ARGS= --enable-cpu-level=4 --enable-vga \
--with-x11 --prefix=${PREFIX}
! WRKSRC= ${WRKDIR}/bochs-${DATE}
RESTRICTED= "Commercial software"
NO_CDROM= ${RESTRICTED}
--- 21,27 ----
CONFIGURE_ARGS= --enable-cpu-level=4 --enable-vga \
--with-x11 --prefix=${PREFIX}
! WRKSRC= ${WRKDIR}/bochs-${DATE}a
RESTRICTED= "Commercial software"
NO_CDROM= ${RESTRICTED}
diff -crN -x CVS bochs-990708a/files/md5 bochs/files/md5
*** bochs-990708a/files/md5 Wed Aug 25 22:24:32 1999
--- bochs/files/md5 Sun Sep 26 10:47:41 1999
***************
*** 1 ****
! MD5 (bochs-990708a.tar.gz) = 8dd96cfd9a5aa2870daaf6ba9b312d5a
--- 1 ----
! MD5 (bochs-990925a.tar.gz) = 4f09417be44db162cbda299cb3f9974d
diff -crN -x CVS bochs-990708a/patches/patch-aa bochs/patches/patch-aa
*** bochs-990708a/patches/patch-aa Wed Aug 25 22:24:32 1999
--- bochs/patches/patch-aa Sun Sep 26 19:57:59 1999
***************
*** 1,5 ****
! --- .bochsrc.orig Thu Jul 8 09:57:11 1999
! +++ .bochsrc Mon Jul 12 18:42:12 1999
@@ -3,7 +3,7 @@
megs: 16
#megs: 8
--- 1,5 ----
! --- .bochsrc.orig Sun Sep 26 11:02:49 1999
! +++ .bochsrc Sun Sep 26 11:03:59 1999
@@ -3,7 +3,7 @@
megs: 16
#megs: 8
***************
*** 9,24 ****
# 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
#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-990218a, address=0xf0000
! #romimage: file=../dttest.bin, address=0xf0000
! @@ -69,8 +69,8 @@
#vgaromimage: ../vgacbios961111
#romimage: ../cbios961203
--- 9,24 ----
# You many now use double quotes around pathnames, in case
# your pathname includes spaces.
! @@ -64,7 +64,7 @@
#romimage: file=../cbios961203
#romimage: file=../r980820.rom, address=0xe0000
! #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=/home/kpl/floating_point/bios/rombios.bin, address=0xf0000
!
! @@ -75,8 +75,8 @@
#vgaromimage: ../vgacbios961111
#romimage: ../cbios961203
diff -crN -x CVS bochs-990708a/pkg/PLIST bochs/pkg/PLIST
*** bochs-990708a/pkg/PLIST Wed Aug 25 22:24:32 1999
--- bochs/pkg/PLIST Mon Sep 27 00:10:30 1999
***************
*** 1,6 ****
bin/bochs
lib/bochs/bios/VGABIOS-elpin-2.20
! lib/bochs/bios/BIOS-bochs-990623a
lib/bochs/bochsrc.sample
share/doc/bochs/3rdparty.license.html
share/doc/bochs/DOS.html
--- 1,6 ----
bin/bochs
lib/bochs/bios/VGABIOS-elpin-2.20
! lib/bochs/bios/BIOS-bochs-990925a
lib/bochs/bochsrc.sample
share/doc/bochs/3rdparty.license.html
share/doc/bochs/DOS.html
>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?199909262329.AAA08624>