diff options
Diffstat (limited to 'java/jdk16/files')
| -rw-r--r-- | java/jdk16/files/patch-control::common::Defs-bsd.gmk | 13 | ||||
| -rw-r--r-- | java/jdk16/files/patch-j2se::common::Defs-bsd.gmk | 13 | ||||
| -rw-r--r-- | java/jdk16/files/patch-j2se::instrument::Makefile | 15 | ||||
| -rw-r--r-- | java/jdk16/files/patch-j2se::management::UnixOperatingSystem_md.c | 13 | ||||
| -rw-r--r-- | java/jdk16/files/patch-java_Makefile | 11 | ||||
| -rw-r--r-- | java/jdk16/files/patch-vm::os_bsd.cpp | 22 | ||||
| -rw-r--r-- | java/jdk16/files/pkg-install.in | 19 | 
7 files changed, 0 insertions, 106 deletions
diff --git a/java/jdk16/files/patch-control::common::Defs-bsd.gmk b/java/jdk16/files/patch-control::common::Defs-bsd.gmk deleted file mode 100644 index e5701664bcbc..000000000000 --- a/java/jdk16/files/patch-control::common::Defs-bsd.gmk +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../control/make/common/Defs-bsd.gmk.orig	Thu Jan 13 02:01:40 2005 -+++ ../../control/make/common/Defs-bsd.gmk	Thu Jan 13 02:01:54 2005 -@@ -200,7 +200,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/jdk16/files/patch-j2se::common::Defs-bsd.gmk b/java/jdk16/files/patch-j2se::common::Defs-bsd.gmk deleted file mode 100644 index dbe49c5c86bc..000000000000 --- a/java/jdk16/files/patch-j2se::common::Defs-bsd.gmk +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/make/common/Defs-bsd.gmk.orig	Thu Jan 13 02:03:20 2005 -+++ ../../j2se/make/common/Defs-bsd.gmk	Thu Jan 13 02:03:38 2005 -@@ -172,7 +172,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/jdk16/files/patch-j2se::instrument::Makefile b/java/jdk16/files/patch-j2se::instrument::Makefile deleted file mode 100644 index 8934bfc11fe3..000000000000 --- a/java/jdk16/files/patch-j2se::instrument::Makefile +++ /dev/null @@ -1,15 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/make/java/instrument/Makefile.orig	Thu Jan 13 02:04:44 2005 -+++ ../../j2se/make/java/instrument/Makefile	Thu Jan 13 02:05:03 2005 -@@ -72,8 +72,8 @@ - else - ifeq ($(PLATFORM), bsd) -   ifneq ($(TRUE_PLATFORM), NetBSD) --    OTHER_INCLUDES += -I/usr/local/include --    OTHER_LDLIBS += -L/usr/local/lib -liconv -+    OTHER_INCLUDES += -I${LOCALBASE}/include -+    OTHER_LDLIBS += -L${LOCALBASE}/lib -liconv -   endif - else -   OTHER_LDLIBS = -lnsl -ldl diff --git a/java/jdk16/files/patch-j2se::management::UnixOperatingSystem_md.c b/java/jdk16/files/patch-j2se::management::UnixOperatingSystem_md.c deleted file mode 100644 index befa6bf882c1..000000000000 --- a/java/jdk16/files/patch-j2se::management::UnixOperatingSystem_md.c +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c.orig Sat Feb 19 12:50:03 2005 -+++ ../../j2se/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c    Fri Feb 18 20:26:04 2005 -@@ -283,7 +283,7 @@ -  -     mib[0] = CTL_HW; -     mib[1] = HW_PHYSMEM; --    rlen = sizof(result); -+    rlen = sizeof(result); -     if (sysctl(mib, 2, &result, &rlen, NULL, 0) == -1) -        result = 256 * MB; - diff --git a/java/jdk16/files/patch-java_Makefile b/java/jdk16/files/patch-java_Makefile deleted file mode 100644 index 60585c522db4..000000000000 --- a/java/jdk16/files/patch-java_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- ../../j2se/make/java/java/Makefile.orig	Mon Dec 13 12:38:14 2004 -+++ ../../j2se/make/java/java/Makefile	Mon Dec 13 12:42:00 2004 -@@ -284,7 +284,7 @@ - 	$(RM) -r $(TMPDIR)/GenerateCurrencyData - 	$(MKDIR) -p $(TMPDIR)/GenerateCurrencyData - 	$(JAVAC_BOOT) -d $(TMPDIR)/GenerateCurrencyData $(BUILDDIR)/tools/GenerateCurrencyData/GenerateCurrencyData.java --	$(JAVA_BOOT) -classpath $(TMPDIR)/GenerateCurrencyData GenerateCurrencyData < $(SHARE_SRC)/classes/java/util/CurrencyData.properties > $@ -+	$(JAVA_BOOT) -classpath $(TMPDIR)/GenerateCurrencyData GenerateCurrencyData < $(SHARE_SRC)/classes/java/util/CurrencyData.properties | egrep -v '^Java HotSpot' > $@ -  - clean::  - 	$(RM) $(GENSRCDIR)/java/util/CurrencyData.java diff --git a/java/jdk16/files/patch-vm::os_bsd.cpp b/java/jdk16/files/patch-vm::os_bsd.cpp deleted file mode 100644 index f2d865a6da54..000000000000 --- a/java/jdk16/files/patch-vm::os_bsd.cpp +++ /dev/null @@ -1,22 +0,0 @@ -$FreeBSD$ - ---- ../../hotspot/src/os/bsd/vm/os_bsd.cpp.orig	Tue Jan 27 17:54:28 2004 -+++ ../../hotspot/src/os/bsd/vm/os_bsd.cpp	Tue Jan 27 17:55:21 2004 -@@ -333,7 +333,7 @@ - #define malloc(n) (char*)NEW_C_HEAP_ARRAY(char, (n)) - #define getenv(n) ::getenv(n) -  --#define DEFAULT_LD_LIBRARY_PATH "/usr/lib" /* See ld.so.1(1) */ -+#define DEFAULT_LD_LIBRARY_PATH "/usr/lib:%%LOCALBASE%%/lib" /* See ld.so.1(1) */ - #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 -  diff --git a/java/jdk16/files/pkg-install.in b/java/jdk16/files/pkg-install.in deleted file mode 100644 index fa980a9778f0..000000000000 --- a/java/jdk16/files/pkg-install.in +++ /dev/null @@ -1,19 +0,0 @@ -#!/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  | 
