Update to mozilla 1.0RC2, like the OO people did yesterday.

author: Martin Blapp <mbr@FreeBSD.org> 2002-05-18 12:32:54 +0000
committer: Martin Blapp <mbr@FreeBSD.org> 2002-05-18 12:32:54 +0000
commit: 9d31c8a527f5e7a11476b818f9122b4989d9a341 (patch)
tree: 3d29c0c13f08f7ab549c3335b520f96f9b1bc0ea
parent: Make setup start. Patch from Alexander N. Kabaev (diff)
47 files changed, 2060 insertions, 193 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile
index 6f6142fd8527..920e499bc6e9 100644
--- a/editors/openoffice-1.0/Makefile
+++ b/editors/openoffice-1.0/Makefile
@@ -14,7 +14,8 @@ MASTER_SITES=	ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \
 		ftp://gd.tuwien.ac.at/office/openoffice/${PORTVERSION}/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
 		http://people.freebsd.org/~mbr/distfiles/
-DISTFILES=	OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
+DISTFILES=	OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z \
+		oo_moz1.0RC2_i386_FreeBSD-4.tar.gz
 EXTRACT_ONLY=	OOo_${PORTVERSION}_source.tar.bz2
 
 MAINTAINER=	mbr@FreeBSD.org
@@ -32,7 +33,7 @@ USE_GMAKE=	yes
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
+EXTRACT_REST=	gpc231.tar.Z oo_moz1.0RC2_i386_FreeBSD-4.tar.gz
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
@@ -53,7 +54,7 @@ CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 .include <bsd.port.pre.mk>
 
 pre-fetch:
-.if ${GCC_VERSION}!="2.95.2" && ${GCC_VERSION}!="2.95.3"
+.if ${GCC_VERSION}!="2.95.2" && ${GCC_VERSION}!="2.95.3" && ${GCC_VERSION}!="2.95.4"
 	@ ${ECHO}
 	@ ${ECHO} Openoffice requires gcc 2.95.2 or better
 	@ ${ECHO}
diff --git a/editors/openoffice-1.0/files/patch-MDatabaseMetaDataHelper.cxx b/editors/openoffice-1.0/files/patch-MDatabaseMetaDataHelper.cxx
new file mode 100644
index 000000000000..4b92670204e7
--- /dev/null
+++ b/editors/openoffice-1.0/files/patch-MDatabaseMetaDataHelper.cxx
@@ -0,0 +1,71 @@
+--- ../connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx.orig	Sat May 18 01:46:08 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx	Sat May 18 01:56:23 2002
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: MDatabaseMetaDataHelper.cxx,v $
+  *
+- *  $Revision: 1.5 $
++ *  $Revision: 1.6 $
+  *
+- *  last change: $Author: dkenny $ $Date: 2001/12/13 09:34:19 $
++ *  last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -213,11 +213,15 @@
+ 
+ 	retCode = dirFactoryService->GetDirFactory(aFactory.getStr(), getter_AddRefs(dirFactory)) ;
+ 	NS_ENSURE_SUCCESS (retCode, retCode) ;
+-	OUString value = OStringToOUString(aFactory, RTL_TEXTENCODING_ASCII_US) ;
+-	const PRUnichar *valueChars = value.getStr() ;
+-	nsCOMPtr<nsISimpleEnumerator> subDirs ;
++	nsCOMPtr <nsIAbDirectoryProperties> properties;
++	properties = do_CreateInstance(NS_ABDIRECTORYPROPERTIES_CONTRACTID, &retCode);
++	NS_ENSURE_SUCCESS(retCode, retCode) ;
+ 
+-	retCode = dirFactory->CreateDirectory(1, &kPropertyName, &valueChars, getter_AddRefs(subDirs)) ;
++	retCode = properties->SetURI(aFactory.getStr());
++	NS_ENSURE_SUCCESS(retCode,retCode);
++
++	nsCOMPtr<nsISimpleEnumerator> subDirs ;
++	retCode = dirFactory->CreateDirectory(properties, getter_AddRefs(subDirs));
+ 	NS_ENSURE_SUCCESS(retCode, retCode) ;
+ 	PRBool hasMore = PR_TRUE ;
+ 	nsCOMPtr<nsISupportsArray> array ;
+@@ -635,12 +639,12 @@
+     if ( NS_FAILED(rv) )
+         return sal_False;
+ 
+-    rv = url->SetSpec( sAbURI.getStr() );
++    rv = url->SetSpec( nsDependentCString(sAbURI.getStr()) );
+     if ( NS_FAILED(rv) )
+         return sal_False;
+ 
+-    nsXPIDLCString host;
+-    rv = url->GetHost(getter_Copies (host));
++    nsCAutoString host;
++    rv = url->GetAsciiHost(host);
+     if ( NS_FAILED(rv) )
+         return sal_False;
+ 
+@@ -654,6 +658,11 @@
+     if ( NS_FAILED(rv) )
+         return sal_False;
+ 
++    PRUint32 options;
++    rv = url->GetOptions(&options);
++    if ( NS_FAILED(rv) )
++        return sal_False;
++
+     // Get the ldap connection
+     nsCOMPtr<nsILDAPConnection> ldapConnection;
+     ldapConnection = do_CreateInstance(NS_LDAPCONNECTION_CONTRACTID, &rv);
+@@ -671,7 +680,7 @@
+ 
+     // Now lets initialize the LDAP connection properly. We'll kick
+     // off the bind operation in the callback function, |OnLDAPInit()|.
+-    rv = ldapConnection->Init(host, port, NS_ConvertASCIItoUCS2(dn).get(),
++    rv = ldapConnection->Init(host.get(), port, options, nsnull,
+                               messageListener);
+     if ( NS_FAILED(rv) )
+         return sal_False;
diff --git a/editors/openoffice-1.0/files/patch-MNSInclude.hxx b/editors/openoffice-1.0/files/patch-MNSInclude.hxx
new file mode 100644
index 000000000000..48ac201682de
--- /dev/null
+++ b/editors/openoffice-1.0/files/patch-MNSInclude.hxx
@@ -0,0 +1,22 @@
+--- ../connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx.orig	Sat May 18 01:58:35 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx	Sat May 18 02:00:42 2002
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: MNSInclude.hxx,v $
+  *
+- *  $Revision: 1.3 $
++ *  $Revision: 1.4 $
+  *
+- *  last change: $Author: oj $ $Date: 2001/11/26 13:52:26 $
++ *  last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -83,7 +83,6 @@
+ # define _DEBUG MOZ_TMP_UDEBUG
+ #endif
+ 
+-#include <xp_core.h>
+ #include <nsCOMPtr.h>
+ #include <nsISupportsArray.h>
+ #include <nsStr.h>
diff --git a/editors/openoffice-1.0/files/patch-MTypeConverter.cxx b/editors/openoffice-1.0/files/patch-MTypeConverter.cxx
new file mode 100644
index 000000000000..345d3700936e
--- /dev/null
+++ b/editors/openoffice-1.0/files/patch-MTypeConverter.cxx
@@ -0,0 +1,26 @@
+--- ../connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx.orig	Mon Nov 26 14:52:26 2001
++++ ../connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx	Sat May 18 14:02:06 2002
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: MTypeConverter.cxx,v $
+  *
+- *  $Revision: 1.3 $
++ *  $Revision: 1.4 $
+  *
+- *  last change: $Author: oj $ $Date: 2001/11/26 13:52:26 $
++ *  last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -136,9 +136,11 @@
+ 	::rtl::OString os(ous,ous.getLength(),RTL_TEXTENCODING_ASCII_US);
+ 	return( ::std::string(os.getStr()));
+ }
++#if 0
+ // -------------------------------------------------------------------------
+ ::std::string MTypeConverter::nsStringToStlString(nsString const &nss)
+ {
+ 	return( ::std::string(nss.GetBuffer()));
+ }
++#endif
+ // -------------------------------------------------------------------------
diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
index 49a5008ebeff..4dd2ea9705f2 100644
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
@@ -1,11 +1,58 @@
---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Apr 23 20:47:57 2002
-+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Tue Apr 23 20:50:30 2002
-@@ -144,7 +144,7 @@
- 	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
+--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Mar 19 12:56:24 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Sat May 18 14:16:19 2002
+@@ -62,10 +62,10 @@
+ CALL_CDECL=TRUE
+ 
+ #mozilla specific stuff.
+-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
+-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
++#MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
++#MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
++MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
++MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
+ #End of mozilla specific stuff.
+ 
+ PRJ=..$/..$/..$/..
+@@ -107,7 +107,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -123,7 +123,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -141,7 +141,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
  CDEFS+=	    -DMOZILLA_CLIENT \
              -DOSTYPE=\"Linux2.2.14-5\" -DOJI
--.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- CFLAGS +=   -fPIC -g
- CFLAGSCXX += \
+ .IF "$(OS)" == "LINUX"
+@@ -157,6 +157,13 @@
              -fno-rtti -Wall -Wconversion -Wpointer-arith \
