Update to SRC680_m163

o buildable with diablo-jdk 1.5

25 files changed, 425 insertions, 90 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 6cb538f95c61..84fb160e4d72 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -50,9 +50,9 @@ ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
-JAVA_VERSION=	1.4
+JAVA_VERSION=	1.5
 JAVA_BUILD=	jdk
-JAVA_VENDOR=	bsdjava
+JAVA_VENDOR=	freebsd bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
@@ -64,9 +64,9 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE?=		162
+MILESTONE?=		163
 OOOTAG?=		SRC680_m${MILESTONE}
-SNAPDATE=		20060331
+SNAPDATE=		20060413
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 898191390491..958aec0e5d25 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m162_source.tar.bz2) = 97df8b901c3ab3f69e65d86eb2a259ee
-SHA256 (openoffice.org2.0/OOo_SRC680_m162_source.tar.bz2) = f9f8c38fdf3a47bca06e53725f15f7094a20ca5018ce279dc09c847a0a0105cc
-SIZE (openoffice.org2.0/OOo_SRC680_m162_source.tar.bz2) = 242081994
+MD5 (openoffice.org2.0/OOo_SRC680_m163_source.tar.bz2) = c4196e635579095bfc7edb84d9306c7a
+SHA256 (openoffice.org2.0/OOo_SRC680_m163_source.tar.bz2) = 743e6fe186b99eb529e63904f480dcc119ae71d8d7fa46cea54700ffd33abfbf
+SIZE (openoffice.org2.0/OOo_SRC680_m163_source.tar.bz2) = 241639799
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice-3-devel/files/patch-i59368 b/editors/openoffice-3-devel/files/patch-i59368
new file mode 100644
index 000000000000..0d81635520e7
--- /dev/null
+++ b/editors/openoffice-3-devel/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-devel/files/patch-i63833 b/editors/openoffice-3-devel/files/patch-i63833
deleted file mode 100644
index cc62cb72b09a..000000000000
--- a/editors/openoffice-3-devel/files/patch-i63833
+++ /dev/null
@@ -1,11 +0,0 @@
---- codemaker/prj/build.lst	2006-03-31 06:30:23.000000000 +0200
-+++ codemaker/prj/build.lst	2006-03-31 06:29:01.000000000 +0200
-@@ -4,7 +4,7 @@
- cm	codemaker\prj							get		-	all	cm_prj NULL
- cm	codemaker\source\codemaker				nmake	-	all	cm_codemaker NULL
- cm	codemaker\source\commoncpp				nmake	-	all	cm_cpp NULL
--cm	codemaker\source\cppumaker				nmake	-	all	cm_cppumaker 	cm_codemaker NULL
-+cm	codemaker\source\cppumaker				nmake	-	all	cm_cppumaker 	cm_codemaker cm_cpp NULL
- cm	codemaker\source\commonjava				nmake	-	all	cm_java NULL
- cm	codemaker\source\javamaker				nmake	-	all	cm_javamaker cm_codemaker cm_java NULL
- 
diff --git a/editors/openoffice-3-devel/files/patch-i64412 b/editors/openoffice-3-devel/files/patch-i64412
new file mode 100644
index 000000000000..6edf8d9c51a0
--- /dev/null
+++ b/editors/openoffice-3-devel/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-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 6cb538f95c61..84fb160e4d72 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -50,9 +50,9 @@ ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
-JAVA_VERSION=	1.4
+JAVA_VERSION=	1.5
 JAVA_BUILD=	jdk
-JAVA_VENDOR=	bsdjava
+JAVA_VENDOR=	freebsd bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
@@ -64,9 +64,9 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE?=		162
+MILESTONE?=		163
 OOOTAG?=		SRC680_m${MILESTONE}
