5 files changed, 26 insertions, 56 deletions

diff --git a/java/jdk14/files/patch-PlainDatagramSocketImpl.c b/java/jdk14/files/patch-PlainDatagramSocketImpl.c
deleted file mode 100644
index c67cba9b612c..000000000000
--- a/java/jdk14/files/patch-PlainDatagramSocketImpl.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../../j2se/src/solaris/native/java/net/PlainDatagramSocketImpl.c.orig	Tue Mar 11 10:43:29 2003
-+++ ../../j2se/src/solaris/native/java/net/PlainDatagramSocketImpl.c	Tue Mar 11 10:43:24 2003
-@@ -2034,9 +2034,7 @@
- 	/* 
- 	 * Join the multicast group.
- 	 */
--// XXXBSD: fix for BSD (re-implement with KAME ?)
--//	if (JVM_SetSockOpt(fd, IPPROTO_IP, (join ? IP_ADD_MEMBERSHIP:IP_DROP_MEMBERSHIP),
--	if (JVM_SetSockOpt(fd, IPPROTO_IP, (join ? 1 : 0),
-+	if (JVM_SetSockOpt(fd, IPPROTO_IP, (join ? IP_ADD_MEMBERSHIP:IP_DROP_MEMBERSHIP),
- 		           (char *) &mname, mname_len) < 0) {
- 
- 	    /*
diff --git a/java/jdk14/files/patch-common::Defs-bsd.gmk b/java/jdk14/files/patch-common::Defs-bsd.gmk
index 3a0209795bfd..aa4acca2b93f 100644
--- a/java/jdk14/files/patch-common::Defs-bsd.gmk
+++ b/java/jdk14/files/patch-common::Defs-bsd.gmk
@@ -1,23 +1,13 @@
 $FreeBSD$
 
---- ../../j2se/make/common/Defs-bsd.gmk.orig	Fri Mar  7 01:38:41 2003
-+++ ../../j2se/make/common/Defs-bsd.gmk	Fri Mar  7 01:38:01 2003
-@@ -155,7 +155,7 @@
- 
- # DEVTOOLS_PATH is for other tools required for building (such as
- # zip, etc.)
+--- ../../j2se/make/common/Defs-bsd.gmk.orig	Fri Oct 10 09:50:48 2003
++++ ../../j2se/make/common/Defs-bsd.gmk	Fri Oct 10 09:54:35 2003
+@@ -162,7 +162,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
- DEVTOOLS_PATH = $(subst //,/,$(ALT_DEVTOOLS_PATH)/)
-@@ -194,7 +194,8 @@
- endif # PLATFORM_SRC
- 
- # platform specific include files
--PLATFORM_INCLUDE  = $(INCLUDEDIR)/$(PLATFORM)
-+TRUE_PLATFORM_INCLUDE := $(shell $(ECHO) $(TRUE_PLATFORM) | $(TR) "[:upper:]" "[:lower:]")
-+PLATFORM_INCLUDE  = $(INCLUDEDIR)/$(TRUE_PLATFORM_INCLUDE)
- 
- #
- # Default BOOTDIR
diff --git a/java/jdk14/files/patch-common::Defs.gmk b/java/jdk14/files/patch-common::Defs.gmk
deleted file mode 100644
index 97e5d53cb796..000000000000
--- a/java/jdk14/files/patch-common::Defs.gmk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../../j2se/make/common/Defs.gmk.orig	Tue Mar 11 11:27:27 2003
-+++ ../../j2se/make/common/Defs.gmk	Tue Mar 11 11:27:06 2003
-@@ -456,6 +456,12 @@
-       JAVAH_CMD = $(BINDIR)/javah
-     endif
-   endif
-+  # XXXBSD: Debug binaries are causing problems on early K6 processors
-+  # and SMP machines.  Don't use javah_g, until above problems resolved.
-+  # --phantom
-+  ifeq ($(PLATFORM), bsd)
-+    JAVAH_CMD = $(BINDIR)/javah
-+  endif
-   RMIC		= $(BINDIR)/rmic$(SUFFIX)
- endif
- 
diff --git a/java/jdk14/files/patch-threads_md.c b/java/jdk14/files/patch-threads_md.c
deleted file mode 100644
index c94a0a21e6b6..000000000000
--- a/java/jdk14/files/patch-threads_md.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../../j2se/src/solaris/hpi/native_threads/src/threads_md.c.orig	Thu Mar 13 11:46:02 2003
-+++ ../../j2se/src/solaris/hpi/native_threads/src/threads_md.c	Thu Mar 13 11:46:12 2003
-@@ -19,7 +19,7 @@
- #include <assert.h>
- #include <setjmp.h>
- #include <signal.h>
--#include <time.h>
-+#include <sys/time.h>
- #include <sys/types.h>
- #include <sys/signal.h>
- #include <sys/resource.h>
diff --git a/java/jdk14/files/pkg-install.in b/java/jdk14/files/pkg-install.in
new file mode 100644
index 000000000000..fa980a9778f0
--- /dev/null
+++ b/java/jdk14/files/pkg-install.in
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# System preference location
+PREFS_LOCATION=%%JRE_HOME%%
+
+# Set up system preferences during post install
+if [ "$2" = "POST-INSTALL" ]; then
+	if [ ! -d "${PREFS_LOCATION}/.systemPrefs" ] ; then
+		mkdir -m 755 "${PREFS_LOCATION}/.systemPrefs"
+	fi
+	if [ ! -f "${PREFS_LOCATION}/.systemPrefs/.system.lock" ] ; then
+		touch "${PREFS_LOCATION}/.systemPrefs/.system.lock"
+		chmod 644 "${PREFS_LOCATION}/.systemPrefs/.system.lock"
+	fi
+	if [ ! -f "${PREFS_LOCATION}/.systemPrefs/.systemRootModFile" ] ; then
+		touch "${PREFS_LOCATION}/.systemPrefs/.systemRootModFile"
+		chmod 644 "${PREFS_LOCATION}/.systemPrefs/.systemRootModFile"
+	fi
+fi