Upgrade to OO1.1 beta2.

svn path=/head/; revision=82477
2003-06-07 22:09:48 +00:00 · 2003-06-07 22:09:48 +00:00 · 5191c1d5a8 · 2021-03-31 03:12:20 +00:00
commit 5191c1d5a8
parent 3dbc504a92
1938 changed files with 2396 additions and 43434 deletions
--- a/editors/openoffice-1.1-devel/distinfo
+++ b/editors/openoffice-1.1-devel/distinfo
@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src_20030412.tar.bz2) = 2ec722a03a806de7f773f6b6086b485e
+MD5 (openoffice/oo_644_src_20030601.tar.bz2) = df9c081ca85caef3d89e039295458c99
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
 MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5
--- a/editors/openoffice-1.1-devel/files/debugpatch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice-1.1-devel/files/debugpatch-setup2+mow+source+loader+loader.c
@ -1,6 +1,6 @@
--- ../setup2/mow/source/loader/loader.c.orig2	Thu Jun  6 11:23:17 2002
-+++ ../setup2/mow/source/loader/loader.c	Thu Jun  6 11:24:14 2002
-@@ -1055,6 +1055,7 @@
+--- ../setup2/mow/source/loader/loader.c.orig	Mon Jun  2 08:25:13 2003
+++ ../setup2/mow/source/loader/loader.c	Tue Jun  3 07:58:22 2003
+@@ -1069,6 +1069,7 @@
 
 void KillSetupDir()
 {
@ -8,7 +8,7 @@
     DIR* pDir;
     struct dirent* pFile;
 
-@@ -1074,6 +1075,10 @@
+@@ -1088,6 +1089,10 @@
     closedir( pDir );
     chdir( strInitPath );
     rmdir( strTmpPath );
--- a/editors/openoffice-1.1-devel/files/openoffice-wrapper
+++ b/editors/openoffice-1.1-devel/files/openoffice-wrapper
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.1-devel/files/Attic/openoffice-wrapper,v 1.7 2003-04-16 06:51:35 mbr Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.1-devel/files/Attic/openoffice-wrapper,v 1.8 2003-06-07 22:09:46 mbr Exp $

 oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/
 program=`echo $0 | sed -e 's|.*-||'`
@ -9,9 +9,9 @@ if [ ! $LANG ]; then
 	export LANG=%%LANG%%
 fi

-if [ -e $HOME/OpenOffice.org644/setup.log ]; then
-	if [ ! -e $HOME/OpenOffice.org644/user/config/soffice.cfg ]; then
-		touch $HOME/OpenOffice.org644/user/config/soffice.cfg
+if [ -e $HOME/OpenOffice.org1.1/setup.log ]; then
+	if [ ! -e $HOME/OpenOffice.org1.1/user/config/soffice.cfg ]; then
+		touch $HOME/OpenOffice.org1.1/user/config/soffice.cfg
 	fi
 fi

--- a/editors/openoffice-1.1-devel/files/patch-berkeleydb+db-3.2.9.patch
+++ b/editors/openoffice-1.1-devel/files/patch-berkeleydb+db-3.2.9.patch
@ -1,11 +1,11 @@
--- ../berkeleydb/db-3.2.9.patch.orig	Wed Mar 12 08:23:51 2003
-+++ ../berkeleydb/db-3.2.9.patch	Wed Mar 12 08:23:59 2003
-@@ -4,7 +4,7 @@
-  	case "$host_os" in
-  	solaris*)	JINCSUBDIRS="solaris";;
-  	linux*)		JINCSUBDIRS="linux genunix";;
-+	freebsd*)	JINCSUBDIRS="freebsd genunix";;
-++	freebsd*)	JINCSUBDIRS="linux bsd freebsd genunix";;
-  	*)		JINCSUBDIRS="genunix";;
-  	esac
-  
+--- ../berkeleydb/db-3.2.9.patch.orig	Thu May 22 05:16:22 2003
+++ ../berkeleydb/db-3.2.9.patch	Sat May 31 22:17:11 2003
+@@ -52,7 +52,7 @@
+   	solaris*)	JINCSUBDIRS="solaris";;
+   	linux*)		JINCSUBDIRS="linux genunix";;
+ + 	irix*)		JINCSUBDIRS="irix";;
+-+ 	freebsd*)	JINCSUBDIRS="freebsd genunix";;
++ 	freebsd*)	JINCSUBDIRS="freebsd bsd linux genunix";;
+   	*)		JINCSUBDIRS="genunix";;
+   	esac
+   
--- a/editors/openoffice-1.1-devel/files/patch-bridges+prj+build.lst
+++ b/editors/openoffice-1.1-devel/files/patch-bridges+prj+build.lst
@ -1,11 +0,0 @@
--- ../bridges/prj/build.lst.orig	Tue Oct 30 17:28:35 2001
-+++ ../bridges/prj/build.lst	Fri Oct 18 22:13:04 2002
-@@ -13,5 +13,8 @@
- br	bridges\source\cpp_uno\cc50_solaris_sparc			nmake	-	u	br_cc50sols br_unotypes NULL
- br	bridges\source\cpp_uno\cc50_solaris_intel			nmake	-	u	br_cc50soli br_unotypes NULL
- br	bridges\source\cpp_uno\gcc2_solaris_sparc			nmake	-	u	br_gccsols br_unotypes NULL
-+br	bridges\source\cpp_uno\gcc2_freebsd_intel	nmake	-	u	br_gccfi br_unotypes NULL
-+br	bridges\source\cpp_uno\gcc2_freebsd_intel-sjlj	nmake	-	u	br_gccfi br_unotypes NULL
-+br	bridges\source\cpp_uno\gcc3_freebsd_intel	nmake	-	u	br_gcc3fi br_unotypes NULL
- br	bridges\source\prot_uno					nmake	-	all	br_pruno br_unotypes NULL
- br	bridges\source\java_uno					nmake	-	all	br_java_uno br_rcon NULL
--- a/editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ b/editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
@ -1,131 +0,0 @@
--- ../bridges/source/cpp_uno/gcc3_freebsd_intel.orig/except.cxx	Tue Mar 11 18:14:16 2003
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Tue Mar 11 18:15:40 2003
-@@ -253,6 +253,13 @@
- //==================================================================================================
- void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
- {
-+#if defined DEBUG
-+    OString cstr(
-+        OUStringToOString(
-+            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-+            RTL_TEXTENCODING_ASCII_US ) );
-+    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
-+#endif
-     void * pCppExc;
-     type_info * rtti;
- 
-@@ -262,7 +269,12 @@
- 	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-     OSL_ASSERT( pTypeDescr );
-     if (! pTypeDescr)
-        terminate();
-+    {
-+        throw RuntimeException(
-+            OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
-+            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-+            Reference< XInterface >() );
-+    }
-     
- 	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
- 	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-@@ -288,29 +300,59 @@
-     TYPELIB_DANGER_RELEASE( pTypeDescr );
-     OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-     if (! rtti)
-        terminate();
-+    {
-+        throw RuntimeException(
-+            OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
-+            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-+            Reference< XInterface >() );
-+    }
-     }
-     
- 	__cxa_throw( pCppExc, rtti, deleteException );
- }
- 
- //==================================================================================================
-void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
-+void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
- {
-    OSL_ENSURE( header, "### no exception header!!!" );
-     if (! header)
-        terminate();
-+    {
-+        RuntimeException aRE(
-+            OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
-+            Reference< XInterface >() );
-+        Type const & rType = ::getCppuType( &aRE );
-+        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
-+#if defined _DEBUG
-+        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-+        OSL_ENSURE( 0, cstr.getStr() );
-+#endif
-+        return;
-+    }
-     
- 	typelib_TypeDescription * pExcTypeDescr = 0;
-     OUString unoName( toUNOname( header->exceptionType->name() ) );
-	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
-    if (! pExcTypeDescr)
-        terminate();
-    
-    // construct uno exception any
-    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
-    ::typelib_typedescription_release( pExcTypeDescr );
-+#if defined DEBUG
-+    OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
-+    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
-+#endif
-+	typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-+    if (0 == pExcTypeDescr)
-+    {
-+        RuntimeException aRE(
-+            OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
-+            Reference< XInterface >() );
-+        Type const & rType = ::getCppuType( &aRE );
-+        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
-+#if defined _DEBUG
-+        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-+        OSL_ENSURE( 0, cstr.getStr() );
-+#endif
-+    }
-+    else
-+    {
-+        // construct uno exception any
-+        uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
-+        typelib_typedescription_release( pExcTypeDescr );
-+    }
- }
- 
- }
--- ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx.orig	Thu Mar 27 22:05:43 2003
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Thu Mar 27 22:08:18 2003
-@@ -97,7 +97,9 @@
-     if (! pThis) dummy_can_throw_anything("xxx"); // address something
-     
- 	volatile long edx = 0, eax = 0; // for register returns
-+    void * stackptr;
- 	asm volatile (
-+        "mov   %%esp, %6\n\t"
- 		// copy values
- 		"mov   %0, %%eax\n\t"
- 		"mov   %%eax, %%edx\n\t"
-@@ -121,13 +123,11 @@
-  		"mov   %%eax, %4\n\t"
-  		"mov   %%edx, %5\n\t"
- 		// cleanup stack
- 		"mov   %0, %%eax\n\t"
- 		"shl   $2, %%eax\n\t"
- 		"add   %%eax, %%esp\n\t"
-+        "mov   %6, %%esp\n\t"
- 		:
-        : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
-+        : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
-+          "m"(eax), "m"(edx), "m"(stackptr)
-         : "eax", "edx" );
-    
- 	switch( eReturnType )
- 	{
- 		case typelib_TypeClass_HYPER:
--- a/editors/openoffice-1.1-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
+++ b/editors/openoffice-1.1-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
@ -1,12 +0,0 @@
--- ../bridges/source/jni_uno/jni_uno2java.cxx.orig	Tue Mar 11 12:35:07 2003
-+++ ../bridges/source/jni_uno/jni_uno2java.cxx	Tue Mar 11 12:35:29 2003
-@@ -62,7 +62,9 @@
- #if defined _MSC_VER
- #include <malloc.h>
- #else
-+#if !defined( FREEBSD)
- #include <alloca.h>
-+#endif
- #endif
- 
- #include "rtl/ustrbuf.hxx"
--- a/editors/openoffice-1.1-devel/files/patch-comphelper+util+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-comphelper+util+makefile.mk
@ -1,15 +0,0 @@
--- ../comphelper/util/makefile.mk.orig	Fri Feb 14 15:40:49 2003
-+++ ../comphelper/util/makefile.mk	Wed Mar  5 20:43:02 2003
-@@ -86,10 +86,10 @@
- 
- SHL1TARGET=$(COMPHLP_TARGET)$(COMPHLP_MAJOR)$(COMID)
- SHL1STDLIBS= \
-+	$(SALLIB) \
- 	$(CPPUHELPERLIB) \
- 	$(CPPULIB) \
-	$(VOSLIB) \
-	$(SALLIB)
-+	$(VOSLIB)
- 
- SHL1DEPN=
- SHL1IMPLIB=	i$(COMPHLP_TARGET)
--- a/editors/openoffice-1.1-devel/files/patch-config_office+configure.in
+++ b/editors/openoffice-1.1-devel/files/patch-config_office+configure.in
@ -1,32 +0,0 @@
--- configure.in.orig	Thu Feb 20 15:49:32 2003
-+++ configure.in	Wed Mar  5 21:22:34 2003
-@@ -556,8 +562,19 @@
- fi
- 
- dnl ===================================================================
-dnl Set the gxx include directories
-+dnl Set the gcc/gxx include directories
- dnl ===================================================================
-+if test "$_os" = "FreeBSD" && test "$CC" != "cc"; then
-+if test "$GXX" = "yes"; then
-+   if test -n "$enable_gcc3"; then
-+		_gccincname1="g++-v3"
-+   else
-+		_gccincname1="g++-3"
-+   fi
-+	_gcc_include_path=".."
-+	_gxx_include_path="$_gcc_include_path/$_gccincname1"
-+fi
-+else
- if test "$GXX" = "yes"; then
-    _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1`
-    if test "$_gxx_include_path" = "/usr/libexec/(null)/include"; then
-@@ -566,7 +583,7 @@
- dnl This is the original code...
- dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include 
- fi
-
-+fi
- 
- dnl ===================================================================
- dnl Extra checking for the SUN OS compiler
--- a/editors/openoffice-1.1-devel/files/patch-config_office+set_soenv.in
+++ b/editors/openoffice-1.1-devel/files/patch-config_office+set_soenv.in
@ -1,97 +0,0 @@
--- set_soenv.in.orig	Fri Mar 28 12:02:25 2003
-+++ set_soenv.in	Fri Apr  4 10:36:54 2003
-@@ -52,7 +52,7 @@
- #-------------------------------------------------
- #
- # Platform independent constant values.
-my @LANGUAGES = ("ARAB", "CHINSIM", "CHINTRAD", "DAN", "DTCH", "ENUS", "FREN", "GREEK", "ITAL",
-+my @LANGUAGES = ("ARAB", "CHINSIM", "CHINTRAD", "DAN", "DTCH", "ENUS", "FREN", "GREEK", "ITAL", "GER",
- "JAPN", "KOREAN", "POL", "PORT", "RUSS", "SPAN", "SWED", "TURK" ); 
- my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PRODUCT, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, 
-      $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, 
-@@ -338,7 +338,7 @@
-       $PTHREAD_LIBS   = '@PTHREAD_LIBS@';
-       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
-       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."green_threads";
-+      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
- } 
- elsif ( $platform eq "$Linux" ) 
- {
-@@ -888,7 +888,8 @@
-                         $ps.$JRETHREADDIR.
-                         $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
- }
-elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64"))
-+elsif (($platform eq "$Linux") || ($platform eq "$NetBSD")
-+|| ($platform eq "$Tru64") || ($platform eq "$FreeBSD"))
- {  $LD_LIBRARY_PATH   = $cur_dir.
-                         $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
-                         $ps.$JRELIBDIR.
-@@ -899,16 +900,6 @@
-                         $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
-                        $ps.$ENV{'LD_LIBRARY_PATH'};
- }
-elsif ($platform eq "$FreeBSD")
-{  $LD_LIBRARY_PATH   = $cur_dir.
-                        $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
-                        $ps.$JRELIBDIR.
-                        $ps.$JRETOOLKITDIR.
-                        $ps.$JRETHREADDIR.
-                        $ps.$par_dir.$LIB.
-			$ps_STLPORT_LIB.
-                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
-}
- elsif ($platform eq "$Irix" || $platform eq "$Irix64")
- {  $LD_LIBRARY_PATH   = $cur_dir.
-                         $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
-@@ -1183,7 +1174,7 @@
-                         $L_STLPORT_LIB.
-                         $L.$XLIB;
- }
-elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64"))
-+elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64") || ($platform eq "$FreeBSD"))
- {  $SOLARLIB          = $L.$par_dir.$LIB.
- 			$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
-                         $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
-@@ -1195,15 +1186,6 @@
-                         $L_STLPORT_LIB.
-                         $L.$XLIB;
- }
-elsif ($platform eq "$FreeBSD")
-{  $SOLARLIB          = $L.$par_dir.$LIB.
-			$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
-                        $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
-                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
-                        $L.'$JAVA_HOME'.$LIB.
-			$L_STLPORT_LIB.
-                        $L.$XLIB;
-}
- elsif ($platform eq "$Winnt")
- {  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
-                         $L.$par_dir.$LIB.
-@@ -1264,7 +1246,9 @@
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
- }
- elsif ($platform eq "$FreeBSD")
-{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+{
-+   $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+   $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd";
- }
- elsif ($platform eq "$NetBSD")
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
-@@ -1275,12 +1259,7 @@
- 
- #java threads include path
- 
-if ($platform eq "$FreeBSD")
-{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."green_threads".$ds."include";
-}
-else
-{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include";
-}
-+   $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include";
- 
- #The tail, if needed
- if (($platform eq "$Linux") or  ($platform eq "$FreeBSD") or ($platform eq "$NetBSD"))
--- a/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk
@ -1,12 +0,0 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig	Wed Oct 30 20:59:21 2002
-+++ ../connectivity/source/drivers/mozab/makefile.mk	Wed Oct 30 20:59:31 2002
-@@ -115,9 +115,7 @@
- # --- MOZAB BASE Library -----------------------------------
- 
- SHL1VERSIONMAP= $(TARGET).map
-.IF "$(OS)"!="FREEBSD"
- SHL1TARGET=	$(TARGET)$(MOZAB_MAJOR)
-.ENDIF
- SHL1OBJS=$(SLOFILES)
- SHL1STDLIBS=\
- 	$(CPPULIB)					\
--- 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,5 +1,5 @@
--- ../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 15:51:13 2002
+--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Apr 15 19:39:14 2003
+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Sat May 31 22:34:31 2003
@@ -64,8 +64,8 @@
 #mozilla specific stuff.
 MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
@ -11,44 +11,35 @@
 #End of mozilla specific stuff.
 
 PRJ=..$/..$/..$/..
-@@ -107,7 +107,7 @@
+@@ -132,7 +132,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)$/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 @@
+@@ -150,7 +150,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)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
 CDEFS+=	    -DMOZILLA_CLIENT \
             -DOSTYPE=\"Linux2.2.14-5\" -DOJI
 .IF "$(OS)" == "LINUX"
-@@ -157,6 +157,13 @@
+@@ -166,6 +166,13 @@
             -fno-rtti -Wall -Wconversion -Wpointer-arith \
             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-             -Wno-long-long 
+             -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 
+            -Wno-long-long -pthread
 CDEFS     += -DTRACING
 .ENDIF
 .ENDIF
--- a/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
@ -1,12 +0,0 @@
--- ../connectivity/source/drivers/mozaddressbook/makefile.mk.orig	Wed Jun 12 01:40:36 2002
-+++ ../connectivity/source/drivers/mozaddressbook/makefile.mk	Wed Jun 12 01:40:37 2002
-@@ -134,9 +134,7 @@
- SLOFILES+=$(SLO)$/staticmbmozab.obj
- .ENDIF
- 
-.IF "$(OS)"!="FREEBSD"
- SHL1VERSIONMAP= $(TARGET).map
-.ENDIF
- # --- Library -----------------------------------
- 
- SHL1TARGET=$(TARGET)$(UPD)$(DLLPOSTFIX)
--- a/editors/openoffice-1.1-devel/files/patch-cppu+inc+uno+lbnames.h
+++ b/editors/openoffice-1.1-devel/files/patch-cppu+inc+uno+lbnames.h
@ -1,11 +0,0 @@
--- ../cppu/inc/uno/lbnames.h.orig	Fri May 31 00:06:58 2002
-+++ ../cppu/inc/uno/lbnames.h	Fri May 31 00:07:22 2002
-@@ -94,7 +94,7 @@
- #define	__CPPU_ENV gcc2
- #elif (__GNUC__ == 2)
- #error "Tested gcc 2 versions are 2.91 and 2.95.  Patch uno/lbnames.h to try your gcc 2 version."
-#elif (__GNUC__ == 3 && __GNUC_MINOR__ == 0)
-+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
- #define	__CPPU_ENV gcc3
- #elif (__GNUC__ == 3)
- #error "Tested gcc 3 version is 3.0.  Patch uno/lbnames.h to try your gcc 3 version."
--- a/editors/openoffice-1.1-devel/files/patch-cppu+prj+build.lst
+++ b/editors/openoffice-1.1-devel/files/patch-cppu+prj+build.lst
@ -1,8 +0,0 @@
--- ../cppu/prj/build.lst.orig	Mon Mar 11 14:13:47 2002
-+++ ../cppu/prj/build.lst	Mon Mar 11 14:14:30 2002
-@@ -1,4 +1,4 @@
-cu	cppu	:	codemaker udkapi NULL
-+cu	cppu	:	codemaker udkapi offuh NULL
- cu	cppu									usr1	-	all	cu_mkout NULL
- cu	cppu\source								nmake	-	all	cu_source NULL
- cu	cppu\source\uno							nmake	-	all	cu_uno cu_source NULL
--- a/editors/openoffice-1.1-devel/files/patch-cppuhelper+source+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-cppuhelper+source+makefile.mk
@ -1,14 +0,0 @@
--- ../cppuhelper/source/makefile.mk.orig	Thu Feb 20 17:04:36 2003
-+++ ../cppuhelper/source/makefile.mk	Wed Mar  5 20:32:03 2003
-@@ -194,9 +194,9 @@
- .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
- SHL1VERSIONMAP=gcc3_linux_intel.map
- .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
-#SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+SHL1VERSIONMAP=gcc2_linux_intel.map
- .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
-#SHL1VERSIONMAP=gcc3_freebsd_intel.map
-+SHL1VERSIONMAP=gcc3_linux_intel.map
- .ENDIF
- 
- # --- Targets ------------------------------------------------------
--- a/editors/openoffice-1.1-devel/files/patch-desktop+source+app+app.cxx
+++ b/editors/openoffice-1.1-devel/files/patch-desktop+source+app+app.cxx
@ -1,22 +0,0 @@
--- ../desktop/source/app/app.cxx.orig	Sun Mar 30 22:26:15 2003
-+++ ../desktop/source/app/app.cxx	Sun Mar 30 22:27:02 2003
-@@ -587,7 +587,8 @@
-     ::comphelper::setProcessServiceFactory( NULL );
- 
- 	// clear lockfile
-	m_pLockfile->clean();
-+	if (m_pLockfile != NULL)
-+		m_pLockfile->clean();
- 
-     if( !Application::IsRemoteServer() )
- 	{
-@@ -621,7 +622,8 @@
- 		a <<= (sal_Bool)sal_False;
- 		xPropertySet->setPropertyValue( OUSTRING(RTL_CONSTASCII_USTRINGPARAM( SUSPEND_QUICKSTARTVETO )), a );
- 	} else {
-        m_pLockfile->clean();
-+		if (m_pLockfile != NULL)
-+			m_pLockfile->clean();
- 	}
- 
-     return bExit;
--- a/editors/openoffice-1.1-devel/files/patch-desktop+source+pkgchk+pkgchk_misc.h
+++ b/editors/openoffice-1.1-devel/files/patch-desktop+source+pkgchk+pkgchk_misc.h
@ -1,11 +0,0 @@
--- ../desktop/source/pkgchk/pkgchk_misc.h.orig	Wed Mar  5 20:51:46 2003
-+++ ../desktop/source/pkgchk/pkgchk_misc.h	Wed Mar  5 20:52:45 2003
-@@ -208,6 +208,8 @@
- #define THIS_PLATFORM_PATH "/macosx_powerpc.plt"
- #elif defined (NETBSD) && defined (SPARC)
- #define THIS_PLATFORM_PATH "/netbsd_sparc.plt"
-+#elif defined (FREEBSD) && defined (INTEL)
-+#define THIS_PLATFORM_PATH "/freebsd_x86.plt"
- #else
- #error "unknown platform"
- insert your platform identifier above; inserted for the case the preprocessor ignores error
--- a/editors/openoffice-1.1-devel/files/patch-desktop+util+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-desktop+util+makefile.mk
@ -1,20 +0,0 @@
--- ../desktop/util/makefile.mk.orig	Fri Feb 14 14:43:59 2003
-+++ ../desktop/util/makefile.mk	Wed Mar  5 20:54:04 2003
-@@ -102,7 +102,7 @@
- 
- # --- Linken der Applikation ---------------------------------------
- 
-.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- # #74158# linux needs sal/vos/tools at end of link list, solaris needs it first,
- # winXX is handled like solaris for now
- APP1_STDPRE=
-@@ -139,7 +139,7 @@
- .ENDIF
- 
- .IF "$(GUI)" == "UNX"
-.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- APP1STDLIBS+= -lXext -lSM -lICE
- .ENDIF
- .ENDIF
--- a/editors/openoffice-1.1-devel/files/patch-dtrans+source+X11+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-dtrans+source+X11+makefile.mk
@ -1,12 +0,0 @@
--- ../dtrans/source/X11/makefile.mk.orig	Tue Dec 11 18:48:36 2001
-+++ ../dtrans/source/X11/makefile.mk	Wed Apr  3 00:31:56 2002
-@@ -116,7 +116,8 @@
- APP1STDLIBS=\
- 		$(CPPULIB)			\
- 		$(CPPUHELPERLIB)	\
-		$(SALLIB)
-+		$(SALLIB) \
-+		-lX11
- 
- .ENDIF		# "$(OS)"=="MACOSX"
- 
--- a/editors/openoffice-1.1-devel/files/patch-eventattacher+source+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-eventattacher+source+makefile.mk
@ -1,14 +0,0 @@
--- ../eventattacher/source/makefile.mk.orig	Tue Oct  1 09:45:21 2002
-+++ ../eventattacher/source/makefile.mk	Wed Mar  5 21:06:11 2003
-@@ -104,9 +104,9 @@
- SHL1TARGET=	$(TARGET)
- 
- SHL1STDLIBS= \
-+		$(SALLIB)					\
- 		$(CPPULIB)					\
-		$(CPPUHELPERLIB)				\
-		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1DEPN=
- SHL1IMPLIB=	i$(TARGET)
--- a/editors/openoffice-1.1-devel/files/patch-extensions+source+scanner+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-extensions+source+scanner+makefile.mk
@ -0,0 +1,12 @@
+--- ../extensions/source/scanner/makefile.mk.orig	Mon Jun  2 04:37:00 2003
+++ ../extensions/source/scanner/makefile.mk	Mon Jun  2 04:37:03 2003
+@@ -135,7 +135,9 @@
+ 	$(GOODIESLIB)		
+ 
+ .IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="FREEBSD"
+ SHL1STDLIBS+=$(SVTOOLLIB) -ldl
+.ENDIF
+ .ENDIF
+ 
+ SHL1DEF=$(MISC)$/$(SHL1TARGET).def
--- a/editors/openoffice-1.1-devel/files/patch-external+gcc3_specific+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-external+gcc3_specific+makefile.mk
@ -1,18 +1,18 @@
--- ../external/gcc3_specific/makefile.mk.orig	Wed Mar  5 23:01:32 2003
-+++ ../external/gcc3_specific/makefile.mk	Wed Mar  5 23:01:59 2003
-@@ -10,6 +10,7 @@
- .IF "$(COMID)"=="gcc3"
+--- ../external/gcc3_specific/makefile.mk.orig	Sat May 31 22:43:57 2003
+++ ../external/gcc3_specific/makefile.mk	Sat May 31 22:43:59 2003
+@@ -11,6 +11,7 @@
 
 .IF "$(OS)"!="MACOSX"
+ .IF "$(OS)"!="IRIX"
 +.IF "$(OS)"!="FREEBSD"
 
 
- all : $(SOLARLIBDIR)$/libstdc++.so.$(LIBSTDCPP3) $(SOLARLIBDIR)$/libgcc_s.so.1 $(SOLARLIBDIR)$/libstdc++.so.$(SHORTSTDCPP3) $(SOLARLIBDIR)$/libgcc_s.so 
-@@ -29,6 +30,7 @@
+ all : $(SOLARLIBDIR)$/libstdc++.so.$(SHORTSTDCPP3) $(SOLARLIBDIR)$/libgcc_s.so.1 $(SOLARLIBDIR)$/libgcc_s.so 
+@@ -26,6 +27,7 @@
         -rm -f $@
         +ln -s libgcc_s.so.1 $@
 
 +.ENDIF 
 .ENDIF 
+ .ENDIF 
 
- .ENDIF
--- a/editors/openoffice-1.1-devel/files/patch-freetype+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-freetype+makefile.mk
@ -1,11 +0,0 @@
--- ../freetype/makefile.mk.orig	Tue Mar 11 14:13:25 2003
-+++ ../freetype/makefile.mk	Tue Mar 11 14:13:27 2003
-@@ -100,7 +100,7 @@
- .IF "$(OS)"=="MACOSX"
- OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
- .ELIF "$(OS)"=="FREEBSD"
-OUT2LIB+=objs$/.libs$/libfreetype.so.7*
-+OUT2LIB+=objs$/.libs$/libfreetype.so.9*
- .ELSE
- OUT2LIB+=objs$/.libs$/libfreetype.so.6*
- .ENDIF          # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
--- a/editors/openoffice-1.1-devel/files/patch-instsetoo+util+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-instsetoo+util+makefile.mk
@ -1,13 +0,0 @@
--- ../instsetoo/util/makefile.mk.orig	Sat Apr 12 15:24:45 2003
-+++ ../instsetoo/util/makefile.mk	Sat Apr 12 15:24:55 2003
-@@ -87,9 +87,7 @@
- 
- .IF "$(alllangext)"!=""
- 
-#pack: $(foreach,i,$(alllangext) pack_$i)
-#temp mh only 49 and 01 for the moment
-pack: pack_01 pack_49
-+pack: $(foreach,i,$(alllangext) pack_$i)
- 
- pack_%:
- 	+-$(MKDIRHIER) $(INSTALLDIR)$/$(@:s/pack_//)$/normal
--- a/editors/openoffice-1.1-devel/files/patch-instsetoo+util+openoffice.lst
+++ b/editors/openoffice-1.1-devel/files/patch-instsetoo+util+openoffice.lst
@ -1,10 +0,0 @@
--- ../instsetoo/util/openoffice.lst.orig	Sat Feb  1 00:38:02 2003
-+++ ../instsetoo/util/openoffice.lst	Thu Apr 17 22:55:06 2003
-@@ -9,6 +9,6 @@
- 				active			1
- 				compression		5
- 				script			setup_osl
-				include			.,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/bin.{minor}/01/,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,.
-+				include			.,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarcommonpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarpath}/bin.{minor}/01/,{solarpath}/bin.{minor}/01/osl/,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,.
- 	}
- }
--- a/editors/openoffice-1.1-devel/files/patch-javaunohelper+source+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-javaunohelper+source+makefile.mk
@ -1,13 +0,0 @@
--- ../javaunohelper/source/makefile.mk.orig	Thu Feb 20 17:28:43 2003
-+++ ../javaunohelper/source/makefile.mk	Wed Mar  5 21:04:09 2003
-@@ -118,9 +118,9 @@
- SHL1TARGET=juhx
- 
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(JVMACCESSLIB)		\
- 		$(SALHELPERLIB)		\
-		$(SALLIB)		\
- 		$(CPPULIB)		\
- 		$(CPPUHELPERLIB)
- 
--- a/editors/openoffice-1.1-devel/files/patch-jni_uno+jni_java2uno.cxx
+++ b/editors/openoffice-1.1-devel/files/patch-jni_uno+jni_java2uno.cxx
@ -1,12 +0,0 @@
--- ../bridges/source/jni_uno/jni_java2uno.cxx.orig	Tue Mar 11 12:33:06 2003
-+++ ../bridges/source/jni_uno/jni_java2uno.cxx	Tue Mar 11 12:34:03 2003
-@@ -62,7 +62,9 @@
- #if defined _MSC_VER
- #include <malloc.h>
- #else
-+#if !defined( FREEBSD)
- #include <alloca.h>
-+#endif
- #endif
- 
- #include "jni_bridge.h"
--- a/editors/openoffice-1.1-devel/files/patch-jvmaccess+source+javainfoimpl.cxx
+++ b/editors/openoffice-1.1-devel/files/patch-jvmaccess+source+javainfoimpl.cxx
@ -1,10 +0,0 @@
--- ../jvmaccess/source/javainfoimpl.cxx.orig	Sat Mar 29 23:58:55 2003
-+++ ../jvmaccess/source/javainfoimpl.cxx	Sun Mar 30 00:00:47 2003
-@@ -123,6 +123,7 @@
- #define JAVA_DIR_NAMES  "j2re1.4.1_01", \
-                         "j2sdk1.4.1_01", \
-                         "j2re1.4.1", \
-+			"jdk1.4.1", \
-                         "j2sdk1.4.1", \
-                         "j2re1.4.0_02", \
-                         "j2sdk1.4.0_02", \
--- a/editors/openoffice-1.1-devel/files/patch-jvmaccess+source+sunversion.cxx
+++ b/editors/openoffice-1.1-devel/files/patch-jvmaccess+source+sunversion.cxx
@ -1,50 +1,11 @@
--- ../jvmaccess/source/sunversion.cxx.orig	Sun Mar 30 00:40:02 2003
-+++ ../jvmaccess/source/sunversion.cxx	Sun Mar 30 01:31:48 2003
-@@ -102,6 +102,7 @@
-         {
-             //token can be "1", or "2_02"
-             char* pUnderscore= strpbrk(tok,"_");
-+            char* pLine= strpbrk(tok,"-");
-             if( pUnderscore != NULL)
-             {
-                 // get the value before and after the underscore
-@@ -115,6 +116,19 @@
-                 // now get the part after "_"
-                 m_nMinor= atoi( pUnderscore + 1);
-             }
-+            else if (pLine != NULL)
-+            {
-+                // get the value before and after the underscore
-+                int len= pLine - tok;
-+                char* pre= new char[len  + 1];
-+                strncpy( pre, tok, len);
-+                pre[len]= 0;
-+                // convert the value before the "_" into a numeric value
-+                arTokens[index]= atoi(pre);
-+                delete[] pre;
-+                // now get the part after "-"
-+                m_nMinor= atoi( pLine + 1);
-+            }
-             else
-             {
-                 arTokens[index]= atoi(tok);
-@@ -172,6 +186,19 @@
-                     continue;
-             }
-         }
-+        if(cCur == '-')
-+        {
-+            //check previous char
-+            if(cLast >= 48 && cLast <= 57)
-+            {
-+                if(cNext == 'p')
-+                    continue;
-+            }
-+        }
-+        if(cCur == 'p')
-+	{
-+                    continue;
-+	}
-         //If we get here then the current character is not a number (0..9),'.','_'
-         ret= false;
-         break;
+--- ../jvmaccess/source/sunversion.cxx.orig	Mon Jun  2 00:00:25 2003
+++ ../jvmaccess/source/sunversion.cxx	Mon Jun  2 00:06:00 2003
+@@ -231,6 +231,8 @@
+             m_preRelease = Rel_BETA;
+         else if (! strcmp(pCur, "rc1"))
+             m_preRelease = Rel_RC1;
+        else if (*pCur == 'p')
+            m_preRelease = Rel_BETA;
+         else
+             return false;
+     }
--- a/editors/openoffice-1.1-devel/files/patch-jvmaccess+util+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-jvmaccess+util+makefile.mk
@ -1,11 +0,0 @@
--- ../jvmaccess/util/makefile.mk.orig	Wed Mar 12 23:52:25 2003
-+++ ../jvmaccess/util/makefile.mk	Wed Mar 12 23:52:50 2003
-@@ -90,6 +90,8 @@
- SHL1VERSIONMAP = cc5_solaris_sparc.map
- .ELIF "$(OS)$(CPU)$(COMNAME)" == "LINUXIgcc3"
- SHL1VERSIONMAP = gcc3_linux_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)" == "FREEBSDIgcc3"
-+SHL1VERSIONMAP = gcc3_linux_intel.map
- .ENDIF
- 
- DEF1NAME = $(SHL1TARGET)
--- a/editors/openoffice-1.1-devel/files/patch-nas+nas-1.6.patch
+++ b/editors/openoffice-1.1-devel/files/patch-nas+nas-1.6.patch
@ -1,301 +0,0 @@
--- ../nas/nas-1.6.patch.orig	Tue Mar 11 15:04:35 2003
-+++ ../nas/nas-1.6.patch	Tue Mar 11 15:29:52 2003
-@@ -69,3 +69,298 @@
-   number		: NUMBER		{ $$ = $1; }
-   		;
- 
-+--- misc/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 14:56:14 2003
-++++ misc/build/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 15:01:04 2003
-+@@ -23,7 +23,7 @@
-+  */
-+ 
-+ #include <stdio.h>
-+-#include <malloc.h>
-++#include <stdlib.h>
-+ #include "auctl.h"
-+ 
-+ char *ProgramName;
-+--- misc/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 14:56:14 2003
-++++ misc/build/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 15:01:04 2003
-+@@ -32,7 +32,7 @@
-+ #include <stdlib.h>
-+ #endif
-+ #include <signal.h>
-+-#include <malloc.h>
-++#include <stdlib.h>
-+ 
-+ #if !defined(SYSV) || defined(WIN32)
-+ #include <audio/Aos.h>		/* for string and other os stuff */
-+--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 14:56:14 2003
-++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:01:04 2003
-+@@ -32,7 +32,7 @@
-+ #if !defined(ISC40) && !defined(WIN32)
-+ #include <sys/file.h>
-+ #endif /* !ISC40 */
-+-#include <malloc.h>
-++#include <stdlib.h>
-+ 
-+ #include <audio/Aos.h>			/* for string and other os stuff */
-+ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
-+--- misc/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 14:56:14 2003
-++++ misc/build/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 15:01:04 2003
-+@@ -37,7 +37,7 @@
-+ #define access _access
-+ #define R_OK 4
-+ #endif /* WIN32 */
-+-#include <malloc.h>
-++#include <stdlib.h>
-+ #include <limits.h>				/* for SHRT_MIN and SHRT_MAX */
-+ #ifndef SYSV
-+ #include <audio/Aos.h>				/* for string and other os
-+--- misc/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 14:56:16 2003
-++++ misc/build/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 15:01:04 2003
-+@@ -28,7 +28,7 @@
-+  */
-+ 
-+ #include	<stdio.h>
-+-#include	<malloc.h>
-++#include	<stdlib.h>
-+ #include	<audio/audiolib.h>
-+ #include	<audio/soundlib.h>
-+ 
-+--- misc/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 14:56:15 2003
-++++ misc/build/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 15:01:04 2003
-+@@ -27,7 +27,7 @@
-+  */
-+ 
-+ #include <stdio.h>
-+-#include <malloc.h>
-++#include <stdlib.h>
-+ #include <audio/Aos.h>			/* for string and other os stuff */
-+ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
-+ #include <audio/audiolib.h>
-+--- misc/nas-1.6/lib/audio/8svx.c	Tue Mar 11 14:56:13 2003
-++++ misc/build/nas-1.6/lib/audio/8svx.c	Tue Mar 11 15:01:04 2003
-+@@ -23,7 +23,7 @@
-+  */
-+ 
-+ #include <stdio.h>
-+-#include <malloc.h>
-++#include <stdlib.h>
-+ #include <audio/Aos.h>
-+ #include <math.h>
-+ #include <audio/8svx.h>
-+--- misc/nas-1.6/lib/audio/aiff.c	Tue Mar 11 14:56:13 2003
-++++ misc/build/nas-1.6/lib/audio/aiff.c	Tue Mar 11 15:01:04 2003
-+@@ -23,7 +23,7 @@
-+  */
-+ 
-+ #include <stdio.h>
-+-#include <malloc.h>
-++#include <stdlib.h>
-+ #include <audio/Aos.h>
-+ #include <math.h>
-+ #include <audio/aiff.h>
-+--- misc/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 14:56:13 2003
-++++ misc/build/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 15:01:04 2003
-+@@ -29,7 +29,7 @@
-+ #include	<stdio.h>
-+ #include	<audio/Aos.h>
-+ #include	<audio/fileutil.h>
-+-#include	<malloc.h>
-++#include	<stdlib.h>
-+ 
-+ #if NeedFunctionPrototypes
-+ unsigned short FileSwapS (unsigned short us)
-+--- misc/nas-1.6/lib/audio/snd.c	Tue Mar 11 14:56:13 2003
-++++ misc/build/nas-1.6/lib/audio/snd.c	Tue Mar 11 15:01:04 2003
-+@@ -23,7 +23,7 @@
-+  */
-+ 
-+ #include <stdio.h>
-+-#include <malloc.h>
-++#include <stdlib.h>
-+ #include <audio/Aos.h>
-+ #include <audio/snd.h>
-+ #include <audio/fileutil.h>
-+--- misc/nas-1.6/lib/audio/sound.c	Tue Mar 11 14:56:13 2003
-++++ misc/build/nas-1.6/lib/audio/sound.c	Tue Mar 11 15:01:04 2003
-+@@ -29,7 +29,7 @@
-+ #define _SOUND_C_
-+ 
-+ #include	<stdio.h>
-+-#include 	<malloc.h>
-++#include 	<stdlib.h>
-+ #include	<audio/Aos.h>
-+ #include	<audio/audio.h>
-+ #include	<audio/sound.h>
-+--- misc/nas-1.6/lib/audio/voc.c	Tue Mar 11 14:56:13 2003
-++++ misc/build/nas-1.6/lib/audio/voc.c	Tue Mar 11 15:01:04 2003
-+@@ -23,7 +23,7 @@
-+  */
-+ 
-+ #include	<stdio.h>
-+-#include 	<malloc.h>
-++#include 	<stdlib.h>
-+ #include	<audio/Aos.h>
-+ #include	<audio/voc.h>
-+ #include	<audio/fileutil.h>
-+--- misc/nas-1.6/lib/audio/wave.c	Tue Mar 11 14:56:13 2003
-++++ misc/build/nas-1.6/lib/audio/wave.c	Tue Mar 11 15:01:04 2003
-+@@ -27,7 +27,7 @@
-+  */
-+ 
-+ #include	<stdio.h>
-+-#include 	<malloc.h>
-++#include 	<stdlib.h>
-+ #include	<audio/Aos.h>
-+ #include	<audio/wave.h>
-+ #include	<audio/fileutil.h>
-+--- misc/nas-1.6/server/os/utils.c	Tue Mar 11 14:56:13 2003
-++++ misc/build/nas-1.6/server/os/utils.c	Tue Mar 11 15:01:04 2003
-+@@ -454,7 +454,7 @@
-+ }
-+ 
-+ #ifdef CAHILL_MALLOC
-+-#include <malloc.h>
-++#include <stdlib.h>
-+ 
-+ void * 
-+ debug_Xalloc (char *file, int line, unsigned long amount)
-+--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:19:40 2003
-++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:20:51 2003
-+@@ -84,6 +84,7 @@
-+  */
-+ static void
-+ usleep(usecs)
-++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3)
-+ unsigned int    usecs;
-+ {
-+     double          s1;
-+@@ -150,6 +151,7 @@
-+     pause();
-+ }
-+ 
-++#endif
-+ #endif						/* SYSV else not */
-+ #endif						/* VMS else not */
-+ #endif						/* NEEDUSLEEP */
-+--- misc/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:19:40 2003
-++++ misc/build/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:25:21 2003
-+@@ -28,7 +28,7 @@
-+  */
-+ 
-+ #ifndef WIN32
-+-# ifdef __NetBSD__
-++# if defined(__NetBSD__) || defined(__FreeBSD__)
-+ #  include <limits.h>
-+ #  define MAXSHORT SHRT_MAX
-+ #  define MINSHORT SHRT_MIN
-+--- misc/nas-1.6/config/NetAudio.def	Tue Mar 11 15:19:40 2003
-++++ misc/build/nas-1.6/config/NetAudio.def	Tue Mar 11 15:26:55 2003
-+@@ -8,6 +8,6 @@
-+ 
-+ XCOMM Directory where NAS will look for it's config file(s)
-+ #ifndef NasConfigSearchPath
-+-#define NasConfigSearchPath /etc/nas/
-++#define NasConfigSearchPath $(PROJECTROOT)/etc/
-+ #endif
-+ 
-+--- misc/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:19:38 2003
-++++ misc/build/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:26:26 2003
-+@@ -36,6 +36,10 @@
-+ #endif
-+ #endif /* ProjectX < 5 */
-+ 
-++#if HasBSD44Sockets
-++    SOCK_DEFINES = -DBSD44SOCKETS
-++#endif
-++
-+ #ifndef NormalLibAudio
-+ #define NormalLibAudio NormalLibX
-+ #endif
-+@@ -79,7 +83,7 @@
-+      EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
-+ 
-+         DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
-+-   CONN_DEFINES = ConnectionFlags
-++   CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
-+ 
-+ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h    \
-+           voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \
-+--- misc/nas-1.6/server/Imakefile	Tue Mar 11 15:19:40 2003
-++++ misc/build/nas-1.6/server/Imakefile	Tue Mar 11 15:27:38 2003
-+@@ -105,6 +105,9 @@
-+ # if defined(LinuxArchitecture)
-+     RCMANDIR = $(FILEMANDIR)
-+     RCMANSUFFIX = 5nas
-++# elif defined(FreeBSDArchitecture)
-++    RCMANDIR = $(FILEMANDIR)
-++    RCMANSUFFIX = $(FILEMANSUFFIX)
-+ # else
-+     RCMANDIR = $(MANDIR)
-+     RCMANSUFFIX = 5x
-+--- misc/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:19:39 2003
-++++ misc/build/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:24:32 2003
-+@@ -133,7 +133,7 @@
-+ 
-+ #include <stdio.h>
-+ #include <stdlib.h>
-+-#ifndef SVR4
-++#if !defined(SVR4) && !defined(__FreeBSD__)
-+ #include <getopt.h>
-+ #endif
-+ #include <sys/types.h>
-+@@ -171,16 +171,11 @@
-+ #include <sys/param.h>
-+ #include <assert.h>
-+ 
-+-#ifdef __FreeBSD__
-+-# include <machine/soundcard.h>
-+-# include <machine/pcaudioio.h>
-++#ifdef __NetBSD__
-++# include <sys/ioctl.h>
-++# include <soundcard.h>
-+ #else
-+-# ifdef __NetBSD__
-+-#  include <sys/ioctl.h>
-+-#  include <soundcard.h>
-+-# else
-+-#  include <sys/soundcard.h>
-+-# endif
-++# include <sys/soundcard.h>
-+ #endif
-+ 
-+ #include <audio/audio.h>
-+@@ -659,7 +654,11 @@
-+     if(sndStatOut.fd == -1)
-+     {
-+        while ((sndStatOut.fd = open(sndStatOut.device, 
-++#if defined(__FreeBSD__)
-++				    sndStatOut.howToOpen|extramode,
-++#else
-+ 				    sndStatOut.howToOpen|O_SYNC|extramode, 
-++#endif
-+ 				    0666)) == -1 && wait)
-+        {
-+            osLogMsg("openDevice: waiting on output device\n");
-+@@ -1310,6 +1309,11 @@
-+ /*
-+  * Setup soundcard at maximum audio quality.
-+  */
-++
-++#if defined(__FreeBSD__)
-++#define NO_16_BIT_SAMPLING
-++#endif
-++
-+ static void setupSoundcard(sndStatPtr)
-+ SndStat* sndStatPtr;
-+ {
-+@@ -1472,7 +1476,11 @@
-+ 		   sndStatOut.device, sndStatOut.howToOpen);
-+ 	
-+ 	if ((fd = open(sndStatOut.device, 
-++#if defined(__FreeBSD__)
-++		       sndStatOut.howToOpen|extramode, 0)) == -1)
-++#else
-+ 		       sndStatOut.howToOpen|O_SYNC|extramode, 0)) == -1)
-++#endif
-+ 	  {
-+ 	    UNIDENTMSG;
-+ 	    return AuFalse;
--- a/editors/openoffice-1.1-devel/files/patch-odk+util+makefile.pmk
+++ b/editors/openoffice-1.1-devel/files/patch-odk+util+makefile.pmk
@ -1,16 +0,0 @@
--- ../odk/util/makefile.pmk.orig	Fri Mar 28 07:17:29 2003
-+++ ../odk/util/makefile.pmk	Fri Mar 28 07:19:02 2003
-@@ -111,8 +111,13 @@
- XMLOUT=$(SOLARXMLDIR)
- LIBOUT=$(SOLARLIBDIR)
- 
-+.IF "$(OS)"=="FREEBSD"
-+MY_COPY=$(GNUCOPY)
-+MY_COPY_RECURSIVE=$(GNUCOPY) -r
-+.ELSE
- MY_COPY=$(GNUCOPY) -u
- MY_COPY_RECURSIVE=$(GNUCOPY) -urf
-+.ENDIF
- 
- CONVERTTAGSCRIPT=$(SOLARENV)$/bin$/converttags.pl
- 
--- a/editors/openoffice-1.1-devel/files/patch-offapi+com+sun+star+setup+OSType.idl
+++ b/editors/openoffice-1.1-devel/files/patch-offapi+com+sun+star+setup+OSType.idl
@ -1,12 +0,0 @@
--- ../offapi/com/sun/star/setup/OSType.idl.orig	Mon Dec 18 16:34:26 2000
-+++ ../offapi/com/sun/star/setup/OSType.idl	Sun Jul 21 01:37:15 2002
-@@ -88,6 +88,9 @@
- 	UNIX_LINUX,
- 
- 	// DocMerge: empty anyway
-+	UNIX_FREEBSD,
-+
-+	// DocMerge: empty anyway
- 	UNIX_HP,
- 
- 	// DocMerge: empty anyway
--- a/editors/openoffice-1.1-devel/files/patch-offapi+util+makefile.pmk
+++ b/editors/openoffice-1.1-devel/files/patch-offapi+util+makefile.pmk
@ -1,11 +0,0 @@
--- ../offapi/util/makefile.pmk.orig	Mon Mar 11 01:37:55 2002
-+++ ../offapi/util/makefile.pmk	Mon Mar 11 01:37:57 2002
-@@ -85,7 +85,7 @@
- 
- URDDOC=TRUE
- 
-.IF "$(OS)"=="SOLARIS"
-+.IF "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
- .IF "$(CPU)"=="I"
- UNOIDL=unoidl
- .ENDIF
--- a/editors/openoffice-1.1-devel/files/patch-package+inc+HashMaps.hxx
+++ b/editors/openoffice-1.1-devel/files/patch-package+inc+HashMaps.hxx
@ -1,20 +0,0 @@
--- ../package/inc/HashMaps.hxx.orig	Tue Oct 30 14:52:18 2001
-+++ ../package/inc/HashMaps.hxx	Wed Jun 12 23:10:42 2002
-@@ -79,7 +79,7 @@
- };
- 
- class ZipPackageFolder;
-class ContentInfo;
-+class ZipContentInfo;
- 
- typedef std::hash_map < rtl::OUString, 
- 						ZipPackageFolder *,
-@@ -87,7 +87,7 @@
- 						eqFunc > FolderHash;
- 
- typedef std::hash_map < rtl::OUString, 
-						vos::ORef < ContentInfo >,
-+						vos::ORef < ZipContentInfo >,
- 						::rtl::OUStringHash, 
- 						eqFunc > ContentHash;
- 
--- a/editors/openoffice-1.1-devel/files/patch-package+inc+ZipPackageFolder.hxx
+++ b/editors/openoffice-1.1-devel/files/patch-package+inc+ZipPackageFolder.hxx
@ -1,11 +0,0 @@
--- ../package/inc/ZipPackageFolder.hxx.orig	Thu Nov 15 21:01:49 2001
-+++ ../package/inc/ZipPackageFolder.hxx	Wed Jun 12 23:10:42 2002
-@@ -106,7 +106,7 @@
- 
- 	void doInsertByName ( ZipPackageEntry *pEntry, sal_Bool bSetParent )
- 		throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-	ContentInfo & doGetByName( const ::rtl::OUString& aName )
-+	ZipContentInfo & doGetByName( const ::rtl::OUString& aName )
- 		throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- 	static void copyZipEntry( ZipEntry &rDest, const ZipEntry &rSource);
- 	static ::com::sun::star::uno::Sequence < sal_Int8 > static_getImplementationId()
--- a/editors/openoffice-1.1-devel/files/patch-package+source+zippackage+ContentInfo.hxx
+++ b/editors/openoffice-1.1-devel/files/patch-package+source+zippackage+ContentInfo.hxx
@ -1,34 +0,0 @@
--- ../package/source/zippackage/ContentInfo.hxx.orig	Tue Oct 30 14:54:47 2001
-+++ ../package/source/zippackage/ContentInfo.hxx	Wed Jun 12 23:10:42 2002
-@@ -75,7 +75,7 @@
- #endif
- #include <hash_map>
- 
-class ContentInfo : public cppu::OWeakObject
-+class ZipContentInfo : public cppu::OWeakObject
- {
- public:
- 	com::sun::star::uno::Reference < com::sun::star::lang::XUnoTunnel > xTunnel;
-@@ -85,19 +85,19 @@
- 		ZipPackageFolder *pFolder;
- 		ZipPackageStream *pStream;
- 	};
-	ContentInfo ( ZipPackageStream * pNewStream ) 
-+	ZipContentInfo ( ZipPackageStream * pNewStream ) 
- 	: bFolder ( false )
- 	, pStream ( pNewStream )
- 	, xTunnel ( pNewStream )
- 	{
- 	}
-	ContentInfo ( ZipPackageFolder * pNewFolder ) 
-+	ZipContentInfo ( ZipPackageFolder * pNewFolder ) 
- 	: bFolder ( true )
- 	, pFolder ( pNewFolder )
- 	, xTunnel ( pNewFolder )
- 	{
- 	}
-	virtual ~ContentInfo () 
-+	virtual ~ZipContentInfo () 
- 	{
- 		if ( bFolder )
- 			pFolder->releaseUpwardRef();
--- a/editors/openoffice-1.1-devel/files/patch-package+source+zippackage+ZipPackageFolder.cxx
+++ b/editors/openoffice-1.1-devel/files/patch-package+source+zippackage+ZipPackageFolder.cxx
@ -1,41 +0,0 @@
--- ../package/source/zippackage/ZipPackageFolder.cxx.orig	Wed Jun 12 23:09:16 2002
-+++ ../package/source/zippackage/ZipPackageFolder.cxx	Wed Jun 12 23:10:42 2002
-@@ -212,7 +212,7 @@
- 	return maContents.size() > 0;
- }
- 	// XNameAccess
-ContentInfo& ZipPackageFolder::doGetByName( const OUString& aName )
-+ZipContentInfo& ZipPackageFolder::doGetByName( const OUString& aName )
- 	throw(NoSuchElementException, WrappedTargetException, RuntimeException)
- {
- 	ContentHash::iterator aIter = maContents.find ( aName );
-@@ -286,7 +286,7 @@
- 		  aCI++)
- 	{ 
- 		const OUString &rShortName = (*aCI).first;
-		const ContentInfo &rInfo = *(*aCI).second;
-+		const ZipContentInfo &rInfo = *(*aCI).second;
- 
- 		Sequence < PropertyValue > aPropSet (2);
- 		PropertyValue *pValue = aPropSet.getArray();
-@@ -533,7 +533,7 @@
- 		  aCI!=maContents.end();
- 		  aCI++)
- 	{ 
-		ContentInfo &rInfo = * (*aCI).second;
-+		ZipContentInfo &rInfo = * (*aCI).second;
- 		if ( rInfo.bFolder )// && ! rInfo.pFolder->HasReleased () )
- 			rInfo.pFolder->releaseUpwardRef();
- 		else //if ( !rInfo.bFolder && !rInfo.pStream->HasReleased() )
-@@ -577,9 +577,9 @@
- 		throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
- {
- 	if ( pEntry->IsFolder() )
-		maContents[pEntry->aEntry.sName] = new ContentInfo ( static_cast < ZipPackageFolder *> ( pEntry ) );
-+		maContents[pEntry->aEntry.sName] = new ZipContentInfo ( static_cast < ZipPackageFolder *> ( pEntry ) );
- 	else
-		maContents[pEntry->aEntry.sName] = new ContentInfo ( static_cast < ZipPackageStream *> ( pEntry ) );
-+		maContents[pEntry->aEntry.sName] = new ZipContentInfo ( static_cast < ZipPackageStream *> ( pEntry ) );
- 
- 	if ( bSetParent )
- 		pEntry->setParent ( *this );
--- a/editors/openoffice-1.1-devel/files/patch-registry+source+registry.cxx
+++ b/editors/openoffice-1.1-devel/files/patch-registry+source+registry.cxx
@ -1,14 +0,0 @@
--- ../registry/source/registry.cxx.orig	Fri Apr  4 00:09:08 2003
-+++ ../registry/source/registry.cxx	Fri Apr  4 00:06:25 2003
-@@ -145,11 +145,7 @@
-                                        + RTL_CONSTASCII_LENGTH("/reg_XXXXXX") ) );
-     strncat(tmpPattern, "/reg_XXXXXX", sizeof(tmpPattern)-1-strlen(tmpPattern));
- 
-#if defined(FREEBSD) || defined(MACOSX)
-	pTmpName = mkstemp(tmpPattern);
-#else
- 	pTmpName = mktemp(tmpPattern);
-#endif
- #endif
- 
- 	return OString(pTmpName);
--- a/editors/openoffice-1.1-devel/files/patch-registry+source+regkey.cxx
+++ b/editors/openoffice-1.1-devel/files/patch-registry+source+regkey.cxx
@ -1,12 +0,0 @@
--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
-+++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
-@@ -228,6 +228,9 @@
- {
- 	RegError _ret = REG_NO_ERROR;
- 
-+       if (!nSubKeys)
-+		return REG_NO_ERROR;
-+
- 	if (phSubKeys)
- 	{
- 		ORegistry* pReg = NULL;
--- a/editors/openoffice-1.1-devel/files/patch-rsc+source+rscpp+cpp.h
+++ b/editors/openoffice-1.1-devel/files/patch-rsc+source+rscpp+cpp.h
@ -1,12 +0,0 @@
--- ../rsc/source/rscpp/cpp.h.orig	Fri Mar  1 00:14:38 2002
-+++ ../rsc/source/rscpp/cpp.h	Fri Mar  1 00:15:03 2002
-@@ -462,7 +462,9 @@
- extern char     *strrchr();
- extern char     *strchr();
- #if ! ( defined UNX && defined ALPHA )
-+#if ! ( defined FREEBSD )
- extern long     time();
-+#endif
- #endif
- /* extern char     *sprintf();  */           /* Lint needs this              */
- 
--- a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+nlsupport.c
+++ b/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+nlsupport.c
@ -1,5 +1,5 @@
--- ../sal/osl/unx/nlsupport.c.orig	Tue Jan 28 15:51:36 2003
-+++ ../sal/osl/unx/nlsupport.c	Wed Mar  5 21:03:13 2003
+--- ../sal/osl/unx/nlsupport.c.orig	Thu May 22 05:21:51 2003
+++ ../sal/osl/unx/nlsupport.c	Sat May 31 23:28:05 2003
@@ -63,7 +63,7 @@
 #include <osl/diagnose.h>
 #include <osl/process.h>
@ -51,46 +51,7 @@
 
 #if defined(SOLARIS)
 
-@@ -300,23 +307,23 @@
- #elif defined(IRIX)
- 
- const _pair _nl_language_list[] = {
-   { "ISO8859-1",  	RTL_TEXTENCODING_ISO_8859_1	}, /* Western */
-   { "ISO8859-2",  	RTL_TEXTENCODING_ISO_8859_2     }, /* Central European */
-   { "ISO8859-5",  	RTL_TEXTENCODING_ISO_8859_5     }, /* Cyrillic */
-   { "ISO8859-7",  	RTL_TEXTENCODING_ISO_8859_7    	}, /* Greek */
-   { "ISO8859-9",  	RTL_TEXTENCODING_ISO_8859_9     }, /* Turkish */
-   { "ISO8859-15", 	RTL_TEXTENCODING_ISO_8859_15    }, /* Western Updated (w/Euro sign) */
-   { "eucJP",		RTL_TEXTENCODING_EUC_JP 	}, /* Japan */
-   { "eucKR",		RTL_TEXTENCODING_EUC_KR		}, /* Korea */
-   { "eucCN",		RTL_TEXTENCODING_EUC_CN		}, /* China */
-   { "eucTW",		RTL_TEXTENCODING_EUC_TW		}, /* Taiwan - Traditional Chinese */
-   { "big5",		RTL_TEXTENCODING_BIG5		}, /* China - Traditional Chinese */
-   { "eucgbk",		RTL_TEXTENCODING_DONTKNOW	}, /* China - Simplified Chinese */
-   { "gbk",		RTL_TEXTENCODING_GBK		}, /* China - Simplified Chinese */
-   { "sjis",		RTL_TEXTENCODING_SHIFT_JIS	}, /* Japan */
-+    { "BIG5",          RTL_TEXTENCODING_BIG5           }, /* China - Traditional Chinese */
-+    { "EUCCN",         RTL_TEXTENCODING_EUC_CN         }, /* China */
-+    { "EUCGBK",        RTL_TEXTENCODING_DONTKNOW       }, /* China - Simplified Chinese */
-+    { "EUCJP",         RTL_TEXTENCODING_EUC_JP         }, /* Japan */
-+    { "EUCKR",         RTL_TEXTENCODING_EUC_KR         }, /* Korea */
-+    { "EUCTW",         RTL_TEXTENCODING_EUC_TW         }, /* Taiwan - Traditional Chinese */
-+    { "GBK",           RTL_TEXTENCODING_GBK            }, /* China - Simplified Chinese */
-+    { "ISO8859-1",     RTL_TEXTENCODING_ISO_8859_1     }, /* Western */
-+    { "ISO8859-15",    RTL_TEXTENCODING_ISO_8859_15    }, /* Western Updated (w/Euro sign) */
-+    { "ISO8859-2",     RTL_TEXTENCODING_ISO_8859_2     }, /* Central European */
-+    { "ISO8859-5",     RTL_TEXTENCODING_ISO_8859_5     }, /* Cyrillic */
-+    { "ISO8859-7",     RTL_TEXTENCODING_ISO_8859_7     }, /* Greek */
-+    { "ISO8859-9",     RTL_TEXTENCODING_ISO_8859_9     }, /* Turkish */
-+    { "SJIS",          RTL_TEXTENCODING_SHIFT_JIS      }  /* Japan */
- };
- 
-#elif defined(LINUX) || defined(NETBSD)
-+#elif defined(LINUX)
- 
- const _pair _nl_language_list[] = {
-     { "ANSI_X3.110-1983",           RTL_TEXTENCODING_DONTKNOW   },  /* ISO-IR-99 NAPLPS */
-@@ -491,13 +498,65 @@
+@@ -492,13 +499,65 @@
     { "T.101-G2",                   RTL_TEXTENCODING_DONTKNOW },    /* ISO-IR-128 */
     { "T.61-7BIT",                  RTL_TEXTENCODING_DONTKNOW },    /* ISO-IR-102 */
     { "T.61-8BIT",                  RTL_TEXTENCODING_DONTKNOW },    /* T.61 ISO-IR-103 */
--- a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+pipe.c
+++ b/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+pipe.c
@ -1,14 +0,0 @@
--- ../sal/osl/unx/pipe.c.orig	Thu Jul 11 16:01:39 2002
-+++ ../sal/osl/unx/pipe.c	Fri Oct 18 19:56:38 2002
-@@ -264,7 +264,11 @@
-     
- 	addr.sun_family = AF_UNIX;
- 	strncpy(addr.sun_path, name, sizeof(addr.sun_path));
-+#if defined(FREEBSD)
-+	len = SUN_LEN(&addr);
-+#else
- 	len = sizeof(addr);
-+#endif
- 
- 	if ( Options & osl_Pipe_CREATE )
- 	{			
--- a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+process.c
+++ b/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+process.c
@ -1,11 +0,0 @@
--- ../sal/osl/unx/process.c.orig	Wed Jun  5 16:24:42 2002
-+++ ../sal/osl/unx/process.c	Wed Jan 15 01:25:17 2003
-@@ -222,7 +222,7 @@
- 	/* Memory layout of CMD_ARG_PRG:
-        progname\0arg1\0...argn[\0]\0environ\0env2\0...envn\0[\0] */
- 
-#if !defined(NETBSD)
-+#if !defined(NETBSD) && !defined(FREEBSD)
- 	extern sal_Char*  CMD_ARG_PRG;
- #endif
- 	extern sal_Char** CMD_ARG_ENV;
--- a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+socket.c
+++ b/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+socket.c
@ -1,26 +0,0 @@
--- ../sal/osl/unx/socket.c.orig	Tue Apr  9 20:09:53 2002
-+++ ../sal/osl/unx/socket.c	Fri Oct 18 20:00:19 2002
-@@ -82,12 +82,12 @@
- #undef HAVE_POLL_H
- #endif
- 
-#if defined(LINUX) || defined (IRIX) || defined(NETBSD)
-+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD )
- #include <sys/poll.h>
- #define HAVE_POLL_H
- #endif /* HAVE_POLL_H */
- 
-#if defined(SOLARIS) || defined ( FREEBSD )
-+#if defined(SOLARIS)
- #include <poll.h>
- #define HAVE_POLL_H
- #endif /* SOLARIS */
-@@ -1965,7 +1965,7 @@
- /*****************************************************************************/
- oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket)
- {
-#ifdef LINUX
-+#ifdef LINUX || defined(FREEBSD)
- 	socklen_t AddrLen;
- #else
- 	/* mfe: Solaris 'cc +w' means Addrlen should be signed! */
--- a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+system.h
+++ b/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+system.h
@ -1,6 +1,6 @@
--- ../sal/osl/unx/system.h.orig	Tue Aug 20 15:54:55 2002
-+++ ../sal/osl/unx/system.h	Thu May  8 20:31:08 2003
-@@ -203,12 +203,19 @@
+--- ../sal/osl/unx/system.h.orig	Mon Apr 28 19:13:35 2003
+++ ../sal/osl/unx/system.h	Sat May 31 23:32:34 2003
+@@ -212,12 +212,19 @@
 #   include <dlfcn.h>
 #   include <sys/filio.h>
 #   include <sys/ioctl.h>
@ -20,7 +20,7 @@
 #   if BYTE_ORDER == LITTLE_ENDIAN
 #   	define _LITTLE_ENDIAN
 #   elif BYTE_ORDER == BIG_ENDIAN
-@@ -216,12 +223,14 @@
+@@ -225,12 +232,14 @@
 #   elif BYTE_ORDER == PDP_ENDIAN
 #   	define _PDP_ENDIAN
 #   endif
@ -40,7 +40,7 @@
 #endif
 
 #ifdef SCO
-@@ -569,12 +578,14 @@
+@@ -556,12 +565,14 @@
 #endif
 
 #ifdef NO_PTHREAD_RTL
--- a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+tempfile.c
+++ b/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+tempfile.c
@ -1,11 +0,0 @@
--- ../sal/osl/unx/tempfile.c.orig	Thu Apr  3 21:58:43 2003
-+++ ../sal/osl/unx/tempfile.c	Thu Apr  3 21:59:08 2003
-@@ -104,7 +104,7 @@
-     if ( !pValue )
- 	{
-         pValue = getenv( "TMP" );
-#if defined(SOLARIS) || defined (LINUX)
-+#if defined(SOLARIS) || defined (LINUX) || defined (FREEBSD)
- 		if ( !pValue )
- 			pValue = P_tmpdir;
- #endif
--- a/editors/openoffice-1.1-devel/files/patch-sal+textenc+tencinfo.c
+++ b/editors/openoffice-1.1-devel/files/patch-sal+textenc+tencinfo.c
@ -1,6 +1,6 @@
--- ../sal/textenc/tencinfo.c.orig	Wed Jul 31 11:44:35 2002
-+++ ../sal/textenc/tencinfo.c	Wed Jul 31 11:45:47 2002
-@@ -695,6 +695,10 @@
+--- ../sal/textenc/tencinfo.c.orig	Fri Apr 11 16:25:01 2003
+++ ../sal/textenc/tencinfo.c	Sat May 31 23:33:43 2003
+@@ -668,6 +668,10 @@
     /* characters. The function search for the first equal string in */
     /* the table. In this table are only the most used mime types. */
     /* Sort order: important */
--- a/editors/openoffice-1.1-devel/files/patch-sal+util+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-sal+util+makefile.mk
@ -1,11 +0,0 @@
--- ../sal/util/makefile.mk.orig	Wed Mar 12 23:57:03 2003
-+++ ../sal/util/makefile.mk	Wed Mar 12 23:56:54 2003
-@@ -120,6 +120,8 @@
- 
- .IF "$(OS)"=="LINUX"
- SHL1VERSIONMAP=	gcc3_linux_intel.map
-+.ELIF "$(OS)"=="FREEBSD"
-+SHL1VERSIONMAP=	gcc3_linux_intel.map
- .ELSE
- SHL1VERSIONMAP=	$(TARGET).map
- .ENDIF
--- a/editors/openoffice-1.1-devel/files/patch-sal+workben+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-sal+workben+makefile.mk
@ -1,6 +1,6 @@
--- ../sal/workben/makefile.mk.orig	Tue May 15 14:11:20 2001
-+++ ../sal/workben/makefile.mk	Sun Mar 10 23:46:59 2002
-@@ -113,7 +113,7 @@
+--- ../sal/workben/makefile.mk.orig	Tue Apr  8 17:54:30 2003
+++ ../sal/workben/makefile.mk	Sat May 31 23:35:21 2003
+@@ -167,7 +167,7 @@
 
 .IF "$(TESTAPP)" == "salstattest"
 
@ -9,7 +9,7 @@
 
 	OBJFILES=	$(OBJ)$/salstattest.obj
 
-@@ -325,7 +325,7 @@
+@@ -379,7 +379,7 @@
 # tgetpwnam
 #
 .IF "$(TESTAPP)" == "tgetpwnam"
@ -18,7 +18,7 @@
 
 CXXFILES=	tgetpwnam.cxx
 OBJFILES=	$(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
+@@ -389,7 +389,7 @@
 APP5STDLIBS=$(SALLIB)
 APP5DEPN=	$(SLB)$/sal.lib
 
--- a/editors/openoffice-1.1-devel/files/patch-salhelper+source+gcc2_freebsd_intel.map
+++ b/editors/openoffice-1.1-devel/files/patch-salhelper+source+gcc2_freebsd_intel.map
@ -1,31 +0,0 @@
--- /dev/null	Thu Jun  6 20:06:24 2002
-+++ ../salhelper/source/gcc2_freebsd_intel.map	Thu Jun  6 20:02:18 2002
-@@ -0,0 +1,28 @@
-+SALHLP_1_0 {
-+global:
-+GetVersionInfo;
-+_._Q28salhelper18ORealDynamicLoader;
-+__Q29salhelper18ORealDynamicLoaderPPQ29salhelper18ORealDynamicLoaderRCQ23rtl8OUStringT2PvT4;
-+__tfQ29salhelper18ORealDynamicLoader;
-+__tiQ29salhelper18ORealDynamicLoader;
-+__vt_Q29salhelper18ORealDynamicLoader;
-+_fini;
-+_init;
-+acquire__Q29salhelper18ORealDynamicLoader;
-+getApi__CQ29salhelper18ORealDynamicLoader;
-+newInstance__Q29salhelper18ORealDynamicLoaderPPQ29salhelper18ORealDynamicLoaderRCQ23rtl8OUStringT2;
-+release__Q29salhelper18ORealDynamicLoader;
-+_._Q29salhelper21SimpleReferenceObject;
-+__Q29salhelper21SimpleReferenceObject;
-+__dl__Q29salhelper21SimpleReferenceObjectPv;
-+__dl__Q29salhelper21SimpleReferenceObjectPvRC9nothrow_t;
-+__nw__Q29salhelper21SimpleReferenceObjectUi;
-+__nw__Q29salhelper21SimpleReferenceObjectUiRC9nothrow_t;
-+__tfQ29salhelper21SimpleReferenceObject;
-+__tiQ29salhelper21SimpleReferenceObject;
-+__vt_Q29salhelper21SimpleReferenceObject;
-+acquire__Q29salhelper21SimpleReferenceObject;
-+release__Q29salhelper21SimpleReferenceObject;
-+local:
-+*;
-+};
--- a/editors/openoffice-1.1-devel/files/patch-salhelper+source+gcc3_freebsd_intel.map
+++ b/editors/openoffice-1.1-devel/files/patch-salhelper+source+gcc3_freebsd_intel.map
@ -1,34 +0,0 @@
--- /dev/null	Thu Jun  6 20:06:34 2002
-+++ ../salhelper/source/gcc3_freebsd_intel.map	Thu Jun  6 20:02:29 2002
-@@ -0,0 +1,31 @@
-+UDK_3_0_0 {
-+	global:
-+GetVersionInfo;
-+_DYNAMIC;
-+_GLOBAL_OFFSET_TABLE_;
-+_ZN9salhelper18ORealDynamicLoader11newInstanceEPPS0_RKN3rtl8OUStringES6_;
-+_ZN9salhelper18ORealDynamicLoader7acquireEv;
-+_ZN9salhelper18ORealDynamicLoader7releaseEv;
-+_ZN9salhelper18ORealDynamicLoaderC1EPPS0_RKN3rtl8OUStringES6_PvS7_;
-+_ZN9salhelper18ORealDynamicLoaderC2EPPS0_RKN3rtl8OUStringES6_PvS7_;
-+_ZN9salhelper18ORealDynamicLoaderD0Ev;
-+_ZN9salhelper18ORealDynamicLoaderD1Ev;
-+_ZN9salhelper18ORealDynamicLoaderD2Ev;
-+_ZN9salhelper21SimpleReferenceObjectD0Ev;
-+_ZN9salhelper21SimpleReferenceObjectD1Ev;
-+_ZN9salhelper21SimpleReferenceObjectD2Ev;
-+_ZN9salhelper21SimpleReferenceObjectdlEPv;
-+_ZN9salhelper21SimpleReferenceObjectnwEj;
-+_ZNK9salhelper18ORealDynamicLoader6getApiEv;
-+_ZTVN9salhelper18ORealDynamicLoaderE;
-+_ZTVN9salhelper21SimpleReferenceObjectE;
-+__bss_start;
-+_edata;
-+_end;
-+_fini;
-+_init;
-+component_getDescriptionFunc;
-+	local:
-+		*;
-+};
-+
--- a/editors/openoffice-1.1-devel/files/patch-salhelper+source+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-salhelper+source+makefile.mk
@ -1,11 +1,11 @@
--- ../salhelper/source/makefile.mk.orig	Sun Sep  1 18:22:39 2002
-+++ ../salhelper/source/makefile.mk	Wed Mar 12 23:54:12 2003
+--- ../salhelper/source/makefile.mk.orig	Sat May 31 23:48:19 2003
+++ ../salhelper/source/makefile.mk	Sat May 31 23:48:21 2003
@@ -114,6 +114,10 @@
 SHL1VERSIONMAP=lngi.map
 .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
 SHL1VERSIONMAP=gcc3_linux_intel.map
 +.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
-+SHL1VERSIONMAP=gcc2_linux_intel.map
+SHL1VERSIONMAP=lngi.map
 +.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
 +SHL1VERSIONMAP=gcc3_linux_intel.map
 .ENDIF
--- a/editors/openoffice-1.1-devel/files/patch-salhelper+test+rtti+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-salhelper+test+rtti+makefile.mk
@ -1,13 +1,11 @@
--- ../salhelper/test/rtti/makefile.mk.orig	Sat Jul 20 23:11:56 2002
-+++ ../salhelper/test/rtti/makefile.mk	Sat Jul 20 23:12:01 2002
-@@ -116,6 +116,10 @@
+--- ../salhelper/test/rtti/makefile.mk.orig	Sat May 31 23:49:55 2003
+++ ../salhelper/test/rtti/makefile.mk	Sat May 31 23:50:20 2003
+@@ -116,6 +116,8 @@
 SHL1VERSIONMAP=	sols.map
 .ELIF "$(OS)$(CPU)"=="LINUXI"
 SHL1VERSIONMAP= lngi.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc2"
-+SHL1VERSIONMAP= gcc2_freebsd_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
-+SHL1VERSIONMAP= gcc3_freebsd_intel.map
+.ELIF "$(OS)$(CPU)"=="FREEBSDI"
+SHL1VERSIONMAP= lngi.map
 .ENDIF
 
 
--- a/editors/openoffice-1.1-devel/files/patch-sc+source+core+data+cell.cxx
+++ b/editors/openoffice-1.1-devel/files/patch-sc+source+core+data+cell.cxx
@ -1,11 +0,0 @@
--- ../sc/source/core/data/cell.cxx.orig	Sun Jul 21 00:39:25 2002
-+++ ../sc/source/core/data/cell.cxx	Sun Jul 21 00:39:26 2002
-@@ -75,7 +75,7 @@
- #include <mac_end.h>
- #endif
- 
-#ifdef SOLARIS
-+#if defined (SOLARIS) || defined (FREEBSD)
- #include <ieeefp.h>
- #elif ( defined ( LINUX ) && ( GLIBC < 2 ) )
- #include <i386/ieeefp.h>
--- a/editors/openoffice-1.1-devel/files/patch-scp+source+global+setupzip.scp
+++ b/editors/openoffice-1.1-devel/files/patch-scp+source+global+setupzip.scp
@ -0,0 +1,15 @@
+--- ../scp/source/global/setupzip.scp.orig	Tue Jun  3 09:36:03 2003
+++ ../scp/source/global/setupzip.scp	Tue Jun  3 09:45:36 2003
+@@ -637,7 +637,11 @@
+         Dir             = GCFG_BINARY_DIR;
+         TXT_FILE_BODY;
+         Styles          = (PACKED, SETUPZIP);
+-        Name            = "libfreetype.so.6";
+#ifdef FREEBSD
+	Name		= "libfreetype.so.9";
+#else
+	Name		= "libfreetype.so.6";
+#endif
+ End
+ #endif
+ 
--- a/editors/openoffice-1.1-devel/files/patch-scp+source+global+udk_base.scp
+++ b/editors/openoffice-1.1-devel/files/patch-scp+source+global+udk_base.scp
@ -1,19 +0,0 @@
--- ../scp/source/global/udk_base.scp.orig	Wed Mar  5 21:12:08 2003
-+++ ../scp/source/global/udk_base.scp	Wed Mar  5 21:12:10 2003
-@@ -6,7 +6,7 @@
- // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are 
- // needed for unxlngi4 environment (setup is linked against it).
- 
-
-+#if ( ! defined ( FREEBSD ))
- #if ( defined( _gcc3 ) && defined( C300 ) )
- 
- File gid_File_Lib_gcc
-@@ -37,6 +37,7 @@
-     Name        = STRING(libstdc++.so);
-     Styles      = (NETWORK,RELATIVE);
- End
-+#endif
- #endif
- 
- File gid_File_Lib_Sal
--- a/editors/openoffice-1.1-devel/files/patch-scp+source+player+player.scp
+++ b/editors/openoffice-1.1-devel/files/patch-scp+source+player+player.scp
@ -1,20 +0,0 @@
--- ../scp/source/player/player.scp.orig	Sun Jul 21 00:30:27 2002
-+++ ../scp/source/player/player.scp	Sun Jul 21 00:30:28 2002
-@@ -62,7 +62,7 @@
- // directories
- ////////////////////////
- 
-#ifdef LINUX
-+#if defined(LINUX) || defined(FREEBSD)
- 
- Directory GID_DIR_KDE2
-     ParentID        = PREDEFINED_HOMEDIR;
-@@ -701,7 +701,7 @@
-         Name = "gnomeappplayer.zip";
- End
- 
-#ifdef LINUX
-+#if defined(LINUX) || defined(FREEBSD)
- 
- File GID_FILE_EXTRA_KDEAPPPLAYER
-         Dir             = GID_DIR_KDE2_SHARE_APPLNK_STAR;
--- a/editors/openoffice-1.1-devel/files/patch-scptools+source+linker+ziplst.cxx
+++ b/editors/openoffice-1.1-devel/files/patch-scptools+source+linker+ziplst.cxx
@ -1,19 +0,0 @@
--- ../scptools/source/linker/ziplst.cxx.orig	Sun Jul 21 00:32:40 2002
-+++ ../scptools/source/linker/ziplst.cxx	Sun Jul 21 00:32:43 2002
-@@ -278,6 +278,7 @@
- #define OS_SOLI			"solia"
- #define OS_WINDOWS		"windows"
- #define OS_LINUX		"linux"
-+#define OS_FREEBSD		"freebsd"
- #define OS_OS2			"os2"
- 
- ByteString _OS2Alpha( const ByteString& rStr )
-@@ -290,6 +291,8 @@
- 		return OS_SOLI;
- 	else if( rStr.CompareIgnoreCaseToAscii("unxlngi",7) == COMPARE_EQUAL )
- 		return OS_LINUX;
-+	else if( rStr.CompareIgnoreCaseToAscii("unxfbsdi",7) == COMPARE_EQUAL )
-+		return OS_FREEBSD;
- 	else if( rStr.CompareIgnoreCaseToAscii("os2icci",7) == COMPARE_EQUAL )
- 		return OS_OS2;
- 
--- a/editors/openoffice-1.1-devel/files/patch-setup2+inc+fields.hxx
+++ b/editors/openoffice-1.1-devel/files/patch-setup2+inc+fields.hxx
@ -1,10 +0,0 @@
--- ../setup2/inc/fields.hxx.orig	Sun Jul 21 00:19:07 2002
-+++ ../setup2/inc/fields.hxx	Sun Jul 21 00:19:12 2002
-@@ -104,6 +104,7 @@
- extern char const VALUE_YES_IF_HPUX_HP9000[];
- extern char const VALUE_YES_IF_AIX_RS6000[];
- extern char const VALUE_YES_IF_LINUX_X86[];
-+extern char const VALUE_YES_IF_FREEBSD_X86[];
- extern char const VALUE_KEEP_OLD_VERSION[];
- extern char const VALUE_NETWORK[];
- extern char const VALUE_NO[];
--- a/editors/openoffice-1.1-devel/files/patch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice-1.1-devel/files/patch-setup2+mow+source+loader+loader.c
@ -1,39 +0,0 @@
--- ../setup2/mow/source/loader/loader.c.orig	Thu Oct 31 21:46:52 2002
-+++ ../setup2/mow/source/loader/loader.c	Wed Jan 22 14:56:44 2003
-@@ -85,6 +85,12 @@
- # include <sys/statvfs.h>
- #endif
- 
-+#ifdef FREEBSD
-+#if (OSVERSION < 500000)
-+#define iswspace(c) ((c)==' ' || (c)=='\t' || (c)=='\n')
-+#endif
-+#endif
-+
- #include "bitmap"
- #include "logo.xpm"
- 
-@@ -580,6 +580,8 @@
- #define GCC_FILE_PATTERN                    "libgcc_s.so.1"
- #define CPLUS_FILE_PATTERN                  "libstdc++.so.3.0.1"
- #define STL_FILE_PATTERN                    "libstlport_gcc.so"
-+#elif defined (FREEBSD)
-+#define STL_FILE_PATTERN                    "libstlport_gcc.so"
- #else
- #define STL_FILE_PATTERN                    "libstlport_sunpro.so"
- #endif
-@@ -650,6 +656,14 @@
- "    export LD_LIBRARY_PATH\n" \
- "    ;;\n" \
- "  Linux)\n" \
-+"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
-+"    export LD_LIBRARY_PATH\n" \
-+"    ;;\n" \
-+"  FreeBSD)\n" \
-+"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
-+"    export LD_LIBRARY_PATH\n" \
-+"    ;;\n" \
-+"  NetBSD)\n" \
- "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
- "    export LD_LIBRARY_PATH\n" \
- "    ;;\n" \
--- a/editors/openoffice-1.1-devel/files/patch-setup2+mow+source+loader+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-setup2+mow+source+loader+makefile.mk
@ -1,14 +0,0 @@
--- ../setup2/mow/source/loader/makefile.mk.orig	Fri Feb 14 15:32:23 2003
-+++ ../setup2/mow/source/loader/makefile.mk	Wed Mar  5 20:28:12 2003
-@@ -95,7 +95,11 @@
- 
- APP1TARGET=	$(TARGET)
- APP1OBJS=	$(OBJFILES)
-+.IF "$(OS)"=="FREEBSD"
-+APP1STDLIBS=$(SVUNZIPLIB) $(LOADERLIB) -lX11
-+.ELSE
- APP1STDLIBS=$(SVUNZIPLIB) $(LOADERLIB) -ldl
-+.ENDIF
- 
- .ENDIF			# "$(OS)"=="MACOSX"
- 
--- a/editors/openoffice-1.1-devel/files/patch-setup2+patch+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-setup2+patch+makefile.mk
@ -1,11 +0,0 @@
--- ../setup2/patch/makefile.mk.orig	Sun Jul 21 00:21:46 2002
-+++ ../setup2/patch/makefile.mk	Sun Jul 21 00:21:52 2002
-@@ -92,7 +92,7 @@
- .IF "$(OS)"=="SOLARIS"
- 	STATIC_LIBS+= -Bdynamic -lnsl -lsocket -lposix4
- .ENDIF
-.IF "$(OS)"=="LINUX"
-+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
- 	STATIC_LIBS+= -Bdynamic -lcrypt
- .ENDIF
- .ELSE
--- a/editors/openoffice-1.1-devel/files/patch-setup2+script+setupserver
+++ b/editors/openoffice-1.1-devel/files/patch-setup2+script+setupserver
@ -1,10 +0,0 @@
--- ../setup2/script/setupserver.orig	Fri Nov 17 12:29:29 2000
-+++ ../setup2/script/setupserver	Fri Oct 18 23:47:09 2002
-@@ -234,6 +234,7 @@
- sd_platform=`uname -s`
- case $sd_platform in
- 	SCO_SV) test=/bin/test     ;;
-+	FreeBSD) test=/bin/test    ;;
-   	*)      test=/usr/bin/test ;;
- esac
- sd_cwd="`pwd`"
--- a/editors/openoffice-1.1-devel/files/patch-setup2+source+compiler+decltor.cxx
+++ b/editors/openoffice-1.1-devel/files/patch-setup2+source+compiler+decltor.cxx
@ -1,20 +0,0 @@
--- ../setup2/source/compiler/decltor.cxx.orig	Sun Jul 21 00:25:00 2002
-+++ ../setup2/source/compiler/decltor.cxx	Sun Jul 21 00:24:06 2002
-@@ -304,6 +304,7 @@
- 			m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_SOLSG ||
- 			m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_SOLIG ||
- 			m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_LINUX ||
-+			m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_FREEBSD ||
- 			m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_HP ||
- 			m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_SCO;
- }
--- ../setup2/source/compiler/fields.cxx.orig	Sun Jul 21 00:25:42 2002
-+++ ../setup2/source/compiler/fields.cxx	Sun Jul 21 00:25:45 2002
-@@ -105,6 +105,7 @@
- char const VALUE_YES_IF_HPUX_HP9000[]	= "YES_IF_HPUX_HP9000";
- char const VALUE_YES_IF_AIX_RS6000[]	= "YES_IF_AIX_RS6000";
- char const VALUE_YES_IF_LINUX_X86[]		= "YES_IF_LINUX_X86";
-+char const VALUE_YES_IF_FREEBSD_X86[]		= "YES_IF_FREEBSD_X86";
- char const VALUE_KEEP_OLD_VERSION[]     = "KEEP_OLD_VERSION";
- char const VALUE_NETWORK[]              = "NETWORK";
- char const VALUE_NO[]               	= "NO";
--- a/editors/openoffice-1.1-devel/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
+++ b/editors/openoffice-1.1-devel/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
@ -1,11 +0,0 @@
--- ../setup2/source/custom/jvmsetup/jvmdlg.cxx.orig	Sat Jul 20 23:33:50 2002
-+++ ../setup2/source/custom/jvmsetup/jvmdlg.cxx	Sat Jul 20 23:34:00 2002
-@@ -154,7 +154,7 @@
- 
- #if defined (OS2)
- 	maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) );
-#elif defined (LINUX)
-+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD)
- 	maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) );
- #elif defined (SOLARIS)
- 	maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) );
--- a/editors/openoffice-1.1-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
+++ b/editors/openoffice-1.1-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
@ -1,10 +0,0 @@
--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig	Fri Jun 14 15:36:11 2002
-+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh	Fri Oct 18 23:45:45 2002
-@@ -65,6 +65,7 @@
- sd_platform=`uname -s`
- case $sd_platform in
- 	SCO_SV) test=/bin/test     ;;
-+	FreeBSD) test=/bin/test    ;;
- 	*)      test=/usr/bin/test ;;
- esac
- 
--- a/editors/openoffice-1.1-devel/files/patch-sfx2+source+doc.src
+++ b/editors/openoffice-1.1-devel/files/patch-sfx2+source+doc.src
@ -1,11 +0,0 @@
--- ../sfx2/source/doc/doc.src.org	Thu Apr 17 18:12:12 2003
-+++ ../sfx2/source/doc/doc.src	Thu Apr 17 18:13:21 2003
-@@ -1168,7 +1168,7 @@
- 	Text[ chinese_simplified ] = "ĺ<C4BA>ç›<C3A7>(~S)";
- 	Text[ russian ] = "Ńîőđŕíčňü";
- 	Text[ polish ] = "Zapisz";
-	Text[ japanese ] = "ă<>Żă<C5BB>„(~S)";
-+	Text[ japanese ] = "äżťĺ<C4BA>(~S)";
- 	Text[ chinese_traditional ] = "ĺ„˛ĺ<C4BA>(~S)";
- 	Text[ arabic ] = "ÍÝŮ";
- 	Text[ dutch ] = "~Opslaan";
--- a/editors/openoffice-1.1-devel/files/patch-shell+source+cmdmail+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-shell+source+cmdmail+makefile.mk
@ -1,16 +0,0 @@
--- ../shell/source/cmdmail/makefile.mk.orig	Tue Jan  1 14:11:38 2002
-+++ ../shell/source/cmdmail/makefile.mk
-@@ -81,9 +81,10 @@
- 			
- SHL1TARGET=$(TARGET)
- 
-SHL1STDLIBS=$(CPPULIB)\
-			$(CPPUHELPERLIB)\
-			$(SALLIB)
-+SHL1STDLIBS=\
-+			$(SALLIB)\
-+			$(CPPULIB)\
-+			$(CPPUHELPERLIB)
- 
- SHL1LIBS=
- 		
--- a/editors/openoffice-1.1-devel/files/patch-shell+source+proxysettings+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-shell+source+proxysettings+makefile.mk
@ -1,16 +0,0 @@
--- ../shell/source/proxysettings/makefile.mk.orig	Tue Jan  1 14:11:38 2002
-+++ ../shell/source/proxysettings/makefile.mk
-@@ -85,9 +85,10 @@
- 
- SHL1TARGET=$(TARGET)
- 
-SHL1STDLIBS=$(CPPULIB)\
-			$(CPPUHELPERLIB)\
-			$(SALLIB)
-+SHL1STDLIBS=\
-+			$(SALLIB)\
-+			$(CPPULIB)\
-+			$(CPPUHELPERLIB)
- 
- SHL1LIBS=
- 		
--- a/editors/openoffice-1.1-devel/files/patch-shell+source+unix+exec+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-shell+source+unix+exec+makefile.mk
@ -1,16 +0,0 @@
--- ../shell/source/unix/exec/makefile.mk.orig	Tue Jan  1 14:11:38 2002
-+++ ../shell/source/unix/exec/makefile.mk
-@@ -79,9 +79,10 @@
- 						
- SHL1TARGET=$(TARGET)
- 
-SHL1STDLIBS=$(CPPULIB)\
-			$(CPPUHELPERLIB)\
-			$(SALLIB)
-+SHL1STDLIBS=\
-+			$(SALLIB)\
-+			$(CPPULIB)\
-+			$(CPPUHELPERLIB)
- 
- SHL1LIBS=
- 		
--- a/editors/openoffice-1.1-devel/files/patch-solenv+bin+mapgen.pl
+++ b/editors/openoffice-1.1-devel/files/patch-solenv+bin+mapgen.pl
@ -1,21 +0,0 @@
--- ../solenv/bin/mapgen.pl.orig	Sat Jul 20 22:30:21 2002
-+++ ../solenv/bin/mapgen.pl	Sat Jul 20 22:31:31 2002
-@@ -112,7 +112,7 @@
- 
- if ($ENV{OS} eq 'SOLARIS') {
- 	&gen_sol;
-} elsif ($ENV{OS} eq 'LINUX') {
-+} elsif ($ENV{OS} eq 'LINUX' || $ENV{OS} eq 'FREEBSD') {
- 	&gen_lnx;
- } else {
- 	&print_error ('Environment not set!!');
-@@ -169,7 +169,8 @@
- 		s/\n//;
- 		$env_section = '1' and next if ((/^# SOLARIS #$/) && ($ENV{OS} eq 'SOLARIS'));
- 		$env_section = '1' and next if ((/^# LINUX #$/) && ($ENV{OS} eq 'LINUX'));
-		last if ($env_section && ((/^# SOLARIS #$/) || (/^# LINUX #$/)));
-+		$env_section = '1' and next if ((/^# FREEBSD #$/) && ($ENV{OS} eq 'FREEBSD'));
-+		last if ($env_section && ((/^# SOLARIS #$/) || (/^# LINUX #$/) || (/^# FREEBSD #$/)));
- 		next if (!$_ || /^#/);
- 		push(@filters, $_);
- 	};
--- a/editors/openoffice-1.1-devel/files/patch-solenv+config+ssrx644.ini
+++ b/editors/openoffice-1.1-devel/files/patch-solenv+config+ssrx644.ini
@ -1,33 +0,0 @@
--- ../solenv/config/ssrx644.ini.orig	Sat Mar 29 22:19:08 2003
-+++ ../solenv/config/ssrx644.ini	Sat Mar 29 22:27:31 2003
-@@ -3704,9 +3704,9 @@
- 			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
- 			SOLARROOT %SOLAR_ENV_ROOT%
- 			DEVROOT %SOLAR_ENV_ROOT%
-			SOLAR_JDK13PATH	%SOLAR_ENV_ROOT%/Linux_JDK_1.3.1
-			SOLAR_JDK14PATH	%SOLAR_ENV_ROOT%/Linux_JDK_1.4.0
-			COMPATH %SOLAR_ENV_ROOT%$/gcc_3.0.1_linux_libc2.11_turbolinux
-+			SOLAR_JDK13PATH	%SOLAR_ENV_ROOT%/jdk1.3.1
-+			SOLAR_JDK14PATH	%SOLAR_ENV_ROOT%/jdk1.4.1
-+			COMPATH %SOLAR_ENV_ROOT%
- 		}
- 		compath
- 		{
-@@ -3810,7 +3810,7 @@
- 		}
- 		debug
- 		{
-			LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH%
-+			LD_LIBRARY_PATH %SOLARROOT%/solenv/unxfbsdi/lib/debug:%LD_LIBRARY_PATH%
- 		}
- 		pre
- 		{
-@@ -3824,7 +3824,7 @@
- 		}
- 		reset
- 		{
-			RESETPATH /usr/bin/X11:/bin:/usr/openwin/bin:/usr/dt/bin:%HOME%/%WORK_STAMP%/unxlngi4%PROEXT%/bin:%SOLARVERSION%/unxlngi4%PROEXT%/bin%UPDMINOREXT%:/usr/bin
-+			RESETPATH /usr/bin/X11:/bin:/usr/openwin/bin:/usr/dt/bin:%HOME%/%WORK_STAMP%/unxfbsdi%PROEXT%/bin:%SOLARVERSION%/unxfbsdi%PROEXT%/bin%UPDMINOREXT%:/usr/bin
- 			*make
- 		}
- 		ca
--- a/editors/openoffice-1.1-devel/files/patch-solenv+inc+tg_ext.mk
+++ b/editors/openoffice-1.1-devel/files/patch-solenv+inc+tg_ext.mk
@ -1,12 +0,0 @@
--- ../solenv/inc/tg_ext.mk.orig	Fri May 10 14:12:12 2002
-+++ ../solenv/inc/tg_ext.mk	Mon Jul 15 14:34:30 2002
-@@ -81,7 +81,9 @@
- .ENDIF			# "$(GUI)"=="WNT"
- 
- .IF "$(OS)"!="NETBSD"
-+.IF "$(OS)"!="FREEBSD"
- PATCHFLAGS=-b
-+.ENDIF			# "$(OS)"=="FREEBSD"
- .ENDIF			# "$(OS)"=="NETBSD"
- 
- #override
--- a/editors/openoffice-1.1-devel/files/patch-solenv+inc+tg_moz.mk
+++ b/editors/openoffice-1.1-devel/files/patch-solenv+inc+tg_moz.mk
@ -1,17 +0,0 @@
--- ../solenv/inc/tg_moz.mk.orig	Sat Jul 20 23:57:37 2002
-+++ ../solenv/inc/tg_moz.mk	Sat Jul 20 23:57:55 2002
-@@ -36,6 +36,14 @@
- CPUCFG=_linux.cfg
- .ENDIF
- 
-+.IF "$(OS)"=="FREEBSD"
-+CPUCFG=_freebsd.cfg
-+.ENDIF
-+
-+.IF "$(OS)"=="NETBSD"
-+CPUCFG=_netbsd.cfg
-+.ENDIF
-+
- .IF "$(GEN_PRCPUCFG)"!=""
- $(GEN_PRCPUCFG): $(PRJ)$/pr$/include$/md$/$(CPUCFG) 
- 	@+$(COPY) $(PRJ)$/pr$/include$/md$/$(CPUCFG) $@
--- a/editors/openoffice-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk
@ -1,203 +0,0 @@
--- ../solenv/inc/unxfbsdi.mk.orig	Fri Jan 31 16:46:52 2003
-+++ ../solenv/inc/unxfbsdi.mk	Wed Mar  5 20:23:28 2003
-@@ -61,50 +61,115 @@
- #*************************************************************************
- 
- # mak file for unxfbsdi
-+ASM=$(CC)
-+AFLAGS=-x assembler-with-cpp -c $(CDEFS)
- 
-ASM=
-AFLAGS=
-+# filter for supressing verbose messages from linker
-+#not needed at the moment
-+#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
-+
-+# this is a platform with JAVA support
-+.IF "$(SOLAR_JAVA)"!=""
-+JAVADEF=-DSOLAR_JAVA
-+.IF "$(debug)"==""
-+JAVA_RUNTIME=-ljava
-+.ELSE
-+JAVA_RUNTIME=-ljava_g
-+.ENDIF
-+.ENDIF
- 
-SOLAR_JAVA=TRUE
-JAVAFLAGSDEBUG=-g
-+# name of C++ Compiler
-+CXX*=g++
-+# name of C Compiler
-+CC*=gcc
- 
-+# filter for supressing verbose messages from linker
-+# not needed at the moment
- LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
- 
-+# options for C and C++ Compiler
-+CDEFS+=	-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION)
-+CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
- 
-CC=				gcc
-CXX=			g++
-CDEFS+=			-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400
-CDEFS+=			-D_REENTRANT -D_PTHREADS -D_THREAD_SAFE
-CFLAGS+= -c $(INCLUDE)
-+# flags for C and C++ Compile
-+CFLAGS+= -w -c $(INCLUDE)
- CFLAGS+= -I/usr/X11R6/include
-+
-+# flags for the C++ Compiler
- CFLAGSCC= -pipe
- CFLAGSCXX= -pipe -fno-for-scope -fpermissive
-+
-+# Flags for enabling exception handling
- CFLAGSEXCEPTIONS= -fexceptions
- CFLAGS_NO_EXCEPTIONS= -fno-exceptions
-+
-+# Compiler flags for compiling static object in single threaded
-+# environment with graphical user interface
- CFLAGSOBJGUIST= -fPIC
-+
-+# Compiler flags for compiling static object in single threaded
-+# environment with character user interface
- CFLAGSOBJCUIST= -fPIC
-+
-+# Compiler flags for compiling static object in multi threaded
-+# environment with graphical user interface
- CFLAGSOBJGUIMT= -fPIC
-+
-+# Compiler flags for compiling static object in multi threaded
-+# environment with character user interface
- CFLAGSOBJCUIMT= -fPIC
-+
-+# Compiler flags for compiling shared object in multi threaded
-+# environment with graphical user interface
- CFLAGSSLOGUIMT=	-fPIC
-+
-+# Compiler flags for compiling shared object in multi threaded
-+# environment with character user interface
- CFLAGSSLOCUIMT=	-fPIC
-+
-+# Compiler flags for profilin
- CFLAGSPROF=     -pg
-+
-+# Compiler flags for debugging
- CFLAGSDEBUG=	-g
- CFLAGSDBGUTIL=
-CFLAGSOPT= -O2
-CFLAGSNOOPT= -O
-+
-+# Compiler flags to enable optimizations
-+# -02 is broken for FreeBSD
-+CFLAGSOPT= -O
-+
-+# Compiler flags to disable optimizations
-+# -0 is broken for STLport for FreeBSD
-+CFLAGSNOOPT= -O0
-+
-+# Compiler flags for the output path
- CFLAGSOUTOBJ= -o
- 
-+# Enable all warnings
-+CFLAGSWALL=-Wall
-+
-+# Set default warn level
-+CFLAGSDFLTWARN=-w
-+
-+# switches for dynamic and static linking
- STATIC=	-Wl,-Bstatic
- DYNAMIC= -Wl,-Bdynamic
- 
-#THREADLIB= -pthread
-LINK= gcc
-# -v -nostdlib
-LINKFLAGS=
-LINKFLAGSAPPGUI= -Wl,-export-dynamic
-LINKFLAGSAPPCUI= -Wl,-export-dynamic
-+# name of linker
-+LINK=$(CXX)
-+
-+# default linker flags
-+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=$(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
-+
-+# linker flags for linking shared libraries
- LINKFLAGSSHLGUI= -shared
- LINKFLAGSSHLCUI= -shared
-+
- LINKFLAGSTACK=
- LINKFLAGSPROF=
- LINKFLAGSDEBUG=-g
-@@ -119,28 +184,41 @@
- 
- LINKVERSIONMAPFLAG=-Wl,--version-script
- 
-+# Sequence of libs does matter !
- STDLIBCPP=-lstdc++
- 
- # _SYSLIBS= -L/usr/lib -lm
- # _X11LIBS= -L/usr/X11R6/lib -lXext -lX11
- # _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib
- 
-+# default objectfilenames to link
- STDOBJGUI=
- STDSLOGUI=
- STDOBJCUI=
- STDSLOCUI=
- 
-+# libraries for linking applications
- STDLIBCUIST=-lm
-STDLIBGUIST=-lX11 -lm
-STDLIBGUIMT=-lX11 -lXext -pthread -lm -lstlport_gcc
-STDLIBCUIMT=-pthread -lm -lstlport_gcc
-STDSHLGUIMT=-lX11 -lXext -pthread -lm -lstlport_gcc
-STDSHLCUIMT=-pthread -lm -lstlport_gcc
-
-LIBMGR=			ar
-LIBFLAGS=		-r
-+STDLIBGUIST=-lXaw -lXt -lX11 -lm
-+STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm -lstlport_gcc
-+STDLIBCUIMT=$(PTHREAD_LIBS) -lm -lstlport_gcc
-+
-+# libraries for linking shared libraries
-+STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm -lstlport_gcc
-+STDSHLCUIMT=$(PTHREAD_LIBS) -lm -lstlport_gcc
-+
-+LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-+
-+# STLport always needs pthread.
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(PTHREAD_LIBS)
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
-+
-+# name of library manager
-+LIBMGR=ar
-+LIBFLAGS=-r
- LIBEXT=			.a
- 
-+# tool for generating import libraries
- IMPLIB=
- IMPLIBFLAGS=
- 
-@@ -148,12 +226,12 @@
- MAPSYMFLAGS=
- 
- RC=irc
-RCFLAGS=		-fo$@ $(RCFILES)
-+RCFLAGS=-fo$@ $(RCFILES)
- RCLINK=
- RCLINKFLAGS=
- RCSETVERSION=
- 
-DLLPOSTFIX=		fi
-DLLPRE=			lib
-DLLPOST=		.so
-LDUMP=
-+# platform specific identifier for shared libs
-+DLLPOSTFIX=fi
-+DLLPRE=lib
-+DLLPOST=.so
--- a/editors/openoffice-1.1-devel/files/patch-soltools+checkdll+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-soltools+checkdll+makefile.mk
@ -1,12 +0,0 @@
--- ../soltools/checkdll/makefile.mk.orig	Tue Mar 11 14:21:02 2003
-+++ ../soltools/checkdll/makefile.mk	Tue Mar 11 14:21:30 2003
-@@ -80,7 +80,9 @@
- APP1TARGET	= 	checkdll
- APP1OBJS	=	$(OBJ)$/checkdll.obj
- DEPOBJFILES	=	$(APP1OBJS) 
-+.IF "$(OS)"!="FREEBSD"
- STDLIB += -ldl
-+.ENDIF
- .IF "$(OS)"=="NETBSD"
- APP1STDLIBS	+= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
- .ENDIF
--- a/editors/openoffice-1.1-devel/files/patch-stlport+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-stlport+makefile.mk
@ -1,30 +0,0 @@
--- ../stlport/makefile.mk.orig	Thu Feb 20 16:13:40 2003
-+++ ../stlport/makefile.mk	Wed Mar  5 19:41:42 2003
-@@ -104,16 +104,27 @@
- 
- .IF "$(COM)"=="GCC"
- .IF "$(COMID)"=="gcc3"
-+# FreeBSD needs a special makefile
-+.IF "$(OS)"=="FREEBSD"
-+BUILD_FLAGS=-f gcc-3.0-freebsd.mak
-+.ELSE
- BUILD_FLAGS=-f gcc-3.0.mak
-+.ENDIF
- .ELSE # "$(COMID)"=="gcc3"
- # MacOS X/Darwin need a special makefile
- .IF "$(OS)"=="MACOSX"
-     BUILD_FLAGS=-f gcc-apple-macosx.mak
-+.ELIF "$(OS)"=="FREEBSD"
-+    BUILD_FLAGS=-f gcc-freebsd.mak
- .ELSE # "$(OS)"=="MACOSX"
-     BUILD_FLAGS=-f gcc.mak
- .ENDIF # "$(OS)"=="MACOSX"
- .ENDIF # "$(COMID)"=="gcc3"
-+.IF "$(OS)"=="FREEBSD"
-+BUILD_ACTION=gmake
-+.ELSE
- BUILD_ACTION=make
-+.ENDIF
- # build in parallel
- BUILD_FLAGS+= -j$(MAXPROCESS)
- .ENDIF
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+corereflection+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-stoc+source+corereflection+makefile.mk
@ -1,14 +0,0 @@
--- ../stoc/source/corereflection/makefile.mk.orig	Tue Jan  1 14:12:02 2002
-+++ ../stoc/source/corereflection/makefile.mk
-@@ -87,9 +87,9 @@
- SHL1TARGET=	$(TARGET)
- SHL1VERSIONMAP=	$(TARGET).map
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
-		$(CPPUHELPERLIB)	\
-		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1DEPN=
- SHL1IMPLIB=	i$(TARGET)
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+defaultregistry+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-stoc+source+defaultregistry+makefile.mk
@ -1,14 +0,0 @@
--- ../stoc/source/defaultregistry/makefile.mk.orig	Tue Jan  1 14:12:02 2002
-+++ ../stoc/source/defaultregistry/makefile.mk
-@@ -84,9 +84,9 @@
- SHL1TARGET=	$(TARGET)
- 
- SHL1STDLIBS= \
-+		$(SALLIB)					\
- 		$(CPPULIB)					\
-		$(CPPUHELPERLIB)				\
-		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1VERSIONMAP=	$(TARGET).map
- SHL1DEPN=
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+implementationregistration+implreg.cxx
+++ b/editors/openoffice-1.1-devel/files/patch-stoc+source+implementationregistration+implreg.cxx
@ -1,11 +0,0 @@
--- ../stoc/source/implementationregistration/implreg.cxx.orig	Tue Apr 16 19:54:58 2002
-+++ ../stoc/source/implementationregistration/implreg.cxx	Tue Apr 16 19:55:26 2002
-@@ -60,6 +60,8 @@
-  ************************************************************************/
- #include <list>
- 
-+#include <unistd.h>
-+
- #ifndef _CPPUHELPER_QUERYINTERFACE_HXX_
- #include <cppuhelper/queryinterface.hxx>
- #endif
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+implementationregistration+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-stoc+source+implementationregistration+makefile.mk
@ -1,14 +0,0 @@
--- ../stoc/source/implementationregistration/makefile.mk.orig	Tue Jan  1 14:12:02 2002
-+++ ../stoc/source/implementationregistration/makefile.mk
-@@ -85,9 +85,9 @@
- SHL1VERSIONMAP=$(TARGET).map
- 
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
-		$(CPPUHELPERLIB)	\
-		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1DEPN=
- SHL1IMPLIB=	i$(TARGET)
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+inspect+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-stoc+source+inspect+makefile.mk
@ -1,14 +0,0 @@
--- ../stoc/source/inspect/makefile.mk.orig	Tue Jan  1 14:12:02 2002
-+++ ../stoc/source/inspect/makefile.mk
-@@ -82,9 +82,9 @@
- SHL1TARGET=	$(TARGET)
- 
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
-		$(CPPUHELPERLIB)	\
-		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1DEPN=
- SHL1IMPLIB=	i$(TARGET)
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+invocation+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-stoc+source+invocation+makefile.mk
@ -1,14 +0,0 @@
--- ../stoc/source/invocation/makefile.mk.orig	Tue Jan  1 14:12:02 2002
-+++ ../stoc/source/invocation/makefile.mk
-@@ -82,9 +82,9 @@
- SHL1TARGET=	$(TARGET)
- 
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
-		$(CPPUHELPERLIB)	\
-		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1VERSIONMAP=$(TARGET).map
- SHL1DEPN=
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
@ -1,14 +0,0 @@
--- ../stoc/source/invocation_adapterfactory/makefile.mk.orig	Tue Jan  1 14:12:02 2002
-+++ ../stoc/source/invocation_adapterfactory/makefile.mk
-@@ -82,9 +82,9 @@
- SHL1TARGET=	$(TARGET)
- 
- SHL1STDLIBS=	\
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
-		$(CPPUHELPERLIB)	\
-		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1VERSIONMAP=	$(TARGET).map
- 
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+javaloader+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-stoc+source+javaloader+makefile.mk
@ -1,15 +0,0 @@
--- ../stoc/source/javaloader/makefile.mk.orig	Fri Dec  6 11:51:54 2002
-+++ ../stoc/source/javaloader/makefile.mk	Wed Mar  5 19:35:11 2003
-@@ -83,10 +83,10 @@
- SHL1TARGET= $(TARGET)
- 
- SHL1STDLIBS=\
-+		$(SALLIB) \
- 		$(CPPUHELPERLIB) 	\
- 		$(CPPULIB)			\
-		$(SALLIB) \
-        $(JVMACCESSLIB)
-+		$(JVMACCESSLIB)
- 
- SHL1VERSIONMAP=$(TARGET).map
- SHL1DEPN=		
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+javavm+javavm.cxx
+++ b/editors/openoffice-1.1-devel/files/patch-stoc+source+javavm+javavm.cxx
@ -1,29 +0,0 @@
--- ../stoc/source/javavm/javavm.cxx.orig	Fri Mar 21 12:03:58 2003
-+++ ../stoc/source/javavm/javavm.cxx	Fri Mar 21 12:04:24 2003
-@@ -1097,7 +1097,7 @@
-                             static_cast<
-                                 css::java::JavaNotConfiguredException * >(0))))
-                 {
-#if defined LINUX
-+#if defined LINUX || defined FREEBSD
-                     // Because of LD_LIBRARY_PATH, even javaldx --use-links does
-                     // not work sometimes:
-                     m_bDontCreateJvm = true;
-@@ -1109,7 +1109,7 @@
-                                      css::java::MissingJavaRuntimeException * >(
-                                          0))))
-                 {
-#if defined LINUX
-+#if defined LINUX || defined FREEBSD
-                     // Because of LD_LIBRARY_PATH, even javaldx --use-links does
-                     // not work sometimes:
-                     m_bDontCreateJvm = true;
-@@ -1596,7 +1596,7 @@
-     // On linux we load jvm with RTLD_GLOBAL. This is necessary for debugging, because
-     // libjdwp.so need a symbol (fork1) from libjvm which it only gets if the jvm is loaded
-     // witd RTLD_GLOBAL. On Solaris libjdwp.so is correctly linked with libjvm.so
-#ifdef LINUX
-+#ifdef LINUX || defined FREEBSD
-     if(!m_aJavaLib.load(jvm.getRuntimeLib(), SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_NOW))
- #else
-     if(!m_aJavaLib.load(jvm.getRuntimeLib()))
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+javavm+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-stoc+source+javavm+makefile.mk
@ -1,14 +0,0 @@
--- ../stoc/source/javavm/makefile.mk.orig	Fri Dec  6 11:48:59 2002
-+++ ../stoc/source/javavm/makefile.mk	Wed Mar  5 19:36:03 2003
-@@ -100,10 +100,10 @@
- SHL1TARGET= $(TARGET)
- SHL1VERSIONMAP=$(TARGET).map
- SHL1STDLIBS= \
-+		$(SALLIB) \
- 		$(CPPUHELPERLIB) 	\
- 		$(CPPULIB)	    	\
- 		$(UNOLIB)	    	\
-		$(SALLIB) \
-         $(JVMACCESSLIB) \
-         $(SALHELPERLIB)
- 
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+loader+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-stoc+source+loader+makefile.mk
@ -1,14 +0,0 @@
--- ../stoc/source/loader/makefile.mk.orig	Tue Jan  1 14:12:02 2002
-+++ ../stoc/source/loader/makefile.mk
-@@ -83,9 +83,9 @@
- SHL1TARGET=	$(TARGET)
- 
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
-		$(CPPUHELPERLIB)	\
-		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1VERSIONMAP=$(TARGET).map
- SHL1DEPN=
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+namingservice+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-stoc+source+namingservice+makefile.mk
@ -1,14 +0,0 @@
--- ../stoc/source/namingservice/makefile.mk.orig	Tue Jan  1 14:12:02 2002
-+++ ../stoc/source/namingservice/makefile.mk
-@@ -82,9 +82,9 @@
- SHL1TARGET=	$(TARGET)
- 
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
-		$(CPPUHELPERLIB)	\
-		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1VERSIONMAP=$(TARGET).map
- 
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+proxy_factory+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-stoc+source+proxy_factory+makefile.mk
@ -1,14 +0,0 @@
--- ../stoc/source/proxy_factory/makefile.mk.orig	Tue Jan  1 14:12:02 2002
-+++ ../stoc/source/proxy_factory/makefile.mk
-@@ -85,9 +85,9 @@
- SHL1VERSIONMAP=$(TARGET).map
- 
- SHL1STDLIBS= \
-+	$(SALLIB)		\
- 	$(CPPULIB)		\
-	$(CPPUHELPERLIB)	\
-	$(SALLIB)
-+	$(CPPUHELPERLIB)
- 
- SHL1DEPN=
- SHL1IMPLIB=i$(TARGET)
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+registry_tdprovider+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-stoc+source+registry_tdprovider+makefile.mk
@ -1,15 +0,0 @@
--- ../stoc/source/registry_tdprovider/makefile.mk.orig	Tue Jan  1 14:12:02 2002
-+++ ../stoc/source/registry_tdprovider/makefile.mk
-@@ -88,10 +88,10 @@
- SHL1TARGET=	$(TARGET)
- 
- SHL1STDLIBS=	\
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
- 		$(CPPUHELPERLIB)	\
-		$(SALHELPERLIB) 	\
-		$(SALLIB)
-+		$(SALHELPERLIB) 
- 
- SHL1DEPN=
- SHL1VERSIONMAP=$(TARGET).map
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+servicemanager+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-stoc+source+servicemanager+makefile.mk
@ -1,14 +0,0 @@
--- ../stoc/source/servicemanager/makefile.mk.orig	Tue Jan  1 14:12:03 2002
-+++ ../stoc/source/servicemanager/makefile.mk
-@@ -84,9 +84,9 @@
- SHL1VERSIONMAP=$(TARGET).map
- 
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
-		$(CPPUHELPERLIB)	\
-		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1DEPN=
- SHL1IMPLIB=	i$(TARGET)
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx
+++ b/editors/openoffice-1.1-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx
@ -1,34 +0,0 @@
--- ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 17:57:10 2003
-+++ ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 18:51:36 2003
-@@ -2,9 +2,9 @@
-  *
-  *  $RCSfile: servicemanager.cxx,v $
-  *
- *  $Revision: 1.19.2.1 $
-+ *  $Revision: 1.19.2.1.16.1 $
-  *
- *  last change: $Author: rt $ $Date: 2003/01/28 17:21:31 $
-+ *  last change: $Author: dbo $ $Date: 2003/03/10 15:14:02 $
-  *
-  *  The Contents of this file are made available subject to the terms of
-  *  either of the following licenses
-@@ -686,6 +686,7 @@
- 
- protected:
-     inline void check_undisposed() const SAL_THROW( (lang::DisposedException) );
-+    virtual void SAL_CALL disposing();
-     
- 	sal_Bool haveFactoryWithThisImplementation(const OUString& aImplName);
- 
-@@ -1081,7 +1082,10 @@
-     if (rBHelper.bDisposed || rBHelper.bInDispose)
-         return;
- 	t_OServiceManager_impl::dispose();
-    
-+}
-+
-+void OServiceManager::disposing()
-+{
- 	// dispose all factories
- 	HashSet_Ref aImpls;
- 	{
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+tdmanager+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-stoc+source+tdmanager+makefile.mk
@ -1,15 +0,0 @@
--- ../stoc/source/tdmanager/makefile.mk.orig	Tue Jan  1 14:12:03 2002
-+++ ../stoc/source/tdmanager/makefile.mk
-@@ -83,9 +83,10 @@
- SHL1TARGET=	$(TARGET)
- 
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
-		$(CPPUHELPERLIB)	\
-		$(SALLIB)
-+		$(CPPUHELPERLIB)
-+
- SHL1VERSIONMAP=$(TARGET).map
- 
- SHL1DEPN=
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+typeconv+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-stoc+source+typeconv+makefile.mk
@ -1,14 +0,0 @@
--- ../stoc/source/typeconv/makefile.mk.orig	Tue Jan  1 14:12:03 2002
-+++ ../stoc/source/typeconv/makefile.mk
-@@ -82,9 +82,9 @@
- SHL1TARGET=	$(TARGET)
- 
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
-		$(CPPUHELPERLIB)	\
-		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1DEPN=
- SHL1VERSIONMAP=	$(TARGET).map
--- a/editors/openoffice-1.1-devel/files/patch-store+util+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-store+util+makefile.mk
@ -1,14 +0,0 @@
--- ../store/util/makefile.mk.orig	Tue Mar 11 14:58:53 2003
-+++ ../store/util/makefile.mk	Tue Mar 11 14:59:34 2003
-@@ -102,7 +102,11 @@
- 
- # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
- .IF "$(COMID)"=="gcc3"
-+.IF "$(OS)"=="FREEBSD"
-+SHL1STDLIBS+= 	-lsupc++
-+.ELSE
- SHL1STDLIBS+= 	-lsupc++ -lgcc_s
-+.ENDIF
- .ENDIF
- 
- 
--- a/editors/openoffice-1.1-devel/files/patch-svx+source+fmcomp+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-svx+source+fmcomp+makefile.mk
@ -1,12 +0,0 @@
--- ../svx/source/fmcomp/makefile.mk.orig	Sun May 19 14:22:34 2002
-+++ ../svx/source/fmcomp/makefile.mk	Sun May 19 14:27:48 2002
-@@ -74,6 +74,9 @@
- .INCLUDE :  sv.mk
- .INCLUDE :  $(PRJ)$/util$/makefile.pmk
- 
-+CFLAGS += -g
-+CFLAGSCC += -g
-+
- # --- Files --------------------------------------------------------
- 
- CXXFILES= \
--- a/editors/openoffice-1.1-devel/files/patch-svx+source+svrtf+rtfitem.cxx
+++ b/editors/openoffice-1.1-devel/files/patch-svx+source+svrtf+rtfitem.cxx
@ -1,24 +0,0 @@
--- ../svx/source/svrtf/rtfitem.cxx.orig	Thu Apr 17 22:50:50 2003
-+++ ../svx/source/svrtf/rtfitem.cxx	Thu Apr 17 23:40:15 2003
-@@ -285,11 +285,20 @@
- 	}
- 	else
- 	{
-		if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType )
-+//		if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType )	//Takashi Ono for CJK
-+		if( LOW_CHARTYPE == eType )
- 		{
- 			if( *pNormal )
- 			{
- 				rItem.SetWhich( *pNormal );
-+				rSet.Put( rItem );
-+			}
-+		}
-+		else if( HIGH_CHARTYPE == eType )
-+		{
-+			if( *pCTL )
-+			{
-+				rItem.SetWhich( *pCTL );
- 				rSet.Put( rItem );
- 			}
- 		}
--- a/Show more
+++ b/Show more