Add support of JDK 1.5

30 files changed, 636 insertions, 138 deletions

diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 1d02fa783c9a..072aa4baf065 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -49,9 +49,9 @@ ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
-JAVA_VERSION=	1.4
+JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
-JAVA_VENDOR=	bsdjava
+JAVA_VENDOR=	freebsd bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/editors/openoffice-3/files/gcj-cws_jaxpapi b/editors/openoffice-3/files/gcj-cws_jaxpapi
index 353cd34bda7a..405254ad39f6 100644
--- a/editors/openoffice-3/files/gcj-cws_jaxpapi
+++ b/editors/openoffice-3/files/gcj-cws_jaxpapi
@@ -15,27 +15,6 @@ diff -u -r1.21 -r1.21.18.1
  
  ..\audio\rtufiles\lib\audio\libaudio.a %_DEST%\lib%_EXT%\libaudio.a
  ..\audio\rtufiles\lib\audio\*.h %_DEST%\inc%_EXT%\audio\*
-Index: filter/source/config/fragments/makefile.mk
-===================================================================
-RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
-retrieving revision 1.16
-retrieving revision 1.16.16.1
-diff -u -r1.16 -r1.16.16.1
---- filter/source/config/fragments/makefile.mk	14 Dec 2005 14:48:16 -0000	1.16
-+++ filter/source/config/fragments/makefile.mk	17 Jan 2006 11:03:31 -0000	1.16.16.1
-@@ -156,11 +156,7 @@
- MERGE:=python ../tools/merge/pyAltFCFGMerge
- .ELSE
- MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
--.IF "$(JDK)" == "gcj"
--XALANCLASS=$(SOLARBINDIR)/xalan.jar
--CLASSPATH:=$(CLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(XALANCLASS:s/ /%Z*Z%/))}
--.ENDIF
--PACKLANG := $(JAVAI) org.apache.xalan.xslt.Process -XSL langfilter.xsl
-+PACKLANG := $(JAVAI) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
- .ENDIF
- 
- # -----------------------------------------------------------------------------
 Index: filter/source/config/tools/utils/makefile.mk
 ===================================================================
 RCS file: /cvs/framework/filter/source/config/tools/utils/makefile.mk,v
