Date: Mon, 19 Jul 1999 15:45:22 -0700 (PDT) From: jobaldwi@vt.edu To: freebsd-gnats-submit@freebsd.org Subject: ports/12709: [PATCH] Upgrade the emulators/bochs port to the latest version Message-ID: <19990719224522.C66C614CD5@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 12709
>Category: ports
>Synopsis: [PATCH] Upgrade the emulators/bochs port to the latest version
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Mon Jul 19 15:50:01 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator: John Baldwin
>Release: 3.2-STABLE
>Organization:
>Environment:
n/a
>Description:
The patch below upgrades the emulators/bochs release to the latest
version.
>How-To-Repeat:
>Fix:
Makefile:
Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/emulators/bochs/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile 1999/01/01 16:34:07 1.14
+++ Makefile 1999/07/12 23:08:16
@@ -1,5 +1,5 @@
# New ports collection makefile for: bochs
-# Version required: 980513a
+# Version required: 990219a
# Date created: 16 December 1997
# Whom: alex
#
@@ -7,10 +7,10 @@
#
VGABIOS= VGABIOS-elpin-2.20
-BIOS= BIOS-bochs-980717a
-DATE= 981102
+BIOS= BIOS-bochs-990623a
+DATE= 990708
-DISTNAME= bochs-${DATE}b
+DISTNAME= bochs-${DATE}a
CATEGORIES= emulators
MASTER_SITES= ftp://ftp.bochs.com/pub/
@@ -18,10 +18,8 @@
USE_XLIB= yes
GNU_CONFIGURE= YES
-CONFIGURE_ARGS= --enable-80386 --enable-memory=16 \
- --enable-v8086-mode --enable-paging --enable-vga \
- --enable-bochs-bios-hooks --enable-dma-floppy-io \
- --enable-processor-ips=200000
+CONFIGURE_ARGS= --enable-cpu-level=4 --enable-vga \
+ --with-x11 --prefix=${PREFIX}
WRKSRC= ${WRKDIR}/bochs-${DATE}
@@ -41,6 +39,7 @@
-@${MKDIR} ${PREFIX}/share/doc/bochs
${INSTALL_MAN} ${WRKSRC}/docs-html/LICENSE ${PREFIX}/share/doc/bochs
${INSTALL_MAN} ${WRKSRC}/docs-html/*.html ${PREFIX}/share/doc/bochs
+ ${INSTALL_MAN} ${WRKSRC}/docs-html/*.gif ${PREFIX}/share/doc/bochs
.endif
.include <bsd.port.mk>
files/md5:
Index: files/md5
===================================================================
RCS file: /usr/cvs/ports/emulators/bochs/files/md5,v
retrieving revision 1.8
diff -u -r1.8 md5
--- md5 1998/11/03 02:26:39 1.8
+++ md5 1999/07/12 22:14:21
@@ -1 +1 @@
-MD5 (bochs-981102b.tar.gz) = 437e421df6d9843dd9dd734088955323
+MD5 (bochs-990708a.tar.gz) = 8dd96cfd9a5aa2870daaf6ba9b312d5a
patches/patch-aa:
Index: patches/patch-aa
===================================================================
RCS file: /usr/cvs/ports/emulators/bochs/patches/patch-aa,v
retrieving revision 1.6
diff -u -r1.6 patch-aa
--- patch-aa 1998/11/03 02:26:39 1.6
+++ patch-aa 1999/07/12 22:42:38
@@ -1,21 +1,24 @@
---- .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
+--- .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
+ boot: c
-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
+
+ # 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-980717a, address=0xf0000
-+romimage: file=/usr/local/lib/bochs/bios/BIOS-bochs-980717a, address=0xf0000
+-romimage: file=bios/BIOS-bochs-990623a, address=0xf0000
++romimage: file=/usr/local/lib/bochs/bios/BIOS-bochs-990623a, address=0xf0000
- #romimage: ../cbios961112
+ #romimage: file=bios/BIOS-bochs-990218a, address=0xf0000
+ #romimage: file=../dttest.bin, address=0xf0000
+@@ -69,8 +69,8 @@
#vgaromimage: ../vgacbios961111
#romimage: ../cbios961203
@@ -23,6 +26,6 @@
-log: ./bochs.out
+log: /dev/null
+#log: ./bochs.out
- keyboard_serial_delay: 200 #microseconds
- floppy_command_delay: 500 #microseconds
+ keyboard_serial_delay: 200
+ floppy_command_delay: 500
#ips: 1500000
pkg/PLIST:
Index: pkg/PLIST
===================================================================
RCS file: /usr/cvs/ports/emulators/bochs/pkg/PLIST,v
retrieving revision 1.9
diff -u -r1.9 PLIST
--- PLIST 1998/11/03 02:26:39 1.9
+++ PLIST 1999/07/12 22:52:43
@@ -1,6 +1,6 @@
bin/bochs
lib/bochs/bios/VGABIOS-elpin-2.20
-lib/bochs/bios/BIOS-bochs-980717a
+lib/bochs/bios/BIOS-bochs-990623a
lib/bochs/bochsrc.sample
share/doc/bochs/3rdparty.license.html
share/doc/bochs/DOS.html
@@ -12,18 +12,18 @@
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/instrumentation.html
share/doc/bochs/licensing.html
share/doc/bochs/mtools.html
+share/doc/bochs/undercon.gif
share/doc/bochs/whatisbochs.html
share/doc/bochs/win32.html
@dirrm lib/bochs/bios
>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?19990719224522.C66C614CD5>