+             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
+             -Wno-long-long 
++CDEFS     += -DTRACING
++.ELIF "$(OS)" == "FREEBSD"
++CFLAGS +=   -fPIC
++CFLAGSCXX += \
++            -fno-rtti -Wall -Wconversion -Wpointer-arith \
++            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
++            -Wno-long-long -pthread 
+ CDEFS     += -DTRACING
+ .ENDIF
+ .ENDIF
diff --git a/editors/openoffice-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MDatabaseMetaDataHelper.cxx b/editors/openoffice-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MDatabaseMetaDataHelper.cxx
new file mode 100644
index 000000000000..4b92670204e7
--- /dev/null
+++ b/editors/openoffice-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MDatabaseMetaDataHelper.cxx
@@ -0,0 +1,71 @@
+--- ../connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx.orig	Sat May 18 01:46:08 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx	Sat May 18 01:56:23 2002
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: MDatabaseMetaDataHelper.cxx,v $
+  *
+- *  $Revision: 1.5 $
++ *  $Revision: 1.6 $
+  *
+- *  last change: $Author: dkenny $ $Date: 2001/12/13 09:34:19 $
++ *  last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -213,11 +213,15 @@
+ 
+ 	retCode = dirFactoryService->GetDirFactory(aFactory.getStr(), getter_AddRefs(dirFactory)) ;
+ 	NS_ENSURE_SUCCESS (retCode, retCode) ;
+-	OUString value = OStringToOUString(aFactory, RTL_TEXTENCODING_ASCII_US) ;
+-	const PRUnichar *valueChars = value.getStr() ;
+-	nsCOMPtr<nsISimpleEnumerator> subDirs ;
++	nsCOMPtr <nsIAbDirectoryProperties> properties;
++	properties = do_CreateInstance(NS_ABDIRECTORYPROPERTIES_CONTRACTID, &retCode);
++	NS_ENSURE_SUCCESS(retCode, retCode) ;
+ 
+-	retCode = dirFactory->CreateDirectory(1, &kPropertyName, &valueChars, getter_AddRefs(subDirs)) ;
++	retCode = properties->SetURI(aFactory.getStr());
++	NS_ENSURE_SUCCESS(retCode,retCode);
++
++	nsCOMPtr<nsISimpleEnumerator> subDirs ;
++	retCode = dirFactory->CreateDirectory(properties, getter_AddRefs(subDirs));
+ 	NS_ENSURE_SUCCESS(retCode, retCode) ;
+ 	PRBool hasMore = PR_TRUE ;
+ 	nsCOMPtr<nsISupportsArray> array ;
+@@ -635,12 +639,12 @@
+     if ( NS_FAILED(rv) )
+         return sal_False;
+ 
+-    rv = url->SetSpec( sAbURI.getStr() );
++    rv = url->SetSpec( nsDependentCString(sAbURI.getStr()) );
+     if ( NS_FAILED(rv) )
+         return sal_False;
+ 
+-    nsXPIDLCString host;
+-    rv = url->GetHost(getter_Copies (host));
++    nsCAutoString host;
++    rv = url->GetAsciiHost(host);
+     if ( NS_FAILED(rv) )
+         return sal_False;
+ 
+@@ -654,6 +658,11 @@
+     if ( NS_FAILED(rv) )
+         return sal_False;
+ 
++    PRUint32 options;
++    rv = url->GetOptions(&options);
++    if ( NS_FAILED(rv) )
++        return sal_False;
++
+     // Get the ldap connection
+     nsCOMPtr<nsILDAPConnection> ldapConnection;
+     ldapConnection = do_CreateInstance(NS_LDAPCONNECTION_CONTRACTID, &rv);
+@@ -671,7 +680,7 @@
+ 
+     // Now lets initialize the LDAP connection properly. We'll kick
+     // off the bind operation in the callback function, |OnLDAPInit()|.
+-    rv = ldapConnection->Init(host, port, NS_ConvertASCIItoUCS2(dn).get(),
++    rv = ldapConnection->Init(host.get(), port, options, nsnull,
+                               messageListener);
+     if ( NS_FAILED(rv) )
+         return sal_False;
diff --git a/editors/openoffice-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInclude.hxx b/editors/openoffice-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInclude.hxx
new file mode 100644
index 000000000000..48ac201682de
--- /dev/null
+++ b/editors/openoffice-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInclude.hxx
@@ -0,0 +1,22 @@
+--- ../connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx.orig	Sat May 18 01:58:35 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx	Sat May 18 02:00:42 2002
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: MNSInclude.hxx,v $
+  *
+- *  $Revision: 1.3 $
++ *  $Revision: 1.4 $
+  *
+- *  last change: $Author: oj $ $Date: 2001/11/26 13:52:26 $
++ *  last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -83,7 +83,6 @@
+ # define _DEBUG MOZ_TMP_UDEBUG
+ #endif
+ 
+-#include <xp_core.h>
+ #include <nsCOMPtr.h>
+ #include <nsISupportsArray.h>
+ #include <nsStr.h>
diff --git a/editors/openoffice-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInit.cxx b/editors/openoffice-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInit.cxx
new file mode 100644
index 000000000000..ba52563e23e0
--- /dev/null
+++ b/editors/openoffice-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInit.cxx
@@ -0,0 +1,23 @@
+--- ../connectivity/source/drivers/mozab/mozillasrc/MNSInit.cxx.orig	Sat May 18 02:01:33 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/MNSInit.cxx	Sat May 18 02:02:18 2002
+@@ -2,9 +2,9 @@
+  *
+  *	$RCSfile: MNSInit.cxx,v $
+  *
+- *	$Revision: 1.4 $
++ *	$Revision: 1.5 $
+  *
+- *	last change: $Author: dkenny $ $Date: 2001/12/12 15:32:45 $
++ *	last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
+  *
+  *	The Contents of this file are made available subject to the terms of
+  *	either of the following licenses
+@@ -269,7 +269,7 @@
+ #ifdef _DEBUG
+ 				nsCAutoString temp1;
+ 				temp1.AssignWithConversion( pUsedProfile );
+-				OSL_TRACE("Profile Name: %s\n", NS_STATIC_CAST(const char*, temp1));
++				OSL_TRACE("Profile Name: %s\n", NS_STATIC_CAST(const char*, temp1.get()));
+ #endif
+ 				theProfile->SetCurrentProfile( pUsedProfile );
+ 
diff --git a/editors/openoffice-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MTypeConverter.cxx b/editors/openoffice-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MTypeConverter.cxx
new file mode 100644
index 000000000000..345d3700936e
--- /dev/null
+++ b/editors/openoffice-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MTypeConverter.cxx
@@ -0,0 +1,26 @@
+--- ../connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx.orig	Mon Nov 26 14:52:26 2001
++++ ../connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx	Sat May 18 14:02:06 2002
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: MTypeConverter.cxx,v $
+  *
+- *  $Revision: 1.3 $
++ *  $Revision: 1.4 $
+  *
+- *  last change: $Author: oj $ $Date: 2001/11/26 13:52:26 $
++ *  last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -136,9 +136,11 @@
+ 	::rtl::OString os(ous,ous.getLength(),RTL_TEXTENCODING_ASCII_US);
+ 	return( ::std::string(os.getStr()));
+ }
++#if 0
+ // -------------------------------------------------------------------------
+ ::std::string MTypeConverter::nsStringToStlString(nsString const &nss)
+ {
+ 	return( ::std::string(nss.GetBuffer()));
+ }
++#endif
+ // -------------------------------------------------------------------------
diff --git a/editors/openoffice-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk b/editors/openoffice-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk
index 49a5008ebeff..4dd2ea9705f2 100644
--- a/editors/openoffice-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk
@@ -1,11 +1,58 @@
---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Apr 23 20:47:57 2002
-+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Tue Apr 23 20:50:30 2002
-@@ -144,7 +144,7 @@
- 	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
+--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Mar 19 12:56:24 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Sat May 18 14:16:19 2002
+@@ -62,10 +62,10 @@
+ CALL_CDECL=TRUE
+ 
+ #mozilla specific stuff.
+-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
+-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
++#MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
++#MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
++MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
++MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
+ #End of mozilla specific stuff.
+ 
+ PRJ=..$/..$/..$/..
+@@ -107,7 +107,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -123,7 +123,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -141,7 +141,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
  CDEFS+=	    -DMOZILLA_CLIENT \
              -DOSTYPE=\"Linux2.2.14-5\" -DOJI
--.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- CFLAGS +=   -fPIC -g
- CFLAGSCXX += \
+ .IF "$(OS)" == "LINUX"
+@@ -157,6 +157,13 @@
              -fno-rtti -Wall -Wconversion -Wpointer-arith \
+             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
+             -Wno-long-long 
++CDEFS     += -DTRACING
++.ELIF "$(OS)" == "FREEBSD"
++CFLAGS +=   -fPIC
++CFLAGSCXX += \
++            -fno-rtti -Wall -Wconversion -Wpointer-arith \
++            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
++            -Wno-long-long -pthread 
+ CDEFS     += -DTRACING
+ .ENDIF
+ .ENDIF
diff --git a/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
index 49a5008ebeff..4dd2ea9705f2 100644
--- a/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
@@ -1,11 +1,58 @@
---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Apr 23 20:47:57 2002
-+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Tue Apr 23 20:50:30 2002
-@@ -144,7 +144,7 @@
- 	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
+--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Mar 19 12:56:24 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Sat May 18 14:16:19 2002
+@@ -62,10 +62,10 @@
+ CALL_CDECL=TRUE
+ 
+ #mozilla specific stuff.
+-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
+-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
++#MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
++#MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
++MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
++MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
+ #End of mozilla specific stuff.
+ 
+ PRJ=..$/..$/..$/..
+@@ -107,7 +107,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -123,7 +123,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -141,7 +141,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
  CDEFS+=	    -DMOZILLA_CLIENT \
              -DOSTYPE=\"Linux2.2.14-5\" -DOJI
--.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- CFLAGS +=   -fPIC -g
- CFLAGSCXX += \
+ .IF "$(OS)" == "LINUX"
+@@ -157,6 +157,13 @@
              -fno-rtti -Wall -Wconversion -Wpointer-arith \
+             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
+             -Wno-long-long 
++CDEFS     += -DTRACING
++.ELIF "$(OS)" == "FREEBSD"
++CFLAGS +=   -fPIC
++CFLAGSCXX += \
++            -fno-rtti -Wall -Wconversion -Wpointer-arith \
++            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
++            -Wno-long-long -pthread 
+ CDEFS     += -DTRACING
+ .ENDIF
+ .ENDIF
diff --git a/editors/openoffice-1.1/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice-1.1/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
index 49a5008ebeff..4dd2ea9705f2 100644
--- a/editors/openoffice-1.1/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ b/editors/openoffice-1.1/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
@@ -1,11 +1,58 @@
---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Apr 23 20:47:57 2002
-+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Tue Apr 23 20:50:30 2002
-@@ -144,7 +144,7 @@
- 	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
+--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Mar 19 12:56:24 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Sat May 18 14:16:19 2002
+@@ -62,10 +62,10 @@
+ CALL_CDECL=TRUE
+ 
+ #mozilla specific stuff.
+-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
+-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
++#MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
++#MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
++MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
++MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
+ #End of mozilla specific stuff.
+ 
+ PRJ=..$/..$/..$/..
+@@ -107,7 +107,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -123,7 +123,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -141,7 +141,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
  CDEFS+=	    -DMOZILLA_CLIENT \
              -DOSTYPE=\"Linux2.2.14-5\" -DOJI
