summaryrefslogtreecommitdiffstats
path: root/editors
diff options
context:
space:
mode:
authormaho <maho@FreeBSD.org>2005-01-15 12:20:34 +0000
committermaho <maho@FreeBSD.org>2005-01-15 12:20:34 +0000
commitd8f8cd65876c1d7850e7717c2fd7140577f7fc53 (patch)
tree344c830d84cd4d13ac50bc8bd25a07005782ff0f /editors
parent70734d490398feddf35f84fe4d8cf33c408eb6c8 (diff)
downloadFreeBSD-ports-d8f8cd65876c1d7850e7717c2fd7140577f7fc53.zip
FreeBSD-ports-d8f8cd65876c1d7850e7717c2fd7140577f7fc53.tar.gz
Recognize Linux's JDK as well.
Still jdk is needed in the build process.
Diffstat (limited to 'editors')
-rw-r--r--editors/openoffice-1.1/files/patch-jvmaccess+source+javainfoimpl.cxx34
-rw-r--r--editors/openoffice.org-1.1/files/patch-jvmaccess+source+javainfoimpl.cxx34
2 files changed, 68 insertions, 0 deletions
diff --git a/editors/openoffice-1.1/files/patch-jvmaccess+source+javainfoimpl.cxx b/editors/openoffice-1.1/files/patch-jvmaccess+source+javainfoimpl.cxx
new file mode 100644
index 0000000..6ef5bf4
--- /dev/null
+++ b/editors/openoffice-1.1/files/patch-jvmaccess+source+javainfoimpl.cxx
@@ -0,0 +1,34 @@
+http://qa.openoffice.org/issues/show_bug.cgi?id=40643
+
+Although FreeBSD has its own Java, 1.3.1 and 1.4.2, however,
+it is not certified by SUN Microsystems. FreeBSD can use Linux's Java
+since there is a binary compatibility (NOT EMULATION!)
+Recognize Linux's Java (SUN's, IBM's and Blackdown's) by default,
+we need to add several seachpaths.
+
+Index: jvmaccess/source/javainfoimpl.cxx
+===================================================================
+RCS file: /cvs/udk/jvmaccess/source/Attic/javainfoimpl.cxx,v
+retrieving revision 1.7.12.5
+diff -u -r1.7.12.5 javainfoimpl.cxx
+--- jvmaccess/source/javainfoimpl.cxx 20 Oct 2004 11:43:13 -0000 1.7.12.5
++++ jvmaccess/source/javainfoimpl.cxx 14 Jan 2005 10:58:53 -0000
+@@ -240,8 +240,16 @@
+ "java", \
+ "Home", \
+ "IBMJava2-" ARCH "-131", \
+- "IBMJava2-" ARCH "-141"
+-
++ "IBMJava2-" ARCH "-141" , \
++ "jdk1.4.2", \
++ "diablo-jre1.3.1", \
++ "diablo-jdk1.3.1", \
++ "linux-sun-jdk1.3.1", \
++ "linux-sun-jdk1.4.2", \
++ "linux-ibm-jdk1.3.1", \
++ "linux-ibm-jdk1.4.2", \
++ "linux-blackdown-jdk1.3.1", \
++ "linux-blackdown-jdk1.4.2"
+
+ /* These are directories in which a java installation is
+ looked for.
diff --git a/editors/openoffice.org-1.1/files/patch-jvmaccess+source+javainfoimpl.cxx b/editors/openoffice.org-1.1/files/patch-jvmaccess+source+javainfoimpl.cxx
new file mode 100644
index 0000000..6ef5bf4
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/patch-jvmaccess+source+javainfoimpl.cxx
@@ -0,0 +1,34 @@
+http://qa.openoffice.org/issues/show_bug.cgi?id=40643
+
+Although FreeBSD has its own Java, 1.3.1 and 1.4.2, however,
+it is not certified by SUN Microsystems. FreeBSD can use Linux's Java
+since there is a binary compatibility (NOT EMULATION!)
+Recognize Linux's Java (SUN's, IBM's and Blackdown's) by default,
+we need to add several seachpaths.
+
+Index: jvmaccess/source/javainfoimpl.cxx
+===================================================================
+RCS file: /cvs/udk/jvmaccess/source/Attic/javainfoimpl.cxx,v
+retrieving revision 1.7.12.5
+diff -u -r1.7.12.5 javainfoimpl.cxx
+--- jvmaccess/source/javainfoimpl.cxx 20 Oct 2004 11:43:13 -0000 1.7.12.5
++++ jvmaccess/source/javainfoimpl.cxx 14 Jan 2005 10:58:53 -0000
+@@ -240,8 +240,16 @@
+ "java", \
+ "Home", \
+ "IBMJava2-" ARCH "-131", \
+- "IBMJava2-" ARCH "-141"
+-
++ "IBMJava2-" ARCH "-141" , \
++ "jdk1.4.2", \
++ "diablo-jre1.3.1", \
++ "diablo-jdk1.3.1", \
++ "linux-sun-jdk1.3.1", \
++ "linux-sun-jdk1.4.2", \
++ "linux-ibm-jdk1.3.1", \
++ "linux-ibm-jdk1.4.2", \
++ "linux-blackdown-jdk1.3.1", \
++ "linux-blackdown-jdk1.4.2"
+
+ /* These are directories in which a java installation is
+ looked for.
OpenPOWER on IntegriCloud