-SNAPDATE=		20060331
+SNAPDATE=		20060413
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index 898191390491..958aec0e5d25 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m162_source.tar.bz2) = 97df8b901c3ab3f69e65d86eb2a259ee
-SHA256 (openoffice.org2.0/OOo_SRC680_m162_source.tar.bz2) = f9f8c38fdf3a47bca06e53725f15f7094a20ca5018ce279dc09c847a0a0105cc
-SIZE (openoffice.org2.0/OOo_SRC680_m162_source.tar.bz2) = 242081994
+MD5 (openoffice.org2.0/OOo_SRC680_m163_source.tar.bz2) = c4196e635579095bfc7edb84d9306c7a
+SHA256 (openoffice.org2.0/OOo_SRC680_m163_source.tar.bz2) = 743e6fe186b99eb529e63904f480dcc119ae71d8d7fa46cea54700ffd33abfbf
+SIZE (openoffice.org2.0/OOo_SRC680_m163_source.tar.bz2) = 241639799
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-2-devel/files/patch-i59368 b/editors/openoffice.org-2-devel/files/patch-i59368
new file mode 100644
index 000000000000..0d81635520e7
--- /dev/null
+++ b/editors/openoffice.org-2-devel/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-devel/files/patch-i63833 b/editors/openoffice.org-2-devel/files/patch-i63833
deleted file mode 100644
index cc62cb72b09a..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i63833
+++ /dev/null
@@ -1,11 +0,0 @@
---- codemaker/prj/build.lst	2006-03-31 06:30:23.000000000 +0200
-+++ codemaker/prj/build.lst	2006-03-31 06:29:01.000000000 +0200
-@@ -4,7 +4,7 @@
- cm	codemaker\prj							get		-	all	cm_prj NULL
- cm	codemaker\source\codemaker				nmake	-	all	cm_codemaker NULL
- cm	codemaker\source\commoncpp				nmake	-	all	cm_cpp NULL
--cm	codemaker\source\cppumaker				nmake	-	all	cm_cppumaker 	cm_codemaker NULL
-+cm	codemaker\source\cppumaker				nmake	-	all	cm_cppumaker 	cm_codemaker cm_cpp NULL
- cm	codemaker\source\commonjava				nmake	-	all	cm_java NULL
- cm	codemaker\source\javamaker				nmake	-	all	cm_javamaker cm_codemaker cm_java NULL
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-i64412 b/editors/openoffice.org-2-devel/files/patch-i64412
new file mode 100644
index 000000000000..6edf8d9c51a0
--- /dev/null
+++ b/editors/openoffice.org-2-devel/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-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 6cb538f95c61..84fb160e4d72 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -50,9 +50,9 @@ ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
-JAVA_VERSION=	1.4
+JAVA_VERSION=	1.5
 JAVA_BUILD=	jdk
-JAVA_VENDOR=	bsdjava
+JAVA_VENDOR=	freebsd bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
@@ -64,9 +64,9 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE?=		162
+MILESTONE?=		163
 OOOTAG?=		SRC680_m${MILESTONE}
-SNAPDATE=		20060331
+SNAPDATE=		20060413
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index 898191390491..958aec0e5d25 100644
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ b/editors/openoffice.org-2.0-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m162_source.tar.bz2) = 97df8b901c3ab3f69e65d86eb2a259ee
-SHA256 (openoffice.org2.0/OOo_SRC680_m162_source.tar.bz2) = f9f8c38fdf3a47bca06e53725f15f7094a20ca5018ce279dc09c847a0a0105cc
-SIZE (openoffice.org2.0/OOo_SRC680_m162_source.tar.bz2) = 242081994
+MD5 (openoffice.org2.0/OOo_SRC680_m163_source.tar.bz2) = c4196e635579095bfc7edb84d9306c7a
+SHA256 (openoffice.org2.0/OOo_SRC680_m163_source.tar.bz2) = 743e6fe186b99eb529e63904f480dcc119ae71d8d7fa46cea54700ffd33abfbf
+SIZE (openoffice.org2.0/OOo_SRC680_m163_source.tar.bz2) = 241639799
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i59368 b/editors/openoffice.org-2.0-devel/files/patch-i59368
new file mode 100644
index 000000000000..0d81635520e7
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/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-devel/files/patch-i63833 b/editors/openoffice.org-2.0-devel/files/patch-i63833
deleted file mode 100644
index cc62cb72b09a..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-i63833
+++ /dev/null
@@ -1,11 +0,0 @@
---- codemaker/prj/build.lst	2006-03-31 06:30:23.000000000 +0200
-+++ codemaker/prj/build.lst	2006-03-31 06:29:01.000000000 +0200
-@@ -4,7 +4,7 @@
- cm	codemaker\prj							get		-	all	cm_prj NULL
- cm	codemaker\source\codemaker				nmake	-	all	cm_codemaker NULL
- cm	codemaker\source\commoncpp				nmake	-	all	cm_cpp NULL
--cm	codemaker\source\cppumaker				nmake	-	all	cm_cppumaker 	cm_codemaker NULL
-+cm	codemaker\source\cppumaker				nmake	-	all	cm_cppumaker 	cm_codemaker cm_cpp NULL
- cm	codemaker\source\commonjava				nmake	-	all	cm_java NULL
- cm	codemaker\source\javamaker				nmake	-	all	cm_javamaker cm_codemaker cm_java NULL
- 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i64412 b/editors/openoffice.org-2.0-devel/files/patch-i64412
new file mode 100644
index 000000000000..6edf8d9c51a0
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/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-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 6cb538f95c61..84fb160e4d72 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -50,9 +50,9 @@ ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
-JAVA_VERSION=	1.4
+JAVA_VERSION=	1.5
 JAVA_BUILD=	jdk
-JAVA_VENDOR=	bsdjava
+JAVA_VENDOR=	freebsd bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
@@ -64,9 +64,9 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE?=		162
+MILESTONE?=		163
 OOOTAG?=		SRC680_m${MILESTONE}