--.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- CFLAGS +=   -fPIC -g
- CFLAGSCXX += \
+ .IF "$(OS)" == "LINUX"
+@@ -157,6 +157,13 @@
              -fno-rtti -Wall -Wconversion -Wpointer-arith \
+             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
+             -Wno-long-long 
++CDEFS     += -DTRACING
++.ELIF "$(OS)" == "FREEBSD"
++CFLAGS +=   -fPIC
++CFLAGSCXX += \
++            -fno-rtti -Wall -Wconversion -Wpointer-arith \
++            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
++            -Wno-long-long -pthread 
+ CDEFS     += -DTRACING
+ .ENDIF
+ .ENDIF
diff --git a/editors/openoffice-2.0-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice-2.0-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
index 49a5008ebeff..4dd2ea9705f2 100644
--- a/editors/openoffice-2.0-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ b/editors/openoffice-2.0-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
@@ -1,11 +1,58 @@
---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Apr 23 20:47:57 2002
-+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Tue Apr 23 20:50:30 2002
-@@ -144,7 +144,7 @@
- 	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
+--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Mar 19 12:56:24 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Sat May 18 14:16:19 2002
+@@ -62,10 +62,10 @@
+ CALL_CDECL=TRUE
+ 
+ #mozilla specific stuff.
+-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
+-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
++#MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
++#MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
++MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
++MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
+ #End of mozilla specific stuff.
+ 
+ PRJ=..$/..$/..$/..
+@@ -107,7 +107,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -123,7 +123,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -141,7 +141,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
  CDEFS+=	    -DMOZILLA_CLIENT \
              -DOSTYPE=\"Linux2.2.14-5\" -DOJI
--.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- CFLAGS +=   -fPIC -g
- CFLAGSCXX += \
+ .IF "$(OS)" == "LINUX"
+@@ -157,6 +157,13 @@
              -fno-rtti -Wall -Wconversion -Wpointer-arith \
+             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
+             -Wno-long-long 
++CDEFS     += -DTRACING
++.ELIF "$(OS)" == "FREEBSD"
++CFLAGS +=   -fPIC
++CFLAGSCXX += \
++            -fno-rtti -Wall -Wconversion -Wpointer-arith \
++            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
++            -Wno-long-long -pthread 
+ CDEFS     += -DTRACING
+ .ENDIF
+ .ENDIF
diff --git a/editors/openoffice-3-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice-3-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
index 49a5008ebeff..4dd2ea9705f2 100644
--- a/editors/openoffice-3-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ b/editors/openoffice-3-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
@@ -1,11 +1,58 @@
---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Apr 23 20:47:57 2002
-+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Tue Apr 23 20:50:30 2002
-@@ -144,7 +144,7 @@
- 	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
+--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Mar 19 12:56:24 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Sat May 18 14:16:19 2002
+@@ -62,10 +62,10 @@
+ CALL_CDECL=TRUE
+ 
+ #mozilla specific stuff.
+-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
+-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
++#MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
++#MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
++MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
++MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
+ #End of mozilla specific stuff.
+ 
+ PRJ=..$/..$/..$/..
+@@ -107,7 +107,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -123,7 +123,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -141,7 +141,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
  CDEFS+=	    -DMOZILLA_CLIENT \
              -DOSTYPE=\"Linux2.2.14-5\" -DOJI
--.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- CFLAGS +=   -fPIC -g
- CFLAGSCXX += \
+ .IF "$(OS)" == "LINUX"
+@@ -157,6 +157,13 @@
              -fno-rtti -Wall -Wconversion -Wpointer-arith \
+             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
+             -Wno-long-long 
++CDEFS     += -DTRACING
++.ELIF "$(OS)" == "FREEBSD"
++CFLAGS +=   -fPIC
++CFLAGSCXX += \
++            -fno-rtti -Wall -Wconversion -Wpointer-arith \
++            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
++            -Wno-long-long -pthread 
+ CDEFS     += -DTRACING
+ .ENDIF
+ .ENDIF
diff --git a/editors/openoffice-3/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice-3/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
index 49a5008ebeff..4dd2ea9705f2 100644
--- a/editors/openoffice-3/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ b/editors/openoffice-3/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
@@ -1,11 +1,58 @@
---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Apr 23 20:47:57 2002
-+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Tue Apr 23 20:50:30 2002
-@@ -144,7 +144,7 @@
- 	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
+--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Mar 19 12:56:24 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Sat May 18 14:16:19 2002
+@@ -62,10 +62,10 @@
+ CALL_CDECL=TRUE
+ 
+ #mozilla specific stuff.
+-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
+-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
++#MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
++#MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
++MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
++MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
+ #End of mozilla specific stuff.
+ 
+ PRJ=..$/..$/..$/..
+@@ -107,7 +107,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -123,7 +123,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -141,7 +141,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
  CDEFS+=	    -DMOZILLA_CLIENT \
              -DOSTYPE=\"Linux2.2.14-5\" -DOJI
--.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- CFLAGS +=   -fPIC -g
- CFLAGSCXX += \
+ .IF "$(OS)" == "LINUX"
+@@ -157,6 +157,13 @@
              -fno-rtti -Wall -Wconversion -Wpointer-arith \
+             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
+             -Wno-long-long 
++CDEFS     += -DTRACING
++.ELIF "$(OS)" == "FREEBSD"
++CFLAGS +=   -fPIC
++CFLAGSCXX += \
++            -fno-rtti -Wall -Wconversion -Wpointer-arith \
++            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
++            -Wno-long-long -pthread 
+ CDEFS     += -DTRACING
+ .ENDIF
+ .ENDIF
diff --git a/editors/openoffice-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
index 49a5008ebeff..4dd2ea9705f2 100644
--- a/editors/openoffice-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ b/editors/openoffice-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
@@ -1,11 +1,58 @@
---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Apr 23 20:47:57 2002
-+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Tue Apr 23 20:50:30 2002
-@@ -144,7 +144,7 @@
- 	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
+--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Mar 19 12:56:24 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Sat May 18 14:16:19 2002
+@@ -62,10 +62,10 @@
+ CALL_CDECL=TRUE
+ 
+ #mozilla specific stuff.
+-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
+-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
++#MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
++#MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
++MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
++MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
+ #End of mozilla specific stuff.
+ 
+ PRJ=..$/..$/..$/..
+@@ -107,7 +107,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -123,7 +123,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -141,7 +141,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
  CDEFS+=	    -DMOZILLA_CLIENT \
              -DOSTYPE=\"Linux2.2.14-5\" -DOJI
--.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- CFLAGS +=   -fPIC -g
- CFLAGSCXX += \
+ .IF "$(OS)" == "LINUX"
+@@ -157,6 +157,13 @@
              -fno-rtti -Wall -Wconversion -Wpointer-arith \
+             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
+             -Wno-long-long 
++CDEFS     += -DTRACING
++.ELIF "$(OS)" == "FREEBSD"
++CFLAGS +=   -fPIC
++CFLAGSCXX += \
++            -fno-rtti -Wall -Wconversion -Wpointer-arith \
++            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
++            -Wno-long-long -pthread 
+ CDEFS     += -DTRACING
+ .ENDIF
+ .ENDIF
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index 6f6142fd8527..920e499bc6e9 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -14,7 +14,8 @@ MASTER_SITES=	ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \
 		ftp://gd.tuwien.ac.at/office/openoffice/${PORTVERSION}/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
 		http://people.freebsd.org/~mbr/distfiles/
-DISTFILES=	OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
+DISTFILES=	OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z \
+		oo_moz1.0RC2_i386_FreeBSD-4.tar.gz
 EXTRACT_ONLY=	OOo_${PORTVERSION}_source.tar.bz2
 
 MAINTAINER=	mbr@FreeBSD.org
@@ -32,7 +33,7 @@ USE_GMAKE=	yes
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
+EXTRACT_REST=	gpc231.tar.Z oo_moz1.0RC2_i386_FreeBSD-4.tar.gz
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
@@ -53,7 +54,7 @@ CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 .include <bsd.port.pre.mk>
 
 pre-fetch:
-.if ${GCC_VERSION}!="2.95.2" && ${GCC_VERSION}!="2.95.3"
+.if ${GCC_VERSION}!="2.95.2" && ${GCC_VERSION}!="2.95.3" && ${GCC_VERSION}!="2.95.4"
 	@ ${ECHO}
 	@ ${ECHO} Openoffice requires gcc 2.95.2 or better
 	@ ${ECHO}
