diff options
Diffstat (limited to 'java/jdk16/files')
22 files changed, 0 insertions, 428 deletions
diff --git a/java/jdk16/files/cacerts b/java/jdk16/files/cacerts Binary files differdeleted file mode 100644 index dbc3699a9c3a..000000000000 --- a/java/jdk16/files/cacerts +++ /dev/null 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-deploy::common::Defs-bsd.gmk b/java/jdk16/files/patch-deploy::common::Defs-bsd.gmk deleted file mode 100644 index a864ac0ef54f..000000000000 --- a/java/jdk16/files/patch-deploy::common::Defs-bsd.gmk +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../deploy/make/plugin/common/Defs-bsd.gmk.orig Tue Mar 28 22:20:28 2006 -+++ ../../deploy/make/plugin/common/Defs-bsd.gmk Tue Mar 28 22:20:45 2006 -@@ -29,7 +29,7 @@ - endif - - # Default NSPR_PATH and allow override. --NSPR_PATH = /usr/local -+NSPR_PATH = ${LOCALBASE} - ifdef ALT_NSPR_PATH - NSPR_PATH = $(subst //,/,$(ALT_NSPR_PATH)) - endif diff --git a/java/jdk16/files/patch-deploy::controlpanel::sun_java.desktop b/java/jdk16/files/patch-deploy::controlpanel::sun_java.desktop deleted file mode 100644 index 898893707989..000000000000 --- a/java/jdk16/files/patch-deploy::controlpanel::sun_java.desktop +++ /dev/null @@ -1,13 +0,0 @@ ---- ../../deploy/src/plugin/solaris/controlpanel/sun_java.desktop.orig Sat Oct 1 20:14:45 2005 -+++ ../../deploy/src/plugin/solaris/controlpanel/sun_java.desktop Sat Oct 1 20:16:12 2005 -@@ -1,8 +1,8 @@ - [Desktop Entry] - Name=Java - Comment=Java Control Panel --Exec=INSTALL_DIR/JRE_NAME_VERSION/bin/ControlPanel --Icon=INSTALL_DIR/JRE_NAME_VERSION/plugin/desktop/sun_java.png -+Exec=%%PREFIX%%/jdk%%JDK_VERSION%%/bin/ControlPanel -+Icon=%%PREFIX%%/jdk%%JDK_VERSION%%/jre/plugin/desktop/sun_java.png - Terminal=0 - Type=Application - Categories=Application;Settings;X-Sun-Supported;X-Red-Hat-Base; 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::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::common::Defs-bsd.gmk b/java/jdk16/files/patch-j2se::common::Defs-bsd.gmk deleted file mode 100644 index 5fe62075f469..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 -@@ -180,7 +180,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::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::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::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::nio::genCharsetProvider.sh b/java/jdk16/files/patch-j2se::nio::genCharsetProvider.sh deleted file mode 100644 index fd6137cab922..000000000000 --- a/java/jdk16/files/patch-j2se::nio::genCharsetProvider.sh +++ /dev/null @@ -1,17 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/make/java/nio/genCharsetProvider.sh 8 Nov 2004 22:27:03 -0000 1.1.1.1 -+++ ../../j2se/make/java/nio/genCharsetProvider.sh 24 Mar 2005 16:14:52 -0000 -@@ -94,9 +94,9 @@ - } - ' - --$JAVA -cp $TMPDIR Hasher -i Aliases <$TMPDIR/aliases >>$OUT --$JAVA -cp $TMPDIR Hasher -i Classes <$TMPDIR/classes >>$OUT --$JAVA -cp $TMPDIR Hasher -i -e Cache -t Charset <$TMPDIR/classes >>$OUT -+$JAVA -cp $TMPDIR Hasher -i Aliases <$TMPDIR/aliases | egrep -v '^Java Hotspot' >>$OUT -+$JAVA -cp $TMPDIR Hasher -i Classes <$TMPDIR/classes | egrep -v '^Java Hotspot' >>$OUT -+$JAVA -cp $TMPDIR Hasher -i -e Cache -t Charset <$TMPDIR/classes | egrep -v '^Java Hotspot' >>$OUT - - - # Constructor 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-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 25bd71db866c..000000000000 --- a/java/jdk16/files/patch-vm::os_bsd.cpp +++ /dev/null @@ -1,13 +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" - diff --git a/java/jdk16/files/pkg-deinstall.in b/java/jdk16/files/pkg-deinstall.in deleted file mode 100644 index 167d5bd28893..000000000000 --- a/java/jdk16/files/pkg-deinstall.in +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -# Set up a standard path -PATH=/usr/bin:/bin - -# Don't do anything during post-deinstall -if [ "$2" = "POST-DEINSTALL" ]; then - exit 0 -fi - -# Remove the plugin - -# Plugin location variables -BROWSERPLUGINDIR="%%LOCALBASE%%/lib/browser_plugins" -JAVAPLUGINDIR="%%JRE_HOME%%/plugin/%%ARCH%%/ns7" -PLUGIN=libjavaplugin_oji.so - -# Check if the package includes the plugin -if [ ! -e "${JAVAPLUGINDIR}/${PLUGIN}" ]; then - exit 0 -fi - -# See if the browser plugin is a link to the package plugin and remove it if so. -if [ -e "${BROWSERPLUGINDIR}/${PLUGIN}" -a \ - -L "${BROWSERPLUGINDIR}/${PLUGIN}" -a \ - x`ls -l "${BROWSERPLUGINDIR}/${PLUGIN}" 2>/dev/null | awk '/->/{print $NF;exit 0}END{exit 1}'` = x"${JAVAPLUGINDIR}/${PLUGIN}" ]; then - rm -f "${BROWSERPLUGINDIR}/${PLUGIN}" -fi - -exit 0 diff --git a/java/jdk16/files/pkg-install.in b/java/jdk16/files/pkg-install.in deleted file mode 100644 index c5f4a70db1df..000000000000 --- a/java/jdk16/files/pkg-install.in +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -# System preference location -JRE_HOME=%%JRE_HOME%% - -# Post-install actions -if [ "$2" = "POST-INSTALL" ]; then - # Set up system preferences - if [ ! -d "${JRE_HOME}/.systemPrefs" ] ; then - mkdir -m 755 "${JRE_HOME}/.systemPrefs" - fi - if [ ! -f "${JRE_HOME}/.systemPrefs/.system.lock" ] ; then - touch "${JRE_HOME}/.systemPrefs/.system.lock" - chmod 644 "${JRE_HOME}/.systemPrefs/.system.lock" - fi - if [ ! -f "${JRE_HOME}/.systemPrefs/.systemRootModFile" ] ; then - touch "${JRE_HOME}/.systemPrefs/.systemRootModFile" - chmod 644 "${JRE_HOME}/.systemPrefs/.systemRootModFile" - fi - - # Install the plugin - BROWSERPLUGINDIR="%%LOCALBASE%%/lib/browser_plugins" - JAVAPLUGINDIR="${JRE_HOME}/plugin/%%ARCH%%/ns7" - PLUGIN=libjavaplugin_oji.so - - # Check if the browser plugin exists - if [ ! -e "${JAVAPLUGINDIR}/${PLUGIN}" ]; then - exit 0 - fi - - # Check if the plugin directory exists. - if [ ! -d "${BROWSERPLUGINDIR}" ]; then - exit 0 - fi - - # Check if the browser plugin currently exists - if [ ! -e "${BROWSERPLUGINDIR}/${PLUGIN}" ]; then - # Create symbolic link - ln -sf "${JAVAPLUGINDIR}/${PLUGIN}" \ - "${BROWSERPLUGINDIR}/${PLUGIN}" - exit 0 - fi - - # If the browser plugin exists and is a symlink, but the link - # doesn't exist, then overwrite with our plugin. - if [ -L "${BROWSERPLUGINDIR}/${PLUGIN}" ]; then - # Check if the linked to file exists. - if [ ! -e `ls -l "${BROWSERPLUGINDIR}/${PLUGIN}" 2>/dev/null | awk '/->/{print $NF;exit 0}END{exit 1}'` ]; then - ln -sf "${JAVAPLUGINDIR}/${PLUGIN}" \ - "${BROWSERPLUGINDIR}/${PLUGIN}" - exit 0 - fi - fi - - exit 0 -fi |