diff --git a/editors/openoffice-3/files/patch-i58308 b/editors/openoffice-3/files/patch-i58308
new file mode 100644
index 000000000000..aa4f34564669
--- /dev/null
+++ b/editors/openoffice-3/files/patch-i58308
@@ -0,0 +1,26 @@
+see: 
+http://lists.ximian.com/pipermail/openoffice/2006-January/001520.html
+http://lists.ximian.com/pipermail/openoffice/2006-January/001522.html
+http://lists.ximian.com/pipermail/openoffice/2006-January/001528.html
+
+Index: filter/source/config/fragments/makefile.mk
+===================================================================
+RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
+retrieving revision 1.16
+retrieving revision 1.16.16.1
+diff -u -r1.16 -r1.16.16.1
+--- filter/source/config/fragments/makefile.mk	14 Dec 2005 14:48:16 -0000	1.16
++++ filter/source/config/fragments/makefile.mk	17 Jan 2006 11:03:31 -0000	1.16.16.1
+@@ -156,11 +156,7 @@
+ MERGE:=python ../tools/merge/pyAltFCFGMerge
+ .ELSE
+ MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
+-.IF "$(JDK)" == "gcj"
+-XALANCLASS=$(SOLARBINDIR)/xalan.jar
+-CLASSPATH:=$(CLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(XALANCLASS:s/ /%Z*Z%/))}
+-.ENDIF
+-PACKLANG := $(JAVAI) org.apache.xalan.xslt.Process -XSL langfilter.xsl
++PACKLANG := $(JAVAI) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
+ .ENDIF
+ 
+ # -----------------------------------------------------------------------------
diff --git a/editors/openoffice-3/files/patch-i59368 b/editors/openoffice-3/files/patch-i59368
new file mode 100644
index 000000000000..0d81635520e7
--- /dev/null
+++ b/editors/openoffice-3/files/patch-i59368
@@ -0,0 +1,63 @@
+Index: xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java
+===================================================================
+RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java,v
+retrieving revision 1.2
+diff -u -r1.2 ConvertData.java
+--- xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java	24 Oct 2005 17:58:33 -0000	1.2
++++ xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java	15 Apr 2006 00:36:23 -0000
+@@ -127,8 +127,8 @@
+      *           <code>Vector</code> of <code>Document</code> objects.
+      */
+     public Enumeration getDocumentEnumeration() {
+-        Enumeration enum = v.elements();
+-		return (enum);
++        Enumeration enumer = v.elements();
++		return (enumer);
+ 	}
+ 
+ 
+Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
+===================================================================
+RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java,v
+retrieving revision 1.2
+diff -u -r1.2 DocumentDeserializerImpl.java
+--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java	24 Oct 2005 18:12:55 -0000	1.2
++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java	15 Apr 2006 00:36:23 -0000
+@@ -155,14 +155,14 @@
+      */
+     public Document deserialize() throws ConvertException, IOException {
+ 	log("\nFound the XSLT deserializer");
+-	Enumeration enum = cd.getDocumentEnumeration();
++	Enumeration enumer = cd.getDocumentEnumeration();
+ 	org.w3c.dom.Document domDoc=null;
+ 	DOMDocument docOut=null;
+ 	GenericOfficeDocument doc = null;
+ 	ByteArrayOutputStream baos =null;
+ 	GenericOfficeDocument sxwDoc = new GenericOfficeDocument("output");
+-	while (enum.hasMoreElements()) {       
+-		 docOut = (DOMDocument) enum.nextElement();
++	while (enumer.hasMoreElements()) {       
++		 docOut = (DOMDocument) enumer.nextElement();
+ 	}
+ 	domDoc = docOut.getContentDOM();	
+ 	try{
+Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
+===================================================================
+RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java,v
+retrieving revision 1.2
+diff -u -r1.2 PluginFactoryImpl.java
+--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java	24 Oct 2005 18:13:41 -0000	1.2
++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java	15 Apr 2006 00:36:23 -0000
+@@ -183,9 +183,9 @@
+ 	String ext= ".txt";
+ 	String mimeType = null;
+ 	ConverterInfo ci = this.getConverterInfo();
+-	Enumeration enum = ci.getDeviceMime();
+-	while (enum.hasMoreElements()) {       
+-	    mimeType= (String) enum.nextElement();
++	Enumeration enumer = ci.getDeviceMime();
++	while (enumer.hasMoreElements()) {       
++	    mimeType= (String) enumer.nextElement();
+ 	}
+ 	try {
+ 	    props.load(is);
diff --git a/editors/openoffice-3/files/patch-i64412 b/editors/openoffice-3/files/patch-i64412
new file mode 100644
index 000000000000..6edf8d9c51a0
--- /dev/null
+++ b/editors/openoffice-3/files/patch-i64412
@@ -0,0 +1,15 @@
+Index: config_office/set_soenv.in
+===================================================================
+RCS file: /cvs/tools/config_office/set_soenv.in,v
+retrieving revision 1.97
+diff -u -r1.97 set_soenv.in
+--- config_office/set_soenv.in	7 Apr 2006 08:02:29 -0000	1.97
++++ config_office/set_soenv.in	14 Apr 2006 21:35:53 -0000
+@@ -342,6 +342,7 @@
+       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
+       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
++      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
+       if( @GCCVER@ >= 30401 ) {
+       	 $CVER        = "C341";
+       }
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 1d02fa783c9a..072aa4baf065 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -49,9 +49,9 @@ ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
-JAVA_VERSION=	1.4
+JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
-JAVA_VENDOR=	bsdjava
+JAVA_VENDOR=	freebsd bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/editors/openoffice.org-2-RC/files/gcj-cws_jaxpapi b/editors/openoffice.org-2-RC/files/gcj-cws_jaxpapi
index 353cd34bda7a..405254ad39f6 100644
--- a/editors/openoffice.org-2-RC/files/gcj-cws_jaxpapi
+++ b/editors/openoffice.org-2-RC/files/gcj-cws_jaxpapi
@@ -15,27 +15,6 @@ diff -u -r1.21 -r1.21.18.1
  
  ..\audio\rtufiles\lib\audio\libaudio.a %_DEST%\lib%_EXT%\libaudio.a
  ..\audio\rtufiles\lib\audio\*.h %_DEST%\inc%_EXT%\audio\*
-Index: filter/source/config/fragments/makefile.mk
-===================================================================
-RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
-retrieving revision 1.16
-retrieving revision 1.16.16.1
-diff -u -r1.16 -r1.16.16.1
---- filter/source/config/fragments/makefile.mk	14 Dec 2005 14:48:16 -0000	1.16
-+++ filter/source/config/fragments/makefile.mk	17 Jan 2006 11:03:31 -0000	1.16.16.1
-@@ -156,11 +156,7 @@
- MERGE:=python ../tools/merge/pyAltFCFGMerge
- .ELSE
- MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
--.IF "$(JDK)" == "gcj"
--XALANCLASS=$(SOLARBINDIR)/xalan.jar
--CLASSPATH:=$(CLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(XALANCLASS:s/ /%Z*Z%/))}
--.ENDIF
--PACKLANG := $(JAVAI) org.apache.xalan.xslt.Process -XSL langfilter.xsl
-+PACKLANG := $(JAVAI) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
- .ENDIF
- 
- # -----------------------------------------------------------------------------
 Index: filter/source/config/tools/utils/makefile.mk
 ===================================================================
 RCS file: /cvs/framework/filter/source/config/tools/utils/makefile.mk,v
diff --git a/editors/openoffice.org-2-RC/files/patch-i58308 b/editors/openoffice.org-2-RC/files/patch-i58308
new file mode 100644
index 000000000000..aa4f34564669
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-i58308
@@ -0,0 +1,26 @@
+see: 
+http://lists.ximian.com/pipermail/openoffice/2006-January/001520.html
+http://lists.ximian.com/pipermail/openoffice/2006-January/001522.html
+http://lists.ximian.com/pipermail/openoffice/2006-January/001528.html
+
+Index: filter/source/config/fragments/makefile.mk
+===================================================================
+RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
+retrieving revision 1.16
+retrieving revision 1.16.16.1
+diff -u -r1.16 -r1.16.16.1
+--- filter/source/config/fragments/makefile.mk	14 Dec 2005 14:48:16 -0000	1.16
++++ filter/source/config/fragments/makefile.mk	17 Jan 2006 11:03:31 -0000	1.16.16.1
+@@ -156,11 +156,7 @@
+ MERGE:=python ../tools/merge/pyAltFCFGMerge
+ .ELSE
+ MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
+-.IF "$(JDK)" == "gcj"
+-XALANCLASS=$(SOLARBINDIR)/xalan.jar
+-CLASSPATH:=$(CLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(XALANCLASS:s/ /%Z*Z%/))}
+-.ENDIF
+-PACKLANG := $(JAVAI) org.apache.xalan.xslt.Process -XSL langfilter.xsl
++PACKLANG := $(JAVAI) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
+ .ENDIF
+ 
+ # -----------------------------------------------------------------------------
diff --git a/editors/openoffice.org-2-RC/files/patch-i59368 b/editors/openoffice.org-2-RC/files/patch-i59368
new file mode 100644
index 000000000000..0d81635520e7
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-i59368
@@ -0,0 +1,63 @@
+Index: xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java
+===================================================================
+RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java,v
+retrieving revision 1.2
+diff -u -r1.2 ConvertData.java
+--- xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java	24 Oct 2005 17:58:33 -0000	1.2
++++ xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java	15 Apr 2006 00:36:23 -0000
+@@ -127,8 +127,8 @@
+      *           <code>Vector</code> of <code>Document</code> objects.
+      */
+     public Enumeration getDocumentEnumeration() {
+-        Enumeration enum = v.elements();
+-		return (enum);
++        Enumeration enumer = v.elements();
++		return (enumer);
+ 	}
+ 
+ 
+Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
+===================================================================
+RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java,v
+retrieving revision 1.2
+diff -u -r1.2 DocumentDeserializerImpl.java
+--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java	24 Oct 2005 18:12:55 -0000	1.2
++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java	15 Apr 2006 00:36:23 -0000
+@@ -155,14 +155,14 @@
+      */
+     public Document deserialize() throws ConvertException, IOException {
+ 	log("\nFound the XSLT deserializer");
+-	Enumeration enum = cd.getDocumentEnumeration();
++	Enumeration enumer = cd.getDocumentEnumeration();
+ 	org.w3c.dom.Document domDoc=null;
+ 	DOMDocument docOut=null;
+ 	GenericOfficeDocument doc = null;
+ 	ByteArrayOutputStream baos =null;
+ 	GenericOfficeDocument sxwDoc = new GenericOfficeDocument("output");
+-	while (enum.hasMoreElements()) {       
+-		 docOut = (DOMDocument) enum.nextElement();
++	while (enumer.hasMoreElements()) {       
++		 docOut = (DOMDocument) enumer.nextElement();
+ 	}
+ 	domDoc = docOut.getContentDOM();	
+ 	try{
+Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
+===================================================================
+RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java,v
+retrieving revision 1.2
+diff -u -r1.2 PluginFactoryImpl.java
+--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java	24 Oct 2005 18:13:41 -0000	1.2
++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java	15 Apr 2006 00:36:23 -0000
+@@ -183,9 +183,9 @@
+ 	String ext= ".txt";
+ 	String mimeType = null;
+ 	ConverterInfo ci = this.getConverterInfo();
+-	Enumeration enum = ci.getDeviceMime();
+-	while (enum.hasMoreElements()) {       
+-	    mimeType= (String) enum.nextElement();
++	Enumeration enumer = ci.getDeviceMime();
++	while (enumer.hasMoreElements()) {       
++	    mimeType= (String) enumer.nextElement();
+ 	}
+ 	try {
+ 	    props.load(is);
diff --git a/editors/openoffice.org-2-RC/files/patch-i64412 b/editors/openoffice.org-2-RC/files/patch-i64412
new file mode 100644
index 000000000000..6edf8d9c51a0
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-i64412
@@ -0,0 +1,15 @@
+Index: config_office/set_soenv.in
+===================================================================
+RCS file: /cvs/tools/config_office/set_soenv.in,v
+retrieving revision 1.97
+diff -u -r1.97 set_soenv.in
+--- config_office/set_soenv.in	7 Apr 2006 08:02:29 -0000	1.97
++++ config_office/set_soenv.in	14 Apr 2006 21:35:53 -0000
+@@ -342,6 +342,7 @@
+       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
+       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
++      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
+       if( @GCCVER@ >= 30401 ) {
+       	 $CVER        = "C341";
+       }
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 1d02fa783c9a..072aa4baf065 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -49,9 +49,9 @@ ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
-JAVA_VERSION=	1.4
+JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
-JAVA_VENDOR=	bsdjava
+JAVA_VENDOR=	freebsd bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/editors/openoffice.org-2.0/files/gcj-cws_jaxpapi b/editors/openoffice.org-2.0/files/gcj-cws_jaxpapi
index 353cd34bda7a..405254ad39f6 100644
--- a/editors/openoffice.org-2.0/files/gcj-cws_jaxpapi
+++ b/editors/openoffice.org-2.0/files/gcj-cws_jaxpapi
@@ -15,27 +15,6 @@ diff -u -r1.21 -r1.21.18.1
  
  ..\audio\rtufiles\lib\audio\libaudio.a %_DEST%\lib%_EXT%\libaudio.a
  ..\audio\rtufiles\lib\audio\*.h %_DEST%\inc%_EXT%\audio\*
-Index: filter/source/config/fragments/makefile.mk
-===================================================================
-RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
-retrieving revision 1.16
-retrieving revision 1.16.16.1
-diff -u -r1.16 -r1.16.16.1
---- filter/source/config/fragments/makefile.mk	14 Dec 2005 14:48:16 -0000	1.16
-+++ filter/source/config/fragments/makefile.mk	17 Jan 2006 11:03:31 -0000	1.16.16.1
-@@ -156,11 +156,7 @@
- MERGE:=python ../tools/merge/pyAltFCFGMerge
- .ELSE
- MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
--.IF "$(JDK)" == "gcj"
--XALANCLASS=$(SOLARBINDIR)/xalan.jar
--CLASSPATH:=$(CLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(XALANCLASS:s/ /%Z*Z%/))}
--.ENDIF
--PACKLANG := $(JAVAI) org.apache.xalan.xslt.Process -XSL langfilter.xsl
-+PACKLANG := $(JAVAI) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
- .ENDIF
- 
- # -----------------------------------------------------------------------------
 Index: filter/source/config/tools/utils/makefile.mk
 ===================================================================
 RCS file: /cvs/framework/filter/source/config/tools/utils/makefile.mk,v
diff --git a/editors/openoffice.org-2.0/files/patch-i58308 b/editors/openoffice.org-2.0/files/patch-i58308
new file mode 100644
index 000000000000..aa4f34564669
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-i58308
@@ -0,0 +1,26 @@
+see: 
+http://lists.ximian.com/pipermail/openoffice/2006-January/001520.html
+http://lists.ximian.com/pipermail/openoffice/2006-January/001522.html
+http://lists.ximian.com/pipermail/openoffice/2006-January/001528.html
+
+Index: filter/source/config/fragments/makefile.mk
+===================================================================
+RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
+retrieving revision 1.16
+retrieving revision 1.16.16.1
+diff -u -r1.16 -r1.16.16.1
+--- filter/source/config/fragments/makefile.mk	14 Dec 2005 14:48:16 -0000	1.16
++++ filter/source/config/fragments/makefile.mk	17 Jan 2006 11:03:31 -0000	1.16.16.1
+@@ -156,11 +156,7 @@
+ MERGE:=python ../tools/merge/pyAltFCFGMerge
+ .ELSE
+ MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
+-.IF "$(JDK)" == "gcj"
+-XALANCLASS=$(SOLARBINDIR)/xalan.jar
+-CLASSPATH:=$(CLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(XALANCLASS:s/ /%Z*Z%/))}
+-.ENDIF
+-PACKLANG := $(JAVAI) org.apache.xalan.xslt.Process -XSL langfilter.xsl
++PACKLANG := $(JAVAI) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
+ .ENDIF
+ 
+ # -----------------------------------------------------------------------------
diff --git a/editors/openoffice.org-2.0/files/patch-i59368 b/editors/openoffice.org-2.0/files/patch-i59368
new file mode 100644
index 000000000000..0d81635520e7
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-i59368
@@ -0,0 +1,63 @@
+Index: xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java
+===================================================================
+RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java,v
+retrieving revision 1.2
+diff -u -r1.2 ConvertData.java
+--- xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java	24 Oct 2005 17:58:33 -0000	1.2
++++ xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java	15 Apr 2006 00:36:23 -0000
+@@ -127,8 +127,8 @@
+      *           <code>Vector</code> of <code>Document</code> objects.
+      */
+     public Enumeration getDocumentEnumeration() {
+-        Enumeration enum = v.elements();
+-		return (enum);
++        Enumeration enumer = v.elements();
++		return (enumer);
+ 	}
+ 
+ 
+Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
+===================================================================
+RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java,v
+retrieving revision 1.2
+diff -u -r1.2 DocumentDeserializerImpl.java
+--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java	24 Oct 2005 18:12:55 -0000	1.2
++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java	15 Apr 2006 00:36:23 -0000
+@@ -155,14 +155,14 @@
+      */
+     public Document deserialize() throws ConvertException, IOException {
+ 	log("\nFound the XSLT deserializer");
+-	Enumeration enum = cd.getDocumentEnumeration();
++	Enumeration enumer = cd.getDocumentEnumeration();
+ 	org.w3c.dom.Document domDoc=null;
+ 	DOMDocument docOut=null;
+ 	GenericOfficeDocument doc = null;
+ 	ByteArrayOutputStream baos =null;
+ 	GenericOfficeDocument sxwDoc = new GenericOfficeDocument("output");
+-	while (enum.hasMoreElements()) {       
+-		 docOut = (DOMDocument) enum.nextElement();
++	while (enumer.hasMoreElements()) {       
++		 docOut = (DOMDocument) enumer.nextElement();
+ 	}
+ 	domDoc = docOut.getContentDOM();	
+ 	try{
+Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
+===================================================================
+RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java,v
+retrieving revision 1.2
+diff -u -r1.2 PluginFactoryImpl.java
+--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java	24 Oct 2005 18:13:41 -0000	1.2
++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java	15 Apr 2006 00:36:23 -0000
+@@ -183,9 +183,9 @@
+ 	String ext= ".txt";
+ 	String mimeType = null;
+ 	ConverterInfo ci = this.getConverterInfo();
+-	Enumeration enum = ci.getDeviceMime();
+-	while (enum.hasMoreElements()) {       
+-	    mimeType= (String) enum.nextElement();
++	Enumeration enumer = ci.getDeviceMime();
++	while (enumer.hasMoreElements()) {       
++	    mimeType= (String) enumer.nextElement();
+ 	}
+ 	try {
+ 	    props.load(is);
diff --git a/editors/openoffice.org-2.0/files/patch-i64412 b/editors/openoffice.org-2.0/files/patch-i64412
new file mode 100644
index 000000000000..6edf8d9c51a0
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-i64412
@@ -0,0 +1,15 @@
+Index: config_office/set_soenv.in
+===================================================================
+RCS file: /cvs/tools/config_office/set_soenv.in,v
+retrieving revision 1.97
+diff -u -r1.97 set_soenv.in
+--- config_office/set_soenv.in	7 Apr 2006 08:02:29 -0000	1.97
++++ config_office/set_soenv.in	14 Apr 2006 21:35:53 -0000
+@@ -342,6 +342,7 @@
+       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
+       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
++      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
+       if( @GCCVER@ >= 30401 ) {
+       	 $CVER        = "C341";
+       }
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 1d02fa783c9a..072aa4baf065 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -49,9 +49,9 @@ ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
-JAVA_VERSION=	1.4
+JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
-JAVA_VENDOR=	bsdjava
+JAVA_VENDOR=	freebsd bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/editors/openoffice.org-2/files/gcj-cws_jaxpapi b/editors/openoffice.org-2/files/gcj-cws_jaxpapi
index 353cd34bda7a..405254ad39f6 100644
--- a/editors/openoffice.org-2/files/gcj-cws_jaxpapi
+++ b/editors/openoffice.org-2/files/gcj-cws_jaxpapi
@@ -15,27 +15,6 @@ diff -u -r1.21 -r1.21.18.1
  
  ..\audio\rtufiles\lib\audio\libaudio.a %_DEST%\lib%_EXT%\libaudio.a
  ..\audio\rtufiles\lib\audio\*.h %_DEST%\inc%_EXT%\audio\*
-Index: filter/source/config/fragments/makefile.mk
-===================================================================
-RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
-retrieving revision 1.16
-retrieving revision 1.16.16.1
-diff -u -r1.16 -r1.16.16.1
---- filter/source/config/fragments/makefile.mk	14 Dec 2005 14:48:16 -0000	1.16
-+++ filter/source/config/fragments/makefile.mk	17 Jan 2006 11:03:31 -0000	1.16.16.1
-@@ -156,11 +156,7 @@
- MERGE:=python ../tools/merge/pyAltFCFGMerge
- .ELSE
- MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
--.IF "$(JDK)" == "gcj"
--XALANCLASS=$(SOLARBINDIR)/xalan.jar
--CLASSPATH:=$(CLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(XALANCLASS:s/ /%Z*Z%/))}
--.ENDIF
--PACKLANG := $(JAVAI) org.apache.xalan.xslt.Process -XSL langfilter.xsl
-+PACKLANG := $(JAVAI) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
- .ENDIF
- 
- # -----------------------------------------------------------------------------
 Index: filter/source/config/tools/utils/makefile.mk
 ===================================================================
 RCS file: /cvs/framework/filter/source/config/tools/utils/makefile.mk,v
diff --git a/editors/openoffice.org-2/files/patch-i58308 b/editors/openoffice.org-2/files/patch-i58308
new file mode 100644
index 000000000000..aa4f34564669
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-i58308
@@ -0,0 +1,26 @@
+see: 
+http://lists.ximian.com/pipermail/openoffice/2006-January/001520.html
+http://lists.ximian.com/pipermail/openoffice/2006-January/001522.html
+http://lists.ximian.com/pipermail/openoffice/2006-January/001528.html
+
+Index: filter/source/config/fragments/makefile.mk
+===================================================================
+RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
+retrieving revision 1.16
+retrieving revision 1.16.16.1
+diff -u -r1.16 -r1.16.16.1
+--- filter/source/config/fragments/makefile.mk	14 Dec 2005 14:48:16 -0000	1.16
++++ filter/source/config/fragments/makefile.mk	17 Jan 2006 11:03:31 -0000	1.16.16.1
+@@ -156,11 +156,7 @@
+ MERGE:=python ../tools/merge/pyAltFCFGMerge
+ .ELSE
+ MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
+-.IF "$(JDK)" == "gcj"
+-XALANCLASS=$(SOLARBINDIR)/xalan.jar
+-CLASSPATH:=$(CLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(XALANCLASS:s/ /%Z*Z%/))}
+-.ENDIF
+-PACKLANG := $(JAVAI) org.apache.xalan.xslt.Process -XSL langfilter.xsl
++PACKLANG := $(JAVAI) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
+ .ENDIF
+ 
+ # -----------------------------------------------------------------------------
diff --git a/editors/openoffice.org-2/files/patch-i59368 b/editors/openoffice.org-2/files/patch-i59368
new file mode 100644
index 000000000000..0d81635520e7
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-i59368
@@ -0,0 +1,63 @@
+Index: xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java
+===================================================================
+RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java,v
+retrieving revision 1.2
+diff -u -r1.2 ConvertData.java
+--- xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java	24 Oct 2005 17:58:33 -0000	1.2
++++ xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java	15 Apr 2006 00:36:23 -0000
+@@ -127,8 +127,8 @@
+      *           <code>Vector</code> of <code>Document</code> objects.
+      */
+     public Enumeration getDocumentEnumeration() {
+-        Enumeration enum = v.elements();
+-		return (enum);
++        Enumeration enumer = v.elements();
++		return (enumer);
+ 	}
+ 
+ 
+Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
+===================================================================
+RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java,v
+retrieving revision 1.2
+diff -u -r1.2 DocumentDeserializerImpl.java
+--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java	24 Oct 2005 18:12:55 -0000	1.2
++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java	15 Apr 2006 00:36:23 -0000
+@@ -155,14 +155,14 @@
+      */
+     public Document deserialize() throws ConvertException, IOException {
+ 	log("\nFound the XSLT deserializer");
+-	Enumeration enum = cd.getDocumentEnumeration();
++	Enumeration enumer = cd.getDocumentEnumeration();
+ 	org.w3c.dom.Document domDoc=null;
+ 	DOMDocument docOut=null;
+ 	GenericOfficeDocument doc = null;
+ 	ByteArrayOutputStream baos =null;
+ 	GenericOfficeDocument sxwDoc = new GenericOfficeDocument("output");
+-	while (enum.hasMoreElements()) {       
+-		 docOut = (DOMDocument) enum.nextElement();
++	while (enumer.hasMoreElements()) {       
++		 docOut = (DOMDocument) enumer.nextElement();
+ 	}
+ 	domDoc = docOut.getContentDOM();	
+ 	try{
+Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
+===================================================================
+RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java,v
+retrieving revision 1.2
+diff -u -r1.2 PluginFactoryImpl.java
+--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java	24 Oct 2005 18:13:41 -0000	1.2
++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java	15 Apr 2006 00:36:23 -0000
+@@ -183,9 +183,9 @@
+ 	String ext= ".txt";
+ 	String mimeType = null;
+ 	ConverterInfo ci = this.getConverterInfo();
+-	Enumeration enum = ci.getDeviceMime();
+-	while (enum.hasMoreElements()) {       
+-	    mimeType= (String) enum.nextElement();
++	Enumeration enumer = ci.getDeviceMime();
++	while (enumer.hasMoreElements()) {       
++	    mimeType= (String) enumer.nextElement();
+ 	}
+ 	try {
+ 	    props.load(is);
diff --git a/editors/openoffice.org-2/files/patch-i64412 b/editors/openoffice.org-2/files/patch-i64412
new file mode 100644
index 000000000000..6edf8d9c51a0
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-i64412
@@ -0,0 +1,15 @@
+Index: config_office/set_soenv.in
+===================================================================
+RCS file: /cvs/tools/config_office/set_soenv.in,v
+retrieving revision 1.97
+diff -u -r1.97 set_soenv.in
+--- config_office/set_soenv.in	7 Apr 2006 08:02:29 -0000	1.97
++++ config_office/set_soenv.in	14 Apr 2006 21:35:53 -0000
+@@ -342,6 +342,7 @@
+       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
+       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
++      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
+       if( @GCCVER@ >= 30401 ) {
+       	 $CVER        = "C341";
+       }
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 1d02fa783c9a..072aa4baf065 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -49,9 +49,9 @@ ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
-JAVA_VERSION=	1.4
+JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
-JAVA_VENDOR=	bsdjava
+JAVA_VENDOR=	freebsd bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/editors/openoffice.org-3-RC/files/gcj-cws_jaxpapi b/editors/openoffice.org-3-RC/files/gcj-cws_jaxpapi
index 353cd34bda7a..405254ad39f6 100644
--- a/editors/openoffice.org-3-RC/files/gcj-cws_jaxpapi
+++ b/editors/openoffice.org-3-RC/files/gcj-cws_jaxpapi
@@ -15,27 +15,6 @@ diff -u -r1.21 -r1.21.18.1
  
  ..\audio\rtufiles\lib\audio\libaudio.a %_DEST%\lib%_EXT%\libaudio.a
  ..\audio\rtufiles\lib\audio\*.h %_DEST%\inc%_EXT%\audio\*
-Index: filter/source/config/fragments/makefile.mk
-===================================================================
-RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
-retrieving revision 1.16
-retrieving revision 1.16.16.1
-diff -u -r1.16 -r1.16.16.1
---- filter/source/config/fragments/makefile.mk	14 Dec 2005 14:48:16 -0000	1.16
-+++ filter/source/config/fragments/makefile.mk	17 Jan 2006 11:03:31 -0000	1.16.16.1
-@@ -156,11 +156,7 @@
- MERGE:=python ../tools/merge/pyAltFCFGMerge
- .ELSE
- MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
--.IF "$(JDK)" == "gcj"
--XALANCLASS=$(SOLARBINDIR)/xalan.jar
--CLASSPATH:=$(CLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(XALANCLASS:s/ /%Z*Z%/))}
--.ENDIF
--PACKLANG := $(JAVAI) org.apache.xalan.xslt.Process -XSL langfilter.xsl
-+PACKLANG := $(JAVAI) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
- .ENDIF
- 
- # -----------------------------------------------------------------------------
 Index: filter/source/config/tools/utils/makefile.mk
 ===================================================================
 RCS file: /cvs/framework/filter/source/config/tools/utils/makefile.mk,v
diff --git a/editors/openoffice.org-3-RC/files/patch-i58308 b/editors/openoffice.org-3-RC/files/patch-i58308
new file mode 100644
index 000000000000..aa4f34564669
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-i58308
@@ -0,0 +1,26 @@
+see: 
+http://lists.ximian.com/pipermail/openoffice/2006-January/001520.html
+http://lists.ximian.com/pipermail/openoffice/2006-January/001522.html
+http://lists.ximian.com/pipermail/openoffice/2006-January/001528.html
+
+Index: filter/source/config/fragments/makefile.mk
+===================================================================
+RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
+retrieving revision 1.16
+retrieving revision 1.16.16.1
+diff -u -r1.16 -r1.16.16.1
+--- filter/source/config/fragments/makefile.mk	14 Dec 2005 14:48:16 -0000	1.16
++++ filter/source/config/fragments/makefile.mk	17 Jan 2006 11:03:31 -0000	1.16.16.1
+@@ -156,11 +156,7 @@
+ MERGE:=python ../tools/merge/pyAltFCFGMerge
+ .ELSE
+ MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
+-.IF "$(JDK)" == "gcj"
+-XALANCLASS=$(SOLARBINDIR)/xalan.jar
+-CLASSPATH:=$(CLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(XALANCLASS:s/ /%Z*Z%/))}
+-.ENDIF
+-PACKLANG := $(JAVAI) org.apache.xalan.xslt.Process -XSL langfilter.xsl
++PACKLANG := $(JAVAI) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
+ .ENDIF
+ 
+ # -----------------------------------------------------------------------------
diff --git a/editors/openoffice.org-3-RC/files/patch-i59368 b/editors/openoffice.org-3-RC/files/patch-i59368
new file mode 100644
index 000000000000..0d81635520e7
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-i59368
@@ -0,0 +1,63 @@
+Index: xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java
+===================================================================
+RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java,v
+retrieving revision 1.2
+diff -u -r1.2 ConvertData.java
+--- xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java	24 Oct 2005 17:58:33 -0000	1.2
++++ xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java	15 Apr 2006 00:36:23 -0000
+@@ -127,8 +127,8 @@
+      *           <code>Vector</code> of <code>Document</code> objects.
+      */
+     public Enumeration getDocumentEnumeration() {
+-        Enumeration enum = v.elements();
+-		return (enum);
++        Enumeration enumer = v.elements();
++		return (enumer);
+ 	}
+ 
+ 
+Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
+===================================================================
+RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java,v
+retrieving revision 1.2
+diff -u -r1.2 DocumentDeserializerImpl.java
+--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java	24 Oct 2005 18:12:55 -0000	1.2
++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java	15 Apr 2006 00:36:23 -0000
+@@ -155,14 +155,14 @@
+      */
+     public Document deserialize() throws ConvertException, IOException {
+ 	log("\nFound the XSLT deserializer");
+-	Enumeration enum = cd.getDocumentEnumeration();
++	Enumeration enumer = cd.getDocumentEnumeration();
+ 	org.w3c.dom.Document domDoc=null;
+ 	DOMDocument docOut=null;
+ 	GenericOfficeDocument doc = null;
+ 	ByteArrayOutputStream baos =null;
+ 	GenericOfficeDocument sxwDoc = new GenericOfficeDocument("output");
+-	while (enum.hasMoreElements()) {       
+-		 docOut = (DOMDocument) enum.nextElement();
++	while (enumer.hasMoreElements()) {       
++		 docOut = (DOMDocument) enumer.nextElement();
+ 	}
+ 	domDoc = docOut.getContentDOM();	
+ 	try{
+Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
+===================================================================
+RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java,v
+retrieving revision 1.2
+diff -u -r1.2 PluginFactoryImpl.java
+--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java	24 Oct 2005 18:13:41 -0000	1.2
++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java	15 Apr 2006 00:36:23 -0000
+@@ -183,9 +183,9 @@
+ 	String ext= ".txt";
+ 	String mimeType = null;
+ 	ConverterInfo ci = this.getConverterInfo();
+-	Enumeration enum = ci.getDeviceMime();
+-	while (enum.hasMoreElements()) {       
+-	    mimeType= (String) enum.nextElement();
++	Enumeration enumer = ci.getDeviceMime();
++	while (enumer.hasMoreElements()) {       
++	    mimeType= (String) enumer.nextElement();
+ 	}
+ 	try {
+ 	    props.load(is);
diff --git a/editors/openoffice.org-3-RC/files/patch-i64412 b/editors/openoffice.org-3-RC/files/patch-i64412
new file mode 100644
index 000000000000..6edf8d9c51a0
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-i64412
@@ -0,0 +1,15 @@
+Index: config_office/set_soenv.in
+===================================================================
+RCS file: /cvs/tools/config_office/set_soenv.in,v
+retrieving revision 1.97
+diff -u -r1.97 set_soenv.in
+--- config_office/set_soenv.in	7 Apr 2006 08:02:29 -0000	1.97
++++ config_office/set_soenv.in	14 Apr 2006 21:35:53 -0000
+@@ -342,6 +342,7 @@
+       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
+       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
++      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
+       if( @GCCVER@ >= 30401 ) {
+       	 $CVER        = "C341";
+       }
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 1d02fa783c9a..072aa4baf065 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -49,9 +49,9 @@ ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
-JAVA_VERSION=	1.4
+JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
-JAVA_VENDOR=	bsdjava
+JAVA_VENDOR=	freebsd bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/editors/openoffice.org-3/files/gcj-cws_jaxpapi b/editors/openoffice.org-3/files/gcj-cws_jaxpapi
index 353cd34bda7a..405254ad39f6 100644
--- a/editors/openoffice.org-3/files/gcj-cws_jaxpapi
+++ b/editors/openoffice.org-3/files/gcj-cws_jaxpapi
@@ -15,27 +15,6 @@ diff -u -r1.21 -r1.21.18.1
  
  ..\audio\rtufiles\lib\audio\libaudio.a %_DEST%\lib%_EXT%\libaudio.a
  ..\audio\rtufiles\lib\audio\*.h %_DEST%\inc%_EXT%\audio\*
-Index: filter/source/config/fragments/makefile.mk
-===================================================================
-RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
-retrieving revision 1.16
-retrieving revision 1.16.16.1
-diff -u -r1.16 -r1.16.16.1
---- filter/source/config/fragments/makefile.mk	14 Dec 2005 14:48:16 -0000	1.16
-+++ filter/source/config/fragments/makefile.mk	17 Jan 2006 11:03:31 -0000	1.16.16.1
-@@ -156,11 +156,7 @@
- MERGE:=python ../tools/merge/pyAltFCFGMerge
- .ELSE
- MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
--.IF "$(JDK)" == "gcj"
--XALANCLASS=$(SOLARBINDIR)/xalan.jar
--CLASSPATH:=$(CLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(XALANCLASS:s/ /%Z*Z%/))}
--.ENDIF
--PACKLANG := $(JAVAI) org.apache.xalan.xslt.Process -XSL langfilter.xsl
-+PACKLANG := $(JAVAI) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
- .ENDIF
- 
- # -----------------------------------------------------------------------------
 Index: filter/source/config/tools/utils/makefile.mk
 ===================================================================
 RCS file: /cvs/framework/filter/source/config/tools/utils/makefile.mk,v
diff --git a/editors/openoffice.org-3/files/patch-i58308 b/editors/openoffice.org-3/files/patch-i58308
new file mode 100644
index 000000000000..aa4f34564669
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-i58308
@@ -0,0 +1,26 @@
+see: 
+http://lists.ximian.com/pipermail/openoffice/2006-January/001520.html
+http://lists.ximian.com/pipermail/openoffice/2006-January/001522.html
+http://lists.ximian.com/pipermail/openoffice/2006-January/001528.html
+
+Index: filter/source/config/fragments/makefile.mk
+===================================================================
+RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
+retrieving revision 1.16
+retrieving revision 1.16.16.1
+diff -u -r1.16 -r1.16.16.1
+--- filter/source/config/fragments/makefile.mk	14 Dec 2005 14:48:16 -0000	1.16
++++ filter/source/config/fragments/makefile.mk	17 Jan 2006 11:03:31 -0000	1.16.16.1
+@@ -156,11 +156,7 @@
+ MERGE:=python ../tools/merge/pyAltFCFGMerge
+ .ELSE
+ MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
+-.IF "$(JDK)" == "gcj"
+-XALANCLASS=$(SOLARBINDIR)/xalan.jar
+-CLASSPATH:=$(CLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(XALANCLASS:s/ /%Z*Z%/))}
+-.ENDIF
+-PACKLANG := $(JAVAI) org.apache.xalan.xslt.Process -XSL langfilter.xsl
++PACKLANG := $(JAVAI) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
+ .ENDIF
+ 
+ # -----------------------------------------------------------------------------
diff --git a/editors/openoffice.org-3/files/patch-i59368 b/editors/openoffice.org-3/files/patch-i59368
new file mode 100644
index 000000000000..0d81635520e7
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-i59368
@@ -0,0 +1,63 @@
+Index: xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java
+===================================================================
+RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java,v
+retrieving revision 1.2
+diff -u -r1.2 ConvertData.java
+--- xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java	24 Oct 2005 17:58:33 -0000	1.2
++++ xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java	15 Apr 2006 00:36:23 -0000
+@@ -127,8 +127,8 @@
+      *           <code>Vector</code> of <code>Document</code> objects.
+      */
+     public Enumeration getDocumentEnumeration() {
+-        Enumeration enum = v.elements();
+-		return (enum);
++        Enumeration enumer = v.elements();
++		return (enumer);
+ 	}
+ 
+ 
+Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
+===================================================================
+RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java,v
+retrieving revision 1.2
+diff -u -r1.2 DocumentDeserializerImpl.java
+--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java	24 Oct 2005 18:12:55 -0000	1.2
++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java	15 Apr 2006 00:36:23 -0000
+@@ -155,14 +155,14 @@
+      */
+     public Document deserialize() throws ConvertException, IOException {
+ 	log("\nFound the XSLT deserializer");
+-	Enumeration enum = cd.getDocumentEnumeration();
++	Enumeration enumer = cd.getDocumentEnumeration();
+ 	org.w3c.dom.Document domDoc=null;
+ 	DOMDocument docOut=null;
+ 	GenericOfficeDocument doc = null;
+ 	ByteArrayOutputStream baos =null;
+ 	GenericOfficeDocument sxwDoc = new GenericOfficeDocument("output");
+-	while (enum.hasMoreElements()) {       
+-		 docOut = (DOMDocument) enum.nextElement();
++	while (enumer.hasMoreElements()) {       
++		 docOut = (DOMDocument) enumer.nextElement();
+ 	}
+ 	domDoc = docOut.getContentDOM();	
+ 	try{
+Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
+===================================================================
+RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java,v
+retrieving revision 1.2
+diff -u -r1.2 PluginFactoryImpl.java
+--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java	24 Oct 2005 18:13:41 -0000	1.2
++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java	15 Apr 2006 00:36:23 -0000
+@@ -183,9 +183,9 @@
+ 	String ext= ".txt";
+ 	String mimeType = null;
+ 	ConverterInfo ci = this.getConverterInfo();
+-	Enumeration enum = ci.getDeviceMime();
+-	while (enum.hasMoreElements()) {       
+-	    mimeType= (String) enum.nextElement();
++	Enumeration enumer = ci.getDeviceMime();
++	while (enumer.hasMoreElements()) {       
++	    mimeType= (String) enumer.nextElement();
+ 	}
+ 	try {
+ 	    props.load(is);
diff --git a/editors/openoffice.org-3/files/patch-i64412 b/editors/openoffice.org-3/files/patch-i64412
new file mode 100644
index 000000000000..6edf8d9c51a0
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-i64412
@@ -0,0 +1,15 @@
+Index: config_office/set_soenv.in
+===================================================================
+RCS file: /cvs/tools/config_office/set_soenv.in,v
+retrieving revision 1.97
+diff -u -r1.97 set_soenv.in
+--- config_office/set_soenv.in	7 Apr 2006 08:02:29 -0000	1.97
++++ config_office/set_soenv.in	14 Apr 2006 21:35:53 -0000
+@@ -342,6 +342,7 @@
+       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
+       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
++      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
+       if( @GCCVER@ >= 30401 ) {
+       	 $CVER        = "C341";
+       }