diff --git a/editors/openoffice.org-1.0/files/patch-MDatabaseMetaDataHelper.cxx b/editors/openoffice.org-1.0/files/patch-MDatabaseMetaDataHelper.cxx
new file mode 100644
index 000000000000..4b92670204e7
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-MDatabaseMetaDataHelper.cxx
@@ -0,0 +1,71 @@
+--- ../connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx.orig	Sat May 18 01:46:08 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx	Sat May 18 01:56:23 2002
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: MDatabaseMetaDataHelper.cxx,v $
+  *
+- *  $Revision: 1.5 $
++ *  $Revision: 1.6 $
+  *
+- *  last change: $Author: dkenny $ $Date: 2001/12/13 09:34:19 $
++ *  last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -213,11 +213,15 @@
+ 
+ 	retCode = dirFactoryService->GetDirFactory(aFactory.getStr(), getter_AddRefs(dirFactory)) ;
+ 	NS_ENSURE_SUCCESS (retCode, retCode) ;
+-	OUString value = OStringToOUString(aFactory, RTL_TEXTENCODING_ASCII_US) ;
+-	const PRUnichar *valueChars = value.getStr() ;
+-	nsCOMPtr<nsISimpleEnumerator> subDirs ;
++	nsCOMPtr <nsIAbDirectoryProperties> properties;
++	properties = do_CreateInstance(NS_ABDIRECTORYPROPERTIES_CONTRACTID, &retCode);
++	NS_ENSURE_SUCCESS(retCode, retCode) ;
+ 
+-	retCode = dirFactory->CreateDirectory(1, &kPropertyName, &valueChars, getter_AddRefs(subDirs)) ;
++	retCode = properties->SetURI(aFactory.getStr());
++	NS_ENSURE_SUCCESS(retCode,retCode);
++
++	nsCOMPtr<nsISimpleEnumerator> subDirs ;
++	retCode = dirFactory->CreateDirectory(properties, getter_AddRefs(subDirs));
+ 	NS_ENSURE_SUCCESS(retCode, retCode) ;
+ 	PRBool hasMore = PR_TRUE ;
+ 	nsCOMPtr<nsISupportsArray> array ;
+@@ -635,12 +639,12 @@
+     if ( NS_FAILED(rv) )
+         return sal_False;
+ 
+-    rv = url->SetSpec( sAbURI.getStr() );
++    rv = url->SetSpec( nsDependentCString(sAbURI.getStr()) );
+     if ( NS_FAILED(rv) )
+         return sal_False;
+ 
+-    nsXPIDLCString host;
+-    rv = url->GetHost(getter_Copies (host));
++    nsCAutoString host;
++    rv = url->GetAsciiHost(host);
+     if ( NS_FAILED(rv) )
+         return sal_False;
+ 
+@@ -654,6 +658,11 @@
+     if ( NS_FAILED(rv) )
+         return sal_False;
+ 
++    PRUint32 options;
++    rv = url->GetOptions(&options);
++    if ( NS_FAILED(rv) )
++        return sal_False;
++
+     // Get the ldap connection
+     nsCOMPtr<nsILDAPConnection> ldapConnection;
+     ldapConnection = do_CreateInstance(NS_LDAPCONNECTION_CONTRACTID, &rv);
+@@ -671,7 +680,7 @@
+ 
+     // Now lets initialize the LDAP connection properly. We'll kick
+     // off the bind operation in the callback function, |OnLDAPInit()|.
+-    rv = ldapConnection->Init(host, port, NS_ConvertASCIItoUCS2(dn).get(),
++    rv = ldapConnection->Init(host.get(), port, options, nsnull,
+                               messageListener);
+     if ( NS_FAILED(rv) )
+         return sal_False;
diff --git a/editors/openoffice.org-1.0/files/patch-MNSInclude.hxx b/editors/openoffice.org-1.0/files/patch-MNSInclude.hxx
new file mode 100644
index 000000000000..48ac201682de
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-MNSInclude.hxx
@@ -0,0 +1,22 @@
+--- ../connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx.orig	Sat May 18 01:58:35 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx	Sat May 18 02:00:42 2002
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: MNSInclude.hxx,v $
+  *
+- *  $Revision: 1.3 $
++ *  $Revision: 1.4 $
+  *
+- *  last change: $Author: oj $ $Date: 2001/11/26 13:52:26 $
++ *  last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -83,7 +83,6 @@
+ # define _DEBUG MOZ_TMP_UDEBUG
+ #endif
+ 
+-#include <xp_core.h>
+ #include <nsCOMPtr.h>
+ #include <nsISupportsArray.h>
+ #include <nsStr.h>
diff --git a/editors/openoffice.org-1.0/files/patch-MTypeConverter.cxx b/editors/openoffice.org-1.0/files/patch-MTypeConverter.cxx
new file mode 100644
index 000000000000..345d3700936e
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-MTypeConverter.cxx
@@ -0,0 +1,26 @@
+--- ../connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx.orig	Mon Nov 26 14:52:26 2001
++++ ../connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx	Sat May 18 14:02:06 2002
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: MTypeConverter.cxx,v $
+  *
+- *  $Revision: 1.3 $
++ *  $Revision: 1.4 $
+  *
+- *  last change: $Author: oj $ $Date: 2001/11/26 13:52:26 $
++ *  last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -136,9 +136,11 @@
+ 	::rtl::OString os(ous,ous.getLength(),RTL_TEXTENCODING_ASCII_US);
+ 	return( ::std::string(os.getStr()));
+ }
++#if 0
+ // -------------------------------------------------------------------------
+ ::std::string MTypeConverter::nsStringToStlString(nsString const &nss)
+ {
+ 	return( ::std::string(nss.GetBuffer()));
+ }
++#endif
+ // -------------------------------------------------------------------------
diff --git a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
index 49a5008ebeff..4dd2ea9705f2 100644
--- a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ b/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
@@ -1,11 +1,58 @@
---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Apr 23 20:47:57 2002
-+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Tue Apr 23 20:50:30 2002
-@@ -144,7 +144,7 @@
- 	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
+--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Mar 19 12:56:24 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Sat May 18 14:16:19 2002
+@@ -62,10 +62,10 @@
+ CALL_CDECL=TRUE
+ 
+ #mozilla specific stuff.
+-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
+-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
++#MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
++#MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
++MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
++MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
+ #End of mozilla specific stuff.
+ 
+ PRJ=..$/..$/..$/..
+@@ -107,7 +107,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -123,7 +123,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -141,7 +141,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
  CDEFS+=	    -DMOZILLA_CLIENT \
              -DOSTYPE=\"Linux2.2.14-5\" -DOJI
--.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- CFLAGS +=   -fPIC -g
- CFLAGSCXX += \
+ .IF "$(OS)" == "LINUX"
+@@ -157,6 +157,13 @@
              -fno-rtti -Wall -Wconversion -Wpointer-arith \
+             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
+             -Wno-long-long 
++CDEFS     += -DTRACING
++.ELIF "$(OS)" == "FREEBSD"
++CFLAGS +=   -fPIC
++CFLAGSCXX += \
++            -fno-rtti -Wall -Wconversion -Wpointer-arith \
++            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
++            -Wno-long-long -pthread 
+ CDEFS     += -DTRACING
+ .ENDIF
+ .ENDIF
diff --git a/editors/openoffice.org-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MDatabaseMetaDataHelper.cxx b/editors/openoffice.org-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MDatabaseMetaDataHelper.cxx
new file mode 100644
index 000000000000..4b92670204e7
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MDatabaseMetaDataHelper.cxx
@@ -0,0 +1,71 @@
+--- ../connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx.orig	Sat May 18 01:46:08 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx	Sat May 18 01:56:23 2002
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: MDatabaseMetaDataHelper.cxx,v $
+  *
+- *  $Revision: 1.5 $
++ *  $Revision: 1.6 $
+  *
+- *  last change: $Author: dkenny $ $Date: 2001/12/13 09:34:19 $
++ *  last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -213,11 +213,15 @@
+ 
+ 	retCode = dirFactoryService->GetDirFactory(aFactory.getStr(), getter_AddRefs(dirFactory)) ;
+ 	NS_ENSURE_SUCCESS (retCode, retCode) ;
+-	OUString value = OStringToOUString(aFactory, RTL_TEXTENCODING_ASCII_US) ;
+-	const PRUnichar *valueChars = value.getStr() ;
+-	nsCOMPtr<nsISimpleEnumerator> subDirs ;
++	nsCOMPtr <nsIAbDirectoryProperties> properties;
++	properties = do_CreateInstance(NS_ABDIRECTORYPROPERTIES_CONTRACTID, &retCode);
++	NS_ENSURE_SUCCESS(retCode, retCode) ;
+ 
+-	retCode = dirFactory->CreateDirectory(1, &kPropertyName, &valueChars, getter_AddRefs(subDirs)) ;
++	retCode = properties->SetURI(aFactory.getStr());
++	NS_ENSURE_SUCCESS(retCode,retCode);
++
++	nsCOMPtr<nsISimpleEnumerator> subDirs ;
++	retCode = dirFactory->CreateDirectory(properties, getter_AddRefs(subDirs));
+ 	NS_ENSURE_SUCCESS(retCode, retCode) ;
+ 	PRBool hasMore = PR_TRUE ;
+ 	nsCOMPtr<nsISupportsArray> array ;
+@@ -635,12 +639,12 @@
+     if ( NS_FAILED(rv) )
+         return sal_False;
+ 
+-    rv = url->SetSpec( sAbURI.getStr() );
++    rv = url->SetSpec( nsDependentCString(sAbURI.getStr()) );
+     if ( NS_FAILED(rv) )
+         return sal_False;
+ 
+-    nsXPIDLCString host;
+-    rv = url->GetHost(getter_Copies (host));
++    nsCAutoString host;
++    rv = url->GetAsciiHost(host);
+     if ( NS_FAILED(rv) )
+         return sal_False;
+ 
+@@ -654,6 +658,11 @@
+     if ( NS_FAILED(rv) )
+         return sal_False;
+ 
++    PRUint32 options;
++    rv = url->GetOptions(&options);
++    if ( NS_FAILED(rv) )
++        return sal_False;
++
+     // Get the ldap connection
+     nsCOMPtr<nsILDAPConnection> ldapConnection;
+     ldapConnection = do_CreateInstance(NS_LDAPCONNECTION_CONTRACTID, &rv);
+@@ -671,7 +680,7 @@
+ 
+     // Now lets initialize the LDAP connection properly. We'll kick
+     // off the bind operation in the callback function, |OnLDAPInit()|.
+-    rv = ldapConnection->Init(host, port, NS_ConvertASCIItoUCS2(dn).get(),
++    rv = ldapConnection->Init(host.get(), port, options, nsnull,
+                               messageListener);
+     if ( NS_FAILED(rv) )
+         return sal_False;
diff --git a/editors/openoffice.org-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInclude.hxx b/editors/openoffice.org-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInclude.hxx
new file mode 100644
index 000000000000..48ac201682de
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInclude.hxx
@@ -0,0 +1,22 @@
+--- ../connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx.orig	Sat May 18 01:58:35 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx	Sat May 18 02:00:42 2002
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: MNSInclude.hxx,v $
+  *
+- *  $Revision: 1.3 $
++ *  $Revision: 1.4 $
+  *
+- *  last change: $Author: oj $ $Date: 2001/11/26 13:52:26 $
++ *  last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -83,7 +83,6 @@
+ # define _DEBUG MOZ_TMP_UDEBUG
+ #endif
+ 
+-#include <xp_core.h>
+ #include <nsCOMPtr.h>
+ #include <nsISupportsArray.h>
+ #include <nsStr.h>
diff --git a/editors/openoffice.org-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInit.cxx b/editors/openoffice.org-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInit.cxx
new file mode 100644
index 000000000000..ba52563e23e0
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInit.cxx
@@ -0,0 +1,23 @@
+--- ../connectivity/source/drivers/mozab/mozillasrc/MNSInit.cxx.orig	Sat May 18 02:01:33 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/MNSInit.cxx	Sat May 18 02:02:18 2002
+@@ -2,9 +2,9 @@
+  *
+  *	$RCSfile: MNSInit.cxx,v $
+  *
+- *	$Revision: 1.4 $
++ *	$Revision: 1.5 $
+  *
+- *	last change: $Author: dkenny $ $Date: 2001/12/12 15:32:45 $
++ *	last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
+  *
+  *	The Contents of this file are made available subject to the terms of
+  *	either of the following licenses
+@@ -269,7 +269,7 @@
+ #ifdef _DEBUG
+ 				nsCAutoString temp1;
+ 				temp1.AssignWithConversion( pUsedProfile );
+-				OSL_TRACE("Profile Name: %s\n", NS_STATIC_CAST(const char*, temp1));
++				OSL_TRACE("Profile Name: %s\n", NS_STATIC_CAST(const char*, temp1.get()));
+ #endif
+ 				theProfile->SetCurrentProfile( pUsedProfile );
+ 
diff --git a/editors/openoffice.org-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MTypeConverter.cxx b/editors/openoffice.org-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MTypeConverter.cxx
new file mode 100644
index 000000000000..345d3700936e
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MTypeConverter.cxx
@@ -0,0 +1,26 @@
+--- ../connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx.orig	Mon Nov 26 14:52:26 2001
++++ ../connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx	Sat May 18 14:02:06 2002
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: MTypeConverter.cxx,v $
+  *
+- *  $Revision: 1.3 $
++ *  $Revision: 1.4 $
+  *
+- *  last change: $Author: oj $ $Date: 2001/11/26 13:52:26 $
++ *  last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -136,9 +136,11 @@
+ 	::rtl::OString os(ous,ous.getLength(),RTL_TEXTENCODING_ASCII_US);
+ 	return( ::std::string(os.getStr()));
+ }
++#if 0
+ // -------------------------------------------------------------------------
+ ::std::string MTypeConverter::nsStringToStlString(nsString const &nss)
+ {
+ 	return( ::std::string(nss.GetBuffer()));
+ }
++#endif
+ // -------------------------------------------------------------------------
diff --git a/editors/openoffice.org-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk b/editors/openoffice.org-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk
index 49a5008ebeff..4dd2ea9705f2 100644
--- a/editors/openoffice.org-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk
+++ b/editors/openoffice.org-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk
@@ -1,11 +1,58 @@
---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Apr 23 20:47:57 2002
-+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Tue Apr 23 20:50:30 2002
-@@ -144,7 +144,7 @@
- 	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
+--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Mar 19 12:56:24 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Sat May 18 14:16:19 2002
+@@ -62,10 +62,10 @@
+ CALL_CDECL=TRUE
+ 
+ #mozilla specific stuff.
+-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
+-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
++#MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
++#MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
++MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
++MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
+ #End of mozilla specific stuff.
+ 
+ PRJ=..$/..$/..$/..
+@@ -107,7 +107,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -123,7 +123,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -141,7 +141,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
  CDEFS+=	    -DMOZILLA_CLIENT \
              -DOSTYPE=\"Linux2.2.14-5\" -DOJI
