Update to 1.4.2p5.

Important changes since last patchset:

. jdk14 port is now JDK 1.4.2 based!
. JavaWS distributing with jdk
. Runway problem fixed (fork() is no more problem for java apps)
. Sound support updated
. IPv6 support overhauled
. Drag'n'Drop support fixed (require open-motif mods)

As for now there's no more outstanding issues with this port!

FreeBSD port is also got a important of changes:

. optimized setup is now default (to get debuging bins/libs use WITH_DEBUG)

. bootstrap jdk autodetection.  If WITH_LINUX_BOOTSTRAP is not set, then
  it checks all known to work JDKs installed.  If nothing found, forces
  to install of linux-sun-jdk14

. Because of above change there's no NATIVE_BOOTSTRAP option anymore.  If
  native jdk14 is installed, it will be used by default.

7 files changed, 53 insertions, 107 deletions

diff --git a/java/jdk15/files/patch-UNIXProcess_md.c.bsd b/java/jdk15/files/patch-UNIXProcess_md.c.bsd
deleted file mode 100644
index d9ec95eefa7c..000000000000
--- a/java/jdk15/files/patch-UNIXProcess_md.c.bsd
+++ /dev/null
@@ -1,93 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/src/solaris/native/java/lang/UNIXProcess_md.c.bsd.orig	Wed Oct 29 12:22:58 2003
-+++ ../../j2se/src/solaris/native/java/lang/UNIXProcess_md.c.bsd	Wed Oct 29 12:23:33 2003
-@@ -22,6 +22,12 @@
- #include <errno.h>
- #include <unistd.h>
- 
-+#if defined(__FreeBSD__)
-+#include <dlfcn.h>
-+#include <pthread.h>
-+#include <pthread_np.h>
-+#endif
-+
- /* path in the environment */
- static char **PATH = 0;
- /* effective uid */
-@@ -228,6 +234,61 @@
-     }
- }
- 
-+#if defined(__FreeBSD__)
-+
-+extern pid_t   __sys_fork(void);
-+
-+static pid_t
-+jdk_fork_wrapper()
-+{
-+    pid_t resultPid;
-+#if (__FreeBSD_version < 5)
-+    static int is_libc_r = -1;
-+    void *funcref;
-+
-+    if (is_libc_r == -1) {
-+	is_libc_r = 1;
-+
-+	/*
-+         * BSDNOTE: Check for loaded symbols.
-+         *
-+         * If "_thr_critical_enter" is found assume we are using 'libthr'.
-+         * If _kse_critical_enter is found assume we are using 'libkse'.
-+         * Otherwise we are using libc_r.
-+         *
-+         * If libc_r is loaded, use fork system call drectly to avoid
-+         * problems with using protected pages. 
-+         *
-+         * --phantom
-+	 */
-+	funcref = dlsym(RTLD_DEFAULT, "_kse_critical_enter");
-+	if (funcref != NULL)
-+	    is_libc_r = 0;
-+	else {
-+	    funcref = dlsym(RTLD_DEFAULT, "_thr_critical_enter");
-+	    if (funcref != NULL)
-+		is_libc_r = 0;
-+	}
-+    }
-+
-+    if (is_libc_r == 0) {
-+	/* Not a libc_r */
-+	resultPid = fork();
-+    } else {
-+#endif /* __FreeBSD_version < 5 */
-+        pthread_suspend_all_np(); 
-+        resultPid = __sys_fork();
-+        if (resultPid != 0)
-+	    /* leave child in single threading mode */
-+ 	    pthread_resume_all_np();
-+#if (__FreeBSD_version < 5)
-+    }
-+#endif /* __FreeBSD_version < 5 */
-+
-+    return resultPid;
-+}
-+#endif /* __FreeBSD__ */
-+
- JNIEXPORT jint JNICALL
- Java_java_lang_UNIXProcess_forkAndExec(JNIEnv *env,
- 				       jobject process,
-@@ -335,8 +396,12 @@
-     if (path != NULL) {
-         cwd = (char *)JNU_GetStringPlatformChars(env, path, NULL);
-     }
-- 
-+
-+#if defined(__FreeBSD__)
-+    resultPid = jdk_fork_wrapper();
-+#else
-     resultPid = fork();
-+#endif
- 
-     if (resultPid < 0) {
- 	char errmsg[128];
diff --git a/java/jdk15/files/patch-control::common::Defs-bsd.gmk b/java/jdk15/files/patch-control::common::Defs-bsd.gmk
new file mode 100644
index 000000000000..f9e45f642fa1
--- /dev/null
+++ b/java/jdk15/files/patch-control::common::Defs-bsd.gmk
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- ../../control/make/common/Defs-bsd.gmk.orig	Wed Nov 12 16:52:22 2003
++++ ../../control/make/common/Defs-bsd.gmk	Wed Nov 12 16:51:41 2003
+@@ -212,7 +212,7 @@
+ ifeq ($(TRUE_PLATFORM), NetBSD)
+ DEVTOOLS_PATH = /usr/pkg/bin/
+ else
+-DEVTOOLS_PATH = /usr/local/bin/
++DEVTOOLS_PATH = ${LOCALBASE}/bin/
+ endif
+ # Allow the user to override the default value...
+ ifdef ALT_DEVTOOLS_PATH
diff --git a/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk b/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk
new file mode 100644
index 000000000000..03d079961bde
--- /dev/null
+++ b/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- ../../deploy/make/common/Defs-bsd.gmk.orig	Wed Nov 12 16:52:55 2003
++++ ../../deploy/make/common/Defs-bsd.gmk	Wed Nov 12 16:53:08 2003
+@@ -10,7 +10,7 @@
+ # XXXBSD: this issue need to be rehashed (/usr/local/ should be defined
+ #         in other place
+ ifeq ($(TRUE_PLATFORM), FreeBSD)
+-USR_LOCAL_PATH = /usr/local/
++USR_LOCAL_PATH = ${LOCALBASE}/
+ endif
+ 
+ BUNDLE_SUFFIX  = .zip
diff --git a/java/jdk15/files/patch-nio::Makefile b/java/jdk15/files/patch-nio::Makefile
deleted file mode 100644
index 5835666f8f43..000000000000
--- a/java/jdk15/files/patch-nio::Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/make/java/nio/Makefile	15 Feb 2003 14:45:49 -0000	1.4
-+++ ../../j2se/make/java/nio/Makefile	24 Aug 2003 05:37:04 -0000
-@@ -131,7 +131,7 @@
- 
- # XXXBSD: really need it for BSD ?
- ifeq ($(PLATFORM), bsd)
--OTHER_CFLAGS += -Werror
-+#OTHER_CFLAGS += -Werror
- OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH)$(SUFFIX) -ljava$(SUFFIX) -lnet$(SUFFIX)
- endif
- 
diff --git a/java/jdk15/files/patch-plugin::common::config.gmk b/java/jdk15/files/patch-plugin::common::config.gmk
new file mode 100644
index 000000000000..fd995e3c063b
--- /dev/null
+++ b/java/jdk15/files/patch-plugin::common::config.gmk
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- ../../deploy/make/plugin/common/config.gmk.orig	Wed Nov 12 16:53:30 2003
++++ ../../deploy/make/plugin/common/config.gmk	Wed Nov 12 16:53:43 2003
+@@ -57,7 +57,7 @@
+ 
+   # include search paths
+   # XXXBSD: these should be defined in other place
+-  CPPFLAGS1 += -I/usr/X11R6/include -I/usr/local/include
++  CPPFLAGS1 += -I/usr/X11R6/include -I${LOCALBASE}/include
+ 
+   ifeq ($(TRUE_PLATFORM), FreeSBD)
+     ifeq ($(FREEBSD_4STABLE), true)
diff --git a/java/jdk15/files/patch-plugin::ns6::Makefile b/java/jdk15/files/patch-plugin::ns6::Makefile
new file mode 100644
index 000000000000..f3ce7053dd48
--- /dev/null
+++ b/java/jdk15/files/patch-plugin::ns6::Makefile
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- ../../deploy/make/plugin/ns6/Makefile.orig	Wed Nov 12 16:54:05 2003
++++ ../../deploy/make/plugin/ns6/Makefile	Wed Nov 12 16:54:22 2003
+@@ -37,7 +37,7 @@
+ # XXXBSD: direct /usr/local/include/nspr path is used!!!
+ #EXTRA_CPPFLAGS = -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610 -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610/nspr -DRAPTOR_API -DNEW_STREAMING_API
+ 
+-EXTRA_CPPFLAGS = -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610 -I/usr/local/include/nspr -DRAPTOR_API -DNEW_STREAMING_API
++EXTRA_CPPFLAGS = -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610 -I${LOCALBASE}/include/nspr -DRAPTOR_API -DNEW_STREAMING_API
+ 
+ vpath %.c $(SRCDIR):$(SRCDIR)/../common:
+ vpath %.cpp $(SRCDIR):$(SRCDIR)/../common:$(SHARED_DIR2)/jcomponent
diff --git a/java/jdk15/files/testos.c b/java/jdk15/files/testos.c
index e5c24160901d..d1e77573e86b 100644
--- a/java/jdk15/files/testos.c
+++ b/java/jdk15/files/testos.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * Test pthreads primitives for required functionality in order to run
- * native FreeBSD JDK1.4.1 port.
+ * native FreeBSD JDK1.4.2 port.
  *
  * Returns:
  *    0 - test passed