1. update to fresh checkout of OpenOffice.org (1.1RC2)

   tagged under cws_srx645_ooo11rc2
2. still broken with installation failure.

Reviewed by:	mbr

29 files changed, 85 insertions, 591 deletions

diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index b72edd8783d3..4d84ecd638ad 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	644
-PORTREVISION=	2
-SNAPDATE=	20030601
+PORTVERSION=	645
+SNAPDATE=	20030712
 CATEGORIES+=	editors
 MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
+		http://people.freebsd.org/~maho/files/ \
 		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
@@ -20,7 +20,7 @@ MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 DISTFILES+=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \
 		gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \
-		http://people.freebsd.org/~mbr/ooo/:moz
+		mozilla-vendor-1.0.2.tgz:moz
 .if defined(L10NHELP)
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
@@ -128,6 +128,7 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/jakarta-ant
+BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
@@ -153,8 +154,6 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
@@ -533,7 +532,7 @@ pre-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
 	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
 	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-	@${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
+	@${MKDIR} -p ${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
diff --git a/editors/openoffice.org-1.1-devel/distinfo b/editors/openoffice.org-1.1-devel/distinfo
index 481a38cc3f15..da71b44025c1 100644
--- a/editors/openoffice.org-1.1-devel/distinfo
+++ b/editors/openoffice.org-1.1-devel/distinfo
@@ -1,8 +1,7 @@
-MD5 (openoffice/oo_644_src_20030601.tar.bz2) = df9c081ca85caef3d89e039295458c99
+MD5 (openoffice/oo_645_src_20030712.tar.bz2) = e607ee4f0a4329ac33fb8122cf595ae7
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/mozilla-vendor-1.0.2.tgz) = 30478b49e04df9528858080ab97ddf62
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5
 MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
 MD5 (openoffice/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
 MD5 (openoffice/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
diff --git a/editors/openoffice.org-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
index 42dde356ebac..054f342ecfe0 100644
--- a/editors/openoffice.org-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
@@ -1,5 +1,5 @@
---- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
-+++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
+--- ../solenv/inc/unxfbsdi.mk.orig	Thu Jun  5 08:44:59 2003
++++ ../solenv/inc/unxfbsdi.mk	Tue Jun 10 17:30:40 2003
 @@ -92,12 +92,12 @@
  CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
  
@@ -9,10 +9,10 @@
  CFLAGS+= -I/usr/X11R6/include
  
  # flags for the C++ Compiler
--CFLAGSCC= -pipe
--CFLAGSCXX= -pipe -fno-for-scope -fpermissive
-+CFLAGSCC= -g -ggdb -pipe
-+CFLAGSCXX= -g -ggdb -pipe -fno-for-scope -fpermissive
+-CFLAGSCC= -pipe -fno-rtti
+-CFLAGSCXX= -pipe -fno-for-scope -fpermissive -fno-rtti
++CFLAGSCC= -g -ggdb -pipe -fno-rtti
++CFLAGSCXX= -g -ggdb -pipe -fno-for-scope -fpermissive -fno-rtti
  
  # Flags for enabling exception handling
  CFLAGSEXCEPTIONS= -fexceptions
diff --git a/editors/openoffice.org-1.1-devel/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-1.1-devel/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index c06b00dc51c5..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../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
-   
diff --git a/editors/openoffice.org-1.1-devel/files/patch-codemaker+source+codemaker+global.cxx b/editors/openoffice.org-1.1-devel/files/patch-codemaker+source+codemaker+global.cxx
deleted file mode 100644
index 057d4ec4d670..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-codemaker+source+codemaker+global.cxx
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../codemaker/source/codemaker/global.cxx.orig	Fri Apr  4 00:14:50 2003
-+++ ../codemaker/source/codemaker/global.cxx	Fri Apr  4 00:14:53 2003
-@@ -164,11 +164,7 @@
-     strncat(tmpPattern, "/", sizeof(tmpPattern)-1-strlen(tmpPattern));
-     strncat(tmpPattern, pPrefix, sizeof(tmpPattern)-1-strlen(tmpPattern));
-     strncat(tmpPattern, "XXXXXX", sizeof(tmpPattern)-1-strlen(tmpPattern));
--#if defined(FREEBSD) || defined(MACOSX)
--	pTmpName = mkstemp(tmpPattern);
--#else
- 	pTmpName = mktemp(tmpPattern);
--#endif
- #endif
- 
- 	return OString(pTmpName);
diff --git a/editors/openoffice.org-1.1-devel/files/patch-crashrep+prj+build.lst b/editors/openoffice.org-1.1-devel/files/patch-crashrep+prj+build.lst
new file mode 100644
index 000000000000..e728cce07869
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-crashrep+prj+build.lst
@@ -0,0 +1,8 @@
+--- ../crashrep/prj/build.lst.org	Wed Jun 25 23:19:29 2003
++++ ../crashrep/prj/build.lst	Sun Jul 13 11:55:15 2003
+@@ -1,4 +1,4 @@
+-cr	crashrep	:	sal sysui gtk tools shell NULL
++cr	crashrep	:	sal sysui gtk vcl tools shell NULL
+ cr	crashrep				usr1	-	all	cr_mkout NULL
+ cr	crashrep\scripts		nmake	-	all	cr_suscript NULL
+ cr	crashrep\source\all		get		-	all	cr_sresource NULL
diff --git a/editors/openoffice.org-1.1-devel/files/patch-crashrep+source+unx+main.cxx b/editors/openoffice.org-1.1-devel/files/patch-crashrep+source+unx+main.cxx
new file mode 100644
index 000000000000..d8eebbf124a5
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-crashrep+source+unx+main.cxx
@@ -0,0 +1,11 @@
+--- ../crashrep/source/unx/main.cxx.orig	Wed Jul  2 23:11:07 2003
++++ ../crashrep/source/unx/main.cxx	Sun Jul 13 11:56:28 2003
+@@ -73,7 +73,7 @@
+ #include <pwd.h>
+ #include <pthread.h>
+ 
+-#ifdef LINUX
++#if defined (LINUX) || (FREEBSD)
+ #include <netinet/in.h>
+ #endif
+ 
diff --git a/editors/openoffice.org-1.1-devel/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-crashrep+source+unx+makefile.mk
new file mode 100644
index 000000000000..03dd7bc9d427
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-crashrep+source+unx+makefile.mk
@@ -0,0 +1,13 @@
+--- ../crashrep/source/unx/makefile.mk.org	Tue Jul  1 08:57:23 2003
++++ ../crashrep/source/unx/makefile.mk	Tue Jul  1 08:57:30 2003
+@@ -105,6 +105,10 @@
+ APP1STDLIBS=$(GTKLINKFLAGS) `pkg-config $(ONLYMODLIBS) --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -Bdynamic -lXext -lX11 -ldl -lsocket -lnsl
+ .ENDIF
+ 
++.IF "$(OS)" == "FREEBSD"
++APP1STDLIBS=$(GTKLINKFLAGS) `pkg-config $(ONLYMODLIBS) --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -Wl,-Bdynamic -lXext -lX11
++.ENDIF
++
+ ALL: ALLTAR $(BIN)$/crash_dump.res.01
+ 
+ # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-1.1-devel/files/patch-extensions+source+scanner+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-extensions+source+scanner+makefile.mk
deleted file mode 100644
index b096f4ea9ccc..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-extensions+source+scanner+makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../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
diff --git a/editors/openoffice.org-1.1-devel/files/patch-external+gcc3_specific+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-external+gcc3_specific+makefile.mk
deleted file mode 100644
index 73786761322e..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-external+gcc3_specific+makefile.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../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.$(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 
- 
diff --git a/editors/openoffice.org-1.1-devel/files/patch-jvmaccess+source+sunversion.cxx b/editors/openoffice.org-1.1-devel/files/patch-jvmaccess+source+sunversion.cxx
deleted file mode 100644
index 44cec840184a..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-jvmaccess+source+sunversion.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../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;
-     }
diff --git a/editors/openoffice.org-1.1-devel/files/patch-python+Python-2.2.2.patch b/editors/openoffice.org-1.1-devel/files/patch-python+Python-2.2.2.patch
new file mode 100644
index 000000000000..34e95537b0b5
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-python+Python-2.2.2.patch
@@ -0,0 +1,40 @@
+--- ../python/Python-2.2.2.patch.org	Wed Jun 18 17:05:52 2003
++++ ../python/Python-2.2.2.patch	Tue Jul 15 07:52:32 2003
+@@ -1,21 +1,21 @@
+ *** misc/Python-2.2.2/configure	Thu Oct 10 17:26:41 2002
+ --- misc/build/Python-2.2.2/configure	Tue Jun 10 11:51:32 2003
+-***************
+-*** 1697,1702 ****
+---- 1697,1710 ----
+-      case $ac_sys_system in
+-      Darwin*)
+-      	OPT="$OPT -no-cpp-precomp";;
+-+     Linux*)
+-+         case "`uname -m`" in
+-+ 	    ppc*)
+-+     	       OPT="$OPT -fPIC";;
+-+             *)
+-+     	       OPT="$OPT";;
+-+ 	esac
+-+         ;;
+-      esac
+-  fi
++@@ -1697,6 +1697,16 @@
++     case $ac_sys_system in
++     Darwin*)
++     	OPT="$OPT -no-cpp-precomp";;
+++    FreeBSD*)
+++    	OPT="$OPT $PTHREAD_CFLAGS";;
+++    Linux*)
+++        case "`uname -m`" in
+++	    ppc*)
+++    	       OPT="$OPT -fPIC";;
+++            *)
+++    	       OPT="$OPT";;
+++	esac
+++        ;;
++     esac
++ fi
+   
+ *** misc/Python-2.2.2/Modules/_hotshot.c	Mon Sep 30 18:16:13 2002
+ --- misc/build/Python-2.2.2/Modules/_hotshot.c	Tue Jun 10 11:56:05 2003
diff --git a/editors/openoffice.org-1.1-devel/files/patch-sal+inc+osl+endian.h b/editors/openoffice.org-1.1-devel/files/patch-sal+inc+osl+endian.h
deleted file mode 100644
index 95e5d1861a70..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-sal+inc+osl+endian.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../sal/inc/osl/endian.h.orig	Thu May  8 20:19:09 2003
-+++ ../sal/inc/osl/endian.h	Thu May  8 20:29:00 2003
-@@ -107,7 +107,9 @@
- #endif
- 
- #ifdef FREEBSD
-+#   include <sys/param.h>
- #   include <machine/endian.h>
-+#if __FreeBSD_version < 500000
- #   if BYTE_ORDER == LITTLE_ENDIAN
- #   	define _LITTLE_ENDIAN
- #   elif BYTE_ORDER == BIG_ENDIAN
-@@ -115,6 +117,7 @@
- #   elif BYTE_ORDER == PDP_ENDIAN
- #   	define _PDP_ENDIAN
- #   endif
-+#endif
- #endif
- 
- #ifdef SCO
diff --git a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+nlsupport.c
deleted file mode 100644
index 9aeb9a89da5b..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+nlsupport.c
+++ /dev/null
@@ -1,121 +0,0 @@
---- ../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>
- 
--#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD)
-+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD)
- #include <pthread.h>
- #include <locale.h>
- #include <langinfo.h>
-@@ -114,8 +114,7 @@
-         comparison = _pair_compare( key, base + current );
-         if (comparison < 0)
-             upper = current;
--        else
--        if (comparison > 0)
-+        else if (comparison > 0)
-             lower = current + 1;
-         else
-             return base + current;
-@@ -241,12 +240,14 @@
-     return NULL;
- }
-         
--#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD)
-+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD)
- 
- /*
-- * This implementation of osl_getTextEncodingFromLocale maps 
-- * from nl_langinfo(CODESET) to rtl_textencoding defines. 
-- * nl_langinfo() is supported only on Linux, Solaris and IRIX. 
-+ * This implementation of osl_getTextEncodingFromLocale maps
-+ * from nl_langinfo(CODESET) to rtl_textencoding defines.
-+ * nl_langinfo() is supported only on Linux and Solaris.
-+ * nl_langinfo() is supported only on Linux, Solaris and IRIX,
-+ * >= NetBSD 1.6 and >= FreeBSD 4.4
-  *
-  * This routine is SLOW because of the setlocale call, so
-  * grab the result and cache it.
-@@ -260,6 +261,12 @@
- #endif
- #endif
- 
-+/*
-+ * _nl_language_list[] is an array list of supported encodings. Because
-+ * we are using a binary search, the list has to be in ascending order.
-+ * We are comparing the encodings case insensitiv, so the list has
-+ * to be completly upper- , or lowercase.
-+ */
- 
- #if defined(SOLARIS)
- 
-@@ -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 */
--    { "TIS-620",                     RTL_TEXTENCODING_MS_874 },     /* locale: th_TH */
-+    { "TIS-620",                    RTL_TEXTENCODING_MS_874 },     /* locale: th_TH */
-     { "UTF-8",                      RTL_TEXTENCODING_UTF8 },        /* ISO-10646/UTF-8 */
-     { "VIDEOTEX-SUPPL",             RTL_TEXTENCODING_DONTKNOW },    /* ISO-IR-70 */
-     { "WIN-SAMI-2",                 RTL_TEXTENCODING_DONTKNOW }     /* WS2 */
- };
- 
--#endif /* ifdef LINUX || NETBSD */
-+#elif defined(FREEBSD)
-+
-+const _pair _nl_language_list[] = {
-+    { "ASCII",         RTL_TEXTENCODING_ASCII_US       }, /* US-ASCII */
-+    { "BIG5",          RTL_TEXTENCODING_BIG5           }, /* China - Traditional Chinese */
-+    { "CP1251",        RTL_TEXTENCODING_MS_1251        }, /* MS-CYRL */
-+    { "CP866",         RTL_TEXTENCODING_IBM_866        }, /* CP866 866 */
-+    { "EUCCN",         RTL_TEXTENCODING_EUC_CN         }, /* China - Simplified Chinese */
-+    { "EUCJP",         RTL_TEXTENCODING_EUC_JP         }, /* Japan */
-+    { "EUCKR",         RTL_TEXTENCODING_EUC_KR         }, /* Korea */
-+    { "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-4",     RTL_TEXTENCODING_ISO_8859_4     }, /* LATIN4 L4 */
-+    { "ISO8859-5",     RTL_TEXTENCODING_ISO_8859_5     }, /* Cyrillic */
-+    { "ISO8859-7",     RTL_TEXTENCODING_ISO_8859_7     }, /* Greek */
-+    { "ISO8859-9",     RTL_TEXTENCODING_ISO_8859_9     }, /* Turkish */
-+    { "KOI8-R",        RTL_TEXTENCODING_KOI8_R         }, /* KOI8-R */
-+    { "KOI8-U",        RTL_TEXTENCODING_KOI8_U         }, /* KOI8-U */
-+    { "SJIS",          RTL_TEXTENCODING_SHIFT_JIS      }, /* Japan */
-+    { "US-ASCII",      RTL_TEXTENCODING_ASCII_US       }, /* US-ASCII */
-+    { "UTF-8",         RTL_TEXTENCODING_UTF8           }  /* ISO-10646/UTF-8 */
-+};
-+
-+#elif defined(NETBSD)
-+
-+const _pair _nl_language_list[] = {
-+    { "ASCII",         RTL_TEXTENCODING_ASCII_US       }, /* US-ASCII */
-+    { "BIG5",          RTL_TEXTENCODING_BIG5           }, /* China - Traditional Chinese */
-+    { "CP1251",        RTL_TEXTENCODING_MS_1251        }, /* MS-CYRL */
-+    { "CP866",         RTL_TEXTENCODING_IBM_866        }, /* CP866 866 */
-+    { "CTEXT",         RTL_TEXTENCODING_ASCII_US       }, /* US-ASCII */
-+    { "EUCCN",         RTL_TEXTENCODING_EUC_CN         }, /* China - Simplified Chinese */
-+    { "EUCJP",         RTL_TEXTENCODING_EUC_JP         }, /* Japan */
-+    { "EUCKR",         RTL_TEXTENCODING_EUC_KR         }, /* Korea */
-+    { "EUCTW",         RTL_TEXTENCODING_EUC_TW         }, /* China - Traditional Chinese */
-+    { "ISO-2022-JP",   RTL_TEXTENCODING_DONTKNOW       }, /* */
-+    { "ISO-2022-JP-2", RTL_TEXTENCODING_DONTKNOW       }, /* */
-+    { "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-4",     RTL_TEXTENCODING_ISO_8859_4     }, /* LATIN4 L4 */
-+    { "ISO8859-5",     RTL_TEXTENCODING_ISO_8859_5     }, /* Cyrillic */
-+    { "ISO8859-7",     RTL_TEXTENCODING_ISO_8859_7     }, /* Greek */
-+    { "ISO8859-9",     RTL_TEXTENCODING_ISO_8859_9     }, /* Turkish */
-+    { "KOI8-R",        RTL_TEXTENCODING_KOI8_R         }, /* KOI8-R */
-+    { "KOI8-U",        RTL_TEXTENCODING_KOI8_U         }, /* KOI8-U */
-+    { "SJIS",          RTL_TEXTENCODING_SHIFT_JIS      }, /* Japan */
-+    { "US-ASCII",      RTL_TEXTENCODING_ASCII_US       }, /* US-ASCII */
-+    { "UTF-8",         RTL_TEXTENCODING_UTF8           }  /* ISO-10646/UTF-8 */
-+};
-+
-+#endif /* ifdef SOLARIS IRIX LINUX FREEBSD NETBSD */
- 
- static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
- 
diff --git a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+system.c b/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+system.c
deleted file mode 100644
index e866f598af30..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+system.c
+++ /dev/null
@@ -1,91 +0,0 @@
---- ../sal/osl/unx/system.c.orig	Tue Aug 20 08:49:46 2002
-+++ ../sal/osl/unx/system.c	Mon Apr 21 02:42:21 2003
-@@ -74,7 +74,8 @@
- static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER;
- 
- /* struct passwd differs on some platforms */
--#if defined NETBSD || defined MACOSX || defined FREEBSD
-+#if defined NETBSD || defined MACOSX || \
-+	(defined FREEBSD && (__FreeBSD_version < 500112))
- #include <pwd.h>
- #include <sys/types.h>
- 
-@@ -134,7 +135,6 @@
-   	return res;
- }
- 
--#if defined(NETBSD) || defined(MACOSX)
- int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
-            size_t buflen, struct passwd **result)
- {
-@@ -201,8 +201,8 @@
- 
-   return res;
- }
--#endif
- 
-+#if defined NETBSD || defined MACOSX
- struct tm *localtime_r(const time_t *timep, struct tm *buffer)
- {
- 	struct tm* res;
-@@ -236,7 +236,8 @@
- 
- 	return res;
- }
--#endif  /* defined NETBSD || defined MACOSX */
-+#endif  /* defined NETBSD || MACOSX */
-+#endif  /* defined NETBSD || FREEBSD || MACOSX */
- 
- #ifdef SCO
- #include <pwd.h>
-@@ -712,3 +713,50 @@
- }
- #endif
- 
-+#if defined(NETBSD) || defined(FREEBSD)
-+char *fcvt(double value, int ndigit, int *decpt, int *sign)
-+{
-+  static char ret[256];
-+  char buf[256],zahl[256],format[256]="%";
-+  char *v1,*v2;
-+ 
-+  if (value==0.0) value=1e-30;
-+  
-+  if (value<0.0) *sign=1; else *sign=0;
-+ 
-+  if (value<1.0) 
-+  {
-+    *decpt=(int)log10(value); 
-+	value*=pow(10.0,1-*decpt);
-+	ndigit+=*decpt-1;
-+	if (ndigit<0) ndigit=0;
-+  }
-+  else 
-+  {
-+    *decpt=(int)log10(value)+1;
-+  }
-+  
-+  sprintf(zahl,"%d",ndigit);
-+  strcat(format,zahl);
-+  strcat(format,".");
-+  strcat(format,zahl);
-+  strcat(format,"f");
-+  
-+  sprintf(buf,format,value);
-+  
-+  if (ndigit!=0)
-+  {
-+    v1=strtok(buf,".");
-+    v2=strtok(NULL,".");
-+	strcpy(ret,v1);
-+    strcat(ret,v2);
-+  }
-+  else
-+  {
-+    strcpy(ret,buf);
-+  }
-+    
-+  return(ret);
-+}
-+
-+#endif
diff --git a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+system.h
deleted file mode 100644
index bd81c00d6d1b..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+system.h
+++ /dev/null
@@ -1,57 +0,0 @@
---- ../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>
-+#   include <sys/param.h>
- #   include <sys/time.h>
- #   include <sys/uio.h>
-+#   include <sys/exec.h>
-+#   include <vm/vm.h>
-+#   include <vm/vm_param.h>
-+#   include <vm/pmap.h>
-+#   include <vm/swap_pager.h>
- #	include <sys/un.h>
- #   include <netinet/tcp.h>
- #	define 	IORESOURCE_TRANSFER_BSD 
- #   include <machine/endian.h>
-+#ifdef __FreeBSD_version < 500000
- #   if BYTE_ORDER == LITTLE_ENDIAN
- #   	define _LITTLE_ENDIAN
- #   elif BYTE_ORDER == BIG_ENDIAN
-@@ -225,12 +232,14 @@
- #   elif BYTE_ORDER == PDP_ENDIAN
- #   	define _PDP_ENDIAN
- #   endif
--#   define  sched_yield() 				pthread_yield()
--#   define  pthread_testcancel()
-+#endif
- #	define  NO_PTHREAD_RTL
--#	define  NO_PTHREAD_PRIORITY
--#	define  CMD_ARG_PRG					__progname		
--#	define  CMD_ARG_ENV					environ
-+/* __progname isn't sufficient here. We need the full path as well 
-+ * for e.g. setup and __progname only points to the binary name. 
-+ */
-+#	define  CMD_ARG_PRG_IS_DEFINED
-+#	define  CMD_ARG_PRG			*((struct ps_strings *)PS_STRINGS)->ps_argvstr
-+#	define  CMD_ARG_ENV			environ
- #endif
- 
- #ifdef SCO
-@@ -556,12 +565,14 @@
- #endif
- 
- #ifdef NO_PTHREAD_RTL
-+#if !defined FREEBSD || (__FreeBSD_version < 500112)
- struct passwd *getpwent_r(struct passwd *pwd, char *buffer,  int buflen);
- extern struct spwd *getspnam_r(const char *name, struct spwd *result,
- 							   char *buffer, int buflen);
- 
- struct tm *localtime_r(const time_t *timep, struct tm *buffer);
- struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
-+#endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
- struct hostent *gethostbyname_r(const char *name, struct hostent *result,
- 								char *buffer, int buflen, int *h_errnop);
- #endif
diff --git a/editors/openoffice.org-1.1-devel/files/patch-sal+workben+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-sal+workben+makefile.mk
deleted file mode 100644
index c754ba40fdf0..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-sal+workben+makefile.mk
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../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"
- 
--	CFLAGS+= /DUSE_SAL_STATIC
-+	CFLAGS+= -DUSE_SAL_STATIC
- 
- 	OBJFILES=	$(OBJ)$/salstattest.obj
- 
-@@ -379,7 +379,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- 
- CXXFILES=	tgetpwnam.cxx
- OBJFILES=	$(OBJ)$/tgetpwnam.obj
-@@ -389,7 +389,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN=	$(SLB)$/sal.lib
- 
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd | freebsd)
- .ENDIF # tgetpwname
- 
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-1.1-devel/files/patch-salhelper+source+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-salhelper+source+makefile.mk
deleted file mode 100644
index 5a3d29a870cd..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-salhelper+source+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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=lngi.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
-+SHL1VERSIONMAP=gcc3_linux_intel.map
- .ENDIF
- 
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-1.1-devel/files/patch-salhelper+test+rtti+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-salhelper+test+rtti+makefile.mk
deleted file mode 100644
index 0ffbed004749..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-salhelper+test+rtti+makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../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)"=="FREEBSDI"
-+SHL1VERSIONMAP= lngi.map
- .ENDIF
- 
- 
diff --git a/editors/openoffice.org-1.1-devel/files/patch-scp+source+global+setupzip.scp b/editors/openoffice.org-1.1-devel/files/patch-scp+source+global+setupzip.scp
deleted file mode 100644
index db35b2781fe8..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-scp+source+global+setupzip.scp
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../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
- 
diff --git a/editors/openoffice.org-1.1-devel/files/patch-scptools+source+linker+searchcache b/editors/openoffice.org-1.1-devel/files/patch-scptools+source+linker+searchcache
deleted file mode 100644
index d090f9911990..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-scptools+source+linker+searchcache
+++ /dev/null
@@ -1,27 +0,0 @@
---- ../scptools/source/linker/searchcache.hxx.orig	Thu Mar 27 23:21:09 2003
-+++ ../scptools/source/linker/searchcache.hxx	Thu Mar 27 23:21:40 2003
-@@ -72,11 +72,11 @@
- //	types
- ///////////////////////////////////////////////////////////////////////////////
- 
--DECLARE_LIST( FileList, ByteString* )
-+DECLARE_LIST( SCacheFileList, ByteString* )
- struct Include
- {
- 	ByteString	aBaseDir;
--	FileList	aFileLst;
-+	SCacheFileList	aFileLst;
- };
- DECLARE_LIST( IncludeList, Include* )
- 
---- ../scptools/source/linker/searchcache.cxx.orig	Thu Mar 27 23:23:04 2003
-+++ ../scptools/source/linker/searchcache.cxx	Thu Mar 27 23:23:51 2003
-@@ -218,7 +218,7 @@
- 		rPath += aDelim;
- }
- 
--void ScanFileList( const ByteString& rPath, FileList& rLst )
-+void ScanFileList( const ByteString& rPath, SCacheFileList& rLst )
- {
- 	Dir aFiles( rPath, FSYS_KIND_FILE );
- 	for( USHORT i = 0; i < aFiles.Count(); ++i )
diff --git a/editors/openoffice.org-1.1-devel/files/patch-setup2+script+setup.sh b/editors/openoffice.org-1.1-devel/files/patch-setup2+script+setup.sh
deleted file mode 100644
index 705c3a4245ff..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-setup2+script+setup.sh
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../setup2/script/setup.sh.orig	Mon Jun  9 07:49:10 2003
-+++ ../setup2/script/setup.sh	Mon Jun  9 07:49:56 2003
-@@ -118,6 +118,16 @@
- 	 LD_LIBRARY_PATH=${sd_archive_path}:.
- 	 export LD_LIBRARY_PATH
- 	 ;;
-+  FreeBSD)
-+     # @@@ <NOTE> @@@
-+     # Please remove '.' as soon as all to be registered UNO components...
-+     # 1) link with a runpath of '$ORIGIN', and
-+     # 2) link against 'libcppuhelper$(COMID).so.$(UDK_MAJOR)'
-+     #    instead of obsolete 'libcppuhelper$(UDK_MAJOR)$(COMID).so'
-+     # @@@ </NOTE> @@@
-+	 LD_LIBRARY_PATH=${sd_archive_path}:.
-+	 export LD_LIBRARY_PATH
-+	 ;;
-   IRIX*)
- 	 LD_LIBRARYN32_PATH=${sd_archive_path}
- 	 export LD_LIBRARYN32_PATH
diff --git a/editors/openoffice.org-1.1-devel/files/patch-setup2+source+service+interface.cxx b/editors/openoffice.org-1.1-devel/files/patch-setup2+source+service+interface.cxx
deleted file mode 100644
index 8e478e17971d..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-setup2+source+service+interface.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
---- ../setup2/source/service/interface.cxx.orig	Sat Jul 20 23:29:33 2002
-+++ ../setup2/source/service/interface.cxx	Sat Jul 20 23:30:02 2002
-@@ -126,6 +126,8 @@
- 		aExtension = "UNIX_SOLIG";
- 	else if( eType == OSType_UNIX_LINUX )
- 		aExtension = "UNIX_LINUX";
-+	else if( eType == OSType_UNIX_LINUX )
-+		aExtension = "UNIX_FREEBSD";
- 	else if( eType == OSType_UNIX_HP )
- 		aExtension = "UNIX_HP";
- 	else if( eType == OSType_UNIX_SCO )
-@@ -238,6 +240,7 @@
- 	readOSConfiguration( OSType_UNIX_SOLSG );
- 	readOSConfiguration( OSType_UNIX_SOLIG );
- 	readOSConfiguration( OSType_UNIX_LINUX );
-+	readOSConfiguration( OSType_UNIX_FREEBSD );
- 	readOSConfiguration( OSType_UNIX_HP );
- 	readOSConfiguration( OSType_UNIX_SCO );
- 	fprintf( stdout, "\n" );
-@@ -577,6 +580,7 @@
- 			case OSType_UNIX_SOLSG:
- 			case OSType_UNIX_SOLIG:
- 			case OSType_UNIX_LINUX:
-+			case OSType_UNIX_FREEBSD:
- 			case OSType_UNIX_HP:
- 			case OSType_UNIX_SCO:
- 				return ByteString(UNX_README_FILE_NAME);
-@@ -599,6 +603,7 @@
- 			case OSType_UNIX_SOLSG:
- 			case OSType_UNIX_SOLIG:
- 			case OSType_UNIX_LINUX:
-+			case OSType_UNIX_FREEBSD:
- 			case OSType_UNIX_HP:
- 			case OSType_UNIX_SCO:
- 				return ByteString(UNX_LICENSE_FILE_NAME);
diff --git a/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+startup+FREEBSD+macros.mk b/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+startup+FREEBSD+macros.mk
deleted file mode 100644
index 0c1b107de988..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+startup+FREEBSD+macros.mk
+++ /dev/null
@@ -1,5 +0,0 @@
---- /dev/null   Mon Mar 11 14:55:01 2002
-+++ ../solenv/inc/startup/FREEBSD/macros.mk     Mon Mar 11 14:54:59 2002
-@@ -0,0 +1,2 @@
-+
-+.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk
diff --git a/editors/openoffice.org-1.1-devel/files/patch-soltools+mkdepend+main.c b/editors/openoffice.org-1.1-devel/files/patch-soltools+mkdepend+main.c
deleted file mode 100644
index cffd5cbb1f43..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-soltools+mkdepend+main.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../soltools/mkdepend/main.c.orig	Mon Apr 15 15:55:43 2002
-+++ ../soltools/mkdepend/main.c	Mon Apr 15 16:54:06 2002
-@@ -27,6 +27,9 @@
- 
- */
- 
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+
- #include "def.h"
- #ifdef hpux
- #define sigvec sigvector
diff --git a/editors/openoffice.org-1.1-devel/files/patch-source+javavm+interact.cxx b/editors/openoffice.org-1.1-devel/files/patch-source+javavm+interact.cxx
deleted file mode 100644
index 3b138eaaff50..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-source+javavm+interact.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../stoc/source/javavm/interact.cxx.orig	Fri Mar 21 11:58:45 2003
-+++ ../stoc/source/javavm/interact.cxx	Fri Mar 21 12:01:18 2003
-@@ -129,7 +129,7 @@
-     m_aRequest(rRequest)
- {
-     bool bRetry;
--#if defined LINUX
-+#if defined LINUX || defined FREEBSD
-     // Only if Java is disabled we allow retry:
-     bRetry = m_aRequest.isExtractableTo(
-         getCppuType(static_cast< css::java::JavaDisabledException * >(0)));
diff --git a/editors/openoffice.org-1.1-devel/files/patch-sysui+desktop+gnome+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-sysui+desktop+gnome+makefile.mk
deleted file mode 100644
index b78de96ef7d7..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-sysui+desktop+gnome+makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/desktop/gnome/makefile.mk.orig	Sun Jun  1 14:58:28 2003
-+++ ../sysui/desktop/gnome/makefile.mk	Sun Jun  1 14:58:30 2003
-@@ -78,7 +78,9 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- APP1LIBS=
-+.IF "$(OS)"!="FREEBSD"
- APP1STDLIBS=-ldl
-+.ENDIF
- 
- # menu launcher files
- LAUNCHERDIR = $(MISC)$/gnome
diff --git a/editors/openoffice.org-1.1-devel/files/patch-toolkit+inc+toolkit+helper+IComboListBoxHelper.hxx b/editors/openoffice.org-1.1-devel/files/patch-toolkit+inc+toolkit+helper+IComboListBoxHelper.hxx
deleted file mode 100644
index 3bc65673efd1..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-toolkit+inc+toolkit+helper+IComboListBoxHelper.hxx
+++ /dev/null
@@ -1,17 +0,0 @@
---- ../toolkit/inc/toolkit/helper/IComboListBoxHelper.hxx.orig	Wed May  7 11:05:11 2003
-+++ ../toolkit/inc/toolkit/helper/IComboListBoxHelper.hxx	Wed Jun  4 00:07:03 2003
-@@ -103,10 +103,10 @@
- 		virtual void			SetNoSelection() = 0;
- 		virtual USHORT			GetSelectEntryPos( USHORT nSelIndex = 0 ) const = 0;
- 		virtual BOOL            IsInDropDown() const = 0;
--        virtual Rectangle       GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const;
--        virtual long            GetIndexForPoint( const Point& rPoint ) const;
--        virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >
--                                GetClipboard();
-+		virtual Rectangle       GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const = 0;
-+		virtual long            GetIndexForPoint( const Point& rPoint ) const = 0;
-+		virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >
-+		GetClipboard() = 0;
- 	};
- }
- #endif // TOOLKIT_HELPER_COMBOLISTBOXHELPER_HXX
diff --git a/editors/openoffice.org-1.1-devel/files/patch-vcl+workben+officeacceptthread.cxx b/editors/openoffice.org-1.1-devel/files/patch-vcl+workben+officeacceptthread.cxx
deleted file mode 100644
index 35a45ec90993..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-vcl+workben+officeacceptthread.cxx
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../vcl/workben/officeacceptthread.cxx.orig	Tue Jun  3 11:27:35 2003
-+++ ../vcl/workben/officeacceptthread.cxx	Tue Jun  3 11:27:38 2003
-@@ -122,10 +122,10 @@
- 			sal_Bool static isProcessRunning( ::vos::OProcess::TProcessInfo& aProcessInfo )
- 			{
- 				int nRet;
--#if defined (SOLARIS)
-+#if defined (SOLARIS) || defined (FREEBSD)
- 				int status;
- 				nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG);
--#elif defined(LINUX) || defined (FREEBSD)
-+#elif defined(LINUX)
- 				nRet = kill(aProcessInfo.Ident, 0);
- #endif
- #if defined (UNX)