--.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- CFLAGS +=   -fPIC -g
- CFLAGSCXX += \
+ .IF "$(OS)" == "LINUX"
+@@ -157,6 +157,13 @@
              -fno-rtti -Wall -Wconversion -Wpointer-arith \
+             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
+             -Wno-long-long 
++CDEFS     += -DTRACING
++.ELIF "$(OS)" == "FREEBSD"
++CFLAGS +=   -fPIC
++CFLAGSCXX += \
++            -fno-rtti -Wall -Wconversion -Wpointer-arith \
++            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
++            -Wno-long-long -pthread 
+ CDEFS     += -DTRACING
+ .ENDIF
+ .ENDIF
diff --git a/editors/openoffice.org-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
index 49a5008ebeff..4dd2ea9705f2 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ b/editors/openoffice.org-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
@@ -1,11 +1,58 @@
---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Apr 23 20:47:57 2002
-+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Tue Apr 23 20:50:30 2002
-@@ -144,7 +144,7 @@
- 	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
+--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Mar 19 12:56:24 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Sat May 18 14:16:19 2002
+@@ -62,10 +62,10 @@
+ CALL_CDECL=TRUE
+ 
+ #mozilla specific stuff.
+-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
+-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
++#MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
++#MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
++MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
++MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
+ #End of mozilla specific stuff.
+ 
+ PRJ=..$/..$/..$/..
+@@ -107,7 +107,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -123,7 +123,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -141,7 +141,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
  CDEFS+=	    -DMOZILLA_CLIENT \
              -DOSTYPE=\"Linux2.2.14-5\" -DOJI
--.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- CFLAGS +=   -fPIC -g
- CFLAGSCXX += \
+ .IF "$(OS)" == "LINUX"
+@@ -157,6 +157,13 @@
              -fno-rtti -Wall -Wconversion -Wpointer-arith \
+             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
+             -Wno-long-long 
++CDEFS     += -DTRACING
++.ELIF "$(OS)" == "FREEBSD"
++CFLAGS +=   -fPIC
++CFLAGSCXX += \
++            -fno-rtti -Wall -Wconversion -Wpointer-arith \
++            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
++            -Wno-long-long -pthread 
+ CDEFS     += -DTRACING
+ .ENDIF
+ .ENDIF
diff --git a/editors/openoffice.org-1.1/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-1.1/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
index 49a5008ebeff..4dd2ea9705f2 100644
--- a/editors/openoffice.org-1.1/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ b/editors/openoffice.org-1.1/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
@@ -1,11 +1,58 @@
---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Apr 23 20:47:57 2002
-+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Tue Apr 23 20:50:30 2002
-@@ -144,7 +144,7 @@
- 	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
+--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Mar 19 12:56:24 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Sat May 18 14:16:19 2002
+@@ -62,10 +62,10 @@
+ CALL_CDECL=TRUE
+ 
+ #mozilla specific stuff.
+-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
+-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
++#MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
++#MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
++MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
++MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
+ #End of mozilla specific stuff.
+ 
+ PRJ=..$/..$/..$/..
+@@ -107,7 +107,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -123,7 +123,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -141,7 +141,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
  CDEFS+=	    -DMOZILLA_CLIENT \
              -DOSTYPE=\"Linux2.2.14-5\" -DOJI
--.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- CFLAGS +=   -fPIC -g
- CFLAGSCXX += \
+ .IF "$(OS)" == "LINUX"
+@@ -157,6 +157,13 @@
              -fno-rtti -Wall -Wconversion -Wpointer-arith \
+             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
+             -Wno-long-long 
++CDEFS     += -DTRACING
++.ELIF "$(OS)" == "FREEBSD"
++CFLAGS +=   -fPIC
++CFLAGSCXX += \
++            -fno-rtti -Wall -Wconversion -Wpointer-arith \
++            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
++            -Wno-long-long -pthread 
+ CDEFS     += -DTRACING
+ .ENDIF
+ .ENDIF
diff --git a/editors/openoffice.org-2-RC/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-2-RC/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
index 49a5008ebeff..4dd2ea9705f2 100644
--- a/editors/openoffice.org-2-RC/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ b/editors/openoffice.org-2-RC/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
@@ -1,11 +1,58 @@
---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Apr 23 20:47:57 2002
-+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Tue Apr 23 20:50:30 2002
-@@ -144,7 +144,7 @@
- 	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
+--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Mar 19 12:56:24 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Sat May 18 14:16:19 2002
+@@ -62,10 +62,10 @@
+ CALL_CDECL=TRUE
+ 
+ #mozilla specific stuff.
+-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
+-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
++#MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
++#MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
++MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
++MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
+ #End of mozilla specific stuff.
+ 
+ PRJ=..$/..$/..$/..
+@@ -107,7 +107,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -123,7 +123,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -141,7 +141,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
  CDEFS+=	    -DMOZILLA_CLIENT \
              -DOSTYPE=\"Linux2.2.14-5\" -DOJI
--.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- CFLAGS +=   -fPIC -g
- CFLAGSCXX += \
+ .IF "$(OS)" == "LINUX"
+@@ -157,6 +157,13 @@
              -fno-rtti -Wall -Wconversion -Wpointer-arith \
+             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
+             -Wno-long-long 
++CDEFS     += -DTRACING
++.ELIF "$(OS)" == "FREEBSD"
++CFLAGS +=   -fPIC
++CFLAGSCXX += \
++            -fno-rtti -Wall -Wconversion -Wpointer-arith \
++            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
++            -Wno-long-long -pthread 
+ CDEFS     += -DTRACING
+ .ENDIF
+ .ENDIF
diff --git a/editors/openoffice.org-2-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-2-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
index 49a5008ebeff..4dd2ea9705f2 100644
--- a/editors/openoffice.org-2-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ b/editors/openoffice.org-2-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
@@ -1,11 +1,58 @@
---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Apr 23 20:47:57 2002
-+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Tue Apr 23 20:50:30 2002
-@@ -144,7 +144,7 @@
- 	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
+--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Mar 19 12:56:24 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Sat May 18 14:16:19 2002
+@@ -62,10 +62,10 @@
+ CALL_CDECL=TRUE
+ 
+ #mozilla specific stuff.
+-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
+-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
++#MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
++#MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
++MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
++MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
+ #End of mozilla specific stuff.
+ 
+ PRJ=..$/..$/..$/..
+@@ -107,7 +107,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -123,7 +123,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -141,7 +141,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
  CDEFS+=	    -DMOZILLA_CLIENT \
              -DOSTYPE=\"Linux2.2.14-5\" -DOJI
