--- BasiliskII/INSTALL	1999/10/03 17:11:52	1.1
+++ BasiliskII/INSTALL	2001/07/15 02:15:48	1.7
@@ -16,16 +16,14 @@ ROM files. No, I won't send you one.
 Depending on the platform you use, Basilisk II has additional requirements:
 
 BeOS:
-  You need BeOS R4 or better. On a PowerPC system you also need the
-  "sheep" driver that comes with SheepShaver. To use Ethernet, you need
-  the "sheep_net" add-on that also comes with SheepShaver (both items
-  are included in the SheepShaver Trial Versions). The PowerPC version of
+  You need BeOS R4 or later versions.
   Basilisk II cannot do Mac Classic emulation.
 
 Unix:
-  You need X11R6, pthreads support and GNU make. To use the GUI preferences
-  editor, you also need GTK+ version 1.2 or better. On Linux, you need
-  glibc 2.0 or better.
+  You need X11R6 and a "make" utility with the VPATH feature (e.g. GNU make).
+  For serial, ethernet and audio support, you need pthreads. To use the GUI
+  preferences editor, you also need GTK+ version 1.2 or better. On Linux, you
+  need glibc 2.0 or better.
 
 AmigaOS:
   You need at least a 68020 and AmigaOS 3.0 or better. To get the GUI
@@ -46,41 +44,38 @@ Installation
 
 BeOS:
   If you have a binary distribution of Basilisk II for BeOS, there are
-  executables for BeOS/PPC and/or BeOS/x86 included. If you have the source
-  distribution, do the following:
+  executables for BeOS/PPC and/or BeOS/x86 included. Basilisk II cannot run
+  concurrently with SheepShaver. Trying to do so will crash Basilisk II, or
+  SheepShaver, or both.
+
+  If you have the source distribution, do the following:
 
     cd src/BeOS
     make
 
-  Basilisk II cannot run concurrently with SheepShaver. Trying to do so will
-  crash Basilisk II, or SheepShaver, or both. On a PowerPC system you must
-  have installed the "sheep" driver that comes with SheepShaver. To use
-  Ethernet, you must have installed the "sheep_net" add-on that also comes
-  with SheepShaver 
+  This will produce an executable "BasiliskII" in the "obj.ppc" or "obj.x86"
+  directory. To use Ethernet, you also have to do:
+
+    cd SheepNet
+    make install
+
+  On a PowerPC system, you also have to do:
+
+    cd SheepDriver
+    make install
 
 Unix:
   To compile Basilisk II, do the following:
 
     cd src/Unix
     ./configure
-    make
+    make            [or "gmake" if you have GNU make and "make" fails]
     make install    [optionally]
 
   To use Ethernet networking under Linux, you either have to configure your
-  kernel for ethertap support or make and install the "sheep_net" driver:
-
-    cd src/Unix
-    make modules
-
-  This should produce a kernel module "sheep_net.o" in the "Linux/NetDriver"
-  directory. Now su root and say
-
-    ./MAKEDEV
-    /sbin/insmod sheep_net.o
-
-  This will install the device node "/dev/sheep_net" and load the driver.
-  You should give appropriate access rights to /dev/sheep_net if you don't
-  want to have to run Basilisk II as root.
+  kernel for ethertap support or make and install the "sheep_net" driver
+  (this is explained in the README file, at the description of the "ether"
+  preferences item).
 
   This is what Brian J. Johnson says about compiling for IRIX:
    "I recommend compiling with "-Ofast".  This requires changing "-g"
@@ -88,6 +83,45 @@ Unix:
     turns on massive interprocedural optimization, and makes for much
     better performance."
 
+  ATTENTION NetBSD/m68k USERS:
+  If you want to run Basilisk II natively (i.e. without CPU emulation), you
+  must NOT use a pthreads library. User-level threads libraries such as PTL
+  interfere with the signal handlers installed by Basilisk II and kernel-
+  level threads are not supported by NetBSD, so you will have to live without
+  pthreads, and thus without serial/ethernet/audio support (but the "UDP
+  tunnelling" network should work).
+
+  ATTENTION NetBSD/mac68k USERS:
+  Current (as of July 2000) versions of the NetBSD/mac68k kernel have a bug
+  that not only prevents Basilisk II from running properly but seems to even
+  cause kernel panics under certain conditions! Apply the following patch to
+  /sys/arch/mac68k/mac68k/macromasm.s, recompile and re-install the kernel
+  and reboot before using Basilisk II:
+
+    --- macromasm.s.orig    Wed Jul  5 19:29:01 2000
+    +++ macromasm.s Wed Jul  5 19:12:34 2000
+    @@ -37,6 +37,8 @@
+ 
+     #include "opt_adb.h"
+     #include "assym.h"
+    +#include <machine/asm.h>
+    +#include <machine/trap.h>
+ 
+ 
+            /* Define this symbol as global with (v) value */
+    @@ -437,8 +439,9 @@
+            movw    sp@(FR_HW + 4), d0      | retrieve status register
+            andw    #PSL_S, d0      | supervisor state?
+            bne     Lalnosup        | branch if supervisor
+    -       jbsr    _mrg_aline_user | user a-line trap
+    -       bra     Lalrts
+    +       addql   #4, sp          | pop frame ptr
+    +       movql   #T_ILLINST, d0  | user-mode fault
+    +       jra     _ASM_LABEL(fault)
+     Lalnosup:
+     #define FR_PC (FR_HW+2)
+            movl    sp@(FR_PC + 4), a0      | retrieve PC
+
 AmigaOS:
   If you have a binary distribution of Basilisk II for AmigaOS, there is an
   executable included. You must also have the "PrepareEmul" utility installed
@@ -96,9 +130,10 @@ AmigaOS:
   following:
 
     cd src/AmigaOS
-    smake
+    make
 
-  To recompile Basilisk II, you need SAS/C 6.58. Earlier versions may not work.
+  To recompile Basilisk II, you need the GeekGadgets development suite and
+  PhxAss (which can be found on Aminet).
 
 Windows NT:
   If you have a binary distribution of Basilisk II for Windows, there is a