. Update to patchset 4.

36 files changed, 22 insertions, 674 deletions

diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index 0d57f11c6c56..5ae909857ec4 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	6
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/java2/download.html
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk15.html
@@ -51,7 +50,7 @@ PATCHSETFILE=	bsd-jdk15-patches-${JDK_PATCHSET_VERSION}.tar.bz2
 POLICYFILE=	jce_policy-${JDK_VERSION:S/./_/g}.zip
 
 JDK_VERSION=	1.5.0
-JDK_PATCHSET_VERSION=	3
+JDK_PATCHSET_VERSION=	4
 LATEST_LINK=	jdk15
 
 SUN_LINUX_JDK_VERSION=	1.4.2
@@ -104,11 +103,8 @@ BUILD_DEPENDS+=	${JDK14DIR}/bin/javac:${PORTSDIR}/java/linux-sun-jdk14
 .if defined(WITHOUT_WEB)
 MAKE_ENV+=	DONT_BUILD_DEPLOY="YES"
 .else
-USE_GECKO=	mozilla # firefox and seamonkey do not work
-.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
-MAKE_ENV+=	BROWSER=${GECKO}
 USE_GNOME=	desktopfileutils
-MAKE_ENV+=	ALT_MOZILLA_HEADERS_PATH="${LOCALBASE}/include"
+LIB_DEPENDS=    nspr4.1:$(PORTSDIR)/devel/nspr
 .endif
 
 ONLY_FOR_ARCHS=	i386 amd64
@@ -222,14 +218,6 @@ pre-fetch:
 	@${ECHO_MSG}
 .endif
 
-pre-everything::
-	@${ECHO_MSG}
-	@${ECHO_MSG} "WARNING: "
-	@${ECHO_MSG} "WARNING: This is BETA quality software!"
-	@${ECHO_MSG} "WARNING: Use in a production environment is at your own risk."
-	@${ECHO_MSG} "WARNING: "
-	@${ECHO_MSG}
-
 pre-patch:
 	@cd ${WRKDIR} &&  \
 		${BZIP2_CMD} -dc ${DISTDIR}/${PATCHSETFILE} | ${TAR} -xf - && \
diff --git a/java/jdk15/distinfo b/java/jdk15/distinfo
index e3e1c2e7a7f5..c922633b6ba2 100644
--- a/java/jdk15/distinfo
+++ b/java/jdk15/distinfo
@@ -4,9 +4,9 @@ SIZE (jdk-1_5_0-src-scsl.zip) = 58338869
 MD5 (jdk-1_5_0-bin-scsl.zip) = 3c3b2c079628141fa28f5f0f1cde5bf0
 SHA256 (jdk-1_5_0-bin-scsl.zip) = f7be15e4478165c361d011f39c02fea558dba442aeb3556357f4c7771db763f1
 SIZE (jdk-1_5_0-bin-scsl.zip) = 2219433
+MD5 (bsd-jdk15-patches-4.tar.bz2) = 2f61d0360f96950e2c56032aed4350c2
+SHA256 (bsd-jdk15-patches-4.tar.bz2) = 383cfb8632250d6bbaa16a96dc2b87c5e99e6ec8eb77cd2134c390db2fdb3a7c
+SIZE (bsd-jdk15-patches-4.tar.bz2) = 746011
 MD5 (jce_policy-1_5_0.zip) = 169441bba1ca95e84e030e116f258d79
 SHA256 (jce_policy-1_5_0.zip) = 4de78da737c6d66b74eb6caebf6bdb0648825a95e2909e815678a0d306bf6d8b
 SIZE (jce_policy-1_5_0.zip) = 8826
-MD5 (bsd-jdk15-patches-3.tar.bz2) = 66e19561ca6d0e775dcd590fd97a6921
-SHA256 (bsd-jdk15-patches-3.tar.bz2) = 84bff46fb1f091fb8a508287cadd740cdc07691c616a72a9d84d3ee53b8cab6c
-SIZE (bsd-jdk15-patches-3.tar.bz2) = 650413
diff --git a/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk b/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk
index 66fa0007e4d0..c3bd401665a1 100644
--- a/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk
+++ b/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk
@@ -2,18 +2,6 @@ $FreeBSD$
 
 --- ../../deploy/make/plugin/common/Defs-bsd.gmk.orig	Sun Dec 10 11:49:51 2006
 +++ ../../deploy/make/plugin/common/Defs-bsd.gmk	Sun Dec 10 21:44:53 2006