--.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- CFLAGS +=   -fPIC -g
- CFLAGSCXX += \
+ .IF "$(OS)" == "LINUX"
+@@ -157,6 +157,13 @@
              -fno-rtti -Wall -Wconversion -Wpointer-arith \
+             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
+             -Wno-long-long 
++CDEFS     += -DTRACING
++.ELIF "$(OS)" == "FREEBSD"
++CFLAGS +=   -fPIC
++CFLAGSCXX += \
++            -fno-rtti -Wall -Wconversion -Wpointer-arith \
++            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
++            -Wno-long-long -pthread 
+ CDEFS     += -DTRACING
+ .ENDIF
+ .ENDIF
diff --git a/editors/openoffice.org-2.0-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
index 49a5008ebeff..4dd2ea9705f2 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ b/editors/openoffice.org-2.0-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
@@ -1,11 +1,58 @@
---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Apr 23 20:47:57 2002
-+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Tue Apr 23 20:50:30 2002
-@@ -144,7 +144,7 @@
- 	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
+--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Mar 19 12:56:24 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Sat May 18 14:16:19 2002
+@@ -62,10 +62,10 @@
+ CALL_CDECL=TRUE
+ 
+ #mozilla specific stuff.
+-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
+-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
++#MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
++#MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
++MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
++MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
+ #End of mozilla specific stuff.
+ 
+ PRJ=..$/..$/..$/..
+@@ -107,7 +107,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -123,7 +123,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -141,7 +141,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
  CDEFS+=	    -DMOZILLA_CLIENT \
              -DOSTYPE=\"Linux2.2.14-5\" -DOJI
--.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- CFLAGS +=   -fPIC -g
- CFLAGSCXX += \
+ .IF "$(OS)" == "LINUX"
+@@ -157,6 +157,13 @@
              -fno-rtti -Wall -Wconversion -Wpointer-arith \
+             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
+             -Wno-long-long 
++CDEFS     += -DTRACING
++.ELIF "$(OS)" == "FREEBSD"
++CFLAGS +=   -fPIC
++CFLAGSCXX += \
++            -fno-rtti -Wall -Wconversion -Wpointer-arith \
++            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
++            -Wno-long-long -pthread 
+ CDEFS     += -DTRACING
+ .ENDIF
+ .ENDIF
diff --git a/editors/openoffice.org-2.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-2.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
index 49a5008ebeff..4dd2ea9705f2 100644
--- a/editors/openoffice.org-2.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ b/editors/openoffice.org-2.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
@@ -1,11 +1,58 @@
---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Apr 23 20:47:57 2002
-+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Tue Apr 23 20:50:30 2002
-@@ -144,7 +144,7 @@
- 	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
+--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Mar 19 12:56:24 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Sat May 18 14:16:19 2002
+@@ -62,10 +62,10 @@
+ CALL_CDECL=TRUE
+ 
+ #mozilla specific stuff.
+-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
+-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
++#MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
++#MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
++MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
++MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
+ #End of mozilla specific stuff.
+ 
+ PRJ=..$/..$/..$/..
+@@ -107,7 +107,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -123,7 +123,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -141,7 +141,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
  CDEFS+=	    -DMOZILLA_CLIENT \
              -DOSTYPE=\"Linux2.2.14-5\" -DOJI
--.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- CFLAGS +=   -fPIC -g
- CFLAGSCXX += \
+ .IF "$(OS)" == "LINUX"
+@@ -157,6 +157,13 @@
              -fno-rtti -Wall -Wconversion -Wpointer-arith \
+             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
+             -Wno-long-long 
++CDEFS     += -DTRACING
++.ELIF "$(OS)" == "FREEBSD"
++CFLAGS +=   -fPIC
++CFLAGSCXX += \
++            -fno-rtti -Wall -Wconversion -Wpointer-arith \
++            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
++            -Wno-long-long -pthread 
+ CDEFS     += -DTRACING
+ .ENDIF
+ .ENDIF
diff --git a/editors/openoffice.org-2/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-2/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
index 49a5008ebeff..4dd2ea9705f2 100644
--- a/editors/openoffice.org-2/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ b/editors/openoffice.org-2/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
@@ -1,11 +1,58 @@
---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Apr 23 20:47:57 2002
-+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Tue Apr 23 20:50:30 2002
-@@ -144,7 +144,7 @@
- 	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
+--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Mar 19 12:56:24 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Sat May 18 14:16:19 2002
+@@ -62,10 +62,10 @@
+ CALL_CDECL=TRUE
+ 
+ #mozilla specific stuff.
+-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
+-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
++#MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
++#MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
++MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
++MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
+ #End of mozilla specific stuff.
+ 
+ PRJ=..$/..$/..$/..
+@@ -107,7 +107,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -123,7 +123,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -141,7 +141,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
  CDEFS+=	    -DMOZILLA_CLIENT \
              -DOSTYPE=\"Linux2.2.14-5\" -DOJI
--.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- CFLAGS +=   -fPIC -g
- CFLAGSCXX += \
+ .IF "$(OS)" == "LINUX"
+@@ -157,6 +157,13 @@
              -fno-rtti -Wall -Wconversion -Wpointer-arith \
+             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
+             -Wno-long-long 
++CDEFS     += -DTRACING
++.ELIF "$(OS)" == "FREEBSD"
++CFLAGS +=   -fPIC
++CFLAGSCXX += \
++            -fno-rtti -Wall -Wconversion -Wpointer-arith \
++            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
++            -Wno-long-long -pthread 
+ CDEFS     += -DTRACING
+ .ENDIF
+ .ENDIF
diff --git a/editors/openoffice.org-3-RC/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-3-RC/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
index 49a5008ebeff..4dd2ea9705f2 100644
--- a/editors/openoffice.org-3-RC/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ b/editors/openoffice.org-3-RC/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
@@ -1,11 +1,58 @@
---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Apr 23 20:47:57 2002
-+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Tue Apr 23 20:50:30 2002
-@@ -144,7 +144,7 @@
- 	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
+--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Mar 19 12:56:24 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Sat May 18 14:16:19 2002
+@@ -62,10 +62,10 @@
+ CALL_CDECL=TRUE
+ 
+ #mozilla specific stuff.
+-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
+-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
++#MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
++#MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
++MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
++MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
+ #End of mozilla specific stuff.
+ 
+ PRJ=..$/..$/..$/..
+@@ -107,7 +107,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -123,7 +123,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -141,7 +141,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
  CDEFS+=	    -DMOZILLA_CLIENT \
              -DOSTYPE=\"Linux2.2.14-5\" -DOJI
--.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- CFLAGS +=   -fPIC -g
- CFLAGSCXX += \
+ .IF "$(OS)" == "LINUX"
+@@ -157,6 +157,13 @@
              -fno-rtti -Wall -Wconversion -Wpointer-arith \
+             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
+             -Wno-long-long 
++CDEFS     += -DTRACING
++.ELIF "$(OS)" == "FREEBSD"
++CFLAGS +=   -fPIC
++CFLAGSCXX += \
++            -fno-rtti -Wall -Wconversion -Wpointer-arith \
++            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
++            -Wno-long-long -pthread 
+ CDEFS     += -DTRACING
+ .ENDIF
+ .ENDIF
diff --git a/editors/openoffice.org-3-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-3-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
index 49a5008ebeff..4dd2ea9705f2 100644
--- a/editors/openoffice.org-3-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ b/editors/openoffice.org-3-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
@@ -1,11 +1,58 @@
---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Apr 23 20:47:57 2002
-+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Tue Apr 23 20:50:30 2002
-@@ -144,7 +144,7 @@
- 	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
+--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Mar 19 12:56:24 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Sat May 18 14:16:19 2002
+@@ -62,10 +62,10 @@
+ CALL_CDECL=TRUE
+ 
+ #mozilla specific stuff.
+-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
+-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
++#MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
++#MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
++MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
++MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
+ #End of mozilla specific stuff.
+ 
+ PRJ=..$/..$/..$/..
+@@ -107,7 +107,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -123,7 +123,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -141,7 +141,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
  CDEFS+=	    -DMOZILLA_CLIENT \
              -DOSTYPE=\"Linux2.2.14-5\" -DOJI
--.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- CFLAGS +=   -fPIC -g
- CFLAGSCXX += \
+ .IF "$(OS)" == "LINUX"
+@@ -157,6 +157,13 @@
              -fno-rtti -Wall -Wconversion -Wpointer-arith \
+             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
+             -Wno-long-long 
++CDEFS     += -DTRACING
++.ELIF "$(OS)" == "FREEBSD"
++CFLAGS +=   -fPIC
++CFLAGSCXX += \
++            -fno-rtti -Wall -Wconversion -Wpointer-arith \
++            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
++            -Wno-long-long -pthread 
+ CDEFS     += -DTRACING
+ .ENDIF
+ .ENDIF
diff --git a/editors/openoffice.org-3/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-3/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
index 49a5008ebeff..4dd2ea9705f2 100644
--- a/editors/openoffice.org-3/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ b/editors/openoffice.org-3/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
@@ -1,11 +1,58 @@
---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Apr 23 20:47:57 2002
-+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Tue Apr 23 20:50:30 2002
-@@ -144,7 +144,7 @@
- 	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
+--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Mar 19 12:56:24 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Sat May 18 14:16:19 2002
+@@ -62,10 +62,10 @@
+ CALL_CDECL=TRUE
+ 
+ #mozilla specific stuff.
+-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
+-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
++#MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
++#MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
++MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
++MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
+ #End of mozilla specific stuff.
+ 
+ PRJ=..$/..$/..$/..
+@@ -107,7 +107,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -123,7 +123,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -141,7 +141,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
  CDEFS+=	    -DMOZILLA_CLIENT \
              -DOSTYPE=\"Linux2.2.14-5\" -DOJI
--.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- CFLAGS +=   -fPIC -g
- CFLAGSCXX += \
+ .IF "$(OS)" == "LINUX"
+@@ -157,6 +157,13 @@
              -fno-rtti -Wall -Wconversion -Wpointer-arith \
