- Use SF macro in MASTER_SITES.

- Add more OPTIONS and knobs.

3 files changed, 1 insertions, 88 deletions

diff --git a/emulators/bochs/files/bochs.sh b/emulators/bochs/files/bochs.sh
deleted file mode 100644
index 1c93e9789f2c..000000000000
--- a/emulators/bochs/files/bochs.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Bochs wrapper
-#
-
-bin_dir=%%PREFIX%%/libexec
-xbin_dir=%%X11BASE%%/bin
-font_dir=%%FONT_DIR%%
-
-${xbin_dir}/xset -q | grep -q ${font_dir}
-rc=$?
-
-if [ $rc != 0 ]; then
-	${xbin_dir}/xset fp+ ${font_dir}
-	${xbin_dir}/xset fp rehash
-fi
-
-${bin_dir}/bochs.bin ${1+"$@"}
-
-if [ $rc != 0 ]; then
-	${xbin_dir}/xset fp- ${font_dir}
-	${xbin_dir}/xset fp rehash
-fi
diff --git a/emulators/bochs/files/patch-aa b/emulators/bochs/files/patch-aa
deleted file mode 100644
index 12d5dae4a650..000000000000
--- a/emulators/bochs/files/patch-aa
+++ /dev/null
@@ -1,62 +0,0 @@
---- .bochsrc.orig	Sun Jan 29 07:56:01 2006
-+++ .bochsrc	Mon Feb 20 21:10:38 2006
-@@ -74,7 +74,7 @@
- # now supported, but we still recommend to use the BIOS distributed with
- # Bochs. Now the start address can be calculated from image size.
- #=======================================================================
--romimage: file=$BXSHARE/BIOS-bochs-latest, address=0xf0000
-+romimage: file=/usr/local/share/bochs/BIOS-bochs-latest, address=0xf0000
- #romimage: file=mybios.bin, address=0xfff80000 # 512k at memory top
- #romimage: file=mybios.bin # calculate start address from image size
- 
-@@ -147,9 +147,9 @@
- # VGAROMIMAGE
- # You now need to load a VGA ROM BIOS into C0000.
- #=======================================================================
--#vgaromimage: file=bios/VGABIOS-elpin-2.40
--vgaromimage: file=$BXSHARE/VGABIOS-lgpl-latest
--#vgaromimage: file=bios/VGABIOS-lgpl-latest-cirrus
-+#vgaromimage: file=/usr/local/share/bochs/VGABIOS-elpin-2.40
-+vgaromimage: file=/usr/local/share/bochs/VGABIOS-lgpl-latest
-+#vgaromimage: file=/usr/local/share/bochs/VGABIOS-lgpl-latest-cirrus
- 
- #=======================================================================
- # VGA:
-@@ -319,7 +319,7 @@
- # 
- # Default value are sync=none, time0=local
- #=======================================================================
--#clock: sync=none, time0=local
-+clock: sync=realtime, time0=local
- 
- 
- #=======================================================================
-@@ -344,8 +344,8 @@
- #   log: ./bochs.out
- #   log: /dev/tty
- #=======================================================================
--#log: /dev/null
--log: bochsout.txt
-+log: /dev/null
-+#log: bochsout.txt
- 
- #=======================================================================
- # LOGPREFIX:
-@@ -385,7 +385,7 @@
- # cause bochs to become unstable.  The panic is a "graceful exit," so
- # if you disable it you may get a spectacular disaster instead.
- #=======================================================================
--panic: action=ask
-+panic: action=fatal
- error: action=report
- info: action=report
- debug: action=ignore
-@@ -442,7 +442,7 @@
- #   parport2: enabled=1, file="/dev/lp0"
- #   parport1: enabled=0
- #=======================================================================
--parport1: enabled=1, file="parport.out"
-+#parport1: enabled=1, file="parport.out"
- 
- #=======================================================================
- # SB16:
diff --git a/emulators/bochs/files/pkg-message.in b/emulators/bochs/files/pkg-message.in
index 2985cb484324..7b46ee416780 100644
--- a/emulators/bochs/files/pkg-message.in
+++ b/emulators/bochs/files/pkg-message.in
@@ -1,7 +1,7 @@
 ===========================================================================
 
 Bochs requires a .bochsrc file to be present in either your current
-directory or your home directory before starting.  A sample .bochsrc
+directory or your home directory before starting. A sample .bochsrc
 file can be found in %%DOCSDIR%%/bochsrc-sample.txt
 
 ===========================================================================