-SNAPDATE=		20060331
+SNAPDATE=		20060413
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index 898191390491..958aec0e5d25 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m162_source.tar.bz2) = 97df8b901c3ab3f69e65d86eb2a259ee
-SHA256 (openoffice.org2.0/OOo_SRC680_m162_source.tar.bz2) = f9f8c38fdf3a47bca06e53725f15f7094a20ca5018ce279dc09c847a0a0105cc
-SIZE (openoffice.org2.0/OOo_SRC680_m162_source.tar.bz2) = 242081994
+MD5 (openoffice.org2.0/OOo_SRC680_m163_source.tar.bz2) = c4196e635579095bfc7edb84d9306c7a
+SHA256 (openoffice.org2.0/OOo_SRC680_m163_source.tar.bz2) = 743e6fe186b99eb529e63904f480dcc119ae71d8d7fa46cea54700ffd33abfbf
+SIZE (openoffice.org2.0/OOo_SRC680_m163_source.tar.bz2) = 241639799
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-3-devel/files/patch-i59368 b/editors/openoffice.org-3-devel/files/patch-i59368
new file mode 100644
index 000000000000..0d81635520e7
--- /dev/null
+++ b/editors/openoffice.org-3-devel/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-devel/files/patch-i63833 b/editors/openoffice.org-3-devel/files/patch-i63833
deleted file mode 100644
index cc62cb72b09a..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i63833
+++ /dev/null
@@ -1,11 +0,0 @@
---- codemaker/prj/build.lst	2006-03-31 06:30:23.000000000 +0200
-+++ codemaker/prj/build.lst	2006-03-31 06:29:01.000000000 +0200
-@@ -4,7 +4,7 @@
- cm	codemaker\prj							get		-	all	cm_prj NULL
- cm	codemaker\source\codemaker				nmake	-	all	cm_codemaker NULL
- cm	codemaker\source\commoncpp				nmake	-	all	cm_cpp NULL
--cm	codemaker\source\cppumaker				nmake	-	all	cm_cppumaker 	cm_codemaker NULL
-+cm	codemaker\source\cppumaker				nmake	-	all	cm_cppumaker 	cm_codemaker cm_cpp NULL
- cm	codemaker\source\commonjava				nmake	-	all	cm_java NULL
- cm	codemaker\source\javamaker				nmake	-	all	cm_javamaker cm_codemaker cm_java NULL
- 
diff --git a/editors/openoffice.org-3-devel/files/patch-i64412 b/editors/openoffice.org-3-devel/files/patch-i64412
new file mode 100644
index 000000000000..6edf8d9c51a0
--- /dev/null
+++ b/editors/openoffice.org-3-devel/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-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 6cb538f95c61..84fb160e4d72 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -50,9 +50,9 @@ ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
-JAVA_VERSION=	1.4
+JAVA_VERSION=	1.5
 JAVA_BUILD=	jdk
-JAVA_VENDOR=	bsdjava
+JAVA_VENDOR=	freebsd bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
@@ -64,9 +64,9 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE?=		162
+MILESTONE?=		163
 OOOTAG?=		SRC680_m${MILESTONE}
-SNAPDATE=		20060331
+SNAPDATE=		20060413
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index 898191390491..958aec0e5d25 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m162_source.tar.bz2) = 97df8b901c3ab3f69e65d86eb2a259ee
-SHA256 (openoffice.org2.0/OOo_SRC680_m162_source.tar.bz2) = f9f8c38fdf3a47bca06e53725f15f7094a20ca5018ce279dc09c847a0a0105cc
-SIZE (openoffice.org2.0/OOo_SRC680_m162_source.tar.bz2) = 242081994
+MD5 (openoffice.org2.0/OOo_SRC680_m163_source.tar.bz2) = c4196e635579095bfc7edb84d9306c7a
+SHA256 (openoffice.org2.0/OOo_SRC680_m163_source.tar.bz2) = 743e6fe186b99eb529e63904f480dcc119ae71d8d7fa46cea54700ffd33abfbf
+SIZE (openoffice.org2.0/OOo_SRC680_m163_source.tar.bz2) = 241639799
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i59368 b/editors/openoffice.org-vcltesttool/files/patch-i59368
new file mode 100644
index 000000000000..0d81635520e7
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/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-vcltesttool/files/patch-i63833 b/editors/openoffice.org-vcltesttool/files/patch-i63833
deleted file mode 100644
index cc62cb72b09a..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i63833
+++ /dev/null
@@ -1,11 +0,0 @@
---- codemaker/prj/build.lst	2006-03-31 06:30:23.000000000 +0200
-+++ codemaker/prj/build.lst	2006-03-31 06:29:01.000000000 +0200
-@@ -4,7 +4,7 @@
- cm	codemaker\prj							get		-	all	cm_prj NULL
- cm	codemaker\source\codemaker				nmake	-	all	cm_codemaker NULL
- cm	codemaker\source\commoncpp				nmake	-	all	cm_cpp NULL
--cm	codemaker\source\cppumaker				nmake	-	all	cm_cppumaker 	cm_codemaker NULL
-+cm	codemaker\source\cppumaker				nmake	-	all	cm_cppumaker 	cm_codemaker cm_cpp NULL
- cm	codemaker\source\commonjava				nmake	-	all	cm_java NULL
- cm	codemaker\source\javamaker				nmake	-	all	cm_javamaker cm_codemaker cm_java NULL
- 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i64412 b/editors/openoffice.org-vcltesttool/files/patch-i64412
new file mode 100644
index 000000000000..6edf8d9c51a0
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/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";
+       }