+             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
+             -Wno-long-long 
++CDEFS     += -DTRACING
++.ELIF "$(OS)" == "FREEBSD"
++CFLAGS +=   -fPIC
++CFLAGSCXX += \
++            -fno-rtti -Wall -Wconversion -Wpointer-arith \
++            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
++            -Wno-long-long -pthread 
+ CDEFS     += -DTRACING
+ .ENDIF
+ .ENDIF
diff --git a/editors/openoffice.org-vcltesttool/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
index 49a5008ebeff..4dd2ea9705f2 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ b/editors/openoffice.org-vcltesttool/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
@@ -1,11 +1,58 @@
---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Apr 23 20:47:57 2002
-+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Tue Apr 23 20:50:30 2002
-@@ -144,7 +144,7 @@
- 	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
+--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Mar 19 12:56:24 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Sat May 18 14:16:19 2002
+@@ -62,10 +62,10 @@
+ CALL_CDECL=TRUE
+ 
+ #mozilla specific stuff.
+-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
+-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
++#MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
++#MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
++MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
++MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
+ #End of mozilla specific stuff.
+ 
+ PRJ=..$/..$/..$/..
+@@ -107,7 +107,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -123,7 +123,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -141,7 +141,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
  CDEFS+=	    -DMOZILLA_CLIENT \
              -DOSTYPE=\"Linux2.2.14-5\" -DOJI
--.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- CFLAGS +=   -fPIC -g
- CFLAGSCXX += \
+ .IF "$(OS)" == "LINUX"
+@@ -157,6 +157,13 @@
              -fno-rtti -Wall -Wconversion -Wpointer-arith \
+             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
+             -Wno-long-long 
++CDEFS     += -DTRACING
++.ELIF "$(OS)" == "FREEBSD"
++CFLAGS +=   -fPIC
++CFLAGSCXX += \
++            -fno-rtti -Wall -Wconversion -Wpointer-arith \
++            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
++            -Wno-long-long -pthread 
+ CDEFS     += -DTRACING
+ .ENDIF
+ .ENDIF
diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile
index 6f6142fd8527..920e499bc6e9 100644
--- a/editors/openoffice/Makefile
+++ b/editors/openoffice/Makefile
@@ -14,7 +14,8 @@ MASTER_SITES=	ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \
 		ftp://gd.tuwien.ac.at/office/openoffice/${PORTVERSION}/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
 		http://people.freebsd.org/~mbr/distfiles/
-DISTFILES=	OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
+DISTFILES=	OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z \
+		oo_moz1.0RC2_i386_FreeBSD-4.tar.gz
 EXTRACT_ONLY=	OOo_${PORTVERSION}_source.tar.bz2
 
 MAINTAINER=	mbr@FreeBSD.org
@@ -32,7 +33,7 @@ USE_GMAKE=	yes
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
+EXTRACT_REST=	gpc231.tar.Z oo_moz1.0RC2_i386_FreeBSD-4.tar.gz
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
@@ -53,7 +54,7 @@ CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 .include <bsd.port.pre.mk>
 
 pre-fetch:
-.if ${GCC_VERSION}!="2.95.2" && ${GCC_VERSION}!="2.95.3"
+.if ${GCC_VERSION}!="2.95.2" && ${GCC_VERSION}!="2.95.3" && ${GCC_VERSION}!="2.95.4"
 	@ ${ECHO}
 	@ ${ECHO} Openoffice requires gcc 2.95.2 or better
 	@ ${ECHO}
diff --git a/editors/openoffice/files/patch-MDatabaseMetaDataHelper.cxx b/editors/openoffice/files/patch-MDatabaseMetaDataHelper.cxx
new file mode 100644
index 000000000000..4b92670204e7
--- /dev/null
+++ b/editors/openoffice/files/patch-MDatabaseMetaDataHelper.cxx
@@ -0,0 +1,71 @@
+--- ../connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx.orig	Sat May 18 01:46:08 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx	Sat May 18 01:56:23 2002
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: MDatabaseMetaDataHelper.cxx,v $
+  *
+- *  $Revision: 1.5 $
++ *  $Revision: 1.6 $
+  *
+- *  last change: $Author: dkenny $ $Date: 2001/12/13 09:34:19 $
++ *  last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -213,11 +213,15 @@
+ 
+ 	retCode = dirFactoryService->GetDirFactory(aFactory.getStr(), getter_AddRefs(dirFactory)) ;
+ 	NS_ENSURE_SUCCESS (retCode, retCode) ;
+-	OUString value = OStringToOUString(aFactory, RTL_TEXTENCODING_ASCII_US) ;
+-	const PRUnichar *valueChars = value.getStr() ;
+-	nsCOMPtr<nsISimpleEnumerator> subDirs ;
++	nsCOMPtr <nsIAbDirectoryProperties> properties;
++	properties = do_CreateInstance(NS_ABDIRECTORYPROPERTIES_CONTRACTID, &retCode);
++	NS_ENSURE_SUCCESS(retCode, retCode) ;
+ 
+-	retCode = dirFactory->CreateDirectory(1, &kPropertyName, &valueChars, getter_AddRefs(subDirs)) ;
++	retCode = properties->SetURI(aFactory.getStr());
++	NS_ENSURE_SUCCESS(retCode,retCode);
++
++	nsCOMPtr<nsISimpleEnumerator> subDirs ;
++	retCode = dirFactory->CreateDirectory(properties, getter_AddRefs(subDirs));
+ 	NS_ENSURE_SUCCESS(retCode, retCode) ;
+ 	PRBool hasMore = PR_TRUE ;
+ 	nsCOMPtr<nsISupportsArray> array ;
+@@ -635,12 +639,12 @@
+     if ( NS_FAILED(rv) )
+         return sal_False;
+ 
+-    rv = url->SetSpec( sAbURI.getStr() );
++    rv = url->SetSpec( nsDependentCString(sAbURI.getStr()) );
+     if ( NS_FAILED(rv) )
+         return sal_False;
+ 
+-    nsXPIDLCString host;
+-    rv = url->GetHost(getter_Copies (host));
++    nsCAutoString host;
++    rv = url->GetAsciiHost(host);
+     if ( NS_FAILED(rv) )
+         return sal_False;
+ 
+@@ -654,6 +658,11 @@
+     if ( NS_FAILED(rv) )
+         return sal_False;
+ 
++    PRUint32 options;
++    rv = url->GetOptions(&options);
++    if ( NS_FAILED(rv) )
++        return sal_False;
++
+     // Get the ldap connection
+     nsCOMPtr<nsILDAPConnection> ldapConnection;
+     ldapConnection = do_CreateInstance(NS_LDAPCONNECTION_CONTRACTID, &rv);
+@@ -671,7 +680,7 @@
+ 
+     // Now lets initialize the LDAP connection properly. We'll kick
+     // off the bind operation in the callback function, |OnLDAPInit()|.
+-    rv = ldapConnection->Init(host, port, NS_ConvertASCIItoUCS2(dn).get(),
++    rv = ldapConnection->Init(host.get(), port, options, nsnull,
+                               messageListener);
+     if ( NS_FAILED(rv) )
+         return sal_False;
diff --git a/editors/openoffice/files/patch-MNSInclude.hxx b/editors/openoffice/files/patch-MNSInclude.hxx
new file mode 100644
index 000000000000..48ac201682de
--- /dev/null
+++ b/editors/openoffice/files/patch-MNSInclude.hxx
@@ -0,0 +1,22 @@
+--- ../connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx.orig	Sat May 18 01:58:35 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx	Sat May 18 02:00:42 2002
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: MNSInclude.hxx,v $
+  *
+- *  $Revision: 1.3 $
++ *  $Revision: 1.4 $
+  *
+- *  last change: $Author: oj $ $Date: 2001/11/26 13:52:26 $
++ *  last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -83,7 +83,6 @@
+ # define _DEBUG MOZ_TMP_UDEBUG
+ #endif
+ 
+-#include <xp_core.h>
+ #include <nsCOMPtr.h>
+ #include <nsISupportsArray.h>
+ #include <nsStr.h>
diff --git a/editors/openoffice/files/patch-MTypeConverter.cxx b/editors/openoffice/files/patch-MTypeConverter.cxx
new file mode 100644
index 000000000000..345d3700936e
--- /dev/null
+++ b/editors/openoffice/files/patch-MTypeConverter.cxx
@@ -0,0 +1,26 @@
+--- ../connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx.orig	Mon Nov 26 14:52:26 2001
++++ ../connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx	Sat May 18 14:02:06 2002
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: MTypeConverter.cxx,v $
+  *
+- *  $Revision: 1.3 $
++ *  $Revision: 1.4 $
+  *
+- *  last change: $Author: oj $ $Date: 2001/11/26 13:52:26 $
++ *  last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -136,9 +136,11 @@
+ 	::rtl::OString os(ous,ous.getLength(),RTL_TEXTENCODING_ASCII_US);
+ 	return( ::std::string(os.getStr()));
+ }
++#if 0
+ // -------------------------------------------------------------------------
+ ::std::string MTypeConverter::nsStringToStlString(nsString const &nss)
+ {
+ 	return( ::std::string(nss.GetBuffer()));
+ }
++#endif
+ // -------------------------------------------------------------------------
diff --git a/editors/openoffice/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
index 49a5008ebeff..4dd2ea9705f2 100644
--- a/editors/openoffice/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ b/editors/openoffice/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
@@ -1,11 +1,58 @@
---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Apr 23 20:47:57 2002
-+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Tue Apr 23 20:50:30 2002
-@@ -144,7 +144,7 @@
- 	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
+--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Mar 19 12:56:24 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Sat May 18 14:16:19 2002
+@@ -62,10 +62,10 @@
+ CALL_CDECL=TRUE
+ 
+ #mozilla specific stuff.
+-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
+-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
++#MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
++#MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
++MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
++MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
+ #End of mozilla specific stuff.
+ 
+ PRJ=..$/..$/..$/..
+@@ -107,7 +107,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -123,7 +123,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -141,7 +141,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
  CDEFS+=	    -DMOZILLA_CLIENT \
              -DOSTYPE=\"Linux2.2.14-5\" -DOJI
--.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- CFLAGS +=   -fPIC -g
- CFLAGSCXX += \
+ .IF "$(OS)" == "LINUX"
+@@ -157,6 +157,13 @@
              -fno-rtti -Wall -Wconversion -Wpointer-arith \
