summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>1999-11-23 01:55:04 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>1999-11-23 01:55:04 +0000
commit3494e96ffb36b406ad92cb5c5d7746c65f6b23b2 (patch)
tree5a8eb37c1a57021aa40444884bf9f54f9156005f /emulators
parentUpdate to the 991114 version. (diff)
Make PREFIX clean.
Notes
Notes: svn path=/head/; revision=23269
Diffstat (limited to 'emulators')
-rw-r--r--emulators/bochs/Makefile7
-rw-r--r--emulators/bochs/files/patch-aa26
2 files changed, 9 insertions, 24 deletions
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 876aaaff4238..16ac136dd751 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
# New ports collection makefile for: bochs
# Version required: 990219a
# Date created: 16 December 1997
@@ -26,6 +27,12 @@ WRKSRC= ${WRKDIR}/bochs-${DATE}a
RESTRICTED= "Commercial software"
NO_CDROM= ${RESTRICTED}
+pre-configure:
+ @${PERL} -pi.fbsd \
+ -e 's|^vgaromimage:\sbios/|vgaromimage: ${PREFIX}/bios/| ;' \
+ -e 's|^romimage:\sfile=bios/|romimage: file=${PREFIX}/bios/|' \
+ ${WRKSRC}/.bochsrc
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bochs ${PREFIX}/bin
-@${MKDIR} ${PREFIX}/lib/bochs
diff --git a/emulators/bochs/files/patch-aa b/emulators/bochs/files/patch-aa
index 2b38c77fd7f5..259f893cb9c7 100644
--- a/emulators/bochs/files/patch-aa
+++ b/emulators/bochs/files/patch-aa
@@ -1,31 +1,9 @@
--- .bochsrc.orig Sun Nov 14 16:01:27 1999
-+++ .bochsrc Mon Nov 22 17:33:48 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
-
- # You many now use double quotes around pathnames, in case
- # your pathname includes spaces.
-@@ -68,7 +68,7 @@
- #floppya: 1_2=../1.2
- #floppyb: 1_44=../1.680
-
--romimage: file=bios/BIOS-bochs-990925a, address=0xf0000
-+romimage: file=/usr/local/lib/bochs/bios/BIOS-bochs-990925a, address=0xf0000
-
- #romimage: file=bios/rombios.bin, address=0xf0000
- #romimage: file=../cbios961203
-@@ -82,8 +82,8 @@
- #vgaromimage: ../vgacbios961111
- #romimage: ../cbios961203
++++ .bochsrc Mon Nov 22 17:44:06 1999
+@@ -84,4 +84,4 @@
-#log: /dev/null
-log: ./bochs.out
+log: /dev/null
+#log: ./bochs.out
keyboard_serial_delay: 200
- floppy_command_delay: 500
- #ips: 1500000