--- bin/.java_wrapper.orig	Fri May 25 14:39:58 2001
+++ bin/.java_wrapper	Fri May 25 14:42:25 2001
@@ -34,8 +34,8 @@
 # Resolve symlinks. See 4152645.
 while [ -L "$PRG" ]; do
     ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/' > /dev/null; then
+    link=`/compat/linux/usr/bin/expr "$ls" : '.*-> \(.*\)$'`
+    if /compat/linux/usr/bin/expr "$link" : '/' > /dev/null; then
 	PRG="$link"
     else
 	PRG="`dirname $PRG`/$link"
--- jre/bin/.java_wrapper.orig	Fri May 25 14:39:58 2001
+++ jre/bin/.java_wrapper	Fri May 25 14:42:25 2001
@@ -34,8 +34,8 @@
 # Resolve symlinks. See 4152645.
 while [ -L "$PRG" ]; do
     ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/' > /dev/null; then
+    link=`/compat/linux/usr/bin/expr "$ls" : '.*-> \(.*\)$'`
+    if /compat/linux/usr/bin/expr "$link" : '/' > /dev/null; then
 	PRG="$link"
     else
 	PRG="`dirname $PRG`/$link"
--- jre/lib/font.properties.orig	Fri May 25 15:17:02 2001
+++ jre/lib/font.properties	Fri May 25 15:18:50 2001
@@ -13,79 +13,80 @@
 #
 
 #
-# Linux version derived from the version for SunOS 5.5.1 Notice that
+# FreeBSD version derived from the Linux version derived from the
+# version for SunOS 5.5.1 Notice that
 # we use the .ttf files shipped in the JDK distribution.
 #
 
 # Serif font definition
 #
 serif.0=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-serif.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+#serif.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
 
 serif.italic.0=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-serif.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+#serif.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
 
 serif.bold.0=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1
-serif.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+#serif.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
 
 serif.bolditalic.0=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1
-serif.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+#serif.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
 
 # SansSerif font definition
 #
 sansserif.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+#sansserif.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
 
 sansserif.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+#sansserif.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
 
 sansserif.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+#sansserif.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
 
 sansserif.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+#sansserif.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
 
 # Monospaced font definition
 #
 monospaced.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+#monospaced.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
 
 monospaced.italic.0=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+#monospaced.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
 
 monospaced.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+#monospaced.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
 
 monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+#monospaced.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
 
 # Dialog font definition
 #
 dialog.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+#dialog.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
 
 dialog.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+#dialog.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
 
 dialog.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+#dialog.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
 
 dialog.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+#dialog.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
 
 # DialogInput font definition
 #
 dialoginput.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+#dialoginput.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
 
 dialoginput.italic.0=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+#dialoginput.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
 
 dialoginput.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+#dialoginput.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
 
 dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
+#dialoginput.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific
 
 # Default font definition
 #
--- jre/lib/jvm.cfg.orig	Fri Feb  9 13:24:23 2001
+++ jre/lib/jvm.cfg	Tue May 15 09:41:16 2001
@@ -8,7 +8,7 @@
 # List of JVMs that can be used as the first option to java, javac, etc.
 # Order is important -- first in this list is the default JVM.
 #
+-classic
 -client
 -hotspot
 -server
--classic