-@@ -9,9 +9,9 @@
- 
- # Default MOZILLA_PATH and allow override.
- ifeq ($(TRUE_PLATFORM), OpenBSD)
--MOZILLA_PATH = /usr/local
-+MOZILLA_PATH = $(LOCALBASE)
- else
--MOZILLA_PATH = /usr/X11R6
-+MOZILLA_PATH = $(X11BASE)
- endif
- ifdef ALT_MOZILLA_PATH
-   MOZILLA_PATH = $(subst //,/,$(ALT_MOZILLA_PATH))
 @@ -29,7 +29,7 @@
  endif
  
diff --git a/java/jdk15/files/patch-deploy::common::Sanity.gmk b/java/jdk15/files/patch-deploy::common::Sanity.gmk
deleted file mode 100644
index 8e772eddd1ca..000000000000
--- a/java/jdk15/files/patch-deploy::common::Sanity.gmk
+++ /dev/null
@@ -1,17 +0,0 @@
-$FreeBSD$
-
---- ../../deploy/make/common/Sanity.gmk	18 Dec 2006 21:49:45 -0000	1.8
-+++ ../../deploy/make/common/Sanity.gmk	10 Jan 2007 17:22:34 -0000
-@@ -50,10 +50,10 @@
-   ifeq ($(TRUE_PLATFORM), FreeBSD)
-     ifeq ($(ARCH_DATA_MODEL), 32)
-       REQUIRED_BSD_VERSION = 4.1[01]|5.[345]|6.*
--      REQUIRED_GCC_VERSION = 2.95.4|3.*
-+      REQUIRED_GCC_VERSION = 2.95.4|3.*|4.*
-     else
-       REQUIRED_BSD_VERSION = 5.[345]|6.*
--      REQUIRED_GCC_VERSION = 3.*
-+      REQUIRED_GCC_VERSION = 3.*|4.*
-     endif
-   endif
- endif
diff --git a/java/jdk15/files/patch-deploy::jcomponent::CPluginVM_OP.cpp b/java/jdk15/files/patch-deploy::jcomponent::CPluginVM_OP.cpp
deleted file mode 100644
index 78d8d258832f..000000000000
--- a/java/jdk15/files/patch-deploy::jcomponent::CPluginVM_OP.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$FreeBSD$
-
---- ../../deploy/src/plugin/share/jcomponent/CPluginVM_OP.cpp.orig	Tue Oct 19 15:04:42 2004
-+++ ../../deploy/src/plugin/share/jcomponent/CPluginVM_OP.cpp	Thu Jul  6 17:09:36 2006
-@@ -305,7 +305,11 @@
-     char * jre = m_ltstate->java_dir;
-     
-     // ARCH is passed in on the compile line
-+#if defined(_ALLBSD_SOURCE) && defined(__amd64__)
-+    sprintf(our_ld_paths,"%s/lib/%s/server:%s/lib/%s",jre,ARCH,jre,ARCH);
-+#else
-     sprintf(our_ld_paths,"%s/lib/%s/client:%s/lib/%s",jre,ARCH,jre,ARCH);
-+#endif
- 
-     char * new_ld_lib_path;
- 
diff --git a/java/jdk15/files/patch-deploy::jvm_exec::java_vm.c b/java/jdk15/files/patch-deploy::jvm_exec::java_vm.c
deleted file mode 100644
index fd5b16551898..000000000000
--- a/java/jdk15/files/patch-deploy::jvm_exec::java_vm.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- ../../deploy/src/plugin/solaris/jvm_exec/java_vm.c.orig	Thu Jul  6 17:10:12 2006
-+++ ../../deploy/src/plugin/solaris/jvm_exec/java_vm.c	Thu Jul  6 17:10:12 2006
-@@ -157,7 +157,7 @@
-     libjvm = dlopen(jvmpath, RTLD_NOW + RTLD_GLOBAL);
-   
-     if (libjvm == NULL) {
--        snprintf(jvmpath, sizeof jvmpath, "%s/lib/"LIBARCH"/%s", java_home, libname);
-+        snprintf(jvmpath, sizeof jvmpath, "%s/lib/"LIBARCH"/server/%s", java_home, libname);
-         libjvm = dlopen(jvmpath, RTLD_NOW + RTLD_GLOBAL);
-     }
- 
diff --git a/java/jdk15/files/patch-deploy::ns7-adapter::Makefile b/java/jdk15/files/patch-deploy::ns7-adapter::Makefile
index da7b0f3b43d2..3a53b9077fa7 100644
--- a/java/jdk15/files/patch-deploy::ns7-adapter::Makefile
+++ b/java/jdk15/files/patch-deploy::ns7-adapter::Makefile
@@ -1,11 +1,11 @@
 $FreeBSD$
 
---- ../../deploy/make/plugin/adapter/ns7-adapter/Makefile.orig	Sun Dec 10 21:38:35 2006
-+++ ../../deploy/make/plugin/adapter/ns7-adapter/Makefile	Sun Dec 10 21:39:08 2006
-@@ -84,8 +84,8 @@
- 		$(subst \,/, $(MOZILLA_HEADERS_PATH)/$(BROWSER)/plugin) \
- 		$(subst \,/, $(MOZILLA_HEADERS_PATH)/$(BROWSER)/xpcom)
-   endif
+--- ../../deploy/make/plugin/adapter/ns7-adapter/Makefile.orig	Sat Jan 20 12:52:46 2007
++++ ../../deploy/make/plugin/adapter/ns7-adapter/Makefile	Sat Jan 20 12:53:22 2007
+@@ -66,8 +66,8 @@
+ COMMONDIR=  $(PLUGIN_TOP)/src/plugin/solaris/common
+ ifeq ($(PLATFORM), bsd)
+ MOZHDRDIR = $(subst \,/,$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns7)
 -X11HDRDIR = /usr/X11R6/include
 -ICONVHDRDIR = /usr/local/include
 +X11HDRDIR = $(X11BASE)/include
diff --git a/java/jdk15/files/patch-deploy::nscore::JavaVM5.cpp b/java/jdk15/files/patch-deploy::nscore::JavaVM5.cpp
deleted file mode 100644
index 6a44c9ce8011..000000000000
--- a/java/jdk15/files/patch-deploy::nscore::JavaVM5.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$FreeBSD$
-
---- ../../deploy/src/plugin/solaris/nscore/JavaVM5.cpp.orig	Thu Jun 15 18:08:03 2006
-+++ ../../deploy/src/plugin/solaris/nscore/JavaVM5.cpp	Thu Jul  6 17:10:37 2006
-@@ -1289,7 +1289,11 @@
-   //          jre/lib/<arch>/classic/libjvm.so
-   // (to permit hotspot later).  So this path is only needed for 1.2
- 
-+#if defined(_ALLBSD_SOURCE) && defined(__amd64__)
-+      sprintf(buff, "LD_LIBRARY_PATH=%s/lib/%s/server:%s/lib/%s",
-+#else
-       sprintf(buff, "LD_LIBRARY_PATH=%s/lib/%s/client:%s/lib/%s",
-+#endif
-               jre, LIBARCH,                // libjvm
-               jre, LIBARCH);               // libjava, libawt & friends
- 
diff --git a/java/jdk15/files/patch-hotspot::vm::globals_bsd_amd64.hpp b/java/jdk15/files/patch-hotspot::vm::globals_bsd_amd64.hpp
deleted file mode 100644
index 866fd9ace02a..000000000000
--- a/java/jdk15/files/patch-hotspot::vm::globals_bsd_amd64.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- ../../hotspot/src/os_cpu/bsd_amd64/vm/globals_bsd_amd64.hpp.orig	Thu Jun 15 17:58:02 2006
-+++ ../../hotspot/src/os_cpu/bsd_amd64/vm/globals_bsd_amd64.hpp	Thu Jun 15 17:59:02 2006
-@@ -12,7 +12,7 @@
- //
- define_pd_global(bool, DontYieldALot,            false);
- //define_pd_global(intx, ThreadStackSize,	 0); // 0 => use system default
--define_pd_global(intx, ThreadStackSize,		 256);
-+define_pd_global(intx, ThreadStackSize,		 1024);
- define_pd_global(intx, VMThreadStackSize,	 1024);
- define_pd_global(intx, CompilerThreadStackSize,  0);
- define_pd_global(intx, SurvivorRatio,            8);
diff --git a/java/jdk15/files/patch-hotspot::vm::thread_bsd.inline.hpp b/java/jdk15/files/patch-hotspot::vm::thread_bsd.inline.hpp
deleted file mode 100644
index 794d795d04a4..000000000000
--- a/java/jdk15/files/patch-hotspot::vm::thread_bsd.inline.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$FreeBSD$
-
---- ../../hotspot/src/os/bsd/vm/thread_bsd.inline.hpp.orig	Thu Jun 15 17:58:02 2006
-+++ ../../hotspot/src/os/bsd/vm/thread_bsd.inline.hpp	Thu Jun 15 17:59:19 2006
-@@ -19,7 +19,10 @@
- 
-   uintptr_t raw = pd_raw_thread_id();
-   int ix = pd_cache_index(raw);
--#ifdef __OpenBSD__
-+// XXXBSD: disable fast case. there is a race condition where the
-+// fast case returns a different thread from the slow case and has
-+// been seen on both OpenBSD and FreeBSD.
-+#if 1
-   return ThreadLocalStorage::get_thread_via_cache_slowly(raw, ix);
- #else
-   Thread *Candidate = ThreadLocalStorage::_get_thread_cache[ix];
diff --git a/java/jdk15/files/patch-j2se::awt::canvas.c b/java/jdk15/files/patch-j2se::awt::canvas.c
deleted file mode 100644
index cf69af4aa14f..000000000000
--- a/java/jdk15/files/patch-j2se::awt::canvas.c
+++ /dev/null
@@ -1,32 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/src/solaris/native/sun/awt/canvas.c	10 Jan 2005 15:09:40 -0000	1.2
-+++ ../../j2se/src/solaris/native/sun/awt/canvas.c	19 Apr 2006 22:21:51 -0000
-@@ -258,10 +258,10 @@
-     {java_awt_event_KeyEvent_VK_DOWN, XK_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
- 
-     /* Keypad equivalents of Triangular Navigation Block */
--    {java_awt_event_KeyEvent_VK_KP_LEFT, XK_KP_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
--    {java_awt_event_KeyEvent_VK_KP_UP, XK_KP_Up, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
--    {java_awt_event_KeyEvent_VK_KP_RIGHT, XK_KP_Right, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
--    {java_awt_event_KeyEvent_VK_KP_DOWN, XK_KP_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
-+    {java_awt_event_KeyEvent_VK_LEFT, XK_KP_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
-+    {java_awt_event_KeyEvent_VK_UP, XK_KP_Up, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
-+    {java_awt_event_KeyEvent_VK_RIGHT, XK_KP_Right, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
-+    {java_awt_event_KeyEvent_VK_DOWN, XK_KP_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
- 
-     /* Other vendor-specific Triangular Navigation Block */
-     {java_awt_event_KeyEvent_VK_LEFT, osfXK_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
-@@ -1349,7 +1349,7 @@
- {
-     KeySym originalKeysym = *keysym;
- 
--#if !defined(__linux__) 	// XXXBSD: applies to FreeBSD?
-+#if !defined(__linux__) && !defined(_ALLBSD_SOURCE)
-     /* The following code on Linux will cause the keypad keys
-      * not to echo on JTextField when the NumLock is on. The
-      * keysyms will be 0, because the last parameter 2 is not defined.
-Index: j2se/src/solaris/native/sun/xawt/XWindow.c
-===================================================================
-RCS file: /home/Java/CVS/JDK2/javasrc_1_5_scsl/j2se/src/solaris/native/sun/xawt/XWindow.c,v
-retrieving revision 1.1.1.1
diff --git a/java/jdk15/files/patch-j2se::font::t1.c b/java/jdk15/files/patch-j2se::font::t1.c
deleted file mode 100644
index 7cb654bf7ff0..000000000000
--- a/java/jdk15/files/patch-j2se::font::t1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/src/share/native/sun/font/t2k/t1.c.orig	Tue Oct 19 15:00:39 2004
-+++ ../../j2se/src/share/native/sun/font/t2k/t1.c	Tue Jul 18 21:42:18 2006
-@@ -2035,9 +2035,10 @@
- 
-     if ( firstChar >= 'A' && firstChar <= 'Z' )
-       lookupIndex = firstChar - 'A';
--    else
-+    else if ( firstChar >= 'a' && firstChar <= 'z' )
-       lookupIndex = firstChar - 'a' + 26;
--
-+    else /* underscore is also valid but not handled */
-+      return 0;
- 
-     startIndex = PSNAME_START_INDEX[ lookupIndex ];
-     endIndex = PSNAME_START_INDEX[ lookupIndex + 1 ];
diff --git a/java/jdk15/files/patch-j2se::io::io_util.h b/java/jdk15/files/patch-j2se::io::io_util.h
deleted file mode 100644
index 0230858c006c..000000000000
--- a/java/jdk15/files/patch-j2se::io::io_util.h
+++ /dev/null
@@ -1,21 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/src/share/native/java/io/io_util.h	8 Nov 2004 22:27:35 -0000	1.1.1.1
-+++ ../../j2se/src/share/native/java/io/io_util.h	7 Sep 2006 19:40:19 -0000
-@@ -11,7 +11,15 @@
- extern jfieldID IO_fd_fdID;
- extern jfieldID IO_handle_fdID;
- 
--#if !defined(O_DSYNC) || !defined(O_SYNC)
-+#ifdef _ALLBSD_SOURCE
-+#include <fcntl.h>
-+#ifndef O_SYNC
-+#define O_SYNC  O_FSYNC
-+#endif
-+#ifndef O_DSYNC
-+#define O_DSYNC O_FSYNC
-+#endif
-+#elif !defined(O_DSYNC) || !defined(O_SYNC)
- #define O_SYNC  (0x0800)
- #define O_DSYNC (0x2000)
- #endif
diff --git a/java/jdk15/files/patch-j2se::lang::ProcessEnvironment_md.c b/java/jdk15/files/patch-j2se::lang::ProcessEnvironment_md.c
deleted file mode 100644
index 64f8f4ebd6c4..000000000000
--- a/java/jdk15/files/patch-j2se::lang::ProcessEnvironment_md.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/src/solaris/native/java/lang/ProcessEnvironment_md.c.orig	Tue Oct 19 15:02:09 2004
-+++ ../../j2se/src/solaris/native/java/lang/ProcessEnvironment_md.c	Thu Jun 15 17:58:34 2006
-@@ -32,7 +32,7 @@
- 
-     for (i = 0; environ[i]; i++) {
- 	/* Ignore corrupted environment variables */
--	if (strchr(environ[i], '=') != NULL)
-+	if (strchr(environ[i], '=') != NULL && *environ[i] != '=')
- 	    count++;
-     }
- 
-@@ -43,7 +43,7 @@
- 	jsize len = strlen(environ[i]);
- 	const char * varEnd = strchr(environ[i], '=');
- 	/* Ignore corrupted environment variables */
--	if (varEnd != NULL) {
-+	if (varEnd != NULL && varEnd != environ[i]) {
- 	    jbyteArray var, val;
- 	    const char * valBeg = varEnd + 1;
- 	    jsize varLength = varEnd - environ[i];
diff --git a/java/jdk15/files/patch-j2se::nio::ch::FileChannelImpl.c b/java/jdk15/files/patch-j2se::nio::ch::FileChannelImpl.c
deleted file mode 100644
index 8dea374d17f3..000000000000
--- a/java/jdk15/files/patch-j2se::nio::ch::FileChannelImpl.c
+++ /dev/null
@@ -1,38 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/src/solaris/native/sun/nio/ch/FileChannelImpl.c.orig	Fri Jul  7 10:47:18 2006
-+++ ../../j2se/src/solaris/native/sun/nio/ch/FileChannelImpl.c	Fri Jul  7 14:48:06 2006
-@@ -273,14 +273,28 @@
-     free(buf);
- 
-     /*
--     * XXXBSD: there're potential problems with NBIO fd's.  Check it.
-+     * Similar to solaris if we've transferred any data return
-+     * the number of bytes and ignore any error
-+    */
-+    if (offset - (off_t)position > 0)
-+	return (offset - (off_t)position);
-+
-+    /*
-+     * Deal with NBIO EAGAIN & EINTR the same as solaris. 
-      */
-     if (r == -1 || w == -1) {
--	fprintf(stderr, "%d %d %d %d %d\n", srcFD, dstFD, r, w, errno);
--	JNU_ThrowIOExceptionWithLastError(env, "Transfer failed");
--	return IOS_THROWN;
-+        switch (errno) {
-+	    case EAGAIN:
-+	        return IOS_UNAVAILABLE;
-+	    case EINTR:
-+	        return IOS_INTERRUPTED;
-+	    default:
-+		JNU_ThrowIOExceptionWithLastError(env, "Transfer failed");
-+		return IOS_THROWN;
-+        }
-     }
--    return (offset - (off_t)position);
-+
-+    return (0);
- #endif
- }
- 
diff --git a/java/jdk15/files/patch-j2se::util::TimeZone.java b/java/jdk15/files/patch-j2se::util::TimeZone.java
deleted file mode 100644
index 834897b78058..000000000000
--- a/java/jdk15/files/patch-j2se::util::TimeZone.java
+++ /dev/null
@@ -1,21 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/src/share/classes/java/util/TimeZone.java	8 Nov 2004 22:27:20 -0000	1.1.1.1
-+++ ../../j2se/src/share/classes/java/util/TimeZone.java	5 Nov 2006 17:43:12 -0000
-@@ -748,15 +748,13 @@
- 	}
- 	int gmtOffset =  (hours * 60 + num) * 60 * 1000;
- 
-+	zi = ZoneInfoFile.getCustomTimeZone(id, negative ? -gmtOffset : gmtOffset);
- 	if (gmtOffset == 0) {
--	    zi = ZoneInfoFile.getZoneInfo(GMT_ID);
- 	    if (negative) {
- 		zi.setID("GMT-00:00");
- 	    } else {
- 		zi.setID("GMT+00:00");
- 	    }
--	} else {
--	    zi = ZoneInfoFile.getCustomTimeZone(id, negative ? -gmtOffset : gmtOffset);
- 	}
- 	return zi;
-     }
diff --git a/java/jdk15/files/patch-j2se::xawt::XWindow.c b/java/jdk15/files/patch-j2se::xawt::XWindow.c
deleted file mode 100644
index 6060511e8263..000000000000
--- a/java/jdk15/files/patch-j2se::xawt::XWindow.c
+++ /dev/null
@@ -1,28 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/src/solaris/native/sun/xawt/XWindow.c	8 Nov 2004 22:27:40 -0000	1.1.1.1
-+++ ../../j2se/src/solaris/native/sun/xawt/XWindow.c	19 Apr 2006 22:21:51 -0000
-@@ -204,10 +204,10 @@
-     {java_awt_event_KeyEvent_VK_DOWN, XK_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
- 
-     /* Keypad equivalents of Triangular Navigation Block */
--    {java_awt_event_KeyEvent_VK_KP_LEFT, XK_KP_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
--    {java_awt_event_KeyEvent_VK_KP_UP, XK_KP_Up, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
--    {java_awt_event_KeyEvent_VK_KP_RIGHT, XK_KP_Right, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
--    {java_awt_event_KeyEvent_VK_KP_DOWN, XK_KP_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
-+    {java_awt_event_KeyEvent_VK_LEFT, XK_KP_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
-+    {java_awt_event_KeyEvent_VK_UP, XK_KP_Up, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
-+    {java_awt_event_KeyEvent_VK_RIGHT, XK_KP_Right, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
-+    {java_awt_event_KeyEvent_VK_DOWN, XK_KP_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
- 
-     /* Other vendor-specific Triangular Navigation Block */
-     {java_awt_event_KeyEvent_VK_LEFT, osfXK_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
-@@ -742,7 +742,7 @@
- {
-     KeySym originalKeysym = *keysym;
- 
--#ifndef __linux__
-+#if !defined(__linux__) && !defined(_ALLBSD_SOURCE)
-     /* The following code on Linux will cause the keypad keys
-      * not to echo on JTextField when the NumLock is on. The
-      * keysyms will be 0, because the last parameter 2 is not defined.
diff --git a/java/jdk15/files/patch-vm::os_bsd.cpp b/java/jdk15/files/patch-vm::os_bsd.cpp
index f9d9f795f508..25bd71db866c 100644
--- a/java/jdk15/files/patch-vm::os_bsd.cpp
+++ b/java/jdk15/files/patch-vm::os_bsd.cpp
@@ -11,35 +11,3 @@ $FreeBSD$
  #define EXTENSIONS_DIR "/lib/ext"
  #define ENDORSED_DIR "/lib/endorsed"
  
-@@ -1968,16 +1968,23 @@
- 
- static int os_sleep(jlong millis, bool interruptible) {
-   int res;
--  if (!interruptible) {
--    do {
--	res = os_nanosleep(&millis);
--    } while ((res == OS_ERR) && (errno == EINTR) && (millis > 0));
--  } else {
--    INTERRUPTIBLE_NORESTART_VM(os_nanosleep(&millis), res, os::Bsd::clear_interrupted);
-+
-+  while (millis > 0) {
-+    if (!interruptible) {
-+      res = os_nanosleep(&millis);
-+    } else {
-+      INTERRUPTIBLE_NORESTART_VM(os_nanosleep(&millis), res, os::Bsd::clear_interrupted);
-+    }
-+    // INTERRUPTIBLE_NORESTART_VM returns res == OS_INTRPT for thread.Interrupt
-+
-+    if((res == OS_ERR) && (errno == EINTR)) {
-+      if(millis <= 0)
-+	return OS_OK;
-+    } else
-+      return res;
-   }
--  // INTERRUPTIBLE_NORESTART_VM returns res == OS_INTRPT for thread.Interrupt
- 
--  return res;
-+  return OS_OK;
- }
- 
- int os::Bsd::naked_sleep() {
diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile
index 0d57f11c6c56..5ae909857ec4 100644
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	6
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/java2/download.html
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk15.html
@@ -51,7 +50,7 @@ PATCHSETFILE=	bsd-jdk15-patches-${JDK_PATCHSET_VERSION}.tar.bz2
 POLICYFILE=	jce_policy-${JDK_VERSION:S/./_/g}.zip
 
 JDK_VERSION=	1.5.0
-JDK_PATCHSET_VERSION=	3
+JDK_PATCHSET_VERSION=	4
 LATEST_LINK=	jdk15
 
 SUN_LINUX_JDK_VERSION=	1.4.2
@@ -104,11 +103,8 @@ BUILD_DEPENDS+=	${JDK14DIR}/bin/javac:${PORTSDIR}/java/linux-sun-jdk14
 .if defined(WITHOUT_WEB)
 MAKE_ENV+=	DONT_BUILD_DEPLOY="YES"
 .else
-USE_GECKO=	mozilla # firefox and seamonkey do not work
-.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
-MAKE_ENV+=	BROWSER=${GECKO}
 USE_GNOME=	desktopfileutils
-MAKE_ENV+=	ALT_MOZILLA_HEADERS_PATH="${LOCALBASE}/include"
+LIB_DEPENDS=    nspr4.1:$(PORTSDIR)/devel/nspr
 .endif
 
 ONLY_FOR_ARCHS=	i386 amd64
@@ -222,14 +218,6 @@ pre-fetch:
 	@${ECHO_MSG}
 .endif
 
-pre-everything::
-	@${ECHO_MSG}
-	@${ECHO_MSG} "WARNING: "
-	@${ECHO_MSG} "WARNING: This is BETA quality software!"
-	@${ECHO_MSG} "WARNING: Use in a production environment is at your own risk."
-	@${ECHO_MSG} "WARNING: "
-	@${ECHO_MSG}
-
 pre-patch:
 	@cd ${WRKDIR} &&  \
 		${BZIP2_CMD} -dc ${DISTDIR}/${PATCHSETFILE} | ${TAR} -xf - && \
diff --git a/java/jdk16/distinfo b/java/jdk16/distinfo
index e3e1c2e7a7f5..c922633b6ba2 100644
--- a/java/jdk16/distinfo
+++ b/java/jdk16/distinfo
@@ -4,9 +4,9 @@ SIZE (jdk-1_5_0-src-scsl.zip) = 58338869
 MD5 (jdk-1_5_0-bin-scsl.zip) = 3c3b2c079628141fa28f5f0f1cde5bf0
 SHA256 (jdk-1_5_0-bin-scsl.zip) = f7be15e4478165c361d011f39c02fea558dba442aeb3556357f4c7771db763f1
 SIZE (jdk-1_5_0-bin-scsl.zip) = 2219433
+MD5 (bsd-jdk15-patches-4.tar.bz2) = 2f61d0360f96950e2c56032aed4350c2
+SHA256 (bsd-jdk15-patches-4.tar.bz2) = 383cfb8632250d6bbaa16a96dc2b87c5e99e6ec8eb77cd2134c390db2fdb3a7c
+SIZE (bsd-jdk15-patches-4.tar.bz2) = 746011
 MD5 (jce_policy-1_5_0.zip) = 169441bba1ca95e84e030e116f258d79
 SHA256 (jce_policy-1_5_0.zip) = 4de78da737c6d66b74eb6caebf6bdb0648825a95e2909e815678a0d306bf6d8b
 SIZE (jce_policy-1_5_0.zip) = 8826
-MD5 (bsd-jdk15-patches-3.tar.bz2) = 66e19561ca6d0e775dcd590fd97a6921
-SHA256 (bsd-jdk15-patches-3.tar.bz2) = 84bff46fb1f091fb8a508287cadd740cdc07691c616a72a9d84d3ee53b8cab6c
-SIZE (bsd-jdk15-patches-3.tar.bz2) = 650413
diff --git a/java/jdk16/files/patch-deploy::common::Defs-bsd.gmk b/java/jdk16/files/patch-deploy::common::Defs-bsd.gmk
index 66fa0007e4d0..c3bd401665a1 100644
--- a/java/jdk16/files/patch-deploy::common::Defs-bsd.gmk
+++ b/java/jdk16/files/patch-deploy::common::Defs-bsd.gmk
@@ -2,18 +2,6 @@ $FreeBSD$
 
 --- ../../deploy/make/plugin/common/Defs-bsd.gmk.orig	Sun Dec 10 11:49:51 2006
 +++ ../../deploy/make/plugin/common/Defs-bsd.gmk	Sun Dec 10 21:44:53 2006
-@@ -9,9 +9,9 @@
- 
- # Default MOZILLA_PATH and allow override.
- ifeq ($(TRUE_PLATFORM), OpenBSD)
--MOZILLA_PATH = /usr/local
-+MOZILLA_PATH = $(LOCALBASE)
- else
--MOZILLA_PATH = /usr/X11R6
-+MOZILLA_PATH = $(X11BASE)
- endif
- ifdef ALT_MOZILLA_PATH
-   MOZILLA_PATH = $(subst //,/,$(ALT_MOZILLA_PATH))
 @@ -29,7 +29,7 @@
  endif
  
diff --git a/java/jdk16/files/patch-deploy::common::Sanity.gmk b/java/jdk16/files/patch-deploy::common::Sanity.gmk
deleted file mode 100644
index 8e772eddd1ca..000000000000
--- a/java/jdk16/files/patch-deploy::common::Sanity.gmk
+++ /dev/null
@@ -1,17 +0,0 @@
-$FreeBSD$
-
---- ../../deploy/make/common/Sanity.gmk	18 Dec 2006 21:49:45 -0000	1.8
-+++ ../../deploy/make/common/Sanity.gmk	10 Jan 2007 17:22:34 -0000
-@@ -50,10 +50,10 @@
-   ifeq ($(TRUE_PLATFORM), FreeBSD)
-     ifeq ($(ARCH_DATA_MODEL), 32)
-       REQUIRED_BSD_VERSION = 4.1[01]|5.[345]|6.*
--      REQUIRED_GCC_VERSION = 2.95.4|3.*
-+      REQUIRED_GCC_VERSION = 2.95.4|3.*|4.*
-     else
-       REQUIRED_BSD_VERSION = 5.[345]|6.*
--      REQUIRED_GCC_VERSION = 3.*
-+      REQUIRED_GCC_VERSION = 3.*|4.*
-     endif
-   endif
- endif
diff --git a/java/jdk16/files/patch-deploy::jcomponent::CPluginVM_OP.cpp b/java/jdk16/files/patch-deploy::jcomponent::CPluginVM_OP.cpp
deleted file mode 100644
index 78d8d258832f..000000000000
--- a/java/jdk16/files/patch-deploy::jcomponent::CPluginVM_OP.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$FreeBSD$
-
---- ../../deploy/src/plugin/share/jcomponent/CPluginVM_OP.cpp.orig	Tue Oct 19 15:04:42 2004
-+++ ../../deploy/src/plugin/share/jcomponent/CPluginVM_OP.cpp	Thu Jul  6 17:09:36 2006
-@@ -305,7 +305,11 @@
-     char * jre = m_ltstate->java_dir;
-     
-     // ARCH is passed in on the compile line
-+#if defined(_ALLBSD_SOURCE) && defined(__amd64__)
-+    sprintf(our_ld_paths,"%s/lib/%s/server:%s/lib/%s",jre,ARCH,jre,ARCH);
-+#else
-     sprintf(our_ld_paths,"%s/lib/%s/client:%s/lib/%s",jre,ARCH,jre,ARCH);
-+#endif
- 
-     char * new_ld_lib_path;
- 
diff --git a/java/jdk16/files/patch-deploy::jvm_exec::java_vm.c b/java/jdk16/files/patch-deploy::jvm_exec::java_vm.c
deleted file mode 100644
index fd5b16551898..000000000000
--- a/java/jdk16/files/patch-deploy::jvm_exec::java_vm.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- ../../deploy/src/plugin/solaris/jvm_exec/java_vm.c.orig	Thu Jul  6 17:10:12 2006
-+++ ../../deploy/src/plugin/solaris/jvm_exec/java_vm.c	Thu Jul  6 17:10:12 2006
-@@ -157,7 +157,7 @@
-     libjvm = dlopen(jvmpath, RTLD_NOW + RTLD_GLOBAL);
-   
-     if (libjvm == NULL) {
--        snprintf(jvmpath, sizeof jvmpath, "%s/lib/"LIBARCH"/%s", java_home, libname);
-+        snprintf(jvmpath, sizeof jvmpath, "%s/lib/"LIBARCH"/server/%s", java_home, libname);
-         libjvm = dlopen(jvmpath, RTLD_NOW + RTLD_GLOBAL);
-     }
- 
diff --git a/java/jdk16/files/patch-deploy::ns7-adapter::Makefile b/java/jdk16/files/patch-deploy::ns7-adapter::Makefile
index da7b0f3b43d2..3a53b9077fa7 100644
--- a/java/jdk16/files/patch-deploy::ns7-adapter::Makefile
+++ b/java/jdk16/files/patch-deploy::ns7-adapter::Makefile
@@ -1,11 +1,11 @@
 $FreeBSD$
 
---- ../../deploy/make/plugin/adapter/ns7-adapter/Makefile.orig	Sun Dec 10 21:38:35 2006
-+++ ../../deploy/make/plugin/adapter/ns7-adapter/Makefile	Sun Dec 10 21:39:08 2006
-@@ -84,8 +84,8 @@
- 		$(subst \,/, $(MOZILLA_HEADERS_PATH)/$(BROWSER)/plugin) \
- 		$(subst \,/, $(MOZILLA_HEADERS_PATH)/$(BROWSER)/xpcom)
-   endif
+--- ../../deploy/make/plugin/adapter/ns7-adapter/Makefile.orig	Sat Jan 20 12:52:46 2007
++++ ../../deploy/make/plugin/adapter/ns7-adapter/Makefile	Sat Jan 20 12:53:22 2007
+@@ -66,8 +66,8 @@
+ COMMONDIR=  $(PLUGIN_TOP)/src/plugin/solaris/common
+ ifeq ($(PLATFORM), bsd)
+ MOZHDRDIR = $(subst \,/,$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns7)
 -X11HDRDIR = /usr/X11R6/include
 -ICONVHDRDIR = /usr/local/include
 +X11HDRDIR = $(X11BASE)/include
diff --git a/java/jdk16/files/patch-deploy::nscore::JavaVM5.cpp b/java/jdk16/files/patch-deploy::nscore::JavaVM5.cpp
deleted file mode 100644
index 6a44c9ce8011..000000000000
--- a/java/jdk16/files/patch-deploy::nscore::JavaVM5.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$FreeBSD$
-
---- ../../deploy/src/plugin/solaris/nscore/JavaVM5.cpp.orig	Thu Jun 15 18:08:03 2006
-+++ ../../deploy/src/plugin/solaris/nscore/JavaVM5.cpp	Thu Jul  6 17:10:37 2006
-@@ -1289,7 +1289,11 @@
-   //          jre/lib/<arch>/classic/libjvm.so
-   // (to permit hotspot later).  So this path is only needed for 1.2
- 
-+#if defined(_ALLBSD_SOURCE) && defined(__amd64__)
-+      sprintf(buff, "LD_LIBRARY_PATH=%s/lib/%s/server:%s/lib/%s",
-+#else
-       sprintf(buff, "LD_LIBRARY_PATH=%s/lib/%s/client:%s/lib/%s",
-+#endif
-               jre, LIBARCH,                // libjvm
-               jre, LIBARCH);               // libjava, libawt & friends
- 
diff --git a/java/jdk16/files/patch-hotspot::vm::globals_bsd_amd64.hpp b/java/jdk16/files/patch-hotspot::vm::globals_bsd_amd64.hpp
deleted file mode 100644
index 866fd9ace02a..000000000000
--- a/java/jdk16/files/patch-hotspot::vm::globals_bsd_amd64.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- ../../hotspot/src/os_cpu/bsd_amd64/vm/globals_bsd_amd64.hpp.orig	Thu Jun 15 17:58:02 2006
-+++ ../../hotspot/src/os_cpu/bsd_amd64/vm/globals_bsd_amd64.hpp	Thu Jun 15 17:59:02 2006
-@@ -12,7 +12,7 @@
- //
- define_pd_global(bool, DontYieldALot,            false);
- //define_pd_global(intx, ThreadStackSize,	 0); // 0 => use system default
--define_pd_global(intx, ThreadStackSize,		 256);
-+define_pd_global(intx, ThreadStackSize,		 1024);
- define_pd_global(intx, VMThreadStackSize,	 1024);
- define_pd_global(intx, CompilerThreadStackSize,  0);
- define_pd_global(intx, SurvivorRatio,            8);
diff --git a/java/jdk16/files/patch-hotspot::vm::thread_bsd.inline.hpp b/java/jdk16/files/patch-hotspot::vm::thread_bsd.inline.hpp
deleted file mode 100644
index 794d795d04a4..000000000000
--- a/java/jdk16/files/patch-hotspot::vm::thread_bsd.inline.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$FreeBSD$
-
---- ../../hotspot/src/os/bsd/vm/thread_bsd.inline.hpp.orig	Thu Jun 15 17:58:02 2006
-+++ ../../hotspot/src/os/bsd/vm/thread_bsd.inline.hpp	Thu Jun 15 17:59:19 2006
-@@ -19,7 +19,10 @@
- 
-   uintptr_t raw = pd_raw_thread_id();
-   int ix = pd_cache_index(raw);
--#ifdef __OpenBSD__
-+// XXXBSD: disable fast case. there is a race condition where the
-+// fast case returns a different thread from the slow case and has
-+// been seen on both OpenBSD and FreeBSD.
-+#if 1
-   return ThreadLocalStorage::get_thread_via_cache_slowly(raw, ix);
- #else
-   Thread *Candidate = ThreadLocalStorage::_get_thread_cache[ix];
diff --git a/java/jdk16/files/patch-j2se::awt::canvas.c b/java/jdk16/files/patch-j2se::awt::canvas.c
deleted file mode 100644
index cf69af4aa14f..000000000000
--- a/java/jdk16/files/patch-j2se::awt::canvas.c
+++ /dev/null
@@ -1,32 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/src/solaris/native/sun/awt/canvas.c	10 Jan 2005 15:09:40 -0000	1.2
-+++ ../../j2se/src/solaris/native/sun/awt/canvas.c	19 Apr 2006 22:21:51 -0000
-@@ -258,10 +258,10 @@
-     {java_awt_event_KeyEvent_VK_DOWN, XK_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
- 
-     /* Keypad equivalents of Triangular Navigation Block */
--    {java_awt_event_KeyEvent_VK_KP_LEFT, XK_KP_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
--    {java_awt_event_KeyEvent_VK_KP_UP, XK_KP_Up, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
--    {java_awt_event_KeyEvent_VK_KP_RIGHT, XK_KP_Right, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
--    {java_awt_event_KeyEvent_VK_KP_DOWN, XK_KP_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
-+    {java_awt_event_KeyEvent_VK_LEFT, XK_KP_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
-+    {java_awt_event_KeyEvent_VK_UP, XK_KP_Up, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
-+    {java_awt_event_KeyEvent_VK_RIGHT, XK_KP_Right, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
-+    {java_awt_event_KeyEvent_VK_DOWN, XK_KP_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
- 
-     /* Other vendor-specific Triangular Navigation Block */
-     {java_awt_event_KeyEvent_VK_LEFT, osfXK_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
-@@ -1349,7 +1349,7 @@
- {
-     KeySym originalKeysym = *keysym;
- 
--#if !defined(__linux__) 	// XXXBSD: applies to FreeBSD?
-+#if !defined(__linux__) && !defined(_ALLBSD_SOURCE)
-     /* The following code on Linux will cause the keypad keys
-      * not to echo on JTextField when the NumLock is on. The
-      * keysyms will be 0, because the last parameter 2 is not defined.
-Index: j2se/src/solaris/native/sun/xawt/XWindow.c
-===================================================================
-RCS file: /home/Java/CVS/JDK2/javasrc_1_5_scsl/j2se/src/solaris/native/sun/xawt/XWindow.c,v
-retrieving revision 1.1.1.1
diff --git a/java/jdk16/files/patch-j2se::font::t1.c b/java/jdk16/files/patch-j2se::font::t1.c
deleted file mode 100644
index 7cb654bf7ff0..000000000000
--- a/java/jdk16/files/patch-j2se::font::t1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/src/share/native/sun/font/t2k/t1.c.orig	Tue Oct 19 15:00:39 2004
-+++ ../../j2se/src/share/native/sun/font/t2k/t1.c	Tue Jul 18 21:42:18 2006
-@@ -2035,9 +2035,10 @@
- 
-     if ( firstChar >= 'A' && firstChar <= 'Z' )
-       lookupIndex = firstChar - 'A';
--    else
-+    else if ( firstChar >= 'a' && firstChar <= 'z' )
-       lookupIndex = firstChar - 'a' + 26;
--
-+    else /* underscore is also valid but not handled */
-+      return 0;
- 
-     startIndex = PSNAME_START_INDEX[ lookupIndex ];
-     endIndex = PSNAME_START_INDEX[ lookupIndex + 1 ];
diff --git a/java/jdk16/files/patch-j2se::io::io_util.h b/java/jdk16/files/patch-j2se::io::io_util.h
deleted file mode 100644
index 0230858c006c..000000000000
--- a/java/jdk16/files/patch-j2se::io::io_util.h
+++ /dev/null
@@ -1,21 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/src/share/native/java/io/io_util.h	8 Nov 2004 22:27:35 -0000	1.1.1.1
-+++ ../../j2se/src/share/native/java/io/io_util.h	7 Sep 2006 19:40:19 -0000
-@@ -11,7 +11,15 @@
- extern jfieldID IO_fd_fdID;
- extern jfieldID IO_handle_fdID;
- 
--#if !defined(O_DSYNC) || !defined(O_SYNC)
-+#ifdef _ALLBSD_SOURCE
-+#include <fcntl.h>
-+#ifndef O_SYNC
-+#define O_SYNC  O_FSYNC
-+#endif
-+#ifndef O_DSYNC
-+#define O_DSYNC O_FSYNC
-+#endif
-+#elif !defined(O_DSYNC) || !defined(O_SYNC)
- #define O_SYNC  (0x0800)
- #define O_DSYNC (0x2000)
- #endif
diff --git a/java/jdk16/files/patch-j2se::lang::ProcessEnvironment_md.c b/java/jdk16/files/patch-j2se::lang::ProcessEnvironment_md.c
deleted file mode 100644
index 64f8f4ebd6c4..000000000000
--- a/java/jdk16/files/patch-j2se::lang::ProcessEnvironment_md.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/src/solaris/native/java/lang/ProcessEnvironment_md.c.orig	Tue Oct 19 15:02:09 2004
-+++ ../../j2se/src/solaris/native/java/lang/ProcessEnvironment_md.c	Thu Jun 15 17:58:34 2006
-@@ -32,7 +32,7 @@
- 
-     for (i = 0; environ[i]; i++) {
- 	/* Ignore corrupted environment variables */
--	if (strchr(environ[i], '=') != NULL)
-+	if (strchr(environ[i], '=') != NULL && *environ[i] != '=')
- 	    count++;
-     }
- 
-@@ -43,7 +43,7 @@
- 	jsize len = strlen(environ[i]);
- 	const char * varEnd = strchr(environ[i], '=');
- 	/* Ignore corrupted environment variables */
--	if (varEnd != NULL) {
-+	if (varEnd != NULL && varEnd != environ[i]) {
- 	    jbyteArray var, val;
- 	    const char * valBeg = varEnd + 1;
- 	    jsize varLength = varEnd - environ[i];
diff --git a/java/jdk16/files/patch-j2se::nio::ch::FileChannelImpl.c b/java/jdk16/files/patch-j2se::nio::ch::FileChannelImpl.c
deleted file mode 100644
index 8dea374d17f3..000000000000
--- a/java/jdk16/files/patch-j2se::nio::ch::FileChannelImpl.c
+++ /dev/null
@@ -1,38 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/src/solaris/native/sun/nio/ch/FileChannelImpl.c.orig	Fri Jul  7 10:47:18 2006
-+++ ../../j2se/src/solaris/native/sun/nio/ch/FileChannelImpl.c	Fri Jul  7 14:48:06 2006
-@@ -273,14 +273,28 @@
-     free(buf);
- 
-     /*
--     * XXXBSD: there're potential problems with NBIO fd's.  Check it.
-+     * Similar to solaris if we've transferred any data return
-+     * the number of bytes and ignore any error
-+    */
-+    if (offset - (off_t)position > 0)
-+	return (offset - (off_t)position);
-+
-+    /*
-+     * Deal with NBIO EAGAIN & EINTR the same as solaris. 
-      */
-     if (r == -1 || w == -1) {
--	fprintf(stderr, "%d %d %d %d %d\n", srcFD, dstFD, r, w, errno);
--	JNU_ThrowIOExceptionWithLastError(env, "Transfer failed");
--	return IOS_THROWN;
-+        switch (errno) {
-+	    case EAGAIN:
-+	        return IOS_UNAVAILABLE;
-+	    case EINTR:
-+	        return IOS_INTERRUPTED;
-+	    default:
-+		JNU_ThrowIOExceptionWithLastError(env, "Transfer failed");
-+		return IOS_THROWN;
-+        }
-     }
--    return (offset - (off_t)position);
-+
-+    return (0);
- #endif
- }
- 
diff --git a/java/jdk16/files/patch-j2se::util::TimeZone.java b/java/jdk16/files/patch-j2se::util::TimeZone.java
deleted file mode 100644
index 834897b78058..000000000000
--- a/java/jdk16/files/patch-j2se::util::TimeZone.java
+++ /dev/null
@@ -1,21 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/src/share/classes/java/util/TimeZone.java	8 Nov 2004 22:27:20 -0000	1.1.1.1
-+++ ../../j2se/src/share/classes/java/util/TimeZone.java	5 Nov 2006 17:43:12 -0000
-@@ -748,15 +748,13 @@
- 	}
- 	int gmtOffset =  (hours * 60 + num) * 60 * 1000;
- 
-+	zi = ZoneInfoFile.getCustomTimeZone(id, negative ? -gmtOffset : gmtOffset);
- 	if (gmtOffset == 0) {
--	    zi = ZoneInfoFile.getZoneInfo(GMT_ID);
- 	    if (negative) {
- 		zi.setID("GMT-00:00");
- 	    } else {
- 		zi.setID("GMT+00:00");
- 	    }
--	} else {
--	    zi = ZoneInfoFile.getCustomTimeZone(id, negative ? -gmtOffset : gmtOffset);
- 	}
- 	return zi;
-     }
diff --git a/java/jdk16/files/patch-j2se::xawt::XWindow.c b/java/jdk16/files/patch-j2se::xawt::XWindow.c
deleted file mode 100644
index 6060511e8263..000000000000
--- a/java/jdk16/files/patch-j2se::xawt::XWindow.c
+++ /dev/null
@@ -1,28 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/src/solaris/native/sun/xawt/XWindow.c	8 Nov 2004 22:27:40 -0000	1.1.1.1
-+++ ../../j2se/src/solaris/native/sun/xawt/XWindow.c	19 Apr 2006 22:21:51 -0000
-@@ -204,10 +204,10 @@
-     {java_awt_event_KeyEvent_VK_DOWN, XK_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
- 
-     /* Keypad equivalents of Triangular Navigation Block */
--    {java_awt_event_KeyEvent_VK_KP_LEFT, XK_KP_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
--    {java_awt_event_KeyEvent_VK_KP_UP, XK_KP_Up, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
--    {java_awt_event_KeyEvent_VK_KP_RIGHT, XK_KP_Right, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
--    {java_awt_event_KeyEvent_VK_KP_DOWN, XK_KP_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
-+    {java_awt_event_KeyEvent_VK_LEFT, XK_KP_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
-+    {java_awt_event_KeyEvent_VK_UP, XK_KP_Up, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
-+    {java_awt_event_KeyEvent_VK_RIGHT, XK_KP_Right, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
-+    {java_awt_event_KeyEvent_VK_DOWN, XK_KP_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
- 
-     /* Other vendor-specific Triangular Navigation Block */
-     {java_awt_event_KeyEvent_VK_LEFT, osfXK_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
-@@ -742,7 +742,7 @@
- {
-     KeySym originalKeysym = *keysym;
- 
--#ifndef __linux__
-+#if !defined(__linux__) && !defined(_ALLBSD_SOURCE)
-     /* The following code on Linux will cause the keypad keys
-      * not to echo on JTextField when the NumLock is on. The
-      * keysyms will be 0, because the last parameter 2 is not defined.
diff --git a/java/jdk16/files/patch-vm::os_bsd.cpp b/java/jdk16/files/patch-vm::os_bsd.cpp
index f9d9f795f508..25bd71db866c 100644
--- a/java/jdk16/files/patch-vm::os_bsd.cpp
+++ b/java/jdk16/files/patch-vm::os_bsd.cpp
@@ -11,35 +11,3 @@ $FreeBSD$
  #define EXTENSIONS_DIR "/lib/ext"
  #define ENDORSED_DIR "/lib/endorsed"
  
-@@ -1968,16 +1968,23 @@
- 
- static int os_sleep(jlong millis, bool interruptible) {
-   int res;
--  if (!interruptible) {
--    do {
--	res = os_nanosleep(&millis);
--    } while ((res == OS_ERR) && (errno == EINTR) && (millis > 0));
--  } else {
--    INTERRUPTIBLE_NORESTART_VM(os_nanosleep(&millis), res, os::Bsd::clear_interrupted);
-+
-+  while (millis > 0) {
-+    if (!interruptible) {
-+      res = os_nanosleep(&millis);
-+    } else {
-+      INTERRUPTIBLE_NORESTART_VM(os_nanosleep(&millis), res, os::Bsd::clear_interrupted);
-+    }
-+    // INTERRUPTIBLE_NORESTART_VM returns res == OS_INTRPT for thread.Interrupt
-+
-+    if((res == OS_ERR) && (errno == EINTR)) {
-+      if(millis <= 0)
-+	return OS_OK;
-+    } else
-+      return res;
-   }
--  // INTERRUPTIBLE_NORESTART_VM returns res == OS_INTRPT for thread.Interrupt
- 
--  return res;
-+  return OS_OK;
- }
- 
- int os::Bsd::naked_sleep() {