. Update to patchset 2:

  . Many patches are now unnecessary as they are included in the new
    patchset.
  . The browser plugin and Java Web Start is enabled on i386 (there are
    64 bit issues with both the plugin and Mozilla/Firefox which prevent
    enabling it on amd64).
. Update the amount of disk space needed.
. Update the status of the port.
. Disable building the shared class data archive.  This broke the build
  on amd64 and appears to also be problematic on some i386 versions
  (4.11 is broken at least).  It will reappear in future, probably
  initially on a limited set of FreeBSD versions and architectures
  (6.0/i386 is reported to work).

Reviewed by:	freebsd-java@
Approved by:	maintainer timeout (1 week)

1 files changed, 0 insertions, 9 deletions

diff --git a/java/jdk16/files/patch-vm::os_bsd.cpp b/java/jdk16/files/patch-vm::os_bsd.cpp
index f2d865a6da54..25bd71db866c 100644
--- a/java/jdk16/files/patch-vm::os_bsd.cpp
+++ b/java/jdk16/files/patch-vm::os_bsd.cpp
@@ -11,12 +11,3 @@ $FreeBSD$
  #define EXTENSIONS_DIR "/lib/ext"
  #define ENDORSED_DIR "/lib/endorsed"
  
-@@ -1898,7 +1898,7 @@
-     } while ((res == OS_ERR) && (errno == EINTR));
-   } else {
-     assert(Thread::current()->is_Java_thread(), "must be java thread");
--    INTERRUPTIBLE_NORESTART(nanosleep(&t, &t), res, os::Bsd::clear_interrupted);
-+    INTERRUPTIBLE_NORESTART_VM(nanosleep(&t, &t), res, os::Bsd::clear_interrupted);
-   }
-   // INTERRUPTIBLE_NORESTART_VM returns res == OS_INTRPT for thread.Interrupt
-