Forgot to run 'cvs add' to add these files.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6961 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 83 insertions, 0 deletions

diff --git a/java/jdk15/files/patch-deploy::jcomponent::CPluginVM_OP.cpp b/java/jdk15/files/patch-deploy::jcomponent::CPluginVM_OP.cpp
new file mode 100644
index 000000000..3eee15710
--- /dev/null
+++ b/java/jdk15/files/patch-deploy::jcomponent::CPluginVM_OP.cpp
@@ -0,0 +1,16 @@
+$FreeBSD: ports/java/jdk15/files/patch-deploy::jcomponent::CPluginVM_OP.cpp,v 1.1 2006/07/18 23:23:02 glewis Exp $
+
+--- ../../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
new file mode 100644
index 000000000..f49e18e89
--- /dev/null
+++ b/java/jdk15/files/patch-deploy::jvm_exec::java_vm.c
@@ -0,0 +1,13 @@
+$FreeBSD: ports/java/jdk15/files/patch-deploy::jvm_exec::java_vm.c,v 1.1 2006/07/18 23:23:02 glewis Exp $
+
+--- ../../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::nscore::JavaVM5.cpp b/java/jdk15/files/patch-deploy::nscore::JavaVM5.cpp
new file mode 100644
index 000000000..6ae176a01
--- /dev/null
+++ b/java/jdk15/files/patch-deploy::nscore::JavaVM5.cpp
@@ -0,0 +1,16 @@
+$FreeBSD: ports/java/jdk15/files/patch-deploy::nscore::JavaVM5.cpp,v 1.1 2006/07/18 23:23:02 glewis Exp $
+
+--- ../../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-j2se::nio::ch::FileChannelImpl.c b/java/jdk15/files/patch-j2se::nio::ch::FileChannelImpl.c
new file mode 100644
index 000000000..eb2bacd82
--- /dev/null
+++ b/java/jdk15/files/patch-j2se::nio::ch::FileChannelImpl.c
@@ -0,0 +1,38 @@
+$FreeBSD: ports/java/jdk15/files/patch-j2se::nio::ch::FileChannelImpl.c,v 1.1 2006/07/18 23:20:26 glewis Exp $
+
+--- ../../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
+ }
+