+             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
+             -Wno-long-long 
++CDEFS     += -DTRACING
++.ELIF "$(OS)" == "FREEBSD"
++CFLAGS +=   -fPIC
++CFLAGSCXX += \
++            -fno-rtti -Wall -Wconversion -Wpointer-arith \
++            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
++            -Wno-long-long -pthread 
+ CDEFS     += -DTRACING
+ .ENDIF
+ .ENDIF
diff --git a/editors/openoffice/files/patch-connectivity::source::drivers::mozab::mozillasrc::MDatabaseMetaDataHelper.cxx b/editors/openoffice/files/patch-connectivity::source::drivers::mozab::mozillasrc::MDatabaseMetaDataHelper.cxx
new file mode 100644
index 000000000000..4b92670204e7
--- /dev/null
+++ b/editors/openoffice/files/patch-connectivity::source::drivers::mozab::mozillasrc::MDatabaseMetaDataHelper.cxx
@@ -0,0 +1,71 @@
+--- ../connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx.orig	Sat May 18 01:46:08 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx	Sat May 18 01:56:23 2002
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: MDatabaseMetaDataHelper.cxx,v $
+  *
+- *  $Revision: 1.5 $
++ *  $Revision: 1.6 $
+  *
+- *  last change: $Author: dkenny $ $Date: 2001/12/13 09:34:19 $
++ *  last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -213,11 +213,15 @@
+ 
+ 	retCode = dirFactoryService->GetDirFactory(aFactory.getStr(), getter_AddRefs(dirFactory)) ;
+ 	NS_ENSURE_SUCCESS (retCode, retCode) ;
+-	OUString value = OStringToOUString(aFactory, RTL_TEXTENCODING_ASCII_US) ;
+-	const PRUnichar *valueChars = value.getStr() ;
+-	nsCOMPtr<nsISimpleEnumerator> subDirs ;
++	nsCOMPtr <nsIAbDirectoryProperties> properties;
++	properties = do_CreateInstance(NS_ABDIRECTORYPROPERTIES_CONTRACTID, &retCode);
++	NS_ENSURE_SUCCESS(retCode, retCode) ;
+ 
+-	retCode = dirFactory->CreateDirectory(1, &kPropertyName, &valueChars, getter_AddRefs(subDirs)) ;
++	retCode = properties->SetURI(aFactory.getStr());
++	NS_ENSURE_SUCCESS(retCode,retCode);
++
++	nsCOMPtr<nsISimpleEnumerator> subDirs ;
++	retCode = dirFactory->CreateDirectory(properties, getter_AddRefs(subDirs));
+ 	NS_ENSURE_SUCCESS(retCode, retCode) ;
+ 	PRBool hasMore = PR_TRUE ;
+ 	nsCOMPtr<nsISupportsArray> array ;
+@@ -635,12 +639,12 @@
+     if ( NS_FAILED(rv) )
+         return sal_False;
+ 
+-    rv = url->SetSpec( sAbURI.getStr() );
++    rv = url->SetSpec( nsDependentCString(sAbURI.getStr()) );
+     if ( NS_FAILED(rv) )
+         return sal_False;
+ 
+-    nsXPIDLCString host;
+-    rv = url->GetHost(getter_Copies (host));
++    nsCAutoString host;
++    rv = url->GetAsciiHost(host);
+     if ( NS_FAILED(rv) )
+         return sal_False;
+ 
+@@ -654,6 +658,11 @@
+     if ( NS_FAILED(rv) )
+         return sal_False;
+ 
++    PRUint32 options;
++    rv = url->GetOptions(&options);
++    if ( NS_FAILED(rv) )
++        return sal_False;
++
+     // Get the ldap connection
+     nsCOMPtr<nsILDAPConnection> ldapConnection;
+     ldapConnection = do_CreateInstance(NS_LDAPCONNECTION_CONTRACTID, &rv);
+@@ -671,7 +680,7 @@
+ 
+     // Now lets initialize the LDAP connection properly. We'll kick
+     // off the bind operation in the callback function, |OnLDAPInit()|.
+-    rv = ldapConnection->Init(host, port, NS_ConvertASCIItoUCS2(dn).get(),
++    rv = ldapConnection->Init(host.get(), port, options, nsnull,
+                               messageListener);
+     if ( NS_FAILED(rv) )
+         return sal_False;
diff --git a/editors/openoffice/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInclude.hxx b/editors/openoffice/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInclude.hxx
new file mode 100644
index 000000000000..48ac201682de
--- /dev/null
+++ b/editors/openoffice/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInclude.hxx
@@ -0,0 +1,22 @@
+--- ../connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx.orig	Sat May 18 01:58:35 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx	Sat May 18 02:00:42 2002
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: MNSInclude.hxx,v $
+  *
+- *  $Revision: 1.3 $
++ *  $Revision: 1.4 $
+  *
+- *  last change: $Author: oj $ $Date: 2001/11/26 13:52:26 $
++ *  last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -83,7 +83,6 @@
+ # define _DEBUG MOZ_TMP_UDEBUG
+ #endif
+ 
+-#include <xp_core.h>
+ #include <nsCOMPtr.h>
+ #include <nsISupportsArray.h>
+ #include <nsStr.h>
diff --git a/editors/openoffice/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInit.cxx b/editors/openoffice/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInit.cxx
new file mode 100644
index 000000000000..ba52563e23e0
--- /dev/null
+++ b/editors/openoffice/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInit.cxx
@@ -0,0 +1,23 @@
+--- ../connectivity/source/drivers/mozab/mozillasrc/MNSInit.cxx.orig	Sat May 18 02:01:33 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/MNSInit.cxx	Sat May 18 02:02:18 2002
+@@ -2,9 +2,9 @@
+  *
+  *	$RCSfile: MNSInit.cxx,v $
+  *
+- *	$Revision: 1.4 $
++ *	$Revision: 1.5 $
+  *
+- *	last change: $Author: dkenny $ $Date: 2001/12/12 15:32:45 $
++ *	last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
+  *
+  *	The Contents of this file are made available subject to the terms of
+  *	either of the following licenses
+@@ -269,7 +269,7 @@
+ #ifdef _DEBUG
+ 				nsCAutoString temp1;
+ 				temp1.AssignWithConversion( pUsedProfile );
+-				OSL_TRACE("Profile Name: %s\n", NS_STATIC_CAST(const char*, temp1));
++				OSL_TRACE("Profile Name: %s\n", NS_STATIC_CAST(const char*, temp1.get()));
+ #endif
+ 				theProfile->SetCurrentProfile( pUsedProfile );
+ 
diff --git a/editors/openoffice/files/patch-connectivity::source::drivers::mozab::mozillasrc::MTypeConverter.cxx b/editors/openoffice/files/patch-connectivity::source::drivers::mozab::mozillasrc::MTypeConverter.cxx
new file mode 100644
index 000000000000..345d3700936e
--- /dev/null
+++ b/editors/openoffice/files/patch-connectivity::source::drivers::mozab::mozillasrc::MTypeConverter.cxx
@@ -0,0 +1,26 @@
+--- ../connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx.orig	Mon Nov 26 14:52:26 2001
++++ ../connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx	Sat May 18 14:02:06 2002
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: MTypeConverter.cxx,v $
+  *
+- *  $Revision: 1.3 $
++ *  $Revision: 1.4 $
+  *
+- *  last change: $Author: oj $ $Date: 2001/11/26 13:52:26 $
++ *  last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -136,9 +136,11 @@
+ 	::rtl::OString os(ous,ous.getLength(),RTL_TEXTENCODING_ASCII_US);
+ 	return( ::std::string(os.getStr()));
+ }
++#if 0
+ // -------------------------------------------------------------------------
+ ::std::string MTypeConverter::nsStringToStlString(nsString const &nss)
+ {
+ 	return( ::std::string(nss.GetBuffer()));
+ }
++#endif
+ // -------------------------------------------------------------------------
diff --git a/editors/openoffice/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk b/editors/openoffice/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk
index 49a5008ebeff..4dd2ea9705f2 100644
--- a/editors/openoffice/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk
+++ b/editors/openoffice/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk
@@ -1,11 +1,58 @@
---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Apr 23 20:47:57 2002
-+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Tue Apr 23 20:50:30 2002
-@@ -144,7 +144,7 @@
- 	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
+--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Mar 19 12:56:24 2002
++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Sat May 18 14:16:19 2002
+@@ -62,10 +62,10 @@
+ CALL_CDECL=TRUE
+ 
+ #mozilla specific stuff.
+-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
+-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
++#MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
++#MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
++MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
++MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
+ #End of mozilla specific stuff.
+ 
+ PRJ=..$/..$/..$/..
+@@ -107,7 +107,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -123,7 +123,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
+ CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
+ 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
+             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
+@@ -141,7 +141,7 @@
+ 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
+ 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
+ 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
+-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
++	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
  CDEFS+=	    -DMOZILLA_CLIENT \
              -DOSTYPE=\"Linux2.2.14-5\" -DOJI
--.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- CFLAGS +=   -fPIC -g
- CFLAGSCXX += \
+ .IF "$(OS)" == "LINUX"
+@@ -157,6 +157,13 @@
              -fno-rtti -Wall -Wconversion -Wpointer-arith \
+             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
+             -Wno-long-long 
++CDEFS     += -DTRACING
++.ELIF "$(OS)" == "FREEBSD"
++CFLAGS +=   -fPIC
++CFLAGSCXX += \
++            -fno-rtti -Wall -Wconversion -Wpointer-arith \
++            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
++            -Wno-long-long -pthread 
+ CDEFS     += -DTRACING
+ .ENDIF
+ .ENDIF
author	Martin Blapp <mbr@FreeBSD.org>	2002-05-18 12:32:54 +0000
committer	Martin Blapp <mbr@FreeBSD.org>	2002-05-18 12:32:54 +0000
commit	9d31c8a527f5e7a11476b818f9122b4989d9a341 (patch)
tree	3d29c0c13f08f7ab549c3335b520f96f9b1bc0ea
parent	Make setup start. Patch from Alexander N. Kabaev (diff)