2203 files changed, 0 insertions, 95290 deletions

diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile
deleted file mode 100644
index 8b6b6a6824cd..000000000000
--- a/editors/abiword-devel/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-# New ports collection makefile for:    AbiWord2
-# Date created:         22 February 2003
-# Whom:                 Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	AbiWord2
-PORTVERSION=	1.1.3
-CATEGORIES=	editors
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
-MASTER_SITE_SUBDIR=	abiword
-DISTNAME=	abiword-${PORTVERSION}
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	An open-source, cross-platform WYSIWYG word processor
-
-# unzip is needed during the installation process
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
-		iconv.3:${PORTSDIR}/converters/libiconv \
-		gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
-		xml2.5:${PORTSDIR}/textproc/libxml2 \
-		fribidi.0:${PORTSDIR}/converters/fribidi
-
-DIST_SUBDIR=	AbiWord
-
-WRKSRC=		${WRKDIR}/abiword-${PORTVERSION}/abi
-
-USE_X_PREFIX=	yes
-USE_AUTOMAKE=	yes
-USE_AUTOMAKE_VER=14
-USE_AUTOCONF_VER=213
-USE_GMAKE=	yes
-USE_REINPLACE=	yes
-USE_GNOMENG=	yes
-USE_GNOME=	gnomehier
-WANT_GNOME=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -liconv"
-CONFIGURE_ARGS=	--enable-xft
-MAKEFILE=	GNUmakefile
-
-.include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/include/wv.h)
-BROKEN=	"This port cannot be built when textproc/wv is installed because of a header conflict.  Please remove textproc/wv, and resume the build.  If textproc/wv is no longer installed, please remove ${LOCALBASE}/include/wv.h, and resume the AbiWord build"
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%AUTOMAKE%%|${AUTOMAKE}|g ; \
-		s|%%ACLOCAL%%|${ACLOCAL}|g ; \
-		s|%%AUTOCONF%%|${AUTOCONF}|g' ${WRKSRC}/autogen.sh
-
-pre-configure:
-	@cd ${WRKSRC} && ${TOUCH} NEWS README AUTHORS ChangeLog INSTALL
-	@cd ${WRKSRC}/ac-helpers && ${RM} -f install-sh mkinstalldirs missing
-	@${RM} -f ${WRKSRC}/configure.ac
-	@cd ${WRKSRC} && ./autogen.sh && ${TRUE}
-	@${FIND} ${WRKSRC} -name GNUmakefile.in | xargs ${REINPLACE_CMD} -e \
-		's|[(]libdir[)]/@PACKAGE@|(datadir)/@PACKAGE@|g ; \
-		 s|@DEFS@|-I${WRKSRC}/../libiconv/include @DEFS@|g' && ${TRUE}
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-	@${INSTALL_DATA} ${WRKSRC}/src/pkg/linux/rpm/data/abiword.desktop \
-		${PREFIX}/share/gnome/apps/Applications/abiword.desktop
-	@${LN} -sf ${PREFIX}/share/AbiSuite-2.0/icons/abiword_48.png \
-		${PREFIX}/share/gnome/pixmaps/abiword_48.png
-
-.include <bsd.port.post.mk>
diff --git a/editors/abiword-devel/distinfo b/editors/abiword-devel/distinfo
deleted file mode 100644
index fa29979a6760..000000000000
--- a/editors/abiword-devel/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (AbiWord/abiword-1.1.3.tar.gz) = 6fdaf7e3cbc5aed2eb80e2054f54381f
diff --git a/editors/abiword-devel/files/patch-..::wv::magick::Makefile.in b/editors/abiword-devel/files/patch-..::wv::magick::Makefile.in
deleted file mode 100644
index bfba3a8beb67..000000000000
--- a/editors/abiword-devel/files/patch-..::wv::magick::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- ../wv/magick/Makefile.in	2001/08/08 11:44:02	1.1
-+++ ../wv/magick/Makefile.in	2001/08/08 11:44:13
-@@ -40,7 +40,7 @@
- all: $(MAGICKOBJECTS)
- 
- %.$(OBJEXT): $(srcdir)/%.c 
--	$(CC) $(CFLAGS) -c $(srcdir)/$*.c 
-+	$(CC) @CPPFLAGS@ $(CFLAGS) -c $(srcdir)/$*.c 
- 
- clean:
- 	rm -rf *.$(OBJEXT) core a.$(OBJEXT)ut *.a
diff --git a/editors/abiword-devel/files/patch-af b/editors/abiword-devel/files/patch-af
deleted file mode 100644
index 502e8de76cd9..000000000000
--- a/editors/abiword-devel/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/af/util/xp/ut_png.cpp.orig	Wed Apr 17 12:49:55 2002
-+++ src/af/util/xp/ut_png.cpp	Fri Apr 19 20:40:25 2002
-@@ -24,7 +24,7 @@
- #ifdef _AIX
- #define jmpbuf __jmpbuf
- #endif
--#include "png.h"
-+#include <png.h>
- 
- #include "ut_assert.h"
- #include "ut_bytebuf.h"
diff --git a/editors/abiword-devel/files/patch-an b/editors/abiword-devel/files/patch-an
deleted file mode 100644
index f2e91bdd806e..000000000000
--- a/editors/abiword-devel/files/patch-an
+++ /dev/null
@@ -1,46 +0,0 @@
-
-$FreeBSD$
-
---- src/Makefile.orig	Thu May 30 17:51:53 2002
-+++ src/Makefile	Wed Jun  5 15:47:41 2002
-@@ -48,6 +48,7 @@
- 
- ## Set the following to a list of pathnames to be copied to $(CANONDIR)
- CANON_TOPLEVELFILES=	$(ABI_ROOT)/COPYING $(ABI_ROOT)/user/wp/readme.txt
-+CANON_TLF_NOTDIR=	$(notdir $(CANON_TOPLEVELFILES))
- 
- ## Set the following to a list of directories (probably a subset of DIRS)
- ## that have work to do.
-@@ -58,6 +59,9 @@
- 	@for k in $(CANON_TOPLEVELFILES); do			\
- 		$(ABICOPY) $$k $(CANONDIR);			\
- 	done
-+	@for k in $(CANON_TLF_NOTDIR); do			\
-+		$(ABICHMOD) ugo=r $(CANONDIR)/$$k;		\
-+	done
- 	@for k in $(CANON_SubDirs); do				\
- 		$(MAKE) ABI_ROOT=$(ABI_ROOT) -C $$k canonical;	\
- 	done
-@@ -72,6 +76,7 @@
- 			cp $$k american.hash;		\
- 			rm $$k ;			\
- 		done)
-+	@(cd $(CANONDIR)/dictionary; $(ABICHMOD) ugo=r *)
- # We currently only ship american.hash, so the above and below aren't logical.
- # For same reason, this will only copy american.hash-encoding once in place.  The rest is in abispell.
- 	@$(ABICOPY) $(ABI_ROOT)/../abidistfiles/dictionary/*.hash-encoding $(CANONDIR)/dictionary	
-@@ -112,10 +117,12 @@
- 	fi
- # icons for X window manager use
- 	@$(subst xxxx,$(CANONDIR)/icons,$(VERIFY_DIRECTORY))
--	(cd $(ABI_ROOT)/../abidistfiles/icons; cp abi* $(CANONDIR)/icons)
-+	(cd $(ABI_ROOT)/../abidistfiles/icons; $(ABICOPY) abi* $(CANONDIR)/icons)
-+	@(cd $(CANONDIR)/icons; $(ABICHMOD) ugo=r *_48*)
- # font stuff for installation
- 	@$(subst xxxx,$(CANONDIR)/fonts,$(VERIFY_DIRECTORY))
--	(cd $(ABI_ROOT)/../unixfonts/fonts ; cp *.* $(CANONDIR)/fonts)
-+	(cd $(ABI_ROOT)/../unixfonts/fonts ; $(ABICOPY) *.* $(CANONDIR)/fonts)
-+	@(cd $(CANONDIR)/fonts; $(ABICHMOD) ugo=r *.*)
- endif
- 
- ##################################################################
diff --git a/editors/abiword-devel/files/patch-ap b/editors/abiword-devel/files/patch-ap
deleted file mode 100644
index 76fbc4554e65..000000000000
--- a/editors/abiword-devel/files/patch-ap
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/wp/Makefile.orig	Sat Apr 13 07:22:38 2002
-+++ src/wp/Makefile	Fri Apr 19 23:30:57 2002
-@@ -44,8 +44,18 @@
- 	@$(subst xxxx,$(CANON_AppDir),$(VERIFY_DIRECTORY))
- 	@$(subst xxxx,$(CANON_AppDir)/strings,$(VERIFY_DIRECTORY))
- 	@$(subst xxxx,$(CANON_AppDir)/help,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/en-US,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/en-US/howto,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/en-US/howto/howtoweb.xhtml_data,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/en-US/howto/howtoword.xhtml_data,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/en-US/info,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/en-US/interface,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/en-US/interface/dialogreplace.xhtml_data,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/en-US/interface/menufile.xhtml_data,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/en-US/interface/workspace.xhtml_data,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/en-US/problems,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/en-US/tutorial,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/images,$(VERIFY_DIRECTORY))
- 	@$(ABICOPY) $(USERDIR)/wp/readme.txt $(CANON_AppDir)
- 	@$(ABICOPY) $(USERDIR)/wp/system.profile* $(CANON_AppDir)
- 	@$(ABICOPY) $(USERDIR)/wp/strings/*.strings $(CANON_AppDir)/strings
--	(cd $(USERDIR)/wp/help; tar cf - images ./*.* $(CANON_Lang)/*.* $(CANON_Lang)/*/*.*) | (cd $(CANON_AppDir)/help; tar xf -)
--	@$(ABICOPY) $(ABI_ROOT)/CREDITS.TXT $(CANON_AppDir)/help/en-US/credits.txt
diff --git a/editors/abiword-devel/files/patch-aq b/editors/abiword-devel/files/patch-aq
deleted file mode 100644
index ed0324f287e6..000000000000
--- a/editors/abiword-devel/files/patch-aq
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/config/abi_defs.mk	Fri Jun  9 15:48:49 2000
-+++ src/config/abi_defs.mk.new	Thu Jun 22 16:32:03 2000
-@@ -124,11 +124,11 @@
- ## INSTALL program...
- 
- define MAKE_OBJDIR
--if test ! -d $(@D); then rm -rf $(@D); mkdir -p $(@D); fi
-+if test ! -d $(@D); then rm -rf $(@D); $(ABIMKDIR) -p $(@D); fi
- endef
- 
- define VERIFY_DIRECTORY
--if test ! -d xxxx; then rm -rf xxxx; mkdir -p  xxxx; fi
-+if test ! -d xxxx; then rm -rf xxxx; $(ABIMKDIR) -p  xxxx; fi
- endef
- 
- ifeq ($(OS_NAME), WIN32)
-@@ -160,7 +160,9 @@
- ##################################################################
- ##################################################################
- 
--ABICOPY=cp
-+ABICOPY = cp
-+ABICHMOD = chmod
-+ABIMKDIR = mkdir -m u=rwx,go=rx
- 
- ifdef ABISOURCE_LICENSED_TRADEMARKS
- ABI_TMDEFS=	-DABISOURCE_LICENSED_TRADEMARKS
diff --git a/editors/abiword-devel/files/patch-ar b/editors/abiword-devel/files/patch-ar
deleted file mode 100644
index 5832a8deed5c..000000000000
--- a/editors/abiword-devel/files/patch-ar
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/pkg/common/unix/scripts/install.sh.orig	Sat Apr  7 10:59:52 2001
-+++ src/pkg/common/unix/scripts/install.sh	Wed Aug  8 13:31:57 2001
-@@ -80,7 +80,7 @@
- 
- echo "Installing program binaries to [$LIBEXECDIR]..."
- # Setup bins 
--(cd $SRCDIR/bin; tar cf - *) | (cd $LIBEXECDIR; tar xf -)
-+(cd $SRCDIR/bin; cp Abi* $LIBEXECDIR)
- 
- ########################################################################
- # If we're on Solaris, run makepsres on the font path
diff --git a/editors/abiword-devel/files/patch-autogen.sh b/editors/abiword-devel/files/patch-autogen.sh
deleted file mode 100644
index 84fe028e64ac..000000000000
--- a/editors/abiword-devel/files/patch-autogen.sh
+++ /dev/null
@@ -1,71 +0,0 @@
---- autogen.sh.orig	Thu Oct 17 08:19:31 2002
-+++ autogen.sh	Fri Feb 21 23:47:48 2003
-@@ -10,20 +10,20 @@
- 
- rm -f autogen.err
- 
--automake --version | perl -ne 'if (/\(GNU automake\) ([0-9].[0-9])/) {print;  if ($1 < 1.4) {exit 1;}}'
-+%%AUTOMAKE%% --version | perl -ne 'if (/\(GNU automake\) ([0-9].[0-9])/) {print; if ($1 < 1.4) {exit 1;}}'
- 
- if [ $? -ne 0 ]; then
-     echo "Error: you need automake 1.4 or later.  Please upgrade."
-     exit 1
- fi
- 
--if test ! -d `aclocal --print-ac-dir 2>> autogen.err`; then
--  echo "Bad aclocal (automake) installation"
-+if test ! -d `%%ACLOCAL%% --print-ac-dir 2>> autogen.err`; then
-+  echo "Bad %%ACLOCAL%% (automake) installation"
-   exit 1
- fi
- 
- for script in `cd ac-helpers/fallback; echo *.m4`; do
--  if test -r `aclocal --print-ac-dir 2>> autogen.err`/$script; then
-+  if test -r `%%ACLOCAL%% --print-ac-dir 2>> autogen.err`/$script; then
-     # Perhaps it was installed recently
-     rm -f ac-helpers/$script
-   else
-@@ -34,17 +34,17 @@
- 
- # Produce aclocal.m4, so autoconf gets the automake macros it needs
- # 
--echo "Creating aclocal.m4: aclocal -I ac-helpers $ACLOCAL_FLAGS"
-+echo "Creating aclocal.m4: %%ACLOCAL%% -I ac-helpers $ACLOCAL_FLAGS"
- 
--aclocal -I ac-helpers $ACLOCAL_FLAGS 2>> autogen.err
-+%%ACLOCAL%% -I ac-helpers $ACLOCAL_FLAGS 2>> autogen.err
- 
- echo "Checking for PKG_CHECK_MODULES..."
- 
- pkgcheckdef=`grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN`
- if test "x$pkgcheckdef" = "x"; then
--  echo "Running aclocal -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS"
--  (aclocal -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS 2>> autogen.err) || {
--    echo "aclocal failed! Unable to continue."
-+  echo "Running %%ACLOCAL%% -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS"
-+  (%%ACLOCAL%% -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS 2>> autogen.err) || {
-+    echo "%%ACLOCAL%% failed! Unable to continue."
-     exit 1
-   }
-   pkgcheckdef=`grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN`
-@@ -66,9 +66,9 @@
- # Produce all the `GNUmakefile.in's and create neat missing things
- # like `install-sh', etc.
- # 
--echo "automake --add-missing --copy --foreign"
-+echo "%%AUTOMAKE%% --add-missing --copy --foreign"
- 
--automake --add-missing --copy --foreign 2>> autogen.err || {
-+%%AUTOMAKE%% --add-missing --copy --foreign 2>> autogen.err || {
-     echo ""
-     echo "* * * warning: possible errors while running automake - check autogen.err"
-     echo ""
-@@ -84,7 +84,7 @@
- # 
- echo "Creating configure..."
- 
--autoconf 2>> autogen.err || {
-+%%AUTOCONF%% 2>> autogen.err || {
-     echo ""
-     echo "* * * warning: possible errors while running automake - check autogen.err"
-     echo ""
diff --git a/editors/abiword-devel/files/patch-ax b/editors/abiword-devel/files/patch-ax
deleted file mode 100644
index 91ab0177588d..000000000000
--- a/editors/abiword-devel/files/patch-ax
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../wv/libole2/ms-ole.h	Sun Oct  6 20:18:41 2002
-+++ ../wv/libole2/ms-ole.h.new	Sun Oct  6 20:18:48 2002
-@@ -20,6 +20,7 @@
- #if defined(__QNXNTO__)
- # include <sys/types.h>	
- #endif
-+# include <sys/types.h>	
- # include <fcntl.h>       /* for mode_t */
- #else
- # include <stdlib.h>
diff --git a/editors/abiword-devel/files/patch-src::wp::ap::unix::ap_UnixApp.cpp b/editors/abiword-devel/files/patch-src::wp::ap::unix::ap_UnixApp.cpp
deleted file mode 100644
index 9af484ab202f..000000000000
--- a/editors/abiword-devel/files/patch-src::wp::ap::unix::ap_UnixApp.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/wp/ap/unix/ap_UnixApp.cpp.orig	Thu Dec  6 09:00:14 2001
-+++ src/wp/ap/unix/ap_UnixApp.cpp	Mon Dec 17 13:49:48 2001
-@@ -612,7 +612,7 @@
-   {
-       pluginDir = pluginList[i];
- 
--      n = scandir(pluginDir.c_str(), &namelist, so_only, alphasort);
-+      n = scandir(pluginDir.c_str(), &namelist, (int (*)(dirent *))so_only, alphasort);
-       UT_DEBUGMSG(("DOM: found %d plugins in %s\n", n, pluginDir.c_str()));
- 
-       if (n > 0)
diff --git a/editors/abiword-devel/files/patch-src_af_xap_unix_xap_UnixFontManager.cpp b/editors/abiword-devel/files/patch-src_af_xap_unix_xap_UnixFontManager.cpp
deleted file mode 100644
index f30c23b080cc..000000000000
--- a/editors/abiword-devel/files/patch-src_af_xap_unix_xap_UnixFontManager.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/af/xap/unix/xap_UnixFontManager.cpp.orig	Sat Feb 22 01:00:28 2003
-+++ src/af/xap/unix/xap_UnixFontManager.cpp	Sat Feb 22 01:00:57 2003
-@@ -808,30 +808,30 @@
- 		switch (f)
- 		{
- 		case GR_Font::FF_Roman:
--			m_f[f].setFont(searchFont("Times-12"));
-+			m_f[f].setFont(searchFont("Times 12"));
- 			break;
- 
- 		case GR_Font::FF_Swiss:
--			m_f[f].setFont(searchFont("Helvetica-12"));
-+			m_f[f].setFont(searchFont("Helvetica 12"));
- 			break;
- 
- 		case GR_Font::FF_Modern:
--			m_f[f].setFont(searchFont("Courier-12"));
-+			m_f[f].setFont(searchFont("Courier 12"));
- 			break;
- 
- 		case GR_Font::FF_Script:
--			m_f[f].setFont(searchFont("Cursive-12"));
-+			m_f[f].setFont(searchFont("Cursive 12"));
- 			break;
- 
- 		case GR_Font::FF_Decorative:
--			m_f[f].setFont(searchFont("Old English-12"));
-+			m_f[f].setFont(searchFont("Old English 12"));
- 			break;
- 
- 		// ugh!?  BiDi is not a font family, what is it doing here?
- 		// And what's that "Technical" thing?
- 		case GR_Font::FF_Technical:
- 		case GR_Font::FF_BiDi:
--			m_f[f].setFont(searchFont("Arial-12"));
-+			m_f[f].setFont(searchFont("Arial 12"));
- 			break;
- 			
- 		default:
diff --git a/editors/abiword-devel/files/patch-src_pkg_linux_rpm_data_abiword.desktop b/editors/abiword-devel/files/patch-src_pkg_linux_rpm_data_abiword.desktop
deleted file mode 100644
index b875f7db74c2..000000000000
--- a/editors/abiword-devel/files/patch-src_pkg_linux_rpm_data_abiword.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/pkg/linux/rpm/data/abiword.desktop.orig	Sun Dec  8 19:56:43 2002
-+++ src/pkg/linux/rpm/data/abiword.desktop	Sat Feb 22 00:25:22 2003
-@@ -8,9 +8,9 @@
- Comment[fr]=Traitement de texte AbiWord
- Comment[pt]=Processador de Texto Abiword
- Comment[sv]=Ordbehandlaren Abiword
--Exec=abiword-2.0
-+Exec=AbiWord-2.0
- Icon=abiword_48.png
- Terminal=0
- Type=Application
--Categories=Application;Office;WordProcessor;X-Red-Hat-Base;
-+Categories=Application;Office;WordProcessor;
- StartupNotify=true
diff --git a/editors/abiword-devel/files/patch-src_wp_ap_unix_ap_UnixApp.cpp b/editors/abiword-devel/files/patch-src_wp_ap_unix_ap_UnixApp.cpp
deleted file mode 100644
index 69aae909af8c..000000000000
--- a/editors/abiword-devel/files/patch-src_wp_ap_unix_ap_UnixApp.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/wp/ap/unix/ap_UnixApp.cpp.orig	Sat Feb 22 01:21:20 2003
-+++ src/wp/ap/unix/ap_UnixApp.cpp	Sat Feb 22 01:21:31 2003
-@@ -1241,7 +1241,7 @@
-     pMyUnixApp->shutdown();
-     delete pMyUnixApp;
-     
--    poptFreeContext (Args.poptcon);
-+    //poptFreeContext (Args.poptcon);
-     return 0;
- }
- 
diff --git a/editors/abiword-devel/pkg-descr b/editors/abiword-devel/pkg-descr
deleted file mode 100644
index 7a56a95478fe..000000000000
--- a/editors/abiword-devel/pkg-descr
+++ /dev/null
@@ -1,22 +0,0 @@
-AbiWord is an open-source, cross-platform WYSIWYG word processor.  It works
-on Windows and most Unix Systems.
-
-Features include: 
-
- - Basic character formatting (bold, underline, italics, etc.) 
- - Paragraph alignment 
- - Spell-check 
- - Import of Word97 and RTF documents 
- - Export to RTF, Text, HTML, and LaTeX formats 
- - Interactive rulers and tabs 
- - Styles 
- - Unlimited undo/redo 
- - Multiple column control 
- - Widow/orphan control 
- - Find/Replace 
- - Anti-aliased fonts
- - Images 
-
-For more information, or to see screenshots, visit the AbiSource home page
-at
-WWW:  http://www.abisource.com/
diff --git a/editors/abiword-devel/pkg-message b/editors/abiword-devel/pkg-message
deleted file mode 100644
index 57ce22a065d7..000000000000
--- a/editors/abiword-devel/pkg-message
+++ /dev/null
@@ -1,21 +0,0 @@
-In order to use AbiWord, you may have to add one or more lines to your
-XF86Config file, usually located in /etc/X11/XF86Config or /etc/XF86Config.
-
-For XFree86 >= 4, add the following line to the "Module" section:
-
-	Load "type1"
-
-For other X servers, please consult your documentation.
-
-Also, if you are going to display AbiWord on a remote X server, besides
-following the instructions above, please make sure that the files in the
-${PREFIX}/share/AbiSuite-2.0/fonts directory are available to the remote X
-server and add the ${PREFIX}/share/AbiSuite-2.0/fonts into server's font
-path. For XFree86, add the following line to the "Files" section:
-
-	FontPath "${PREFIX}/share/AbiSuite-2.0/fonts"
-
-If you use a different X server, please see its documentation on how to
-do this.
-
-Finally, re-start your X server.
diff --git a/editors/abiword-devel/pkg-plist b/editors/abiword-devel/pkg-plist
deleted file mode 100644
index 540649c565fa..000000000000
--- a/editors/abiword-devel/pkg-plist
+++ /dev/null
@@ -1,372 +0,0 @@
-bin/ttftool
-bin/ttfadmin.sh
-bin/AbiWord-2.0
-bin/abiword
-share/AbiSuite-2.0/AbiWord/bin/AbiWord_d
-share/AbiSuite-2.0/AbiWord/readme.txt
-share/AbiSuite-2.0/AbiWord/system.profile
-share/AbiSuite-2.0/AbiWord/system.profile-CP1254
-share/AbiSuite-2.0/AbiWord/system.profile-KOI8-R
-share/AbiSuite-2.0/AbiWord/system.profile-KOI8-U
-share/AbiSuite-2.0/AbiWord/system.profile-KOI8-UB
-share/AbiSuite-2.0/AbiWord/system.profile-am-ET
-share/AbiSuite-2.0/AbiWord/system.profile-bg-BG
-share/AbiSuite-2.0/AbiWord/system.profile-ca-ES
-share/AbiSuite-2.0/AbiWord/system.profile-cs-CZ
-share/AbiSuite-2.0/AbiWord/system.profile-da-DK
-share/AbiSuite-2.0/AbiWord/system.profile-de
-share/AbiSuite-2.0/AbiWord/system.profile-de-AT
-share/AbiSuite-2.0/AbiWord/system.profile-de-CH
-share/AbiSuite-2.0/AbiWord/system.profile-de-DE
-share/AbiSuite-2.0/AbiWord/help/en-US/aboutos.html
-share/AbiSuite-2.0/AbiWord/help/en-US/credits.html
-share/AbiSuite-2.0/AbiWord/help/en-US/fdl.html
-share/AbiSuite-2.0/AbiWord/help/en-US/histyle.css
-share/AbiSuite-2.0/AbiWord/help/en-US/index.html
-share/AbiSuite-2.0/AbiWord/help/en-US/introduction.html
-share/AbiSuite-2.0/AbiWord/help/en-US/search.html
-share/AbiSuite-2.0/AbiWord/help/en-US/style.css
-share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtonormaltemplate.html
-share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtotables.html
-share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoweb.html
-share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoword.html
-share/AbiSuite-2.0/AbiWord/help/en-US/howto/index.html
-share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoweb.xhtml_data/ruler.png
-share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoword.xhtml_data/gettingstarted.abw-0.png
-share/AbiSuite-2.0/AbiWord/help/en-US/info/index.html
-share/AbiSuite-2.0/AbiWord/help/en-US/info/inforequirements.html
-share/AbiSuite-2.0/AbiWord/help/en-US/info/infospelling.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogactivatewindow.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogbackgroundcolor.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogbookmark.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogbreak.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogchangecase.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogcolumns.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogdateandtime.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogfield.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogfind.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogfont.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogformatheaderfooters.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialoggoto.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialoghyperlink.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogimageproperties.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialoglanguage.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialoglists.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogmodifystyle.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialognew.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialognewstyle.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogopenlinux.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogpagenumbers.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogpagesetup.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogparagraph.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogplugins.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogpreferences.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogreplace.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogsavelinux.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogscreencolor.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogspelling.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogstyles.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogsymbol.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogtabs.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogwordcount.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogzoom.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/index.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menucontextual.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuedit.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menufile.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuformat.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuhelp.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuinsert.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menutools.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuview.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuweb.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuwindow.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/rulers.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/toolbarextra.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/toolbarformatting.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/toolbarstandard.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogreplace.xhtml_data/replace.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menufile.xhtml_data/menufile.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data/full_window.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data/functionbars.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data/functionbars_hiding.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data/grabbar_shaded.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data/ruler.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data/statusbar.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data/statusbar_quickhelp.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data/titlebar.png
-share/AbiSuite-2.0/AbiWord/help/en-US/problems/index.html
-share/AbiSuite-2.0/AbiWord/help/en-US/problems/problemsbugs.html
-share/AbiSuite-2.0/AbiWord/help/en-US/problems/problemsfaq.html
-share/AbiSuite-2.0/AbiWord/help/en-US/problems/problemsfonts.html
-share/AbiSuite-2.0/AbiWord/help/en-US/problems/problemshelp.html
-share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/index.html
-share/AbiSuite-2.0/AbiWord/help/en-US/credits.txt
-share/AbiSuite-2.0/AbiWord/system.profile-el-GR
-share/AbiSuite-2.0/AbiWord/system.profile-en
-share/AbiSuite-2.0/AbiWord/system.profile-en-AU
-share/AbiSuite-2.0/AbiWord/system.profile-en-CA
-share/AbiSuite-2.0/AbiWord/system.profile-en-GB
-share/AbiSuite-2.0/AbiWord/system.profile-en-IE
-share/AbiSuite-2.0/AbiWord/system.profile-en-NZ
-share/AbiSuite-2.0/AbiWord/system.profile-en-US
-share/AbiSuite-2.0/AbiWord/system.profile-en-ZA
-share/AbiSuite-2.0/AbiWord/system.profile-es
-share/AbiSuite-2.0/AbiWord/system.profile-es-ES
-share/AbiSuite-2.0/AbiWord/system.profile-es-MX
-share/AbiSuite-2.0/AbiWord/system.profile-fi-FI
-share/AbiSuite-2.0/AbiWord/system.profile-fr
-share/AbiSuite-2.0/AbiWord/system.profile-fr-BE
-share/AbiSuite-2.0/AbiWord/system.profile-fr-CA
-share/AbiSuite-2.0/AbiWord/system.profile-fr-CH
-share/AbiSuite-2.0/AbiWord/system.profile-fr-FR
-share/AbiSuite-2.0/AbiWord/system.profile-gl-ES
-share/AbiSuite-2.0/AbiWord/system.profile-hu-HU
-share/AbiSuite-2.0/AbiWord/system.profile-it-IT
-share/AbiSuite-2.0/AbiWord/system.profile-ja-JP
-share/AbiSuite-2.0/AbiWord/system.profile-lt-LT
-share/AbiSuite-2.0/AbiWord/system.profile-nb-NO
-share/AbiSuite-2.0/AbiWord/system.profile-nl-NL
-share/AbiSuite-2.0/AbiWord/system.profile-nn-NO
-share/AbiSuite-2.0/AbiWord/system.profile-pl-PL
-share/AbiSuite-2.0/AbiWord/system.profile-pt-BR
-share/AbiSuite-2.0/AbiWord/system.profile-pt-PT
-share/AbiSuite-2.0/AbiWord/system.profile-ru
-share/AbiSuite-2.0/AbiWord/system.profile-ru-RU
-share/AbiSuite-2.0/AbiWord/system.profile-sk-SK
-share/AbiSuite-2.0/AbiWord/system.profile-sk-SK.CP1250
-share/AbiSuite-2.0/AbiWord/system.profile-sl
-share/AbiSuite-2.0/AbiWord/system.profile-sv
-share/AbiSuite-2.0/AbiWord/system.profile-sv-SE
-share/AbiSuite-2.0/AbiWord/system.profile-tr
-share/AbiSuite-2.0/AbiWord/system.profile-tr-TR
-share/AbiSuite-2.0/AbiWord/system.profile-tr-TR.CP1254
-share/AbiSuite-2.0/AbiWord/system.profile-uk-UA
-share/AbiSuite-2.0/AbiWord/system.profile-zh-CN
-share/AbiSuite-2.0/AbiWord/system.profile-zh-TW
-share/AbiSuite-2.0/AbiWord/scripts/abw2html.pl
-share/AbiSuite-2.0/AbiWord/strings/am-ET.strings
-share/AbiSuite-2.0/AbiWord/strings/art-lojban.strings
-share/AbiSuite-2.0/AbiWord/strings/bg-BG.strings
-share/AbiSuite-2.0/AbiWord/strings/ca-ES.strings
-share/AbiSuite-2.0/AbiWord/strings/cs-CZ.strings
-share/AbiSuite-2.0/AbiWord/strings/cy-GB.strings
-share/AbiSuite-2.0/AbiWord/strings/da-DK.strings
-share/AbiSuite-2.0/AbiWord/strings/de-CH.strings
-share/AbiSuite-2.0/AbiWord/strings/de-DE.strings
-share/AbiSuite-2.0/AbiWord/strings/el-GR.strings
-share/AbiSuite-2.0/AbiWord/strings/en-AU.strings
-share/AbiSuite-2.0/AbiWord/strings/en-GB.strings
-share/AbiSuite-2.0/AbiWord/strings/en-IE.strings
-share/AbiSuite-2.0/AbiWord/strings/es-ES.strings
-share/AbiSuite-2.0/AbiWord/strings/es-MX.strings
-share/AbiSuite-2.0/AbiWord/strings/eu-ES.strings
-share/AbiSuite-2.0/AbiWord/strings/fi-FI.strings
-share/AbiSuite-2.0/AbiWord/strings/fr-FR.strings
-share/AbiSuite-2.0/AbiWord/strings/ga-IE.strings
-share/AbiSuite-2.0/AbiWord/strings/gl-ES.strings
-share/AbiSuite-2.0/AbiWord/strings/he-IL.strings
-share/AbiSuite-2.0/AbiWord/strings/hu-HU.strings
-share/AbiSuite-2.0/AbiWord/strings/id-ID.strings
-share/AbiSuite-2.0/AbiWord/strings/it-IT.strings
-share/AbiSuite-2.0/AbiWord/strings/ja-JP.strings
-share/AbiSuite-2.0/AbiWord/strings/lt-LT.strings
-share/AbiSuite-2.0/AbiWord/strings/mh-MH.strings
-share/AbiSuite-2.0/AbiWord/strings/ms-MY.strings
-share/AbiSuite-2.0/AbiWord/strings/nb-NO.strings
-share/AbiSuite-2.0/AbiWord/strings/nl-NL.strings
-share/AbiSuite-2.0/AbiWord/strings/nn-NO.strings
-share/AbiSuite-2.0/AbiWord/strings/pl-PL.strings
-share/AbiSuite-2.0/AbiWord/strings/pt-BR.strings
-share/AbiSuite-2.0/AbiWord/strings/pt-PT.strings
-share/AbiSuite-2.0/AbiWord/strings/ro-RO.strings
-share/AbiSuite-2.0/AbiWord/strings/ru-RU.strings
-share/AbiSuite-2.0/AbiWord/strings/sk-SK.strings
-share/AbiSuite-2.0/AbiWord/strings/sl-SI.strings
-share/AbiSuite-2.0/AbiWord/strings/sq-AL.strings
-share/AbiSuite-2.0/AbiWord/strings/sr-SR.strings
-share/AbiSuite-2.0/AbiWord/strings/sv-SE.strings
-share/AbiSuite-2.0/AbiWord/strings/tr-TR.strings
-share/AbiSuite-2.0/AbiWord/strings/uk-UA.strings
-share/AbiSuite-2.0/AbiWord/strings/vi-VN.strings
-share/AbiSuite-2.0/AbiWord/strings/yi.strings
-share/AbiSuite-2.0/AbiWord/strings/zh-CN.strings
-share/AbiSuite-2.0/AbiWord/strings/zh-HK.strings
-share/AbiSuite-2.0/AbiWord/strings/zh-TW.strings
-share/AbiSuite-2.0/fonts/a010013l.afm
-share/AbiSuite-2.0/fonts/a010013l.pfb
-share/AbiSuite-2.0/fonts/a010015l.afm
-share/AbiSuite-2.0/fonts/a010015l.pfb
-share/AbiSuite-2.0/fonts/a010033l.afm
-share/AbiSuite-2.0/fonts/a010033l.pfb
-share/AbiSuite-2.0/fonts/a010035l.afm
-share/AbiSuite-2.0/fonts/a010035l.pfb
-share/AbiSuite-2.0/fonts/adobe-full.u2g
-share/AbiSuite-2.0/fonts/adobe-short.u2g
-share/AbiSuite-2.0/fonts/b018012l.afm
-share/AbiSuite-2.0/fonts/b018012l.pfb
-share/AbiSuite-2.0/fonts/b018015l.afm
-share/AbiSuite-2.0/fonts/b018015l.pfb
-share/AbiSuite-2.0/fonts/b018032l.afm
-share/AbiSuite-2.0/fonts/b018032l.pfb
-share/AbiSuite-2.0/fonts/b018035l.afm
-share/AbiSuite-2.0/fonts/b018035l.pfb
-share/AbiSuite-2.0/fonts/bchb.afm
-share/AbiSuite-2.0/fonts/bchb.pfa
-share/AbiSuite-2.0/fonts/bchbi.afm
-share/AbiSuite-2.0/fonts/bchbi.pfa
-share/AbiSuite-2.0/fonts/bchr.afm
-share/AbiSuite-2.0/fonts/bchr.pfa
-share/AbiSuite-2.0/fonts/bchri.afm
-share/AbiSuite-2.0/fonts/bchri.pfa
-share/AbiSuite-2.0/fonts/c059013l.afm
-share/AbiSuite-2.0/fonts/c059013l.pfb
-share/AbiSuite-2.0/fonts/c059016l.afm
-share/AbiSuite-2.0/fonts/c059016l.pfb
-share/AbiSuite-2.0/fonts/c059033l.afm
-share/AbiSuite-2.0/fonts/c059033l.pfb
-share/AbiSuite-2.0/fonts/c059036l.afm
-share/AbiSuite-2.0/fonts/c059036l.pfb
-share/AbiSuite-2.0/fonts/d050000l.afm
-share/AbiSuite-2.0/fonts/d050000l.pfb
-share/AbiSuite-2.0/fonts/d050000l.u2g
-share/AbiSuite-2.0/fonts/dingbats.e2u
-share/AbiSuite-2.0/fonts/fonts.dir
-share/AbiSuite-2.0/fonts/fonts.scale
-share/AbiSuite-2.0/fonts/n019003l.afm
-share/AbiSuite-2.0/fonts/n019003l.pfb
-share/AbiSuite-2.0/fonts/n019004l.afm
-share/AbiSuite-2.0/fonts/n019004l.pfb
-share/AbiSuite-2.0/fonts/n019023l.afm
-share/AbiSuite-2.0/fonts/n019023l.pfb
-share/AbiSuite-2.0/fonts/n019024l.afm
-share/AbiSuite-2.0/fonts/n019024l.pfb
-share/AbiSuite-2.0/fonts/n019043l.afm
-share/AbiSuite-2.0/fonts/n019043l.pfb
-share/AbiSuite-2.0/fonts/n019044l.afm
-share/AbiSuite-2.0/fonts/n019044l.pfb
-share/AbiSuite-2.0/fonts/n019063l.afm
-share/AbiSuite-2.0/fonts/n019063l.pfb
-share/AbiSuite-2.0/fonts/n019064l.afm
-share/AbiSuite-2.0/fonts/n019064l.pfb
-share/AbiSuite-2.0/fonts/n021003l.afm
-share/AbiSuite-2.0/fonts/n021003l.pfb
-share/AbiSuite-2.0/fonts/n021004l.afm
-share/AbiSuite-2.0/fonts/n021004l.pfb
-share/AbiSuite-2.0/fonts/n021023l.afm
-share/AbiSuite-2.0/fonts/n021023l.pfb
-share/AbiSuite-2.0/fonts/n021024l.afm
-share/AbiSuite-2.0/fonts/n021024l.pfb
-share/AbiSuite-2.0/fonts/n022003l.afm
-share/AbiSuite-2.0/fonts/n022003l.pfb
-share/AbiSuite-2.0/fonts/n022004l.afm
-share/AbiSuite-2.0/fonts/n022004l.pfb
-share/AbiSuite-2.0/fonts/n022023l.afm
-share/AbiSuite-2.0/fonts/n022023l.pfb
-share/AbiSuite-2.0/fonts/n022024l.afm
-share/AbiSuite-2.0/fonts/n022024l.pfb
-share/AbiSuite-2.0/fonts/p052003l.afm
-share/AbiSuite-2.0/fonts/p052003l.pfb
-share/AbiSuite-2.0/fonts/p052004l.afm
-share/AbiSuite-2.0/fonts/p052004l.pfb
-share/AbiSuite-2.0/fonts/p052023l.afm
-share/AbiSuite-2.0/fonts/p052023l.pfb
-share/AbiSuite-2.0/fonts/p052024l.afm
-share/AbiSuite-2.0/fonts/p052024l.pfb
-share/AbiSuite-2.0/fonts/s050000l.afm
-share/AbiSuite-2.0/fonts/s050000l.pfb
-share/AbiSuite-2.0/fonts/s050000l.u2g
-share/AbiSuite-2.0/fonts/symbol.e2u
-share/AbiSuite-2.0/fonts/z003034l.afm
-share/AbiSuite-2.0/fonts/z003034l.pfb
-share/AbiSuite-2.0/GNOME_AbiWord_Control_1_0.oaf
-share/AbiSuite-2.0/Nautilus_View_AbiWord.oaf
-share/AbiSuite-2.0/README
-share/AbiSuite-2.0/nautilus-abiword-content-view-ui.xml
-share/AbiSuite-2.0/clipart/book.png
-share/AbiSuite-2.0/clipart/chip.png
-share/AbiSuite-2.0/clipart/fun.png
-share/AbiSuite-2.0/clipart/gear.png
-share/AbiSuite-2.0/clipart/gnomea.png
-share/AbiSuite-2.0/clipart/gnomeb.png
-share/AbiSuite-2.0/clipart/gnomec.png
-share/AbiSuite-2.0/clipart/gnomecorner.png
-share/AbiSuite-2.0/clipart/gnomed.png
-share/AbiSuite-2.0/clipart/gnomedecor1.png
-share/AbiSuite-2.0/clipart/gnomedecor2.png
-share/AbiSuite-2.0/clipart/gnomee.png
-share/AbiSuite-2.0/clipart/gnomeflowers.png
-share/AbiSuite-2.0/clipart/gnomeline.png
-share/AbiSuite-2.0/clipart/idea.png
-share/AbiSuite-2.0/clipart/lamp.png
-share/AbiSuite-2.0/clipart/monitor.png
-share/AbiSuite-2.0/clipart/music1.png
-share/AbiSuite-2.0/clipart/pinceau.png
-share/AbiSuite-2.0/clipart/simca.png
-share/AbiSuite-2.0/clipart/surprise.png
-share/AbiSuite-2.0/clipart/together.png
-share/AbiSuite-2.0/clipart/toolbox.png
-share/AbiSuite-2.0/clipart/tree.png
-share/AbiSuite-2.0/clipart/tux_bordelais.png
-share/AbiSuite-2.0/clipart/weather.png
-share/AbiSuite-2.0/clipart/write.png
-share/AbiSuite-2.0/dictionary/american.hash
-share/AbiSuite-2.0/dictionary/ispell_dictionary_list.xml
-share/AbiSuite-2.0/icons/abiword_16.xpm
-share/AbiSuite-2.0/icons/abiword_48.png
-share/AbiSuite-2.0/icons/abiword_48.tif
-share/AbiSuite-2.0/icons/abiword_48.xpm
-share/AbiSuite-2.0/templates/A4.awt
-share/AbiSuite-2.0/templates/Business-Report.awt
-share/AbiSuite-2.0/templates/Employee-Directory.awt
-share/AbiSuite-2.0/templates/Fax-Coversheet.awt
-share/AbiSuite-2.0/templates/Two-Columns.awt
-share/AbiSuite-2.0/templates/US-Letter.awt
-share/AbiSuite-2.0/templates/normal.awt
-share/gnome/apps/Applications/abiword.desktop
-share/gnome/pixmaps/abiword_48.png
-@dirrm share/AbiSuite-2.0/AbiWord/bin
-@dirrm share/AbiSuite-2.0/AbiWord/help/de-DE/de_DE
-@dirrm share/AbiSuite-2.0/AbiWord/help/de-DE/images
-@dirrm share/AbiSuite-2.0/AbiWord/help/de-DE
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoweb.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoword.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/howto
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/images
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/info
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogreplace.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface/menufile.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface/rulers.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/problems
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/tutorial
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US
-@dirrm share/AbiSuite-2.0/AbiWord/help/es-ES
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/howto/howtoweb.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/howto/howtoword.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/howto
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/images
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/info
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/interface/dialogreplace.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/interface/rulers.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/interface/workspace.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/interface
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/plugins
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/problems
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/tutorial
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR
-@dirrm share/AbiSuite-2.0/AbiWord/help/images
-@dirrm share/AbiSuite-2.0/AbiWord/help
-@dirrm share/AbiSuite-2.0/AbiWord/sample/en-US
-@dirrm share/AbiSuite-2.0/AbiWord/sample
-@dirrm share/AbiSuite-2.0/AbiWord/scripts
-@dirrm share/AbiSuite-2.0/AbiWord/strings
-@dirrm share/AbiSuite-2.0/AbiWord
-@dirrm share/AbiSuite-2.0/fonts
-@dirrm share/AbiSuite-2.0/clipart
-@dirrm share/AbiSuite-2.0/dictionary
-@dirrm share/AbiSuite-2.0/icons
-@dirrm share/AbiSuite-2.0/templates
-@dirrm share/AbiSuite-2.0
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
deleted file mode 100644
index 8b6b6a6824cd..000000000000
--- a/editors/abiword/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-# New ports collection makefile for:    AbiWord2
-# Date created:         22 February 2003
-# Whom:                 Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	AbiWord2
-PORTVERSION=	1.1.3
-CATEGORIES=	editors
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
-MASTER_SITE_SUBDIR=	abiword
-DISTNAME=	abiword-${PORTVERSION}
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	An open-source, cross-platform WYSIWYG word processor
-
-# unzip is needed during the installation process
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
-		iconv.3:${PORTSDIR}/converters/libiconv \
-		gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
-		xml2.5:${PORTSDIR}/textproc/libxml2 \
-		fribidi.0:${PORTSDIR}/converters/fribidi
-
-DIST_SUBDIR=	AbiWord
-
-WRKSRC=		${WRKDIR}/abiword-${PORTVERSION}/abi
-
-USE_X_PREFIX=	yes
-USE_AUTOMAKE=	yes
-USE_AUTOMAKE_VER=14
-USE_AUTOCONF_VER=213
-USE_GMAKE=	yes
-USE_REINPLACE=	yes
-USE_GNOMENG=	yes
-USE_GNOME=	gnomehier
-WANT_GNOME=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -liconv"
-CONFIGURE_ARGS=	--enable-xft
-MAKEFILE=	GNUmakefile
-
-.include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/include/wv.h)
-BROKEN=	"This port cannot be built when textproc/wv is installed because of a header conflict.  Please remove textproc/wv, and resume the build.  If textproc/wv is no longer installed, please remove ${LOCALBASE}/include/wv.h, and resume the AbiWord build"
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%AUTOMAKE%%|${AUTOMAKE}|g ; \
-		s|%%ACLOCAL%%|${ACLOCAL}|g ; \
-		s|%%AUTOCONF%%|${AUTOCONF}|g' ${WRKSRC}/autogen.sh
-
-pre-configure:
-	@cd ${WRKSRC} && ${TOUCH} NEWS README AUTHORS ChangeLog INSTALL
-	@cd ${WRKSRC}/ac-helpers && ${RM} -f install-sh mkinstalldirs missing
-	@${RM} -f ${WRKSRC}/configure.ac
-	@cd ${WRKSRC} && ./autogen.sh && ${TRUE}
-	@${FIND} ${WRKSRC} -name GNUmakefile.in | xargs ${REINPLACE_CMD} -e \
-		's|[(]libdir[)]/@PACKAGE@|(datadir)/@PACKAGE@|g ; \
-		 s|@DEFS@|-I${WRKSRC}/../libiconv/include @DEFS@|g' && ${TRUE}
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-	@${INSTALL_DATA} ${WRKSRC}/src/pkg/linux/rpm/data/abiword.desktop \
-		${PREFIX}/share/gnome/apps/Applications/abiword.desktop
-	@${LN} -sf ${PREFIX}/share/AbiSuite-2.0/icons/abiword_48.png \
-		${PREFIX}/share/gnome/pixmaps/abiword_48.png
-
-.include <bsd.port.post.mk>
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
deleted file mode 100644
index fa29979a6760..000000000000
--- a/editors/abiword/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (AbiWord/abiword-1.1.3.tar.gz) = 6fdaf7e3cbc5aed2eb80e2054f54381f
diff --git a/editors/abiword/files/patch-..::wv::magick::Makefile.in b/editors/abiword/files/patch-..::wv::magick::Makefile.in
deleted file mode 100644
index bfba3a8beb67..000000000000
--- a/editors/abiword/files/patch-..::wv::magick::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- ../wv/magick/Makefile.in	2001/08/08 11:44:02	1.1
-+++ ../wv/magick/Makefile.in	2001/08/08 11:44:13
-@@ -40,7 +40,7 @@
- all: $(MAGICKOBJECTS)
- 
- %.$(OBJEXT): $(srcdir)/%.c 
--	$(CC) $(CFLAGS) -c $(srcdir)/$*.c 
-+	$(CC) @CPPFLAGS@ $(CFLAGS) -c $(srcdir)/$*.c 
- 
- clean:
- 	rm -rf *.$(OBJEXT) core a.$(OBJEXT)ut *.a
diff --git a/editors/abiword/files/patch-af b/editors/abiword/files/patch-af
deleted file mode 100644
index 502e8de76cd9..000000000000
--- a/editors/abiword/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/af/util/xp/ut_png.cpp.orig	Wed Apr 17 12:49:55 2002
-+++ src/af/util/xp/ut_png.cpp	Fri Apr 19 20:40:25 2002
-@@ -24,7 +24,7 @@
- #ifdef _AIX
- #define jmpbuf __jmpbuf
- #endif
--#include "png.h"
-+#include <png.h>
- 
- #include "ut_assert.h"
- #include "ut_bytebuf.h"
diff --git a/editors/abiword/files/patch-an b/editors/abiword/files/patch-an
deleted file mode 100644
index f2e91bdd806e..000000000000
--- a/editors/abiword/files/patch-an
+++ /dev/null
@@ -1,46 +0,0 @@
-
-$FreeBSD$
-
---- src/Makefile.orig	Thu May 30 17:51:53 2002
-+++ src/Makefile	Wed Jun  5 15:47:41 2002
-@@ -48,6 +48,7 @@
- 
- ## Set the following to a list of pathnames to be copied to $(CANONDIR)
- CANON_TOPLEVELFILES=	$(ABI_ROOT)/COPYING $(ABI_ROOT)/user/wp/readme.txt
-+CANON_TLF_NOTDIR=	$(notdir $(CANON_TOPLEVELFILES))
- 
- ## Set the following to a list of directories (probably a subset of DIRS)
- ## that have work to do.
-@@ -58,6 +59,9 @@
- 	@for k in $(CANON_TOPLEVELFILES); do			\
- 		$(ABICOPY) $$k $(CANONDIR);			\
- 	done
-+	@for k in $(CANON_TLF_NOTDIR); do			\
-+		$(ABICHMOD) ugo=r $(CANONDIR)/$$k;		\
-+	done
- 	@for k in $(CANON_SubDirs); do				\
- 		$(MAKE) ABI_ROOT=$(ABI_ROOT) -C $$k canonical;	\
- 	done
-@@ -72,6 +76,7 @@
- 			cp $$k american.hash;		\
- 			rm $$k ;			\
- 		done)
-+	@(cd $(CANONDIR)/dictionary; $(ABICHMOD) ugo=r *)
- # We currently only ship american.hash, so the above and below aren't logical.
- # For same reason, this will only copy american.hash-encoding once in place.  The rest is in abispell.
- 	@$(ABICOPY) $(ABI_ROOT)/../abidistfiles/dictionary/*.hash-encoding $(CANONDIR)/dictionary	
-@@ -112,10 +117,12 @@
- 	fi
- # icons for X window manager use
- 	@$(subst xxxx,$(CANONDIR)/icons,$(VERIFY_DIRECTORY))
--	(cd $(ABI_ROOT)/../abidistfiles/icons; cp abi* $(CANONDIR)/icons)
-+	(cd $(ABI_ROOT)/../abidistfiles/icons; $(ABICOPY) abi* $(CANONDIR)/icons)
-+	@(cd $(CANONDIR)/icons; $(ABICHMOD) ugo=r *_48*)
- # font stuff for installation
- 	@$(subst xxxx,$(CANONDIR)/fonts,$(VERIFY_DIRECTORY))
--	(cd $(ABI_ROOT)/../unixfonts/fonts ; cp *.* $(CANONDIR)/fonts)
-+	(cd $(ABI_ROOT)/../unixfonts/fonts ; $(ABICOPY) *.* $(CANONDIR)/fonts)
-+	@(cd $(CANONDIR)/fonts; $(ABICHMOD) ugo=r *.*)
- endif
- 
- ##################################################################
diff --git a/editors/abiword/files/patch-ap b/editors/abiword/files/patch-ap
deleted file mode 100644
index 76fbc4554e65..000000000000
--- a/editors/abiword/files/patch-ap
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/wp/Makefile.orig	Sat Apr 13 07:22:38 2002
-+++ src/wp/Makefile	Fri Apr 19 23:30:57 2002
-@@ -44,8 +44,18 @@
- 	@$(subst xxxx,$(CANON_AppDir),$(VERIFY_DIRECTORY))
- 	@$(subst xxxx,$(CANON_AppDir)/strings,$(VERIFY_DIRECTORY))
- 	@$(subst xxxx,$(CANON_AppDir)/help,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/en-US,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/en-US/howto,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/en-US/howto/howtoweb.xhtml_data,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/en-US/howto/howtoword.xhtml_data,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/en-US/info,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/en-US/interface,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/en-US/interface/dialogreplace.xhtml_data,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/en-US/interface/menufile.xhtml_data,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/en-US/interface/workspace.xhtml_data,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/en-US/problems,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/en-US/tutorial,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/images,$(VERIFY_DIRECTORY))
- 	@$(ABICOPY) $(USERDIR)/wp/readme.txt $(CANON_AppDir)
- 	@$(ABICOPY) $(USERDIR)/wp/system.profile* $(CANON_AppDir)
- 	@$(ABICOPY) $(USERDIR)/wp/strings/*.strings $(CANON_AppDir)/strings
--	(cd $(USERDIR)/wp/help; tar cf - images ./*.* $(CANON_Lang)/*.* $(CANON_Lang)/*/*.*) | (cd $(CANON_AppDir)/help; tar xf -)
--	@$(ABICOPY) $(ABI_ROOT)/CREDITS.TXT $(CANON_AppDir)/help/en-US/credits.txt
diff --git a/editors/abiword/files/patch-aq b/editors/abiword/files/patch-aq
deleted file mode 100644
index ed0324f287e6..000000000000
--- a/editors/abiword/files/patch-aq
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/config/abi_defs.mk	Fri Jun  9 15:48:49 2000
-+++ src/config/abi_defs.mk.new	Thu Jun 22 16:32:03 2000
-@@ -124,11 +124,11 @@
- ## INSTALL program...
- 
- define MAKE_OBJDIR
--if test ! -d $(@D); then rm -rf $(@D); mkdir -p $(@D); fi
-+if test ! -d $(@D); then rm -rf $(@D); $(ABIMKDIR) -p $(@D); fi
- endef
- 
- define VERIFY_DIRECTORY
--if test ! -d xxxx; then rm -rf xxxx; mkdir -p  xxxx; fi
-+if test ! -d xxxx; then rm -rf xxxx; $(ABIMKDIR) -p  xxxx; fi
- endef
- 
- ifeq ($(OS_NAME), WIN32)
-@@ -160,7 +160,9 @@
- ##################################################################
- ##################################################################
- 
--ABICOPY=cp
-+ABICOPY = cp
-+ABICHMOD = chmod
-+ABIMKDIR = mkdir -m u=rwx,go=rx
- 
- ifdef ABISOURCE_LICENSED_TRADEMARKS
- ABI_TMDEFS=	-DABISOURCE_LICENSED_TRADEMARKS
diff --git a/editors/abiword/files/patch-ar b/editors/abiword/files/patch-ar
deleted file mode 100644
index 5832a8deed5c..000000000000
--- a/editors/abiword/files/patch-ar
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/pkg/common/unix/scripts/install.sh.orig	Sat Apr  7 10:59:52 2001
-+++ src/pkg/common/unix/scripts/install.sh	Wed Aug  8 13:31:57 2001
-@@ -80,7 +80,7 @@
- 
- echo "Installing program binaries to [$LIBEXECDIR]..."
- # Setup bins 
--(cd $SRCDIR/bin; tar cf - *) | (cd $LIBEXECDIR; tar xf -)
-+(cd $SRCDIR/bin; cp Abi* $LIBEXECDIR)
- 
- ########################################################################
- # If we're on Solaris, run makepsres on the font path
diff --git a/editors/abiword/files/patch-autogen.sh b/editors/abiword/files/patch-autogen.sh
deleted file mode 100644
index 84fe028e64ac..000000000000
--- a/editors/abiword/files/patch-autogen.sh
+++ /dev/null
@@ -1,71 +0,0 @@
---- autogen.sh.orig	Thu Oct 17 08:19:31 2002
-+++ autogen.sh	Fri Feb 21 23:47:48 2003
-@@ -10,20 +10,20 @@
- 
- rm -f autogen.err
- 
--automake --version | perl -ne 'if (/\(GNU automake\) ([0-9].[0-9])/) {print;  if ($1 < 1.4) {exit 1;}}'
-+%%AUTOMAKE%% --version | perl -ne 'if (/\(GNU automake\) ([0-9].[0-9])/) {print; if ($1 < 1.4) {exit 1;}}'
- 
- if [ $? -ne 0 ]; then
-     echo "Error: you need automake 1.4 or later.  Please upgrade."
-     exit 1
- fi
- 
--if test ! -d `aclocal --print-ac-dir 2>> autogen.err`; then
--  echo "Bad aclocal (automake) installation"
-+if test ! -d `%%ACLOCAL%% --print-ac-dir 2>> autogen.err`; then
-+  echo "Bad %%ACLOCAL%% (automake) installation"
-   exit 1
- fi
- 
- for script in `cd ac-helpers/fallback; echo *.m4`; do
--  if test -r `aclocal --print-ac-dir 2>> autogen.err`/$script; then
-+  if test -r `%%ACLOCAL%% --print-ac-dir 2>> autogen.err`/$script; then
-     # Perhaps it was installed recently
-     rm -f ac-helpers/$script
-   else
-@@ -34,17 +34,17 @@
- 
- # Produce aclocal.m4, so autoconf gets the automake macros it needs
- # 
--echo "Creating aclocal.m4: aclocal -I ac-helpers $ACLOCAL_FLAGS"
-+echo "Creating aclocal.m4: %%ACLOCAL%% -I ac-helpers $ACLOCAL_FLAGS"
- 
--aclocal -I ac-helpers $ACLOCAL_FLAGS 2>> autogen.err
-+%%ACLOCAL%% -I ac-helpers $ACLOCAL_FLAGS 2>> autogen.err
- 
- echo "Checking for PKG_CHECK_MODULES..."
- 
- pkgcheckdef=`grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN`
- if test "x$pkgcheckdef" = "x"; then
--  echo "Running aclocal -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS"
--  (aclocal -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS 2>> autogen.err) || {
--    echo "aclocal failed! Unable to continue."
-+  echo "Running %%ACLOCAL%% -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS"
-+  (%%ACLOCAL%% -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS 2>> autogen.err) || {
-+    echo "%%ACLOCAL%% failed! Unable to continue."
-     exit 1
-   }
-   pkgcheckdef=`grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN`
-@@ -66,9 +66,9 @@
- # Produce all the `GNUmakefile.in's and create neat missing things
- # like `install-sh', etc.
- # 
--echo "automake --add-missing --copy --foreign"
-+echo "%%AUTOMAKE%% --add-missing --copy --foreign"
- 
--automake --add-missing --copy --foreign 2>> autogen.err || {
-+%%AUTOMAKE%% --add-missing --copy --foreign 2>> autogen.err || {
-     echo ""
-     echo "* * * warning: possible errors while running automake - check autogen.err"
-     echo ""
-@@ -84,7 +84,7 @@
- # 
- echo "Creating configure..."
- 
--autoconf 2>> autogen.err || {
-+%%AUTOCONF%% 2>> autogen.err || {
-     echo ""
-     echo "* * * warning: possible errors while running automake - check autogen.err"
-     echo ""
diff --git a/editors/abiword/files/patch-ax b/editors/abiword/files/patch-ax
deleted file mode 100644
index 91ab0177588d..000000000000
--- a/editors/abiword/files/patch-ax
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../wv/libole2/ms-ole.h	Sun Oct  6 20:18:41 2002
-+++ ../wv/libole2/ms-ole.h.new	Sun Oct  6 20:18:48 2002
-@@ -20,6 +20,7 @@
- #if defined(__QNXNTO__)
- # include <sys/types.h>	
- #endif
-+# include <sys/types.h>	
- # include <fcntl.h>       /* for mode_t */
- #else
- # include <stdlib.h>
diff --git a/editors/abiword/files/patch-src::wp::ap::unix::ap_UnixApp.cpp b/editors/abiword/files/patch-src::wp::ap::unix::ap_UnixApp.cpp
deleted file mode 100644
index 9af484ab202f..000000000000
--- a/editors/abiword/files/patch-src::wp::ap::unix::ap_UnixApp.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/wp/ap/unix/ap_UnixApp.cpp.orig	Thu Dec  6 09:00:14 2001
-+++ src/wp/ap/unix/ap_UnixApp.cpp	Mon Dec 17 13:49:48 2001
-@@ -612,7 +612,7 @@
-   {
-       pluginDir = pluginList[i];
- 
--      n = scandir(pluginDir.c_str(), &namelist, so_only, alphasort);
-+      n = scandir(pluginDir.c_str(), &namelist, (int (*)(dirent *))so_only, alphasort);
-       UT_DEBUGMSG(("DOM: found %d plugins in %s\n", n, pluginDir.c_str()));
- 
-       if (n > 0)
diff --git a/editors/abiword/files/patch-src_af_xap_unix_xap_UnixFontManager.cpp b/editors/abiword/files/patch-src_af_xap_unix_xap_UnixFontManager.cpp
deleted file mode 100644
index f30c23b080cc..000000000000
--- a/editors/abiword/files/patch-src_af_xap_unix_xap_UnixFontManager.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/af/xap/unix/xap_UnixFontManager.cpp.orig	Sat Feb 22 01:00:28 2003
-+++ src/af/xap/unix/xap_UnixFontManager.cpp	Sat Feb 22 01:00:57 2003
-@@ -808,30 +808,30 @@
- 		switch (f)
- 		{
- 		case GR_Font::FF_Roman:
--			m_f[f].setFont(searchFont("Times-12"));
-+			m_f[f].setFont(searchFont("Times 12"));
- 			break;
- 
- 		case GR_Font::FF_Swiss:
--			m_f[f].setFont(searchFont("Helvetica-12"));
-+			m_f[f].setFont(searchFont("Helvetica 12"));
- 			break;
- 
- 		case GR_Font::FF_Modern:
--			m_f[f].setFont(searchFont("Courier-12"));
-+			m_f[f].setFont(searchFont("Courier 12"));
- 			break;
- 
- 		case GR_Font::FF_Script:
--			m_f[f].setFont(searchFont("Cursive-12"));
-+			m_f[f].setFont(searchFont("Cursive 12"));
- 			break;
- 
- 		case GR_Font::FF_Decorative:
--			m_f[f].setFont(searchFont("Old English-12"));
-+			m_f[f].setFont(searchFont("Old English 12"));
- 			break;
- 
- 		// ugh!?  BiDi is not a font family, what is it doing here?
- 		// And what's that "Technical" thing?
- 		case GR_Font::FF_Technical:
- 		case GR_Font::FF_BiDi:
--			m_f[f].setFont(searchFont("Arial-12"));
-+			m_f[f].setFont(searchFont("Arial 12"));
- 			break;
- 			
- 		default:
diff --git a/editors/abiword/files/patch-src_pkg_linux_rpm_data_abiword.desktop b/editors/abiword/files/patch-src_pkg_linux_rpm_data_abiword.desktop
deleted file mode 100644
index b875f7db74c2..000000000000
--- a/editors/abiword/files/patch-src_pkg_linux_rpm_data_abiword.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/pkg/linux/rpm/data/abiword.desktop.orig	Sun Dec  8 19:56:43 2002
-+++ src/pkg/linux/rpm/data/abiword.desktop	Sat Feb 22 00:25:22 2003
-@@ -8,9 +8,9 @@
- Comment[fr]=Traitement de texte AbiWord
- Comment[pt]=Processador de Texto Abiword
- Comment[sv]=Ordbehandlaren Abiword
--Exec=abiword-2.0
-+Exec=AbiWord-2.0
- Icon=abiword_48.png
- Terminal=0
- Type=Application
--Categories=Application;Office;WordProcessor;X-Red-Hat-Base;
-+Categories=Application;Office;WordProcessor;
- StartupNotify=true
diff --git a/editors/abiword/files/patch-src_wp_ap_unix_ap_UnixApp.cpp b/editors/abiword/files/patch-src_wp_ap_unix_ap_UnixApp.cpp
deleted file mode 100644
index 69aae909af8c..000000000000
--- a/editors/abiword/files/patch-src_wp_ap_unix_ap_UnixApp.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/wp/ap/unix/ap_UnixApp.cpp.orig	Sat Feb 22 01:21:20 2003
-+++ src/wp/ap/unix/ap_UnixApp.cpp	Sat Feb 22 01:21:31 2003
-@@ -1241,7 +1241,7 @@
-     pMyUnixApp->shutdown();
-     delete pMyUnixApp;
-     
--    poptFreeContext (Args.poptcon);
-+    //poptFreeContext (Args.poptcon);
-     return 0;
- }
- 
diff --git a/editors/abiword/pkg-descr b/editors/abiword/pkg-descr
deleted file mode 100644
index 7a56a95478fe..000000000000
--- a/editors/abiword/pkg-descr
+++ /dev/null
@@ -1,22 +0,0 @@
-AbiWord is an open-source, cross-platform WYSIWYG word processor.  It works
-on Windows and most Unix Systems.
-
-Features include: 
-
- - Basic character formatting (bold, underline, italics, etc.) 
- - Paragraph alignment 
- - Spell-check 
- - Import of Word97 and RTF documents 
- - Export to RTF, Text, HTML, and LaTeX formats 
- - Interactive rulers and tabs 
- - Styles 
- - Unlimited undo/redo 
- - Multiple column control 
- - Widow/orphan control 
- - Find/Replace 
- - Anti-aliased fonts
- - Images 
-
-For more information, or to see screenshots, visit the AbiSource home page
-at
-WWW:  http://www.abisource.com/
diff --git a/editors/abiword/pkg-message b/editors/abiword/pkg-message
deleted file mode 100644
index 57ce22a065d7..000000000000
--- a/editors/abiword/pkg-message
+++ /dev/null
@@ -1,21 +0,0 @@
-In order to use AbiWord, you may have to add one or more lines to your
-XF86Config file, usually located in /etc/X11/XF86Config or /etc/XF86Config.
-
-For XFree86 >= 4, add the following line to the "Module" section:
-
-	Load "type1"
-
-For other X servers, please consult your documentation.
-
-Also, if you are going to display AbiWord on a remote X server, besides
-following the instructions above, please make sure that the files in the
-${PREFIX}/share/AbiSuite-2.0/fonts directory are available to the remote X
-server and add the ${PREFIX}/share/AbiSuite-2.0/fonts into server's font
-path. For XFree86, add the following line to the "Files" section:
-
-	FontPath "${PREFIX}/share/AbiSuite-2.0/fonts"
-
-If you use a different X server, please see its documentation on how to
-do this.
-
-Finally, re-start your X server.
diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist
deleted file mode 100644
index 540649c565fa..000000000000
--- a/editors/abiword/pkg-plist
+++ /dev/null
@@ -1,372 +0,0 @@
-bin/ttftool
-bin/ttfadmin.sh
-bin/AbiWord-2.0
-bin/abiword
-share/AbiSuite-2.0/AbiWord/bin/AbiWord_d
-share/AbiSuite-2.0/AbiWord/readme.txt
-share/AbiSuite-2.0/AbiWord/system.profile
-share/AbiSuite-2.0/AbiWord/system.profile-CP1254
-share/AbiSuite-2.0/AbiWord/system.profile-KOI8-R
-share/AbiSuite-2.0/AbiWord/system.profile-KOI8-U
-share/AbiSuite-2.0/AbiWord/system.profile-KOI8-UB
-share/AbiSuite-2.0/AbiWord/system.profile-am-ET
-share/AbiSuite-2.0/AbiWord/system.profile-bg-BG
-share/AbiSuite-2.0/AbiWord/system.profile-ca-ES
-share/AbiSuite-2.0/AbiWord/system.profile-cs-CZ
-share/AbiSuite-2.0/AbiWord/system.profile-da-DK
-share/AbiSuite-2.0/AbiWord/system.profile-de
-share/AbiSuite-2.0/AbiWord/system.profile-de-AT
-share/AbiSuite-2.0/AbiWord/system.profile-de-CH
-share/AbiSuite-2.0/AbiWord/system.profile-de-DE
-share/AbiSuite-2.0/AbiWord/help/en-US/aboutos.html
-share/AbiSuite-2.0/AbiWord/help/en-US/credits.html
-share/AbiSuite-2.0/AbiWord/help/en-US/fdl.html
-share/AbiSuite-2.0/AbiWord/help/en-US/histyle.css
-share/AbiSuite-2.0/AbiWord/help/en-US/index.html
-share/AbiSuite-2.0/AbiWord/help/en-US/introduction.html
-share/AbiSuite-2.0/AbiWord/help/en-US/search.html
-share/AbiSuite-2.0/AbiWord/help/en-US/style.css
-share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtonormaltemplate.html
-share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtotables.html
-share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoweb.html
-share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoword.html
-share/AbiSuite-2.0/AbiWord/help/en-US/howto/index.html
-share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoweb.xhtml_data/ruler.png
-share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoword.xhtml_data/gettingstarted.abw-0.png
-share/AbiSuite-2.0/AbiWord/help/en-US/info/index.html
-share/AbiSuite-2.0/AbiWord/help/en-US/info/inforequirements.html
-share/AbiSuite-2.0/AbiWord/help/en-US/info/infospelling.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogactivatewindow.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogbackgroundcolor.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogbookmark.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogbreak.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogchangecase.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogcolumns.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogdateandtime.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogfield.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogfind.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogfont.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogformatheaderfooters.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialoggoto.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialoghyperlink.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogimageproperties.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialoglanguage.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialoglists.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogmodifystyle.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialognew.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialognewstyle.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogopenlinux.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogpagenumbers.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogpagesetup.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogparagraph.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogplugins.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogpreferences.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogreplace.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogsavelinux.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogscreencolor.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogspelling.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogstyles.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogsymbol.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogtabs.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogwordcount.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogzoom.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/index.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menucontextual.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuedit.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menufile.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuformat.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuhelp.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuinsert.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menutools.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuview.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuweb.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuwindow.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/rulers.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/toolbarextra.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/toolbarformatting.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/toolbarstandard.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogreplace.xhtml_data/replace.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menufile.xhtml_data/menufile.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data/full_window.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data/functionbars.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data/functionbars_hiding.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data/grabbar_shaded.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data/ruler.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data/statusbar.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data/statusbar_quickhelp.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data/titlebar.png
-share/AbiSuite-2.0/AbiWord/help/en-US/problems/index.html
-share/AbiSuite-2.0/AbiWord/help/en-US/problems/problemsbugs.html
-share/AbiSuite-2.0/AbiWord/help/en-US/problems/problemsfaq.html
-share/AbiSuite-2.0/AbiWord/help/en-US/problems/problemsfonts.html
-share/AbiSuite-2.0/AbiWord/help/en-US/problems/problemshelp.html
-share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/index.html
-share/AbiSuite-2.0/AbiWord/help/en-US/credits.txt
-share/AbiSuite-2.0/AbiWord/system.profile-el-GR
-share/AbiSuite-2.0/AbiWord/system.profile-en
-share/AbiSuite-2.0/AbiWord/system.profile-en-AU
-share/AbiSuite-2.0/AbiWord/system.profile-en-CA
-share/AbiSuite-2.0/AbiWord/system.profile-en-GB
-share/AbiSuite-2.0/AbiWord/system.profile-en-IE
-share/AbiSuite-2.0/AbiWord/system.profile-en-NZ
-share/AbiSuite-2.0/AbiWord/system.profile-en-US
-share/AbiSuite-2.0/AbiWord/system.profile-en-ZA
-share/AbiSuite-2.0/AbiWord/system.profile-es
-share/AbiSuite-2.0/AbiWord/system.profile-es-ES
-share/AbiSuite-2.0/AbiWord/system.profile-es-MX
-share/AbiSuite-2.0/AbiWord/system.profile-fi-FI
-share/AbiSuite-2.0/AbiWord/system.profile-fr
-share/AbiSuite-2.0/AbiWord/system.profile-fr-BE
-share/AbiSuite-2.0/AbiWord/system.profile-fr-CA
-share/AbiSuite-2.0/AbiWord/system.profile-fr-CH
-share/AbiSuite-2.0/AbiWord/system.profile-fr-FR
-share/AbiSuite-2.0/AbiWord/system.profile-gl-ES
-share/AbiSuite-2.0/AbiWord/system.profile-hu-HU
-share/AbiSuite-2.0/AbiWord/system.profile-it-IT
-share/AbiSuite-2.0/AbiWord/system.profile-ja-JP
-share/AbiSuite-2.0/AbiWord/system.profile-lt-LT
-share/AbiSuite-2.0/AbiWord/system.profile-nb-NO
-share/AbiSuite-2.0/AbiWord/system.profile-nl-NL
-share/AbiSuite-2.0/AbiWord/system.profile-nn-NO
-share/AbiSuite-2.0/AbiWord/system.profile-pl-PL
-share/AbiSuite-2.0/AbiWord/system.profile-pt-BR
-share/AbiSuite-2.0/AbiWord/system.profile-pt-PT
-share/AbiSuite-2.0/AbiWord/system.profile-ru
-share/AbiSuite-2.0/AbiWord/system.profile-ru-RU
-share/AbiSuite-2.0/AbiWord/system.profile-sk-SK
-share/AbiSuite-2.0/AbiWord/system.profile-sk-SK.CP1250
-share/AbiSuite-2.0/AbiWord/system.profile-sl
-share/AbiSuite-2.0/AbiWord/system.profile-sv
-share/AbiSuite-2.0/AbiWord/system.profile-sv-SE
-share/AbiSuite-2.0/AbiWord/system.profile-tr
-share/AbiSuite-2.0/AbiWord/system.profile-tr-TR
-share/AbiSuite-2.0/AbiWord/system.profile-tr-TR.CP1254
-share/AbiSuite-2.0/AbiWord/system.profile-uk-UA
-share/AbiSuite-2.0/AbiWord/system.profile-zh-CN
-share/AbiSuite-2.0/AbiWord/system.profile-zh-TW
-share/AbiSuite-2.0/AbiWord/scripts/abw2html.pl
-share/AbiSuite-2.0/AbiWord/strings/am-ET.strings
-share/AbiSuite-2.0/AbiWord/strings/art-lojban.strings
-share/AbiSuite-2.0/AbiWord/strings/bg-BG.strings
-share/AbiSuite-2.0/AbiWord/strings/ca-ES.strings
-share/AbiSuite-2.0/AbiWord/strings/cs-CZ.strings
-share/AbiSuite-2.0/AbiWord/strings/cy-GB.strings
-share/AbiSuite-2.0/AbiWord/strings/da-DK.strings
-share/AbiSuite-2.0/AbiWord/strings/de-CH.strings
-share/AbiSuite-2.0/AbiWord/strings/de-DE.strings
-share/AbiSuite-2.0/AbiWord/strings/el-GR.strings
-share/AbiSuite-2.0/AbiWord/strings/en-AU.strings
-share/AbiSuite-2.0/AbiWord/strings/en-GB.strings
-share/AbiSuite-2.0/AbiWord/strings/en-IE.strings
-share/AbiSuite-2.0/AbiWord/strings/es-ES.strings
-share/AbiSuite-2.0/AbiWord/strings/es-MX.strings
-share/AbiSuite-2.0/AbiWord/strings/eu-ES.strings
-share/AbiSuite-2.0/AbiWord/strings/fi-FI.strings
-share/AbiSuite-2.0/AbiWord/strings/fr-FR.strings
-share/AbiSuite-2.0/AbiWord/strings/ga-IE.strings
-share/AbiSuite-2.0/AbiWord/strings/gl-ES.strings
-share/AbiSuite-2.0/AbiWord/strings/he-IL.strings
-share/AbiSuite-2.0/AbiWord/strings/hu-HU.strings
-share/AbiSuite-2.0/AbiWord/strings/id-ID.strings
-share/AbiSuite-2.0/AbiWord/strings/it-IT.strings
-share/AbiSuite-2.0/AbiWord/strings/ja-JP.strings
-share/AbiSuite-2.0/AbiWord/strings/lt-LT.strings
-share/AbiSuite-2.0/AbiWord/strings/mh-MH.strings
-share/AbiSuite-2.0/AbiWord/strings/ms-MY.strings
-share/AbiSuite-2.0/AbiWord/strings/nb-NO.strings
-share/AbiSuite-2.0/AbiWord/strings/nl-NL.strings
-share/AbiSuite-2.0/AbiWord/strings/nn-NO.strings
-share/AbiSuite-2.0/AbiWord/strings/pl-PL.strings
-share/AbiSuite-2.0/AbiWord/strings/pt-BR.strings
-share/AbiSuite-2.0/AbiWord/strings/pt-PT.strings
-share/AbiSuite-2.0/AbiWord/strings/ro-RO.strings
-share/AbiSuite-2.0/AbiWord/strings/ru-RU.strings
-share/AbiSuite-2.0/AbiWord/strings/sk-SK.strings
-share/AbiSuite-2.0/AbiWord/strings/sl-SI.strings
-share/AbiSuite-2.0/AbiWord/strings/sq-AL.strings
-share/AbiSuite-2.0/AbiWord/strings/sr-SR.strings
-share/AbiSuite-2.0/AbiWord/strings/sv-SE.strings
-share/AbiSuite-2.0/AbiWord/strings/tr-TR.strings
-share/AbiSuite-2.0/AbiWord/strings/uk-UA.strings
-share/AbiSuite-2.0/AbiWord/strings/vi-VN.strings
-share/AbiSuite-2.0/AbiWord/strings/yi.strings
-share/AbiSuite-2.0/AbiWord/strings/zh-CN.strings
-share/AbiSuite-2.0/AbiWord/strings/zh-HK.strings
-share/AbiSuite-2.0/AbiWord/strings/zh-TW.strings
-share/AbiSuite-2.0/fonts/a010013l.afm
-share/AbiSuite-2.0/fonts/a010013l.pfb
-share/AbiSuite-2.0/fonts/a010015l.afm
-share/AbiSuite-2.0/fonts/a010015l.pfb
-share/AbiSuite-2.0/fonts/a010033l.afm
-share/AbiSuite-2.0/fonts/a010033l.pfb
-share/AbiSuite-2.0/fonts/a010035l.afm
-share/AbiSuite-2.0/fonts/a010035l.pfb
-share/AbiSuite-2.0/fonts/adobe-full.u2g
-share/AbiSuite-2.0/fonts/adobe-short.u2g
-share/AbiSuite-2.0/fonts/b018012l.afm
-share/AbiSuite-2.0/fonts/b018012l.pfb
-share/AbiSuite-2.0/fonts/b018015l.afm
-share/AbiSuite-2.0/fonts/b018015l.pfb
-share/AbiSuite-2.0/fonts/b018032l.afm
-share/AbiSuite-2.0/fonts/b018032l.pfb
-share/AbiSuite-2.0/fonts/b018035l.afm
-share/AbiSuite-2.0/fonts/b018035l.pfb
-share/AbiSuite-2.0/fonts/bchb.afm
-share/AbiSuite-2.0/fonts/bchb.pfa
-share/AbiSuite-2.0/fonts/bchbi.afm
-share/AbiSuite-2.0/fonts/bchbi.pfa
-share/AbiSuite-2.0/fonts/bchr.afm
-share/AbiSuite-2.0/fonts/bchr.pfa
-share/AbiSuite-2.0/fonts/bchri.afm
-share/AbiSuite-2.0/fonts/bchri.pfa
-share/AbiSuite-2.0/fonts/c059013l.afm
-share/AbiSuite-2.0/fonts/c059013l.pfb
-share/AbiSuite-2.0/fonts/c059016l.afm
-share/AbiSuite-2.0/fonts/c059016l.pfb
-share/AbiSuite-2.0/fonts/c059033l.afm
-share/AbiSuite-2.0/fonts/c059033l.pfb
-share/AbiSuite-2.0/fonts/c059036l.afm
-share/AbiSuite-2.0/fonts/c059036l.pfb
-share/AbiSuite-2.0/fonts/d050000l.afm
-share/AbiSuite-2.0/fonts/d050000l.pfb
-share/AbiSuite-2.0/fonts/d050000l.u2g
-share/AbiSuite-2.0/fonts/dingbats.e2u
-share/AbiSuite-2.0/fonts/fonts.dir
-share/AbiSuite-2.0/fonts/fonts.scale
-share/AbiSuite-2.0/fonts/n019003l.afm
-share/AbiSuite-2.0/fonts/n019003l.pfb
-share/AbiSuite-2.0/fonts/n019004l.afm
-share/AbiSuite-2.0/fonts/n019004l.pfb
-share/AbiSuite-2.0/fonts/n019023l.afm
-share/AbiSuite-2.0/fonts/n019023l.pfb
-share/AbiSuite-2.0/fonts/n019024l.afm
-share/AbiSuite-2.0/fonts/n019024l.pfb
-share/AbiSuite-2.0/fonts/n019043l.afm
-share/AbiSuite-2.0/fonts/n019043l.pfb
-share/AbiSuite-2.0/fonts/n019044l.afm
-share/AbiSuite-2.0/fonts/n019044l.pfb
-share/AbiSuite-2.0/fonts/n019063l.afm
-share/AbiSuite-2.0/fonts/n019063l.pfb
-share/AbiSuite-2.0/fonts/n019064l.afm
-share/AbiSuite-2.0/fonts/n019064l.pfb
-share/AbiSuite-2.0/fonts/n021003l.afm
-share/AbiSuite-2.0/fonts/n021003l.pfb
-share/AbiSuite-2.0/fonts/n021004l.afm
-share/AbiSuite-2.0/fonts/n021004l.pfb
-share/AbiSuite-2.0/fonts/n021023l.afm
-share/AbiSuite-2.0/fonts/n021023l.pfb
-share/AbiSuite-2.0/fonts/n021024l.afm
-share/AbiSuite-2.0/fonts/n021024l.pfb
-share/AbiSuite-2.0/fonts/n022003l.afm
-share/AbiSuite-2.0/fonts/n022003l.pfb
-share/AbiSuite-2.0/fonts/n022004l.afm
-share/AbiSuite-2.0/fonts/n022004l.pfb
-share/AbiSuite-2.0/fonts/n022023l.afm
-share/AbiSuite-2.0/fonts/n022023l.pfb
-share/AbiSuite-2.0/fonts/n022024l.afm
-share/AbiSuite-2.0/fonts/n022024l.pfb
-share/AbiSuite-2.0/fonts/p052003l.afm
-share/AbiSuite-2.0/fonts/p052003l.pfb
-share/AbiSuite-2.0/fonts/p052004l.afm
-share/AbiSuite-2.0/fonts/p052004l.pfb
-share/AbiSuite-2.0/fonts/p052023l.afm
-share/AbiSuite-2.0/fonts/p052023l.pfb
-share/AbiSuite-2.0/fonts/p052024l.afm
-share/AbiSuite-2.0/fonts/p052024l.pfb
-share/AbiSuite-2.0/fonts/s050000l.afm
-share/AbiSuite-2.0/fonts/s050000l.pfb
-share/AbiSuite-2.0/fonts/s050000l.u2g
-share/AbiSuite-2.0/fonts/symbol.e2u
-share/AbiSuite-2.0/fonts/z003034l.afm
-share/AbiSuite-2.0/fonts/z003034l.pfb
-share/AbiSuite-2.0/GNOME_AbiWord_Control_1_0.oaf
-share/AbiSuite-2.0/Nautilus_View_AbiWord.oaf
-share/AbiSuite-2.0/README
-share/AbiSuite-2.0/nautilus-abiword-content-view-ui.xml
-share/AbiSuite-2.0/clipart/book.png
-share/AbiSuite-2.0/clipart/chip.png
-share/AbiSuite-2.0/clipart/fun.png
-share/AbiSuite-2.0/clipart/gear.png
-share/AbiSuite-2.0/clipart/gnomea.png
-share/AbiSuite-2.0/clipart/gnomeb.png
-share/AbiSuite-2.0/clipart/gnomec.png
-share/AbiSuite-2.0/clipart/gnomecorner.png
-share/AbiSuite-2.0/clipart/gnomed.png
-share/AbiSuite-2.0/clipart/gnomedecor1.png
-share/AbiSuite-2.0/clipart/gnomedecor2.png
-share/AbiSuite-2.0/clipart/gnomee.png
-share/AbiSuite-2.0/clipart/gnomeflowers.png
-share/AbiSuite-2.0/clipart/gnomeline.png
-share/AbiSuite-2.0/clipart/idea.png
-share/AbiSuite-2.0/clipart/lamp.png
-share/AbiSuite-2.0/clipart/monitor.png
-share/AbiSuite-2.0/clipart/music1.png
-share/AbiSuite-2.0/clipart/pinceau.png
-share/AbiSuite-2.0/clipart/simca.png
-share/AbiSuite-2.0/clipart/surprise.png
-share/AbiSuite-2.0/clipart/together.png
-share/AbiSuite-2.0/clipart/toolbox.png
-share/AbiSuite-2.0/clipart/tree.png
-share/AbiSuite-2.0/clipart/tux_bordelais.png
-share/AbiSuite-2.0/clipart/weather.png
-share/AbiSuite-2.0/clipart/write.png
-share/AbiSuite-2.0/dictionary/american.hash
-share/AbiSuite-2.0/dictionary/ispell_dictionary_list.xml
-share/AbiSuite-2.0/icons/abiword_16.xpm
-share/AbiSuite-2.0/icons/abiword_48.png
-share/AbiSuite-2.0/icons/abiword_48.tif
-share/AbiSuite-2.0/icons/abiword_48.xpm
-share/AbiSuite-2.0/templates/A4.awt
-share/AbiSuite-2.0/templates/Business-Report.awt
-share/AbiSuite-2.0/templates/Employee-Directory.awt
-share/AbiSuite-2.0/templates/Fax-Coversheet.awt
-share/AbiSuite-2.0/templates/Two-Columns.awt
-share/AbiSuite-2.0/templates/US-Letter.awt
-share/AbiSuite-2.0/templates/normal.awt
-share/gnome/apps/Applications/abiword.desktop
-share/gnome/pixmaps/abiword_48.png
-@dirrm share/AbiSuite-2.0/AbiWord/bin
-@dirrm share/AbiSuite-2.0/AbiWord/help/de-DE/de_DE
-@dirrm share/AbiSuite-2.0/AbiWord/help/de-DE/images
-@dirrm share/AbiSuite-2.0/AbiWord/help/de-DE
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoweb.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoword.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/howto
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/images
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/info
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogreplace.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface/menufile.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface/rulers.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/problems
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/tutorial
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US
-@dirrm share/AbiSuite-2.0/AbiWord/help/es-ES
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/howto/howtoweb.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/howto/howtoword.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/howto
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/images
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/info
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/interface/dialogreplace.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/interface/rulers.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/interface/workspace.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/interface
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/plugins
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/problems
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/tutorial
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR
-@dirrm share/AbiSuite-2.0/AbiWord/help/images
-@dirrm share/AbiSuite-2.0/AbiWord/help
-@dirrm share/AbiSuite-2.0/AbiWord/sample/en-US
-@dirrm share/AbiSuite-2.0/AbiWord/sample
-@dirrm share/AbiSuite-2.0/AbiWord/scripts
-@dirrm share/AbiSuite-2.0/AbiWord/strings
-@dirrm share/AbiSuite-2.0/AbiWord
-@dirrm share/AbiSuite-2.0/fonts
-@dirrm share/AbiSuite-2.0/clipart
-@dirrm share/AbiSuite-2.0/dictionary
-@dirrm share/AbiSuite-2.0/icons
-@dirrm share/AbiSuite-2.0/templates
-@dirrm share/AbiSuite-2.0
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
deleted file mode 100644
index 6916eea1ffeb..000000000000
--- a/editors/calligra/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-mode: makefile-*-
-# New ports collection makefile for:	koffice
-# Date created:				Sun May 14 2000 16:33:15
-# Whom:					Will Andrews <will@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	koffice
-PORTVERSION=	1.2.1
-PORTEPOCH=	1
-CATEGORIES=	editors kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTNAME}-${PORTVERSION}/src
-DIST_SUBDIR=	KDE/koffice
-
-MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Office Suite for KDE3
-
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2
-
-USE_KDELIBS_VER=	3
-PREFIX=			${KDE_PREFIX}
-
-USE_BZIP2=		yes
-USE_GMAKE=		yes
-USE_PYTHON=		yes
-GNU_CONFIGURE=		yes
-
-INSTALLS_SHLIB=		yes
-LDCONFIG_DIRS+=		%%PREFIX%%/lib %%PREFIX%%/lib/kde3
-
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-
-.include <bsd.port.mk>
diff --git a/editors/calligra/distinfo b/editors/calligra/distinfo
deleted file mode 100644
index 6988c28cdb50..000000000000
--- a/editors/calligra/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (KDE/koffice/koffice-1.2.1.tar.bz2) = 6a73aa72b094ca7b7377f74a508e804e
diff --git a/editors/calligra/pkg-descr b/editors/calligra/pkg-descr
deleted file mode 100644
index 3e111fad1e16..000000000000
--- a/editors/calligra/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This is the office suite for KDE3 that includes KWord, KSpread, KPresenter,
-KChart, and so forth.
-
-WWW: http://www.koffice.org/
-
---AlanE <kde@freebsd.org>
diff --git a/editors/calligra/pkg-plist b/editors/calligra/pkg-plist
deleted file mode 100644
index c556aea1b068..000000000000
--- a/editors/calligra/pkg-plist
+++ /dev/null
@@ -1,2065 +0,0 @@
-bin/karbon
-bin/kchart
-bin/kformula
-bin/kivio
-bin/koconverter
-bin/kontour
-bin/koscript
-bin/koshell
-bin/kprconverter.pl
-bin/kpresenter
-bin/kspread
-bin/kthesaurus
-bin/kudesigner
-bin/kugar
-bin/kword
-include/KDChartData.h
-include/KDChartListTable.h
-include/KDChartTable.h
-include/KDChartTableBase.h
-include/KDChartVectorTable.h
-include/KoApplicationIface.h
-include/KoDocumentIface.h
-include/KoMainWindowIface.h
-include/KoViewIface.h
-include/handler.h
-include/kcoloractions.h
-include/kformulaconfigpage.h
-include/kformulacontainer.h
-include/kformuladefs.h
-include/kformuladocument.h
-include/kformulaview.h
-include/koApplication.h
-include/koCharSelectDia.h
-include/koChart.h
-include/koChild.h
-include/koDocument.h
-include/koDocumentChild.h
-include/koDocumentInfo.h
-include/koDocumentInfoDlg.h
-include/koFactory.h
-include/koFilter.h
-include/koFilterChain.h
-include/koFilterManager.h
-include/koFind.h
-include/koFrame.h
-include/koGlobal.h
-include/koInsertLink.h
-include/koKoolBar.h
-include/koMainWindow.h
-include/koPageLayoutDia.h
-include/koPartSelectAction.h
-include/koPartSelectDia.h
-include/koPicture.h
-include/koPictureCollection.h
-include/koPictureFilePreview.h
-include/koPictureKey.h
-include/koPoint.h
-include/koQueryTrader.h
-include/koRect.h
-include/koReplace.h
-include/koRuler.h
-include/koSize.h
-include/koStore.h
-include/koStoreDevice.h
-include/koTabChooser.h
-include/koTemplateChooseDia.h
-include/koTemplateCreateDia.h
-include/koToolBox.h
-include/koUnit.h
-include/koView.h
-include/kotoolbutton.h
-include/kreportviewer.h
-include/kugar.h
-include/kugarqt.h
-include/mcalcobject.h
-include/mfieldobject.h
-include/mlabelobject.h
-include/mlineobject.h
-include/mpagecollection.h
-include/mpagedisplay.h
-include/mreportdetail.h
-include/mreportengine.h
-include/mreportobject.h
-include/mreportsection.h
-include/mreportviewer.h
-include/mspecialobject.h
-include/mutil.h
-include/tkaction.h
-include/tkcoloractions.h
-include/tkcombobox.h
-include/tktoolbarbutton.h
-lib/karbon.la
-lib/karbon.so
-lib/kchart.la
-lib/kchart.so
-lib/kde3/clipartthumbnail.la
-lib/kde3/clipartthumbnail.so
-lib/kde3/kfile_koffice.la
-lib/kde3/kfile_koffice.so
-lib/kde3/kodocinfopropspage.la
-lib/kde3/kodocinfopropspage.so
-lib/kde3/kofficescan.la
-lib/kde3/kofficescan.so
-lib/kde3/kofficethumbnail.la
-lib/kde3/kofficethumbnail.so
-lib/kde3/kwmailmerge_classic.la
-lib/kde3/kwmailmerge_classic.so
-lib/kde3/kwmailmerge_qtsqldb.la
-lib/kde3/kwmailmerge_qtsqldb.so
-lib/kde3/kwmailmerge_qtsqldb_power.la
-lib/kde3/kwmailmerge_qtsqldb_power.so
-lib/kde3/libabiwordexport.la
-lib/kde3/libabiwordexport.so
-lib/kde3/libabiwordimport.la
-lib/kde3/libabiwordimport.so
-lib/kde3/libamiproexport.la
-lib/kde3/libamiproexport.so
-lib/kde3/libamiproimport.la
-lib/kde3/libamiproimport.so
-lib/kde3/libapplixgraphicimport.la
-lib/kde3/libapplixgraphicimport.so
-lib/kde3/libapplixspreadimport.la
-lib/kde3/libapplixspreadimport.so
-lib/kde3/libapplixwordimport.la
-lib/kde3/libapplixwordimport.so
-lib/kde3/libasciiexport.la
-lib/kde3/libasciiexport.so
-lib/kde3/libasciiimport.la
-lib/kde3/libasciiimport.so
-lib/kde3/libcsvexport.la
-lib/kde3/libcsvexport.so
-lib/kde3/libcsvimport.la
-lib/kde3/libcsvimport.so
-lib/kde3/libdbaseimport.la
-lib/kde3/libdbaseimport.so
-lib/kde3/libdocbookexport.la
-lib/kde3/libdocbookexport.so
-lib/kde3/libgnumericexport.la
-lib/kde3/libgnumericexport.so
-lib/kde3/libgnumericimport.la
-lib/kde3/libgnumericimport.so
-lib/kde3/libhtmlexport.la
-lib/kde3/libhtmlexport.so
-lib/kde3/libhtmlimport.la
-lib/kde3/libhtmlimport.so
-lib/kde3/libkarbonaiimport.la
-lib/kde3/libkarbonaiimport.so
-lib/kde3/libkarbonaiimport.so.1
-lib/kde3/libkarbonepsexport.la
-lib/kde3/libkarbonepsexport.so
-lib/kde3/libkarbonepsimport.la
-lib/kde3/libkarbonepsimport.so
-lib/kde3/libkarbonkontourimport.la
-lib/kde3/libkarbonkontourimport.so
-lib/kde3/libkarbonpart.la
-lib/kde3/libkarbonpart.so
-lib/kde3/libkarbonpngexport.la
-lib/kde3/libkarbonpngexport.so
-lib/kde3/libkarbonsvgexport.la
-lib/kde3/libkarbonsvgexport.so
-lib/kde3/libkchartpart.la
-lib/kde3/libkchartpart.so
-lib/kde3/libkfolatexexport.la
-lib/kde3/libkfolatexexport.so
-lib/kde3/libkfopngexport.la
-lib/kde3/libkfopngexport.so
-lib/kde3/libkformulapart.la
-lib/kde3/libkformulapart.so
-lib/kde3/libkiviopart.la
-lib/kde3/libkiviopart.so
-lib/kde3/libkontourpart.la
-lib/kde3/libkontourpart.so
-lib/kde3/libkontourrtfexport.la
-lib/kde3/libkontourrtfexport.so
-lib/kde3/libkounavailpart.la
-lib/kde3/libkounavailpart.so
-lib/kde3/libkpresenterpart.la
-lib/kde3/libkpresenterpart.so
-lib/kde3/libkprkword.la
-lib/kde3/libkprkword.so
-lib/kde3/libkspelltool.la
-lib/kde3/libkspelltool.so
-lib/kde3/libkspreadcalc.la
-lib/kde3/libkspreadcalc.so
-lib/kde3/libkspreadhtmlexport.la
-lib/kde3/libkspreadhtmlexport.so
-lib/kde3/libkspreadpart.la
-lib/kde3/libkspreadpart.so
-lib/kde3/libkwordpart.la
-lib/kde3/libkwordpart.so
-lib/kde3/liblatexexport.la
-lib/kde3/liblatexexport.so
-lib/kde3/liblateximport.la
-lib/kde3/liblateximport.so
-lib/kde3/liblatexparser.la
-lib/kde3/liblatexparser.so
-lib/kde3/libmsodimport.la
-lib/kde3/libmsodimport.so
-lib/kde3/libmswriteimport.la
-lib/kde3/libmswriteimport.so
-lib/kde3/libolefilter.la
-lib/kde3/libolefilter.so
-lib/kde3/libpalmdocexport.la
-lib/kde3/libpalmdocexport.so
-lib/kde3/libpalmdocimport.la
-lib/kde3/libpalmdocimport.so
-lib/kde3/libqproimport.la
-lib/kde3/libqproimport.so
-lib/kde3/librtfexport.la
-lib/kde3/librtfexport.so
-lib/kde3/librtfimport.la
-lib/kde3/librtfimport.so
-lib/kde3/libtexgraphexport.la
-lib/kde3/libtexgraphexport.so
-lib/kde3/libthesaurustool.la
-lib/kde3/libthesaurustool.so
-lib/kde3/libwmfimport.la
-lib/kde3/libwmfimport.so
-lib/kde3/libwmlexport.la
-lib/kde3/libwmlexport.so
-lib/kde3/libwmlimport.la
-lib/kde3/libwmlimport.so
-lib/kde3/libwpexport.la
-lib/kde3/libwpexport.so
-lib/kde3/libwpimport.la
-lib/kde3/libwpimport.so
-lib/kde3/libxsltexport.la
-lib/kde3/libxsltexport.so
-lib/kde3/libxsltimport.la
-lib/kde3/libxsltimport.so
-lib/kformulamain.la
-lib/kformulamain.so
-lib/kivio.la
-lib/kivio.so
-lib/kontour.la
-lib/kontour.so
-lib/koshell.la
-lib/koshell.so
-lib/kpresenter.la
-lib/kpresenter.so
-lib/kspread.la
-lib/kspread.so
-lib/kword.la
-lib/kword.so
-lib/libkdchart.la
-lib/libkdchart.so
-lib/libkdchart.so.0
-lib/libkformula.la
-lib/libkformula.so
-lib/libkformula.so.3
-lib/libkivioconnectortool.la
-lib/libkivioconnectortool.so
-lib/libkivioselecttool.la
-lib/libkivioselecttool.so
-lib/libkiviotexttool.la
-lib/libkiviotexttool.so
-lib/libkiviozoomtool.la
-lib/libkiviozoomtool.so
-lib/libkochart.la
-lib/libkochart.so
-lib/libkochart.so.1
-lib/libkofficecore.la
-lib/libkofficecore.so
-lib/libkofficecore.so.2
-lib/libkofficeui.la
-lib/libkofficeui.so
-lib/libkofficeui.so.2
-lib/libkopainter.la
-lib/libkopainter.so
-lib/libkopainter.so.1
-lib/libkoscript.la
-lib/libkoscript.so
-lib/libkoscript.so.2
-lib/libkotext.la
-lib/libkotext.so
-lib/libkotext.so.2
-lib/libkstore.la
-lib/libkstore.so
-lib/libkstore.so.2
-lib/libkugar.la
-lib/libkugar.so
-lib/libkugar.so.1
-lib/libkugarpart.la
-lib/libkugarpart.so
-lib/libkwmailmerge_interface.la
-lib/libkwmailmerge_interface.so
-lib/libkwmailmerge_interface.so.4
-lib/libkwmf.la
-lib/libkwmf.so
-lib/libkwmf.so.2
-lib/libkwordexportfilters.la
-lib/libkwordexportfilters.so
-lib/libkwordexportfilters.so.1
-share/applnk/Office/KThesaurus.desktop
-share/applnk/Office/karbon.desktop
-share/applnk/Office/kchart.desktop
-share/applnk/Office/kformula.desktop
-share/applnk/Office/kivio.desktop
-share/applnk/Office/kontour.desktop
-share/applnk/Office/koshell.desktop
-share/applnk/Office/kpresenter.desktop
-share/applnk/Office/kspread.desktop
-share/applnk/Office/kudesigner.desktop
-share/applnk/Office/kugar.desktop
-share/applnk/Office/kword.desktop
-share/apps/karbon/icons/hicolor/16x16/actions/cap_butt.png
-share/apps/karbon/icons/hicolor/16x16/actions/cap_round.png
-share/apps/karbon/icons/hicolor/16x16/actions/cap_square.png
-share/apps/karbon/icons/hicolor/16x16/actions/join_bevel.png
-share/apps/karbon/icons/hicolor/16x16/actions/join_miter.png
-share/apps/karbon/icons/hicolor/16x16/actions/join_round.png
-share/apps/karbon/icons/hicolor/16x16/actions/rotate.png
-share/apps/karbon/icons/hicolor/16x16/actions/shear.png
-share/apps/karbon/icons/hicolor/16x16/actions/translate.png
-share/apps/karbon/icons/hicolor/16x16/apps/karbon.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_ellipse.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_gradient.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_polygon.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_polyline.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_rectangle.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_rotate.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_roundrect.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_select.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_selectnodes.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_shear.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_sinus.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_spiral.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_star.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_text.png
-share/apps/karbon/icons/hicolor/22x22/actions/colorman.png
-share/apps/karbon/icons/hicolor/22x22/actions/gradientdlg.png
-share/apps/karbon/icons/hicolor/22x22/actions/outlinedlg.png
-share/apps/karbon/icons/hicolor/22x22/actions/pagesetup.png
-share/apps/karbon/icons/hicolor/22x22/actions/solidfilldlg.png
-share/apps/karbon/icons/hicolor/32x32/apps/karbon.png
-share/apps/karbon/icons/hicolor/48x48/apps/karbon.png
-share/apps/karbon/karbon.rc
-share/apps/karbon/karbon_readonly.rc
-share/apps/kchart/icons/hicolor/22x22/actions/areas.png
-share/apps/kchart/icons/hicolor/22x22/actions/areas3d.png
-share/apps/kchart/icons/hicolor/22x22/actions/bars.png
-share/apps/kchart/icons/hicolor/22x22/actions/bars3d.png
-share/apps/kchart/icons/hicolor/22x22/actions/cakes.png
-share/apps/kchart/icons/hicolor/22x22/actions/cakes3d.png
-share/apps/kchart/icons/hicolor/22x22/actions/data.png
-share/apps/kchart/icons/hicolor/22x22/actions/hilo.png
-share/apps/kchart/icons/hicolor/22x22/actions/lines.png
-share/apps/kchart/icons/hicolor/22x22/actions/lines3d.png
-share/apps/kchart/icons/hicolor/22x22/actions/options.png
-share/apps/kchart/icons/hicolor/22x22/actions/polar.png
-share/apps/kchart/icons/hicolor/22x22/actions/ring.png
-share/apps/kchart/icons/hicolor/22x22/actions/wizard.png
-share/apps/kchart/icons/locolor/16x16/actions/areas.png
-share/apps/kchart/icons/locolor/16x16/actions/areas3d.png
-share/apps/kchart/icons/locolor/16x16/actions/bars.png
-share/apps/kchart/icons/locolor/16x16/actions/bars3d.png
-share/apps/kchart/icons/locolor/16x16/actions/cakes.png
-share/apps/kchart/icons/locolor/16x16/actions/cakes3d.png
-share/apps/kchart/icons/locolor/16x16/actions/data.png
-share/apps/kchart/icons/locolor/16x16/actions/hilo.png
-share/apps/kchart/icons/locolor/16x16/actions/lines.png
-share/apps/kchart/icons/locolor/16x16/actions/lines3d.png
-share/apps/kchart/icons/locolor/16x16/actions/options.png
-share/apps/kchart/icons/locolor/16x16/actions/ring.png
-share/apps/kchart/icons/locolor/16x16/actions/wizard.png
-share/apps/kchart/kchart.rc
-share/apps/kchart/kchart_readonly.rc
-share/apps/kchart/pics/3DAREA.png
-share/apps/kchart/pics/3DBAR.png
-share/apps/kchart/pics/3DCOMBO_HLC_AREA.png
-share/apps/kchart/pics/3DCOMBO_HLC_BAR.png
-share/apps/kchart/pics/3DCOMBO_LINE_AREA.png
-share/apps/kchart/pics/3DCOMBO_LINE_BAR.png
-share/apps/kchart/pics/3DLINE.png
-share/apps/kchart/pics/areasubtypebeside.png
-share/apps/kchart/pics/areasubtypedepth.png
-share/apps/kchart/pics/barsubtypebeside.png
-share/apps/kchart/pics/barsubtypedepth.png
-share/apps/kchart/pics/barsubtypelayer.png
-share/apps/kchart/pics/barsubtypepercent.png
-share/apps/kchart/pics/chart_3dhiloclose.png
-share/apps/kchart/pics/chart_area.png
-share/apps/kchart/pics/chart_bar.png
-share/apps/kchart/pics/chart_combo_hlc_area.png
-share/apps/kchart/pics/chart_combo_hlc_bar.png
-share/apps/kchart/pics/chart_combo_line_area.png
-share/apps/kchart/pics/chart_combo_line_bar.png
-share/apps/kchart/pics/chart_hiloclose.png
-share/apps/kchart/pics/chart_lines.png
-share/apps/kchart/pics/chart_pie2D.png
-share/apps/kchart/pics/chart_pie3D.png
-share/apps/kformula/esstixeight.font
-share/apps/kformula/esstixeleven.font
-share/apps/kformula/esstixfifteen.font
-share/apps/kformula/esstixfive.font
-share/apps/kformula/esstixfour.font
-share/apps/kformula/esstixfourteen.font
-share/apps/kformula/esstixnine.font
-share/apps/kformula/esstixone.font
-share/apps/kformula/esstixseven.font
-share/apps/kformula/esstixseventeen.font
-share/apps/kformula/esstixsix.font
-share/apps/kformula/esstixsixteen.font
-share/apps/kformula/esstixten.font
-share/apps/kformula/esstixthirteen.font
-share/apps/kformula/esstixthree.font
-share/apps/kformula/esstixtwelve.font
-share/apps/kformula/esstixtwo.font
-share/apps/kformula/euclid%20math%20one.font
-share/apps/kformula/euclid%20math%20two.font
-share/apps/kformula/euclid%20symbol.font
-share/apps/kformula/kformula.rc
-share/apps/kformula/kformula_readonly.rc
-share/apps/kformula/mt%20extra.font
-share/apps/kformula/mt%20symbol.font
-share/apps/kformula/symbol.font
-share/apps/kformula/unicode.tbl
-share/apps/kivio/autoloadStencils/Text.sml
-share/apps/kivio/autoloadStencils/Text.xpm
-share/apps/kivio/autoloadStencils/straight_connector.ksp
-share/apps/kivio/autoloadStencils/straight_connector.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/add_stencil.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/bring_stencil_to_front.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/color_fill.png
-share/apps/kivio/icons/hicolor/16x16/actions/color_line.png
-share/apps/kivio/icons/hicolor/16x16/actions/copy_stencil.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/cut_stencil.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/fillcolor.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/font_bold.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/font_italic.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/font_names.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/font_size.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/font_under.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/group_stencils.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/guides_horizontal.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/guides_vertical.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/item_add.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/item_remove.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/item_rename.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/layer_add.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/layer_connect.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/layer_editable.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/layer_noconnect.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/layer_noeditable.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/layer_noprint.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/layer_novisible.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/layer_print.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/layer_remove.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/layer_visible.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/linewidth.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/open_stencilset.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/page_disabled.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/page_enabled.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/paste_stencil.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/pencolor.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/remove_stencil.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/send_stencil_to_back.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/textcolor.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/ungroup_stencils.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/view_grid.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/view_guidelines.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/view_manager.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/view_margins.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/view_page.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/view_pageborder.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/view_ruler.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/zoom_disabled.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/zoom_enabled.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/bring_stencil_to_front.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/close_stencilset.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/color_fill.png
-share/apps/kivio/icons/hicolor/22x22/actions/color_line.png
-share/apps/kivio/icons/hicolor/22x22/actions/font_bold.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/font_italic.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/font_under.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/group_stencils.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/open_stencilset.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/select_all.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/send_stencil_to_back.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/ungroup_stencils.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/unselect_all.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/view_grid.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/view_margins.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/view_pageborder.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/view_ruler.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/bring_stencil_to_front.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/close_stencilset.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/font_bold.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/font_italic.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/font_under.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/group_stencils.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/open_stencilset.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/select_all.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/send_stencil_to_back.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/ungroup_stencils.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/unselect_all.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/view_grid.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/view_margins.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/view_pageborder.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/view_ruler.xpm
-share/apps/kivio/kivio.rc
-share/apps/kivio/kivio_readonly.rc
-share/apps/kivio/kivio_tool.rc
-share/apps/kivio/kpartplugins/kivioconnectortool.rc
-share/apps/kivio/kpartplugins/kivioselecttool.rc
-share/apps/kivio/kpartplugins/kiviotexttool.rc
-share/apps/kivio/kpartplugins/kiviozoomtool.rc
-share/apps/kivio/pics/kivio_arrow.xpm
-share/apps/kivio/pics/kivio_connector.xpm
-share/apps/kivio/pics/kivio_connector_cursor1.xpm
-share/apps/kivio/pics/kivio_connector_cursor2.xpm
-share/apps/kivio/pics/kivio_text.xpm
-share/apps/kivio/pics/kivio_text_cursor.xpm
-share/apps/kivio/pics/kivio_zoom.xpm
-share/apps/kivio/pics/kivio_zoom_allobject.xpm
-share/apps/kivio/pics/kivio_zoom_hand.xpm
-share/apps/kivio/pics/kivio_zoom_height.xpm
-share/apps/kivio/pics/kivio_zoom_minus.xpm
-share/apps/kivio/pics/kivio_zoom_page.xpm
-share/apps/kivio/pics/kivio_zoom_plus.xpm
-share/apps/kivio/pics/kivio_zoom_selected.xpm
-share/apps/kivio/pics/kivio_zoom_width.xpm
-share/apps/kivio/pics/kiviosplash.png
-share/apps/kivio/pics/tile_scissors1.xpm
-share/apps/kivio/pics/tile_skulls1.xpm
-share/apps/kivio/pics/tile_yellow_swirl.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Card.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Card.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Data.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Data.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Decision.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Decision.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/DirectData.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/DirectData.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Display.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Display.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Document.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Document.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/InternalStorage.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/InternalStorage.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/LoopLimit.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/LoopLimit.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/ManualInput.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/ManualInput.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/ManualOperation.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/ManualOperation.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/OffPageRef.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/OffPageRef.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/OnPageRef.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/OnPageRef.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/PaperTape.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/PaperTape.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/PredefinedProcess.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/PredefinedProcess.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Preperation.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Preperation.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Process.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Process.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/SequentialData.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/SequentialData.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/StoredData.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/StoredData.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Terminator.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Terminator.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/desc
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/icon.xpm
-share/apps/kivio/stencils/Flowcharting/Logic/and.sml
-share/apps/kivio/stencils/Flowcharting/Logic/and.xpm
-share/apps/kivio/stencils/Flowcharting/Logic/buffer.sml
-share/apps/kivio/stencils/Flowcharting/Logic/buffer.xpm
-share/apps/kivio/stencils/Flowcharting/Logic/connector.sml
-share/apps/kivio/stencils/Flowcharting/Logic/connector.xpm
-share/apps/kivio/stencils/Flowcharting/Logic/icon.xpm
-share/apps/kivio/stencils/Flowcharting/Logic/inverter.sml
-share/apps/kivio/stencils/Flowcharting/Logic/inverter.xpm
-share/apps/kivio/stencils/Flowcharting/Logic/nand.sml
-share/apps/kivio/stencils/Flowcharting/Logic/nand.xpm
-share/apps/kivio/stencils/Flowcharting/Logic/nor.sml
-share/apps/kivio/stencils/Flowcharting/Logic/nor.xpm
-share/apps/kivio/stencils/Flowcharting/Logic/not.sml
-share/apps/kivio/stencils/Flowcharting/Logic/not.xpm
-share/apps/kivio/stencils/Flowcharting/Logic/or.sml
-share/apps/kivio/stencils/Flowcharting/Logic/or.xpm
-share/apps/kivio/stencils/Flowcharting/Logic/xor.sml
-share/apps/kivio/stencils/Flowcharting/Logic/xor.xpm
-share/apps/kivio/stencils/Flowcharting/desc
-share/apps/kivio/stencils/Flowcharting/icon.xpm
-share/apps/koffice/autocorrect/autocorrect.xml
-share/apps/koffice/autocorrect/cs.xml
-share/apps/koffice/autocorrect/de.xml
-share/apps/koffice/autocorrect/en_US.xml
-share/apps/koffice/autocorrect/es.xml
-share/apps/koffice/autocorrect/fr.xml
-share/apps/koffice/autocorrect/hu.xml
-share/apps/koffice/autocorrect/it.xml
-share/apps/koffice/autocorrect/nn.xml
-share/apps/koffice/autocorrect/sk.xml
-share/apps/koffice/icons/hicolor/16x16/actions/delete_table_col.png
-share/apps/koffice/icons/hicolor/16x16/actions/delete_table_row.png
-share/apps/koffice/icons/hicolor/16x16/actions/documentinfo.png
-share/apps/koffice/icons/hicolor/16x16/actions/enum_list.png
-share/apps/koffice/icons/hicolor/16x16/actions/fontsizedown.png
-share/apps/koffice/icons/hicolor/16x16/actions/fontsizeup.png
-share/apps/koffice/icons/hicolor/16x16/actions/format_decreaseindent.png
-share/apps/koffice/icons/hicolor/16x16/actions/format_increaseindent.png
-share/apps/koffice/icons/hicolor/16x16/actions/frame_edit.png
-share/apps/koffice/icons/hicolor/16x16/actions/frame_formula.png
-share/apps/koffice/icons/hicolor/16x16/actions/frame_image.png
-share/apps/koffice/icons/hicolor/16x16/actions/frame_query.png
-share/apps/koffice/icons/hicolor/16x16/actions/frame_spreadsheet.png
-share/apps/koffice/icons/hicolor/16x16/actions/frame_text.png
-share/apps/koffice/icons/hicolor/16x16/actions/inline_image.png
-share/apps/koffice/icons/hicolor/16x16/actions/inline_table.png
-share/apps/koffice/icons/hicolor/16x16/actions/insert_table_col.png
-share/apps/koffice/icons/hicolor/16x16/actions/insert_table_row.png
-share/apps/koffice/icons/hicolor/16x16/actions/kdb_form.png
-share/apps/koffice/icons/hicolor/16x16/actions/kdb_table.png
-share/apps/koffice/icons/hicolor/16x16/actions/linewidth.png
-share/apps/koffice/icons/hicolor/16x16/actions/tab_first.png
-share/apps/koffice/icons/hicolor/16x16/actions/tab_last.png
-share/apps/koffice/icons/hicolor/16x16/actions/tab_left.png
-share/apps/koffice/icons/hicolor/16x16/actions/tab_right.png
-share/apps/koffice/icons/hicolor/16x16/actions/text_strike.png
-share/apps/koffice/icons/hicolor/16x16/actions/text_sub.png
-share/apps/koffice/icons/hicolor/16x16/actions/text_super.png
-share/apps/koffice/icons/hicolor/16x16/actions/textcolor.png
-share/apps/koffice/icons/hicolor/16x16/actions/unsorted_list.png
-share/apps/koffice/icons/hicolor/16x16/actions/view_orientation.png
-share/apps/koffice/icons/hicolor/16x16/actions/view_remove.png
-share/apps/koffice/icons/hicolor/16x16/actions/view_split.png
-share/apps/koffice/icons/hicolor/16x16/apps/go.png
-share/apps/koffice/icons/hicolor/16x16/apps/key_bindings.png
-share/apps/koffice/icons/hicolor/16x16/apps/style.png
-share/apps/koffice/icons/hicolor/22x22/actions/borderbottom.png
-share/apps/koffice/icons/hicolor/22x22/actions/borderleft.png
-share/apps/koffice/icons/hicolor/22x22/actions/borderright.png
-share/apps/koffice/icons/hicolor/22x22/actions/bordertop.png
-share/apps/koffice/icons/hicolor/22x22/actions/bring_forward.png
-share/apps/koffice/icons/hicolor/22x22/actions/cancel.png
-share/apps/koffice/icons/hicolor/22x22/actions/char.png
-share/apps/koffice/icons/hicolor/22x22/actions/clipart.png
-share/apps/koffice/icons/hicolor/22x22/actions/clipart_from_file.png
-share/apps/koffice/icons/hicolor/22x22/actions/delete_table_col.png
-share/apps/koffice/icons/hicolor/22x22/actions/delete_table_row.png
-share/apps/koffice/icons/hicolor/22x22/actions/fontsizedown.png
-share/apps/koffice/icons/hicolor/22x22/actions/fontsizeup.png
-share/apps/koffice/icons/hicolor/22x22/actions/format_decreaseindent.png
-share/apps/koffice/icons/hicolor/22x22/actions/format_increaseindent.png
-share/apps/koffice/icons/hicolor/22x22/actions/frame_chart.png
-share/apps/koffice/icons/hicolor/22x22/actions/frame_edit.png
-share/apps/koffice/icons/hicolor/22x22/actions/frame_formula.png
-share/apps/koffice/icons/hicolor/22x22/actions/frame_image.png
-share/apps/koffice/icons/hicolor/22x22/actions/frame_query.png
-share/apps/koffice/icons/hicolor/22x22/actions/frame_spreadsheet.png
-share/apps/koffice/icons/hicolor/22x22/actions/frame_text.png
-share/apps/koffice/icons/hicolor/22x22/actions/inline_image.png
-share/apps/koffice/icons/hicolor/22x22/actions/inline_table.png
-share/apps/koffice/icons/hicolor/22x22/actions/insert_table_col.png
-share/apps/koffice/icons/hicolor/22x22/actions/insert_table_row.png
-share/apps/koffice/icons/hicolor/22x22/actions/neonpen.png
-share/apps/koffice/icons/hicolor/22x22/actions/ok.png
-share/apps/koffice/icons/hicolor/22x22/actions/part/killustrator.png
-share/apps/koffice/icons/hicolor/22x22/actions/part/kword.png
-share/apps/koffice/icons/hicolor/22x22/actions/send_backward.png
-share/apps/koffice/icons/hicolor/22x22/actions/shadow.png
-share/apps/koffice/icons/hicolor/22x22/actions/shadowB.png
-share/apps/koffice/icons/hicolor/22x22/actions/shadowL.png
-share/apps/koffice/icons/hicolor/22x22/actions/shadowLB.png
-share/apps/koffice/icons/hicolor/22x22/actions/shadowLU.png
-share/apps/koffice/icons/hicolor/22x22/actions/shadowR.png
-share/apps/koffice/icons/hicolor/22x22/actions/shadowRB.png
-share/apps/koffice/icons/hicolor/22x22/actions/shadowRU.png
-share/apps/koffice/icons/hicolor/22x22/actions/shadowU.png
-share/apps/koffice/icons/hicolor/22x22/actions/sub.png
-share/apps/koffice/icons/hicolor/22x22/actions/super.png
-share/apps/koffice/icons/hicolor/22x22/actions/text_strike.png
-share/apps/koffice/icons/hicolor/22x22/actions/toggle_docbrowser.png
-share/apps/koffice/icons/hicolor/22x22/actions/view_remove.png
-share/apps/koffice/icons/hicolor/32x32/actions/delete_table_col.png
-share/apps/koffice/icons/hicolor/32x32/actions/delete_table_row.png
-share/apps/koffice/icons/hicolor/32x32/actions/insert_table_col.png
-share/apps/koffice/icons/hicolor/32x32/actions/insert_table_row.png
-share/apps/koffice/icons/hicolor/32x32/actions/sort_az.png
-share/apps/koffice/icons/hicolor/32x32/actions/view_remove.png
-share/apps/koffice/icons/hicolor/32x32/apps/go.png
-share/apps/koffice/icons/hicolor/48x48/apps/key_bindings.png
-share/apps/koffice/koffice_shell.rc
-share/apps/koffice/pics/koKoolBarDown.png
-share/apps/koffice/pics/koKoolBarUp.png
-share/apps/koffice/pics/koRulerFirst.png
-share/apps/koffice/pics/koRulerLeft.png
-share/apps/koffice/pics/koffice-logo.png
-share/apps/kontour/icons/hicolor/16x16/actions/abottom.png
-share/apps/kontour/icons/hicolor/16x16/actions/ahcenter.png
-share/apps/kontour/icons/hicolor/16x16/actions/aleft.png
-share/apps/kontour/icons/hicolor/16x16/actions/aright.png
-share/apps/kontour/icons/hicolor/16x16/actions/atop.png
-share/apps/kontour/icons/hicolor/16x16/actions/avcenter.png
-share/apps/kontour/icons/hicolor/16x16/actions/beziertool.png
-share/apps/kontour/icons/hicolor/16x16/actions/cap_butt.png
-share/apps/kontour/icons/hicolor/16x16/actions/cap_round.png
-share/apps/kontour/icons/hicolor/16x16/actions/cap_square.png
-share/apps/kontour/icons/hicolor/16x16/actions/dbottom.png
-share/apps/kontour/icons/hicolor/16x16/actions/deleteNode.png
-share/apps/kontour/icons/hicolor/16x16/actions/deletelayer.png
-share/apps/kontour/icons/hicolor/16x16/actions/dhcenter.png
-share/apps/kontour/icons/hicolor/16x16/actions/dhdist.png
-share/apps/kontour/icons/hicolor/16x16/actions/dleft.png
-share/apps/kontour/icons/hicolor/16x16/actions/dright.png
-share/apps/kontour/icons/hicolor/16x16/actions/dtop.png
-share/apps/kontour/icons/hicolor/16x16/actions/dvcenter.png
-share/apps/kontour/icons/hicolor/16x16/actions/dvdist.png
-share/apps/kontour/icons/hicolor/16x16/actions/ellipse1.png
-share/apps/kontour/icons/hicolor/16x16/actions/ellipse2.png
-share/apps/kontour/icons/hicolor/16x16/actions/ellipse3.png
-share/apps/kontour/icons/hicolor/16x16/actions/ellipsetool.png
-share/apps/kontour/icons/hicolor/16x16/actions/eye.png
-share/apps/kontour/icons/hicolor/16x16/actions/freehandtool.png
-share/apps/kontour/icons/hicolor/16x16/actions/group.png
-share/apps/kontour/icons/hicolor/16x16/actions/hmirror.png
-share/apps/kontour/icons/hicolor/16x16/actions/insertclipart.png
-share/apps/kontour/icons/hicolor/16x16/actions/item_add.png
-share/apps/kontour/icons/hicolor/16x16/actions/item_remove.png
-share/apps/kontour/icons/hicolor/16x16/actions/item_rename.png
-share/apps/kontour/icons/hicolor/16x16/actions/joinNodes.png
-share/apps/kontour/icons/hicolor/16x16/actions/join_bevel.png
-share/apps/kontour/icons/hicolor/16x16/actions/join_miter.png
-share/apps/kontour/icons/hicolor/16x16/actions/join_round.png
-share/apps/kontour/icons/hicolor/16x16/actions/linetool.png
-share/apps/kontour/icons/hicolor/16x16/actions/lowerlayer.png
-share/apps/kontour/icons/hicolor/16x16/actions/moveNode.png
-share/apps/kontour/icons/hicolor/16x16/actions/newNode.png
-share/apps/kontour/icons/hicolor/16x16/actions/newlayer.png
-share/apps/kontour/icons/hicolor/16x16/actions/pointtool.png
-share/apps/kontour/icons/hicolor/16x16/actions/polygontool.png
-share/apps/kontour/icons/hicolor/16x16/actions/raiselayer.png
-share/apps/kontour/icons/hicolor/16x16/actions/recttool.png
-share/apps/kontour/icons/hicolor/16x16/actions/snap_to_grid.png
-share/apps/kontour/icons/hicolor/16x16/actions/split.png
-share/apps/kontour/icons/hicolor/16x16/actions/tcenteralign.png
-share/apps/kontour/icons/hicolor/16x16/actions/texttool.png
-share/apps/kontour/icons/hicolor/16x16/actions/tleftalign.png
-share/apps/kontour/icons/hicolor/16x16/actions/trightalign.png
-share/apps/kontour/icons/hicolor/16x16/actions/ungroup.png
-share/apps/kontour/icons/hicolor/16x16/actions/vmirror.png
-share/apps/kontour/icons/hicolor/16x16/apps/kontour.png
-share/apps/kontour/icons/hicolor/22x22/actions/selecttool.png
-share/apps/kontour/icons/hicolor/32x32/actions/rect1.png
-share/apps/kontour/icons/hicolor/32x32/actions/rect2.png
-share/apps/kontour/icons/hicolor/32x32/actions/rect3.png
-share/apps/kontour/icons/hicolor/32x32/actions/rect4.png
-share/apps/kontour/icons/hicolor/32x32/actions/rect5.png
-share/apps/kontour/icons/hicolor/32x32/actions/rect6.png
-share/apps/kontour/icons/hicolor/32x32/actions/rect7.png
-share/apps/kontour/icons/hicolor/32x32/actions/rect8.png
-share/apps/kontour/icons/hicolor/32x32/apps/kontour.png
-share/apps/kontour/icons/hicolor/48x48/apps/kontour.png
-share/apps/kontour/kontour.rc
-share/apps/kontour/kontour_readonly.rc
-share/apps/kontour/kpartplugins/scan-kontour.rc
-share/apps/kontour/templates/Simple/.directory
-share/apps/kontour/templates/Simple/.icon/Plain.png
-share/apps/kontour/templates/Simple/.source/Plain.kon
-share/apps/kontour/templates/Simple/Plain.desktop
-share/apps/kpresenter/autoforms/.autoforms
-share/apps/kpresenter/autoforms/Arrows/.directory
-share/apps/kpresenter/autoforms/Arrows/.icon/ArrowDown.png
-share/apps/kpresenter/autoforms/Arrows/.icon/ArrowLeft.png
-share/apps/kpresenter/autoforms/Arrows/.icon/ArrowLeftDown.png
-share/apps/kpresenter/autoforms/Arrows/.icon/ArrowLeftUp.png
-share/apps/kpresenter/autoforms/Arrows/.icon/ArrowRight.png
-share/apps/kpresenter/autoforms/Arrows/.icon/ArrowRightDown.png
-share/apps/kpresenter/autoforms/Arrows/.icon/ArrowRightUp.png
-share/apps/kpresenter/autoforms/Arrows/.icon/ArrowUp.png
-share/apps/kpresenter/autoforms/Arrows/.source/ArrowDown.atf
-share/apps/kpresenter/autoforms/Arrows/.source/ArrowLeft.atf
-share/apps/kpresenter/autoforms/Arrows/.source/ArrowLeftDown.atf
-share/apps/kpresenter/autoforms/Arrows/.source/ArrowLeftUp.atf
-share/apps/kpresenter/autoforms/Arrows/.source/ArrowRight.atf
-share/apps/kpresenter/autoforms/Arrows/.source/ArrowRightDown.atf
-share/apps/kpresenter/autoforms/Arrows/.source/ArrowRightUp.atf
-share/apps/kpresenter/autoforms/Arrows/.source/ArrowUp.atf
-share/apps/kpresenter/autoforms/Arrows/ArrowDown.desktop
-share/apps/kpresenter/autoforms/Arrows/ArrowLeft.desktop
-share/apps/kpresenter/autoforms/Arrows/ArrowLeftDown.desktop
-share/apps/kpresenter/autoforms/Arrows/ArrowLeftUp.desktop
-share/apps/kpresenter/autoforms/Arrows/ArrowRight.desktop
-share/apps/kpresenter/autoforms/Arrows/ArrowRightDown.desktop
-share/apps/kpresenter/autoforms/Arrows/ArrowRightUp.desktop
-share/apps/kpresenter/autoforms/Arrows/ArrowUp.desktop
-share/apps/kpresenter/autoforms/Connections/.directory
-share/apps/kpresenter/autoforms/Connections/.icon/Connection1.png
-share/apps/kpresenter/autoforms/Connections/.icon/Connection10.png
-share/apps/kpresenter/autoforms/Connections/.icon/Connection11.png
-share/apps/kpresenter/autoforms/Connections/.icon/Connection12.png
-share/apps/kpresenter/autoforms/Connections/.icon/Connection2.png
-share/apps/kpresenter/autoforms/Connections/.icon/Connection3.png
-share/apps/kpresenter/autoforms/Connections/.icon/Connection4.png
-share/apps/kpresenter/autoforms/Connections/.icon/Connection5.png
-share/apps/kpresenter/autoforms/Connections/.icon/Connection6.png
-share/apps/kpresenter/autoforms/Connections/.icon/Connection7.png
-share/apps/kpresenter/autoforms/Connections/.icon/Connection8.png
-share/apps/kpresenter/autoforms/Connections/.icon/Connection9.png
-share/apps/kpresenter/autoforms/Connections/.source/Connection1.atf
-share/apps/kpresenter/autoforms/Connections/.source/Connection10.atf
-share/apps/kpresenter/autoforms/Connections/.source/Connection11.atf
-share/apps/kpresenter/autoforms/Connections/.source/Connection12.atf
-share/apps/kpresenter/autoforms/Connections/.source/Connection2.atf
-share/apps/kpresenter/autoforms/Connections/.source/Connection3.atf
-share/apps/kpresenter/autoforms/Connections/.source/Connection4.atf
-share/apps/kpresenter/autoforms/Connections/.source/Connection5.atf
-share/apps/kpresenter/autoforms/Connections/.source/Connection6.atf
-share/apps/kpresenter/autoforms/Connections/.source/Connection7.atf
-share/apps/kpresenter/autoforms/Connections/.source/Connection8.atf
-share/apps/kpresenter/autoforms/Connections/.source/Connection9.atf
-share/apps/kpresenter/autoforms/Connections/Connection1.desktop
-share/apps/kpresenter/autoforms/Connections/Connection10.desktop
-share/apps/kpresenter/autoforms/Connections/Connection11.desktop
-share/apps/kpresenter/autoforms/Connections/Connection12.desktop
-share/apps/kpresenter/autoforms/Connections/Connection2.desktop
-share/apps/kpresenter/autoforms/Connections/Connection3.desktop
-share/apps/kpresenter/autoforms/Connections/Connection4.desktop
-share/apps/kpresenter/autoforms/Connections/Connection5.desktop
-share/apps/kpresenter/autoforms/Connections/Connection6.desktop
-share/apps/kpresenter/autoforms/Connections/Connection7.desktop
-share/apps/kpresenter/autoforms/Connections/Connection8.desktop
-share/apps/kpresenter/autoforms/Connections/Connection9.desktop
-share/apps/kpresenter/dtd/kpresenter.dtd
-share/apps/kpresenter/icons/hicolor/22x22/actions/alignobjs.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/aobottom.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/aocenterh.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/aocenterv.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/aoleft.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/aoright.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/aotop.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/arrange.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/autoform.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/circle.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/closed_cubicbeziercurve.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/closed_freehand.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/closed_polyline.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/closed_quadricbeziercurve.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/cubicbeziercurve.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/delslide.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/depth-.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/edit_picture.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/edit_pie.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/edit_polygon.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/effect.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/freehand.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/group.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_arrow_begin.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_arrow_end.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_begin.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_circle_begin.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_circle_end.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_dimension_line_begin.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_dimension_line_end.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_double_arrow_begin.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_double_arrow_end.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_double_line_arrow_begin.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_double_line_arrow_end.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_end.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_line_arrow_begin.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_line_arrow_end.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_normal_begin.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_normal_end.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_rect_begin.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_rect_end.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/lined1.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/lined2.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/lineh.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/linev.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/lower.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/mini_autoform.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/mini_circle.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/mini_clipart.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/mini_line.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/mini_pie.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/mini_polygon.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/mini_rect.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/newPoint.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/newslide.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_style.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_style_dash.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_style_dashdot.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_style_dashdotdot.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_style_dot.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_style_nopen.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_style_solid.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_width.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_width1.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_width10.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_width2.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_width3.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_width4.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_width5.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_width6.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_width7.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_width8.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_width9.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/penbrush.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pgnum.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pie.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/polygon.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/polyline.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/quadricbeziercurve.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/raise.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/rectangle.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/rectangle2.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/rectangleRound.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/screen.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/ungroup.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/webpres.png
-share/apps/kpresenter/kpartplugins/scan-kpresenter.rc
-share/apps/kpresenter/kpresenter.rc
-share/apps/kpresenter/kpresenter_readonly.rc
-share/apps/kpresenter/pics/OneColumnLandscape.png
-share/apps/kpresenter/pics/OneColumnPortrait.png
-share/apps/kpresenter/pics/TitleLandscape.png
-share/apps/kpresenter/pics/TitlePortrait.png
-share/apps/kpresenter/pics/TwoColumnLandscape.png
-share/apps/kpresenter/pics/TwoColumnPortrait.png
-share/apps/kpresenter/pics/emptyLandscape.png
-share/apps/kpresenter/pics/emptyPortrait.png
-share/apps/kpresenter/pics/kautoformedit.png
-share/apps/kpresenter/slideshow/first.bmp
-share/apps/kpresenter/slideshow/first.jpeg
-share/apps/kpresenter/slideshow/first.png
-share/apps/kpresenter/slideshow/home.bmp
-share/apps/kpresenter/slideshow/home.jpeg
-share/apps/kpresenter/slideshow/home.png
-share/apps/kpresenter/slideshow/last.bmp
-share/apps/kpresenter/slideshow/last.jpeg
-share/apps/kpresenter/slideshow/last.png
-share/apps/kpresenter/slideshow/next.bmp
-share/apps/kpresenter/slideshow/next.jpeg
-share/apps/kpresenter/slideshow/next.png
-share/apps/kpresenter/slideshow/prev.bmp
-share/apps/kpresenter/slideshow/prev.jpeg
-share/apps/kpresenter/slideshow/prev.png
-share/apps/kpresenter/templates/A4/.directory
-share/apps/kpresenter/templates/A4/.source/OneColumnLandscape.kpt
-share/apps/kpresenter/templates/A4/.source/OneColumnPortrait.kpt
-share/apps/kpresenter/templates/A4/.source/TitleLandscape.kpt
-share/apps/kpresenter/templates/A4/.source/TitlePortrait.kpt
-share/apps/kpresenter/templates/A4/.source/TwoColumnLandscape.kpt
-share/apps/kpresenter/templates/A4/.source/TwoColumnPortrait.kpt
-share/apps/kpresenter/templates/A4/.source/emptyLandscape.kpt
-share/apps/kpresenter/templates/A4/.source/emptyPortrait.kpt
-share/apps/kpresenter/templates/A4/OneColumnLandscape.desktop
-share/apps/kpresenter/templates/A4/OneColumnPortrait.desktop
-share/apps/kpresenter/templates/A4/TitleLandscape.desktop
-share/apps/kpresenter/templates/A4/TitlePortrait.desktop
-share/apps/kpresenter/templates/A4/TwoColumnLandscape.desktop
-share/apps/kpresenter/templates/A4/TwoColumnPortrait.desktop
-share/apps/kpresenter/templates/A4/emptyLandscape.desktop
-share/apps/kpresenter/templates/A4/emptyPortrait.desktop
-share/apps/kpresenter/templates/Screen/.directory
-share/apps/kpresenter/templates/Screen/.source/OneColumnLandscape.kpt
-share/apps/kpresenter/templates/Screen/.source/TitleLandscape.kpt
-share/apps/kpresenter/templates/Screen/.source/TwoColumnLandscape.kpt
-share/apps/kpresenter/templates/Screen/.source/emptyLandscape.kpt
-share/apps/kpresenter/templates/Screen/OneColumnLandscape.desktop
-share/apps/kpresenter/templates/Screen/TitleLandscape.desktop
-share/apps/kpresenter/templates/Screen/TwoColumnLandscape.desktop
-share/apps/kpresenter/templates/Screen/emptyLandscape.desktop
-share/apps/kpresenter/templates/Screenpresentations/.directory
-share/apps/kpresenter/templates/Screenpresentations/.icon/BlueBreezeDouble.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/BlueBreezePicture.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/BlueBreezeSingle.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/CopperPlain.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/Gradient-Blue-Red.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/Plain.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/SnowyMountains.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/TotallyNewProduct.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/kde.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/kde2.png
-share/apps/kpresenter/templates/Screenpresentations/.source/BlueBreezeDouble.kpt
-share/apps/kpresenter/templates/Screenpresentations/.source/BlueBreezePicture.kpt
-share/apps/kpresenter/templates/Screenpresentations/.source/BlueBreezeSingle.kpt
-share/apps/kpresenter/templates/Screenpresentations/.source/CopperPlain.kpt
-share/apps/kpresenter/templates/Screenpresentations/.source/Gradient-Blue-Red.kpt
-share/apps/kpresenter/templates/Screenpresentations/.source/Plain.kpt
-share/apps/kpresenter/templates/Screenpresentations/.source/SnowyMountains.kpt
-share/apps/kpresenter/templates/Screenpresentations/.source/TotallyNewProduct.kpt
-share/apps/kpresenter/templates/Screenpresentations/.source/kde.kpt
-share/apps/kpresenter/templates/Screenpresentations/.source/kde2.kpt
-share/apps/kpresenter/templates/Screenpresentations/BlueBreezeDouble.desktop
-share/apps/kpresenter/templates/Screenpresentations/BlueBreezePicture.desktop
-share/apps/kpresenter/templates/Screenpresentations/BlueBreezeSingle.desktop
-share/apps/kpresenter/templates/Screenpresentations/CopperPlain.desktop
-share/apps/kpresenter/templates/Screenpresentations/Gradient-Blue-Red.desktop
-share/apps/kpresenter/templates/Screenpresentations/Plain.desktop
-share/apps/kpresenter/templates/Screenpresentations/SnowyMountains.desktop
-share/apps/kpresenter/templates/Screenpresentations/TotallyNewProduct.desktop
-share/apps/kpresenter/templates/Screenpresentations/kde.desktop
-share/apps/kpresenter/templates/Screenpresentations/kde2.desktop
-share/apps/kpresenter/templates/legal/.directory
-share/apps/kpresenter/templates/legal/.source/OneColumnLandscape.kpt
-share/apps/kpresenter/templates/legal/.source/OneColumnPortrait.kpt
-share/apps/kpresenter/templates/legal/.source/TitleLandscape.kpt
-share/apps/kpresenter/templates/legal/.source/TitlePortrait.kpt
-share/apps/kpresenter/templates/legal/.source/TwoColumnLandscape.kpt
-share/apps/kpresenter/templates/legal/.source/TwoColumnPortrait.kpt
-share/apps/kpresenter/templates/legal/.source/emptyLandscape.kpt
-share/apps/kpresenter/templates/legal/.source/emptyPortrait.kpt
-share/apps/kpresenter/templates/legal/OneColumnLandscape.desktop
-share/apps/kpresenter/templates/legal/OneColumnPortrait.desktop
-share/apps/kpresenter/templates/legal/TitleLandscape.desktop
-share/apps/kpresenter/templates/legal/TitlePortrait.desktop
-share/apps/kpresenter/templates/legal/TwoColumnLandscape.desktop
-share/apps/kpresenter/templates/legal/TwoColumnPortrait.desktop
-share/apps/kpresenter/templates/legal/emptyLandscape.desktop
-share/apps/kpresenter/templates/legal/emptyPortrait.desktop
-share/apps/kpresenter/templates/letter/.directory
-share/apps/kpresenter/templates/letter/.source/OneColumnLandscape.kpt
-share/apps/kpresenter/templates/letter/.source/OneColumnPortrait.kpt
-share/apps/kpresenter/templates/letter/.source/TitleLandscape.kpt
-share/apps/kpresenter/templates/letter/.source/TitlePortrait.kpt
-share/apps/kpresenter/templates/letter/.source/TwoColumnLandscape.kpt
-share/apps/kpresenter/templates/letter/.source/TwoColumnPortrait.kpt
-share/apps/kpresenter/templates/letter/.source/emptyLandscape.kpt
-share/apps/kpresenter/templates/letter/.source/emptyPortrait.kpt
-share/apps/kpresenter/templates/letter/OneColumnLandscape.desktop
-share/apps/kpresenter/templates/letter/OneColumnPortrait.desktop
-share/apps/kpresenter/templates/letter/TitleLandscape.desktop
-share/apps/kpresenter/templates/letter/TitlePortrait.desktop
-share/apps/kpresenter/templates/letter/TwoColumnLandscape.desktop
-share/apps/kpresenter/templates/letter/TwoColumnPortrait.desktop
-share/apps/kpresenter/templates/letter/emptyLandscape.desktop
-share/apps/kpresenter/templates/letter/emptyPortrait.desktop
-share/apps/krita/kpartplugins/scan-krita.rc
-share/apps/kspread/dtd/kspread.dtd
-share/apps/kspread/extensions/builtin.xml
-share/apps/kspread/extensions/conversion.xml
-share/apps/kspread/extensions/datetime.xml
-share/apps/kspread/extensions/engineering.xml
-share/apps/kspread/extensions/financial.xml
-share/apps/kspread/extensions/information.xml
-share/apps/kspread/extensions/logic.xml
-share/apps/kspread/extensions/math.ks
-share/apps/kspread/extensions/math.xml
-share/apps/kspread/extensions/statistical.xml
-share/apps/kspread/extensions/text.xml
-share/apps/kspread/extensions/trig.xml
-share/apps/kspread/icons/hicolor/16x16/actions/adjustcol.png
-share/apps/kspread/icons/hicolor/16x16/actions/adjustrow.png
-share/apps/kspread/icons/hicolor/16x16/actions/black_sum.png
-share/apps/kspread/icons/hicolor/16x16/actions/border_all.png
-share/apps/kspread/icons/hicolor/16x16/actions/border_bottom.png
-share/apps/kspread/icons/hicolor/16x16/actions/border_fall.png
-share/apps/kspread/icons/hicolor/16x16/actions/border_horizontal.png
-share/apps/kspread/icons/hicolor/16x16/actions/border_inside.png
-share/apps/kspread/icons/hicolor/16x16/actions/border_left.png
-share/apps/kspread/icons/hicolor/16x16/actions/border_outline.png
-share/apps/kspread/icons/hicolor/16x16/actions/border_remove.png
-share/apps/kspread/icons/hicolor/16x16/actions/border_right.png
-share/apps/kspread/icons/hicolor/16x16/actions/border_top.png
-share/apps/kspread/icons/hicolor/16x16/actions/border_up.png
-share/apps/kspread/icons/hicolor/16x16/actions/border_vertical.png
-share/apps/kspread/icons/hicolor/16x16/actions/cell_edit.png
-share/apps/kspread/icons/hicolor/16x16/actions/cell_layout.png
-share/apps/kspread/icons/hicolor/16x16/actions/chart.png
-share/apps/kspread/icons/hicolor/16x16/actions/color_fill.png
-share/apps/kspread/icons/hicolor/16x16/actions/color_line.png
-share/apps/kspread/icons/hicolor/16x16/actions/comment.png
-share/apps/kspread/icons/hicolor/16x16/actions/delete_table.png
-share/apps/kspread/icons/hicolor/16x16/actions/deletecell.png
-share/apps/kspread/icons/hicolor/16x16/actions/dissociatecell.png
-share/apps/kspread/icons/hicolor/16x16/actions/first_letter_upper.png
-share/apps/kspread/icons/hicolor/16x16/actions/fontsizedown.png
-share/apps/kspread/icons/hicolor/16x16/actions/fontsizeup.png
-share/apps/kspread/icons/hicolor/16x16/actions/funct.png
-share/apps/kspread/icons/hicolor/16x16/actions/hide_table_column.png
-share/apps/kspread/icons/hicolor/16x16/actions/hide_table_row.png
-share/apps/kspread/icons/hicolor/16x16/actions/insertcell.png
-share/apps/kspread/icons/hicolor/16x16/actions/insertcellcopy.png
-share/apps/kspread/icons/hicolor/16x16/actions/inserttable.png
-share/apps/kspread/icons/hicolor/16x16/actions/lower.png
-share/apps/kspread/icons/hicolor/16x16/actions/mergecell.png
-share/apps/kspread/icons/hicolor/16x16/actions/middle.png
-share/apps/kspread/icons/hicolor/16x16/actions/money.png
-share/apps/kspread/icons/hicolor/16x16/actions/multirow.png
-share/apps/kspread/icons/hicolor/16x16/actions/oscilloscope.png
-share/apps/kspread/icons/hicolor/16x16/actions/percent.png
-share/apps/kspread/icons/hicolor/16x16/actions/precminus.png
-share/apps/kspread/icons/hicolor/16x16/actions/precplus.png
-share/apps/kspread/icons/hicolor/16x16/actions/removecell.png
-share/apps/kspread/icons/hicolor/16x16/actions/removecomment.png
-share/apps/kspread/icons/hicolor/16x16/actions/resizecol.png
-share/apps/kspread/icons/hicolor/16x16/actions/resizerow.png
-share/apps/kspread/icons/hicolor/16x16/actions/series.png
-share/apps/kspread/icons/hicolor/16x16/actions/show_table_column.png
-share/apps/kspread/icons/hicolor/16x16/actions/show_table_row.png
-share/apps/kspread/icons/hicolor/16x16/actions/sort_decrease.png
-share/apps/kspread/icons/hicolor/16x16/actions/sort_incr.png
-share/apps/kspread/icons/hicolor/16x16/actions/special_paste.png
-share/apps/kspread/icons/hicolor/16x16/actions/text_bottom.png
-share/apps/kspread/icons/hicolor/16x16/actions/text_top.png
-share/apps/kspread/icons/hicolor/16x16/actions/upper.png
-share/apps/kspread/icons/hicolor/16x16/actions/vertical_text.png
-share/apps/kspread/icons/hicolor/22x22/actions/abort.png
-share/apps/kspread/icons/hicolor/22x22/actions/adjustcol.png
-share/apps/kspread/icons/hicolor/22x22/actions/adjustrow.png
-share/apps/kspread/icons/hicolor/22x22/actions/black_sum.png
-share/apps/kspread/icons/hicolor/22x22/actions/border_all.png
-share/apps/kspread/icons/hicolor/22x22/actions/border_bottom.png
-share/apps/kspread/icons/hicolor/22x22/actions/border_fall.png
-share/apps/kspread/icons/hicolor/22x22/actions/border_horizontal.png
-share/apps/kspread/icons/hicolor/22x22/actions/border_inside.png
-share/apps/kspread/icons/hicolor/22x22/actions/border_left.png
-share/apps/kspread/icons/hicolor/22x22/actions/border_outline.png
-share/apps/kspread/icons/hicolor/22x22/actions/border_remove.png
-share/apps/kspread/icons/hicolor/22x22/actions/border_right.png
-share/apps/kspread/icons/hicolor/22x22/actions/border_top.png
-share/apps/kspread/icons/hicolor/22x22/actions/border_up.png
-share/apps/kspread/icons/hicolor/22x22/actions/border_vertical.png
-share/apps/kspread/icons/hicolor/22x22/actions/cell_layout.png
-share/apps/kspread/icons/hicolor/22x22/actions/color_fill.png
-share/apps/kspread/icons/hicolor/22x22/actions/color_line.png
-share/apps/kspread/icons/hicolor/22x22/actions/colout.png
-share/apps/kspread/icons/hicolor/22x22/actions/comment.png
-share/apps/kspread/icons/hicolor/22x22/actions/delete_table.png
-share/apps/kspread/icons/hicolor/22x22/actions/deletecell.png
-share/apps/kspread/icons/hicolor/22x22/actions/dissociatecell.png
-share/apps/kspread/icons/hicolor/22x22/actions/done.png
-share/apps/kspread/icons/hicolor/22x22/actions/first_letter_upper.png
-share/apps/kspread/icons/hicolor/22x22/actions/fontsizedown.png
-share/apps/kspread/icons/hicolor/22x22/actions/fontsizeup.png
-share/apps/kspread/icons/hicolor/22x22/actions/funct.png
-share/apps/kspread/icons/hicolor/22x22/actions/hide_table_column.png
-share/apps/kspread/icons/hicolor/22x22/actions/hide_table_row.png
-share/apps/kspread/icons/hicolor/22x22/actions/insertcell.png
-share/apps/kspread/icons/hicolor/22x22/actions/insertcellcopy.png
-share/apps/kspread/icons/hicolor/22x22/actions/inserttable.png
-share/apps/kspread/icons/hicolor/22x22/actions/lower.png
-share/apps/kspread/icons/hicolor/22x22/actions/mergecell.png
-share/apps/kspread/icons/hicolor/22x22/actions/middle.png
-share/apps/kspread/icons/hicolor/22x22/actions/money.png
-share/apps/kspread/icons/hicolor/22x22/actions/multirow.png
-share/apps/kspread/icons/hicolor/22x22/actions/neonpen.png
-share/apps/kspread/icons/hicolor/22x22/actions/oscilloscope.png
-share/apps/kspread/icons/hicolor/22x22/actions/percent.png
-share/apps/kspread/icons/hicolor/22x22/actions/prec_minus.png
-share/apps/kspread/icons/hicolor/22x22/actions/prec_plus.png
-share/apps/kspread/icons/hicolor/22x22/actions/removecell.png
-share/apps/kspread/icons/hicolor/22x22/actions/removecomment.png
-share/apps/kspread/icons/hicolor/22x22/actions/resizecol.png
-share/apps/kspread/icons/hicolor/22x22/actions/resizerow.png
-share/apps/kspread/icons/hicolor/22x22/actions/rowout.png
-share/apps/kspread/icons/hicolor/22x22/actions/show_table_column.png
-share/apps/kspread/icons/hicolor/22x22/actions/show_table_row.png
-share/apps/kspread/icons/hicolor/22x22/actions/sort_decrease.png
-share/apps/kspread/icons/hicolor/22x22/actions/sort_incr.png
-share/apps/kspread/icons/hicolor/22x22/actions/special_paste.png
-share/apps/kspread/icons/hicolor/22x22/actions/text_bottom.png
-share/apps/kspread/icons/hicolor/22x22/actions/text_top.png
-share/apps/kspread/icons/hicolor/22x22/actions/upper.png
-share/apps/kspread/icons/hicolor/22x22/actions/vertical_text.png
-share/apps/kspread/icons/hicolor/32x32/actions/border_all.png
-share/apps/kspread/icons/hicolor/32x32/actions/border_bottom.png
-share/apps/kspread/icons/hicolor/32x32/actions/border_fall.png
-share/apps/kspread/icons/hicolor/32x32/actions/border_horizontal.png
-share/apps/kspread/icons/hicolor/32x32/actions/border_inside.png
-share/apps/kspread/icons/hicolor/32x32/actions/border_left.png
-share/apps/kspread/icons/hicolor/32x32/actions/border_outline.png
-share/apps/kspread/icons/hicolor/32x32/actions/border_remove.png
-share/apps/kspread/icons/hicolor/32x32/actions/border_right.png
-share/apps/kspread/icons/hicolor/32x32/actions/border_top.png
-share/apps/kspread/icons/hicolor/32x32/actions/border_up.png
-share/apps/kspread/icons/hicolor/32x32/actions/border_vertical.png
-share/apps/kspread/icons/hicolor/32x32/actions/funct.png
-share/apps/kspread/icons/hicolor/32x32/actions/percent.png
-share/apps/kspread/icons/hicolor/32x32/actions/prec_minus.png
-share/apps/kspread/icons/hicolor/32x32/actions/prec_plus.png
-share/apps/kspread/kpartplugins/kspreadcalc.rc
-share/apps/kspread/kspread.rc
-share/apps/kspread/kspread_readonly.rc
-share/apps/kspread/tablestyles/standard1.ksts
-share/apps/kspread/tablestyles/standard1.png
-share/apps/kspread/tablestyles/standard1.xml
-share/apps/kspread/tablestyles/standard2.ksts
-share/apps/kspread/tablestyles/standard2.png
-share/apps/kspread/tablestyles/standard2.xml
-share/apps/kspread/templates/General/.directory
-share/apps/kspread/templates/General/.icon/Worksheet.png
-share/apps/kspread/templates/General/.source/Worksheet.kst
-share/apps/kspread/templates/General/Worksheet.desktop
-share/apps/kudesigner/icons/hicolor/22x22/actions/frame_field.png
-share/apps/kudesigner/icons/hicolor/22x22/actions/id.png
-share/apps/kudesigner/icons/hicolor/22x22/actions/idf.png
-share/apps/kudesigner/icons/hicolor/22x22/actions/idh.png
-share/apps/kudesigner/icons/hicolor/22x22/actions/ipf.png
-share/apps/kudesigner/icons/hicolor/22x22/actions/iph.png
-share/apps/kudesigner/icons/hicolor/22x22/actions/irf.png
-share/apps/kudesigner/icons/hicolor/22x22/actions/irh.png
-share/apps/kudesigner/icons/locolor/22x22/actions/frame_field.png
-share/apps/kudesigner/icons/locolor/22x22/actions/id.png
-share/apps/kudesigner/icons/locolor/22x22/actions/idf.png
-share/apps/kudesigner/icons/locolor/22x22/actions/idh.png
-share/apps/kudesigner/icons/locolor/22x22/actions/ipf.png
-share/apps/kudesigner/icons/locolor/22x22/actions/iph.png
-share/apps/kudesigner/icons/locolor/22x22/actions/irf.png
-share/apps/kudesigner/icons/locolor/22x22/actions/irh.png
-share/apps/kudesigner/kudesignerui.rc
-share/apps/kugar/dtd/kugartemplate.dtd
-share/apps/kugar/kugarpart.rc
-share/apps/kugar/kugarui.rc
-share/apps/kugar/templates/sample1.kud
-share/apps/kugar/templates/sample1.kut
-share/apps/kugar/templates/sample2.kud
-share/apps/kugar/templates/sample2.kut
-share/apps/kugar/templates/sample3.kud
-share/apps/kugar/templates/sample3.kut
-share/apps/kword/dtd/framestyles.dtd
-share/apps/kword/dtd/kword.dtd
-share/apps/kword/dtd/tablestyles.dtd
-share/apps/kword/dtd/tabletemplates.dtd
-share/apps/kword/expression/expression.xml
-share/apps/kword/framestyles.xml
-share/apps/kword/icons/hicolor/16x16/actions/color_fill.png
-share/apps/kword/icons/hicolor/16x16/actions/color_line.png
-share/apps/kword/icons/hicolor/22x22/actions/borderoutline.png
-share/apps/kword/icons/hicolor/22x22/actions/color_fill.png
-share/apps/kword/icons/hicolor/22x22/actions/color_line.png
-share/apps/kword/icons/hicolor/22x22/actions/edittool.png
-share/apps/kword/icons/hicolor/22x22/actions/enumList.png
-share/apps/kword/icons/hicolor/22x22/actions/kwsearch.png
-share/apps/kword/icons/hicolor/22x22/actions/lower.png
-share/apps/kword/icons/hicolor/22x22/actions/raise.png
-share/apps/kword/icons/hicolor/22x22/actions/return.png
-share/apps/kword/icons/hicolor/22x22/actions/run_bounding.png
-share/apps/kword/icons/hicolor/22x22/actions/run_not.png
-share/apps/kword/icons/hicolor/22x22/actions/run_skip.png
-share/apps/kword/icons/hicolor/22x22/actions/sl_addentry.png
-share/apps/kword/icons/hicolor/22x22/actions/sl_addrecord.png
-share/apps/kword/icons/hicolor/22x22/actions/sl_delentry.png
-share/apps/kword/icons/hicolor/22x22/actions/sl_delrecord.png
-share/apps/kword/icons/hicolor/22x22/actions/tree_arrange.png
-share/apps/kword/icons/hicolor/22x22/actions/unsortedList.png
-share/apps/kword/kpartplugins/scan-kword.rc
-share/apps/kword/kword.rc
-share/apps/kword/kword_readonly.rc
-share/apps/kword/tablestyles.xml
-share/apps/kword/tabletemplates.xml
-share/apps/kword/templates/Normal/.directory
-share/apps/kword/templates/Normal/.icon/A4.png
-share/apps/kword/templates/Normal/.icon/Letter.png
-share/apps/kword/templates/Normal/.icon/Memo.png
-share/apps/kword/templates/Normal/.icon/PlainText.png
-share/apps/kword/templates/Normal/.icon/TwoColumns.png
-share/apps/kword/templates/Normal/.source/A4.kwt
-share/apps/kword/templates/Normal/.source/Letter.kwt
-share/apps/kword/templates/Normal/.source/Memo.kwt
-share/apps/kword/templates/Normal/.source/PlainText.kwt
-share/apps/kword/templates/Normal/.source/TwoColumns.kwt
-share/apps/kword/templates/Normal/A4.desktop
-share/apps/kword/templates/Normal/Letter.desktop
-share/apps/kword/templates/Normal/Memo.desktop
-share/apps/kword/templates/Normal/PlainText.desktop
-share/apps/kword/templates/Normal/TwoColumns.desktop
-share/apps/kword/templates/Publishing/.directory
-share/apps/kword/templates/Publishing/.icon/SimpleLayout.png
-share/apps/kword/templates/Publishing/.icon/fax.png
-share/apps/kword/templates/Publishing/.source/SimpleLayout.kwt
-share/apps/kword/templates/Publishing/.source/fax.kwt
-share/apps/kword/templates/Publishing/SimpleLayout.desktop
-share/apps/kword/templates/Publishing/fax.desktop
-share/apps/thesaurus/thesaurus.txt
-share/apps/xsltfilter/export/kword/xslfo/kword2xslfo-table.xsl
-share/apps/xsltfilter/export/kword/xslfo/main.xsl
-share/doc/HTML/en/kchart/commands.html
-share/doc/HTML/en/kchart/common
-share/doc/HTML/en/kchart/compilation.html
-share/doc/HTML/en/kchart/credits.html
-share/doc/HTML/en/kchart/faq.html
-share/doc/HTML/en/kchart/file-toolbar.png
-share/doc/HTML/en/kchart/file-toolbar2.png
-share/doc/HTML/en/kchart/frame_chart.png
-share/doc/HTML/en/kchart/index.cache.bz2
-share/doc/HTML/en/kchart/index.docbook
-share/doc/HTML/en/kchart/index.html
-share/doc/HTML/en/kchart/installation.html
-share/doc/HTML/en/kchart/introduction.html
-share/doc/HTML/en/kchart/kchart-kspread-bar.png
-share/doc/HTML/en/kchart/kchart-kspread.png
-share/doc/HTML/en/kchart/kchart.tar.gz
-share/doc/HTML/en/kchart/requirements.html
-share/doc/HTML/en/kchart/shortcut.png
-share/doc/HTML/en/kchart/toolbars.png
-share/doc/HTML/en/kformula/additional_fonts1.png
-share/doc/HTML/en/kformula/ambiguous-string.png
-share/doc/HTML/en/kformula/common
-share/doc/HTML/en/kformula/correct_index_location.png
-share/doc/HTML/en/kformula/definite_integral.png
-share/doc/HTML/en/kformula/file-toolbar.png
-share/doc/HTML/en/kformula/file-toolbar2.png
-share/doc/HTML/en/kformula/green1.png
-share/doc/HTML/en/kformula/green2.png
-share/doc/HTML/en/kformula/greens.png
-share/doc/HTML/en/kformula/incorrect_index_location.png
-share/doc/HTML/en/kformula/index.cache.bz2
-share/doc/HTML/en/kformula/index.docbook
-share/doc/HTML/en/kformula/index_smear.png
-share/doc/HTML/en/kformula/kfontinst-right.png
-share/doc/HTML/en/kformula/kfontinst1.png
-share/doc/HTML/en/kformula/kfontinst2.png
-share/doc/HTML/en/kformula/kfontinst3.png
-share/doc/HTML/en/kformula/kfontinst4.png
-share/doc/HTML/en/kformula/kfontinst5.png
-share/doc/HTML/en/kformula/lower-index.png
-share/doc/HTML/en/kformula/matrix-view.png
-share/doc/HTML/en/kformula/matrix.png
-share/doc/HTML/en/kformula/path-integral.png
-share/doc/HTML/en/kformula/rk-edit0.png
-share/doc/HTML/en/kformula/rk-edit1.png
-share/doc/HTML/en/kformula/rk-edit2.png
-share/doc/HTML/en/kformula/scilab-edit.png
-share/doc/HTML/en/kformula/scilab.png
-share/doc/HTML/en/kformula/shortcut0.png
-share/doc/HTML/en/kformula/shortcut1.png
-share/doc/HTML/en/kformula/sin.png
-share/doc/HTML/en/kformula/toolbars.png
-share/doc/HTML/en/kformula/upper-index.png
-share/doc/HTML/en/koffice-apidocs/common
-share/doc/HTML/en/koffice/README.documentation
-share/doc/HTML/en/koffice/common
-share/doc/HTML/en/koffice/index.cache.bz2
-share/doc/HTML/en/koffice/index.docbook
-share/doc/HTML/en/koshell/common
-share/doc/HTML/en/koshell/index.cache.bz2
-share/doc/HTML/en/koshell/index.docbook
-share/doc/HTML/en/kpresenter/barmenus.png
-share/doc/HTML/en/kpresenter/barstyle1.png
-share/doc/HTML/en/kpresenter/barstyle2.png
-share/doc/HTML/en/kpresenter/barstyle3.png
-share/doc/HTML/en/kpresenter/barstyle4.png
-share/doc/HTML/en/kpresenter/barstyle5.png
-share/doc/HTML/en/kpresenter/barstyle6.png
-share/doc/HTML/en/kpresenter/barstyle7.png
-share/doc/HTML/en/kpresenter/common
-share/doc/HTML/en/kpresenter/faq.docbook
-share/doc/HTML/en/kpresenter/great-presentations.docbook
-share/doc/HTML/en/kpresenter/guides.docbook
-share/doc/HTML/en/kpresenter/htmlshow00.png
-share/doc/HTML/en/kpresenter/htmlshow01.png
-share/doc/HTML/en/kpresenter/htmlshow02.png
-share/doc/HTML/en/kpresenter/htmlshow03.png
-share/doc/HTML/en/kpresenter/htmlshow04.png
-share/doc/HTML/en/kpresenter/htmlshow05.png
-share/doc/HTML/en/kpresenter/htmlshow07.png
-share/doc/HTML/en/kpresenter/index.cache.bz2
-share/doc/HTML/en/kpresenter/index.docbook
-share/doc/HTML/en/kpresenter/menuedit.png
-share/doc/HTML/en/kpresenter/menuextra.png
-share/doc/HTML/en/kpresenter/menufile.png
-share/doc/HTML/en/kpresenter/menuhelp.png
-share/doc/HTML/en/kpresenter/menuinsert.png
-share/doc/HTML/en/kpresenter/menus.docbook
-share/doc/HTML/en/kpresenter/menuscreen.png
-share/doc/HTML/en/kpresenter/menutext.png
-share/doc/HTML/en/kpresenter/menutools.png
-share/doc/HTML/en/kpresenter/menuview.png
-share/doc/HTML/en/kpresenter/options.docbook
-share/doc/HTML/en/kpresenter/screen.docbook
-share/doc/HTML/en/kpresenter/settings01.png
-share/doc/HTML/en/kpresenter/settings03.png
-share/doc/HTML/en/kpresenter/settings04.png
-share/doc/HTML/en/kpresenter/settings05.png
-share/doc/HTML/en/kpresenter/settings06.png
-share/doc/HTML/en/kpresenter/template02.png
-share/doc/HTML/en/kpresenter/template03.png
-share/doc/HTML/en/kpresenter/template04.png
-share/doc/HTML/en/kpresenter/template05.png
-share/doc/HTML/en/kpresenter/template06.png
-share/doc/HTML/en/kpresenter/template07.png
-share/doc/HTML/en/kpresenter/textmenu01.png
-share/doc/HTML/en/kpresenter/textmenu02.png
-share/doc/HTML/en/kpresenter/textmenu03.png
-share/doc/HTML/en/kpresenter/textmenu03a.png
-share/doc/HTML/en/kpresenter/textmenu04.png
-share/doc/HTML/en/kpresenter/toolsmenu01.png
-share/doc/HTML/en/kpresenter/tut01.png
-share/doc/HTML/en/kpresenter/tut02.png
-share/doc/HTML/en/kpresenter/tut03.png
-share/doc/HTML/en/kpresenter/tut04.png
-share/doc/HTML/en/kpresenter/tut05.png
-share/doc/HTML/en/kpresenter/tut06.png
-share/doc/HTML/en/kpresenter/tut07.png
-share/doc/HTML/en/kpresenter/tut08.png
-share/doc/HTML/en/kpresenter/tut09.png
-share/doc/HTML/en/kpresenter/tut10.png
-share/doc/HTML/en/kpresenter/tut11.png
-share/doc/HTML/en/kpresenter/tut12.png
-share/doc/HTML/en/kpresenter/tut13.png
-share/doc/HTML/en/kpresenter/tut14.png
-share/doc/HTML/en/kpresenter/tut15.png
-share/doc/HTML/en/kpresenter/tut16.png
-share/doc/HTML/en/kpresenter/tut17.png
-share/doc/HTML/en/kpresenter/tut18.png
-share/doc/HTML/en/kpresenter/tut19.png
-share/doc/HTML/en/kpresenter/tut20.png
-share/doc/HTML/en/kpresenter/tut21.png
-share/doc/HTML/en/kpresenter/tut22.png
-share/doc/HTML/en/kpresenter/tut23.png
-share/doc/HTML/en/kpresenter/tutorial.docbook
-share/doc/HTML/en/kspread/chart1.png
-share/doc/HTML/en/kspread/common
-share/doc/HTML/en/kspread/copy1.png
-share/doc/HTML/en/kspread/index.cache.bz2
-share/doc/HTML/en/kspread/index.docbook
-share/doc/HTML/en/kspread/shortcut1.png
-share/doc/HTML/en/kspread/shortcut2.png
-share/doc/HTML/en/kspread/sort1.png
-share/doc/HTML/en/kspread/starting1.png
-share/doc/HTML/en/kugar/add_detail.png
-share/doc/HTML/en/kugar/add_detail_footer.png
-share/doc/HTML/en/kugar/add_detail_header.png
-share/doc/HTML/en/kugar/common
-share/doc/HTML/en/kugar/datadtd.docbook
-share/doc/HTML/en/kugar/dataref.docbook
-share/doc/HTML/en/kugar/designer.docbook
-share/doc/HTML/en/kugar/file_new.png
-share/doc/HTML/en/kugar/index.cache.bz2
-share/doc/HTML/en/kugar/index.docbook
-share/doc/HTML/en/kugar/kugar.png
-share/doc/HTML/en/kugar/progguide.docbook
-share/doc/HTML/en/kugar/props.png
-share/doc/HTML/en/kugar/starting.docbook
-share/doc/HTML/en/kugar/template-elements.docbook
-share/doc/HTML/en/kugar/template.docbook
-share/doc/HTML/en/kugar/templatedtd.docbook
-share/doc/HTML/en/kugar/tut_edit_height.png
-share/doc/HTML/en/kugar/tut_empty_report.png
-share/doc/HTML/en/kugar/tut_file_new.png
-share/doc/HTML/en/kugar/tut_rep_complete.png
-share/doc/HTML/en/kugar/tut_rep_generated.png
-share/doc/HTML/en/kugar/tut_rep_look1.png
-share/doc/HTML/en/kugar/tut_rep_look2.png
-share/doc/HTML/en/kugar/tut_set_level.png
-share/doc/HTML/en/kugar/tutorial.docbook
-share/doc/HTML/en/kword/ChooseTempDia.png
-share/doc/HTML/en/kword/Tut1.png
-share/doc/HTML/en/kword/Tut11a.png
-share/doc/HTML/en/kword/Tut11b.png
-share/doc/HTML/en/kword/Tut13.png
-share/doc/HTML/en/kword/Tut14.png
-share/doc/HTML/en/kword/Tut14a.png
-share/doc/HTML/en/kword/Tut14b.png
-share/doc/HTML/en/kword/Tut15.png
-share/doc/HTML/en/kword/Tut15b.png
-share/doc/HTML/en/kword/Tut16.png
-share/doc/HTML/en/kword/Tut18.png
-share/doc/HTML/en/kword/Tut19.png
-share/doc/HTML/en/kword/Tut2.png
-share/doc/HTML/en/kword/Tut21.png
-share/doc/HTML/en/kword/Tut22.png
-share/doc/HTML/en/kword/Tut3.png
-share/doc/HTML/en/kword/Tut4.png
-share/doc/HTML/en/kword/Tut7.png
-share/doc/HTML/en/kword/Tut8.png
-share/doc/HTML/en/kword/addentry.png
-share/doc/HTML/en/kword/addrecord.png
-share/doc/HTML/en/kword/alignBlock.png
-share/doc/HTML/en/kword/alignCenter.png
-share/doc/HTML/en/kword/alignLeft.png
-share/doc/HTML/en/kword/alignRight.png
-share/doc/HTML/en/kword/auto1.png
-share/doc/HTML/en/kword/auto2.png
-share/doc/HTML/en/kword/auto3.png
-share/doc/HTML/en/kword/auto4.png
-share/doc/HTML/en/kword/autocompdlg.png
-share/doc/HTML/en/kword/back.png
-share/doc/HTML/en/kword/basic.png
-share/doc/HTML/en/kword/basics.docbook
-share/doc/HTML/en/kword/bbord.png
-share/doc/HTML/en/kword/bdcolorbut.png
-share/doc/HTML/en/kword/bdselbut.png
-share/doc/HTML/en/kword/bdsizebut.png
-share/doc/HTML/en/kword/beginning.png
-share/doc/HTML/en/kword/bkgdcolorbut.png
-share/doc/HTML/en/kword/bold.png
-share/doc/HTML/en/kword/bookmarks.docbook
-share/doc/HTML/en/kword/borbutB.png
-share/doc/HTML/en/kword/borbutL.png
-share/doc/HTML/en/kword/borbutR.png
-share/doc/HTML/en/kword/borbutT.png
-share/doc/HTML/en/kword/bord.png
-share/doc/HTML/en/kword/bordtb.png
-share/doc/HTML/en/kword/bullist.png
-share/doc/HTML/en/kword/cftb.png
-share/doc/HTML/en/kword/chcolorbut.png
-share/doc/HTML/en/kword/chfontbut.png
-share/doc/HTML/en/kword/chsizebut.png
-share/doc/HTML/en/kword/chstylebut.png
-share/doc/HTML/en/kword/clearright.png
-share/doc/HTML/en/kword/colin.png
-share/doc/HTML/en/kword/colorseldlg.png
-share/doc/HTML/en/kword/colout.png
-share/doc/HTML/en/kword/columns.docbook
-share/doc/HTML/en/kword/common
-share/doc/HTML/en/kword/ctab.png
-share/doc/HTML/en/kword/ctab2.png
-share/doc/HTML/en/kword/decindbut.png
-share/doc/HTML/en/kword/delentry.png
-share/doc/HTML/en/kword/delrecord.png
-share/doc/HTML/en/kword/doccomments.docbook
-share/doc/HTML/en/kword/doclinks.docbook
-share/doc/HTML/en/kword/docstruct.docbook
-share/doc/HTML/en/kword/docstruct.png
-share/doc/HTML/en/kword/docvariables.docbook
-share/doc/HTML/en/kword/dtab.png
-share/doc/HTML/en/kword/dtab2.png
-share/doc/HTML/en/kword/dtpfmtpg1.png
-share/doc/HTML/en/kword/editcopy.png
-share/doc/HTML/en/kword/editcut.png
-share/doc/HTML/en/kword/editing.docbook
-share/doc/HTML/en/kword/editpaste.png
-share/doc/HTML/en/kword/edittb.png
-share/doc/HTML/en/kword/end.png
-share/doc/HTML/en/kword/enumlist.png
-share/doc/HTML/en/kword/expression.png
-share/doc/HTML/en/kword/expressions.docbook
-share/doc/HTML/en/kword/exst.png
-share/doc/HTML/en/kword/exul.png
-share/doc/HTML/en/kword/fchardlg.png
-share/doc/HTML/en/kword/fchardlg2.png
-share/doc/HTML/en/kword/filefloppy.png
-share/doc/HTML/en/kword/filenew2.png
-share/doc/HTML/en/kword/fileopen.png
-share/doc/HTML/en/kword/fileprint.png
-share/doc/HTML/en/kword/fileprint2.png
-share/doc/HTML/en/kword/filetb.png
-share/doc/HTML/en/kword/find.png
-share/doc/HTML/en/kword/finddlg.png
-share/doc/HTML/en/kword/finddlg2.png
-share/doc/HTML/en/kword/footcfg1.png
-share/doc/HTML/en/kword/footcfg3.png
-share/doc/HTML/en/kword/footendnotes.docbook
-share/doc/HTML/en/kword/formabs.png
-share/doc/HTML/en/kword/formatchar.docbook
-share/doc/HTML/en/kword/formatframes.docbook
-share/doc/HTML/en/kword/formatpara.docbook
-share/doc/HTML/en/kword/formbrac.png
-share/doc/HTML/en/kword/formcbrac.png
-share/doc/HTML/en/kword/formfrac.png
-share/doc/HTML/en/kword/formframe1.png
-share/doc/HTML/en/kword/formframe2.png
-share/doc/HTML/en/kword/formframe3.png
-share/doc/HTML/en/kword/formframe4.png
-share/doc/HTML/en/kword/formframe5.png
-share/doc/HTML/en/kword/forminteg.png
-share/doc/HTML/en/kword/formllind.png
-share/doc/HTML/en/kword/formlrind.png
-share/doc/HTML/en/kword/formmat.png
-share/doc/HTML/en/kword/formprod.png
-share/doc/HTML/en/kword/formsbrac.png
-share/doc/HTML/en/kword/formspecchar.png
-share/doc/HTML/en/kword/formsqrt.png
-share/doc/HTML/en/kword/formsum.png
-share/doc/HTML/en/kword/formtb.png
-share/doc/HTML/en/kword/formulas.docbook
-share/doc/HTML/en/kword/formulind.png
-share/doc/HTML/en/kword/formurind.png
-share/doc/HTML/en/kword/forward.png
-share/doc/HTML/en/kword/fpara1.png
-share/doc/HTML/en/kword/fpara2.png
-share/doc/HTML/en/kword/fpara3.png
-share/doc/HTML/en/kword/fpara4.png
-share/doc/HTML/en/kword/fpara5.png
-share/doc/HTML/en/kword/fpara6.png
-share/doc/HTML/en/kword/fpicture.png
-share/doc/HTML/en/kword/framers.png
-share/doc/HTML/en/kword/frames.docbook
-share/doc/HTML/en/kword/framestylist.png
-share/doc/HTML/en/kword/fundimentals.docbook
-share/doc/HTML/en/kword/graphics.docbook
-share/doc/HTML/en/kword/headerfooter.docbook
-share/doc/HTML/en/kword/incindbut.png
-share/doc/HTML/en/kword/index.cache.bz2
-share/doc/HTML/en/kword/index.docbook
-share/doc/HTML/en/kword/inscoldlg.png
-share/doc/HTML/en/kword/insdate.png
-share/doc/HTML/en/kword/insertfile.docbook
-share/doc/HTML/en/kword/insgrph1.png
-share/doc/HTML/en/kword/insgrph2.png
-share/doc/HTML/en/kword/insrowdlg.png
-share/doc/HTML/en/kword/instab1.png
-share/doc/HTML/en/kword/instb.png
-share/doc/HTML/en/kword/instime.png
-share/doc/HTML/en/kword/intro1.png
-share/doc/HTML/en/kword/intro2.png
-share/doc/HTML/en/kword/intro3.png
-share/doc/HTML/en/kword/ital.png
-share/doc/HTML/en/kword/joincell.png
-share/doc/HTML/en/kword/kpart.png
-share/doc/HTML/en/kword/kparts.docbook
-share/doc/HTML/en/kword/landscape.png
-share/doc/HTML/en/kword/larrow.png
-share/doc/HTML/en/kword/lbord.png
-share/doc/HTML/en/kword/linkdlg.png
-share/doc/HTML/en/kword/listdepth1.png
-share/doc/HTML/en/kword/listdepth2.png
-share/doc/HTML/en/kword/listdepth3.png
-share/doc/HTML/en/kword/lists.docbook
-share/doc/HTML/en/kword/ltab.png
-share/doc/HTML/en/kword/ltab2.png
-share/doc/HTML/en/kword/mailmerge.docbook
-share/doc/HTML/en/kword/mbtb.docbook
-share/doc/HTML/en/kword/mmerge1.png
-share/doc/HTML/en/kword/mmerge2.png
-share/doc/HTML/en/kword/mmergesql1.png
-share/doc/HTML/en/kword/mmergesql2.png
-share/doc/HTML/en/kword/numtxtbut.png
-share/doc/HTML/en/kword/opendlg.png
-share/doc/HTML/en/kword/opt.docbook
-share/doc/HTML/en/kword/opt1.png
-share/doc/HTML/en/kword/opt2.png
-share/doc/HTML/en/kword/opt3.png
-share/doc/HTML/en/kword/opt4.png
-share/doc/HTML/en/kword/opt5.png
-share/doc/HTML/en/kword/optkb.png
-share/doc/HTML/en/kword/optkb2.png
-share/doc/HTML/en/kword/opttb.png
-share/doc/HTML/en/kword/pageformat.docbook
-share/doc/HTML/en/kword/paratb.png
-share/doc/HTML/en/kword/part-kformula.png
-share/doc/HTML/en/kword/part-kspread.png
-share/doc/HTML/en/kword/picture.png
-share/doc/HTML/en/kword/pntdlg.png
-share/doc/HTML/en/kword/pntdlg1.png
-share/doc/HTML/en/kword/portrait.png
-share/doc/HTML/en/kword/rarrow.png
-share/doc/HTML/en/kword/rbord.png
-share/doc/HTML/en/kword/redo.png
-share/doc/HTML/en/kword/repldlg.png
-share/doc/HTML/en/kword/rowin.png
-share/doc/HTML/en/kword/rowout.png
-share/doc/HTML/en/kword/rtab.png
-share/doc/HTML/en/kword/rtab2.png
-share/doc/HTML/en/kword/ruler.png
-share/doc/HTML/en/kword/saturation.png
-share/doc/HTML/en/kword/saved1.png
-share/doc/HTML/en/kword/saved2.png
-share/doc/HTML/en/kword/savedlg.png
-share/doc/HTML/en/kword/savetmpl1.png
-share/doc/HTML/en/kword/screen.png
-share/doc/HTML/en/kword/select1.png
-share/doc/HTML/en/kword/spell.png
-share/doc/HTML/en/kword/spelldlg.png
-share/doc/HTML/en/kword/stkout.png
-share/doc/HTML/en/kword/storeprint.docbook
-share/doc/HTML/en/kword/styldlg1.png
-share/doc/HTML/en/kword/styldlg2.png
-share/doc/HTML/en/kword/styles.docbook
-share/doc/HTML/en/kword/subscbut.png
-share/doc/HTML/en/kword/sum.png
-share/doc/HTML/en/kword/supscbut.png
-share/doc/HTML/en/kword/table.docbook
-share/doc/HTML/en/kword/tableprop1.png
-share/doc/HTML/en/kword/tableprop2.png
-share/doc/HTML/en/kword/tablestylist.png
-share/doc/HTML/en/kword/tabstops.docbook
-share/doc/HTML/en/kword/tb1.png
-share/doc/HTML/en/kword/tb2.png
-share/doc/HTML/en/kword/tb3.png
-share/doc/HTML/en/kword/tb4.png
-share/doc/HTML/en/kword/tblsty.png
-share/doc/HTML/en/kword/tbmax.png
-share/doc/HTML/en/kword/tbmin.png
-share/doc/HTML/en/kword/tbord.png
-share/doc/HTML/en/kword/techinfo.docbook
-share/doc/HTML/en/kword/tedittb.png
-share/doc/HTML/en/kword/templatecreation.docbook
-share/doc/HTML/en/kword/textstyex.png
-share/doc/HTML/en/kword/tfcreatebut.png
-share/doc/HTML/en/kword/thesaurus.png
-share/doc/HTML/en/kword/toc.docbook
-share/doc/HTML/en/kword/tutorial.docbook
-share/doc/HTML/en/kword/undl.png
-share/doc/HTML/en/kword/undo.png
-share/doc/HTML/en/kword/value.png
-share/doc/HTML/en/kword/wpfmtpg1.png
-share/doc/HTML/en/kword/wpfmtpg2.png
-share/doc/HTML/en/kword/wpfmtpg3.png
-share/doc/HTML/en/kword/zoom.png
-share/doc/HTML/en/thesaurus/common
-share/doc/HTML/en/thesaurus/index.cache.bz2
-share/doc/HTML/en/thesaurus/index.docbook
-share/icons/hicolor/16x16/actions/abs.png
-share/icons/hicolor/16x16/actions/brace.png
-share/icons/hicolor/16x16/actions/brackets.png
-share/icons/hicolor/16x16/actions/frac.png
-share/icons/hicolor/16x16/actions/int.png
-share/icons/hicolor/16x16/actions/lsub.png
-share/icons/hicolor/16x16/actions/lsup.png
-share/icons/hicolor/16x16/actions/matrix.png
-share/icons/hicolor/16x16/actions/onetwomatrix.png
-share/icons/hicolor/16x16/actions/paren.png
-share/icons/hicolor/16x16/actions/prod.png
-share/icons/hicolor/16x16/actions/rsub.png
-share/icons/hicolor/16x16/actions/rsup.png
-share/icons/hicolor/16x16/actions/sqrt.png
-share/icons/hicolor/16x16/actions/sum.png
-share/icons/hicolor/16x16/apps/karbon.png
-share/icons/hicolor/16x16/apps/kchart.png
-share/icons/hicolor/16x16/apps/kformula.png
-share/icons/hicolor/16x16/apps/kivio.png
-share/icons/hicolor/16x16/apps/kontour.png
-share/icons/hicolor/16x16/apps/kpresenter.png
-share/icons/hicolor/16x16/apps/kspread.png
-share/icons/hicolor/16x16/apps/kudesigner.png
-share/icons/hicolor/16x16/apps/kugar.png
-share/icons/hicolor/16x16/apps/kword.png
-share/icons/hicolor/16x16/mimetypes/kugardata.png
-share/icons/hicolor/22x22/actions/abs.png
-share/icons/hicolor/22x22/actions/brace.png
-share/icons/hicolor/22x22/actions/brackets.png
-share/icons/hicolor/22x22/actions/frac.png
-share/icons/hicolor/22x22/actions/inscol.png
-share/icons/hicolor/22x22/actions/insrow.png
-share/icons/hicolor/22x22/actions/int.png
-share/icons/hicolor/22x22/actions/lsub.png
-share/icons/hicolor/22x22/actions/lsup.png
-share/icons/hicolor/22x22/actions/matrix.png
-share/icons/hicolor/22x22/actions/onetwomatrix.png
-share/icons/hicolor/22x22/actions/paren.png
-share/icons/hicolor/22x22/actions/prod.png
-share/icons/hicolor/22x22/actions/remcol.png
-share/icons/hicolor/22x22/actions/remrow.png
-share/icons/hicolor/22x22/actions/rsub.png
-share/icons/hicolor/22x22/actions/rsup.png
-share/icons/hicolor/22x22/actions/sqrt.png
-share/icons/hicolor/22x22/actions/sum.png
-share/icons/hicolor/22x22/apps/kivio.png
-share/icons/hicolor/22x22/apps/kugar.png
-share/icons/hicolor/22x22/mimetypes/kugardata.png
-share/icons/hicolor/32x32/actions/abs.png
-share/icons/hicolor/32x32/actions/brace.png
-share/icons/hicolor/32x32/actions/brackets.png
-share/icons/hicolor/32x32/actions/frac.png
-share/icons/hicolor/32x32/actions/int.png
-share/icons/hicolor/32x32/actions/lsub.png
-share/icons/hicolor/32x32/actions/lsup.png
-share/icons/hicolor/32x32/actions/matrix.png
-share/icons/hicolor/32x32/actions/onetwomatrix.png
-share/icons/hicolor/32x32/actions/paren.png
-share/icons/hicolor/32x32/actions/prod.png
-share/icons/hicolor/32x32/actions/rsub.png
-share/icons/hicolor/32x32/actions/rsup.png
-share/icons/hicolor/32x32/actions/sqrt.png
-share/icons/hicolor/32x32/actions/sum.png
-share/icons/hicolor/32x32/apps/karbon.png
-share/icons/hicolor/32x32/apps/kchart.png
-share/icons/hicolor/32x32/apps/kformula.png
-share/icons/hicolor/32x32/apps/kivio.png
-share/icons/hicolor/32x32/apps/kontour.png
-share/icons/hicolor/32x32/apps/kpresenter.png
-share/icons/hicolor/32x32/apps/kspread.png
-share/icons/hicolor/32x32/apps/kudesigner.png
-share/icons/hicolor/32x32/apps/kugar.png
-share/icons/hicolor/32x32/apps/kword.png
-share/icons/hicolor/32x32/mimetypes/kugardata.png
-share/icons/hicolor/48x48/apps/karbon.png
-share/icons/hicolor/48x48/apps/kchart.png
-share/icons/hicolor/48x48/apps/kformula.png
-share/icons/hicolor/48x48/apps/kivio.png
-share/icons/hicolor/48x48/apps/kontour.png
-share/icons/hicolor/48x48/apps/kpresenter.png
-share/icons/hicolor/48x48/apps/kspread.png
-share/icons/hicolor/48x48/apps/kugar.png
-share/icons/hicolor/48x48/apps/kword.png
-share/icons/hicolor/48x48/mimetypes/kugardata.png
-share/icons/locolor/16x16/apps/kspreadcalc.png
-share/icons/locolor/16x16/apps/kudesigner.png
-share/icons/locolor/16x16/apps/kugar.png
-share/icons/locolor/16x16/mimetypes/kugardata.png
-share/icons/locolor/22x22/apps/kspreadcalc.png
-share/icons/locolor/22x22/apps/kugar.png
-share/icons/locolor/22x22/mimetypes/kugardata.png
-share/icons/locolor/32x32/apps/kspreadcalc.png
-share/icons/locolor/32x32/apps/kudesigner.png
-share/icons/locolor/32x32/apps/kugar.png
-share/icons/locolor/32x32/mimetypes/kugardata.png
-share/mimelnk/application/x-kudesigner.desktop
-share/services/clipartthumbnail.desktop
-share/services/karbon_ai_import.desktop
-share/services/karbon_eps_export.desktop
-share/services/karbon_eps_import.desktop
-share/services/karbon_kontour_import.desktop
-share/services/karbon_png_export.desktop
-share/services/karbon_ps_import.desktop
-share/services/karbon_svg_export.desktop
-share/services/karbon_wmf_import.desktop
-share/services/kfile_koffice.desktop
-share/services/kformula_latex_export.desktop
-share/services/kformula_png_export.desktop
-share/services/kivioconnectortool.desktop
-share/services/kivioselecttool.desktop
-share/services/kiviotexttool.desktop
-share/services/kiviozoomtool.desktop
-share/services/kodocinfopropspage.desktop
-share/services/kofficethumbnail.desktop
-share/services/kontour_applixgraphic_import.desktop
-share/services/kontour_latex_export.desktop
-share/services/kontour_msod_import.desktop
-share/services/kontour_rtf_export.desktop
-share/services/kontour_wmf_import.desktop
-share/services/kounavail.desktop
-share/services/kprkword.desktop
-share/services/kspelltool.desktop
-share/services/kspread_applixspread_import.desktop
-share/services/kspread_csv_export.desktop
-share/services/kspread_csv_import.desktop
-share/services/kspread_dbase_import.desktop
-share/services/kspread_gnumeric_export.desktop
-share/services/kspread_gnumeric_import.desktop
-share/services/kspread_html_export.desktop
-share/services/kspread_qpro_import.desktop
-share/services/kspreadcalc.desktop
-share/services/kword_abiword_export.desktop
-share/services/kword_abiword_import.desktop
-share/services/kword_amipro_export.desktop
-share/services/kword_amipro_import.desktop
-share/services/kword_applixword_import.desktop
-share/services/kword_ascii_export.desktop
-share/services/kword_ascii_import.desktop
-share/services/kword_docbook_export.desktop
-share/services/kword_html_export.desktop
-share/services/kword_html_import.desktop
-share/services/kword_latex_export.desktop
-share/services/kword_latex_import.desktop
-share/services/kword_mswrite_import.desktop
-share/services/kword_palmdoc_export.desktop
-share/services/kword_palmdoc_import.desktop
-share/services/kword_rtf_export.desktop
-share/services/kword_rtf_import.desktop
-share/services/kword_wml_export.desktop
-share/services/kword_wml_import.desktop
-share/services/kword_wp_export.desktop
-share/services/kword_wp_import.desktop
-share/services/kwserialletter_classic.desktop
-share/services/kwserialletter_qtsqldb_power.desktop
-share/services/ole_excel97_import.desktop
-share/services/ole_hancomword_import.desktop
-share/services/ole_powerpoint97_import.desktop
-share/services/ole_winword97_import.desktop
-share/services/otherofficethumbnail.desktop
-share/services/thesaurustool.desktop
-share/services/xslt_export.desktop
-share/services/xslt_import.desktop
-share/servicetypes/kochart.desktop
-share/servicetypes/kofficepart.desktop
-share/servicetypes/kofilter.desktop
-share/servicetypes/koplugin.desktop
-share/servicetypes/kwmailmerge.desktop
-share/templates/.source/Illustration.kil
-share/templates/.source/Presentation.kpt
-share/templates/.source/SpreadSheet.ksp
-share/templates/.source/TextDocument.kwt
-share/templates/Illustration.desktop
-share/templates/Presentation.desktop
-share/templates/SpreadSheet.desktop
-share/templates/TextDocument.desktop
-@exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/lib/html
-@unexec /bin/rmdir %D/share/doc/HTML/en/koffice-apidocs/lib/html || true
-@dirrm share/templates/.source
-@dirrm share/templates
-@dirrm share/mimelnk/application
-@dirrm share/mimelnk
-@dirrm share/icons/locolor/32x32/mimetypes
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/22x22/mimetypes
-@dirrm share/icons/locolor/22x22/apps
-@dirrm share/icons/locolor/22x22
-@dirrm share/icons/locolor/16x16/mimetypes
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/mimetypes
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/mimetypes
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32/actions
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/22x22/mimetypes
-@dirrm share/icons/hicolor/22x22/apps
-@dirrm share/icons/hicolor/22x22/actions
-@dirrm share/icons/hicolor/22x22
-@dirrm share/icons/hicolor/16x16/mimetypes
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16/actions
-@dirrm share/icons/hicolor/16x16
-@dirrm share/icons/hicolor
-@dirrm share/doc/HTML/en/thesaurus
-@dirrm share/doc/HTML/en/kword
-@dirrm share/doc/HTML/en/kugar
-@dirrm share/doc/HTML/en/kspread
-@dirrm share/doc/HTML/en/kpresenter
-@dirrm share/doc/HTML/en/koshell
-@dirrm share/doc/HTML/en/koffice-apidocs/lib
-@dirrm share/doc/HTML/en/koffice-apidocs
-@dirrm share/doc/HTML/en/koffice
-@dirrm share/doc/HTML/en/kformula
-@dirrm share/doc/HTML/en/kchart
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
-@dirrm share/apps/xsltfilter/export/kword/xslfo
-@dirrm share/apps/xsltfilter/export/kword
-@dirrm share/apps/xsltfilter/export
-@dirrm share/apps/xsltfilter
-@dirrm share/apps/thesaurus
-@dirrm share/apps/kword/templates/Publishing/.source
-@dirrm share/apps/kword/templates/Publishing/.icon
-@dirrm share/apps/kword/templates/Publishing
-@dirrm share/apps/kword/templates/Normal/.source
-@dirrm share/apps/kword/templates/Normal/.icon
-@dirrm share/apps/kword/templates/Normal
-@dirrm share/apps/kword/templates
-@dirrm share/apps/kword/kpartplugins
-@dirrm share/apps/kword/icons/hicolor/22x22/actions
-@dirrm share/apps/kword/icons/hicolor/22x22
-@dirrm share/apps/kword/icons/hicolor/16x16/actions
-@dirrm share/apps/kword/icons/hicolor/16x16
-@dirrm share/apps/kword/icons/hicolor
-@dirrm share/apps/kword/icons
-@dirrm share/apps/kword/expression
-@dirrm share/apps/kword/dtd
-@dirrm share/apps/kword
-@dirrm share/apps/kugar/templates
-@dirrm share/apps/kugar/dtd
-@dirrm share/apps/kugar
-@dirrm share/apps/kudesigner/icons/locolor/22x22/actions
-@dirrm share/apps/kudesigner/icons/locolor/22x22
-@dirrm share/apps/kudesigner/icons/locolor
-@dirrm share/apps/kudesigner/icons/hicolor/22x22/actions
-@dirrm share/apps/kudesigner/icons/hicolor/22x22
-@dirrm share/apps/kudesigner/icons/hicolor
-@dirrm share/apps/kudesigner/icons
-@dirrm share/apps/kudesigner
-@dirrm share/apps/kspread/templates/General/.source
-@dirrm share/apps/kspread/templates/General/.icon
-@dirrm share/apps/kspread/templates/General
-@dirrm share/apps/kspread/templates
-@dirrm share/apps/kspread/tablestyles
-@dirrm share/apps/kspread/kpartplugins
-@dirrm share/apps/kspread/icons/hicolor/32x32/actions
-@dirrm share/apps/kspread/icons/hicolor/32x32
-@dirrm share/apps/kspread/icons/hicolor/22x22/actions
-@dirrm share/apps/kspread/icons/hicolor/22x22
-@dirrm share/apps/kspread/icons/hicolor/16x16/actions
-@dirrm share/apps/kspread/icons/hicolor/16x16
-@dirrm share/apps/kspread/icons/hicolor
-@dirrm share/apps/kspread/icons
-@dirrm share/apps/kspread/extensions
-@dirrm share/apps/kspread/dtd
-@dirrm share/apps/kspread
-@dirrm share/apps/krita/kpartplugins
-@dirrm share/apps/krita
-@dirrm share/apps/kpresenter/templates/letter/.source
-@dirrm share/apps/kpresenter/templates/letter
-@dirrm share/apps/kpresenter/templates/legal/.source
-@dirrm share/apps/kpresenter/templates/legal
-@dirrm share/apps/kpresenter/templates/Screenpresentations/.source
-@dirrm share/apps/kpresenter/templates/Screenpresentations/.icon
-@dirrm share/apps/kpresenter/templates/Screenpresentations
-@dirrm share/apps/kpresenter/templates/Screen/.source
-@dirrm share/apps/kpresenter/templates/Screen
-@dirrm share/apps/kpresenter/templates/A4/.source
-@dirrm share/apps/kpresenter/templates/A4
-@dirrm share/apps/kpresenter/templates
-@dirrm share/apps/kpresenter/slideshow
-@dirrm share/apps/kpresenter/pics
-@dirrm share/apps/kpresenter/kpartplugins
-@dirrm share/apps/kpresenter/icons/hicolor/22x22/actions
-@dirrm share/apps/kpresenter/icons/hicolor/22x22
-@dirrm share/apps/kpresenter/icons/hicolor
-@dirrm share/apps/kpresenter/icons
-@dirrm share/apps/kpresenter/dtd
-@dirrm share/apps/kpresenter/autoforms/Connections/.source
-@dirrm share/apps/kpresenter/autoforms/Connections/.icon
-@dirrm share/apps/kpresenter/autoforms/Connections
-@dirrm share/apps/kpresenter/autoforms/Arrows/.source
-@dirrm share/apps/kpresenter/autoforms/Arrows/.icon
-@dirrm share/apps/kpresenter/autoforms/Arrows
-@dirrm share/apps/kpresenter/autoforms
-@dirrm share/apps/kpresenter
-@dirrm share/apps/kontour/templates/Simple/.source
-@dirrm share/apps/kontour/templates/Simple/.icon
-@dirrm share/apps/kontour/templates/Simple
-@dirrm share/apps/kontour/templates
-@dirrm share/apps/kontour/kpartplugins
-@dirrm share/apps/kontour/icons/hicolor/48x48/apps
-@dirrm share/apps/kontour/icons/hicolor/48x48
-@dirrm share/apps/kontour/icons/hicolor/32x32/apps
-@dirrm share/apps/kontour/icons/hicolor/32x32/actions
-@dirrm share/apps/kontour/icons/hicolor/32x32
-@dirrm share/apps/kontour/icons/hicolor/22x22/actions
-@dirrm share/apps/kontour/icons/hicolor/22x22
-@dirrm share/apps/kontour/icons/hicolor/16x16/apps
-@dirrm share/apps/kontour/icons/hicolor/16x16/actions
-@dirrm share/apps/kontour/icons/hicolor/16x16
-@dirrm share/apps/kontour/icons/hicolor
-@dirrm share/apps/kontour/icons
-@dirrm share/apps/kontour
-@dirrm share/apps/koffice/pics
-@dirrm share/apps/koffice/icons/hicolor/48x48/apps
-@dirrm share/apps/koffice/icons/hicolor/48x48
-@dirrm share/apps/koffice/icons/hicolor/32x32/apps
-@dirrm share/apps/koffice/icons/hicolor/32x32/actions
-@dirrm share/apps/koffice/icons/hicolor/32x32
-@dirrm share/apps/koffice/icons/hicolor/22x22/actions/part
-@dirrm share/apps/koffice/icons/hicolor/22x22/actions
-@dirrm share/apps/koffice/icons/hicolor/22x22
-@dirrm share/apps/koffice/icons/hicolor/16x16/apps
-@dirrm share/apps/koffice/icons/hicolor/16x16/actions
-@dirrm share/apps/koffice/icons/hicolor/16x16
-@dirrm share/apps/koffice/icons/hicolor
-@dirrm share/apps/koffice/icons
-@dirrm share/apps/koffice/autocorrect
-@dirrm share/apps/koffice
-@dirrm share/apps/kivio/stencils/Flowcharting/Logic
-@dirrm share/apps/kivio/stencils/Flowcharting/BasicFlowcharting
-@dirrm share/apps/kivio/stencils/Flowcharting
-@dirrm share/apps/kivio/stencils
-@dirrm share/apps/kivio/pics
-@dirrm share/apps/kivio/kpartplugins
-@dirrm share/apps/kivio/icons/hicolor/32x32/actions
-@dirrm share/apps/kivio/icons/hicolor/32x32
-@dirrm share/apps/kivio/icons/hicolor/22x22/actions
-@dirrm share/apps/kivio/icons/hicolor/22x22
-@dirrm share/apps/kivio/icons/hicolor/16x16/actions
-@dirrm share/apps/kivio/icons/hicolor/16x16
-@dirrm share/apps/kivio/icons/hicolor
-@dirrm share/apps/kivio/icons
-@dirrm share/apps/kivio/autoloadStencils
-@dirrm share/apps/kivio
-@dirrm share/apps/kformula
-@dirrm share/apps/kchart/pics
-@dirrm share/apps/kchart/icons/locolor/16x16/actions
-@dirrm share/apps/kchart/icons/locolor/16x16
-@dirrm share/apps/kchart/icons/locolor
-@dirrm share/apps/kchart/icons/hicolor/22x22/actions
-@dirrm share/apps/kchart/icons/hicolor/22x22
-@dirrm share/apps/kchart/icons/hicolor
-@dirrm share/apps/kchart/icons
-@dirrm share/apps/kchart
-@dirrm share/apps/karbon/icons/hicolor/48x48/apps
-@dirrm share/apps/karbon/icons/hicolor/48x48
-@dirrm share/apps/karbon/icons/hicolor/32x32/apps
-@dirrm share/apps/karbon/icons/hicolor/32x32
-@dirrm share/apps/karbon/icons/hicolor/22x22/actions
-@dirrm share/apps/karbon/icons/hicolor/22x22
-@dirrm share/apps/karbon/icons/hicolor/16x16/apps
-@dirrm share/apps/karbon/icons/hicolor/16x16/actions
-@dirrm share/apps/karbon/icons/hicolor/16x16
-@dirrm share/apps/karbon/icons/hicolor
-@dirrm share/apps/karbon/icons
-@dirrm share/apps/karbon
-@dirrm share/applnk/Office
diff --git a/editors/emacs19/Makefile b/editors/emacs19/Makefile
deleted file mode 100644
index 5a8dba415107..000000000000
--- a/editors/emacs19/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# New ports collection makefile for:	GNU emacs
-# Date created:		29 October 1994
-# Whom:			jkh
-#
-# $FreeBSD$
-#
-
-PORTNAME=	emacs
-PORTVERSION=	19.34b
-CATEGORIES=	editors
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	emacs
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	GNU editing macros
-
-EMACS_VERSION=	19.34
-CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
-PLIST_SUB=	EMACS_VERSION=${EMACS_VERSION} EMACS_ARCH=${CONFIGURE_TARGET}
-NO_LATEST_LINK=	yes
-WRKSRC=		${WRKDIR}/emacs-19.34
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-.if !defined(WITHOUT_X11)
-CONFIGURE_ARGS=	--with-x-toolkit --sharedstatedir=/var/run
-USE_XLIB=	yes
-.else
-CONFIGURE_ARGS=	--with-x=no --sharedstatedir=/var/run
-.endif
-
-STRIP=
-MAN1=		emacs.1 etags.1 ctags.1
-
-post-install:
-.for file in emacs-19.34 emacsclient etags ctags b2m
-	strip ${PREFIX}/bin/${file}
-.endfor
-.for info in emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode message
-	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
-.endfor
-# install emacs.sh into ${PREFIX}/etc/rc.d
-	${CHMOD} 1777 /var/run/emacs/lock
-	@${MKDIR} ${PREFIX}/etc/rc.d
-	@${INSTALL_SCRIPT} ${FILESDIR}/emacs.sh ${PREFIX}/etc/rc.d
-
-.include <bsd.port.mk>
diff --git a/editors/emacs19/distinfo b/editors/emacs19/distinfo
deleted file mode 100644
index 030e3b0241da..000000000000
--- a/editors/emacs19/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (emacs-19.34b.tar.gz) = 9bd3c694a9019c2a2ebd703a9a0394e0
diff --git a/editors/emacs19/files/emacs.sh b/editors/emacs19/files/emacs.sh
deleted file mode 100644
index c6976c1b8a18..000000000000
--- a/editors/emacs19/files/emacs.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-start)
-	if [ -d /var/run/emacs/lock ]
-	then
-	    rm -f /var/run/emacs/lock/*
-	else
-	    mkdir -p /var/run/emacs/lock
-	fi
-	chmod 1777 /var/run/emacs/lock
-	;;
-stop)
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
-
-exit 0
diff --git a/editors/emacs19/files/patch-aa b/editors/emacs19/files/patch-aa
deleted file mode 100644
index 8e32af2fb6a6..000000000000
--- a/editors/emacs19/files/patch-aa
+++ /dev/null
@@ -1,235 +0,0 @@
---- ./man/vip.texi.org	Fri Jun 16 15:31:11 1995
-+++ ./man/vip.texi	Tue May 20 01:28:33 1997
-@@ -2,6 +2,10 @@
- 
- @setfilename ../info/vip
- @settitle VIP
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* VIP: (vip).			A VI-emulation for Emacs.
-+@end direntry
- 
- @iftex
- @finalout
---- ./man/emacs.texi.org	Mon Aug 19 21:15:12 1996
-+++ ./man/emacs.texi	Tue May 20 01:20:11 1997
-@@ -49,6 +49,11 @@
- @settitle GNU Emacs Manual
- @setfilename ../info/emacs
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Emacs: (emacs).		The extensible self-documenting text editor.
-+@end direntry
-+
- @c
- @c in general, keep the following line commented out, unless doing a
- @c copy of this manual that will be published.  the manual should go
---- ./man/viper.texi.org	Wed Aug  7 10:59:45 1996
-+++ ./man/viper.texi	Tue May 20 01:29:17 1997
-@@ -4,6 +4,10 @@
- \input texinfo
- 
- @setfilename ../info/viper
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* VIPER: (viper).		The new VI-emulation mode in Emacs-19.29.
-+@end direntry
- 
- @iftex
- @finalout
---- ./man/forms.texi.org	Sat Mar 23 06:42:27 1996
-+++ ./man/forms.texi	Tue May 20 01:22:37 1997
-@@ -9,6 +9,11 @@
- @syncodeindex vr cp
- @syncodeindex fn cp
- @syncodeindex ky cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Forms: (forms).		Emacs package for editing data bases
-+				by filling in forms.
-+@end direntry
- @iftex
- @finalout
- @setchapternewpage odd
---- ./man/gnus.texi.org	Wed Jun 26 14:49:29 1996
-+++ ./man/gnus.texi	Tue May 20 01:23:15 1997
-@@ -5,6 +5,11 @@
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* GNUS: (gnus).			The news reader GNUS.
-+@end direntry
-+
- @iftex
- @finalout
- @end iftex
---- ./man/mh-e.texi.org	Sun Aug  4 00:00:29 1996
-+++ ./man/mh-e.texi	Tue May 20 01:23:49 1997
-@@ -4,6 +4,10 @@
- @setfilename ../info/mh-e
- @settitle mh-e
- @c %**end of header
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* MH-E: (mh-e).			Emacs interface to the MH mail system.
-+@end direntry
- 
- @setchapternewpage odd
- 
---- ./man/cl.texi.org	Mon Apr 15 21:36:53 1996
-+++ ./man/cl.texi	Tue May 20 01:24:18 1997
-@@ -2,6 +2,12 @@
- @setfilename ../info/cl
- @settitle Common Lisp Extensions
- 
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* CL: (cl).			Partial Common Lisp support for Emacs Lisp.
-+@end direntry
-+
-+
- @iftex
- @finalout
- @end iftex
---- ./man/sc.texi.org	Thu Jan  4 12:55:23 1996
-+++ ./man/sc.texi	Tue May 20 01:25:13 1997
-@@ -3,6 +3,12 @@
- @comment %**start of header (This is for running Texinfo on a region.)
- @setfilename ../info/sc
- @settitle Supercite Version 3.1 User's Manual
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* SC: (sc).			Supercite lets you cite parts of messages
-+				you're replying to, in flexible ways.
-+@end direntry
-+
- @iftex
- @finalout
- @end iftex
---- ./man/dired-x.texi.org	Thu Jan  4 12:54:19 1996
-+++ ./man/dired-x.texi	Tue May 20 01:25:55 1997
-@@ -18,6 +18,11 @@
- @setfilename ../info/dired-x
- @c dired-x.el REVISION NUMBER
- @settitle Dired Extra Version 2 User's Manual
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Dired-X: (dired-x).		Dired Extra Features.
-+@end direntry
-+
- @iftex
- @finalout
- @end iftex
---- ./man/ediff.texi.org	Fri Jun 21 20:00:04 1996
-+++ ./man/ediff.texi	Tue May 20 01:26:29 1997
-@@ -10,6 +10,11 @@
- @synindex vr cp
- @synindex fn cp
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Ediff: (ediff).		A comprehensive visual interface to diff
-+				and patch.
-+@end direntry
- @iftex
- @finalout
- @end iftex
---- ./man/cc-mode.texi.org	Sun Aug  4 21:56:21 1996
-+++ ./man/cc-mode.texi	Tue May 20 01:27:18 1997
-@@ -9,6 +9,12 @@
- @settitle     CC-MODE Version 4 Documentation
- @footnotestyle end
- 
-+@dircategory The Emacs editor and associated tools 
-+@direntry 
-+* CC mode: (ccmode).		The GNU Emacs mode for editing C, C++,
-+				Objective-C and Java code.
-+@end direntry
-+
- @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- @comment @setchapternewpage odd !! we don't want blank pages !!
- @comment %**end of header (This is for running Texinfo on a region)
---- ./man/message.texi.org	Wed Jun 26 14:49:43 1996
-+++ ./man/message.texi	Sat Dec 13 17:46:31 1997
-@@ -5,6 +5,10 @@
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Message: (message).		Editing mail and news messages.
-+@end direntry
- @iftex
- @finalout
- @end iftex
---- ./Makefile.in.org	Mon Aug 19 21:12:19 1996
-+++ ./Makefile.in	Tue Apr 15 00:15:28 1997
-@@ -184,7 +184,7 @@
- # Subdirectories to make recursively.  `lisp' is not included
- # because the compiled lisp files are part of the distribution
- # and you cannot remake them without installing Emacs first.
--SUBDIR = lib-src src
-+SUBDIR = lib-src src man
- 
- # The makefiles of the directories in $SUBDIR.
- SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile
-@@ -368,14 +368,8 @@
- 	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
- 	then \
- 	  (cd ${infodir};  \
--	   if [ -f dir ]; then \
--	     if [ ! -f dir.old ]; then mv -f dir dir.old; \
--	     else mv -f dir dir.bak; fi; \
--	   fi; \
- 	   cd ${srcdir}/info ; \
--	   (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \
--	   (cd $${thisdir}; chmod a+r ${infodir}/dir); \
--	   for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* sc* vip*; do \
-+	   for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* message* mh-e* sc* vip*; do \
- 	     (cd $${thisdir}; \
- 	      ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
- 	      chmod a+r ${infodir}/$$f); \
-@@ -426,7 +420,7 @@
- 	    esac ;					\
- 	  fi ;						\
- 	done
--	(cd ${infodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*)
-+	(cd ${infodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* mh-e* sc* vip*)
- 	(cd ${man1dir}  && rm -f emacs.1 etags.1 ctags.1)
- 	(cd ${bindir}  && rm -f emacs-${version} $(EMACS))
- 
---- ./man/Makefile.in.org	Thu Jun 27 15:27:19 1996
-+++ ./man/Makefile.in	Tue Apr 15 00:29:52 1997
-@@ -13,7 +13,7 @@
- # The makeinfo program is part of the Texinfo distribution.
- MAKEINFO = makeinfo
- INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl ../info/dired-x \
--	       ../info/ediff ../info/forms ../info/gnus ../info/info \
-+	       ../info/ediff ../info/forms ../info/gnus \
- 	       ../info/mh-e ../info/sc ../info/vip ../info/viper \
- 	       ../info/message
- DVI_TARGETS = emacs.dvi cc-mode.dvi cl.dvi dired-x.dvi ediff.dvi forms.dvi \
-@@ -66,6 +66,7 @@
- 	${srcdir}/gnu1.texi \
- 	${srcdir}/glossary.texi
- 
-+all: info
- info: $(INFO_TARGETS)
- 
- dvi: $(DVI_TARGETS)
-@@ -74,12 +75,6 @@
- # in srcdir.  There is no provision for Info files
- # to exist in the build directory.
- # In a distribution of Emacs, the Info files should be up to date.
--
--../info/info: ${INFOSOURCES}
--	cd $(srcdir); $(MAKEINFO) --no-split info.texi
--
--info.dvi: ${INFOSOURCES}
--	TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/info.texi
- 
- ../info/emacs: ${EMACSSOURCES}
- 	cd $(srcdir); $(MAKEINFO) emacs.texi
diff --git a/editors/emacs19/files/patch-ab b/editors/emacs19/files/patch-ab
deleted file mode 100644
index 16aee5fa323f..000000000000
--- a/editors/emacs19/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/xrdb.c.org	Sat Apr  8 21:54:08 1995
-+++ ./src/xrdb.c	Mon Sep 11 21:53:29 1995
-@@ -361,7 +361,7 @@
- 
- /* Producing databases for individual sources.  */
- 
--#define X_DEFAULT_SEARCH_PATH "/usr/lib/X11/%L/%T/%N%C%S:/usr/lib/X11/%l/%T/%N%C%S:/usr/lib/X11/%T/%N%C%S:/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S"
-+#define X_DEFAULT_SEARCH_PATH "/usr/X11R6/lib/X11/%L/%T/%N%C%S:/usr/X11R6/lib/X11/%l/%T/%N%C%S:/usr/X11R6/lib/X11/%T/%N%C%S:/usr/X11R6/lib/X11/%L/%T/%N%S:/usr/X11R6/lib/X11/%l/%T/%N%S:/usr/X11R6/lib/X11/%T/%N%S"
- 
- static XrmDatabase
- get_system_app (class)
diff --git a/editors/emacs19/files/patch-ac b/editors/emacs19/files/patch-ac
deleted file mode 100644
index dfad53e9e187..000000000000
--- a/editors/emacs19/files/patch-ac
+++ /dev/null
@@ -1,82 +0,0 @@
---- src/s/freebsd.h.orig	Mon Jun 10 05:14:32 1996
-+++ src/s/freebsd.h	Tue Jul 11 16:44:14 2000
-@@ -1,5 +1,15 @@
- /* s/ file for freebsd system.  */
- 
-+/* Get the correct __FreeBSD_version, even if this is before that was
-+   defined. */
-+#ifndef __FreeBSD__
-+#define __FreeBSD_version 199401
-+#elif __FreeBSD__ == 1
-+#define __FreeBSD_version 199405
-+#else
-+#include <osreldate.h>
-+#endif
-+
- /* '__FreeBSD__' is defined by the preprocessor on FreeBSD-1.1 and up.
-    Earlier versions do not have shared libraries, so inhibit them.
-    You can inhibit them on newer systems if you wish
-@@ -33,8 +43,9 @@
- 
- #define LIBS_DEBUG
- #define LIBS_SYSTEM -lutil
-+#if __FreeBSD_version < 400000
- #define LIBS_TERMCAP -ltermcap
--#define LIB_GCC -lgcc
-+#endif
- 
- #define SYSV_SYSTEM_DIR
- 
-@@ -42,12 +53,33 @@
- #undef BSD_PGRPS
- #define GETPGRP_NO_ARG
- 
-+#ifdef __ELF__
-+
-+#define LD_SWITCH_SYSTEM
-+#ifdef i386
-+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
-+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
-+#else
-+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crtbegin.o
-+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
-+#endif
-+#define UNEXEC unexelf.o
-+#undef LIB_GCC
-+#define LIB_GCC
-+
-+#else /* not __ELF__ */
-+
- #ifndef NO_SHARED_LIBS
- #define LD_SWITCH_SYSTEM -e start -dc -dp
- #define HAVE_TEXT_START		/* No need to define `start_of_text'. */
-+#if __FreeBSD_version >= 300002
-+#define START_FILES pre-crt0.o /usr/lib/aout/crt0.o
-+#else /* __FreeBSD_version < 300002 */
- #define START_FILES pre-crt0.o /usr/lib/crt0.o
--#define UNEXEC unexsunos4.o
-+#endif /* __FreeBSD_version < 300002 */
-+#define UNEXEC unexfreebsd.o
- #define RUN_TIME_REMAP
-+#define LIB_GCC -lgcc
- 
- #ifndef N_TRELOFF
- #define N_PAGSIZ(x) __LDPGSZ
-@@ -63,6 +95,8 @@
- #endif /* __FreeBSD__ */
- #endif /* NO_SHARED_LIBS */
- 
-+#endif /* not __ELF__ */
-+
- #define HAVE_WAIT_HEADER
- #define HAVE_GETLOADAVG
- /*#define HAVE_GETPAGESIZE  /* configure now puts this in config.h */
-@@ -80,6 +114,8 @@
- #define BSD 199103
- #elif __FreeBSD__ == 2
- #define BSD 199306
-+#elif __FreeBSD__ >= 3
-+#define BSD 199506
- #endif
- 
- #define WAITTYPE int
diff --git a/editors/emacs19/files/patch-ad b/editors/emacs19/files/patch-ad
deleted file mode 100644
index f2013a374044..000000000000
--- a/editors/emacs19/files/patch-ad
+++ /dev/null
@@ -1,695 +0,0 @@
---- src/unexfreebsd.c.orig	Wed Dec  3 17:28:14 1997
-+++ src/unexfreebsd.c	Wed Dec  3 17:34:02 1997
-@@ -0,0 +1,692 @@
-+/* Code to do an unexec for FreeBSD for a temacs linked -Bdynamic.
-+   Derived from unexnetbsd.c, which was derived from unexsunos4.c
-+   Copyright (C) 1992, 1993 Free Software Foundation, Inc.
-+
-+This file is part of XEmacs.
-+
-+XEmacs is free software; you can redistribute it and/or modify it
-+under the terms of the GNU General Public License as published by the
-+Free Software Foundation; either version 2, or (at your option) any
-+later version.
-+
-+XEmacs is distributed in the hope that it will be useful, but WITHOUT
-+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with XEmacs; see the file COPYING.  If not, write to
-+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA.  */
-+
-+/* Synched up with: Not in FSF? */
-+
-+/*
-+Created 29-Oct-92 by Harlan Sexton
-+Tweaked 06-Aug-93 by Dean Michaels to work with sun3.
-+Converted 01-Dec-93 by Paul Mackerras to work with NetBSD shared libraries.
-+Tweaked 26-Feb-94 by Shawn Carey for use with FreeBSD-1.1 shared libraries.
-+*/
-+
-+/********************** Included .h Files **************************/
-+
-+#include <config.h>
-+
-+#include <stdarg.h>
-+#include <sys/param.h>
-+#include <sys/mman.h>
-+#include <sys/file.h>
-+#include <sys/stat.h>
-+#include <sys/types.h>
-+#include <string.h>
-+#include <stdio.h>
-+#include <a.out.h>
-+#include <unistd.h>
-+#include <ctype.h>
-+#include <stab.h>
-+#include <dirent.h>
-+#include <link.h>
-+
-+/********************** Macros *************************************/
-+
-+#define SYS_ERR		strerror(errno)
-+
-+#define MASK_UP(x,p_of_two) \
-+ ((((unsigned long) (x)) + ((p_of_two) - 1)) & (~((p_of_two) - 1)))
-+
-+#define MASK_DOWN(x,p_of_two) (((unsigned long) (x)) & (~((p_of_two) - 1)))
-+
-+/********************** Typedefs and Structs ***********************/
-+
-+struct translation_struct
-+{
-+  long txtaddr;
-+  long txtoff;
-+  long dataddr;
-+  long datoff;
-+  long bssaddr;
-+  long endaddr;
-+};
-+
-+/********************** Function Prototypes/Declarations ***********/
-+
-+static void unexec_error (const char *m, int use_errno, ...);
-+static int unexec_open (char *filename, int flag, int mode);
-+static caddr_t unexec_mmap (int fd, size_t len, int prot, int flags);
-+static long unexec_seek (int fd, long position);
-+static void unexec_read (int fd, long position, char *buf, int bytes);
-+static void unexec_write (int fd, long position, char *buf, int bytes);
-+static void unexec_pad (int fd, int bytes);
-+static void unexec_fstat (int fd, struct stat *statptr);
-+static void unexec_fchmod (int fd, int mode);
-+static long unexec_addr_to_offset (long addr, struct translation_struct *ts);
-+static void copy_relocation_site (struct relocation_info *ri, 
-+                                  caddr_t from_base_addr, 
-+                                  caddr_t to_base_addr, 
-+                                  struct translation_struct *ts);
-+static void reset_symtab (struct nlist *start, struct nlist *end, 
-+                          char *strtab, long edata_value, long end_value,
-+                          int shlib_image);
-+static void reset_ldso_symtab (struct nzlist *start, struct nzlist *end, 
-+                          char *strtab, long edata_value, long end_value,
-+                          int shlib_image);
-+int run_time_remap (char *dummy);
-+
-+/********************** Variables **********************************/
-+
-+/* for reporting error messages from system calls */
-+extern int errno;
-+extern int _DYNAMIC;
-+extern char **environ;             
-+
-+static unsigned long sbrk_of_0_at_unexec;
-+             
-+/*******************************************************************/
-+
-+static void
-+unexec_error (const char *fmt, int use_errno, ...)
-+{
-+  const char *err_msg = SYS_ERR;
-+  va_list args;
-+
-+  fprintf (stderr, "unexec - ");
-+  va_start (args, use_errno);
-+  vfprintf (stderr, fmt, args);
-+  va_end (args);
-+
-+  if (use_errno)
-+    fprintf (stderr, ": %s", err_msg);
-+  fprintf (stderr, "\n");
-+  exit (1);
-+  return;
-+}
-+
-+static int
-+unexec_open (char *filename, int flag, int mode)
-+{
-+  int fd;
-+
-+  errno = 0;
-+
-+  fd = open (filename, flag, mode);
-+
-+  if (fd < 0)
-+    unexec_error ("Failure opening file %s", 1, filename);
-+  return fd;
-+}
-+
-+static caddr_t
-+unexec_mmap (int fd, size_t len, int prot, int flags)
-+{
-+  caddr_t return_val;
-+
-+  unexec_seek (fd, 0);
-+  errno = 0;
-+  return_val = mmap (0, len, prot, flags, fd, 0);
-+
-+  if (return_val == (caddr_t) -1)
-+    unexec_error ("Failure mmap'ing file", 1);
-+  return return_val;
-+}
-+
-+
-+static long
-+unexec_seek (int fd, long position)
-+{
-+  long seek_value;
-+
-+  if (fd <= 0)
-+    unexec_error ("No file open in which to seek", 0);
-+
-+  errno = 0;
-+
-+  if (position < 0)
-+    seek_value = (long) lseek (fd, 0, L_INCR);
-+  else
-+    seek_value = (long) lseek (fd, position, L_SET);
-+
-+  if (seek_value < 0)
-+    unexec_error ("Failed to do a seek to 0x%x in %s", 1,
-+                  position, "unexec() output file");
-+
-+  return seek_value;
-+}
-+
-+static void
-+unexec_read (int fd, long position, char *buf, int bytes)
-+{
-+  int n_read;
-+  int remains = bytes;
-+  position = unexec_seek (fd, position);
-+
-+  if (bytes < 0)
-+    unexec_error ("Attempted read of %d bytes", 0, bytes);
-+
-+  errno = 0;
-+
-+  while (remains > 0)
-+    {
-+      n_read = read (fd, buf, remains);
-+      if (n_read <= 0)
-+        unexec_error ("Read failed for 0x%x bytes at offset 0x%x in %s",
-+                      1, bytes, position, "unexec() output file");
-+      buf += n_read;
-+      remains -= n_read;
-+    }
-+
-+  return;
-+}
-+
-+static void
-+unexec_write (int fd, long position, char *buf, int bytes)
-+{
-+  int n_written;
-+  int remains = bytes;
-+  position = unexec_seek (fd, position);
-+
-+  if (bytes < 0)
-+    unexec_error ("Attempted write of %d bytes in %s",
-+                  0, bytes, "unexec() output file");
-+
-+  errno = 0;
-+
-+  while (remains > 0)
-+    {
-+      n_written = write (fd, buf, remains);
-+      if (n_written <= 0)
-+        unexec_error ("Write failed for 0x%x bytes at offset 0x%x in %s",
-+                      1, bytes, position, "unexec() output file");
-+      buf += n_written;
-+      remains -= n_written;
-+    }
-+
-+  return;
-+}
-+
-+static void 
-+unexec_pad (int fd, int bytes)
-+{
-+  if (bytes > 0)
-+    {
-+      char buf[1024];
-+      int remaining = bytes;
-+
-+      memset (buf, 0, sizeof (buf));
-+
-+      while (remaining > 0)
-+        {
-+          int this_write = (remaining > sizeof(buf))?sizeof(buf):remaining;
-+          unexec_write (fd, -1, buf, this_write);
-+          remaining -= this_write;
-+        }
-+    }
-+}
-+
-+static void
-+unexec_fstat (int fd, struct stat *statptr)
-+{
-+  errno = 0;
-+  if (-1 == fstat (fd, statptr))
-+    unexec_error ("fstat() failed for descriptor %d", 1, fd);
-+  return;
-+}
-+
-+static void
-+unexec_fchmod (int fd, int mode)
-+{
-+  errno = 0;
-+  if (-1 == fchmod (fd, mode))
-+    unexec_error ("fchmod() failed for descriptor %d", 1, fd);
-+  return;
-+}
-+
-+static long
-+unexec_addr_to_offset (long addr, struct translation_struct *ts)
-+                             
-+{
-+  if ((addr < ts->txtaddr) || (addr >= ts->bssaddr))
-+    return -1;
-+  else if (addr >= ts->dataddr)
-+    return ((long) ((addr - ts->dataddr) + ts->datoff));
-+  else 
-+    return ((long) ((addr - ts->txtaddr) + ts->txtoff));
-+}
-+
-+
-+/*
-+ * "LD.SO" DATA AND SYMBOL TABLE OPERATIONS 
-+ */
-+
-+static void
-+copy_relocation_site (struct relocation_info *ri, 
-+                      caddr_t from_base_addr,
-+                      caddr_t to_base_addr,
-+                      struct translation_struct *ts)
-+{
-+  long offset;
-+  caddr_t from, to;
-+
-+  /* We can get relocation sites in the bss region, for objects whose
-+     contents are copied from a shared library.  We don't need or want
-+     to restore these at present. */
-+#ifndef sparc
-+  if (ri->r_copy)
-+    return;
-+#else
-+  /* Struct relocation_info_sparc doesn't have member r_copy.
-+     Instead, we use the address to check if this is run-time-copied. */
-+  if (ri->r_address >= ts->bssaddr && ri->r_address < ts->endaddr)
-+    return;
-+#endif
-+
-+  offset = unexec_addr_to_offset (ri->r_address, ts);
-+  if (offset == -1)
-+    unexec_error ("bad relocation address 0x%x (0x%x)", 0, ri->r_address,
-+		  ((long *)ri)[1]);
-+
-+  from = from_base_addr + offset;
-+  to = to_base_addr + offset;
-+  /* This stuff should be in a md_ file somewhere... */
-+#ifndef sparc
-+  switch (ri->r_length)
-+    {
-+    case 0:
-+      *((char *) to) = *((char *) from);
-+      break;
-+    case 1:
-+      *((short *) to) = *((short *) from);
-+      break;
-+    case 2:
-+      *((long *) to) = *((long *) from);
-+      break;
-+    default:
-+      unexec_error ("unknown reloc length %d seen during unexec()",
-+		    0, ri->r_length);
-+      break;
-+    }
-+#else /* sparc */
-+  switch (ri->r_type)
-+    {
-+    case RELOC_8:
-+    case RELOC_DISP8:
-+      *((char *) to) = *((char *) from);
-+      break;
-+    case RELOC_16:
-+    case RELOC_DISP16:
-+      *((short *) to) = *((short *) from);
-+      break;     
-+    case RELOC_LO10:
-+    case RELOC_13:     
-+    case RELOC_22:     
-+    case RELOC_HI22:
-+    case RELOC_WDISP22:
-+    case RELOC_WDISP30:
-+    case RELOC_32:
-+    case RELOC_DISP32:
-+    case RELOC_GLOB_DAT:
-+      *((long *) to) = *((long *) from);
-+      break;
-+    case RELOC_JMP_SLOT:
-+      {
-+        long *target = (long *) to;
-+        long *source = (long *) from;
-+        *target = *source;
-+        target++;
-+        source++;
-+        *target = *source;
-+        target++;
-+        source++;
-+        *target = *source;
-+      }
-+      break;
-+    default:
-+      unexec_error ("unknown reloc type %d seen during unexec()",
-+		    0, ri->r_type);
-+      break;
-+    }
-+#endif /* sparc */
-+}
-+
-+static void
-+reset_symtab (struct nlist *start, struct nlist *end, char *strtab,
-+              long edata_value, long end_value, int shlib_image)
-+{
-+  struct nlist *tmp = start;
-+  int found_edata = 0;
-+  int found_end = 0;
-+     
-+  while (tmp < end)
-+    {
-+      int type = tmp->n_type;
-+
-+      if ((type == (N_UNDF | N_EXT)) &&
-+          (tmp->n_value != 0))
-+        unexec_error ("unexec'ing image has COMMON symbols in it -- we quit!",
-+		      0);
-+     
-+      if (!(type & N_STAB))
-+        {
-+          if (!found_edata &&
-+              (type == (N_EXT | N_DATA)) &&
-+              tmp->n_un.n_strx &&
-+              !strcmp ("_edata", strtab + tmp->n_un.n_strx))
-+            {
-+              tmp->n_value = edata_value;
-+              found_edata = 1;
-+            }
-+
-+
-+          if ((type & N_TYPE) == N_BSS)
-+            {
-+              if (!found_end &&
-+                  (type == (N_EXT | N_BSS)) &&
-+                  tmp->n_un.n_strx &&
-+                  !strcmp ("_end", strtab + tmp->n_un.n_strx))
-+                {
-+                  tmp->n_value = end_value;
-+                  found_end = 1;
-+                }
-+              else if (type & N_EXT)
-+                tmp->n_type = N_DATA | N_EXT;
-+              else
-+                tmp->n_type = N_DATA;
-+            }
-+
-+          /* the way things are being handled here, having sbrk() in the
-+             image is fatal for an image linked with shared lib's (although 
-+             the code could be modified to support it), but this should 
-+             never happen anyway */
-+          if (shlib_image &&
-+              (type == (N_EXT | N_TEXT)) &&
-+              tmp->n_un.n_strx &&
-+              !strcmp ("_sbrk", strtab + tmp->n_un.n_strx))
-+            unexec_error ("unexec'd shlib image has sbrk() in it -- we quit!",
-+                          0);
-+        }
-+
-+      tmp++;
-+    }
-+} 
-+     
-+static void
-+reset_ldso_symtab (struct nzlist *start, struct nzlist *end, char *strtab,
-+              long edata_value, long end_value, int shlib_image)
-+{
-+  struct nzlist *tmp = start;
-+  int found_edata = 0;
-+  int found_end = 0;
-+     
-+  while (tmp < end) {
-+    int type = tmp->nz_type;
-+/*
-+ * the following code breaks under FreeBSD-1.1-BETA, but everything
-+ * seems to work perfectly if it's commented out.  This did not break
-+ * anything until the changes to ld.so were made.
-+ */
-+/*
-+    if ((type == (N_UNDF | N_EXT)) && (tmp->nz_value != 0))
-+      unexec_error("unexec'ing image has COMMON symbols in rel -- we quit!",0);
-+*/
-+    if (!(type & N_STAB)) {
-+      if (!found_edata &&
-+	  (type == (N_EXT | N_DATA)) &&
-+	  !strcmp ("_edata", strtab + tmp->nz_strx)) {
-+	tmp->nz_value = edata_value;
-+	found_edata = 1;
-+      }
-+
-+      if ((type & N_TYPE) == N_BSS) {
-+	if (!found_end &&
-+	    (type == (N_EXT | N_BSS)) &&
-+	    !strcmp ("_end", strtab + tmp->nz_strx)) {
-+	  tmp->nz_value = end_value;
-+	  found_end = 1;
-+	} else if (type & N_EXT)
-+	  tmp->nz_type = N_DATA | N_EXT;
-+	else
-+	  tmp->nz_type = N_DATA;
-+      }
-+
-+      /* the way things are being handled here, having sbrk() in the
-+	 image is fatal for an image linked with shared lib's (although 
-+	 the code could be modified to support it), but this should 
-+	 never happen anyway */
-+      if (shlib_image &&
-+	  (type == (N_EXT | N_TEXT)) &&
-+	  !strcmp ("_sbrk", strtab + tmp->nz_strx))
-+	unexec_error("unexec'd shlib image has sbrk() ref -- we quit!", 0);
-+    }
-+    tmp++;
-+  }
-+} 
-+     
-+extern int getpagesize (void);
-+
-+/*
-+ * EXPORTED FUNCTIONS 
-+ */
-+
-+/* this has to be a global variable to prevent the optimizers from
-+ * assuming that it can not be 0.  
-+*/
-+static void *dynamic_addr = (void *) &_DYNAMIC;
-+
-+int
-+unexec (char *new_name, char *old_name,
-+        unsigned int emacs_edata, unsigned int dummy1, unsigned int dummy2)
-+{
-+  /* ld.so data */
-+  struct _dynamic *ld = 0;
-+  struct section_dispatch_table *ld2 = 0;
-+  /* old and new state */
-+  int old_fd;
-+  int new_fd;
-+  caddr_t old_base_addr;
-+  caddr_t new_base_addr;
-+  struct exec old_hdr;
-+  struct exec new_hdr;
-+  struct stat old_buf;
-+  struct stat new_buf;
-+  /* some process specific "constants" */
-+  unsigned long n_pagsiz, new_edata;
-+  long page_size = getpagesize ();
-+  caddr_t plt_end;
-+  caddr_t current_break = (caddr_t) sbrk (0);
-+
-+  if (!page_size)
-+    unexec_error ("unexec() failed because we can't get the size of a page!",
-+                  0);
-+
-+  /* see if this is a -Bdynamic image -- if so, find ld.so structures */
-+  if (dynamic_addr)
-+    {
-+      ld = (struct _dynamic *) dynamic_addr;
-+      ld2 = ld->d_un.d_sdt;
-+      if (ld->d_version < LD_VERSION_BSD)
-+        unexec_error ("%s linked with obsolete version of ld -- we quit!",
-+                      0, old_name);
-+    }
-+
-+  /* open the old and new files, figuring out how big the old one is
-+     so that we can map it in */
-+  old_fd = unexec_open (old_name, O_RDONLY, 0);
-+  new_fd = unexec_open (new_name, O_RDWR | O_CREAT | O_TRUNC, 0666);
-+
-+  /* setup the header and the statbuf for old_fd */
-+  unexec_read (old_fd, 0, (char *) &old_hdr, sizeof (old_hdr));
-+  unexec_fstat (old_fd, &old_buf);
-+
-+
-+  /* set up some important constants */
-+  n_pagsiz = __LDPGSZ;
-+  if (dynamic_addr)
-+    plt_end = (caddr_t) MASK_UP (ld2->sdt_plt + ld2->sdt_plt_sz, sizeof (double));
-+  else
-+    plt_end = (caddr_t) N_DATADDR (old_hdr);
-+
-+#if 0
-+  /* never write protect the variable "environ", defined in /lib/crt0.o, and
-+     set in process.c and callproc.c */
-+  mprotect_bottom_addr = ((unsigned long) &environ) + sizeof (char **);
-+  /* never protect ABOVE the end of data emacs_edata specified */
-+  mprotect_top_addr = MIN (emacs_edata, N_DATADDR (old_hdr) + old_hdr.a_data);
-+#endif
-+
-+  /* Set up the image of the old file */
-+  old_base_addr = unexec_mmap (old_fd, old_buf.st_size, PROT_READ,
-+			       MAP_FILE | MAP_PRIVATE);
-+  close (old_fd);
-+
-+  /* set up the new exec */
-+  new_hdr = old_hdr;
-+  new_edata = (unsigned long) MASK_UP (current_break, n_pagsiz);
-+  new_hdr.a_data = new_edata - ((unsigned long) N_DATADDR (old_hdr));
-+  new_hdr.a_bss  = 0;
-+
-+  /* set up this variable, in case we want to reset "the break" 
-+     when restarting */
-+  sbrk_of_0_at_unexec = ((unsigned long) MASK_UP (current_break, n_pagsiz));
-+     
-+  /* Write out the first approximation to the new file. The sizes of
-+     each section will be correct, but there will be a number of 
-+     corrections that will need to be made. */
-+  {
-+    long old_datoff = N_DATOFF (old_hdr);
-+    long old_dataddr = N_DATADDR (old_hdr);
-+    long new_treloff = N_RELOFF (new_hdr);
-+    long old_treloff = N_RELOFF (old_hdr);
-+    long ld_so_size = ((unsigned long) plt_end) - old_dataddr;
-+    long real_data_size = current_break - plt_end;
-+    long pad_size = 
-+      MASK_UP (current_break, n_pagsiz) - ((unsigned long) current_break);
-+
-+
-+    /* First, write the text segment with new header -- copy everything until
-+       the start of the data segment from the old file, and then go back and 
-+       write the new header. */
-+    unexec_write (new_fd, 0, old_base_addr, old_datoff + ld_so_size);
-+    unexec_write (new_fd, 0, (char *) &new_hdr, sizeof (new_hdr));
-+
-+    /* Copy the rest of the data segment from the running image. */
-+    unexec_write (new_fd, old_datoff + ld_so_size, 
-+                  plt_end, real_data_size);
-+
-+    /* pad out the data segment */
-+    unexec_pad (new_fd, pad_size);
-+    
-+    /* Finally, copy the symbol table information from the old file. */
-+    unexec_write (new_fd, new_treloff,
-+                  old_base_addr + old_treloff,
-+                  old_buf.st_size - old_treloff);
-+  }
-+     
-+     
-+  /* Next, map in the output file so that we can jump around fixing it
-+     up. We retain the old file so that we can refer to it. */
-+  unexec_fstat (new_fd, &new_buf);
-+  new_base_addr = unexec_mmap (new_fd, 
-+                               MASK_UP (new_buf.st_size, page_size),
-+                               PROT_READ | PROT_WRITE,
-+			       MAP_FILE | MAP_SHARED);
-+
-+
-+
-+  /* We need to do 2 things. First, make sure that _edata and _end (and
-+     hence, curbrk) are set to the correct values. At the same time, for
-+     neatness and to help with debugging, mark all the types of all ld.so
-+     and nm BSS symbols in the new file to be DATA, and make sure that
-+     there are no COMMON symbols in the output file, as any references to
-+     these can lose really big. Second, reset all of the ld.so "relocation
-+     sites" in the new file to have the values that appear in the old file
-+     -- the failure to do this was the biggest loser in the old version of
-+     this code. */
-+
-+  /* STEP 1 */
-+  /* Reset the regular symbol table first. */
-+  reset_symtab ((struct nlist *) (new_base_addr + N_SYMOFF(new_hdr)),
-+		(struct nlist *) (new_base_addr + N_SYMOFF(new_hdr) +
-+				  new_hdr.a_syms),
-+		(char *) (new_base_addr + N_STROFF(new_hdr)),
-+		new_edata, new_edata,
-+		!!dynamic_addr);
-+
-+  /* Now reset the ld.so symbol table. */
-+  if (dynamic_addr)
-+    {
-+      struct translation_struct ts;
-+      struct relocation_info *tmp, *end;
-+      caddr_t syms, strings;
-+
-+      /* set up the structure that we use to translate addresses in the
-+	 old file into file offsets */
-+      ts.txtaddr = N_TXTADDR (old_hdr);
-+      ts.txtoff = N_TXTOFF (old_hdr);
-+      ts.dataddr = N_DATADDR (old_hdr);
-+      ts.datoff = N_DATOFF (old_hdr);
-+      ts.bssaddr = N_DATADDR (old_hdr) + old_hdr.a_data;
-+      ts.endaddr = ts.bssaddr + old_hdr.a_bss;
-+
-+      syms = new_base_addr + unexec_addr_to_offset(ld2->sdt_nzlist, &ts);
-+      strings = new_base_addr + unexec_addr_to_offset(ld2->sdt_strings, &ts);
-+      reset_ldso_symtab ((struct nzlist *) syms, (struct nzlist *) strings,
-+			 (char *) strings,
-+			 new_edata, new_edata,
-+			 !!dynamic_addr);
-+
-+      /* STEP 2 */
-+      tmp = (struct relocation_info *)
-+	(old_base_addr + unexec_addr_to_offset(ld2->sdt_rel, &ts));
-+      end = (struct relocation_info *)
-+	(old_base_addr + unexec_addr_to_offset(ld2->sdt_hash, &ts));
-+      while (tmp < end)
-+	{
-+	  copy_relocation_site (tmp, old_base_addr, new_base_addr, &ts);
-+	  tmp++;
-+	}
-+    }
-+     
-+  /* get rid of the mmap-ed file space and make the output file 
-+     executable -- then quit */
-+  munmap (new_base_addr, MASK_UP (new_buf.st_size, page_size));
-+  munmap (old_base_addr, MASK_UP (old_buf.st_size, page_size));
-+  unexec_fchmod (new_fd, 0755);
-+  close (new_fd);
-+  return 0;
-+}
-+
-+
-+int
-+run_time_remap (char *dummy)
-+{
-+  unsigned long current_sbrk = (unsigned long) sbrk (0);
-+
-+  if (sbrk_of_0_at_unexec > current_sbrk)
-+    {
-+      errno = 0;
-+      if (brk ((caddr_t) sbrk_of_0_at_unexec))
-+	fprintf (stderr, "failed to change brk addr to 0x%lx: %s\n", 
-+		 sbrk_of_0_at_unexec, SYS_ERR);
-+    }
-+             
-+  return 0;
-+}
diff --git a/editors/emacs19/files/patch-ae b/editors/emacs19/files/patch-ae
deleted file mode 100644
index 82b5e69cad05..000000000000
--- a/editors/emacs19/files/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/unexelf.c.orig	Fri Oct  2 12:55:43 1998
-+++ src/unexelf.c	Fri Oct  2 13:02:05 1998
-@@ -678,7 +678,8 @@
-   if (n < 0)
-     fatal ("Couldn't find segment next to .bss in %s\n", old_name, 0);
- 
--  NEW_PROGRAM_H (n).p_filesz += new_data2_size;
-+/*  NEW_PROGRAM_H (n).p_filesz += new_data2_size; */
-+  NEW_PROGRAM_H (n).p_filesz = new_bss_addr - NEW_PROGRAM_H (n).p_vaddr; /* From emacs 20.3 */
-   NEW_PROGRAM_H (n).p_memsz = NEW_PROGRAM_H (n).p_filesz;
- 
- #if 0 /* Maybe allow section after data2 - does this ever happen? */
-@@ -845,7 +846,9 @@
- 
-       for (; symp < symendp; symp ++)
- 	if (strcmp ((char *) (symnames + symp->st_name), "_end") == 0
--	    || strcmp ((char *) (symnames + symp->st_name), "_edata") == 0)
-+	    || strcmp ((char *) (symnames + symp->st_name), "end") == 0
-+	    || strcmp ((char *) (symnames + symp->st_name), "_edata") == 0
-+	    || strcmp ((char *) (symnames + symp->st_name), "edata") == 0)
- 	  memcpy (&symp->st_value, &new_bss_addr, sizeof (new_bss_addr));
-     }
diff --git a/editors/emacs19/files/patch-af b/editors/emacs19/files/patch-af
deleted file mode 100644
index 23092a4a8ca0..000000000000
--- a/editors/emacs19/files/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	Tue Aug 20 13:11:26 1996
-+++ configure	Sat Jan 16 23:18:54 1999
-@@ -756,6 +756,10 @@
-     machine=alpha opsys=gnu-linux
-   ;;
- 
-+  alpha-*-freebsd* )
-+    machine=alpha opsys=freebsd
-+  ;;
-+
-   ## Altos 3068
-   m68*-altos-sysv* )
-     machine=altos opsys=usg5-2
diff --git a/editors/emacs19/files/patch-ag b/editors/emacs19/files/patch-ag
deleted file mode 100644
index a556bd24f5eb..000000000000
--- a/editors/emacs19/files/patch-ag
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/m/alpha.h.orig	Sat Aug 10 07:03:36 1996
-+++ src/m/alpha.h	Sat Jan 16 22:34:10 1999
-@@ -234,7 +234,11 @@
- 
- #ifndef NOT_C_CODE
- /* We need these because pointers are larger than the default ints.  */
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #include <alloca.h>
-+#else
-+#include <stdlib.h>
-+#endif
- 
- /* Hack alert!  For reasons unknown to mankind the string.h file insists
-    on defining bcopy etc. as taking char pointers as arguments.  With
-@@ -299,10 +303,18 @@
-    termio and struct termios are mutually incompatible.  */
- #define NO_TERMIO
- 
--#ifdef LINUX
-+#if defined(LINUX) || \
-+	defined(__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
- # define TEXT_END ({ extern int _etext; &_etext; })
- # ifndef __ELF__
- #  define COFF
- #  define DATA_END ({ extern int _EDATA; &_EDATA; })
- # endif /* notdef __ELF__ */
- #endif
-+
-+#if (defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)) \
-+	&& defined (__ELF__)
-+#define HAVE_TEXT_START
-+#endif
-+
-+
diff --git a/editors/emacs19/files/patch-ah b/editors/emacs19/files/patch-ah
deleted file mode 100644
index 3f990e4b5970..000000000000
--- a/editors/emacs19/files/patch-ah
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/unexelf1.c.orig	Sat Aug 10 06:56:52 1996
-+++ src/unexelf1.c	Sun Jan 17 00:28:21 1999
-@@ -423,12 +423,50 @@
- #include <elf.h>
- #include <sys/mman.h>
- 
--#ifdef __alpha__
-+#if defined(__alpha__) && defined(__osf__)
- # include <sym.h>	/* get COFF debugging symbol table declaration */
-+#else if defined(__alpha__)
-+typedef struct {
-+	short magic;
-+	short vstamp;
-+	int ilineMax;
-+	int idnMax;
-+	int ipdMax;
-+	int isymMax;
-+	int ioptMax;
-+	int iauxMax;
-+	int issMax;
-+	int issExtMax;
-+	int ifdMax;
-+	int crfd;
-+	int iextMax;
-+	long cbLine;
-+	long cbLineOffset;
-+	long cbDnOffset;
-+	long cbPdOffset;
-+	long cbSymOffset;
-+	long cbOptOffset;
-+	long cbAuxOffset;
-+	long cbSsOffset;
-+	long cbSsExtOffset;
-+	long cbFdOffset;
-+	long cbRfdOffset;
-+	long cbExtOffset;
-+} HDRR, *pHDRR; 
-+#define cbHDRR sizeof(HDRR)
-+#define hdrNil ((pHDRR)0)
- #endif
- 
- #if __GNU_LIBRARY__ - 0 >= 6
- # include <link.h>	/* get ElfW etc */
-+#endif
-+
-+#ifdef __FreeBSD__
-+# ifdef __STDC__
-+#  define ElfW(type)	Elf_##type
-+# else
-+#  define ElfW(type)	Elf_/**/type
-+# endif
- #endif
- 
- #ifndef ElfW
diff --git a/editors/emacs19/files/patch-ai b/editors/emacs19/files/patch-ai
deleted file mode 100644
index 57da8f14f8fd..000000000000
--- a/editors/emacs19/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib-src/Makefile.in.orig	Sun Apr  4 13:04:19 1999
-+++ lib-src/Makefile.in	Sun Apr  4 13:04:48 1999
-@@ -364,7 +364,7 @@
- 	$(CC) ${ALL_CFLAGS} ${srcdir}/cvtmail.c $(LOADLIBES) -o cvtmail
- 
- fakemail: ${srcdir}/fakemail.c ../src/config.h
--	$(CC) ${ALL_CFLAGS} ${srcdir}/fakemail.c $(LOADLIBES) -o fakemail
-+	$(CC) ${ALL_CFLAGS} ${srcdir}/fakemail.c $(LOADLIBES) -lcompat -o fakemail
- 
- yow: ${srcdir}/yow.c ../src/paths.h
- 	$(CC) ${ALL_CFLAGS} ${srcdir}/yow.c $(LOADLIBES) -o yow
diff --git a/editors/emacs19/files/patch-ba b/editors/emacs19/files/patch-ba
deleted file mode 100644
index c9f637aa3ba4..000000000000
--- a/editors/emacs19/files/patch-ba
+++ /dev/null
@@ -1,22 +0,0 @@
---- lib-src/emacsclient.c.old	Tue Jul 23 23:18:33 1996
-+++ lib-src/emacsclient.c	Thu Oct  8 22:34:54 1998
-@@ -94,6 +94,8 @@
-     struct stat statbfr;
- 
-     gethostname (system_name, sizeof (system_name));
-+    system_name[sizeof (system_name) - 1] = '\0';
-+		/* system_name must be null-terminated string */
-     sprintf (server.sun_path, "/tmp/esrv%d-%s", geteuid (), system_name);
- 
-     if (stat (server.sun_path, &statbfr) == -1)
---- lib-src/emacsserver.c.old	Wed Jul 17 07:09:29 1996
-+++ lib-src/emacsserver.c	Thu Oct  8 22:35:08 1998
-@@ -115,6 +115,8 @@
-   server.sun_family = AF_UNIX;
- #ifndef SERVER_HOME_DIR
-   gethostname (system_name, sizeof (system_name));
-+  system_name[sizeof (system_name) - 1] = '\0';
-+		/* system_name must be null-terminated string */
-   sprintf (server.sun_path, "/tmp/esrv%d-%s", geteuid (), system_name);
- 
-   if (unlink (server.sun_path) == -1 && errno != ENOENT)
diff --git a/editors/emacs19/files/patch-bb b/editors/emacs19/files/patch-bb
deleted file mode 100644
index 1d6fcf08137e..000000000000
--- a/editors/emacs19/files/patch-bb
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/emacs.c.orig	Fri Sep  6 17:15:38 2002
-+++ src/emacs.c	Fri Sep  6 17:16:33 2002
-@@ -427,8 +427,6 @@
- {
-   char stack_bottom_variable;
-   int skip_args = 0;
--  extern int errno;
--  extern sys_nerr;
- 
- #ifdef LINUX_SBRK_BUG
-   __sbrk (1);
diff --git a/editors/emacs19/pkg-descr b/editors/emacs19/pkg-descr
deleted file mode 100644
index 87a11a9cf372..000000000000
--- a/editors/emacs19/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-GNU Emacs is a self-documenting, customizable, extensible real-time
-display editor.
-
-Users new to Emacs will be able to use basic features fairly rapidly
-by studying the tutorial and using the self-documentation features.
-Emacs also has an extensive interactive manual browser.  It is easily
-extensible since its editing commands are written in Lisp.
-
-GNU Emacs's many special packages handle mail reading (RMail) and
-sending (Mail), outline editing (Outline), compiling (Compile),
-running subshells within Emacs windows (Shell), running a Lisp
-read-eval-print loop (Lisp-Interaction-Mode), automated psychotherapy
-(Doctor :-) and many more.
-
-WWW: http://www.gnu.org/software/emacs/
diff --git a/editors/emacs19/pkg-plist b/editors/emacs19/pkg-plist
deleted file mode 100644
index bd28773b2034..000000000000
--- a/editors/emacs19/pkg-plist
+++ /dev/null
@@ -1,1051 +0,0 @@
-bin/ctags
-bin/b2m
-bin/rcs-checkin
-bin/emacs-%%EMACS_VERSION%%
-@exec ln -s %D/%F %B/emacs
-@unexec rm %B/emacs
-bin/etags
-bin/emacsclient
-@exec if [ ! -d %d/share/emacs/site-lisp ]; then mkdir -p %D/share/emacs/site-lisp; fi
-@exec if [ ! -d %d/share/emacs/%%EMACS_VERSION%%/site-lisp ]; then mkdir -p %D/share/emacs/%%EMACS_VERSION%%/site-lisp; fi
-@exec mkdir -p /var/run/emacs/lock ; chmod 1777 /var/run/emacs/lock
-etc/rc.d/emacs.sh
-@comment This can fail if other ports are installed, no need to
-@comment scare user in that case
-@unexec rmdir %D/share/emacs/%%EMACS_VERSION%%/site-lisp 2>/dev/null || true
-@unexec install-info --delete %D/info/emacs %D/info/dir
-@unexec install-info --delete %D/info/vip %D/info/dir
-@unexec install-info --delete %D/info/viper %D/info/dir
-@unexec install-info --delete %D/info/forms %D/info/dir
-@unexec install-info --delete %D/info/gnus %D/info/dir
-@unexec install-info --delete %D/info/mh-e %D/info/dir
-@unexec install-info --delete %D/info/cl %D/info/dir
-@unexec install-info --delete %D/info/sc %D/info/dir
-@unexec install-info --delete %D/info/dired-x %D/info/dir
-@unexec install-info --delete %D/info/ediff %D/info/dir
-@unexec install-info --delete %D/info/ccmode %D/info/dir
-@unexec install-info --delete %D/info/message %D/info/dir
-info/ccmode
-info/ccmode-1
-info/ccmode-2
-info/cl
-info/cl-1
-info/cl-2
-info/cl-3
-info/cl-4
-info/cl-5
-info/cl-6
-info/dired-x
-info/ediff
-info/ediff-1
-info/ediff-2
-info/emacs
-info/emacs-1
-info/emacs-10
-info/emacs-11
-info/emacs-12
-info/emacs-13
-info/emacs-14
-info/emacs-15
-info/emacs-16
-info/emacs-17
-info/emacs-18
-info/emacs-19
-info/emacs-2
-info/emacs-20
-info/emacs-21
-info/emacs-22
-info/emacs-23
-info/emacs-24
-info/emacs-25
-info/emacs-26
-info/emacs-27
-info/emacs-28
-info/emacs-29
-info/emacs-3
-info/emacs-4
-info/emacs-5
-info/emacs-6
-info/emacs-7
-info/emacs-8
-info/emacs-9
-info/forms
-info/gnus
-info/gnus-1
-info/gnus-2
-info/gnus-3
-info/gnus-4
-info/gnus-5
-info/gnus-6
-info/gnus-7
-info/gnus-8
-info/gnus-9
-info/gnus-10
-info/gnus-11
-info/message
-info/mh-e
-info/mh-e-1
-info/mh-e-2
-info/mh-e-3
-info/mh-e-4
-info/sc
-info/sc-1
-info/sc-2
-info/sc-3
-info/vip
-info/vip-1
-info/vip-2
-info/viper
-info/viper-1
-info/viper-2
-info/viper-3
-info/viper-4
-@exec install-info %D/info/emacs %D/info/dir
-@exec install-info %D/info/vip %D/info/dir
-@exec install-info %D/info/viper %D/info/dir
-@exec install-info %D/info/forms %D/info/dir
-@exec install-info %D/info/gnus %D/info/dir
-@exec install-info %D/info/mh-e %D/info/dir
-@exec install-info %D/info/cl %D/info/dir
-@exec install-info %D/info/sc %D/info/dir
-@exec install-info %D/info/dired-x %D/info/dir
-@exec install-info %D/info/ediff %D/info/dir
-@exec install-info %D/info/ccmode %D/info/dir
-@exec install-info %D/info/message %D/info/dir
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/cvtmail
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/digest-doc
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/emacsserver
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/fakemail
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/hexl
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/movemail
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/profile
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/rcs2log
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/sorted-doc
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/vcdiff
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/yow
-@dirrm libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%
-@dirrm libexec/emacs/%%EMACS_VERSION%%
-@unexec rmdir %D/libexec/emacs 2>/dev/null || true
-share/emacs/%%EMACS_VERSION%%/etc/3B-MAXMEM
-share/emacs/%%EMACS_VERSION%%/etc/AIX.DUMP
-share/emacs/%%EMACS_VERSION%%/etc/BABYL
-share/emacs/%%EMACS_VERSION%%/etc/CENSORSHIP
-share/emacs/%%EMACS_VERSION%%/etc/COOKIES
-share/emacs/%%EMACS_VERSION%%/etc/COPYING
-share/emacs/%%EMACS_VERSION%%/etc/DEBUG
-share/emacs/%%EMACS_VERSION%%/etc/DISTRIB
-share/emacs/%%EMACS_VERSION%%/etc/DOC-%%EMACS_VERSION%%.1
-share/emacs/%%EMACS_VERSION%%/etc/FAQ
-share/emacs/%%EMACS_VERSION%%/etc/FTP
-share/emacs/%%EMACS_VERSION%%/etc/GNU
-share/emacs/%%EMACS_VERSION%%/etc/INTERVIEW
-share/emacs/%%EMACS_VERSION%%/etc/JOKES
-share/emacs/%%EMACS_VERSION%%/etc/LEDIT
-share/emacs/%%EMACS_VERSION%%/etc/LINUX-GNU
-share/emacs/%%EMACS_VERSION%%/etc/LNEWS
-share/emacs/%%EMACS_VERSION%%/etc/LPF
-share/emacs/%%EMACS_VERSION%%/etc/MACHINES
-share/emacs/%%EMACS_VERSION%%/etc/MAILINGLISTS
-share/emacs/%%EMACS_VERSION%%/etc/MH-E-NEWS
-share/emacs/%%EMACS_VERSION%%/etc/MH-E-ONEWS
-share/emacs/%%EMACS_VERSION%%/etc/MORE.STUFF
-share/emacs/%%EMACS_VERSION%%/etc/MOTIVATION
-share/emacs/%%EMACS_VERSION%%/etc/NEWS
-share/emacs/%%EMACS_VERSION%%/etc/ONEWS
-share/emacs/%%EMACS_VERSION%%/etc/OONEWS
-share/emacs/%%EMACS_VERSION%%/etc/OOONEWS
-share/emacs/%%EMACS_VERSION%%/etc/OOOONEWS
-share/emacs/%%EMACS_VERSION%%/etc/ORDERS
-share/emacs/%%EMACS_VERSION%%/etc/ORDERS.EUROPE
-share/emacs/%%EMACS_VERSION%%/etc/ORDERS.JAPAN
-share/emacs/%%EMACS_VERSION%%/etc/OTHER.EMACSES
-share/emacs/%%EMACS_VERSION%%/etc/README
-share/emacs/%%EMACS_VERSION%%/etc/SERVICE
-share/emacs/%%EMACS_VERSION%%/etc/SUN-SUPPORT
-share/emacs/%%EMACS_VERSION%%/etc/TERMS
-share/emacs/%%EMACS_VERSION%%/etc/TODO
-share/emacs/%%EMACS_VERSION%%/etc/TUTORIAL
-share/emacs/%%EMACS_VERSION%%/etc/WHY-FREE
-share/emacs/%%EMACS_VERSION%%/etc/Xkeymap.txt
-share/emacs/%%EMACS_VERSION%%/etc/celibacy.1
-share/emacs/%%EMACS_VERSION%%/etc/condom.1
-share/emacs/%%EMACS_VERSION%%/etc/copying.paper
-share/emacs/%%EMACS_VERSION%%/etc/ctags.1
-share/emacs/%%EMACS_VERSION%%/etc/e/eterm
-share/emacs/%%EMACS_VERSION%%/etc/e/eterm.ti
-share/emacs/%%EMACS_VERSION%%/etc/echo.msg
-share/emacs/%%EMACS_VERSION%%/etc/edt-user.doc
-share/emacs/%%EMACS_VERSION%%/etc/emacs.1
-share/emacs/%%EMACS_VERSION%%/etc/emacs.bash
-share/emacs/%%EMACS_VERSION%%/etc/emacs.csh
-share/emacs/%%EMACS_VERSION%%/etc/emacs.icon
-share/emacs/%%EMACS_VERSION%%/etc/emacs.xbm
-share/emacs/%%EMACS_VERSION%%/etc/emacstool.1
-share/emacs/%%EMACS_VERSION%%/etc/enriched.doc
-share/emacs/%%EMACS_VERSION%%/etc/etags.1
-share/emacs/%%EMACS_VERSION%%/etc/future-bug
-share/emacs/%%EMACS_VERSION%%/etc/gnu.xpm
-share/emacs/%%EMACS_VERSION%%/etc/gnus-tut.txt
-share/emacs/%%EMACS_VERSION%%/etc/ledit.l
-share/emacs/%%EMACS_VERSION%%/etc/ms-7bkermit
-share/emacs/%%EMACS_VERSION%%/etc/ms-kermit
-share/emacs/%%EMACS_VERSION%%/etc/news.texi
-share/emacs/%%EMACS_VERSION%%/etc/refcard.bit
-share/emacs/%%EMACS_VERSION%%/etc/refcard.ps
-share/emacs/%%EMACS_VERSION%%/etc/refcard.tex
-share/emacs/%%EMACS_VERSION%%/etc/rgb.txt
-share/emacs/%%EMACS_VERSION%%/etc/sex.6
-share/emacs/%%EMACS_VERSION%%/etc/spook.lines
-share/emacs/%%EMACS_VERSION%%/etc/termcap.src
-share/emacs/%%EMACS_VERSION%%/etc/ulimit.hack
-share/emacs/%%EMACS_VERSION%%/etc/vipcard.tex
-share/emacs/%%EMACS_VERSION%%/etc/viperCard.tex
-share/emacs/%%EMACS_VERSION%%/etc/yow.lines
-share/emacs/%%EMACS_VERSION%%/lisp/COPYING
-share/emacs/%%EMACS_VERSION%%/lisp/README
-share/emacs/%%EMACS_VERSION%%/lisp/abbrev.el
-share/emacs/%%EMACS_VERSION%%/lisp/abbrev.elc
-share/emacs/%%EMACS_VERSION%%/lisp/abbrevlist.el
-share/emacs/%%EMACS_VERSION%%/lisp/abbrevlist.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ada-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/ada-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/add-log.el
-share/emacs/%%EMACS_VERSION%%/lisp/add-log.elc
-share/emacs/%%EMACS_VERSION%%/lisp/advice.el
-share/emacs/%%EMACS_VERSION%%/lisp/advice.elc
-share/emacs/%%EMACS_VERSION%%/lisp/allout.el
-share/emacs/%%EMACS_VERSION%%/lisp/allout.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ange-ftp.el
-share/emacs/%%EMACS_VERSION%%/lisp/ange-ftp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/appt.el
-share/emacs/%%EMACS_VERSION%%/lisp/appt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/apropos.el
-share/emacs/%%EMACS_VERSION%%/lisp/apropos.elc
-share/emacs/%%EMACS_VERSION%%/lisp/arc-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/arc-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/array.el
-share/emacs/%%EMACS_VERSION%%/lisp/array.elc
-share/emacs/%%EMACS_VERSION%%/lisp/asm-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/asm-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/assoc.el
-share/emacs/%%EMACS_VERSION%%/lisp/assoc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/auto-show.el
-share/emacs/%%EMACS_VERSION%%/lisp/auto-show.elc
-share/emacs/%%EMACS_VERSION%%/lisp/autoinsert.el
-share/emacs/%%EMACS_VERSION%%/lisp/autoinsert.elc
-share/emacs/%%EMACS_VERSION%%/lisp/autoload.el
-share/emacs/%%EMACS_VERSION%%/lisp/autoload.elc
-share/emacs/%%EMACS_VERSION%%/lisp/avoid.el
-share/emacs/%%EMACS_VERSION%%/lisp/avoid.elc
-share/emacs/%%EMACS_VERSION%%/lisp/awk-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/awk-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/backquote.el
-share/emacs/%%EMACS_VERSION%%/lisp/backquote.elc
-share/emacs/%%EMACS_VERSION%%/lisp/bib-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/bib-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/bibtex.el
-share/emacs/%%EMACS_VERSION%%/lisp/bibtex.elc
-share/emacs/%%EMACS_VERSION%%/lisp/blackbox.el
-share/emacs/%%EMACS_VERSION%%/lisp/blackbox.elc
-share/emacs/%%EMACS_VERSION%%/lisp/blessmail.el
-share/emacs/%%EMACS_VERSION%%/lisp/bookmark.el
-share/emacs/%%EMACS_VERSION%%/lisp/bookmark.elc
-share/emacs/%%EMACS_VERSION%%/lisp/browse-url.el
-share/emacs/%%EMACS_VERSION%%/lisp/browse-url.elc
-share/emacs/%%EMACS_VERSION%%/lisp/buff-menu.el
-share/emacs/%%EMACS_VERSION%%/lisp/buff-menu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/byte-opt.el
-share/emacs/%%EMACS_VERSION%%/lisp/byte-opt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/byte-run.el
-share/emacs/%%EMACS_VERSION%%/lisp/byte-run.elc
-share/emacs/%%EMACS_VERSION%%/lisp/bytecomp.el
-share/emacs/%%EMACS_VERSION%%/lisp/bytecomp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/c-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/c-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-china.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-china.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-coptic.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-coptic.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-dst.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-dst.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-french.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-french.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-hebrew.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-hebrew.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-islam.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-islam.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-iso.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-iso.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-julian.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-julian.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-mayan.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-mayan.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-menu.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-menu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-move.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-move.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-persia.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-persia.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-tex.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-tex.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-x.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-x.elc
-share/emacs/%%EMACS_VERSION%%/lisp/calendar.el
-share/emacs/%%EMACS_VERSION%%/lisp/calendar.elc
-share/emacs/%%EMACS_VERSION%%/lisp/case-table.el
-share/emacs/%%EMACS_VERSION%%/lisp/case-table.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cc-compat.el
-share/emacs/%%EMACS_VERSION%%/lisp/cc-compat.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cc-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/cc-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cdl.el
-share/emacs/%%EMACS_VERSION%%/lisp/cdl.elc
-share/emacs/%%EMACS_VERSION%%/lisp/chistory.el
-share/emacs/%%EMACS_VERSION%%/lisp/chistory.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cl-compat.el
-share/emacs/%%EMACS_VERSION%%/lisp/cl-compat.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cl-extra.el
-share/emacs/%%EMACS_VERSION%%/lisp/cl-extra.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cl-indent.el
-share/emacs/%%EMACS_VERSION%%/lisp/cl-indent.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cl-macs.el
-share/emacs/%%EMACS_VERSION%%/lisp/cl-macs.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cl-seq.el
-share/emacs/%%EMACS_VERSION%%/lisp/cl-seq.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cl-specs.el
-share/emacs/%%EMACS_VERSION%%/lisp/cl-specs.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cl.el
-share/emacs/%%EMACS_VERSION%%/lisp/cl.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cmacexp.el
-share/emacs/%%EMACS_VERSION%%/lisp/cmacexp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cmuscheme.el
-share/emacs/%%EMACS_VERSION%%/lisp/cmuscheme.elc
-share/emacs/%%EMACS_VERSION%%/lisp/comint.el
-share/emacs/%%EMACS_VERSION%%/lisp/comint.elc
-share/emacs/%%EMACS_VERSION%%/lisp/compare-w.el
-share/emacs/%%EMACS_VERSION%%/lisp/compare-w.elc
-share/emacs/%%EMACS_VERSION%%/lisp/compile.el
-share/emacs/%%EMACS_VERSION%%/lisp/compile.elc
-share/emacs/%%EMACS_VERSION%%/lisp/complete.el
-share/emacs/%%EMACS_VERSION%%/lisp/complete.elc
-share/emacs/%%EMACS_VERSION%%/lisp/completion.el
-share/emacs/%%EMACS_VERSION%%/lisp/completion.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cookie1.el
-share/emacs/%%EMACS_VERSION%%/lisp/cookie1.elc
-share/emacs/%%EMACS_VERSION%%/lisp/copyright.el
-share/emacs/%%EMACS_VERSION%%/lisp/copyright.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cplus-md.el
-share/emacs/%%EMACS_VERSION%%/lisp/cplus-md.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cpp.el
-share/emacs/%%EMACS_VERSION%%/lisp/cpp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cust-print.el
-share/emacs/%%EMACS_VERSION%%/lisp/cust-print.elc
-share/emacs/%%EMACS_VERSION%%/lisp/custom.el
-share/emacs/%%EMACS_VERSION%%/lisp/custom.elc
-share/emacs/%%EMACS_VERSION%%/lisp/dabbrev.el
-share/emacs/%%EMACS_VERSION%%/lisp/dabbrev.elc
-share/emacs/%%EMACS_VERSION%%/lisp/debug.el
-share/emacs/%%EMACS_VERSION%%/lisp/debug.elc
-share/emacs/%%EMACS_VERSION%%/lisp/decipher.el
-share/emacs/%%EMACS_VERSION%%/lisp/decipher.elc
-share/emacs/%%EMACS_VERSION%%/lisp/delsel.el
-share/emacs/%%EMACS_VERSION%%/lisp/delsel.elc
-share/emacs/%%EMACS_VERSION%%/lisp/derived.el
-share/emacs/%%EMACS_VERSION%%/lisp/derived.elc
-share/emacs/%%EMACS_VERSION%%/lisp/desktop.el
-share/emacs/%%EMACS_VERSION%%/lisp/desktop.elc
-share/emacs/%%EMACS_VERSION%%/lisp/diary-lib.el
-share/emacs/%%EMACS_VERSION%%/lisp/diary-lib.elc
-share/emacs/%%EMACS_VERSION%%/lisp/diff.el
-share/emacs/%%EMACS_VERSION%%/lisp/diff.elc
-share/emacs/%%EMACS_VERSION%%/lisp/dired-aux.el
-share/emacs/%%EMACS_VERSION%%/lisp/dired-aux.elc
-share/emacs/%%EMACS_VERSION%%/lisp/dired-x.el
-share/emacs/%%EMACS_VERSION%%/lisp/dired-x.elc
-share/emacs/%%EMACS_VERSION%%/lisp/dired.el
-share/emacs/%%EMACS_VERSION%%/lisp/dired.elc
-share/emacs/%%EMACS_VERSION%%/lisp/disass.el
-share/emacs/%%EMACS_VERSION%%/lisp/disass.elc
-share/emacs/%%EMACS_VERSION%%/lisp/disp-table.el
-share/emacs/%%EMACS_VERSION%%/lisp/disp-table.elc
-share/emacs/%%EMACS_VERSION%%/lisp/dissociate.el
-share/emacs/%%EMACS_VERSION%%/lisp/dissociate.elc
-share/emacs/%%EMACS_VERSION%%/lisp/docref.el
-share/emacs/%%EMACS_VERSION%%/lisp/docref.elc
-share/emacs/%%EMACS_VERSION%%/lisp/doctor.el
-share/emacs/%%EMACS_VERSION%%/lisp/doctor.elc
-share/emacs/%%EMACS_VERSION%%/lisp/dos-fns.el
-share/emacs/%%EMACS_VERSION%%/lisp/dos-fns.elc
-share/emacs/%%EMACS_VERSION%%/lisp/double.el
-share/emacs/%%EMACS_VERSION%%/lisp/double.elc
-share/emacs/%%EMACS_VERSION%%/lisp/dunnet.el
-share/emacs/%%EMACS_VERSION%%/lisp/dunnet.elc
-share/emacs/%%EMACS_VERSION%%/lisp/easymenu.el
-share/emacs/%%EMACS_VERSION%%/lisp/easymenu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ebuff-menu.el
-share/emacs/%%EMACS_VERSION%%/lisp/ebuff-menu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/echistory.el
-share/emacs/%%EMACS_VERSION%%/lisp/echistory.elc
-share/emacs/%%EMACS_VERSION%%/lisp/edebug.el
-share/emacs/%%EMACS_VERSION%%/lisp/edebug.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-diff.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-diff.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-hook.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-hook.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-init.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-init.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-merg.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-merg.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-mult.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-mult.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-ptch.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-ptch.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-util.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-util.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-vers.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-vers.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-wind.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-wind.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff.elc
-share/emacs/%%EMACS_VERSION%%/lisp/edmacro.el
-share/emacs/%%EMACS_VERSION%%/lisp/edmacro.elc
-share/emacs/%%EMACS_VERSION%%/lisp/edt-lk201.el
-share/emacs/%%EMACS_VERSION%%/lisp/edt-lk201.elc
-share/emacs/%%EMACS_VERSION%%/lisp/edt-mapper.el
-share/emacs/%%EMACS_VERSION%%/lisp/edt-mapper.elc
-share/emacs/%%EMACS_VERSION%%/lisp/edt-pc.el
-share/emacs/%%EMACS_VERSION%%/lisp/edt-pc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/edt-vt100.el
-share/emacs/%%EMACS_VERSION%%/lisp/edt-vt100.elc
-share/emacs/%%EMACS_VERSION%%/lisp/edt.el
-share/emacs/%%EMACS_VERSION%%/lisp/edt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ehelp.el
-share/emacs/%%EMACS_VERSION%%/lisp/ehelp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/electric.el
-share/emacs/%%EMACS_VERSION%%/lisp/electric.elc
-share/emacs/%%EMACS_VERSION%%/lisp/elp.el
-share/emacs/%%EMACS_VERSION%%/lisp/elp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/emacs-lock.el
-share/emacs/%%EMACS_VERSION%%/lisp/emacs-lock.elc
-share/emacs/%%EMACS_VERSION%%/lisp/emacsbug.el
-share/emacs/%%EMACS_VERSION%%/lisp/emacsbug.elc
-share/emacs/%%EMACS_VERSION%%/lisp/emerge.el
-share/emacs/%%EMACS_VERSION%%/lisp/emerge.elc
-share/emacs/%%EMACS_VERSION%%/lisp/enriched.el
-share/emacs/%%EMACS_VERSION%%/lisp/enriched.elc
-share/emacs/%%EMACS_VERSION%%/lisp/env.el
-share/emacs/%%EMACS_VERSION%%/lisp/env.elc
-share/emacs/%%EMACS_VERSION%%/lisp/etags.el
-share/emacs/%%EMACS_VERSION%%/lisp/etags.elc
-share/emacs/%%EMACS_VERSION%%/lisp/eval-reg.el
-share/emacs/%%EMACS_VERSION%%/lisp/eval-reg.elc
-share/emacs/%%EMACS_VERSION%%/lisp/executable.el
-share/emacs/%%EMACS_VERSION%%/lisp/executable.elc
-share/emacs/%%EMACS_VERSION%%/lisp/f90.el
-share/emacs/%%EMACS_VERSION%%/lisp/f90.elc
-share/emacs/%%EMACS_VERSION%%/lisp/facemenu.el
-share/emacs/%%EMACS_VERSION%%/lisp/facemenu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/faces.el
-share/emacs/%%EMACS_VERSION%%/lisp/faces.elc
-share/emacs/%%EMACS_VERSION%%/lisp/fast-lock.el
-share/emacs/%%EMACS_VERSION%%/lisp/fast-lock.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ffap.el
-share/emacs/%%EMACS_VERSION%%/lisp/ffap.elc
-share/emacs/%%EMACS_VERSION%%/lisp/files.el
-share/emacs/%%EMACS_VERSION%%/lisp/files.elc
-share/emacs/%%EMACS_VERSION%%/lisp/fill.el
-share/emacs/%%EMACS_VERSION%%/lisp/fill.elc
-share/emacs/%%EMACS_VERSION%%/lisp/find-dired.el
-share/emacs/%%EMACS_VERSION%%/lisp/find-dired.elc
-share/emacs/%%EMACS_VERSION%%/lisp/find-file.el
-share/emacs/%%EMACS_VERSION%%/lisp/find-file.elc
-share/emacs/%%EMACS_VERSION%%/lisp/find-gc.el
-share/emacs/%%EMACS_VERSION%%/lisp/find-gc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/finder-inf.el
-share/emacs/%%EMACS_VERSION%%/lisp/finder-inf.elc
-share/emacs/%%EMACS_VERSION%%/lisp/finder.el
-share/emacs/%%EMACS_VERSION%%/lisp/finder.elc
-share/emacs/%%EMACS_VERSION%%/lisp/float-sup.el
-share/emacs/%%EMACS_VERSION%%/lisp/float-sup.elc
-share/emacs/%%EMACS_VERSION%%/lisp/float.el
-share/emacs/%%EMACS_VERSION%%/lisp/float.elc
-share/emacs/%%EMACS_VERSION%%/lisp/flow-ctrl.el
-share/emacs/%%EMACS_VERSION%%/lisp/flow-ctrl.elc
-share/emacs/%%EMACS_VERSION%%/lisp/foldout.el
-share/emacs/%%EMACS_VERSION%%/lisp/foldout.elc
-share/emacs/%%EMACS_VERSION%%/lisp/follow.el
-share/emacs/%%EMACS_VERSION%%/lisp/follow.elc
-share/emacs/%%EMACS_VERSION%%/lisp/font-lock.el
-share/emacs/%%EMACS_VERSION%%/lisp/font-lock.elc
-share/emacs/%%EMACS_VERSION%%/lisp/format.el
-share/emacs/%%EMACS_VERSION%%/lisp/format.elc
-share/emacs/%%EMACS_VERSION%%/lisp/forms-d2.dat
-share/emacs/%%EMACS_VERSION%%/lisp/forms-d2.el
-share/emacs/%%EMACS_VERSION%%/lisp/forms-pass.el
-share/emacs/%%EMACS_VERSION%%/lisp/forms.el
-share/emacs/%%EMACS_VERSION%%/lisp/forms.elc
-share/emacs/%%EMACS_VERSION%%/lisp/fortran.el
-share/emacs/%%EMACS_VERSION%%/lisp/fortran.elc
-share/emacs/%%EMACS_VERSION%%/lisp/frame.el
-share/emacs/%%EMACS_VERSION%%/lisp/frame.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-cache.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-cache.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-cite.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-cite.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-cus.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-cus.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-demon.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-demon.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-edit.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-edit.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-ems.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-ems.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-gl.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-gl.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-kill.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-kill.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-mh.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-mh.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-msg.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-msg.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-nocem.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-nocem.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-salt.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-salt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-score.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-score.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-setup.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-setup.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-soup.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-soup.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-srvr.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-srvr.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-topic.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-topic.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-uu.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-uu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-vis.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-vis.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-vm.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-vm.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gomoku.el
-share/emacs/%%EMACS_VERSION%%/lisp/gomoku.elc
-share/emacs/%%EMACS_VERSION%%/lisp/goto-addr.el
-share/emacs/%%EMACS_VERSION%%/lisp/goto-addr.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gud.el
-share/emacs/%%EMACS_VERSION%%/lisp/gud.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gulp.el
-share/emacs/%%EMACS_VERSION%%/lisp/gulp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/hanoi.el
-share/emacs/%%EMACS_VERSION%%/lisp/hanoi.elc
-share/emacs/%%EMACS_VERSION%%/lisp/help-macro.el
-share/emacs/%%EMACS_VERSION%%/lisp/help-macro.elc
-share/emacs/%%EMACS_VERSION%%/lisp/help.el
-share/emacs/%%EMACS_VERSION%%/lisp/help.elc
-share/emacs/%%EMACS_VERSION%%/lisp/helper.el
-share/emacs/%%EMACS_VERSION%%/lisp/helper.elc
-share/emacs/%%EMACS_VERSION%%/lisp/hexl.el
-share/emacs/%%EMACS_VERSION%%/lisp/hexl.elc
-share/emacs/%%EMACS_VERSION%%/lisp/hideif.el
-share/emacs/%%EMACS_VERSION%%/lisp/hideif.elc
-share/emacs/%%EMACS_VERSION%%/lisp/hideshow.el
-share/emacs/%%EMACS_VERSION%%/lisp/hideshow.elc
-share/emacs/%%EMACS_VERSION%%/lisp/hilit19.el
-share/emacs/%%EMACS_VERSION%%/lisp/hilit19.elc
-share/emacs/%%EMACS_VERSION%%/lisp/hippie-exp.el
-share/emacs/%%EMACS_VERSION%%/lisp/hippie-exp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/holidays.el
-share/emacs/%%EMACS_VERSION%%/lisp/holidays.elc
-share/emacs/%%EMACS_VERSION%%/lisp/icomplete.el
-share/emacs/%%EMACS_VERSION%%/lisp/icomplete.elc
-share/emacs/%%EMACS_VERSION%%/lisp/icon.el
-share/emacs/%%EMACS_VERSION%%/lisp/icon.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ielm.el
-share/emacs/%%EMACS_VERSION%%/lisp/ielm.elc
-share/emacs/%%EMACS_VERSION%%/lisp/imenu.el
-share/emacs/%%EMACS_VERSION%%/lisp/imenu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/indent.el
-share/emacs/%%EMACS_VERSION%%/lisp/indent.elc
-share/emacs/%%EMACS_VERSION%%/lisp/inf-lisp.el
-share/emacs/%%EMACS_VERSION%%/lisp/inf-lisp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/info.el
-share/emacs/%%EMACS_VERSION%%/lisp/info.elc
-share/emacs/%%EMACS_VERSION%%/lisp/informat.el
-share/emacs/%%EMACS_VERSION%%/lisp/informat.elc
-share/emacs/%%EMACS_VERSION%%/lisp/isearch.el
-share/emacs/%%EMACS_VERSION%%/lisp/isearch.elc
-share/emacs/%%EMACS_VERSION%%/lisp/iso-acc.el
-share/emacs/%%EMACS_VERSION%%/lisp/iso-acc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/iso-ascii.el
-share/emacs/%%EMACS_VERSION%%/lisp/iso-ascii.elc
-share/emacs/%%EMACS_VERSION%%/lisp/iso-cvt.el
-share/emacs/%%EMACS_VERSION%%/lisp/iso-cvt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/iso-insert.el
-share/emacs/%%EMACS_VERSION%%/lisp/iso-insert.elc
-share/emacs/%%EMACS_VERSION%%/lisp/iso-swed.el
-share/emacs/%%EMACS_VERSION%%/lisp/iso-swed.elc
-share/emacs/%%EMACS_VERSION%%/lisp/iso-syntax.el
-share/emacs/%%EMACS_VERSION%%/lisp/iso-syntax.elc
-share/emacs/%%EMACS_VERSION%%/lisp/iso-transl.el
-share/emacs/%%EMACS_VERSION%%/lisp/iso-transl.elc
-share/emacs/%%EMACS_VERSION%%/lisp/iso02-syn.el
-share/emacs/%%EMACS_VERSION%%/lisp/iso02-syn.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ispell.el
-share/emacs/%%EMACS_VERSION%%/lisp/ispell.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ispell4.el
-share/emacs/%%EMACS_VERSION%%/lisp/ispell4.elc
-share/emacs/%%EMACS_VERSION%%/lisp/jka-compr.el
-share/emacs/%%EMACS_VERSION%%/lisp/jka-compr.elc
-share/emacs/%%EMACS_VERSION%%/lisp/kermit.el
-share/emacs/%%EMACS_VERSION%%/lisp/kermit.elc
-share/emacs/%%EMACS_VERSION%%/lisp/lazy-lock.el
-share/emacs/%%EMACS_VERSION%%/lisp/lazy-lock.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ledit.el
-share/emacs/%%EMACS_VERSION%%/lisp/ledit.elc
-share/emacs/%%EMACS_VERSION%%/lisp/levents.el
-share/emacs/%%EMACS_VERSION%%/lisp/levents.elc
-share/emacs/%%EMACS_VERSION%%/lisp/life.el
-share/emacs/%%EMACS_VERSION%%/lisp/life.elc
-share/emacs/%%EMACS_VERSION%%/lisp/lisp-mnt.el
-share/emacs/%%EMACS_VERSION%%/lisp/lisp-mnt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/lisp-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/lisp-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/lisp.el
-share/emacs/%%EMACS_VERSION%%/lisp/lisp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/lmenu.el
-share/emacs/%%EMACS_VERSION%%/lisp/lmenu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/loaddefs.el
-share/emacs/%%EMACS_VERSION%%/lisp/loadhist.el
-share/emacs/%%EMACS_VERSION%%/lisp/loadhist.elc
-share/emacs/%%EMACS_VERSION%%/lisp/loadup.el
-share/emacs/%%EMACS_VERSION%%/lisp/lpr.el
-share/emacs/%%EMACS_VERSION%%/lisp/lpr.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ls-lisp.el
-share/emacs/%%EMACS_VERSION%%/lisp/ls-lisp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/lselect.el
-share/emacs/%%EMACS_VERSION%%/lisp/lselect.elc
-share/emacs/%%EMACS_VERSION%%/lisp/lucid.el
-share/emacs/%%EMACS_VERSION%%/lisp/lucid.elc
-share/emacs/%%EMACS_VERSION%%/lisp/lunar.el
-share/emacs/%%EMACS_VERSION%%/lisp/lunar.elc
-share/emacs/%%EMACS_VERSION%%/lisp/macros.el
-share/emacs/%%EMACS_VERSION%%/lisp/macros.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mail-extr.el
-share/emacs/%%EMACS_VERSION%%/lisp/mail-extr.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mail-hist.el
-share/emacs/%%EMACS_VERSION%%/lisp/mail-hist.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mail-utils.el
-share/emacs/%%EMACS_VERSION%%/lisp/mail-utils.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mailabbrev.el
-share/emacs/%%EMACS_VERSION%%/lisp/mailabbrev.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mailalias.el
-share/emacs/%%EMACS_VERSION%%/lisp/mailalias.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mailheader.el
-share/emacs/%%EMACS_VERSION%%/lisp/mailheader.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mailpost.el
-share/emacs/%%EMACS_VERSION%%/lisp/mailpost.elc
-share/emacs/%%EMACS_VERSION%%/lisp/make-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/make-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/makeinfo.el
-share/emacs/%%EMACS_VERSION%%/lisp/makeinfo.elc
-share/emacs/%%EMACS_VERSION%%/lisp/makesum.el
-share/emacs/%%EMACS_VERSION%%/lisp/makesum.elc
-share/emacs/%%EMACS_VERSION%%/lisp/man.el
-share/emacs/%%EMACS_VERSION%%/lisp/man.elc
-share/emacs/%%EMACS_VERSION%%/lisp/map-ynp.el
-share/emacs/%%EMACS_VERSION%%/lisp/map-ynp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/meese.el
-share/emacs/%%EMACS_VERSION%%/lisp/meese.elc
-share/emacs/%%EMACS_VERSION%%/lisp/menu-bar.el
-share/emacs/%%EMACS_VERSION%%/lisp/menu-bar.elc
-share/emacs/%%EMACS_VERSION%%/lisp/message.el
-share/emacs/%%EMACS_VERSION%%/lisp/message.elc
-share/emacs/%%EMACS_VERSION%%/lisp/metamail.el
-share/emacs/%%EMACS_VERSION%%/lisp/metamail.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mh-comp.el
-share/emacs/%%EMACS_VERSION%%/lisp/mh-comp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mh-e.el
-share/emacs/%%EMACS_VERSION%%/lisp/mh-e.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mh-funcs.el
-share/emacs/%%EMACS_VERSION%%/lisp/mh-funcs.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mh-mime.el
-share/emacs/%%EMACS_VERSION%%/lisp/mh-mime.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mh-pick.el
-share/emacs/%%EMACS_VERSION%%/lisp/mh-pick.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mh-seq.el
-share/emacs/%%EMACS_VERSION%%/lisp/mh-seq.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mh-utils.el
-share/emacs/%%EMACS_VERSION%%/lisp/mh-utils.elc
-share/emacs/%%EMACS_VERSION%%/lisp/misc.el
-share/emacs/%%EMACS_VERSION%%/lisp/misc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mlconvert.el
-share/emacs/%%EMACS_VERSION%%/lisp/mlconvert.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mldrag.el
-share/emacs/%%EMACS_VERSION%%/lisp/mldrag.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mlsupport.el
-share/emacs/%%EMACS_VERSION%%/lisp/mlsupport.elc
-share/emacs/%%EMACS_VERSION%%/lisp/modula2.el
-share/emacs/%%EMACS_VERSION%%/lisp/modula2.elc
-share/emacs/%%EMACS_VERSION%%/lisp/morse.el
-share/emacs/%%EMACS_VERSION%%/lisp/morse.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mouse-sel.el
-share/emacs/%%EMACS_VERSION%%/lisp/mouse-sel.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mouse.el
-share/emacs/%%EMACS_VERSION%%/lisp/mouse.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mpuz.el
-share/emacs/%%EMACS_VERSION%%/lisp/mpuz.elc
-share/emacs/%%EMACS_VERSION%%/lisp/msb.el
-share/emacs/%%EMACS_VERSION%%/lisp/msb.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnbabyl.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnbabyl.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nndb.el
-share/emacs/%%EMACS_VERSION%%/lisp/nndb.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nndir.el
-share/emacs/%%EMACS_VERSION%%/lisp/nndir.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nndoc.el
-share/emacs/%%EMACS_VERSION%%/lisp/nndoc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nneething.el
-share/emacs/%%EMACS_VERSION%%/lisp/nneething.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnfolder.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnfolder.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnheader.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnheader.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnkiboze.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnkiboze.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnmail.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnmail.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnmbox.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnmbox.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnmh.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnmh.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnml.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnml.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnoo.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnoo.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnsoup.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnsoup.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnspool.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnspool.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nntp.el
-share/emacs/%%EMACS_VERSION%%/lisp/nntp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnvirtual.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnvirtual.elc
-share/emacs/%%EMACS_VERSION%%/lisp/noutline.el
-share/emacs/%%EMACS_VERSION%%/lisp/noutline.elc
-share/emacs/%%EMACS_VERSION%%/lisp/novice.el
-share/emacs/%%EMACS_VERSION%%/lisp/novice.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nroff-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/nroff-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/options.el
-share/emacs/%%EMACS_VERSION%%/lisp/options.elc
-share/emacs/%%EMACS_VERSION%%/lisp/outline.el
-share/emacs/%%EMACS_VERSION%%/lisp/outline.elc
-share/emacs/%%EMACS_VERSION%%/lisp/page-ext.el
-share/emacs/%%EMACS_VERSION%%/lisp/page-ext.elc
-share/emacs/%%EMACS_VERSION%%/lisp/page.el
-share/emacs/%%EMACS_VERSION%%/lisp/page.elc
-share/emacs/%%EMACS_VERSION%%/lisp/paragraphs.el
-share/emacs/%%EMACS_VERSION%%/lisp/paragraphs.elc
-share/emacs/%%EMACS_VERSION%%/lisp/paren.el
-share/emacs/%%EMACS_VERSION%%/lisp/paren.elc
-share/emacs/%%EMACS_VERSION%%/lisp/pascal.el
-share/emacs/%%EMACS_VERSION%%/lisp/pascal.elc
-share/emacs/%%EMACS_VERSION%%/lisp/patcomp.el
-share/emacs/%%EMACS_VERSION%%/lisp/paths.el
-share/emacs/%%EMACS_VERSION%%/lisp/pc-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/pc-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/pc-select.el
-share/emacs/%%EMACS_VERSION%%/lisp/pc-select.elc
-share/emacs/%%EMACS_VERSION%%/lisp/perl-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/perl-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/picture.el
-share/emacs/%%EMACS_VERSION%%/lisp/picture.elc
-share/emacs/%%EMACS_VERSION%%/lisp/pp.el
-share/emacs/%%EMACS_VERSION%%/lisp/pp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/profile.el
-share/emacs/%%EMACS_VERSION%%/lisp/profile.elc
-share/emacs/%%EMACS_VERSION%%/lisp/prolog.el
-share/emacs/%%EMACS_VERSION%%/lisp/prolog.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ps-print.el
-share/emacs/%%EMACS_VERSION%%/lisp/ps-print.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rcompile.el
-share/emacs/%%EMACS_VERSION%%/lisp/rcompile.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rect.el
-share/emacs/%%EMACS_VERSION%%/lisp/rect.elc
-share/emacs/%%EMACS_VERSION%%/lisp/refbib.el
-share/emacs/%%EMACS_VERSION%%/lisp/refbib.elc
-share/emacs/%%EMACS_VERSION%%/lisp/refer.el
-share/emacs/%%EMACS_VERSION%%/lisp/refer.elc
-share/emacs/%%EMACS_VERSION%%/lisp/regi.el
-share/emacs/%%EMACS_VERSION%%/lisp/regi.elc
-share/emacs/%%EMACS_VERSION%%/lisp/register.el
-share/emacs/%%EMACS_VERSION%%/lisp/register.elc
-share/emacs/%%EMACS_VERSION%%/lisp/replace.el
-share/emacs/%%EMACS_VERSION%%/lisp/replace.elc
-share/emacs/%%EMACS_VERSION%%/lisp/reporter.el
-share/emacs/%%EMACS_VERSION%%/lisp/reporter.elc
-share/emacs/%%EMACS_VERSION%%/lisp/reposition.el
-share/emacs/%%EMACS_VERSION%%/lisp/reposition.elc
-share/emacs/%%EMACS_VERSION%%/lisp/resume.el
-share/emacs/%%EMACS_VERSION%%/lisp/resume.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rfc822.el
-share/emacs/%%EMACS_VERSION%%/lisp/rfc822.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ring.el
-share/emacs/%%EMACS_VERSION%%/lisp/ring.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rlogin.el
-share/emacs/%%EMACS_VERSION%%/lisp/rlogin.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rmail.el
-share/emacs/%%EMACS_VERSION%%/lisp/rmail.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rmailedit.el
-share/emacs/%%EMACS_VERSION%%/lisp/rmailedit.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rmailkwd.el
-share/emacs/%%EMACS_VERSION%%/lisp/rmailkwd.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rmailmsc.el
-share/emacs/%%EMACS_VERSION%%/lisp/rmailmsc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rmailout.el
-share/emacs/%%EMACS_VERSION%%/lisp/rmailout.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rmailsort.el
-share/emacs/%%EMACS_VERSION%%/lisp/rmailsort.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rmailsum.el
-share/emacs/%%EMACS_VERSION%%/lisp/rmailsum.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rnews.el
-share/emacs/%%EMACS_VERSION%%/lisp/rnews.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rnewspost.el
-share/emacs/%%EMACS_VERSION%%/lisp/rnewspost.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rot13.el
-share/emacs/%%EMACS_VERSION%%/lisp/rot13.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rsz-mini.el
-share/emacs/%%EMACS_VERSION%%/lisp/rsz-mini.elc
-share/emacs/%%EMACS_VERSION%%/lisp/s-region.el
-share/emacs/%%EMACS_VERSION%%/lisp/s-region.elc
-share/emacs/%%EMACS_VERSION%%/lisp/saveplace.el
-share/emacs/%%EMACS_VERSION%%/lisp/saveplace.elc
-share/emacs/%%EMACS_VERSION%%/lisp/sc.el
-share/emacs/%%EMACS_VERSION%%/lisp/scheme.el
-share/emacs/%%EMACS_VERSION%%/lisp/scheme.elc
-share/emacs/%%EMACS_VERSION%%/lisp/score-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/score-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/scribe.el
-share/emacs/%%EMACS_VERSION%%/lisp/scribe.elc
-share/emacs/%%EMACS_VERSION%%/lisp/scroll-bar.el
-share/emacs/%%EMACS_VERSION%%/lisp/scroll-bar.elc
-share/emacs/%%EMACS_VERSION%%/lisp/select.el
-share/emacs/%%EMACS_VERSION%%/lisp/select.elc
-share/emacs/%%EMACS_VERSION%%/lisp/sendmail.el
-share/emacs/%%EMACS_VERSION%%/lisp/sendmail.elc
-share/emacs/%%EMACS_VERSION%%/lisp/server.el
-share/emacs/%%EMACS_VERSION%%/lisp/server.elc
-share/emacs/%%EMACS_VERSION%%/lisp/sgml-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/sgml-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/sh-script.el
-share/emacs/%%EMACS_VERSION%%/lisp/sh-script.elc
-share/emacs/%%EMACS_VERSION%%/lisp/shadow.el
-share/emacs/%%EMACS_VERSION%%/lisp/shadow.elc
-share/emacs/%%EMACS_VERSION%%/lisp/shadowfile.el
-share/emacs/%%EMACS_VERSION%%/lisp/shadowfile.elc
-share/emacs/%%EMACS_VERSION%%/lisp/shell.el
-share/emacs/%%EMACS_VERSION%%/lisp/shell.elc
-share/emacs/%%EMACS_VERSION%%/lisp/simple.el
-share/emacs/%%EMACS_VERSION%%/lisp/simple.elc
-share/emacs/%%EMACS_VERSION%%/lisp/simula.el
-share/emacs/%%EMACS_VERSION%%/lisp/simula.elc
-share/emacs/%%EMACS_VERSION%%/lisp/skeleton.el
-share/emacs/%%EMACS_VERSION%%/lisp/skeleton.elc
-share/emacs/%%EMACS_VERSION%%/lisp/smtpmail.el
-share/emacs/%%EMACS_VERSION%%/lisp/smtpmail.elc
-share/emacs/%%EMACS_VERSION%%/lisp/solar.el
-share/emacs/%%EMACS_VERSION%%/lisp/solar.elc
-share/emacs/%%EMACS_VERSION%%/lisp/solitaire.el
-share/emacs/%%EMACS_VERSION%%/lisp/solitaire.elc
-share/emacs/%%EMACS_VERSION%%/lisp/sort.el
-share/emacs/%%EMACS_VERSION%%/lisp/sort.elc
-share/emacs/%%EMACS_VERSION%%/lisp/soundex.el
-share/emacs/%%EMACS_VERSION%%/lisp/soundex.elc
-share/emacs/%%EMACS_VERSION%%/lisp/spell.el
-share/emacs/%%EMACS_VERSION%%/lisp/spell.elc
-share/emacs/%%EMACS_VERSION%%/lisp/spook.el
-share/emacs/%%EMACS_VERSION%%/lisp/spook.elc
-share/emacs/%%EMACS_VERSION%%/lisp/startup.el
-share/emacs/%%EMACS_VERSION%%/lisp/startup.elc
-share/emacs/%%EMACS_VERSION%%/lisp/studly.el
-share/emacs/%%EMACS_VERSION%%/lisp/studly.elc
-share/emacs/%%EMACS_VERSION%%/lisp/subdirs.el
-share/emacs/%%EMACS_VERSION%%/lisp/subr.el
-share/emacs/%%EMACS_VERSION%%/lisp/subr.elc
-share/emacs/%%EMACS_VERSION%%/lisp/sun-curs.el
-share/emacs/%%EMACS_VERSION%%/lisp/sun-curs.elc
-share/emacs/%%EMACS_VERSION%%/lisp/sun-fns.el
-share/emacs/%%EMACS_VERSION%%/lisp/sun-fns.elc
-share/emacs/%%EMACS_VERSION%%/lisp/supercite.el
-share/emacs/%%EMACS_VERSION%%/lisp/supercite.elc
-share/emacs/%%EMACS_VERSION%%/lisp/swedish.el
-share/emacs/%%EMACS_VERSION%%/lisp/swedish.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tabify.el
-share/emacs/%%EMACS_VERSION%%/lisp/tabify.elc
-share/emacs/%%EMACS_VERSION%%/lisp/talk.el
-share/emacs/%%EMACS_VERSION%%/lisp/talk.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tar-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/tar-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tcl-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/tcl-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tcp.el
-share/emacs/%%EMACS_VERSION%%/lisp/tcp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/telnet.el
-share/emacs/%%EMACS_VERSION%%/lisp/telnet.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tempo.el
-share/emacs/%%EMACS_VERSION%%/lisp/tempo.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term-nasty.el
-share/emacs/%%EMACS_VERSION%%/lisp/term.el
-share/emacs/%%EMACS_VERSION%%/lisp/term.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/AT386.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/README
-share/emacs/%%EMACS_VERSION%%/lisp/term/apollo.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/apollo.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/bg-mouse.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/bg-mouse.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/bobcat.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/internal.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/keyswap.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/lk201.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/news.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/news.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/pc-win.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/pc-win.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/sun-mouse.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/sun-mouse.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/sun.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/sun.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/sup-mouse.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/sup-mouse.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/tvi970.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/tvi970.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt100.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt100.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt102.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt125.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt200.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt200.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt201.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt220.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt240.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt300.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt320.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt400.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt420.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/win32-win.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/win32-win.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/wyse50.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/wyse50.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/x-win.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/x-win.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/xterm.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/xterm.elc
-share/emacs/%%EMACS_VERSION%%/lisp/terminal.el
-share/emacs/%%EMACS_VERSION%%/lisp/terminal.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tex-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/tex-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/texinfmt.el
-share/emacs/%%EMACS_VERSION%%/lisp/texinfmt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/texinfo.el
-share/emacs/%%EMACS_VERSION%%/lisp/texinfo.elc
-share/emacs/%%EMACS_VERSION%%/lisp/texnfo-upd.el
-share/emacs/%%EMACS_VERSION%%/lisp/texnfo-upd.elc
-share/emacs/%%EMACS_VERSION%%/lisp/text-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/text-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/thingatpt.el
-share/emacs/%%EMACS_VERSION%%/lisp/thingatpt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/time-stamp.el
-share/emacs/%%EMACS_VERSION%%/lisp/time-stamp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/time.el
-share/emacs/%%EMACS_VERSION%%/lisp/time.elc
-share/emacs/%%EMACS_VERSION%%/lisp/timer.el
-share/emacs/%%EMACS_VERSION%%/lisp/timer.elc
-share/emacs/%%EMACS_VERSION%%/lisp/timezone.el
-share/emacs/%%EMACS_VERSION%%/lisp/timezone.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tmm.el
-share/emacs/%%EMACS_VERSION%%/lisp/tmm.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tpu-edt.el
-share/emacs/%%EMACS_VERSION%%/lisp/tpu-edt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tpu-extras.el
-share/emacs/%%EMACS_VERSION%%/lisp/tpu-extras.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tpu-mapper.el
-share/emacs/%%EMACS_VERSION%%/lisp/tpu-mapper.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tq.el
-share/emacs/%%EMACS_VERSION%%/lisp/tq.elc
-share/emacs/%%EMACS_VERSION%%/lisp/trace.el
-share/emacs/%%EMACS_VERSION%%/lisp/trace.elc
-share/emacs/%%EMACS_VERSION%%/lisp/two-column.el
-share/emacs/%%EMACS_VERSION%%/lisp/two-column.elc
-share/emacs/%%EMACS_VERSION%%/lisp/type-break.el
-share/emacs/%%EMACS_VERSION%%/lisp/type-break.elc
-share/emacs/%%EMACS_VERSION%%/lisp/uncompress.el
-share/emacs/%%EMACS_VERSION%%/lisp/uncompress.elc
-share/emacs/%%EMACS_VERSION%%/lisp/underline.el
-share/emacs/%%EMACS_VERSION%%/lisp/underline.elc
-share/emacs/%%EMACS_VERSION%%/lisp/undigest.el
-share/emacs/%%EMACS_VERSION%%/lisp/undigest.elc
-share/emacs/%%EMACS_VERSION%%/lisp/uniquify.el
-share/emacs/%%EMACS_VERSION%%/lisp/uniquify.elc
-share/emacs/%%EMACS_VERSION%%/lisp/unrmail.el
-share/emacs/%%EMACS_VERSION%%/lisp/unrmail.elc
-share/emacs/%%EMACS_VERSION%%/lisp/unused.el
-share/emacs/%%EMACS_VERSION%%/lisp/unused.elc
-share/emacs/%%EMACS_VERSION%%/lisp/userlock.el
-share/emacs/%%EMACS_VERSION%%/lisp/userlock.elc
-share/emacs/%%EMACS_VERSION%%/lisp/vc-hooks.el
-share/emacs/%%EMACS_VERSION%%/lisp/vc-hooks.elc
-share/emacs/%%EMACS_VERSION%%/lisp/vc.el
-share/emacs/%%EMACS_VERSION%%/lisp/vc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/version.el
-share/emacs/%%EMACS_VERSION%%/lisp/vi.el
-share/emacs/%%EMACS_VERSION%%/lisp/vi.elc
-share/emacs/%%EMACS_VERSION%%/lisp/view.el
-share/emacs/%%EMACS_VERSION%%/lisp/view.elc
-share/emacs/%%EMACS_VERSION%%/lisp/vip.el
-share/emacs/%%EMACS_VERSION%%/lisp/vip.elc
-share/emacs/%%EMACS_VERSION%%/lisp/viper-ex.el
-share/emacs/%%EMACS_VERSION%%/lisp/viper-ex.elc
-share/emacs/%%EMACS_VERSION%%/lisp/viper-keym.el
-share/emacs/%%EMACS_VERSION%%/lisp/viper-keym.elc
-share/emacs/%%EMACS_VERSION%%/lisp/viper-macs.el
-share/emacs/%%EMACS_VERSION%%/lisp/viper-macs.elc
-share/emacs/%%EMACS_VERSION%%/lisp/viper-mous.el
-share/emacs/%%EMACS_VERSION%%/lisp/viper-mous.elc
-share/emacs/%%EMACS_VERSION%%/lisp/viper-util.el
-share/emacs/%%EMACS_VERSION%%/lisp/viper-util.elc
-share/emacs/%%EMACS_VERSION%%/lisp/viper.el
-share/emacs/%%EMACS_VERSION%%/lisp/viper.elc
-share/emacs/%%EMACS_VERSION%%/lisp/vms-patch.el
-share/emacs/%%EMACS_VERSION%%/lisp/vms-patch.elc
-share/emacs/%%EMACS_VERSION%%/lisp/vms-pmail.el
-share/emacs/%%EMACS_VERSION%%/lisp/vms-pmail.elc
-share/emacs/%%EMACS_VERSION%%/lisp/vmsproc.el
-share/emacs/%%EMACS_VERSION%%/lisp/vmsproc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/vt-control.el
-share/emacs/%%EMACS_VERSION%%/lisp/vt-control.elc
-share/emacs/%%EMACS_VERSION%%/lisp/vt100-led.el
-share/emacs/%%EMACS_VERSION%%/lisp/vt100-led.elc
-share/emacs/%%EMACS_VERSION%%/lisp/window.el
-share/emacs/%%EMACS_VERSION%%/lisp/window.elc
-share/emacs/%%EMACS_VERSION%%/lisp/winnt.el
-share/emacs/%%EMACS_VERSION%%/lisp/winnt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ws-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/ws-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/x-apollo.el
-share/emacs/%%EMACS_VERSION%%/lisp/x-apollo.elc
-share/emacs/%%EMACS_VERSION%%/lisp/x-menu.el
-share/emacs/%%EMACS_VERSION%%/lisp/x-menu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/xscheme.el
-share/emacs/%%EMACS_VERSION%%/lisp/xscheme.elc
-share/emacs/%%EMACS_VERSION%%/lisp/xt-mouse.el
-share/emacs/%%EMACS_VERSION%%/lisp/xt-mouse.elc
-share/emacs/%%EMACS_VERSION%%/lisp/yow.el
-share/emacs/%%EMACS_VERSION%%/lisp/yow.elc
-@dirrm share/emacs/%%EMACS_VERSION%%/lisp/term
-@dirrm share/emacs/%%EMACS_VERSION%%/lisp
-@dirrm share/emacs/%%EMACS_VERSION%%/etc/e
-@dirrm share/emacs/%%EMACS_VERSION%%/etc
-@dirrm share/emacs/%%EMACS_VERSION%%
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
deleted file mode 100644
index 5a8dba415107..000000000000
--- a/editors/emacs22/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# New ports collection makefile for:	GNU emacs
-# Date created:		29 October 1994
-# Whom:			jkh
-#
-# $FreeBSD$
-#
-
-PORTNAME=	emacs
-PORTVERSION=	19.34b
-CATEGORIES=	editors
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	emacs
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	GNU editing macros
-
-EMACS_VERSION=	19.34
-CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
-PLIST_SUB=	EMACS_VERSION=${EMACS_VERSION} EMACS_ARCH=${CONFIGURE_TARGET}
-NO_LATEST_LINK=	yes
-WRKSRC=		${WRKDIR}/emacs-19.34
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-.if !defined(WITHOUT_X11)
-CONFIGURE_ARGS=	--with-x-toolkit --sharedstatedir=/var/run
-USE_XLIB=	yes
-.else
-CONFIGURE_ARGS=	--with-x=no --sharedstatedir=/var/run
-.endif
-
-STRIP=
-MAN1=		emacs.1 etags.1 ctags.1
-
-post-install:
-.for file in emacs-19.34 emacsclient etags ctags b2m
-	strip ${PREFIX}/bin/${file}
-.endfor
-.for info in emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode message
-	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
-.endfor
-# install emacs.sh into ${PREFIX}/etc/rc.d
-	${CHMOD} 1777 /var/run/emacs/lock
-	@${MKDIR} ${PREFIX}/etc/rc.d
-	@${INSTALL_SCRIPT} ${FILESDIR}/emacs.sh ${PREFIX}/etc/rc.d
-
-.include <bsd.port.mk>
diff --git a/editors/emacs22/distinfo b/editors/emacs22/distinfo
deleted file mode 100644
index 030e3b0241da..000000000000
--- a/editors/emacs22/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (emacs-19.34b.tar.gz) = 9bd3c694a9019c2a2ebd703a9a0394e0
diff --git a/editors/emacs22/files/emacs.sh b/editors/emacs22/files/emacs.sh
deleted file mode 100644
index c6976c1b8a18..000000000000
--- a/editors/emacs22/files/emacs.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-start)
-	if [ -d /var/run/emacs/lock ]
-	then
-	    rm -f /var/run/emacs/lock/*
-	else
-	    mkdir -p /var/run/emacs/lock
-	fi
-	chmod 1777 /var/run/emacs/lock
-	;;
-stop)
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
-
-exit 0
diff --git a/editors/emacs22/files/patch-aa b/editors/emacs22/files/patch-aa
deleted file mode 100644
index 8e32af2fb6a6..000000000000
--- a/editors/emacs22/files/patch-aa
+++ /dev/null
@@ -1,235 +0,0 @@
---- ./man/vip.texi.org	Fri Jun 16 15:31:11 1995
-+++ ./man/vip.texi	Tue May 20 01:28:33 1997
-@@ -2,6 +2,10 @@
- 
- @setfilename ../info/vip
- @settitle VIP
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* VIP: (vip).			A VI-emulation for Emacs.
-+@end direntry
- 
- @iftex
- @finalout
---- ./man/emacs.texi.org	Mon Aug 19 21:15:12 1996
-+++ ./man/emacs.texi	Tue May 20 01:20:11 1997
-@@ -49,6 +49,11 @@
- @settitle GNU Emacs Manual
- @setfilename ../info/emacs
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Emacs: (emacs).		The extensible self-documenting text editor.
-+@end direntry
-+
- @c
- @c in general, keep the following line commented out, unless doing a
- @c copy of this manual that will be published.  the manual should go
---- ./man/viper.texi.org	Wed Aug  7 10:59:45 1996
-+++ ./man/viper.texi	Tue May 20 01:29:17 1997
-@@ -4,6 +4,10 @@
- \input texinfo
- 
- @setfilename ../info/viper
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* VIPER: (viper).		The new VI-emulation mode in Emacs-19.29.
-+@end direntry
- 
- @iftex
- @finalout
---- ./man/forms.texi.org	Sat Mar 23 06:42:27 1996
-+++ ./man/forms.texi	Tue May 20 01:22:37 1997
-@@ -9,6 +9,11 @@
- @syncodeindex vr cp
- @syncodeindex fn cp
- @syncodeindex ky cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Forms: (forms).		Emacs package for editing data bases
-+				by filling in forms.
-+@end direntry
- @iftex
- @finalout
- @setchapternewpage odd
---- ./man/gnus.texi.org	Wed Jun 26 14:49:29 1996
-+++ ./man/gnus.texi	Tue May 20 01:23:15 1997
-@@ -5,6 +5,11 @@
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* GNUS: (gnus).			The news reader GNUS.
-+@end direntry
-+
- @iftex
- @finalout
- @end iftex
---- ./man/mh-e.texi.org	Sun Aug  4 00:00:29 1996
-+++ ./man/mh-e.texi	Tue May 20 01:23:49 1997
-@@ -4,6 +4,10 @@
- @setfilename ../info/mh-e
- @settitle mh-e
- @c %**end of header
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* MH-E: (mh-e).			Emacs interface to the MH mail system.
-+@end direntry
- 
- @setchapternewpage odd
- 
---- ./man/cl.texi.org	Mon Apr 15 21:36:53 1996
-+++ ./man/cl.texi	Tue May 20 01:24:18 1997
-@@ -2,6 +2,12 @@
- @setfilename ../info/cl
- @settitle Common Lisp Extensions
- 
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* CL: (cl).			Partial Common Lisp support for Emacs Lisp.
-+@end direntry
-+
-+
- @iftex
- @finalout
- @end iftex
---- ./man/sc.texi.org	Thu Jan  4 12:55:23 1996
-+++ ./man/sc.texi	Tue May 20 01:25:13 1997
-@@ -3,6 +3,12 @@
- @comment %**start of header (This is for running Texinfo on a region.)
- @setfilename ../info/sc
- @settitle Supercite Version 3.1 User's Manual
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* SC: (sc).			Supercite lets you cite parts of messages
-+				you're replying to, in flexible ways.
-+@end direntry
-+
- @iftex
- @finalout
- @end iftex
---- ./man/dired-x.texi.org	Thu Jan  4 12:54:19 1996
-+++ ./man/dired-x.texi	Tue May 20 01:25:55 1997
-@@ -18,6 +18,11 @@
- @setfilename ../info/dired-x
- @c dired-x.el REVISION NUMBER
- @settitle Dired Extra Version 2 User's Manual
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Dired-X: (dired-x).		Dired Extra Features.
-+@end direntry
-+
- @iftex
- @finalout
- @end iftex
---- ./man/ediff.texi.org	Fri Jun 21 20:00:04 1996
-+++ ./man/ediff.texi	Tue May 20 01:26:29 1997
-@@ -10,6 +10,11 @@
- @synindex vr cp
- @synindex fn cp
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Ediff: (ediff).		A comprehensive visual interface to diff
-+				and patch.
-+@end direntry
- @iftex
- @finalout
- @end iftex
---- ./man/cc-mode.texi.org	Sun Aug  4 21:56:21 1996
-+++ ./man/cc-mode.texi	Tue May 20 01:27:18 1997
-@@ -9,6 +9,12 @@
- @settitle     CC-MODE Version 4 Documentation
- @footnotestyle end
- 
-+@dircategory The Emacs editor and associated tools 
-+@direntry 
-+* CC mode: (ccmode).		The GNU Emacs mode for editing C, C++,
-+				Objective-C and Java code.
-+@end direntry
-+
- @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- @comment @setchapternewpage odd !! we don't want blank pages !!
- @comment %**end of header (This is for running Texinfo on a region)
---- ./man/message.texi.org	Wed Jun 26 14:49:43 1996
-+++ ./man/message.texi	Sat Dec 13 17:46:31 1997
-@@ -5,6 +5,10 @@
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Message: (message).		Editing mail and news messages.
-+@end direntry
- @iftex
- @finalout
- @end iftex
---- ./Makefile.in.org	Mon Aug 19 21:12:19 1996
-+++ ./Makefile.in	Tue Apr 15 00:15:28 1997
-@@ -184,7 +184,7 @@
- # Subdirectories to make recursively.  `lisp' is not included
- # because the compiled lisp files are part of the distribution
- # and you cannot remake them without installing Emacs first.
--SUBDIR = lib-src src
-+SUBDIR = lib-src src man
- 
- # The makefiles of the directories in $SUBDIR.
- SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile
-@@ -368,14 +368,8 @@
- 	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
- 	then \
- 	  (cd ${infodir};  \
--	   if [ -f dir ]; then \
--	     if [ ! -f dir.old ]; then mv -f dir dir.old; \
--	     else mv -f dir dir.bak; fi; \
--	   fi; \
- 	   cd ${srcdir}/info ; \
--	   (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \
--	   (cd $${thisdir}; chmod a+r ${infodir}/dir); \
--	   for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* sc* vip*; do \
-+	   for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* message* mh-e* sc* vip*; do \
- 	     (cd $${thisdir}; \
- 	      ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
- 	      chmod a+r ${infodir}/$$f); \
-@@ -426,7 +420,7 @@
- 	    esac ;					\
- 	  fi ;						\
- 	done
--	(cd ${infodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*)
-+	(cd ${infodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* mh-e* sc* vip*)
- 	(cd ${man1dir}  && rm -f emacs.1 etags.1 ctags.1)
- 	(cd ${bindir}  && rm -f emacs-${version} $(EMACS))
- 
---- ./man/Makefile.in.org	Thu Jun 27 15:27:19 1996
-+++ ./man/Makefile.in	Tue Apr 15 00:29:52 1997
-@@ -13,7 +13,7 @@
- # The makeinfo program is part of the Texinfo distribution.
- MAKEINFO = makeinfo
- INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl ../info/dired-x \
--	       ../info/ediff ../info/forms ../info/gnus ../info/info \
-+	       ../info/ediff ../info/forms ../info/gnus \
- 	       ../info/mh-e ../info/sc ../info/vip ../info/viper \
- 	       ../info/message
- DVI_TARGETS = emacs.dvi cc-mode.dvi cl.dvi dired-x.dvi ediff.dvi forms.dvi \
-@@ -66,6 +66,7 @@
- 	${srcdir}/gnu1.texi \
- 	${srcdir}/glossary.texi
- 
-+all: info
- info: $(INFO_TARGETS)
- 
- dvi: $(DVI_TARGETS)
-@@ -74,12 +75,6 @@
- # in srcdir.  There is no provision for Info files
- # to exist in the build directory.
- # In a distribution of Emacs, the Info files should be up to date.
--
--../info/info: ${INFOSOURCES}
--	cd $(srcdir); $(MAKEINFO) --no-split info.texi
--
--info.dvi: ${INFOSOURCES}
--	TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/info.texi
- 
- ../info/emacs: ${EMACSSOURCES}
- 	cd $(srcdir); $(MAKEINFO) emacs.texi
diff --git a/editors/emacs22/files/patch-ab b/editors/emacs22/files/patch-ab
deleted file mode 100644
index 16aee5fa323f..000000000000
--- a/editors/emacs22/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/xrdb.c.org	Sat Apr  8 21:54:08 1995
-+++ ./src/xrdb.c	Mon Sep 11 21:53:29 1995
-@@ -361,7 +361,7 @@
- 
- /* Producing databases for individual sources.  */
- 
--#define X_DEFAULT_SEARCH_PATH "/usr/lib/X11/%L/%T/%N%C%S:/usr/lib/X11/%l/%T/%N%C%S:/usr/lib/X11/%T/%N%C%S:/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S"
-+#define X_DEFAULT_SEARCH_PATH "/usr/X11R6/lib/X11/%L/%T/%N%C%S:/usr/X11R6/lib/X11/%l/%T/%N%C%S:/usr/X11R6/lib/X11/%T/%N%C%S:/usr/X11R6/lib/X11/%L/%T/%N%S:/usr/X11R6/lib/X11/%l/%T/%N%S:/usr/X11R6/lib/X11/%T/%N%S"
- 
- static XrmDatabase
- get_system_app (class)
diff --git a/editors/emacs22/files/patch-ac b/editors/emacs22/files/patch-ac
deleted file mode 100644
index dfad53e9e187..000000000000
--- a/editors/emacs22/files/patch-ac
+++ /dev/null
@@ -1,82 +0,0 @@
---- src/s/freebsd.h.orig	Mon Jun 10 05:14:32 1996
-+++ src/s/freebsd.h	Tue Jul 11 16:44:14 2000
-@@ -1,5 +1,15 @@
- /* s/ file for freebsd system.  */
- 
-+/* Get the correct __FreeBSD_version, even if this is before that was
-+   defined. */
-+#ifndef __FreeBSD__
-+#define __FreeBSD_version 199401
-+#elif __FreeBSD__ == 1
-+#define __FreeBSD_version 199405
-+#else
-+#include <osreldate.h>
-+#endif
-+
- /* '__FreeBSD__' is defined by the preprocessor on FreeBSD-1.1 and up.
-    Earlier versions do not have shared libraries, so inhibit them.
-    You can inhibit them on newer systems if you wish
-@@ -33,8 +43,9 @@
- 
- #define LIBS_DEBUG
- #define LIBS_SYSTEM -lutil
-+#if __FreeBSD_version < 400000
- #define LIBS_TERMCAP -ltermcap
--#define LIB_GCC -lgcc
-+#endif
- 
- #define SYSV_SYSTEM_DIR
- 
-@@ -42,12 +53,33 @@
- #undef BSD_PGRPS
- #define GETPGRP_NO_ARG
- 
-+#ifdef __ELF__
-+
-+#define LD_SWITCH_SYSTEM
-+#ifdef i386
-+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
-+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
-+#else
-+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crtbegin.o
-+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
-+#endif
-+#define UNEXEC unexelf.o
-+#undef LIB_GCC
-+#define LIB_GCC
-+
-+#else /* not __ELF__ */
-+
- #ifndef NO_SHARED_LIBS
- #define LD_SWITCH_SYSTEM -e start -dc -dp
- #define HAVE_TEXT_START		/* No need to define `start_of_text'. */
-+#if __FreeBSD_version >= 300002
-+#define START_FILES pre-crt0.o /usr/lib/aout/crt0.o
-+#else /* __FreeBSD_version < 300002 */
- #define START_FILES pre-crt0.o /usr/lib/crt0.o
--#define UNEXEC unexsunos4.o
-+#endif /* __FreeBSD_version < 300002 */
-+#define UNEXEC unexfreebsd.o
- #define RUN_TIME_REMAP
-+#define LIB_GCC -lgcc
- 
- #ifndef N_TRELOFF
- #define N_PAGSIZ(x) __LDPGSZ
-@@ -63,6 +95,8 @@
- #endif /* __FreeBSD__ */
- #endif /* NO_SHARED_LIBS */
- 
-+#endif /* not __ELF__ */
-+
- #define HAVE_WAIT_HEADER
- #define HAVE_GETLOADAVG
- /*#define HAVE_GETPAGESIZE  /* configure now puts this in config.h */
-@@ -80,6 +114,8 @@
- #define BSD 199103
- #elif __FreeBSD__ == 2
- #define BSD 199306
-+#elif __FreeBSD__ >= 3
-+#define BSD 199506
- #endif
- 
- #define WAITTYPE int
diff --git a/editors/emacs22/files/patch-ad b/editors/emacs22/files/patch-ad
deleted file mode 100644
index f2013a374044..000000000000
--- a/editors/emacs22/files/patch-ad
+++ /dev/null
@@ -1,695 +0,0 @@
---- src/unexfreebsd.c.orig	Wed Dec  3 17:28:14 1997
-+++ src/unexfreebsd.c	Wed Dec  3 17:34:02 1997
-@@ -0,0 +1,692 @@
-+/* Code to do an unexec for FreeBSD for a temacs linked -Bdynamic.
-+   Derived from unexnetbsd.c, which was derived from unexsunos4.c
-+   Copyright (C) 1992, 1993 Free Software Foundation, Inc.
-+
-+This file is part of XEmacs.
-+
-+XEmacs is free software; you can redistribute it and/or modify it
-+under the terms of the GNU General Public License as published by the
-+Free Software Foundation; either version 2, or (at your option) any
-+later version.
-+
-+XEmacs is distributed in the hope that it will be useful, but WITHOUT
-+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with XEmacs; see the file COPYING.  If not, write to
-+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA.  */
-+
-+/* Synched up with: Not in FSF? */
-+
-+/*
-+Created 29-Oct-92 by Harlan Sexton
-+Tweaked 06-Aug-93 by Dean Michaels to work with sun3.
-+Converted 01-Dec-93 by Paul Mackerras to work with NetBSD shared libraries.
-+Tweaked 26-Feb-94 by Shawn Carey for use with FreeBSD-1.1 shared libraries.
-+*/
-+
-+/********************** Included .h Files **************************/
-+
-+#include <config.h>
-+
-+#include <stdarg.h>
-+#include <sys/param.h>
-+#include <sys/mman.h>
-+#include <sys/file.h>
-+#include <sys/stat.h>
-+#include <sys/types.h>
-+#include <string.h>
-+#include <stdio.h>
-+#include <a.out.h>
-+#include <unistd.h>
-+#include <ctype.h>
-+#include <stab.h>
-+#include <dirent.h>
-+#include <link.h>
-+
-+/********************** Macros *************************************/
-+
-+#define SYS_ERR		strerror(errno)
-+
-+#define MASK_UP(x,p_of_two) \
-+ ((((unsigned long) (x)) + ((p_of_two) - 1)) & (~((p_of_two) - 1)))
-+
-+#define MASK_DOWN(x,p_of_two) (((unsigned long) (x)) & (~((p_of_two) - 1)))
-+
-+/********************** Typedefs and Structs ***********************/
-+
-+struct translation_struct
-+{
-+  long txtaddr;
-+  long txtoff;
-+  long dataddr;
-+  long datoff;
-+  long bssaddr;
-+  long endaddr;
-+};
-+
-+/********************** Function Prototypes/Declarations ***********/
-+
-+static void unexec_error (const char *m, int use_errno, ...);
-+static int unexec_open (char *filename, int flag, int mode);
-+static caddr_t unexec_mmap (int fd, size_t len, int prot, int flags);
-+static long unexec_seek (int fd, long position);
-+static void unexec_read (int fd, long position, char *buf, int bytes);
-+static void unexec_write (int fd, long position, char *buf, int bytes);
-+static void unexec_pad (int fd, int bytes);
-+static void unexec_fstat (int fd, struct stat *statptr);
-+static void unexec_fchmod (int fd, int mode);
-+static long unexec_addr_to_offset (long addr, struct translation_struct *ts);
-+static void copy_relocation_site (struct relocation_info *ri, 
-+                                  caddr_t from_base_addr, 
-+                                  caddr_t to_base_addr, 
-+                                  struct translation_struct *ts);
-+static void reset_symtab (struct nlist *start, struct nlist *end, 
-+                          char *strtab, long edata_value, long end_value,
-+                          int shlib_image);
-+static void reset_ldso_symtab (struct nzlist *start, struct nzlist *end, 
-+                          char *strtab, long edata_value, long end_value,
-+                          int shlib_image);
-+int run_time_remap (char *dummy);
-+
-+/********************** Variables **********************************/
-+
-+/* for reporting error messages from system calls */
-+extern int errno;
-+extern int _DYNAMIC;
-+extern char **environ;             
-+
-+static unsigned long sbrk_of_0_at_unexec;
-+             
-+/*******************************************************************/
-+
-+static void
-+unexec_error (const char *fmt, int use_errno, ...)
-+{
-+  const char *err_msg = SYS_ERR;
-+  va_list args;
-+
-+  fprintf (stderr, "unexec - ");
-+  va_start (args, use_errno);
-+  vfprintf (stderr, fmt, args);
-+  va_end (args);
-+
-+  if (use_errno)
-+    fprintf (stderr, ": %s", err_msg);
-+  fprintf (stderr, "\n");
-+  exit (1);
-+  return;
-+}
-+
-+static int
-+unexec_open (char *filename, int flag, int mode)
-+{
-+  int fd;
-+
-+  errno = 0;
-+
-+  fd = open (filename, flag, mode);
-+
-+  if (fd < 0)
-+    unexec_error ("Failure opening file %s", 1, filename);
-+  return fd;
-+}
-+
-+static caddr_t
-+unexec_mmap (int fd, size_t len, int prot, int flags)
-+{
-+  caddr_t return_val;
-+
-+  unexec_seek (fd, 0);
-+  errno = 0;
-+  return_val = mmap (0, len, prot, flags, fd, 0);
-+
-+  if (return_val == (caddr_t) -1)
-+    unexec_error ("Failure mmap'ing file", 1);
-+  return return_val;
-+}
-+
-+
-+static long
-+unexec_seek (int fd, long position)
-+{
-+  long seek_value;
-+
-+  if (fd <= 0)
-+    unexec_error ("No file open in which to seek", 0);
-+
-+  errno = 0;
-+
-+  if (position < 0)
-+    seek_value = (long) lseek (fd, 0, L_INCR);
-+  else
-+    seek_value = (long) lseek (fd, position, L_SET);
-+
-+  if (seek_value < 0)
-+    unexec_error ("Failed to do a seek to 0x%x in %s", 1,
-+                  position, "unexec() output file");
-+
-+  return seek_value;
-+}
-+
-+static void
-+unexec_read (int fd, long position, char *buf, int bytes)
-+{
-+  int n_read;
-+  int remains = bytes;
-+  position = unexec_seek (fd, position);
-+
-+  if (bytes < 0)
-+    unexec_error ("Attempted read of %d bytes", 0, bytes);
-+
-+  errno = 0;
-+
-+  while (remains > 0)
-+    {
-+      n_read = read (fd, buf, remains);
-+      if (n_read <= 0)
-+        unexec_error ("Read failed for 0x%x bytes at offset 0x%x in %s",
-+                      1, bytes, position, "unexec() output file");
-+      buf += n_read;
-+      remains -= n_read;
-+    }
-+
-+  return;
-+}
-+
-+static void
-+unexec_write (int fd, long position, char *buf, int bytes)
-+{
-+  int n_written;
-+  int remains = bytes;
-+  position = unexec_seek (fd, position);
-+
-+  if (bytes < 0)
-+    unexec_error ("Attempted write of %d bytes in %s",
-+                  0, bytes, "unexec() output file");
-+
-+  errno = 0;
-+
-+  while (remains > 0)
-+    {
-+      n_written = write (fd, buf, remains);
-+      if (n_written <= 0)
-+        unexec_error ("Write failed for 0x%x bytes at offset 0x%x in %s",
-+                      1, bytes, position, "unexec() output file");
-+      buf += n_written;
-+      remains -= n_written;
-+    }
-+
-+  return;
-+}
-+
-+static void 
-+unexec_pad (int fd, int bytes)
-+{
-+  if (bytes > 0)
-+    {
-+      char buf[1024];
-+      int remaining = bytes;
-+
-+      memset (buf, 0, sizeof (buf));
-+
-+      while (remaining > 0)
-+        {
-+          int this_write = (remaining > sizeof(buf))?sizeof(buf):remaining;
-+          unexec_write (fd, -1, buf, this_write);
-+          remaining -= this_write;
-+        }
-+    }
-+}
-+
-+static void
-+unexec_fstat (int fd, struct stat *statptr)
-+{
-+  errno = 0;
-+  if (-1 == fstat (fd, statptr))
-+    unexec_error ("fstat() failed for descriptor %d", 1, fd);
-+  return;
-+}
-+
-+static void
-+unexec_fchmod (int fd, int mode)
-+{
-+  errno = 0;
-+  if (-1 == fchmod (fd, mode))
-+    unexec_error ("fchmod() failed for descriptor %d", 1, fd);
-+  return;
-+}
-+
-+static long
-+unexec_addr_to_offset (long addr, struct translation_struct *ts)
-+                             
-+{
-+  if ((addr < ts->txtaddr) || (addr >= ts->bssaddr))
-+    return -1;
-+  else if (addr >= ts->dataddr)
-+    return ((long) ((addr - ts->dataddr) + ts->datoff));
-+  else 
-+    return ((long) ((addr - ts->txtaddr) + ts->txtoff));
-+}
-+
-+
-+/*
-+ * "LD.SO" DATA AND SYMBOL TABLE OPERATIONS 
-+ */
-+
-+static void
-+copy_relocation_site (struct relocation_info *ri, 
-+                      caddr_t from_base_addr,
-+                      caddr_t to_base_addr,
-+                      struct translation_struct *ts)
-+{
-+  long offset;
-+  caddr_t from, to;
-+
-+  /* We can get relocation sites in the bss region, for objects whose
-+     contents are copied from a shared library.  We don't need or want
-+     to restore these at present. */
-+#ifndef sparc
-+  if (ri->r_copy)
-+    return;
-+#else
-+  /* Struct relocation_info_sparc doesn't have member r_copy.
-+     Instead, we use the address to check if this is run-time-copied. */
-+  if (ri->r_address >= ts->bssaddr && ri->r_address < ts->endaddr)
-+    return;
-+#endif
-+
-+  offset = unexec_addr_to_offset (ri->r_address, ts);
-+  if (offset == -1)
-+    unexec_error ("bad relocation address 0x%x (0x%x)", 0, ri->r_address,
-+		  ((long *)ri)[1]);
-+
-+  from = from_base_addr + offset;
-+  to = to_base_addr + offset;
-+  /* This stuff should be in a md_ file somewhere... */
-+#ifndef sparc
-+  switch (ri->r_length)
-+    {
-+    case 0:
-+      *((char *) to) = *((char *) from);
-+      break;
-+    case 1:
-+      *((short *) to) = *((short *) from);
-+      break;
-+    case 2:
-+      *((long *) to) = *((long *) from);
-+      break;
-+    default:
-+      unexec_error ("unknown reloc length %d seen during unexec()",
-+		    0, ri->r_length);
-+      break;
-+    }
-+#else /* sparc */
-+  switch (ri->r_type)
-+    {
-+    case RELOC_8:
-+    case RELOC_DISP8:
-+      *((char *) to) = *((char *) from);
-+      break;
-+    case RELOC_16:
-+    case RELOC_DISP16:
-+      *((short *) to) = *((short *) from);
-+      break;     
-+    case RELOC_LO10:
-+    case RELOC_13:     
-+    case RELOC_22:     
-+    case RELOC_HI22:
-+    case RELOC_WDISP22:
-+    case RELOC_WDISP30:
-+    case RELOC_32:
-+    case RELOC_DISP32:
-+    case RELOC_GLOB_DAT:
-+      *((long *) to) = *((long *) from);
-+      break;
-+    case RELOC_JMP_SLOT:
-+      {
-+        long *target = (long *) to;
-+        long *source = (long *) from;
-+        *target = *source;
-+        target++;
-+        source++;
-+        *target = *source;
-+        target++;
-+        source++;
-+        *target = *source;
-+      }
-+      break;
-+    default:
-+      unexec_error ("unknown reloc type %d seen during unexec()",
-+		    0, ri->r_type);
-+      break;
-+    }
-+#endif /* sparc */
-+}
-+
-+static void
-+reset_symtab (struct nlist *start, struct nlist *end, char *strtab,
-+              long edata_value, long end_value, int shlib_image)
-+{
-+  struct nlist *tmp = start;
-+  int found_edata = 0;
-+  int found_end = 0;
-+     
-+  while (tmp < end)
-+    {
-+      int type = tmp->n_type;
-+
-+      if ((type == (N_UNDF | N_EXT)) &&
-+          (tmp->n_value != 0))
-+        unexec_error ("unexec'ing image has COMMON symbols in it -- we quit!",
-+		      0);
-+     
-+      if (!(type & N_STAB))
-+        {
-+          if (!found_edata &&
-+              (type == (N_EXT | N_DATA)) &&
-+              tmp->n_un.n_strx &&
-+              !strcmp ("_edata", strtab + tmp->n_un.n_strx))
-+            {
-+              tmp->n_value = edata_value;
-+              found_edata = 1;
-+            }
-+
-+
-+          if ((type & N_TYPE) == N_BSS)
-+            {
-+              if (!found_end &&
-+                  (type == (N_EXT | N_BSS)) &&
-+                  tmp->n_un.n_strx &&
-+                  !strcmp ("_end", strtab + tmp->n_un.n_strx))
-+                {
-+                  tmp->n_value = end_value;
-+                  found_end = 1;
-+                }
-+              else if (type & N_EXT)
-+                tmp->n_type = N_DATA | N_EXT;
-+              else
-+                tmp->n_type = N_DATA;
-+            }
-+
-+          /* the way things are being handled here, having sbrk() in the
-+             image is fatal for an image linked with shared lib's (although 
-+             the code could be modified to support it), but this should 
-+             never happen anyway */
-+          if (shlib_image &&
-+              (type == (N_EXT | N_TEXT)) &&
-+              tmp->n_un.n_strx &&
-+              !strcmp ("_sbrk", strtab + tmp->n_un.n_strx))
-+            unexec_error ("unexec'd shlib image has sbrk() in it -- we quit!",
-+                          0);
-+        }
-+
-+      tmp++;
-+    }
-+} 
-+     
-+static void
-+reset_ldso_symtab (struct nzlist *start, struct nzlist *end, char *strtab,
-+              long edata_value, long end_value, int shlib_image)
-+{
-+  struct nzlist *tmp = start;
-+  int found_edata = 0;
-+  int found_end = 0;
-+     
-+  while (tmp < end) {
-+    int type = tmp->nz_type;
-+/*
-+ * the following code breaks under FreeBSD-1.1-BETA, but everything
-+ * seems to work perfectly if it's commented out.  This did not break
-+ * anything until the changes to ld.so were made.
-+ */
-+/*
-+    if ((type == (N_UNDF | N_EXT)) && (tmp->nz_value != 0))
-+      unexec_error("unexec'ing image has COMMON symbols in rel -- we quit!",0);
-+*/
-+    if (!(type & N_STAB)) {
-+      if (!found_edata &&
-+	  (type == (N_EXT | N_DATA)) &&
-+	  !strcmp ("_edata", strtab + tmp->nz_strx)) {
-+	tmp->nz_value = edata_value;
-+	found_edata = 1;
-+      }
-+
-+      if ((type & N_TYPE) == N_BSS) {
-+	if (!found_end &&
-+	    (type == (N_EXT | N_BSS)) &&
-+	    !strcmp ("_end", strtab + tmp->nz_strx)) {
-+	  tmp->nz_value = end_value;
-+	  found_end = 1;
-+	} else if (type & N_EXT)
-+	  tmp->nz_type = N_DATA | N_EXT;
-+	else
-+	  tmp->nz_type = N_DATA;
-+      }
-+
-+      /* the way things are being handled here, having sbrk() in the
-+	 image is fatal for an image linked with shared lib's (although 
-+	 the code could be modified to support it), but this should 
-+	 never happen anyway */
-+      if (shlib_image &&
-+	  (type == (N_EXT | N_TEXT)) &&
-+	  !strcmp ("_sbrk", strtab + tmp->nz_strx))
-+	unexec_error("unexec'd shlib image has sbrk() ref -- we quit!", 0);
-+    }
-+    tmp++;
-+  }
-+} 
-+     
-+extern int getpagesize (void);
-+
-+/*
-+ * EXPORTED FUNCTIONS 
-+ */
-+
-+/* this has to be a global variable to prevent the optimizers from
-+ * assuming that it can not be 0.  
-+*/
-+static void *dynamic_addr = (void *) &_DYNAMIC;
-+
-+int
-+unexec (char *new_name, char *old_name,
-+        unsigned int emacs_edata, unsigned int dummy1, unsigned int dummy2)
-+{
-+  /* ld.so data */
-+  struct _dynamic *ld = 0;
-+  struct section_dispatch_table *ld2 = 0;
-+  /* old and new state */
-+  int old_fd;
-+  int new_fd;
-+  caddr_t old_base_addr;
-+  caddr_t new_base_addr;
-+  struct exec old_hdr;
-+  struct exec new_hdr;
-+  struct stat old_buf;
-+  struct stat new_buf;
-+  /* some process specific "constants" */
-+  unsigned long n_pagsiz, new_edata;
-+  long page_size = getpagesize ();
-+  caddr_t plt_end;
-+  caddr_t current_break = (caddr_t) sbrk (0);
-+
-+  if (!page_size)
-+    unexec_error ("unexec() failed because we can't get the size of a page!",
-+                  0);
-+
-+  /* see if this is a -Bdynamic image -- if so, find ld.so structures */
-+  if (dynamic_addr)
-+    {
-+      ld = (struct _dynamic *) dynamic_addr;
-+      ld2 = ld->d_un.d_sdt;
-+      if (ld->d_version < LD_VERSION_BSD)
-+        unexec_error ("%s linked with obsolete version of ld -- we quit!",
-+                      0, old_name);
-+    }
-+
-+  /* open the old and new files, figuring out how big the old one is
-+     so that we can map it in */
-+  old_fd = unexec_open (old_name, O_RDONLY, 0);
-+  new_fd = unexec_open (new_name, O_RDWR | O_CREAT | O_TRUNC, 0666);
-+
-+  /* setup the header and the statbuf for old_fd */
-+  unexec_read (old_fd, 0, (char *) &old_hdr, sizeof (old_hdr));
-+  unexec_fstat (old_fd, &old_buf);
-+
-+
-+  /* set up some important constants */
-+  n_pagsiz = __LDPGSZ;
-+  if (dynamic_addr)
-+    plt_end = (caddr_t) MASK_UP (ld2->sdt_plt + ld2->sdt_plt_sz, sizeof (double));
-+  else
-+    plt_end = (caddr_t) N_DATADDR (old_hdr);
-+
-+#if 0
-+  /* never write protect the variable "environ", defined in /lib/crt0.o, and
-+     set in process.c and callproc.c */
-+  mprotect_bottom_addr = ((unsigned long) &environ) + sizeof (char **);
-+  /* never protect ABOVE the end of data emacs_edata specified */
-+  mprotect_top_addr = MIN (emacs_edata, N_DATADDR (old_hdr) + old_hdr.a_data);
-+#endif
-+
-+  /* Set up the image of the old file */
-+  old_base_addr = unexec_mmap (old_fd, old_buf.st_size, PROT_READ,
-+			       MAP_FILE | MAP_PRIVATE);
-+  close (old_fd);
-+
-+  /* set up the new exec */
-+  new_hdr = old_hdr;
-+  new_edata = (unsigned long) MASK_UP (current_break, n_pagsiz);
-+  new_hdr.a_data = new_edata - ((unsigned long) N_DATADDR (old_hdr));
-+  new_hdr.a_bss  = 0;
-+
-+  /* set up this variable, in case we want to reset "the break" 
-+     when restarting */
-+  sbrk_of_0_at_unexec = ((unsigned long) MASK_UP (current_break, n_pagsiz));
-+     
-+  /* Write out the first approximation to the new file. The sizes of
-+     each section will be correct, but there will be a number of 
-+     corrections that will need to be made. */
-+  {
-+    long old_datoff = N_DATOFF (old_hdr);
-+    long old_dataddr = N_DATADDR (old_hdr);
-+    long new_treloff = N_RELOFF (new_hdr);
-+    long old_treloff = N_RELOFF (old_hdr);
-+    long ld_so_size = ((unsigned long) plt_end) - old_dataddr;
-+    long real_data_size = current_break - plt_end;
-+    long pad_size = 
-+      MASK_UP (current_break, n_pagsiz) - ((unsigned long) current_break);
-+
-+
-+    /* First, write the text segment with new header -- copy everything until
-+       the start of the data segment from the old file, and then go back and 
-+       write the new header. */
-+    unexec_write (new_fd, 0, old_base_addr, old_datoff + ld_so_size);
-+    unexec_write (new_fd, 0, (char *) &new_hdr, sizeof (new_hdr));
-+
-+    /* Copy the rest of the data segment from the running image. */
-+    unexec_write (new_fd, old_datoff + ld_so_size, 
-+                  plt_end, real_data_size);
-+
-+    /* pad out the data segment */
-+    unexec_pad (new_fd, pad_size);
-+    
-+    /* Finally, copy the symbol table information from the old file. */
-+    unexec_write (new_fd, new_treloff,
-+                  old_base_addr + old_treloff,
-+                  old_buf.st_size - old_treloff);
-+  }
-+     
-+     
-+  /* Next, map in the output file so that we can jump around fixing it
-+     up. We retain the old file so that we can refer to it. */
-+  unexec_fstat (new_fd, &new_buf);
-+  new_base_addr = unexec_mmap (new_fd, 
-+                               MASK_UP (new_buf.st_size, page_size),
-+                               PROT_READ | PROT_WRITE,
-+			       MAP_FILE | MAP_SHARED);
-+
-+
-+
-+  /* We need to do 2 things. First, make sure that _edata and _end (and
-+     hence, curbrk) are set to the correct values. At the same time, for
-+     neatness and to help with debugging, mark all the types of all ld.so
-+     and nm BSS symbols in the new file to be DATA, and make sure that
-+     there are no COMMON symbols in the output file, as any references to
-+     these can lose really big. Second, reset all of the ld.so "relocation
-+     sites" in the new file to have the values that appear in the old file
-+     -- the failure to do this was the biggest loser in the old version of
-+     this code. */
-+
-+  /* STEP 1 */
-+  /* Reset the regular symbol table first. */
-+  reset_symtab ((struct nlist *) (new_base_addr + N_SYMOFF(new_hdr)),
-+		(struct nlist *) (new_base_addr + N_SYMOFF(new_hdr) +
-+				  new_hdr.a_syms),
-+		(char *) (new_base_addr + N_STROFF(new_hdr)),
-+		new_edata, new_edata,
-+		!!dynamic_addr);
-+
-+  /* Now reset the ld.so symbol table. */
-+  if (dynamic_addr)
-+    {
-+      struct translation_struct ts;
-+      struct relocation_info *tmp, *end;
-+      caddr_t syms, strings;
-+
-+      /* set up the structure that we use to translate addresses in the
-+	 old file into file offsets */
-+      ts.txtaddr = N_TXTADDR (old_hdr);
-+      ts.txtoff = N_TXTOFF (old_hdr);
-+      ts.dataddr = N_DATADDR (old_hdr);
-+      ts.datoff = N_DATOFF (old_hdr);
-+      ts.bssaddr = N_DATADDR (old_hdr) + old_hdr.a_data;
-+      ts.endaddr = ts.bssaddr + old_hdr.a_bss;
-+
-+      syms = new_base_addr + unexec_addr_to_offset(ld2->sdt_nzlist, &ts);
-+      strings = new_base_addr + unexec_addr_to_offset(ld2->sdt_strings, &ts);
-+      reset_ldso_symtab ((struct nzlist *) syms, (struct nzlist *) strings,
-+			 (char *) strings,
-+			 new_edata, new_edata,
-+			 !!dynamic_addr);
-+
-+      /* STEP 2 */
-+      tmp = (struct relocation_info *)
-+	(old_base_addr + unexec_addr_to_offset(ld2->sdt_rel, &ts));
-+      end = (struct relocation_info *)
-+	(old_base_addr + unexec_addr_to_offset(ld2->sdt_hash, &ts));
-+      while (tmp < end)
-+	{
-+	  copy_relocation_site (tmp, old_base_addr, new_base_addr, &ts);
-+	  tmp++;
-+	}
-+    }
-+     
-+  /* get rid of the mmap-ed file space and make the output file 
-+     executable -- then quit */
-+  munmap (new_base_addr, MASK_UP (new_buf.st_size, page_size));
-+  munmap (old_base_addr, MASK_UP (old_buf.st_size, page_size));
-+  unexec_fchmod (new_fd, 0755);
-+  close (new_fd);
-+  return 0;
-+}
-+
-+
-+int
-+run_time_remap (char *dummy)
-+{
-+  unsigned long current_sbrk = (unsigned long) sbrk (0);
-+
-+  if (sbrk_of_0_at_unexec > current_sbrk)
-+    {
-+      errno = 0;
-+      if (brk ((caddr_t) sbrk_of_0_at_unexec))
-+	fprintf (stderr, "failed to change brk addr to 0x%lx: %s\n", 
-+		 sbrk_of_0_at_unexec, SYS_ERR);
-+    }
-+             
-+  return 0;
-+}
diff --git a/editors/emacs22/files/patch-ae b/editors/emacs22/files/patch-ae
deleted file mode 100644
index 82b5e69cad05..000000000000
--- a/editors/emacs22/files/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/unexelf.c.orig	Fri Oct  2 12:55:43 1998
-+++ src/unexelf.c	Fri Oct  2 13:02:05 1998
-@@ -678,7 +678,8 @@
-   if (n < 0)
-     fatal ("Couldn't find segment next to .bss in %s\n", old_name, 0);
- 
--  NEW_PROGRAM_H (n).p_filesz += new_data2_size;
-+/*  NEW_PROGRAM_H (n).p_filesz += new_data2_size; */
-+  NEW_PROGRAM_H (n).p_filesz = new_bss_addr - NEW_PROGRAM_H (n).p_vaddr; /* From emacs 20.3 */
-   NEW_PROGRAM_H (n).p_memsz = NEW_PROGRAM_H (n).p_filesz;
- 
- #if 0 /* Maybe allow section after data2 - does this ever happen? */
-@@ -845,7 +846,9 @@
- 
-       for (; symp < symendp; symp ++)
- 	if (strcmp ((char *) (symnames + symp->st_name), "_end") == 0
--	    || strcmp ((char *) (symnames + symp->st_name), "_edata") == 0)
-+	    || strcmp ((char *) (symnames + symp->st_name), "end") == 0
-+	    || strcmp ((char *) (symnames + symp->st_name), "_edata") == 0
-+	    || strcmp ((char *) (symnames + symp->st_name), "edata") == 0)
- 	  memcpy (&symp->st_value, &new_bss_addr, sizeof (new_bss_addr));
-     }
diff --git a/editors/emacs22/files/patch-af b/editors/emacs22/files/patch-af
deleted file mode 100644
index 23092a4a8ca0..000000000000
--- a/editors/emacs22/files/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	Tue Aug 20 13:11:26 1996
-+++ configure	Sat Jan 16 23:18:54 1999
-@@ -756,6 +756,10 @@
-     machine=alpha opsys=gnu-linux
-   ;;
- 
-+  alpha-*-freebsd* )
-+    machine=alpha opsys=freebsd
-+  ;;
-+
-   ## Altos 3068
-   m68*-altos-sysv* )
-     machine=altos opsys=usg5-2
diff --git a/editors/emacs22/files/patch-ag b/editors/emacs22/files/patch-ag
deleted file mode 100644
index a556bd24f5eb..000000000000
--- a/editors/emacs22/files/patch-ag
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/m/alpha.h.orig	Sat Aug 10 07:03:36 1996
-+++ src/m/alpha.h	Sat Jan 16 22:34:10 1999
-@@ -234,7 +234,11 @@
- 
- #ifndef NOT_C_CODE
- /* We need these because pointers are larger than the default ints.  */
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #include <alloca.h>
-+#else
-+#include <stdlib.h>
-+#endif
- 
- /* Hack alert!  For reasons unknown to mankind the string.h file insists
-    on defining bcopy etc. as taking char pointers as arguments.  With
-@@ -299,10 +303,18 @@
-    termio and struct termios are mutually incompatible.  */
- #define NO_TERMIO
- 
--#ifdef LINUX
-+#if defined(LINUX) || \
-+	defined(__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
- # define TEXT_END ({ extern int _etext; &_etext; })
- # ifndef __ELF__
- #  define COFF
- #  define DATA_END ({ extern int _EDATA; &_EDATA; })
- # endif /* notdef __ELF__ */
- #endif
-+
-+#if (defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)) \
-+	&& defined (__ELF__)
-+#define HAVE_TEXT_START
-+#endif
-+
-+
diff --git a/editors/emacs22/files/patch-ah b/editors/emacs22/files/patch-ah
deleted file mode 100644
index 3f990e4b5970..000000000000
--- a/editors/emacs22/files/patch-ah
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/unexelf1.c.orig	Sat Aug 10 06:56:52 1996
-+++ src/unexelf1.c	Sun Jan 17 00:28:21 1999
-@@ -423,12 +423,50 @@
- #include <elf.h>
- #include <sys/mman.h>
- 
--#ifdef __alpha__
-+#if defined(__alpha__) && defined(__osf__)
- # include <sym.h>	/* get COFF debugging symbol table declaration */
-+#else if defined(__alpha__)
-+typedef struct {
-+	short magic;
-+	short vstamp;
-+	int ilineMax;
-+	int idnMax;
-+	int ipdMax;
-+	int isymMax;
-+	int ioptMax;
-+	int iauxMax;
-+	int issMax;
-+	int issExtMax;
-+	int ifdMax;
-+	int crfd;
-+	int iextMax;
-+	long cbLine;
-+	long cbLineOffset;
-+	long cbDnOffset;
-+	long cbPdOffset;
-+	long cbSymOffset;
-+	long cbOptOffset;
-+	long cbAuxOffset;
-+	long cbSsOffset;
-+	long cbSsExtOffset;
-+	long cbFdOffset;
-+	long cbRfdOffset;
-+	long cbExtOffset;
-+} HDRR, *pHDRR; 
-+#define cbHDRR sizeof(HDRR)
-+#define hdrNil ((pHDRR)0)
- #endif
- 
- #if __GNU_LIBRARY__ - 0 >= 6
- # include <link.h>	/* get ElfW etc */
-+#endif
-+
-+#ifdef __FreeBSD__
-+# ifdef __STDC__
-+#  define ElfW(type)	Elf_##type
-+# else
-+#  define ElfW(type)	Elf_/**/type
-+# endif
- #endif
- 
- #ifndef ElfW
diff --git a/editors/emacs22/files/patch-ai b/editors/emacs22/files/patch-ai
deleted file mode 100644
index 57da8f14f8fd..000000000000
--- a/editors/emacs22/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib-src/Makefile.in.orig	Sun Apr  4 13:04:19 1999
-+++ lib-src/Makefile.in	Sun Apr  4 13:04:48 1999
-@@ -364,7 +364,7 @@
- 	$(CC) ${ALL_CFLAGS} ${srcdir}/cvtmail.c $(LOADLIBES) -o cvtmail
- 
- fakemail: ${srcdir}/fakemail.c ../src/config.h
--	$(CC) ${ALL_CFLAGS} ${srcdir}/fakemail.c $(LOADLIBES) -o fakemail
-+	$(CC) ${ALL_CFLAGS} ${srcdir}/fakemail.c $(LOADLIBES) -lcompat -o fakemail
- 
- yow: ${srcdir}/yow.c ../src/paths.h
- 	$(CC) ${ALL_CFLAGS} ${srcdir}/yow.c $(LOADLIBES) -o yow
diff --git a/editors/emacs22/files/patch-ba b/editors/emacs22/files/patch-ba
deleted file mode 100644
index c9f637aa3ba4..000000000000
--- a/editors/emacs22/files/patch-ba
+++ /dev/null
@@ -1,22 +0,0 @@
---- lib-src/emacsclient.c.old	Tue Jul 23 23:18:33 1996
-+++ lib-src/emacsclient.c	Thu Oct  8 22:34:54 1998
-@@ -94,6 +94,8 @@
-     struct stat statbfr;
- 
-     gethostname (system_name, sizeof (system_name));
-+    system_name[sizeof (system_name) - 1] = '\0';
-+		/* system_name must be null-terminated string */
-     sprintf (server.sun_path, "/tmp/esrv%d-%s", geteuid (), system_name);
- 
-     if (stat (server.sun_path, &statbfr) == -1)
---- lib-src/emacsserver.c.old	Wed Jul 17 07:09:29 1996
-+++ lib-src/emacsserver.c	Thu Oct  8 22:35:08 1998
-@@ -115,6 +115,8 @@
-   server.sun_family = AF_UNIX;
- #ifndef SERVER_HOME_DIR
-   gethostname (system_name, sizeof (system_name));
-+  system_name[sizeof (system_name) - 1] = '\0';
-+		/* system_name must be null-terminated string */
-   sprintf (server.sun_path, "/tmp/esrv%d-%s", geteuid (), system_name);
- 
-   if (unlink (server.sun_path) == -1 && errno != ENOENT)
diff --git a/editors/emacs22/files/patch-bb b/editors/emacs22/files/patch-bb
deleted file mode 100644
index 1d6fcf08137e..000000000000
--- a/editors/emacs22/files/patch-bb
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/emacs.c.orig	Fri Sep  6 17:15:38 2002
-+++ src/emacs.c	Fri Sep  6 17:16:33 2002
-@@ -427,8 +427,6 @@
- {
-   char stack_bottom_variable;
-   int skip_args = 0;
--  extern int errno;
--  extern sys_nerr;
- 
- #ifdef LINUX_SBRK_BUG
-   __sbrk (1);
diff --git a/editors/emacs22/pkg-descr b/editors/emacs22/pkg-descr
deleted file mode 100644
index 87a11a9cf372..000000000000
--- a/editors/emacs22/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-GNU Emacs is a self-documenting, customizable, extensible real-time
-display editor.
-
-Users new to Emacs will be able to use basic features fairly rapidly
-by studying the tutorial and using the self-documentation features.
-Emacs also has an extensive interactive manual browser.  It is easily
-extensible since its editing commands are written in Lisp.
-
-GNU Emacs's many special packages handle mail reading (RMail) and
-sending (Mail), outline editing (Outline), compiling (Compile),
-running subshells within Emacs windows (Shell), running a Lisp
-read-eval-print loop (Lisp-Interaction-Mode), automated psychotherapy
-(Doctor :-) and many more.
-
-WWW: http://www.gnu.org/software/emacs/
diff --git a/editors/emacs22/pkg-plist b/editors/emacs22/pkg-plist
deleted file mode 100644
index bd28773b2034..000000000000
--- a/editors/emacs22/pkg-plist
+++ /dev/null
@@ -1,1051 +0,0 @@
-bin/ctags
-bin/b2m
-bin/rcs-checkin
-bin/emacs-%%EMACS_VERSION%%
-@exec ln -s %D/%F %B/emacs
-@unexec rm %B/emacs
-bin/etags
-bin/emacsclient
-@exec if [ ! -d %d/share/emacs/site-lisp ]; then mkdir -p %D/share/emacs/site-lisp; fi
-@exec if [ ! -d %d/share/emacs/%%EMACS_VERSION%%/site-lisp ]; then mkdir -p %D/share/emacs/%%EMACS_VERSION%%/site-lisp; fi
-@exec mkdir -p /var/run/emacs/lock ; chmod 1777 /var/run/emacs/lock
-etc/rc.d/emacs.sh
-@comment This can fail if other ports are installed, no need to
-@comment scare user in that case
-@unexec rmdir %D/share/emacs/%%EMACS_VERSION%%/site-lisp 2>/dev/null || true
-@unexec install-info --delete %D/info/emacs %D/info/dir
-@unexec install-info --delete %D/info/vip %D/info/dir
-@unexec install-info --delete %D/info/viper %D/info/dir
-@unexec install-info --delete %D/info/forms %D/info/dir
-@unexec install-info --delete %D/info/gnus %D/info/dir
-@unexec install-info --delete %D/info/mh-e %D/info/dir
-@unexec install-info --delete %D/info/cl %D/info/dir
-@unexec install-info --delete %D/info/sc %D/info/dir
-@unexec install-info --delete %D/info/dired-x %D/info/dir
-@unexec install-info --delete %D/info/ediff %D/info/dir
-@unexec install-info --delete %D/info/ccmode %D/info/dir
-@unexec install-info --delete %D/info/message %D/info/dir
-info/ccmode
-info/ccmode-1
-info/ccmode-2
-info/cl
-info/cl-1
-info/cl-2
-info/cl-3
-info/cl-4
-info/cl-5
-info/cl-6
-info/dired-x
-info/ediff
-info/ediff-1
-info/ediff-2
-info/emacs
-info/emacs-1
-info/emacs-10
-info/emacs-11
-info/emacs-12
-info/emacs-13
-info/emacs-14
-info/emacs-15
-info/emacs-16
-info/emacs-17
-info/emacs-18
-info/emacs-19
-info/emacs-2
-info/emacs-20
-info/emacs-21
-info/emacs-22
-info/emacs-23
-info/emacs-24
-info/emacs-25
-info/emacs-26
-info/emacs-27
-info/emacs-28
-info/emacs-29
-info/emacs-3
-info/emacs-4
-info/emacs-5
-info/emacs-6
-info/emacs-7
-info/emacs-8
-info/emacs-9
-info/forms
-info/gnus
-info/gnus-1
-info/gnus-2
-info/gnus-3
-info/gnus-4
-info/gnus-5
-info/gnus-6
-info/gnus-7
-info/gnus-8
-info/gnus-9
-info/gnus-10
-info/gnus-11
-info/message
-info/mh-e
-info/mh-e-1
-info/mh-e-2
-info/mh-e-3
-info/mh-e-4
-info/sc
-info/sc-1
-info/sc-2
-info/sc-3
-info/vip
-info/vip-1
-info/vip-2
-info/viper
-info/viper-1
-info/viper-2
-info/viper-3
-info/viper-4
-@exec install-info %D/info/emacs %D/info/dir
-@exec install-info %D/info/vip %D/info/dir
-@exec install-info %D/info/viper %D/info/dir
-@exec install-info %D/info/forms %D/info/dir
-@exec install-info %D/info/gnus %D/info/dir
-@exec install-info %D/info/mh-e %D/info/dir
-@exec install-info %D/info/cl %D/info/dir
-@exec install-info %D/info/sc %D/info/dir
-@exec install-info %D/info/dired-x %D/info/dir
-@exec install-info %D/info/ediff %D/info/dir
-@exec install-info %D/info/ccmode %D/info/dir
-@exec install-info %D/info/message %D/info/dir
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/cvtmail
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/digest-doc
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/emacsserver
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/fakemail
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/hexl
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/movemail
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/profile
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/rcs2log
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/sorted-doc
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/vcdiff
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/yow
-@dirrm libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%
-@dirrm libexec/emacs/%%EMACS_VERSION%%
-@unexec rmdir %D/libexec/emacs 2>/dev/null || true
-share/emacs/%%EMACS_VERSION%%/etc/3B-MAXMEM
-share/emacs/%%EMACS_VERSION%%/etc/AIX.DUMP
-share/emacs/%%EMACS_VERSION%%/etc/BABYL
-share/emacs/%%EMACS_VERSION%%/etc/CENSORSHIP
-share/emacs/%%EMACS_VERSION%%/etc/COOKIES
-share/emacs/%%EMACS_VERSION%%/etc/COPYING
-share/emacs/%%EMACS_VERSION%%/etc/DEBUG
-share/emacs/%%EMACS_VERSION%%/etc/DISTRIB
-share/emacs/%%EMACS_VERSION%%/etc/DOC-%%EMACS_VERSION%%.1
-share/emacs/%%EMACS_VERSION%%/etc/FAQ
-share/emacs/%%EMACS_VERSION%%/etc/FTP
-share/emacs/%%EMACS_VERSION%%/etc/GNU
-share/emacs/%%EMACS_VERSION%%/etc/INTERVIEW
-share/emacs/%%EMACS_VERSION%%/etc/JOKES
-share/emacs/%%EMACS_VERSION%%/etc/LEDIT
-share/emacs/%%EMACS_VERSION%%/etc/LINUX-GNU
-share/emacs/%%EMACS_VERSION%%/etc/LNEWS
-share/emacs/%%EMACS_VERSION%%/etc/LPF
-share/emacs/%%EMACS_VERSION%%/etc/MACHINES
-share/emacs/%%EMACS_VERSION%%/etc/MAILINGLISTS
-share/emacs/%%EMACS_VERSION%%/etc/MH-E-NEWS
-share/emacs/%%EMACS_VERSION%%/etc/MH-E-ONEWS
-share/emacs/%%EMACS_VERSION%%/etc/MORE.STUFF
-share/emacs/%%EMACS_VERSION%%/etc/MOTIVATION
-share/emacs/%%EMACS_VERSION%%/etc/NEWS
-share/emacs/%%EMACS_VERSION%%/etc/ONEWS
-share/emacs/%%EMACS_VERSION%%/etc/OONEWS
-share/emacs/%%EMACS_VERSION%%/etc/OOONEWS
-share/emacs/%%EMACS_VERSION%%/etc/OOOONEWS
-share/emacs/%%EMACS_VERSION%%/etc/ORDERS
-share/emacs/%%EMACS_VERSION%%/etc/ORDERS.EUROPE
-share/emacs/%%EMACS_VERSION%%/etc/ORDERS.JAPAN
-share/emacs/%%EMACS_VERSION%%/etc/OTHER.EMACSES
-share/emacs/%%EMACS_VERSION%%/etc/README
-share/emacs/%%EMACS_VERSION%%/etc/SERVICE
-share/emacs/%%EMACS_VERSION%%/etc/SUN-SUPPORT
-share/emacs/%%EMACS_VERSION%%/etc/TERMS
-share/emacs/%%EMACS_VERSION%%/etc/TODO
-share/emacs/%%EMACS_VERSION%%/etc/TUTORIAL
-share/emacs/%%EMACS_VERSION%%/etc/WHY-FREE
-share/emacs/%%EMACS_VERSION%%/etc/Xkeymap.txt
-share/emacs/%%EMACS_VERSION%%/etc/celibacy.1
-share/emacs/%%EMACS_VERSION%%/etc/condom.1
-share/emacs/%%EMACS_VERSION%%/etc/copying.paper
-share/emacs/%%EMACS_VERSION%%/etc/ctags.1
-share/emacs/%%EMACS_VERSION%%/etc/e/eterm
-share/emacs/%%EMACS_VERSION%%/etc/e/eterm.ti
-share/emacs/%%EMACS_VERSION%%/etc/echo.msg
-share/emacs/%%EMACS_VERSION%%/etc/edt-user.doc
-share/emacs/%%EMACS_VERSION%%/etc/emacs.1
-share/emacs/%%EMACS_VERSION%%/etc/emacs.bash
-share/emacs/%%EMACS_VERSION%%/etc/emacs.csh
-share/emacs/%%EMACS_VERSION%%/etc/emacs.icon
-share/emacs/%%EMACS_VERSION%%/etc/emacs.xbm
-share/emacs/%%EMACS_VERSION%%/etc/emacstool.1
-share/emacs/%%EMACS_VERSION%%/etc/enriched.doc
-share/emacs/%%EMACS_VERSION%%/etc/etags.1
-share/emacs/%%EMACS_VERSION%%/etc/future-bug
-share/emacs/%%EMACS_VERSION%%/etc/gnu.xpm
-share/emacs/%%EMACS_VERSION%%/etc/gnus-tut.txt
-share/emacs/%%EMACS_VERSION%%/etc/ledit.l
-share/emacs/%%EMACS_VERSION%%/etc/ms-7bkermit
-share/emacs/%%EMACS_VERSION%%/etc/ms-kermit
-share/emacs/%%EMACS_VERSION%%/etc/news.texi
-share/emacs/%%EMACS_VERSION%%/etc/refcard.bit
-share/emacs/%%EMACS_VERSION%%/etc/refcard.ps
-share/emacs/%%EMACS_VERSION%%/etc/refcard.tex
-share/emacs/%%EMACS_VERSION%%/etc/rgb.txt
-share/emacs/%%EMACS_VERSION%%/etc/sex.6
-share/emacs/%%EMACS_VERSION%%/etc/spook.lines
-share/emacs/%%EMACS_VERSION%%/etc/termcap.src
-share/emacs/%%EMACS_VERSION%%/etc/ulimit.hack
-share/emacs/%%EMACS_VERSION%%/etc/vipcard.tex
-share/emacs/%%EMACS_VERSION%%/etc/viperCard.tex
-share/emacs/%%EMACS_VERSION%%/etc/yow.lines
-share/emacs/%%EMACS_VERSION%%/lisp/COPYING
-share/emacs/%%EMACS_VERSION%%/lisp/README
-share/emacs/%%EMACS_VERSION%%/lisp/abbrev.el
-share/emacs/%%EMACS_VERSION%%/lisp/abbrev.elc
-share/emacs/%%EMACS_VERSION%%/lisp/abbrevlist.el
-share/emacs/%%EMACS_VERSION%%/lisp/abbrevlist.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ada-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/ada-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/add-log.el
-share/emacs/%%EMACS_VERSION%%/lisp/add-log.elc
-share/emacs/%%EMACS_VERSION%%/lisp/advice.el
-share/emacs/%%EMACS_VERSION%%/lisp/advice.elc
-share/emacs/%%EMACS_VERSION%%/lisp/allout.el
-share/emacs/%%EMACS_VERSION%%/lisp/allout.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ange-ftp.el
-share/emacs/%%EMACS_VERSION%%/lisp/ange-ftp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/appt.el
-share/emacs/%%EMACS_VERSION%%/lisp/appt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/apropos.el
-share/emacs/%%EMACS_VERSION%%/lisp/apropos.elc
-share/emacs/%%EMACS_VERSION%%/lisp/arc-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/arc-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/array.el
-share/emacs/%%EMACS_VERSION%%/lisp/array.elc
-share/emacs/%%EMACS_VERSION%%/lisp/asm-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/asm-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/assoc.el
-share/emacs/%%EMACS_VERSION%%/lisp/assoc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/auto-show.el
-share/emacs/%%EMACS_VERSION%%/lisp/auto-show.elc
-share/emacs/%%EMACS_VERSION%%/lisp/autoinsert.el
-share/emacs/%%EMACS_VERSION%%/lisp/autoinsert.elc
-share/emacs/%%EMACS_VERSION%%/lisp/autoload.el
-share/emacs/%%EMACS_VERSION%%/lisp/autoload.elc
-share/emacs/%%EMACS_VERSION%%/lisp/avoid.el
-share/emacs/%%EMACS_VERSION%%/lisp/avoid.elc
-share/emacs/%%EMACS_VERSION%%/lisp/awk-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/awk-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/backquote.el
-share/emacs/%%EMACS_VERSION%%/lisp/backquote.elc
-share/emacs/%%EMACS_VERSION%%/lisp/bib-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/bib-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/bibtex.el
-share/emacs/%%EMACS_VERSION%%/lisp/bibtex.elc
-share/emacs/%%EMACS_VERSION%%/lisp/blackbox.el
-share/emacs/%%EMACS_VERSION%%/lisp/blackbox.elc
-share/emacs/%%EMACS_VERSION%%/lisp/blessmail.el
-share/emacs/%%EMACS_VERSION%%/lisp/bookmark.el
-share/emacs/%%EMACS_VERSION%%/lisp/bookmark.elc
-share/emacs/%%EMACS_VERSION%%/lisp/browse-url.el
-share/emacs/%%EMACS_VERSION%%/lisp/browse-url.elc
-share/emacs/%%EMACS_VERSION%%/lisp/buff-menu.el
-share/emacs/%%EMACS_VERSION%%/lisp/buff-menu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/byte-opt.el
-share/emacs/%%EMACS_VERSION%%/lisp/byte-opt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/byte-run.el
-share/emacs/%%EMACS_VERSION%%/lisp/byte-run.elc
-share/emacs/%%EMACS_VERSION%%/lisp/bytecomp.el
-share/emacs/%%EMACS_VERSION%%/lisp/bytecomp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/c-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/c-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-china.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-china.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-coptic.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-coptic.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-dst.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-dst.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-french.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-french.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-hebrew.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-hebrew.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-islam.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-islam.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-iso.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-iso.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-julian.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-julian.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-mayan.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-mayan.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-menu.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-menu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-move.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-move.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-persia.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-persia.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-tex.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-tex.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-x.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-x.elc
-share/emacs/%%EMACS_VERSION%%/lisp/calendar.el
-share/emacs/%%EMACS_VERSION%%/lisp/calendar.elc
-share/emacs/%%EMACS_VERSION%%/lisp/case-table.el
-share/emacs/%%EMACS_VERSION%%/lisp/case-table.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cc-compat.el
-share/emacs/%%EMACS_VERSION%%/lisp/cc-compat.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cc-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/cc-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cdl.el
-share/emacs/%%EMACS_VERSION%%/lisp/cdl.elc
-share/emacs/%%EMACS_VERSION%%/lisp/chistory.el
-share/emacs/%%EMACS_VERSION%%/lisp/chistory.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cl-compat.el
-share/emacs/%%EMACS_VERSION%%/lisp/cl-compat.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cl-extra.el
-share/emacs/%%EMACS_VERSION%%/lisp/cl-extra.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cl-indent.el
-share/emacs/%%EMACS_VERSION%%/lisp/cl-indent.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cl-macs.el
-share/emacs/%%EMACS_VERSION%%/lisp/cl-macs.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cl-seq.el
-share/emacs/%%EMACS_VERSION%%/lisp/cl-seq.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cl-specs.el
-share/emacs/%%EMACS_VERSION%%/lisp/cl-specs.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cl.el
-share/emacs/%%EMACS_VERSION%%/lisp/cl.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cmacexp.el
-share/emacs/%%EMACS_VERSION%%/lisp/cmacexp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cmuscheme.el
-share/emacs/%%EMACS_VERSION%%/lisp/cmuscheme.elc
-share/emacs/%%EMACS_VERSION%%/lisp/comint.el
-share/emacs/%%EMACS_VERSION%%/lisp/comint.elc
-share/emacs/%%EMACS_VERSION%%/lisp/compare-w.el
-share/emacs/%%EMACS_VERSION%%/lisp/compare-w.elc
-share/emacs/%%EMACS_VERSION%%/lisp/compile.el
-share/emacs/%%EMACS_VERSION%%/lisp/compile.elc
-share/emacs/%%EMACS_VERSION%%/lisp/complete.el
-share/emacs/%%EMACS_VERSION%%/lisp/complete.elc
-share/emacs/%%EMACS_VERSION%%/lisp/completion.el
-share/emacs/%%EMACS_VERSION%%/lisp/completion.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cookie1.el
-share/emacs/%%EMACS_VERSION%%/lisp/cookie1.elc
-share/emacs/%%EMACS_VERSION%%/lisp/copyright.el
-share/emacs/%%EMACS_VERSION%%/lisp/copyright.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cplus-md.el
-share/emacs/%%EMACS_VERSION%%/lisp/cplus-md.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cpp.el
-share/emacs/%%EMACS_VERSION%%/lisp/cpp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cust-print.el
-share/emacs/%%EMACS_VERSION%%/lisp/cust-print.elc
-share/emacs/%%EMACS_VERSION%%/lisp/custom.el
-share/emacs/%%EMACS_VERSION%%/lisp/custom.elc
-share/emacs/%%EMACS_VERSION%%/lisp/dabbrev.el
-share/emacs/%%EMACS_VERSION%%/lisp/dabbrev.elc
-share/emacs/%%EMACS_VERSION%%/lisp/debug.el
-share/emacs/%%EMACS_VERSION%%/lisp/debug.elc
-share/emacs/%%EMACS_VERSION%%/lisp/decipher.el
-share/emacs/%%EMACS_VERSION%%/lisp/decipher.elc
-share/emacs/%%EMACS_VERSION%%/lisp/delsel.el
-share/emacs/%%EMACS_VERSION%%/lisp/delsel.elc
-share/emacs/%%EMACS_VERSION%%/lisp/derived.el
-share/emacs/%%EMACS_VERSION%%/lisp/derived.elc
-share/emacs/%%EMACS_VERSION%%/lisp/desktop.el
-share/emacs/%%EMACS_VERSION%%/lisp/desktop.elc
-share/emacs/%%EMACS_VERSION%%/lisp/diary-lib.el
-share/emacs/%%EMACS_VERSION%%/lisp/diary-lib.elc
-share/emacs/%%EMACS_VERSION%%/lisp/diff.el
-share/emacs/%%EMACS_VERSION%%/lisp/diff.elc
-share/emacs/%%EMACS_VERSION%%/lisp/dired-aux.el
-share/emacs/%%EMACS_VERSION%%/lisp/dired-aux.elc
-share/emacs/%%EMACS_VERSION%%/lisp/dired-x.el
-share/emacs/%%EMACS_VERSION%%/lisp/dired-x.elc
-share/emacs/%%EMACS_VERSION%%/lisp/dired.el
-share/emacs/%%EMACS_VERSION%%/lisp/dired.elc
-share/emacs/%%EMACS_VERSION%%/lisp/disass.el
-share/emacs/%%EMACS_VERSION%%/lisp/disass.elc
-share/emacs/%%EMACS_VERSION%%/lisp/disp-table.el
-share/emacs/%%EMACS_VERSION%%/lisp/disp-table.elc
-share/emacs/%%EMACS_VERSION%%/lisp/dissociate.el
-share/emacs/%%EMACS_VERSION%%/lisp/dissociate.elc
-share/emacs/%%EMACS_VERSION%%/lisp/docref.el
-share/emacs/%%EMACS_VERSION%%/lisp/docref.elc
-share/emacs/%%EMACS_VERSION%%/lisp/doctor.el
-share/emacs/%%EMACS_VERSION%%/lisp/doctor.elc
-share/emacs/%%EMACS_VERSION%%/lisp/dos-fns.el
-share/emacs/%%EMACS_VERSION%%/lisp/dos-fns.elc
-share/emacs/%%EMACS_VERSION%%/lisp/double.el
-share/emacs/%%EMACS_VERSION%%/lisp/double.elc
-share/emacs/%%EMACS_VERSION%%/lisp/dunnet.el
-share/emacs/%%EMACS_VERSION%%/lisp/dunnet.elc
-share/emacs/%%EMACS_VERSION%%/lisp/easymenu.el
-share/emacs/%%EMACS_VERSION%%/lisp/easymenu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ebuff-menu.el
-share/emacs/%%EMACS_VERSION%%/lisp/ebuff-menu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/echistory.el
-share/emacs/%%EMACS_VERSION%%/lisp/echistory.elc
-share/emacs/%%EMACS_VERSION%%/lisp/edebug.el
-share/emacs/%%EMACS_VERSION%%/lisp/edebug.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-diff.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-diff.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-hook.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-hook.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-init.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-init.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-merg.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-merg.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-mult.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-mult.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-ptch.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-ptch.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-util.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-util.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-vers.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-vers.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-wind.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-wind.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff.elc
-share/emacs/%%EMACS_VERSION%%/lisp/edmacro.el
-share/emacs/%%EMACS_VERSION%%/lisp/edmacro.elc
-share/emacs/%%EMACS_VERSION%%/lisp/edt-lk201.el
-share/emacs/%%EMACS_VERSION%%/lisp/edt-lk201.elc
-share/emacs/%%EMACS_VERSION%%/lisp/edt-mapper.el
-share/emacs/%%EMACS_VERSION%%/lisp/edt-mapper.elc
-share/emacs/%%EMACS_VERSION%%/lisp/edt-pc.el
-share/emacs/%%EMACS_VERSION%%/lisp/edt-pc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/edt-vt100.el
-share/emacs/%%EMACS_VERSION%%/lisp/edt-vt100.elc
-share/emacs/%%EMACS_VERSION%%/lisp/edt.el
-share/emacs/%%EMACS_VERSION%%/lisp/edt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ehelp.el
-share/emacs/%%EMACS_VERSION%%/lisp/ehelp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/electric.el
-share/emacs/%%EMACS_VERSION%%/lisp/electric.elc
-share/emacs/%%EMACS_VERSION%%/lisp/elp.el
-share/emacs/%%EMACS_VERSION%%/lisp/elp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/emacs-lock.el
-share/emacs/%%EMACS_VERSION%%/lisp/emacs-lock.elc
-share/emacs/%%EMACS_VERSION%%/lisp/emacsbug.el
-share/emacs/%%EMACS_VERSION%%/lisp/emacsbug.elc
-share/emacs/%%EMACS_VERSION%%/lisp/emerge.el
-share/emacs/%%EMACS_VERSION%%/lisp/emerge.elc
-share/emacs/%%EMACS_VERSION%%/lisp/enriched.el
-share/emacs/%%EMACS_VERSION%%/lisp/enriched.elc
-share/emacs/%%EMACS_VERSION%%/lisp/env.el
-share/emacs/%%EMACS_VERSION%%/lisp/env.elc
-share/emacs/%%EMACS_VERSION%%/lisp/etags.el
-share/emacs/%%EMACS_VERSION%%/lisp/etags.elc
-share/emacs/%%EMACS_VERSION%%/lisp/eval-reg.el
-share/emacs/%%EMACS_VERSION%%/lisp/eval-reg.elc
-share/emacs/%%EMACS_VERSION%%/lisp/executable.el
-share/emacs/%%EMACS_VERSION%%/lisp/executable.elc
-share/emacs/%%EMACS_VERSION%%/lisp/f90.el
-share/emacs/%%EMACS_VERSION%%/lisp/f90.elc
-share/emacs/%%EMACS_VERSION%%/lisp/facemenu.el
-share/emacs/%%EMACS_VERSION%%/lisp/facemenu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/faces.el
-share/emacs/%%EMACS_VERSION%%/lisp/faces.elc
-share/emacs/%%EMACS_VERSION%%/lisp/fast-lock.el
-share/emacs/%%EMACS_VERSION%%/lisp/fast-lock.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ffap.el
-share/emacs/%%EMACS_VERSION%%/lisp/ffap.elc
-share/emacs/%%EMACS_VERSION%%/lisp/files.el
-share/emacs/%%EMACS_VERSION%%/lisp/files.elc
-share/emacs/%%EMACS_VERSION%%/lisp/fill.el
-share/emacs/%%EMACS_VERSION%%/lisp/fill.elc
-share/emacs/%%EMACS_VERSION%%/lisp/find-dired.el
-share/emacs/%%EMACS_VERSION%%/lisp/find-dired.elc
-share/emacs/%%EMACS_VERSION%%/lisp/find-file.el
-share/emacs/%%EMACS_VERSION%%/lisp/find-file.elc
-share/emacs/%%EMACS_VERSION%%/lisp/find-gc.el
-share/emacs/%%EMACS_VERSION%%/lisp/find-gc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/finder-inf.el
-share/emacs/%%EMACS_VERSION%%/lisp/finder-inf.elc
-share/emacs/%%EMACS_VERSION%%/lisp/finder.el
-share/emacs/%%EMACS_VERSION%%/lisp/finder.elc
-share/emacs/%%EMACS_VERSION%%/lisp/float-sup.el
-share/emacs/%%EMACS_VERSION%%/lisp/float-sup.elc
-share/emacs/%%EMACS_VERSION%%/lisp/float.el
-share/emacs/%%EMACS_VERSION%%/lisp/float.elc
-share/emacs/%%EMACS_VERSION%%/lisp/flow-ctrl.el
-share/emacs/%%EMACS_VERSION%%/lisp/flow-ctrl.elc
-share/emacs/%%EMACS_VERSION%%/lisp/foldout.el
-share/emacs/%%EMACS_VERSION%%/lisp/foldout.elc
-share/emacs/%%EMACS_VERSION%%/lisp/follow.el
-share/emacs/%%EMACS_VERSION%%/lisp/follow.elc
-share/emacs/%%EMACS_VERSION%%/lisp/font-lock.el
-share/emacs/%%EMACS_VERSION%%/lisp/font-lock.elc
-share/emacs/%%EMACS_VERSION%%/lisp/format.el
-share/emacs/%%EMACS_VERSION%%/lisp/format.elc
-share/emacs/%%EMACS_VERSION%%/lisp/forms-d2.dat
-share/emacs/%%EMACS_VERSION%%/lisp/forms-d2.el
-share/emacs/%%EMACS_VERSION%%/lisp/forms-pass.el
-share/emacs/%%EMACS_VERSION%%/lisp/forms.el
-share/emacs/%%EMACS_VERSION%%/lisp/forms.elc
-share/emacs/%%EMACS_VERSION%%/lisp/fortran.el
-share/emacs/%%EMACS_VERSION%%/lisp/fortran.elc
-share/emacs/%%EMACS_VERSION%%/lisp/frame.el
-share/emacs/%%EMACS_VERSION%%/lisp/frame.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-cache.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-cache.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-cite.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-cite.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-cus.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-cus.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-demon.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-demon.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-edit.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-edit.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-ems.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-ems.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-gl.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-gl.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-kill.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-kill.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-mh.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-mh.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-msg.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-msg.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-nocem.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-nocem.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-salt.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-salt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-score.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-score.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-setup.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-setup.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-soup.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-soup.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-srvr.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-srvr.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-topic.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-topic.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-uu.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-uu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-vis.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-vis.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-vm.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-vm.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gomoku.el
-share/emacs/%%EMACS_VERSION%%/lisp/gomoku.elc
-share/emacs/%%EMACS_VERSION%%/lisp/goto-addr.el
-share/emacs/%%EMACS_VERSION%%/lisp/goto-addr.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gud.el
-share/emacs/%%EMACS_VERSION%%/lisp/gud.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gulp.el
-share/emacs/%%EMACS_VERSION%%/lisp/gulp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/hanoi.el
-share/emacs/%%EMACS_VERSION%%/lisp/hanoi.elc
-share/emacs/%%EMACS_VERSION%%/lisp/help-macro.el
-share/emacs/%%EMACS_VERSION%%/lisp/help-macro.elc
-share/emacs/%%EMACS_VERSION%%/lisp/help.el
-share/emacs/%%EMACS_VERSION%%/lisp/help.elc
-share/emacs/%%EMACS_VERSION%%/lisp/helper.el
-share/emacs/%%EMACS_VERSION%%/lisp/helper.elc
-share/emacs/%%EMACS_VERSION%%/lisp/hexl.el
-share/emacs/%%EMACS_VERSION%%/lisp/hexl.elc
-share/emacs/%%EMACS_VERSION%%/lisp/hideif.el
-share/emacs/%%EMACS_VERSION%%/lisp/hideif.elc
-share/emacs/%%EMACS_VERSION%%/lisp/hideshow.el
-share/emacs/%%EMACS_VERSION%%/lisp/hideshow.elc
-share/emacs/%%EMACS_VERSION%%/lisp/hilit19.el
-share/emacs/%%EMACS_VERSION%%/lisp/hilit19.elc
-share/emacs/%%EMACS_VERSION%%/lisp/hippie-exp.el
-share/emacs/%%EMACS_VERSION%%/lisp/hippie-exp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/holidays.el
-share/emacs/%%EMACS_VERSION%%/lisp/holidays.elc
-share/emacs/%%EMACS_VERSION%%/lisp/icomplete.el
-share/emacs/%%EMACS_VERSION%%/lisp/icomplete.elc
-share/emacs/%%EMACS_VERSION%%/lisp/icon.el
-share/emacs/%%EMACS_VERSION%%/lisp/icon.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ielm.el
-share/emacs/%%EMACS_VERSION%%/lisp/ielm.elc
-share/emacs/%%EMACS_VERSION%%/lisp/imenu.el
-share/emacs/%%EMACS_VERSION%%/lisp/imenu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/indent.el
-share/emacs/%%EMACS_VERSION%%/lisp/indent.elc
-share/emacs/%%EMACS_VERSION%%/lisp/inf-lisp.el
-share/emacs/%%EMACS_VERSION%%/lisp/inf-lisp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/info.el
-share/emacs/%%EMACS_VERSION%%/lisp/info.elc
-share/emacs/%%EMACS_VERSION%%/lisp/informat.el
-share/emacs/%%EMACS_VERSION%%/lisp/informat.elc
-share/emacs/%%EMACS_VERSION%%/lisp/isearch.el
-share/emacs/%%EMACS_VERSION%%/lisp/isearch.elc
-share/emacs/%%EMACS_VERSION%%/lisp/iso-acc.el
-share/emacs/%%EMACS_VERSION%%/lisp/iso-acc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/iso-ascii.el
-share/emacs/%%EMACS_VERSION%%/lisp/iso-ascii.elc
-share/emacs/%%EMACS_VERSION%%/lisp/iso-cvt.el
-share/emacs/%%EMACS_VERSION%%/lisp/iso-cvt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/iso-insert.el
-share/emacs/%%EMACS_VERSION%%/lisp/iso-insert.elc
-share/emacs/%%EMACS_VERSION%%/lisp/iso-swed.el
-share/emacs/%%EMACS_VERSION%%/lisp/iso-swed.elc
-share/emacs/%%EMACS_VERSION%%/lisp/iso-syntax.el
-share/emacs/%%EMACS_VERSION%%/lisp/iso-syntax.elc
-share/emacs/%%EMACS_VERSION%%/lisp/iso-transl.el
-share/emacs/%%EMACS_VERSION%%/lisp/iso-transl.elc
-share/emacs/%%EMACS_VERSION%%/lisp/iso02-syn.el
-share/emacs/%%EMACS_VERSION%%/lisp/iso02-syn.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ispell.el
-share/emacs/%%EMACS_VERSION%%/lisp/ispell.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ispell4.el
-share/emacs/%%EMACS_VERSION%%/lisp/ispell4.elc
-share/emacs/%%EMACS_VERSION%%/lisp/jka-compr.el
-share/emacs/%%EMACS_VERSION%%/lisp/jka-compr.elc
-share/emacs/%%EMACS_VERSION%%/lisp/kermit.el
-share/emacs/%%EMACS_VERSION%%/lisp/kermit.elc
-share/emacs/%%EMACS_VERSION%%/lisp/lazy-lock.el
-share/emacs/%%EMACS_VERSION%%/lisp/lazy-lock.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ledit.el
-share/emacs/%%EMACS_VERSION%%/lisp/ledit.elc
-share/emacs/%%EMACS_VERSION%%/lisp/levents.el
-share/emacs/%%EMACS_VERSION%%/lisp/levents.elc
-share/emacs/%%EMACS_VERSION%%/lisp/life.el
-share/emacs/%%EMACS_VERSION%%/lisp/life.elc
-share/emacs/%%EMACS_VERSION%%/lisp/lisp-mnt.el
-share/emacs/%%EMACS_VERSION%%/lisp/lisp-mnt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/lisp-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/lisp-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/lisp.el
-share/emacs/%%EMACS_VERSION%%/lisp/lisp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/lmenu.el
-share/emacs/%%EMACS_VERSION%%/lisp/lmenu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/loaddefs.el
-share/emacs/%%EMACS_VERSION%%/lisp/loadhist.el
-share/emacs/%%EMACS_VERSION%%/lisp/loadhist.elc
-share/emacs/%%EMACS_VERSION%%/lisp/loadup.el
-share/emacs/%%EMACS_VERSION%%/lisp/lpr.el
-share/emacs/%%EMACS_VERSION%%/lisp/lpr.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ls-lisp.el
-share/emacs/%%EMACS_VERSION%%/lisp/ls-lisp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/lselect.el
-share/emacs/%%EMACS_VERSION%%/lisp/lselect.elc
-share/emacs/%%EMACS_VERSION%%/lisp/lucid.el
-share/emacs/%%EMACS_VERSION%%/lisp/lucid.elc
-share/emacs/%%EMACS_VERSION%%/lisp/lunar.el
-share/emacs/%%EMACS_VERSION%%/lisp/lunar.elc
-share/emacs/%%EMACS_VERSION%%/lisp/macros.el
-share/emacs/%%EMACS_VERSION%%/lisp/macros.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mail-extr.el
-share/emacs/%%EMACS_VERSION%%/lisp/mail-extr.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mail-hist.el
-share/emacs/%%EMACS_VERSION%%/lisp/mail-hist.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mail-utils.el
-share/emacs/%%EMACS_VERSION%%/lisp/mail-utils.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mailabbrev.el
-share/emacs/%%EMACS_VERSION%%/lisp/mailabbrev.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mailalias.el
-share/emacs/%%EMACS_VERSION%%/lisp/mailalias.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mailheader.el
-share/emacs/%%EMACS_VERSION%%/lisp/mailheader.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mailpost.el
-share/emacs/%%EMACS_VERSION%%/lisp/mailpost.elc
-share/emacs/%%EMACS_VERSION%%/lisp/make-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/make-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/makeinfo.el
-share/emacs/%%EMACS_VERSION%%/lisp/makeinfo.elc
-share/emacs/%%EMACS_VERSION%%/lisp/makesum.el
-share/emacs/%%EMACS_VERSION%%/lisp/makesum.elc
-share/emacs/%%EMACS_VERSION%%/lisp/man.el
-share/emacs/%%EMACS_VERSION%%/lisp/man.elc
-share/emacs/%%EMACS_VERSION%%/lisp/map-ynp.el
-share/emacs/%%EMACS_VERSION%%/lisp/map-ynp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/meese.el
-share/emacs/%%EMACS_VERSION%%/lisp/meese.elc
-share/emacs/%%EMACS_VERSION%%/lisp/menu-bar.el
-share/emacs/%%EMACS_VERSION%%/lisp/menu-bar.elc
-share/emacs/%%EMACS_VERSION%%/lisp/message.el
-share/emacs/%%EMACS_VERSION%%/lisp/message.elc
-share/emacs/%%EMACS_VERSION%%/lisp/metamail.el
-share/emacs/%%EMACS_VERSION%%/lisp/metamail.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mh-comp.el
-share/emacs/%%EMACS_VERSION%%/lisp/mh-comp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mh-e.el
-share/emacs/%%EMACS_VERSION%%/lisp/mh-e.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mh-funcs.el
-share/emacs/%%EMACS_VERSION%%/lisp/mh-funcs.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mh-mime.el
-share/emacs/%%EMACS_VERSION%%/lisp/mh-mime.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mh-pick.el
-share/emacs/%%EMACS_VERSION%%/lisp/mh-pick.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mh-seq.el
-share/emacs/%%EMACS_VERSION%%/lisp/mh-seq.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mh-utils.el
-share/emacs/%%EMACS_VERSION%%/lisp/mh-utils.elc
-share/emacs/%%EMACS_VERSION%%/lisp/misc.el
-share/emacs/%%EMACS_VERSION%%/lisp/misc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mlconvert.el
-share/emacs/%%EMACS_VERSION%%/lisp/mlconvert.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mldrag.el
-share/emacs/%%EMACS_VERSION%%/lisp/mldrag.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mlsupport.el
-share/emacs/%%EMACS_VERSION%%/lisp/mlsupport.elc
-share/emacs/%%EMACS_VERSION%%/lisp/modula2.el
-share/emacs/%%EMACS_VERSION%%/lisp/modula2.elc
-share/emacs/%%EMACS_VERSION%%/lisp/morse.el
-share/emacs/%%EMACS_VERSION%%/lisp/morse.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mouse-sel.el
-share/emacs/%%EMACS_VERSION%%/lisp/mouse-sel.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mouse.el
-share/emacs/%%EMACS_VERSION%%/lisp/mouse.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mpuz.el
-share/emacs/%%EMACS_VERSION%%/lisp/mpuz.elc
-share/emacs/%%EMACS_VERSION%%/lisp/msb.el
-share/emacs/%%EMACS_VERSION%%/lisp/msb.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnbabyl.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnbabyl.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nndb.el
-share/emacs/%%EMACS_VERSION%%/lisp/nndb.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nndir.el
-share/emacs/%%EMACS_VERSION%%/lisp/nndir.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nndoc.el
-share/emacs/%%EMACS_VERSION%%/lisp/nndoc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nneething.el
-share/emacs/%%EMACS_VERSION%%/lisp/nneething.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnfolder.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnfolder.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnheader.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnheader.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnkiboze.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnkiboze.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnmail.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnmail.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnmbox.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnmbox.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnmh.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnmh.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnml.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnml.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnoo.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnoo.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnsoup.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnsoup.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnspool.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnspool.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nntp.el
-share/emacs/%%EMACS_VERSION%%/lisp/nntp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnvirtual.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnvirtual.elc
-share/emacs/%%EMACS_VERSION%%/lisp/noutline.el
-share/emacs/%%EMACS_VERSION%%/lisp/noutline.elc
-share/emacs/%%EMACS_VERSION%%/lisp/novice.el
-share/emacs/%%EMACS_VERSION%%/lisp/novice.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nroff-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/nroff-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/options.el
-share/emacs/%%EMACS_VERSION%%/lisp/options.elc
-share/emacs/%%EMACS_VERSION%%/lisp/outline.el
-share/emacs/%%EMACS_VERSION%%/lisp/outline.elc
-share/emacs/%%EMACS_VERSION%%/lisp/page-ext.el
-share/emacs/%%EMACS_VERSION%%/lisp/page-ext.elc
-share/emacs/%%EMACS_VERSION%%/lisp/page.el
-share/emacs/%%EMACS_VERSION%%/lisp/page.elc
-share/emacs/%%EMACS_VERSION%%/lisp/paragraphs.el
-share/emacs/%%EMACS_VERSION%%/lisp/paragraphs.elc
-share/emacs/%%EMACS_VERSION%%/lisp/paren.el
-share/emacs/%%EMACS_VERSION%%/lisp/paren.elc
-share/emacs/%%EMACS_VERSION%%/lisp/pascal.el
-share/emacs/%%EMACS_VERSION%%/lisp/pascal.elc
-share/emacs/%%EMACS_VERSION%%/lisp/patcomp.el
-share/emacs/%%EMACS_VERSION%%/lisp/paths.el
-share/emacs/%%EMACS_VERSION%%/lisp/pc-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/pc-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/pc-select.el
-share/emacs/%%EMACS_VERSION%%/lisp/pc-select.elc
-share/emacs/%%EMACS_VERSION%%/lisp/perl-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/perl-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/picture.el
-share/emacs/%%EMACS_VERSION%%/lisp/picture.elc
-share/emacs/%%EMACS_VERSION%%/lisp/pp.el
-share/emacs/%%EMACS_VERSION%%/lisp/pp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/profile.el
-share/emacs/%%EMACS_VERSION%%/lisp/profile.elc
-share/emacs/%%EMACS_VERSION%%/lisp/prolog.el
-share/emacs/%%EMACS_VERSION%%/lisp/prolog.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ps-print.el
-share/emacs/%%EMACS_VERSION%%/lisp/ps-print.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rcompile.el
-share/emacs/%%EMACS_VERSION%%/lisp/rcompile.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rect.el
-share/emacs/%%EMACS_VERSION%%/lisp/rect.elc
-share/emacs/%%EMACS_VERSION%%/lisp/refbib.el
-share/emacs/%%EMACS_VERSION%%/lisp/refbib.elc
-share/emacs/%%EMACS_VERSION%%/lisp/refer.el
-share/emacs/%%EMACS_VERSION%%/lisp/refer.elc
-share/emacs/%%EMACS_VERSION%%/lisp/regi.el
-share/emacs/%%EMACS_VERSION%%/lisp/regi.elc
-share/emacs/%%EMACS_VERSION%%/lisp/register.el
-share/emacs/%%EMACS_VERSION%%/lisp/register.elc
-share/emacs/%%EMACS_VERSION%%/lisp/replace.el
-share/emacs/%%EMACS_VERSION%%/lisp/replace.elc
-share/emacs/%%EMACS_VERSION%%/lisp/reporter.el
-share/emacs/%%EMACS_VERSION%%/lisp/reporter.elc
-share/emacs/%%EMACS_VERSION%%/lisp/reposition.el
-share/emacs/%%EMACS_VERSION%%/lisp/reposition.elc
-share/emacs/%%EMACS_VERSION%%/lisp/resume.el
-share/emacs/%%EMACS_VERSION%%/lisp/resume.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rfc822.el
-share/emacs/%%EMACS_VERSION%%/lisp/rfc822.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ring.el
-share/emacs/%%EMACS_VERSION%%/lisp/ring.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rlogin.el
-share/emacs/%%EMACS_VERSION%%/lisp/rlogin.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rmail.el
-share/emacs/%%EMACS_VERSION%%/lisp/rmail.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rmailedit.el
-share/emacs/%%EMACS_VERSION%%/lisp/rmailedit.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rmailkwd.el
-share/emacs/%%EMACS_VERSION%%/lisp/rmailkwd.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rmailmsc.el
-share/emacs/%%EMACS_VERSION%%/lisp/rmailmsc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rmailout.el
-share/emacs/%%EMACS_VERSION%%/lisp/rmailout.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rmailsort.el
-share/emacs/%%EMACS_VERSION%%/lisp/rmailsort.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rmailsum.el
-share/emacs/%%EMACS_VERSION%%/lisp/rmailsum.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rnews.el
-share/emacs/%%EMACS_VERSION%%/lisp/rnews.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rnewspost.el
-share/emacs/%%EMACS_VERSION%%/lisp/rnewspost.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rot13.el
-share/emacs/%%EMACS_VERSION%%/lisp/rot13.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rsz-mini.el
-share/emacs/%%EMACS_VERSION%%/lisp/rsz-mini.elc
-share/emacs/%%EMACS_VERSION%%/lisp/s-region.el
-share/emacs/%%EMACS_VERSION%%/lisp/s-region.elc
-share/emacs/%%EMACS_VERSION%%/lisp/saveplace.el
-share/emacs/%%EMACS_VERSION%%/lisp/saveplace.elc
-share/emacs/%%EMACS_VERSION%%/lisp/sc.el
-share/emacs/%%EMACS_VERSION%%/lisp/scheme.el
-share/emacs/%%EMACS_VERSION%%/lisp/scheme.elc
-share/emacs/%%EMACS_VERSION%%/lisp/score-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/score-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/scribe.el
-share/emacs/%%EMACS_VERSION%%/lisp/scribe.elc
-share/emacs/%%EMACS_VERSION%%/lisp/scroll-bar.el
-share/emacs/%%EMACS_VERSION%%/lisp/scroll-bar.elc
-share/emacs/%%EMACS_VERSION%%/lisp/select.el
-share/emacs/%%EMACS_VERSION%%/lisp/select.elc
-share/emacs/%%EMACS_VERSION%%/lisp/sendmail.el
-share/emacs/%%EMACS_VERSION%%/lisp/sendmail.elc
-share/emacs/%%EMACS_VERSION%%/lisp/server.el
-share/emacs/%%EMACS_VERSION%%/lisp/server.elc
-share/emacs/%%EMACS_VERSION%%/lisp/sgml-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/sgml-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/sh-script.el
-share/emacs/%%EMACS_VERSION%%/lisp/sh-script.elc
-share/emacs/%%EMACS_VERSION%%/lisp/shadow.el
-share/emacs/%%EMACS_VERSION%%/lisp/shadow.elc
-share/emacs/%%EMACS_VERSION%%/lisp/shadowfile.el
-share/emacs/%%EMACS_VERSION%%/lisp/shadowfile.elc
-share/emacs/%%EMACS_VERSION%%/lisp/shell.el
-share/emacs/%%EMACS_VERSION%%/lisp/shell.elc
-share/emacs/%%EMACS_VERSION%%/lisp/simple.el
-share/emacs/%%EMACS_VERSION%%/lisp/simple.elc
-share/emacs/%%EMACS_VERSION%%/lisp/simula.el
-share/emacs/%%EMACS_VERSION%%/lisp/simula.elc
-share/emacs/%%EMACS_VERSION%%/lisp/skeleton.el
-share/emacs/%%EMACS_VERSION%%/lisp/skeleton.elc
-share/emacs/%%EMACS_VERSION%%/lisp/smtpmail.el
-share/emacs/%%EMACS_VERSION%%/lisp/smtpmail.elc
-share/emacs/%%EMACS_VERSION%%/lisp/solar.el
-share/emacs/%%EMACS_VERSION%%/lisp/solar.elc
-share/emacs/%%EMACS_VERSION%%/lisp/solitaire.el
-share/emacs/%%EMACS_VERSION%%/lisp/solitaire.elc
-share/emacs/%%EMACS_VERSION%%/lisp/sort.el
-share/emacs/%%EMACS_VERSION%%/lisp/sort.elc
-share/emacs/%%EMACS_VERSION%%/lisp/soundex.el
-share/emacs/%%EMACS_VERSION%%/lisp/soundex.elc
-share/emacs/%%EMACS_VERSION%%/lisp/spell.el
-share/emacs/%%EMACS_VERSION%%/lisp/spell.elc
-share/emacs/%%EMACS_VERSION%%/lisp/spook.el
-share/emacs/%%EMACS_VERSION%%/lisp/spook.elc
-share/emacs/%%EMACS_VERSION%%/lisp/startup.el
-share/emacs/%%EMACS_VERSION%%/lisp/startup.elc
-share/emacs/%%EMACS_VERSION%%/lisp/studly.el
-share/emacs/%%EMACS_VERSION%%/lisp/studly.elc
-share/emacs/%%EMACS_VERSION%%/lisp/subdirs.el
-share/emacs/%%EMACS_VERSION%%/lisp/subr.el
-share/emacs/%%EMACS_VERSION%%/lisp/subr.elc
-share/emacs/%%EMACS_VERSION%%/lisp/sun-curs.el
-share/emacs/%%EMACS_VERSION%%/lisp/sun-curs.elc
-share/emacs/%%EMACS_VERSION%%/lisp/sun-fns.el
-share/emacs/%%EMACS_VERSION%%/lisp/sun-fns.elc
-share/emacs/%%EMACS_VERSION%%/lisp/supercite.el
-share/emacs/%%EMACS_VERSION%%/lisp/supercite.elc
-share/emacs/%%EMACS_VERSION%%/lisp/swedish.el
-share/emacs/%%EMACS_VERSION%%/lisp/swedish.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tabify.el
-share/emacs/%%EMACS_VERSION%%/lisp/tabify.elc
-share/emacs/%%EMACS_VERSION%%/lisp/talk.el
-share/emacs/%%EMACS_VERSION%%/lisp/talk.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tar-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/tar-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tcl-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/tcl-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tcp.el
-share/emacs/%%EMACS_VERSION%%/lisp/tcp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/telnet.el
-share/emacs/%%EMACS_VERSION%%/lisp/telnet.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tempo.el
-share/emacs/%%EMACS_VERSION%%/lisp/tempo.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term-nasty.el
-share/emacs/%%EMACS_VERSION%%/lisp/term.el
-share/emacs/%%EMACS_VERSION%%/lisp/term.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/AT386.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/README
-share/emacs/%%EMACS_VERSION%%/lisp/term/apollo.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/apollo.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/bg-mouse.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/bg-mouse.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/bobcat.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/internal.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/keyswap.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/lk201.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/news.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/news.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/pc-win.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/pc-win.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/sun-mouse.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/sun-mouse.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/sun.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/sun.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/sup-mouse.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/sup-mouse.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/tvi970.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/tvi970.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt100.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt100.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt102.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt125.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt200.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt200.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt201.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt220.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt240.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt300.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt320.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt400.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt420.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/win32-win.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/win32-win.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/wyse50.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/wyse50.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/x-win.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/x-win.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/xterm.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/xterm.elc
-share/emacs/%%EMACS_VERSION%%/lisp/terminal.el
-share/emacs/%%EMACS_VERSION%%/lisp/terminal.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tex-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/tex-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/texinfmt.el
-share/emacs/%%EMACS_VERSION%%/lisp/texinfmt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/texinfo.el
-share/emacs/%%EMACS_VERSION%%/lisp/texinfo.elc
-share/emacs/%%EMACS_VERSION%%/lisp/texnfo-upd.el
-share/emacs/%%EMACS_VERSION%%/lisp/texnfo-upd.elc
-share/emacs/%%EMACS_VERSION%%/lisp/text-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/text-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/thingatpt.el
-share/emacs/%%EMACS_VERSION%%/lisp/thingatpt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/time-stamp.el
-share/emacs/%%EMACS_VERSION%%/lisp/time-stamp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/time.el
-share/emacs/%%EMACS_VERSION%%/lisp/time.elc
-share/emacs/%%EMACS_VERSION%%/lisp/timer.el
-share/emacs/%%EMACS_VERSION%%/lisp/timer.elc
-share/emacs/%%EMACS_VERSION%%/lisp/timezone.el
-share/emacs/%%EMACS_VERSION%%/lisp/timezone.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tmm.el
-share/emacs/%%EMACS_VERSION%%/lisp/tmm.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tpu-edt.el
-share/emacs/%%EMACS_VERSION%%/lisp/tpu-edt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tpu-extras.el
-share/emacs/%%EMACS_VERSION%%/lisp/tpu-extras.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tpu-mapper.el
-share/emacs/%%EMACS_VERSION%%/lisp/tpu-mapper.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tq.el
-share/emacs/%%EMACS_VERSION%%/lisp/tq.elc
-share/emacs/%%EMACS_VERSION%%/lisp/trace.el
-share/emacs/%%EMACS_VERSION%%/lisp/trace.elc
-share/emacs/%%EMACS_VERSION%%/lisp/two-column.el
-share/emacs/%%EMACS_VERSION%%/lisp/two-column.elc
-share/emacs/%%EMACS_VERSION%%/lisp/type-break.el
-share/emacs/%%EMACS_VERSION%%/lisp/type-break.elc
-share/emacs/%%EMACS_VERSION%%/lisp/uncompress.el
-share/emacs/%%EMACS_VERSION%%/lisp/uncompress.elc
-share/emacs/%%EMACS_VERSION%%/lisp/underline.el
-share/emacs/%%EMACS_VERSION%%/lisp/underline.elc
-share/emacs/%%EMACS_VERSION%%/lisp/undigest.el
-share/emacs/%%EMACS_VERSION%%/lisp/undigest.elc
-share/emacs/%%EMACS_VERSION%%/lisp/uniquify.el
-share/emacs/%%EMACS_VERSION%%/lisp/uniquify.elc
-share/emacs/%%EMACS_VERSION%%/lisp/unrmail.el
-share/emacs/%%EMACS_VERSION%%/lisp/unrmail.elc
-share/emacs/%%EMACS_VERSION%%/lisp/unused.el
-share/emacs/%%EMACS_VERSION%%/lisp/unused.elc
-share/emacs/%%EMACS_VERSION%%/lisp/userlock.el
-share/emacs/%%EMACS_VERSION%%/lisp/userlock.elc
-share/emacs/%%EMACS_VERSION%%/lisp/vc-hooks.el
-share/emacs/%%EMACS_VERSION%%/lisp/vc-hooks.elc
-share/emacs/%%EMACS_VERSION%%/lisp/vc.el
-share/emacs/%%EMACS_VERSION%%/lisp/vc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/version.el
-share/emacs/%%EMACS_VERSION%%/lisp/vi.el
-share/emacs/%%EMACS_VERSION%%/lisp/vi.elc
-share/emacs/%%EMACS_VERSION%%/lisp/view.el
-share/emacs/%%EMACS_VERSION%%/lisp/view.elc
-share/emacs/%%EMACS_VERSION%%/lisp/vip.el
-share/emacs/%%EMACS_VERSION%%/lisp/vip.elc
-share/emacs/%%EMACS_VERSION%%/lisp/viper-ex.el
-share/emacs/%%EMACS_VERSION%%/lisp/viper-ex.elc
-share/emacs/%%EMACS_VERSION%%/lisp/viper-keym.el
-share/emacs/%%EMACS_VERSION%%/lisp/viper-keym.elc
-share/emacs/%%EMACS_VERSION%%/lisp/viper-macs.el
-share/emacs/%%EMACS_VERSION%%/lisp/viper-macs.elc
-share/emacs/%%EMACS_VERSION%%/lisp/viper-mous.el
-share/emacs/%%EMACS_VERSION%%/lisp/viper-mous.elc
-share/emacs/%%EMACS_VERSION%%/lisp/viper-util.el
-share/emacs/%%EMACS_VERSION%%/lisp/viper-util.elc
-share/emacs/%%EMACS_VERSION%%/lisp/viper.el
-share/emacs/%%EMACS_VERSION%%/lisp/viper.elc
-share/emacs/%%EMACS_VERSION%%/lisp/vms-patch.el
-share/emacs/%%EMACS_VERSION%%/lisp/vms-patch.elc
-share/emacs/%%EMACS_VERSION%%/lisp/vms-pmail.el
-share/emacs/%%EMACS_VERSION%%/lisp/vms-pmail.elc
-share/emacs/%%EMACS_VERSION%%/lisp/vmsproc.el
-share/emacs/%%EMACS_VERSION%%/lisp/vmsproc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/vt-control.el
-share/emacs/%%EMACS_VERSION%%/lisp/vt-control.elc
-share/emacs/%%EMACS_VERSION%%/lisp/vt100-led.el
-share/emacs/%%EMACS_VERSION%%/lisp/vt100-led.elc
-share/emacs/%%EMACS_VERSION%%/lisp/window.el
-share/emacs/%%EMACS_VERSION%%/lisp/window.elc
-share/emacs/%%EMACS_VERSION%%/lisp/winnt.el
-share/emacs/%%EMACS_VERSION%%/lisp/winnt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ws-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/ws-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/x-apollo.el
-share/emacs/%%EMACS_VERSION%%/lisp/x-apollo.elc
-share/emacs/%%EMACS_VERSION%%/lisp/x-menu.el
-share/emacs/%%EMACS_VERSION%%/lisp/x-menu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/xscheme.el
-share/emacs/%%EMACS_VERSION%%/lisp/xscheme.elc
-share/emacs/%%EMACS_VERSION%%/lisp/xt-mouse.el
-share/emacs/%%EMACS_VERSION%%/lisp/xt-mouse.elc
-share/emacs/%%EMACS_VERSION%%/lisp/yow.el
-share/emacs/%%EMACS_VERSION%%/lisp/yow.elc
-@dirrm share/emacs/%%EMACS_VERSION%%/lisp/term
-@dirrm share/emacs/%%EMACS_VERSION%%/lisp
-@dirrm share/emacs/%%EMACS_VERSION%%/etc/e
-@dirrm share/emacs/%%EMACS_VERSION%%/etc
-@dirrm share/emacs/%%EMACS_VERSION%%
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
deleted file mode 100644
index 5a8dba415107..000000000000
--- a/editors/emacs23/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# New ports collection makefile for:	GNU emacs
-# Date created:		29 October 1994
-# Whom:			jkh
-#
-# $FreeBSD$
-#
-
-PORTNAME=	emacs
-PORTVERSION=	19.34b
-CATEGORIES=	editors
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	emacs
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	GNU editing macros
-
-EMACS_VERSION=	19.34
-CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
-PLIST_SUB=	EMACS_VERSION=${EMACS_VERSION} EMACS_ARCH=${CONFIGURE_TARGET}
-NO_LATEST_LINK=	yes
-WRKSRC=		${WRKDIR}/emacs-19.34
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-.if !defined(WITHOUT_X11)
-CONFIGURE_ARGS=	--with-x-toolkit --sharedstatedir=/var/run
-USE_XLIB=	yes
-.else
-CONFIGURE_ARGS=	--with-x=no --sharedstatedir=/var/run
-.endif
-
-STRIP=
-MAN1=		emacs.1 etags.1 ctags.1
-
-post-install:
-.for file in emacs-19.34 emacsclient etags ctags b2m
-	strip ${PREFIX}/bin/${file}
-.endfor
-.for info in emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode message
-	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
-.endfor
-# install emacs.sh into ${PREFIX}/etc/rc.d
-	${CHMOD} 1777 /var/run/emacs/lock
-	@${MKDIR} ${PREFIX}/etc/rc.d
-	@${INSTALL_SCRIPT} ${FILESDIR}/emacs.sh ${PREFIX}/etc/rc.d
-
-.include <bsd.port.mk>
diff --git a/editors/emacs23/distinfo b/editors/emacs23/distinfo
deleted file mode 100644
index 030e3b0241da..000000000000
--- a/editors/emacs23/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (emacs-19.34b.tar.gz) = 9bd3c694a9019c2a2ebd703a9a0394e0
diff --git a/editors/emacs23/files/emacs.sh b/editors/emacs23/files/emacs.sh
deleted file mode 100644
index c6976c1b8a18..000000000000
--- a/editors/emacs23/files/emacs.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-start)
-	if [ -d /var/run/emacs/lock ]
-	then
-	    rm -f /var/run/emacs/lock/*
-	else
-	    mkdir -p /var/run/emacs/lock
-	fi
-	chmod 1777 /var/run/emacs/lock
-	;;
-stop)
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
-
-exit 0
diff --git a/editors/emacs23/files/patch-aa b/editors/emacs23/files/patch-aa
deleted file mode 100644
index 8e32af2fb6a6..000000000000
--- a/editors/emacs23/files/patch-aa
+++ /dev/null
@@ -1,235 +0,0 @@
---- ./man/vip.texi.org	Fri Jun 16 15:31:11 1995
-+++ ./man/vip.texi	Tue May 20 01:28:33 1997
-@@ -2,6 +2,10 @@
- 
- @setfilename ../info/vip
- @settitle VIP
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* VIP: (vip).			A VI-emulation for Emacs.
-+@end direntry
- 
- @iftex
- @finalout
---- ./man/emacs.texi.org	Mon Aug 19 21:15:12 1996
-+++ ./man/emacs.texi	Tue May 20 01:20:11 1997
-@@ -49,6 +49,11 @@
- @settitle GNU Emacs Manual
- @setfilename ../info/emacs
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Emacs: (emacs).		The extensible self-documenting text editor.
-+@end direntry
-+
- @c
- @c in general, keep the following line commented out, unless doing a
- @c copy of this manual that will be published.  the manual should go
---- ./man/viper.texi.org	Wed Aug  7 10:59:45 1996
-+++ ./man/viper.texi	Tue May 20 01:29:17 1997
-@@ -4,6 +4,10 @@
- \input texinfo
- 
- @setfilename ../info/viper
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* VIPER: (viper).		The new VI-emulation mode in Emacs-19.29.
-+@end direntry
- 
- @iftex
- @finalout
---- ./man/forms.texi.org	Sat Mar 23 06:42:27 1996
-+++ ./man/forms.texi	Tue May 20 01:22:37 1997
-@@ -9,6 +9,11 @@
- @syncodeindex vr cp
- @syncodeindex fn cp
- @syncodeindex ky cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Forms: (forms).		Emacs package for editing data bases
-+				by filling in forms.
-+@end direntry
- @iftex
- @finalout
- @setchapternewpage odd
---- ./man/gnus.texi.org	Wed Jun 26 14:49:29 1996
-+++ ./man/gnus.texi	Tue May 20 01:23:15 1997
-@@ -5,6 +5,11 @@
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* GNUS: (gnus).			The news reader GNUS.
-+@end direntry
-+
- @iftex
- @finalout
- @end iftex
---- ./man/mh-e.texi.org	Sun Aug  4 00:00:29 1996
-+++ ./man/mh-e.texi	Tue May 20 01:23:49 1997
-@@ -4,6 +4,10 @@
- @setfilename ../info/mh-e
- @settitle mh-e
- @c %**end of header
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* MH-E: (mh-e).			Emacs interface to the MH mail system.
-+@end direntry
- 
- @setchapternewpage odd
- 
---- ./man/cl.texi.org	Mon Apr 15 21:36:53 1996
-+++ ./man/cl.texi	Tue May 20 01:24:18 1997
-@@ -2,6 +2,12 @@
- @setfilename ../info/cl
- @settitle Common Lisp Extensions
- 
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* CL: (cl).			Partial Common Lisp support for Emacs Lisp.
-+@end direntry
-+
-+
- @iftex
- @finalout
- @end iftex
---- ./man/sc.texi.org	Thu Jan  4 12:55:23 1996
-+++ ./man/sc.texi	Tue May 20 01:25:13 1997
-@@ -3,6 +3,12 @@
- @comment %**start of header (This is for running Texinfo on a region.)
- @setfilename ../info/sc
- @settitle Supercite Version 3.1 User's Manual
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* SC: (sc).			Supercite lets you cite parts of messages
-+				you're replying to, in flexible ways.
-+@end direntry
-+
- @iftex
- @finalout
- @end iftex
---- ./man/dired-x.texi.org	Thu Jan  4 12:54:19 1996
-+++ ./man/dired-x.texi	Tue May 20 01:25:55 1997
-@@ -18,6 +18,11 @@
- @setfilename ../info/dired-x
- @c dired-x.el REVISION NUMBER
- @settitle Dired Extra Version 2 User's Manual
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Dired-X: (dired-x).		Dired Extra Features.
-+@end direntry
-+
- @iftex
- @finalout
- @end iftex
---- ./man/ediff.texi.org	Fri Jun 21 20:00:04 1996
-+++ ./man/ediff.texi	Tue May 20 01:26:29 1997
-@@ -10,6 +10,11 @@
- @synindex vr cp
- @synindex fn cp
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Ediff: (ediff).		A comprehensive visual interface to diff
-+				and patch.
-+@end direntry
- @iftex
- @finalout
- @end iftex
---- ./man/cc-mode.texi.org	Sun Aug  4 21:56:21 1996
-+++ ./man/cc-mode.texi	Tue May 20 01:27:18 1997
-@@ -9,6 +9,12 @@
- @settitle     CC-MODE Version 4 Documentation
- @footnotestyle end
- 
-+@dircategory The Emacs editor and associated tools 
-+@direntry 
-+* CC mode: (ccmode).		The GNU Emacs mode for editing C, C++,
-+				Objective-C and Java code.
-+@end direntry
-+
- @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- @comment @setchapternewpage odd !! we don't want blank pages !!
- @comment %**end of header (This is for running Texinfo on a region)
---- ./man/message.texi.org	Wed Jun 26 14:49:43 1996
-+++ ./man/message.texi	Sat Dec 13 17:46:31 1997
-@@ -5,6 +5,10 @@
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Message: (message).		Editing mail and news messages.
-+@end direntry
- @iftex
- @finalout
- @end iftex
---- ./Makefile.in.org	Mon Aug 19 21:12:19 1996
-+++ ./Makefile.in	Tue Apr 15 00:15:28 1997
-@@ -184,7 +184,7 @@
- # Subdirectories to make recursively.  `lisp' is not included
- # because the compiled lisp files are part of the distribution
- # and you cannot remake them without installing Emacs first.
--SUBDIR = lib-src src
-+SUBDIR = lib-src src man
- 
- # The makefiles of the directories in $SUBDIR.
- SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile
-@@ -368,14 +368,8 @@
- 	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
- 	then \
- 	  (cd ${infodir};  \
--	   if [ -f dir ]; then \
--	     if [ ! -f dir.old ]; then mv -f dir dir.old; \
--	     else mv -f dir dir.bak; fi; \
--	   fi; \
- 	   cd ${srcdir}/info ; \
--	   (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \
--	   (cd $${thisdir}; chmod a+r ${infodir}/dir); \
--	   for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* sc* vip*; do \
-+	   for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* message* mh-e* sc* vip*; do \
- 	     (cd $${thisdir}; \
- 	      ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
- 	      chmod a+r ${infodir}/$$f); \
-@@ -426,7 +420,7 @@
- 	    esac ;					\
- 	  fi ;						\
- 	done
--	(cd ${infodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*)
-+	(cd ${infodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* mh-e* sc* vip*)
- 	(cd ${man1dir}  && rm -f emacs.1 etags.1 ctags.1)
- 	(cd ${bindir}  && rm -f emacs-${version} $(EMACS))
- 
---- ./man/Makefile.in.org	Thu Jun 27 15:27:19 1996
-+++ ./man/Makefile.in	Tue Apr 15 00:29:52 1997
-@@ -13,7 +13,7 @@
- # The makeinfo program is part of the Texinfo distribution.
- MAKEINFO = makeinfo
- INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl ../info/dired-x \
--	       ../info/ediff ../info/forms ../info/gnus ../info/info \
-+	       ../info/ediff ../info/forms ../info/gnus \
- 	       ../info/mh-e ../info/sc ../info/vip ../info/viper \
- 	       ../info/message
- DVI_TARGETS = emacs.dvi cc-mode.dvi cl.dvi dired-x.dvi ediff.dvi forms.dvi \
-@@ -66,6 +66,7 @@
- 	${srcdir}/gnu1.texi \
- 	${srcdir}/glossary.texi
- 
-+all: info
- info: $(INFO_TARGETS)
- 
- dvi: $(DVI_TARGETS)
-@@ -74,12 +75,6 @@
- # in srcdir.  There is no provision for Info files
- # to exist in the build directory.
- # In a distribution of Emacs, the Info files should be up to date.
--
--../info/info: ${INFOSOURCES}
--	cd $(srcdir); $(MAKEINFO) --no-split info.texi
--
--info.dvi: ${INFOSOURCES}
--	TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/info.texi
- 
- ../info/emacs: ${EMACSSOURCES}
- 	cd $(srcdir); $(MAKEINFO) emacs.texi
diff --git a/editors/emacs23/files/patch-ab b/editors/emacs23/files/patch-ab
deleted file mode 100644
index 16aee5fa323f..000000000000
--- a/editors/emacs23/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/xrdb.c.org	Sat Apr  8 21:54:08 1995
-+++ ./src/xrdb.c	Mon Sep 11 21:53:29 1995
-@@ -361,7 +361,7 @@
- 
- /* Producing databases for individual sources.  */
- 
--#define X_DEFAULT_SEARCH_PATH "/usr/lib/X11/%L/%T/%N%C%S:/usr/lib/X11/%l/%T/%N%C%S:/usr/lib/X11/%T/%N%C%S:/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S"
-+#define X_DEFAULT_SEARCH_PATH "/usr/X11R6/lib/X11/%L/%T/%N%C%S:/usr/X11R6/lib/X11/%l/%T/%N%C%S:/usr/X11R6/lib/X11/%T/%N%C%S:/usr/X11R6/lib/X11/%L/%T/%N%S:/usr/X11R6/lib/X11/%l/%T/%N%S:/usr/X11R6/lib/X11/%T/%N%S"
- 
- static XrmDatabase
- get_system_app (class)
diff --git a/editors/emacs23/files/patch-ac b/editors/emacs23/files/patch-ac
deleted file mode 100644
index dfad53e9e187..000000000000
--- a/editors/emacs23/files/patch-ac
+++ /dev/null
@@ -1,82 +0,0 @@
---- src/s/freebsd.h.orig	Mon Jun 10 05:14:32 1996
-+++ src/s/freebsd.h	Tue Jul 11 16:44:14 2000
-@@ -1,5 +1,15 @@
- /* s/ file for freebsd system.  */
- 
-+/* Get the correct __FreeBSD_version, even if this is before that was
-+   defined. */
-+#ifndef __FreeBSD__
-+#define __FreeBSD_version 199401
-+#elif __FreeBSD__ == 1
-+#define __FreeBSD_version 199405
-+#else
-+#include <osreldate.h>
-+#endif
-+
- /* '__FreeBSD__' is defined by the preprocessor on FreeBSD-1.1 and up.
-    Earlier versions do not have shared libraries, so inhibit them.
-    You can inhibit them on newer systems if you wish
-@@ -33,8 +43,9 @@
- 
- #define LIBS_DEBUG
- #define LIBS_SYSTEM -lutil
-+#if __FreeBSD_version < 400000
- #define LIBS_TERMCAP -ltermcap
--#define LIB_GCC -lgcc
-+#endif
- 
- #define SYSV_SYSTEM_DIR
- 
-@@ -42,12 +53,33 @@
- #undef BSD_PGRPS
- #define GETPGRP_NO_ARG
- 
-+#ifdef __ELF__
-+
-+#define LD_SWITCH_SYSTEM
-+#ifdef i386
-+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
-+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
-+#else
-+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crtbegin.o
-+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
-+#endif
-+#define UNEXEC unexelf.o
-+#undef LIB_GCC
-+#define LIB_GCC
-+
-+#else /* not __ELF__ */
-+
- #ifndef NO_SHARED_LIBS
- #define LD_SWITCH_SYSTEM -e start -dc -dp
- #define HAVE_TEXT_START		/* No need to define `start_of_text'. */
-+#if __FreeBSD_version >= 300002
-+#define START_FILES pre-crt0.o /usr/lib/aout/crt0.o
-+#else /* __FreeBSD_version < 300002 */
- #define START_FILES pre-crt0.o /usr/lib/crt0.o
--#define UNEXEC unexsunos4.o
-+#endif /* __FreeBSD_version < 300002 */
-+#define UNEXEC unexfreebsd.o
- #define RUN_TIME_REMAP
-+#define LIB_GCC -lgcc
- 
- #ifndef N_TRELOFF
- #define N_PAGSIZ(x) __LDPGSZ
-@@ -63,6 +95,8 @@
- #endif /* __FreeBSD__ */
- #endif /* NO_SHARED_LIBS */
- 
-+#endif /* not __ELF__ */
-+
- #define HAVE_WAIT_HEADER
- #define HAVE_GETLOADAVG
- /*#define HAVE_GETPAGESIZE  /* configure now puts this in config.h */
-@@ -80,6 +114,8 @@
- #define BSD 199103
- #elif __FreeBSD__ == 2
- #define BSD 199306
-+#elif __FreeBSD__ >= 3
-+#define BSD 199506
- #endif
- 
- #define WAITTYPE int
diff --git a/editors/emacs23/files/patch-ad b/editors/emacs23/files/patch-ad
deleted file mode 100644
index f2013a374044..000000000000
--- a/editors/emacs23/files/patch-ad
+++ /dev/null
@@ -1,695 +0,0 @@
---- src/unexfreebsd.c.orig	Wed Dec  3 17:28:14 1997
-+++ src/unexfreebsd.c	Wed Dec  3 17:34:02 1997
-@@ -0,0 +1,692 @@
-+/* Code to do an unexec for FreeBSD for a temacs linked -Bdynamic.
-+   Derived from unexnetbsd.c, which was derived from unexsunos4.c
-+   Copyright (C) 1992, 1993 Free Software Foundation, Inc.
-+
-+This file is part of XEmacs.
-+
-+XEmacs is free software; you can redistribute it and/or modify it
-+under the terms of the GNU General Public License as published by the
-+Free Software Foundation; either version 2, or (at your option) any
-+later version.
-+
-+XEmacs is distributed in the hope that it will be useful, but WITHOUT
-+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with XEmacs; see the file COPYING.  If not, write to
-+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA.  */
-+
-+/* Synched up with: Not in FSF? */
-+
-+/*
-+Created 29-Oct-92 by Harlan Sexton
-+Tweaked 06-Aug-93 by Dean Michaels to work with sun3.
-+Converted 01-Dec-93 by Paul Mackerras to work with NetBSD shared libraries.
-+Tweaked 26-Feb-94 by Shawn Carey for use with FreeBSD-1.1 shared libraries.
-+*/
-+
-+/********************** Included .h Files **************************/
-+
-+#include <config.h>
-+
-+#include <stdarg.h>
-+#include <sys/param.h>
-+#include <sys/mman.h>
-+#include <sys/file.h>
-+#include <sys/stat.h>
-+#include <sys/types.h>
-+#include <string.h>
-+#include <stdio.h>
-+#include <a.out.h>
-+#include <unistd.h>
-+#include <ctype.h>
-+#include <stab.h>
-+#include <dirent.h>
-+#include <link.h>
-+
-+/********************** Macros *************************************/
-+
-+#define SYS_ERR		strerror(errno)
-+
-+#define MASK_UP(x,p_of_two) \
-+ ((((unsigned long) (x)) + ((p_of_two) - 1)) & (~((p_of_two) - 1)))
-+
-+#define MASK_DOWN(x,p_of_two) (((unsigned long) (x)) & (~((p_of_two) - 1)))
-+
-+/********************** Typedefs and Structs ***********************/
-+
-+struct translation_struct
-+{
-+  long txtaddr;
-+  long txtoff;
-+  long dataddr;
-+  long datoff;
-+  long bssaddr;
-+  long endaddr;
-+};
-+
-+/********************** Function Prototypes/Declarations ***********/
-+
-+static void unexec_error (const char *m, int use_errno, ...);
-+static int unexec_open (char *filename, int flag, int mode);
-+static caddr_t unexec_mmap (int fd, size_t len, int prot, int flags);
-+static long unexec_seek (int fd, long position);
-+static void unexec_read (int fd, long position, char *buf, int bytes);
-+static void unexec_write (int fd, long position, char *buf, int bytes);
-+static void unexec_pad (int fd, int bytes);
-+static void unexec_fstat (int fd, struct stat *statptr);
-+static void unexec_fchmod (int fd, int mode);
-+static long unexec_addr_to_offset (long addr, struct translation_struct *ts);
-+static void copy_relocation_site (struct relocation_info *ri, 
-+                                  caddr_t from_base_addr, 
-+                                  caddr_t to_base_addr, 
-+                                  struct translation_struct *ts);
-+static void reset_symtab (struct nlist *start, struct nlist *end, 
-+                          char *strtab, long edata_value, long end_value,
-+                          int shlib_image);
-+static void reset_ldso_symtab (struct nzlist *start, struct nzlist *end, 
-+                          char *strtab, long edata_value, long end_value,
-+                          int shlib_image);
-+int run_time_remap (char *dummy);
-+
-+/********************** Variables **********************************/
-+
-+/* for reporting error messages from system calls */
-+extern int errno;
-+extern int _DYNAMIC;
-+extern char **environ;             
-+
-+static unsigned long sbrk_of_0_at_unexec;
-+             
-+/*******************************************************************/
-+
-+static void
-+unexec_error (const char *fmt, int use_errno, ...)
-+{
-+  const char *err_msg = SYS_ERR;
-+  va_list args;
-+
-+  fprintf (stderr, "unexec - ");
-+  va_start (args, use_errno);
-+  vfprintf (stderr, fmt, args);
-+  va_end (args);
-+
-+  if (use_errno)
-+    fprintf (stderr, ": %s", err_msg);
-+  fprintf (stderr, "\n");
-+  exit (1);
-+  return;
-+}
-+
-+static int
-+unexec_open (char *filename, int flag, int mode)
-+{
-+  int fd;
-+
-+  errno = 0;
-+
-+  fd = open (filename, flag, mode);
-+
-+  if (fd < 0)
-+    unexec_error ("Failure opening file %s", 1, filename);
-+  return fd;
-+}
-+
-+static caddr_t
-+unexec_mmap (int fd, size_t len, int prot, int flags)
-+{
-+  caddr_t return_val;
-+
-+  unexec_seek (fd, 0);
-+  errno = 0;
-+  return_val = mmap (0, len, prot, flags, fd, 0);
-+
-+  if (return_val == (caddr_t) -1)
-+    unexec_error ("Failure mmap'ing file", 1);
-+  return return_val;
-+}
-+
-+
-+static long
-+unexec_seek (int fd, long position)
-+{
-+  long seek_value;
-+
-+  if (fd <= 0)
-+    unexec_error ("No file open in which to seek", 0);
-+
-+  errno = 0;
-+
-+  if (position < 0)
-+    seek_value = (long) lseek (fd, 0, L_INCR);
-+  else
-+    seek_value = (long) lseek (fd, position, L_SET);
-+
-+  if (seek_value < 0)
-+    unexec_error ("Failed to do a seek to 0x%x in %s", 1,
-+                  position, "unexec() output file");
-+
-+  return seek_value;
-+}
-+
-+static void
-+unexec_read (int fd, long position, char *buf, int bytes)
-+{
-+  int n_read;
-+  int remains = bytes;
-+  position = unexec_seek (fd, position);
-+
-+  if (bytes < 0)
-+    unexec_error ("Attempted read of %d bytes", 0, bytes);
-+
-+  errno = 0;
-+
-+  while (remains > 0)
-+    {
-+      n_read = read (fd, buf, remains);
-+      if (n_read <= 0)
-+        unexec_error ("Read failed for 0x%x bytes at offset 0x%x in %s",
-+                      1, bytes, position, "unexec() output file");
-+      buf += n_read;
-+      remains -= n_read;
-+    }
-+
-+  return;
-+}
-+
-+static void
-+unexec_write (int fd, long position, char *buf, int bytes)
-+{
-+  int n_written;
-+  int remains = bytes;
-+  position = unexec_seek (fd, position);
-+
-+  if (bytes < 0)
-+    unexec_error ("Attempted write of %d bytes in %s",
-+                  0, bytes, "unexec() output file");
-+
-+  errno = 0;
-+
-+  while (remains > 0)
-+    {
-+      n_written = write (fd, buf, remains);
-+      if (n_written <= 0)
-+        unexec_error ("Write failed for 0x%x bytes at offset 0x%x in %s",
-+                      1, bytes, position, "unexec() output file");
-+      buf += n_written;
-+      remains -= n_written;
-+    }
-+
-+  return;
-+}
-+
-+static void 
-+unexec_pad (int fd, int bytes)
-+{
-+  if (bytes > 0)
-+    {
-+      char buf[1024];
-+      int remaining = bytes;
-+
-+      memset (buf, 0, sizeof (buf));
-+
-+      while (remaining > 0)
-+        {
-+          int this_write = (remaining > sizeof(buf))?sizeof(buf):remaining;
-+          unexec_write (fd, -1, buf, this_write);
-+          remaining -= this_write;
-+        }
-+    }
-+}
-+
-+static void
-+unexec_fstat (int fd, struct stat *statptr)
-+{
-+  errno = 0;
-+  if (-1 == fstat (fd, statptr))
-+    unexec_error ("fstat() failed for descriptor %d", 1, fd);
-+  return;
-+}
-+
-+static void
-+unexec_fchmod (int fd, int mode)
-+{
-+  errno = 0;
-+  if (-1 == fchmod (fd, mode))
-+    unexec_error ("fchmod() failed for descriptor %d", 1, fd);
-+  return;
-+}
-+
-+static long
-+unexec_addr_to_offset (long addr, struct translation_struct *ts)
-+                             
-+{
-+  if ((addr < ts->txtaddr) || (addr >= ts->bssaddr))
-+    return -1;
-+  else if (addr >= ts->dataddr)
-+    return ((long) ((addr - ts->dataddr) + ts->datoff));
-+  else 
-+    return ((long) ((addr - ts->txtaddr) + ts->txtoff));
-+}
-+
-+
-+/*
-+ * "LD.SO" DATA AND SYMBOL TABLE OPERATIONS 
-+ */
-+
-+static void
-+copy_relocation_site (struct relocation_info *ri, 
-+                      caddr_t from_base_addr,
-+                      caddr_t to_base_addr,
-+                      struct translation_struct *ts)
-+{
-+  long offset;
-+  caddr_t from, to;
-+
-+  /* We can get relocation sites in the bss region, for objects whose
-+     contents are copied from a shared library.  We don't need or want
-+     to restore these at present. */
-+#ifndef sparc
-+  if (ri->r_copy)
-+    return;
-+#else
-+  /* Struct relocation_info_sparc doesn't have member r_copy.
-+     Instead, we use the address to check if this is run-time-copied. */
-+  if (ri->r_address >= ts->bssaddr && ri->r_address < ts->endaddr)
-+    return;
-+#endif
-+
-+  offset = unexec_addr_to_offset (ri->r_address, ts);
-+  if (offset == -1)
-+    unexec_error ("bad relocation address 0x%x (0x%x)", 0, ri->r_address,
-+		  ((long *)ri)[1]);
-+
-+  from = from_base_addr + offset;
-+  to = to_base_addr + offset;
-+  /* This stuff should be in a md_ file somewhere... */
-+#ifndef sparc
-+  switch (ri->r_length)
-+    {
-+    case 0:
-+      *((char *) to) = *((char *) from);
-+      break;
-+    case 1:
-+      *((short *) to) = *((short *) from);
-+      break;
-+    case 2:
-+      *((long *) to) = *((long *) from);
-+      break;
-+    default:
-+      unexec_error ("unknown reloc length %d seen during unexec()",
-+		    0, ri->r_length);
-+      break;
-+    }
-+#else /* sparc */
-+  switch (ri->r_type)
-+    {
-+    case RELOC_8:
-+    case RELOC_DISP8:
-+      *((char *) to) = *((char *) from);
-+      break;
-+    case RELOC_16:
-+    case RELOC_DISP16:
-+      *((short *) to) = *((short *) from);
-+      break;     
-+    case RELOC_LO10:
-+    case RELOC_13:     
-+    case RELOC_22:     
-+    case RELOC_HI22:
-+    case RELOC_WDISP22:
-+    case RELOC_WDISP30:
-+    case RELOC_32:
-+    case RELOC_DISP32:
-+    case RELOC_GLOB_DAT:
-+      *((long *) to) = *((long *) from);
-+      break;
-+    case RELOC_JMP_SLOT:
-+      {
-+        long *target = (long *) to;
-+        long *source = (long *) from;
-+        *target = *source;
-+        target++;
-+        source++;
-+        *target = *source;
-+        target++;
-+        source++;
-+        *target = *source;
-+      }
-+      break;
-+    default:
-+      unexec_error ("unknown reloc type %d seen during unexec()",
-+		    0, ri->r_type);
-+      break;
-+    }
-+#endif /* sparc */
-+}
-+
-+static void
-+reset_symtab (struct nlist *start, struct nlist *end, char *strtab,
-+              long edata_value, long end_value, int shlib_image)
-+{
-+  struct nlist *tmp = start;
-+  int found_edata = 0;
-+  int found_end = 0;
-+     
-+  while (tmp < end)
-+    {
-+      int type = tmp->n_type;
-+
-+      if ((type == (N_UNDF | N_EXT)) &&
-+          (tmp->n_value != 0))
-+        unexec_error ("unexec'ing image has COMMON symbols in it -- we quit!",
-+		      0);
-+     
-+      if (!(type & N_STAB))
-+        {
-+          if (!found_edata &&
-+              (type == (N_EXT | N_DATA)) &&
-+              tmp->n_un.n_strx &&
-+              !strcmp ("_edata", strtab + tmp->n_un.n_strx))
-+            {
-+              tmp->n_value = edata_value;
-+              found_edata = 1;
-+            }
-+
-+
-+          if ((type & N_TYPE) == N_BSS)
-+            {
-+              if (!found_end &&
-+                  (type == (N_EXT | N_BSS)) &&
-+                  tmp->n_un.n_strx &&
-+                  !strcmp ("_end", strtab + tmp->n_un.n_strx))
-+                {
-+                  tmp->n_value = end_value;
-+                  found_end = 1;
-+                }
-+              else if (type & N_EXT)
-+                tmp->n_type = N_DATA | N_EXT;
-+              else
-+                tmp->n_type = N_DATA;
-+            }
-+
-+          /* the way things are being handled here, having sbrk() in the
-+             image is fatal for an image linked with shared lib's (although 
-+             the code could be modified to support it), but this should 
-+             never happen anyway */
-+          if (shlib_image &&
-+              (type == (N_EXT | N_TEXT)) &&
-+              tmp->n_un.n_strx &&
-+              !strcmp ("_sbrk", strtab + tmp->n_un.n_strx))
-+            unexec_error ("unexec'd shlib image has sbrk() in it -- we quit!",
-+                          0);
-+        }
-+
-+      tmp++;
-+    }
-+} 
-+     
-+static void
-+reset_ldso_symtab (struct nzlist *start, struct nzlist *end, char *strtab,
-+              long edata_value, long end_value, int shlib_image)
-+{
-+  struct nzlist *tmp = start;
-+  int found_edata = 0;
-+  int found_end = 0;
-+     
-+  while (tmp < end) {
-+    int type = tmp->nz_type;
-+/*
-+ * the following code breaks under FreeBSD-1.1-BETA, but everything
-+ * seems to work perfectly if it's commented out.  This did not break
-+ * anything until the changes to ld.so were made.
-+ */
-+/*
-+    if ((type == (N_UNDF | N_EXT)) && (tmp->nz_value != 0))
-+      unexec_error("unexec'ing image has COMMON symbols in rel -- we quit!",0);
-+*/
-+    if (!(type & N_STAB)) {
-+      if (!found_edata &&
-+	  (type == (N_EXT | N_DATA)) &&
-+	  !strcmp ("_edata", strtab + tmp->nz_strx)) {
-+	tmp->nz_value = edata_value;
-+	found_edata = 1;
-+      }
-+
-+      if ((type & N_TYPE) == N_BSS) {
-+	if (!found_end &&
-+	    (type == (N_EXT | N_BSS)) &&
-+	    !strcmp ("_end", strtab + tmp->nz_strx)) {
-+	  tmp->nz_value = end_value;
-+	  found_end = 1;
-+	} else if (type & N_EXT)
-+	  tmp->nz_type = N_DATA | N_EXT;
-+	else
-+	  tmp->nz_type = N_DATA;
-+      }
-+
-+      /* the way things are being handled here, having sbrk() in the
-+	 image is fatal for an image linked with shared lib's (although 
-+	 the code could be modified to support it), but this should 
-+	 never happen anyway */
-+      if (shlib_image &&
-+	  (type == (N_EXT | N_TEXT)) &&
-+	  !strcmp ("_sbrk", strtab + tmp->nz_strx))
-+	unexec_error("unexec'd shlib image has sbrk() ref -- we quit!", 0);
-+    }
-+    tmp++;
-+  }
-+} 
-+     
-+extern int getpagesize (void);
-+
-+/*
-+ * EXPORTED FUNCTIONS 
-+ */
-+
-+/* this has to be a global variable to prevent the optimizers from
-+ * assuming that it can not be 0.  
-+*/
-+static void *dynamic_addr = (void *) &_DYNAMIC;
-+
-+int
-+unexec (char *new_name, char *old_name,
-+        unsigned int emacs_edata, unsigned int dummy1, unsigned int dummy2)
-+{
-+  /* ld.so data */
-+  struct _dynamic *ld = 0;
-+  struct section_dispatch_table *ld2 = 0;
-+  /* old and new state */
-+  int old_fd;
-+  int new_fd;
-+  caddr_t old_base_addr;
-+  caddr_t new_base_addr;
-+  struct exec old_hdr;
-+  struct exec new_hdr;
-+  struct stat old_buf;
-+  struct stat new_buf;
-+  /* some process specific "constants" */
-+  unsigned long n_pagsiz, new_edata;
-+  long page_size = getpagesize ();
-+  caddr_t plt_end;
-+  caddr_t current_break = (caddr_t) sbrk (0);
-+
-+  if (!page_size)
-+    unexec_error ("unexec() failed because we can't get the size of a page!",
-+                  0);
-+
-+  /* see if this is a -Bdynamic image -- if so, find ld.so structures */
-+  if (dynamic_addr)
-+    {
-+      ld = (struct _dynamic *) dynamic_addr;
-+      ld2 = ld->d_un.d_sdt;
-+      if (ld->d_version < LD_VERSION_BSD)
-+        unexec_error ("%s linked with obsolete version of ld -- we quit!",
-+                      0, old_name);
-+    }
-+
-+  /* open the old and new files, figuring out how big the old one is
-+     so that we can map it in */
-+  old_fd = unexec_open (old_name, O_RDONLY, 0);
-+  new_fd = unexec_open (new_name, O_RDWR | O_CREAT | O_TRUNC, 0666);
-+
-+  /* setup the header and the statbuf for old_fd */
-+  unexec_read (old_fd, 0, (char *) &old_hdr, sizeof (old_hdr));
-+  unexec_fstat (old_fd, &old_buf);
-+
-+
-+  /* set up some important constants */
-+  n_pagsiz = __LDPGSZ;
-+  if (dynamic_addr)
-+    plt_end = (caddr_t) MASK_UP (ld2->sdt_plt + ld2->sdt_plt_sz, sizeof (double));
-+  else
-+    plt_end = (caddr_t) N_DATADDR (old_hdr);
-+
-+#if 0
-+  /* never write protect the variable "environ", defined in /lib/crt0.o, and
-+     set in process.c and callproc.c */
-+  mprotect_bottom_addr = ((unsigned long) &environ) + sizeof (char **);
-+  /* never protect ABOVE the end of data emacs_edata specified */
-+  mprotect_top_addr = MIN (emacs_edata, N_DATADDR (old_hdr) + old_hdr.a_data);
-+#endif
-+
-+  /* Set up the image of the old file */
-+  old_base_addr = unexec_mmap (old_fd, old_buf.st_size, PROT_READ,
-+			       MAP_FILE | MAP_PRIVATE);
-+  close (old_fd);
-+
-+  /* set up the new exec */
-+  new_hdr = old_hdr;
-+  new_edata = (unsigned long) MASK_UP (current_break, n_pagsiz);
-+  new_hdr.a_data = new_edata - ((unsigned long) N_DATADDR (old_hdr));
-+  new_hdr.a_bss  = 0;
-+
-+  /* set up this variable, in case we want to reset "the break" 
-+     when restarting */
-+  sbrk_of_0_at_unexec = ((unsigned long) MASK_UP (current_break, n_pagsiz));
-+     
-+  /* Write out the first approximation to the new file. The sizes of
-+     each section will be correct, but there will be a number of 
-+     corrections that will need to be made. */
-+  {
-+    long old_datoff = N_DATOFF (old_hdr);
-+    long old_dataddr = N_DATADDR (old_hdr);
-+    long new_treloff = N_RELOFF (new_hdr);
-+    long old_treloff = N_RELOFF (old_hdr);
-+    long ld_so_size = ((unsigned long) plt_end) - old_dataddr;
-+    long real_data_size = current_break - plt_end;
-+    long pad_size = 
-+      MASK_UP (current_break, n_pagsiz) - ((unsigned long) current_break);
-+
-+
-+    /* First, write the text segment with new header -- copy everything until
-+       the start of the data segment from the old file, and then go back and 
-+       write the new header. */
-+    unexec_write (new_fd, 0, old_base_addr, old_datoff + ld_so_size);
-+    unexec_write (new_fd, 0, (char *) &new_hdr, sizeof (new_hdr));
-+
-+    /* Copy the rest of the data segment from the running image. */
-+    unexec_write (new_fd, old_datoff + ld_so_size, 
-+                  plt_end, real_data_size);
-+
-+    /* pad out the data segment */
-+    unexec_pad (new_fd, pad_size);
-+    
-+    /* Finally, copy the symbol table information from the old file. */
-+    unexec_write (new_fd, new_treloff,
-+                  old_base_addr + old_treloff,
-+                  old_buf.st_size - old_treloff);
-+  }
-+     
-+     
-+  /* Next, map in the output file so that we can jump around fixing it
-+     up. We retain the old file so that we can refer to it. */
-+  unexec_fstat (new_fd, &new_buf);
-+  new_base_addr = unexec_mmap (new_fd, 
-+                               MASK_UP (new_buf.st_size, page_size),
-+                               PROT_READ | PROT_WRITE,
-+			       MAP_FILE | MAP_SHARED);
-+
-+
-+
-+  /* We need to do 2 things. First, make sure that _edata and _end (and
-+     hence, curbrk) are set to the correct values. At the same time, for
-+     neatness and to help with debugging, mark all the types of all ld.so
-+     and nm BSS symbols in the new file to be DATA, and make sure that
-+     there are no COMMON symbols in the output file, as any references to
-+     these can lose really big. Second, reset all of the ld.so "relocation
-+     sites" in the new file to have the values that appear in the old file
-+     -- the failure to do this was the biggest loser in the old version of
-+     this code. */
-+
-+  /* STEP 1 */
-+  /* Reset the regular symbol table first. */
-+  reset_symtab ((struct nlist *) (new_base_addr + N_SYMOFF(new_hdr)),
-+		(struct nlist *) (new_base_addr + N_SYMOFF(new_hdr) +
-+				  new_hdr.a_syms),
-+		(char *) (new_base_addr + N_STROFF(new_hdr)),
-+		new_edata, new_edata,
-+		!!dynamic_addr);
-+
-+  /* Now reset the ld.so symbol table. */
-+  if (dynamic_addr)
-+    {
-+      struct translation_struct ts;
-+      struct relocation_info *tmp, *end;
-+      caddr_t syms, strings;
-+
-+      /* set up the structure that we use to translate addresses in the
-+	 old file into file offsets */
-+      ts.txtaddr = N_TXTADDR (old_hdr);
-+      ts.txtoff = N_TXTOFF (old_hdr);
-+      ts.dataddr = N_DATADDR (old_hdr);
-+      ts.datoff = N_DATOFF (old_hdr);
-+      ts.bssaddr = N_DATADDR (old_hdr) + old_hdr.a_data;
-+      ts.endaddr = ts.bssaddr + old_hdr.a_bss;
-+
-+      syms = new_base_addr + unexec_addr_to_offset(ld2->sdt_nzlist, &ts);
-+      strings = new_base_addr + unexec_addr_to_offset(ld2->sdt_strings, &ts);
-+      reset_ldso_symtab ((struct nzlist *) syms, (struct nzlist *) strings,
-+			 (char *) strings,
-+			 new_edata, new_edata,
-+			 !!dynamic_addr);
-+
-+      /* STEP 2 */
-+      tmp = (struct relocation_info *)
-+	(old_base_addr + unexec_addr_to_offset(ld2->sdt_rel, &ts));
-+      end = (struct relocation_info *)
-+	(old_base_addr + unexec_addr_to_offset(ld2->sdt_hash, &ts));
-+      while (tmp < end)
-+	{
-+	  copy_relocation_site (tmp, old_base_addr, new_base_addr, &ts);
-+	  tmp++;
-+	}
-+    }
-+     
-+  /* get rid of the mmap-ed file space and make the output file 
-+     executable -- then quit */
-+  munmap (new_base_addr, MASK_UP (new_buf.st_size, page_size));
-+  munmap (old_base_addr, MASK_UP (old_buf.st_size, page_size));
-+  unexec_fchmod (new_fd, 0755);
-+  close (new_fd);
-+  return 0;
-+}
-+
-+
-+int
-+run_time_remap (char *dummy)
-+{
-+  unsigned long current_sbrk = (unsigned long) sbrk (0);
-+
-+  if (sbrk_of_0_at_unexec > current_sbrk)
-+    {
-+      errno = 0;
-+      if (brk ((caddr_t) sbrk_of_0_at_unexec))
-+	fprintf (stderr, "failed to change brk addr to 0x%lx: %s\n", 
-+		 sbrk_of_0_at_unexec, SYS_ERR);
-+    }
-+             
-+  return 0;
-+}
diff --git a/editors/emacs23/files/patch-ae b/editors/emacs23/files/patch-ae
deleted file mode 100644
index 82b5e69cad05..000000000000
--- a/editors/emacs23/files/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/unexelf.c.orig	Fri Oct  2 12:55:43 1998
-+++ src/unexelf.c	Fri Oct  2 13:02:05 1998
-@@ -678,7 +678,8 @@
-   if (n < 0)
-     fatal ("Couldn't find segment next to .bss in %s\n", old_name, 0);
- 
--  NEW_PROGRAM_H (n).p_filesz += new_data2_size;
-+/*  NEW_PROGRAM_H (n).p_filesz += new_data2_size; */
-+  NEW_PROGRAM_H (n).p_filesz = new_bss_addr - NEW_PROGRAM_H (n).p_vaddr; /* From emacs 20.3 */
-   NEW_PROGRAM_H (n).p_memsz = NEW_PROGRAM_H (n).p_filesz;
- 
- #if 0 /* Maybe allow section after data2 - does this ever happen? */
-@@ -845,7 +846,9 @@
- 
-       for (; symp < symendp; symp ++)
- 	if (strcmp ((char *) (symnames + symp->st_name), "_end") == 0
--	    || strcmp ((char *) (symnames + symp->st_name), "_edata") == 0)
-+	    || strcmp ((char *) (symnames + symp->st_name), "end") == 0
-+	    || strcmp ((char *) (symnames + symp->st_name), "_edata") == 0
-+	    || strcmp ((char *) (symnames + symp->st_name), "edata") == 0)
- 	  memcpy (&symp->st_value, &new_bss_addr, sizeof (new_bss_addr));
-     }
diff --git a/editors/emacs23/files/patch-af b/editors/emacs23/files/patch-af
deleted file mode 100644
index 23092a4a8ca0..000000000000
--- a/editors/emacs23/files/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	Tue Aug 20 13:11:26 1996
-+++ configure	Sat Jan 16 23:18:54 1999
-@@ -756,6 +756,10 @@
-     machine=alpha opsys=gnu-linux
-   ;;
- 
-+  alpha-*-freebsd* )
-+    machine=alpha opsys=freebsd
-+  ;;
-+
-   ## Altos 3068
-   m68*-altos-sysv* )
-     machine=altos opsys=usg5-2
diff --git a/editors/emacs23/files/patch-ag b/editors/emacs23/files/patch-ag
deleted file mode 100644
index a556bd24f5eb..000000000000
--- a/editors/emacs23/files/patch-ag
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/m/alpha.h.orig	Sat Aug 10 07:03:36 1996
-+++ src/m/alpha.h	Sat Jan 16 22:34:10 1999
-@@ -234,7 +234,11 @@
- 
- #ifndef NOT_C_CODE
- /* We need these because pointers are larger than the default ints.  */
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #include <alloca.h>
-+#else
-+#include <stdlib.h>
-+#endif
- 
- /* Hack alert!  For reasons unknown to mankind the string.h file insists
-    on defining bcopy etc. as taking char pointers as arguments.  With
-@@ -299,10 +303,18 @@
-    termio and struct termios are mutually incompatible.  */
- #define NO_TERMIO
- 
--#ifdef LINUX
-+#if defined(LINUX) || \
-+	defined(__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
- # define TEXT_END ({ extern int _etext; &_etext; })
- # ifndef __ELF__
- #  define COFF
- #  define DATA_END ({ extern int _EDATA; &_EDATA; })
- # endif /* notdef __ELF__ */
- #endif
-+
-+#if (defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)) \
-+	&& defined (__ELF__)
-+#define HAVE_TEXT_START
-+#endif
-+
-+
diff --git a/editors/emacs23/files/patch-ah b/editors/emacs23/files/patch-ah
deleted file mode 100644
index 3f990e4b5970..000000000000
--- a/editors/emacs23/files/patch-ah
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/unexelf1.c.orig	Sat Aug 10 06:56:52 1996
-+++ src/unexelf1.c	Sun Jan 17 00:28:21 1999
-@@ -423,12 +423,50 @@
- #include <elf.h>
- #include <sys/mman.h>
- 
--#ifdef __alpha__
-+#if defined(__alpha__) && defined(__osf__)
- # include <sym.h>	/* get COFF debugging symbol table declaration */
-+#else if defined(__alpha__)
-+typedef struct {
-+	short magic;
-+	short vstamp;
-+	int ilineMax;
-+	int idnMax;
-+	int ipdMax;
-+	int isymMax;
-+	int ioptMax;
-+	int iauxMax;
-+	int issMax;
-+	int issExtMax;
-+	int ifdMax;
-+	int crfd;
-+	int iextMax;
-+	long cbLine;
-+	long cbLineOffset;
-+	long cbDnOffset;
-+	long cbPdOffset;
-+	long cbSymOffset;
-+	long cbOptOffset;
-+	long cbAuxOffset;
-+	long cbSsOffset;
-+	long cbSsExtOffset;
-+	long cbFdOffset;
-+	long cbRfdOffset;
-+	long cbExtOffset;
-+} HDRR, *pHDRR; 
-+#define cbHDRR sizeof(HDRR)
-+#define hdrNil ((pHDRR)0)
- #endif
- 
- #if __GNU_LIBRARY__ - 0 >= 6
- # include <link.h>	/* get ElfW etc */
-+#endif
-+
-+#ifdef __FreeBSD__
-+# ifdef __STDC__
-+#  define ElfW(type)	Elf_##type
-+# else
-+#  define ElfW(type)	Elf_/**/type
-+# endif
- #endif
- 
- #ifndef ElfW
diff --git a/editors/emacs23/files/patch-ai b/editors/emacs23/files/patch-ai
deleted file mode 100644
index 57da8f14f8fd..000000000000
--- a/editors/emacs23/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib-src/Makefile.in.orig	Sun Apr  4 13:04:19 1999
-+++ lib-src/Makefile.in	Sun Apr  4 13:04:48 1999
-@@ -364,7 +364,7 @@
- 	$(CC) ${ALL_CFLAGS} ${srcdir}/cvtmail.c $(LOADLIBES) -o cvtmail
- 
- fakemail: ${srcdir}/fakemail.c ../src/config.h
--	$(CC) ${ALL_CFLAGS} ${srcdir}/fakemail.c $(LOADLIBES) -o fakemail
-+	$(CC) ${ALL_CFLAGS} ${srcdir}/fakemail.c $(LOADLIBES) -lcompat -o fakemail
- 
- yow: ${srcdir}/yow.c ../src/paths.h
- 	$(CC) ${ALL_CFLAGS} ${srcdir}/yow.c $(LOADLIBES) -o yow
diff --git a/editors/emacs23/files/patch-ba b/editors/emacs23/files/patch-ba
deleted file mode 100644
index c9f637aa3ba4..000000000000
--- a/editors/emacs23/files/patch-ba
+++ /dev/null
@@ -1,22 +0,0 @@
---- lib-src/emacsclient.c.old	Tue Jul 23 23:18:33 1996
-+++ lib-src/emacsclient.c	Thu Oct  8 22:34:54 1998
-@@ -94,6 +94,8 @@
-     struct stat statbfr;
- 
-     gethostname (system_name, sizeof (system_name));
-+    system_name[sizeof (system_name) - 1] = '\0';
-+		/* system_name must be null-terminated string */
-     sprintf (server.sun_path, "/tmp/esrv%d-%s", geteuid (), system_name);
- 
-     if (stat (server.sun_path, &statbfr) == -1)
---- lib-src/emacsserver.c.old	Wed Jul 17 07:09:29 1996
-+++ lib-src/emacsserver.c	Thu Oct  8 22:35:08 1998
-@@ -115,6 +115,8 @@
-   server.sun_family = AF_UNIX;
- #ifndef SERVER_HOME_DIR
-   gethostname (system_name, sizeof (system_name));
-+  system_name[sizeof (system_name) - 1] = '\0';
-+		/* system_name must be null-terminated string */
-   sprintf (server.sun_path, "/tmp/esrv%d-%s", geteuid (), system_name);
- 
-   if (unlink (server.sun_path) == -1 && errno != ENOENT)
diff --git a/editors/emacs23/files/patch-bb b/editors/emacs23/files/patch-bb
deleted file mode 100644
index 1d6fcf08137e..000000000000
--- a/editors/emacs23/files/patch-bb
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/emacs.c.orig	Fri Sep  6 17:15:38 2002
-+++ src/emacs.c	Fri Sep  6 17:16:33 2002
-@@ -427,8 +427,6 @@
- {
-   char stack_bottom_variable;
-   int skip_args = 0;
--  extern int errno;
--  extern sys_nerr;
- 
- #ifdef LINUX_SBRK_BUG
-   __sbrk (1);
diff --git a/editors/emacs23/pkg-descr b/editors/emacs23/pkg-descr
deleted file mode 100644
index 87a11a9cf372..000000000000
--- a/editors/emacs23/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-GNU Emacs is a self-documenting, customizable, extensible real-time
-display editor.
-
-Users new to Emacs will be able to use basic features fairly rapidly
-by studying the tutorial and using the self-documentation features.
-Emacs also has an extensive interactive manual browser.  It is easily
-extensible since its editing commands are written in Lisp.
-
-GNU Emacs's many special packages handle mail reading (RMail) and
-sending (Mail), outline editing (Outline), compiling (Compile),
-running subshells within Emacs windows (Shell), running a Lisp
-read-eval-print loop (Lisp-Interaction-Mode), automated psychotherapy
-(Doctor :-) and many more.
-
-WWW: http://www.gnu.org/software/emacs/
diff --git a/editors/emacs23/pkg-plist b/editors/emacs23/pkg-plist
deleted file mode 100644
index bd28773b2034..000000000000
--- a/editors/emacs23/pkg-plist
+++ /dev/null
@@ -1,1051 +0,0 @@
-bin/ctags
-bin/b2m
-bin/rcs-checkin
-bin/emacs-%%EMACS_VERSION%%
-@exec ln -s %D/%F %B/emacs
-@unexec rm %B/emacs
-bin/etags
-bin/emacsclient
-@exec if [ ! -d %d/share/emacs/site-lisp ]; then mkdir -p %D/share/emacs/site-lisp; fi
-@exec if [ ! -d %d/share/emacs/%%EMACS_VERSION%%/site-lisp ]; then mkdir -p %D/share/emacs/%%EMACS_VERSION%%/site-lisp; fi
-@exec mkdir -p /var/run/emacs/lock ; chmod 1777 /var/run/emacs/lock
-etc/rc.d/emacs.sh
-@comment This can fail if other ports are installed, no need to
-@comment scare user in that case
-@unexec rmdir %D/share/emacs/%%EMACS_VERSION%%/site-lisp 2>/dev/null || true
-@unexec install-info --delete %D/info/emacs %D/info/dir
-@unexec install-info --delete %D/info/vip %D/info/dir
-@unexec install-info --delete %D/info/viper %D/info/dir
-@unexec install-info --delete %D/info/forms %D/info/dir
-@unexec install-info --delete %D/info/gnus %D/info/dir
-@unexec install-info --delete %D/info/mh-e %D/info/dir
-@unexec install-info --delete %D/info/cl %D/info/dir
-@unexec install-info --delete %D/info/sc %D/info/dir
-@unexec install-info --delete %D/info/dired-x %D/info/dir
-@unexec install-info --delete %D/info/ediff %D/info/dir
-@unexec install-info --delete %D/info/ccmode %D/info/dir
-@unexec install-info --delete %D/info/message %D/info/dir
-info/ccmode
-info/ccmode-1
-info/ccmode-2
-info/cl
-info/cl-1
-info/cl-2
-info/cl-3
-info/cl-4
-info/cl-5
-info/cl-6
-info/dired-x
-info/ediff
-info/ediff-1
-info/ediff-2
-info/emacs
-info/emacs-1
-info/emacs-10
-info/emacs-11
-info/emacs-12
-info/emacs-13
-info/emacs-14
-info/emacs-15
-info/emacs-16
-info/emacs-17
-info/emacs-18
-info/emacs-19
-info/emacs-2
-info/emacs-20
-info/emacs-21
-info/emacs-22
-info/emacs-23
-info/emacs-24
-info/emacs-25
-info/emacs-26
-info/emacs-27
-info/emacs-28
-info/emacs-29
-info/emacs-3
-info/emacs-4
-info/emacs-5
-info/emacs-6
-info/emacs-7
-info/emacs-8
-info/emacs-9
-info/forms
-info/gnus
-info/gnus-1
-info/gnus-2
-info/gnus-3
-info/gnus-4
-info/gnus-5
-info/gnus-6
-info/gnus-7
-info/gnus-8
-info/gnus-9
-info/gnus-10
-info/gnus-11
-info/message
-info/mh-e
-info/mh-e-1
-info/mh-e-2
-info/mh-e-3
-info/mh-e-4
-info/sc
-info/sc-1
-info/sc-2
-info/sc-3
-info/vip
-info/vip-1
-info/vip-2
-info/viper
-info/viper-1
-info/viper-2
-info/viper-3
-info/viper-4
-@exec install-info %D/info/emacs %D/info/dir
-@exec install-info %D/info/vip %D/info/dir
-@exec install-info %D/info/viper %D/info/dir
-@exec install-info %D/info/forms %D/info/dir
-@exec install-info %D/info/gnus %D/info/dir
-@exec install-info %D/info/mh-e %D/info/dir
-@exec install-info %D/info/cl %D/info/dir
-@exec install-info %D/info/sc %D/info/dir
-@exec install-info %D/info/dired-x %D/info/dir
-@exec install-info %D/info/ediff %D/info/dir
-@exec install-info %D/info/ccmode %D/info/dir
-@exec install-info %D/info/message %D/info/dir
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/cvtmail
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/digest-doc
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/emacsserver
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/fakemail
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/hexl
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/movemail
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/profile
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/rcs2log
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/sorted-doc
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/vcdiff
-libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/yow
-@dirrm libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%
-@dirrm libexec/emacs/%%EMACS_VERSION%%
-@unexec rmdir %D/libexec/emacs 2>/dev/null || true
-share/emacs/%%EMACS_VERSION%%/etc/3B-MAXMEM
-share/emacs/%%EMACS_VERSION%%/etc/AIX.DUMP
-share/emacs/%%EMACS_VERSION%%/etc/BABYL
-share/emacs/%%EMACS_VERSION%%/etc/CENSORSHIP
-share/emacs/%%EMACS_VERSION%%/etc/COOKIES
-share/emacs/%%EMACS_VERSION%%/etc/COPYING
-share/emacs/%%EMACS_VERSION%%/etc/DEBUG
-share/emacs/%%EMACS_VERSION%%/etc/DISTRIB
-share/emacs/%%EMACS_VERSION%%/etc/DOC-%%EMACS_VERSION%%.1
-share/emacs/%%EMACS_VERSION%%/etc/FAQ
-share/emacs/%%EMACS_VERSION%%/etc/FTP
-share/emacs/%%EMACS_VERSION%%/etc/GNU
-share/emacs/%%EMACS_VERSION%%/etc/INTERVIEW
-share/emacs/%%EMACS_VERSION%%/etc/JOKES
-share/emacs/%%EMACS_VERSION%%/etc/LEDIT
-share/emacs/%%EMACS_VERSION%%/etc/LINUX-GNU
-share/emacs/%%EMACS_VERSION%%/etc/LNEWS
-share/emacs/%%EMACS_VERSION%%/etc/LPF
-share/emacs/%%EMACS_VERSION%%/etc/MACHINES
-share/emacs/%%EMACS_VERSION%%/etc/MAILINGLISTS
-share/emacs/%%EMACS_VERSION%%/etc/MH-E-NEWS
-share/emacs/%%EMACS_VERSION%%/etc/MH-E-ONEWS
-share/emacs/%%EMACS_VERSION%%/etc/MORE.STUFF
-share/emacs/%%EMACS_VERSION%%/etc/MOTIVATION
-share/emacs/%%EMACS_VERSION%%/etc/NEWS
-share/emacs/%%EMACS_VERSION%%/etc/ONEWS
-share/emacs/%%EMACS_VERSION%%/etc/OONEWS
-share/emacs/%%EMACS_VERSION%%/etc/OOONEWS
-share/emacs/%%EMACS_VERSION%%/etc/OOOONEWS
-share/emacs/%%EMACS_VERSION%%/etc/ORDERS
-share/emacs/%%EMACS_VERSION%%/etc/ORDERS.EUROPE
-share/emacs/%%EMACS_VERSION%%/etc/ORDERS.JAPAN
-share/emacs/%%EMACS_VERSION%%/etc/OTHER.EMACSES
-share/emacs/%%EMACS_VERSION%%/etc/README
-share/emacs/%%EMACS_VERSION%%/etc/SERVICE
-share/emacs/%%EMACS_VERSION%%/etc/SUN-SUPPORT
-share/emacs/%%EMACS_VERSION%%/etc/TERMS
-share/emacs/%%EMACS_VERSION%%/etc/TODO
-share/emacs/%%EMACS_VERSION%%/etc/TUTORIAL
-share/emacs/%%EMACS_VERSION%%/etc/WHY-FREE
-share/emacs/%%EMACS_VERSION%%/etc/Xkeymap.txt
-share/emacs/%%EMACS_VERSION%%/etc/celibacy.1
-share/emacs/%%EMACS_VERSION%%/etc/condom.1
-share/emacs/%%EMACS_VERSION%%/etc/copying.paper
-share/emacs/%%EMACS_VERSION%%/etc/ctags.1
-share/emacs/%%EMACS_VERSION%%/etc/e/eterm
-share/emacs/%%EMACS_VERSION%%/etc/e/eterm.ti
-share/emacs/%%EMACS_VERSION%%/etc/echo.msg
-share/emacs/%%EMACS_VERSION%%/etc/edt-user.doc
-share/emacs/%%EMACS_VERSION%%/etc/emacs.1
-share/emacs/%%EMACS_VERSION%%/etc/emacs.bash
-share/emacs/%%EMACS_VERSION%%/etc/emacs.csh
-share/emacs/%%EMACS_VERSION%%/etc/emacs.icon
-share/emacs/%%EMACS_VERSION%%/etc/emacs.xbm
-share/emacs/%%EMACS_VERSION%%/etc/emacstool.1
-share/emacs/%%EMACS_VERSION%%/etc/enriched.doc
-share/emacs/%%EMACS_VERSION%%/etc/etags.1
-share/emacs/%%EMACS_VERSION%%/etc/future-bug
-share/emacs/%%EMACS_VERSION%%/etc/gnu.xpm
-share/emacs/%%EMACS_VERSION%%/etc/gnus-tut.txt
-share/emacs/%%EMACS_VERSION%%/etc/ledit.l
-share/emacs/%%EMACS_VERSION%%/etc/ms-7bkermit
-share/emacs/%%EMACS_VERSION%%/etc/ms-kermit
-share/emacs/%%EMACS_VERSION%%/etc/news.texi
-share/emacs/%%EMACS_VERSION%%/etc/refcard.bit
-share/emacs/%%EMACS_VERSION%%/etc/refcard.ps
-share/emacs/%%EMACS_VERSION%%/etc/refcard.tex
-share/emacs/%%EMACS_VERSION%%/etc/rgb.txt
-share/emacs/%%EMACS_VERSION%%/etc/sex.6
-share/emacs/%%EMACS_VERSION%%/etc/spook.lines
-share/emacs/%%EMACS_VERSION%%/etc/termcap.src
-share/emacs/%%EMACS_VERSION%%/etc/ulimit.hack
-share/emacs/%%EMACS_VERSION%%/etc/vipcard.tex
-share/emacs/%%EMACS_VERSION%%/etc/viperCard.tex
-share/emacs/%%EMACS_VERSION%%/etc/yow.lines
-share/emacs/%%EMACS_VERSION%%/lisp/COPYING
-share/emacs/%%EMACS_VERSION%%/lisp/README
-share/emacs/%%EMACS_VERSION%%/lisp/abbrev.el
-share/emacs/%%EMACS_VERSION%%/lisp/abbrev.elc
-share/emacs/%%EMACS_VERSION%%/lisp/abbrevlist.el
-share/emacs/%%EMACS_VERSION%%/lisp/abbrevlist.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ada-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/ada-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/add-log.el
-share/emacs/%%EMACS_VERSION%%/lisp/add-log.elc
-share/emacs/%%EMACS_VERSION%%/lisp/advice.el
-share/emacs/%%EMACS_VERSION%%/lisp/advice.elc
-share/emacs/%%EMACS_VERSION%%/lisp/allout.el
-share/emacs/%%EMACS_VERSION%%/lisp/allout.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ange-ftp.el
-share/emacs/%%EMACS_VERSION%%/lisp/ange-ftp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/appt.el
-share/emacs/%%EMACS_VERSION%%/lisp/appt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/apropos.el
-share/emacs/%%EMACS_VERSION%%/lisp/apropos.elc
-share/emacs/%%EMACS_VERSION%%/lisp/arc-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/arc-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/array.el
-share/emacs/%%EMACS_VERSION%%/lisp/array.elc
-share/emacs/%%EMACS_VERSION%%/lisp/asm-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/asm-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/assoc.el
-share/emacs/%%EMACS_VERSION%%/lisp/assoc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/auto-show.el
-share/emacs/%%EMACS_VERSION%%/lisp/auto-show.elc
-share/emacs/%%EMACS_VERSION%%/lisp/autoinsert.el
-share/emacs/%%EMACS_VERSION%%/lisp/autoinsert.elc
-share/emacs/%%EMACS_VERSION%%/lisp/autoload.el
-share/emacs/%%EMACS_VERSION%%/lisp/autoload.elc
-share/emacs/%%EMACS_VERSION%%/lisp/avoid.el
-share/emacs/%%EMACS_VERSION%%/lisp/avoid.elc
-share/emacs/%%EMACS_VERSION%%/lisp/awk-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/awk-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/backquote.el
-share/emacs/%%EMACS_VERSION%%/lisp/backquote.elc
-share/emacs/%%EMACS_VERSION%%/lisp/bib-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/bib-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/bibtex.el
-share/emacs/%%EMACS_VERSION%%/lisp/bibtex.elc
-share/emacs/%%EMACS_VERSION%%/lisp/blackbox.el
-share/emacs/%%EMACS_VERSION%%/lisp/blackbox.elc
-share/emacs/%%EMACS_VERSION%%/lisp/blessmail.el
-share/emacs/%%EMACS_VERSION%%/lisp/bookmark.el
-share/emacs/%%EMACS_VERSION%%/lisp/bookmark.elc
-share/emacs/%%EMACS_VERSION%%/lisp/browse-url.el
-share/emacs/%%EMACS_VERSION%%/lisp/browse-url.elc
-share/emacs/%%EMACS_VERSION%%/lisp/buff-menu.el
-share/emacs/%%EMACS_VERSION%%/lisp/buff-menu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/byte-opt.el
-share/emacs/%%EMACS_VERSION%%/lisp/byte-opt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/byte-run.el
-share/emacs/%%EMACS_VERSION%%/lisp/byte-run.elc
-share/emacs/%%EMACS_VERSION%%/lisp/bytecomp.el
-share/emacs/%%EMACS_VERSION%%/lisp/bytecomp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/c-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/c-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-china.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-china.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-coptic.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-coptic.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-dst.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-dst.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-french.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-french.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-hebrew.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-hebrew.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-islam.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-islam.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-iso.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-iso.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-julian.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-julian.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-mayan.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-mayan.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-menu.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-menu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-move.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-move.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-persia.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-persia.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-tex.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-tex.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cal-x.el
-share/emacs/%%EMACS_VERSION%%/lisp/cal-x.elc
-share/emacs/%%EMACS_VERSION%%/lisp/calendar.el
-share/emacs/%%EMACS_VERSION%%/lisp/calendar.elc
-share/emacs/%%EMACS_VERSION%%/lisp/case-table.el
-share/emacs/%%EMACS_VERSION%%/lisp/case-table.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cc-compat.el
-share/emacs/%%EMACS_VERSION%%/lisp/cc-compat.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cc-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/cc-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cdl.el
-share/emacs/%%EMACS_VERSION%%/lisp/cdl.elc
-share/emacs/%%EMACS_VERSION%%/lisp/chistory.el
-share/emacs/%%EMACS_VERSION%%/lisp/chistory.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cl-compat.el
-share/emacs/%%EMACS_VERSION%%/lisp/cl-compat.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cl-extra.el
-share/emacs/%%EMACS_VERSION%%/lisp/cl-extra.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cl-indent.el
-share/emacs/%%EMACS_VERSION%%/lisp/cl-indent.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cl-macs.el
-share/emacs/%%EMACS_VERSION%%/lisp/cl-macs.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cl-seq.el
-share/emacs/%%EMACS_VERSION%%/lisp/cl-seq.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cl-specs.el
-share/emacs/%%EMACS_VERSION%%/lisp/cl-specs.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cl.el
-share/emacs/%%EMACS_VERSION%%/lisp/cl.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cmacexp.el
-share/emacs/%%EMACS_VERSION%%/lisp/cmacexp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cmuscheme.el
-share/emacs/%%EMACS_VERSION%%/lisp/cmuscheme.elc
-share/emacs/%%EMACS_VERSION%%/lisp/comint.el
-share/emacs/%%EMACS_VERSION%%/lisp/comint.elc
-share/emacs/%%EMACS_VERSION%%/lisp/compare-w.el
-share/emacs/%%EMACS_VERSION%%/lisp/compare-w.elc
-share/emacs/%%EMACS_VERSION%%/lisp/compile.el
-share/emacs/%%EMACS_VERSION%%/lisp/compile.elc
-share/emacs/%%EMACS_VERSION%%/lisp/complete.el
-share/emacs/%%EMACS_VERSION%%/lisp/complete.elc
-share/emacs/%%EMACS_VERSION%%/lisp/completion.el
-share/emacs/%%EMACS_VERSION%%/lisp/completion.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cookie1.el
-share/emacs/%%EMACS_VERSION%%/lisp/cookie1.elc
-share/emacs/%%EMACS_VERSION%%/lisp/copyright.el
-share/emacs/%%EMACS_VERSION%%/lisp/copyright.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cplus-md.el
-share/emacs/%%EMACS_VERSION%%/lisp/cplus-md.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cpp.el
-share/emacs/%%EMACS_VERSION%%/lisp/cpp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/cust-print.el
-share/emacs/%%EMACS_VERSION%%/lisp/cust-print.elc
-share/emacs/%%EMACS_VERSION%%/lisp/custom.el
-share/emacs/%%EMACS_VERSION%%/lisp/custom.elc
-share/emacs/%%EMACS_VERSION%%/lisp/dabbrev.el
-share/emacs/%%EMACS_VERSION%%/lisp/dabbrev.elc
-share/emacs/%%EMACS_VERSION%%/lisp/debug.el
-share/emacs/%%EMACS_VERSION%%/lisp/debug.elc
-share/emacs/%%EMACS_VERSION%%/lisp/decipher.el
-share/emacs/%%EMACS_VERSION%%/lisp/decipher.elc
-share/emacs/%%EMACS_VERSION%%/lisp/delsel.el
-share/emacs/%%EMACS_VERSION%%/lisp/delsel.elc
-share/emacs/%%EMACS_VERSION%%/lisp/derived.el
-share/emacs/%%EMACS_VERSION%%/lisp/derived.elc
-share/emacs/%%EMACS_VERSION%%/lisp/desktop.el
-share/emacs/%%EMACS_VERSION%%/lisp/desktop.elc
-share/emacs/%%EMACS_VERSION%%/lisp/diary-lib.el
-share/emacs/%%EMACS_VERSION%%/lisp/diary-lib.elc
-share/emacs/%%EMACS_VERSION%%/lisp/diff.el
-share/emacs/%%EMACS_VERSION%%/lisp/diff.elc
-share/emacs/%%EMACS_VERSION%%/lisp/dired-aux.el
-share/emacs/%%EMACS_VERSION%%/lisp/dired-aux.elc
-share/emacs/%%EMACS_VERSION%%/lisp/dired-x.el
-share/emacs/%%EMACS_VERSION%%/lisp/dired-x.elc
-share/emacs/%%EMACS_VERSION%%/lisp/dired.el
-share/emacs/%%EMACS_VERSION%%/lisp/dired.elc
-share/emacs/%%EMACS_VERSION%%/lisp/disass.el
-share/emacs/%%EMACS_VERSION%%/lisp/disass.elc
-share/emacs/%%EMACS_VERSION%%/lisp/disp-table.el
-share/emacs/%%EMACS_VERSION%%/lisp/disp-table.elc
-share/emacs/%%EMACS_VERSION%%/lisp/dissociate.el
-share/emacs/%%EMACS_VERSION%%/lisp/dissociate.elc
-share/emacs/%%EMACS_VERSION%%/lisp/docref.el
-share/emacs/%%EMACS_VERSION%%/lisp/docref.elc
-share/emacs/%%EMACS_VERSION%%/lisp/doctor.el
-share/emacs/%%EMACS_VERSION%%/lisp/doctor.elc
-share/emacs/%%EMACS_VERSION%%/lisp/dos-fns.el
-share/emacs/%%EMACS_VERSION%%/lisp/dos-fns.elc
-share/emacs/%%EMACS_VERSION%%/lisp/double.el
-share/emacs/%%EMACS_VERSION%%/lisp/double.elc
-share/emacs/%%EMACS_VERSION%%/lisp/dunnet.el
-share/emacs/%%EMACS_VERSION%%/lisp/dunnet.elc
-share/emacs/%%EMACS_VERSION%%/lisp/easymenu.el
-share/emacs/%%EMACS_VERSION%%/lisp/easymenu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ebuff-menu.el
-share/emacs/%%EMACS_VERSION%%/lisp/ebuff-menu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/echistory.el
-share/emacs/%%EMACS_VERSION%%/lisp/echistory.elc
-share/emacs/%%EMACS_VERSION%%/lisp/edebug.el
-share/emacs/%%EMACS_VERSION%%/lisp/edebug.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-diff.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-diff.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-hook.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-hook.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-init.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-init.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-merg.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-merg.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-mult.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-mult.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-ptch.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-ptch.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-util.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-util.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-vers.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-vers.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-wind.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff-wind.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ediff.el
-share/emacs/%%EMACS_VERSION%%/lisp/ediff.elc
-share/emacs/%%EMACS_VERSION%%/lisp/edmacro.el
-share/emacs/%%EMACS_VERSION%%/lisp/edmacro.elc
-share/emacs/%%EMACS_VERSION%%/lisp/edt-lk201.el
-share/emacs/%%EMACS_VERSION%%/lisp/edt-lk201.elc
-share/emacs/%%EMACS_VERSION%%/lisp/edt-mapper.el
-share/emacs/%%EMACS_VERSION%%/lisp/edt-mapper.elc
-share/emacs/%%EMACS_VERSION%%/lisp/edt-pc.el
-share/emacs/%%EMACS_VERSION%%/lisp/edt-pc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/edt-vt100.el
-share/emacs/%%EMACS_VERSION%%/lisp/edt-vt100.elc
-share/emacs/%%EMACS_VERSION%%/lisp/edt.el
-share/emacs/%%EMACS_VERSION%%/lisp/edt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ehelp.el
-share/emacs/%%EMACS_VERSION%%/lisp/ehelp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/electric.el
-share/emacs/%%EMACS_VERSION%%/lisp/electric.elc
-share/emacs/%%EMACS_VERSION%%/lisp/elp.el
-share/emacs/%%EMACS_VERSION%%/lisp/elp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/emacs-lock.el
-share/emacs/%%EMACS_VERSION%%/lisp/emacs-lock.elc
-share/emacs/%%EMACS_VERSION%%/lisp/emacsbug.el
-share/emacs/%%EMACS_VERSION%%/lisp/emacsbug.elc
-share/emacs/%%EMACS_VERSION%%/lisp/emerge.el
-share/emacs/%%EMACS_VERSION%%/lisp/emerge.elc
-share/emacs/%%EMACS_VERSION%%/lisp/enriched.el
-share/emacs/%%EMACS_VERSION%%/lisp/enriched.elc
-share/emacs/%%EMACS_VERSION%%/lisp/env.el
-share/emacs/%%EMACS_VERSION%%/lisp/env.elc
-share/emacs/%%EMACS_VERSION%%/lisp/etags.el
-share/emacs/%%EMACS_VERSION%%/lisp/etags.elc
-share/emacs/%%EMACS_VERSION%%/lisp/eval-reg.el
-share/emacs/%%EMACS_VERSION%%/lisp/eval-reg.elc
-share/emacs/%%EMACS_VERSION%%/lisp/executable.el
-share/emacs/%%EMACS_VERSION%%/lisp/executable.elc
-share/emacs/%%EMACS_VERSION%%/lisp/f90.el
-share/emacs/%%EMACS_VERSION%%/lisp/f90.elc
-share/emacs/%%EMACS_VERSION%%/lisp/facemenu.el
-share/emacs/%%EMACS_VERSION%%/lisp/facemenu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/faces.el
-share/emacs/%%EMACS_VERSION%%/lisp/faces.elc
-share/emacs/%%EMACS_VERSION%%/lisp/fast-lock.el
-share/emacs/%%EMACS_VERSION%%/lisp/fast-lock.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ffap.el
-share/emacs/%%EMACS_VERSION%%/lisp/ffap.elc
-share/emacs/%%EMACS_VERSION%%/lisp/files.el
-share/emacs/%%EMACS_VERSION%%/lisp/files.elc
-share/emacs/%%EMACS_VERSION%%/lisp/fill.el
-share/emacs/%%EMACS_VERSION%%/lisp/fill.elc
-share/emacs/%%EMACS_VERSION%%/lisp/find-dired.el
-share/emacs/%%EMACS_VERSION%%/lisp/find-dired.elc
-share/emacs/%%EMACS_VERSION%%/lisp/find-file.el
-share/emacs/%%EMACS_VERSION%%/lisp/find-file.elc
-share/emacs/%%EMACS_VERSION%%/lisp/find-gc.el
-share/emacs/%%EMACS_VERSION%%/lisp/find-gc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/finder-inf.el
-share/emacs/%%EMACS_VERSION%%/lisp/finder-inf.elc
-share/emacs/%%EMACS_VERSION%%/lisp/finder.el
-share/emacs/%%EMACS_VERSION%%/lisp/finder.elc
-share/emacs/%%EMACS_VERSION%%/lisp/float-sup.el
-share/emacs/%%EMACS_VERSION%%/lisp/float-sup.elc
-share/emacs/%%EMACS_VERSION%%/lisp/float.el
-share/emacs/%%EMACS_VERSION%%/lisp/float.elc
-share/emacs/%%EMACS_VERSION%%/lisp/flow-ctrl.el
-share/emacs/%%EMACS_VERSION%%/lisp/flow-ctrl.elc
-share/emacs/%%EMACS_VERSION%%/lisp/foldout.el
-share/emacs/%%EMACS_VERSION%%/lisp/foldout.elc
-share/emacs/%%EMACS_VERSION%%/lisp/follow.el
-share/emacs/%%EMACS_VERSION%%/lisp/follow.elc
-share/emacs/%%EMACS_VERSION%%/lisp/font-lock.el
-share/emacs/%%EMACS_VERSION%%/lisp/font-lock.elc
-share/emacs/%%EMACS_VERSION%%/lisp/format.el
-share/emacs/%%EMACS_VERSION%%/lisp/format.elc
-share/emacs/%%EMACS_VERSION%%/lisp/forms-d2.dat
-share/emacs/%%EMACS_VERSION%%/lisp/forms-d2.el
-share/emacs/%%EMACS_VERSION%%/lisp/forms-pass.el
-share/emacs/%%EMACS_VERSION%%/lisp/forms.el
-share/emacs/%%EMACS_VERSION%%/lisp/forms.elc
-share/emacs/%%EMACS_VERSION%%/lisp/fortran.el
-share/emacs/%%EMACS_VERSION%%/lisp/fortran.elc
-share/emacs/%%EMACS_VERSION%%/lisp/frame.el
-share/emacs/%%EMACS_VERSION%%/lisp/frame.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-cache.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-cache.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-cite.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-cite.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-cus.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-cus.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-demon.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-demon.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-edit.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-edit.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-ems.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-ems.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-gl.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-gl.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-kill.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-kill.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-mh.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-mh.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-msg.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-msg.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-nocem.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-nocem.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-salt.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-salt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-score.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-score.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-setup.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-setup.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-soup.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-soup.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-srvr.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-srvr.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-topic.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-topic.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-uu.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-uu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-vis.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-vis.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-vm.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus-vm.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gnus.el
-share/emacs/%%EMACS_VERSION%%/lisp/gnus.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gomoku.el
-share/emacs/%%EMACS_VERSION%%/lisp/gomoku.elc
-share/emacs/%%EMACS_VERSION%%/lisp/goto-addr.el
-share/emacs/%%EMACS_VERSION%%/lisp/goto-addr.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gud.el
-share/emacs/%%EMACS_VERSION%%/lisp/gud.elc
-share/emacs/%%EMACS_VERSION%%/lisp/gulp.el
-share/emacs/%%EMACS_VERSION%%/lisp/gulp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/hanoi.el
-share/emacs/%%EMACS_VERSION%%/lisp/hanoi.elc
-share/emacs/%%EMACS_VERSION%%/lisp/help-macro.el
-share/emacs/%%EMACS_VERSION%%/lisp/help-macro.elc
-share/emacs/%%EMACS_VERSION%%/lisp/help.el
-share/emacs/%%EMACS_VERSION%%/lisp/help.elc
-share/emacs/%%EMACS_VERSION%%/lisp/helper.el
-share/emacs/%%EMACS_VERSION%%/lisp/helper.elc
-share/emacs/%%EMACS_VERSION%%/lisp/hexl.el
-share/emacs/%%EMACS_VERSION%%/lisp/hexl.elc
-share/emacs/%%EMACS_VERSION%%/lisp/hideif.el
-share/emacs/%%EMACS_VERSION%%/lisp/hideif.elc
-share/emacs/%%EMACS_VERSION%%/lisp/hideshow.el
-share/emacs/%%EMACS_VERSION%%/lisp/hideshow.elc
-share/emacs/%%EMACS_VERSION%%/lisp/hilit19.el
-share/emacs/%%EMACS_VERSION%%/lisp/hilit19.elc
-share/emacs/%%EMACS_VERSION%%/lisp/hippie-exp.el
-share/emacs/%%EMACS_VERSION%%/lisp/hippie-exp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/holidays.el
-share/emacs/%%EMACS_VERSION%%/lisp/holidays.elc
-share/emacs/%%EMACS_VERSION%%/lisp/icomplete.el
-share/emacs/%%EMACS_VERSION%%/lisp/icomplete.elc
-share/emacs/%%EMACS_VERSION%%/lisp/icon.el
-share/emacs/%%EMACS_VERSION%%/lisp/icon.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ielm.el
-share/emacs/%%EMACS_VERSION%%/lisp/ielm.elc
-share/emacs/%%EMACS_VERSION%%/lisp/imenu.el
-share/emacs/%%EMACS_VERSION%%/lisp/imenu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/indent.el
-share/emacs/%%EMACS_VERSION%%/lisp/indent.elc
-share/emacs/%%EMACS_VERSION%%/lisp/inf-lisp.el
-share/emacs/%%EMACS_VERSION%%/lisp/inf-lisp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/info.el
-share/emacs/%%EMACS_VERSION%%/lisp/info.elc
-share/emacs/%%EMACS_VERSION%%/lisp/informat.el
-share/emacs/%%EMACS_VERSION%%/lisp/informat.elc
-share/emacs/%%EMACS_VERSION%%/lisp/isearch.el
-share/emacs/%%EMACS_VERSION%%/lisp/isearch.elc
-share/emacs/%%EMACS_VERSION%%/lisp/iso-acc.el
-share/emacs/%%EMACS_VERSION%%/lisp/iso-acc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/iso-ascii.el
-share/emacs/%%EMACS_VERSION%%/lisp/iso-ascii.elc
-share/emacs/%%EMACS_VERSION%%/lisp/iso-cvt.el
-share/emacs/%%EMACS_VERSION%%/lisp/iso-cvt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/iso-insert.el
-share/emacs/%%EMACS_VERSION%%/lisp/iso-insert.elc
-share/emacs/%%EMACS_VERSION%%/lisp/iso-swed.el
-share/emacs/%%EMACS_VERSION%%/lisp/iso-swed.elc
-share/emacs/%%EMACS_VERSION%%/lisp/iso-syntax.el
-share/emacs/%%EMACS_VERSION%%/lisp/iso-syntax.elc
-share/emacs/%%EMACS_VERSION%%/lisp/iso-transl.el
-share/emacs/%%EMACS_VERSION%%/lisp/iso-transl.elc
-share/emacs/%%EMACS_VERSION%%/lisp/iso02-syn.el
-share/emacs/%%EMACS_VERSION%%/lisp/iso02-syn.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ispell.el
-share/emacs/%%EMACS_VERSION%%/lisp/ispell.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ispell4.el
-share/emacs/%%EMACS_VERSION%%/lisp/ispell4.elc
-share/emacs/%%EMACS_VERSION%%/lisp/jka-compr.el
-share/emacs/%%EMACS_VERSION%%/lisp/jka-compr.elc
-share/emacs/%%EMACS_VERSION%%/lisp/kermit.el
-share/emacs/%%EMACS_VERSION%%/lisp/kermit.elc
-share/emacs/%%EMACS_VERSION%%/lisp/lazy-lock.el
-share/emacs/%%EMACS_VERSION%%/lisp/lazy-lock.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ledit.el
-share/emacs/%%EMACS_VERSION%%/lisp/ledit.elc
-share/emacs/%%EMACS_VERSION%%/lisp/levents.el
-share/emacs/%%EMACS_VERSION%%/lisp/levents.elc
-share/emacs/%%EMACS_VERSION%%/lisp/life.el
-share/emacs/%%EMACS_VERSION%%/lisp/life.elc
-share/emacs/%%EMACS_VERSION%%/lisp/lisp-mnt.el
-share/emacs/%%EMACS_VERSION%%/lisp/lisp-mnt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/lisp-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/lisp-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/lisp.el
-share/emacs/%%EMACS_VERSION%%/lisp/lisp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/lmenu.el
-share/emacs/%%EMACS_VERSION%%/lisp/lmenu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/loaddefs.el
-share/emacs/%%EMACS_VERSION%%/lisp/loadhist.el
-share/emacs/%%EMACS_VERSION%%/lisp/loadhist.elc
-share/emacs/%%EMACS_VERSION%%/lisp/loadup.el
-share/emacs/%%EMACS_VERSION%%/lisp/lpr.el
-share/emacs/%%EMACS_VERSION%%/lisp/lpr.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ls-lisp.el
-share/emacs/%%EMACS_VERSION%%/lisp/ls-lisp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/lselect.el
-share/emacs/%%EMACS_VERSION%%/lisp/lselect.elc
-share/emacs/%%EMACS_VERSION%%/lisp/lucid.el
-share/emacs/%%EMACS_VERSION%%/lisp/lucid.elc
-share/emacs/%%EMACS_VERSION%%/lisp/lunar.el
-share/emacs/%%EMACS_VERSION%%/lisp/lunar.elc
-share/emacs/%%EMACS_VERSION%%/lisp/macros.el
-share/emacs/%%EMACS_VERSION%%/lisp/macros.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mail-extr.el
-share/emacs/%%EMACS_VERSION%%/lisp/mail-extr.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mail-hist.el
-share/emacs/%%EMACS_VERSION%%/lisp/mail-hist.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mail-utils.el
-share/emacs/%%EMACS_VERSION%%/lisp/mail-utils.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mailabbrev.el
-share/emacs/%%EMACS_VERSION%%/lisp/mailabbrev.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mailalias.el
-share/emacs/%%EMACS_VERSION%%/lisp/mailalias.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mailheader.el
-share/emacs/%%EMACS_VERSION%%/lisp/mailheader.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mailpost.el
-share/emacs/%%EMACS_VERSION%%/lisp/mailpost.elc
-share/emacs/%%EMACS_VERSION%%/lisp/make-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/make-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/makeinfo.el
-share/emacs/%%EMACS_VERSION%%/lisp/makeinfo.elc
-share/emacs/%%EMACS_VERSION%%/lisp/makesum.el
-share/emacs/%%EMACS_VERSION%%/lisp/makesum.elc
-share/emacs/%%EMACS_VERSION%%/lisp/man.el
-share/emacs/%%EMACS_VERSION%%/lisp/man.elc
-share/emacs/%%EMACS_VERSION%%/lisp/map-ynp.el
-share/emacs/%%EMACS_VERSION%%/lisp/map-ynp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/meese.el
-share/emacs/%%EMACS_VERSION%%/lisp/meese.elc
-share/emacs/%%EMACS_VERSION%%/lisp/menu-bar.el
-share/emacs/%%EMACS_VERSION%%/lisp/menu-bar.elc
-share/emacs/%%EMACS_VERSION%%/lisp/message.el
-share/emacs/%%EMACS_VERSION%%/lisp/message.elc
-share/emacs/%%EMACS_VERSION%%/lisp/metamail.el
-share/emacs/%%EMACS_VERSION%%/lisp/metamail.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mh-comp.el
-share/emacs/%%EMACS_VERSION%%/lisp/mh-comp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mh-e.el
-share/emacs/%%EMACS_VERSION%%/lisp/mh-e.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mh-funcs.el
-share/emacs/%%EMACS_VERSION%%/lisp/mh-funcs.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mh-mime.el
-share/emacs/%%EMACS_VERSION%%/lisp/mh-mime.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mh-pick.el
-share/emacs/%%EMACS_VERSION%%/lisp/mh-pick.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mh-seq.el
-share/emacs/%%EMACS_VERSION%%/lisp/mh-seq.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mh-utils.el
-share/emacs/%%EMACS_VERSION%%/lisp/mh-utils.elc
-share/emacs/%%EMACS_VERSION%%/lisp/misc.el
-share/emacs/%%EMACS_VERSION%%/lisp/misc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mlconvert.el
-share/emacs/%%EMACS_VERSION%%/lisp/mlconvert.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mldrag.el
-share/emacs/%%EMACS_VERSION%%/lisp/mldrag.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mlsupport.el
-share/emacs/%%EMACS_VERSION%%/lisp/mlsupport.elc
-share/emacs/%%EMACS_VERSION%%/lisp/modula2.el
-share/emacs/%%EMACS_VERSION%%/lisp/modula2.elc
-share/emacs/%%EMACS_VERSION%%/lisp/morse.el
-share/emacs/%%EMACS_VERSION%%/lisp/morse.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mouse-sel.el
-share/emacs/%%EMACS_VERSION%%/lisp/mouse-sel.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mouse.el
-share/emacs/%%EMACS_VERSION%%/lisp/mouse.elc
-share/emacs/%%EMACS_VERSION%%/lisp/mpuz.el
-share/emacs/%%EMACS_VERSION%%/lisp/mpuz.elc
-share/emacs/%%EMACS_VERSION%%/lisp/msb.el
-share/emacs/%%EMACS_VERSION%%/lisp/msb.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnbabyl.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnbabyl.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nndb.el
-share/emacs/%%EMACS_VERSION%%/lisp/nndb.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nndir.el
-share/emacs/%%EMACS_VERSION%%/lisp/nndir.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nndoc.el
-share/emacs/%%EMACS_VERSION%%/lisp/nndoc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nneething.el
-share/emacs/%%EMACS_VERSION%%/lisp/nneething.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnfolder.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnfolder.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnheader.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnheader.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnkiboze.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnkiboze.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnmail.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnmail.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnmbox.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnmbox.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnmh.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnmh.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnml.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnml.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnoo.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnoo.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnsoup.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnsoup.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnspool.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnspool.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nntp.el
-share/emacs/%%EMACS_VERSION%%/lisp/nntp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nnvirtual.el
-share/emacs/%%EMACS_VERSION%%/lisp/nnvirtual.elc
-share/emacs/%%EMACS_VERSION%%/lisp/noutline.el
-share/emacs/%%EMACS_VERSION%%/lisp/noutline.elc
-share/emacs/%%EMACS_VERSION%%/lisp/novice.el
-share/emacs/%%EMACS_VERSION%%/lisp/novice.elc
-share/emacs/%%EMACS_VERSION%%/lisp/nroff-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/nroff-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/options.el
-share/emacs/%%EMACS_VERSION%%/lisp/options.elc
-share/emacs/%%EMACS_VERSION%%/lisp/outline.el
-share/emacs/%%EMACS_VERSION%%/lisp/outline.elc
-share/emacs/%%EMACS_VERSION%%/lisp/page-ext.el
-share/emacs/%%EMACS_VERSION%%/lisp/page-ext.elc
-share/emacs/%%EMACS_VERSION%%/lisp/page.el
-share/emacs/%%EMACS_VERSION%%/lisp/page.elc
-share/emacs/%%EMACS_VERSION%%/lisp/paragraphs.el
-share/emacs/%%EMACS_VERSION%%/lisp/paragraphs.elc
-share/emacs/%%EMACS_VERSION%%/lisp/paren.el
-share/emacs/%%EMACS_VERSION%%/lisp/paren.elc
-share/emacs/%%EMACS_VERSION%%/lisp/pascal.el
-share/emacs/%%EMACS_VERSION%%/lisp/pascal.elc
-share/emacs/%%EMACS_VERSION%%/lisp/patcomp.el
-share/emacs/%%EMACS_VERSION%%/lisp/paths.el
-share/emacs/%%EMACS_VERSION%%/lisp/pc-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/pc-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/pc-select.el
-share/emacs/%%EMACS_VERSION%%/lisp/pc-select.elc
-share/emacs/%%EMACS_VERSION%%/lisp/perl-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/perl-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/picture.el
-share/emacs/%%EMACS_VERSION%%/lisp/picture.elc
-share/emacs/%%EMACS_VERSION%%/lisp/pp.el
-share/emacs/%%EMACS_VERSION%%/lisp/pp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/profile.el
-share/emacs/%%EMACS_VERSION%%/lisp/profile.elc
-share/emacs/%%EMACS_VERSION%%/lisp/prolog.el
-share/emacs/%%EMACS_VERSION%%/lisp/prolog.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ps-print.el
-share/emacs/%%EMACS_VERSION%%/lisp/ps-print.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rcompile.el
-share/emacs/%%EMACS_VERSION%%/lisp/rcompile.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rect.el
-share/emacs/%%EMACS_VERSION%%/lisp/rect.elc
-share/emacs/%%EMACS_VERSION%%/lisp/refbib.el
-share/emacs/%%EMACS_VERSION%%/lisp/refbib.elc
-share/emacs/%%EMACS_VERSION%%/lisp/refer.el
-share/emacs/%%EMACS_VERSION%%/lisp/refer.elc
-share/emacs/%%EMACS_VERSION%%/lisp/regi.el
-share/emacs/%%EMACS_VERSION%%/lisp/regi.elc
-share/emacs/%%EMACS_VERSION%%/lisp/register.el
-share/emacs/%%EMACS_VERSION%%/lisp/register.elc
-share/emacs/%%EMACS_VERSION%%/lisp/replace.el
-share/emacs/%%EMACS_VERSION%%/lisp/replace.elc
-share/emacs/%%EMACS_VERSION%%/lisp/reporter.el
-share/emacs/%%EMACS_VERSION%%/lisp/reporter.elc
-share/emacs/%%EMACS_VERSION%%/lisp/reposition.el
-share/emacs/%%EMACS_VERSION%%/lisp/reposition.elc
-share/emacs/%%EMACS_VERSION%%/lisp/resume.el
-share/emacs/%%EMACS_VERSION%%/lisp/resume.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rfc822.el
-share/emacs/%%EMACS_VERSION%%/lisp/rfc822.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ring.el
-share/emacs/%%EMACS_VERSION%%/lisp/ring.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rlogin.el
-share/emacs/%%EMACS_VERSION%%/lisp/rlogin.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rmail.el
-share/emacs/%%EMACS_VERSION%%/lisp/rmail.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rmailedit.el
-share/emacs/%%EMACS_VERSION%%/lisp/rmailedit.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rmailkwd.el
-share/emacs/%%EMACS_VERSION%%/lisp/rmailkwd.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rmailmsc.el
-share/emacs/%%EMACS_VERSION%%/lisp/rmailmsc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rmailout.el
-share/emacs/%%EMACS_VERSION%%/lisp/rmailout.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rmailsort.el
-share/emacs/%%EMACS_VERSION%%/lisp/rmailsort.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rmailsum.el
-share/emacs/%%EMACS_VERSION%%/lisp/rmailsum.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rnews.el
-share/emacs/%%EMACS_VERSION%%/lisp/rnews.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rnewspost.el
-share/emacs/%%EMACS_VERSION%%/lisp/rnewspost.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rot13.el
-share/emacs/%%EMACS_VERSION%%/lisp/rot13.elc
-share/emacs/%%EMACS_VERSION%%/lisp/rsz-mini.el
-share/emacs/%%EMACS_VERSION%%/lisp/rsz-mini.elc
-share/emacs/%%EMACS_VERSION%%/lisp/s-region.el
-share/emacs/%%EMACS_VERSION%%/lisp/s-region.elc
-share/emacs/%%EMACS_VERSION%%/lisp/saveplace.el
-share/emacs/%%EMACS_VERSION%%/lisp/saveplace.elc
-share/emacs/%%EMACS_VERSION%%/lisp/sc.el
-share/emacs/%%EMACS_VERSION%%/lisp/scheme.el
-share/emacs/%%EMACS_VERSION%%/lisp/scheme.elc
-share/emacs/%%EMACS_VERSION%%/lisp/score-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/score-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/scribe.el
-share/emacs/%%EMACS_VERSION%%/lisp/scribe.elc
-share/emacs/%%EMACS_VERSION%%/lisp/scroll-bar.el
-share/emacs/%%EMACS_VERSION%%/lisp/scroll-bar.elc
-share/emacs/%%EMACS_VERSION%%/lisp/select.el
-share/emacs/%%EMACS_VERSION%%/lisp/select.elc
-share/emacs/%%EMACS_VERSION%%/lisp/sendmail.el
-share/emacs/%%EMACS_VERSION%%/lisp/sendmail.elc
-share/emacs/%%EMACS_VERSION%%/lisp/server.el
-share/emacs/%%EMACS_VERSION%%/lisp/server.elc
-share/emacs/%%EMACS_VERSION%%/lisp/sgml-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/sgml-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/sh-script.el
-share/emacs/%%EMACS_VERSION%%/lisp/sh-script.elc
-share/emacs/%%EMACS_VERSION%%/lisp/shadow.el
-share/emacs/%%EMACS_VERSION%%/lisp/shadow.elc
-share/emacs/%%EMACS_VERSION%%/lisp/shadowfile.el
-share/emacs/%%EMACS_VERSION%%/lisp/shadowfile.elc
-share/emacs/%%EMACS_VERSION%%/lisp/shell.el
-share/emacs/%%EMACS_VERSION%%/lisp/shell.elc
-share/emacs/%%EMACS_VERSION%%/lisp/simple.el
-share/emacs/%%EMACS_VERSION%%/lisp/simple.elc
-share/emacs/%%EMACS_VERSION%%/lisp/simula.el
-share/emacs/%%EMACS_VERSION%%/lisp/simula.elc
-share/emacs/%%EMACS_VERSION%%/lisp/skeleton.el
-share/emacs/%%EMACS_VERSION%%/lisp/skeleton.elc
-share/emacs/%%EMACS_VERSION%%/lisp/smtpmail.el
-share/emacs/%%EMACS_VERSION%%/lisp/smtpmail.elc
-share/emacs/%%EMACS_VERSION%%/lisp/solar.el
-share/emacs/%%EMACS_VERSION%%/lisp/solar.elc
-share/emacs/%%EMACS_VERSION%%/lisp/solitaire.el
-share/emacs/%%EMACS_VERSION%%/lisp/solitaire.elc
-share/emacs/%%EMACS_VERSION%%/lisp/sort.el
-share/emacs/%%EMACS_VERSION%%/lisp/sort.elc
-share/emacs/%%EMACS_VERSION%%/lisp/soundex.el
-share/emacs/%%EMACS_VERSION%%/lisp/soundex.elc
-share/emacs/%%EMACS_VERSION%%/lisp/spell.el
-share/emacs/%%EMACS_VERSION%%/lisp/spell.elc
-share/emacs/%%EMACS_VERSION%%/lisp/spook.el
-share/emacs/%%EMACS_VERSION%%/lisp/spook.elc
-share/emacs/%%EMACS_VERSION%%/lisp/startup.el
-share/emacs/%%EMACS_VERSION%%/lisp/startup.elc
-share/emacs/%%EMACS_VERSION%%/lisp/studly.el
-share/emacs/%%EMACS_VERSION%%/lisp/studly.elc
-share/emacs/%%EMACS_VERSION%%/lisp/subdirs.el
-share/emacs/%%EMACS_VERSION%%/lisp/subr.el
-share/emacs/%%EMACS_VERSION%%/lisp/subr.elc
-share/emacs/%%EMACS_VERSION%%/lisp/sun-curs.el
-share/emacs/%%EMACS_VERSION%%/lisp/sun-curs.elc
-share/emacs/%%EMACS_VERSION%%/lisp/sun-fns.el
-share/emacs/%%EMACS_VERSION%%/lisp/sun-fns.elc
-share/emacs/%%EMACS_VERSION%%/lisp/supercite.el
-share/emacs/%%EMACS_VERSION%%/lisp/supercite.elc
-share/emacs/%%EMACS_VERSION%%/lisp/swedish.el
-share/emacs/%%EMACS_VERSION%%/lisp/swedish.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tabify.el
-share/emacs/%%EMACS_VERSION%%/lisp/tabify.elc
-share/emacs/%%EMACS_VERSION%%/lisp/talk.el
-share/emacs/%%EMACS_VERSION%%/lisp/talk.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tar-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/tar-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tcl-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/tcl-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tcp.el
-share/emacs/%%EMACS_VERSION%%/lisp/tcp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/telnet.el
-share/emacs/%%EMACS_VERSION%%/lisp/telnet.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tempo.el
-share/emacs/%%EMACS_VERSION%%/lisp/tempo.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term-nasty.el
-share/emacs/%%EMACS_VERSION%%/lisp/term.el
-share/emacs/%%EMACS_VERSION%%/lisp/term.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/AT386.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/README
-share/emacs/%%EMACS_VERSION%%/lisp/term/apollo.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/apollo.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/bg-mouse.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/bg-mouse.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/bobcat.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/internal.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/keyswap.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/lk201.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/news.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/news.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/pc-win.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/pc-win.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/sun-mouse.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/sun-mouse.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/sun.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/sun.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/sup-mouse.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/sup-mouse.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/tvi970.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/tvi970.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt100.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt100.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt102.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt125.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt200.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt200.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt201.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt220.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt240.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt300.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt320.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt400.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/vt420.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/win32-win.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/win32-win.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/wyse50.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/wyse50.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/x-win.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/x-win.elc
-share/emacs/%%EMACS_VERSION%%/lisp/term/xterm.el
-share/emacs/%%EMACS_VERSION%%/lisp/term/xterm.elc
-share/emacs/%%EMACS_VERSION%%/lisp/terminal.el
-share/emacs/%%EMACS_VERSION%%/lisp/terminal.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tex-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/tex-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/texinfmt.el
-share/emacs/%%EMACS_VERSION%%/lisp/texinfmt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/texinfo.el
-share/emacs/%%EMACS_VERSION%%/lisp/texinfo.elc
-share/emacs/%%EMACS_VERSION%%/lisp/texnfo-upd.el
-share/emacs/%%EMACS_VERSION%%/lisp/texnfo-upd.elc
-share/emacs/%%EMACS_VERSION%%/lisp/text-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/text-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/thingatpt.el
-share/emacs/%%EMACS_VERSION%%/lisp/thingatpt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/time-stamp.el
-share/emacs/%%EMACS_VERSION%%/lisp/time-stamp.elc
-share/emacs/%%EMACS_VERSION%%/lisp/time.el
-share/emacs/%%EMACS_VERSION%%/lisp/time.elc
-share/emacs/%%EMACS_VERSION%%/lisp/timer.el
-share/emacs/%%EMACS_VERSION%%/lisp/timer.elc
-share/emacs/%%EMACS_VERSION%%/lisp/timezone.el
-share/emacs/%%EMACS_VERSION%%/lisp/timezone.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tmm.el
-share/emacs/%%EMACS_VERSION%%/lisp/tmm.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tpu-edt.el
-share/emacs/%%EMACS_VERSION%%/lisp/tpu-edt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tpu-extras.el
-share/emacs/%%EMACS_VERSION%%/lisp/tpu-extras.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tpu-mapper.el
-share/emacs/%%EMACS_VERSION%%/lisp/tpu-mapper.elc
-share/emacs/%%EMACS_VERSION%%/lisp/tq.el
-share/emacs/%%EMACS_VERSION%%/lisp/tq.elc
-share/emacs/%%EMACS_VERSION%%/lisp/trace.el
-share/emacs/%%EMACS_VERSION%%/lisp/trace.elc
-share/emacs/%%EMACS_VERSION%%/lisp/two-column.el
-share/emacs/%%EMACS_VERSION%%/lisp/two-column.elc
-share/emacs/%%EMACS_VERSION%%/lisp/type-break.el
-share/emacs/%%EMACS_VERSION%%/lisp/type-break.elc
-share/emacs/%%EMACS_VERSION%%/lisp/uncompress.el
-share/emacs/%%EMACS_VERSION%%/lisp/uncompress.elc
-share/emacs/%%EMACS_VERSION%%/lisp/underline.el
-share/emacs/%%EMACS_VERSION%%/lisp/underline.elc
-share/emacs/%%EMACS_VERSION%%/lisp/undigest.el
-share/emacs/%%EMACS_VERSION%%/lisp/undigest.elc
-share/emacs/%%EMACS_VERSION%%/lisp/uniquify.el
-share/emacs/%%EMACS_VERSION%%/lisp/uniquify.elc
-share/emacs/%%EMACS_VERSION%%/lisp/unrmail.el
-share/emacs/%%EMACS_VERSION%%/lisp/unrmail.elc
-share/emacs/%%EMACS_VERSION%%/lisp/unused.el
-share/emacs/%%EMACS_VERSION%%/lisp/unused.elc
-share/emacs/%%EMACS_VERSION%%/lisp/userlock.el
-share/emacs/%%EMACS_VERSION%%/lisp/userlock.elc
-share/emacs/%%EMACS_VERSION%%/lisp/vc-hooks.el
-share/emacs/%%EMACS_VERSION%%/lisp/vc-hooks.elc
-share/emacs/%%EMACS_VERSION%%/lisp/vc.el
-share/emacs/%%EMACS_VERSION%%/lisp/vc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/version.el
-share/emacs/%%EMACS_VERSION%%/lisp/vi.el
-share/emacs/%%EMACS_VERSION%%/lisp/vi.elc
-share/emacs/%%EMACS_VERSION%%/lisp/view.el
-share/emacs/%%EMACS_VERSION%%/lisp/view.elc
-share/emacs/%%EMACS_VERSION%%/lisp/vip.el
-share/emacs/%%EMACS_VERSION%%/lisp/vip.elc
-share/emacs/%%EMACS_VERSION%%/lisp/viper-ex.el
-share/emacs/%%EMACS_VERSION%%/lisp/viper-ex.elc
-share/emacs/%%EMACS_VERSION%%/lisp/viper-keym.el
-share/emacs/%%EMACS_VERSION%%/lisp/viper-keym.elc
-share/emacs/%%EMACS_VERSION%%/lisp/viper-macs.el
-share/emacs/%%EMACS_VERSION%%/lisp/viper-macs.elc
-share/emacs/%%EMACS_VERSION%%/lisp/viper-mous.el
-share/emacs/%%EMACS_VERSION%%/lisp/viper-mous.elc
-share/emacs/%%EMACS_VERSION%%/lisp/viper-util.el
-share/emacs/%%EMACS_VERSION%%/lisp/viper-util.elc
-share/emacs/%%EMACS_VERSION%%/lisp/viper.el
-share/emacs/%%EMACS_VERSION%%/lisp/viper.elc
-share/emacs/%%EMACS_VERSION%%/lisp/vms-patch.el
-share/emacs/%%EMACS_VERSION%%/lisp/vms-patch.elc
-share/emacs/%%EMACS_VERSION%%/lisp/vms-pmail.el
-share/emacs/%%EMACS_VERSION%%/lisp/vms-pmail.elc
-share/emacs/%%EMACS_VERSION%%/lisp/vmsproc.el
-share/emacs/%%EMACS_VERSION%%/lisp/vmsproc.elc
-share/emacs/%%EMACS_VERSION%%/lisp/vt-control.el
-share/emacs/%%EMACS_VERSION%%/lisp/vt-control.elc
-share/emacs/%%EMACS_VERSION%%/lisp/vt100-led.el
-share/emacs/%%EMACS_VERSION%%/lisp/vt100-led.elc
-share/emacs/%%EMACS_VERSION%%/lisp/window.el
-share/emacs/%%EMACS_VERSION%%/lisp/window.elc
-share/emacs/%%EMACS_VERSION%%/lisp/winnt.el
-share/emacs/%%EMACS_VERSION%%/lisp/winnt.elc
-share/emacs/%%EMACS_VERSION%%/lisp/ws-mode.el
-share/emacs/%%EMACS_VERSION%%/lisp/ws-mode.elc
-share/emacs/%%EMACS_VERSION%%/lisp/x-apollo.el
-share/emacs/%%EMACS_VERSION%%/lisp/x-apollo.elc
-share/emacs/%%EMACS_VERSION%%/lisp/x-menu.el
-share/emacs/%%EMACS_VERSION%%/lisp/x-menu.elc
-share/emacs/%%EMACS_VERSION%%/lisp/xscheme.el
-share/emacs/%%EMACS_VERSION%%/lisp/xscheme.elc
-share/emacs/%%EMACS_VERSION%%/lisp/xt-mouse.el
-share/emacs/%%EMACS_VERSION%%/lisp/xt-mouse.elc
-share/emacs/%%EMACS_VERSION%%/lisp/yow.el
-share/emacs/%%EMACS_VERSION%%/lisp/yow.elc
-@dirrm share/emacs/%%EMACS_VERSION%%/lisp/term
-@dirrm share/emacs/%%EMACS_VERSION%%/lisp
-@dirrm share/emacs/%%EMACS_VERSION%%/etc/e
-@dirrm share/emacs/%%EMACS_VERSION%%/etc
-@dirrm share/emacs/%%EMACS_VERSION%%
diff --git a/editors/joe2/Makefile b/editors/joe2/Makefile
deleted file mode 100644
index 459473985296..000000000000
--- a/editors/joe2/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# New ports collection makefile for:	joe
-# Date created:		01 Jul 1995
-# Whom:			torstenb@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	joe
-PORTVERSION=	2.8
-PORTREVISION=	5
-CATEGORIES+=	editors
-MASTER_SITES=	ftp://ftp.std.com/src/editors/ \
-		http://www.dragondata.com/software/
-DISTNAME=	${PORTNAME}${PORTVERSION}
-EXTRACT_SUFX=	.tar.Z
-
-MAINTAINER?=	toasty@dragondata.com
-COMMENT?=	Joe's own editor
-
-WRKSRC=		${WRKDIR}/joe
-ALL_TARGET=	joe
-MAN1=		joe.1
-
-.include <bsd.port.mk>
diff --git a/editors/joe2/distinfo b/editors/joe2/distinfo
deleted file mode 100644
index 58ec9d53e361..000000000000
--- a/editors/joe2/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (joe2.8.tar.Z) = bad4221aa63ca432e37dac1a953294b1
diff --git a/editors/joe2/files/patch-aa b/editors/joe2/files/patch-aa
deleted file mode 100644
index 755912494edf..000000000000
--- a/editors/joe2/files/patch-aa
+++ /dev/null
@@ -1,106 +0,0 @@
-*** Makefile.orig	Sat Jul  1 18:43:39 1995
---- Makefile	Sat Jul  1 18:59:47 1995
-***************
-*** 9,17 ****
-  # to go and where you want the man page
-  # to go:
-  
-! WHEREJOE = /usr/local/bin
-! WHERERC = /usr/local/lib
-! WHEREMAN = /usr/man/man1
-  
-  # If you want to use TERMINFO, you have to set
-  # the following variable to 1.  Also you have to
---- 9,17 ----
-  # to go and where you want the man page
-  # to go:
-  
-! WHEREJOE = ${PREFIX}/bin
-! WHERERC = ${PREFIX}/lib
-! WHEREMAN = ${PREFIX}/man/man1
-  
-  # If you want to use TERMINFO, you have to set
-  # the following variable to 1.  Also you have to
-***************
-*** 27,33 ****
-  
-  # C compiler options: make's built-in rules use this variable
-  
-! CFLAGS = -O
-  
-  # C compiler to use: make's built-in rules use this variable
-  
---- 27,33 ----
-  
-  # C compiler options: make's built-in rules use this variable
-  
-! # CFLAGS = -O
-  
-  # C compiler to use: make's built-in rules use this variable
-  
-***************
-*** 84,100 ****
-  
-  # Install proceedure
-  
-! install: joe termidx
-  	strip joe
-! 	strip termidx
-  	if [ ! -d $(WHEREJOE) ]; then mkdir $(WHEREJOE); chmod a+rx $(WHEREJOE); fi
-! 	rm -f $(WHEREJOE)/joe $(WHEREJOE)/jmacs $(WHEREJOE)/jstar $(WHEREJOE)/jpico $(WHEREJOE)/rjoe $(WHEREJOE)/termidx
-  	mv joe $(WHEREJOE)
-  	ln $(WHEREJOE)/joe $(WHEREJOE)/jmacs
-  	ln $(WHEREJOE)/joe $(WHEREJOE)/jstar
-  	ln $(WHEREJOE)/joe $(WHEREJOE)/rjoe
-  	ln $(WHEREJOE)/joe $(WHEREJOE)/jpico
-! 	mv termidx $(WHEREJOE)
-  	if [ ! -d $(WHERERC) ]; then mkdir $(WHERERC); chmod a+rx $(WHERERC); fi
-  	rm -f $(WHERERC)/joerc $(WHERERC)/jmacsrc $(WHERERC)/jstarrc $(WHERERC)/jpicorc $(WHERERC)/rjoerc $(WHEREMAN)/joe.1
-  	cp joerc $(WHERERC)
---- 84,100 ----
-  
-  # Install proceedure
-  
-! install: joe # termidx
-  	strip joe
-! #	strip termidx
-  	if [ ! -d $(WHEREJOE) ]; then mkdir $(WHEREJOE); chmod a+rx $(WHEREJOE); fi
-! 	rm -f $(WHEREJOE)/joe $(WHEREJOE)/jmacs $(WHEREJOE)/jstar $(WHEREJOE)/jpico $(WHEREJOE)/rjoe # $(WHEREJOE)/termidx
-  	mv joe $(WHEREJOE)
-  	ln $(WHEREJOE)/joe $(WHEREJOE)/jmacs
-  	ln $(WHEREJOE)/joe $(WHEREJOE)/jstar
-  	ln $(WHEREJOE)/joe $(WHEREJOE)/rjoe
-  	ln $(WHEREJOE)/joe $(WHEREJOE)/jpico
-! #	mv termidx $(WHEREJOE)
-  	if [ ! -d $(WHERERC) ]; then mkdir $(WHERERC); chmod a+rx $(WHERERC); fi
-  	rm -f $(WHERERC)/joerc $(WHERERC)/jmacsrc $(WHERERC)/jstarrc $(WHERERC)/jpicorc $(WHERERC)/rjoerc $(WHEREMAN)/joe.1
-  	cp joerc $(WHERERC)
-***************
-*** 114,126 ****
-  	chmod a+r $(WHERERC)/rjoerc
-  	chmod a+r $(WHERERC)/jpicorc
-  	chmod a+r $(WHEREMAN)/joe.1
-! 	chmod a+x $(WHEREJOE)/termidx
-! 	rm -f $(WHERERC)/termcap
-! 	cp termcap $(WHERERC)/termcap
-! 	chmod a+r $(WHERERC)/termcap
-! 	rm -f $(WHERERC)/terminfo
-! 	cp terminfo $(WHERERC)/terminfo
-! 	chmod a+r $(WHERERC)/terminfo
-  
-  # Cleanup proceedure
-  
---- 114,126 ----
-  	chmod a+r $(WHERERC)/rjoerc
-  	chmod a+r $(WHERERC)/jpicorc
-  	chmod a+r $(WHEREMAN)/joe.1
-! #	chmod a+x $(WHEREJOE)/termidx
-! #	rm -f $(WHERERC)/termcap
-! #	cp termcap $(WHERERC)/termcap
-! #	chmod a+r $(WHERERC)/termcap
-! #	rm -f $(WHERERC)/terminfo
-! #	cp terminfo $(WHERERC)/terminfo
-! #	chmod a+r $(WHERERC)/terminfo
-  
-  # Cleanup proceedure
-  
diff --git a/editors/joe2/files/patch-ab b/editors/joe2/files/patch-ab
deleted file mode 100644
index 1624db3df769..000000000000
--- a/editors/joe2/files/patch-ab
+++ /dev/null
@@ -1,64 +0,0 @@
---- main.c.orig	Sat Jan 21 19:21:08 1995
-+++ main.c	Wed Feb 28 18:52:17 2001
-@@ -18,6 +18,10 @@
- 
- #include <stdio.h>
- #include <fcntl.h>
-+#ifdef __FreeBSD__
-+#include <locale.h>
-+#include <ctype.h>
-+#endif
- #include "config.h"
- #include "w.h"
- #include "tty.h"
-@@ -187,6 +191,20 @@
-  run=namprt(argv[0]);
- #endif 
- 
-+#ifdef __FreeBSD__
-+ setlocale(LC_ALL, "");
-+ for(c=0;c<256;c++)
-+  { int a=0;
-+    if(iscntrl(c))
-+     a|=UNDERLINE;
-+    if((c&0x80)&&!isprint(c))
-+     a|=INVERSE;
-+    xlata[c]=a;
-+    if(isprint(c))
-+     xlatc[c]=c;
-+  }
-+#endif
-+
-  if(s=getenv("LINES")) sscanf(s,"%d",&lines);
-  if(s=getenv("COLUMNS")) sscanf(s,"%d",&columns);
-  if(s=getenv("BAUD")) sscanf(s,"%u",&Baud);
-@@ -234,20 +252,6 @@
- 
- #else
- 
-- s=vsncpy(NULL,0,sc("."));
-- s=vsncpy(sv(s),sv(run));
-- s=vsncpy(sv(s),sc("rc"));
-- c=procrc(cap,s);
-- if(c==0) goto donerc;
-- if(c==1)
--  {
--  char buf[8];
--  fprintf(stderr,"There were errors in '%s'.  Use it anyway?",s);
--  fflush(stderr);
--  fgets(buf,8,stdin);
--  if(buf[0]=='y' || buf[0]=='Y') goto donerc;
--  }
--
-  vsrm(s);
-  s=getenv("HOME");
-  if(s)
-@@ -365,7 +369,7 @@
-  maint->curwin=maint->topwin;
-  if(help) helpon(maint);
-  if(!nonotice)
--  msgnw(lastw(maint)->object,"\\i** Joe's Own Editor v2.8 ** Copyright (C) 1995 Joseph H. Allen **\\i");
-+  msgnw(lastw(maint)->object,"\\i** Joe's Own Editor v2.8l ** Copyright (C) 1995 Joseph H. Allen **\\i");
-  edloop(0);
-  vclose(vmem);
-  nclose(n);
diff --git a/editors/joe2/files/patch-ac b/editors/joe2/files/patch-ac
deleted file mode 100644
index a479bec93fe6..000000000000
--- a/editors/joe2/files/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
---- scrn.c.old	Thu Oct  6 02:10:07 1994
-+++ scrn.c	Thu Sep 11 11:45:47 1997
-@@ -288,6 +288,12 @@
- if(!(t->uc=jgetstr(t->cap,"uc"))) if(t->ul) t->uc="_";
- if(t->uc) t->avattr|=UNDERLINE;
- 
-+/* If we don't have underline, but we do have bold, print underline as bold */
-+if (!(t->avattr & UNDERLINE) && t->md != NULL)
-+ {
-+ t->us = t->md ; t->ue = t->me ; t->avattr |= UNDERLINE;
-+ }
-+
- t->ms=getflag(t->cap,"ms");
- 
- t->da=getflag(t->cap,"da");
-
diff --git a/editors/joe2/files/patch-ad b/editors/joe2/files/patch-ad
deleted file mode 100644
index db0f7fce5fdd..000000000000
--- a/editors/joe2/files/patch-ad
+++ /dev/null
@@ -1,101 +0,0 @@
---- b.c.orig	Fri Jan 20 02:38:25 1995
-+++ b.c	Sun Feb 10 14:39:03 2002
-@@ -21,6 +21,9 @@
- #include <pwd.h>
- #endif
- #include <errno.h>
-+#include <sys/file.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
- 
- #include "config.h"
- #include "blocks.h"
-@@ -201,6 +204,7 @@
-  if(prop) b->o=prop->o;
-  else b->o=pdefault;
-  mset(b->marks,0,sizeof(b->marks));
-+ b->filehandle = -1;	/* initialize filehandle &&& ob */
-  b->rdonly=0;
-  b->orphan=0;
-  b->oldcur=0;
-@@ -255,6 +259,10 @@
-  {
-  if(b && !--b->count)
-   {
-+  if (b->filehandle != -1) {
-+    /* close filehandle, free lock &&& ob */
-+    close (b->filehandle);
-+    }
-   if(b->changed) abrerr(b->name);
-   if(b==errbuf) errbuf=0;
-   if(b->undo) undorm(b->undo);
-@@ -1671,7 +1679,8 @@
-  B *b;
-  long skip,amnt;
-  char *n;
-- int nowrite=0;
-+ struct stat sb;
-+ int nowrite=0,fh=-1;
- 
-  if(!s || !s[0])
-   {
-@@ -1704,6 +1713,28 @@
-   else fclose(fi);
-   fi=fopen(n,"r");
-   if(!fi) nowrite=0;
-+/*printf ("nowrite open=%i\n", nowrite); */
-+  
-+  /* check file mod, if no write flags set, 
-+     joe in read only mode. &&& ob */
-+
-+  if (!nowrite) { 
-+    nowrite = (!stat (n, &sb)) && (!(sb.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH)));
-+    }
-+/*printf ("nowrite stat=%i\n", nowrite); */
-+
-+  /* lock the file if writable, or go into read only mode if
-+     already locked,      */
-+  
-+  if ((fi) && (!nowrite)) { 
-+    fh = dup( fileno(fi) ); 
-+    nowrite = (flock (fh, LOCK_EX | LOCK_NB));
-+    }
-+/*printf ("nowrite flock=%i\n", nowrite); */
-+
-+/*nowrite = 1; */	/* for test purpose */
-+/*printf ("nowrite=%i\n", nowrite); */
-+
-   }
-  joesep(n);
- 
-@@ -1761,6 +1792,7 @@
-  vsrm(n);
- 
-  b->er=error;
-+ if( fh != -1 ) b->filehandle = fh;
-  return b;
-  }
- 
-@@ -1988,9 +2020,20 @@
- 
- void ttsig(sig)
-  {
-- long tim=time(0);
-+ time_t tim=time(0);
-  B *b;
-- FILE *f=fopen("DEADJOE","a");
-+ FILE *f;
-+ struct stat sb;
-+ if ((lstat("DEADJOE", &sb) == 0) && (((sb.st_mode & S_IFLNK) && (sb.st_uid != getuid())) || (sb.st_nlink > 1))) 
-+  {
-+  printf("*** JOE was aborted ");
-+  if (sig) printf("by signal %d, cannot save DEADJOE due to unsafe symlink\n",sig);
-+  else printf("because the terminal closed, cannot save DEADJOE due to unsafe symlink\n");
-+  if(sig) ttclsn();
-+  _exit(1);
-+  }
-+ f=fopen("DEADJOE","a");
-+ chmod("DEADJOE", S_IRUSR | S_IWUSR);
-  fprintf(f,"\n*** Modified files in JOE when it aborted on %s",ctime(&tim));
-  if(sig) fprintf(f,"*** JOE was aborted by signal %d\n",sig);
-  else fprintf(f,"*** JOE was aborted because the terminal closed\n");
diff --git a/editors/joe2/files/patch-ae b/editors/joe2/files/patch-ae
deleted file mode 100644
index 4f01692773cc..000000000000
--- a/editors/joe2/files/patch-ae
+++ /dev/null
@@ -1,8 +0,0 @@
---- b.h.orig	Wed Dec 21 13:04:46 1994
-+++ b.h	Tue Dec  7 13:35:11 1999
-@@ -61,4 +61,5 @@
-  int internal;			/* Set for internal buffers */
-  int er;			/* Error code when file was loaded */
-+ int filehandle;		/* File handle for locking */
-  };
- 
diff --git a/editors/joe2/files/patch-af b/editors/joe2/files/patch-af
deleted file mode 100644
index d21c8801922f..000000000000
--- a/editors/joe2/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- conf.c.orig	Fri Jun  1 19:32:10 2001
-+++ conf.c	Fri Jun  1 19:33:37 2001
-@@ -204,8 +204,6 @@
-  fprintf(f,"\n");
- 
-  fprintf(f,"char *getenv();\n");
-- if(sizeof(long)==8) fprintf(f,"int time();\n");
-- else fprintf(f,"long time();\n");
-  fprintf(f,"void *malloc();\n");
-  fprintf(f,"void free();\n");
-  fprintf(f,"void *calloc();\n");
diff --git a/editors/joe2/files/patch-ag b/editors/joe2/files/patch-ag
deleted file mode 100644
index 084c22bc4db6..000000000000
--- a/editors/joe2/files/patch-ag
+++ /dev/null
@@ -1,39 +0,0 @@
---- rc.c.orig	Fri Jan 20 02:53:42 1995
-+++ rc.c	Sun Feb 10 14:28:42 2002
-@@ -29,7 +29,7 @@
-  * is created.
-  */
- 
--KMAP *getcontext(name)
-+KMAP *joegetcontext(name)
- char *name;
-  {
-  struct context *c;
-@@ -610,7 +610,8 @@
-  FILE *fd;			/* rc file */
-  int line=0;			/* Line number */
-  int err=0;			/* Set to 1 if there was a syntax error */
-- ossep(zcpy(buf,name));
-+ strlcpy(buf,name,sizeof(buf));
-+ ossep(buf);
- #ifdef __MSDOS__
-  fd=fopen(buf,"rt");
- #else
-@@ -739,7 +740,7 @@
-        for(buf[x]=c;cwhite(buf[x]);++x);
-        for(c=x;!cwhitef(buf[c]);++c);
-        buf[c]=0;
--       if(c!=x) kcpy(context,getcontext(buf+x));
-+       if(c!=x) kcpy(context,joegetcontext(buf+x));
-        else
-         {
-         err=1;
-@@ -788,7 +789,7 @@
-        err=1;
-        fprintf(stderr,"\n%s %d: No context selected for :delete",name,line);
-        }
--     else context=getcontext(buf+1);
-+     else context=joegetcontext(buf+1);
-     else
-      {
-      err=1;
diff --git a/editors/joe2/files/patch-ah b/editors/joe2/files/patch-ah
deleted file mode 100644
index d73d9c46710b..000000000000
--- a/editors/joe2/files/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- w.c.orig	Sun Feb 10 14:28:10 2002
-+++ w.c	Sun Feb 10 14:29:15 2002
-@@ -594,7 +594,7 @@
-   else seth(original,original->h-height);
- 
-  /* Create new keyboard handler for window */
-- if(watom->context) new->kbd=mkkbd(getcontext(watom->context));
-+ if(watom->context) new->kbd=mkkbd(joegetcontext(watom->context));
-  else new->kbd=0;
- 
-  /* Put window on the screen */
diff --git a/editors/joe2/files/patch-ai b/editors/joe2/files/patch-ai
deleted file mode 100644
index ce0c0efb52cf..000000000000
--- a/editors/joe2/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- bw.c.orig	Sun Feb 10 14:27:49 2002
-+++ bw.c	Sun Feb 10 14:28:18 2002
-@@ -734,7 +734,7 @@
- if(window==window->main)
-  {
-  rmkbd(window->kbd);
-- window->kbd=mkkbd(getcontext(w->o.context));
-+ window->kbd=mkkbd(joegetcontext(w->o.context));
-  } 
- w->top->xcol=0; w->cursor->xcol=0;
- return w;
diff --git a/editors/joe2/files/patch-aj b/editors/joe2/files/patch-aj
deleted file mode 100644
index 0eff727bd0f1..000000000000
--- a/editors/joe2/files/patch-aj
+++ /dev/null
@@ -1,16 +0,0 @@
---- rc.h.orig	Sun Feb 10 14:28:00 2002
-+++ rc.h	Sun Feb 10 14:28:55 2002
-@@ -34,11 +34,11 @@
- extern OPTIONS pdefault;
- void setopt();
- 
--/* KMAP *getcontext(char *name);
-+/* KMAP *joegetcontext(char *name);
-  * Find and return the KMAP for a given context name.  If none is found, an
-  * empty kmap is created, bound to the context name, and returned.
-  */
--KMAP *getcontext();
-+KMAP *joegetcontext();
- 
- /* int procrc(char *name);  Process an rc file
-    Returns 0 for success
diff --git a/editors/joe2/files/patch-ufile.c b/editors/joe2/files/patch-ufile.c
deleted file mode 100644
index fcea6cc24d15..000000000000
--- a/editors/joe2/files/patch-ufile.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ufile.c.orig	Wed Sep 18 19:09:53 2002
-+++ ufile.c	Wed Sep 18 19:10:19 2002
-@@ -149,7 +149,7 @@
-  f=open(from,O_RDONLY);
-  if(f<0) return -1;
-  if(fstat(f,&sbuf)<0) return -1;
-- g=creat(to,sbuf.st_mode);
-+ g=creat(to,sbuf.st_mode&~(S_ISGID|S_ISUID));
-  if(g<0)
-   {
-   close(f);
diff --git a/editors/joe2/pkg-descr b/editors/joe2/pkg-descr
deleted file mode 100644
index fa4a0a0d104c..000000000000
--- a/editors/joe2/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-	JOE is the professional freeware ASCII text screen editor for UNIX. 
-It makes full use of the power and versatility of UNIX, but lacks the steep
-learning curve and basic nonsense you have to deal with in every other UNIX
-editor. JOE has the feel of most IBM PC text editors: The key-sequences are
-reminiscent of WordStar and Turbo-C.  JOE is much more powerful than those
-editors, however.  JOE has all of the features a UNIX user should expect:
-full use of termcap/terminfo, excellent screen update optimizations (JOE is
-fully useable at 2400 baud), simple installation, and all of the
-UNIX-integration features of VI.
diff --git a/editors/joe2/pkg-plist b/editors/joe2/pkg-plist
deleted file mode 100644
index 52b3d39c3434..000000000000
--- a/editors/joe2/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-bin/joe
-bin/jmacs
-bin/jstar
-bin/rjoe
-bin/jpico
-lib/joerc
-lib/jmacsrc
-lib/jstarrc
-lib/rjoerc
-lib/jpicorc
diff --git a/editors/kile-kde4/Makefile b/editors/kile-kde4/Makefile
deleted file mode 100644
index 4a695962c43f..000000000000
--- a/editors/kile-kde4/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# New ports collection makefile for:	kile
-# Date created:		21 Jun 2002
-# Whom:			Stefan Jahn <stefan.jahn@nemesis-sektor.de>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	kile
-PORTVERSION=	1.31
-CATEGORIES=	editors kde
-MASTER_SITES=	http://perso.club-internet.fr/pascal.brachet/kile/
-
-MAINTAINER=	stefan.jahn@nemesis-sektor.de
-COMMENT=	A LaTeX source editor for KDE
-
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
-
-USE_KDELIBS_VER=3
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/x11/kde3/Makefile.kde"
-.include <bsd.port.post.mk>
diff --git a/editors/kile-kde4/distinfo b/editors/kile-kde4/distinfo
deleted file mode 100644
index fecf5dba685b..000000000000
--- a/editors/kile-kde4/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (kile-1.31.tar.gz) = 234a6a0bfaa54be721bc764d0274671a
diff --git a/editors/kile-kde4/pkg-descr b/editors/kile-kde4/pkg-descr
deleted file mode 100644
index 64304d205ff0..000000000000
--- a/editors/kile-kde4/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Kile (f/k/a Ktexmaker2) is a LaTeX source editor,
-TeX shell and GnuPlot frontend. It is not (and will
-never be) a WYSIWYG (what you see is what you get)
-interface for LaTeX; instead, its aim is to simplify
-the edition of LaTeX source code and the use of the
-LaTeX-related programs for users who want to retain
-control over their LaTeX documents.
-
-WWW: http://perso.club-internet.fr/pascal.brachet/kile/
-
-- Stefan Jahn
-stefan.jahn@nemesis-sektor.de
diff --git a/editors/kile-kde4/pkg-plist b/editors/kile-kde4/pkg-plist
deleted file mode 100644
index 3ba2e0020b0b..000000000000
--- a/editors/kile-kde4/pkg-plist
+++ /dev/null
@@ -1,502 +0,0 @@
-bin/kile
-share/applnk/Applications/kile.desktop
-share/apps/kile/doc/doc1.png
-share/apps/kile/doc/doc10.png
-share/apps/kile/doc/doc11.png
-share/apps/kile/doc/doc12.png
-share/apps/kile/doc/doc2.png
-share/apps/kile/doc/doc3.png
-share/apps/kile/doc/doc4.png
-share/apps/kile/doc/doc5.png
-share/apps/kile/doc/doc6.png
-share/apps/kile/doc/doc7.png
-share/apps/kile/doc/doc8.png
-share/apps/kile/doc/doc9.png
-share/apps/kile/doc/latexhelp.html
-share/apps/kile/doc/logo.png
-share/apps/kile/doc/usermanual.html
-share/apps/kile/kileui.rc
-share/apps/kile/mathsymbols/img1.png
-share/apps/kile/mathsymbols/img10.png
-share/apps/kile/mathsymbols/img100.png
-share/apps/kile/mathsymbols/img101.png
-share/apps/kile/mathsymbols/img102.png
-share/apps/kile/mathsymbols/img103.png
-share/apps/kile/mathsymbols/img104.png
-share/apps/kile/mathsymbols/img105.png
-share/apps/kile/mathsymbols/img106.png
-share/apps/kile/mathsymbols/img107.png
-share/apps/kile/mathsymbols/img108.png
-share/apps/kile/mathsymbols/img109.png
-share/apps/kile/mathsymbols/img10greek.png
-share/apps/kile/mathsymbols/img11.png
-share/apps/kile/mathsymbols/img110.png
-share/apps/kile/mathsymbols/img111.png
-share/apps/kile/mathsymbols/img112.png
-share/apps/kile/mathsymbols/img113.png
-share/apps/kile/mathsymbols/img114.png
-share/apps/kile/mathsymbols/img115.png
-share/apps/kile/mathsymbols/img116.png
-share/apps/kile/mathsymbols/img117.png
-share/apps/kile/mathsymbols/img118.png
-share/apps/kile/mathsymbols/img119.png
-share/apps/kile/mathsymbols/img11greek.png
-share/apps/kile/mathsymbols/img12.png
-share/apps/kile/mathsymbols/img120.png
-share/apps/kile/mathsymbols/img121.png
-share/apps/kile/mathsymbols/img122.png
-share/apps/kile/mathsymbols/img123.png
-share/apps/kile/mathsymbols/img124.png
-share/apps/kile/mathsymbols/img125.png
-share/apps/kile/mathsymbols/img126.png
-share/apps/kile/mathsymbols/img127.png
-share/apps/kile/mathsymbols/img128.png
-share/apps/kile/mathsymbols/img129.png
-share/apps/kile/mathsymbols/img12greek.png
-share/apps/kile/mathsymbols/img13.png
-share/apps/kile/mathsymbols/img130.png
-share/apps/kile/mathsymbols/img131.png
-share/apps/kile/mathsymbols/img132.png
-share/apps/kile/mathsymbols/img133.png
-share/apps/kile/mathsymbols/img134.png
-share/apps/kile/mathsymbols/img135.png
-share/apps/kile/mathsymbols/img136.png
-share/apps/kile/mathsymbols/img137.png
-share/apps/kile/mathsymbols/img138.png
-share/apps/kile/mathsymbols/img139.png
-share/apps/kile/mathsymbols/img13greek.png
-share/apps/kile/mathsymbols/img14.png
-share/apps/kile/mathsymbols/img140.png
-share/apps/kile/mathsymbols/img141.png
-share/apps/kile/mathsymbols/img142.png
-share/apps/kile/mathsymbols/img143.png
-share/apps/kile/mathsymbols/img144.png
-share/apps/kile/mathsymbols/img145.png
-share/apps/kile/mathsymbols/img146.png
-share/apps/kile/mathsymbols/img147.png
-share/apps/kile/mathsymbols/img148.png
-share/apps/kile/mathsymbols/img149.png
-share/apps/kile/mathsymbols/img14greek.png
-share/apps/kile/mathsymbols/img15.png
-share/apps/kile/mathsymbols/img150.png
-share/apps/kile/mathsymbols/img151.png
-share/apps/kile/mathsymbols/img152.png
-share/apps/kile/mathsymbols/img153.png
-share/apps/kile/mathsymbols/img154.png
-share/apps/kile/mathsymbols/img155.png
-share/apps/kile/mathsymbols/img156.png
-share/apps/kile/mathsymbols/img157.png
-share/apps/kile/mathsymbols/img158.png
-share/apps/kile/mathsymbols/img159.png
-share/apps/kile/mathsymbols/img15greek.png
-share/apps/kile/mathsymbols/img16.png
-share/apps/kile/mathsymbols/img160.png
-share/apps/kile/mathsymbols/img161.png
-share/apps/kile/mathsymbols/img162.png
-share/apps/kile/mathsymbols/img163.png
-share/apps/kile/mathsymbols/img164.png
-share/apps/kile/mathsymbols/img165.png
-share/apps/kile/mathsymbols/img166.png
-share/apps/kile/mathsymbols/img167.png
-share/apps/kile/mathsymbols/img168.png
-share/apps/kile/mathsymbols/img169.png
-share/apps/kile/mathsymbols/img16greek.png
-share/apps/kile/mathsymbols/img17.png
-share/apps/kile/mathsymbols/img170.png
-share/apps/kile/mathsymbols/img171.png
-share/apps/kile/mathsymbols/img172.png
-share/apps/kile/mathsymbols/img173.png
-share/apps/kile/mathsymbols/img174.png
-share/apps/kile/mathsymbols/img175.png
-share/apps/kile/mathsymbols/img176.png
-share/apps/kile/mathsymbols/img177.png
-share/apps/kile/mathsymbols/img178.png
-share/apps/kile/mathsymbols/img179.png
-share/apps/kile/mathsymbols/img17greek.png
-share/apps/kile/mathsymbols/img18.png
-share/apps/kile/mathsymbols/img180.png
-share/apps/kile/mathsymbols/img181.png
-share/apps/kile/mathsymbols/img182.png
-share/apps/kile/mathsymbols/img183.png
-share/apps/kile/mathsymbols/img184.png
-share/apps/kile/mathsymbols/img185.png
-share/apps/kile/mathsymbols/img186.png
-share/apps/kile/mathsymbols/img187.png
-share/apps/kile/mathsymbols/img188.png
-share/apps/kile/mathsymbols/img189.png
-share/apps/kile/mathsymbols/img18greek.png
-share/apps/kile/mathsymbols/img19.png
-share/apps/kile/mathsymbols/img190.png
-share/apps/kile/mathsymbols/img191.png
-share/apps/kile/mathsymbols/img192.png
-share/apps/kile/mathsymbols/img193.png
-share/apps/kile/mathsymbols/img194.png
-share/apps/kile/mathsymbols/img195.png
-share/apps/kile/mathsymbols/img196.png
-share/apps/kile/mathsymbols/img197.png
-share/apps/kile/mathsymbols/img198.png
-share/apps/kile/mathsymbols/img199.png
-share/apps/kile/mathsymbols/img19greek.png
-share/apps/kile/mathsymbols/img1greek.png
-share/apps/kile/mathsymbols/img2.png
-share/apps/kile/mathsymbols/img20.png
-share/apps/kile/mathsymbols/img200.png
-share/apps/kile/mathsymbols/img201.png
-share/apps/kile/mathsymbols/img202.png
-share/apps/kile/mathsymbols/img203.png
-share/apps/kile/mathsymbols/img204.png
-share/apps/kile/mathsymbols/img205.png
-share/apps/kile/mathsymbols/img206.png
-share/apps/kile/mathsymbols/img207.png
-share/apps/kile/mathsymbols/img208.png
-share/apps/kile/mathsymbols/img209.png
-share/apps/kile/mathsymbols/img20greek.png
-share/apps/kile/mathsymbols/img21.png
-share/apps/kile/mathsymbols/img210.png
-share/apps/kile/mathsymbols/img211.png
-share/apps/kile/mathsymbols/img212.png
-share/apps/kile/mathsymbols/img213.png
-share/apps/kile/mathsymbols/img214.png
-share/apps/kile/mathsymbols/img215.png
-share/apps/kile/mathsymbols/img216.png
-share/apps/kile/mathsymbols/img217.png
-share/apps/kile/mathsymbols/img218.png
-share/apps/kile/mathsymbols/img219.png
-share/apps/kile/mathsymbols/img21greek.png
-share/apps/kile/mathsymbols/img22.png
-share/apps/kile/mathsymbols/img220.png
-share/apps/kile/mathsymbols/img221.png
-share/apps/kile/mathsymbols/img222.png
-share/apps/kile/mathsymbols/img223.png
-share/apps/kile/mathsymbols/img224.png
-share/apps/kile/mathsymbols/img225.png
-share/apps/kile/mathsymbols/img226.png
-share/apps/kile/mathsymbols/img227.png
-share/apps/kile/mathsymbols/img228.png
-share/apps/kile/mathsymbols/img229.png
-share/apps/kile/mathsymbols/img22greek.png
-share/apps/kile/mathsymbols/img23.png
-share/apps/kile/mathsymbols/img230.png
-share/apps/kile/mathsymbols/img231.png
-share/apps/kile/mathsymbols/img232.png
-share/apps/kile/mathsymbols/img233.png
-share/apps/kile/mathsymbols/img234.png
-share/apps/kile/mathsymbols/img235.png
-share/apps/kile/mathsymbols/img236.png
-share/apps/kile/mathsymbols/img237.png
-share/apps/kile/mathsymbols/img238.png
-share/apps/kile/mathsymbols/img239.png
-share/apps/kile/mathsymbols/img23greek.png
-share/apps/kile/mathsymbols/img24.png
-share/apps/kile/mathsymbols/img240.png
-share/apps/kile/mathsymbols/img241.png
-share/apps/kile/mathsymbols/img242.png
-share/apps/kile/mathsymbols/img243.png
-share/apps/kile/mathsymbols/img244.png
-share/apps/kile/mathsymbols/img245.png
-share/apps/kile/mathsymbols/img246.png
-share/apps/kile/mathsymbols/img247.png
-share/apps/kile/mathsymbols/img248.png
-share/apps/kile/mathsymbols/img249.png
-share/apps/kile/mathsymbols/img24greek.png
-share/apps/kile/mathsymbols/img25.png
-share/apps/kile/mathsymbols/img250.png
-share/apps/kile/mathsymbols/img251.png
-share/apps/kile/mathsymbols/img252.png
-share/apps/kile/mathsymbols/img253.png
-share/apps/kile/mathsymbols/img254.png
-share/apps/kile/mathsymbols/img255.png
-share/apps/kile/mathsymbols/img256.png
-share/apps/kile/mathsymbols/img257.png
-share/apps/kile/mathsymbols/img258.png
-share/apps/kile/mathsymbols/img259.png
-share/apps/kile/mathsymbols/img25greek.png
-share/apps/kile/mathsymbols/img26.png
-share/apps/kile/mathsymbols/img260.png
-share/apps/kile/mathsymbols/img261.png
-share/apps/kile/mathsymbols/img262.png
-share/apps/kile/mathsymbols/img263.png
-share/apps/kile/mathsymbols/img264.png
-share/apps/kile/mathsymbols/img265.png
-share/apps/kile/mathsymbols/img266.png
-share/apps/kile/mathsymbols/img267.png
-share/apps/kile/mathsymbols/img268.png
-share/apps/kile/mathsymbols/img269.png
-share/apps/kile/mathsymbols/img26greek.png
-share/apps/kile/mathsymbols/img27.png
-share/apps/kile/mathsymbols/img270.png
-share/apps/kile/mathsymbols/img271.png
-share/apps/kile/mathsymbols/img272.png
-share/apps/kile/mathsymbols/img273.png
-share/apps/kile/mathsymbols/img274.png
-share/apps/kile/mathsymbols/img275.png
-share/apps/kile/mathsymbols/img276.png
-share/apps/kile/mathsymbols/img277.png
-share/apps/kile/mathsymbols/img278.png
-share/apps/kile/mathsymbols/img279.png
-share/apps/kile/mathsymbols/img27greek.png
-share/apps/kile/mathsymbols/img28.png
-share/apps/kile/mathsymbols/img280.png
-share/apps/kile/mathsymbols/img281.png
-share/apps/kile/mathsymbols/img282.png
-share/apps/kile/mathsymbols/img283.png
-share/apps/kile/mathsymbols/img284.png
-share/apps/kile/mathsymbols/img285.png
-share/apps/kile/mathsymbols/img286.png
-share/apps/kile/mathsymbols/img287.png
-share/apps/kile/mathsymbols/img288.png
-share/apps/kile/mathsymbols/img289.png
-share/apps/kile/mathsymbols/img28greek.png
-share/apps/kile/mathsymbols/img29.png
-share/apps/kile/mathsymbols/img290.png
-share/apps/kile/mathsymbols/img291.png
-share/apps/kile/mathsymbols/img292.png
-share/apps/kile/mathsymbols/img293.png
-share/apps/kile/mathsymbols/img294.png
-share/apps/kile/mathsymbols/img295.png
-share/apps/kile/mathsymbols/img296.png
-share/apps/kile/mathsymbols/img297.png
-share/apps/kile/mathsymbols/img298.png
-share/apps/kile/mathsymbols/img299.png
-share/apps/kile/mathsymbols/img29greek.png
-share/apps/kile/mathsymbols/img2greek.png
-share/apps/kile/mathsymbols/img3.png
-share/apps/kile/mathsymbols/img30.png
-share/apps/kile/mathsymbols/img300.png
-share/apps/kile/mathsymbols/img301.png
-share/apps/kile/mathsymbols/img302.png
-share/apps/kile/mathsymbols/img303.png
-share/apps/kile/mathsymbols/img304.png
-share/apps/kile/mathsymbols/img305.png
-share/apps/kile/mathsymbols/img306.png
-share/apps/kile/mathsymbols/img307.png
-share/apps/kile/mathsymbols/img308.png
-share/apps/kile/mathsymbols/img309.png
-share/apps/kile/mathsymbols/img30greek.png
-share/apps/kile/mathsymbols/img31.png
-share/apps/kile/mathsymbols/img310.png
-share/apps/kile/mathsymbols/img311.png
-share/apps/kile/mathsymbols/img312.png
-share/apps/kile/mathsymbols/img313.png
-share/apps/kile/mathsymbols/img314.png
-share/apps/kile/mathsymbols/img315.png
-share/apps/kile/mathsymbols/img316.png
-share/apps/kile/mathsymbols/img317.png
-share/apps/kile/mathsymbols/img318.png
-share/apps/kile/mathsymbols/img319.png
-share/apps/kile/mathsymbols/img31greek.png
-share/apps/kile/mathsymbols/img32.png
-share/apps/kile/mathsymbols/img320.png
-share/apps/kile/mathsymbols/img321.png
-share/apps/kile/mathsymbols/img322.png
-share/apps/kile/mathsymbols/img323.png
-share/apps/kile/mathsymbols/img324.png
-share/apps/kile/mathsymbols/img325.png
-share/apps/kile/mathsymbols/img326.png
-share/apps/kile/mathsymbols/img327.png
-share/apps/kile/mathsymbols/img328.png
-share/apps/kile/mathsymbols/img329.png
-share/apps/kile/mathsymbols/img32greek.png
-share/apps/kile/mathsymbols/img33.png
-share/apps/kile/mathsymbols/img330.png
-share/apps/kile/mathsymbols/img331.png
-share/apps/kile/mathsymbols/img332.png
-share/apps/kile/mathsymbols/img333.png
-share/apps/kile/mathsymbols/img334.png
-share/apps/kile/mathsymbols/img335.png
-share/apps/kile/mathsymbols/img336.png
-share/apps/kile/mathsymbols/img337.png
-share/apps/kile/mathsymbols/img338.png
-share/apps/kile/mathsymbols/img339.png
-share/apps/kile/mathsymbols/img33greek.png
-share/apps/kile/mathsymbols/img34.png
-share/apps/kile/mathsymbols/img340.png
-share/apps/kile/mathsymbols/img341.png
-share/apps/kile/mathsymbols/img343.png
-share/apps/kile/mathsymbols/img344.png
-share/apps/kile/mathsymbols/img345.png
-share/apps/kile/mathsymbols/img346.png
-share/apps/kile/mathsymbols/img347.png
-share/apps/kile/mathsymbols/img348.png
-share/apps/kile/mathsymbols/img349.png
-share/apps/kile/mathsymbols/img34greek.png
-share/apps/kile/mathsymbols/img35.png
-share/apps/kile/mathsymbols/img350.png
-share/apps/kile/mathsymbols/img351.png
-share/apps/kile/mathsymbols/img352.png
-share/apps/kile/mathsymbols/img353.png
-share/apps/kile/mathsymbols/img354.png
-share/apps/kile/mathsymbols/img355.png
-share/apps/kile/mathsymbols/img356.png
-share/apps/kile/mathsymbols/img357.png
-share/apps/kile/mathsymbols/img358.png
-share/apps/kile/mathsymbols/img359.png
-share/apps/kile/mathsymbols/img35greek.png
-share/apps/kile/mathsymbols/img36.png
-share/apps/kile/mathsymbols/img360.png
-share/apps/kile/mathsymbols/img361.png
-share/apps/kile/mathsymbols/img362.png
-share/apps/kile/mathsymbols/img363.png
-share/apps/kile/mathsymbols/img364.png
-share/apps/kile/mathsymbols/img365.png
-share/apps/kile/mathsymbols/img366.png
-share/apps/kile/mathsymbols/img367.png
-share/apps/kile/mathsymbols/img368.png
-share/apps/kile/mathsymbols/img369.png
-share/apps/kile/mathsymbols/img36greek.png
-share/apps/kile/mathsymbols/img37.png
-share/apps/kile/mathsymbols/img370.png
-share/apps/kile/mathsymbols/img371.png
-share/apps/kile/mathsymbols/img372.png
-share/apps/kile/mathsymbols/img37greek.png
-share/apps/kile/mathsymbols/img38.png
-share/apps/kile/mathsymbols/img38greek.png
-share/apps/kile/mathsymbols/img39.png
-share/apps/kile/mathsymbols/img39greek.png
-share/apps/kile/mathsymbols/img3greek.png
-share/apps/kile/mathsymbols/img4.png
-share/apps/kile/mathsymbols/img40.png
-share/apps/kile/mathsymbols/img40greek.png
-share/apps/kile/mathsymbols/img41.png
-share/apps/kile/mathsymbols/img42.png
-share/apps/kile/mathsymbols/img43.png
-share/apps/kile/mathsymbols/img44.png
-share/apps/kile/mathsymbols/img45.png
-share/apps/kile/mathsymbols/img46.png
-share/apps/kile/mathsymbols/img47.png
-share/apps/kile/mathsymbols/img48.png
-share/apps/kile/mathsymbols/img49.png
-share/apps/kile/mathsymbols/img4greek.png
-share/apps/kile/mathsymbols/img5.png
-share/apps/kile/mathsymbols/img50.png
-share/apps/kile/mathsymbols/img51.png
-share/apps/kile/mathsymbols/img52.png
-share/apps/kile/mathsymbols/img53.png
-share/apps/kile/mathsymbols/img54.png
-share/apps/kile/mathsymbols/img55.png
-share/apps/kile/mathsymbols/img56.png
-share/apps/kile/mathsymbols/img57.png
-share/apps/kile/mathsymbols/img58.png
-share/apps/kile/mathsymbols/img59.png
-share/apps/kile/mathsymbols/img5greek.png
-share/apps/kile/mathsymbols/img6.png
-share/apps/kile/mathsymbols/img60.png
-share/apps/kile/mathsymbols/img61.png
-share/apps/kile/mathsymbols/img62.png
-share/apps/kile/mathsymbols/img63.png
-share/apps/kile/mathsymbols/img64.png
-share/apps/kile/mathsymbols/img65.png
-share/apps/kile/mathsymbols/img66.png
-share/apps/kile/mathsymbols/img67.png
-share/apps/kile/mathsymbols/img68.png
-share/apps/kile/mathsymbols/img69.png
-share/apps/kile/mathsymbols/img6greek.png
-share/apps/kile/mathsymbols/img7.png
-share/apps/kile/mathsymbols/img70.png
-share/apps/kile/mathsymbols/img71.png
-share/apps/kile/mathsymbols/img72.png
-share/apps/kile/mathsymbols/img73.png
-share/apps/kile/mathsymbols/img74.png
-share/apps/kile/mathsymbols/img75.png
-share/apps/kile/mathsymbols/img76.png
-share/apps/kile/mathsymbols/img77.png
-share/apps/kile/mathsymbols/img78.png
-share/apps/kile/mathsymbols/img79.png
-share/apps/kile/mathsymbols/img7greek.png
-share/apps/kile/mathsymbols/img8.png
-share/apps/kile/mathsymbols/img80.png
-share/apps/kile/mathsymbols/img81.png
-share/apps/kile/mathsymbols/img82.png
-share/apps/kile/mathsymbols/img83.png
-share/apps/kile/mathsymbols/img84.png
-share/apps/kile/mathsymbols/img85.png
-share/apps/kile/mathsymbols/img86.png
-share/apps/kile/mathsymbols/img87.png
-share/apps/kile/mathsymbols/img88.png
-share/apps/kile/mathsymbols/img89.png
-share/apps/kile/mathsymbols/img8greek.png
-share/apps/kile/mathsymbols/img9.png
-share/apps/kile/mathsymbols/img90.png
-share/apps/kile/mathsymbols/img91.png
-share/apps/kile/mathsymbols/img92.png
-share/apps/kile/mathsymbols/img93.png
-share/apps/kile/mathsymbols/img94.png
-share/apps/kile/mathsymbols/img95.png
-share/apps/kile/mathsymbols/img96.png
-share/apps/kile/mathsymbols/img97.png
-share/apps/kile/mathsymbols/img98.png
-share/apps/kile/mathsymbols/img99.png
-share/apps/kile/mathsymbols/img9greek.png
-share/apps/kile/pics/acute.png
-share/apps/kile/pics/bar.png
-share/apps/kile/pics/breve.png
-share/apps/kile/pics/chapter.png
-share/apps/kile/pics/check.png
-share/apps/kile/pics/ddot.png
-share/apps/kile/pics/dfrac.png
-share/apps/kile/pics/doc.png
-share/apps/kile/pics/dot.png
-share/apps/kile/pics/dvipdf.png
-share/apps/kile/pics/dvips.png
-share/apps/kile/pics/dvisearch.png
-share/apps/kile/pics/empty.png
-share/apps/kile/pics/enumerate.png
-share/apps/kile/pics/errornext.png
-share/apps/kile/pics/errorprev.png
-share/apps/kile/pics/grave.png
-share/apps/kile/pics/hat.png
-share/apps/kile/pics/include.png
-share/apps/kile/pics/indice.png
-share/apps/kile/pics/item.png
-share/apps/kile/pics/itemize.png
-share/apps/kile/pics/l2h.png
-share/apps/kile/pics/latex.png
-share/apps/kile/pics/master.png
-share/apps/kile/pics/math1.png
-share/apps/kile/pics/math2.png
-share/apps/kile/pics/math3.png
-share/apps/kile/pics/math4.png
-share/apps/kile/pics/math5.png
-share/apps/kile/pics/mathmode.png
-share/apps/kile/pics/modified.png
-share/apps/kile/pics/newline.png
-share/apps/kile/pics/part.png
-share/apps/kile/pics/ps2pdf.png
-share/apps/kile/pics/puissance.png
-share/apps/kile/pics/quick.png
-share/apps/kile/pics/racine.png
-share/apps/kile/pics/section.png
-share/apps/kile/pics/smallfrac.png
-share/apps/kile/pics/structure.png
-share/apps/kile/pics/subsection.png
-share/apps/kile/pics/subsubsection.png
-share/apps/kile/pics/tilde.png
-share/apps/kile/pics/vec.png
-share/apps/kile/pics/viewdvi.png
-share/apps/kile/pics/viewhtml.png
-share/apps/kile/pics/viewlog.png
-share/apps/kile/pics/viewpdf.png
-share/apps/kile/pics/viewps.png
-share/apps/kile/pics/watchfile.png
-share/apps/kile/pics/xfig.png
-share/apps/kile/pics/xgfe.png
-share/doc/HTML/en/kile/index.html
-share/icons/hicolor/16x16/apps/kile.png
-share/icons/hicolor/32x32/apps/kile.png
-share/icons/hicolor/48x48/apps/kile.png
-share/locale/de/LC_MESSAGES/kile.mo
-share/locale/el/LC_MESSAGES/kile.mo
-share/locale/es/LC_MESSAGES/kile.mo
-share/locale/eu/LC_MESSAGES/kile.mo
-share/locale/fr/LC_MESSAGES/kile.mo
-share/locale/hu/LC_MESSAGES/kile.mo
-share/locale/ja/LC_MESSAGES/kile.mo
-share/locale/pt_BR/LC_MESSAGES/kile.mo
-share/locale/ru/LC_MESSAGES/kile.mo
-share/locale/sk/LC_MESSAGES/kile.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kile.mo
-@dirrm share/doc/HTML/en/kile
-@dirrm share/apps/kile/pics
-@dirrm share/apps/kile/mathsymbols
-@dirrm share/apps/kile/doc
-@dirrm share/apps/kile
diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
deleted file mode 100644
index 6916eea1ffeb..000000000000
--- a/editors/koffice-kde4/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-mode: makefile-*-
-# New ports collection makefile for:	koffice
-# Date created:				Sun May 14 2000 16:33:15
-# Whom:					Will Andrews <will@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	koffice
-PORTVERSION=	1.2.1
-PORTEPOCH=	1
-CATEGORIES=	editors kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTNAME}-${PORTVERSION}/src
-DIST_SUBDIR=	KDE/koffice
-
-MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Office Suite for KDE3
-
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2
-
-USE_KDELIBS_VER=	3
-PREFIX=			${KDE_PREFIX}
-
-USE_BZIP2=		yes
-USE_GMAKE=		yes
-USE_PYTHON=		yes
-GNU_CONFIGURE=		yes
-
-INSTALLS_SHLIB=		yes
-LDCONFIG_DIRS+=		%%PREFIX%%/lib %%PREFIX%%/lib/kde3
-
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-
-.include <bsd.port.mk>
diff --git a/editors/koffice-kde4/distinfo b/editors/koffice-kde4/distinfo
deleted file mode 100644
index 6988c28cdb50..000000000000
--- a/editors/koffice-kde4/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (KDE/koffice/koffice-1.2.1.tar.bz2) = 6a73aa72b094ca7b7377f74a508e804e
diff --git a/editors/koffice-kde4/pkg-descr b/editors/koffice-kde4/pkg-descr
deleted file mode 100644
index 3e111fad1e16..000000000000
--- a/editors/koffice-kde4/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This is the office suite for KDE3 that includes KWord, KSpread, KPresenter,
-KChart, and so forth.
-
-WWW: http://www.koffice.org/
-
---AlanE <kde@freebsd.org>
diff --git a/editors/koffice-kde4/pkg-plist b/editors/koffice-kde4/pkg-plist
deleted file mode 100644
index c556aea1b068..000000000000
--- a/editors/koffice-kde4/pkg-plist
+++ /dev/null
@@ -1,2065 +0,0 @@
-bin/karbon
-bin/kchart
-bin/kformula
-bin/kivio
-bin/koconverter
-bin/kontour
-bin/koscript
-bin/koshell
-bin/kprconverter.pl
-bin/kpresenter
-bin/kspread
-bin/kthesaurus
-bin/kudesigner
-bin/kugar
-bin/kword
-include/KDChartData.h
-include/KDChartListTable.h
-include/KDChartTable.h
-include/KDChartTableBase.h
-include/KDChartVectorTable.h
-include/KoApplicationIface.h
-include/KoDocumentIface.h
-include/KoMainWindowIface.h
-include/KoViewIface.h
-include/handler.h
-include/kcoloractions.h
-include/kformulaconfigpage.h
-include/kformulacontainer.h
-include/kformuladefs.h
-include/kformuladocument.h
-include/kformulaview.h
-include/koApplication.h
-include/koCharSelectDia.h
-include/koChart.h
-include/koChild.h
-include/koDocument.h
-include/koDocumentChild.h
-include/koDocumentInfo.h
-include/koDocumentInfoDlg.h
-include/koFactory.h
-include/koFilter.h
-include/koFilterChain.h
-include/koFilterManager.h
-include/koFind.h
-include/koFrame.h
-include/koGlobal.h
-include/koInsertLink.h
-include/koKoolBar.h
-include/koMainWindow.h
-include/koPageLayoutDia.h
-include/koPartSelectAction.h
-include/koPartSelectDia.h
-include/koPicture.h
-include/koPictureCollection.h
-include/koPictureFilePreview.h
-include/koPictureKey.h
-include/koPoint.h
-include/koQueryTrader.h
-include/koRect.h
-include/koReplace.h
-include/koRuler.h
-include/koSize.h
-include/koStore.h
-include/koStoreDevice.h
-include/koTabChooser.h
-include/koTemplateChooseDia.h
-include/koTemplateCreateDia.h
-include/koToolBox.h
-include/koUnit.h
-include/koView.h
-include/kotoolbutton.h
-include/kreportviewer.h
-include/kugar.h
-include/kugarqt.h
-include/mcalcobject.h
-include/mfieldobject.h
-include/mlabelobject.h
-include/mlineobject.h
-include/mpagecollection.h
-include/mpagedisplay.h
-include/mreportdetail.h
-include/mreportengine.h
-include/mreportobject.h
-include/mreportsection.h
-include/mreportviewer.h
-include/mspecialobject.h
-include/mutil.h
-include/tkaction.h
-include/tkcoloractions.h
-include/tkcombobox.h
-include/tktoolbarbutton.h
-lib/karbon.la
-lib/karbon.so
-lib/kchart.la
-lib/kchart.so
-lib/kde3/clipartthumbnail.la
-lib/kde3/clipartthumbnail.so
-lib/kde3/kfile_koffice.la
-lib/kde3/kfile_koffice.so
-lib/kde3/kodocinfopropspage.la
-lib/kde3/kodocinfopropspage.so
-lib/kde3/kofficescan.la
-lib/kde3/kofficescan.so
-lib/kde3/kofficethumbnail.la
-lib/kde3/kofficethumbnail.so
-lib/kde3/kwmailmerge_classic.la
-lib/kde3/kwmailmerge_classic.so
-lib/kde3/kwmailmerge_qtsqldb.la
-lib/kde3/kwmailmerge_qtsqldb.so
-lib/kde3/kwmailmerge_qtsqldb_power.la
-lib/kde3/kwmailmerge_qtsqldb_power.so
-lib/kde3/libabiwordexport.la
-lib/kde3/libabiwordexport.so
-lib/kde3/libabiwordimport.la
-lib/kde3/libabiwordimport.so
-lib/kde3/libamiproexport.la
-lib/kde3/libamiproexport.so
-lib/kde3/libamiproimport.la
-lib/kde3/libamiproimport.so
-lib/kde3/libapplixgraphicimport.la
-lib/kde3/libapplixgraphicimport.so
-lib/kde3/libapplixspreadimport.la
-lib/kde3/libapplixspreadimport.so
-lib/kde3/libapplixwordimport.la
-lib/kde3/libapplixwordimport.so
-lib/kde3/libasciiexport.la
-lib/kde3/libasciiexport.so
-lib/kde3/libasciiimport.la
-lib/kde3/libasciiimport.so
-lib/kde3/libcsvexport.la
-lib/kde3/libcsvexport.so
-lib/kde3/libcsvimport.la
-lib/kde3/libcsvimport.so
-lib/kde3/libdbaseimport.la
-lib/kde3/libdbaseimport.so
-lib/kde3/libdocbookexport.la
-lib/kde3/libdocbookexport.so
-lib/kde3/libgnumericexport.la
-lib/kde3/libgnumericexport.so
-lib/kde3/libgnumericimport.la
-lib/kde3/libgnumericimport.so
-lib/kde3/libhtmlexport.la
-lib/kde3/libhtmlexport.so
-lib/kde3/libhtmlimport.la
-lib/kde3/libhtmlimport.so
-lib/kde3/libkarbonaiimport.la
-lib/kde3/libkarbonaiimport.so
-lib/kde3/libkarbonaiimport.so.1
-lib/kde3/libkarbonepsexport.la
-lib/kde3/libkarbonepsexport.so
-lib/kde3/libkarbonepsimport.la
-lib/kde3/libkarbonepsimport.so
-lib/kde3/libkarbonkontourimport.la
-lib/kde3/libkarbonkontourimport.so
-lib/kde3/libkarbonpart.la
-lib/kde3/libkarbonpart.so
-lib/kde3/libkarbonpngexport.la
-lib/kde3/libkarbonpngexport.so
-lib/kde3/libkarbonsvgexport.la
-lib/kde3/libkarbonsvgexport.so
-lib/kde3/libkchartpart.la
-lib/kde3/libkchartpart.so
-lib/kde3/libkfolatexexport.la
-lib/kde3/libkfolatexexport.so
-lib/kde3/libkfopngexport.la
-lib/kde3/libkfopngexport.so
-lib/kde3/libkformulapart.la
-lib/kde3/libkformulapart.so
-lib/kde3/libkiviopart.la
-lib/kde3/libkiviopart.so
-lib/kde3/libkontourpart.la
-lib/kde3/libkontourpart.so
-lib/kde3/libkontourrtfexport.la
-lib/kde3/libkontourrtfexport.so
-lib/kde3/libkounavailpart.la
-lib/kde3/libkounavailpart.so
-lib/kde3/libkpresenterpart.la
-lib/kde3/libkpresenterpart.so
-lib/kde3/libkprkword.la
-lib/kde3/libkprkword.so
-lib/kde3/libkspelltool.la
-lib/kde3/libkspelltool.so
-lib/kde3/libkspreadcalc.la
-lib/kde3/libkspreadcalc.so
-lib/kde3/libkspreadhtmlexport.la
-lib/kde3/libkspreadhtmlexport.so
-lib/kde3/libkspreadpart.la
-lib/kde3/libkspreadpart.so
-lib/kde3/libkwordpart.la
-lib/kde3/libkwordpart.so
-lib/kde3/liblatexexport.la
-lib/kde3/liblatexexport.so
-lib/kde3/liblateximport.la
-lib/kde3/liblateximport.so
-lib/kde3/liblatexparser.la
-lib/kde3/liblatexparser.so
-lib/kde3/libmsodimport.la
-lib/kde3/libmsodimport.so
-lib/kde3/libmswriteimport.la
-lib/kde3/libmswriteimport.so
-lib/kde3/libolefilter.la
-lib/kde3/libolefilter.so
-lib/kde3/libpalmdocexport.la
-lib/kde3/libpalmdocexport.so
-lib/kde3/libpalmdocimport.la
-lib/kde3/libpalmdocimport.so
-lib/kde3/libqproimport.la
-lib/kde3/libqproimport.so
-lib/kde3/librtfexport.la
-lib/kde3/librtfexport.so
-lib/kde3/librtfimport.la
-lib/kde3/librtfimport.so
-lib/kde3/libtexgraphexport.la
-lib/kde3/libtexgraphexport.so
-lib/kde3/libthesaurustool.la
-lib/kde3/libthesaurustool.so
-lib/kde3/libwmfimport.la
-lib/kde3/libwmfimport.so
-lib/kde3/libwmlexport.la
-lib/kde3/libwmlexport.so
-lib/kde3/libwmlimport.la
-lib/kde3/libwmlimport.so
-lib/kde3/libwpexport.la
-lib/kde3/libwpexport.so
-lib/kde3/libwpimport.la
-lib/kde3/libwpimport.so
-lib/kde3/libxsltexport.la
-lib/kde3/libxsltexport.so
-lib/kde3/libxsltimport.la
-lib/kde3/libxsltimport.so
-lib/kformulamain.la
-lib/kformulamain.so
-lib/kivio.la
-lib/kivio.so
-lib/kontour.la
-lib/kontour.so
-lib/koshell.la
-lib/koshell.so
-lib/kpresenter.la
-lib/kpresenter.so
-lib/kspread.la
-lib/kspread.so
-lib/kword.la
-lib/kword.so
-lib/libkdchart.la
-lib/libkdchart.so
-lib/libkdchart.so.0
-lib/libkformula.la
-lib/libkformula.so
-lib/libkformula.so.3
-lib/libkivioconnectortool.la
-lib/libkivioconnectortool.so
-lib/libkivioselecttool.la
-lib/libkivioselecttool.so
-lib/libkiviotexttool.la
-lib/libkiviotexttool.so
-lib/libkiviozoomtool.la
-lib/libkiviozoomtool.so
-lib/libkochart.la
-lib/libkochart.so
-lib/libkochart.so.1
-lib/libkofficecore.la
-lib/libkofficecore.so
-lib/libkofficecore.so.2
-lib/libkofficeui.la
-lib/libkofficeui.so
-lib/libkofficeui.so.2
-lib/libkopainter.la
-lib/libkopainter.so
-lib/libkopainter.so.1
-lib/libkoscript.la
-lib/libkoscript.so
-lib/libkoscript.so.2
-lib/libkotext.la
-lib/libkotext.so
-lib/libkotext.so.2
-lib/libkstore.la
-lib/libkstore.so
-lib/libkstore.so.2
-lib/libkugar.la
-lib/libkugar.so
-lib/libkugar.so.1
-lib/libkugarpart.la
-lib/libkugarpart.so
-lib/libkwmailmerge_interface.la
-lib/libkwmailmerge_interface.so
-lib/libkwmailmerge_interface.so.4
-lib/libkwmf.la
-lib/libkwmf.so
-lib/libkwmf.so.2
-lib/libkwordexportfilters.la
-lib/libkwordexportfilters.so
-lib/libkwordexportfilters.so.1
-share/applnk/Office/KThesaurus.desktop
-share/applnk/Office/karbon.desktop
-share/applnk/Office/kchart.desktop
-share/applnk/Office/kformula.desktop
-share/applnk/Office/kivio.desktop
-share/applnk/Office/kontour.desktop
-share/applnk/Office/koshell.desktop
-share/applnk/Office/kpresenter.desktop
-share/applnk/Office/kspread.desktop
-share/applnk/Office/kudesigner.desktop
-share/applnk/Office/kugar.desktop
-share/applnk/Office/kword.desktop
-share/apps/karbon/icons/hicolor/16x16/actions/cap_butt.png
-share/apps/karbon/icons/hicolor/16x16/actions/cap_round.png
-share/apps/karbon/icons/hicolor/16x16/actions/cap_square.png
-share/apps/karbon/icons/hicolor/16x16/actions/join_bevel.png
-share/apps/karbon/icons/hicolor/16x16/actions/join_miter.png
-share/apps/karbon/icons/hicolor/16x16/actions/join_round.png
-share/apps/karbon/icons/hicolor/16x16/actions/rotate.png
-share/apps/karbon/icons/hicolor/16x16/actions/shear.png
-share/apps/karbon/icons/hicolor/16x16/actions/translate.png
-share/apps/karbon/icons/hicolor/16x16/apps/karbon.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_ellipse.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_gradient.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_polygon.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_polyline.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_rectangle.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_rotate.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_roundrect.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_select.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_selectnodes.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_shear.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_sinus.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_spiral.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_star.png
-share/apps/karbon/icons/hicolor/22x22/actions/14_text.png
-share/apps/karbon/icons/hicolor/22x22/actions/colorman.png
-share/apps/karbon/icons/hicolor/22x22/actions/gradientdlg.png
-share/apps/karbon/icons/hicolor/22x22/actions/outlinedlg.png
-share/apps/karbon/icons/hicolor/22x22/actions/pagesetup.png
-share/apps/karbon/icons/hicolor/22x22/actions/solidfilldlg.png
-share/apps/karbon/icons/hicolor/32x32/apps/karbon.png
-share/apps/karbon/icons/hicolor/48x48/apps/karbon.png
-share/apps/karbon/karbon.rc
-share/apps/karbon/karbon_readonly.rc
-share/apps/kchart/icons/hicolor/22x22/actions/areas.png
-share/apps/kchart/icons/hicolor/22x22/actions/areas3d.png
-share/apps/kchart/icons/hicolor/22x22/actions/bars.png
-share/apps/kchart/icons/hicolor/22x22/actions/bars3d.png
-share/apps/kchart/icons/hicolor/22x22/actions/cakes.png
-share/apps/kchart/icons/hicolor/22x22/actions/cakes3d.png
-share/apps/kchart/icons/hicolor/22x22/actions/data.png
-share/apps/kchart/icons/hicolor/22x22/actions/hilo.png
-share/apps/kchart/icons/hicolor/22x22/actions/lines.png
-share/apps/kchart/icons/hicolor/22x22/actions/lines3d.png
-share/apps/kchart/icons/hicolor/22x22/actions/options.png
-share/apps/kchart/icons/hicolor/22x22/actions/polar.png
-share/apps/kchart/icons/hicolor/22x22/actions/ring.png
-share/apps/kchart/icons/hicolor/22x22/actions/wizard.png
-share/apps/kchart/icons/locolor/16x16/actions/areas.png
-share/apps/kchart/icons/locolor/16x16/actions/areas3d.png
-share/apps/kchart/icons/locolor/16x16/actions/bars.png
-share/apps/kchart/icons/locolor/16x16/actions/bars3d.png
-share/apps/kchart/icons/locolor/16x16/actions/cakes.png
-share/apps/kchart/icons/locolor/16x16/actions/cakes3d.png
-share/apps/kchart/icons/locolor/16x16/actions/data.png
-share/apps/kchart/icons/locolor/16x16/actions/hilo.png
-share/apps/kchart/icons/locolor/16x16/actions/lines.png
-share/apps/kchart/icons/locolor/16x16/actions/lines3d.png
-share/apps/kchart/icons/locolor/16x16/actions/options.png
-share/apps/kchart/icons/locolor/16x16/actions/ring.png
-share/apps/kchart/icons/locolor/16x16/actions/wizard.png
-share/apps/kchart/kchart.rc
-share/apps/kchart/kchart_readonly.rc
-share/apps/kchart/pics/3DAREA.png
-share/apps/kchart/pics/3DBAR.png
-share/apps/kchart/pics/3DCOMBO_HLC_AREA.png
-share/apps/kchart/pics/3DCOMBO_HLC_BAR.png
-share/apps/kchart/pics/3DCOMBO_LINE_AREA.png
-share/apps/kchart/pics/3DCOMBO_LINE_BAR.png
-share/apps/kchart/pics/3DLINE.png
-share/apps/kchart/pics/areasubtypebeside.png
-share/apps/kchart/pics/areasubtypedepth.png
-share/apps/kchart/pics/barsubtypebeside.png
-share/apps/kchart/pics/barsubtypedepth.png
-share/apps/kchart/pics/barsubtypelayer.png
-share/apps/kchart/pics/barsubtypepercent.png
-share/apps/kchart/pics/chart_3dhiloclose.png
-share/apps/kchart/pics/chart_area.png
-share/apps/kchart/pics/chart_bar.png
-share/apps/kchart/pics/chart_combo_hlc_area.png
-share/apps/kchart/pics/chart_combo_hlc_bar.png
-share/apps/kchart/pics/chart_combo_line_area.png
-share/apps/kchart/pics/chart_combo_line_bar.png
-share/apps/kchart/pics/chart_hiloclose.png
-share/apps/kchart/pics/chart_lines.png
-share/apps/kchart/pics/chart_pie2D.png
-share/apps/kchart/pics/chart_pie3D.png
-share/apps/kformula/esstixeight.font
-share/apps/kformula/esstixeleven.font
-share/apps/kformula/esstixfifteen.font
-share/apps/kformula/esstixfive.font
-share/apps/kformula/esstixfour.font
-share/apps/kformula/esstixfourteen.font
-share/apps/kformula/esstixnine.font
-share/apps/kformula/esstixone.font
-share/apps/kformula/esstixseven.font
-share/apps/kformula/esstixseventeen.font
-share/apps/kformula/esstixsix.font
-share/apps/kformula/esstixsixteen.font
-share/apps/kformula/esstixten.font
-share/apps/kformula/esstixthirteen.font
-share/apps/kformula/esstixthree.font
-share/apps/kformula/esstixtwelve.font
-share/apps/kformula/esstixtwo.font
-share/apps/kformula/euclid%20math%20one.font
-share/apps/kformula/euclid%20math%20two.font
-share/apps/kformula/euclid%20symbol.font
-share/apps/kformula/kformula.rc
-share/apps/kformula/kformula_readonly.rc
-share/apps/kformula/mt%20extra.font
-share/apps/kformula/mt%20symbol.font
-share/apps/kformula/symbol.font
-share/apps/kformula/unicode.tbl
-share/apps/kivio/autoloadStencils/Text.sml
-share/apps/kivio/autoloadStencils/Text.xpm
-share/apps/kivio/autoloadStencils/straight_connector.ksp
-share/apps/kivio/autoloadStencils/straight_connector.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/add_stencil.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/bring_stencil_to_front.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/color_fill.png
-share/apps/kivio/icons/hicolor/16x16/actions/color_line.png
-share/apps/kivio/icons/hicolor/16x16/actions/copy_stencil.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/cut_stencil.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/fillcolor.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/font_bold.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/font_italic.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/font_names.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/font_size.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/font_under.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/group_stencils.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/guides_horizontal.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/guides_vertical.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/item_add.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/item_remove.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/item_rename.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/layer_add.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/layer_connect.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/layer_editable.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/layer_noconnect.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/layer_noeditable.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/layer_noprint.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/layer_novisible.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/layer_print.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/layer_remove.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/layer_visible.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/linewidth.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/open_stencilset.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/page_disabled.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/page_enabled.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/paste_stencil.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/pencolor.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/remove_stencil.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/send_stencil_to_back.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/textcolor.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/ungroup_stencils.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/view_grid.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/view_guidelines.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/view_manager.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/view_margins.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/view_page.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/view_pageborder.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/view_ruler.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/zoom_disabled.xpm
-share/apps/kivio/icons/hicolor/16x16/actions/zoom_enabled.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/bring_stencil_to_front.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/close_stencilset.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/color_fill.png
-share/apps/kivio/icons/hicolor/22x22/actions/color_line.png
-share/apps/kivio/icons/hicolor/22x22/actions/font_bold.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/font_italic.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/font_under.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/group_stencils.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/open_stencilset.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/select_all.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/send_stencil_to_back.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/ungroup_stencils.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/unselect_all.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/view_grid.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/view_margins.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/view_pageborder.xpm
-share/apps/kivio/icons/hicolor/22x22/actions/view_ruler.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/bring_stencil_to_front.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/close_stencilset.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/font_bold.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/font_italic.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/font_under.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/group_stencils.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/open_stencilset.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/select_all.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/send_stencil_to_back.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/ungroup_stencils.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/unselect_all.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/view_grid.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/view_margins.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/view_pageborder.xpm
-share/apps/kivio/icons/hicolor/32x32/actions/view_ruler.xpm
-share/apps/kivio/kivio.rc
-share/apps/kivio/kivio_readonly.rc
-share/apps/kivio/kivio_tool.rc
-share/apps/kivio/kpartplugins/kivioconnectortool.rc
-share/apps/kivio/kpartplugins/kivioselecttool.rc
-share/apps/kivio/kpartplugins/kiviotexttool.rc
-share/apps/kivio/kpartplugins/kiviozoomtool.rc
-share/apps/kivio/pics/kivio_arrow.xpm
-share/apps/kivio/pics/kivio_connector.xpm
-share/apps/kivio/pics/kivio_connector_cursor1.xpm
-share/apps/kivio/pics/kivio_connector_cursor2.xpm
-share/apps/kivio/pics/kivio_text.xpm
-share/apps/kivio/pics/kivio_text_cursor.xpm
-share/apps/kivio/pics/kivio_zoom.xpm
-share/apps/kivio/pics/kivio_zoom_allobject.xpm
-share/apps/kivio/pics/kivio_zoom_hand.xpm
-share/apps/kivio/pics/kivio_zoom_height.xpm
-share/apps/kivio/pics/kivio_zoom_minus.xpm
-share/apps/kivio/pics/kivio_zoom_page.xpm
-share/apps/kivio/pics/kivio_zoom_plus.xpm
-share/apps/kivio/pics/kivio_zoom_selected.xpm
-share/apps/kivio/pics/kivio_zoom_width.xpm
-share/apps/kivio/pics/kiviosplash.png
-share/apps/kivio/pics/tile_scissors1.xpm
-share/apps/kivio/pics/tile_skulls1.xpm
-share/apps/kivio/pics/tile_yellow_swirl.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Card.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Card.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Data.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Data.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Decision.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Decision.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/DirectData.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/DirectData.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Display.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Display.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Document.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Document.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/InternalStorage.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/InternalStorage.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/LoopLimit.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/LoopLimit.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/ManualInput.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/ManualInput.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/ManualOperation.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/ManualOperation.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/OffPageRef.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/OffPageRef.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/OnPageRef.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/OnPageRef.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/PaperTape.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/PaperTape.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/PredefinedProcess.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/PredefinedProcess.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Preperation.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Preperation.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Process.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Process.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/SequentialData.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/SequentialData.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/StoredData.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/StoredData.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Terminator.sml
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/Terminator.xpm
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/desc
-share/apps/kivio/stencils/Flowcharting/BasicFlowcharting/icon.xpm
-share/apps/kivio/stencils/Flowcharting/Logic/and.sml
-share/apps/kivio/stencils/Flowcharting/Logic/and.xpm
-share/apps/kivio/stencils/Flowcharting/Logic/buffer.sml
-share/apps/kivio/stencils/Flowcharting/Logic/buffer.xpm
-share/apps/kivio/stencils/Flowcharting/Logic/connector.sml
-share/apps/kivio/stencils/Flowcharting/Logic/connector.xpm
-share/apps/kivio/stencils/Flowcharting/Logic/icon.xpm
-share/apps/kivio/stencils/Flowcharting/Logic/inverter.sml
-share/apps/kivio/stencils/Flowcharting/Logic/inverter.xpm
-share/apps/kivio/stencils/Flowcharting/Logic/nand.sml
-share/apps/kivio/stencils/Flowcharting/Logic/nand.xpm
-share/apps/kivio/stencils/Flowcharting/Logic/nor.sml
-share/apps/kivio/stencils/Flowcharting/Logic/nor.xpm
-share/apps/kivio/stencils/Flowcharting/Logic/not.sml
-share/apps/kivio/stencils/Flowcharting/Logic/not.xpm
-share/apps/kivio/stencils/Flowcharting/Logic/or.sml
-share/apps/kivio/stencils/Flowcharting/Logic/or.xpm
-share/apps/kivio/stencils/Flowcharting/Logic/xor.sml
-share/apps/kivio/stencils/Flowcharting/Logic/xor.xpm
-share/apps/kivio/stencils/Flowcharting/desc
-share/apps/kivio/stencils/Flowcharting/icon.xpm
-share/apps/koffice/autocorrect/autocorrect.xml
-share/apps/koffice/autocorrect/cs.xml
-share/apps/koffice/autocorrect/de.xml
-share/apps/koffice/autocorrect/en_US.xml
-share/apps/koffice/autocorrect/es.xml
-share/apps/koffice/autocorrect/fr.xml
-share/apps/koffice/autocorrect/hu.xml
-share/apps/koffice/autocorrect/it.xml
-share/apps/koffice/autocorrect/nn.xml
-share/apps/koffice/autocorrect/sk.xml
-share/apps/koffice/icons/hicolor/16x16/actions/delete_table_col.png
-share/apps/koffice/icons/hicolor/16x16/actions/delete_table_row.png
-share/apps/koffice/icons/hicolor/16x16/actions/documentinfo.png
-share/apps/koffice/icons/hicolor/16x16/actions/enum_list.png
-share/apps/koffice/icons/hicolor/16x16/actions/fontsizedown.png
-share/apps/koffice/icons/hicolor/16x16/actions/fontsizeup.png
-share/apps/koffice/icons/hicolor/16x16/actions/format_decreaseindent.png
-share/apps/koffice/icons/hicolor/16x16/actions/format_increaseindent.png
-share/apps/koffice/icons/hicolor/16x16/actions/frame_edit.png
-share/apps/koffice/icons/hicolor/16x16/actions/frame_formula.png
-share/apps/koffice/icons/hicolor/16x16/actions/frame_image.png
-share/apps/koffice/icons/hicolor/16x16/actions/frame_query.png
-share/apps/koffice/icons/hicolor/16x16/actions/frame_spreadsheet.png
-share/apps/koffice/icons/hicolor/16x16/actions/frame_text.png
-share/apps/koffice/icons/hicolor/16x16/actions/inline_image.png
-share/apps/koffice/icons/hicolor/16x16/actions/inline_table.png
-share/apps/koffice/icons/hicolor/16x16/actions/insert_table_col.png
-share/apps/koffice/icons/hicolor/16x16/actions/insert_table_row.png
-share/apps/koffice/icons/hicolor/16x16/actions/kdb_form.png
-share/apps/koffice/icons/hicolor/16x16/actions/kdb_table.png
-share/apps/koffice/icons/hicolor/16x16/actions/linewidth.png
-share/apps/koffice/icons/hicolor/16x16/actions/tab_first.png
-share/apps/koffice/icons/hicolor/16x16/actions/tab_last.png
-share/apps/koffice/icons/hicolor/16x16/actions/tab_left.png
-share/apps/koffice/icons/hicolor/16x16/actions/tab_right.png
-share/apps/koffice/icons/hicolor/16x16/actions/text_strike.png
-share/apps/koffice/icons/hicolor/16x16/actions/text_sub.png
-share/apps/koffice/icons/hicolor/16x16/actions/text_super.png
-share/apps/koffice/icons/hicolor/16x16/actions/textcolor.png
-share/apps/koffice/icons/hicolor/16x16/actions/unsorted_list.png
-share/apps/koffice/icons/hicolor/16x16/actions/view_orientation.png
-share/apps/koffice/icons/hicolor/16x16/actions/view_remove.png
-share/apps/koffice/icons/hicolor/16x16/actions/view_split.png
-share/apps/koffice/icons/hicolor/16x16/apps/go.png
-share/apps/koffice/icons/hicolor/16x16/apps/key_bindings.png
-share/apps/koffice/icons/hicolor/16x16/apps/style.png
-share/apps/koffice/icons/hicolor/22x22/actions/borderbottom.png
-share/apps/koffice/icons/hicolor/22x22/actions/borderleft.png
-share/apps/koffice/icons/hicolor/22x22/actions/borderright.png
-share/apps/koffice/icons/hicolor/22x22/actions/bordertop.png
-share/apps/koffice/icons/hicolor/22x22/actions/bring_forward.png
-share/apps/koffice/icons/hicolor/22x22/actions/cancel.png
-share/apps/koffice/icons/hicolor/22x22/actions/char.png
-share/apps/koffice/icons/hicolor/22x22/actions/clipart.png
-share/apps/koffice/icons/hicolor/22x22/actions/clipart_from_file.png
-share/apps/koffice/icons/hicolor/22x22/actions/delete_table_col.png
-share/apps/koffice/icons/hicolor/22x22/actions/delete_table_row.png
-share/apps/koffice/icons/hicolor/22x22/actions/fontsizedown.png
-share/apps/koffice/icons/hicolor/22x22/actions/fontsizeup.png
-share/apps/koffice/icons/hicolor/22x22/actions/format_decreaseindent.png
-share/apps/koffice/icons/hicolor/22x22/actions/format_increaseindent.png
-share/apps/koffice/icons/hicolor/22x22/actions/frame_chart.png
-share/apps/koffice/icons/hicolor/22x22/actions/frame_edit.png
-share/apps/koffice/icons/hicolor/22x22/actions/frame_formula.png
-share/apps/koffice/icons/hicolor/22x22/actions/frame_image.png
-share/apps/koffice/icons/hicolor/22x22/actions/frame_query.png
-share/apps/koffice/icons/hicolor/22x22/actions/frame_spreadsheet.png
-share/apps/koffice/icons/hicolor/22x22/actions/frame_text.png
-share/apps/koffice/icons/hicolor/22x22/actions/inline_image.png
-share/apps/koffice/icons/hicolor/22x22/actions/inline_table.png
-share/apps/koffice/icons/hicolor/22x22/actions/insert_table_col.png
-share/apps/koffice/icons/hicolor/22x22/actions/insert_table_row.png
-share/apps/koffice/icons/hicolor/22x22/actions/neonpen.png
-share/apps/koffice/icons/hicolor/22x22/actions/ok.png
-share/apps/koffice/icons/hicolor/22x22/actions/part/killustrator.png
-share/apps/koffice/icons/hicolor/22x22/actions/part/kword.png
-share/apps/koffice/icons/hicolor/22x22/actions/send_backward.png
-share/apps/koffice/icons/hicolor/22x22/actions/shadow.png
-share/apps/koffice/icons/hicolor/22x22/actions/shadowB.png
-share/apps/koffice/icons/hicolor/22x22/actions/shadowL.png
-share/apps/koffice/icons/hicolor/22x22/actions/shadowLB.png
-share/apps/koffice/icons/hicolor/22x22/actions/shadowLU.png
-share/apps/koffice/icons/hicolor/22x22/actions/shadowR.png
-share/apps/koffice/icons/hicolor/22x22/actions/shadowRB.png
-share/apps/koffice/icons/hicolor/22x22/actions/shadowRU.png
-share/apps/koffice/icons/hicolor/22x22/actions/shadowU.png
-share/apps/koffice/icons/hicolor/22x22/actions/sub.png
-share/apps/koffice/icons/hicolor/22x22/actions/super.png
-share/apps/koffice/icons/hicolor/22x22/actions/text_strike.png
-share/apps/koffice/icons/hicolor/22x22/actions/toggle_docbrowser.png
-share/apps/koffice/icons/hicolor/22x22/actions/view_remove.png
-share/apps/koffice/icons/hicolor/32x32/actions/delete_table_col.png
-share/apps/koffice/icons/hicolor/32x32/actions/delete_table_row.png
-share/apps/koffice/icons/hicolor/32x32/actions/insert_table_col.png
-share/apps/koffice/icons/hicolor/32x32/actions/insert_table_row.png
-share/apps/koffice/icons/hicolor/32x32/actions/sort_az.png
-share/apps/koffice/icons/hicolor/32x32/actions/view_remove.png
-share/apps/koffice/icons/hicolor/32x32/apps/go.png
-share/apps/koffice/icons/hicolor/48x48/apps/key_bindings.png
-share/apps/koffice/koffice_shell.rc
-share/apps/koffice/pics/koKoolBarDown.png
-share/apps/koffice/pics/koKoolBarUp.png
-share/apps/koffice/pics/koRulerFirst.png
-share/apps/koffice/pics/koRulerLeft.png
-share/apps/koffice/pics/koffice-logo.png
-share/apps/kontour/icons/hicolor/16x16/actions/abottom.png
-share/apps/kontour/icons/hicolor/16x16/actions/ahcenter.png
-share/apps/kontour/icons/hicolor/16x16/actions/aleft.png
-share/apps/kontour/icons/hicolor/16x16/actions/aright.png
-share/apps/kontour/icons/hicolor/16x16/actions/atop.png
-share/apps/kontour/icons/hicolor/16x16/actions/avcenter.png
-share/apps/kontour/icons/hicolor/16x16/actions/beziertool.png
-share/apps/kontour/icons/hicolor/16x16/actions/cap_butt.png
-share/apps/kontour/icons/hicolor/16x16/actions/cap_round.png
-share/apps/kontour/icons/hicolor/16x16/actions/cap_square.png
-share/apps/kontour/icons/hicolor/16x16/actions/dbottom.png
-share/apps/kontour/icons/hicolor/16x16/actions/deleteNode.png
-share/apps/kontour/icons/hicolor/16x16/actions/deletelayer.png
-share/apps/kontour/icons/hicolor/16x16/actions/dhcenter.png
-share/apps/kontour/icons/hicolor/16x16/actions/dhdist.png
-share/apps/kontour/icons/hicolor/16x16/actions/dleft.png
-share/apps/kontour/icons/hicolor/16x16/actions/dright.png
-share/apps/kontour/icons/hicolor/16x16/actions/dtop.png
-share/apps/kontour/icons/hicolor/16x16/actions/dvcenter.png
-share/apps/kontour/icons/hicolor/16x16/actions/dvdist.png
-share/apps/kontour/icons/hicolor/16x16/actions/ellipse1.png
-share/apps/kontour/icons/hicolor/16x16/actions/ellipse2.png
-share/apps/kontour/icons/hicolor/16x16/actions/ellipse3.png
-share/apps/kontour/icons/hicolor/16x16/actions/ellipsetool.png
-share/apps/kontour/icons/hicolor/16x16/actions/eye.png
-share/apps/kontour/icons/hicolor/16x16/actions/freehandtool.png
-share/apps/kontour/icons/hicolor/16x16/actions/group.png
-share/apps/kontour/icons/hicolor/16x16/actions/hmirror.png
-share/apps/kontour/icons/hicolor/16x16/actions/insertclipart.png
-share/apps/kontour/icons/hicolor/16x16/actions/item_add.png
-share/apps/kontour/icons/hicolor/16x16/actions/item_remove.png
-share/apps/kontour/icons/hicolor/16x16/actions/item_rename.png
-share/apps/kontour/icons/hicolor/16x16/actions/joinNodes.png
-share/apps/kontour/icons/hicolor/16x16/actions/join_bevel.png
-share/apps/kontour/icons/hicolor/16x16/actions/join_miter.png
-share/apps/kontour/icons/hicolor/16x16/actions/join_round.png
-share/apps/kontour/icons/hicolor/16x16/actions/linetool.png
-share/apps/kontour/icons/hicolor/16x16/actions/lowerlayer.png
-share/apps/kontour/icons/hicolor/16x16/actions/moveNode.png
-share/apps/kontour/icons/hicolor/16x16/actions/newNode.png
-share/apps/kontour/icons/hicolor/16x16/actions/newlayer.png
-share/apps/kontour/icons/hicolor/16x16/actions/pointtool.png
-share/apps/kontour/icons/hicolor/16x16/actions/polygontool.png
-share/apps/kontour/icons/hicolor/16x16/actions/raiselayer.png
-share/apps/kontour/icons/hicolor/16x16/actions/recttool.png
-share/apps/kontour/icons/hicolor/16x16/actions/snap_to_grid.png
-share/apps/kontour/icons/hicolor/16x16/actions/split.png
-share/apps/kontour/icons/hicolor/16x16/actions/tcenteralign.png
-share/apps/kontour/icons/hicolor/16x16/actions/texttool.png
-share/apps/kontour/icons/hicolor/16x16/actions/tleftalign.png
-share/apps/kontour/icons/hicolor/16x16/actions/trightalign.png
-share/apps/kontour/icons/hicolor/16x16/actions/ungroup.png
-share/apps/kontour/icons/hicolor/16x16/actions/vmirror.png
-share/apps/kontour/icons/hicolor/16x16/apps/kontour.png
-share/apps/kontour/icons/hicolor/22x22/actions/selecttool.png
-share/apps/kontour/icons/hicolor/32x32/actions/rect1.png
-share/apps/kontour/icons/hicolor/32x32/actions/rect2.png
-share/apps/kontour/icons/hicolor/32x32/actions/rect3.png
-share/apps/kontour/icons/hicolor/32x32/actions/rect4.png
-share/apps/kontour/icons/hicolor/32x32/actions/rect5.png
-share/apps/kontour/icons/hicolor/32x32/actions/rect6.png
-share/apps/kontour/icons/hicolor/32x32/actions/rect7.png
-share/apps/kontour/icons/hicolor/32x32/actions/rect8.png
-share/apps/kontour/icons/hicolor/32x32/apps/kontour.png
-share/apps/kontour/icons/hicolor/48x48/apps/kontour.png
-share/apps/kontour/kontour.rc
-share/apps/kontour/kontour_readonly.rc
-share/apps/kontour/kpartplugins/scan-kontour.rc
-share/apps/kontour/templates/Simple/.directory
-share/apps/kontour/templates/Simple/.icon/Plain.png
-share/apps/kontour/templates/Simple/.source/Plain.kon
-share/apps/kontour/templates/Simple/Plain.desktop
-share/apps/kpresenter/autoforms/.autoforms
-share/apps/kpresenter/autoforms/Arrows/.directory
-share/apps/kpresenter/autoforms/Arrows/.icon/ArrowDown.png
-share/apps/kpresenter/autoforms/Arrows/.icon/ArrowLeft.png
-share/apps/kpresenter/autoforms/Arrows/.icon/ArrowLeftDown.png
-share/apps/kpresenter/autoforms/Arrows/.icon/ArrowLeftUp.png
-share/apps/kpresenter/autoforms/Arrows/.icon/ArrowRight.png
-share/apps/kpresenter/autoforms/Arrows/.icon/ArrowRightDown.png
-share/apps/kpresenter/autoforms/Arrows/.icon/ArrowRightUp.png
-share/apps/kpresenter/autoforms/Arrows/.icon/ArrowUp.png
-share/apps/kpresenter/autoforms/Arrows/.source/ArrowDown.atf
-share/apps/kpresenter/autoforms/Arrows/.source/ArrowLeft.atf
-share/apps/kpresenter/autoforms/Arrows/.source/ArrowLeftDown.atf
-share/apps/kpresenter/autoforms/Arrows/.source/ArrowLeftUp.atf
-share/apps/kpresenter/autoforms/Arrows/.source/ArrowRight.atf
-share/apps/kpresenter/autoforms/Arrows/.source/ArrowRightDown.atf
-share/apps/kpresenter/autoforms/Arrows/.source/ArrowRightUp.atf
-share/apps/kpresenter/autoforms/Arrows/.source/ArrowUp.atf
-share/apps/kpresenter/autoforms/Arrows/ArrowDown.desktop
-share/apps/kpresenter/autoforms/Arrows/ArrowLeft.desktop
-share/apps/kpresenter/autoforms/Arrows/ArrowLeftDown.desktop
-share/apps/kpresenter/autoforms/Arrows/ArrowLeftUp.desktop
-share/apps/kpresenter/autoforms/Arrows/ArrowRight.desktop
-share/apps/kpresenter/autoforms/Arrows/ArrowRightDown.desktop
-share/apps/kpresenter/autoforms/Arrows/ArrowRightUp.desktop
-share/apps/kpresenter/autoforms/Arrows/ArrowUp.desktop
-share/apps/kpresenter/autoforms/Connections/.directory
-share/apps/kpresenter/autoforms/Connections/.icon/Connection1.png
-share/apps/kpresenter/autoforms/Connections/.icon/Connection10.png
-share/apps/kpresenter/autoforms/Connections/.icon/Connection11.png
-share/apps/kpresenter/autoforms/Connections/.icon/Connection12.png
-share/apps/kpresenter/autoforms/Connections/.icon/Connection2.png
-share/apps/kpresenter/autoforms/Connections/.icon/Connection3.png
-share/apps/kpresenter/autoforms/Connections/.icon/Connection4.png
-share/apps/kpresenter/autoforms/Connections/.icon/Connection5.png
-share/apps/kpresenter/autoforms/Connections/.icon/Connection6.png
-share/apps/kpresenter/autoforms/Connections/.icon/Connection7.png
-share/apps/kpresenter/autoforms/Connections/.icon/Connection8.png
-share/apps/kpresenter/autoforms/Connections/.icon/Connection9.png
-share/apps/kpresenter/autoforms/Connections/.source/Connection1.atf
-share/apps/kpresenter/autoforms/Connections/.source/Connection10.atf
-share/apps/kpresenter/autoforms/Connections/.source/Connection11.atf
-share/apps/kpresenter/autoforms/Connections/.source/Connection12.atf
-share/apps/kpresenter/autoforms/Connections/.source/Connection2.atf
-share/apps/kpresenter/autoforms/Connections/.source/Connection3.atf
-share/apps/kpresenter/autoforms/Connections/.source/Connection4.atf
-share/apps/kpresenter/autoforms/Connections/.source/Connection5.atf
-share/apps/kpresenter/autoforms/Connections/.source/Connection6.atf
-share/apps/kpresenter/autoforms/Connections/.source/Connection7.atf
-share/apps/kpresenter/autoforms/Connections/.source/Connection8.atf
-share/apps/kpresenter/autoforms/Connections/.source/Connection9.atf
-share/apps/kpresenter/autoforms/Connections/Connection1.desktop
-share/apps/kpresenter/autoforms/Connections/Connection10.desktop
-share/apps/kpresenter/autoforms/Connections/Connection11.desktop
-share/apps/kpresenter/autoforms/Connections/Connection12.desktop
-share/apps/kpresenter/autoforms/Connections/Connection2.desktop
-share/apps/kpresenter/autoforms/Connections/Connection3.desktop
-share/apps/kpresenter/autoforms/Connections/Connection4.desktop
-share/apps/kpresenter/autoforms/Connections/Connection5.desktop
-share/apps/kpresenter/autoforms/Connections/Connection6.desktop
-share/apps/kpresenter/autoforms/Connections/Connection7.desktop
-share/apps/kpresenter/autoforms/Connections/Connection8.desktop
-share/apps/kpresenter/autoforms/Connections/Connection9.desktop
-share/apps/kpresenter/dtd/kpresenter.dtd
-share/apps/kpresenter/icons/hicolor/22x22/actions/alignobjs.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/aobottom.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/aocenterh.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/aocenterv.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/aoleft.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/aoright.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/aotop.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/arrange.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/autoform.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/circle.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/closed_cubicbeziercurve.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/closed_freehand.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/closed_polyline.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/closed_quadricbeziercurve.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/cubicbeziercurve.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/delslide.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/depth-.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/edit_picture.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/edit_pie.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/edit_polygon.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/effect.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/freehand.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/group.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_arrow_begin.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_arrow_end.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_begin.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_circle_begin.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_circle_end.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_dimension_line_begin.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_dimension_line_end.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_double_arrow_begin.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_double_arrow_end.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_double_line_arrow_begin.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_double_line_arrow_end.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_end.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_line_arrow_begin.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_line_arrow_end.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_normal_begin.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_normal_end.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_rect_begin.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/line_rect_end.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/lined1.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/lined2.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/lineh.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/linev.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/lower.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/mini_autoform.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/mini_circle.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/mini_clipart.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/mini_line.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/mini_pie.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/mini_polygon.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/mini_rect.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/newPoint.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/newslide.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_style.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_style_dash.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_style_dashdot.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_style_dashdotdot.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_style_dot.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_style_nopen.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_style_solid.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_width.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_width1.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_width10.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_width2.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_width3.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_width4.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_width5.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_width6.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_width7.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_width8.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pen_width9.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/penbrush.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pgnum.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/pie.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/polygon.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/polyline.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/quadricbeziercurve.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/raise.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/rectangle.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/rectangle2.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/rectangleRound.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/screen.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/ungroup.png
-share/apps/kpresenter/icons/hicolor/22x22/actions/webpres.png
-share/apps/kpresenter/kpartplugins/scan-kpresenter.rc
-share/apps/kpresenter/kpresenter.rc
-share/apps/kpresenter/kpresenter_readonly.rc
-share/apps/kpresenter/pics/OneColumnLandscape.png
-share/apps/kpresenter/pics/OneColumnPortrait.png
-share/apps/kpresenter/pics/TitleLandscape.png
-share/apps/kpresenter/pics/TitlePortrait.png
-share/apps/kpresenter/pics/TwoColumnLandscape.png
-share/apps/kpresenter/pics/TwoColumnPortrait.png
-share/apps/kpresenter/pics/emptyLandscape.png
-share/apps/kpresenter/pics/emptyPortrait.png
-share/apps/kpresenter/pics/kautoformedit.png
-share/apps/kpresenter/slideshow/first.bmp
-share/apps/kpresenter/slideshow/first.jpeg
-share/apps/kpresenter/slideshow/first.png
-share/apps/kpresenter/slideshow/home.bmp
-share/apps/kpresenter/slideshow/home.jpeg
-share/apps/kpresenter/slideshow/home.png
-share/apps/kpresenter/slideshow/last.bmp
-share/apps/kpresenter/slideshow/last.jpeg
-share/apps/kpresenter/slideshow/last.png
-share/apps/kpresenter/slideshow/next.bmp
-share/apps/kpresenter/slideshow/next.jpeg
-share/apps/kpresenter/slideshow/next.png
-share/apps/kpresenter/slideshow/prev.bmp
-share/apps/kpresenter/slideshow/prev.jpeg
-share/apps/kpresenter/slideshow/prev.png
-share/apps/kpresenter/templates/A4/.directory
-share/apps/kpresenter/templates/A4/.source/OneColumnLandscape.kpt
-share/apps/kpresenter/templates/A4/.source/OneColumnPortrait.kpt
-share/apps/kpresenter/templates/A4/.source/TitleLandscape.kpt
-share/apps/kpresenter/templates/A4/.source/TitlePortrait.kpt
-share/apps/kpresenter/templates/A4/.source/TwoColumnLandscape.kpt
-share/apps/kpresenter/templates/A4/.source/TwoColumnPortrait.kpt
-share/apps/kpresenter/templates/A4/.source/emptyLandscape.kpt
-share/apps/kpresenter/templates/A4/.source/emptyPortrait.kpt
-share/apps/kpresenter/templates/A4/OneColumnLandscape.desktop
-share/apps/kpresenter/templates/A4/OneColumnPortrait.desktop
-share/apps/kpresenter/templates/A4/TitleLandscape.desktop
-share/apps/kpresenter/templates/A4/TitlePortrait.desktop
-share/apps/kpresenter/templates/A4/TwoColumnLandscape.desktop
-share/apps/kpresenter/templates/A4/TwoColumnPortrait.desktop
-share/apps/kpresenter/templates/A4/emptyLandscape.desktop
-share/apps/kpresenter/templates/A4/emptyPortrait.desktop
-share/apps/kpresenter/templates/Screen/.directory
-share/apps/kpresenter/templates/Screen/.source/OneColumnLandscape.kpt
-share/apps/kpresenter/templates/Screen/.source/TitleLandscape.kpt
-share/apps/kpresenter/templates/Screen/.source/TwoColumnLandscape.kpt
-share/apps/kpresenter/templates/Screen/.source/emptyLandscape.kpt
-share/apps/kpresenter/templates/Screen/OneColumnLandscape.desktop
-share/apps/kpresenter/templates/Screen/TitleLandscape.desktop
-share/apps/kpresenter/templates/Screen/TwoColumnLandscape.desktop
-share/apps/kpresenter/templates/Screen/emptyLandscape.desktop
-share/apps/kpresenter/templates/Screenpresentations/.directory
-share/apps/kpresenter/templates/Screenpresentations/.icon/BlueBreezeDouble.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/BlueBreezePicture.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/BlueBreezeSingle.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/CopperPlain.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/Gradient-Blue-Red.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/Plain.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/SnowyMountains.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/TotallyNewProduct.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/kde.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/kde2.png
-share/apps/kpresenter/templates/Screenpresentations/.source/BlueBreezeDouble.kpt
-share/apps/kpresenter/templates/Screenpresentations/.source/BlueBreezePicture.kpt
-share/apps/kpresenter/templates/Screenpresentations/.source/BlueBreezeSingle.kpt
-share/apps/kpresenter/templates/Screenpresentations/.source/CopperPlain.kpt
-share/apps/kpresenter/templates/Screenpresentations/.source/Gradient-Blue-Red.kpt
-share/apps/kpresenter/templates/Screenpresentations/.source/Plain.kpt
-share/apps/kpresenter/templates/Screenpresentations/.source/SnowyMountains.kpt
-share/apps/kpresenter/templates/Screenpresentations/.source/TotallyNewProduct.kpt
-share/apps/kpresenter/templates/Screenpresentations/.source/kde.kpt
-share/apps/kpresenter/templates/Screenpresentations/.source/kde2.kpt
-share/apps/kpresenter/templates/Screenpresentations/BlueBreezeDouble.desktop
-share/apps/kpresenter/templates/Screenpresentations/BlueBreezePicture.desktop
-share/apps/kpresenter/templates/Screenpresentations/BlueBreezeSingle.desktop
-share/apps/kpresenter/templates/Screenpresentations/CopperPlain.desktop
-share/apps/kpresenter/templates/Screenpresentations/Gradient-Blue-Red.desktop
-share/apps/kpresenter/templates/Screenpresentations/Plain.desktop
-share/apps/kpresenter/templates/Screenpresentations/SnowyMountains.desktop
-share/apps/kpresenter/templates/Screenpresentations/TotallyNewProduct.desktop
-share/apps/kpresenter/templates/Screenpresentations/kde.desktop
-share/apps/kpresenter/templates/Screenpresentations/kde2.desktop
-share/apps/kpresenter/templates/legal/.directory
-share/apps/kpresenter/templates/legal/.source/OneColumnLandscape.kpt
-share/apps/kpresenter/templates/legal/.source/OneColumnPortrait.kpt
-share/apps/kpresenter/templates/legal/.source/TitleLandscape.kpt
-share/apps/kpresenter/templates/legal/.source/TitlePortrait.kpt
-share/apps/kpresenter/templates/legal/.source/TwoColumnLandscape.kpt
-share/apps/kpresenter/templates/legal/.source/TwoColumnPortrait.kpt
-share/apps/kpresenter/templates/legal/.source/emptyLandscape.kpt
-share/apps/kpresenter/templates/legal/.source/emptyPortrait.kpt
-share/apps/kpresenter/templates/legal/OneColumnLandscape.desktop
-share/apps/kpresenter/templates/legal/OneColumnPortrait.desktop
-share/apps/kpresenter/templates/legal/TitleLandscape.desktop
-share/apps/kpresenter/templates/legal/TitlePortrait.desktop
-share/apps/kpresenter/templates/legal/TwoColumnLandscape.desktop
-share/apps/kpresenter/templates/legal/TwoColumnPortrait.desktop
-share/apps/kpresenter/templates/legal/emptyLandscape.desktop
-share/apps/kpresenter/templates/legal/emptyPortrait.desktop
-share/apps/kpresenter/templates/letter/.directory
-share/apps/kpresenter/templates/letter/.source/OneColumnLandscape.kpt
-share/apps/kpresenter/templates/letter/.source/OneColumnPortrait.kpt
-share/apps/kpresenter/templates/letter/.source/TitleLandscape.kpt
-share/apps/kpresenter/templates/letter/.source/TitlePortrait.kpt
-share/apps/kpresenter/templates/letter/.source/TwoColumnLandscape.kpt
-share/apps/kpresenter/templates/letter/.source/TwoColumnPortrait.kpt
-share/apps/kpresenter/templates/letter/.source/emptyLandscape.kpt
-share/apps/kpresenter/templates/letter/.source/emptyPortrait.kpt
-share/apps/kpresenter/templates/letter/OneColumnLandscape.desktop
-share/apps/kpresenter/templates/letter/OneColumnPortrait.desktop
-share/apps/kpresenter/templates/letter/TitleLandscape.desktop
-share/apps/kpresenter/templates/letter/TitlePortrait.desktop
-share/apps/kpresenter/templates/letter/TwoColumnLandscape.desktop
-share/apps/kpresenter/templates/letter/TwoColumnPortrait.desktop
-share/apps/kpresenter/templates/letter/emptyLandscape.desktop
-share/apps/kpresenter/templates/letter/emptyPortrait.desktop
-share/apps/krita/kpartplugins/scan-krita.rc
-share/apps/kspread/dtd/kspread.dtd
-share/apps/kspread/extensions/builtin.xml
-share/apps/kspread/extensions/conversion.xml
-share/apps/kspread/extensions/datetime.xml
-share/apps/kspread/extensions/engineering.xml
-share/apps/kspread/extensions/financial.xml
-share/apps/kspread/extensions/information.xml
-share/apps/kspread/extensions/logic.xml
-share/apps/kspread/extensions/math.ks
-share/apps/kspread/extensions/math.xml
-share/apps/kspread/extensions/statistical.xml
-share/apps/kspread/extensions/text.xml
-share/apps/kspread/extensions/trig.xml
-share/apps/kspread/icons/hicolor/16x16/actions/adjustcol.png
-share/apps/kspread/icons/hicolor/16x16/actions/adjustrow.png
-share/apps/kspread/icons/hicolor/16x16/actions/black_sum.png
-share/apps/kspread/icons/hicolor/16x16/actions/border_all.png
-share/apps/kspread/icons/hicolor/16x16/actions/border_bottom.png
-share/apps/kspread/icons/hicolor/16x16/actions/border_fall.png
-share/apps/kspread/icons/hicolor/16x16/actions/border_horizontal.png
-share/apps/kspread/icons/hicolor/16x16/actions/border_inside.png
-share/apps/kspread/icons/hicolor/16x16/actions/border_left.png
-share/apps/kspread/icons/hicolor/16x16/actions/border_outline.png
-share/apps/kspread/icons/hicolor/16x16/actions/border_remove.png
-share/apps/kspread/icons/hicolor/16x16/actions/border_right.png
-share/apps/kspread/icons/hicolor/16x16/actions/border_top.png
-share/apps/kspread/icons/hicolor/16x16/actions/border_up.png
-share/apps/kspread/icons/hicolor/16x16/actions/border_vertical.png
-share/apps/kspread/icons/hicolor/16x16/actions/cell_edit.png
-share/apps/kspread/icons/hicolor/16x16/actions/cell_layout.png
-share/apps/kspread/icons/hicolor/16x16/actions/chart.png
-share/apps/kspread/icons/hicolor/16x16/actions/color_fill.png
-share/apps/kspread/icons/hicolor/16x16/actions/color_line.png
-share/apps/kspread/icons/hicolor/16x16/actions/comment.png
-share/apps/kspread/icons/hicolor/16x16/actions/delete_table.png
-share/apps/kspread/icons/hicolor/16x16/actions/deletecell.png
-share/apps/kspread/icons/hicolor/16x16/actions/dissociatecell.png
-share/apps/kspread/icons/hicolor/16x16/actions/first_letter_upper.png
-share/apps/kspread/icons/hicolor/16x16/actions/fontsizedown.png
-share/apps/kspread/icons/hicolor/16x16/actions/fontsizeup.png
-share/apps/kspread/icons/hicolor/16x16/actions/funct.png
-share/apps/kspread/icons/hicolor/16x16/actions/hide_table_column.png
-share/apps/kspread/icons/hicolor/16x16/actions/hide_table_row.png
-share/apps/kspread/icons/hicolor/16x16/actions/insertcell.png
-share/apps/kspread/icons/hicolor/16x16/actions/insertcellcopy.png
-share/apps/kspread/icons/hicolor/16x16/actions/inserttable.png
-share/apps/kspread/icons/hicolor/16x16/actions/lower.png
-share/apps/kspread/icons/hicolor/16x16/actions/mergecell.png
-share/apps/kspread/icons/hicolor/16x16/actions/middle.png
-share/apps/kspread/icons/hicolor/16x16/actions/money.png
-share/apps/kspread/icons/hicolor/16x16/actions/multirow.png
-share/apps/kspread/icons/hicolor/16x16/actions/oscilloscope.png
-share/apps/kspread/icons/hicolor/16x16/actions/percent.png
-share/apps/kspread/icons/hicolor/16x16/actions/precminus.png
-share/apps/kspread/icons/hicolor/16x16/actions/precplus.png
-share/apps/kspread/icons/hicolor/16x16/actions/removecell.png
-share/apps/kspread/icons/hicolor/16x16/actions/removecomment.png
-share/apps/kspread/icons/hicolor/16x16/actions/resizecol.png
-share/apps/kspread/icons/hicolor/16x16/actions/resizerow.png
-share/apps/kspread/icons/hicolor/16x16/actions/series.png
-share/apps/kspread/icons/hicolor/16x16/actions/show_table_column.png
-share/apps/kspread/icons/hicolor/16x16/actions/show_table_row.png
-share/apps/kspread/icons/hicolor/16x16/actions/sort_decrease.png
-share/apps/kspread/icons/hicolor/16x16/actions/sort_incr.png
-share/apps/kspread/icons/hicolor/16x16/actions/special_paste.png
-share/apps/kspread/icons/hicolor/16x16/actions/text_bottom.png
-share/apps/kspread/icons/hicolor/16x16/actions/text_top.png
-share/apps/kspread/icons/hicolor/16x16/actions/upper.png
-share/apps/kspread/icons/hicolor/16x16/actions/vertical_text.png
-share/apps/kspread/icons/hicolor/22x22/actions/abort.png
-share/apps/kspread/icons/hicolor/22x22/actions/adjustcol.png
-share/apps/kspread/icons/hicolor/22x22/actions/adjustrow.png
-share/apps/kspread/icons/hicolor/22x22/actions/black_sum.png
-share/apps/kspread/icons/hicolor/22x22/actions/border_all.png
-share/apps/kspread/icons/hicolor/22x22/actions/border_bottom.png
-share/apps/kspread/icons/hicolor/22x22/actions/border_fall.png
-share/apps/kspread/icons/hicolor/22x22/actions/border_horizontal.png
-share/apps/kspread/icons/hicolor/22x22/actions/border_inside.png
-share/apps/kspread/icons/hicolor/22x22/actions/border_left.png
-share/apps/kspread/icons/hicolor/22x22/actions/border_outline.png
-share/apps/kspread/icons/hicolor/22x22/actions/border_remove.png
-share/apps/kspread/icons/hicolor/22x22/actions/border_right.png
-share/apps/kspread/icons/hicolor/22x22/actions/border_top.png
-share/apps/kspread/icons/hicolor/22x22/actions/border_up.png
-share/apps/kspread/icons/hicolor/22x22/actions/border_vertical.png
-share/apps/kspread/icons/hicolor/22x22/actions/cell_layout.png
-share/apps/kspread/icons/hicolor/22x22/actions/color_fill.png
-share/apps/kspread/icons/hicolor/22x22/actions/color_line.png
-share/apps/kspread/icons/hicolor/22x22/actions/colout.png
-share/apps/kspread/icons/hicolor/22x22/actions/comment.png
-share/apps/kspread/icons/hicolor/22x22/actions/delete_table.png
-share/apps/kspread/icons/hicolor/22x22/actions/deletecell.png
-share/apps/kspread/icons/hicolor/22x22/actions/dissociatecell.png
-share/apps/kspread/icons/hicolor/22x22/actions/done.png
-share/apps/kspread/icons/hicolor/22x22/actions/first_letter_upper.png
-share/apps/kspread/icons/hicolor/22x22/actions/fontsizedown.png
-share/apps/kspread/icons/hicolor/22x22/actions/fontsizeup.png
-share/apps/kspread/icons/hicolor/22x22/actions/funct.png
-share/apps/kspread/icons/hicolor/22x22/actions/hide_table_column.png
-share/apps/kspread/icons/hicolor/22x22/actions/hide_table_row.png
-share/apps/kspread/icons/hicolor/22x22/actions/insertcell.png
-share/apps/kspread/icons/hicolor/22x22/actions/insertcellcopy.png
-share/apps/kspread/icons/hicolor/22x22/actions/inserttable.png
-share/apps/kspread/icons/hicolor/22x22/actions/lower.png
-share/apps/kspread/icons/hicolor/22x22/actions/mergecell.png
-share/apps/kspread/icons/hicolor/22x22/actions/middle.png
-share/apps/kspread/icons/hicolor/22x22/actions/money.png
-share/apps/kspread/icons/hicolor/22x22/actions/multirow.png
-share/apps/kspread/icons/hicolor/22x22/actions/neonpen.png
-share/apps/kspread/icons/hicolor/22x22/actions/oscilloscope.png
-share/apps/kspread/icons/hicolor/22x22/actions/percent.png
-share/apps/kspread/icons/hicolor/22x22/actions/prec_minus.png
-share/apps/kspread/icons/hicolor/22x22/actions/prec_plus.png
-share/apps/kspread/icons/hicolor/22x22/actions/removecell.png
-share/apps/kspread/icons/hicolor/22x22/actions/removecomment.png
-share/apps/kspread/icons/hicolor/22x22/actions/resizecol.png
-share/apps/kspread/icons/hicolor/22x22/actions/resizerow.png
-share/apps/kspread/icons/hicolor/22x22/actions/rowout.png
-share/apps/kspread/icons/hicolor/22x22/actions/show_table_column.png
-share/apps/kspread/icons/hicolor/22x22/actions/show_table_row.png
-share/apps/kspread/icons/hicolor/22x22/actions/sort_decrease.png
-share/apps/kspread/icons/hicolor/22x22/actions/sort_incr.png
-share/apps/kspread/icons/hicolor/22x22/actions/special_paste.png
-share/apps/kspread/icons/hicolor/22x22/actions/text_bottom.png
-share/apps/kspread/icons/hicolor/22x22/actions/text_top.png
-share/apps/kspread/icons/hicolor/22x22/actions/upper.png
-share/apps/kspread/icons/hicolor/22x22/actions/vertical_text.png
-share/apps/kspread/icons/hicolor/32x32/actions/border_all.png
-share/apps/kspread/icons/hicolor/32x32/actions/border_bottom.png
-share/apps/kspread/icons/hicolor/32x32/actions/border_fall.png
-share/apps/kspread/icons/hicolor/32x32/actions/border_horizontal.png
-share/apps/kspread/icons/hicolor/32x32/actions/border_inside.png
-share/apps/kspread/icons/hicolor/32x32/actions/border_left.png
-share/apps/kspread/icons/hicolor/32x32/actions/border_outline.png
-share/apps/kspread/icons/hicolor/32x32/actions/border_remove.png
-share/apps/kspread/icons/hicolor/32x32/actions/border_right.png
-share/apps/kspread/icons/hicolor/32x32/actions/border_top.png
-share/apps/kspread/icons/hicolor/32x32/actions/border_up.png
-share/apps/kspread/icons/hicolor/32x32/actions/border_vertical.png
-share/apps/kspread/icons/hicolor/32x32/actions/funct.png
-share/apps/kspread/icons/hicolor/32x32/actions/percent.png
-share/apps/kspread/icons/hicolor/32x32/actions/prec_minus.png
-share/apps/kspread/icons/hicolor/32x32/actions/prec_plus.png
-share/apps/kspread/kpartplugins/kspreadcalc.rc
-share/apps/kspread/kspread.rc
-share/apps/kspread/kspread_readonly.rc
-share/apps/kspread/tablestyles/standard1.ksts
-share/apps/kspread/tablestyles/standard1.png
-share/apps/kspread/tablestyles/standard1.xml
-share/apps/kspread/tablestyles/standard2.ksts
-share/apps/kspread/tablestyles/standard2.png
-share/apps/kspread/tablestyles/standard2.xml
-share/apps/kspread/templates/General/.directory
-share/apps/kspread/templates/General/.icon/Worksheet.png
-share/apps/kspread/templates/General/.source/Worksheet.kst
-share/apps/kspread/templates/General/Worksheet.desktop
-share/apps/kudesigner/icons/hicolor/22x22/actions/frame_field.png
-share/apps/kudesigner/icons/hicolor/22x22/actions/id.png
-share/apps/kudesigner/icons/hicolor/22x22/actions/idf.png
-share/apps/kudesigner/icons/hicolor/22x22/actions/idh.png
-share/apps/kudesigner/icons/hicolor/22x22/actions/ipf.png
-share/apps/kudesigner/icons/hicolor/22x22/actions/iph.png
-share/apps/kudesigner/icons/hicolor/22x22/actions/irf.png
-share/apps/kudesigner/icons/hicolor/22x22/actions/irh.png
-share/apps/kudesigner/icons/locolor/22x22/actions/frame_field.png
-share/apps/kudesigner/icons/locolor/22x22/actions/id.png
-share/apps/kudesigner/icons/locolor/22x22/actions/idf.png
-share/apps/kudesigner/icons/locolor/22x22/actions/idh.png
-share/apps/kudesigner/icons/locolor/22x22/actions/ipf.png
-share/apps/kudesigner/icons/locolor/22x22/actions/iph.png
-share/apps/kudesigner/icons/locolor/22x22/actions/irf.png
-share/apps/kudesigner/icons/locolor/22x22/actions/irh.png
-share/apps/kudesigner/kudesignerui.rc
-share/apps/kugar/dtd/kugartemplate.dtd
-share/apps/kugar/kugarpart.rc
-share/apps/kugar/kugarui.rc
-share/apps/kugar/templates/sample1.kud
-share/apps/kugar/templates/sample1.kut
-share/apps/kugar/templates/sample2.kud
-share/apps/kugar/templates/sample2.kut
-share/apps/kugar/templates/sample3.kud
-share/apps/kugar/templates/sample3.kut
-share/apps/kword/dtd/framestyles.dtd
-share/apps/kword/dtd/kword.dtd
-share/apps/kword/dtd/tablestyles.dtd
-share/apps/kword/dtd/tabletemplates.dtd
-share/apps/kword/expression/expression.xml
-share/apps/kword/framestyles.xml
-share/apps/kword/icons/hicolor/16x16/actions/color_fill.png
-share/apps/kword/icons/hicolor/16x16/actions/color_line.png
-share/apps/kword/icons/hicolor/22x22/actions/borderoutline.png
-share/apps/kword/icons/hicolor/22x22/actions/color_fill.png
-share/apps/kword/icons/hicolor/22x22/actions/color_line.png
-share/apps/kword/icons/hicolor/22x22/actions/edittool.png
-share/apps/kword/icons/hicolor/22x22/actions/enumList.png
-share/apps/kword/icons/hicolor/22x22/actions/kwsearch.png
-share/apps/kword/icons/hicolor/22x22/actions/lower.png
-share/apps/kword/icons/hicolor/22x22/actions/raise.png
-share/apps/kword/icons/hicolor/22x22/actions/return.png
-share/apps/kword/icons/hicolor/22x22/actions/run_bounding.png
-share/apps/kword/icons/hicolor/22x22/actions/run_not.png
-share/apps/kword/icons/hicolor/22x22/actions/run_skip.png
-share/apps/kword/icons/hicolor/22x22/actions/sl_addentry.png
-share/apps/kword/icons/hicolor/22x22/actions/sl_addrecord.png
-share/apps/kword/icons/hicolor/22x22/actions/sl_delentry.png
-share/apps/kword/icons/hicolor/22x22/actions/sl_delrecord.png
-share/apps/kword/icons/hicolor/22x22/actions/tree_arrange.png
-share/apps/kword/icons/hicolor/22x22/actions/unsortedList.png
-share/apps/kword/kpartplugins/scan-kword.rc
-share/apps/kword/kword.rc
-share/apps/kword/kword_readonly.rc
-share/apps/kword/tablestyles.xml
-share/apps/kword/tabletemplates.xml
-share/apps/kword/templates/Normal/.directory
-share/apps/kword/templates/Normal/.icon/A4.png
-share/apps/kword/templates/Normal/.icon/Letter.png
-share/apps/kword/templates/Normal/.icon/Memo.png
-share/apps/kword/templates/Normal/.icon/PlainText.png
-share/apps/kword/templates/Normal/.icon/TwoColumns.png
-share/apps/kword/templates/Normal/.source/A4.kwt
-share/apps/kword/templates/Normal/.source/Letter.kwt
-share/apps/kword/templates/Normal/.source/Memo.kwt
-share/apps/kword/templates/Normal/.source/PlainText.kwt
-share/apps/kword/templates/Normal/.source/TwoColumns.kwt
-share/apps/kword/templates/Normal/A4.desktop
-share/apps/kword/templates/Normal/Letter.desktop
-share/apps/kword/templates/Normal/Memo.desktop
-share/apps/kword/templates/Normal/PlainText.desktop
-share/apps/kword/templates/Normal/TwoColumns.desktop
-share/apps/kword/templates/Publishing/.directory
-share/apps/kword/templates/Publishing/.icon/SimpleLayout.png
-share/apps/kword/templates/Publishing/.icon/fax.png
-share/apps/kword/templates/Publishing/.source/SimpleLayout.kwt
-share/apps/kword/templates/Publishing/.source/fax.kwt
-share/apps/kword/templates/Publishing/SimpleLayout.desktop
-share/apps/kword/templates/Publishing/fax.desktop
-share/apps/thesaurus/thesaurus.txt
-share/apps/xsltfilter/export/kword/xslfo/kword2xslfo-table.xsl
-share/apps/xsltfilter/export/kword/xslfo/main.xsl
-share/doc/HTML/en/kchart/commands.html
-share/doc/HTML/en/kchart/common
-share/doc/HTML/en/kchart/compilation.html
-share/doc/HTML/en/kchart/credits.html
-share/doc/HTML/en/kchart/faq.html
-share/doc/HTML/en/kchart/file-toolbar.png
-share/doc/HTML/en/kchart/file-toolbar2.png
-share/doc/HTML/en/kchart/frame_chart.png
-share/doc/HTML/en/kchart/index.cache.bz2
-share/doc/HTML/en/kchart/index.docbook
-share/doc/HTML/en/kchart/index.html
-share/doc/HTML/en/kchart/installation.html
-share/doc/HTML/en/kchart/introduction.html
-share/doc/HTML/en/kchart/kchart-kspread-bar.png
-share/doc/HTML/en/kchart/kchart-kspread.png
-share/doc/HTML/en/kchart/kchart.tar.gz
-share/doc/HTML/en/kchart/requirements.html
-share/doc/HTML/en/kchart/shortcut.png
-share/doc/HTML/en/kchart/toolbars.png
-share/doc/HTML/en/kformula/additional_fonts1.png
-share/doc/HTML/en/kformula/ambiguous-string.png
-share/doc/HTML/en/kformula/common
-share/doc/HTML/en/kformula/correct_index_location.png
-share/doc/HTML/en/kformula/definite_integral.png
-share/doc/HTML/en/kformula/file-toolbar.png
-share/doc/HTML/en/kformula/file-toolbar2.png
-share/doc/HTML/en/kformula/green1.png
-share/doc/HTML/en/kformula/green2.png
-share/doc/HTML/en/kformula/greens.png
-share/doc/HTML/en/kformula/incorrect_index_location.png
-share/doc/HTML/en/kformula/index.cache.bz2
-share/doc/HTML/en/kformula/index.docbook
-share/doc/HTML/en/kformula/index_smear.png
-share/doc/HTML/en/kformula/kfontinst-right.png
-share/doc/HTML/en/kformula/kfontinst1.png
-share/doc/HTML/en/kformula/kfontinst2.png
-share/doc/HTML/en/kformula/kfontinst3.png
-share/doc/HTML/en/kformula/kfontinst4.png
-share/doc/HTML/en/kformula/kfontinst5.png
-share/doc/HTML/en/kformula/lower-index.png
-share/doc/HTML/en/kformula/matrix-view.png
-share/doc/HTML/en/kformula/matrix.png
-share/doc/HTML/en/kformula/path-integral.png
-share/doc/HTML/en/kformula/rk-edit0.png
-share/doc/HTML/en/kformula/rk-edit1.png
-share/doc/HTML/en/kformula/rk-edit2.png
-share/doc/HTML/en/kformula/scilab-edit.png
-share/doc/HTML/en/kformula/scilab.png
-share/doc/HTML/en/kformula/shortcut0.png
-share/doc/HTML/en/kformula/shortcut1.png
-share/doc/HTML/en/kformula/sin.png
-share/doc/HTML/en/kformula/toolbars.png
-share/doc/HTML/en/kformula/upper-index.png
-share/doc/HTML/en/koffice-apidocs/common
-share/doc/HTML/en/koffice/README.documentation
-share/doc/HTML/en/koffice/common
-share/doc/HTML/en/koffice/index.cache.bz2
-share/doc/HTML/en/koffice/index.docbook
-share/doc/HTML/en/koshell/common
-share/doc/HTML/en/koshell/index.cache.bz2
-share/doc/HTML/en/koshell/index.docbook
-share/doc/HTML/en/kpresenter/barmenus.png
-share/doc/HTML/en/kpresenter/barstyle1.png
-share/doc/HTML/en/kpresenter/barstyle2.png
-share/doc/HTML/en/kpresenter/barstyle3.png
-share/doc/HTML/en/kpresenter/barstyle4.png
-share/doc/HTML/en/kpresenter/barstyle5.png
-share/doc/HTML/en/kpresenter/barstyle6.png
-share/doc/HTML/en/kpresenter/barstyle7.png
-share/doc/HTML/en/kpresenter/common
-share/doc/HTML/en/kpresenter/faq.docbook
-share/doc/HTML/en/kpresenter/great-presentations.docbook
-share/doc/HTML/en/kpresenter/guides.docbook
-share/doc/HTML/en/kpresenter/htmlshow00.png
-share/doc/HTML/en/kpresenter/htmlshow01.png
-share/doc/HTML/en/kpresenter/htmlshow02.png
-share/doc/HTML/en/kpresenter/htmlshow03.png
-share/doc/HTML/en/kpresenter/htmlshow04.png
-share/doc/HTML/en/kpresenter/htmlshow05.png
-share/doc/HTML/en/kpresenter/htmlshow07.png
-share/doc/HTML/en/kpresenter/index.cache.bz2
-share/doc/HTML/en/kpresenter/index.docbook
-share/doc/HTML/en/kpresenter/menuedit.png
-share/doc/HTML/en/kpresenter/menuextra.png
-share/doc/HTML/en/kpresenter/menufile.png
-share/doc/HTML/en/kpresenter/menuhelp.png
-share/doc/HTML/en/kpresenter/menuinsert.png
-share/doc/HTML/en/kpresenter/menus.docbook
-share/doc/HTML/en/kpresenter/menuscreen.png
-share/doc/HTML/en/kpresenter/menutext.png
-share/doc/HTML/en/kpresenter/menutools.png
-share/doc/HTML/en/kpresenter/menuview.png
-share/doc/HTML/en/kpresenter/options.docbook
-share/doc/HTML/en/kpresenter/screen.docbook
-share/doc/HTML/en/kpresenter/settings01.png
-share/doc/HTML/en/kpresenter/settings03.png
-share/doc/HTML/en/kpresenter/settings04.png
-share/doc/HTML/en/kpresenter/settings05.png
-share/doc/HTML/en/kpresenter/settings06.png
-share/doc/HTML/en/kpresenter/template02.png
-share/doc/HTML/en/kpresenter/template03.png
-share/doc/HTML/en/kpresenter/template04.png
-share/doc/HTML/en/kpresenter/template05.png
-share/doc/HTML/en/kpresenter/template06.png
-share/doc/HTML/en/kpresenter/template07.png
-share/doc/HTML/en/kpresenter/textmenu01.png
-share/doc/HTML/en/kpresenter/textmenu02.png
-share/doc/HTML/en/kpresenter/textmenu03.png
-share/doc/HTML/en/kpresenter/textmenu03a.png
-share/doc/HTML/en/kpresenter/textmenu04.png
-share/doc/HTML/en/kpresenter/toolsmenu01.png
-share/doc/HTML/en/kpresenter/tut01.png
-share/doc/HTML/en/kpresenter/tut02.png
-share/doc/HTML/en/kpresenter/tut03.png
-share/doc/HTML/en/kpresenter/tut04.png
-share/doc/HTML/en/kpresenter/tut05.png
-share/doc/HTML/en/kpresenter/tut06.png
-share/doc/HTML/en/kpresenter/tut07.png
-share/doc/HTML/en/kpresenter/tut08.png
-share/doc/HTML/en/kpresenter/tut09.png
-share/doc/HTML/en/kpresenter/tut10.png
-share/doc/HTML/en/kpresenter/tut11.png
-share/doc/HTML/en/kpresenter/tut12.png
-share/doc/HTML/en/kpresenter/tut13.png
-share/doc/HTML/en/kpresenter/tut14.png
-share/doc/HTML/en/kpresenter/tut15.png
-share/doc/HTML/en/kpresenter/tut16.png
-share/doc/HTML/en/kpresenter/tut17.png
-share/doc/HTML/en/kpresenter/tut18.png
-share/doc/HTML/en/kpresenter/tut19.png
-share/doc/HTML/en/kpresenter/tut20.png
-share/doc/HTML/en/kpresenter/tut21.png
-share/doc/HTML/en/kpresenter/tut22.png
-share/doc/HTML/en/kpresenter/tut23.png
-share/doc/HTML/en/kpresenter/tutorial.docbook
-share/doc/HTML/en/kspread/chart1.png
-share/doc/HTML/en/kspread/common
-share/doc/HTML/en/kspread/copy1.png
-share/doc/HTML/en/kspread/index.cache.bz2
-share/doc/HTML/en/kspread/index.docbook
-share/doc/HTML/en/kspread/shortcut1.png
-share/doc/HTML/en/kspread/shortcut2.png
-share/doc/HTML/en/kspread/sort1.png
-share/doc/HTML/en/kspread/starting1.png
-share/doc/HTML/en/kugar/add_detail.png
-share/doc/HTML/en/kugar/add_detail_footer.png
-share/doc/HTML/en/kugar/add_detail_header.png
-share/doc/HTML/en/kugar/common
-share/doc/HTML/en/kugar/datadtd.docbook
-share/doc/HTML/en/kugar/dataref.docbook
-share/doc/HTML/en/kugar/designer.docbook
-share/doc/HTML/en/kugar/file_new.png
-share/doc/HTML/en/kugar/index.cache.bz2
-share/doc/HTML/en/kugar/index.docbook
-share/doc/HTML/en/kugar/kugar.png
-share/doc/HTML/en/kugar/progguide.docbook
-share/doc/HTML/en/kugar/props.png
-share/doc/HTML/en/kugar/starting.docbook
-share/doc/HTML/en/kugar/template-elements.docbook
-share/doc/HTML/en/kugar/template.docbook
-share/doc/HTML/en/kugar/templatedtd.docbook
-share/doc/HTML/en/kugar/tut_edit_height.png
-share/doc/HTML/en/kugar/tut_empty_report.png
-share/doc/HTML/en/kugar/tut_file_new.png
-share/doc/HTML/en/kugar/tut_rep_complete.png
-share/doc/HTML/en/kugar/tut_rep_generated.png
-share/doc/HTML/en/kugar/tut_rep_look1.png
-share/doc/HTML/en/kugar/tut_rep_look2.png
-share/doc/HTML/en/kugar/tut_set_level.png
-share/doc/HTML/en/kugar/tutorial.docbook
-share/doc/HTML/en/kword/ChooseTempDia.png
-share/doc/HTML/en/kword/Tut1.png
-share/doc/HTML/en/kword/Tut11a.png
-share/doc/HTML/en/kword/Tut11b.png
-share/doc/HTML/en/kword/Tut13.png
-share/doc/HTML/en/kword/Tut14.png
-share/doc/HTML/en/kword/Tut14a.png
-share/doc/HTML/en/kword/Tut14b.png
-share/doc/HTML/en/kword/Tut15.png
-share/doc/HTML/en/kword/Tut15b.png
-share/doc/HTML/en/kword/Tut16.png
-share/doc/HTML/en/kword/Tut18.png
-share/doc/HTML/en/kword/Tut19.png
-share/doc/HTML/en/kword/Tut2.png
-share/doc/HTML/en/kword/Tut21.png
-share/doc/HTML/en/kword/Tut22.png
-share/doc/HTML/en/kword/Tut3.png
-share/doc/HTML/en/kword/Tut4.png
-share/doc/HTML/en/kword/Tut7.png
-share/doc/HTML/en/kword/Tut8.png
-share/doc/HTML/en/kword/addentry.png
-share/doc/HTML/en/kword/addrecord.png
-share/doc/HTML/en/kword/alignBlock.png
-share/doc/HTML/en/kword/alignCenter.png
-share/doc/HTML/en/kword/alignLeft.png
-share/doc/HTML/en/kword/alignRight.png
-share/doc/HTML/en/kword/auto1.png
-share/doc/HTML/en/kword/auto2.png
-share/doc/HTML/en/kword/auto3.png
-share/doc/HTML/en/kword/auto4.png
-share/doc/HTML/en/kword/autocompdlg.png
-share/doc/HTML/en/kword/back.png
-share/doc/HTML/en/kword/basic.png
-share/doc/HTML/en/kword/basics.docbook
-share/doc/HTML/en/kword/bbord.png
-share/doc/HTML/en/kword/bdcolorbut.png
-share/doc/HTML/en/kword/bdselbut.png
-share/doc/HTML/en/kword/bdsizebut.png
-share/doc/HTML/en/kword/beginning.png
-share/doc/HTML/en/kword/bkgdcolorbut.png
-share/doc/HTML/en/kword/bold.png
-share/doc/HTML/en/kword/bookmarks.docbook
-share/doc/HTML/en/kword/borbutB.png
-share/doc/HTML/en/kword/borbutL.png
-share/doc/HTML/en/kword/borbutR.png
-share/doc/HTML/en/kword/borbutT.png
-share/doc/HTML/en/kword/bord.png
-share/doc/HTML/en/kword/bordtb.png
-share/doc/HTML/en/kword/bullist.png
-share/doc/HTML/en/kword/cftb.png
-share/doc/HTML/en/kword/chcolorbut.png
-share/doc/HTML/en/kword/chfontbut.png
-share/doc/HTML/en/kword/chsizebut.png
-share/doc/HTML/en/kword/chstylebut.png
-share/doc/HTML/en/kword/clearright.png
-share/doc/HTML/en/kword/colin.png
-share/doc/HTML/en/kword/colorseldlg.png
-share/doc/HTML/en/kword/colout.png
-share/doc/HTML/en/kword/columns.docbook
-share/doc/HTML/en/kword/common
-share/doc/HTML/en/kword/ctab.png
-share/doc/HTML/en/kword/ctab2.png
-share/doc/HTML/en/kword/decindbut.png
-share/doc/HTML/en/kword/delentry.png
-share/doc/HTML/en/kword/delrecord.png
-share/doc/HTML/en/kword/doccomments.docbook
-share/doc/HTML/en/kword/doclinks.docbook
-share/doc/HTML/en/kword/docstruct.docbook
-share/doc/HTML/en/kword/docstruct.png
-share/doc/HTML/en/kword/docvariables.docbook
-share/doc/HTML/en/kword/dtab.png
-share/doc/HTML/en/kword/dtab2.png
-share/doc/HTML/en/kword/dtpfmtpg1.png
-share/doc/HTML/en/kword/editcopy.png
-share/doc/HTML/en/kword/editcut.png
-share/doc/HTML/en/kword/editing.docbook
-share/doc/HTML/en/kword/editpaste.png
-share/doc/HTML/en/kword/edittb.png
-share/doc/HTML/en/kword/end.png
-share/doc/HTML/en/kword/enumlist.png
-share/doc/HTML/en/kword/expression.png
-share/doc/HTML/en/kword/expressions.docbook
-share/doc/HTML/en/kword/exst.png
-share/doc/HTML/en/kword/exul.png
-share/doc/HTML/en/kword/fchardlg.png
-share/doc/HTML/en/kword/fchardlg2.png
-share/doc/HTML/en/kword/filefloppy.png
-share/doc/HTML/en/kword/filenew2.png
-share/doc/HTML/en/kword/fileopen.png
-share/doc/HTML/en/kword/fileprint.png
-share/doc/HTML/en/kword/fileprint2.png
-share/doc/HTML/en/kword/filetb.png
-share/doc/HTML/en/kword/find.png
-share/doc/HTML/en/kword/finddlg.png
-share/doc/HTML/en/kword/finddlg2.png
-share/doc/HTML/en/kword/footcfg1.png
-share/doc/HTML/en/kword/footcfg3.png
-share/doc/HTML/en/kword/footendnotes.docbook
-share/doc/HTML/en/kword/formabs.png
-share/doc/HTML/en/kword/formatchar.docbook
-share/doc/HTML/en/kword/formatframes.docbook
-share/doc/HTML/en/kword/formatpara.docbook
-share/doc/HTML/en/kword/formbrac.png
-share/doc/HTML/en/kword/formcbrac.png
-share/doc/HTML/en/kword/formfrac.png
-share/doc/HTML/en/kword/formframe1.png
-share/doc/HTML/en/kword/formframe2.png
-share/doc/HTML/en/kword/formframe3.png
-share/doc/HTML/en/kword/formframe4.png
-share/doc/HTML/en/kword/formframe5.png
-share/doc/HTML/en/kword/forminteg.png
-share/doc/HTML/en/kword/formllind.png
-share/doc/HTML/en/kword/formlrind.png
-share/doc/HTML/en/kword/formmat.png
-share/doc/HTML/en/kword/formprod.png
-share/doc/HTML/en/kword/formsbrac.png
-share/doc/HTML/en/kword/formspecchar.png
-share/doc/HTML/en/kword/formsqrt.png
-share/doc/HTML/en/kword/formsum.png
-share/doc/HTML/en/kword/formtb.png
-share/doc/HTML/en/kword/formulas.docbook
-share/doc/HTML/en/kword/formulind.png
-share/doc/HTML/en/kword/formurind.png
-share/doc/HTML/en/kword/forward.png
-share/doc/HTML/en/kword/fpara1.png
-share/doc/HTML/en/kword/fpara2.png
-share/doc/HTML/en/kword/fpara3.png
-share/doc/HTML/en/kword/fpara4.png
-share/doc/HTML/en/kword/fpara5.png
-share/doc/HTML/en/kword/fpara6.png
-share/doc/HTML/en/kword/fpicture.png
-share/doc/HTML/en/kword/framers.png
-share/doc/HTML/en/kword/frames.docbook
-share/doc/HTML/en/kword/framestylist.png
-share/doc/HTML/en/kword/fundimentals.docbook
-share/doc/HTML/en/kword/graphics.docbook
-share/doc/HTML/en/kword/headerfooter.docbook
-share/doc/HTML/en/kword/incindbut.png
-share/doc/HTML/en/kword/index.cache.bz2
-share/doc/HTML/en/kword/index.docbook
-share/doc/HTML/en/kword/inscoldlg.png
-share/doc/HTML/en/kword/insdate.png
-share/doc/HTML/en/kword/insertfile.docbook
-share/doc/HTML/en/kword/insgrph1.png
-share/doc/HTML/en/kword/insgrph2.png
-share/doc/HTML/en/kword/insrowdlg.png
-share/doc/HTML/en/kword/instab1.png
-share/doc/HTML/en/kword/instb.png
-share/doc/HTML/en/kword/instime.png
-share/doc/HTML/en/kword/intro1.png
-share/doc/HTML/en/kword/intro2.png
-share/doc/HTML/en/kword/intro3.png
-share/doc/HTML/en/kword/ital.png
-share/doc/HTML/en/kword/joincell.png
-share/doc/HTML/en/kword/kpart.png
-share/doc/HTML/en/kword/kparts.docbook
-share/doc/HTML/en/kword/landscape.png
-share/doc/HTML/en/kword/larrow.png
-share/doc/HTML/en/kword/lbord.png
-share/doc/HTML/en/kword/linkdlg.png
-share/doc/HTML/en/kword/listdepth1.png
-share/doc/HTML/en/kword/listdepth2.png
-share/doc/HTML/en/kword/listdepth3.png
-share/doc/HTML/en/kword/lists.docbook
-share/doc/HTML/en/kword/ltab.png
-share/doc/HTML/en/kword/ltab2.png
-share/doc/HTML/en/kword/mailmerge.docbook
-share/doc/HTML/en/kword/mbtb.docbook
-share/doc/HTML/en/kword/mmerge1.png
-share/doc/HTML/en/kword/mmerge2.png
-share/doc/HTML/en/kword/mmergesql1.png
-share/doc/HTML/en/kword/mmergesql2.png
-share/doc/HTML/en/kword/numtxtbut.png
-share/doc/HTML/en/kword/opendlg.png
-share/doc/HTML/en/kword/opt.docbook
-share/doc/HTML/en/kword/opt1.png
-share/doc/HTML/en/kword/opt2.png
-share/doc/HTML/en/kword/opt3.png
-share/doc/HTML/en/kword/opt4.png
-share/doc/HTML/en/kword/opt5.png
-share/doc/HTML/en/kword/optkb.png
-share/doc/HTML/en/kword/optkb2.png
-share/doc/HTML/en/kword/opttb.png
-share/doc/HTML/en/kword/pageformat.docbook
-share/doc/HTML/en/kword/paratb.png
-share/doc/HTML/en/kword/part-kformula.png
-share/doc/HTML/en/kword/part-kspread.png
-share/doc/HTML/en/kword/picture.png
-share/doc/HTML/en/kword/pntdlg.png
-share/doc/HTML/en/kword/pntdlg1.png
-share/doc/HTML/en/kword/portrait.png
-share/doc/HTML/en/kword/rarrow.png
-share/doc/HTML/en/kword/rbord.png
-share/doc/HTML/en/kword/redo.png
-share/doc/HTML/en/kword/repldlg.png
-share/doc/HTML/en/kword/rowin.png
-share/doc/HTML/en/kword/rowout.png
-share/doc/HTML/en/kword/rtab.png
-share/doc/HTML/en/kword/rtab2.png
-share/doc/HTML/en/kword/ruler.png
-share/doc/HTML/en/kword/saturation.png
-share/doc/HTML/en/kword/saved1.png
-share/doc/HTML/en/kword/saved2.png
-share/doc/HTML/en/kword/savedlg.png
-share/doc/HTML/en/kword/savetmpl1.png
-share/doc/HTML/en/kword/screen.png
-share/doc/HTML/en/kword/select1.png
-share/doc/HTML/en/kword/spell.png
-share/doc/HTML/en/kword/spelldlg.png
-share/doc/HTML/en/kword/stkout.png
-share/doc/HTML/en/kword/storeprint.docbook
-share/doc/HTML/en/kword/styldlg1.png
-share/doc/HTML/en/kword/styldlg2.png
-share/doc/HTML/en/kword/styles.docbook
-share/doc/HTML/en/kword/subscbut.png
-share/doc/HTML/en/kword/sum.png
-share/doc/HTML/en/kword/supscbut.png
-share/doc/HTML/en/kword/table.docbook
-share/doc/HTML/en/kword/tableprop1.png
-share/doc/HTML/en/kword/tableprop2.png
-share/doc/HTML/en/kword/tablestylist.png
-share/doc/HTML/en/kword/tabstops.docbook
-share/doc/HTML/en/kword/tb1.png
-share/doc/HTML/en/kword/tb2.png
-share/doc/HTML/en/kword/tb3.png
-share/doc/HTML/en/kword/tb4.png
-share/doc/HTML/en/kword/tblsty.png
-share/doc/HTML/en/kword/tbmax.png
-share/doc/HTML/en/kword/tbmin.png
-share/doc/HTML/en/kword/tbord.png
-share/doc/HTML/en/kword/techinfo.docbook
-share/doc/HTML/en/kword/tedittb.png
-share/doc/HTML/en/kword/templatecreation.docbook
-share/doc/HTML/en/kword/textstyex.png
-share/doc/HTML/en/kword/tfcreatebut.png
-share/doc/HTML/en/kword/thesaurus.png
-share/doc/HTML/en/kword/toc.docbook
-share/doc/HTML/en/kword/tutorial.docbook
-share/doc/HTML/en/kword/undl.png
-share/doc/HTML/en/kword/undo.png
-share/doc/HTML/en/kword/value.png
-share/doc/HTML/en/kword/wpfmtpg1.png
-share/doc/HTML/en/kword/wpfmtpg2.png
-share/doc/HTML/en/kword/wpfmtpg3.png
-share/doc/HTML/en/kword/zoom.png
-share/doc/HTML/en/thesaurus/common
-share/doc/HTML/en/thesaurus/index.cache.bz2
-share/doc/HTML/en/thesaurus/index.docbook
-share/icons/hicolor/16x16/actions/abs.png
-share/icons/hicolor/16x16/actions/brace.png
-share/icons/hicolor/16x16/actions/brackets.png
-share/icons/hicolor/16x16/actions/frac.png
-share/icons/hicolor/16x16/actions/int.png
-share/icons/hicolor/16x16/actions/lsub.png
-share/icons/hicolor/16x16/actions/lsup.png
-share/icons/hicolor/16x16/actions/matrix.png
-share/icons/hicolor/16x16/actions/onetwomatrix.png
-share/icons/hicolor/16x16/actions/paren.png
-share/icons/hicolor/16x16/actions/prod.png
-share/icons/hicolor/16x16/actions/rsub.png
-share/icons/hicolor/16x16/actions/rsup.png
-share/icons/hicolor/16x16/actions/sqrt.png
-share/icons/hicolor/16x16/actions/sum.png
-share/icons/hicolor/16x16/apps/karbon.png
-share/icons/hicolor/16x16/apps/kchart.png
-share/icons/hicolor/16x16/apps/kformula.png
-share/icons/hicolor/16x16/apps/kivio.png
-share/icons/hicolor/16x16/apps/kontour.png
-share/icons/hicolor/16x16/apps/kpresenter.png
-share/icons/hicolor/16x16/apps/kspread.png
-share/icons/hicolor/16x16/apps/kudesigner.png
-share/icons/hicolor/16x16/apps/kugar.png
-share/icons/hicolor/16x16/apps/kword.png
-share/icons/hicolor/16x16/mimetypes/kugardata.png
-share/icons/hicolor/22x22/actions/abs.png
-share/icons/hicolor/22x22/actions/brace.png
-share/icons/hicolor/22x22/actions/brackets.png
-share/icons/hicolor/22x22/actions/frac.png
-share/icons/hicolor/22x22/actions/inscol.png
-share/icons/hicolor/22x22/actions/insrow.png
-share/icons/hicolor/22x22/actions/int.png
-share/icons/hicolor/22x22/actions/lsub.png
-share/icons/hicolor/22x22/actions/lsup.png
-share/icons/hicolor/22x22/actions/matrix.png
-share/icons/hicolor/22x22/actions/onetwomatrix.png
-share/icons/hicolor/22x22/actions/paren.png
-share/icons/hicolor/22x22/actions/prod.png
-share/icons/hicolor/22x22/actions/remcol.png
-share/icons/hicolor/22x22/actions/remrow.png
-share/icons/hicolor/22x22/actions/rsub.png
-share/icons/hicolor/22x22/actions/rsup.png
-share/icons/hicolor/22x22/actions/sqrt.png
-share/icons/hicolor/22x22/actions/sum.png
-share/icons/hicolor/22x22/apps/kivio.png
-share/icons/hicolor/22x22/apps/kugar.png
-share/icons/hicolor/22x22/mimetypes/kugardata.png
-share/icons/hicolor/32x32/actions/abs.png
-share/icons/hicolor/32x32/actions/brace.png
-share/icons/hicolor/32x32/actions/brackets.png
-share/icons/hicolor/32x32/actions/frac.png
-share/icons/hicolor/32x32/actions/int.png
-share/icons/hicolor/32x32/actions/lsub.png
-share/icons/hicolor/32x32/actions/lsup.png
-share/icons/hicolor/32x32/actions/matrix.png
-share/icons/hicolor/32x32/actions/onetwomatrix.png
-share/icons/hicolor/32x32/actions/paren.png
-share/icons/hicolor/32x32/actions/prod.png
-share/icons/hicolor/32x32/actions/rsub.png
-share/icons/hicolor/32x32/actions/rsup.png
-share/icons/hicolor/32x32/actions/sqrt.png
-share/icons/hicolor/32x32/actions/sum.png
-share/icons/hicolor/32x32/apps/karbon.png
-share/icons/hicolor/32x32/apps/kchart.png
-share/icons/hicolor/32x32/apps/kformula.png
-share/icons/hicolor/32x32/apps/kivio.png
-share/icons/hicolor/32x32/apps/kontour.png
-share/icons/hicolor/32x32/apps/kpresenter.png
-share/icons/hicolor/32x32/apps/kspread.png
-share/icons/hicolor/32x32/apps/kudesigner.png
-share/icons/hicolor/32x32/apps/kugar.png
-share/icons/hicolor/32x32/apps/kword.png
-share/icons/hicolor/32x32/mimetypes/kugardata.png
-share/icons/hicolor/48x48/apps/karbon.png
-share/icons/hicolor/48x48/apps/kchart.png
-share/icons/hicolor/48x48/apps/kformula.png
-share/icons/hicolor/48x48/apps/kivio.png
-share/icons/hicolor/48x48/apps/kontour.png
-share/icons/hicolor/48x48/apps/kpresenter.png
-share/icons/hicolor/48x48/apps/kspread.png
-share/icons/hicolor/48x48/apps/kugar.png
-share/icons/hicolor/48x48/apps/kword.png
-share/icons/hicolor/48x48/mimetypes/kugardata.png
-share/icons/locolor/16x16/apps/kspreadcalc.png
-share/icons/locolor/16x16/apps/kudesigner.png
-share/icons/locolor/16x16/apps/kugar.png
-share/icons/locolor/16x16/mimetypes/kugardata.png
-share/icons/locolor/22x22/apps/kspreadcalc.png
-share/icons/locolor/22x22/apps/kugar.png
-share/icons/locolor/22x22/mimetypes/kugardata.png
-share/icons/locolor/32x32/apps/kspreadcalc.png
-share/icons/locolor/32x32/apps/kudesigner.png
-share/icons/locolor/32x32/apps/kugar.png
-share/icons/locolor/32x32/mimetypes/kugardata.png
-share/mimelnk/application/x-kudesigner.desktop
-share/services/clipartthumbnail.desktop
-share/services/karbon_ai_import.desktop
-share/services/karbon_eps_export.desktop
-share/services/karbon_eps_import.desktop
-share/services/karbon_kontour_import.desktop
-share/services/karbon_png_export.desktop
-share/services/karbon_ps_import.desktop
-share/services/karbon_svg_export.desktop
-share/services/karbon_wmf_import.desktop
-share/services/kfile_koffice.desktop
-share/services/kformula_latex_export.desktop
-share/services/kformula_png_export.desktop
-share/services/kivioconnectortool.desktop
-share/services/kivioselecttool.desktop
-share/services/kiviotexttool.desktop
-share/services/kiviozoomtool.desktop
-share/services/kodocinfopropspage.desktop
-share/services/kofficethumbnail.desktop
-share/services/kontour_applixgraphic_import.desktop
-share/services/kontour_latex_export.desktop
-share/services/kontour_msod_import.desktop
-share/services/kontour_rtf_export.desktop
-share/services/kontour_wmf_import.desktop
-share/services/kounavail.desktop
-share/services/kprkword.desktop
-share/services/kspelltool.desktop
-share/services/kspread_applixspread_import.desktop
-share/services/kspread_csv_export.desktop
-share/services/kspread_csv_import.desktop
-share/services/kspread_dbase_import.desktop
-share/services/kspread_gnumeric_export.desktop
-share/services/kspread_gnumeric_import.desktop
-share/services/kspread_html_export.desktop
-share/services/kspread_qpro_import.desktop
-share/services/kspreadcalc.desktop
-share/services/kword_abiword_export.desktop
-share/services/kword_abiword_import.desktop
-share/services/kword_amipro_export.desktop
-share/services/kword_amipro_import.desktop
-share/services/kword_applixword_import.desktop
-share/services/kword_ascii_export.desktop
-share/services/kword_ascii_import.desktop
-share/services/kword_docbook_export.desktop
-share/services/kword_html_export.desktop
-share/services/kword_html_import.desktop
-share/services/kword_latex_export.desktop
-share/services/kword_latex_import.desktop
-share/services/kword_mswrite_import.desktop
-share/services/kword_palmdoc_export.desktop
-share/services/kword_palmdoc_import.desktop
-share/services/kword_rtf_export.desktop
-share/services/kword_rtf_import.desktop
-share/services/kword_wml_export.desktop
-share/services/kword_wml_import.desktop
-share/services/kword_wp_export.desktop
-share/services/kword_wp_import.desktop
-share/services/kwserialletter_classic.desktop
-share/services/kwserialletter_qtsqldb_power.desktop
-share/services/ole_excel97_import.desktop
-share/services/ole_hancomword_import.desktop
-share/services/ole_powerpoint97_import.desktop
-share/services/ole_winword97_import.desktop
-share/services/otherofficethumbnail.desktop
-share/services/thesaurustool.desktop
-share/services/xslt_export.desktop
-share/services/xslt_import.desktop
-share/servicetypes/kochart.desktop
-share/servicetypes/kofficepart.desktop
-share/servicetypes/kofilter.desktop
-share/servicetypes/koplugin.desktop
-share/servicetypes/kwmailmerge.desktop
-share/templates/.source/Illustration.kil
-share/templates/.source/Presentation.kpt
-share/templates/.source/SpreadSheet.ksp
-share/templates/.source/TextDocument.kwt
-share/templates/Illustration.desktop
-share/templates/Presentation.desktop
-share/templates/SpreadSheet.desktop
-share/templates/TextDocument.desktop
-@exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/lib/html
-@unexec /bin/rmdir %D/share/doc/HTML/en/koffice-apidocs/lib/html || true
-@dirrm share/templates/.source
-@dirrm share/templates
-@dirrm share/mimelnk/application
-@dirrm share/mimelnk
-@dirrm share/icons/locolor/32x32/mimetypes
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/22x22/mimetypes
-@dirrm share/icons/locolor/22x22/apps
-@dirrm share/icons/locolor/22x22
-@dirrm share/icons/locolor/16x16/mimetypes
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/mimetypes
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/mimetypes
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32/actions
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/22x22/mimetypes
-@dirrm share/icons/hicolor/22x22/apps
-@dirrm share/icons/hicolor/22x22/actions
-@dirrm share/icons/hicolor/22x22
-@dirrm share/icons/hicolor/16x16/mimetypes
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16/actions
-@dirrm share/icons/hicolor/16x16
-@dirrm share/icons/hicolor
-@dirrm share/doc/HTML/en/thesaurus
-@dirrm share/doc/HTML/en/kword
-@dirrm share/doc/HTML/en/kugar
-@dirrm share/doc/HTML/en/kspread
-@dirrm share/doc/HTML/en/kpresenter
-@dirrm share/doc/HTML/en/koshell
-@dirrm share/doc/HTML/en/koffice-apidocs/lib
-@dirrm share/doc/HTML/en/koffice-apidocs
-@dirrm share/doc/HTML/en/koffice
-@dirrm share/doc/HTML/en/kformula
-@dirrm share/doc/HTML/en/kchart
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
-@dirrm share/apps/xsltfilter/export/kword/xslfo
-@dirrm share/apps/xsltfilter/export/kword
-@dirrm share/apps/xsltfilter/export
-@dirrm share/apps/xsltfilter
-@dirrm share/apps/thesaurus
-@dirrm share/apps/kword/templates/Publishing/.source
-@dirrm share/apps/kword/templates/Publishing/.icon
-@dirrm share/apps/kword/templates/Publishing
-@dirrm share/apps/kword/templates/Normal/.source
-@dirrm share/apps/kword/templates/Normal/.icon
-@dirrm share/apps/kword/templates/Normal
-@dirrm share/apps/kword/templates
-@dirrm share/apps/kword/kpartplugins
-@dirrm share/apps/kword/icons/hicolor/22x22/actions
-@dirrm share/apps/kword/icons/hicolor/22x22
-@dirrm share/apps/kword/icons/hicolor/16x16/actions
-@dirrm share/apps/kword/icons/hicolor/16x16
-@dirrm share/apps/kword/icons/hicolor
-@dirrm share/apps/kword/icons
-@dirrm share/apps/kword/expression
-@dirrm share/apps/kword/dtd
-@dirrm share/apps/kword
-@dirrm share/apps/kugar/templates
-@dirrm share/apps/kugar/dtd
-@dirrm share/apps/kugar
-@dirrm share/apps/kudesigner/icons/locolor/22x22/actions
-@dirrm share/apps/kudesigner/icons/locolor/22x22
-@dirrm share/apps/kudesigner/icons/locolor
-@dirrm share/apps/kudesigner/icons/hicolor/22x22/actions
-@dirrm share/apps/kudesigner/icons/hicolor/22x22
-@dirrm share/apps/kudesigner/icons/hicolor
-@dirrm share/apps/kudesigner/icons
-@dirrm share/apps/kudesigner
-@dirrm share/apps/kspread/templates/General/.source
-@dirrm share/apps/kspread/templates/General/.icon
-@dirrm share/apps/kspread/templates/General
-@dirrm share/apps/kspread/templates
-@dirrm share/apps/kspread/tablestyles
-@dirrm share/apps/kspread/kpartplugins
-@dirrm share/apps/kspread/icons/hicolor/32x32/actions
-@dirrm share/apps/kspread/icons/hicolor/32x32
-@dirrm share/apps/kspread/icons/hicolor/22x22/actions
-@dirrm share/apps/kspread/icons/hicolor/22x22
-@dirrm share/apps/kspread/icons/hicolor/16x16/actions
-@dirrm share/apps/kspread/icons/hicolor/16x16
-@dirrm share/apps/kspread/icons/hicolor
-@dirrm share/apps/kspread/icons
-@dirrm share/apps/kspread/extensions
-@dirrm share/apps/kspread/dtd
-@dirrm share/apps/kspread
-@dirrm share/apps/krita/kpartplugins
-@dirrm share/apps/krita
-@dirrm share/apps/kpresenter/templates/letter/.source
-@dirrm share/apps/kpresenter/templates/letter
-@dirrm share/apps/kpresenter/templates/legal/.source
-@dirrm share/apps/kpresenter/templates/legal
-@dirrm share/apps/kpresenter/templates/Screenpresentations/.source
-@dirrm share/apps/kpresenter/templates/Screenpresentations/.icon
-@dirrm share/apps/kpresenter/templates/Screenpresentations
-@dirrm share/apps/kpresenter/templates/Screen/.source
-@dirrm share/apps/kpresenter/templates/Screen
-@dirrm share/apps/kpresenter/templates/A4/.source
-@dirrm share/apps/kpresenter/templates/A4
-@dirrm share/apps/kpresenter/templates
-@dirrm share/apps/kpresenter/slideshow
-@dirrm share/apps/kpresenter/pics
-@dirrm share/apps/kpresenter/kpartplugins
-@dirrm share/apps/kpresenter/icons/hicolor/22x22/actions
-@dirrm share/apps/kpresenter/icons/hicolor/22x22
-@dirrm share/apps/kpresenter/icons/hicolor
-@dirrm share/apps/kpresenter/icons
-@dirrm share/apps/kpresenter/dtd
-@dirrm share/apps/kpresenter/autoforms/Connections/.source
-@dirrm share/apps/kpresenter/autoforms/Connections/.icon
-@dirrm share/apps/kpresenter/autoforms/Connections
-@dirrm share/apps/kpresenter/autoforms/Arrows/.source
-@dirrm share/apps/kpresenter/autoforms/Arrows/.icon
-@dirrm share/apps/kpresenter/autoforms/Arrows
-@dirrm share/apps/kpresenter/autoforms
-@dirrm share/apps/kpresenter
-@dirrm share/apps/kontour/templates/Simple/.source
-@dirrm share/apps/kontour/templates/Simple/.icon
-@dirrm share/apps/kontour/templates/Simple
-@dirrm share/apps/kontour/templates
-@dirrm share/apps/kontour/kpartplugins
-@dirrm share/apps/kontour/icons/hicolor/48x48/apps
-@dirrm share/apps/kontour/icons/hicolor/48x48
-@dirrm share/apps/kontour/icons/hicolor/32x32/apps
-@dirrm share/apps/kontour/icons/hicolor/32x32/actions
-@dirrm share/apps/kontour/icons/hicolor/32x32
-@dirrm share/apps/kontour/icons/hicolor/22x22/actions
-@dirrm share/apps/kontour/icons/hicolor/22x22
-@dirrm share/apps/kontour/icons/hicolor/16x16/apps
-@dirrm share/apps/kontour/icons/hicolor/16x16/actions
-@dirrm share/apps/kontour/icons/hicolor/16x16
-@dirrm share/apps/kontour/icons/hicolor
-@dirrm share/apps/kontour/icons
-@dirrm share/apps/kontour
-@dirrm share/apps/koffice/pics
-@dirrm share/apps/koffice/icons/hicolor/48x48/apps
-@dirrm share/apps/koffice/icons/hicolor/48x48
-@dirrm share/apps/koffice/icons/hicolor/32x32/apps
-@dirrm share/apps/koffice/icons/hicolor/32x32/actions
-@dirrm share/apps/koffice/icons/hicolor/32x32
-@dirrm share/apps/koffice/icons/hicolor/22x22/actions/part
-@dirrm share/apps/koffice/icons/hicolor/22x22/actions
-@dirrm share/apps/koffice/icons/hicolor/22x22
-@dirrm share/apps/koffice/icons/hicolor/16x16/apps
-@dirrm share/apps/koffice/icons/hicolor/16x16/actions
-@dirrm share/apps/koffice/icons/hicolor/16x16
-@dirrm share/apps/koffice/icons/hicolor
-@dirrm share/apps/koffice/icons
-@dirrm share/apps/koffice/autocorrect
-@dirrm share/apps/koffice
-@dirrm share/apps/kivio/stencils/Flowcharting/Logic
-@dirrm share/apps/kivio/stencils/Flowcharting/BasicFlowcharting
-@dirrm share/apps/kivio/stencils/Flowcharting
-@dirrm share/apps/kivio/stencils
-@dirrm share/apps/kivio/pics
-@dirrm share/apps/kivio/kpartplugins
-@dirrm share/apps/kivio/icons/hicolor/32x32/actions
-@dirrm share/apps/kivio/icons/hicolor/32x32
-@dirrm share/apps/kivio/icons/hicolor/22x22/actions
-@dirrm share/apps/kivio/icons/hicolor/22x22
-@dirrm share/apps/kivio/icons/hicolor/16x16/actions
-@dirrm share/apps/kivio/icons/hicolor/16x16
-@dirrm share/apps/kivio/icons/hicolor
-@dirrm share/apps/kivio/icons
-@dirrm share/apps/kivio/autoloadStencils
-@dirrm share/apps/kivio
-@dirrm share/apps/kformula
-@dirrm share/apps/kchart/pics
-@dirrm share/apps/kchart/icons/locolor/16x16/actions
-@dirrm share/apps/kchart/icons/locolor/16x16
-@dirrm share/apps/kchart/icons/locolor
-@dirrm share/apps/kchart/icons/hicolor/22x22/actions
-@dirrm share/apps/kchart/icons/hicolor/22x22
-@dirrm share/apps/kchart/icons/hicolor
-@dirrm share/apps/kchart/icons
-@dirrm share/apps/kchart
-@dirrm share/apps/karbon/icons/hicolor/48x48/apps
-@dirrm share/apps/karbon/icons/hicolor/48x48
-@dirrm share/apps/karbon/icons/hicolor/32x32/apps
-@dirrm share/apps/karbon/icons/hicolor/32x32
-@dirrm share/apps/karbon/icons/hicolor/22x22/actions
-@dirrm share/apps/karbon/icons/hicolor/22x22
-@dirrm share/apps/karbon/icons/hicolor/16x16/apps
-@dirrm share/apps/karbon/icons/hicolor/16x16/actions
-@dirrm share/apps/karbon/icons/hicolor/16x16
-@dirrm share/apps/karbon/icons/hicolor
-@dirrm share/apps/karbon/icons
-@dirrm share/apps/karbon
-@dirrm share/applnk/Office
diff --git a/editors/openoffice-1.0-ar/Makefile b/editors/openoffice-1.0-ar/Makefile
deleted file mode 100644
index 505fb56d0846..000000000000
--- a/editors/openoffice-1.0-ar/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# New ports collection makefile for:	OpenOffice for Arabic language
-# Date created:		Tue Jun 11 16:47:21 UTC 2002
-# Whom:		Martin Blapp <mbr@FreeBSD.org> and Mario Ferreira <lioux@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	editors
-
-LANG_PKGNAME=	ar
-LANG_EXT=	96
-LANG_CONFIGURE_ARG=	ARAB
-MASTERDIR=	${.CURDIR}/../openoffice
-
-.include "${MASTERDIR}/Makefile"
diff --git a/editors/openoffice-1.0-dk/Makefile b/editors/openoffice-1.0-dk/Makefile
deleted file mode 100644
index 979cfc7bfe23..000000000000
--- a/editors/openoffice-1.0-dk/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# New ports collection makefile for:	OpenOffice for Danish language
-# Date created:		Tue Jun 11 16:47:21 UTC 2002
-# Whom:		Martin Blapp <mbr@FreeBSD.org> and Mario Ferreira <lioux@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	editors
-
-LANG_PKGNAME=	dk
-LANG_EXT=	45
-LANG_CONFIGURE_ARG=	DAN
-MASTERDIR=	${.CURDIR}/../openoffice
-
-.include "${MASTERDIR}/Makefile"
diff --git a/editors/openoffice-1.0-es/Makefile b/editors/openoffice-1.0-es/Makefile
deleted file mode 100644
index 89685af41da4..000000000000
--- a/editors/openoffice-1.0-es/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# New ports collection makefile for:	OpenOffice for Spanish language
-# Date created:		Tue Jun 11 16:47:21 UTC 2002
-# Whom:		Martin Blapp <mbr@FreeBSD.org> and Mario Ferreira <lioux@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	editors
-
-LANG_PKGNAME=	es
-LANG_EXT=	34
-L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
-
-LANG_CONFIGURE_ARG=	SPAN
-MASTERDIR=	${.CURDIR}/../openoffice
-
-.include "${MASTERDIR}/Makefile"
diff --git a/editors/openoffice-1.0-gr/Makefile b/editors/openoffice-1.0-gr/Makefile
deleted file mode 100644
index 100cfb744e85..000000000000
--- a/editors/openoffice-1.0-gr/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# New ports collection makefile for:	OpenOffice for Greek language
-# Date created:		Tue Jun 11 16:47:21 UTC 2002
-# Whom:		Martin Blapp <mbr@FreeBSD.org> and Mario Ferreira <lioux@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	editors
-
-LANG_PKGNAME=	gr
-LANG_EXT=	30
-LANG_CONFIGURE_ARG=	GREEK
-MASTERDIR=	${.CURDIR}/../openoffice
-
-.include "${MASTERDIR}/Makefile"
diff --git a/editors/openoffice-1.0-it/Makefile b/editors/openoffice-1.0-it/Makefile
deleted file mode 100644
index 1ada4e02d4c6..000000000000
--- a/editors/openoffice-1.0-it/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# New ports collection makefile for:	OpenOffice for Italian language
-# Date created:		Tue Jun 11 16:47:21 UTC 2002
-# Whom:		Martin Blapp <mbr@FreeBSD.org> and Mario Ferreira <lioux@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	editors
-
-LANG_PKGNAME=	it
-LANG_EXT=	39
-L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
-LANG_CONFIGURE_ARG=	ITAL
-MASTERDIR=	${.CURDIR}/../openoffice
-
-.include "${MASTERDIR}/Makefile"
diff --git a/editors/openoffice-1.0-nl/Makefile b/editors/openoffice-1.0-nl/Makefile
deleted file mode 100644
index ffb2bb333844..000000000000
--- a/editors/openoffice-1.0-nl/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# New ports collection makefile for:	OpenOffice for Dutch language
-# Date created:		Tue Jun 11 16:47:21 UTC 2002
-# Whom:		Martin Blapp <mbr@FreeBSD.org> and Mario Ferreira <lioux@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	editors
-
-LANG_PKGNAME=	nl
-LANG_EXT=	31
-LANG_CONFIGURE_ARG=	DTCH
-MASTERDIR=	${.CURDIR}/../openoffice
-
-.include "${MASTERDIR}/Makefile"
diff --git a/editors/openoffice-1.0-se/Makefile b/editors/openoffice-1.0-se/Makefile
deleted file mode 100644
index 90143cf8e6bb..000000000000
--- a/editors/openoffice-1.0-se/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# New ports collection makefile for:	OpenOffice for Swedish language
-# Date created:		Tue Jun 11 16:47:21 UTC 2002
-# Whom:		Martin Blapp <mbr@FreeBSD.org> and Mario Ferreira <lioux@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	editors
-
-LANG_PKGNAME=	se
-LANG_EXT=	46
-L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
-LANG_CONFIGURE_ARG=	SWED
-MASTERDIR=	${.CURDIR}/../openoffice
-
-.include "${MASTERDIR}/Makefile"
diff --git a/editors/openoffice-1.0-tr/Makefile b/editors/openoffice-1.0-tr/Makefile
deleted file mode 100644
index a31fce9bec30..000000000000
--- a/editors/openoffice-1.0-tr/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# New ports collection makefile for:	OpenOffice for Turkish language
-# Date created:		Tue Jun 11 16:47:21 UTC 2002
-# Whom:		Martin Blapp <mbr@FreeBSD.org> and Mario Ferreira <lioux@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	editors
-
-LANG_PKGNAME=	tr
-LANG_EXT=	90
-LANG_CONFIGURE_ARG=	TURK
-MASTERDIR=	${.CURDIR}/../openoffice
-
-.include "${MASTERDIR}/Makefile"
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile
deleted file mode 100644
index 545132d817fb..000000000000
--- a/editors/openoffice-1.0/Makefile
+++ /dev/null
@@ -1,566 +0,0 @@
-# New ports collection makefile for: OpenOffice
-# Date created:		28 Februar 2002
-# Whom:                 Martin Blapp
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openoffice
-PORTVERSION=	1.0.2
-PORTREVISION=	1
-CATEGORIES+=	editors
-MASTER_SITES+=	http://ny1.mirror.openoffice.org/%SUBDIR%/ \
-		http://ftp.gwdg.de/pub/misc/openoffice/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/&,} \
-		ftp://ftp.chg.ru/pub/OpenOffice/%SUBDIR%/ \
-		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		ftp://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}
-DISTFILES+=	OOo_${PORTVERSION}_source.tar.bz2 \
-		gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
-
-SORT?=	/usr/bin/sort
-FIND?=	/usr/bin/find
-CUT?=	/usr/bin/cut
-AWK?=	/usr/bin/awk
-GREP?=	/usr/bin/grep
-MOUNT?=	/sbin/mount
-ZIP?=	${PREFIX}/bin/zip
-UNZIP?=	${PREFIX}/bin/unzip
-ANT?=	${LOCALBASE}/bin/ant
-TCSH?=	/bin/tcsh
-PASTE?= /usr/bin/paste
-
-.include <bsd.port.pre.mk>
-
-INSTALLATION_BASEDIR=	OpenOffice.org1.0
-BUILD_NR=		641
-DIST_SUBDIR=		openoffice
-DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
-
-#
-# configuration for language specific slave ports
-#
-.if !defined(LANG_EXT)
-LANG_EXT=01
-.else
-#
-# Add pkg-descr and pkg-message if available
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-#
-# LANG_CONFIGURE_ARG is missing for the german port
-#
-.if defined(LANG_EXT)
-CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG},ENUS
-.endif
-.endif
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=	`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
-
-EXTRACT_ONLY=	OOo_${PORTVERSION}_source.tar.bz2
-
-MAINTAINER=	openoffice@FreeBSD.org
-COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/jakarta-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-.if !defined(DISPLAY)
-BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
-.endif
-.if !defined(WITH_BSD_JDK)
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk13
-.else
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
-.endif
-
-USE_PERL5=	yes
-USE_BZIP2=	yes
-USE_BISON=	yes
-USE_GMAKE=	yes
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
-.if !defined(WITH_BSD_JDK)
-JDK13DIR?=      ${LOCALBASE}/linux-sun-jdk1.3.1
-.else
-JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
-.endif
-JAVAVM=         ${JDK13DIR}/bin/java
-
-GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
-LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
-BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
-
-.if !defined(DISPLAY)
-DISPLAYHACK=localhost:1001
-.endif
-
-CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
-			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDK13DIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
-
-.if !defined(WITH_BSD_JDK)
-CONFIGURE_ARGS+=	--enable-linuxjdk=yes
-.endif
-
-.if defined(WITH_DEBUG)
-.if ${WITH_DEBUG} == 2
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-.endif
-
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"prefered language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
-	@${ECHO} "OPTIONS:"
-.if !defined(USE_GCC)
-	@${ECHO}
-	@${ECHO} "You can compile OO with different"
-	@${ECHO} "gcc compiler versions:"
-	@${ECHO}
-	@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.1"
-	@${ECHO} "to compile openoffice with your"
-	@${ECHO} "prefered compiler."
-.endif
-.if !defined(WITH_BSD_JDK)
-	@${ECHO}
-	@${ECHO} "If you like to use the native BSD"
-	@${ECHO} "JDK for the build system, you can use"
-	@${ECHO} "WITH_BSD_JDK=TRUE to disable the"
-	@${ECHO} "usage of the linux-JDK and linux dependency."
-	@${ECHO}
-.endif
-.if !defined(WITH_DEBUG)
-	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
-	@${ECHO} "if you call make with WITH_DEBUG=1"
-	@${ECHO}
-	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
-	@${ECHO}
-.endif
-.if !defined(WITH_TTF_BYTECODE_ENABLED)
-	@${ECHO}
-	@${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES"
-	@${ECHO} "if you like to use the Freetype library to"
-	@${ECHO} "render TTF fonts. Normally the TTF lib is"
-	@${ECHO} "not used to render fonts."
-	@${ECHO}
-	@${ECHO} "If you have licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479"
-	@${ECHO} "you can enable this option to get better"
-	@${ECHO} "quality of glyphs at small bitmap sizes."
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 450002
-	@${ECHO}
-	@${ECHO} "OS-VERSION ${OSVERSION} too low"
-	@${ECHO}
-	@${ECHO} "OO need some important libc_r and"
-	@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
-	@${ECHO} "RELEASE or 4.6 STABLE."
-	@${FALSE}
-.endif
-	@${ECHO}
-	@${ECHO} "NOTICE:"
-	@${ECHO}
-	@${ECHO} "To build Openoffice, you should have a lot"
-.if defined(WITH_DEBUG)
-	@${ECHO} "of free diskspace (~ 8GB)."
-.else
-	@${ECHO} "of free diskspace (~ 4GB)."
-.endif
-	@${ECHO}
-.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
-    (${OSVERSION} < 500000 && !defined(USE_GCC))
-	@${ECHO} "KERNEL CONFIGURATION:"
-	@${ECHO}
-	@${ECHO} "Openoffice needs a larger stack- and"
-	@${ECHO} "datasize to build. Check your limit"
-	@${ECHO} "settings and and put this in /boot/loader.conf"
-	@${ECHO} "if neccessary:"
-	@${ECHO}
-	@${ECHO} "kern.maxdsiz=\"1073741824\""
-	@${ECHO} "kern.maxssiz=\"268435456\""
-.endif
-	@${ECHO}
-.if ${OSVERSION} < 460002
-	@${ECHO} "REQUIRED SYSTEM PATCHES:"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO} "OO.org can crash if you enter a non existing path"
-	@${ECHO} "or URL in the location bar. To fix these crashes"
-	@${ECHO} "you need a uncommitted system patch for rtld:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460001
-	@${ECHO}
-	@${ECHO} "OO setup is broken on STABLE < 4.6"
-	@${ECHO} "including 4.6 RELEASE."
-	@${ECHO} "You'll need a system patch to solve"
-	@${ECHO} "this problem:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460002
-	@${ECHO}
-	@${ECHO} "OO.org soffice binary can deadlock. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO}
-	@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
-	@${ECHO}
-.endif
-.if !exists(/usr/include/langinfo.h)
-	@${ECHO}
-	@${ECHO} "langinfo.h is missing !"
-	@${ECHO}
-	@${ECHO} "Please upgrade to 4.6 RELEASE or"
-	@${ECHO} "4.6 STABLE."
-	@${ECHO}
-	@${FALSE}
-.endif
-
-post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
-	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
-	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@-${RM} ${WRKSRC}/../moz/zipped/*.zip
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
-.if defined(L10NHELP)
-	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
-	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
-.endif
-
-post-patch:
-	@${MAKE} patch-mozilla
-.if defined(WITH_TTF_BYTECODE_ENABLED)
-	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
-		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-			${ECHO_MSG} "===>   Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \
-		fi; \
-		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
-	fi
-.endif
-.if defined(WITH_DEBUG)
-	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
-		PATCHES_APPLIED="" ; \
-		for i in ${PATCHDIR}/debugpatch-*; do \
-			case $$i in \
-				*.orig|*.rej|*~) \
-					${ECHO_MSG} "===>   Ignoring patchfile $$i" ; \
-					;; \
-				*) \
-					if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-						${ECHO_MSG} "===>   Applying ${OPSYS} patch $$i" ; \
-					fi; \
-					if ${PATCH} ${PATCH_ARGS} < $$i ; then \
-						PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
-					else \
-						${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
-						if [ x"$$PATCHES_APPLIED" != x"" ]; then \
-							${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
-						fi; \
-						${FALSE} ; \
-					fi; \
-					;; \
-			esac; \
-		done; \
-	fi;
-.endif
-	@${ECHO_MSG} "===>  Find old malloc.h defines and fix them in ${PKGNAME} source"
-	@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
-		${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
-
-extract-mozilla:
-.if ! exists(${WRKDIR}/mozilla/Makefile)
-	@${ECHO_MSG} "===>  Extracting mozilla sub project"
-	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
-	
-.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment)
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
-.endif
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
-.endif
-	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
-
-patch-mozilla:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
-		${WRKDIR}/mozilla/files/
-	@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
-
-build-mozilla:
-.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
-	@${ECHO_MSG} "===>  Building mozilla sub project"
-.if defined(WITH_DEBUG)
-	@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
-	@${SED} -e 's|--disable-debug||' \
-		-e 's|--disable-cpp-rtti||' \
-		-e 's|--enable-strip||' \
-		< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
-.endif
-.if defined(USE_GCC)
-	@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
-.else
-	@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
-.endif
-	@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
-	@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
-	@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
-.endif
-
-install-mozilla:
-	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
-
-register-mozilla:
-.if exists(${WRKDIR}/mozilla-runtime)
-	@${RM} -rf ${WRKDIR}/mozilla-runtime
-.endif
-	@${MKDIR} ${WRKDIR}/mozilla-runtime
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
-	@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
-	@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
-	@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
-		&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom 
-	@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
-		${WRKDIR}/mozilla-runtime/components/xptitemp.dat
-	@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
-	@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
-		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
-
-mozilla:
-	@${MAKE} extract-mozilla
-	@${MAKE} patch-mozilla
-	@${MAKE} build-mozilla
-	@${MAKE} register-mozilla
-	@${MAKE} install-mozilla
-
-do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
-	@${MAKE} mozilla
-.endif
-.endif
-.endif
-.if exists(${WRKDIR}/.Xvfb.pid)
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.endif
-.if !defined(DISPLAY)
-	#
-	# This is a UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-.endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
-	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck 
-	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-.endif
-.if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
-.endif
-
-pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-
-do-install:
-.if !defined(DISPLAY)
-	#
-	# UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-.endif
-
-install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
-
-post-install:
-	@${ECHO_MSG} "===>  Add wrapper scripts";
-	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
-	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
-
-package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
-.if defined(LANG_SUFFIX)
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
-.else
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/editors/openoffice-1.0/distinfo b/editors/openoffice-1.0/distinfo
deleted file mode 100644
index 577a3ec9fd1f..000000000000
--- a/editors/openoffice-1.0/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-MD5 (openoffice/OOo_1.0.2_source.tar.bz2) = 8a82b4dbdd4e305b6f6db70ea65dce8c
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-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
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
-MD5 (openoffice/patch-translation-ru-1.0.2.bz2) = 47d7a3cb565361816d71968efa31754a
diff --git a/editors/openoffice-1.0/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice-1.0/files/debugpatch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 96c651ce22c8..000000000000
--- a/editors/openoffice-1.0/files/debugpatch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../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
-@@ -902,6 +902,7 @@
- 
- void KillSetupDir()
- {
-+#if 0
-     DIR* pDir = opendir( strTmpPath );
-     struct dirent* pFile;
- 
-@@ -915,6 +916,10 @@
- 
-     chdir( strInitPath );
-     rmdir( strTmpPath );
-+#else
-+	fprintf(stderr, "\nLeaving behind temporary directory: %s\n",
-+	strTmpPath);
-+#endif
- }
- 
- void makeSymLink( char* s )
diff --git a/editors/openoffice-1.0/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.0/files/debugpatch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 52bd2b3d58d6..000000000000
--- a/editors/openoffice-1.0/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
-+++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
- 
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- 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
- 
- # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
diff --git a/editors/openoffice-1.0/files/oo_setup.resp b/editors/openoffice-1.0/files/oo_setup.resp
deleted file mode 100644
index 364169bdd695..000000000000
--- a/editors/openoffice-1.0/files/oo_setup.resp
+++ /dev/null
@@ -1,7 +0,0 @@
-[Environment]
-InstallationMode = INSTALL_NETWORK
-InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org1.0
-
-[Java]
-JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice-1.0/files/openoffice-wrapper b/editors/openoffice-1.0/files/openoffice-wrapper
deleted file mode 100644
index d5707b7ad633..000000000000
--- a/editors/openoffice-1.0/files/openoffice-wrapper
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.0/files/Attic/openoffice-wrapper,v 1.3 2003-01-21 17:09:39 mbr Exp $
-
-oopath=%%PREFIX%%/OpenOffice.org1.0/program/
-program=`echo $0 | sed -e 's|.*-||'`
-
-if [ ! $LANG ]; then
-	export LANG=%%LANG%%
-fi
-
-case $program in
-$0)
-	exec $oopath/soffice "$@"
-	;;
-	*)
-	exec $oopath/$program "$@"
-	;;
-esac
diff --git a/editors/openoffice-1.0/files/optpatch-freetype+patch b/editors/openoffice-1.0/files/optpatch-freetype+patch
deleted file mode 100644
index b426a8fb7fcc..000000000000
--- a/editors/openoffice-1.0/files/optpatch-freetype+patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Index: files/patch-freetype::patch
-===================================================================
-RCS file: files/patch-freetype::patch
-diff -N files/patch-freetype::patch
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-freetype::patch	4 Aug 2002 15:27:42 -0000
-@@ -0,0 +1,201 @@
-+diff -ur ../freetype/freetype-2.0.5.patch oo641d_patched/freetype/freetype-2.0.5.patch
-+--- ../freetype/freetype-2.0.5.patch	Fri Apr  5 21:07:34 2002
-++++ ../freetype/freetype-2.0.5.patch	Sat Mar  9 18:04:17 2002
-+@@ -1,118 +1,79 @@
-+-*** misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 14 00:44:33 2000
-+---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 63,69 ****
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+---- 63,69 ----
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+-*** misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Jun  7 19:36:17 2001
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 631,637 ****
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+---- 631,637 ----
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile -DPIC $pic_flag"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Mon Jan  1 18:25:21 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 1,7 ****
-+---- 1,9 ----
-+-  FT_USE_MODULE(autohint_module_class)
-+-  FT_USE_MODULE(cff_driver_class)
-+-  FT_USE_MODULE(t1cid_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(pcf_driver_class)
-+-+ */
-+-  FT_USE_MODULE(psaux_module_class)
-+-  FT_USE_MODULE(psnames_module_class)
-+-  FT_USE_MODULE(ft_raster1_renderer_class)
-+-***************
-+-*** 9,12 ****
-+---- 11,16 ----
-+-  FT_USE_MODULE(ft_smooth_renderer_class)
-+-  FT_USE_MODULE(tt_driver_class)
-+-  FT_USE_MODULE(t1_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(winfnt_driver_class)
-+-+ */
-+-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h	Tue Aug 21 10:50:45 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 70,76 ****
-+---- 70,79 ----
-+-    /*   All convenience functions are declared as such in their             */
-+-    /*   documentation.                                                      */
-+-    /*                                                                       */
-+-+ /*
-+-  #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-+ */
-+-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-  
-+-  
-+-    /*************************************************************************/
-+-***************
-+-*** 108,116 ****
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-- 
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+---- 111,121 ----
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-+ /*
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-+ */
-+-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig	Mon Jan  7 14:21:35 2002
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Mon Jan  7 14:21:40 2002
-+-***************
-+-*** 2251,2257 ****
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age + 1`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-+---- 2251,2257 ----
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk
-++--- misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:49:17 2001
-++@@ -63,7 +63,7 @@
-++ #   ANSI compliance.
-++ #
-++ ifndef CFLAGS
-++-  CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+++  CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-++ endif
-++ 
-++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh
-++--- misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:47:56 2001
-+++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:49:17 2001
-++@@ -631,7 +631,7 @@
-++     if test "$build_old_libs" = yes; then
-++       if test "$pic_mode" != yes; then
-++ 	# Don't build PIC code
-++-	command="$base_compile $srcfile"
-+++	command="$base_compile $srcfile -DPIC $pic_flag"
-++       else
-++ 	# All platforms use -DPIC, to notify preprocessed assembler code.
-++ 	command="$base_compile $srcfile $pic_flag -DPIC"
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:49:17 2001
-++@@ -1,7 +1,9 @@
-++ FT_USE_MODULE(autohint_module_class)
-++ FT_USE_MODULE(cff_driver_class)
-++ FT_USE_MODULE(t1cid_driver_class)
-+++/*
-++ FT_USE_MODULE(pcf_driver_class)
-+++*/
-++ FT_USE_MODULE(psaux_module_class)
-++ FT_USE_MODULE(psnames_module_class)
-++ FT_USE_MODULE(ft_raster1_renderer_class)
-++@@ -9,4 +11,6 @@
-++ FT_USE_MODULE(ft_smooth_renderer_class)
-++ FT_USE_MODULE(tt_driver_class)
-++ FT_USE_MODULE(t1_driver_class)
-+++/*
-++ FT_USE_MODULE(winfnt_driver_class)
-+++*/
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:51:15 2001
-++@@ -70,7 +70,10 @@
-++   /*   All convenience functions are declared as such in their             */
-++   /*   documentation.                                                      */
-++   /*                                                                       */
-+++/*
-++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+++*/
-+++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-++ 
-++ 
-++   /*************************************************************************/
-++@@ -108,8 +111,10 @@
-++   /*   use a vector `plotter' format that isn't supported when this        */
-++   /*   macro is undefined.                                                 */
-++   /*                                                                       */
-+++/*
-++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++-
-+++*/
-+++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++ 
-++   /*************************************************************************/
-++   /*                                                                       */
-++@@ -338,7 +343,7 @@
-++   /* By undefining this, you will only compile the code necessary to load  */
-++   /* TrueType glyphs without hinting.                                      */
-++   /*                                                                       */
-++-#undef  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-+++#define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-++ 
-++ 
-++   /*************************************************************************/
diff --git a/editors/openoffice-1.0/files/optpatch-vcl+util+makefile.pmk b/editors/openoffice-1.0/files/optpatch-vcl+util+makefile.pmk
deleted file mode 100644
index 41341ff0b4e8..000000000000
--- a/editors/openoffice-1.0/files/optpatch-vcl+util+makefile.pmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/util/makefile.pmk.orig	Mon Aug  5 01:39:41 2002
-+++ ../vcl/util/makefile.pmk	Mon Aug  5 01:40:03 2002
-@@ -64,7 +64,7 @@
- PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch
- PDBTARGET=vcl
- 
--.IF "$(OS)" != "MACOSX"
-+.IF "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- .IF "$(remote)" != ""
- USE_BUILTIN_RASTERIZER=true
- .ENDIF
diff --git a/editors/openoffice-1.0/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice-1.0/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index b3f090de1f03..000000000000
--- a/editors/openoffice-1.0/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,132 +0,0 @@
---- ../berkeleydb/db-3.2.9.patch.orig	Sun Jan 19 14:58:19 2003
-+++ ../berkeleydb/db-3.2.9.patch	Sun Jan 19 15:00:02 2003
-@@ -45,52 +45,82 @@
-   CCLINK=		@MAKEFILE_CCLINK@
- *** misc/db-3.2.9/dist/configure	Wed Jan 24 10:16:18 2001
- --- misc/build/db-3.2.9/dist/configure	Tue Jan  7 11:37:05 2003
--***************
--*** 995,1000 ****
----- 995,1001 ----
--  	   CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
--  mpeix*)	   CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS"
--  	   LIBS="-lsocket -lsvipc $LIBS";;
--+ netbsd*)   optimize_def="-O2";;
--  osf*)	   CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
--  *qnx)	   cat >> confdefs.h <<\EOF
--  #define HAVE_QNX 1
--***************
--*** 1795,1800 ****
----- 1796,1803 ----
--  	case "$host_os" in
--  	solaris*)	JINCSUBDIRS="solaris";;
--  	linux*)		JINCSUBDIRS="linux genunix";;
--+ 	irix*)		JINCSUBDIRS="irix";;
--+ netbsd*)	JINCSUBDIRS="netbsd linux solaris genunix";;
--  	*)		JINCSUBDIRS="genunix";;
--  	esac
--  
-+@@ -984,9 +984,9 @@
-+ 	   optimize_def="-O2"
-+ 	   LIBS="-lipc $LIBS";;
-+ bsdi*)	   optimize_def="-O2";;
-+-freebsd*)  optimize_def="-O2"
-+-	   CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS"
-+-           LIBS="-pthread";;
-++freebsd*)  optimize_def="-O"
-++	   CPPFLAGS="$PTHREAD_CFLAGS $CPPFLAGS"
-++           LIBS="$PTHREAD_LIBS";;
-+ hpux*)	   CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
-+ irix*)	   optimize_def="-O2"
-+ 	   CPPFLAGS="-D_SGI_MP_SOURCE $CPPFLAGS";;
-+@@ -995,6 +995,7 @@
-+ 	   CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
-+ mpeix*)	   CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS"
-+ 	   LIBS="-lsocket -lsvipc $LIBS";;
-++netbsd*)   optimize_def="-O2";;
-+ osf*)	   CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
-+ *qnx)	   cat >> confdefs.h <<\EOF
-+ #define HAVE_QNX 1
-+@@ -1795,6 +1796,9 @@
-+ 	case "$host_os" in
-+ 	solaris*)	JINCSUBDIRS="solaris";;
-+ 	linux*)		JINCSUBDIRS="linux genunix";;
-++	irix*)		JINCSUBDIRS="irix";;
-++	netbsd*)        JINCSUBDIRS="netbsd linux solaris genunix";;
-++	freebsd*)	JINCSUBDIRS="freebsd linux solaris genunix";;
-+ 	*)		JINCSUBDIRS="genunix";;
-+ 	esac
-+ 
- *** misc/db-3.2.9/dist/ltconfig	Fri Oct 13 16:23:00 2000
- --- misc/build/db-3.2.9/dist/ltconfig	Tue Jan  7 11:37:05 2003
--***************
--*** 1194,1204 ****
--  
--    netbsd*)
--      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
---       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
---       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
---     else
--        archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
--        # can we support soname and/or expsyms with a.out? -oliva
--      fi
--      ;;
--  
----- 1194,1205 ----
--  
--    netbsd*)
--      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--        archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
--        # can we support soname and/or expsyms with a.out? -oliva
--+     else
--+       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
--+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--+       need_version=no
--      fi
--      ;;
--  
-+@@ -1194,11 +1194,12 @@
-+ 
-+   netbsd*)
-+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+-      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+-    else
-+       archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-+       # can we support soname and/or expsyms with a.out? -oliva
-++    else
-++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-++      need_version=no
-+     fi
-+     ;;
-+ 
-+@@ -1365,10 +1366,13 @@
-+ 
-+   # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+   freebsd*)
-+-    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts'
-++    archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-++    archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname \
-++	${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+     hardcode_libdir_flag_spec='-R$libdir'
-+     hardcode_direct=yes
-+     hardcode_shlibpath_var=no
-++    need_version=no
-+     ;;
-+ 
-+   hpux9* | hpux10* | hpux11*)
-+@@ -2020,6 +2024,14 @@
-+     soname_spec='${libname}${release}.so$major'
-+     dynamic_linker='NetBSD ld.elf_so'
-+   fi
-++  shlibpath_var=LD_LIBRARY_PATH
-++  ;;
-++
-++freebsd*)
-++  version_type=sunos
-++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-++  soname_spec='${libname}${release}.so$major'
-++  dynamic_linker='FreeBSD ld.elf_so'
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
diff --git a/editors/openoffice-1.0/files/patch-bridges+prj+build.lst b/editors/openoffice-1.0/files/patch-bridges+prj+build.lst
deleted file mode 100644
index cd979b062a34..000000000000
--- a/editors/openoffice-1.0/files/patch-bridges+prj+build.lst
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../bridges/prj/build.lst.orig	Tue Mar 19 22:06:50 2002
-+++ ../bridges/prj/build.lst	Tue Jun  4 12:24:46 2002
-@@ -9,6 +9,8 @@
- br	bridges\source\cpp_uno\gcc2_linux_intel	nmake	-	u	br_gccli br_unotypes NULL
- br	bridges\source\cpp_uno\gcc3_linux_intel	nmake	-	u	br_gcc3li 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\cpp_uno\gcc2_linux_powerpc	nmake	-	u	br_gcclp br_unotypes NULL
- br	bridges\source\cpp_uno\gcc2_macosx_powerpc			nmake	-	u	br_gccmacoxp br_unotypes NULL
- br	bridges\source\cpp_uno\cc50_solaris_sparc			nmake	-	u	br_cc50sols br_unotypes NULL
diff --git a/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk b/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk
deleted file mode 100644
index 512a57e75b9b..000000000000
--- a/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk.orig	Fri May 31 10:22:18 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk	Fri May 31 10:22:46 2002
-@@ -76,7 +76,7 @@
- 
- # --- Files --------------------------------------------------------
- 
--.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI"
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-dwarf2"
- 
- CFLAGSNOOPT=-O0
- NOOPTFILES=$(SLO)$/uno2cpp.obj
diff --git a/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj b/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
deleted file mode 100644
index 95874155c7db..000000000000
--- a/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
+++ /dev/null
@@ -1,1735 +0,0 @@
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx	Tue Jun  4 10:49:43 2002
-@@ -0,0 +1,615 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( (2*(nSize+1)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + (2*(nSize+1)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[(nPos << 1) + 2 ] = NULL;
-+		pvft[(nPos << 1) + 3 ] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__sjthrow();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx	Tue Jun  4 10:49:36 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_freebsd_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __sjthrow(void) __attribute__ ((__noreturn__));
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk	Tue Jun  4 12:20:58 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.1 $
-+#
-+#   last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-sjlj"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,473 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs,
-+									  sal_Int32 nThisOffset )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $1, %%eax\n\t" // first entry is reserved
-+		"shl  $3, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov %4, %%eax\n\t"
-+		"movswl (%%edx), %%ecx\n\t"
-+                "add  %%esp, %%eax\n\t"
-+                "add  %%ecx, (%%eax)\n\t"
-+		"mov  4(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %5\n\t"
-+ 		"mov  %%edx, %6\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
-+                    "m"(nThisOffset), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+
-+        sal_Int32 nThisOffset = 0;
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack  += sizeof(void *);
-+                        nThisOffset = sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32),
-+			nThisOffset);
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_freebsd_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
deleted file mode 100644
index 20b13ea25cb2..000000000000
--- a/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ /dev/null
@@ -1,1608 +0,0 @@
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,594 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/26 07:22:57 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <hash_map>
-+
-+#include <rtl/alloc.h>
-+#include <osl/mutex.hxx>
-+
-+#include <uno/data.h>
-+#include <typelib/typedescription.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+    {
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+    }
-+    
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("illegal vtable index!"),
-+            (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+    
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("no member description found!"),
-+            (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+	typelib_TypeClass aType = cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+    
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+    typedef ::std::hash_map< OUString, void *, OUStringHash > t_classdata_map;
-+	t_classdata_map m_map;
-+	Mutex m_mutex;
-+    
-+public:
-+	void const * get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () );
-+    
-+	inline MediateClassData() SAL_THROW( () )
-+        {}
-+	~MediateClassData() SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData() SAL_THROW( () )
-+{
-+	OSL_TRACE( "> calling ~MediateClassData(): freeing mediate vtables." );
-+	
-+	for ( t_classdata_map::const_iterator iPos( m_map.begin() ); iPos != m_map.end(); ++iPos )
-+	{
-+		::rtl_freeMemory( iPos->second );
-+	}
-+}
-+//--------------------------------------------------------------------------------------------------
-+static inline void codeSnippet( char * code, sal_uInt32 vtable_pos, bool simple_ret_type ) SAL_THROW( () )
-+{
-+    if (! simple_ret_type)
-+        vtable_pos |= 0x80000000;
-+    OSL_ASSERT( sizeof (long) == 4 );
-+    // mov $nPos, %eax
-+    *code++ = 0xb8;
-+    *(long *)code = vtable_pos;
-+    code += sizeof (long);
-+    // mov %esp, %edx
-+    *code++ = 0x89;
-+    *code++ = 0xe2;
-+    // jmp cpp_vtable_call
-+    *code++ = 0xe9;
-+    *(long *)code = ((char *)cpp_vtable_call) - code - sizeof (long);
-+}
-+//__________________________________________________________________________________________________
-+void const * MediateClassData::get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () )
-+{
-+    void * buffer;
-+    
-+    // avoiding locked counts
-+    OUString const & unoName = *(OUString const *)&((typelib_TypeDescription *)pTD)->pTypeName;
-+    {
-+	MutexGuard aGuard( m_mutex );
-+	t_classdata_map::const_iterator iFind( m_map.find( unoName ) );
-+	if (iFind == m_map.end())
-+    {
-+        // create new vtable
-+        sal_Int32 nSlots = pTD->nMapFunctionIndexToMemberIndex;
-+        buffer = ::rtl_allocateMemory( ((2+ nSlots) * sizeof (void *)) + (nSlots *20) );
-+        
-+        ::std::pair< t_classdata_map::iterator, bool > insertion(
-+            m_map.insert( t_classdata_map::value_type( unoName, buffer ) ) );
-+        OSL_ENSURE( insertion.second, "### inserting new vtable buffer failed?!" );
-+        
-+        void ** slots = (void **)buffer;
-+        *slots++ = 0;
-+        *slots++ = 0; // rtti
-+        char * code = (char *)(slots + nSlots);
-+        
-+        sal_uInt32 vtable_pos = 0;
-+        sal_Int32 nAllMembers = pTD->nAllMembers;
-+        typelib_TypeDescriptionReference ** ppAllMembers = pTD->ppAllMembers;
-+        for ( sal_Int32 nPos = 0; nPos < nAllMembers; ++nPos )
-+        {
-+            typelib_TypeDescription * pTD = 0;
-+            TYPELIB_DANGER_GET( &pTD, ppAllMembers[ nPos ] );
-+            OSL_ASSERT( pTD );
-+            if (typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass)
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceAttributeTypeDescription *)pTD)->pAttributeTypeRef->eTypeClass );
-+                // get method
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+                if (! ((typelib_InterfaceAttributeTypeDescription *)pTD)->bReadOnly)
-+                {
-+                    // set method
-+                    *slots++ = code;
-+                    codeSnippet( code, vtable_pos++, true );
-+                    code += 20;
-+                }
-+            }
-+            else
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceMethodTypeDescription *)pTD)->pReturnTypeRef->eTypeClass );
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+            }
-+            TYPELIB_DANGER_RELEASE( pTD );
-+        }
-+        OSL_ASSERT( vtable_pos == nSlots );
-+    }
-+    else
-+    {
-+        buffer = iFind->second;
-+    }
-+    }
-+    
-+    return ((void **)buffer +2);
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(void const **)pCppI = s_pMediateClassData->get_vtable( pTypeDescr );
-+}
-+
-+}
-+
-+extern "C"
-+{
-+//##################################################################################################
-+sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload(
-+        &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment(
-+        pCppEnv );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping(
-+        ppMapping, pFrom, pTo );
-+}
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,317 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.6 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/11/08 12:35:28 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdio.h>
-+#include <dlfcn.h>
-+#include <cxxabi.h>
-+#include <hash_map>
-+
-+#include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
-+#include <osl/diagnose.h>
-+#include <osl/mutex.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <typelib/typedescription.hxx>
-+#include <uno/any2.h>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::std;
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+using namespace ::__cxxabiv1;
-+
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+    
-+void dummy_can_throw_anything( char const * )
-+{
-+}
-+
-+//==================================================================================================
-+static OUString toUNOname( char const * p ) SAL_THROW( () )
-+{
-+#ifdef DEBUG
-+    char const * start = p;
-+#endif
-+    
-+    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-+    
-+	OUStringBuffer buf( 64 );
-+    OSL_ASSERT( 'N' == *p );
-+    ++p; // skip N
-+    
-+    while ('E' != *p)
-+    {
-+        // read chars count
-+        long n = (*p++ - '0');
-+        while ('0' <= *p && '9' >= *p)
-+        {
-+            n *= 10;
-+            n += (*p++ - '0');
-+        }
-+        buf.appendAscii( p, n );
-+        p += n;
-+        if ('E' != *p)
-+            buf.append( (sal_Unicode)'.' );
-+    }
-+    
-+#ifdef DEBUG
-+    OUString ret( buf.makeStringAndClear() );
-+    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
-+    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
-+    return ret;
-+#else
-+    return buf.makeStringAndClear();
-+#endif
-+}
-+
-+//==================================================================================================
-+class RTTI
-+{
-+    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-+    
-+    Mutex m_mutex;
-+	t_rtti_map m_rttis;
-+    t_rtti_map m_generatedRttis;
-+
-+    void * m_hApp;
-+    
-+public:
-+    RTTI() SAL_THROW( () );
-+    ~RTTI() SAL_THROW( () );
-+    
-+    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+RTTI::RTTI() SAL_THROW( () )
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+{
-+}
-+//__________________________________________________________________________________________________
-+RTTI::~RTTI() SAL_THROW( () )
-+{
-+    dlclose( m_hApp );
-+}
-+
-+//__________________________________________________________________________________________________
-+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
-+{
-+    type_info * rtti;
-+    
-+    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-+    
-+    MutexGuard guard( m_mutex );
-+    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-+    if (iFind == m_rttis.end())
-+    {
-+        // RTTI symbol
-+        OStringBuffer buf( 64 );
-+        buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
-+        sal_Int32 index = 0;
-+        do
-+        {
-+            OUString token( unoName.getToken( 0, '.', index ) );
-+            buf.append( token.getLength() );
-+            OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) );
-+            buf.append( c_token );
-+        }
-+        while (index >= 0);
-+        buf.append( 'E' );
-+        
-+        OString symName( buf.makeStringAndClear() );
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+
-+        if (rtti)
-+        {
-+            pair< t_rtti_map::iterator, bool > insertion(
-+                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+            OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
-+        }
-+        else
-+        {
-+            // try to lookup the symbol in the generated rtti map
-+            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
-+            if (iFind == m_generatedRttis.end())
-+            {
-+                // we must generate it !
-+                // symbol and rtti-name is nearly identical,
-+                // the symbol is prefixed with _ZTI
-+                char const * rttiName = symName.getStr() +4;
-+#ifdef DEBUG
-+                fprintf( stderr,"generated rtti for %s\n", rttiName );
-+#endif
-+                if (pTypeDescr->pBaseTypeDescription)
-+                {
-+                    // ensure availability of base
-+                    type_info * base_rtti = getRTTI(
-+                        (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
-+                    rtti = new __si_class_type_info(
-+                        strdup( rttiName ), (__class_type_info *)base_rtti );
-+                }
-+                else
-+                {
-+                    // this class has no base class
-+                    rtti = new __class_type_info( strdup( rttiName ) );
-+                }
-+                
-+                pair< t_rtti_map::iterator, bool > insertion(
-+                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+                OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
-+            }
-+            else // taking already generated rtti
-+            {
-+                rtti = iFind->second;
-+            }
-+        }
-+    }
-+    else
-+    {
-+        rtti = iFind->second;
-+    }
-+    
-+    return rtti;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+static void deleteException( void * pExc )
-+{
-+    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-+    typelib_TypeDescription * pTD = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+    ::typelib_typedescription_getByName( &pTD, unoName.pData );
-+    OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
-+    if (pTD)
-+    {
-+		::uno_destructData( pExc, pTD, cpp_release );
-+		::typelib_typedescription_release( pTD );
-+	}
-+}
-+
-+//==================================================================================================
-+void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+    void * pCppExc;
-+    type_info * rtti;
-+
-+    {
-+    // construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-+    OSL_ASSERT( pTypeDescr );
-+    if (! pTypeDescr)
-+        terminate();
-+    
-+	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-+	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	::uno_any_destruct( pUnoExc, 0 );
-+    // avoiding locked counts
-+    static RTTI * s_rtti = 0;
-+    if (! s_rtti)
-+    {
-+        MutexGuard guard( Mutex::getGlobalMutex() );
-+        if (! s_rtti)
-+        {
-+#ifdef LEAK_STATIC_DATA
-+            s_rtti = new RTTI();
-+#else
-+            static RTTI rtti_data;
-+            s_rtti = &rtti_data;
-+#endif
-+        }
-+    }
-+	rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
-+    TYPELIB_DANGER_RELEASE( pTypeDescr );
-+    OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-+    if (! rtti)
-+        terminate();
-+    }
-+    
-+	__cxa_throw( pCppExc, rtti, deleteException );
-+}
-+
-+//==================================================================================================
-+void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
-+{
-+    OSL_ENSURE( header, "### no exception header!!!" );
-+    if (! header)
-+        terminate();
-+    
-+	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 );
-+}
-+
-+}
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Mon Mar  4 21:24:53 2002
-@@ -0,0 +1,112 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.2 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc3_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
-+
-+.IF "$(cppu_no_leak)" == ""
-+CFLAGS += -DLEAK_STATIC_DATA
-+.ENDIF
-+
-+CFLAGSNOOPT=-O0
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB=i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB)			\
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,120 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: share.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/19 13:32:39 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <typeinfo>
-+#include <exception>
-+#include <cstddef>
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
-+
-+struct _Unwind_Exception
-+{
-+    unsigned exception_class __attribute__((__mode__(__DI__)));
-+    void * exception_cleanup;
-+    unsigned private_1 __attribute__((__mode__(__word__)));
-+    unsigned private_2 __attribute__((__mode__(__word__)));
-+} __attribute__((__aligned__));
-+
-+struct __cxa_exception
-+{ 
-+    ::std::type_info *exceptionType;
-+    void (*exceptionDestructor)(void *); 
-+    
-+    ::std::unexpected_handler unexpectedHandler;
-+    ::std::terminate_handler terminateHandler;
-+    
-+    __cxa_exception *nextException;
-+    
-+    int handlerCount;
-+    
-+    int handlerSwitchValue;
-+    const unsigned char *actionRecord;
-+    const unsigned char *languageSpecificData;
-+    void *catchTemp;
-+    void *adjustedPtr;
-+    
-+    _Unwind_Exception unwindHeader;
-+};    
-+
-+extern "C" void *__cxa_allocate_exception(
-+    std::size_t thrown_size ) throw();
-+extern "C" void __cxa_throw (
-+    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
-+
-+struct __cxa_eh_globals
-+{
-+    __cxa_exception *caughtExceptions;
-+    unsigned int uncaughtExceptions;
-+};
-+extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-+
-+// -----
-+
-+//==================================================================================================
-+void raiseException(
-+    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+//==================================================================================================
-+void fillUnoException(
-+    __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,450 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2001/10/31 14:46:47 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <rtl/alloc.h>
-+
-+#include <uno/data.h>
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+void dummy_can_throw_anything( char const * );
-+
-+//==================================================================================================
-+static void callVirtualMethod(
-+    void * pThis,
-+    sal_Int32 nVtableIndex,
-+    void * pRegisterReturn,
-+    typelib_TypeClass eReturnType,
-+    sal_Int32 * pStackLongs,
-+    sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+    
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+    
-+    // never called
-+    if (! pThis) dummy_can_throw_anything("xxx"); // address something
-+    
-+	volatile long edx = 0, eax = 0; // for register returns
-+	asm volatile (
-+		// copy values
-+		"mov   %0, %%eax\n\t"
-+		"mov   %%eax, %%edx\n\t"
-+		"dec   %%edx\n\t"
-+		"shl   $2, %%edx\n\t"
-+		"add   %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"pushl 0(%%edx)\n\t"
-+		"sub   $4, %%edx\n\t"
-+		"dec   %%eax\n\t"
-+		"jne   Lcopy\n\t"
-+		// do the actual call
-+		"mov   %2, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"mov   %3, %%eax\n\t"
-+		"shl   $2, %%eax\n\t"
-+		"add   %%eax, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"call  *%%edx\n\t"
-+		// save return registers
-+ 		"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"
-+		:
-+        : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
-+        : "eax", "edx" );
-+    
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch (...)
-+ 	{
-+  		// fill uno exception
-+		fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+        
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice-1.0/files/patch-bridges+source+prot_uno+makefile.mk b/editors/openoffice-1.0/files/patch-bridges+source+prot_uno+makefile.mk
deleted file mode 100644
index 595ea6cb5ac9..000000000000
--- a/editors/openoffice-1.0/files/patch-bridges+source+prot_uno+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../bridges/source/prot_uno/makefile.mk.orig	Fri Oct 26 09:22:57 2001
-+++ ../bridges/source/prot_uno/makefile.mk	Wed Mar  6 15:45:09 2002
-@@ -88,8 +88,8 @@
- SHL1VERSIONMAP=..$/bridge_exports.map
- 
- SHL1STDLIBS= \
--	$(CPPULIB)		\
--	$(SALLIB)
-+	$(SALLIB) \
-+	$(CPPULIB)
- 
- DEF1NAME=$(SHL1TARGET)
- 
diff --git a/editors/openoffice-1.0/files/patch-chaos+util+makefile.mk b/editors/openoffice-1.0/files/patch-chaos+util+makefile.mk
deleted file mode 100644
index ba211f9044c4..000000000000
--- a/editors/openoffice-1.0/files/patch-chaos+util+makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../chaos/util/makefile.mk.orig	Wed Jun 12 01:16:35 2002
-+++ ../chaos/util/makefile.mk	Wed Jun 12 01:16:47 2002
-@@ -100,7 +100,7 @@
- 
- SHL1TARGET=	cnt$(UPD)$(DLLPOSTFIX)
- SHL1IMPLIB=	i$(TARGET)
--.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
-+.IF "$(OS)"=="MACOSX"
- #SHL1VERSIONMAP=	exports.$(DLLPOSTFIX).map
- .ELSE
- SHL1VERSIONMAP=	exports.map
diff --git a/editors/openoffice-1.0/files/patch-comphelper+util+makefile.mk b/editors/openoffice-1.0/files/patch-comphelper+util+makefile.mk
deleted file mode 100644
index 997719c43dd8..000000000000
--- a/editors/openoffice-1.0/files/patch-comphelper+util+makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../comphelper/util/makefile.mk.orig	Tue Feb 19 13:26:37 2002
-+++ ../comphelper/util/makefile.mk	Wed Apr  3 00:16:43 2002
-@@ -85,11 +85,11 @@
- 
- SHL1TARGET=$(COMPHLP_TARGET)$(COMPHLP_MAJOR)
- SHL1STDLIBS=\
-+	$(SALLIB)					\
- 	$(CPPULIB)					\
- 	$(CPPUHELPERLIB)			\
- 	$(VOSLIB)					\
- 	$(OSLLIB)					\
--	$(SALLIB)					\
- 	$(CPPRTLLIB)
- 
- .IF "$(OS)$(CPU)"=="SOLARISS"
diff --git a/editors/openoffice-1.0/files/patch-config_office+configure.in b/editors/openoffice-1.0/files/patch-config_office+configure.in
deleted file mode 100644
index 94d4b1cf08dc..000000000000
--- a/editors/openoffice-1.0/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,85 +0,0 @@
---- configure.in.orig	Thu Jan 16 13:42:46 2003
-+++ configure.in	Sat Jan 25 18:24:08 2003
-@@ -89,6 +89,12 @@
-  
-                           Usage: --enable-check-only=yes
- ],,)
-+AC_ARG_ENABLE(linuxjdk,
-+[  --enable-linuxjdk         Use this option option if you like to use
-+                          the linux-jdk instead of the native jdk.
-+                          
-+                          Usage: --enable-linuxjdk
-+],,)
- AC_ARG_ENABLE(macos9,
- [  --enable-macos9         Use this option option if you want to generate a
-                           macos9 environment on macosx.
-@@ -352,10 +358,7 @@
-    if test "$COMPATH" != "NO_GCC"; then
-       AC_MSG_RESULT([checked (gcc $_gcc_version)])
-    fi
--
--dnl Set the include paths
--   _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include 
--fi  
-+fi
- 
- dnl ===================================================================
- dnl Search all the common names for GNU make
-@@ -553,14 +556,27 @@
- 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`
-+   _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
-+   _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - \
-+	| $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1`
- dnl This is the original code...
--dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include 
-+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
-@@ -1222,12 +1238,16 @@
- else
-    with_lang=","$with_lang","
- fi
--
- if test -n "$enable_debug"; then
-    ENABLE_DEBUG="TRUE"
- else
-    ENABLE_DEBUG="FALSE"
- fi
-+if test -n "$enable_linuxjdk"; then
-+   USE_LINUXJDK="TRUE"
-+else
-+   USE_LINUXJDK="FALSE"
-+fi
- 
- dnl ===================================================================
- dnl Bits to substitute into set_soenv.in
-@@ -1272,6 +1292,7 @@
- AC_SUBST(PTHREAD_CFLAGS)
- AC_SUBST(PTHREAD_LIBS)
- AC_SUBST(ENABLE_DEBUG)
-+AC_SUBST(USE_LINUXJDK)
- 
- AC_OUTPUT([set_soenv])
- 
diff --git a/editors/openoffice-1.0/files/patch-config_office+setsoenv.in b/editors/openoffice-1.0/files/patch-config_office+setsoenv.in
deleted file mode 100644
index 8f159960ab19..000000000000
--- a/editors/openoffice-1.0/files/patch-config_office+setsoenv.in
+++ /dev/null
@@ -1,44 +0,0 @@
---- set_soenv.in.orig	Thu Jan  9 14:41:31 2003
-+++ set_soenv.in	Sat Jan 25 18:27:08 2003
-@@ -52,8 +52,8 @@
- #-------------------------------------------------
- #
- # Platform independent constant values.
--my @LANGUAGES = ("ARAB", "CHINSIM", "CHINTRAD", "DAN", "DTCH", "ENUS", "FREN", "GREEK", "ITAL",
--"JAPN", "KOREAN", "POL", "PORT", "RUSS", "SPAN", "SWED", "TURK" ); 
-+my @LANGUAGES = ("ARAB", "CHINSIM", "CHINTRAD", "DAN", "DTCH", "ENUS", "FREN", "GREEK", "GER",
-+"ITAL", "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, 
-      $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, 
-@@ -88,7 +88,7 @@
-      $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
-      $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME,
-      $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
--     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG );
-+     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $USE_LINUXJDK);
- #
- #-------------------------------------------
- # IId. Declaring the aliases.
-@@ -141,6 +141,7 @@
- $CXX		= '@CXX@';          # C++ compiler
- $EXCEPTIONS	= '@EXCEPTIONS@';   # Exception handling type
- $ENABLE_DEBUG	= '@ENABLE_DEBUG@';  # Enable a debug build
-+$USE_LINUXJDK	= '@USE_LINUXJDK@';  # Enable a debug build
- $WRAPCMD	= "";				# Wrapper (only for winnt)
- 
- #
-@@ -1265,7 +1266,12 @@
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
- }
- elsif ($platform eq "$FreeBSD")
--{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+{
-+   if ($USE_LINUXJDK eq "TRUE") {
-+   	$SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
-+   } else {
-+   	$SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+   }
- }
- elsif ($platform eq "$NetBSD")
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+adabas+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+adabas+makefile.mk
deleted file mode 100644
index fdab3ab41e7d..000000000000
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+adabas+makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../connectivity/source/drivers/adabas/makefile.mk.orig	Wed Jun 12 01:06:20 2002
-+++ ../connectivity/source/drivers/adabas/makefile.mk	Wed Jun 12 01:06:34 2002
-@@ -104,7 +104,7 @@
- 		$(SLO)$/BResultSetMetaData.obj			\
-         $(SLO)$/BResultSet.obj
- 		
--.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
-+.IF "$(OS)"=="MACOSX"
- #SHL1VERSIONMAP=$(ADABAS_TARGET).$(DLLPOSTFIX).map
- .ELSE      
- SHL1VERSIONMAP=$(ADABAS_TARGET).map
diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+calc+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+calc+makefile.mk
deleted file mode 100644
index 043038a77f4b..000000000000
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+calc+makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../connectivity/source/drivers/calc/makefile.mk.orig	Wed Jun 12 01:36:16 2002
-+++ ../connectivity/source/drivers/calc/makefile.mk	Wed Jun 12 01:36:22 2002
-@@ -92,9 +92,7 @@
- 	$(SLO)$/CDriver.obj
- 
- .IF "$(OS)"!="MACOSX"
--.IF "$(OS)"!="FREEBSD"
- SHL1VERSIONMAP= $(TARGET).map
--.ENDIF
- .ENDIF
- # --- Library -----------------------------------
- 
diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+dbase+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+dbase+makefile.mk
deleted file mode 100644
index 029f04a655c7..000000000000
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+dbase+makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../connectivity/source/drivers/dbase/makefile.mk.orig	Wed Jun 12 01:26:39 2002
-+++ ../connectivity/source/drivers/dbase/makefile.mk	Wed Jun 12 01:26:48 2002
-@@ -116,7 +116,7 @@
- 	$(SLO)$/DDriver.obj
- 
- 
--.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD"
-+.IF "$(OS)"=="MACOSX"
- #SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map
- .ELSE      
- SHL1VERSIONMAP=$(TARGET).map
diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+file+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+file+makefile.mk
deleted file mode 100644
index 8776a49f52f1..000000000000
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+file+makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../connectivity/source/drivers/file/makefile.mk.orig	Wed Jun 12 01:12:42 2002
-+++ ../connectivity/source/drivers/file/makefile.mk	Wed Jun 12 01:12:44 2002
-@@ -112,7 +112,7 @@
- 	$(SLO)$/fanalyzer.obj			\
- 	$(SLO)$/fcomp.obj
- 
--.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD"
-+.IF "$(OS)"=="MACOSX"
- #SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map
- .ELSE      
- #SHL1VERSIONMAP=$(TARGET).map
diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+flat+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+flat+makefile.mk
deleted file mode 100644
index d6af428b7794..000000000000
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+flat+makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../connectivity/source/drivers/flat/makefile.mk.orig	Wed Jun 12 01:14:43 2002
-+++ ../connectivity/source/drivers/flat/makefile.mk	Wed Jun 12 01:15:03 2002
-@@ -104,7 +104,7 @@
- 	$(SLO)$/EDriver.obj
- 
- 
--.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD"
-+.IF "$(OS)"=="MACOSX"
- #SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map
- .ELSE      
- SHL1VERSIONMAP=$(TARGET).map
diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+jdbc+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+jdbc+makefile.mk
deleted file mode 100644
index 1801ae3083c4..000000000000
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+jdbc+makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../connectivity/source/drivers/jdbc/makefile.mk.orig	Wed Jun 12 00:57:12 2002
-+++ ../connectivity/source/drivers/jdbc/makefile.mk	Wed Jun 12 00:57:21 2002
-@@ -111,7 +111,7 @@
- 		$(SLO)$/tools.obj
- 		
- 
--.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD"
-+.IF "$(OS)"=="MACOSX"
- #SHL1VERSIONMAP=$(JDBC_TARGET).$(DLLPOSTFIX).map
- .ELSE      
- SHL1VERSIONMAP=$(JDBC_TARGET).map
diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+makefile.mk
deleted file mode 100644
index f422040f99d4..000000000000
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../connectivity/source/drivers/mozab/makefile.mk.orig	Wed Jun 12 01:37:30 2002
-+++ ../connectivity/source/drivers/mozab/makefile.mk	Wed Jun 12 01:37:47 2002
-@@ -107,9 +107,7 @@
- # --- MOZAB BASE Library -----------------------------------
- 
- SHL1VERSIONMAP= $(TARGET).map
--.IF "$(OS)"!="FREEBSD"
- SHL1TARGET=	$(TARGET)$(MOZAB_MAJOR)
--.ENDIF
- SHL1OBJS=$(SLOFILES)
- SHL1STDLIBS=\
- 	$(CPPULIB)					\
diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
deleted file mode 100644
index 3601766ee561..000000000000
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../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
-@@ -64,8 +64,8 @@
- #mozilla specific stuff.
- MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
- MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
--#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
--#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
-+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
-+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
- #End of mozilla specific stuff.
- 
- PRJ=..$/..$/..$/..
-@@ -107,7 +107,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -123,7 +123,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -141,7 +141,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS+=	    -DMOZILLA_CLIENT \
-             -DOSTYPE=\"Linux2.2.14-5\" -DOJI
- .IF "$(OS)" == "LINUX"
-@@ -157,6 +157,13 @@
-             -fno-rtti -Wall -Wconversion -Wpointer-arith \
-             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-             -Wno-long-long 
-+CDEFS     += -DTRACING
-+.ELIF "$(OS)" == "FREEBSD"
-+CFLAGS +=   -fPIC
-+CFLAGSCXX += \
-+            -fno-rtti -Wall -Wconversion -Wpointer-arith \
-+            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-+            -Wno-long-long -pthread 
- CDEFS     += -DTRACING
- .ENDIF
- .ENDIF
diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
deleted file mode 100644
index b63d2a25f184..000000000000
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-1.0/files/patch-cppu+inc+cppu+macros.hxx b/editors/openoffice-1.0/files/patch-cppu+inc+cppu+macros.hxx
deleted file mode 100644
index dad8a1f99a5c..000000000000
--- a/editors/openoffice-1.0/files/patch-cppu+inc+cppu+macros.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../cppu/inc/cppu/macros.hxx.kan	Wed Jul 24 23:28:55 2002
-+++ ../cppu/inc/cppu/macros.hxx	Wed Jul 24 23:29:45 2002
-@@ -76,7 +76,7 @@
-     the struct inherits from a base struct the first member is no double or [unsigned] long long.
-     @internal
- */
--#if defined(__GNUC__) && defined(LINUX) && (defined(INTEL) || defined(POWERPC)) && (__GNUC__ == 3)
-+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && (defined(INTEL) || defined(POWERPC)) && (__GNUC__ == 3)
- #define CPPU_GCC3_ALIGN( base_struct ) __attribute__ ((aligned (__alignof__ (base_struct))))
- #else
- #define CPPU_GCC3_ALIGN( base_struct )
diff --git a/editors/openoffice-1.0/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice-1.0/files/patch-cppu+inc+uno+lbnames.h
deleted file mode 100644
index cb43c2d165e9..000000000000
--- a/editors/openoffice-1.0/files/patch-cppu+inc+uno+lbnames.h
+++ /dev/null
@@ -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."
diff --git a/editors/openoffice-1.0/files/patch-cppu+prj+build.lst b/editors/openoffice-1.0/files/patch-cppu+prj+build.lst
deleted file mode 100644
index 78fd210a1193..000000000000
--- a/editors/openoffice-1.0/files/patch-cppu+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.0/files/patch-cppu+source+uno+data.cxx b/editors/openoffice-1.0/files/patch-cppu+source+uno+data.cxx
deleted file mode 100644
index 9c0e34bfb60b..000000000000
--- a/editors/openoffice-1.0/files/patch-cppu+source+uno+data.cxx
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../cppu/source/uno/data.cxx.kan	Wed Jul 24 23:39:23 2002
-+++ ../cppu/source/uno/data.cxx	Wed Jul 24 23:38:49 2002
-@@ -295,7 +295,7 @@
- #	pragma pack(8)
- #endif
- 
--#if defined(__GNUC__) && defined(LINUX) && defined(INTEL)
-+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && defined(INTEL)
- #define MAX_ALIGNMENT_4
- #endif
- 
-@@ -307,7 +307,7 @@
-     if (OFFSET_OF(s, m) != n) { fprintf( stderr, "### OFFSET_OF(" #s ", "  #m ") = %d instead of expected %d!!!\n", OFFSET_OF(s, m), n ); abort(); }
- 
- #ifdef DEBUG
--#if defined(__GNUC__) && defined(LINUX) && (defined(INTEL) || defined(POWERPC))
-+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && (defined(INTEL) || defined(POWERPC))
- #define BINTEST_VERIFYSIZE( s, n ) \
-     fprintf( stderr, "> sizeof(" #s ") = %d; __alignof__ (" #s ") = %d\n", sizeof(s), __alignof__ (s) ); \
-     if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of expected %d!!!\n", sizeof(s), n ); abort(); }
diff --git a/editors/openoffice-1.0/files/patch-cppu+test+alignment+diagnose.h b/editors/openoffice-1.0/files/patch-cppu+test+alignment+diagnose.h
deleted file mode 100644
index 2a6650400a1e..000000000000
--- a/editors/openoffice-1.0/files/patch-cppu+test+alignment+diagnose.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../cppu/test/alignment/diagnose.h.orig	Sat Jul 20 23:54:59 2002
-+++ ../cppu/test/alignment/diagnose.h	Sat Jul 20 23:55:06 2002
-@@ -64,7 +64,7 @@
- #include <sal/types.h>
- #include <stdio.h>
- 
--#if defined(__GNUC__) && defined(LINUX) && defined(INTEL)
-+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && defined(INTEL)
- #define __ALIGNMENT__(s, n) __alignof__ (s)
- #else
- #define __ALIGNMENT__(s, n) n
diff --git a/editors/openoffice-1.0/files/patch-cppu+util+makefile.mk b/editors/openoffice-1.0/files/patch-cppu+util+makefile.mk
deleted file mode 100644
index 875a5fb6deeb..000000000000
--- a/editors/openoffice-1.0/files/patch-cppu+util+makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../cppu/util/makefile.mk.orig	Wed Jun 12 01:39:28 2002
-+++ ../cppu/util/makefile.mk	Wed Jun 12 01:39:32 2002
-@@ -87,9 +87,7 @@
- 
- SHL1DEPN=
- SHL1IMPLIB=i$(TARGET)
--.IF "$(OS)"!="FREEBSD"
- SHL1DEF=$(MISC)$/$(SHL1TARGET).def
--.ENDIF
- 
- SHL1VERSIONMAP=$(TARGET).map
- 
diff --git a/editors/openoffice-1.0/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice-1.0/files/patch-cppuhelper+source+makefile.mk
deleted file mode 100644
index 62e971de324a..000000000000
--- a/editors/openoffice-1.0/files/patch-cppuhelper+source+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
---- ../cppuhelper/source/makefile.mk.orig	Mon Mar 11 22:17:52 2002
-+++ ../cppuhelper/source/makefile.mk	Wed Apr  3 00:31:19 2002
-@@ -149,8 +149,8 @@
- SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID)
- 
- SHL1STDLIBS= \
--		$(CPPULIB)		\
--		$(SALLIB)
-+		$(SALLIB)		\
-+		$(CPPULIB)
- 
- SHL1DEPN=
- SHL1IMPLIB=i$(TARGET)
-@@ -175,6 +175,10 @@
- #SHL1VERSIONMAP=gcc2_freebsd_intel.map
- .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
- SHL1VERSIONMAP=gcc3_linux_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
-+#SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
-+#SHL1VERSIONMAP=gcc3_freebsd_intel.map
- .ENDIF
- 
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-1.0/files/patch-cpputools+source+registercomponent+makefile.mk b/editors/openoffice-1.0/files/patch-cpputools+source+registercomponent+makefile.mk
deleted file mode 100644
index 8134445349f1..000000000000
--- a/editors/openoffice-1.0/files/patch-cpputools+source+registercomponent+makefile.mk
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../cpputools/source/registercomponent/makefile.mk.orig	Mon Apr 22 22:46:11 2002
-+++ ../cpputools/source/registercomponent/makefile.mk	Mon Apr 22 22:46:44 2002
-@@ -104,6 +104,7 @@
- 
- APP1STDLIBS=\
- 			$(SALLIB) \
-+			$(TOOLSLIB) \
- 			$(CPPULIB)	\
- 			$(CPPUHELPERLIB)
- 
diff --git a/editors/openoffice-1.0/files/patch-desktop+source+pkgchk_packages.cxx b/editors/openoffice-1.0/files/patch-desktop+source+pkgchk_packages.cxx
deleted file mode 100644
index 7b01e4f554b5..000000000000
--- a/editors/openoffice-1.0/files/patch-desktop+source+pkgchk_packages.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../desktop/source/pkgchk/pkgchk_packages.cxx.orig	Sun Jan 19 20:00:08 2003
-+++ ../desktop/source/pkgchk/pkgchk_packages.cxx	Sun Jan 19 20:01:51 2003
-@@ -124,6 +124,10 @@
- static char const s_platform_path [] = "/macosx_powerpc.plt";
- #elif defined (NETBSD) && defined (SPARC)
- static char const s_platform_path [] = "/netbsd_sparc.plt";
-+#elif defined (FREEBSD) && defined (INTEL)
-+static char const s_platform_path [] = "/freebsd_x86.plt";
-+#elif defined (FREEBSD) && defined (SPARC)
-+static char const s_platform_path [] = "/freebsd_sparc.plt";
- #else
- #error "unkonwn platform"
- insert your platform identifier above; inserted for the case the preprocessor ignores error
diff --git a/editors/openoffice-1.0/files/patch-desktop+util+makefile.mk b/editors/openoffice-1.0/files/patch-desktop+util+makefile.mk
deleted file mode 100644
index 8ceb57682cc7..000000000000
--- a/editors/openoffice-1.0/files/patch-desktop+util+makefile.mk
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../desktop/util/makefile.mk.orig	Sun Jul 21 00:04:35 2002
-+++ ../desktop/util/makefile.mk	Sun Jul 21 00:04:38 2002
-@@ -81,7 +81,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=
-@@ -111,7 +111,7 @@
- 	$(SALHELPERLIB)
- 
- .IF "$(GUI)" == "UNX"
--.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- 
- APP1STDLIBS+= -lXext -lSM -lICE
- 
diff --git a/editors/openoffice-1.0/files/patch-dmake+unix+linux+gnu+make.sh b/editors/openoffice-1.0/files/patch-dmake+unix+linux+gnu+make.sh
deleted file mode 100644
index d60afa8e32e8..000000000000
--- a/editors/openoffice-1.0/files/patch-dmake+unix+linux+gnu+make.sh
+++ /dev/null
@@ -1,244 +0,0 @@
---- ../dmake/unix/linux/gnu/make.sh.orig	Wed Mar 13 20:32:53 2002
-+++ ../dmake/unix/linux/gnu/make.sh	Wed Mar 13 20:33:00 2002
-@@ -3,188 +3,188 @@
- mkdir objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c
- fi
- mv infer.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c
- fi
- mv make.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c
- fi
- mv stat.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c
- fi
- mv expand.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c
- fi
- mv dmstring.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c
- fi
- mv hash.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c
- fi
- mv dag.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c
- fi
- mv dmake.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c
- fi
- mv path.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c
- fi
- mv imacs.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c
- fi
- mv sysintf.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c
- fi
- mv parse.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c
- fi
- mv getinp.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c
- fi
- mv quit.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c
- fi
- mv state.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c
- fi
- mv dmdump.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c
- fi
- mv macparse.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c
- fi
- mv rulparse.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c
- fi
- mv percent.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c
- fi
- mv function.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c
- fi
- mv arlib.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c
- fi
- mv dirbrk.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c
- fi
- mv rmprq.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c
- fi
- mv ruletab.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c
- fi
- mv runargv.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c
- fi
- mv dcache.o objects
- 
--gcc -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
-+${CC} ${CFLAGS} -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
- objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \
- objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \
- objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \
diff --git a/editors/openoffice-1.0/files/patch-dtrans+source+X11+X11_selection.cxx b/editors/openoffice-1.0/files/patch-dtrans+source+X11+X11_selection.cxx
deleted file mode 100644
index e3159c23c1a3..000000000000
--- a/editors/openoffice-1.0/files/patch-dtrans+source+X11+X11_selection.cxx
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../dtrans/source/X11/X11_selection.cxx.orig	Sat Jul 20 23:18:03 2002
-+++ ../dtrans/source/X11/X11_selection.cxx	Sat Jul 20 23:18:05 2002
-@@ -65,7 +65,7 @@
- #include <X11/keysym.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
--#if defined(LINUX) || defined(NETBSD)
-+#if defined(LINUX) || defined(NETBSD) || defined (FREEBSD)
- #include <sys/poll.h>
- #else
- #include <poll.h>
-@@ -175,6 +175,7 @@
- 	{ 0, "text/plain;charset=ksc5601.1992-0", "KSC5601.1992-0", 8 },
- 	// eastern european encodings
- 	{ 0, "text/plain;charset=koi8-r", "KOI8-R", 8 },
-+	{ 0, "text/plain;charset=koi8-u", "KOI8-U", 8 },
- 	// String (== iso8859-1)
- 	{ XA_STRING, "text/plain;charset=string", "STRING", 8 },
-     // special for compound text
diff --git a/editors/openoffice-1.0/files/patch-dtrans+source+X11+makefile.mk b/editors/openoffice-1.0/files/patch-dtrans+source+X11+makefile.mk
deleted file mode 100644
index 5881f5d7f6a5..000000000000
--- a/editors/openoffice-1.0/files/patch-dtrans+source+X11+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice-1.0/files/patch-eventattacher+source+makefile.mk b/editors/openoffice-1.0/files/patch-eventattacher+source+makefile.mk
deleted file mode 100644
index b09408500c2d..000000000000
--- a/editors/openoffice-1.0/files/patch-eventattacher+source+makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../eventattacher/source/makefile.mk.orig	Tue Jan  1 14:09:28 2002
-+++ ../eventattacher/source/makefile.mk
-@@ -110,10 +110,10 @@
- SHL1TARGET=	$(TARGET)
- 
- SHL1STDLIBS= \
-+		$(SALLIB)					\
- 		$(CPPULIB)					\
- 		$(CPPUHELPERLIB)				\
--		$(VOSLIB)					\
--		$(SALLIB)
-+		$(VOSLIB)					
- 
- SHL1DEPN=
- SHL1IMPLIB=	i$(TARGET)
diff --git a/editors/openoffice-1.0/files/patch-external+dt+dtpatch.sh b/editors/openoffice-1.0/files/patch-external+dt+dtpatch.sh
deleted file mode 100644
index e5122bcb45c1..000000000000
--- a/editors/openoffice-1.0/files/patch-external+dt+dtpatch.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../external/dt/dtpatch.sh.orig	Wed Mar 13 17:09:43 2002
-+++ ../external/dt/dtpatch.sh	Wed Mar 13 17:09:47 2002
-@@ -96,7 +96,7 @@
-     done
- 
-     chmod -R +w rtufiles/*.h
--    patch -i pat/editor.h.pat rtufiles/editor.h 2> newpatch
-+    patch < pat/editor.h.pat rtufiles/editor.h 2> newpatch
- 
-     if test -s "patcherror"; then
-        echo "Please install the SUNWdtinc Version 1.2 package on your Solaris machine" >> patcherror
diff --git a/editors/openoffice-1.0/files/patch-external+expat+expatpatch.sh b/editors/openoffice-1.0/files/patch-external+expat+expatpatch.sh
deleted file mode 100644
index ce07edcfffd8..000000000000
--- a/editors/openoffice-1.0/files/patch-external+expat+expatpatch.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../external/expat/expatpatch.sh.orig	Wed Mar 13 16:59:16 2002
-+++ ../external/expat/expatpatch.sh	Wed Mar 13 17:00:18 2002
-@@ -87,7 +87,7 @@
- 
-   for PNAME in `cat flist.pat`
-   do
--     patch -i pat/$PNAME.pat rtufiles/$PNAME
-+     patch < pat/$PNAME.pat rtufiles/$PNAME
-   done
- 
-   for SDNAME in `cat flist.sd`
diff --git a/editors/openoffice-1.0/files/patch-external+glibc+glibcpatch b/editors/openoffice-1.0/files/patch-external+glibc+glibcpatch
deleted file mode 100644
index 07e2f5373ee8..000000000000
--- a/editors/openoffice-1.0/files/patch-external+glibc+glibcpatch
+++ /dev/null
@@ -1,35 +0,0 @@
---- /dev/null	Sun Jun  2 16:11:00 2002
-+++ ../external/glibc/flist.pat	Sun Jun  2 12:00:09 2002
-@@ -0,0 +1 @@
-+patch-getopt.h
---- /dev/null	Sun Jun  2 16:11:00 2002
-+++ ../external/glibc/patch-getopt.h	Sun Jun  2 16:14:52 2002
-@@ -0,0 +1,14 @@
-+--- rtufiles/getopt.h.orig	Fri May 31 16:46:21 2002
-++++ rtufiles/getopt.h	Fri May 31 17:07:19 2002
-+@@ -133,7 +133,11 @@
-+    errors, only prototype getopt for the GNU C library.  */
-+ extern int getopt (int __argc, char *const *__argv, const char *__shortopts);
-+ # else /* not __GNU_LIBRARY__ */
-++#if (__GNUC__ == 3 && defined(FREEBSD))
-++/* skip getopt() definition , it conflicts with std.h */
-++#else
-+ extern int getopt ();
-++# endif /* FREEBSD */
-+ # endif /* __GNU_LIBRARY__ */
-+ 
-+ # ifndef __need_getopt
---- ../external/glibc/glibcpatch.sh.orig	Sun Jun  2 11:46:42 2002
-+++ ../external/glibc/glibcpatch.sh	Sun Jun  2 16:13:51 2002
-@@ -113,7 +113,10 @@
- # apply the patches
- #
- 
--# there is no need to apply patch here
-+for PNAME in `cat flist.pat`
-+  do
-+      patch < $PNAME
-+  done
- 
- 
- #
diff --git a/editors/openoffice-1.0/files/patch-external+jpeg+jpegpatch.sh b/editors/openoffice-1.0/files/patch-external+jpeg+jpegpatch.sh
deleted file mode 100644
index 4fb55f5d70d0..000000000000
--- a/editors/openoffice-1.0/files/patch-external+jpeg+jpegpatch.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../external/jpeg/jpegpatch.sh.orig	Wed Mar 13 17:04:35 2002
-+++ ../external/jpeg/jpegpatch.sh	Wed Mar 13 17:08:02 2002
-@@ -112,7 +112,7 @@
- 
-   for PNAME in `cat flist.pat`
-   do
--      patch -i pat/$PNAME.pat $PNAME
-+      patch < pat/$PNAME.pat $PNAME
-   done
- 
-   cp -rf jpeg-6b/* rtufiles/
diff --git a/editors/openoffice-1.0/files/patch-external+neon+md5.c.pat b/editors/openoffice-1.0/files/patch-external+neon+md5.c.pat
deleted file mode 100644
index 46c5e062128e..000000000000
--- a/editors/openoffice-1.0/files/patch-external+neon+md5.c.pat
+++ /dev/null
@@ -1,112 +0,0 @@
---- /dev/null	Thu Aug  8 22:39:51 2002
-+++ ../external/neon/md5.c.pat	Thu Aug  8 22:35:33 2002
-@@ -0,0 +1,109 @@
-+*** ..\download\neon-0.14.0\src\md5.c	Sun Apr 29 13:23:08 2001
-+--- sub\md5.c	Tue May 08 12:52:02 2001
-+***************
-+*** 278,290 ****
-+       const void *buffer;
-+       size_t len;
-+       struct md5_ctx *ctx;
-+  {
-+    md5_uint32 correct_words[16];
-+!   const md5_uint32 *words = buffer;
-+!   size_t nwords = len / sizeof (md5_uint32);
-+!   const md5_uint32 *endp = words + nwords;
-+    md5_uint32 A = ctx->A;
-+    md5_uint32 B = ctx->B;
-+    md5_uint32 C = ctx->C;
-+    md5_uint32 D = ctx->D;
-+  
-+--- 278,289 ----
-+       const void *buffer;
-+       size_t len;
-+       struct md5_ctx *ctx;
-+  {
-+    md5_uint32 correct_words[16];
-+!   const unsigned char *words = buffer;
-+!   const unsigned char *endp = words + len;
-+    md5_uint32 A = ctx->A;
-+    md5_uint32 B = ctx->B;
-+    md5_uint32 C = ctx->C;
-+    md5_uint32 D = ctx->D;
-+  
-+***************
-+*** 313,324 ****
-+  	 we store the swapped words in the array CORRECT_WORDS.  */
-+  
-+  #define OP(a, b, c, d, s, T)						\
-+        do								\
-+          {								\
-+! 	  a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T;		\
-+! 	  ++words;							\
-+  	  CYCLIC (a, s);						\
-+  	  a += b;							\
-+          }								\
-+        while (0)
-+  
-+--- 312,325 ----
-+  	 we store the swapped words in the array CORRECT_WORDS.  */
-+  
-+  #define OP(a, b, c, d, s, T)						\
-+        do								\
-+          {								\
-+!       md5_uint32 WORD_ = words[0] | (words[1] << 8) \
-+! 	                   | (words[2] << 16) | (words[3] << 24); \
-+! 	  a += FF (b, c, d) + (*cwp++ = WORD_) + T;		\
-+! 	  words += 4;							\
-+  	  CYCLIC (a, s);						\
-+  	  a += b;							\
-+          }								\
-+        while (0)
-+  
-+***************
-+*** 431,441 ****
-+    ctx->D = D;
-+  }
-+  
-+  /* Writes the ASCII representation of the MD5 digest into the
-+   * given buffer, which must be at least 33 characters long. */
-+! void ne_md5_to_ascii(const unsigned char md5_buf[16], char *buffer) 
-+  {
-+      int count;
-+      for (count = 0; count<16; count++) {
-+  	buffer[count*2] = HEX2ASC(md5_buf[count] >> 4);
-+  	buffer[count*2+1] = HEX2ASC(md5_buf[count] & 0x0f);
-+--- 432,442 ----
-+    ctx->D = D;
-+  }
-+  
-+  /* Writes the ASCII representation of the MD5 digest into the
-+   * given buffer, which must be at least 33 characters long. */
-+! void ne_md5_to_ascii(const unsigned char md5_buf[16], char *buffer)
-+  {
-+      int count;
-+      for (count = 0; count<16; count++) {
-+  	buffer[count*2] = HEX2ASC(md5_buf[count] >> 4);
-+  	buffer[count*2+1] = HEX2ASC(md5_buf[count] & 0x0f);
-+***************
-+*** 443,453 ****
-+      buffer[32] = '\0';
-+  }
-+  
-+  /* Reads the ASCII representation of an MD5 digest. The buffer must
-+   * be at least 32 characters long. */
-+! void ne_ascii_to_md5(const char *buffer, unsigned char md5_buf[16]) 
-+  {
-+      int count;
-+      for (count = 0; count<16; count++) {
-+  	md5_buf[count] = ((ASC2HEX(buffer[count*2])) << 4) |
-+  	    ASC2HEX(buffer[count*2+1]);
-+--- 444,454 ----
-+      buffer[32] = '\0';
-+  }
-+  
-+  /* Reads the ASCII representation of an MD5 digest. The buffer must
-+   * be at least 32 characters long. */
-+! void ne_ascii_to_md5(const char *buffer, unsigned char md5_buf[16])
-+  {
-+      int count;
-+      for (count = 0; count<16; count++) {
-+  	md5_buf[count] = ((ASC2HEX(buffer[count*2])) << 4) |
-+  	    ASC2HEX(buffer[count*2+1]);
diff --git a/editors/openoffice-1.0/files/patch-external+neon+neonpatch.sh b/editors/openoffice-1.0/files/patch-external+neon+neonpatch.sh
deleted file mode 100644
index 1ccc1adf27f9..000000000000
--- a/editors/openoffice-1.0/files/patch-external+neon+neonpatch.sh
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../external/neon/neonpatch.sh.orig	Tue May 29 17:40:10 2001
-+++ ../external/neon/neonpatch.sh	Thu Aug  8 22:43:04 2002
-@@ -119,10 +119,7 @@
- # apply the patches
- #
- 
--  for PNAME in `cat flist.pat`
--  do
--      patch -i pat/$PNAME.pat rtufiles/$PNAME
--  done
-+  patch < md5.c.pat rtufiles/md5.c
- 
- #
- # copy the SD files into rtufiles directory
diff --git a/editors/openoffice-1.0/files/patch-external+npsdk+npsdkpatch.sh b/editors/openoffice-1.0/files/patch-external+npsdk+npsdkpatch.sh
deleted file mode 100644
index 49a3056831dd..000000000000
--- a/editors/openoffice-1.0/files/patch-external+npsdk+npsdkpatch.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../external/npsdk/npsdkpatch.sh.orig	Wed Mar 13 16:49:19 2002
-+++ ../external/npsdk/npsdkpatch.sh	Wed Mar 13 16:49:39 2002
-@@ -121,7 +121,7 @@
- 
-   for PNAME in `cat flist.pat`
-   do
--    patch -i pat/$PNAME.pat rtufiles/$PNAME
-+    patch < pat/$PNAME.pat rtufiles/$PNAME
-   done
- 
- #
diff --git a/editors/openoffice-1.0/files/patch-freetype+makefile.mk b/editors/openoffice-1.0/files/patch-freetype+makefile.mk
deleted file mode 100644
index 802c6b4d1a8b..000000000000
--- a/editors/openoffice-1.0/files/patch-freetype+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
---- ../freetype/makefile.mk.orig	Fri Aug 16 17:28:36 2002
-+++ ../freetype/makefile.mk	Sat Jan 18 13:39:03 2003
-@@ -86,7 +86,11 @@
- .IF "$(GUI)"=="UNX"
- #relative to CONFIGURE_DIR
- CONFIGURE_ACTION=$(GNUMAKE)
--CONFIGURE_FLAGS=setup
-+.IF "$(debug)"==""
-+CONFIGURE_FLAGS=setup CFLAGS="-O"
-+.ELSE                 # "$(debug)"==""
-+CONFIGURE_FLAGS=setup CFLAGS="-O -g -ggdb"
-+.ENDIF
- 
- BUILD_DIR=$(CONFIGURE_DIR)
- BUILD_ACTION=$(GNUMAKE)
-@@ -95,6 +99,8 @@
- 	objs$/.libs$/libfreetype.a
- .IF "$(OS)"=="MACOSX"
- OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
-+.ELIF "$(OS)"=="FREEBSD"
-+OUT2LIB+=objs$/.libs$/libfreetype.so.7*
- .ELSE
- OUT2LIB+=objs$/.libs$/libfreetype.so.6*
- .ENDIF          # "$(OS)"=="MACOSX"
diff --git a/editors/openoffice-1.0/files/patch-i18n+inc+collator.hxx b/editors/openoffice-1.0/files/patch-i18n+inc+collator.hxx
deleted file mode 100644
index 796b7bbf4567..000000000000
--- a/editors/openoffice-1.0/files/patch-i18n+inc+collator.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../i18n/inc/collator.hxx.orig	Sat Apr  6 12:19:32 2002
-+++ ../i18n/inc/collator.hxx	Wed May  1 22:31:57 2002
-@@ -78,7 +78,7 @@
- #include <com/sun/star/lang/XServiceInfo.hpp>
- #endif
- 
--#if !(defined WIN32 || defined MACOSX || defined NETBSD)
-+#if !(defined WIN32 || defined MACOSX || defined NETBSD || defined FREEBSD)
- #include <alloca.h>
- #endif
- #include <tools/string.hxx>
diff --git a/editors/openoffice-1.0/files/patch-i18npool+source+localedata+localedata.cxx b/editors/openoffice-1.0/files/patch-i18npool+source+localedata+localedata.cxx
deleted file mode 100644
index dc4af11250f4..000000000000
--- a/editors/openoffice-1.0/files/patch-i18npool+source+localedata+localedata.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../i18npool/source/localedata/localedata.cxx.orig	Mon Feb 24 17:47:22 2003
-+++ ../i18npool/source/localedata/localedata.cxx	Tue Feb 25 16:41:58 2003
-@@ -150,6 +150,7 @@
- 	{ "pt_BR",  lcl_ASCII },
- 	{ "pt_PT",  lcl_ASCII },
- 	{ "ru_RU",  lcl_ASCII },
-+	{ "uk_UA",  lcl_ASCII },
- 	{ "sv_FI",  lcl_ASCII },
- 	{ "tr_TR",  lcl_ASCII },
- 	{ "th_TH",  lcl_ASCII },    // PlaDao convenience entry
diff --git a/editors/openoffice-1.0/files/patch-i18npool+source+localedata_ascii+makefile.mk b/editors/openoffice-1.0/files/patch-i18npool+source+localedata_ascii+makefile.mk
deleted file mode 100644
index 47957effbdbf..000000000000
--- a/editors/openoffice-1.0/files/patch-i18npool+source+localedata_ascii+makefile.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../i18npool/source/localedata_ascii/makefile.mk.orig	Sun Nov 17 23:27:32 2002
-+++ ../i18npool/source/localedata_ascii/makefile.mk	Tue Feb 25 16:43:21 2003
-@@ -138,6 +138,7 @@
- 	$(MISC)$/localedata_pt_BR.cxx	\
- 	$(MISC)$/localedata_pt_PT.cxx	\
- 	$(MISC)$/localedata_ru_RU.cxx	\
-+	$(MISC)$/localedata_uk_UA.cxx	\
- 	$(MISC)$/localedata_sv_FI.cxx	\
- 	$(MISC)$/localedata_tr_TR.cxx	\
- 	$(MISC)$/localedata_nb_NO.cxx	\
-@@ -208,6 +209,7 @@
- 	$(SLO)$/localedata_pt_BR.obj	\
- 	$(SLO)$/localedata_pt_PT.obj	\
- 	$(SLO)$/localedata_ru_RU.obj	\
-+	$(SLO)$/localedata_uk_UA.obj	\
- 	$(SLO)$/localedata_sv_FI.obj	\
- 	$(SLO)$/localedata_tr_TR.obj	\
- 	$(SLO)$/localedata_nb_NO.obj	\
diff --git a/editors/openoffice-1.0/files/patch-i18npool+source+localedata_ascii+uk_UA.xml b/editors/openoffice-1.0/files/patch-i18npool+source+localedata_ascii+uk_UA.xml
deleted file mode 100644
index 68325b32eff0..000000000000
--- a/editors/openoffice-1.0/files/patch-i18npool+source+localedata_ascii+uk_UA.xml
+++ /dev/null
@@ -1,454 +0,0 @@
---- ../i18npool/source/localedata_ascii/uk_UA.xml.orig	Thu Jan  1 00:00:00 1970
-+++ ../i18npool/source/localedata_ascii/uk_UA.xml	Fri Feb 28 13:04:01 2003
-@@ -0,0 +1,451 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE Locale SYSTEM 'locale.dtd'>
-+<Locale version="1.2">
-+<LC_INFO>
-+<Language>
-+<LangID>uk</LangID>
-+<DefaultName>Ukrainian</DefaultName>
-+</Language>
-+<Country>
-+<CountryID>UA</CountryID>
-+<DefaultName>Ukraine</DefaultName>
-+</Country>
-+<Platform>
-+<PlatformID>generic</PlatformID>
-+</Platform>
-+<Varient></Varient>
-+</LC_INFO>
-+<LC_CTYPE unoid="generic">
-+<Separators>
-+<DateSeparator>.</DateSeparator>
-+<ThousandSeparator> </ThousandSeparator>
-+<DecimalSeparator>,</DecimalSeparator>
-+<TimeSeparator>:</TimeSeparator>
-+<Time100SecSeparator>,</Time100SecSeparator>
-+<ListSeparator>;</ListSeparator>
-+<LongDateDayOfWeekSeparator></LongDateDayOfWeekSeparator>
-+<LongDateDaySeparator> </LongDateDaySeparator>
-+<LongDateMonthSeparator> </LongDateMonthSeparator>
-+<LongDateYearSeparator> р.</LongDateYearSeparator>
-+</Separators>
-+<Markers>
-+<QuotationStart>‘</QuotationStart>
-+<QuotationEnd>’</QuotationEnd>
-+<DoubleQuotationStart>“</DoubleQuotationStart>
-+<DoubleQuotationEnd>�</DoubleQuotationEnd>
-+</Markers>
-+<TimeAM>AM</TimeAM>
-+<TimePM>PM</TimePM>
-+<MeasurementSystem>Metric</MeasurementSystem>
-+</LC_CTYPE>
-+<LC_FORMAT>
-+<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
-+<FormatCode>M/D/YY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28">
-+<FormatCode>NN DD/MMM YY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34">
-+<FormatCode>MM/YY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35">
-+<FormatCode>MMM DD</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36">
-+<FormatCode>MMMM</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37">
-+<FormatCode>QQ YY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21">
-+<FormatCode>MM/DD/YYYY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20">
-+<FormatCode>MM/DD/YY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19">
-+<FormatCode>NNNNMMMM DD, YYYY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22">
-+<FormatCode>MMM D, YY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23">
-+<FormatCode>MMM D, YYYY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25">
-+<FormatCode>MMMM D, YYYY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27">
-+<FormatCode>NN, MMM D, YY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29">
-+<FormatCode>NN, MMMM D, YYYY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30">
-+<FormatCode>NNNNMMMM D, YYYY</FormatCode>
-+<DefaultName>DIN 5008 (EN 28601) </DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24">
-+<FormatCode>D. MMM. YYYY</FormatCode>
-+<DefaultName>DIN 5008 (EN 28601) </DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26">
-+<FormatCode>D. MMMM YYYY</FormatCode>
-+<DefaultName>DIN 5008 (EN 28601) </DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31">
-+<FormatCode>MM-DD</FormatCode>
-+<DefaultName>DIN 5008 (EN 28601) </DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32">
-+<FormatCode>YY-MM-DD</FormatCode>
-+<DefaultName>DIN 5008 (EN 28601) </DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey20" default="false" type="medium" usage="DATE" formatindex="33">
-+<FormatCode>YYYY-MM-DD</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey21" default="false" type="medium" usage="DATE" formatindex="38">
-+<FormatCode>WW</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="TimeFormatskey1" default="true" type="short" usage="TIME"  formatindex="39">
-+<FormatCode>HH:MM</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="TimeFormatskey2" default="true" type="medium" usage="TIME"  formatindex="40">
-+<FormatCode>HH:MM:SS</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="TimeFormatskey3" default="false" type="short" usage="TIME"  formatindex="41">
-+<FormatCode>HH:MM AM/PM</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="TimeFormatskey4" default="false" type="medium" usage="TIME"  formatindex="42">
-+<FormatCode>HH:MM:SS AM/PM</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME"  formatindex="43">
-+<FormatCode>[HH]:MM:SS</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME"  formatindex="44">
-+<FormatCode>MM:SS,00</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME"  formatindex="45">
-+<FormatCode>[HH]:MM:SS,00</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME"  formatindex="46">
-+<FormatCode>MM/DD/YY HH:MM</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME"  formatindex="47">
-+<FormatCode>MM/DD/YYYY HH:MM:SS</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER"  formatindex="0">
-+<FormatCode>Standard</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER"  formatindex="1">
-+<FormatCode>0</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="2">
-+<FormatCode>0,00</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER"  formatindex="3">
-+<FormatCode># ##0</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="4">
-+<FormatCode># ##0,00</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="5">
-+<FormatCode># ###,00</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY"  formatindex="12">
-+<FormatCode>[$грн.-419]# ##0;-[$грн.-419]# ##0</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY"  formatindex="13">
-+<FormatCode>[$грн.-419]# ##0,00;-[$грн.-419]# ##0,00</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY"  formatindex="14">
-+	<FormatCode>[$грн.-419]# ##0;[RED]-[$грн.-419]# ##0</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY"  formatindex="15">
-+<FormatCode>[$грн.-419]# ##0,00;[RED]-[$грн.-419]# ##0,00</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY"  formatindex="16">
-+<FormatCode># ##0,00 CCC</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY"  formatindex="17">
-+<FormatCode>[$грн.-419]# ##0,--;[RED]-[$грн.-419]# ##0,--</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER"  formatindex="8">
-+<FormatCode>0%</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER"  formatindex="9">
-+<FormatCode>0,00%</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="6">
-+<FormatCode>0,00E+000</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="7">
-+<FormatCode>0,00E+00</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+</LC_FORMAT>
-+<LC_COLLATION>
-+<Collator unoid="uk_UA.alphanumeric" default="true"/>
-+<CollationOptions>
-+<TransliterationModules>IGNORE_CASE</TransliterationModules>
-+</CollationOptions>
-+</LC_COLLATION>
-+<LC_SEARCH>
-+<SearchOptions>
-+<TransliterationModules>IGNORE_CASE</TransliterationModules>
-+</SearchOptions>
-+</LC_SEARCH>
-+<LC_CALENDAR>
-+<Calendar unoid="gregorian" default="true">
-+<DaysOfWeek>
-+<Day>
-+<DayID>sun</DayID>
-+<DefaultAbbrvName>�д</DefaultAbbrvName>
-+<DefaultFullName>неділ�</DefaultFullName>
-+</Day>
-+<Day>
-+<DayID>mon</DayID>
-+<DefaultAbbrvName>Пн</DefaultAbbrvName>
-+<DefaultFullName>понеділок</DefaultFullName>
-+</Day>
-+<Day>
-+<DayID>tue</DayID>
-+<DefaultAbbrvName>Ð’Ñ‚</DefaultAbbrvName>
-+<DefaultFullName>вівторок</DefaultFullName>
-+</Day>
-+<Day>
-+<DayID>wed</DayID>
-+<DefaultAbbrvName>Ср</DefaultAbbrvName>
-+<DefaultFullName>�ереда</DefaultFullName>
-+</Day>
-+<Day>
-+<DayID>thu</DayID>
-+<DefaultAbbrvName>Чт</DefaultAbbrvName>
-+<DefaultFullName>четвер</DefaultFullName>
-+</Day>
-+<Day>
-+<DayID>fri</DayID>
-+<DefaultAbbrvName>Пт</DefaultAbbrvName>
-+<DefaultFullName>п'�тниц�</DefaultFullName>
-+</Day>
-+<Day>
-+<DayID>sat</DayID>
-+<DefaultAbbrvName>Сб</DefaultAbbrvName>
-+<DefaultFullName>�убота</DefaultFullName>
-+</Day>
-+</DaysOfWeek>
-+<MonthsOfYear>
-+<Month>
-+<MonthID>jan</MonthID>
-+<DefaultAbbrvName>�іч</DefaultAbbrvName>
-+<DefaultFullName>Січень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>feb</MonthID>
-+<DefaultAbbrvName>лют</DefaultAbbrvName>
-+<DefaultFullName>Лютий</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>mar</MonthID>
-+<DefaultAbbrvName>бер</DefaultAbbrvName>
-+<DefaultFullName>Березень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>apr</MonthID>
-+<DefaultAbbrvName>квт</DefaultAbbrvName>
-+<DefaultFullName>Квітень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>may</MonthID>
-+<DefaultAbbrvName>трв</DefaultAbbrvName>
-+<DefaultFullName>Травень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>jun</MonthID>
-+<DefaultAbbrvName>чер</DefaultAbbrvName>
-+<DefaultFullName>Червень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>jul</MonthID>
-+<DefaultAbbrvName>лип</DefaultAbbrvName>
-+<DefaultFullName>Липень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>aug</MonthID>
-+<DefaultAbbrvName>�ер</DefaultAbbrvName>
-+<DefaultFullName>Серпень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>sep</MonthID>
-+<DefaultAbbrvName>вер</DefaultAbbrvName>
-+<DefaultFullName>Вере�ень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>oct</MonthID>
-+<DefaultAbbrvName>жов</DefaultAbbrvName>
-+<DefaultFullName>Жовтень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>nov</MonthID>
-+<DefaultAbbrvName>ли�</DefaultAbbrvName>
-+<DefaultFullName>Ли�топад</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>dec</MonthID>
-+<DefaultAbbrvName>гру</DefaultAbbrvName>
-+<DefaultFullName>Грудень</DefaultFullName>
-+</Month>
-+</MonthsOfYear>
-+<Eras>
-+<Era>
-+<EraID>bc</EraID>
-+<DefaultAbbrvName>до н.е.</DefaultAbbrvName>
-+<DefaultFullName>до н.е.</DefaultFullName>
-+</Era>
-+<Era>
-+<EraID>ad</EraID>
-+<DefaultAbbrvName>н.е.</DefaultAbbrvName>
-+<DefaultFullName>н.е.</DefaultFullName>
-+</Era>
-+</Eras>
-+<StartDayOfWeek>
-+<DayID>sun</DayID>
-+</StartDayOfWeek>
-+<MinimalDaysInFirstWeek>1</MinimalDaysInFirstWeek>
-+</Calendar>
-+</LC_CALENDAR>
-+<LC_CURRENCY>
-+<Currency default="true" usedInCompatibleFormatCodes="true">
-+<CurrencyID>грн.</CurrencyID>
-+<CurrencySymbol>грн.</CurrencySymbol>
-+<BankSymbol>UAH</BankSymbol>
-+<CurrencyName>Hrivnya</CurrencyName>
-+<DecimalPlaces>2</DecimalPlaces>
-+</Currency>
-+</LC_CURRENCY>
-+<LC_TRANSLITERATION>
-+<Transliteration unoid="UPPERCASE_LOWERCASE"/>
-+<Transliteration unoid="IGNORE_CASE"/>
-+<Transliteration unoid="LOWERCASE_UPPERCASE" />
-+</LC_TRANSLITERATION>
-+<LC_MISC>
-+<ReservedWords>
-+<trueWord>true</trueWord>
-+<falseWord>false</falseWord>
-+<quarter1Word>1st quarter</quarter1Word>
-+<quarter2Word>2nd quarter</quarter2Word>
-+<quarter3Word>3rd quarter</quarter3Word>
-+<quarter4Word>4th quarter</quarter4Word>
-+<aboveWord>above</aboveWord>
-+<belowWord>below</belowWord>
-+</ReservedWords>
-+</LC_MISC>
-+<LC_NumberingLevel>
-+<NumberingLevel Prefix=" " NumType="4" Suffix=")" />
-+<NumberingLevel Prefix=" " NumType="4" Suffix="." />
-+<NumberingLevel Prefix="(" NumType="4" Suffix="." />
-+<NumberingLevel Prefix=" " NumType="2" Suffix="." />
-+<NumberingLevel Prefix=" " NumType="0" Suffix=")" />
-+<NumberingLevel Prefix=" " NumType="1" Suffix=")" />
-+<NumberingLevel Prefix="(" NumType="1" Suffix=")" />
-+<NumberingLevel Prefix=" " NumType="3" Suffix="." />
-+</LC_NumberingLevel>
-+<LC_OutLineNumberingLevel>
-+<OutlineStyle>
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="1" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
-+</OutlineStyle>
-+<OutlineStyle>
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
-+</OutlineStyle>
-+<OutlineStyle>
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix="(" NumType="1" Suffix=")" BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix="." BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
-+</OutlineStyle>
-+<OutlineStyle>
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
-+</OutlineStyle>
-+<OutlineStyle>
-+<OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
-+</OutlineStyle>
-+<OutlineStyle>
-+<OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="1" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
-+</OutlineStyle>
-+<OutlineStyle>
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020"  BulletFontName=""            ParentNumbering="1" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020"  BulletFontName=""            ParentNumbering="2" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020"  BulletFontName=""            ParentNumbering="3" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020"  BulletFontName=""            ParentNumbering="4" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
-+</OutlineStyle>
-+<OutlineStyle>
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="27A2"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="E006"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=")" BulletChar="E004"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
-+</OutlineStyle>
-+</LC_OutLineNumberingLevel>
-+</Locale>
diff --git a/editors/openoffice-1.0/files/patch-idlc+source+parser.yy b/editors/openoffice-1.0/files/patch-idlc+source+parser.yy
deleted file mode 100644
index 5ad06d2a4100..000000000000
--- a/editors/openoffice-1.0/files/patch-idlc+source+parser.yy
+++ /dev/null
@@ -1,36 +0,0 @@
---- ../idlc/source/parser.yy.orig	Wed Jul 10 11:43:18 2002
-+++ ../idlc/source/parser.yy	Thu Oct 31 10:00:47 2002
-@@ -995,7 +995,8 @@
- 	{
- 		idlc()->setParseState(PS_ConstantDeclSeen);
- 	}
--	';'
-+	';' {};
-+
- 
- const_dcl : 
- 	IDL_CONST
-@@ -1316,7 +1317,7 @@
- 		 * Push the scope of the exception on the scopes stack
- 		 */
- 		idlc()->scopes()->push(pExcept);
--		delete $1
-+		delete $1;
- 	}
- 	'{'
- 	{
-@@ -1705,10 +1706,10 @@
- 	{
- 		idlc()->setParseState(PS_TypedefSeen);
- 	}
--	type_declarator
--	| struct_type
--	| union_type
--	| enum_type
-+	type_declarator {}
-+	| struct_type {}
-+	| union_type {}
-+	| enum_type {}
- 	;
- 
- type_declarator :
diff --git a/editors/openoffice-1.0/files/patch-javaunohelper+source+makefile.mk b/editors/openoffice-1.0/files/patch-javaunohelper+source+makefile.mk
deleted file mode 100644
index 7f2cd2f1d220..000000000000
--- a/editors/openoffice-1.0/files/patch-javaunohelper+source+makefile.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../javaunohelper/source/makefile.mk.orig	Tue Jan  1 14:10:20 2002
-+++ ../javaunohelper/source/makefile.mk
-@@ -110,9 +110,9 @@
- SHL1TARGET=	$(TARGET)
- 
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
--		$(CPPUHELPERLIB)	\
--		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1DEPN=
- SHL1IMPLIB=	i$(TARGET)
diff --git a/editors/openoffice-1.0/files/patch-moz+prj+d.lst b/editors/openoffice-1.0/files/patch-moz+prj+d.lst
deleted file mode 100644
index d65f2df6cf3b..000000000000
--- a/editors/openoffice-1.0/files/patch-moz+prj+d.lst
+++ /dev/null
@@ -1,34 +0,0 @@
---- ../moz/prj/d.lst	Sat May 18 16:06:23 2002
-+++ ../moz/prj/d.lst	Sat May 18 16:16:33 2002
-@@ -43,6 +43,7 @@
- mkdir: %_DEST%\inc%_EXT%\mozilla\layout_xul
- mkdir: %_DEST%\inc%_EXT%\mozilla\ldap
- mkdir: %_DEST%\inc%_EXT%\mozilla\ldap\ldap
-+mkdir: %_DEST%\inc%_EXT%\mozilla\ldap-nspr
- mkdir: %_DEST%\inc%_EXT%\mozilla\locale
- mkdir: %_DEST%\inc%_EXT%\mozilla\lwbrk
- mkdir: %_DEST%\inc%_EXT%\mozilla\mailnews
-@@ -71,6 +72,7 @@
- mkdir: %_DEST%\inc%_EXT%\mozilla\nspr\private
- mkdir: %_DEST%\inc%_EXT%\mozilla\nsprefm
- mkdir: %_DEST%\inc%_EXT%\mozilla\oji
-+mkdir: %_DEST%\inc%_EXT%\mozilla\obsolete
- mkdir: %_DEST%\inc%_EXT%\mozilla\plugin
- mkdir: %_DEST%\inc%_EXT%\mozilla\png
- mkdir: %_DEST%\inc%_EXT%\mozilla\pref
-@@ -158,6 +160,7 @@
- ..\%__SRC%\inc\layout_xul\* %_DEST%\inc%_EXT%\mozilla\layout_xul
- ..\%__SRC%\inc\ldap\* %_DEST%\inc%_EXT%\mozilla\ldap
- ..\%__SRC%\inc\ldap\ldap\* %_DEST%\inc%_EXT%\mozilla\ldap\ldap
-+..\%__SRC%\inc\ldap-nspr\* %_DEST%\inc%_EXT%\mozilla\ldap-nspr
- ..\%__SRC%\inc\locale\* %_DEST%\inc%_EXT%\mozilla\locale
- ..\%__SRC%\inc\lwbrk\* %_DEST%\inc%_EXT%\mozilla\lwbrk
- ..\%__SRC%\inc\mailnews\* %_DEST%\inc%_EXT%\mozilla\mailnews
-@@ -186,6 +189,7 @@
- ..\%__SRC%\inc\nspr\private\* %_DEST%\inc%_EXT%\mozilla\nspr\private
- ..\%__SRC%\inc\nsprefm\* %_DEST%\inc%_EXT%\mozilla\nsprefm
- ..\%__SRC%\inc\oji\* %_DEST%\inc%_EXT%\mozilla\oji
-+..\%__SRC%\inc\obsolete\* %_DEST%\inc%_EXT%\mozilla\obsolete
- ..\%__SRC%\inc\plugin\* %_DEST%\inc%_EXT%\mozilla\plugin
- ..\%__SRC%\inc\png\* %_DEST%\inc%_EXT%\mozilla\png
- ..\%__SRC%\inc\pref\* %_DEST%\inc%_EXT%\mozilla\pref
diff --git a/editors/openoffice-1.0/files/patch-nas+nas-1.4.1.patch b/editors/openoffice-1.0/files/patch-nas+nas-1.4.1.patch
deleted file mode 100644
index 5432812bb50c..000000000000
--- a/editors/openoffice-1.0/files/patch-nas+nas-1.4.1.patch
+++ /dev/null
@@ -1,246 +0,0 @@
---- ../nas/nas-1.4.1.patch.orig	Wed Jan  8 02:52:13 2003
-+++ ../nas/nas-1.4.1.patch	Sat Jan 18 17:55:19 2003
-@@ -1,5 +1,5 @@
--*** misc/nas-1.4.1/config/NetAudio.tmpl	Sat Mar  4 21:40:50 2000
----- misc/build/nas-1.4.1/config/NetAudio.tmpl	Tue Jan  7 19:30:41 2003
-+*** misc/nas-1.4.1/config/NetAudio.tmpl	Sun Mar  5 03:40:50 2000
-+--- misc/build/nas-1.4.1/config/NetAudio.tmpl	Thu Nov  1 13:08:21 2001
- ***************
- *** 166,171 ****
- --- 166,177 ----
-@@ -15,8 +15,8 @@
-       INCLUDESRC = $(TOP)/include
-           INCDIR = $(INCROOT)/audio
-       WIDGET_DIR = $(TOP)/clients/audio/widgets
--*** misc/nas-1.4.1/lib/audio/Alibint.c	Sun Oct 24 13:45:21 1999
----- misc/build/nas-1.4.1/lib/audio/Alibint.c	Tue Jan  7 19:30:41 2003
-+*** misc/nas-1.4.1/lib/audio/Alibint.c	Sun Oct 24 19:45:21 1999
-+--- misc/build/nas-1.4.1/lib/audio/Alibint.c	Thu Nov  1 13:11:51 2001
- ***************
- *** 1336,1348 ****
-   static char *_SysErrorMsg (n)
-@@ -40,8 +40,8 @@
-   }
-   
-   #endif 	/* USL sharedlibs in don't define for AUD3.2 */
--*** misc/nas-1.4.1/lib/audio/Astreams.c	Sat May  8 21:10:05 1999
----- misc/build/nas-1.4.1/lib/audio/Astreams.c	Tue Jan  7 19:30:41 2003
-+*** misc/nas-1.4.1/lib/audio/Astreams.c	Sun May  9 03:10:05 1999
-+--- misc/build/nas-1.4.1/lib/audio/Astreams.c	Thu Nov  1 13:05:48 2001
- ***************
- *** 51,59 ****
-   #include <errno.h>
-@@ -120,59 +120,157 @@
-   	    return(-1);
-   	}
-   
--*** misc/nas-1.4.1/lib/audio/Imakefile	Sat Jan  1 04:28:13 2000
----- misc/build/nas-1.4.1/lib/audio/Imakefile	Tue Jan  7 19:30:41 2003
--***************
--*** 25,30 ****
----- 25,32 ----
--  
--  #include "../../config/NetAudio.tmpl"
--  
--+ CCOPTIONS += $(EXTRA_CCOPTIONS)
--+ 
--  #if ProjectX < 5
--  /* Pre-X11R5 compatability */
--  #ifndef NormalLibX
--***************
--*** 119,124 ****
----- 121,127 ----
--  
--  #endif
--  BuildIncludes($(HEADERS),audio,..)
--+ BuildIncludes($(HEADERS),audio,$(BUILDINCTOP:../..=.))
--  InstallMultiple($(HEADERS),$(INCDIR))
--  #if ProjectX >= 5
--  InstallNonExecFile(AuErrorDB,$(LIBDIR))
--*** misc/nas-1.4.1/server/dia/gram.y	Sat Jan  1 22:35:49 2000
----- misc/build/nas-1.4.1/server/dia/gram.y	Tue Jan  7 19:42:40 2003
--***************
--*** 119,132 ****
--  			}
--  		| MAXRATE number
--  			{ ddaSetConfig(MAXRATE, (void *)$2); }
--! 		| MINRATE number
--! 			{ ddaSetConfig(MINRATE, (void *)$2); }
--  
--  string		: STRING		{ ptr = (char *)malloc(strlen($1)+1);
--  					  strcpy(ptr, $1);
--  					  RemoveDQuote(ptr);
--  					  $$ = ptr;
--! 					}
--  number		: NUMBER		{ $$ = $1; }
--  		;
--  
----- 119,132 ----
--  			}
--  		| MAXRATE number
--  			{ ddaSetConfig(MAXRATE, (void *)$2); }
--! 		| MINRATE number 
--!                         { ddaSetConfig(MINRATE, (void *)$2); } ;
--  
--  string		: STRING		{ ptr = (char *)malloc(strlen($1)+1);
--  					  strcpy(ptr, $1);
--  					  RemoveDQuote(ptr);
--  					  $$ = ptr;
--!                                         };
--  number		: NUMBER		{ $$ = $1; }
--  		;
--  
-+--- misc/nas-1.4.1/Imakefile.orig	Wed Mar  6 02:20:01 2002
-++++ misc/build/nas-1.4.1/Imakefile	Wed Mar  6 02:20:07 2002
-+@@ -42,6 +42,8 @@
-+ 	@echo ""
-+ 	Date
-+ 	@echo ""
-++	@find . | egrep "\.(cxx|h|c)$$" | xargs \
-++                ${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
-+ 	$(MAKE) $(MFLAGS) Makefiles
-+ 	$(MAKE) $(MFLAGS) clean
-+ 	$(MAKE) $(MFLAGS) includes
-+--- misc/nas-1.4.1/clients/audio/audial/audial.c.orig	Wed Nov  5 18:50:21 1997
-++++ misc/build/nas-1.4.1/clients/audio/audial/audial.c	Wed Nov  5 18:56:33 1997
-+@@ -133,6 +133,7 @@
-+     signal(SIGALRM, SIG_DFL);
-+ }
-+ 
-++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3)
-+ static void
-+ usleep(usecs)
-+ unsigned int    usecs;
-+@@ -149,7 +150,7 @@
-+     setitimer(ITIMER_REAL, &ntval, &otval);
-+     pause();
-+ }
-+-
-++#endif
-+ #endif						/* SYSV else not */
-+ #endif						/* VMS else not */
-+ #endif						/* NEEDUSLEEP */
-+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig	Sun Mar  5 03:40:55 2000
-++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c	Sat Dec 16 22:11:35 2000
-+@@ -155,8 +155,10 @@
-+ #include <assert.h>
-+ 
-+ #ifdef __FreeBSD__
-+-# include <machine/soundcard.h>
-+-# include <machine/pcaudioio.h>
-++# include <sys/soundcard.h>
-++# ifdef __i386__
-++#  include <machine/pcaudioio.h>
-++# endif
-+ #else
-+ # ifdef __NetBSD__
-+ #  include <sys/ioctl.h>
-+@@ -610,7 +612,11 @@
-+ 
-+     if(sndStatOut.fd == -1)
-+     {
-++#ifdef __FreeBSD__
-++       while ((sndStatOut.fd = open(sndStatOut.device, O_RDWR)) == -1 && wait)
-++#else
-+        while ((sndStatOut.fd = open(sndStatOut.device, O_RDWR|O_SYNC)) == -1 && wait)
-++#endif
-+        {
-+            osLogMsg("openDevice: waiting on output device\n");
-+            sleep(1);
-+@@ -1230,6 +1236,11 @@
-+ /*
-+  * Setup soundcard at maximum audio quality.
-+  */
-++
-++#ifdef __FreeBSD__
-++#define NO_16_BIT_SAMPLING
-++#endif
-++
-+ static void setupSoundcard(sndStatPtr)
-+ SndStat* sndStatPtr;
-+ {
-+@@ -1380,7 +1391,11 @@
-+ 
-+     AL_initialized = AuTrue;
-+ 
-++#ifdef __FreeBSD__
-++    if ((fd = open(sndStatOut.device, O_RDWR, 0)) == -1) {
-++#else
-+     if ((fd = open(sndStatOut.device, O_RDWR|O_SYNC, 0)) == -1) {
-++#endif
-+         UNIDENTMSG;
-+         return AuFalse;
-+     }
-+--- misc/nas-1.4.1/clients/audio/auedit/Graph.c.orig	Mon Oct 25 02:24:08 1999
-++++ misc/build/nas-1.4.1/clients/audio/auedit/Graph.c	Sat Mar 25 14:56:23 2000
-+@@ -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.4.1/lib/audio/Imakefile.orig	Sun May 19 14:52:20 2002
-++++ misc/build/nas-1.4.1/lib/audio/Imakefile	Sun May 19 14:54:25 2002
-+@@ -25,6 +25,8 @@
-+ 
-+ #include "../../config/NetAudio.tmpl"
-+ 
-++CCOPTIONS += $(EXTRA_CCOPTIONS)
-++
-+ #if ProjectX < 5
-+ /* Pre-X11R5 compatability */
-+ #ifndef NormalLibX
-+@@ -64,10 +66,14 @@
-+     COMPAT_OBJS = AuGetBest.o
-+ #endif /* ProjectX < 5 */
-+ 
-++#if HasBSD44Sockets
-++    SOCK_DEFINES = -DBSD44SOCKETS
-++#endif
-++
-+      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 \
-+@@ -119,6 +125,7 @@
-+ 
-+ #endif
-+ BuildIncludes($(HEADERS),audio,..)
-++BuildIncludes($(HEADERS),audio,$(BUILDINCTOP:../..=.))
-+ InstallMultiple($(HEADERS),$(INCDIR))
-+ #if ProjectX >= 5
-+ InstallNonExecFile(AuErrorDB,$(LIBDIR))
-+--- misc/nas-1.4.1/config/NetAudio.def.orig	Sun Feb 13 05:31:14 2000
-++++ misc/build/nas-1.4.1/config/NetAudio.def	Fri Mar 24 04:55:49 2000
-+@@ -8,5 +8,5 @@
-+ 
-+ 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.4.1/server/dia/gram.y.orig	Thu Oct 31 10:13:28 2002
-++++ misc/build/nas-1.4.1/server/dia/gram.y	Thu Oct 31 10:15:18 2002
-+@@ -120,13 +120,13 @@
-+ 		| MAXRATE number
-+ 			{ ddaSetConfig(MAXRATE, (void *)$2); }
-+ 		| MINRATE number
-+-			{ ddaSetConfig(MINRATE, (void *)$2); }
-++			{ ddaSetConfig(MINRATE, (void *)$2); };
-+ 
-+ string		: STRING		{ ptr = (char *)malloc(strlen($1)+1);
-+ 					  strcpy(ptr, $1);
-+ 					  RemoveDQuote(ptr);
-+ 					  $$ = ptr;
-+-					}
-++					};
-+ number		: NUMBER		{ $$ = $1; }
-+ 		;
-+ 
diff --git a/editors/openoffice-1.0/files/patch-offapi+com+sun+star+setup+OSType.idl b/editors/openoffice-1.0/files/patch-offapi+com+sun+star+setup+OSType.idl
deleted file mode 100644
index 3fee562c6d38..000000000000
--- a/editors/openoffice-1.0/files/patch-offapi+com+sun+star+setup+OSType.idl
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.0/files/patch-offapi+util+makefile.pmk b/editors/openoffice-1.0/files/patch-offapi+util+makefile.pmk
deleted file mode 100644
index 5cdbb1b4aa4a..000000000000
--- a/editors/openoffice-1.0/files/patch-offapi+util+makefile.pmk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.0/files/patch-package+inc+HashMaps.hxx b/editors/openoffice-1.0/files/patch-package+inc+HashMaps.hxx
deleted file mode 100644
index 35052d291ef7..000000000000
--- a/editors/openoffice-1.0/files/patch-package+inc+HashMaps.hxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice-1.0/files/patch-package+inc+ZipPackageFolder.hxx b/editors/openoffice-1.0/files/patch-package+inc+ZipPackageFolder.hxx
deleted file mode 100644
index 014c61403380..000000000000
--- a/editors/openoffice-1.0/files/patch-package+inc+ZipPackageFolder.hxx
+++ /dev/null
@@ -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()
diff --git a/editors/openoffice-1.0/files/patch-package+source+zippackage+ContentInfo.hxx b/editors/openoffice-1.0/files/patch-package+source+zippackage+ContentInfo.hxx
deleted file mode 100644
index c4bf35e79f64..000000000000
--- a/editors/openoffice-1.0/files/patch-package+source+zippackage+ContentInfo.hxx
+++ /dev/null
@@ -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();
diff --git a/editors/openoffice-1.0/files/patch-package+source+zippackage+ZipPackageFolder.cxx b/editors/openoffice-1.0/files/patch-package+source+zippackage+ZipPackageFolder.cxx
deleted file mode 100644
index bb504c834eef..000000000000
--- a/editors/openoffice-1.0/files/patch-package+source+zippackage+ZipPackageFolder.cxx
+++ /dev/null
@@ -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 );
diff --git a/editors/openoffice-1.0/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice-1.0/files/patch-product+inc+scp+udk_basefiles.scp
deleted file mode 100644
index 0f59b9ebee9b..000000000000
--- a/editors/openoffice-1.0/files/patch-product+inc+scp+udk_basefiles.scp
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../product/inc/scp/udk_basefiles.scp.orig	Tue Jan  7 14:52:10 2003
-+++ ../product/inc/scp/udk_basefiles.scp	Sun Jan 19 22:37:05 2003
-@@ -2,6 +2,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 ( LINUX ))
- #if ( defined( _gcc3 ) && defined( C300 ) )
- 
- File gid_File_Lib_gcc
-@@ -34,6 +35,7 @@
- End
- 
- 
-+#endif
- #endif
- 
- File gid_File_Lib_Sal
diff --git a/editors/openoffice-1.0/files/patch-product+settings+settings.mk b/editors/openoffice-1.0/files/patch-product+settings+settings.mk
deleted file mode 100644
index 3dae50f091a3..000000000000
--- a/editors/openoffice-1.0/files/patch-product+settings+settings.mk
+++ /dev/null
@@ -1,75 +0,0 @@
---- ../product/settings/settings.mk.orig	Sat Jan 18 18:23:17 2003
-+++ ../product/settings/settings.mk	Sat Jan 18 18:37:12 2003
-@@ -225,3 +226,72 @@
- 
- endif
- 
-+ifeq "$(PLATFORM)" "FreeBSD"
-+# Settings for Linux using gcc compiler
-+
-+OS=LINUX
-+PLATFORM=linux
-+PS=/
-+LINK=$(CC)
-+LIB=$(CC)
-+ECHO=@echo
-+MKDIR=mkdir -p
-+CAT=cat
-+OBJ_EXT=o
-+SHAREDLIB_EXT=so
-+SHAREDLIB_PRE=lib
-+SHAREDLIB_OUT=$(OUT_LIB)
-+PACKAGE_LIB_DIR=linux_x86.plt
-+    
-+GCC_VERSION=$(shell $(CC) -dumpversion)
-+
-+ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3"
-+COMID=gcc3
-+CPPU_ENV=gcc3
-+else
-+COMID=GCC
-+CPPU_ENV=gcc2
-+endif
-+
-+OSEP=\<
-+CSEP=\>
-+    
-+DEL=rm -f
-+DELRECURSIVE=rm -rf
-+COPY=cp
-+URLPREFIX=file://
-+
-+# Include UDK version numbers
-+include $(PRJ)/include/udkversion.mk
-+
-+SALLIB=-lsal
-+CPPULIB=-lcppu
-+CPPUHELPERLIB=-lcppuhelper$(COMID)
-+SALHELPERLIB=-lsalhelper$(COMID)
-+STLPORTLIB=-lstlport_gcc
-+
-+EMPTYSTRING=
-+PATH_SEPARATOR=:
-+
-+# -O is necessary for inlining (see gcc documentation)
-+ifeq "$(DEBUG)" "yes"
-+CC_FLAGS=-c -g
-+else
-+CC_FLAGS=-c -O
-+endif
-+SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/linux
-+CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include
-+STL_INCLUDES=-I$(OO_STLPORT_HOME)/stlport
-+CC_DEFINES=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV)
-+
-+# define for used compiler necessary for UNO
-+#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95
-+#-DCPPU_ENV=gcc3 -- gcc3 3.0
-+
-+CC_OUTPUT_SWITCH=-o
-+
-+LIBRARY_LINK_FLAGS=-shared
-+EXE_LINK_FLAGS=-Wl -export-dynamic
-+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH)
-+
-+endif
diff --git a/editors/openoffice-1.0/files/patch-product+util+makefile.mk b/editors/openoffice-1.0/files/patch-product+util+makefile.mk
deleted file mode 100644
index 6e72982a23bf..000000000000
--- a/editors/openoffice-1.0/files/patch-product+util+makefile.mk
+++ /dev/null
@@ -1,32 +0,0 @@
---- ../product/util/makefile.mk.orig	Sat Jan 18 13:31:50 2003
-+++ ../product/util/makefile.mk	Sat Jan 18 13:30:54 2003
-@@ -131,13 +131,6 @@
- DESTDIRDLL=$(DESTDIRLIB)
- STLPORTLIBNAME=libstlport_gcc.so
- BINDINGDLL=$(COMNAME)_uno
--.IF "$(COMID)"=="gcc3"
--ADDITIONAL_DLLS= \
--       $(DESTDIRDLL)$/libgcc_s.so.1            \
--       $(DESTDIRDLL)$/libgcc_s.so              \
--       $(DESTDIRDLL)$/libstdc++.so.$(SHORTSTDCPP3)           \
--       $(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3)
--.ENDIF
- 
- .ELIF "$(OS)"=="NETBSD"
- ###########
-@@ -491,6 +484,7 @@
- # special targets for linux gcc3 
- .IF "$(COMID)"=="gcc3"
- 
-+.IF "$(OS)"!="FREEBSD"
- $(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) :
-        $(GCCINSTLIB) libstdc++.so.$(LIBSTDCPP3) $(DLLOUT)
- 
-@@ -514,6 +508,7 @@
- $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
- 	-rm -f $@
- 	+ln -s libgcc_s.so.1 $@
-+.ENDIF
- #-------------------------------------------------------------
- 
- $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
diff --git a/editors/openoffice-1.0/files/patch-psprint+source+printer+printerinfomanager.cxx b/editors/openoffice-1.0/files/patch-psprint+source+printer+printerinfomanager.cxx
deleted file mode 100644
index 4947227f8d52..000000000000
--- a/editors/openoffice-1.0/files/patch-psprint+source+printer+printerinfomanager.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../psprint/source/printer/printerinfomanager.cxx.orig	Sat Apr  6 11:56:35 2002
-+++ ../psprint/source/printer/printerinfomanager.cxx	Wed May  1 22:42:58 2002
-@@ -883,7 +883,7 @@
- 
- static const struct SystemCommandParameters aParms[] =
- {
--#if defined(LINUX) || defined(NETBSD)
-+#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD)
-     { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 },
-     { "lpc status", "lpr -P (PRINTER)", "", ":", 0 },
-     { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 }
diff --git a/editors/openoffice-1.0/files/patch-psprint+source+printergfx+psheader.ps b/editors/openoffice-1.0/files/patch-psprint+source+printergfx+psheader.ps
deleted file mode 100644
index 2118d0fe6c93..000000000000
--- a/editors/openoffice-1.0/files/patch-psprint+source+printergfx+psheader.ps
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../psprint/source/printergfx/psheader.ps.orig	Tue Jun  4 22:33:58 2002
-+++ ../psprint/source/printergfx/psheader.ps
-@@ -303,8 +303,8 @@
-     /h /i /j /k /l /m /n /o
-     /p /q /r /s /t /u /v /w
-     /x /y /z /braceleft /bar /braceright /asciitilde /unused
--    /euro /unused /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
--    /circumflex /perthousand /Scaron /guilsinglleft /OE /unused /zcaron /unused
-+    /Euro /unused /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
-+    /circumflex /perthousand /Scaron /guilsinglleft /OE /unused /Zcaron /unused
-     /unused /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
-     /tilde /trademark /scaron /guilsinglright /oe /unused /zcaron /Ydieresis
-     /space /exclamdown /cent /sterling /currency /yen /brokenbar /section
diff --git a/editors/openoffice-1.0/files/patch-registry+source+regkey.cxx b/editors/openoffice-1.0/files/patch-registry+source+regkey.cxx
deleted file mode 100644
index fad069f83f14..000000000000
--- a/editors/openoffice-1.0/files/patch-registry+source+regkey.cxx
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice-1.0/files/patch-remotebridges+source+unourl_resolver+makefile.mk b/editors/openoffice-1.0/files/patch-remotebridges+source+unourl_resolver+makefile.mk
deleted file mode 100644
index 72e5a97234f4..000000000000
--- a/editors/openoffice-1.0/files/patch-remotebridges+source+unourl_resolver+makefile.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../remotebridges/source/unourl_resolver/makefile.mk.orig	Tue Jan  1 14:11:01 2002
-+++ ../remotebridges/source/unourl_resolver/makefile.mk
-@@ -102,9 +102,9 @@
- SHL1VERSIONMAP=	$(TARGET).map
- 
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
--		$(CPPUHELPERLIB)	\
--		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1DEPN=
- SHL1IMPLIB=	i$(TARGET)
diff --git a/editors/openoffice-1.0/files/patch-rsc+source+rscpp+cpp.h b/editors/openoffice-1.0/files/patch-rsc+source+rscpp+cpp.h
deleted file mode 100644
index 417ab33ba52f..000000000000
--- a/editors/openoffice-1.0/files/patch-rsc+source+rscpp+cpp.h
+++ /dev/null
@@ -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              */
- 
diff --git a/editors/openoffice-1.0/files/patch-rsc+source+rscpp+cpp3.c b/editors/openoffice-1.0/files/patch-rsc+source+rscpp+cpp3.c
deleted file mode 100644
index f74de7504d2e..000000000000
--- a/editors/openoffice-1.0/files/patch-rsc+source+rscpp+cpp3.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../rsc/source/rscpp/cpp3.c.orig	Thu Jul 25 00:00:25 2002
-+++ ../rsc/source/rscpp/cpp3.c	Thu Jul 25 00:01:50 2002
-@@ -82,7 +82,9 @@
- #ifdef IRIX
- extern void 	abort(void);
- #else
-+#ifndef FREEBSD
- extern int      abort();                /* For debugging                */
-+#endif
- #endif
- #endif
- 
diff --git a/editors/openoffice-1.0/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice-1.0/files/patch-sablot+Sablot-0.52.patch
deleted file mode 100644
index c3a0ffc47e73..000000000000
--- a/editors/openoffice-1.0/files/patch-sablot+Sablot-0.52.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../sablot/Sablot-0.52.patch.orig	Sun Jan 19 15:13:42 2003
-+++ ../sablot/Sablot-0.52.patch	Sun Jan 19 15:15:15 2003
-@@ -3,7 +3,7 @@
- ***************
- *** 1 ****
- ! dummy
----- 1,159 ----
-+--- 1,161 ----
- ! #*************************************************************************
- ! #
- ! #   $RCSfile: makefile.mk,v $
-@@ -96,6 +96,8 @@
- ! .IF "$(GUI)"=="UNX"
- ! .IF "$(OS)"=="NETBSD"
- ! CFLAGS+=     -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
-+! .ELIF "$(OS)"=="FREEBSD"
-+! CFLAGS+=     -DHAVE_SYS_TIME_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
- ! .ELSE
- ! .IF "$(OS)"=="MACOSX"
- ! CFLAGS+=     -DHAVE_GETTIMEOFDAY -DHAVE_SYS_TIME_H -DHAVE_ISNAN -DHAVE_FINITE
diff --git a/editors/openoffice-1.0/files/patch-sal+inc+rtl+textenc.h b/editors/openoffice-1.0/files/patch-sal+inc+rtl+textenc.h
deleted file mode 100644
index 10731179cff5..000000000000
--- a/editors/openoffice-1.0/files/patch-sal+inc+rtl+textenc.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../sal/inc/rtl/textenc.h.orig	Mon Feb 24 17:46:26 2003
-+++ ../sal/inc/rtl/textenc.h	Tue Feb 25 16:45:00 2003
-@@ -173,8 +173,9 @@
- #define RTL_TEXTENCODING_MS_1361                (RTL_TEXTENC_CAST( 84 ))
- #define RTL_TEXTENCODING_GB_18030               (RTL_TEXTENC_CAST( 85 ))
- #define RTL_TEXTENCODING_BIG5_HKSCS             (RTL_TEXTENC_CAST( 86 ))
-+#define RTL_TEXTENCODING_KOI8_U                 (RTL_TEXTENC_CAST( 87 ))
- 
--#define RTL_TEXTENCODING_STD_COUNT              (RTL_TEXTENC_CAST( 87 ))
-+#define RTL_TEXTENCODING_STD_COUNT              (RTL_TEXTENC_CAST( 88 ))
- 
- #define RTL_TEXTENCODING_USER_START             (RTL_TEXTENC_CAST( 0x8000 ))
- #define RTL_TEXTENCODING_USER_END               (RTL_TEXTENC_CAST( 0xEFFF ))
-@@ -223,6 +224,7 @@
- Cyrillic (DOS/OS2-866/Russian)                  RTL_TEXTENCODING_IBM_866
- Cyrillic (ISO-8859-5)                           RTL_TEXTENCODING_ISO_8859_5
- Cyrillic (KOI8-R)                               RTL_TEXTENCODING_KOI8_R
-+Cyrillic (KOI8-U)                               RTL_TEXTENCODING_KOI8_U
- Cyrillic (Windows-1251)                         RTL_TEXTENCODING_MS_1251
- 
- Greek (Apple Macintosh)                         RTL_TEXTENCODING_APPLE_GREEK
diff --git a/editors/openoffice-1.0/files/patch-sal+osl+unx+interlck.c b/editors/openoffice-1.0/files/patch-sal+osl+unx+interlck.c
deleted file mode 100644
index 60ea1f414d1a..000000000000
--- a/editors/openoffice-1.0/files/patch-sal+osl+unx+interlck.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- ../sal/osl/unx/interlck.c.orig	Mon Jul 22 17:51:34 2002
-+++ ../sal/osl/unx/interlck.c	Mon Jul 22 18:03:42 2002
-@@ -81,10 +81,10 @@
- 	__asm__ __volatile__ (
- 		"movl $1, %0\n\t"
- 		"lock\n\t" 
--		"xadd %0, %2\n\t"
-+		"xadd %0, %1\n\t"
- 		"incl %0"
--	:	"=a" (nCount), "=m" (*pCount)
--	:	"m" (*pCount)
-+	:	"=&a" (nCount), "+m" (*pCount)
-+	:
- 	:	"memory");
- }
- 
-@@ -95,10 +95,10 @@
- 	__asm__ __volatile__ (
- 		"movl $-1, %0\n\t"
- 		"lock\n\t"
--		"xadd %0, %2\n\t"
-+		"xadd %0, %1\n\t"
- 		"decl %0"
--	:	"=a" (nCount), "=m" (*pCount)
--	:	"m" (*pCount)
-+	:	"=&a" (nCount), "+m" (*pCount)
-+	:
- 	:	"memory");
- }
- 
diff --git a/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c
deleted file mode 100644
index 9bebad2b4386..000000000000
--- a/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c
+++ /dev/null
@@ -1,184 +0,0 @@
---- ../sal/osl/unx/nlsupport.c.orig	Tue May 21 15:22:11 2002
-+++ ../sal/osl/unx/nlsupport.c	Tue Sep  3 12:58:48 2002
-@@ -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(FREEBSD) || defined(NETBSD)
- #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,13 @@
-     return NULL;
- }
-         
--#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD)
-+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(FREEBSD) || defined(NETBSD)
- 
- /*
-  * This implementation of osl_getTextEncodingFromLocale maps 
-  * from nl_langinfo(CODESET) to rtl_textencoding defines. 
-- * nl_langinfo() is supported only on Linux, Solaris and IRIX. 
-+ * 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 +260,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)
- 
-@@ -299,23 +305,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 */
-@@ -496,7 +502,59 @@
-     { "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 */
-+   { "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 */
-+   { "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;
- 
-@@ -618,7 +676,7 @@
-     return ret;
- }
- 
--#elif defined(MACOSX) /* ifdef LINUX || SOLARIS || NETBSD */
-+#elif defined(MACOSX) /* ifdef LINUX || SOLARIS || IRIX || FREEBSD || NETBSD */
- 
- /*
-  * FIXME: the MacOS X implemetation is missing
-@@ -651,7 +709,7 @@
-     return 0;
- }
- 
--#else /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */
-+#else /* ifdef LINUX || SOLARIS || IRIX || FREEBSD || NETBSD || MACOSX */
- 
- /*
-  * This implementation of osl_getTextEncodingFromLocale maps 
-@@ -684,6 +742,7 @@
-     { "iso8859-8",    RTL_TEXTENCODING_ISO_8859_8  },
-     { "iso8859-9",    RTL_TEXTENCODING_ISO_8859_9  },
-     { "koi8-r",       RTL_TEXTENCODING_KOI8_R      },
-+    { "koi8-u",       RTL_TEXTENCODING_KOI8_U      },
-     { "pck",          RTL_TEXTENCODING_MS_932      },
- #if (0)
-     { "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW    },
-@@ -887,6 +946,6 @@
-     return 0;
- }
- 
--#endif /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */
-+#endif /* ifdef LINUX || SOLARIS || FREEBSD || NETBSD || MACOSX */
- 
- 
diff --git a/editors/openoffice-1.0/files/patch-sal+osl+unx+pipe.c b/editors/openoffice-1.0/files/patch-sal+osl+unx+pipe.c
deleted file mode 100644
index 217bd0be4d58..000000000000
--- a/editors/openoffice-1.0/files/patch-sal+osl+unx+pipe.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../sal/osl/unx/pipe.c.orig	Mon Feb 18 13:48:55 2002
-+++ ../sal/osl/unx/pipe.c	Wed Apr  3 00:59:15 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 )
- 	{			
diff --git a/editors/openoffice-1.0/files/patch-sal+osl+unx+process.c b/editors/openoffice-1.0/files/patch-sal+osl+unx+process.c
deleted file mode 100644
index 4c3fdcc8f0ad..000000000000
--- a/editors/openoffice-1.0/files/patch-sal+osl+unx+process.c
+++ /dev/null
@@ -1,20 +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;
-@@ -862,7 +862,7 @@
- 
- 			if (! INIT_GROUPS(data.m_name, data.m_gid) || (setuid(data.m_uid) != 0))
- 				OSL_TRACE("Failed to change uid and guid, errno=%d (%s)\n", errno, strerror(errno));
--#ifdef LINUX
-+#if defined(LINUX) || defined(FREEBSD)
- 			unsetenv("HOME");
- #else
- 			putenv("HOME=");
diff --git a/editors/openoffice-1.0/files/patch-sal+osl+unx+security.c b/editors/openoffice-1.0/files/patch-sal+osl+unx+security.c
deleted file mode 100644
index 0cc321dcd544..000000000000
--- a/editors/openoffice-1.0/files/patch-sal+osl+unx+security.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../sal/osl/unx/security.c.orig	Sat Jul 20 22:53:31 2002
-+++ ../sal/osl/unx/security.c	Sat Jul 20 22:52:39 2002
-@@ -739,7 +739,7 @@
- 	}
- 
- 
--#elif (LINUX && (GLIBC >= 2))
-+#elif ((LINUX && (GLIBC >= 2)) || defined(FREEBSD))
- 	
- 	struct passwd	*pPasswd; 
- 	
diff --git a/editors/openoffice-1.0/files/patch-sal+osl+unx+socket.c b/editors/openoffice-1.0/files/patch-sal+osl+unx+socket.c
deleted file mode 100644
index b6e0e2fa0901..000000000000
--- a/editors/openoffice-1.0/files/patch-sal+osl+unx+socket.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../sal/osl/unx/socket.c.orig	Sun Mar 17 12:46:37 2002
-+++ ../sal/osl/unx/socket.c	Wed Apr  3 01:01:14 2002
-@@ -82,7 +82,7 @@
- #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 */
-@@ -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! */
diff --git a/editors/openoffice-1.0/files/patch-sal+osl+unx+system.c b/editors/openoffice-1.0/files/patch-sal+osl+unx+system.c
deleted file mode 100644
index 8dc663ac03fc..000000000000
--- a/editors/openoffice-1.0/files/patch-sal+osl+unx+system.c
+++ /dev/null
@@ -1,127 +0,0 @@
---- ../sal/osl/unx/system.c.orig	Sun Mar 17 12:34:13 2002
-+++ ../sal/osl/unx/system.c	Wed Apr  3 01:03:36 2002
-@@ -195,6 +195,73 @@
- }
- #endif
- 
-+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
-+           size_t buflen, struct passwd **result)
-+{
-+  struct passwd* res;
-+
-+  pthread_mutex_lock(&getrtl_mutex);
-+
-+  if ( res = getpwuid(uid) )
-+  {
-+    size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell;
-+
-+    pw_name = strlen(res->pw_name)+1;
-+    pw_passwd = strlen(res->pw_passwd)+1;
-+    pw_class = strlen(res->pw_class)+1;
-+    pw_gecos = strlen(res->pw_gecos)+1;
-+    pw_dir = strlen(res->pw_dir)+1;
-+    pw_shell = strlen(res->pw_shell)+1;
-+
-+    if (pw_name+pw_passwd+pw_class+pw_gecos
-+                                 +pw_dir+pw_shell < buflen)
-+    {
-+      memcpy(pwd, res, sizeof(struct passwd));
-+
-+      strncpy(buffer, res->pw_name, pw_name);
-+      pwd->pw_name = buffer;
-+      buffer += pw_name;
-+
-+      strncpy(buffer, res->pw_passwd, pw_passwd);
-+      pwd->pw_passwd = buffer;
-+      buffer += pw_passwd;
-+
-+      strncpy(buffer, res->pw_class, pw_class);
-+      pwd->pw_class = buffer;
-+      buffer += pw_class;
-+
-+      strncpy(buffer, res->pw_gecos, pw_gecos);
-+      pwd->pw_gecos = buffer;
-+      buffer += pw_gecos;
-+
-+      strncpy(buffer, res->pw_dir, pw_dir);
-+      pwd->pw_dir = buffer;
-+      buffer += pw_dir;
-+
-+      strncpy(buffer, res->pw_shell, pw_shell);
-+      pwd->pw_shell = buffer;
-+      buffer += pw_shell;
-+
-+      *result = pwd ;
-+      res = 0 ;
-+
-+    } else {
-+
-+      res = ENOMEM ;
-+
-+    }      
-+  
-+  } else {
-+
-+    res = errno ;
-+ 
-+  } 
-+
-+  pthread_mutex_unlock(&getrtl_mutex);
-+
-+  return res;
-+}
-+
- struct tm *localtime_r(const time_t *timep, struct tm *buffer)
- {
- 	struct tm* res;
-@@ -518,3 +585,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-1.0/files/patch-sal+osl+unx+system.h b/editors/openoffice-1.0/files/patch-sal+osl+unx+system.h
deleted file mode 100644
index c4e255952fc7..000000000000
--- a/editors/openoffice-1.0/files/patch-sal+osl+unx+system.h
+++ /dev/null
@@ -1,35 +0,0 @@
---- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
-+++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
-@@ -205,6 +205,13 @@
- #   include <sys/ioctl.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 <machine/vmparam.h>
-+#   include <machine/pmap.h>
- #	include <sys/un.h>
- #   include <netinet/tcp.h>
- #	define 	IORESOURCE_TRANSFER_BSD 
-@@ -216,12 +223,13 @@
- #   elif BYTE_ORDER == PDP_ENDIAN
- #   	define _PDP_ENDIAN
- #   endif
--#   define  sched_yield() 				pthread_yield()
--#   define  pthread_testcancel()
- #	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
diff --git a/editors/openoffice-1.0/files/patch-sal+rtl+source+strtmpl.c b/editors/openoffice-1.0/files/patch-sal+rtl+source+strtmpl.c
deleted file mode 100644
index 91a5289d6636..000000000000
--- a/editors/openoffice-1.0/files/patch-sal+rtl+source+strtmpl.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../sal/rtl/source/strtmpl.c.orig	Mon Mar 11 01:28:38 2002
-+++ ../sal/rtl/source/strtmpl.c	Mon Mar 11 01:30:42 2002
-@@ -1104,10 +1104,12 @@
-         }
-         else if ( *pStr == '+' )
-         {
--            if ( bExp && (nExp != 0) )
--                break;
--            if ( fRet != 0.0 )
--                break;
-+		if ( bExp ) {
-+			if ( nExp != 0 )
-+				break;
-+			}
-+		else if ( fRet != 0.0 )
-+			break;
-         }
-         /* Exponent separator */
-         else if ( (*pStr == 'e') || (*pStr == 'E') )
diff --git a/editors/openoffice-1.0/files/patch-sal+textenc+tcvtest1.tab b/editors/openoffice-1.0/files/patch-sal+textenc+tcvtest1.tab
deleted file mode 100644
index 3597a0587962..000000000000
--- a/editors/openoffice-1.0/files/patch-sal+textenc+tcvtest1.tab
+++ /dev/null
@@ -1,173 +0,0 @@
---- ../sal/textenc/tcvtest1.tab.orig	Fri Oct 12 13:44:53 2001
-+++ ../sal/textenc/tcvtest1.tab	Tue Feb 25 16:47:50 2003
-@@ -4328,3 +4328,170 @@
-         "koi8-r",
-         RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME };
-     /* SCRIPT_CYRILLIC, pc code page 866 (855?), mac encoding 7 */
-+
-+/* ======================================================================= */
-+
-+/* KOI8_U */
-+/* Standard Charset for Ukrainian Cyrillic */
-+/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
-+/* Convert-Tables: typed per hand */
-+/* Last-Changes from us: */
-+
-+#define KOI8UUNI_START                  0x80
-+#define KOI8UUNI_END                    0xFF
-+static sal_uInt16 const aImplKOI8UToUniTab[KOI8UUNI_END - KOI8UUNI_START + 1] =
-+{
-+/*       0       1       2       3       4       5       6       7 */
-+/*       8       9       A       B       C       D       E       F */
-+    0x2500, 0x2502, 0x250C, 0x2510, 0x2514, 0x2518, 0x251C, 0x2524, /* 0x80 */
-+    0x252C, 0x2534, 0x253C, 0x2580, 0x2584, 0x2588, 0x258C, 0x2590, /* 0x80 */
-+    0x2591, 0x2592, 0x2593, 0x2320, 0x25A0, 0x2219, 0x221A, 0x2248, /* 0x90 */
-+    0x2264, 0x2265, 0x00A0, 0x2321, 0x00B0, 0x00B2, 0x00B7, 0x00F7, /* 0x90 */
-+    0x2550, 0x2551, 0x2552, 0x0451, 0x0454, 0x2554, 0x0456, 0x0457, /* 0xA0 */
-+    0x2557, 0x2558, 0x2559, 0x255A, 0x255B, 0x0491, 0x255D, 0x255E, /* 0xA0 */
-+    0x255F, 0x2560, 0x2561, 0x0401, 0x0404, 0x2563, 0x0406, 0x0407, /* 0xB0 */
-+    0x2566, 0x2567, 0x2568, 0x2569, 0x256A, 0x0490, 0x256C, 0x00A9, /* 0xB0 */
-+    0x044E, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, /* 0xC0 */
-+    0x0445, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, /* 0xC0 */
-+    0x043F, 0x044F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, /* 0xD0 */
-+    0x044C, 0x044B, 0x0437, 0x0448, 0x044D, 0x0449, 0x0447, 0x044A, /* 0xD0 */
-+    0x042E, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, /* 0xE0 */
-+    0x0425, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, /* 0xE0 */
-+    0x041F, 0x042F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, /* 0xF0 */
-+    0x042C, 0x042B, 0x0417, 0x0428, 0x042D, 0x0429, 0x0427, 0x042A  /* 0xF0 */
-+};
-+
-+/* ----------------------------------------------------------------------- */
-+
-+#define KOI8UCHAR_START                 0x0410
-+#define KOI8UCHAR_END                   0x044F
-+static sal_uChar const aImplKOI8UToCharTab[KOI8UCHAR_END - KOI8UCHAR_START + 1] =
-+{
-+/*     0     1     2     3     4     5     6     7 */
-+/*     8     9     A     B     C     D     E     F */
-+    0xE1, 0xE2, 0xF7, 0xE7, 0xE4, 0xE5, 0xF6, 0xFA, /* 0x0410 */
-+    0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, /* 0x0410 */
-+    0xF2, 0xF3, 0xF4, 0xF5, 0xE6, 0xE8, 0xE3, 0xFE, /* 0x0420 */
-+    0xFB, 0xFD, 0xFF, 0xF9, 0xF8, 0xFC, 0xE0, 0xF1, /* 0x0420 */
-+    0xC1, 0xC2, 0xD7, 0xC7, 0xC4, 0xC5, 0xD6, 0xDA, /* 0x0430 */
-+    0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, /* 0x0430 */
-+    0xD2, 0xD3, 0xD4, 0xD5, 0xC6, 0xC8, 0xC3, 0xDE, /* 0x0440 */
-+    0xDB, 0xDD, 0xDF, 0xD9, 0xD8, 0xDC, 0xC0, 0xD1  /* 0x0440 */
-+};
-+
-+/* ----------------------------------------------------------------------- */
-+
-+#define KOI8UTOCHARTABEX_COUNT          72
-+static ImplUniCharTabData const aImplKOI8UToCharTabEx[KOI8UTOCHARTABEX_COUNT] =
-+{
-+  { 0x00A0, 0x9A },
-+  { 0x00A9, 0xBF },
-+  { 0x00B0, 0x9C },
-+  { 0x00B2, 0x9D },
-+  { 0x00B7, 0x9E },
-+  { 0x00F7, 0x9F },
-+  { 0x0401, 0xB3 },
-+  { 0x0404, 0xB4 },
-+  { 0x0406, 0xB6 },
-+  { 0x0407, 0xB7 },
-+  { 0x0451, 0xA3 },
-+  { 0x0454, 0xA4 },
-+  { 0x0456, 0xA6 },
-+  { 0x0457, 0xA7 },
-+  { 0x0490, 0xBD },
-+  { 0x0491, 0xAD },
-+  { 0x2219, 0x95 },
-+  { 0x221A, 0x96 },
-+  { 0x2248, 0x97 },
-+  { 0x2264, 0x98 },
-+  { 0x2265, 0x99 },
-+  { 0x2320, 0x93 },
-+  { 0x2321, 0x9B },
-+  { 0x2500, 0x80 },
-+  { 0x2502, 0x81 },
-+  { 0x250C, 0x82 },
-+  { 0x2510, 0x83 },
-+  { 0x2514, 0x84 },
-+  { 0x2518, 0x85 },
-+  { 0x251C, 0x86 },
-+  { 0x2524, 0x87 },
-+  { 0x252C, 0x88 },
-+  { 0x2534, 0x89 },
-+  { 0x253C, 0x8A },
-+  { 0x2550, 0xA0 },
-+  { 0x2551, 0xA1 },
-+  { 0x2552, 0xA2 },
-+  { 0x2553, 0xA4 },
-+  { 0x2554, 0xA5 },
-+  { 0x2555, 0xA6 },
-+  { 0x2556, 0xA7 },
-+  { 0x2557, 0xA8 },
-+  { 0x2558, 0xA9 },
-+  { 0x2559, 0xAA },
-+  { 0x255A, 0xAB },
-+  { 0x255B, 0xAC },
-+  { 0x255C, 0xAD },
-+  { 0x255D, 0xAE },
-+  { 0x255E, 0xAF },
-+  { 0x255F, 0xB0 },
-+  { 0x2560, 0xB1 },
-+  { 0x2561, 0xB2 },
-+  { 0x2562, 0xB4 },
-+  { 0x2563, 0xB5 },
-+  { 0x2564, 0xB6 },
-+  { 0x2565, 0xB7 },
-+  { 0x2566, 0xB8 },
-+  { 0x2567, 0xB9 },
-+  { 0x2568, 0xBA },
-+  { 0x2569, 0xBB },
-+  { 0x256A, 0xBC },
-+  { 0x256B, 0xBD },
-+  { 0x256C, 0xBE },
-+  { 0x2580, 0x8B },
-+  { 0x2584, 0x8C },
-+  { 0x2588, 0x8D },
-+  { 0x258C, 0x8E },
-+  { 0x2590, 0x8F },
-+  { 0x2591, 0x90 },
-+  { 0x2592, 0x91 },
-+  { 0x2593, 0x92 },
-+  { 0x25A0, 0x94 }
-+};
-+
-+/* ----------------------------------------------------------------------- */
-+
-+static ImplByteConvertData const aImplKOI8UByteCvtData =
-+{
-+    aImplKOI8UToUniTab,
-+    NULL,
-+    KOI8UUNI_START, KOI8UUNI_END,
-+    NOTABUNI_START, NOTABUNI_END,
-+    aImplKOI8UToCharTab,
-+    NULL,
-+    aImplKOI8UToCharTabEx,
-+    KOI8UCHAR_START, KOI8UCHAR_END,
-+    NOTABCHAR_START, NOTABCHAR_END,
-+    KOI8UTOCHARTABEX_COUNT
-+};
-+
-+/* ----------------------------------------------------------------------- */
-+
-+static ImplTextEncodingData const aImplKOI8UTextEncodingData
-+    = { { &aImplKOI8UByteCvtData,
-+          ImplCharToUnicode,
-+          ImplUnicodeToChar,
-+          NULL,
-+          NULL,
-+          NULL,
-+          NULL,
-+          NULL,
-+          NULL },
-+        RTL_TEXTENCODING_KOI8_U,
-+        1,
-+        1,
-+        1,
-+        204,
-+        "koi8-u",
-+        "koi8-u",
-+        RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME };
-+    /* SCRIPT_CYRILLIC, pc code page 866 (855?), mac encoding 7 */
diff --git a/editors/openoffice-1.0/files/patch-sal+textenc+tencinfo.c b/editors/openoffice-1.0/files/patch-sal+textenc+tencinfo.c
deleted file mode 100644
index 03825fb8b4a5..000000000000
--- a/editors/openoffice-1.0/files/patch-sal+textenc+tencinfo.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- ../sal/textenc/tencinfo.c.orig	Wed Jul 31 11:44:35 2002
-+++ ../sal/textenc/tencinfo.c	Wed Jul 31 11:45:47 2002
-@@ -532,6 +532,7 @@
-     static ImplStrCharsetDef const aUnixCharsetKOI8Tab[] =
-     {
-         { "r", RTL_TEXTENCODING_KOI8_R },
-+        { "u", RTL_TEXTENCODING_KOI8_U },
-         { NULL, RTL_TEXTENCODING_DONTKNOW }
-     };
- 
-@@ -695,6 +695,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 */
-+
-+    if (pMimeCharset == NULL)
-+	pMimeCharset = "usascii";
-+
-     static ImplStrCharsetDef const aVIPMimeCharsetTab[] =
-     {
-         { "usascii", RTL_TEXTENCODING_ASCII_US },
-@@ -741,6 +742,7 @@
-         { "windows1256", RTL_TEXTENCODING_MS_1256 },
-         { "windows1257", RTL_TEXTENCODING_MS_1257 },
-         { "windows1258", RTL_TEXTENCODING_MS_1258 },
-+        { "koi8u", RTL_TEXTENCODING_KOI8_U },
-         { NULL, RTL_TEXTENCODING_DONTKNOW }
-     };
- 
-@@ -815,6 +817,7 @@
-         { "iso10646us", RTL_TEXTENCODING_ASCII_US },
-         { "iso646irv", RTL_TEXTENCODING_ASCII_US },
-         { "cskoi8r", RTL_TEXTENCODING_KOI8_R },
-+        { "cskoi8u", RTL_TEXTENCODING_KOI8_U },
-         { "ibm437", RTL_TEXTENCODING_IBM_437 },
-         { "cp437", RTL_TEXTENCODING_IBM_437 },
-         { "437", RTL_TEXTENCODING_IBM_437 },
diff --git a/editors/openoffice-1.0/files/patch-sal+textenc+textenc.c b/editors/openoffice-1.0/files/patch-sal+textenc+textenc.c
deleted file mode 100644
index 1e822ae076ce..000000000000
--- a/editors/openoffice-1.0/files/patch-sal+textenc+textenc.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sal/textenc/textenc.c.orig	Mon Feb 24 17:46:29 2003
-+++ ../sal/textenc/textenc.c	Tue Feb 25 16:51:28 2003
-@@ -254,7 +254,8 @@
-             &aImplJISX0212TextEncodingData, /* JIS_X_0212 */
-             &aImplMS1361TextEncodingData, /* MS_1361 */
-             &aImplGb18030TextEncodingData, /* GB_18030 */
--            &aImplBig5HkscsTextEncodingData }; /* BIG5_HKSCS */
-+            &aImplBig5HkscsTextEncodingData, /* BIG5_HKSCS */
-+            &aImplKOI8UTextEncodingData }; /* KOI8_U */
-     OSL_ENSURE(nEncoding >= RTL_TEXTENCODING_DONTKNOW
-                && nEncoding <= RTL_TEXTENCODING_UNICODE,
-                "specification violation");
diff --git a/editors/openoffice-1.0/files/patch-sal+workben+makefile.mk b/editors/openoffice-1.0/files/patch-sal+workben+makefile.mk
deleted file mode 100644
index 369935e31d66..000000000000
--- a/editors/openoffice-1.0/files/patch-sal+workben+makefile.mk
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../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 @@
- 
- .IF "$(TESTAPP)" == "salstattest"
- 
--	CFLAGS+= /DUSE_SAL_STATIC
-+	CFLAGS+= -DUSE_SAL_STATIC
- 
- 	OBJFILES=	$(OBJ)$/salstattest.obj
- 
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- 
- CXXFILES=	tgetpwnam.cxx
- OBJFILES=	$(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN=	$(SLB)$/sal.lib
- 
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd | freebsd)
- .ENDIF # tgetpwname
- 
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-1.0/files/patch-salhelper+source+gcc2_freebsd_intel.map b/editors/openoffice-1.0/files/patch-salhelper+source+gcc2_freebsd_intel.map
deleted file mode 100644
index 1ffacf889bc6..000000000000
--- a/editors/openoffice-1.0/files/patch-salhelper+source+gcc2_freebsd_intel.map
+++ /dev/null
@@ -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:
-+*;
-+};
diff --git a/editors/openoffice-1.0/files/patch-salhelper+source+gcc3_freebsd_intel.map b/editors/openoffice-1.0/files/patch-salhelper+source+gcc3_freebsd_intel.map
deleted file mode 100644
index 823cff316ec7..000000000000
--- a/editors/openoffice-1.0/files/patch-salhelper+source+gcc3_freebsd_intel.map
+++ /dev/null
@@ -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:
-+		*;
-+};
-+
diff --git a/editors/openoffice-1.0/files/patch-salhelper+source+makefile.mk b/editors/openoffice-1.0/files/patch-salhelper+source+makefile.mk
deleted file mode 100644
index 3687664d8d16..000000000000
--- a/editors/openoffice-1.0/files/patch-salhelper+source+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../salhelper/source/makefile.mk.orig	Wed Nov 14 14:19:21 2001
-+++ ../salhelper/source/makefile.mk	Sun Mar  3 17:58:15 2002
-@@ -109,6 +109,10 @@
- SHL1VERSIONMAP=lngi.map
- .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
- SHL1VERSIONMAP=gcc3_linux_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
- .ENDIF
- 
- 
diff --git a/editors/openoffice-1.0/files/patch-salhelper+test+rtti+makefile.mk b/editors/openoffice-1.0/files/patch-salhelper+test+rtti+makefile.mk
deleted file mode 100644
index 70f25048a24a..000000000000
--- a/editors/openoffice-1.0/files/patch-salhelper+test+rtti+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
- 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
- .ENDIF
- 
- 
diff --git a/editors/openoffice-1.0/files/patch-sc+source+core+data+cell.cxx b/editors/openoffice-1.0/files/patch-sc+source+core+data+cell.cxx
deleted file mode 100644
index 529f67a3e35f..000000000000
--- a/editors/openoffice-1.0/files/patch-sc+source+core+data+cell.cxx
+++ /dev/null
@@ -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>
diff --git a/editors/openoffice-1.0/files/patch-scp+source+player+player.scp b/editors/openoffice-1.0/files/patch-scp+source+player+player.scp
deleted file mode 100644
index 2f8daab35cdd..000000000000
--- a/editors/openoffice-1.0/files/patch-scp+source+player+player.scp
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice-1.0/files/patch-scptools+source+linker+searchcache b/editors/openoffice-1.0/files/patch-scptools+source+linker+searchcache
deleted file mode 100644
index 593e9eabf5bc..000000000000
--- a/editors/openoffice-1.0/files/patch-scptools+source+linker+searchcache
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: files/patch-scptools::source::linker::searchcache
-===================================================================
-RCS file: files/patch-scptools::source::linker::searchcache
-diff -N files/patch-scptools::source::linker::searchcache
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-scptools::source::linker::searchcache	4 Aug 2002 15:28:04 -0000
-@@ -0,0 +1,27 @@
-+--- ../scptools/source/linker/searchcache.hxx.orig	Fri Aug  2 22:53:46 2002
-++++ ../scptools/source/linker/searchcache.hxx	Fri Aug  2 22:54:50 2002
-+@@ -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	Fri Aug  2 22:53:35 2002
-++++ ../scptools/source/linker/searchcache.cxx	Fri Aug  2 22:55:14 2002
-+@@ -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-1.0/files/patch-scptools+source+linker+ziplst.cxx b/editors/openoffice-1.0/files/patch-scptools+source+linker+ziplst.cxx
deleted file mode 100644
index 83b84631542e..000000000000
--- a/editors/openoffice-1.0/files/patch-scptools+source+linker+ziplst.cxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice-1.0/files/patch-setup2+inc+fields.hxx b/editors/openoffice-1.0/files/patch-setup2+inc+fields.hxx
deleted file mode 100644
index d56e12f2abf4..000000000000
--- a/editors/openoffice-1.0/files/patch-setup2+inc+fields.hxx
+++ /dev/null
@@ -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[];
diff --git a/editors/openoffice-1.0/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice-1.0/files/patch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 396c586ee3a3..000000000000
--- a/editors/openoffice-1.0/files/patch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,30 +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"
- 
-@@ -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" \
diff --git a/editors/openoffice-1.0/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice-1.0/files/patch-setup2+mow+source+loader+makefile.mk
deleted file mode 100644
index 007c0f69b6f9..000000000000
--- a/editors/openoffice-1.0/files/patch-setup2+mow+source+loader+makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../setup2/mow/source/loader/makefile.mk.orig	Sun Mar  3 01:45:18 2002
-+++ ../setup2/mow/source/loader/makefile.mk	Sun Mar  3 01:45:22 2002
-@@ -85,7 +85,7 @@
- APP1NOSAL=TRUE
- APP1TARGET= $(TARGET)
- APP1OBJS=  $(OBJFILES)
--APP1STDLIBS= $(SVUNZIPLIB) $(LOADERLIB)
-+APP1STDLIBS= $(SVUNZIPLIB) $(LOADERLIB) -lX11
- 
- .ENDIF			# "$(OS)"=="MACOSX"
- 
diff --git a/editors/openoffice-1.0/files/patch-setup2+patch+makefile.mk b/editors/openoffice-1.0/files/patch-setup2+patch+makefile.mk
deleted file mode 100644
index 53846a8bdfc9..000000000000
--- a/editors/openoffice-1.0/files/patch-setup2+patch+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.0/files/patch-setup2+script+setupserver b/editors/openoffice-1.0/files/patch-setup2+script+setupserver
deleted file mode 100644
index 7d3b13f659b9..000000000000
--- a/editors/openoffice-1.0/files/patch-setup2+script+setupserver
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../setup2/script/setupserver.orig	Sat Apr  6 12:22:21 2002
-+++ ../setup2/script/setupserver	Wed May  1 22:30:13 2002
-@@ -234,6 +234,7 @@
- sd_platform=`uname -s`
- case $sd_platform in
- 	SCO_SV) test=/bin/test     ;;
-+	FreeBSD) test=/bin/test     ;;
- 	NetBSD) test=/bin/test     ;;
-   	*)      test=/usr/bin/test ;;
- esac
diff --git a/editors/openoffice-1.0/files/patch-setup2+source+compiler+decltor.cxx b/editors/openoffice-1.0/files/patch-setup2+source+compiler+decltor.cxx
deleted file mode 100644
index 98f6ad2f7567..000000000000
--- a/editors/openoffice-1.0/files/patch-setup2+source+compiler+decltor.cxx
+++ /dev/null
@@ -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";
diff --git a/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx b/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
deleted file mode 100644
index ac0b39a6aa47..000000000000
--- a/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
+++ /dev/null
@@ -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) );
diff --git a/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
deleted file mode 100644
index 1919789038db..000000000000
--- a/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig	Sat Apr  6 12:22:21 2002
-+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh	Wed May  1 22:38:21 2002
-@@ -66,6 +66,7 @@
- case $sd_platform in
- 	SCO_SV) test=/bin/test     ;;
- 	NetBSD) test=/bin/test     ;;
-+	FreeBSD) test=/bin/test    ;;
- 	*)      test=/usr/bin/test ;;
- esac
- 
diff --git a/editors/openoffice-1.0/files/patch-setup2+source+service+interface.cxx b/editors/openoffice-1.0/files/patch-setup2+source+service+interface.cxx
deleted file mode 100644
index 8e478e17971d..000000000000
--- a/editors/openoffice-1.0/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-1.0/files/patch-sfx2+source+appl+officeacceptthread.cxx b/editors/openoffice-1.0/files/patch-sfx2+source+appl+officeacceptthread.cxx
deleted file mode 100644
index a33491e0d8b2..000000000000
--- a/editors/openoffice-1.0/files/patch-sfx2+source+appl+officeacceptthread.cxx
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../sfx2/source/appl/officeacceptthread.cxx.orig	Sat Jul 20 22:56:19 2002
-+++ ../sfx2/source/appl/officeacceptthread.cxx	Sat Jul 20 22:56:54 2002
-@@ -123,13 +123,13 @@
- 			sal_Bool static isProcessRunning( ::vos::OProcess::TProcessInfo& aProcessInfo )
- 			{
- 				int nRet;
--#if defined (SOLARIS) || defined (IRIX)
-+#if defined (SOLARIS) || defined (IRIX) || defined (FREEBSD) || defined (NETBSD)
- 				int status;
- 				nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG);
- #elif defined(LINUX)
- 				nRet = kill(aProcessInfo.Ident, 0);
- #endif
--#if defined (LINUX) || defined (SOLARIS) || defined (IRIX)
-+#if defined (LINUX) || defined (SOLARIS) || defined (IRIX) || defined (FREEBSD) || defined (NETBSD)
- 				if ( nRet == 0 )
- 					return sal_True; // process is running
- 				if ( nRet < 0 )
diff --git a/editors/openoffice-1.0/files/patch-shell+source+cmdmail+makefile.mk b/editors/openoffice-1.0/files/patch-shell+source+cmdmail+makefile.mk
deleted file mode 100644
index 0476285c802e..000000000000
--- a/editors/openoffice-1.0/files/patch-shell+source+cmdmail+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice-1.0/files/patch-shell+source+proxysettings+makefile.mk b/editors/openoffice-1.0/files/patch-shell+source+proxysettings+makefile.mk
deleted file mode 100644
index e83cf7c9d7a1..000000000000
--- a/editors/openoffice-1.0/files/patch-shell+source+proxysettings+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice-1.0/files/patch-shell+source+unix+exec+makefile.mk b/editors/openoffice-1.0/files/patch-shell+source+unix+exec+makefile.mk
deleted file mode 100644
index 0b7712ee35f8..000000000000
--- a/editors/openoffice-1.0/files/patch-shell+source+unix+exec+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice-1.0/files/patch-solenv+bin+addsym.awk b/editors/openoffice-1.0/files/patch-solenv+bin+addsym.awk
deleted file mode 100644
index d4b9daeb8a48..000000000000
--- a/editors/openoffice-1.0/files/patch-solenv+bin+addsym.awk
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../solenv/bin/addsym.awk.kan	Sat Jul 27 10:10:19 2002
-+++ ../solenv/bin/addsym.awk	Thu Jul 25 14:49:30 2002
-@@ -62,6 +62,7 @@
- BEGIN { global_found = "false" }
- /[ \t]*local:/ { global_found = "false" }
- global_found == "true"  { 
-+    print "\t\tGetVersionInfo;"
-     print "\t\t_ZTS*;"
-     print "\t\t_ZTI*;"
-     global_found = "false" }
diff --git a/editors/openoffice-1.0/files/patch-solenv+bin+build.pl b/editors/openoffice-1.0/files/patch-solenv+bin+build.pl
deleted file mode 100644
index 923b99e5d065..000000000000
--- a/editors/openoffice-1.0/files/patch-solenv+bin+build.pl
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../solenv/bin/build.pl.orig	Sun Jan 19 00:08:38 2003
-+++ ../solenv/bin/build.pl	Sun Jan 19 00:07:25 2003
-@@ -292,7 +292,6 @@
- 		cwd();
- 		$! = 0;
- 		system ("$dmake");
--		&print_error("dmake - " . lc($!)) if ($!);
- 		if ($? && ($? != -1) && (!$child)) {
- 			&print_error("Error $? occurred while making $BuildDir");
- 		};
diff --git a/editors/openoffice-1.0/files/patch-solenv+bin+mapgen.pl b/editors/openoffice-1.0/files/patch-solenv+bin+mapgen.pl
deleted file mode 100644
index 71ebdb934120..000000000000
--- a/editors/openoffice-1.0/files/patch-solenv+bin+mapgen.pl
+++ /dev/null
@@ -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, $_);
- 	};
diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+postset.mk b/editors/openoffice-1.0/files/patch-solenv+inc+postset.mk
deleted file mode 100644
index 722ec086cc54..000000000000
--- a/editors/openoffice-1.0/files/patch-solenv+inc+postset.mk
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../solenv/inc/postset.mk.orig	Tue Jan  7 17:22:04 2003
-+++ ../solenv/inc/postset.mk	Tue Feb 25 16:52:34 2003
-@@ -220,6 +220,19 @@
- RCLANGFLAGS_07+= -d RUSS
- iso_07=ru
- 
-+.IF "$(RES_UKRA)"!="" || "$(give_me_all_languages)"!=""
-+alllangext+=38
-+ukra$(LANG_GUI)*=$(default$(LANG_GUI))
-+cmd_ukra:=ukra 38 -lgUKRAINIAN $(IBM_PC_852) $(ukra$(LANG_GUI))
-+lang_38=ukra
-+longlang_38=ukrainian
-+langext_38=38
-+rsclang_38=-lgUKRAINIAN $(IBM_PC_852)
-+rescharset_38=$(ukra$(LANG_GUI))
-+RCLANGFLAGS_38+= -d UKRA
-+iso_38=uk
-+.ENDIF
-+
- .IF "$(RES_POL)"!="" || "$(give_me_all_languages)"!=""
- alllangext+=48
- .ENDIF 
diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+startup+FREEBSD+macros.mk b/editors/openoffice-1.0/files/patch-solenv+inc+startup+FREEBSD+macros.mk
deleted file mode 100644
index 0c1b107de988..000000000000
--- a/editors/openoffice-1.0/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-1.0/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice-1.0/files/patch-solenv+inc+tg_ext.mk
deleted file mode 100644
index 701692c9425a..000000000000
--- a/editors/openoffice-1.0/files/patch-solenv+inc+tg_ext.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+tg_moz.mk b/editors/openoffice-1.0/files/patch-solenv+inc+tg_moz.mk
deleted file mode 100644
index 255a41f92281..000000000000
--- a/editors/openoffice-1.0/files/patch-solenv+inc+tg_moz.mk
+++ /dev/null
@@ -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) $@
diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+tg_shl.mk b/editors/openoffice-1.0/files/patch-solenv+inc+tg_shl.mk
deleted file mode 100644
index 2a9d4ba1b65c..000000000000
--- a/editors/openoffice-1.0/files/patch-solenv+inc+tg_shl.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../solenv/inc/tg_shl.mk.orig	Tue Jan  7 16:22:13 2003
-+++ ../solenv/inc/tg_shl.mk	Sat Jan 18 12:51:58 2003
-@@ -319,7 +319,7 @@
- .IF "$(GUI)" == "WNT"
- .IF "$(UPDATER)"=="YES"
- .IF "$(COM)"=="GCC"
--			gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
-+			${CC} -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
- .ELSE
- 			$(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
- .ENDIF			# "$(COM)"=="GCC"
diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.0/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 4c2fd26f5c2c..000000000000
--- a/editors/openoffice-1.0/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,209 +0,0 @@
---- ../solenv/inc/unxfbsdi.mk.orig	Tue Jan  7 16:22:18 2003
-+++ ../solenv/inc/unxfbsdi.mk	Sat Jan 18 13:04:17 2003
-@@ -1,84 +1,139 @@
--
- # mak file fuer unxfbsdi
- 
--ASM=
--AFLAGS=
-+ASM=$(CC)
-+AFLAGS=-x assembler-with-cpp -c $(CDEFS)
- 
- SOLAR_JAVA=TRUE
- JAVAFLAGSDEBUG=-g
- 
-+# 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=400 -DOSVERSION=$(OSVERSION)
-+CDEFS+=$(PTHREAD_CFLAGS)
-+
-+# 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
-+
-+# flags for C and C++ Compiler
-+CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/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
-+
-+# Flags for disabling exception handling
-+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
- 
--CC=				gcc
--CXX=				g++
--CDEFS+=			-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400
--CDEFS+=			-D_REENTRANT -D_PTHREADS -D_THREAD_SAFE
--CFLAGS+= -w -c $(INCLUDE)
--CFLAGS+= -I/usr/X11R6/include
--CFLAGSCC= -pipe
--CFLAGSCXX= -pipe -fno-for-scope -fpermissive
--CFLAGSEXCEPTIONS= -fexceptions
--CFLAGS_NO_EXCEPTIONS= -fno-exceptions
--CFLAGSOBJGUIST= -fPIC
--CFLAGSOBJCUIST= -fPIC
--CFLAGSOBJGUIMT= -fPIC
--CFLAGSOBJCUIMT= -fPIC
--CFLAGSSLOGUIMT=	-fPIC
--CFLAGSSLOCUIMT=	-fPIC
--CFLAGSPROF=     -pg
--CFLAGSDEBUG=	-g
-+# 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 profiling
-+CFLAGSPROF=-pg
-+
-+# Compiler flags for debugging
-+CFLAGSDEBUG=-g -ggdb
- CFLAGSDBGUTIL=
--CFLAGSOPT= -O2
--CFLAGSNOOPT= -O
--CFLAGSOUTOBJ= -o
--
--STATIC=	-Wl,-Bstatic
--DYNAMIC= -Wl,-Bdynamic
--
--#THREADLIB= -pthread
--LINK= gcc
--# -v -nostdlib
-+
-+# Compiler flags to enable optimizations
-+# -02 is broken for FreeBSD
-+CFLAGSOPT=-O
-+
-+# Compiler flags to disable optimizations
-+# -0 is broken for STLport
-+CFLAGSNOOPT=-O0
-+
-+# Compiler flags for the output path
-+CFLAGSOUTOBJ=-o
-+
-+# switches for dynamic and static linking
-+STATIC=-Wl,-Bstatic
-+DYNAMIC=-Wl,-Bdynamic
-+
-+LINK=$(CXX)
- LINKFLAGS=
--LINKFLAGSAPPGUI= -Wl,-export-dynamic
--LINKFLAGSAPPCUI= -Wl,-export-dynamic
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= 
-+LINKFLAGSAPPCUI= 
-+
-+# linker flags for linking shared libraries
- LINKFLAGSSHLGUI= -shared
- LINKFLAGSSHLCUI= -shared
- LINKFLAGSTACK=
- LINKFLAGSPROF=
- LINKFLAGSDEBUG=-g
--LINKFLAGSOPT=
-+LINKFLAGSOPT=-O
- 
- .IF "$(NO_BSYMBOLIC)"==""
- .IF "$(PRJNAME)" != "envtest"
--LINKFLAGSSHLGUI+= -Wl,-Bsymbolic
--LINKFLAGSSHLCUI+= -Wl,-Bsymbolic
-+LINKFLAGSSHLGUI+=-Wl,-Bsymbolic
-+LINKFLAGSSHLCUI+=-Wl,-Bsymbolic
- .ENDIF
- .ENDIF
- 
- 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
-+# libraries for linking applications
-+STDLIBCUIST=-lm
-+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
-+
-+# STLport always needs pthread.
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(PTHREAD_LIBS)
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
- 
-+# default objectfilenames to lin
- STDOBJGUI=
- STDSLOGUI=
- STDOBJCUI=
- STDSLOCUI=
- 
--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
--LIBEXT=			.a
-+LIBMGR=ar
-+LIBFLAGS=-r
-+LIBEXT=.a
- 
- IMPLIB=
- IMPLIBFLAGS=
-@@ -87,12 +142,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
diff --git a/editors/openoffice-1.0/files/patch-soltools+mkdepend+main.c b/editors/openoffice-1.0/files/patch-soltools+mkdepend+main.c
deleted file mode 100644
index cffd5cbb1f43..000000000000
--- a/editors/openoffice-1.0/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-1.0/files/patch-stlport+STLport-4.5.patch b/editors/openoffice-1.0/files/patch-stlport+STLport-4.5.patch
deleted file mode 100644
index 2a34de03f4b1..000000000000
--- a/editors/openoffice-1.0/files/patch-stlport+STLport-4.5.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- ../stlport/STLport-4.5.patch.orig	Mon Jan 14 18:33:17 2002
-+++ ../stlport/STLport-4.5.patch	Tue May 28 23:55:42 2002
-@@ -174,3 +174,110 @@
-   class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-   public:
-     __Named_exception(const string& __str) 
-+--- misc/STLport-4.5/src/gcc-freebsd.mak	Sun Jul 29 05:36:25 2001
-++++ misc/build/STLport-4.5/src/gcc-freebsd.mak	Tue May 28 23:04:27 2002
-+@@ -5,8 +5,8 @@
-+ #
-+ # compiler
-+ #
-+-CC = gcc -pthread
-+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-+ 
-+ #
-+ # Basename for libraries
-+@@ -19,7 +19,7 @@
-+ #
-+ LINK=ar cr
-+ # 2.95 flag
-+-DYN_LINK=c++ -pthread -fexceptions -shared -o
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
-+ 
-+ OBJEXT=o
-+ DYNEXT=so
-+@@ -41,8 +41,8 @@
-+ 
-+ CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-+ 
-+-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
-+-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-+ 
-+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+--- /dev/null	Tue May 28 22:55:00 2002
-++++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak	Tue May 28 22:38:52 2002
-+@@ -0,0 +1,59 @@
-++#
-++# Note : this makefile is for gcc-3 !
-++#
-++
-++#
-++# compiler
-++#
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-++
-++#
-++# Basename for libraries
-++#
-++LIB_BASENAME = libstlport_gcc
-++
-++#
-++# guts for common stuff
-++#
-++#
-++LINK=ar cr
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
-++
-++OBJEXT=o
-++DYNEXT=so
-++STEXT=a
-++RM=rm -rf
-++PATH_SEP=/
-++MKDIR=mkdir -p
-++COMP=GCC-FREEBSD
-++INSTALL_STEP = install_unix 
-++
-++all:  all_dynamic all_static symbolic_links 
-++
-++include common_macros.mak
-++
-++WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-++
-++CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-++
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-++
-++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-++
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-++
-++include common_percent_rules.mak
-++include common_rules.mak
-++
-++
-++#install: all
-++#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-++
-++#%.s: %.cpp
-++#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-++
-++
-+--- misc/STLport-4.5/stlport/cwchar.orig	Tue May 28 22:51:31 2002
-++++ misc/build/STLport-4.5/stlport/cwchar	Tue May 28 22:55:33 2002
-+@@ -21,6 +21,9 @@
-+ #  include <stl/_prolog.h>
-+ # endif
-+ 
-++#ifdef __FreeBSD__
-++# include <../wchar.h>
-++#endif
-+ # include <stl/_cwchar.h>
-+ 
-+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
diff --git a/editors/openoffice-1.0/files/patch-stlport+makefile.mk b/editors/openoffice-1.0/files/patch-stlport+makefile.mk
deleted file mode 100644
index 70ec58c3428e..000000000000
--- a/editors/openoffice-1.0/files/patch-stlport+makefile.mk
+++ /dev/null
@@ -1,36 +0,0 @@
---- ../stlport/makefile.mk.orig	Tue Jan  7 13:13:37 2003
-+++ ../stlport/makefile.mk	Sat Jan 18 13:01:53 2003
-@@ -98,16 +98,28 @@
- 
- .IF "$(COM)"=="GCC"
- .IF "$(COMID)"=="gcc3"
--BUILD_FLAGS=-f gcc-3.0.mak
-+.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
-+# FreeBSD / MacOS X/Darwin need a special makefile
- .IF "$(OS)"=="MACOSX"
-     BUILD_FLAGS=-f gcc-apple-macosx.mak
--.ELSE # "$(OS)"=="MACOSX"
-+.ELSIF # "$(OS)"=="FREEBSD"
-+    BUILD_FLAGS=-f gcc-freebsd.mak
-+.ELSE
-     BUILD_FLAGS=-f gcc.mak
--.ENDIF # "$(OS)"=="MACOSX"
-+.ENDIF # "$(OS)"=="MACOSX || $(OS)"=="FREEBSD"
- .ENDIF # "$(COMID)"=="gcc3"
--BUILD_ACTION=make
-+
-+.IF "$(OS)"=="FREEBSD"
-+    BUILD_ACTION=gmake
-+.ELSE
-+    BUILD_ACTION=make
-+.ENDIF
-+
- # build in parallel
- BUILD_FLAGS+= -j$(MAXPROCESS)
- .ENDIF
diff --git a/editors/openoffice-1.0/files/patch-stoc+source+corereflection+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+corereflection+makefile.mk
deleted file mode 100644
index 4b319b08d401..000000000000
--- a/editors/openoffice-1.0/files/patch-stoc+source+corereflection+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-1.0/files/patch-stoc+source+defaultregistry+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+defaultregistry+makefile.mk
deleted file mode 100644
index 4cae0476415a..000000000000
--- a/editors/openoffice-1.0/files/patch-stoc+source+defaultregistry+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice-1.0/files/patch-stoc+source+implementationregistration+implreg.cxx b/editors/openoffice-1.0/files/patch-stoc+source+implementationregistration+implreg.cxx
deleted file mode 100644
index 341d621d872c..000000000000
--- a/editors/openoffice-1.0/files/patch-stoc+source+implementationregistration+implreg.cxx
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.0/files/patch-stoc+source+implementationregistration+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+implementationregistration+makefile.mk
deleted file mode 100644
index 0051043b7ecb..000000000000
--- a/editors/openoffice-1.0/files/patch-stoc+source+implementationregistration+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-1.0/files/patch-stoc+source+inspect+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+inspect+makefile.mk
deleted file mode 100644
index c7cd85253c11..000000000000
--- a/editors/openoffice-1.0/files/patch-stoc+source+inspect+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-1.0/files/patch-stoc+source+invocation+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+invocation+makefile.mk
deleted file mode 100644
index 9ac2072a5612..000000000000
--- a/editors/openoffice-1.0/files/patch-stoc+source+invocation+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice-1.0/files/patch-stoc+source+invocation_adapterfactory+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
deleted file mode 100644
index 8853ad39a90e..000000000000
--- a/editors/openoffice-1.0/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice-1.0/files/patch-stoc+source+javaloader+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+javaloader+makefile.mk
deleted file mode 100644
index af0fb9af619c..000000000000
--- a/editors/openoffice-1.0/files/patch-stoc+source+javaloader+makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../stoc/source/javaloader/makefile.mk.orig	Tue Jan  1 14:12:02 2002
-+++ ../stoc/source/javaloader/makefile.mk
-@@ -83,9 +83,10 @@
- SHL1TARGET= $(TARGET)
- 
- SHL1STDLIBS=\
-+		$(SALLIB)		\
- 		$(CPPUHELPERLIB) 	\
--		$(CPPULIB)			\
--		$(SALLIB)
-+		$(CPPULIB)
-+
- SHL1VERSIONMAP=$(TARGET).map
- SHL1DEPN=		
- SHL1IMPLIB=		i$(TARGET)
diff --git a/editors/openoffice-1.0/files/patch-stoc+source+javavm+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+javavm+makefile.mk
deleted file mode 100644
index f97af0ea270d..000000000000
--- a/editors/openoffice-1.0/files/patch-stoc+source+javavm+makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../stoc/source/javavm/makefile.mk.orig	Tue Jan  1 14:12:02 2002
-+++ ../stoc/source/javavm/makefile.mk
-@@ -91,10 +91,10 @@
- SHL1TARGET= $(TARGET)
- SHL1VERSIONMAP=$(TARGET).map
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPUHELPERLIB) 	\
- 		$(CPPULIB)	    	\
--		$(UNOLIB)	    	\
--		$(SALLIB)
-+		$(UNOLIB)
- 
- .IF "$(GUI)"=="WNT"
- SHL1STDLIBS += advapi32.lib
diff --git a/editors/openoffice-1.0/files/patch-stoc+source+loader+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+loader+makefile.mk
deleted file mode 100644
index 5a08ee5937b6..000000000000
--- a/editors/openoffice-1.0/files/patch-stoc+source+loader+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice-1.0/files/patch-stoc+source+namingservice+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+namingservice+makefile.mk
deleted file mode 100644
index e573081bc21d..000000000000
--- a/editors/openoffice-1.0/files/patch-stoc+source+namingservice+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice-1.0/files/patch-stoc+source+proxy_factory+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+proxy_factory+makefile.mk
deleted file mode 100644
index 9110b2f50cd1..000000000000
--- a/editors/openoffice-1.0/files/patch-stoc+source+proxy_factory+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-1.0/files/patch-stoc+source+registry_tdprovider+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+registry_tdprovider+makefile.mk
deleted file mode 100644
index 9d974d1c0d10..000000000000
--- a/editors/openoffice-1.0/files/patch-stoc+source+registry_tdprovider+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.0/files/patch-stoc+source+servicemanager+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+servicemanager+makefile.mk
deleted file mode 100644
index 746776d54759..000000000000
--- a/editors/openoffice-1.0/files/patch-stoc+source+servicemanager+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-1.0/files/patch-stoc+source+tdmanager+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+tdmanager+makefile.mk
deleted file mode 100644
index 76403fdde841..000000000000
--- a/editors/openoffice-1.0/files/patch-stoc+source+tdmanager+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice-1.0/files/patch-stoc+source+typeconv+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+typeconv+makefile.mk
deleted file mode 100644
index dc647f89a166..000000000000
--- a/editors/openoffice-1.0/files/patch-stoc+source+typeconv+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.0/files/patch-svx+source+dialog+txenctab.src b/editors/openoffice-1.0/files/patch-svx+source+dialog+txenctab.src
deleted file mode 100644
index b8178b78384c..000000000000
--- a/editors/openoffice-1.0/files/patch-svx+source+dialog+txenctab.src
+++ /dev/null
@@ -1,44 +0,0 @@
---- ../svx/source/dialog/txenctab.src.orig	Thu Oct 31 23:18:23 2002
-+++ ../svx/source/dialog/txenctab.src	Tue Feb 25 16:57:06 2003
-@@ -147,6 +147,7 @@
-         < "Japanisch (ISO-2022-JP)"                         ; RTL_TEXTENCODING_ISO_2022_JP      ; > ;
-         < "Chinesisch vereinfacht (ISO-2022-CN)"            ; RTL_TEXTENCODING_ISO_2022_CN      ; > ;
- 		< "Kyrillisch (KOI8-R)"								; RTL_TEXTENCODING_KOI8_R			; > ;
-+		< "Kyrillisch (KOI8-U)"								; RTL_TEXTENCODING_KOI8_U			; > ;
- 		< "Unicode (UTF-7)"									; RTL_TEXTENCODING_UTF7				; > ;
- 		< "Unicode (UTF-8)"									; RTL_TEXTENCODING_UTF8				; > ;
- 		< "Osteuropa (ISO-8859-10)"							; RTL_TEXTENCODING_ISO_8859_10		; > ;
-@@ -235,6 +236,7 @@
-         < "Japanese (ISO-2022-JP)"                          ; RTL_TEXTENCODING_ISO_2022_JP      ; > ;
-         < "Chinese Simplified (ISO-2022-CN)"                ; RTL_TEXTENCODING_ISO_2022_CN      ; > ;
- 		< "Cyrillic (KOI8-R)"                               ; RTL_TEXTENCODING_KOI8_R			; > ;
-+		< "Cyrillic (KOI8-U)"                               ; RTL_TEXTENCODING_KOI8_U			; > ;
- 		< "Unicode (UTF-7)"                                 ; RTL_TEXTENCODING_UTF7				; > ;
- 		< "Unicode (UTF-8)"                                 ; RTL_TEXTENCODING_UTF8				; > ;
- 		< "Central European (ISO-8859-10)"                  ; RTL_TEXTENCODING_ISO_8859_10		; > ;
-@@ -308,6 +310,7 @@
-         < "Japanisch (ISO-2022-JP)"                         ; RTL_TEXTENCODING_ISO_2022_JP      ; > ;
-         < "Chinesisch vereinfacht (ISO-2022-CN)"            ; RTL_TEXTENCODING_ISO_2022_CN      ; > ;
- 		< "Kyrillisch (KOI8-R)"								; RTL_TEXTENCODING_KOI8_R			; > ;
-+		< "Kyrillisch (KOI8-U)"								; RTL_TEXTENCODING_KOI8_U			; > ;
- 		< "Unicode (UTF-7)"									; RTL_TEXTENCODING_UTF7				; > ;
- 		< "Unicode (UTF-8)"									; RTL_TEXTENCODING_UTF8				; > ;
- 		< "Osteuropa (ISO-8859-10)"							; RTL_TEXTENCODING_ISO_8859_10		; > ;
-@@ -378,6 +381,7 @@
-         < "Japanese (ISO-2022-JP)"                         ; RTL_TEXTENCODING_ISO_2022_JP      ; > ;
-         < "Chinese simplified (ISO-2022-CN)"            ; RTL_TEXTENCODING_ISO_2022_CN      ; > ;
- 		< "Cyrillic (KOI8-R)"								; RTL_TEXTENCODING_KOI8_R			; > ;
-+		< "Cyrillic (KOI8-U)"								; RTL_TEXTENCODING_KOI8_U			; > ;
- 		< "Unicode (UTF-7)"									; RTL_TEXTENCODING_UTF7				; > ;
- 		< "Unicode (UTF-8)"									; RTL_TEXTENCODING_UTF8				; > ;
- 		< "Eastern Europe (ISO-8859-10)"							; RTL_TEXTENCODING_ISO_8859_10		; > ;
-@@ -512,7 +516,8 @@
- 		< "Êèòàéñêèé òðàäèöèîííûé (BIG5)"			; RTL_TEXTENCODING_GBK				; > ;
- 		< "ßïîíñêèé (EUC-JP)"					; RTL_TEXTENCODING_BIG5				; > ;
- 		< "Êèòàéñêèé óïðîùåííûé (EUC-CN)"								; RTL_TEXTENCODING_EUC_JP			; > ;
--		< "Êèðèëëè÷åñêèé (KOI8-R)"					; RTL_TEXTENCODING_EUC_CN			; > ;
-+		< "Êèðèëëè÷åñêèé (KOI8-R)"					; RTL_TEXTENCODING_KOI8_R			; > ;
-+		< "Êèðèëëè÷åñêèé (KOI8-U)"					; RTL_TEXTENCODING_KOI8_U			; > ;
-         < "Þíèêîä (UTF-7)"                ; RTL_TEXTENCODING_EUC_TW           ; > ;
-         < "Þíèêîä (UTF-8)"                         ; RTL_TEXTENCODING_ISO_2022_JP      ; > ;
-         < "Âîñòî÷íîåâðîïåéñêèé (ISO-8859-10)"            ; RTL_TEXTENCODING_ISO_2022_CN      ; > ;
diff --git a/editors/openoffice-1.0/files/patch-svx+source+fmcomp+makefile.mk b/editors/openoffice-1.0/files/patch-svx+source+fmcomp+makefile.mk
deleted file mode 100644
index b16030080c0d..000000000000
--- a/editors/openoffice-1.0/files/patch-svx+source+fmcomp+makefile.mk
+++ /dev/null
@@ -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= \
diff --git a/editors/openoffice-1.0/files/patch-sw+source+filter+basflt+fltini.cxx b/editors/openoffice-1.0/files/patch-sw+source+filter+basflt+fltini.cxx
deleted file mode 100644
index 4029175a3236..000000000000
--- a/editors/openoffice-1.0/files/patch-sw+source+filter+basflt+fltini.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../sw/source/filter/basflt/fltini.cxx.orig	Mon Feb 24 17:46:43 2003
-+++ ../sw/source/filter/basflt/fltini.cxx	Tue Feb 25 16:59:03 2003
-@@ -1007,7 +1007,8 @@
- 		sToken081[] = "JIS_X_212",
- 		sToken082[] = "MS_1361",
- 		sToken083[] = "GB_18030",
--		sToken084[] = "UNICODE_2"
-+		sToken084[] = "KOI8_U",
-+		sToken085[] = "UNICODE_2"
- 			;
- 	struct _Dummy_MAP
- 	{
-@@ -1099,7 +1100,8 @@
- 		RTL_TEXTENCODING_JIS_X_0212,            sToken081,
- 		RTL_TEXTENCODING_MS_1361,               sToken082,
- 		RTL_TEXTENCODING_GB_18030,              sToken083,
--		RTL_TEXTENCODING_UCS2,              	sToken084
-+		RTL_TEXTENCODING_KOI8_U,              	sToken084,
-+		RTL_TEXTENCODING_UCS2,              	sToken085
- 	};
- 
- 	BOOL bFnd = FALSE;
diff --git a/editors/openoffice-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx b/editors/openoffice-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index ec91def86fe6..000000000000
--- a/editors/openoffice-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Fri Aug 16 18:56:19 2002
-+++ ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx	Sat Jan 18 13:06:16 2003
-@@ -62,7 +62,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
--#ifndef MACOSX
-+#if !(defined NETBSD || defined FREEBSD || defined MACOSX)
- #include <alloca.h>
- #endif
- #include <string.h>
diff --git a/editors/openoffice-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx b/editors/openoffice-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx
deleted file mode 100644
index e7497406c222..000000000000
--- a/editors/openoffice-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../sysui/tools/lngconv/lngconv.cxx.orig	Sat Jul 20 23:14:29 2002
-+++ ../sysui/tools/lngconv/lngconv.cxx	Sat Jul 20 23:14:34 2002
-@@ -62,7 +62,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- 
--#if defined( LINUX ) || defined (SOLARIS)
-+#if defined(LINUX) || defined (SOLARIS) || defined (FREEBSD)
- #include <locale.h>
- #include <langinfo.h>
- #endif
-@@ -143,6 +143,7 @@
-     { "iso8859-8",    RTL_TEXTENCODING_ISO_8859_8  },
-     { "iso8859-9",    RTL_TEXTENCODING_ISO_8859_9  },
-     { "koi8-r",       RTL_TEXTENCODING_KOI8_R      },
-+    { "koi8-u",       RTL_TEXTENCODING_KOI8_U      },
-     { "pck",          RTL_TEXTENCODING_MS_932      },
- #if (0)
-     { "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW    },
diff --git a/editors/openoffice-1.0/files/patch-sysui+unix+office+cde+locales.tab b/editors/openoffice-1.0/files/patch-sysui+unix+office+cde+locales.tab
deleted file mode 100644
index 0c91acc455d1..000000000000
--- a/editors/openoffice-1.0/files/patch-sysui+unix+office+cde+locales.tab
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../sysui/unix/office/cde/locales.tab.orig	Tue Nov 20 19:26:28 2001
-+++ ../sysui/unix/office/cde/locales.tab	Tue Feb 25 17:04:36 2003
-@@ -7,6 +7,7 @@
- locales+=$(assign locale_34 = es es.UTF-8)
- locales+=$(assign locale_35 = fi fi.UTF-8)
- locales+=$(assign locale_37 = ca)
-+locales+=$(assign locale_38 = uk uk_UA.KOI8-U)
- locales+=$(assign locale_39 = it it.UTF-8)
- locales+=$(assign locale_45 = da da.UTF-8)
- locales+=$(assign locale_46 = sv sv.UTF-8)
diff --git a/editors/openoffice-1.0/files/patch-tools+bootstrp+makefile.mk b/editors/openoffice-1.0/files/patch-tools+bootstrp+makefile.mk
deleted file mode 100644
index b188641846f0..000000000000
--- a/editors/openoffice-1.0/files/patch-tools+bootstrp+makefile.mk
+++ /dev/null
@@ -1,23 +0,0 @@
---- ../tools/bootstrp/makefile.mk.orig	Tue Jan  1 14:12:19 2002
-+++ ../tools/bootstrp/makefile.mk
-@@ -83,6 +83,15 @@
- 	@echo No bootstrp for Mac OS
- .ELSE	# "$(OS)"=="MACOS"
- 
-+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
-+ALLTAR2: $(LB)$/libgcc_pic.a $(LB)$/libgcc.a ALLTAR 
-+	@echo ""
-+$(LB)$/libgcc_pic.a:
-+	-objcopy -L set_new_handler__FPFv_v /usr/lib/libgcc_pic.a $(LB)$/libgcc_pic.a
-+$(LB)$/libgcc.a:
-+	objcopy -L set_new_handler__FPFv_v `gcc -print-libgcc-file-name` $(LB)$/libgcc.a
-+.ENDIF
-+
- OBJFILES=                       \
- 	$(OBJ)$/sstring.obj     \
- 	$(OBJ)$/appdef.obj      \
-@@ -172,3 +181,4 @@
- # --- Targets ------------------------------------------------------
- 
- .INCLUDE :  target.mk
-+
diff --git a/editors/openoffice-1.0/files/patch-tools+inc+inetdef.hxx b/editors/openoffice-1.0/files/patch-tools+inc+inetdef.hxx
deleted file mode 100644
index a9e02c684019..000000000000
--- a/editors/openoffice-1.0/files/patch-tools+inc+inetdef.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../tools/inc/inetdef.hxx.orig	Sun Jul 21 00:59:36 2002
-+++ ../tools/inc/inetdef.hxx	Sun Jul 21 00:59:38 2002
-@@ -90,6 +90,8 @@
- #define TOOLS_INETDEF_OS "NETBSD Sparc"
- #elif defined LINUX && defined X86
- #define TOOLS_INETDEF_OS "Linux"
-+#elif defined FREEBSD && defined X86
-+#define TOOLS_INETDEF_OS "FreeBSD"
- #elif defined SINIX
- #define TOOLS_INETDEF_OS "SINIX"
- #elif defined IRIX
diff --git a/editors/openoffice-1.0/files/patch-tools+source+inet+inetmime.cxx b/editors/openoffice-1.0/files/patch-tools+source+inet+inetmime.cxx
deleted file mode 100644
index 58fc8db2a85b..000000000000
--- a/editors/openoffice-1.0/files/patch-tools+source+inet+inetmime.cxx
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../tools/source/inet/inetmime.cxx.orig	Mon Feb 24 17:46:55 2003
-+++ ../tools/source/inet/inetmime.cxx	Tue Feb 25 17:08:22 2003
-@@ -1633,7 +1633,8 @@
- 				"ISO-8859-10", // RTL_TEXTENCODING_ISO_8859_10, RFC 2047
- 				"ISO-8859-13", // RTL_TEXTENCODING_ISO_8859_13, RFC 2047
- 				"EUC-KR", // RTL_TEXTENCODING_EUC_KR
--				"ISO-2022-KR" }; // RTL_TEXTENCODING_ISO_2022_KR
-+				"ISO-2022-KR", // RTL_TEXTENCODING_ISO_2022_KR
-+				"KOI8-U" }; // RTL_TEXTENCODING_KOI8_U
- 		DBG_ASSERT(aMap[eEncoding],
- 				   "INetMIME::getCharsetName(): Unsupported encoding");
- 		return aMap[eEncoding];
-@@ -1841,7 +1842,8 @@
- 		{ "ISO-10646-UCS-4", RTL_TEXTENCODING_UCS4 },
- 		{ "CSUCS4", RTL_TEXTENCODING_UCS4 },
- 		{ "ISO-10646-UCS-2", RTL_TEXTENCODING_UCS2 },
--		{ "CSUNICODE", RTL_TEXTENCODING_UCS2 } };
-+		{ "CSUNICODE", RTL_TEXTENCODING_UCS2 },
-+		{ "KOI8-U", RTL_TEXTENCODING_KOI8_U } };
- 
- //============================================================================
- template< typename T >
-@@ -2012,6 +2014,18 @@
- 		// <ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/KOI8-R.TXT>
- 		// version 1.0 of 18 August 1999
- 
-+	static const sal_uInt32 aKOI8URanges[]
-+		= { 0, 0x7F, 0xA0, 0xA0, 0xA9, 0xA9, 0xB0, 0xB0, 0xB2, 0xB2,
-+			0xB7, 0xB7, 0xF7, 0xF7, 0x401, 0x401, 0x410, 0x44F, 0x451, 0x451,
-+			0x2219, 0x221A, 0x2248, 0x2248, 0x2264, 0x2265, 0x2320, 0x2321,
-+			0x2500, 0x2500, 0x2502, 0x2502, 0x250C, 0x250C, 0x2510, 0x2510,
-+			0x2514, 0x2514, 0x2518, 0x2518, 0x251C, 0x251C, 0x2524, 0x2524,
-+			0x252C, 0x252C, 0x2534, 0x2534, 0x253C, 0x253C, 0x2550, 0x256C,
-+			0x2580, 0x2580, 0x2584, 0x2584, 0x2588, 0x2588, 0x258C, 0x258C,
-+			0x2590, 0x2593, 0x25A0, 0x25A0, sal_uInt32(-1) };
-+		// <ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/KOI8-R.TXT>
-+		// version 1.0 of 18 August 1999
-+
- 	static const sal_uInt32 aWindows1252Ranges[]
- 		= { 0, 0x7F, 0xA0, 0xFF, 0x152, 0x153, 0x160, 0x161, 0x178, 0x178,
- 			0x17D, 0x17E, 0x192, 0x192, 0x2C6, 0x2C6, 0x2DC, 0x2DC,
-@@ -2133,6 +2147,12 @@
- 			pList->prepend(Charset(RTL_TEXTENCODING_ISO_8859_5,
- 								   aISO88595Ranges));
- 			pList->prepend(Charset(RTL_TEXTENCODING_KOI8_R, aKOI8RRanges));
-+			break;
-+
-+		case RTL_TEXTENCODING_KOI8_U:
-+			pList->prepend(Charset(RTL_TEXTENCODING_ISO_8859_5,
-+								   aISO88595Ranges));
-+			pList->prepend(Charset(RTL_TEXTENCODING_KOI8_U, aKOI8URanges));
- 			break;
- 
- 		default: //@@@ more cases are missing!
diff --git a/editors/openoffice-1.0/files/patch-tools+source+rc+resmgr.cxx b/editors/openoffice-1.0/files/patch-tools+source+rc+resmgr.cxx
deleted file mode 100644
index 7e6174dd56fe..000000000000
--- a/editors/openoffice-1.0/files/patch-tools+source+rc+resmgr.cxx
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../tools/source/rc/resmgr.cxx.orig	Mon Feb 24 17:46:55 2003
-+++ ../tools/source/rc/resmgr.cxx	Tue Feb 25 17:09:39 2003
-@@ -1189,6 +1189,8 @@
-                 return "36";
-             case LANGUAGE_RUSSIAN:
-                 return "07";
-+            case LANGUAGE_UKRAINIAN:
-+                return "38";
-             case LANGUAGE_SLOVAK:
-                 return "04";
-             case LANGUAGE_GREEK:
-@@ -1339,6 +1341,7 @@
-         LANGUAGE_HUNGARIAN,
-         LANGUAGE_CZECH,
-         LANGUAGE_RUSSIAN,
-+        LANGUAGE_UKRAINIAN,
-         LANGUAGE_ARABIC,
-         LANGUAGE_GREEK,
-         LANGUAGE_KOREAN,
diff --git a/editors/openoffice-1.0/files/patch-tools+source+string+tstring.cxx b/editors/openoffice-1.0/files/patch-tools+source+string+tstring.cxx
deleted file mode 100644
index 12bd6bd0b244..000000000000
--- a/editors/openoffice-1.0/files/patch-tools+source+string+tstring.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../tools/source/string/tstring.cxx.orig	Sat Aug 10 12:53:42 2002
-+++ ../tools/source/string/tstring.cxx	Sat Aug 10 12:54:16 2002
-@@ -103,6 +103,9 @@
- xub_StrLen ImplStringLen( const sal_Char* pStr )
- {
- 	const sal_Char* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
-@@ -113,6 +116,9 @@
- xub_StrLen ImplStringLen( const sal_Unicode* pStr )
- {
- 	const sal_Unicode* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
diff --git a/editors/openoffice-1.0/files/patch-transex3+inc+export.hxx b/editors/openoffice-1.0/files/patch-transex3+inc+export.hxx
deleted file mode 100644
index 1263573285d3..000000000000
--- a/editors/openoffice-1.0/files/patch-transex3+inc+export.hxx
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../transex3/inc/export.hxx.orig	Fri May 24 15:26:18 2002
-+++ ../transex3/inc/export.hxx	Tue Feb 25 17:13:09 2003
-@@ -187,18 +187,22 @@
- #define CATALAN_ISO				"ca"
- #define CATALAN_INDEX				28
- 
-+#define UKRAINIAN					38
-+#define UKRAINIAN_ISO				"uk"
-+#define UKRAINIAN_INDEX				29
-+
- #define THAI					66
- #define THAI_ISO				"th"
--#define THAI_INDEX					29
-+#define THAI_INDEX					30
- 
- // special language for l10n framework
- #define EXTERN					99
--#define EXTERN_INDEX				30
-+#define EXTERN_INDEX				31
- 
--#define LANGUAGES					31
-+#define LANGUAGES					32
- 
- #define LANGUAGE_ALLOWED( n )  (( n != 0xFFFF ) && ( Export::LanguageAllowed( Export::LangId[ n ] )) && 													\
--							   (( Export::LangId[ n ] == 01 ) || ( Export::LangId[ n ] == 03 ) || ( Export::LangId[ n ] == 07 ) || 	\
-+							   (( Export::LangId[ n ] == 01 ) || ( Export::LangId[ n ] == 03 ) || ( Export::LangId[ n ] == 07 ) || ( Export::LangId[ n ] == 38 ) ||	\
- 								( Export::LangId[ n ] == 30 ) || ( Export::LangId[ n ] == 31 ) || ( Export::LangId[ n ] == 33 ) ||   	\
- 								( Export::LangId[ n ] == 34 ) || ( Export::LangId[ n ] == 35 ) || ( Export::LangId[ n ] == 37 ) || 	\
- 								( Export::LangId[ n ] == 39 ) || ( Export::LangId[ n ] == 45 ) || ( Export::LangId[ n ] == 46 ) || 	\
diff --git a/editors/openoffice-1.0/files/patch-transex3+source+export.cxx b/editors/openoffice-1.0/files/patch-transex3+source+export.cxx
deleted file mode 100644
index b5ee0d1b294e..000000000000
--- a/editors/openoffice-1.0/files/patch-transex3+source+export.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../transex3/source/export.cxx.orig	Mon Feb 24 17:45:55 2003
-+++ ../transex3/source/export.cxx	Tue Feb 25 17:14:06 2003
-@@ -1205,6 +1205,8 @@
- 		return PORTUGUESE_INDEX;
- 	else if ( sLang == "RUSSIAN" )
- 		return RUSSIAN_INDEX;
-+	else if ( sLang == "UKRAINIAN" )
-+		return UKRAINIAN_INDEX;
- 	else if ( sLang == "GREEK" )
- 		return GREEK_INDEX;
- 	else if ( sLang == "DUTCH" )
diff --git a/editors/openoffice-1.0/files/patch-transex3+source+export2.cxx b/editors/openoffice-1.0/files/patch-transex3+source+export2.cxx
deleted file mode 100644
index 031b9bdf4b8f..000000000000
--- a/editors/openoffice-1.0/files/patch-transex3+source+export2.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
---- ../transex3/source/export2.cxx.orig	Mon Feb 24 17:45:55 2003
-+++ ../transex3/source/export2.cxx	Tue Feb 25 17:19:19 2003
-@@ -144,6 +144,7 @@
- 	ARABIC,
- 	HEBREW,
- 	CATALAN,
-+	UKRAINIAN,
- 	THAI,
- 	EXTERN
- };
-@@ -192,6 +193,7 @@
- 		case ARABIC: return RTL_TEXTENCODING_MS_1256;
- 		case HEBREW: return RTL_TEXTENCODING_MS_1255;
- 		case CATALAN: return RTL_TEXTENCODING_MS_1252;
-+		case UKRAINIAN: return RTL_TEXTENCODING_MS_1251;
- 		case THAI: return RTL_TEXTENCODING_UTF8;
- 		case EXTERN: return RTL_TEXTENCODING_UTF8;
- 	}
-@@ -214,6 +216,8 @@
- 		return PORTUGUESE;
- 	else if ( sLang == ByteString( RUSSIAN_ISO ).ToUpperAscii())
- 		return RUSSIAN;
-+	else if ( sLang == ByteString( UKRAINIAN_ISO ).ToUpperAscii())
-+		return UKRAINIAN;
- 	else if ( sLang == ByteString( GREEK_ISO ).ToUpperAscii())
- 		return GREEK;
- 	else if ( sLang == ByteString( DUTCH_ISO ).ToUpperAscii())
-@@ -279,6 +283,7 @@
- 		case ENGLISH_US_INDEX: return ENGLISH_US_ISO;
- 		case PORTUGUESE_INDEX: return PORTUGUESE_ISO;
- 		case RUSSIAN_INDEX: return RUSSIAN_ISO;
-+		case UKRAINIAN_INDEX: return UKRAINIAN_ISO;
- 		case GREEK_INDEX: return GREEK_ISO;
- 		case DUTCH_INDEX: return DUTCH_ISO;
- 		case FRENCH_INDEX: return FRENCH_ISO;
-@@ -429,6 +434,7 @@
- 	"arabic",
- 	"hebrew",
- 	"catalan",
-+	"ukrainian",
- 	"thai",
- 	"extern"
- };
diff --git a/editors/openoffice-1.0/files/patch-transex3+source+gsiconv.cxx b/editors/openoffice-1.0/files/patch-transex3+source+gsiconv.cxx
deleted file mode 100644
index 4bad0a9b6b2b..000000000000
--- a/editors/openoffice-1.0/files/patch-transex3+source+gsiconv.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../transex3/source/gsiconv.cxx.orig	Mon Feb 24 17:45:55 2003
-+++ ../transex3/source/gsiconv.cxx	Tue Feb 25 17:20:08 2003
-@@ -210,6 +210,7 @@
- 	fprintf( stdout, "          34 => SPANISH\n" );
- 	fprintf( stdout, "          35 => FINNISH\n" );
- 	fprintf( stdout, "          36 => HUNGARIAN\n" );
-+	fprintf( stdout, "          38 => UKRAINIAN\n" );
- 	fprintf( stdout, "          39 => ITALIAN\n" );
- 	fprintf( stdout, "          42 => CZECH\n" );
- 	fprintf( stdout, "          44 => ENGLISH (UK)\n" );
diff --git a/editors/openoffice-1.0/files/patch-transex3+source+merge.cxx b/editors/openoffice-1.0/files/patch-transex3+source+merge.cxx
deleted file mode 100644
index 6137c2a2408d..000000000000
--- a/editors/openoffice-1.0/files/patch-transex3+source+merge.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../transex3/source/merge.cxx.orig	Mon Feb 24 17:45:55 2003
-+++ ../transex3/source/merge.cxx	Tue Feb 25 17:20:43 2003
-@@ -388,6 +388,7 @@
- 		case ENGLISH_US: return ENGLISH_US_INDEX;
- 		case PORTUGUESE: return PORTUGUESE_INDEX;
- 		case RUSSIAN: return RUSSIAN_INDEX;
-+		case UKRAINIAN: return UKRAINIAN_INDEX;
- 		case GREEK: return GREEK_INDEX;
- 		case DUTCH: return DUTCH_INDEX;
- 		case FRENCH: return FRENCH_INDEX;
diff --git a/editors/openoffice-1.0/files/patch-ucb+source+ucp+hierarchy+makefile.mk b/editors/openoffice-1.0/files/patch-ucb+source+ucp+hierarchy+makefile.mk
deleted file mode 100644
index 18e68e89120b..000000000000
--- a/editors/openoffice-1.0/files/patch-ucb+source+ucp+hierarchy+makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../ucb/source/ucp/hierarchy/makefile.mk.orig	Wed Jun 12 01:34:50 2002
-+++ ../ucb/source/ucp/hierarchy/makefile.mk	Wed Jun 12 01:34:52 2002
-@@ -96,7 +96,7 @@
- 
- SHL1TARGET=$(TARGET)$(UCPHIER_MAJOR)
- SHL1IMPLIB=i$(TARGET)
--.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD"
-+.IF "$(OS)"=="MACOSX"
- .ELSE
- SHL1VERSIONMAP=	$(TARGET).map
- .ENDIF
diff --git a/editors/openoffice-1.0/files/patch-ucb+source+ucp+webdav+makefile.mk b/editors/openoffice-1.0/files/patch-ucb+source+ucp+webdav+makefile.mk
deleted file mode 100644
index 4b505c6571d8..000000000000
--- a/editors/openoffice-1.0/files/patch-ucb+source+ucp+webdav+makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../ucb/source/ucp/webdav/makefile.mk.orig	Wed Jun 12 01:04:43 2002
-+++ ../ucb/source/ucp/webdav/makefile.mk	Wed Jun 12 01:04:53 2002
-@@ -120,7 +120,7 @@
- 
- SHL1TARGET=$(TARGET)$(UCP_VERSION)
- SHL1IMPLIB=i$(TARGET)
--.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
-+.IF "$(OS)"=="MACOSX"
- .ELSE
- SHL1VERSIONMAP=exports.map
- .ENDIF
diff --git a/editors/openoffice-1.0/files/patch-unoil+com+sun+star+document+makefile.mk b/editors/openoffice-1.0/files/patch-unoil+com+sun+star+document+makefile.mk
deleted file mode 100644
index 63b73d0e107c..000000000000
--- a/editors/openoffice-1.0/files/patch-unoil+com+sun+star+document+makefile.mk
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../unoil/com/sun/star/document/makefile.mk.orig	Wed Sep 11 11:51:49 2002
-+++ ../unoil/com/sun/star/document/makefile.mk	Wed Sep 11 11:52:08 2002
-@@ -64,6 +64,7 @@
- PRJ		= ..$/..$/..$/..
- TARGET	= unoil_document
- PACKAGE	= com$/sun$/star$/document
-+GENJAVAFILES = $(GENJAVADIR)$/com/sun/star/task/XInteractionContinuation.java
- 
- # --- Settings -----------------------------------------------------
- 
diff --git a/editors/openoffice-1.0/files/patch-unoil+makefile.pmk b/editors/openoffice-1.0/files/patch-unoil+makefile.pmk
deleted file mode 100644
index 7febdabf7b4b..000000000000
--- a/editors/openoffice-1.0/files/patch-unoil+makefile.pmk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../unoil/makefile.pmk.orig	Fri Aug 31 18:04:43 2001
-+++ ../unoil/makefile.pmk	Thu Sep 12 12:17:50 2002
-@@ -74,8 +74,8 @@
- JAVAFILESLIST	:= $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java)
- .ENDIF          # "$(L10N_framework)"==""
- 
--GENJAVAFILES	:= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
--GENCLASSFILES	:= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
-+GENJAVAFILES	+= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
-+GENCLASSFILES	+= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
- 
- # --- Targets ------------------------------------------------------
- 
diff --git a/editors/openoffice-1.0/files/patch-unzip+source+file_io.c b/editors/openoffice-1.0/files/patch-unzip+source+file_io.c
deleted file mode 100644
index 2a838fe377b1..000000000000
--- a/editors/openoffice-1.0/files/patch-unzip+source+file_io.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../unzip/source/file_io.c.orig	Sat Apr  6 12:13:38 2002
-+++ ../unzip/source/file_io.c	Wed May  1 22:34:51 2002
-@@ -864,7 +864,7 @@
- #ifndef __386BSD__
- 	static struct timeb tbp;
- #endif /* !__386BSD__ */
--#elif !defined(NETBSD) /* !BSD */
-+#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */
- 	extern long timezone;
- #endif /* ?BSD */
- #endif /* ?AMIGA */
diff --git a/editors/openoffice-1.0/files/patch-unzip+source+misc.c b/editors/openoffice-1.0/files/patch-unzip+source+misc.c
deleted file mode 100644
index 649a976f4c4d..000000000000
--- a/editors/openoffice-1.0/files/patch-unzip+source+misc.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../unzip/source/misc.c.orig	Mon Jul 15 14:25:32 2002
-+++ ../unzip/source/misc.c	Mon Jul 15 14:27:15 2002
-@@ -300,9 +300,9 @@
-     static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
-     int yr, mo, dy, hh, mm, ss, leap;
-     long m_time, days=0;
--#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD))
--#if (defined(BSD) || defined(MTS) || defined(FREEBSD))
--#if !defined __386BSD__ && !defined FREEBSD
-+#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD))
-+#if (defined(BSD) || defined(MTS)
-+#if !defined __386BSD__
-     static struct timeb tbp;
- #endif /* __386BSD__ */
- #else /* !(BSD || MTS) */
diff --git a/editors/openoffice-1.0/files/patch-vcl+unx+source+app+osssound.cxx b/editors/openoffice-1.0/files/patch-vcl+unx+source+app+osssound.cxx
deleted file mode 100644
index af681e020472..000000000000
--- a/editors/openoffice-1.0/files/patch-vcl+unx+source+app+osssound.cxx
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../vcl/unx/source/app/osssound.cxx.orig	Sun Jul 21 10:20:34 2002
-+++ ../vcl/unx/source/app/osssound.cxx	Sun Jul 21 10:21:28 2002
-@@ -72,7 +72,11 @@
- #include <unistd.h>
- #include <string.h>
- #include <sys/ioctl.h>
-+#ifdef LINUX
- #include <linux/soundcard.h>
-+#else
-+#include <sys/soundcard.h>
-+#endif
- #include <errno.h>
- 
- #ifdef _USE_NAMESPACE
diff --git a/editors/openoffice-1.0/files/patch-vcl+unx+source+app+rptpsound.cxx b/editors/openoffice-1.0/files/patch-vcl+unx+source+app+rptpsound.cxx
deleted file mode 100644
index fca5510022f9..000000000000
--- a/editors/openoffice-1.0/files/patch-vcl+unx+source+app+rptpsound.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../vcl/unx/source/app/rptpsound.cxx.orig	Wed Oct 24 18:32:21 2001
-+++ ../vcl/unx/source/app/rptpsound.cxx	Sun Jun  2 22:01:07 2002
-@@ -78,6 +78,10 @@
- extern "C" int usleep(unsigned int);
- #endif
- 
-+#ifdef FREEBSD
-+#include <unistd.h>
-+#endif
-+
- #ifdef _USE_NAMESPACE
- using namespace vcl_sal;
- using namespace vos;
diff --git a/editors/openoffice-1.0/files/patch-vcl+unx+source+app+saldata.cxx b/editors/openoffice-1.0/files/patch-vcl+unx+source+app+saldata.cxx
deleted file mode 100644
index c292a93a8313..000000000000
--- a/editors/openoffice-1.0/files/patch-vcl+unx+source+app+saldata.cxx
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../vcl/unx/source/app/saldata.cxx.orig	Sun Jun  2 22:07:34 2002
-+++ ../vcl/unx/source/app/saldata.cxx	Sun Jun  2 22:08:22 2002
-@@ -78,6 +78,11 @@
- #ifdef AIX
- #include <strings.h>
- #endif
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#include <sys/time.h>
-+#include <unistd.h>
-+#endif
- 
- #ifndef _VOS_MUTEX_HXX
- #include <vos/mutex.hxx>
diff --git a/editors/openoffice-1.0/files/patch-vcl+unx+source+app+vsound.hxx b/editors/openoffice-1.0/files/patch-vcl+unx+source+app+vsound.hxx
deleted file mode 100644
index 028e7c9d64c1..000000000000
--- a/editors/openoffice-1.0/files/patch-vcl+unx+source+app+vsound.hxx
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../vcl/unx/source/app/vsound.hxx.orig	Sun Jul 21 00:10:24 2002
-+++ ../vcl/unx/source/app/vsound.hxx	Sun Jul 21 00:10:27 2002
-@@ -61,7 +61,7 @@
- #ifndef _VCL_VSOUND_HXX
- #define _VCL_VSOUND_HXX
- 
--#ifdef LINUX
-+#if defined(LINUX) || defined(FREEBSD)
- #define USE_OSS
- #endif
- 
-@@ -69,7 +69,7 @@
- #define USE_DEVAUDIO
- #endif
- 
--#if defined LINUX || defined SOLARIS
-+#if defined (LINUX) || defined(FREEBSD) || defined (SOLARIS)
- #define USE_NAS
- #endif
- 
diff --git a/editors/openoffice-1.0/files/patch-vcl+unx+source+gdi+salcvt.cxx b/editors/openoffice-1.0/files/patch-vcl+unx+source+gdi+salcvt.cxx
deleted file mode 100644
index 8b588120c718..000000000000
--- a/editors/openoffice-1.0/files/patch-vcl+unx+source+gdi+salcvt.cxx
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../vcl/unx/source/gdi/salcvt.cxx.orig	Mon Feb 24 17:46:21 2003
-+++ ../vcl/unx/source/gdi/salcvt.cxx	Tue Feb 25 17:21:50 2003
-@@ -261,6 +261,17 @@
- 					||	( nChar >= 0x2500 && nChar <= 0x25a0 );
- 			break;
- 
-+		case RTL_TEXTENCODING_KOI8_U:
-+			bMatch = 	( nChar >= 0x0020 && nChar <= 0x007e )
-+					||	( nChar >= 0x00a0 && nChar <= 0x00b7 )
-+					||	( nChar == 0x00f7 )
-+					||	( nChar >= 0x0401 && nChar <= 0x0491 )
-+					||	( nChar >= 0x2219 && nChar <= 0x221a )
-+					||	( nChar >= 0x2248 && nChar <= 0x2265 )
-+					||	( nChar >= 0x2320 && nChar <= 0x2321 )
-+					||	( nChar >= 0x2500 && nChar <= 0x25a0 );
-+			break;
-+
- 		case RTL_TEXTENCODING_UNICODE:
- 			bMatch = True;
- 			break;
diff --git a/editors/openoffice-1.0/files/patch-vcl+unx+source+gdi+xlfd_extd.cxx b/editors/openoffice-1.0/files/patch-vcl+unx+source+gdi+xlfd_extd.cxx
deleted file mode 100644
index 15142495e078..000000000000
--- a/editors/openoffice-1.0/files/patch-vcl+unx+source+gdi+xlfd_extd.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../vcl/unx/source/gdi/xlfd_extd.cxx.orig	Mon Feb 24 17:46:21 2003
-+++ ../vcl/unx/source/gdi/xlfd_extd.cxx	Tue Feb 25 17:22:26 2003
-@@ -205,6 +205,7 @@
- 			case RTL_TEXTENCODING_ISO_8859_15:
- 			case RTL_TEXTENCODING_MS_1251:
- 			case RTL_TEXTENCODING_KOI8_R:
-+			case RTL_TEXTENCODING_KOI8_U:
- 			case RTL_TEXTENCODING_JIS_X_0201:
- 				if ( nLargestRange < 0x0080 )
- 				{
diff --git a/editors/openoffice-1.0/files/patch-vcl+util+makefile.mk b/editors/openoffice-1.0/files/patch-vcl+util+makefile.mk
deleted file mode 100644
index 1ea13157ce57..000000000000
--- a/editors/openoffice-1.0/files/patch-vcl+util+makefile.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../vcl/util/makefile.mk.orig	Sun Jul 21 00:12:09 2002
-+++ ../vcl/util/makefile.mk	Sun Jul 21 00:12:11 2002
-@@ -293,9 +293,9 @@
- .ENDIF          # "$(OS)"=="MACOSX"
- .ENDIF          # "$(OS)"=="SOLARIS"
- 
--.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS"
-+.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
- SHL1STDLIBS += -laudio
--.ENDIF          # "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS"
-+.ENDIF          # "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
- 
- .ENDIF          # "$(GUI)"=="UNX"
- 
diff --git a/editors/openoffice-1.0/files/zipmoz.sh b/editors/openoffice-1.0/files/zipmoz.sh
deleted file mode 100644
index 43a4591f3430..000000000000
--- a/editors/openoffice-1.0/files/zipmoz.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/sh -f
-
-RUNTIME_FILES=" components/libabsyncsvc.so components/libaddrbook.so \
-		components/libmork.so components/libmozldap.so \
-		components/libnecko.so components/libprofile.so \
-		components/librdf.so components/libstrres.so \
-		components/libunicharutil.so components/libuconv.so \
-		components/libucvcn.so components/libucvibm.so \
-		components/libucvja.so components/libucvko.so \
-		components/libucvlatin.so components/libucvtw.so \
-		components/libucvtw2.so components/liburiloader.so \
-		components/libvcard.so components/libxpconnect.so \
-		components/libpref.so components/libchrome.so libmozjs.so \
-		libmsgbaseutil.so libldap50.so libnspr4.so libplc4.so \
-		libplds4.so libxpcom.so libmozz.so component.reg \
-		components/necko_dns.xpt components/xpcom_xpti.xpt \
-		components/xpcom_threads.xpt components/xpcom_io.xpt \
-		components/xpcom_ds.xpt components/xpcom_components.xpt \
-		components/xpcom_base.xpt components/xpti.dat \
-		defaults/pref/all.js defaults/pref/config.js \
-		defaults/pref/editor.js defaults/pref/initpref.js \
-		defaults/pref/inspector.js defaults/pref/mailnews.js \
-		defaults/pref/security-prefs.js defaults/pref/unix.js \
-		defaults/pref/xpinstall.js"
-
-LIB_FILES="	lib/libembed_base_s.a lib/libmozreg_s.a \
-		lib/libnspr4.so lib/libxpcom.so lib/libprldap50.so"
-
-INC_FILES="include/"
-INC_FILES2="public/"
-
-if [ $# -lt 2 -o $# -gt 3 ] ; then
-	echo 
-	echo usage: $0 mozilla_dist target [target_dir]
-	echo
-	echo where:
-	echo
-	echo "mozilla_dist points to the mozilla distribution"
-	echo "target concatenates  OS, compiler and CPU (e.g. FREEBSDGCCI etc)"
-	echo "target_dir is the directory to place the zips"
-	exit 1
-fi
-
-MOZ_DIST=$1
-TARGET=$2
-if [ "w$3" != "w" ]; then
-	TARGET_DIR=$3
-else
-	if [ "w$TARGET_DIR" == "w" ]; then
-		TARGET_DIR=
-	fi
-fi
-
-ZIP_TARGET=$TARGET_DIR
-if [ -z "$ZIP_TARGET" ] ; then
-	ZIP_TARGET=../
-fi
-
-# just to remember the current working directory
-STARTING_DIR=`pwd`
-
-echo
-echo --- creating zips for $TARGET, using mozilla distribution in $MOZ_DIST
-
-# Create the directories
-[ ! -d $TARGET_DIR/$TARGET/runtime ] && mkdir -p $TARGET_DIR/$TARGET/runtime
-[ ! -d $TARGET_DIR/$TARGET/runtime/components ] && mkdir -p $TARGET_DIR/$TARGET/runtime/components
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults/pref ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults/pref
-[ ! -d $TARGET_DIR/$TARGET/lib ] && mkdir -p $TARGET_DIR/$TARGET/lib
-[ ! -d $TARGET_DIR/$TARGET/inc ] && mkdir -p $TARGET_DIR/$TARGET/inc
-[ ! -d $TARGET_DIR/$TARGET/inc/nspr ] && mkdir -p $TARGET_DIR/$TARGET/inc/nspr
-[ ! -d $TARGET_DIR/$TARGET/inc/obsolete ] && mkdir -p $TARGET_DIR/$TARGET/inc/obsolete
-
-# Copy the files
-echo
-echo --- copying files
-echo
-
-for i in $RUNTIME_FILES; do
-	if [ ! -f $MOZ_DIST/bin/$i ]; then
-		echo $MOZ_DIST/bin/$i does not exist, check your distribution
-	else
-		if [ `echo $i | grep component` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/components/
-		elif [ `echo $i | grep defaults` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/defaults/pref/
-		else
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/
-		fi
-	fi
-done
-
-for i in $LIB_FILES; do
-	if [ ! -f $MOZ_DIST/$i ]; then
-		echo $MOZ_DIST/$i does not exist, check your distribution
-	else
-		cp -R -L $MOZ_DIST/$i $TARGET_DIR/$TARGET/lib/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES`; do
-	if [ ! -d $i ]; then 
-		cp -R -L $MOZ_DIST/include/$i $TARGET_DIR/$TARGET/inc/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES2`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/public/$i $TARGET_DIR/$TARGET/inc
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/$i $TARGET_DIR/$TARGET/inc/nspr
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr/obsolete`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/obsolete/$i $TARGET_DIR/$TARGET/inc/obsolete
-	fi
-done
-
-# delete old zips
-
-[ -f $TARGET_DIR/$TARGET/runtime.zip ] && rm -f $TARGET_DIR/$TARGET/runtime.zip
-[ -f $TARGET_DIR/$TARGET/lib.zip ] && rm -f $TARGET_DIR/$TARGET/lib.zip
-[ -f $TARGET_DIR/$TARGET/inc.zip ] && rm -f $TARGET_DIR/$TARGET/inc.zip
-
-# zip the runtime files
-
-echo
-echo --- creating ${TARGET}runtime.zip
-echo
-
-cd $TARGET_DIR/$TARGET/runtime
-find . -type f | zip $ZIP_TARGET/${TARGET}runtime.zip -@
-
-# zip the lib files
-echo 
-echo --- creating ${TARGET}lib.zip
-echo 
-
-cd $TARGET_DIR/$TARGET/lib
-find . -type f | zip $ZIP_TARGET/${TARGET}lib.zip -@
-
-# zip the inc files
-echo
-echo --- creating ${TARGET}inc.zip
-echo
-
-cd $TARGET_DIR/$TARGET/inc
-find . -type f | zip $ZIP_TARGET/${TARGET}inc.zip -@
-
-# remove dirs
-cd $STARTING_DIR
-rm -rf $TARGET_DIR/$TARGET
-
-echo
-echo --- done
-echo
-
diff --git a/editors/openoffice-1.0/pkg-descr b/editors/openoffice-1.0/pkg-descr
deleted file mode 100644
index 31fd1b12161a..000000000000
--- a/editors/openoffice-1.0/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-OpenOffice.org is an Open Source, community-developed, multi-platform office
-productivity suite. It includes the key desktop applications, such as a
-word processor, spreadsheet, presentation manager, and drawing program,
-with a user interface and feature set similar to other office suites.
-
-Components include:
-  * A universal word processing application for creating business
-    letters, extensive text documents, professional layouts, and HTML
-    documents.
-  * A sophisticated application for performing advanced spreadsheet
-    functions, such as analyzing figures, creating lists, and viewing data.
-  * A tool for creating effective eye-catching presentations.
-  * A vector-oriented draw module that enables the creation of 3D
-    illustrations
diff --git a/editors/openoffice-1.0/pkg-message b/editors/openoffice-1.0/pkg-message
deleted file mode 100644
index d34987ae0817..000000000000
--- a/editors/openoffice-1.0/pkg-message
+++ /dev/null
@@ -1,82 +0,0 @@
-OpenOffice.org Build 1.0.2 Personal Install How-To
-
-Written by:	Martin Blapp <mbr@freebsd.org>
-
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org1.0/
-
-1 User installation
--------------------
-
-Just type "openoffice" after you have successfully
-installed the package. If there is no installed
-OO.org dir in hour homedir, you'll be prompted to
-install some files and choose a installed JDK.
-The setup installs a "OpenOffice.org1.0.2" folder
-in your homedir.
-
-If the setup tells you there is already an installed
-version, you may look at the file ".sversionrc" in
-your homedir. In this file OpenOffice and StarOffice
-have both a line for each version which is installed.
-After removing the problematic line you should be able to
-install again.
-
-2 Start OO.org
---------------
-
-There are some wrappers installed for fast startup.
-Add "${PREFIX}/bin/" to your PATH and you will be able
-to use them.
-
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-OO.org does need $LANG to be set to a suitable value.
-If it is not already set, a default value is chosen.
-Some old X-Servers before XFree86 4.2 do not like the
-western locale with Euro symbol (ISO_8859-15).
-You should ignore the warning message then or upgrade to
-to a more recent X-server.
-
-If you have chosen US-ASCII as locale, you cannot load
-and save documents with special characters and these
-characters are also not available in swriter and scalc.
-
-3 Setup problems (FreeBSD < 4.7-RELEASE only)
----------------------------------------------
-
-If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the latest
-version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE.
-
-4 Crashes in URL-location bar (FreeBSD < 4.7-RELEASE only)
-----------------------------------------------------------
-
-OO.org can crash if you enter a non existing path
-or URL in the location bar. To fix these crashes
-you need the following patch. You will see this
-bug only if your OS is older than FreeBSD 4.7-RELEASE.
-
-http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff
-
-5 Crash at startup after using a localized version
---------------------------------------------------
-
-If you had installed the english version, and then have
-switched to a localized OO.org, it will crash instantly.
-
-To solve this issue, please remove the already installed
-OpenOffice.org1.0.2 dir in your homedir and remove the
-appropriate entry from ".sversionrc". After you have done
-this, redo the user installation and the problem will
-go away.
diff --git a/editors/openoffice-1.0/pkg-plist b/editors/openoffice-1.0/pkg-plist
deleted file mode 100644
index 28bd78453b52..000000000000
--- a/editors/openoffice-1.0/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, do not delete. Package list is generated automatically.
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
deleted file mode 100644
index 6f740924c399..000000000000
--- a/editors/openoffice-1.1-devel/Makefile
+++ /dev/null
@@ -1,580 +0,0 @@
-# New ports collection makefile for: OpenOffice
-# Date created:		28 Februar 2002
-# Whom:                 Martin Blapp
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openoffice
-PORTVERSION=	644
-CATEGORIES+=	editors
-MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
-		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
-		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
-		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ny1.mirror.openoffice.org/miscellaneous/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
-MASTER_SITE_SUBDIR=	${PORTVERSION}
-DISTFILES+=	oo_${PORTVERSION}_src.tar.bz2 \
-		gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
-
-BROKEN=		"Does not build"
-
-SORT?=	/usr/bin/sort
-FIND?=	/usr/bin/find
-CUT?=	/usr/bin/cut
-AWK?=	/usr/bin/awk
-GREP?=	/usr/bin/grep
-ZIP?=	${PREFIX}/bin/zip
-UNZIP?=	${PREFIX}/bin/unzip
-ANT?=	${LOCALBASE}/bin/ant
-TCSH?=	/bin/tcsh
-PASTE?=	/usr/bin/paste
-
-.include <bsd.port.pre.mk>
-
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
-DIST_SUBDIR=		openoffice
-DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
-
-#
-# configuration for language specific slave ports
-#
-.if !defined(LANG_EXT)
-LANG_EXT=01
-.else
-#
-# Add pkg-descr and pkg-message if available
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-#
-# LANG_CONFIGURE_ARG is missing for the german port
-#
-.if defined(LANG_EXT)
-CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG},ENUS
-.endif
-.endif
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
-
-EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-
-MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/jakarta-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-.if !defined(DISPLAY)
-BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
-.endif
-.if !defined(WITH_BSD_JDK)
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk14
-.else
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-.endif
-
-USE_PERL5=	yes
-USE_BZIP2=	yes
-USE_BISON=	yes
-USE_GMAKE=	yes
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
-.if !defined(WITH_BSD_JDK)
-JDKDIR?=	${LOCALBASE}/linux-sun-jdk1.4.1
-.else
-JDKDIR?=	${LOCALBASE}/jdk1.4.1
-.endif
-JAVAVM=         ${JDKDIR}/bin/java
-
-GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
-LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
-BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
-
-.if !defined(DISPLAY)
-DISPLAYHACK=localhost:1001
-.endif
-
-CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
-			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
-
-.if !defined(WITH_BSD_JDK)
-CONFIGURE_ARGS+=	--enable-linuxjdk=yes
-.endif
-
-.if defined(WITH_DEBUG)
-.if ${WITH_DEBUG} == 2
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-.endif
-
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"prefered language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
-	@${ECHO} "OPTIONS:"
-.if !defined(USE_GCC)
-	@${ECHO}
-	@${ECHO} "You can compile OO with different"
-	@${ECHO} "gcc compiler versions:"
-	@${ECHO}
-	@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.2"
-	@${ECHO} "to compile openoffice with your"
-	@${ECHO} "prefered compiler."
-.endif
-.if !defined(WITH_BSD_JDK)
-	@${ECHO}
-	@${ECHO} "If you like to use the native BSD"
-	@${ECHO} "JDK for the build system, you can use"
-	@${ECHO} "WITH_BSD_JDK=TRUE to disable the"
-	@${ECHO} "usage of the linux-JDK and linux dependency."
-	@${ECHO}
-.endif
-.if !defined(WITH_DEBUG)
-	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
-	@${ECHO} "if you call make with WITH_DEBUG=1"
-	@${ECHO}
-	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
-	@${ECHO}
-.endif
-.if !defined(WITH_TTF_BYTECODE_ENABLED)
-	@${ECHO}
-	@${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES"
-	@${ECHO} "if you like to use the Freetype library to"
-	@${ECHO} "render TTF fonts. Normally the TTF lib is"
-	@${ECHO} "not used to render fonts."
-	@${ECHO}
-	@${ECHO} "If you have licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479"
-	@${ECHO} "you can enable this option to get better"
-	@${ECHO} "quality of glyphs at small bitmap sizes."
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 450002
-	@${ECHO}
-	@${ECHO} "OS-VERSION ${OSVERSION} too low"
-	@${ECHO}
-	@${ECHO} "OO need some important libc_r and"
-	@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
-	@${ECHO} "RELEASE or 4.6 STABLE."
-	@${FALSE}
-.endif
-	@${ECHO}
-	@${ECHO} "NOTICE:"
-	@${ECHO}
-	@${ECHO} "To build Openoffice, you should have a lot"
-.if defined(WITH_DEBUG)
-	@${ECHO} "of free diskspace (~ 8GB)."
-.else
-	@${ECHO} "of free diskspace (~ 4GB)."
-.endif
-	@${ECHO}
-.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
-    (${OSVERSION} < 500000 && !defined(USE_GCC))
-	@${ECHO} "KERNEL CONFIGURATION:"
-	@${ECHO}
-	@${ECHO} "Openoffice needs a larger stack- and"
-	@${ECHO} "datasize to build. Check your limit"
-	@${ECHO} "settings and and put this in /boot/loader.conf"
-	@${ECHO} "if neccessary:"
-	@${ECHO}
-	@${ECHO} "kern.maxdsiz=\"1073741824\""
-	@${ECHO} "kern.maxssiz=\"268435456\""
-.endif
-	@${ECHO}
-.if ${OSVERSION} < 460002
-	@${ECHO} "REQUIRED SYSTEM PATCHES:"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO} "OO.org can crash if you enter a non existing path"
-	@${ECHO} "or URL in the location bar. To fix these crashes"
-	@${ECHO} "you need a uncommitted system patch for rtld:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460001
-	@${ECHO}
-	@${ECHO} "OO setup is broken on STABLE < 4.6"
-	@${ECHO} "including 4.6 RELEASE."
-	@${ECHO} "You'll need a system patch to solve"
-	@${ECHO} "this problem:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460002
-	@${ECHO}
-	@${ECHO} "OO.org soffice binary can deadlock. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO}
-	@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
-	@${ECHO}
-.endif
-.if !exists(/usr/include/langinfo.h)
-	@${ECHO}
-	@${ECHO} "langinfo.h is missing !"
-	@${ECHO}
-	@${ECHO} "Please upgrade to 4.6 RELEASE or"
-	@${ECHO} "4.6 STABLE."
-	@${ECHO}
-	@${FALSE}
-.endif
-
-post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
-	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
-	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@-${RM} -f ${WRKSRC}/../moz/zipped/*.zip
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
-.if defined(L10NHELP)
-	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
-	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
-.endif
-
-post-patch:
-	@${MAKE} patch-mozilla
-.if defined(WITH_TTF_BYTECODE_ENABLED)
-	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
-		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-			${ECHO_MSG} "===>   Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \
-		fi; \
-		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
-	fi
-.endif
-.if defined(WITH_DEBUG)
-	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
-		PATCHES_APPLIED="" ; \
-		for i in ${PATCHDIR}/debugpatch-*; do \
-			case $$i in \
-				*.orig|*.rej|*~) \
-					${ECHO_MSG} "===>   Ignoring patchfile $$i" ; \
-					;; \
-				*) \
-					if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-						${ECHO_MSG} "===>   Applying ${OPSYS} patch $$i" ; \
-					fi; \
-					if ${PATCH} ${PATCH_ARGS} < $$i ; then \
-						PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
-					else \
-						${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
-						if [ x"$$PATCHES_APPLIED" != x"" ]; then \
-							${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
-						fi; \
-						${FALSE} ; \
-					fi; \
-					;; \
-			esac; \
-		done; \
-	fi;
-.endif
-	@${ECHO_MSG} "===>  Find old malloc.h defines and fix them in ${PKGNAME} source"
-	@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
-		${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
-
-extract-mozilla:
-.if ! exists(${WRKDIR}/mozilla/Makefile)
-	@${ECHO_MSG} "===>  Extracting mozilla sub project"
-	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
-.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment)
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
-.endif
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
-.endif
-	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
-
-patch-mozilla:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
-		${WRKDIR}/mozilla/files/
-	@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
-
-build-mozilla:
-.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
-	@${ECHO_MSG} "===>  Building mozilla sub project"
-.if defined(WITH_DEBUG)
-	@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
-	@${SED} -e 's|--disable-debug||' \
-		-e 's|--disable-cpp-rtti||' \
-		-e 's|--enable-strip||' \
-		< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
-.endif
-.if defined(USE_GCC)
-	@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
-.else
-	@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
-.endif
-	@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
-	@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
-	@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
-.endif
-
-install-mozilla:
-	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
-
-register-mozilla:
-.if exists(${WRKDIR}/mozilla-runtime)
-	@${RM} -rf ${WRKDIR}/mozilla-runtime
-.endif
-	@${MKDIR} ${WRKDIR}/mozilla-runtime
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
-	@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
-	@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
-	@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
-		&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom 
-	@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
-		${WRKDIR}/mozilla-runtime/components/xptitemp.dat
-	@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
-	@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
-		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
-
-mozilla:
-	@${MAKE} extract-mozilla
-	@${MAKE} patch-mozilla
-	@${MAKE} build-mozilla
-	@${MAKE} register-mozilla
-	@${MAKE} install-mozilla
-
-do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
-	@${MAKE} mozilla
-.endif
-.endif
-.endif
-.if exists(${WRKDIR}/.Xvfb.pid)
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.endif
-.if !defined(DISPLAY)
-	#
-	# This is a UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-.endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
-	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-.endif
-.if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
-.endif
-
-pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-
-do-install:
-.if !defined(DISPLAY)
-	#
-	# UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-.endif
-
-install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
-
-post-install:
-	@${ECHO_MSG} "===>  Add wrapper scripts";
-	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
-	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
-
-package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
-.if defined(LANG_SUFFIX)
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
-.else
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
-.endif
-
-update:
-	@${MAKE} fetch
-	@${MAKE} extract
-	@cd ${WRKSRC}/.. && for dir in *; do \
-	    if [ -d $$dir ]; then \
-		cd $$dir; cvs update -d; cd ..; \
-	    fi \
-	done
-
-.include <bsd.port.post.mk>
diff --git a/editors/openoffice-1.1-devel/distinfo b/editors/openoffice-1.1-devel/distinfo
deleted file mode 100644
index ec9d6788f104..000000000000
--- a/editors/openoffice-1.1-devel/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
-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
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
diff --git 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
deleted file mode 100644
index 96c651ce22c8..000000000000
--- a/editors/openoffice-1.1-devel/files/debugpatch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../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
-@@ -902,6 +902,7 @@
- 
- void KillSetupDir()
- {
-+#if 0
-     DIR* pDir = opendir( strTmpPath );
-     struct dirent* pFile;
- 
-@@ -915,6 +916,10 @@
- 
-     chdir( strInitPath );
-     rmdir( strTmpPath );
-+#else
-+	fprintf(stderr, "\nLeaving behind temporary directory: %s\n",
-+	strTmpPath);
-+#endif
- }
- 
- void makeSymLink( char* s )
diff --git a/editors/openoffice-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 52bd2b3d58d6..000000000000
--- a/editors/openoffice-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
-+++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
- 
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- 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
- 
- # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
diff --git a/editors/openoffice-1.1-devel/files/oo_setup.resp b/editors/openoffice-1.1-devel/files/oo_setup.resp
deleted file mode 100644
index 8eeeb11bd95e..000000000000
--- a/editors/openoffice-1.1-devel/files/oo_setup.resp
+++ /dev/null
@@ -1,7 +0,0 @@
-[Environment]
-InstallationMode = INSTALL_NETWORK
-InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org-643
-
-[Java]
-JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice-1.1-devel/files/openoffice-wrapper b/editors/openoffice-1.1-devel/files/openoffice-wrapper
deleted file mode 100644
index ab39495b87e9..000000000000
--- a/editors/openoffice-1.1-devel/files/openoffice-wrapper
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.1-devel/files/Attic/openoffice-wrapper,v 1.3 2003-03-05 23:24:05 mbr Exp $
-
-oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/
-program=`echo $0 | sed -e 's|.*-||'`
-
-if [ ! $LANG ]; then
-	export LANG=%%LANG%%
-fi
-
-case $program in
-$0)
-	exec $oopath/soffice "$@"
-	;;
-	*)
-	exec $oopath/$program "$@"
-	;;
-esac
diff --git a/editors/openoffice-1.1-devel/files/optpatch-freetype+patch b/editors/openoffice-1.1-devel/files/optpatch-freetype+patch
deleted file mode 100644
index b426a8fb7fcc..000000000000
--- a/editors/openoffice-1.1-devel/files/optpatch-freetype+patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Index: files/patch-freetype::patch
-===================================================================
-RCS file: files/patch-freetype::patch
-diff -N files/patch-freetype::patch
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-freetype::patch	4 Aug 2002 15:27:42 -0000
-@@ -0,0 +1,201 @@
-+diff -ur ../freetype/freetype-2.0.5.patch oo641d_patched/freetype/freetype-2.0.5.patch
-+--- ../freetype/freetype-2.0.5.patch	Fri Apr  5 21:07:34 2002
-++++ ../freetype/freetype-2.0.5.patch	Sat Mar  9 18:04:17 2002
-+@@ -1,118 +1,79 @@
-+-*** misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 14 00:44:33 2000
-+---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 63,69 ****
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+---- 63,69 ----
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+-*** misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Jun  7 19:36:17 2001
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 631,637 ****
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+---- 631,637 ----
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile -DPIC $pic_flag"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Mon Jan  1 18:25:21 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 1,7 ****
-+---- 1,9 ----
-+-  FT_USE_MODULE(autohint_module_class)
-+-  FT_USE_MODULE(cff_driver_class)
-+-  FT_USE_MODULE(t1cid_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(pcf_driver_class)
-+-+ */
-+-  FT_USE_MODULE(psaux_module_class)
-+-  FT_USE_MODULE(psnames_module_class)
-+-  FT_USE_MODULE(ft_raster1_renderer_class)
-+-***************
-+-*** 9,12 ****
-+---- 11,16 ----
-+-  FT_USE_MODULE(ft_smooth_renderer_class)
-+-  FT_USE_MODULE(tt_driver_class)
-+-  FT_USE_MODULE(t1_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(winfnt_driver_class)
-+-+ */
-+-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h	Tue Aug 21 10:50:45 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 70,76 ****
-+---- 70,79 ----
-+-    /*   All convenience functions are declared as such in their             */
-+-    /*   documentation.                                                      */
-+-    /*                                                                       */
-+-+ /*
-+-  #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-+ */
-+-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-  
-+-  
-+-    /*************************************************************************/
-+-***************
-+-*** 108,116 ****
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-- 
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+---- 111,121 ----
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-+ /*
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-+ */
-+-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig	Mon Jan  7 14:21:35 2002
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Mon Jan  7 14:21:40 2002
-+-***************
-+-*** 2251,2257 ****
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age + 1`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-+---- 2251,2257 ----
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk
-++--- misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:49:17 2001
-++@@ -63,7 +63,7 @@
-++ #   ANSI compliance.
-++ #
-++ ifndef CFLAGS
-++-  CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+++  CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-++ endif
-++ 
-++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh
-++--- misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:47:56 2001
-+++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:49:17 2001
-++@@ -631,7 +631,7 @@
-++     if test "$build_old_libs" = yes; then
-++       if test "$pic_mode" != yes; then
-++ 	# Don't build PIC code
-++-	command="$base_compile $srcfile"
-+++	command="$base_compile $srcfile -DPIC $pic_flag"
-++       else
-++ 	# All platforms use -DPIC, to notify preprocessed assembler code.
-++ 	command="$base_compile $srcfile $pic_flag -DPIC"
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:49:17 2001
-++@@ -1,7 +1,9 @@
-++ FT_USE_MODULE(autohint_module_class)
-++ FT_USE_MODULE(cff_driver_class)
-++ FT_USE_MODULE(t1cid_driver_class)
-+++/*
-++ FT_USE_MODULE(pcf_driver_class)
-+++*/
-++ FT_USE_MODULE(psaux_module_class)
-++ FT_USE_MODULE(psnames_module_class)
-++ FT_USE_MODULE(ft_raster1_renderer_class)
-++@@ -9,4 +11,6 @@
-++ FT_USE_MODULE(ft_smooth_renderer_class)
-++ FT_USE_MODULE(tt_driver_class)
-++ FT_USE_MODULE(t1_driver_class)
-+++/*
-++ FT_USE_MODULE(winfnt_driver_class)
-+++*/
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:51:15 2001
-++@@ -70,7 +70,10 @@
-++   /*   All convenience functions are declared as such in their             */
-++   /*   documentation.                                                      */
-++   /*                                                                       */
-+++/*
-++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+++*/
-+++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-++ 
-++ 
-++   /*************************************************************************/
-++@@ -108,8 +111,10 @@
-++   /*   use a vector `plotter' format that isn't supported when this        */
-++   /*   macro is undefined.                                                 */
-++   /*                                                                       */
-+++/*
-++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++-
-+++*/
-+++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++ 
-++   /*************************************************************************/
-++   /*                                                                       */
-++@@ -338,7 +343,7 @@
-++   /* By undefining this, you will only compile the code necessary to load  */
-++   /* TrueType glyphs without hinting.                                      */
-++   /*                                                                       */
-++-#undef  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-+++#define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-++ 
-++ 
-++   /*************************************************************************/
diff --git a/editors/openoffice-1.1-devel/files/optpatch-vcl+util+makefile.pmk b/editors/openoffice-1.1-devel/files/optpatch-vcl+util+makefile.pmk
deleted file mode 100644
index 41341ff0b4e8..000000000000
--- a/editors/openoffice-1.1-devel/files/optpatch-vcl+util+makefile.pmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/util/makefile.pmk.orig	Mon Aug  5 01:39:41 2002
-+++ ../vcl/util/makefile.pmk	Mon Aug  5 01:40:03 2002
-@@ -64,7 +64,7 @@
- PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch
- PDBTARGET=vcl
- 
--.IF "$(OS)" != "MACOSX"
-+.IF "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- .IF "$(remote)" != ""
- USE_BUILTIN_RASTERIZER=true
- .ENDIF
diff --git 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
deleted file mode 100644
index 078685f3b516..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../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 freebsd genunix";;
-  	*)		JINCSUBDIRS="genunix";;
-  	esac
-  
diff --git a/editors/openoffice-1.1-devel/files/patch-bridges+prj+build.lst b/editors/openoffice-1.1-devel/files/patch-bridges+prj+build.lst
deleted file mode 100644
index fee3d847c5e6..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-bridges+prj+build.lst
+++ /dev/null
@@ -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
diff --git 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
deleted file mode 100644
index 99b8c566fb61..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ /dev/null
@@ -1,102 +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 );
-+    }
- }
- 
- }
diff --git 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
deleted file mode 100644
index 4622b7fe21c4..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice-1.1-devel/files/patch-comphelper+util+makefile.mk b/editors/openoffice-1.1-devel/files/patch-comphelper+util+makefile.mk
deleted file mode 100644
index f2d3092c2ddf..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-comphelper+util+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-1.1-devel/files/patch-config_office+configure.in b/editors/openoffice-1.1-devel/files/patch-config_office+configure.in
deleted file mode 100644
index a45332fcbec0..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,66 +0,0 @@
---- configure.in.orig	Thu Feb 20 15:49:32 2003
-+++ configure.in	Wed Mar  5 21:22:34 2003
-@@ -95,6 +95,12 @@
-                           
-                           Usage: --enable-macos9
- ],,)
-+AC_ARG_ENABLE(linuxjdk,
-+[  --enable-linuxjdk         Use this option option if you like to use
-+                          the linux-jdk instead of the native jdk.
-+
-+                          Usage: --enable-linuxjdk
-+],,)
- AC_ARG_WITH(lang,
- [  --with-lang             Use this option to build OpenOffice.org with
-                           additional language support. US English is always
-@@ -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
-@@ -1232,7 +1249,11 @@
- if test -n "$enable_debug"; then
-    ENABLE_DEBUG="TRUE"
- else
--   ENABLE_DEBUG="FALSE"
-+fi
-+if test -n "$enable_linuxjdk"; then
-+   USE_LINUXJDK="TRUE"
-+else
-+   USE_LINUXJDK="FALSE"
- fi
- 
- dnl ===================================================================
-@@ -1278,6 +1299,7 @@
- AC_SUBST(PTHREAD_CFLAGS)
- AC_SUBST(PTHREAD_LIBS)
- AC_SUBST(ENABLE_DEBUG)
-+AC_SUBST(USE_LINUXJDK)
- 
- AC_OUTPUT([set_soenv])
- 
diff --git 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
deleted file mode 100644
index 9ea6b11bdab2..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-config_office+set_soenv.in
+++ /dev/null
@@ -1,44 +0,0 @@
---- set_soenv.in.orig	Thu Feb 27 15:12:36 2003
-+++ set_soenv.in	Wed Mar  5 21:16:43 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, 
-@@ -88,7 +88,7 @@
-      $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
-      $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS,
-      $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
--     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG );
-+     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $USE_LINUXJDK );
- #
- #-------------------------------------------
- # IId. Declaring the aliases.
-@@ -140,7 +140,8 @@
- $CC			= '@CC@';           # C compiler
- $CXX		= '@CXX@';          # C++ compiler
- $EXCEPTIONS	= '@EXCEPTIONS@';   # Exception handling type
--$ENABLE_DEBUG	= '@ENABLE_DEBUG@';  # Enable a debug build
-+$ENABLE_DEBUG	= '@ENABLE_DEBUG@'; # Enable a debug build
-+$USE_LINUXJDK	= '@USE_LINUXJDK@'; # Use the Linux JDK
- $WRAPCMD	= "";				# Wrapper (only for winnt)
- 
- #
-@@ -1265,7 +1266,12 @@
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
- }
- elsif ($platform eq "$FreeBSD")
--{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+{
-+   if ($USE_LINUXJDK eq "TRUE") {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
-+   } else {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+   }
- }
- elsif ($platform eq "$NetBSD")
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
diff --git 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
deleted file mode 100644
index 2b83f2cd2ec7..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk
+++ /dev/null
@@ -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)					\
diff --git a/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
deleted file mode 100644
index 3601766ee561..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../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
-@@ -64,8 +64,8 @@
- #mozilla specific stuff.
- MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
- MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
--#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
--#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
-+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
-+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
- #End of mozilla specific stuff.
- 
- PRJ=..$/..$/..$/..
-@@ -107,7 +107,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -123,7 +123,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -141,7 +141,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS+=	    -DMOZILLA_CLIENT \
-             -DOSTYPE=\"Linux2.2.14-5\" -DOJI
- .IF "$(OS)" == "LINUX"
-@@ -157,6 +157,13 @@
-             -fno-rtti -Wall -Wconversion -Wpointer-arith \
-             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-             -Wno-long-long 
-+CDEFS     += -DTRACING
-+.ELIF "$(OS)" == "FREEBSD"
-+CFLAGS +=   -fPIC
-+CFLAGSCXX += \
-+            -fno-rtti -Wall -Wconversion -Wpointer-arith \
-+            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-+            -Wno-long-long -pthread 
- CDEFS     += -DTRACING
- .ENDIF
- .ENDIF
diff --git a/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk b/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
deleted file mode 100644
index b63d2a25f184..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
+++ /dev/null
@@ -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)
diff --git 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
deleted file mode 100644
index cb43c2d165e9..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-cppu+inc+uno+lbnames.h
+++ /dev/null
@@ -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."
diff --git a/editors/openoffice-1.1-devel/files/patch-cppu+prj+build.lst b/editors/openoffice-1.1-devel/files/patch-cppu+prj+build.lst
deleted file mode 100644
index 78fd210a1193..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-cppu+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.1-devel/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice-1.1-devel/files/patch-cppuhelper+source+makefile.mk
deleted file mode 100644
index 5fb5bd636eb1..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-cppuhelper+source+makefile.mk
+++ /dev/null
@@ -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 ------------------------------------------------------
diff --git 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
deleted file mode 100644
index 391667b66ebd..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-desktop+source+pkgchk+pkgchk_misc.h
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.1-devel/files/patch-desktop+util+makefile.mk b/editors/openoffice-1.1-devel/files/patch-desktop+util+makefile.mk
deleted file mode 100644
index 025d644a8077..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-desktop+util+makefile.mk
+++ /dev/null
@@ -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
diff --git 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
deleted file mode 100644
index 5881f5d7f6a5..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-dtrans+source+X11+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice-1.1-devel/files/patch-eventattacher+source+makefile.mk b/editors/openoffice-1.1-devel/files/patch-eventattacher+source+makefile.mk
deleted file mode 100644
index 4552698eb132..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-eventattacher+source+makefile.mk
+++ /dev/null
@@ -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)
diff --git 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
deleted file mode 100644
index 6b8071f4030e..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-external+gcc3_specific+makefile.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../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"
- 
- .IF "$(OS)"!="MACOSX"
-+.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 @@
-         -rm -f $@
-         +ln -s libgcc_s.so.1 $@
- 
-+.ENDIF 
- .ENDIF 
- 
- .ENDIF
diff --git a/editors/openoffice-1.1-devel/files/patch-freetype+makefile.mk b/editors/openoffice-1.1-devel/files/patch-freetype+makefile.mk
deleted file mode 100644
index 3e5a8dd19f18..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-freetype+makefile.mk
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice-1.1-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice-1.1-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
- 
- /* 
diff --git a/editors/openoffice-1.1-devel/files/patch-javaunohelper+source+makefile.mk b/editors/openoffice-1.1-devel/files/patch-javaunohelper+source+makefile.mk
deleted file mode 100644
index 19f6b86e5ab5..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-javaunohelper+source+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git 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
deleted file mode 100644
index a9ff9e3fed88..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-jni_uno+jni_java2uno.cxx
+++ /dev/null
@@ -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"
diff --git 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
deleted file mode 100644
index b6096654ebaf..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-nas+nas-1.6.patch
+++ /dev/null
@@ -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;
diff --git 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
deleted file mode 100644
index 3fee562c6d38..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-offapi+com+sun+star+setup+OSType.idl
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.1-devel/files/patch-offapi+util+makefile.pmk b/editors/openoffice-1.1-devel/files/patch-offapi+util+makefile.pmk
deleted file mode 100644
index 5cdbb1b4aa4a..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-offapi+util+makefile.pmk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.1-devel/files/patch-package+inc+HashMaps.hxx b/editors/openoffice-1.1-devel/files/patch-package+inc+HashMaps.hxx
deleted file mode 100644
index 35052d291ef7..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-package+inc+HashMaps.hxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice-1.1-devel/files/patch-package+inc+ZipPackageFolder.hxx b/editors/openoffice-1.1-devel/files/patch-package+inc+ZipPackageFolder.hxx
deleted file mode 100644
index 014c61403380..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-package+inc+ZipPackageFolder.hxx
+++ /dev/null
@@ -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()
diff --git 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
deleted file mode 100644
index c4bf35e79f64..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-package+source+zippackage+ContentInfo.hxx
+++ /dev/null
@@ -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();
diff --git 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
deleted file mode 100644
index bb504c834eef..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-package+source+zippackage+ZipPackageFolder.cxx
+++ /dev/null
@@ -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 );
diff --git a/editors/openoffice-1.1-devel/files/patch-registry+source+regkey.cxx b/editors/openoffice-1.1-devel/files/patch-registry+source+regkey.cxx
deleted file mode 100644
index fad069f83f14..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-registry+source+regkey.cxx
+++ /dev/null
@@ -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;
diff --git 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
deleted file mode 100644
index 417ab33ba52f..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-rsc+source+rscpp+cpp.h
+++ /dev/null
@@ -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              */
- 
diff --git 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
deleted file mode 100644
index 49fe0da8589b..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+nlsupport.c
+++ /dev/null
@@ -1,160 +0,0 @@
---- ../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
-@@ -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)
- 
-@@ -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 @@
-     { "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-1.1-devel/files/patch-sal+osl+unx+pipe.c b/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+pipe.c
deleted file mode 100644
index 4aa7b8af1a61..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+pipe.c
+++ /dev/null
@@ -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 )
- 	{			
diff --git 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
deleted file mode 100644
index 50023576bec4..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+process.c
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+security.c b/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+security.c
deleted file mode 100644
index 0cc321dcd544..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+security.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../sal/osl/unx/security.c.orig	Sat Jul 20 22:53:31 2002
-+++ ../sal/osl/unx/security.c	Sat Jul 20 22:52:39 2002
-@@ -739,7 +739,7 @@
- 	}
- 
- 
--#elif (LINUX && (GLIBC >= 2))
-+#elif ((LINUX && (GLIBC >= 2)) || defined(FREEBSD))
- 	
- 	struct passwd	*pPasswd; 
- 	
diff --git 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
deleted file mode 100644
index 9541cac8583f..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+socket.c
+++ /dev/null
@@ -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! */
diff --git a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+system.c b/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+system.c
deleted file mode 100644
index 8dc663ac03fc..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+system.c
+++ /dev/null
@@ -1,127 +0,0 @@
---- ../sal/osl/unx/system.c.orig	Sun Mar 17 12:34:13 2002
-+++ ../sal/osl/unx/system.c	Wed Apr  3 01:03:36 2002
-@@ -195,6 +195,73 @@
- }
- #endif
- 
-+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
-+           size_t buflen, struct passwd **result)
-+{
-+  struct passwd* res;
-+
-+  pthread_mutex_lock(&getrtl_mutex);
-+
-+  if ( res = getpwuid(uid) )
-+  {
-+    size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell;
-+
-+    pw_name = strlen(res->pw_name)+1;
-+    pw_passwd = strlen(res->pw_passwd)+1;
-+    pw_class = strlen(res->pw_class)+1;
-+    pw_gecos = strlen(res->pw_gecos)+1;
-+    pw_dir = strlen(res->pw_dir)+1;
-+    pw_shell = strlen(res->pw_shell)+1;
-+
-+    if (pw_name+pw_passwd+pw_class+pw_gecos
-+                                 +pw_dir+pw_shell < buflen)
-+    {
-+      memcpy(pwd, res, sizeof(struct passwd));
-+
-+      strncpy(buffer, res->pw_name, pw_name);
-+      pwd->pw_name = buffer;
-+      buffer += pw_name;
-+
-+      strncpy(buffer, res->pw_passwd, pw_passwd);
-+      pwd->pw_passwd = buffer;
-+      buffer += pw_passwd;
-+
-+      strncpy(buffer, res->pw_class, pw_class);
-+      pwd->pw_class = buffer;
-+      buffer += pw_class;
-+
-+      strncpy(buffer, res->pw_gecos, pw_gecos);
-+      pwd->pw_gecos = buffer;
-+      buffer += pw_gecos;
-+
-+      strncpy(buffer, res->pw_dir, pw_dir);
-+      pwd->pw_dir = buffer;
-+      buffer += pw_dir;
-+
-+      strncpy(buffer, res->pw_shell, pw_shell);
-+      pwd->pw_shell = buffer;
-+      buffer += pw_shell;
-+
-+      *result = pwd ;
-+      res = 0 ;
-+
-+    } else {
-+
-+      res = ENOMEM ;
-+
-+    }      
-+  
-+  } else {
-+
-+    res = errno ;
-+ 
-+  } 
-+
-+  pthread_mutex_unlock(&getrtl_mutex);
-+
-+  return res;
-+}
-+
- struct tm *localtime_r(const time_t *timep, struct tm *buffer)
- {
- 	struct tm* res;
-@@ -518,3 +585,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-1.1-devel/files/patch-sal+osl+unx+system.h b/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+system.h
deleted file mode 100644
index c4e255952fc7..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+system.h
+++ /dev/null
@@ -1,35 +0,0 @@
---- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
-+++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
-@@ -205,6 +205,13 @@
- #   include <sys/ioctl.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 <machine/vmparam.h>
-+#   include <machine/pmap.h>
- #	include <sys/un.h>
- #   include <netinet/tcp.h>
- #	define 	IORESOURCE_TRANSFER_BSD 
-@@ -216,12 +223,13 @@
- #   elif BYTE_ORDER == PDP_ENDIAN
- #   	define _PDP_ENDIAN
- #   endif
--#   define  sched_yield() 				pthread_yield()
--#   define  pthread_testcancel()
- #	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
diff --git a/editors/openoffice-1.1-devel/files/patch-sal+textenc+tencinfo.c b/editors/openoffice-1.1-devel/files/patch-sal+textenc+tencinfo.c
deleted file mode 100644
index 7cf80c18d0a0..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-sal+textenc+tencinfo.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
-     /* 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 */
-+
-+    if (pMimeCharset == NULL)
-+	pMimeCharset = "usascii";
-+
-     static ImplStrCharsetDef const aVIPMimeCharsetTab[] =
-     {
-         { "usascii", RTL_TEXTENCODING_ASCII_US },
diff --git a/editors/openoffice-1.1-devel/files/patch-sal+workben+makefile.mk b/editors/openoffice-1.1-devel/files/patch-sal+workben+makefile.mk
deleted file mode 100644
index 369935e31d66..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-sal+workben+makefile.mk
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../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 @@
- 
- .IF "$(TESTAPP)" == "salstattest"
- 
--	CFLAGS+= /DUSE_SAL_STATIC
-+	CFLAGS+= -DUSE_SAL_STATIC
- 
- 	OBJFILES=	$(OBJ)$/salstattest.obj
- 
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- 
- CXXFILES=	tgetpwnam.cxx
- OBJFILES=	$(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN=	$(SLB)$/sal.lib
- 
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd | freebsd)
- .ENDIF # tgetpwname
- 
- # --- Targets ------------------------------------------------------
diff --git 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
deleted file mode 100644
index 1ffacf889bc6..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-salhelper+source+gcc2_freebsd_intel.map
+++ /dev/null
@@ -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:
-+*;
-+};
diff --git 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
deleted file mode 100644
index 823cff316ec7..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-salhelper+source+gcc3_freebsd_intel.map
+++ /dev/null
@@ -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:
-+		*;
-+};
-+
diff --git a/editors/openoffice-1.1-devel/files/patch-salhelper+source+makefile.mk b/editors/openoffice-1.1-devel/files/patch-salhelper+source+makefile.mk
deleted file mode 100644
index 3687664d8d16..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-salhelper+source+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../salhelper/source/makefile.mk.orig	Wed Nov 14 14:19:21 2001
-+++ ../salhelper/source/makefile.mk	Sun Mar  3 17:58:15 2002
-@@ -109,6 +109,10 @@
- SHL1VERSIONMAP=lngi.map
- .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
- SHL1VERSIONMAP=gcc3_linux_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
- .ENDIF
- 
- 
diff --git 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
deleted file mode 100644
index 70f25048a24a..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-salhelper+test+rtti+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
- 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
- .ENDIF
- 
- 
diff --git 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
deleted file mode 100644
index 529f67a3e35f..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-sc+source+core+data+cell.cxx
+++ /dev/null
@@ -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>
diff --git 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
deleted file mode 100644
index 623eccb0ff09..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-scp+source+global+udk_base.scp
+++ /dev/null
@@ -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
diff --git 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
deleted file mode 100644
index 2f8daab35cdd..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-scp+source+player+player.scp
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice-1.1-devel/files/patch-scptools+source+linker+searchcache b/editors/openoffice-1.1-devel/files/patch-scptools+source+linker+searchcache
deleted file mode 100644
index 593e9eabf5bc..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-scptools+source+linker+searchcache
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: files/patch-scptools::source::linker::searchcache
-===================================================================
-RCS file: files/patch-scptools::source::linker::searchcache
-diff -N files/patch-scptools::source::linker::searchcache
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-scptools::source::linker::searchcache	4 Aug 2002 15:28:04 -0000
-@@ -0,0 +1,27 @@
-+--- ../scptools/source/linker/searchcache.hxx.orig	Fri Aug  2 22:53:46 2002
-++++ ../scptools/source/linker/searchcache.hxx	Fri Aug  2 22:54:50 2002
-+@@ -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	Fri Aug  2 22:53:35 2002
-++++ ../scptools/source/linker/searchcache.cxx	Fri Aug  2 22:55:14 2002
-+@@ -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-1.1-devel/files/patch-scptools+source+linker+ziplst.cxx b/editors/openoffice-1.1-devel/files/patch-scptools+source+linker+ziplst.cxx
deleted file mode 100644
index 83b84631542e..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-scptools+source+linker+ziplst.cxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice-1.1-devel/files/patch-setup2+inc+fields.hxx b/editors/openoffice-1.1-devel/files/patch-setup2+inc+fields.hxx
deleted file mode 100644
index d56e12f2abf4..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-setup2+inc+fields.hxx
+++ /dev/null
@@ -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[];
diff --git 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
deleted file mode 100644
index 396c586ee3a3..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,30 +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"
- 
-@@ -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" \
diff --git 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
deleted file mode 100644
index 5460e4296587..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-setup2+mow+source+loader+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice-1.1-devel/files/patch-setup2+patch+makefile.mk b/editors/openoffice-1.1-devel/files/patch-setup2+patch+makefile.mk
deleted file mode 100644
index 53846a8bdfc9..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-setup2+patch+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.1-devel/files/patch-setup2+script+setupserver b/editors/openoffice-1.1-devel/files/patch-setup2+script+setupserver
deleted file mode 100644
index 450ea386c841..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-setup2+script+setupserver
+++ /dev/null
@@ -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`"
diff --git 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
deleted file mode 100644
index 98f6ad2f7567..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-setup2+source+compiler+decltor.cxx
+++ /dev/null
@@ -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";
diff --git 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
deleted file mode 100644
index ac0b39a6aa47..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
+++ /dev/null
@@ -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) );
diff --git 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
deleted file mode 100644
index f199b18823e1..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice-1.1-devel/files/patch-setup2+source+service+interface.cxx b/editors/openoffice-1.1-devel/files/patch-setup2+source+service+interface.cxx
deleted file mode 100644
index 8e478e17971d..000000000000
--- a/editors/openoffice-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-1.1-devel/files/patch-shell+source+cmdmail+makefile.mk b/editors/openoffice-1.1-devel/files/patch-shell+source+cmdmail+makefile.mk
deleted file mode 100644
index 0476285c802e..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-shell+source+cmdmail+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git 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
deleted file mode 100644
index e83cf7c9d7a1..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-shell+source+proxysettings+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git 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
deleted file mode 100644
index 0b7712ee35f8..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-shell+source+unix+exec+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice-1.1-devel/files/patch-solenv+bin+addsym.awk b/editors/openoffice-1.1-devel/files/patch-solenv+bin+addsym.awk
deleted file mode 100644
index 996e282b350b..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-solenv+bin+addsym.awk
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
-+++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
-@@ -72,11 +72,11 @@
- END {
-     if (state == 0) {
-         print "# Weak RTTI symbols for C++ exceptions:"
--        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
-+        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
-     }
- }
- state == 2 {
--    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
-+    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
-     state = 3
- }
- /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice-1.1-devel/files/patch-solenv+bin+mapgen.pl b/editors/openoffice-1.1-devel/files/patch-solenv+bin+mapgen.pl
deleted file mode 100644
index 71ebdb934120..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-solenv+bin+mapgen.pl
+++ /dev/null
@@ -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, $_);
- 	};
diff --git a/editors/openoffice-1.1-devel/files/patch-solenv+inc+startup+FREEBSD+macros.mk b/editors/openoffice-1.1-devel/files/patch-solenv+inc+startup+FREEBSD+macros.mk
deleted file mode 100644
index 0c1b107de988..000000000000
--- a/editors/openoffice-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-1.1-devel/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice-1.1-devel/files/patch-solenv+inc+tg_ext.mk
deleted file mode 100644
index 701692c9425a..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-solenv+inc+tg_ext.mk
+++ /dev/null
@@ -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
diff --git 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
deleted file mode 100644
index 255a41f92281..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-solenv+inc+tg_moz.mk
+++ /dev/null
@@ -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) $@
diff --git a/editors/openoffice-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index b4764485aa86..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,202 +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
-+# 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*=$(CC)
-+
-+# default linker flags
-+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -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
diff --git a/editors/openoffice-1.1-devel/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice-1.1-devel/files/patch-soltools+checkdll+makefile.mk
deleted file mode 100644
index e6407402258a..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-soltools+checkdll+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.1-devel/files/patch-soltools+mkdepend+main.c b/editors/openoffice-1.1-devel/files/patch-soltools+mkdepend+main.c
deleted file mode 100644
index cffd5cbb1f43..000000000000
--- a/editors/openoffice-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-1.1-devel/files/patch-stlport+makefile.mk b/editors/openoffice-1.1-devel/files/patch-stlport+makefile.mk
deleted file mode 100644
index 797817ba85be..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-stlport+makefile.mk
+++ /dev/null
@@ -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
diff --git 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
deleted file mode 100644
index 4b319b08d401..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+corereflection+makefile.mk
+++ /dev/null
@@ -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)
diff --git 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
deleted file mode 100644
index 4cae0476415a..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+defaultregistry+makefile.mk
+++ /dev/null
@@ -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=
diff --git 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
deleted file mode 100644
index 341d621d872c..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+implementationregistration+implreg.cxx
+++ /dev/null
@@ -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
diff --git 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
deleted file mode 100644
index 0051043b7ecb..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+implementationregistration+makefile.mk
+++ /dev/null
@@ -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)
diff --git 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
deleted file mode 100644
index c7cd85253c11..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+inspect+makefile.mk
+++ /dev/null
@@ -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)
diff --git 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
deleted file mode 100644
index 9ac2072a5612..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+invocation+makefile.mk
+++ /dev/null
@@ -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=
diff --git 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
deleted file mode 100644
index 8853ad39a90e..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git 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
deleted file mode 100644
index cea499f15c57..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+javaloader+makefile.mk
+++ /dev/null
@@ -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=		
diff --git 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
deleted file mode 100644
index b895a2b968d4..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+javavm+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git 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
deleted file mode 100644
index 5a08ee5937b6..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+loader+makefile.mk
+++ /dev/null
@@ -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=
diff --git 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
deleted file mode 100644
index e573081bc21d..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+namingservice+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git 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
deleted file mode 100644
index 9110b2f50cd1..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+proxy_factory+makefile.mk
+++ /dev/null
@@ -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)
diff --git 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
deleted file mode 100644
index 9d974d1c0d10..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+registry_tdprovider+makefile.mk
+++ /dev/null
@@ -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
diff --git 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
deleted file mode 100644
index 746776d54759..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+servicemanager+makefile.mk
+++ /dev/null
@@ -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)
diff --git 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
deleted file mode 100644
index 76403fdde841..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+tdmanager+makefile.mk
+++ /dev/null
@@ -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=
diff --git 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
deleted file mode 100644
index dc647f89a166..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-stoc+source+typeconv+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.1-devel/files/patch-store+util+makefile.mk b/editors/openoffice-1.1-devel/files/patch-store+util+makefile.mk
deleted file mode 100644
index 6bef6e960f2e..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-store+util+makefile.mk
+++ /dev/null
@@ -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
- 
- 
diff --git 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
deleted file mode 100644
index b16030080c0d..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-svx+source+fmcomp+makefile.mk
+++ /dev/null
@@ -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= \
diff --git a/editors/openoffice-1.1-devel/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice-1.1-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
deleted file mode 100644
index 3d7c2e22aa63..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
-+++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
-@@ -84,7 +84,9 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- APP1LIBS=
-+.IF "$(OS)"!="FREEBSD"
- APP1STDLIBS=-ldl
-+.ENDIF
- 
- GNOMEFILES= \
- 	locales.tab
diff --git a/editors/openoffice-1.1-devel/files/patch-tools+source+string+tstring.cxx b/editors/openoffice-1.1-devel/files/patch-tools+source+string+tstring.cxx
deleted file mode 100644
index 12bd6bd0b244..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-tools+source+string+tstring.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../tools/source/string/tstring.cxx.orig	Sat Aug 10 12:53:42 2002
-+++ ../tools/source/string/tstring.cxx	Sat Aug 10 12:54:16 2002
-@@ -103,6 +103,9 @@
- xub_StrLen ImplStringLen( const sal_Char* pStr )
- {
- 	const sal_Char* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
-@@ -113,6 +116,9 @@
- xub_StrLen ImplStringLen( const sal_Unicode* pStr )
- {
- 	const sal_Unicode* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
diff --git a/editors/openoffice-1.1-devel/files/patch-unoil+makefile.pmk b/editors/openoffice-1.1-devel/files/patch-unoil+makefile.pmk
deleted file mode 100644
index 7febdabf7b4b..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-unoil+makefile.pmk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../unoil/makefile.pmk.orig	Fri Aug 31 18:04:43 2001
-+++ ../unoil/makefile.pmk	Thu Sep 12 12:17:50 2002
-@@ -74,8 +74,8 @@
- JAVAFILESLIST	:= $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java)
- .ENDIF          # "$(L10N_framework)"==""
- 
--GENJAVAFILES	:= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
--GENCLASSFILES	:= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
-+GENJAVAFILES	+= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
-+GENCLASSFILES	+= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
- 
- # --- Targets ------------------------------------------------------
- 
diff --git a/editors/openoffice-1.1-devel/files/patch-unzip+source+file_io.c b/editors/openoffice-1.1-devel/files/patch-unzip+source+file_io.c
deleted file mode 100644
index 2f85a108c185..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-unzip+source+file_io.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../unzip/source/file_io.c.orig	Sat Oct 19 11:58:45 2002
-+++ ../unzip/source/file_io.c	Sat Oct 19 12:03:40 2002
-@@ -500,7 +500,7 @@
- #ifdef MPW
- 				pCallBack( 0 );
- #else
--				#if defined LINUX || defined MACOSX || defined NETBSD
-+				#if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD
- 				pCallBack( lseek(outfd, 0, SEEK_CUR) );
- 				#else
- 				pCallBack( tell( outfd ) );
-@@ -865,7 +865,9 @@
- 	static struct timeb tbp;
- #endif /* !__386BSD__ */
- #else /* !BSD */
-+#if (!defined(NETBSD) && !defined(FREEBSD))
- 	extern long timezone;
-+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
- #endif /* ?BSD */
- #endif /* ?AMIGA */
- 
diff --git a/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
deleted file mode 100644
index 41defbd5eb59..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
-+++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
-@@ -65,6 +65,8 @@
- #include <glyphcache.hxx>
- 
- #define Region XLIB_Region
-+typedef unsigned long CARD32;
-+#define Cursor CARD32
- #include <X11/extensions/Xrender.h>
- #undef Region
- 
diff --git a/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
deleted file mode 100644
index fefc925db41f..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
-@@ -78,6 +78,12 @@
- GETSTYLE_GNOME=getstyle-gnome-linux-intel
- HASGNOME2=TRUE
- .ENDIF
-+.IF "$_(HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
-+.ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
- HASGNOME2=TRUE
diff --git a/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
deleted file mode 100644
index 984313fc540a..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
-@@ -75,9 +75,15 @@
- 
- HASGNOME2=
- 
--.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
-+.IF "$(OS)$(CPU)"=="LINUXI"
- MSGBOX_GNOME=msgbox-gnome-linux-intel
- HASGNOME2=TRUE
-+.ENDIF
-+.IF "$(_HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+MSGBOX_GNOME=msgbox-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
- .ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice-1.1-devel/files/patch-vcl+workben+officeacceptthread.cxx b/editors/openoffice-1.1-devel/files/patch-vcl+workben+officeacceptthread.cxx
deleted file mode 100644
index 07d9f1060557..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-vcl+workben+officeacceptthread.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/workben/officeacceptthread.cxx.orig	Wed Mar  5 20:25:36 2003
-+++ ../vcl/workben/officeacceptthread.cxx	Wed Mar  5 20:26:03 2003
-@@ -125,7 +125,7 @@
- #if defined (SOLARIS)
- 				int status;
- 				nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG);
--#elif defined(LINUX)
-+#elif defined(LINUX) || defined (FREEBSD)
- 				nRet = kill(aProcessInfo.Ident, 0);
- #endif
- #if defined (UNX)
diff --git a/editors/openoffice-1.1-devel/files/zipmoz.sh b/editors/openoffice-1.1-devel/files/zipmoz.sh
deleted file mode 100644
index 43a4591f3430..000000000000
--- a/editors/openoffice-1.1-devel/files/zipmoz.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/sh -f
-
-RUNTIME_FILES=" components/libabsyncsvc.so components/libaddrbook.so \
-		components/libmork.so components/libmozldap.so \
-		components/libnecko.so components/libprofile.so \
-		components/librdf.so components/libstrres.so \
-		components/libunicharutil.so components/libuconv.so \
-		components/libucvcn.so components/libucvibm.so \
-		components/libucvja.so components/libucvko.so \
-		components/libucvlatin.so components/libucvtw.so \
-		components/libucvtw2.so components/liburiloader.so \
-		components/libvcard.so components/libxpconnect.so \
-		components/libpref.so components/libchrome.so libmozjs.so \
-		libmsgbaseutil.so libldap50.so libnspr4.so libplc4.so \
-		libplds4.so libxpcom.so libmozz.so component.reg \
-		components/necko_dns.xpt components/xpcom_xpti.xpt \
-		components/xpcom_threads.xpt components/xpcom_io.xpt \
-		components/xpcom_ds.xpt components/xpcom_components.xpt \
-		components/xpcom_base.xpt components/xpti.dat \
-		defaults/pref/all.js defaults/pref/config.js \
-		defaults/pref/editor.js defaults/pref/initpref.js \
-		defaults/pref/inspector.js defaults/pref/mailnews.js \
-		defaults/pref/security-prefs.js defaults/pref/unix.js \
-		defaults/pref/xpinstall.js"
-
-LIB_FILES="	lib/libembed_base_s.a lib/libmozreg_s.a \
-		lib/libnspr4.so lib/libxpcom.so lib/libprldap50.so"
-
-INC_FILES="include/"
-INC_FILES2="public/"
-
-if [ $# -lt 2 -o $# -gt 3 ] ; then
-	echo 
-	echo usage: $0 mozilla_dist target [target_dir]
-	echo
-	echo where:
-	echo
-	echo "mozilla_dist points to the mozilla distribution"
-	echo "target concatenates  OS, compiler and CPU (e.g. FREEBSDGCCI etc)"
-	echo "target_dir is the directory to place the zips"
-	exit 1
-fi
-
-MOZ_DIST=$1
-TARGET=$2
-if [ "w$3" != "w" ]; then
-	TARGET_DIR=$3
-else
-	if [ "w$TARGET_DIR" == "w" ]; then
-		TARGET_DIR=
-	fi
-fi
-
-ZIP_TARGET=$TARGET_DIR
-if [ -z "$ZIP_TARGET" ] ; then
-	ZIP_TARGET=../
-fi
-
-# just to remember the current working directory
-STARTING_DIR=`pwd`
-
-echo
-echo --- creating zips for $TARGET, using mozilla distribution in $MOZ_DIST
-
-# Create the directories
-[ ! -d $TARGET_DIR/$TARGET/runtime ] && mkdir -p $TARGET_DIR/$TARGET/runtime
-[ ! -d $TARGET_DIR/$TARGET/runtime/components ] && mkdir -p $TARGET_DIR/$TARGET/runtime/components
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults/pref ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults/pref
-[ ! -d $TARGET_DIR/$TARGET/lib ] && mkdir -p $TARGET_DIR/$TARGET/lib
-[ ! -d $TARGET_DIR/$TARGET/inc ] && mkdir -p $TARGET_DIR/$TARGET/inc
-[ ! -d $TARGET_DIR/$TARGET/inc/nspr ] && mkdir -p $TARGET_DIR/$TARGET/inc/nspr
-[ ! -d $TARGET_DIR/$TARGET/inc/obsolete ] && mkdir -p $TARGET_DIR/$TARGET/inc/obsolete
-
-# Copy the files
-echo
-echo --- copying files
-echo
-
-for i in $RUNTIME_FILES; do
-	if [ ! -f $MOZ_DIST/bin/$i ]; then
-		echo $MOZ_DIST/bin/$i does not exist, check your distribution
-	else
-		if [ `echo $i | grep component` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/components/
-		elif [ `echo $i | grep defaults` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/defaults/pref/
-		else
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/
-		fi
-	fi
-done
-
-for i in $LIB_FILES; do
-	if [ ! -f $MOZ_DIST/$i ]; then
-		echo $MOZ_DIST/$i does not exist, check your distribution
-	else
-		cp -R -L $MOZ_DIST/$i $TARGET_DIR/$TARGET/lib/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES`; do
-	if [ ! -d $i ]; then 
-		cp -R -L $MOZ_DIST/include/$i $TARGET_DIR/$TARGET/inc/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES2`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/public/$i $TARGET_DIR/$TARGET/inc
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/$i $TARGET_DIR/$TARGET/inc/nspr
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr/obsolete`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/obsolete/$i $TARGET_DIR/$TARGET/inc/obsolete
-	fi
-done
-
-# delete old zips
-
-[ -f $TARGET_DIR/$TARGET/runtime.zip ] && rm -f $TARGET_DIR/$TARGET/runtime.zip
-[ -f $TARGET_DIR/$TARGET/lib.zip ] && rm -f $TARGET_DIR/$TARGET/lib.zip
-[ -f $TARGET_DIR/$TARGET/inc.zip ] && rm -f $TARGET_DIR/$TARGET/inc.zip
-
-# zip the runtime files
-
-echo
-echo --- creating ${TARGET}runtime.zip
-echo
-
-cd $TARGET_DIR/$TARGET/runtime
-find . -type f | zip $ZIP_TARGET/${TARGET}runtime.zip -@
-
-# zip the lib files
-echo 
-echo --- creating ${TARGET}lib.zip
-echo 
-
-cd $TARGET_DIR/$TARGET/lib
-find . -type f | zip $ZIP_TARGET/${TARGET}lib.zip -@
-
-# zip the inc files
-echo
-echo --- creating ${TARGET}inc.zip
-echo
-
-cd $TARGET_DIR/$TARGET/inc
-find . -type f | zip $ZIP_TARGET/${TARGET}inc.zip -@
-
-# remove dirs
-cd $STARTING_DIR
-rm -rf $TARGET_DIR/$TARGET
-
-echo
-echo --- done
-echo
-
diff --git a/editors/openoffice-1.1-devel/pkg-descr b/editors/openoffice-1.1-devel/pkg-descr
deleted file mode 100644
index 31fd1b12161a..000000000000
--- a/editors/openoffice-1.1-devel/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-OpenOffice.org is an Open Source, community-developed, multi-platform office
-productivity suite. It includes the key desktop applications, such as a
-word processor, spreadsheet, presentation manager, and drawing program,
-with a user interface and feature set similar to other office suites.
-
-Components include:
-  * A universal word processing application for creating business
-    letters, extensive text documents, professional layouts, and HTML
-    documents.
-  * A sophisticated application for performing advanced spreadsheet
-    functions, such as analyzing figures, creating lists, and viewing data.
-  * A tool for creating effective eye-catching presentations.
-  * A vector-oriented draw module that enables the creation of 3D
-    illustrations
diff --git a/editors/openoffice-1.1-devel/pkg-message b/editors/openoffice-1.1-devel/pkg-message
deleted file mode 100644
index 1dc749f301c2..000000000000
--- a/editors/openoffice-1.1-devel/pkg-message
+++ /dev/null
@@ -1,73 +0,0 @@
-OpenOffice.org Build 643 Personal Install How-To
-
-Written by:	Martin Blapp <mbr@freebsd.org>
-
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
-
-1 User installation
--------------------
-
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
---------------
-
-There are some wrappers installed for fast startup.
-Add "${PREFIX}/bin/" to your PATH and you will be able
-to use them.
-
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
-
-If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
-version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
diff --git a/editors/openoffice-1.1-devel/pkg-plist b/editors/openoffice-1.1-devel/pkg-plist
deleted file mode 100644
index 28bd78453b52..000000000000
--- a/editors/openoffice-1.1-devel/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, do not delete. Package list is generated automatically.
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
deleted file mode 100644
index 6f740924c399..000000000000
--- a/editors/openoffice-1.1/Makefile
+++ /dev/null
@@ -1,580 +0,0 @@
-# New ports collection makefile for: OpenOffice
-# Date created:		28 Februar 2002
-# Whom:                 Martin Blapp
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openoffice
-PORTVERSION=	644
-CATEGORIES+=	editors
-MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
-		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
-		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
-		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ny1.mirror.openoffice.org/miscellaneous/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
-MASTER_SITE_SUBDIR=	${PORTVERSION}
-DISTFILES+=	oo_${PORTVERSION}_src.tar.bz2 \
-		gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
-
-BROKEN=		"Does not build"
-
-SORT?=	/usr/bin/sort
-FIND?=	/usr/bin/find
-CUT?=	/usr/bin/cut
-AWK?=	/usr/bin/awk
-GREP?=	/usr/bin/grep
-ZIP?=	${PREFIX}/bin/zip
-UNZIP?=	${PREFIX}/bin/unzip
-ANT?=	${LOCALBASE}/bin/ant
-TCSH?=	/bin/tcsh
-PASTE?=	/usr/bin/paste
-
-.include <bsd.port.pre.mk>
-
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
-DIST_SUBDIR=		openoffice
-DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
-
-#
-# configuration for language specific slave ports
-#
-.if !defined(LANG_EXT)
-LANG_EXT=01
-.else
-#
-# Add pkg-descr and pkg-message if available
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-#
-# LANG_CONFIGURE_ARG is missing for the german port
-#
-.if defined(LANG_EXT)
-CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG},ENUS
-.endif
-.endif
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
-
-EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-
-MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/jakarta-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-.if !defined(DISPLAY)
-BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
-.endif
-.if !defined(WITH_BSD_JDK)
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk14
-.else
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-.endif
-
-USE_PERL5=	yes
-USE_BZIP2=	yes
-USE_BISON=	yes
-USE_GMAKE=	yes
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
-.if !defined(WITH_BSD_JDK)
-JDKDIR?=	${LOCALBASE}/linux-sun-jdk1.4.1
-.else
-JDKDIR?=	${LOCALBASE}/jdk1.4.1
-.endif
-JAVAVM=         ${JDKDIR}/bin/java
-
-GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
-LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
-BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
-
-.if !defined(DISPLAY)
-DISPLAYHACK=localhost:1001
-.endif
-
-CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
-			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
-
-.if !defined(WITH_BSD_JDK)
-CONFIGURE_ARGS+=	--enable-linuxjdk=yes
-.endif
-
-.if defined(WITH_DEBUG)
-.if ${WITH_DEBUG} == 2
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-.endif
-
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"prefered language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
-	@${ECHO} "OPTIONS:"
-.if !defined(USE_GCC)
-	@${ECHO}
-	@${ECHO} "You can compile OO with different"
-	@${ECHO} "gcc compiler versions:"
-	@${ECHO}
-	@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.2"
-	@${ECHO} "to compile openoffice with your"
-	@${ECHO} "prefered compiler."
-.endif
-.if !defined(WITH_BSD_JDK)
-	@${ECHO}
-	@${ECHO} "If you like to use the native BSD"
-	@${ECHO} "JDK for the build system, you can use"
-	@${ECHO} "WITH_BSD_JDK=TRUE to disable the"
-	@${ECHO} "usage of the linux-JDK and linux dependency."
-	@${ECHO}
-.endif
-.if !defined(WITH_DEBUG)
-	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
-	@${ECHO} "if you call make with WITH_DEBUG=1"
-	@${ECHO}
-	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
-	@${ECHO}
-.endif
-.if !defined(WITH_TTF_BYTECODE_ENABLED)
-	@${ECHO}
-	@${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES"
-	@${ECHO} "if you like to use the Freetype library to"
-	@${ECHO} "render TTF fonts. Normally the TTF lib is"
-	@${ECHO} "not used to render fonts."
-	@${ECHO}
-	@${ECHO} "If you have licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479"
-	@${ECHO} "you can enable this option to get better"
-	@${ECHO} "quality of glyphs at small bitmap sizes."
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 450002
-	@${ECHO}
-	@${ECHO} "OS-VERSION ${OSVERSION} too low"
-	@${ECHO}
-	@${ECHO} "OO need some important libc_r and"
-	@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
-	@${ECHO} "RELEASE or 4.6 STABLE."
-	@${FALSE}
-.endif
-	@${ECHO}
-	@${ECHO} "NOTICE:"
-	@${ECHO}
-	@${ECHO} "To build Openoffice, you should have a lot"
-.if defined(WITH_DEBUG)
-	@${ECHO} "of free diskspace (~ 8GB)."
-.else
-	@${ECHO} "of free diskspace (~ 4GB)."
-.endif
-	@${ECHO}
-.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
-    (${OSVERSION} < 500000 && !defined(USE_GCC))
-	@${ECHO} "KERNEL CONFIGURATION:"
-	@${ECHO}
-	@${ECHO} "Openoffice needs a larger stack- and"
-	@${ECHO} "datasize to build. Check your limit"
-	@${ECHO} "settings and and put this in /boot/loader.conf"
-	@${ECHO} "if neccessary:"
-	@${ECHO}
-	@${ECHO} "kern.maxdsiz=\"1073741824\""
-	@${ECHO} "kern.maxssiz=\"268435456\""
-.endif
-	@${ECHO}
-.if ${OSVERSION} < 460002
-	@${ECHO} "REQUIRED SYSTEM PATCHES:"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO} "OO.org can crash if you enter a non existing path"
-	@${ECHO} "or URL in the location bar. To fix these crashes"
-	@${ECHO} "you need a uncommitted system patch for rtld:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460001
-	@${ECHO}
-	@${ECHO} "OO setup is broken on STABLE < 4.6"
-	@${ECHO} "including 4.6 RELEASE."
-	@${ECHO} "You'll need a system patch to solve"
-	@${ECHO} "this problem:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460002
-	@${ECHO}
-	@${ECHO} "OO.org soffice binary can deadlock. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO}
-	@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
-	@${ECHO}
-.endif
-.if !exists(/usr/include/langinfo.h)
-	@${ECHO}
-	@${ECHO} "langinfo.h is missing !"
-	@${ECHO}
-	@${ECHO} "Please upgrade to 4.6 RELEASE or"
-	@${ECHO} "4.6 STABLE."
-	@${ECHO}
-	@${FALSE}
-.endif
-
-post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
-	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
-	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@-${RM} -f ${WRKSRC}/../moz/zipped/*.zip
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
-.if defined(L10NHELP)
-	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
-	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
-.endif
-
-post-patch:
-	@${MAKE} patch-mozilla
-.if defined(WITH_TTF_BYTECODE_ENABLED)
-	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
-		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-			${ECHO_MSG} "===>   Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \
-		fi; \
-		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
-	fi
-.endif
-.if defined(WITH_DEBUG)
-	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
-		PATCHES_APPLIED="" ; \
-		for i in ${PATCHDIR}/debugpatch-*; do \
-			case $$i in \
-				*.orig|*.rej|*~) \
-					${ECHO_MSG} "===>   Ignoring patchfile $$i" ; \
-					;; \
-				*) \
-					if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-						${ECHO_MSG} "===>   Applying ${OPSYS} patch $$i" ; \
-					fi; \
-					if ${PATCH} ${PATCH_ARGS} < $$i ; then \
-						PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
-					else \
-						${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
-						if [ x"$$PATCHES_APPLIED" != x"" ]; then \
-							${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
-						fi; \
-						${FALSE} ; \
-					fi; \
-					;; \
-			esac; \
-		done; \
-	fi;
-.endif
-	@${ECHO_MSG} "===>  Find old malloc.h defines and fix them in ${PKGNAME} source"
-	@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
-		${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
-
-extract-mozilla:
-.if ! exists(${WRKDIR}/mozilla/Makefile)
-	@${ECHO_MSG} "===>  Extracting mozilla sub project"
-	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
-.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment)
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
-.endif
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
-.endif
-	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
-
-patch-mozilla:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
-		${WRKDIR}/mozilla/files/
-	@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
-
-build-mozilla:
-.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
-	@${ECHO_MSG} "===>  Building mozilla sub project"
-.if defined(WITH_DEBUG)
-	@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
-	@${SED} -e 's|--disable-debug||' \
-		-e 's|--disable-cpp-rtti||' \
-		-e 's|--enable-strip||' \
-		< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
-.endif
-.if defined(USE_GCC)
-	@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
-.else
-	@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
-.endif
-	@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
-	@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
-	@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
-.endif
-
-install-mozilla:
-	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
-
-register-mozilla:
-.if exists(${WRKDIR}/mozilla-runtime)
-	@${RM} -rf ${WRKDIR}/mozilla-runtime
-.endif
-	@${MKDIR} ${WRKDIR}/mozilla-runtime
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
-	@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
-	@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
-	@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
-		&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom 
-	@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
-		${WRKDIR}/mozilla-runtime/components/xptitemp.dat
-	@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
-	@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
-		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
-
-mozilla:
-	@${MAKE} extract-mozilla
-	@${MAKE} patch-mozilla
-	@${MAKE} build-mozilla
-	@${MAKE} register-mozilla
-	@${MAKE} install-mozilla
-
-do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
-	@${MAKE} mozilla
-.endif
-.endif
-.endif
-.if exists(${WRKDIR}/.Xvfb.pid)
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.endif
-.if !defined(DISPLAY)
-	#
-	# This is a UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-.endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
-	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-.endif
-.if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
-.endif
-
-pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-
-do-install:
-.if !defined(DISPLAY)
-	#
-	# UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-.endif
-
-install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
-
-post-install:
-	@${ECHO_MSG} "===>  Add wrapper scripts";
-	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
-	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
-
-package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
-.if defined(LANG_SUFFIX)
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
-.else
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
-.endif
-
-update:
-	@${MAKE} fetch
-	@${MAKE} extract
-	@cd ${WRKSRC}/.. && for dir in *; do \
-	    if [ -d $$dir ]; then \
-		cd $$dir; cvs update -d; cd ..; \
-	    fi \
-	done
-
-.include <bsd.port.post.mk>
diff --git a/editors/openoffice-1.1/distinfo b/editors/openoffice-1.1/distinfo
deleted file mode 100644
index ec9d6788f104..000000000000
--- a/editors/openoffice-1.1/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
-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
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
diff --git a/editors/openoffice-1.1/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice-1.1/files/debugpatch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 96c651ce22c8..000000000000
--- a/editors/openoffice-1.1/files/debugpatch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../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
-@@ -902,6 +902,7 @@
- 
- void KillSetupDir()
- {
-+#if 0
-     DIR* pDir = opendir( strTmpPath );
-     struct dirent* pFile;
- 
-@@ -915,6 +916,10 @@
- 
-     chdir( strInitPath );
-     rmdir( strTmpPath );
-+#else
-+	fprintf(stderr, "\nLeaving behind temporary directory: %s\n",
-+	strTmpPath);
-+#endif
- }
- 
- void makeSymLink( char* s )
diff --git a/editors/openoffice-1.1/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.1/files/debugpatch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 52bd2b3d58d6..000000000000
--- a/editors/openoffice-1.1/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
-+++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
- 
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- 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
- 
- # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
diff --git a/editors/openoffice-1.1/files/oo_setup.resp b/editors/openoffice-1.1/files/oo_setup.resp
deleted file mode 100644
index 8eeeb11bd95e..000000000000
--- a/editors/openoffice-1.1/files/oo_setup.resp
+++ /dev/null
@@ -1,7 +0,0 @@
-[Environment]
-InstallationMode = INSTALL_NETWORK
-InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org-643
-
-[Java]
-JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice-1.1/files/openoffice-wrapper b/editors/openoffice-1.1/files/openoffice-wrapper
deleted file mode 100644
index a23e5f71b60f..000000000000
--- a/editors/openoffice-1.1/files/openoffice-wrapper
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.1/files/Attic/openoffice-wrapper,v 1.3 2003-03-05 23:24:05 mbr Exp $
-
-oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/
-program=`echo $0 | sed -e 's|.*-||'`
-
-if [ ! $LANG ]; then
-	export LANG=%%LANG%%
-fi
-
-case $program in
-$0)
-	exec $oopath/soffice "$@"
-	;;
-	*)
-	exec $oopath/$program "$@"
-	;;
-esac
diff --git a/editors/openoffice-1.1/files/optpatch-freetype+patch b/editors/openoffice-1.1/files/optpatch-freetype+patch
deleted file mode 100644
index b426a8fb7fcc..000000000000
--- a/editors/openoffice-1.1/files/optpatch-freetype+patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Index: files/patch-freetype::patch
-===================================================================
-RCS file: files/patch-freetype::patch
-diff -N files/patch-freetype::patch
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-freetype::patch	4 Aug 2002 15:27:42 -0000
-@@ -0,0 +1,201 @@
-+diff -ur ../freetype/freetype-2.0.5.patch oo641d_patched/freetype/freetype-2.0.5.patch
-+--- ../freetype/freetype-2.0.5.patch	Fri Apr  5 21:07:34 2002
-++++ ../freetype/freetype-2.0.5.patch	Sat Mar  9 18:04:17 2002
-+@@ -1,118 +1,79 @@
-+-*** misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 14 00:44:33 2000
-+---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 63,69 ****
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+---- 63,69 ----
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+-*** misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Jun  7 19:36:17 2001
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 631,637 ****
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+---- 631,637 ----
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile -DPIC $pic_flag"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Mon Jan  1 18:25:21 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 1,7 ****
-+---- 1,9 ----
-+-  FT_USE_MODULE(autohint_module_class)
-+-  FT_USE_MODULE(cff_driver_class)
-+-  FT_USE_MODULE(t1cid_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(pcf_driver_class)
-+-+ */
-+-  FT_USE_MODULE(psaux_module_class)
-+-  FT_USE_MODULE(psnames_module_class)
-+-  FT_USE_MODULE(ft_raster1_renderer_class)
-+-***************
-+-*** 9,12 ****
-+---- 11,16 ----
-+-  FT_USE_MODULE(ft_smooth_renderer_class)
-+-  FT_USE_MODULE(tt_driver_class)
-+-  FT_USE_MODULE(t1_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(winfnt_driver_class)
-+-+ */
-+-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h	Tue Aug 21 10:50:45 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 70,76 ****
-+---- 70,79 ----
-+-    /*   All convenience functions are declared as such in their             */
-+-    /*   documentation.                                                      */
-+-    /*                                                                       */
-+-+ /*
-+-  #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-+ */
-+-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-  
-+-  
-+-    /*************************************************************************/
-+-***************
-+-*** 108,116 ****
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-- 
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+---- 111,121 ----
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-+ /*
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-+ */
-+-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig	Mon Jan  7 14:21:35 2002
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Mon Jan  7 14:21:40 2002
-+-***************
-+-*** 2251,2257 ****
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age + 1`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-+---- 2251,2257 ----
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk
-++--- misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:49:17 2001
-++@@ -63,7 +63,7 @@
-++ #   ANSI compliance.
-++ #
-++ ifndef CFLAGS
-++-  CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+++  CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-++ endif
-++ 
-++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh
-++--- misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:47:56 2001
-+++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:49:17 2001
-++@@ -631,7 +631,7 @@
-++     if test "$build_old_libs" = yes; then
-++       if test "$pic_mode" != yes; then
-++ 	# Don't build PIC code
-++-	command="$base_compile $srcfile"
-+++	command="$base_compile $srcfile -DPIC $pic_flag"
-++       else
-++ 	# All platforms use -DPIC, to notify preprocessed assembler code.
-++ 	command="$base_compile $srcfile $pic_flag -DPIC"
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:49:17 2001
-++@@ -1,7 +1,9 @@
-++ FT_USE_MODULE(autohint_module_class)
-++ FT_USE_MODULE(cff_driver_class)
-++ FT_USE_MODULE(t1cid_driver_class)
-+++/*
-++ FT_USE_MODULE(pcf_driver_class)
-+++*/
-++ FT_USE_MODULE(psaux_module_class)
-++ FT_USE_MODULE(psnames_module_class)
-++ FT_USE_MODULE(ft_raster1_renderer_class)
-++@@ -9,4 +11,6 @@
-++ FT_USE_MODULE(ft_smooth_renderer_class)
-++ FT_USE_MODULE(tt_driver_class)
-++ FT_USE_MODULE(t1_driver_class)
-+++/*
-++ FT_USE_MODULE(winfnt_driver_class)
-+++*/
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:51:15 2001
-++@@ -70,7 +70,10 @@
-++   /*   All convenience functions are declared as such in their             */
-++   /*   documentation.                                                      */
-++   /*                                                                       */
-+++/*
-++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+++*/
-+++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-++ 
-++ 
-++   /*************************************************************************/
-++@@ -108,8 +111,10 @@
-++   /*   use a vector `plotter' format that isn't supported when this        */
-++   /*   macro is undefined.                                                 */
-++   /*                                                                       */
-+++/*
-++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++-
-+++*/
-+++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++ 
-++   /*************************************************************************/
-++   /*                                                                       */
-++@@ -338,7 +343,7 @@
-++   /* By undefining this, you will only compile the code necessary to load  */
-++   /* TrueType glyphs without hinting.                                      */
-++   /*                                                                       */
-++-#undef  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-+++#define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-++ 
-++ 
-++   /*************************************************************************/
diff --git a/editors/openoffice-1.1/files/optpatch-vcl+util+makefile.pmk b/editors/openoffice-1.1/files/optpatch-vcl+util+makefile.pmk
deleted file mode 100644
index 41341ff0b4e8..000000000000
--- a/editors/openoffice-1.1/files/optpatch-vcl+util+makefile.pmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/util/makefile.pmk.orig	Mon Aug  5 01:39:41 2002
-+++ ../vcl/util/makefile.pmk	Mon Aug  5 01:40:03 2002
-@@ -64,7 +64,7 @@
- PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch
- PDBTARGET=vcl
- 
--.IF "$(OS)" != "MACOSX"
-+.IF "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- .IF "$(remote)" != ""
- USE_BUILTIN_RASTERIZER=true
- .ENDIF
diff --git a/editors/openoffice-1.1/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice-1.1/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 078685f3b516..000000000000
--- a/editors/openoffice-1.1/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../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 freebsd genunix";;
-  	*)		JINCSUBDIRS="genunix";;
-  	esac
-  
diff --git a/editors/openoffice-1.1/files/patch-bridges+prj+build.lst b/editors/openoffice-1.1/files/patch-bridges+prj+build.lst
deleted file mode 100644
index fee3d847c5e6..000000000000
--- a/editors/openoffice-1.1/files/patch-bridges+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
deleted file mode 100644
index 99b8c566fb61..000000000000
--- a/editors/openoffice-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ /dev/null
@@ -1,102 +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 );
-+    }
- }
- 
- }
diff --git a/editors/openoffice-1.1/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice-1.1/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
deleted file mode 100644
index 4622b7fe21c4..000000000000
--- a/editors/openoffice-1.1/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice-1.1/files/patch-comphelper+util+makefile.mk b/editors/openoffice-1.1/files/patch-comphelper+util+makefile.mk
deleted file mode 100644
index f2d3092c2ddf..000000000000
--- a/editors/openoffice-1.1/files/patch-comphelper+util+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-1.1/files/patch-config_office+configure.in b/editors/openoffice-1.1/files/patch-config_office+configure.in
deleted file mode 100644
index a45332fcbec0..000000000000
--- a/editors/openoffice-1.1/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,66 +0,0 @@
---- configure.in.orig	Thu Feb 20 15:49:32 2003
-+++ configure.in	Wed Mar  5 21:22:34 2003
-@@ -95,6 +95,12 @@
-                           
-                           Usage: --enable-macos9
- ],,)
-+AC_ARG_ENABLE(linuxjdk,
-+[  --enable-linuxjdk         Use this option option if you like to use
-+                          the linux-jdk instead of the native jdk.
-+
-+                          Usage: --enable-linuxjdk
-+],,)
- AC_ARG_WITH(lang,
- [  --with-lang             Use this option to build OpenOffice.org with
-                           additional language support. US English is always
-@@ -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
-@@ -1232,7 +1249,11 @@
- if test -n "$enable_debug"; then
-    ENABLE_DEBUG="TRUE"
- else
--   ENABLE_DEBUG="FALSE"
-+fi
-+if test -n "$enable_linuxjdk"; then
-+   USE_LINUXJDK="TRUE"
-+else
-+   USE_LINUXJDK="FALSE"
- fi
- 
- dnl ===================================================================
-@@ -1278,6 +1299,7 @@
- AC_SUBST(PTHREAD_CFLAGS)
- AC_SUBST(PTHREAD_LIBS)
- AC_SUBST(ENABLE_DEBUG)
-+AC_SUBST(USE_LINUXJDK)
- 
- AC_OUTPUT([set_soenv])
- 
diff --git a/editors/openoffice-1.1/files/patch-config_office+set_soenv.in b/editors/openoffice-1.1/files/patch-config_office+set_soenv.in
deleted file mode 100644
index 9ea6b11bdab2..000000000000
--- a/editors/openoffice-1.1/files/patch-config_office+set_soenv.in
+++ /dev/null
@@ -1,44 +0,0 @@
---- set_soenv.in.orig	Thu Feb 27 15:12:36 2003
-+++ set_soenv.in	Wed Mar  5 21:16:43 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, 
-@@ -88,7 +88,7 @@
-      $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
-      $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS,
-      $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
--     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG );
-+     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $USE_LINUXJDK );
- #
- #-------------------------------------------
- # IId. Declaring the aliases.
-@@ -140,7 +140,8 @@
- $CC			= '@CC@';           # C compiler
- $CXX		= '@CXX@';          # C++ compiler
- $EXCEPTIONS	= '@EXCEPTIONS@';   # Exception handling type
--$ENABLE_DEBUG	= '@ENABLE_DEBUG@';  # Enable a debug build
-+$ENABLE_DEBUG	= '@ENABLE_DEBUG@'; # Enable a debug build
-+$USE_LINUXJDK	= '@USE_LINUXJDK@'; # Use the Linux JDK
- $WRAPCMD	= "";				# Wrapper (only for winnt)
- 
- #
-@@ -1265,7 +1266,12 @@
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
- }
- elsif ($platform eq "$FreeBSD")
--{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+{
-+   if ($USE_LINUXJDK eq "TRUE") {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
-+   } else {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+   }
- }
- elsif ($platform eq "$NetBSD")
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
diff --git a/editors/openoffice-1.1/files/patch-connectivity+source+drivers+mozab+makefile.mk b/editors/openoffice-1.1/files/patch-connectivity+source+drivers+mozab+makefile.mk
deleted file mode 100644
index 2b83f2cd2ec7..000000000000
--- a/editors/openoffice-1.1/files/patch-connectivity+source+drivers+mozab+makefile.mk
+++ /dev/null
@@ -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)					\
diff --git a/editors/openoffice-1.1/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice-1.1/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
deleted file mode 100644
index 3601766ee561..000000000000
--- a/editors/openoffice-1.1/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../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
-@@ -64,8 +64,8 @@
- #mozilla specific stuff.
- MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
- MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
--#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
--#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
-+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
-+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
- #End of mozilla specific stuff.
- 
- PRJ=..$/..$/..$/..
-@@ -107,7 +107,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -123,7 +123,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -141,7 +141,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS+=	    -DMOZILLA_CLIENT \
-             -DOSTYPE=\"Linux2.2.14-5\" -DOJI
- .IF "$(OS)" == "LINUX"
-@@ -157,6 +157,13 @@
-             -fno-rtti -Wall -Wconversion -Wpointer-arith \
-             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-             -Wno-long-long 
-+CDEFS     += -DTRACING
-+.ELIF "$(OS)" == "FREEBSD"
-+CFLAGS +=   -fPIC
-+CFLAGSCXX += \
-+            -fno-rtti -Wall -Wconversion -Wpointer-arith \
-+            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-+            -Wno-long-long -pthread 
- CDEFS     += -DTRACING
- .ENDIF
- .ENDIF
diff --git a/editors/openoffice-1.1/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk b/editors/openoffice-1.1/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
deleted file mode 100644
index b63d2a25f184..000000000000
--- a/editors/openoffice-1.1/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-1.1/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice-1.1/files/patch-cppu+inc+uno+lbnames.h
deleted file mode 100644
index cb43c2d165e9..000000000000
--- a/editors/openoffice-1.1/files/patch-cppu+inc+uno+lbnames.h
+++ /dev/null
@@ -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."
diff --git a/editors/openoffice-1.1/files/patch-cppu+prj+build.lst b/editors/openoffice-1.1/files/patch-cppu+prj+build.lst
deleted file mode 100644
index 78fd210a1193..000000000000
--- a/editors/openoffice-1.1/files/patch-cppu+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.1/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice-1.1/files/patch-cppuhelper+source+makefile.mk
deleted file mode 100644
index 5fb5bd636eb1..000000000000
--- a/editors/openoffice-1.1/files/patch-cppuhelper+source+makefile.mk
+++ /dev/null
@@ -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 ------------------------------------------------------
diff --git a/editors/openoffice-1.1/files/patch-desktop+source+pkgchk+pkgchk_misc.h b/editors/openoffice-1.1/files/patch-desktop+source+pkgchk+pkgchk_misc.h
deleted file mode 100644
index 391667b66ebd..000000000000
--- a/editors/openoffice-1.1/files/patch-desktop+source+pkgchk+pkgchk_misc.h
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.1/files/patch-desktop+util+makefile.mk b/editors/openoffice-1.1/files/patch-desktop+util+makefile.mk
deleted file mode 100644
index 025d644a8077..000000000000
--- a/editors/openoffice-1.1/files/patch-desktop+util+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.1/files/patch-dtrans+source+X11+makefile.mk b/editors/openoffice-1.1/files/patch-dtrans+source+X11+makefile.mk
deleted file mode 100644
index 5881f5d7f6a5..000000000000
--- a/editors/openoffice-1.1/files/patch-dtrans+source+X11+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice-1.1/files/patch-eventattacher+source+makefile.mk b/editors/openoffice-1.1/files/patch-eventattacher+source+makefile.mk
deleted file mode 100644
index 4552698eb132..000000000000
--- a/editors/openoffice-1.1/files/patch-eventattacher+source+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-1.1/files/patch-external+gcc3_specific+makefile.mk b/editors/openoffice-1.1/files/patch-external+gcc3_specific+makefile.mk
deleted file mode 100644
index 6b8071f4030e..000000000000
--- a/editors/openoffice-1.1/files/patch-external+gcc3_specific+makefile.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../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"
- 
- .IF "$(OS)"!="MACOSX"
-+.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 @@
-         -rm -f $@
-         +ln -s libgcc_s.so.1 $@
- 
-+.ENDIF 
- .ENDIF 
- 
- .ENDIF
diff --git a/editors/openoffice-1.1/files/patch-freetype+makefile.mk b/editors/openoffice-1.1/files/patch-freetype+makefile.mk
deleted file mode 100644
index 3e5a8dd19f18..000000000000
--- a/editors/openoffice-1.1/files/patch-freetype+makefile.mk
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice-1.1/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice-1.1/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice-1.1/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
- 
- /* 
diff --git a/editors/openoffice-1.1/files/patch-javaunohelper+source+makefile.mk b/editors/openoffice-1.1/files/patch-javaunohelper+source+makefile.mk
deleted file mode 100644
index 19f6b86e5ab5..000000000000
--- a/editors/openoffice-1.1/files/patch-javaunohelper+source+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice-1.1/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice-1.1/files/patch-jni_uno+jni_java2uno.cxx
deleted file mode 100644
index a9ff9e3fed88..000000000000
--- a/editors/openoffice-1.1/files/patch-jni_uno+jni_java2uno.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice-1.1/files/patch-nas+nas-1.6.patch b/editors/openoffice-1.1/files/patch-nas+nas-1.6.patch
deleted file mode 100644
index b6096654ebaf..000000000000
--- a/editors/openoffice-1.1/files/patch-nas+nas-1.6.patch
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice-1.1/files/patch-offapi+com+sun+star+setup+OSType.idl b/editors/openoffice-1.1/files/patch-offapi+com+sun+star+setup+OSType.idl
deleted file mode 100644
index 3fee562c6d38..000000000000
--- a/editors/openoffice-1.1/files/patch-offapi+com+sun+star+setup+OSType.idl
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.1/files/patch-offapi+util+makefile.pmk b/editors/openoffice-1.1/files/patch-offapi+util+makefile.pmk
deleted file mode 100644
index 5cdbb1b4aa4a..000000000000
--- a/editors/openoffice-1.1/files/patch-offapi+util+makefile.pmk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.1/files/patch-package+inc+HashMaps.hxx b/editors/openoffice-1.1/files/patch-package+inc+HashMaps.hxx
deleted file mode 100644
index 35052d291ef7..000000000000
--- a/editors/openoffice-1.1/files/patch-package+inc+HashMaps.hxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice-1.1/files/patch-package+inc+ZipPackageFolder.hxx b/editors/openoffice-1.1/files/patch-package+inc+ZipPackageFolder.hxx
deleted file mode 100644
index 014c61403380..000000000000
--- a/editors/openoffice-1.1/files/patch-package+inc+ZipPackageFolder.hxx
+++ /dev/null
@@ -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()
diff --git a/editors/openoffice-1.1/files/patch-package+source+zippackage+ContentInfo.hxx b/editors/openoffice-1.1/files/patch-package+source+zippackage+ContentInfo.hxx
deleted file mode 100644
index c4bf35e79f64..000000000000
--- a/editors/openoffice-1.1/files/patch-package+source+zippackage+ContentInfo.hxx
+++ /dev/null
@@ -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();
diff --git a/editors/openoffice-1.1/files/patch-package+source+zippackage+ZipPackageFolder.cxx b/editors/openoffice-1.1/files/patch-package+source+zippackage+ZipPackageFolder.cxx
deleted file mode 100644
index bb504c834eef..000000000000
--- a/editors/openoffice-1.1/files/patch-package+source+zippackage+ZipPackageFolder.cxx
+++ /dev/null
@@ -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 );
diff --git a/editors/openoffice-1.1/files/patch-registry+source+regkey.cxx b/editors/openoffice-1.1/files/patch-registry+source+regkey.cxx
deleted file mode 100644
index fad069f83f14..000000000000
--- a/editors/openoffice-1.1/files/patch-registry+source+regkey.cxx
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice-1.1/files/patch-rsc+source+rscpp+cpp.h b/editors/openoffice-1.1/files/patch-rsc+source+rscpp+cpp.h
deleted file mode 100644
index 417ab33ba52f..000000000000
--- a/editors/openoffice-1.1/files/patch-rsc+source+rscpp+cpp.h
+++ /dev/null
@@ -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              */
- 
diff --git a/editors/openoffice-1.1/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice-1.1/files/patch-sal+osl+unx+nlsupport.c
deleted file mode 100644
index 49fe0da8589b..000000000000
--- a/editors/openoffice-1.1/files/patch-sal+osl+unx+nlsupport.c
+++ /dev/null
@@ -1,160 +0,0 @@
---- ../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
-@@ -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)
- 
-@@ -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 @@
-     { "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-1.1/files/patch-sal+osl+unx+pipe.c b/editors/openoffice-1.1/files/patch-sal+osl+unx+pipe.c
deleted file mode 100644
index 4aa7b8af1a61..000000000000
--- a/editors/openoffice-1.1/files/patch-sal+osl+unx+pipe.c
+++ /dev/null
@@ -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 )
- 	{			
diff --git a/editors/openoffice-1.1/files/patch-sal+osl+unx+process.c b/editors/openoffice-1.1/files/patch-sal+osl+unx+process.c
deleted file mode 100644
index 50023576bec4..000000000000
--- a/editors/openoffice-1.1/files/patch-sal+osl+unx+process.c
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice-1.1/files/patch-sal+osl+unx+security.c b/editors/openoffice-1.1/files/patch-sal+osl+unx+security.c
deleted file mode 100644
index 0cc321dcd544..000000000000
--- a/editors/openoffice-1.1/files/patch-sal+osl+unx+security.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../sal/osl/unx/security.c.orig	Sat Jul 20 22:53:31 2002
-+++ ../sal/osl/unx/security.c	Sat Jul 20 22:52:39 2002
-@@ -739,7 +739,7 @@
- 	}
- 
- 
--#elif (LINUX && (GLIBC >= 2))
-+#elif ((LINUX && (GLIBC >= 2)) || defined(FREEBSD))
- 	
- 	struct passwd	*pPasswd; 
- 	
diff --git a/editors/openoffice-1.1/files/patch-sal+osl+unx+socket.c b/editors/openoffice-1.1/files/patch-sal+osl+unx+socket.c
deleted file mode 100644
index 9541cac8583f..000000000000
--- a/editors/openoffice-1.1/files/patch-sal+osl+unx+socket.c
+++ /dev/null
@@ -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! */
diff --git a/editors/openoffice-1.1/files/patch-sal+osl+unx+system.c b/editors/openoffice-1.1/files/patch-sal+osl+unx+system.c
deleted file mode 100644
index 8dc663ac03fc..000000000000
--- a/editors/openoffice-1.1/files/patch-sal+osl+unx+system.c
+++ /dev/null
@@ -1,127 +0,0 @@
---- ../sal/osl/unx/system.c.orig	Sun Mar 17 12:34:13 2002
-+++ ../sal/osl/unx/system.c	Wed Apr  3 01:03:36 2002
-@@ -195,6 +195,73 @@
- }
- #endif
- 
-+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
-+           size_t buflen, struct passwd **result)
-+{
-+  struct passwd* res;
-+
-+  pthread_mutex_lock(&getrtl_mutex);
-+
-+  if ( res = getpwuid(uid) )
-+  {
-+    size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell;
-+
-+    pw_name = strlen(res->pw_name)+1;
-+    pw_passwd = strlen(res->pw_passwd)+1;
-+    pw_class = strlen(res->pw_class)+1;
-+    pw_gecos = strlen(res->pw_gecos)+1;
-+    pw_dir = strlen(res->pw_dir)+1;
-+    pw_shell = strlen(res->pw_shell)+1;
-+
-+    if (pw_name+pw_passwd+pw_class+pw_gecos
-+                                 +pw_dir+pw_shell < buflen)
-+    {
-+      memcpy(pwd, res, sizeof(struct passwd));
-+
-+      strncpy(buffer, res->pw_name, pw_name);
-+      pwd->pw_name = buffer;
-+      buffer += pw_name;
-+
-+      strncpy(buffer, res->pw_passwd, pw_passwd);
-+      pwd->pw_passwd = buffer;
-+      buffer += pw_passwd;
-+
-+      strncpy(buffer, res->pw_class, pw_class);
-+      pwd->pw_class = buffer;
-+      buffer += pw_class;
-+
-+      strncpy(buffer, res->pw_gecos, pw_gecos);
-+      pwd->pw_gecos = buffer;
-+      buffer += pw_gecos;
-+
-+      strncpy(buffer, res->pw_dir, pw_dir);
-+      pwd->pw_dir = buffer;
-+      buffer += pw_dir;
-+
-+      strncpy(buffer, res->pw_shell, pw_shell);
-+      pwd->pw_shell = buffer;
-+      buffer += pw_shell;
-+
-+      *result = pwd ;
-+      res = 0 ;
-+
-+    } else {
-+
-+      res = ENOMEM ;
-+
-+    }      
-+  
-+  } else {
-+
-+    res = errno ;
-+ 
-+  } 
-+
-+  pthread_mutex_unlock(&getrtl_mutex);
-+
-+  return res;
-+}
-+
- struct tm *localtime_r(const time_t *timep, struct tm *buffer)
- {
- 	struct tm* res;
-@@ -518,3 +585,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-1.1/files/patch-sal+osl+unx+system.h b/editors/openoffice-1.1/files/patch-sal+osl+unx+system.h
deleted file mode 100644
index c4e255952fc7..000000000000
--- a/editors/openoffice-1.1/files/patch-sal+osl+unx+system.h
+++ /dev/null
@@ -1,35 +0,0 @@
---- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
-+++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
-@@ -205,6 +205,13 @@
- #   include <sys/ioctl.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 <machine/vmparam.h>
-+#   include <machine/pmap.h>
- #	include <sys/un.h>
- #   include <netinet/tcp.h>
- #	define 	IORESOURCE_TRANSFER_BSD 
-@@ -216,12 +223,13 @@
- #   elif BYTE_ORDER == PDP_ENDIAN
- #   	define _PDP_ENDIAN
- #   endif
--#   define  sched_yield() 				pthread_yield()
--#   define  pthread_testcancel()
- #	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
diff --git a/editors/openoffice-1.1/files/patch-sal+textenc+tencinfo.c b/editors/openoffice-1.1/files/patch-sal+textenc+tencinfo.c
deleted file mode 100644
index 7cf80c18d0a0..000000000000
--- a/editors/openoffice-1.1/files/patch-sal+textenc+tencinfo.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
-     /* 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 */
-+
-+    if (pMimeCharset == NULL)
-+	pMimeCharset = "usascii";
-+
-     static ImplStrCharsetDef const aVIPMimeCharsetTab[] =
-     {
-         { "usascii", RTL_TEXTENCODING_ASCII_US },
diff --git a/editors/openoffice-1.1/files/patch-sal+workben+makefile.mk b/editors/openoffice-1.1/files/patch-sal+workben+makefile.mk
deleted file mode 100644
index 369935e31d66..000000000000
--- a/editors/openoffice-1.1/files/patch-sal+workben+makefile.mk
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../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 @@
- 
- .IF "$(TESTAPP)" == "salstattest"
- 
--	CFLAGS+= /DUSE_SAL_STATIC
-+	CFLAGS+= -DUSE_SAL_STATIC
- 
- 	OBJFILES=	$(OBJ)$/salstattest.obj
- 
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- 
- CXXFILES=	tgetpwnam.cxx
- OBJFILES=	$(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN=	$(SLB)$/sal.lib
- 
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd | freebsd)
- .ENDIF # tgetpwname
- 
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-1.1/files/patch-salhelper+source+gcc2_freebsd_intel.map b/editors/openoffice-1.1/files/patch-salhelper+source+gcc2_freebsd_intel.map
deleted file mode 100644
index 1ffacf889bc6..000000000000
--- a/editors/openoffice-1.1/files/patch-salhelper+source+gcc2_freebsd_intel.map
+++ /dev/null
@@ -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:
-+*;
-+};
diff --git a/editors/openoffice-1.1/files/patch-salhelper+source+gcc3_freebsd_intel.map b/editors/openoffice-1.1/files/patch-salhelper+source+gcc3_freebsd_intel.map
deleted file mode 100644
index 823cff316ec7..000000000000
--- a/editors/openoffice-1.1/files/patch-salhelper+source+gcc3_freebsd_intel.map
+++ /dev/null
@@ -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:
-+		*;
-+};
-+
diff --git a/editors/openoffice-1.1/files/patch-salhelper+source+makefile.mk b/editors/openoffice-1.1/files/patch-salhelper+source+makefile.mk
deleted file mode 100644
index 3687664d8d16..000000000000
--- a/editors/openoffice-1.1/files/patch-salhelper+source+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../salhelper/source/makefile.mk.orig	Wed Nov 14 14:19:21 2001
-+++ ../salhelper/source/makefile.mk	Sun Mar  3 17:58:15 2002
-@@ -109,6 +109,10 @@
- SHL1VERSIONMAP=lngi.map
- .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
- SHL1VERSIONMAP=gcc3_linux_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
- .ENDIF
- 
- 
diff --git a/editors/openoffice-1.1/files/patch-salhelper+test+rtti+makefile.mk b/editors/openoffice-1.1/files/patch-salhelper+test+rtti+makefile.mk
deleted file mode 100644
index 70f25048a24a..000000000000
--- a/editors/openoffice-1.1/files/patch-salhelper+test+rtti+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
- 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
- .ENDIF
- 
- 
diff --git a/editors/openoffice-1.1/files/patch-sc+source+core+data+cell.cxx b/editors/openoffice-1.1/files/patch-sc+source+core+data+cell.cxx
deleted file mode 100644
index 529f67a3e35f..000000000000
--- a/editors/openoffice-1.1/files/patch-sc+source+core+data+cell.cxx
+++ /dev/null
@@ -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>
diff --git a/editors/openoffice-1.1/files/patch-scp+source+global+udk_base.scp b/editors/openoffice-1.1/files/patch-scp+source+global+udk_base.scp
deleted file mode 100644
index 623eccb0ff09..000000000000
--- a/editors/openoffice-1.1/files/patch-scp+source+global+udk_base.scp
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.1/files/patch-scp+source+player+player.scp b/editors/openoffice-1.1/files/patch-scp+source+player+player.scp
deleted file mode 100644
index 2f8daab35cdd..000000000000
--- a/editors/openoffice-1.1/files/patch-scp+source+player+player.scp
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice-1.1/files/patch-scptools+source+linker+searchcache b/editors/openoffice-1.1/files/patch-scptools+source+linker+searchcache
deleted file mode 100644
index 593e9eabf5bc..000000000000
--- a/editors/openoffice-1.1/files/patch-scptools+source+linker+searchcache
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: files/patch-scptools::source::linker::searchcache
-===================================================================
-RCS file: files/patch-scptools::source::linker::searchcache
-diff -N files/patch-scptools::source::linker::searchcache
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-scptools::source::linker::searchcache	4 Aug 2002 15:28:04 -0000
-@@ -0,0 +1,27 @@
-+--- ../scptools/source/linker/searchcache.hxx.orig	Fri Aug  2 22:53:46 2002
-++++ ../scptools/source/linker/searchcache.hxx	Fri Aug  2 22:54:50 2002
-+@@ -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	Fri Aug  2 22:53:35 2002
-++++ ../scptools/source/linker/searchcache.cxx	Fri Aug  2 22:55:14 2002
-+@@ -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-1.1/files/patch-scptools+source+linker+ziplst.cxx b/editors/openoffice-1.1/files/patch-scptools+source+linker+ziplst.cxx
deleted file mode 100644
index 83b84631542e..000000000000
--- a/editors/openoffice-1.1/files/patch-scptools+source+linker+ziplst.cxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice-1.1/files/patch-setup2+inc+fields.hxx b/editors/openoffice-1.1/files/patch-setup2+inc+fields.hxx
deleted file mode 100644
index d56e12f2abf4..000000000000
--- a/editors/openoffice-1.1/files/patch-setup2+inc+fields.hxx
+++ /dev/null
@@ -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[];
diff --git a/editors/openoffice-1.1/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice-1.1/files/patch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 396c586ee3a3..000000000000
--- a/editors/openoffice-1.1/files/patch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,30 +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"
- 
-@@ -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" \
diff --git a/editors/openoffice-1.1/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice-1.1/files/patch-setup2+mow+source+loader+makefile.mk
deleted file mode 100644
index 5460e4296587..000000000000
--- a/editors/openoffice-1.1/files/patch-setup2+mow+source+loader+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice-1.1/files/patch-setup2+patch+makefile.mk b/editors/openoffice-1.1/files/patch-setup2+patch+makefile.mk
deleted file mode 100644
index 53846a8bdfc9..000000000000
--- a/editors/openoffice-1.1/files/patch-setup2+patch+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.1/files/patch-setup2+script+setupserver b/editors/openoffice-1.1/files/patch-setup2+script+setupserver
deleted file mode 100644
index 450ea386c841..000000000000
--- a/editors/openoffice-1.1/files/patch-setup2+script+setupserver
+++ /dev/null
@@ -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`"
diff --git a/editors/openoffice-1.1/files/patch-setup2+source+compiler+decltor.cxx b/editors/openoffice-1.1/files/patch-setup2+source+compiler+decltor.cxx
deleted file mode 100644
index 98f6ad2f7567..000000000000
--- a/editors/openoffice-1.1/files/patch-setup2+source+compiler+decltor.cxx
+++ /dev/null
@@ -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";
diff --git a/editors/openoffice-1.1/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx b/editors/openoffice-1.1/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
deleted file mode 100644
index ac0b39a6aa47..000000000000
--- a/editors/openoffice-1.1/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
+++ /dev/null
@@ -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) );
diff --git a/editors/openoffice-1.1/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice-1.1/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
deleted file mode 100644
index f199b18823e1..000000000000
--- a/editors/openoffice-1.1/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice-1.1/files/patch-setup2+source+service+interface.cxx b/editors/openoffice-1.1/files/patch-setup2+source+service+interface.cxx
deleted file mode 100644
index 8e478e17971d..000000000000
--- a/editors/openoffice-1.1/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-1.1/files/patch-shell+source+cmdmail+makefile.mk b/editors/openoffice-1.1/files/patch-shell+source+cmdmail+makefile.mk
deleted file mode 100644
index 0476285c802e..000000000000
--- a/editors/openoffice-1.1/files/patch-shell+source+cmdmail+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice-1.1/files/patch-shell+source+proxysettings+makefile.mk b/editors/openoffice-1.1/files/patch-shell+source+proxysettings+makefile.mk
deleted file mode 100644
index e83cf7c9d7a1..000000000000
--- a/editors/openoffice-1.1/files/patch-shell+source+proxysettings+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice-1.1/files/patch-shell+source+unix+exec+makefile.mk b/editors/openoffice-1.1/files/patch-shell+source+unix+exec+makefile.mk
deleted file mode 100644
index 0b7712ee35f8..000000000000
--- a/editors/openoffice-1.1/files/patch-shell+source+unix+exec+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice-1.1/files/patch-solenv+bin+addsym.awk b/editors/openoffice-1.1/files/patch-solenv+bin+addsym.awk
deleted file mode 100644
index 996e282b350b..000000000000
--- a/editors/openoffice-1.1/files/patch-solenv+bin+addsym.awk
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
-+++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
-@@ -72,11 +72,11 @@
- END {
-     if (state == 0) {
-         print "# Weak RTTI symbols for C++ exceptions:"
--        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
-+        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
-     }
- }
- state == 2 {
--    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
-+    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
-     state = 3
- }
- /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice-1.1/files/patch-solenv+bin+mapgen.pl b/editors/openoffice-1.1/files/patch-solenv+bin+mapgen.pl
deleted file mode 100644
index 71ebdb934120..000000000000
--- a/editors/openoffice-1.1/files/patch-solenv+bin+mapgen.pl
+++ /dev/null
@@ -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, $_);
- 	};
diff --git a/editors/openoffice-1.1/files/patch-solenv+inc+startup+FREEBSD+macros.mk b/editors/openoffice-1.1/files/patch-solenv+inc+startup+FREEBSD+macros.mk
deleted file mode 100644
index 0c1b107de988..000000000000
--- a/editors/openoffice-1.1/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-1.1/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice-1.1/files/patch-solenv+inc+tg_ext.mk
deleted file mode 100644
index 701692c9425a..000000000000
--- a/editors/openoffice-1.1/files/patch-solenv+inc+tg_ext.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.1/files/patch-solenv+inc+tg_moz.mk b/editors/openoffice-1.1/files/patch-solenv+inc+tg_moz.mk
deleted file mode 100644
index 255a41f92281..000000000000
--- a/editors/openoffice-1.1/files/patch-solenv+inc+tg_moz.mk
+++ /dev/null
@@ -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) $@
diff --git a/editors/openoffice-1.1/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.1/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index b4764485aa86..000000000000
--- a/editors/openoffice-1.1/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,202 +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
-+# 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*=$(CC)
-+
-+# default linker flags
-+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -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
diff --git a/editors/openoffice-1.1/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice-1.1/files/patch-soltools+checkdll+makefile.mk
deleted file mode 100644
index e6407402258a..000000000000
--- a/editors/openoffice-1.1/files/patch-soltools+checkdll+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.1/files/patch-soltools+mkdepend+main.c b/editors/openoffice-1.1/files/patch-soltools+mkdepend+main.c
deleted file mode 100644
index cffd5cbb1f43..000000000000
--- a/editors/openoffice-1.1/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-1.1/files/patch-stlport+makefile.mk b/editors/openoffice-1.1/files/patch-stlport+makefile.mk
deleted file mode 100644
index 797817ba85be..000000000000
--- a/editors/openoffice-1.1/files/patch-stlport+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.1/files/patch-stoc+source+corereflection+makefile.mk b/editors/openoffice-1.1/files/patch-stoc+source+corereflection+makefile.mk
deleted file mode 100644
index 4b319b08d401..000000000000
--- a/editors/openoffice-1.1/files/patch-stoc+source+corereflection+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-1.1/files/patch-stoc+source+defaultregistry+makefile.mk b/editors/openoffice-1.1/files/patch-stoc+source+defaultregistry+makefile.mk
deleted file mode 100644
index 4cae0476415a..000000000000
--- a/editors/openoffice-1.1/files/patch-stoc+source+defaultregistry+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice-1.1/files/patch-stoc+source+implementationregistration+implreg.cxx b/editors/openoffice-1.1/files/patch-stoc+source+implementationregistration+implreg.cxx
deleted file mode 100644
index 341d621d872c..000000000000
--- a/editors/openoffice-1.1/files/patch-stoc+source+implementationregistration+implreg.cxx
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.1/files/patch-stoc+source+implementationregistration+makefile.mk b/editors/openoffice-1.1/files/patch-stoc+source+implementationregistration+makefile.mk
deleted file mode 100644
index 0051043b7ecb..000000000000
--- a/editors/openoffice-1.1/files/patch-stoc+source+implementationregistration+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-1.1/files/patch-stoc+source+inspect+makefile.mk b/editors/openoffice-1.1/files/patch-stoc+source+inspect+makefile.mk
deleted file mode 100644
index c7cd85253c11..000000000000
--- a/editors/openoffice-1.1/files/patch-stoc+source+inspect+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-1.1/files/patch-stoc+source+invocation+makefile.mk b/editors/openoffice-1.1/files/patch-stoc+source+invocation+makefile.mk
deleted file mode 100644
index 9ac2072a5612..000000000000
--- a/editors/openoffice-1.1/files/patch-stoc+source+invocation+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice-1.1/files/patch-stoc+source+invocation_adapterfactory+makefile.mk b/editors/openoffice-1.1/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
deleted file mode 100644
index 8853ad39a90e..000000000000
--- a/editors/openoffice-1.1/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice-1.1/files/patch-stoc+source+javaloader+makefile.mk b/editors/openoffice-1.1/files/patch-stoc+source+javaloader+makefile.mk
deleted file mode 100644
index cea499f15c57..000000000000
--- a/editors/openoffice-1.1/files/patch-stoc+source+javaloader+makefile.mk
+++ /dev/null
@@ -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=		
diff --git a/editors/openoffice-1.1/files/patch-stoc+source+javavm+makefile.mk b/editors/openoffice-1.1/files/patch-stoc+source+javavm+makefile.mk
deleted file mode 100644
index b895a2b968d4..000000000000
--- a/editors/openoffice-1.1/files/patch-stoc+source+javavm+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice-1.1/files/patch-stoc+source+loader+makefile.mk b/editors/openoffice-1.1/files/patch-stoc+source+loader+makefile.mk
deleted file mode 100644
index 5a08ee5937b6..000000000000
--- a/editors/openoffice-1.1/files/patch-stoc+source+loader+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice-1.1/files/patch-stoc+source+namingservice+makefile.mk b/editors/openoffice-1.1/files/patch-stoc+source+namingservice+makefile.mk
deleted file mode 100644
index e573081bc21d..000000000000
--- a/editors/openoffice-1.1/files/patch-stoc+source+namingservice+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice-1.1/files/patch-stoc+source+proxy_factory+makefile.mk b/editors/openoffice-1.1/files/patch-stoc+source+proxy_factory+makefile.mk
deleted file mode 100644
index 9110b2f50cd1..000000000000
--- a/editors/openoffice-1.1/files/patch-stoc+source+proxy_factory+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-1.1/files/patch-stoc+source+registry_tdprovider+makefile.mk b/editors/openoffice-1.1/files/patch-stoc+source+registry_tdprovider+makefile.mk
deleted file mode 100644
index 9d974d1c0d10..000000000000
--- a/editors/openoffice-1.1/files/patch-stoc+source+registry_tdprovider+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.1/files/patch-stoc+source+servicemanager+makefile.mk b/editors/openoffice-1.1/files/patch-stoc+source+servicemanager+makefile.mk
deleted file mode 100644
index 746776d54759..000000000000
--- a/editors/openoffice-1.1/files/patch-stoc+source+servicemanager+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-1.1/files/patch-stoc+source+tdmanager+makefile.mk b/editors/openoffice-1.1/files/patch-stoc+source+tdmanager+makefile.mk
deleted file mode 100644
index 76403fdde841..000000000000
--- a/editors/openoffice-1.1/files/patch-stoc+source+tdmanager+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice-1.1/files/patch-stoc+source+typeconv+makefile.mk b/editors/openoffice-1.1/files/patch-stoc+source+typeconv+makefile.mk
deleted file mode 100644
index dc647f89a166..000000000000
--- a/editors/openoffice-1.1/files/patch-stoc+source+typeconv+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-1.1/files/patch-store+util+makefile.mk b/editors/openoffice-1.1/files/patch-store+util+makefile.mk
deleted file mode 100644
index 6bef6e960f2e..000000000000
--- a/editors/openoffice-1.1/files/patch-store+util+makefile.mk
+++ /dev/null
@@ -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
- 
- 
diff --git a/editors/openoffice-1.1/files/patch-svx+source+fmcomp+makefile.mk b/editors/openoffice-1.1/files/patch-svx+source+fmcomp+makefile.mk
deleted file mode 100644
index b16030080c0d..000000000000
--- a/editors/openoffice-1.1/files/patch-svx+source+fmcomp+makefile.mk
+++ /dev/null
@@ -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= \
diff --git a/editors/openoffice-1.1/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice-1.1/files/patch-sysui+oounix+office+gnome+makefile.mk
deleted file mode 100644
index 3d7c2e22aa63..000000000000
--- a/editors/openoffice-1.1/files/patch-sysui+oounix+office+gnome+makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
-+++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
-@@ -84,7 +84,9 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- APP1LIBS=
-+.IF "$(OS)"!="FREEBSD"
- APP1STDLIBS=-ldl
-+.ENDIF
- 
- GNOMEFILES= \
- 	locales.tab
diff --git a/editors/openoffice-1.1/files/patch-tools+source+string+tstring.cxx b/editors/openoffice-1.1/files/patch-tools+source+string+tstring.cxx
deleted file mode 100644
index 12bd6bd0b244..000000000000
--- a/editors/openoffice-1.1/files/patch-tools+source+string+tstring.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../tools/source/string/tstring.cxx.orig	Sat Aug 10 12:53:42 2002
-+++ ../tools/source/string/tstring.cxx	Sat Aug 10 12:54:16 2002
-@@ -103,6 +103,9 @@
- xub_StrLen ImplStringLen( const sal_Char* pStr )
- {
- 	const sal_Char* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
-@@ -113,6 +116,9 @@
- xub_StrLen ImplStringLen( const sal_Unicode* pStr )
- {
- 	const sal_Unicode* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
diff --git a/editors/openoffice-1.1/files/patch-unoil+makefile.pmk b/editors/openoffice-1.1/files/patch-unoil+makefile.pmk
deleted file mode 100644
index 7febdabf7b4b..000000000000
--- a/editors/openoffice-1.1/files/patch-unoil+makefile.pmk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../unoil/makefile.pmk.orig	Fri Aug 31 18:04:43 2001
-+++ ../unoil/makefile.pmk	Thu Sep 12 12:17:50 2002
-@@ -74,8 +74,8 @@
- JAVAFILESLIST	:= $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java)
- .ENDIF          # "$(L10N_framework)"==""
- 
--GENJAVAFILES	:= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
--GENCLASSFILES	:= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
-+GENJAVAFILES	+= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
-+GENCLASSFILES	+= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
- 
- # --- Targets ------------------------------------------------------
- 
diff --git a/editors/openoffice-1.1/files/patch-unzip+source+file_io.c b/editors/openoffice-1.1/files/patch-unzip+source+file_io.c
deleted file mode 100644
index 2f85a108c185..000000000000
--- a/editors/openoffice-1.1/files/patch-unzip+source+file_io.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../unzip/source/file_io.c.orig	Sat Oct 19 11:58:45 2002
-+++ ../unzip/source/file_io.c	Sat Oct 19 12:03:40 2002
-@@ -500,7 +500,7 @@
- #ifdef MPW
- 				pCallBack( 0 );
- #else
--				#if defined LINUX || defined MACOSX || defined NETBSD
-+				#if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD
- 				pCallBack( lseek(outfd, 0, SEEK_CUR) );
- 				#else
- 				pCallBack( tell( outfd ) );
-@@ -865,7 +865,9 @@
- 	static struct timeb tbp;
- #endif /* !__386BSD__ */
- #else /* !BSD */
-+#if (!defined(NETBSD) && !defined(FREEBSD))
- 	extern long timezone;
-+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
- #endif /* ?BSD */
- #endif /* ?AMIGA */
- 
diff --git a/editors/openoffice-1.1/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice-1.1/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
deleted file mode 100644
index 41defbd5eb59..000000000000
--- a/editors/openoffice-1.1/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
-+++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
-@@ -65,6 +65,8 @@
- #include <glyphcache.hxx>
- 
- #define Region XLIB_Region
-+typedef unsigned long CARD32;
-+#define Cursor CARD32
- #include <X11/extensions/Xrender.h>
- #undef Region
- 
diff --git a/editors/openoffice-1.1/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice-1.1/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
deleted file mode 100644
index fefc925db41f..000000000000
--- a/editors/openoffice-1.1/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
-@@ -78,6 +78,12 @@
- GETSTYLE_GNOME=getstyle-gnome-linux-intel
- HASGNOME2=TRUE
- .ENDIF
-+.IF "$_(HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
-+.ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
- HASGNOME2=TRUE
diff --git a/editors/openoffice-1.1/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice-1.1/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
deleted file mode 100644
index 984313fc540a..000000000000
--- a/editors/openoffice-1.1/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
-@@ -75,9 +75,15 @@
- 
- HASGNOME2=
- 
--.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
-+.IF "$(OS)$(CPU)"=="LINUXI"
- MSGBOX_GNOME=msgbox-gnome-linux-intel
- HASGNOME2=TRUE
-+.ENDIF
-+.IF "$(_HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+MSGBOX_GNOME=msgbox-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
- .ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice-1.1/files/patch-vcl+workben+officeacceptthread.cxx b/editors/openoffice-1.1/files/patch-vcl+workben+officeacceptthread.cxx
deleted file mode 100644
index 07d9f1060557..000000000000
--- a/editors/openoffice-1.1/files/patch-vcl+workben+officeacceptthread.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/workben/officeacceptthread.cxx.orig	Wed Mar  5 20:25:36 2003
-+++ ../vcl/workben/officeacceptthread.cxx	Wed Mar  5 20:26:03 2003
-@@ -125,7 +125,7 @@
- #if defined (SOLARIS)
- 				int status;
- 				nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG);
--#elif defined(LINUX)
-+#elif defined(LINUX) || defined (FREEBSD)
- 				nRet = kill(aProcessInfo.Ident, 0);
- #endif
- #if defined (UNX)
diff --git a/editors/openoffice-1.1/files/zipmoz.sh b/editors/openoffice-1.1/files/zipmoz.sh
deleted file mode 100644
index 43a4591f3430..000000000000
--- a/editors/openoffice-1.1/files/zipmoz.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/sh -f
-
-RUNTIME_FILES=" components/libabsyncsvc.so components/libaddrbook.so \
-		components/libmork.so components/libmozldap.so \
-		components/libnecko.so components/libprofile.so \
-		components/librdf.so components/libstrres.so \
-		components/libunicharutil.so components/libuconv.so \
-		components/libucvcn.so components/libucvibm.so \
-		components/libucvja.so components/libucvko.so \
-		components/libucvlatin.so components/libucvtw.so \
-		components/libucvtw2.so components/liburiloader.so \
-		components/libvcard.so components/libxpconnect.so \
-		components/libpref.so components/libchrome.so libmozjs.so \
-		libmsgbaseutil.so libldap50.so libnspr4.so libplc4.so \
-		libplds4.so libxpcom.so libmozz.so component.reg \
-		components/necko_dns.xpt components/xpcom_xpti.xpt \
-		components/xpcom_threads.xpt components/xpcom_io.xpt \
-		components/xpcom_ds.xpt components/xpcom_components.xpt \
-		components/xpcom_base.xpt components/xpti.dat \
-		defaults/pref/all.js defaults/pref/config.js \
-		defaults/pref/editor.js defaults/pref/initpref.js \
-		defaults/pref/inspector.js defaults/pref/mailnews.js \
-		defaults/pref/security-prefs.js defaults/pref/unix.js \
-		defaults/pref/xpinstall.js"
-
-LIB_FILES="	lib/libembed_base_s.a lib/libmozreg_s.a \
-		lib/libnspr4.so lib/libxpcom.so lib/libprldap50.so"
-
-INC_FILES="include/"
-INC_FILES2="public/"
-
-if [ $# -lt 2 -o $# -gt 3 ] ; then
-	echo 
-	echo usage: $0 mozilla_dist target [target_dir]
-	echo
-	echo where:
-	echo
-	echo "mozilla_dist points to the mozilla distribution"
-	echo "target concatenates  OS, compiler and CPU (e.g. FREEBSDGCCI etc)"
-	echo "target_dir is the directory to place the zips"
-	exit 1
-fi
-
-MOZ_DIST=$1
-TARGET=$2
-if [ "w$3" != "w" ]; then
-	TARGET_DIR=$3
-else
-	if [ "w$TARGET_DIR" == "w" ]; then
-		TARGET_DIR=
-	fi
-fi
-
-ZIP_TARGET=$TARGET_DIR
-if [ -z "$ZIP_TARGET" ] ; then
-	ZIP_TARGET=../
-fi
-
-# just to remember the current working directory
-STARTING_DIR=`pwd`
-
-echo
-echo --- creating zips for $TARGET, using mozilla distribution in $MOZ_DIST
-
-# Create the directories
-[ ! -d $TARGET_DIR/$TARGET/runtime ] && mkdir -p $TARGET_DIR/$TARGET/runtime
-[ ! -d $TARGET_DIR/$TARGET/runtime/components ] && mkdir -p $TARGET_DIR/$TARGET/runtime/components
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults/pref ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults/pref
-[ ! -d $TARGET_DIR/$TARGET/lib ] && mkdir -p $TARGET_DIR/$TARGET/lib
-[ ! -d $TARGET_DIR/$TARGET/inc ] && mkdir -p $TARGET_DIR/$TARGET/inc
-[ ! -d $TARGET_DIR/$TARGET/inc/nspr ] && mkdir -p $TARGET_DIR/$TARGET/inc/nspr
-[ ! -d $TARGET_DIR/$TARGET/inc/obsolete ] && mkdir -p $TARGET_DIR/$TARGET/inc/obsolete
-
-# Copy the files
-echo
-echo --- copying files
-echo
-
-for i in $RUNTIME_FILES; do
-	if [ ! -f $MOZ_DIST/bin/$i ]; then
-		echo $MOZ_DIST/bin/$i does not exist, check your distribution
-	else
-		if [ `echo $i | grep component` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/components/
-		elif [ `echo $i | grep defaults` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/defaults/pref/
-		else
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/
-		fi
-	fi
-done
-
-for i in $LIB_FILES; do
-	if [ ! -f $MOZ_DIST/$i ]; then
-		echo $MOZ_DIST/$i does not exist, check your distribution
-	else
-		cp -R -L $MOZ_DIST/$i $TARGET_DIR/$TARGET/lib/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES`; do
-	if [ ! -d $i ]; then 
-		cp -R -L $MOZ_DIST/include/$i $TARGET_DIR/$TARGET/inc/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES2`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/public/$i $TARGET_DIR/$TARGET/inc
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/$i $TARGET_DIR/$TARGET/inc/nspr
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr/obsolete`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/obsolete/$i $TARGET_DIR/$TARGET/inc/obsolete
-	fi
-done
-
-# delete old zips
-
-[ -f $TARGET_DIR/$TARGET/runtime.zip ] && rm -f $TARGET_DIR/$TARGET/runtime.zip
-[ -f $TARGET_DIR/$TARGET/lib.zip ] && rm -f $TARGET_DIR/$TARGET/lib.zip
-[ -f $TARGET_DIR/$TARGET/inc.zip ] && rm -f $TARGET_DIR/$TARGET/inc.zip
-
-# zip the runtime files
-
-echo
-echo --- creating ${TARGET}runtime.zip
-echo
-
-cd $TARGET_DIR/$TARGET/runtime
-find . -type f | zip $ZIP_TARGET/${TARGET}runtime.zip -@
-
-# zip the lib files
-echo 
-echo --- creating ${TARGET}lib.zip
-echo 
-
-cd $TARGET_DIR/$TARGET/lib
-find . -type f | zip $ZIP_TARGET/${TARGET}lib.zip -@
-
-# zip the inc files
-echo
-echo --- creating ${TARGET}inc.zip
-echo
-
-cd $TARGET_DIR/$TARGET/inc
-find . -type f | zip $ZIP_TARGET/${TARGET}inc.zip -@
-
-# remove dirs
-cd $STARTING_DIR
-rm -rf $TARGET_DIR/$TARGET
-
-echo
-echo --- done
-echo
-
diff --git a/editors/openoffice-1.1/pkg-descr b/editors/openoffice-1.1/pkg-descr
deleted file mode 100644
index 31fd1b12161a..000000000000
--- a/editors/openoffice-1.1/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-OpenOffice.org is an Open Source, community-developed, multi-platform office
-productivity suite. It includes the key desktop applications, such as a
-word processor, spreadsheet, presentation manager, and drawing program,
-with a user interface and feature set similar to other office suites.
-
-Components include:
-  * A universal word processing application for creating business
-    letters, extensive text documents, professional layouts, and HTML
-    documents.
-  * A sophisticated application for performing advanced spreadsheet
-    functions, such as analyzing figures, creating lists, and viewing data.
-  * A tool for creating effective eye-catching presentations.
-  * A vector-oriented draw module that enables the creation of 3D
-    illustrations
diff --git a/editors/openoffice-1.1/pkg-message b/editors/openoffice-1.1/pkg-message
deleted file mode 100644
index 1dc749f301c2..000000000000
--- a/editors/openoffice-1.1/pkg-message
+++ /dev/null
@@ -1,73 +0,0 @@
-OpenOffice.org Build 643 Personal Install How-To
-
-Written by:	Martin Blapp <mbr@freebsd.org>
-
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
-
-1 User installation
--------------------
-
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
---------------
-
-There are some wrappers installed for fast startup.
-Add "${PREFIX}/bin/" to your PATH and you will be able
-to use them.
-
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
-
-If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
-version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
diff --git a/editors/openoffice-1.1/pkg-plist b/editors/openoffice-1.1/pkg-plist
deleted file mode 100644
index 28bd78453b52..000000000000
--- a/editors/openoffice-1.1/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, do not delete. Package list is generated automatically.
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
deleted file mode 100644
index 6f740924c399..000000000000
--- a/editors/openoffice-2.0-devel/Makefile
+++ /dev/null
@@ -1,580 +0,0 @@
-# New ports collection makefile for: OpenOffice
-# Date created:		28 Februar 2002
-# Whom:                 Martin Blapp
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openoffice
-PORTVERSION=	644
-CATEGORIES+=	editors
-MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
-		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
-		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
-		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ny1.mirror.openoffice.org/miscellaneous/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
-MASTER_SITE_SUBDIR=	${PORTVERSION}
-DISTFILES+=	oo_${PORTVERSION}_src.tar.bz2 \
-		gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
-
-BROKEN=		"Does not build"
-
-SORT?=	/usr/bin/sort
-FIND?=	/usr/bin/find
-CUT?=	/usr/bin/cut
-AWK?=	/usr/bin/awk
-GREP?=	/usr/bin/grep
-ZIP?=	${PREFIX}/bin/zip
-UNZIP?=	${PREFIX}/bin/unzip
-ANT?=	${LOCALBASE}/bin/ant
-TCSH?=	/bin/tcsh
-PASTE?=	/usr/bin/paste
-
-.include <bsd.port.pre.mk>
-
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
-DIST_SUBDIR=		openoffice
-DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
-
-#
-# configuration for language specific slave ports
-#
-.if !defined(LANG_EXT)
-LANG_EXT=01
-.else
-#
-# Add pkg-descr and pkg-message if available
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-#
-# LANG_CONFIGURE_ARG is missing for the german port
-#
-.if defined(LANG_EXT)
-CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG},ENUS
-.endif
-.endif
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
-
-EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-
-MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/jakarta-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-.if !defined(DISPLAY)
-BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
-.endif
-.if !defined(WITH_BSD_JDK)
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk14
-.else
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-.endif
-
-USE_PERL5=	yes
-USE_BZIP2=	yes
-USE_BISON=	yes
-USE_GMAKE=	yes
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
-.if !defined(WITH_BSD_JDK)
-JDKDIR?=	${LOCALBASE}/linux-sun-jdk1.4.1
-.else
-JDKDIR?=	${LOCALBASE}/jdk1.4.1
-.endif
-JAVAVM=         ${JDKDIR}/bin/java
-
-GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
-LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
-BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
-
-.if !defined(DISPLAY)
-DISPLAYHACK=localhost:1001
-.endif
-
-CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
-			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
-
-.if !defined(WITH_BSD_JDK)
-CONFIGURE_ARGS+=	--enable-linuxjdk=yes
-.endif
-
-.if defined(WITH_DEBUG)
-.if ${WITH_DEBUG} == 2
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-.endif
-
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"prefered language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
-	@${ECHO} "OPTIONS:"
-.if !defined(USE_GCC)
-	@${ECHO}
-	@${ECHO} "You can compile OO with different"
-	@${ECHO} "gcc compiler versions:"
-	@${ECHO}
-	@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.2"
-	@${ECHO} "to compile openoffice with your"
-	@${ECHO} "prefered compiler."
-.endif
-.if !defined(WITH_BSD_JDK)
-	@${ECHO}
-	@${ECHO} "If you like to use the native BSD"
-	@${ECHO} "JDK for the build system, you can use"
-	@${ECHO} "WITH_BSD_JDK=TRUE to disable the"
-	@${ECHO} "usage of the linux-JDK and linux dependency."
-	@${ECHO}
-.endif
-.if !defined(WITH_DEBUG)
-	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
-	@${ECHO} "if you call make with WITH_DEBUG=1"
-	@${ECHO}
-	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
-	@${ECHO}
-.endif
-.if !defined(WITH_TTF_BYTECODE_ENABLED)
-	@${ECHO}
-	@${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES"
-	@${ECHO} "if you like to use the Freetype library to"
-	@${ECHO} "render TTF fonts. Normally the TTF lib is"
-	@${ECHO} "not used to render fonts."
-	@${ECHO}
-	@${ECHO} "If you have licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479"
-	@${ECHO} "you can enable this option to get better"
-	@${ECHO} "quality of glyphs at small bitmap sizes."
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 450002
-	@${ECHO}
-	@${ECHO} "OS-VERSION ${OSVERSION} too low"
-	@${ECHO}
-	@${ECHO} "OO need some important libc_r and"
-	@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
-	@${ECHO} "RELEASE or 4.6 STABLE."
-	@${FALSE}
-.endif
-	@${ECHO}
-	@${ECHO} "NOTICE:"
-	@${ECHO}
-	@${ECHO} "To build Openoffice, you should have a lot"
-.if defined(WITH_DEBUG)
-	@${ECHO} "of free diskspace (~ 8GB)."
-.else
-	@${ECHO} "of free diskspace (~ 4GB)."
-.endif
-	@${ECHO}
-.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
-    (${OSVERSION} < 500000 && !defined(USE_GCC))
-	@${ECHO} "KERNEL CONFIGURATION:"
-	@${ECHO}
-	@${ECHO} "Openoffice needs a larger stack- and"
-	@${ECHO} "datasize to build. Check your limit"
-	@${ECHO} "settings and and put this in /boot/loader.conf"
-	@${ECHO} "if neccessary:"
-	@${ECHO}
-	@${ECHO} "kern.maxdsiz=\"1073741824\""
-	@${ECHO} "kern.maxssiz=\"268435456\""
-.endif
-	@${ECHO}
-.if ${OSVERSION} < 460002
-	@${ECHO} "REQUIRED SYSTEM PATCHES:"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO} "OO.org can crash if you enter a non existing path"
-	@${ECHO} "or URL in the location bar. To fix these crashes"
-	@${ECHO} "you need a uncommitted system patch for rtld:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460001
-	@${ECHO}
-	@${ECHO} "OO setup is broken on STABLE < 4.6"
-	@${ECHO} "including 4.6 RELEASE."
-	@${ECHO} "You'll need a system patch to solve"
-	@${ECHO} "this problem:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460002
-	@${ECHO}
-	@${ECHO} "OO.org soffice binary can deadlock. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO}
-	@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
-	@${ECHO}
-.endif
-.if !exists(/usr/include/langinfo.h)
-	@${ECHO}
-	@${ECHO} "langinfo.h is missing !"
-	@${ECHO}
-	@${ECHO} "Please upgrade to 4.6 RELEASE or"
-	@${ECHO} "4.6 STABLE."
-	@${ECHO}
-	@${FALSE}
-.endif
-
-post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
-	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
-	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@-${RM} -f ${WRKSRC}/../moz/zipped/*.zip
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
-.if defined(L10NHELP)
-	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
-	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
-.endif
-
-post-patch:
-	@${MAKE} patch-mozilla
-.if defined(WITH_TTF_BYTECODE_ENABLED)
-	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
-		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-			${ECHO_MSG} "===>   Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \
-		fi; \
-		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
-	fi
-.endif
-.if defined(WITH_DEBUG)
-	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
-		PATCHES_APPLIED="" ; \
-		for i in ${PATCHDIR}/debugpatch-*; do \
-			case $$i in \
-				*.orig|*.rej|*~) \
-					${ECHO_MSG} "===>   Ignoring patchfile $$i" ; \
-					;; \
-				*) \
-					if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-						${ECHO_MSG} "===>   Applying ${OPSYS} patch $$i" ; \
-					fi; \
-					if ${PATCH} ${PATCH_ARGS} < $$i ; then \
-						PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
-					else \
-						${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
-						if [ x"$$PATCHES_APPLIED" != x"" ]; then \
-							${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
-						fi; \
-						${FALSE} ; \
-					fi; \
-					;; \
-			esac; \
-		done; \
-	fi;
-.endif
-	@${ECHO_MSG} "===>  Find old malloc.h defines and fix them in ${PKGNAME} source"
-	@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
-		${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
-
-extract-mozilla:
-.if ! exists(${WRKDIR}/mozilla/Makefile)
-	@${ECHO_MSG} "===>  Extracting mozilla sub project"
-	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
-.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment)
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
-.endif
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
-.endif
-	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
-
-patch-mozilla:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
-		${WRKDIR}/mozilla/files/
-	@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
-
-build-mozilla:
-.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
-	@${ECHO_MSG} "===>  Building mozilla sub project"
-.if defined(WITH_DEBUG)
-	@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
-	@${SED} -e 's|--disable-debug||' \
-		-e 's|--disable-cpp-rtti||' \
-		-e 's|--enable-strip||' \
-		< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
-.endif
-.if defined(USE_GCC)
-	@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
-.else
-	@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
-.endif
-	@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
-	@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
-	@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
-.endif
-
-install-mozilla:
-	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
-
-register-mozilla:
-.if exists(${WRKDIR}/mozilla-runtime)
-	@${RM} -rf ${WRKDIR}/mozilla-runtime
-.endif
-	@${MKDIR} ${WRKDIR}/mozilla-runtime
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
-	@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
-	@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
-	@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
-		&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom 
-	@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
-		${WRKDIR}/mozilla-runtime/components/xptitemp.dat
-	@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
-	@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
-		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
-
-mozilla:
-	@${MAKE} extract-mozilla
-	@${MAKE} patch-mozilla
-	@${MAKE} build-mozilla
-	@${MAKE} register-mozilla
-	@${MAKE} install-mozilla
-
-do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
-	@${MAKE} mozilla
-.endif
-.endif
-.endif
-.if exists(${WRKDIR}/.Xvfb.pid)
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.endif
-.if !defined(DISPLAY)
-	#
-	# This is a UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-.endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
-	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-.endif
-.if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
-.endif
-
-pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-
-do-install:
-.if !defined(DISPLAY)
-	#
-	# UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-.endif
-
-install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
-
-post-install:
-	@${ECHO_MSG} "===>  Add wrapper scripts";
-	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
-	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
-
-package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
-.if defined(LANG_SUFFIX)
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
-.else
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
-.endif
-
-update:
-	@${MAKE} fetch
-	@${MAKE} extract
-	@cd ${WRKSRC}/.. && for dir in *; do \
-	    if [ -d $$dir ]; then \
-		cd $$dir; cvs update -d; cd ..; \
-	    fi \
-	done
-
-.include <bsd.port.post.mk>
diff --git a/editors/openoffice-2.0-devel/distinfo b/editors/openoffice-2.0-devel/distinfo
deleted file mode 100644
index ec9d6788f104..000000000000
--- a/editors/openoffice-2.0-devel/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
-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
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
diff --git a/editors/openoffice-2.0-devel/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice-2.0-devel/files/debugpatch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 96c651ce22c8..000000000000
--- a/editors/openoffice-2.0-devel/files/debugpatch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../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
-@@ -902,6 +902,7 @@
- 
- void KillSetupDir()
- {
-+#if 0
-     DIR* pDir = opendir( strTmpPath );
-     struct dirent* pFile;
- 
-@@ -915,6 +916,10 @@
- 
-     chdir( strInitPath );
-     rmdir( strTmpPath );
-+#else
-+	fprintf(stderr, "\nLeaving behind temporary directory: %s\n",
-+	strTmpPath);
-+#endif
- }
- 
- void makeSymLink( char* s )
diff --git a/editors/openoffice-2.0-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice-2.0-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 52bd2b3d58d6..000000000000
--- a/editors/openoffice-2.0-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
-+++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
- 
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- 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
- 
- # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
diff --git a/editors/openoffice-2.0-devel/files/oo_setup.resp b/editors/openoffice-2.0-devel/files/oo_setup.resp
deleted file mode 100644
index 8eeeb11bd95e..000000000000
--- a/editors/openoffice-2.0-devel/files/oo_setup.resp
+++ /dev/null
@@ -1,7 +0,0 @@
-[Environment]
-InstallationMode = INSTALL_NETWORK
-InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org-643
-
-[Java]
-JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice-2.0-devel/files/openoffice-wrapper b/editors/openoffice-2.0-devel/files/openoffice-wrapper
deleted file mode 100644
index 03811dd5f43b..000000000000
--- a/editors/openoffice-2.0-devel/files/openoffice-wrapper
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-2.0-devel/files/Attic/openoffice-wrapper,v 1.3 2003-03-05 23:24:05 mbr Exp $
-
-oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/
-program=`echo $0 | sed -e 's|.*-||'`
-
-if [ ! $LANG ]; then
-	export LANG=%%LANG%%
-fi
-
-case $program in
-$0)
-	exec $oopath/soffice "$@"
-	;;
-	*)
-	exec $oopath/$program "$@"
-	;;
-esac
diff --git a/editors/openoffice-2.0-devel/files/optpatch-freetype+patch b/editors/openoffice-2.0-devel/files/optpatch-freetype+patch
deleted file mode 100644
index b426a8fb7fcc..000000000000
--- a/editors/openoffice-2.0-devel/files/optpatch-freetype+patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Index: files/patch-freetype::patch
-===================================================================
-RCS file: files/patch-freetype::patch
-diff -N files/patch-freetype::patch
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-freetype::patch	4 Aug 2002 15:27:42 -0000
-@@ -0,0 +1,201 @@
-+diff -ur ../freetype/freetype-2.0.5.patch oo641d_patched/freetype/freetype-2.0.5.patch
-+--- ../freetype/freetype-2.0.5.patch	Fri Apr  5 21:07:34 2002
-++++ ../freetype/freetype-2.0.5.patch	Sat Mar  9 18:04:17 2002
-+@@ -1,118 +1,79 @@
-+-*** misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 14 00:44:33 2000
-+---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 63,69 ****
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+---- 63,69 ----
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+-*** misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Jun  7 19:36:17 2001
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 631,637 ****
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+---- 631,637 ----
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile -DPIC $pic_flag"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Mon Jan  1 18:25:21 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 1,7 ****
-+---- 1,9 ----
-+-  FT_USE_MODULE(autohint_module_class)
-+-  FT_USE_MODULE(cff_driver_class)
-+-  FT_USE_MODULE(t1cid_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(pcf_driver_class)
-+-+ */
-+-  FT_USE_MODULE(psaux_module_class)
-+-  FT_USE_MODULE(psnames_module_class)
-+-  FT_USE_MODULE(ft_raster1_renderer_class)
-+-***************
-+-*** 9,12 ****
-+---- 11,16 ----
-+-  FT_USE_MODULE(ft_smooth_renderer_class)
-+-  FT_USE_MODULE(tt_driver_class)
-+-  FT_USE_MODULE(t1_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(winfnt_driver_class)
-+-+ */
-+-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h	Tue Aug 21 10:50:45 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 70,76 ****
-+---- 70,79 ----
-+-    /*   All convenience functions are declared as such in their             */
-+-    /*   documentation.                                                      */
-+-    /*                                                                       */
-+-+ /*
-+-  #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-+ */
-+-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-  
-+-  
-+-    /*************************************************************************/
-+-***************
-+-*** 108,116 ****
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-- 
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+---- 111,121 ----
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-+ /*
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-+ */
-+-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig	Mon Jan  7 14:21:35 2002
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Mon Jan  7 14:21:40 2002
-+-***************
-+-*** 2251,2257 ****
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age + 1`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-+---- 2251,2257 ----
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk
-++--- misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:49:17 2001
-++@@ -63,7 +63,7 @@
-++ #   ANSI compliance.
-++ #
-++ ifndef CFLAGS
-++-  CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+++  CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-++ endif
-++ 
-++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh
-++--- misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:47:56 2001
-+++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:49:17 2001
-++@@ -631,7 +631,7 @@
-++     if test "$build_old_libs" = yes; then
-++       if test "$pic_mode" != yes; then
-++ 	# Don't build PIC code
-++-	command="$base_compile $srcfile"
-+++	command="$base_compile $srcfile -DPIC $pic_flag"
-++       else
-++ 	# All platforms use -DPIC, to notify preprocessed assembler code.
-++ 	command="$base_compile $srcfile $pic_flag -DPIC"
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:49:17 2001
-++@@ -1,7 +1,9 @@
-++ FT_USE_MODULE(autohint_module_class)
-++ FT_USE_MODULE(cff_driver_class)
-++ FT_USE_MODULE(t1cid_driver_class)
-+++/*
-++ FT_USE_MODULE(pcf_driver_class)
-+++*/
-++ FT_USE_MODULE(psaux_module_class)
-++ FT_USE_MODULE(psnames_module_class)
-++ FT_USE_MODULE(ft_raster1_renderer_class)
-++@@ -9,4 +11,6 @@
-++ FT_USE_MODULE(ft_smooth_renderer_class)
-++ FT_USE_MODULE(tt_driver_class)
-++ FT_USE_MODULE(t1_driver_class)
-+++/*
-++ FT_USE_MODULE(winfnt_driver_class)
-+++*/
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:51:15 2001
-++@@ -70,7 +70,10 @@
-++   /*   All convenience functions are declared as such in their             */
-++   /*   documentation.                                                      */
-++   /*                                                                       */
-+++/*
-++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+++*/
-+++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-++ 
-++ 
-++   /*************************************************************************/
-++@@ -108,8 +111,10 @@
-++   /*   use a vector `plotter' format that isn't supported when this        */
-++   /*   macro is undefined.                                                 */
-++   /*                                                                       */
-+++/*
-++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++-
-+++*/
-+++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++ 
-++   /*************************************************************************/
-++   /*                                                                       */
-++@@ -338,7 +343,7 @@
-++   /* By undefining this, you will only compile the code necessary to load  */
-++   /* TrueType glyphs without hinting.                                      */
-++   /*                                                                       */
-++-#undef  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-+++#define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-++ 
-++ 
-++   /*************************************************************************/
diff --git a/editors/openoffice-2.0-devel/files/optpatch-vcl+util+makefile.pmk b/editors/openoffice-2.0-devel/files/optpatch-vcl+util+makefile.pmk
deleted file mode 100644
index 41341ff0b4e8..000000000000
--- a/editors/openoffice-2.0-devel/files/optpatch-vcl+util+makefile.pmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/util/makefile.pmk.orig	Mon Aug  5 01:39:41 2002
-+++ ../vcl/util/makefile.pmk	Mon Aug  5 01:40:03 2002
-@@ -64,7 +64,7 @@
- PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch
- PDBTARGET=vcl
- 
--.IF "$(OS)" != "MACOSX"
-+.IF "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- .IF "$(remote)" != ""
- USE_BUILTIN_RASTERIZER=true
- .ENDIF
diff --git a/editors/openoffice-2.0-devel/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice-2.0-devel/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 078685f3b516..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../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 freebsd genunix";;
-  	*)		JINCSUBDIRS="genunix";;
-  	esac
-  
diff --git a/editors/openoffice-2.0-devel/files/patch-bridges+prj+build.lst b/editors/openoffice-2.0-devel/files/patch-bridges+prj+build.lst
deleted file mode 100644
index fee3d847c5e6..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-bridges+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
deleted file mode 100644
index 99b8c566fb61..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ /dev/null
@@ -1,102 +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 );
-+    }
- }
- 
- }
diff --git a/editors/openoffice-2.0-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice-2.0-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
deleted file mode 100644
index 4622b7fe21c4..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice-2.0-devel/files/patch-comphelper+util+makefile.mk b/editors/openoffice-2.0-devel/files/patch-comphelper+util+makefile.mk
deleted file mode 100644
index f2d3092c2ddf..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-comphelper+util+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-2.0-devel/files/patch-config_office+configure.in b/editors/openoffice-2.0-devel/files/patch-config_office+configure.in
deleted file mode 100644
index a45332fcbec0..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,66 +0,0 @@
---- configure.in.orig	Thu Feb 20 15:49:32 2003
-+++ configure.in	Wed Mar  5 21:22:34 2003
-@@ -95,6 +95,12 @@
-                           
-                           Usage: --enable-macos9
- ],,)
-+AC_ARG_ENABLE(linuxjdk,
-+[  --enable-linuxjdk         Use this option option if you like to use
-+                          the linux-jdk instead of the native jdk.
-+
-+                          Usage: --enable-linuxjdk
-+],,)
- AC_ARG_WITH(lang,
- [  --with-lang             Use this option to build OpenOffice.org with
-                           additional language support. US English is always
-@@ -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
-@@ -1232,7 +1249,11 @@
- if test -n "$enable_debug"; then
-    ENABLE_DEBUG="TRUE"
- else
--   ENABLE_DEBUG="FALSE"
-+fi
-+if test -n "$enable_linuxjdk"; then
-+   USE_LINUXJDK="TRUE"
-+else
-+   USE_LINUXJDK="FALSE"
- fi
- 
- dnl ===================================================================
-@@ -1278,6 +1299,7 @@
- AC_SUBST(PTHREAD_CFLAGS)
- AC_SUBST(PTHREAD_LIBS)
- AC_SUBST(ENABLE_DEBUG)
-+AC_SUBST(USE_LINUXJDK)
- 
- AC_OUTPUT([set_soenv])
- 
diff --git a/editors/openoffice-2.0-devel/files/patch-config_office+set_soenv.in b/editors/openoffice-2.0-devel/files/patch-config_office+set_soenv.in
deleted file mode 100644
index 9ea6b11bdab2..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-config_office+set_soenv.in
+++ /dev/null
@@ -1,44 +0,0 @@
---- set_soenv.in.orig	Thu Feb 27 15:12:36 2003
-+++ set_soenv.in	Wed Mar  5 21:16:43 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, 
-@@ -88,7 +88,7 @@
-      $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
-      $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS,
-      $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
--     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG );
-+     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $USE_LINUXJDK );
- #
- #-------------------------------------------
- # IId. Declaring the aliases.
-@@ -140,7 +140,8 @@
- $CC			= '@CC@';           # C compiler
- $CXX		= '@CXX@';          # C++ compiler
- $EXCEPTIONS	= '@EXCEPTIONS@';   # Exception handling type
--$ENABLE_DEBUG	= '@ENABLE_DEBUG@';  # Enable a debug build
-+$ENABLE_DEBUG	= '@ENABLE_DEBUG@'; # Enable a debug build
-+$USE_LINUXJDK	= '@USE_LINUXJDK@'; # Use the Linux JDK
- $WRAPCMD	= "";				# Wrapper (only for winnt)
- 
- #
-@@ -1265,7 +1266,12 @@
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
- }
- elsif ($platform eq "$FreeBSD")
--{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+{
-+   if ($USE_LINUXJDK eq "TRUE") {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
-+   } else {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+   }
- }
- elsif ($platform eq "$NetBSD")
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
diff --git a/editors/openoffice-2.0-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk b/editors/openoffice-2.0-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk
deleted file mode 100644
index 2b83f2cd2ec7..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk
+++ /dev/null
@@ -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)					\
diff --git a/editors/openoffice-2.0-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice-2.0-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
deleted file mode 100644
index 3601766ee561..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../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
-@@ -64,8 +64,8 @@
- #mozilla specific stuff.
- MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
- MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
--#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
--#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
-+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
-+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
- #End of mozilla specific stuff.
- 
- PRJ=..$/..$/..$/..
-@@ -107,7 +107,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -123,7 +123,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -141,7 +141,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS+=	    -DMOZILLA_CLIENT \
-             -DOSTYPE=\"Linux2.2.14-5\" -DOJI
- .IF "$(OS)" == "LINUX"
-@@ -157,6 +157,13 @@
-             -fno-rtti -Wall -Wconversion -Wpointer-arith \
-             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-             -Wno-long-long 
-+CDEFS     += -DTRACING
-+.ELIF "$(OS)" == "FREEBSD"
-+CFLAGS +=   -fPIC
-+CFLAGSCXX += \
-+            -fno-rtti -Wall -Wconversion -Wpointer-arith \
-+            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-+            -Wno-long-long -pthread 
- CDEFS     += -DTRACING
- .ENDIF
- .ENDIF
diff --git a/editors/openoffice-2.0-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk b/editors/openoffice-2.0-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
deleted file mode 100644
index b63d2a25f184..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-2.0-devel/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice-2.0-devel/files/patch-cppu+inc+uno+lbnames.h
deleted file mode 100644
index cb43c2d165e9..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-cppu+inc+uno+lbnames.h
+++ /dev/null
@@ -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."
diff --git a/editors/openoffice-2.0-devel/files/patch-cppu+prj+build.lst b/editors/openoffice-2.0-devel/files/patch-cppu+prj+build.lst
deleted file mode 100644
index 78fd210a1193..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-cppu+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-2.0-devel/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice-2.0-devel/files/patch-cppuhelper+source+makefile.mk
deleted file mode 100644
index 5fb5bd636eb1..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-cppuhelper+source+makefile.mk
+++ /dev/null
@@ -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 ------------------------------------------------------
diff --git a/editors/openoffice-2.0-devel/files/patch-desktop+source+pkgchk+pkgchk_misc.h b/editors/openoffice-2.0-devel/files/patch-desktop+source+pkgchk+pkgchk_misc.h
deleted file mode 100644
index 391667b66ebd..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-desktop+source+pkgchk+pkgchk_misc.h
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-2.0-devel/files/patch-desktop+util+makefile.mk b/editors/openoffice-2.0-devel/files/patch-desktop+util+makefile.mk
deleted file mode 100644
index 025d644a8077..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-desktop+util+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-2.0-devel/files/patch-dtrans+source+X11+makefile.mk b/editors/openoffice-2.0-devel/files/patch-dtrans+source+X11+makefile.mk
deleted file mode 100644
index 5881f5d7f6a5..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-dtrans+source+X11+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice-2.0-devel/files/patch-eventattacher+source+makefile.mk b/editors/openoffice-2.0-devel/files/patch-eventattacher+source+makefile.mk
deleted file mode 100644
index 4552698eb132..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-eventattacher+source+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-2.0-devel/files/patch-external+gcc3_specific+makefile.mk b/editors/openoffice-2.0-devel/files/patch-external+gcc3_specific+makefile.mk
deleted file mode 100644
index 6b8071f4030e..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-external+gcc3_specific+makefile.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../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"
- 
- .IF "$(OS)"!="MACOSX"
-+.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 @@
-         -rm -f $@
-         +ln -s libgcc_s.so.1 $@
- 
-+.ENDIF 
- .ENDIF 
- 
- .ENDIF
diff --git a/editors/openoffice-2.0-devel/files/patch-freetype+makefile.mk b/editors/openoffice-2.0-devel/files/patch-freetype+makefile.mk
deleted file mode 100644
index 3e5a8dd19f18..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-freetype+makefile.mk
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice-2.0-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice-2.0-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
- 
- /* 
diff --git a/editors/openoffice-2.0-devel/files/patch-javaunohelper+source+makefile.mk b/editors/openoffice-2.0-devel/files/patch-javaunohelper+source+makefile.mk
deleted file mode 100644
index 19f6b86e5ab5..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-javaunohelper+source+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice-2.0-devel/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice-2.0-devel/files/patch-jni_uno+jni_java2uno.cxx
deleted file mode 100644
index a9ff9e3fed88..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-jni_uno+jni_java2uno.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice-2.0-devel/files/patch-nas+nas-1.6.patch b/editors/openoffice-2.0-devel/files/patch-nas+nas-1.6.patch
deleted file mode 100644
index b6096654ebaf..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-nas+nas-1.6.patch
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice-2.0-devel/files/patch-offapi+com+sun+star+setup+OSType.idl b/editors/openoffice-2.0-devel/files/patch-offapi+com+sun+star+setup+OSType.idl
deleted file mode 100644
index 3fee562c6d38..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-offapi+com+sun+star+setup+OSType.idl
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-2.0-devel/files/patch-offapi+util+makefile.pmk b/editors/openoffice-2.0-devel/files/patch-offapi+util+makefile.pmk
deleted file mode 100644
index 5cdbb1b4aa4a..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-offapi+util+makefile.pmk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-2.0-devel/files/patch-package+inc+HashMaps.hxx b/editors/openoffice-2.0-devel/files/patch-package+inc+HashMaps.hxx
deleted file mode 100644
index 35052d291ef7..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-package+inc+HashMaps.hxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice-2.0-devel/files/patch-package+inc+ZipPackageFolder.hxx b/editors/openoffice-2.0-devel/files/patch-package+inc+ZipPackageFolder.hxx
deleted file mode 100644
index 014c61403380..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-package+inc+ZipPackageFolder.hxx
+++ /dev/null
@@ -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()
diff --git a/editors/openoffice-2.0-devel/files/patch-package+source+zippackage+ContentInfo.hxx b/editors/openoffice-2.0-devel/files/patch-package+source+zippackage+ContentInfo.hxx
deleted file mode 100644
index c4bf35e79f64..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-package+source+zippackage+ContentInfo.hxx
+++ /dev/null
@@ -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();
diff --git a/editors/openoffice-2.0-devel/files/patch-package+source+zippackage+ZipPackageFolder.cxx b/editors/openoffice-2.0-devel/files/patch-package+source+zippackage+ZipPackageFolder.cxx
deleted file mode 100644
index bb504c834eef..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-package+source+zippackage+ZipPackageFolder.cxx
+++ /dev/null
@@ -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 );
diff --git a/editors/openoffice-2.0-devel/files/patch-registry+source+regkey.cxx b/editors/openoffice-2.0-devel/files/patch-registry+source+regkey.cxx
deleted file mode 100644
index fad069f83f14..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-registry+source+regkey.cxx
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice-2.0-devel/files/patch-rsc+source+rscpp+cpp.h b/editors/openoffice-2.0-devel/files/patch-rsc+source+rscpp+cpp.h
deleted file mode 100644
index 417ab33ba52f..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-rsc+source+rscpp+cpp.h
+++ /dev/null
@@ -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              */
- 
diff --git a/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+nlsupport.c
deleted file mode 100644
index 49fe0da8589b..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+nlsupport.c
+++ /dev/null
@@ -1,160 +0,0 @@
---- ../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
-@@ -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)
- 
-@@ -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 @@
-     { "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-2.0-devel/files/patch-sal+osl+unx+pipe.c b/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+pipe.c
deleted file mode 100644
index 4aa7b8af1a61..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+pipe.c
+++ /dev/null
@@ -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 )
- 	{			
diff --git a/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+process.c b/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+process.c
deleted file mode 100644
index 50023576bec4..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+process.c
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+security.c b/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+security.c
deleted file mode 100644
index 0cc321dcd544..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+security.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../sal/osl/unx/security.c.orig	Sat Jul 20 22:53:31 2002
-+++ ../sal/osl/unx/security.c	Sat Jul 20 22:52:39 2002
-@@ -739,7 +739,7 @@
- 	}
- 
- 
--#elif (LINUX && (GLIBC >= 2))
-+#elif ((LINUX && (GLIBC >= 2)) || defined(FREEBSD))
- 	
- 	struct passwd	*pPasswd; 
- 	
diff --git a/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+socket.c b/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+socket.c
deleted file mode 100644
index 9541cac8583f..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+socket.c
+++ /dev/null
@@ -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! */
diff --git a/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+system.c b/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+system.c
deleted file mode 100644
index 8dc663ac03fc..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+system.c
+++ /dev/null
@@ -1,127 +0,0 @@
---- ../sal/osl/unx/system.c.orig	Sun Mar 17 12:34:13 2002
-+++ ../sal/osl/unx/system.c	Wed Apr  3 01:03:36 2002
-@@ -195,6 +195,73 @@
- }
- #endif
- 
-+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
-+           size_t buflen, struct passwd **result)
-+{
-+  struct passwd* res;
-+
-+  pthread_mutex_lock(&getrtl_mutex);
-+
-+  if ( res = getpwuid(uid) )
-+  {
-+    size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell;
-+
-+    pw_name = strlen(res->pw_name)+1;
-+    pw_passwd = strlen(res->pw_passwd)+1;
-+    pw_class = strlen(res->pw_class)+1;
-+    pw_gecos = strlen(res->pw_gecos)+1;
-+    pw_dir = strlen(res->pw_dir)+1;
-+    pw_shell = strlen(res->pw_shell)+1;
-+
-+    if (pw_name+pw_passwd+pw_class+pw_gecos
-+                                 +pw_dir+pw_shell < buflen)
-+    {
-+      memcpy(pwd, res, sizeof(struct passwd));
-+
-+      strncpy(buffer, res->pw_name, pw_name);
-+      pwd->pw_name = buffer;
-+      buffer += pw_name;
-+
-+      strncpy(buffer, res->pw_passwd, pw_passwd);
-+      pwd->pw_passwd = buffer;
-+      buffer += pw_passwd;
-+
-+      strncpy(buffer, res->pw_class, pw_class);
-+      pwd->pw_class = buffer;
-+      buffer += pw_class;
-+
-+      strncpy(buffer, res->pw_gecos, pw_gecos);
-+      pwd->pw_gecos = buffer;
-+      buffer += pw_gecos;
-+
-+      strncpy(buffer, res->pw_dir, pw_dir);
-+      pwd->pw_dir = buffer;
-+      buffer += pw_dir;
-+
-+      strncpy(buffer, res->pw_shell, pw_shell);
-+      pwd->pw_shell = buffer;
-+      buffer += pw_shell;
-+
-+      *result = pwd ;
-+      res = 0 ;
-+
-+    } else {
-+
-+      res = ENOMEM ;
-+
-+    }      
-+  
-+  } else {
-+
-+    res = errno ;
-+ 
-+  } 
-+
-+  pthread_mutex_unlock(&getrtl_mutex);
-+
-+  return res;
-+}
-+
- struct tm *localtime_r(const time_t *timep, struct tm *buffer)
- {
- 	struct tm* res;
-@@ -518,3 +585,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-2.0-devel/files/patch-sal+osl+unx+system.h b/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+system.h
deleted file mode 100644
index c4e255952fc7..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+system.h
+++ /dev/null
@@ -1,35 +0,0 @@
---- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
-+++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
-@@ -205,6 +205,13 @@
- #   include <sys/ioctl.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 <machine/vmparam.h>
-+#   include <machine/pmap.h>
- #	include <sys/un.h>
- #   include <netinet/tcp.h>
- #	define 	IORESOURCE_TRANSFER_BSD 
-@@ -216,12 +223,13 @@
- #   elif BYTE_ORDER == PDP_ENDIAN
- #   	define _PDP_ENDIAN
- #   endif
--#   define  sched_yield() 				pthread_yield()
--#   define  pthread_testcancel()
- #	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
diff --git a/editors/openoffice-2.0-devel/files/patch-sal+textenc+tencinfo.c b/editors/openoffice-2.0-devel/files/patch-sal+textenc+tencinfo.c
deleted file mode 100644
index 7cf80c18d0a0..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-sal+textenc+tencinfo.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
-     /* 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 */
-+
-+    if (pMimeCharset == NULL)
-+	pMimeCharset = "usascii";
-+
-     static ImplStrCharsetDef const aVIPMimeCharsetTab[] =
-     {
-         { "usascii", RTL_TEXTENCODING_ASCII_US },
diff --git a/editors/openoffice-2.0-devel/files/patch-sal+workben+makefile.mk b/editors/openoffice-2.0-devel/files/patch-sal+workben+makefile.mk
deleted file mode 100644
index 369935e31d66..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-sal+workben+makefile.mk
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../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 @@
- 
- .IF "$(TESTAPP)" == "salstattest"
- 
--	CFLAGS+= /DUSE_SAL_STATIC
-+	CFLAGS+= -DUSE_SAL_STATIC
- 
- 	OBJFILES=	$(OBJ)$/salstattest.obj
- 
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- 
- CXXFILES=	tgetpwnam.cxx
- OBJFILES=	$(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN=	$(SLB)$/sal.lib
- 
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd | freebsd)
- .ENDIF # tgetpwname
- 
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-2.0-devel/files/patch-salhelper+source+gcc2_freebsd_intel.map b/editors/openoffice-2.0-devel/files/patch-salhelper+source+gcc2_freebsd_intel.map
deleted file mode 100644
index 1ffacf889bc6..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-salhelper+source+gcc2_freebsd_intel.map
+++ /dev/null
@@ -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:
-+*;
-+};
diff --git a/editors/openoffice-2.0-devel/files/patch-salhelper+source+gcc3_freebsd_intel.map b/editors/openoffice-2.0-devel/files/patch-salhelper+source+gcc3_freebsd_intel.map
deleted file mode 100644
index 823cff316ec7..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-salhelper+source+gcc3_freebsd_intel.map
+++ /dev/null
@@ -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:
-+		*;
-+};
-+
diff --git a/editors/openoffice-2.0-devel/files/patch-salhelper+source+makefile.mk b/editors/openoffice-2.0-devel/files/patch-salhelper+source+makefile.mk
deleted file mode 100644
index 3687664d8d16..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-salhelper+source+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../salhelper/source/makefile.mk.orig	Wed Nov 14 14:19:21 2001
-+++ ../salhelper/source/makefile.mk	Sun Mar  3 17:58:15 2002
-@@ -109,6 +109,10 @@
- SHL1VERSIONMAP=lngi.map
- .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
- SHL1VERSIONMAP=gcc3_linux_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
- .ENDIF
- 
- 
diff --git a/editors/openoffice-2.0-devel/files/patch-salhelper+test+rtti+makefile.mk b/editors/openoffice-2.0-devel/files/patch-salhelper+test+rtti+makefile.mk
deleted file mode 100644
index 70f25048a24a..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-salhelper+test+rtti+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
- 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
- .ENDIF
- 
- 
diff --git a/editors/openoffice-2.0-devel/files/patch-sc+source+core+data+cell.cxx b/editors/openoffice-2.0-devel/files/patch-sc+source+core+data+cell.cxx
deleted file mode 100644
index 529f67a3e35f..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-sc+source+core+data+cell.cxx
+++ /dev/null
@@ -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>
diff --git a/editors/openoffice-2.0-devel/files/patch-scp+source+global+udk_base.scp b/editors/openoffice-2.0-devel/files/patch-scp+source+global+udk_base.scp
deleted file mode 100644
index 623eccb0ff09..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-scp+source+global+udk_base.scp
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-2.0-devel/files/patch-scp+source+player+player.scp b/editors/openoffice-2.0-devel/files/patch-scp+source+player+player.scp
deleted file mode 100644
index 2f8daab35cdd..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-scp+source+player+player.scp
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice-2.0-devel/files/patch-scptools+source+linker+searchcache b/editors/openoffice-2.0-devel/files/patch-scptools+source+linker+searchcache
deleted file mode 100644
index 593e9eabf5bc..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-scptools+source+linker+searchcache
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: files/patch-scptools::source::linker::searchcache
-===================================================================
-RCS file: files/patch-scptools::source::linker::searchcache
-diff -N files/patch-scptools::source::linker::searchcache
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-scptools::source::linker::searchcache	4 Aug 2002 15:28:04 -0000
-@@ -0,0 +1,27 @@
-+--- ../scptools/source/linker/searchcache.hxx.orig	Fri Aug  2 22:53:46 2002
-++++ ../scptools/source/linker/searchcache.hxx	Fri Aug  2 22:54:50 2002
-+@@ -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	Fri Aug  2 22:53:35 2002
-++++ ../scptools/source/linker/searchcache.cxx	Fri Aug  2 22:55:14 2002
-+@@ -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-2.0-devel/files/patch-scptools+source+linker+ziplst.cxx b/editors/openoffice-2.0-devel/files/patch-scptools+source+linker+ziplst.cxx
deleted file mode 100644
index 83b84631542e..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-scptools+source+linker+ziplst.cxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice-2.0-devel/files/patch-setup2+inc+fields.hxx b/editors/openoffice-2.0-devel/files/patch-setup2+inc+fields.hxx
deleted file mode 100644
index d56e12f2abf4..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-setup2+inc+fields.hxx
+++ /dev/null
@@ -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[];
diff --git a/editors/openoffice-2.0-devel/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice-2.0-devel/files/patch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 396c586ee3a3..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,30 +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"
- 
-@@ -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" \
diff --git a/editors/openoffice-2.0-devel/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice-2.0-devel/files/patch-setup2+mow+source+loader+makefile.mk
deleted file mode 100644
index 5460e4296587..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-setup2+mow+source+loader+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice-2.0-devel/files/patch-setup2+patch+makefile.mk b/editors/openoffice-2.0-devel/files/patch-setup2+patch+makefile.mk
deleted file mode 100644
index 53846a8bdfc9..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-setup2+patch+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-2.0-devel/files/patch-setup2+script+setupserver b/editors/openoffice-2.0-devel/files/patch-setup2+script+setupserver
deleted file mode 100644
index 450ea386c841..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-setup2+script+setupserver
+++ /dev/null
@@ -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`"
diff --git a/editors/openoffice-2.0-devel/files/patch-setup2+source+compiler+decltor.cxx b/editors/openoffice-2.0-devel/files/patch-setup2+source+compiler+decltor.cxx
deleted file mode 100644
index 98f6ad2f7567..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-setup2+source+compiler+decltor.cxx
+++ /dev/null
@@ -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";
diff --git a/editors/openoffice-2.0-devel/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx b/editors/openoffice-2.0-devel/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
deleted file mode 100644
index ac0b39a6aa47..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
+++ /dev/null
@@ -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) );
diff --git a/editors/openoffice-2.0-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice-2.0-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
deleted file mode 100644
index f199b18823e1..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice-2.0-devel/files/patch-setup2+source+service+interface.cxx b/editors/openoffice-2.0-devel/files/patch-setup2+source+service+interface.cxx
deleted file mode 100644
index 8e478e17971d..000000000000
--- a/editors/openoffice-2.0-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-2.0-devel/files/patch-shell+source+cmdmail+makefile.mk b/editors/openoffice-2.0-devel/files/patch-shell+source+cmdmail+makefile.mk
deleted file mode 100644
index 0476285c802e..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-shell+source+cmdmail+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice-2.0-devel/files/patch-shell+source+proxysettings+makefile.mk b/editors/openoffice-2.0-devel/files/patch-shell+source+proxysettings+makefile.mk
deleted file mode 100644
index e83cf7c9d7a1..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-shell+source+proxysettings+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice-2.0-devel/files/patch-shell+source+unix+exec+makefile.mk b/editors/openoffice-2.0-devel/files/patch-shell+source+unix+exec+makefile.mk
deleted file mode 100644
index 0b7712ee35f8..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-shell+source+unix+exec+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice-2.0-devel/files/patch-solenv+bin+addsym.awk b/editors/openoffice-2.0-devel/files/patch-solenv+bin+addsym.awk
deleted file mode 100644
index 996e282b350b..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-solenv+bin+addsym.awk
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
-+++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
-@@ -72,11 +72,11 @@
- END {
-     if (state == 0) {
-         print "# Weak RTTI symbols for C++ exceptions:"
--        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
-+        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
-     }
- }
- state == 2 {
--    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
-+    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
-     state = 3
- }
- /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice-2.0-devel/files/patch-solenv+bin+mapgen.pl b/editors/openoffice-2.0-devel/files/patch-solenv+bin+mapgen.pl
deleted file mode 100644
index 71ebdb934120..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-solenv+bin+mapgen.pl
+++ /dev/null
@@ -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, $_);
- 	};
diff --git a/editors/openoffice-2.0-devel/files/patch-solenv+inc+startup+FREEBSD+macros.mk b/editors/openoffice-2.0-devel/files/patch-solenv+inc+startup+FREEBSD+macros.mk
deleted file mode 100644
index 0c1b107de988..000000000000
--- a/editors/openoffice-2.0-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-2.0-devel/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice-2.0-devel/files/patch-solenv+inc+tg_ext.mk
deleted file mode 100644
index 701692c9425a..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-solenv+inc+tg_ext.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-2.0-devel/files/patch-solenv+inc+tg_moz.mk b/editors/openoffice-2.0-devel/files/patch-solenv+inc+tg_moz.mk
deleted file mode 100644
index 255a41f92281..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-solenv+inc+tg_moz.mk
+++ /dev/null
@@ -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) $@
diff --git a/editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index b4764485aa86..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,202 +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
-+# 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*=$(CC)
-+
-+# default linker flags
-+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -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
diff --git a/editors/openoffice-2.0-devel/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice-2.0-devel/files/patch-soltools+checkdll+makefile.mk
deleted file mode 100644
index e6407402258a..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-soltools+checkdll+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-2.0-devel/files/patch-soltools+mkdepend+main.c b/editors/openoffice-2.0-devel/files/patch-soltools+mkdepend+main.c
deleted file mode 100644
index cffd5cbb1f43..000000000000
--- a/editors/openoffice-2.0-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-2.0-devel/files/patch-stlport+makefile.mk b/editors/openoffice-2.0-devel/files/patch-stlport+makefile.mk
deleted file mode 100644
index 797817ba85be..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-stlport+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-2.0-devel/files/patch-stoc+source+corereflection+makefile.mk b/editors/openoffice-2.0-devel/files/patch-stoc+source+corereflection+makefile.mk
deleted file mode 100644
index 4b319b08d401..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-stoc+source+corereflection+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-2.0-devel/files/patch-stoc+source+defaultregistry+makefile.mk b/editors/openoffice-2.0-devel/files/patch-stoc+source+defaultregistry+makefile.mk
deleted file mode 100644
index 4cae0476415a..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-stoc+source+defaultregistry+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice-2.0-devel/files/patch-stoc+source+implementationregistration+implreg.cxx b/editors/openoffice-2.0-devel/files/patch-stoc+source+implementationregistration+implreg.cxx
deleted file mode 100644
index 341d621d872c..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-stoc+source+implementationregistration+implreg.cxx
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-2.0-devel/files/patch-stoc+source+implementationregistration+makefile.mk b/editors/openoffice-2.0-devel/files/patch-stoc+source+implementationregistration+makefile.mk
deleted file mode 100644
index 0051043b7ecb..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-stoc+source+implementationregistration+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-2.0-devel/files/patch-stoc+source+inspect+makefile.mk b/editors/openoffice-2.0-devel/files/patch-stoc+source+inspect+makefile.mk
deleted file mode 100644
index c7cd85253c11..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-stoc+source+inspect+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-2.0-devel/files/patch-stoc+source+invocation+makefile.mk b/editors/openoffice-2.0-devel/files/patch-stoc+source+invocation+makefile.mk
deleted file mode 100644
index 9ac2072a5612..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-stoc+source+invocation+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice-2.0-devel/files/patch-stoc+source+invocation_adapterfactory+makefile.mk b/editors/openoffice-2.0-devel/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
deleted file mode 100644
index 8853ad39a90e..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice-2.0-devel/files/patch-stoc+source+javaloader+makefile.mk b/editors/openoffice-2.0-devel/files/patch-stoc+source+javaloader+makefile.mk
deleted file mode 100644
index cea499f15c57..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-stoc+source+javaloader+makefile.mk
+++ /dev/null
@@ -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=		
diff --git a/editors/openoffice-2.0-devel/files/patch-stoc+source+javavm+makefile.mk b/editors/openoffice-2.0-devel/files/patch-stoc+source+javavm+makefile.mk
deleted file mode 100644
index b895a2b968d4..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-stoc+source+javavm+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice-2.0-devel/files/patch-stoc+source+loader+makefile.mk b/editors/openoffice-2.0-devel/files/patch-stoc+source+loader+makefile.mk
deleted file mode 100644
index 5a08ee5937b6..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-stoc+source+loader+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice-2.0-devel/files/patch-stoc+source+namingservice+makefile.mk b/editors/openoffice-2.0-devel/files/patch-stoc+source+namingservice+makefile.mk
deleted file mode 100644
index e573081bc21d..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-stoc+source+namingservice+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice-2.0-devel/files/patch-stoc+source+proxy_factory+makefile.mk b/editors/openoffice-2.0-devel/files/patch-stoc+source+proxy_factory+makefile.mk
deleted file mode 100644
index 9110b2f50cd1..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-stoc+source+proxy_factory+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-2.0-devel/files/patch-stoc+source+registry_tdprovider+makefile.mk b/editors/openoffice-2.0-devel/files/patch-stoc+source+registry_tdprovider+makefile.mk
deleted file mode 100644
index 9d974d1c0d10..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-stoc+source+registry_tdprovider+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-2.0-devel/files/patch-stoc+source+servicemanager+makefile.mk b/editors/openoffice-2.0-devel/files/patch-stoc+source+servicemanager+makefile.mk
deleted file mode 100644
index 746776d54759..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-stoc+source+servicemanager+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-2.0-devel/files/patch-stoc+source+tdmanager+makefile.mk b/editors/openoffice-2.0-devel/files/patch-stoc+source+tdmanager+makefile.mk
deleted file mode 100644
index 76403fdde841..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-stoc+source+tdmanager+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice-2.0-devel/files/patch-stoc+source+typeconv+makefile.mk b/editors/openoffice-2.0-devel/files/patch-stoc+source+typeconv+makefile.mk
deleted file mode 100644
index dc647f89a166..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-stoc+source+typeconv+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-2.0-devel/files/patch-store+util+makefile.mk b/editors/openoffice-2.0-devel/files/patch-store+util+makefile.mk
deleted file mode 100644
index 6bef6e960f2e..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-store+util+makefile.mk
+++ /dev/null
@@ -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
- 
- 
diff --git a/editors/openoffice-2.0-devel/files/patch-svx+source+fmcomp+makefile.mk b/editors/openoffice-2.0-devel/files/patch-svx+source+fmcomp+makefile.mk
deleted file mode 100644
index b16030080c0d..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-svx+source+fmcomp+makefile.mk
+++ /dev/null
@@ -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= \
diff --git a/editors/openoffice-2.0-devel/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice-2.0-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
deleted file mode 100644
index 3d7c2e22aa63..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
-+++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
-@@ -84,7 +84,9 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- APP1LIBS=
-+.IF "$(OS)"!="FREEBSD"
- APP1STDLIBS=-ldl
-+.ENDIF
- 
- GNOMEFILES= \
- 	locales.tab
diff --git a/editors/openoffice-2.0-devel/files/patch-tools+source+string+tstring.cxx b/editors/openoffice-2.0-devel/files/patch-tools+source+string+tstring.cxx
deleted file mode 100644
index 12bd6bd0b244..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-tools+source+string+tstring.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../tools/source/string/tstring.cxx.orig	Sat Aug 10 12:53:42 2002
-+++ ../tools/source/string/tstring.cxx	Sat Aug 10 12:54:16 2002
-@@ -103,6 +103,9 @@
- xub_StrLen ImplStringLen( const sal_Char* pStr )
- {
- 	const sal_Char* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
-@@ -113,6 +116,9 @@
- xub_StrLen ImplStringLen( const sal_Unicode* pStr )
- {
- 	const sal_Unicode* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
diff --git a/editors/openoffice-2.0-devel/files/patch-unoil+makefile.pmk b/editors/openoffice-2.0-devel/files/patch-unoil+makefile.pmk
deleted file mode 100644
index 7febdabf7b4b..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-unoil+makefile.pmk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../unoil/makefile.pmk.orig	Fri Aug 31 18:04:43 2001
-+++ ../unoil/makefile.pmk	Thu Sep 12 12:17:50 2002
-@@ -74,8 +74,8 @@
- JAVAFILESLIST	:= $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java)
- .ENDIF          # "$(L10N_framework)"==""
- 
--GENJAVAFILES	:= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
--GENCLASSFILES	:= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
-+GENJAVAFILES	+= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
-+GENCLASSFILES	+= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
- 
- # --- Targets ------------------------------------------------------
- 
diff --git a/editors/openoffice-2.0-devel/files/patch-unzip+source+file_io.c b/editors/openoffice-2.0-devel/files/patch-unzip+source+file_io.c
deleted file mode 100644
index 2f85a108c185..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-unzip+source+file_io.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../unzip/source/file_io.c.orig	Sat Oct 19 11:58:45 2002
-+++ ../unzip/source/file_io.c	Sat Oct 19 12:03:40 2002
-@@ -500,7 +500,7 @@
- #ifdef MPW
- 				pCallBack( 0 );
- #else
--				#if defined LINUX || defined MACOSX || defined NETBSD
-+				#if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD
- 				pCallBack( lseek(outfd, 0, SEEK_CUR) );
- 				#else
- 				pCallBack( tell( outfd ) );
-@@ -865,7 +865,9 @@
- 	static struct timeb tbp;
- #endif /* !__386BSD__ */
- #else /* !BSD */
-+#if (!defined(NETBSD) && !defined(FREEBSD))
- 	extern long timezone;
-+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
- #endif /* ?BSD */
- #endif /* ?AMIGA */
- 
diff --git a/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
deleted file mode 100644
index 41defbd5eb59..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
-+++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
-@@ -65,6 +65,8 @@
- #include <glyphcache.hxx>
- 
- #define Region XLIB_Region
-+typedef unsigned long CARD32;
-+#define Cursor CARD32
- #include <X11/extensions/Xrender.h>
- #undef Region
- 
diff --git a/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
deleted file mode 100644
index fefc925db41f..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
-@@ -78,6 +78,12 @@
- GETSTYLE_GNOME=getstyle-gnome-linux-intel
- HASGNOME2=TRUE
- .ENDIF
-+.IF "$_(HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
-+.ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
- HASGNOME2=TRUE
diff --git a/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
deleted file mode 100644
index 984313fc540a..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
-@@ -75,9 +75,15 @@
- 
- HASGNOME2=
- 
--.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
-+.IF "$(OS)$(CPU)"=="LINUXI"
- MSGBOX_GNOME=msgbox-gnome-linux-intel
- HASGNOME2=TRUE
-+.ENDIF
-+.IF "$(_HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+MSGBOX_GNOME=msgbox-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
- .ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice-2.0-devel/files/patch-vcl+workben+officeacceptthread.cxx b/editors/openoffice-2.0-devel/files/patch-vcl+workben+officeacceptthread.cxx
deleted file mode 100644
index 07d9f1060557..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-vcl+workben+officeacceptthread.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/workben/officeacceptthread.cxx.orig	Wed Mar  5 20:25:36 2003
-+++ ../vcl/workben/officeacceptthread.cxx	Wed Mar  5 20:26:03 2003
-@@ -125,7 +125,7 @@
- #if defined (SOLARIS)
- 				int status;
- 				nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG);
--#elif defined(LINUX)
-+#elif defined(LINUX) || defined (FREEBSD)
- 				nRet = kill(aProcessInfo.Ident, 0);
- #endif
- #if defined (UNX)
diff --git a/editors/openoffice-2.0-devel/files/zipmoz.sh b/editors/openoffice-2.0-devel/files/zipmoz.sh
deleted file mode 100644
index 43a4591f3430..000000000000
--- a/editors/openoffice-2.0-devel/files/zipmoz.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/sh -f
-
-RUNTIME_FILES=" components/libabsyncsvc.so components/libaddrbook.so \
-		components/libmork.so components/libmozldap.so \
-		components/libnecko.so components/libprofile.so \
-		components/librdf.so components/libstrres.so \
-		components/libunicharutil.so components/libuconv.so \
-		components/libucvcn.so components/libucvibm.so \
-		components/libucvja.so components/libucvko.so \
-		components/libucvlatin.so components/libucvtw.so \
-		components/libucvtw2.so components/liburiloader.so \
-		components/libvcard.so components/libxpconnect.so \
-		components/libpref.so components/libchrome.so libmozjs.so \
-		libmsgbaseutil.so libldap50.so libnspr4.so libplc4.so \
-		libplds4.so libxpcom.so libmozz.so component.reg \
-		components/necko_dns.xpt components/xpcom_xpti.xpt \
-		components/xpcom_threads.xpt components/xpcom_io.xpt \
-		components/xpcom_ds.xpt components/xpcom_components.xpt \
-		components/xpcom_base.xpt components/xpti.dat \
-		defaults/pref/all.js defaults/pref/config.js \
-		defaults/pref/editor.js defaults/pref/initpref.js \
-		defaults/pref/inspector.js defaults/pref/mailnews.js \
-		defaults/pref/security-prefs.js defaults/pref/unix.js \
-		defaults/pref/xpinstall.js"
-
-LIB_FILES="	lib/libembed_base_s.a lib/libmozreg_s.a \
-		lib/libnspr4.so lib/libxpcom.so lib/libprldap50.so"
-
-INC_FILES="include/"
-INC_FILES2="public/"
-
-if [ $# -lt 2 -o $# -gt 3 ] ; then
-	echo 
-	echo usage: $0 mozilla_dist target [target_dir]
-	echo
-	echo where:
-	echo
-	echo "mozilla_dist points to the mozilla distribution"
-	echo "target concatenates  OS, compiler and CPU (e.g. FREEBSDGCCI etc)"
-	echo "target_dir is the directory to place the zips"
-	exit 1
-fi
-
-MOZ_DIST=$1
-TARGET=$2
-if [ "w$3" != "w" ]; then
-	TARGET_DIR=$3
-else
-	if [ "w$TARGET_DIR" == "w" ]; then
-		TARGET_DIR=
-	fi
-fi
-
-ZIP_TARGET=$TARGET_DIR
-if [ -z "$ZIP_TARGET" ] ; then
-	ZIP_TARGET=../
-fi
-
-# just to remember the current working directory
-STARTING_DIR=`pwd`
-
-echo
-echo --- creating zips for $TARGET, using mozilla distribution in $MOZ_DIST
-
-# Create the directories
-[ ! -d $TARGET_DIR/$TARGET/runtime ] && mkdir -p $TARGET_DIR/$TARGET/runtime
-[ ! -d $TARGET_DIR/$TARGET/runtime/components ] && mkdir -p $TARGET_DIR/$TARGET/runtime/components
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults/pref ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults/pref
-[ ! -d $TARGET_DIR/$TARGET/lib ] && mkdir -p $TARGET_DIR/$TARGET/lib
-[ ! -d $TARGET_DIR/$TARGET/inc ] && mkdir -p $TARGET_DIR/$TARGET/inc
-[ ! -d $TARGET_DIR/$TARGET/inc/nspr ] && mkdir -p $TARGET_DIR/$TARGET/inc/nspr
-[ ! -d $TARGET_DIR/$TARGET/inc/obsolete ] && mkdir -p $TARGET_DIR/$TARGET/inc/obsolete
-
-# Copy the files
-echo
-echo --- copying files
-echo
-
-for i in $RUNTIME_FILES; do
-	if [ ! -f $MOZ_DIST/bin/$i ]; then
-		echo $MOZ_DIST/bin/$i does not exist, check your distribution
-	else
-		if [ `echo $i | grep component` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/components/
-		elif [ `echo $i | grep defaults` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/defaults/pref/
-		else
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/
-		fi
-	fi
-done
-
-for i in $LIB_FILES; do
-	if [ ! -f $MOZ_DIST/$i ]; then
-		echo $MOZ_DIST/$i does not exist, check your distribution
-	else
-		cp -R -L $MOZ_DIST/$i $TARGET_DIR/$TARGET/lib/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES`; do
-	if [ ! -d $i ]; then 
-		cp -R -L $MOZ_DIST/include/$i $TARGET_DIR/$TARGET/inc/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES2`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/public/$i $TARGET_DIR/$TARGET/inc
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/$i $TARGET_DIR/$TARGET/inc/nspr
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr/obsolete`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/obsolete/$i $TARGET_DIR/$TARGET/inc/obsolete
-	fi
-done
-
-# delete old zips
-
-[ -f $TARGET_DIR/$TARGET/runtime.zip ] && rm -f $TARGET_DIR/$TARGET/runtime.zip
-[ -f $TARGET_DIR/$TARGET/lib.zip ] && rm -f $TARGET_DIR/$TARGET/lib.zip
-[ -f $TARGET_DIR/$TARGET/inc.zip ] && rm -f $TARGET_DIR/$TARGET/inc.zip
-
-# zip the runtime files
-
-echo
-echo --- creating ${TARGET}runtime.zip
-echo
-
-cd $TARGET_DIR/$TARGET/runtime
-find . -type f | zip $ZIP_TARGET/${TARGET}runtime.zip -@
-
-# zip the lib files
-echo 
-echo --- creating ${TARGET}lib.zip
-echo 
-
-cd $TARGET_DIR/$TARGET/lib
-find . -type f | zip $ZIP_TARGET/${TARGET}lib.zip -@
-
-# zip the inc files
-echo
-echo --- creating ${TARGET}inc.zip
-echo
-
-cd $TARGET_DIR/$TARGET/inc
-find . -type f | zip $ZIP_TARGET/${TARGET}inc.zip -@
-
-# remove dirs
-cd $STARTING_DIR
-rm -rf $TARGET_DIR/$TARGET
-
-echo
-echo --- done
-echo
-
diff --git a/editors/openoffice-2.0-devel/pkg-descr b/editors/openoffice-2.0-devel/pkg-descr
deleted file mode 100644
index 31fd1b12161a..000000000000
--- a/editors/openoffice-2.0-devel/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-OpenOffice.org is an Open Source, community-developed, multi-platform office
-productivity suite. It includes the key desktop applications, such as a
-word processor, spreadsheet, presentation manager, and drawing program,
-with a user interface and feature set similar to other office suites.
-
-Components include:
-  * A universal word processing application for creating business
-    letters, extensive text documents, professional layouts, and HTML
-    documents.
-  * A sophisticated application for performing advanced spreadsheet
-    functions, such as analyzing figures, creating lists, and viewing data.
-  * A tool for creating effective eye-catching presentations.
-  * A vector-oriented draw module that enables the creation of 3D
-    illustrations
diff --git a/editors/openoffice-2.0-devel/pkg-message b/editors/openoffice-2.0-devel/pkg-message
deleted file mode 100644
index 1dc749f301c2..000000000000
--- a/editors/openoffice-2.0-devel/pkg-message
+++ /dev/null
@@ -1,73 +0,0 @@
-OpenOffice.org Build 643 Personal Install How-To
-
-Written by:	Martin Blapp <mbr@freebsd.org>
-
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
-
-1 User installation
--------------------
-
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
---------------
-
-There are some wrappers installed for fast startup.
-Add "${PREFIX}/bin/" to your PATH and you will be able
-to use them.
-
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
-
-If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
-version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
diff --git a/editors/openoffice-2.0-devel/pkg-plist b/editors/openoffice-2.0-devel/pkg-plist
deleted file mode 100644
index 28bd78453b52..000000000000
--- a/editors/openoffice-2.0-devel/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, do not delete. Package list is generated automatically.
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
deleted file mode 100644
index 6f740924c399..000000000000
--- a/editors/openoffice-3-devel/Makefile
+++ /dev/null
@@ -1,580 +0,0 @@
-# New ports collection makefile for: OpenOffice
-# Date created:		28 Februar 2002
-# Whom:                 Martin Blapp
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openoffice
-PORTVERSION=	644
-CATEGORIES+=	editors
-MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
-		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
-		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
-		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ny1.mirror.openoffice.org/miscellaneous/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
-MASTER_SITE_SUBDIR=	${PORTVERSION}
-DISTFILES+=	oo_${PORTVERSION}_src.tar.bz2 \
-		gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
-
-BROKEN=		"Does not build"
-
-SORT?=	/usr/bin/sort
-FIND?=	/usr/bin/find
-CUT?=	/usr/bin/cut
-AWK?=	/usr/bin/awk
-GREP?=	/usr/bin/grep
-ZIP?=	${PREFIX}/bin/zip
-UNZIP?=	${PREFIX}/bin/unzip
-ANT?=	${LOCALBASE}/bin/ant
-TCSH?=	/bin/tcsh
-PASTE?=	/usr/bin/paste
-
-.include <bsd.port.pre.mk>
-
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
-DIST_SUBDIR=		openoffice
-DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
-
-#
-# configuration for language specific slave ports
-#
-.if !defined(LANG_EXT)
-LANG_EXT=01
-.else
-#
-# Add pkg-descr and pkg-message if available
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-#
-# LANG_CONFIGURE_ARG is missing for the german port
-#
-.if defined(LANG_EXT)
-CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG},ENUS
-.endif
-.endif
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
-
-EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-
-MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/jakarta-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-.if !defined(DISPLAY)
-BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
-.endif
-.if !defined(WITH_BSD_JDK)
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk14
-.else
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-.endif
-
-USE_PERL5=	yes
-USE_BZIP2=	yes
-USE_BISON=	yes
-USE_GMAKE=	yes
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
-.if !defined(WITH_BSD_JDK)
-JDKDIR?=	${LOCALBASE}/linux-sun-jdk1.4.1
-.else
-JDKDIR?=	${LOCALBASE}/jdk1.4.1
-.endif
-JAVAVM=         ${JDKDIR}/bin/java
-
-GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
-LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
-BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
-
-.if !defined(DISPLAY)
-DISPLAYHACK=localhost:1001
-.endif
-
-CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
-			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
-
-.if !defined(WITH_BSD_JDK)
-CONFIGURE_ARGS+=	--enable-linuxjdk=yes
-.endif
-
-.if defined(WITH_DEBUG)
-.if ${WITH_DEBUG} == 2
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-.endif
-
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"prefered language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
-	@${ECHO} "OPTIONS:"
-.if !defined(USE_GCC)
-	@${ECHO}
-	@${ECHO} "You can compile OO with different"
-	@${ECHO} "gcc compiler versions:"
-	@${ECHO}
-	@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.2"
-	@${ECHO} "to compile openoffice with your"
-	@${ECHO} "prefered compiler."
-.endif
-.if !defined(WITH_BSD_JDK)
-	@${ECHO}
-	@${ECHO} "If you like to use the native BSD"
-	@${ECHO} "JDK for the build system, you can use"
-	@${ECHO} "WITH_BSD_JDK=TRUE to disable the"
-	@${ECHO} "usage of the linux-JDK and linux dependency."
-	@${ECHO}
-.endif
-.if !defined(WITH_DEBUG)
-	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
-	@${ECHO} "if you call make with WITH_DEBUG=1"
-	@${ECHO}
-	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
-	@${ECHO}
-.endif
-.if !defined(WITH_TTF_BYTECODE_ENABLED)
-	@${ECHO}
-	@${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES"
-	@${ECHO} "if you like to use the Freetype library to"
-	@${ECHO} "render TTF fonts. Normally the TTF lib is"
-	@${ECHO} "not used to render fonts."
-	@${ECHO}
-	@${ECHO} "If you have licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479"
-	@${ECHO} "you can enable this option to get better"
-	@${ECHO} "quality of glyphs at small bitmap sizes."
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 450002
-	@${ECHO}
-	@${ECHO} "OS-VERSION ${OSVERSION} too low"
-	@${ECHO}
-	@${ECHO} "OO need some important libc_r and"
-	@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
-	@${ECHO} "RELEASE or 4.6 STABLE."
-	@${FALSE}
-.endif
-	@${ECHO}
-	@${ECHO} "NOTICE:"
-	@${ECHO}
-	@${ECHO} "To build Openoffice, you should have a lot"
-.if defined(WITH_DEBUG)
-	@${ECHO} "of free diskspace (~ 8GB)."
-.else
-	@${ECHO} "of free diskspace (~ 4GB)."
-.endif
-	@${ECHO}
-.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
-    (${OSVERSION} < 500000 && !defined(USE_GCC))
-	@${ECHO} "KERNEL CONFIGURATION:"
-	@${ECHO}
-	@${ECHO} "Openoffice needs a larger stack- and"
-	@${ECHO} "datasize to build. Check your limit"
-	@${ECHO} "settings and and put this in /boot/loader.conf"
-	@${ECHO} "if neccessary:"
-	@${ECHO}
-	@${ECHO} "kern.maxdsiz=\"1073741824\""
-	@${ECHO} "kern.maxssiz=\"268435456\""
-.endif
-	@${ECHO}
-.if ${OSVERSION} < 460002
-	@${ECHO} "REQUIRED SYSTEM PATCHES:"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO} "OO.org can crash if you enter a non existing path"
-	@${ECHO} "or URL in the location bar. To fix these crashes"
-	@${ECHO} "you need a uncommitted system patch for rtld:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460001
-	@${ECHO}
-	@${ECHO} "OO setup is broken on STABLE < 4.6"
-	@${ECHO} "including 4.6 RELEASE."
-	@${ECHO} "You'll need a system patch to solve"
-	@${ECHO} "this problem:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460002
-	@${ECHO}
-	@${ECHO} "OO.org soffice binary can deadlock. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO}
-	@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
-	@${ECHO}
-.endif
-.if !exists(/usr/include/langinfo.h)
-	@${ECHO}
-	@${ECHO} "langinfo.h is missing !"
-	@${ECHO}
-	@${ECHO} "Please upgrade to 4.6 RELEASE or"
-	@${ECHO} "4.6 STABLE."
-	@${ECHO}
-	@${FALSE}
-.endif
-
-post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
-	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
-	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@-${RM} -f ${WRKSRC}/../moz/zipped/*.zip
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
-.if defined(L10NHELP)
-	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
-	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
-.endif
-
-post-patch:
-	@${MAKE} patch-mozilla
-.if defined(WITH_TTF_BYTECODE_ENABLED)
-	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
-		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-			${ECHO_MSG} "===>   Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \
-		fi; \
-		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
-	fi
-.endif
-.if defined(WITH_DEBUG)
-	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
-		PATCHES_APPLIED="" ; \
-		for i in ${PATCHDIR}/debugpatch-*; do \
-			case $$i in \
-				*.orig|*.rej|*~) \
-					${ECHO_MSG} "===>   Ignoring patchfile $$i" ; \
-					;; \
-				*) \
-					if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-						${ECHO_MSG} "===>   Applying ${OPSYS} patch $$i" ; \
-					fi; \
-					if ${PATCH} ${PATCH_ARGS} < $$i ; then \
-						PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
-					else \
-						${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
-						if [ x"$$PATCHES_APPLIED" != x"" ]; then \
-							${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
-						fi; \
-						${FALSE} ; \
-					fi; \
-					;; \
-			esac; \
-		done; \
-	fi;
-.endif
-	@${ECHO_MSG} "===>  Find old malloc.h defines and fix them in ${PKGNAME} source"
-	@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
-		${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
-
-extract-mozilla:
-.if ! exists(${WRKDIR}/mozilla/Makefile)
-	@${ECHO_MSG} "===>  Extracting mozilla sub project"
-	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
-.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment)
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
-.endif
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
-.endif
-	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
-
-patch-mozilla:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
-		${WRKDIR}/mozilla/files/
-	@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
-
-build-mozilla:
-.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
-	@${ECHO_MSG} "===>  Building mozilla sub project"
-.if defined(WITH_DEBUG)
-	@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
-	@${SED} -e 's|--disable-debug||' \
-		-e 's|--disable-cpp-rtti||' \
-		-e 's|--enable-strip||' \
-		< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
-.endif
-.if defined(USE_GCC)
-	@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
-.else
-	@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
-.endif
-	@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
-	@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
-	@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
-.endif
-
-install-mozilla:
-	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
-
-register-mozilla:
-.if exists(${WRKDIR}/mozilla-runtime)
-	@${RM} -rf ${WRKDIR}/mozilla-runtime
-.endif
-	@${MKDIR} ${WRKDIR}/mozilla-runtime
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
-	@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
-	@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
-	@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
-		&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom 
-	@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
-		${WRKDIR}/mozilla-runtime/components/xptitemp.dat
-	@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
-	@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
-		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
-
-mozilla:
-	@${MAKE} extract-mozilla
-	@${MAKE} patch-mozilla
-	@${MAKE} build-mozilla
-	@${MAKE} register-mozilla
-	@${MAKE} install-mozilla
-
-do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
-	@${MAKE} mozilla
-.endif
-.endif
-.endif
-.if exists(${WRKDIR}/.Xvfb.pid)
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.endif
-.if !defined(DISPLAY)
-	#
-	# This is a UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-.endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
-	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-.endif
-.if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
-.endif
-
-pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-
-do-install:
-.if !defined(DISPLAY)
-	#
-	# UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-.endif
-
-install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
-
-post-install:
-	@${ECHO_MSG} "===>  Add wrapper scripts";
-	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
-	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
-
-package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
-.if defined(LANG_SUFFIX)
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
-.else
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
-.endif
-
-update:
-	@${MAKE} fetch
-	@${MAKE} extract
-	@cd ${WRKSRC}/.. && for dir in *; do \
-	    if [ -d $$dir ]; then \
-		cd $$dir; cvs update -d; cd ..; \
-	    fi \
-	done
-
-.include <bsd.port.post.mk>
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
deleted file mode 100644
index ec9d6788f104..000000000000
--- a/editors/openoffice-3-devel/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
-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
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
diff --git a/editors/openoffice-3-devel/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice-3-devel/files/debugpatch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 96c651ce22c8..000000000000
--- a/editors/openoffice-3-devel/files/debugpatch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../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
-@@ -902,6 +902,7 @@
- 
- void KillSetupDir()
- {
-+#if 0
-     DIR* pDir = opendir( strTmpPath );
-     struct dirent* pFile;
- 
-@@ -915,6 +916,10 @@
- 
-     chdir( strInitPath );
-     rmdir( strTmpPath );
-+#else
-+	fprintf(stderr, "\nLeaving behind temporary directory: %s\n",
-+	strTmpPath);
-+#endif
- }
- 
- void makeSymLink( char* s )
diff --git a/editors/openoffice-3-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice-3-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 52bd2b3d58d6..000000000000
--- a/editors/openoffice-3-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
-+++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
- 
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- 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
- 
- # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
diff --git a/editors/openoffice-3-devel/files/oo_setup.resp b/editors/openoffice-3-devel/files/oo_setup.resp
deleted file mode 100644
index 8eeeb11bd95e..000000000000
--- a/editors/openoffice-3-devel/files/oo_setup.resp
+++ /dev/null
@@ -1,7 +0,0 @@
-[Environment]
-InstallationMode = INSTALL_NETWORK
-InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org-643
-
-[Java]
-JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice-3-devel/files/openoffice-wrapper b/editors/openoffice-3-devel/files/openoffice-wrapper
deleted file mode 100644
index 147391298f1c..000000000000
--- a/editors/openoffice-3-devel/files/openoffice-wrapper
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/
-program=`echo $0 | sed -e 's|.*-||'`
-
-if [ ! $LANG ]; then
-	export LANG=%%LANG%%
-fi
-
-case $program in
-$0)
-	exec $oopath/soffice "$@"
-	;;
-	*)
-	exec $oopath/$program "$@"
-	;;
-esac
diff --git a/editors/openoffice-3-devel/files/optpatch-freetype+patch b/editors/openoffice-3-devel/files/optpatch-freetype+patch
deleted file mode 100644
index b426a8fb7fcc..000000000000
--- a/editors/openoffice-3-devel/files/optpatch-freetype+patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Index: files/patch-freetype::patch
-===================================================================
-RCS file: files/patch-freetype::patch
-diff -N files/patch-freetype::patch
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-freetype::patch	4 Aug 2002 15:27:42 -0000
-@@ -0,0 +1,201 @@
-+diff -ur ../freetype/freetype-2.0.5.patch oo641d_patched/freetype/freetype-2.0.5.patch
-+--- ../freetype/freetype-2.0.5.patch	Fri Apr  5 21:07:34 2002
-++++ ../freetype/freetype-2.0.5.patch	Sat Mar  9 18:04:17 2002
-+@@ -1,118 +1,79 @@
-+-*** misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 14 00:44:33 2000
-+---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 63,69 ****
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+---- 63,69 ----
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+-*** misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Jun  7 19:36:17 2001
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 631,637 ****
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+---- 631,637 ----
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile -DPIC $pic_flag"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Mon Jan  1 18:25:21 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 1,7 ****
-+---- 1,9 ----
-+-  FT_USE_MODULE(autohint_module_class)
-+-  FT_USE_MODULE(cff_driver_class)
-+-  FT_USE_MODULE(t1cid_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(pcf_driver_class)
-+-+ */
-+-  FT_USE_MODULE(psaux_module_class)
-+-  FT_USE_MODULE(psnames_module_class)
-+-  FT_USE_MODULE(ft_raster1_renderer_class)
-+-***************
-+-*** 9,12 ****
-+---- 11,16 ----
-+-  FT_USE_MODULE(ft_smooth_renderer_class)
-+-  FT_USE_MODULE(tt_driver_class)
-+-  FT_USE_MODULE(t1_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(winfnt_driver_class)
-+-+ */
-+-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h	Tue Aug 21 10:50:45 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 70,76 ****
-+---- 70,79 ----
-+-    /*   All convenience functions are declared as such in their             */
-+-    /*   documentation.                                                      */
-+-    /*                                                                       */
-+-+ /*
-+-  #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-+ */
-+-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-  
-+-  
-+-    /*************************************************************************/
-+-***************
-+-*** 108,116 ****
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-- 
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+---- 111,121 ----
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-+ /*
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-+ */
-+-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig	Mon Jan  7 14:21:35 2002
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Mon Jan  7 14:21:40 2002
-+-***************
-+-*** 2251,2257 ****
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age + 1`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-+---- 2251,2257 ----
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk
-++--- misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:49:17 2001
-++@@ -63,7 +63,7 @@
-++ #   ANSI compliance.
-++ #
-++ ifndef CFLAGS
-++-  CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+++  CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-++ endif
-++ 
-++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh
-++--- misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:47:56 2001
-+++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:49:17 2001
-++@@ -631,7 +631,7 @@
-++     if test "$build_old_libs" = yes; then
-++       if test "$pic_mode" != yes; then
-++ 	# Don't build PIC code
-++-	command="$base_compile $srcfile"
-+++	command="$base_compile $srcfile -DPIC $pic_flag"
-++       else
-++ 	# All platforms use -DPIC, to notify preprocessed assembler code.
-++ 	command="$base_compile $srcfile $pic_flag -DPIC"
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:49:17 2001
-++@@ -1,7 +1,9 @@
-++ FT_USE_MODULE(autohint_module_class)
-++ FT_USE_MODULE(cff_driver_class)
-++ FT_USE_MODULE(t1cid_driver_class)
-+++/*
-++ FT_USE_MODULE(pcf_driver_class)
-+++*/
-++ FT_USE_MODULE(psaux_module_class)
-++ FT_USE_MODULE(psnames_module_class)
-++ FT_USE_MODULE(ft_raster1_renderer_class)
-++@@ -9,4 +11,6 @@
-++ FT_USE_MODULE(ft_smooth_renderer_class)
-++ FT_USE_MODULE(tt_driver_class)
-++ FT_USE_MODULE(t1_driver_class)
-+++/*
-++ FT_USE_MODULE(winfnt_driver_class)
-+++*/
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:51:15 2001
-++@@ -70,7 +70,10 @@
-++   /*   All convenience functions are declared as such in their             */
-++   /*   documentation.                                                      */
-++   /*                                                                       */
-+++/*
-++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+++*/
-+++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-++ 
-++ 
-++   /*************************************************************************/
-++@@ -108,8 +111,10 @@
-++   /*   use a vector `plotter' format that isn't supported when this        */
-++   /*   macro is undefined.                                                 */
-++   /*                                                                       */
-+++/*
-++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++-
-+++*/
-+++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++ 
-++   /*************************************************************************/
-++   /*                                                                       */
-++@@ -338,7 +343,7 @@
-++   /* By undefining this, you will only compile the code necessary to load  */
-++   /* TrueType glyphs without hinting.                                      */
-++   /*                                                                       */
-++-#undef  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-+++#define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-++ 
-++ 
-++   /*************************************************************************/
diff --git a/editors/openoffice-3-devel/files/optpatch-vcl+util+makefile.pmk b/editors/openoffice-3-devel/files/optpatch-vcl+util+makefile.pmk
deleted file mode 100644
index 41341ff0b4e8..000000000000
--- a/editors/openoffice-3-devel/files/optpatch-vcl+util+makefile.pmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/util/makefile.pmk.orig	Mon Aug  5 01:39:41 2002
-+++ ../vcl/util/makefile.pmk	Mon Aug  5 01:40:03 2002
-@@ -64,7 +64,7 @@
- PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch
- PDBTARGET=vcl
- 
--.IF "$(OS)" != "MACOSX"
-+.IF "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- .IF "$(remote)" != ""
- USE_BUILTIN_RASTERIZER=true
- .ENDIF
diff --git a/editors/openoffice-3-devel/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice-3-devel/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 078685f3b516..000000000000
--- a/editors/openoffice-3-devel/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../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 freebsd genunix";;
-  	*)		JINCSUBDIRS="genunix";;
-  	esac
-  
diff --git a/editors/openoffice-3-devel/files/patch-bridges+prj+build.lst b/editors/openoffice-3-devel/files/patch-bridges+prj+build.lst
deleted file mode 100644
index fee3d847c5e6..000000000000
--- a/editors/openoffice-3-devel/files/patch-bridges+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
deleted file mode 100644
index 99b8c566fb61..000000000000
--- a/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ /dev/null
@@ -1,102 +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 );
-+    }
- }
- 
- }
diff --git a/editors/openoffice-3-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice-3-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
deleted file mode 100644
index 4622b7fe21c4..000000000000
--- a/editors/openoffice-3-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice-3-devel/files/patch-comphelper+util+makefile.mk b/editors/openoffice-3-devel/files/patch-comphelper+util+makefile.mk
deleted file mode 100644
index f2d3092c2ddf..000000000000
--- a/editors/openoffice-3-devel/files/patch-comphelper+util+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-3-devel/files/patch-config_office+configure.in b/editors/openoffice-3-devel/files/patch-config_office+configure.in
deleted file mode 100644
index a45332fcbec0..000000000000
--- a/editors/openoffice-3-devel/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,66 +0,0 @@
---- configure.in.orig	Thu Feb 20 15:49:32 2003
-+++ configure.in	Wed Mar  5 21:22:34 2003
-@@ -95,6 +95,12 @@
-                           
-                           Usage: --enable-macos9
- ],,)
-+AC_ARG_ENABLE(linuxjdk,
-+[  --enable-linuxjdk         Use this option option if you like to use
-+                          the linux-jdk instead of the native jdk.
-+
-+                          Usage: --enable-linuxjdk
-+],,)
- AC_ARG_WITH(lang,
- [  --with-lang             Use this option to build OpenOffice.org with
-                           additional language support. US English is always
-@@ -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
-@@ -1232,7 +1249,11 @@
- if test -n "$enable_debug"; then
-    ENABLE_DEBUG="TRUE"
- else
--   ENABLE_DEBUG="FALSE"
-+fi
-+if test -n "$enable_linuxjdk"; then
-+   USE_LINUXJDK="TRUE"
-+else
-+   USE_LINUXJDK="FALSE"
- fi
- 
- dnl ===================================================================
-@@ -1278,6 +1299,7 @@
- AC_SUBST(PTHREAD_CFLAGS)
- AC_SUBST(PTHREAD_LIBS)
- AC_SUBST(ENABLE_DEBUG)
-+AC_SUBST(USE_LINUXJDK)
- 
- AC_OUTPUT([set_soenv])
- 
diff --git a/editors/openoffice-3-devel/files/patch-config_office+set_soenv.in b/editors/openoffice-3-devel/files/patch-config_office+set_soenv.in
deleted file mode 100644
index 9ea6b11bdab2..000000000000
--- a/editors/openoffice-3-devel/files/patch-config_office+set_soenv.in
+++ /dev/null
@@ -1,44 +0,0 @@
---- set_soenv.in.orig	Thu Feb 27 15:12:36 2003
-+++ set_soenv.in	Wed Mar  5 21:16:43 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, 
-@@ -88,7 +88,7 @@
-      $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
-      $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS,
-      $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
--     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG );
-+     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $USE_LINUXJDK );
- #
- #-------------------------------------------
- # IId. Declaring the aliases.
-@@ -140,7 +140,8 @@
- $CC			= '@CC@';           # C compiler
- $CXX		= '@CXX@';          # C++ compiler
- $EXCEPTIONS	= '@EXCEPTIONS@';   # Exception handling type
--$ENABLE_DEBUG	= '@ENABLE_DEBUG@';  # Enable a debug build
-+$ENABLE_DEBUG	= '@ENABLE_DEBUG@'; # Enable a debug build
-+$USE_LINUXJDK	= '@USE_LINUXJDK@'; # Use the Linux JDK
- $WRAPCMD	= "";				# Wrapper (only for winnt)
- 
- #
-@@ -1265,7 +1266,12 @@
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
- }
- elsif ($platform eq "$FreeBSD")
--{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+{
-+   if ($USE_LINUXJDK eq "TRUE") {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
-+   } else {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+   }
- }
- elsif ($platform eq "$NetBSD")
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
diff --git a/editors/openoffice-3-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk b/editors/openoffice-3-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk
deleted file mode 100644
index 2b83f2cd2ec7..000000000000
--- a/editors/openoffice-3-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk
+++ /dev/null
@@ -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)					\
diff --git a/editors/openoffice-3-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice-3-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
deleted file mode 100644
index 3601766ee561..000000000000
--- a/editors/openoffice-3-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../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
-@@ -64,8 +64,8 @@
- #mozilla specific stuff.
- MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
- MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
--#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
--#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
-+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
-+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
- #End of mozilla specific stuff.
- 
- PRJ=..$/..$/..$/..
-@@ -107,7 +107,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -123,7 +123,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -141,7 +141,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS+=	    -DMOZILLA_CLIENT \
-             -DOSTYPE=\"Linux2.2.14-5\" -DOJI
- .IF "$(OS)" == "LINUX"
-@@ -157,6 +157,13 @@
-             -fno-rtti -Wall -Wconversion -Wpointer-arith \
-             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-             -Wno-long-long 
-+CDEFS     += -DTRACING
-+.ELIF "$(OS)" == "FREEBSD"
-+CFLAGS +=   -fPIC
-+CFLAGSCXX += \
-+            -fno-rtti -Wall -Wconversion -Wpointer-arith \
-+            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-+            -Wno-long-long -pthread 
- CDEFS     += -DTRACING
- .ENDIF
- .ENDIF
diff --git a/editors/openoffice-3-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk b/editors/openoffice-3-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
deleted file mode 100644
index b63d2a25f184..000000000000
--- a/editors/openoffice-3-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-3-devel/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice-3-devel/files/patch-cppu+inc+uno+lbnames.h
deleted file mode 100644
index cb43c2d165e9..000000000000
--- a/editors/openoffice-3-devel/files/patch-cppu+inc+uno+lbnames.h
+++ /dev/null
@@ -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."
diff --git a/editors/openoffice-3-devel/files/patch-cppu+prj+build.lst b/editors/openoffice-3-devel/files/patch-cppu+prj+build.lst
deleted file mode 100644
index 78fd210a1193..000000000000
--- a/editors/openoffice-3-devel/files/patch-cppu+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3-devel/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice-3-devel/files/patch-cppuhelper+source+makefile.mk
deleted file mode 100644
index 5fb5bd636eb1..000000000000
--- a/editors/openoffice-3-devel/files/patch-cppuhelper+source+makefile.mk
+++ /dev/null
@@ -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 ------------------------------------------------------
diff --git a/editors/openoffice-3-devel/files/patch-desktop+source+pkgchk+pkgchk_misc.h b/editors/openoffice-3-devel/files/patch-desktop+source+pkgchk+pkgchk_misc.h
deleted file mode 100644
index 391667b66ebd..000000000000
--- a/editors/openoffice-3-devel/files/patch-desktop+source+pkgchk+pkgchk_misc.h
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3-devel/files/patch-desktop+util+makefile.mk b/editors/openoffice-3-devel/files/patch-desktop+util+makefile.mk
deleted file mode 100644
index 025d644a8077..000000000000
--- a/editors/openoffice-3-devel/files/patch-desktop+util+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3-devel/files/patch-dtrans+source+X11+makefile.mk b/editors/openoffice-3-devel/files/patch-dtrans+source+X11+makefile.mk
deleted file mode 100644
index 5881f5d7f6a5..000000000000
--- a/editors/openoffice-3-devel/files/patch-dtrans+source+X11+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice-3-devel/files/patch-eventattacher+source+makefile.mk b/editors/openoffice-3-devel/files/patch-eventattacher+source+makefile.mk
deleted file mode 100644
index 4552698eb132..000000000000
--- a/editors/openoffice-3-devel/files/patch-eventattacher+source+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-3-devel/files/patch-external+gcc3_specific+makefile.mk b/editors/openoffice-3-devel/files/patch-external+gcc3_specific+makefile.mk
deleted file mode 100644
index 6b8071f4030e..000000000000
--- a/editors/openoffice-3-devel/files/patch-external+gcc3_specific+makefile.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../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"
- 
- .IF "$(OS)"!="MACOSX"
-+.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 @@
-         -rm -f $@
-         +ln -s libgcc_s.so.1 $@
- 
-+.ENDIF 
- .ENDIF 
- 
- .ENDIF
diff --git a/editors/openoffice-3-devel/files/patch-freetype+makefile.mk b/editors/openoffice-3-devel/files/patch-freetype+makefile.mk
deleted file mode 100644
index 3e5a8dd19f18..000000000000
--- a/editors/openoffice-3-devel/files/patch-freetype+makefile.mk
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice-3-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice-3-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice-3-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
- 
- /* 
diff --git a/editors/openoffice-3-devel/files/patch-javaunohelper+source+makefile.mk b/editors/openoffice-3-devel/files/patch-javaunohelper+source+makefile.mk
deleted file mode 100644
index 19f6b86e5ab5..000000000000
--- a/editors/openoffice-3-devel/files/patch-javaunohelper+source+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice-3-devel/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice-3-devel/files/patch-jni_uno+jni_java2uno.cxx
deleted file mode 100644
index a9ff9e3fed88..000000000000
--- a/editors/openoffice-3-devel/files/patch-jni_uno+jni_java2uno.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice-3-devel/files/patch-nas+nas-1.6.patch b/editors/openoffice-3-devel/files/patch-nas+nas-1.6.patch
deleted file mode 100644
index b6096654ebaf..000000000000
--- a/editors/openoffice-3-devel/files/patch-nas+nas-1.6.patch
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice-3-devel/files/patch-offapi+com+sun+star+setup+OSType.idl b/editors/openoffice-3-devel/files/patch-offapi+com+sun+star+setup+OSType.idl
deleted file mode 100644
index 3fee562c6d38..000000000000
--- a/editors/openoffice-3-devel/files/patch-offapi+com+sun+star+setup+OSType.idl
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3-devel/files/patch-offapi+util+makefile.pmk b/editors/openoffice-3-devel/files/patch-offapi+util+makefile.pmk
deleted file mode 100644
index 5cdbb1b4aa4a..000000000000
--- a/editors/openoffice-3-devel/files/patch-offapi+util+makefile.pmk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3-devel/files/patch-package+inc+HashMaps.hxx b/editors/openoffice-3-devel/files/patch-package+inc+HashMaps.hxx
deleted file mode 100644
index 35052d291ef7..000000000000
--- a/editors/openoffice-3-devel/files/patch-package+inc+HashMaps.hxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice-3-devel/files/patch-package+inc+ZipPackageFolder.hxx b/editors/openoffice-3-devel/files/patch-package+inc+ZipPackageFolder.hxx
deleted file mode 100644
index 014c61403380..000000000000
--- a/editors/openoffice-3-devel/files/patch-package+inc+ZipPackageFolder.hxx
+++ /dev/null
@@ -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()
diff --git a/editors/openoffice-3-devel/files/patch-package+source+zippackage+ContentInfo.hxx b/editors/openoffice-3-devel/files/patch-package+source+zippackage+ContentInfo.hxx
deleted file mode 100644
index c4bf35e79f64..000000000000
--- a/editors/openoffice-3-devel/files/patch-package+source+zippackage+ContentInfo.hxx
+++ /dev/null
@@ -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();
diff --git a/editors/openoffice-3-devel/files/patch-package+source+zippackage+ZipPackageFolder.cxx b/editors/openoffice-3-devel/files/patch-package+source+zippackage+ZipPackageFolder.cxx
deleted file mode 100644
index bb504c834eef..000000000000
--- a/editors/openoffice-3-devel/files/patch-package+source+zippackage+ZipPackageFolder.cxx
+++ /dev/null
@@ -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 );
diff --git a/editors/openoffice-3-devel/files/patch-registry+source+regkey.cxx b/editors/openoffice-3-devel/files/patch-registry+source+regkey.cxx
deleted file mode 100644
index fad069f83f14..000000000000
--- a/editors/openoffice-3-devel/files/patch-registry+source+regkey.cxx
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice-3-devel/files/patch-rsc+source+rscpp+cpp.h b/editors/openoffice-3-devel/files/patch-rsc+source+rscpp+cpp.h
deleted file mode 100644
index 417ab33ba52f..000000000000
--- a/editors/openoffice-3-devel/files/patch-rsc+source+rscpp+cpp.h
+++ /dev/null
@@ -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              */
- 
diff --git a/editors/openoffice-3-devel/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice-3-devel/files/patch-sal+osl+unx+nlsupport.c
deleted file mode 100644
index 49fe0da8589b..000000000000
--- a/editors/openoffice-3-devel/files/patch-sal+osl+unx+nlsupport.c
+++ /dev/null
@@ -1,160 +0,0 @@
---- ../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
-@@ -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)
- 
-@@ -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 @@
-     { "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-3-devel/files/patch-sal+osl+unx+pipe.c b/editors/openoffice-3-devel/files/patch-sal+osl+unx+pipe.c
deleted file mode 100644
index 4aa7b8af1a61..000000000000
--- a/editors/openoffice-3-devel/files/patch-sal+osl+unx+pipe.c
+++ /dev/null
@@ -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 )
- 	{			
diff --git a/editors/openoffice-3-devel/files/patch-sal+osl+unx+process.c b/editors/openoffice-3-devel/files/patch-sal+osl+unx+process.c
deleted file mode 100644
index 50023576bec4..000000000000
--- a/editors/openoffice-3-devel/files/patch-sal+osl+unx+process.c
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice-3-devel/files/patch-sal+osl+unx+security.c b/editors/openoffice-3-devel/files/patch-sal+osl+unx+security.c
deleted file mode 100644
index 0cc321dcd544..000000000000
--- a/editors/openoffice-3-devel/files/patch-sal+osl+unx+security.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../sal/osl/unx/security.c.orig	Sat Jul 20 22:53:31 2002
-+++ ../sal/osl/unx/security.c	Sat Jul 20 22:52:39 2002
-@@ -739,7 +739,7 @@
- 	}
- 
- 
--#elif (LINUX && (GLIBC >= 2))
-+#elif ((LINUX && (GLIBC >= 2)) || defined(FREEBSD))
- 	
- 	struct passwd	*pPasswd; 
- 	
diff --git a/editors/openoffice-3-devel/files/patch-sal+osl+unx+socket.c b/editors/openoffice-3-devel/files/patch-sal+osl+unx+socket.c
deleted file mode 100644
index 9541cac8583f..000000000000
--- a/editors/openoffice-3-devel/files/patch-sal+osl+unx+socket.c
+++ /dev/null
@@ -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! */
diff --git a/editors/openoffice-3-devel/files/patch-sal+osl+unx+system.c b/editors/openoffice-3-devel/files/patch-sal+osl+unx+system.c
deleted file mode 100644
index 8dc663ac03fc..000000000000
--- a/editors/openoffice-3-devel/files/patch-sal+osl+unx+system.c
+++ /dev/null
@@ -1,127 +0,0 @@
---- ../sal/osl/unx/system.c.orig	Sun Mar 17 12:34:13 2002
-+++ ../sal/osl/unx/system.c	Wed Apr  3 01:03:36 2002
-@@ -195,6 +195,73 @@
- }
- #endif
- 
-+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
-+           size_t buflen, struct passwd **result)
-+{
-+  struct passwd* res;
-+
-+  pthread_mutex_lock(&getrtl_mutex);
-+
-+  if ( res = getpwuid(uid) )
-+  {
-+    size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell;
-+
-+    pw_name = strlen(res->pw_name)+1;
-+    pw_passwd = strlen(res->pw_passwd)+1;
-+    pw_class = strlen(res->pw_class)+1;
-+    pw_gecos = strlen(res->pw_gecos)+1;
-+    pw_dir = strlen(res->pw_dir)+1;
-+    pw_shell = strlen(res->pw_shell)+1;
-+
-+    if (pw_name+pw_passwd+pw_class+pw_gecos
-+                                 +pw_dir+pw_shell < buflen)
-+    {
-+      memcpy(pwd, res, sizeof(struct passwd));
-+
-+      strncpy(buffer, res->pw_name, pw_name);
-+      pwd->pw_name = buffer;
-+      buffer += pw_name;
-+
-+      strncpy(buffer, res->pw_passwd, pw_passwd);
-+      pwd->pw_passwd = buffer;
-+      buffer += pw_passwd;
-+
-+      strncpy(buffer, res->pw_class, pw_class);
-+      pwd->pw_class = buffer;
-+      buffer += pw_class;
-+
-+      strncpy(buffer, res->pw_gecos, pw_gecos);
-+      pwd->pw_gecos = buffer;
-+      buffer += pw_gecos;
-+
-+      strncpy(buffer, res->pw_dir, pw_dir);
-+      pwd->pw_dir = buffer;
-+      buffer += pw_dir;
-+
-+      strncpy(buffer, res->pw_shell, pw_shell);
-+      pwd->pw_shell = buffer;
-+      buffer += pw_shell;
-+
-+      *result = pwd ;
-+      res = 0 ;
-+
-+    } else {
-+
-+      res = ENOMEM ;
-+
-+    }      
-+  
-+  } else {
-+
-+    res = errno ;
-+ 
-+  } 
-+
-+  pthread_mutex_unlock(&getrtl_mutex);
-+
-+  return res;
-+}
-+
- struct tm *localtime_r(const time_t *timep, struct tm *buffer)
- {
- 	struct tm* res;
-@@ -518,3 +585,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-3-devel/files/patch-sal+osl+unx+system.h b/editors/openoffice-3-devel/files/patch-sal+osl+unx+system.h
deleted file mode 100644
index c4e255952fc7..000000000000
--- a/editors/openoffice-3-devel/files/patch-sal+osl+unx+system.h
+++ /dev/null
@@ -1,35 +0,0 @@
---- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
-+++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
-@@ -205,6 +205,13 @@
- #   include <sys/ioctl.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 <machine/vmparam.h>
-+#   include <machine/pmap.h>
- #	include <sys/un.h>
- #   include <netinet/tcp.h>
- #	define 	IORESOURCE_TRANSFER_BSD 
-@@ -216,12 +223,13 @@
- #   elif BYTE_ORDER == PDP_ENDIAN
- #   	define _PDP_ENDIAN
- #   endif
--#   define  sched_yield() 				pthread_yield()
--#   define  pthread_testcancel()
- #	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
diff --git a/editors/openoffice-3-devel/files/patch-sal+textenc+tencinfo.c b/editors/openoffice-3-devel/files/patch-sal+textenc+tencinfo.c
deleted file mode 100644
index 7cf80c18d0a0..000000000000
--- a/editors/openoffice-3-devel/files/patch-sal+textenc+tencinfo.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
-     /* 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 */
-+
-+    if (pMimeCharset == NULL)
-+	pMimeCharset = "usascii";
-+
-     static ImplStrCharsetDef const aVIPMimeCharsetTab[] =
-     {
-         { "usascii", RTL_TEXTENCODING_ASCII_US },
diff --git a/editors/openoffice-3-devel/files/patch-sal+workben+makefile.mk b/editors/openoffice-3-devel/files/patch-sal+workben+makefile.mk
deleted file mode 100644
index 369935e31d66..000000000000
--- a/editors/openoffice-3-devel/files/patch-sal+workben+makefile.mk
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../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 @@
- 
- .IF "$(TESTAPP)" == "salstattest"
- 
--	CFLAGS+= /DUSE_SAL_STATIC
-+	CFLAGS+= -DUSE_SAL_STATIC
- 
- 	OBJFILES=	$(OBJ)$/salstattest.obj
- 
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- 
- CXXFILES=	tgetpwnam.cxx
- OBJFILES=	$(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN=	$(SLB)$/sal.lib
- 
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd | freebsd)
- .ENDIF # tgetpwname
- 
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-3-devel/files/patch-salhelper+source+gcc2_freebsd_intel.map b/editors/openoffice-3-devel/files/patch-salhelper+source+gcc2_freebsd_intel.map
deleted file mode 100644
index 1ffacf889bc6..000000000000
--- a/editors/openoffice-3-devel/files/patch-salhelper+source+gcc2_freebsd_intel.map
+++ /dev/null
@@ -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:
-+*;
-+};
diff --git a/editors/openoffice-3-devel/files/patch-salhelper+source+gcc3_freebsd_intel.map b/editors/openoffice-3-devel/files/patch-salhelper+source+gcc3_freebsd_intel.map
deleted file mode 100644
index 823cff316ec7..000000000000
--- a/editors/openoffice-3-devel/files/patch-salhelper+source+gcc3_freebsd_intel.map
+++ /dev/null
@@ -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:
-+		*;
-+};
-+
diff --git a/editors/openoffice-3-devel/files/patch-salhelper+source+makefile.mk b/editors/openoffice-3-devel/files/patch-salhelper+source+makefile.mk
deleted file mode 100644
index 3687664d8d16..000000000000
--- a/editors/openoffice-3-devel/files/patch-salhelper+source+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../salhelper/source/makefile.mk.orig	Wed Nov 14 14:19:21 2001
-+++ ../salhelper/source/makefile.mk	Sun Mar  3 17:58:15 2002
-@@ -109,6 +109,10 @@
- SHL1VERSIONMAP=lngi.map
- .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
- SHL1VERSIONMAP=gcc3_linux_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
- .ENDIF
- 
- 
diff --git a/editors/openoffice-3-devel/files/patch-salhelper+test+rtti+makefile.mk b/editors/openoffice-3-devel/files/patch-salhelper+test+rtti+makefile.mk
deleted file mode 100644
index 70f25048a24a..000000000000
--- a/editors/openoffice-3-devel/files/patch-salhelper+test+rtti+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
- 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
- .ENDIF
- 
- 
diff --git a/editors/openoffice-3-devel/files/patch-sc+source+core+data+cell.cxx b/editors/openoffice-3-devel/files/patch-sc+source+core+data+cell.cxx
deleted file mode 100644
index 529f67a3e35f..000000000000
--- a/editors/openoffice-3-devel/files/patch-sc+source+core+data+cell.cxx
+++ /dev/null
@@ -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>
diff --git a/editors/openoffice-3-devel/files/patch-scp+source+global+udk_base.scp b/editors/openoffice-3-devel/files/patch-scp+source+global+udk_base.scp
deleted file mode 100644
index 623eccb0ff09..000000000000
--- a/editors/openoffice-3-devel/files/patch-scp+source+global+udk_base.scp
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3-devel/files/patch-scp+source+player+player.scp b/editors/openoffice-3-devel/files/patch-scp+source+player+player.scp
deleted file mode 100644
index 2f8daab35cdd..000000000000
--- a/editors/openoffice-3-devel/files/patch-scp+source+player+player.scp
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice-3-devel/files/patch-scptools+source+linker+searchcache b/editors/openoffice-3-devel/files/patch-scptools+source+linker+searchcache
deleted file mode 100644
index 593e9eabf5bc..000000000000
--- a/editors/openoffice-3-devel/files/patch-scptools+source+linker+searchcache
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: files/patch-scptools::source::linker::searchcache
-===================================================================
-RCS file: files/patch-scptools::source::linker::searchcache
-diff -N files/patch-scptools::source::linker::searchcache
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-scptools::source::linker::searchcache	4 Aug 2002 15:28:04 -0000
-@@ -0,0 +1,27 @@
-+--- ../scptools/source/linker/searchcache.hxx.orig	Fri Aug  2 22:53:46 2002
-++++ ../scptools/source/linker/searchcache.hxx	Fri Aug  2 22:54:50 2002
-+@@ -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	Fri Aug  2 22:53:35 2002
-++++ ../scptools/source/linker/searchcache.cxx	Fri Aug  2 22:55:14 2002
-+@@ -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-3-devel/files/patch-scptools+source+linker+ziplst.cxx b/editors/openoffice-3-devel/files/patch-scptools+source+linker+ziplst.cxx
deleted file mode 100644
index 83b84631542e..000000000000
--- a/editors/openoffice-3-devel/files/patch-scptools+source+linker+ziplst.cxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice-3-devel/files/patch-setup2+inc+fields.hxx b/editors/openoffice-3-devel/files/patch-setup2+inc+fields.hxx
deleted file mode 100644
index d56e12f2abf4..000000000000
--- a/editors/openoffice-3-devel/files/patch-setup2+inc+fields.hxx
+++ /dev/null
@@ -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[];
diff --git a/editors/openoffice-3-devel/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice-3-devel/files/patch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 396c586ee3a3..000000000000
--- a/editors/openoffice-3-devel/files/patch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,30 +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"
- 
-@@ -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" \
diff --git a/editors/openoffice-3-devel/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice-3-devel/files/patch-setup2+mow+source+loader+makefile.mk
deleted file mode 100644
index 5460e4296587..000000000000
--- a/editors/openoffice-3-devel/files/patch-setup2+mow+source+loader+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice-3-devel/files/patch-setup2+patch+makefile.mk b/editors/openoffice-3-devel/files/patch-setup2+patch+makefile.mk
deleted file mode 100644
index 53846a8bdfc9..000000000000
--- a/editors/openoffice-3-devel/files/patch-setup2+patch+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3-devel/files/patch-setup2+script+setupserver b/editors/openoffice-3-devel/files/patch-setup2+script+setupserver
deleted file mode 100644
index 450ea386c841..000000000000
--- a/editors/openoffice-3-devel/files/patch-setup2+script+setupserver
+++ /dev/null
@@ -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`"
diff --git a/editors/openoffice-3-devel/files/patch-setup2+source+compiler+decltor.cxx b/editors/openoffice-3-devel/files/patch-setup2+source+compiler+decltor.cxx
deleted file mode 100644
index 98f6ad2f7567..000000000000
--- a/editors/openoffice-3-devel/files/patch-setup2+source+compiler+decltor.cxx
+++ /dev/null
@@ -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";
diff --git a/editors/openoffice-3-devel/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx b/editors/openoffice-3-devel/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
deleted file mode 100644
index ac0b39a6aa47..000000000000
--- a/editors/openoffice-3-devel/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
+++ /dev/null
@@ -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) );
diff --git a/editors/openoffice-3-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice-3-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
deleted file mode 100644
index f199b18823e1..000000000000
--- a/editors/openoffice-3-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice-3-devel/files/patch-setup2+source+service+interface.cxx b/editors/openoffice-3-devel/files/patch-setup2+source+service+interface.cxx
deleted file mode 100644
index 8e478e17971d..000000000000
--- a/editors/openoffice-3-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-3-devel/files/patch-shell+source+cmdmail+makefile.mk b/editors/openoffice-3-devel/files/patch-shell+source+cmdmail+makefile.mk
deleted file mode 100644
index 0476285c802e..000000000000
--- a/editors/openoffice-3-devel/files/patch-shell+source+cmdmail+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice-3-devel/files/patch-shell+source+proxysettings+makefile.mk b/editors/openoffice-3-devel/files/patch-shell+source+proxysettings+makefile.mk
deleted file mode 100644
index e83cf7c9d7a1..000000000000
--- a/editors/openoffice-3-devel/files/patch-shell+source+proxysettings+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice-3-devel/files/patch-shell+source+unix+exec+makefile.mk b/editors/openoffice-3-devel/files/patch-shell+source+unix+exec+makefile.mk
deleted file mode 100644
index 0b7712ee35f8..000000000000
--- a/editors/openoffice-3-devel/files/patch-shell+source+unix+exec+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice-3-devel/files/patch-solenv+bin+addsym.awk b/editors/openoffice-3-devel/files/patch-solenv+bin+addsym.awk
deleted file mode 100644
index 996e282b350b..000000000000
--- a/editors/openoffice-3-devel/files/patch-solenv+bin+addsym.awk
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
-+++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
-@@ -72,11 +72,11 @@
- END {
-     if (state == 0) {
-         print "# Weak RTTI symbols for C++ exceptions:"
--        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
-+        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
-     }
- }
- state == 2 {
--    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
-+    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
-     state = 3
- }
- /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice-3-devel/files/patch-solenv+bin+mapgen.pl b/editors/openoffice-3-devel/files/patch-solenv+bin+mapgen.pl
deleted file mode 100644
index 71ebdb934120..000000000000
--- a/editors/openoffice-3-devel/files/patch-solenv+bin+mapgen.pl
+++ /dev/null
@@ -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, $_);
- 	};
diff --git a/editors/openoffice-3-devel/files/patch-solenv+inc+startup+FREEBSD+macros.mk b/editors/openoffice-3-devel/files/patch-solenv+inc+startup+FREEBSD+macros.mk
deleted file mode 100644
index 0c1b107de988..000000000000
--- a/editors/openoffice-3-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-3-devel/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice-3-devel/files/patch-solenv+inc+tg_ext.mk
deleted file mode 100644
index 701692c9425a..000000000000
--- a/editors/openoffice-3-devel/files/patch-solenv+inc+tg_ext.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3-devel/files/patch-solenv+inc+tg_moz.mk b/editors/openoffice-3-devel/files/patch-solenv+inc+tg_moz.mk
deleted file mode 100644
index 255a41f92281..000000000000
--- a/editors/openoffice-3-devel/files/patch-solenv+inc+tg_moz.mk
+++ /dev/null
@@ -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) $@
diff --git a/editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index b4764485aa86..000000000000
--- a/editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,202 +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
-+# 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*=$(CC)
-+
-+# default linker flags
-+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -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
diff --git a/editors/openoffice-3-devel/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice-3-devel/files/patch-soltools+checkdll+makefile.mk
deleted file mode 100644
index e6407402258a..000000000000
--- a/editors/openoffice-3-devel/files/patch-soltools+checkdll+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3-devel/files/patch-soltools+mkdepend+main.c b/editors/openoffice-3-devel/files/patch-soltools+mkdepend+main.c
deleted file mode 100644
index cffd5cbb1f43..000000000000
--- a/editors/openoffice-3-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-3-devel/files/patch-stlport+makefile.mk b/editors/openoffice-3-devel/files/patch-stlport+makefile.mk
deleted file mode 100644
index 797817ba85be..000000000000
--- a/editors/openoffice-3-devel/files/patch-stlport+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3-devel/files/patch-stoc+source+corereflection+makefile.mk b/editors/openoffice-3-devel/files/patch-stoc+source+corereflection+makefile.mk
deleted file mode 100644
index 4b319b08d401..000000000000
--- a/editors/openoffice-3-devel/files/patch-stoc+source+corereflection+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-3-devel/files/patch-stoc+source+defaultregistry+makefile.mk b/editors/openoffice-3-devel/files/patch-stoc+source+defaultregistry+makefile.mk
deleted file mode 100644
index 4cae0476415a..000000000000
--- a/editors/openoffice-3-devel/files/patch-stoc+source+defaultregistry+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice-3-devel/files/patch-stoc+source+implementationregistration+implreg.cxx b/editors/openoffice-3-devel/files/patch-stoc+source+implementationregistration+implreg.cxx
deleted file mode 100644
index 341d621d872c..000000000000
--- a/editors/openoffice-3-devel/files/patch-stoc+source+implementationregistration+implreg.cxx
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3-devel/files/patch-stoc+source+implementationregistration+makefile.mk b/editors/openoffice-3-devel/files/patch-stoc+source+implementationregistration+makefile.mk
deleted file mode 100644
index 0051043b7ecb..000000000000
--- a/editors/openoffice-3-devel/files/patch-stoc+source+implementationregistration+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-3-devel/files/patch-stoc+source+inspect+makefile.mk b/editors/openoffice-3-devel/files/patch-stoc+source+inspect+makefile.mk
deleted file mode 100644
index c7cd85253c11..000000000000
--- a/editors/openoffice-3-devel/files/patch-stoc+source+inspect+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-3-devel/files/patch-stoc+source+invocation+makefile.mk b/editors/openoffice-3-devel/files/patch-stoc+source+invocation+makefile.mk
deleted file mode 100644
index 9ac2072a5612..000000000000
--- a/editors/openoffice-3-devel/files/patch-stoc+source+invocation+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice-3-devel/files/patch-stoc+source+invocation_adapterfactory+makefile.mk b/editors/openoffice-3-devel/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
deleted file mode 100644
index 8853ad39a90e..000000000000
--- a/editors/openoffice-3-devel/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice-3-devel/files/patch-stoc+source+javaloader+makefile.mk b/editors/openoffice-3-devel/files/patch-stoc+source+javaloader+makefile.mk
deleted file mode 100644
index cea499f15c57..000000000000
--- a/editors/openoffice-3-devel/files/patch-stoc+source+javaloader+makefile.mk
+++ /dev/null
@@ -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=		
diff --git a/editors/openoffice-3-devel/files/patch-stoc+source+javavm+makefile.mk b/editors/openoffice-3-devel/files/patch-stoc+source+javavm+makefile.mk
deleted file mode 100644
index b895a2b968d4..000000000000
--- a/editors/openoffice-3-devel/files/patch-stoc+source+javavm+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice-3-devel/files/patch-stoc+source+loader+makefile.mk b/editors/openoffice-3-devel/files/patch-stoc+source+loader+makefile.mk
deleted file mode 100644
index 5a08ee5937b6..000000000000
--- a/editors/openoffice-3-devel/files/patch-stoc+source+loader+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice-3-devel/files/patch-stoc+source+namingservice+makefile.mk b/editors/openoffice-3-devel/files/patch-stoc+source+namingservice+makefile.mk
deleted file mode 100644
index e573081bc21d..000000000000
--- a/editors/openoffice-3-devel/files/patch-stoc+source+namingservice+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice-3-devel/files/patch-stoc+source+proxy_factory+makefile.mk b/editors/openoffice-3-devel/files/patch-stoc+source+proxy_factory+makefile.mk
deleted file mode 100644
index 9110b2f50cd1..000000000000
--- a/editors/openoffice-3-devel/files/patch-stoc+source+proxy_factory+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-3-devel/files/patch-stoc+source+registry_tdprovider+makefile.mk b/editors/openoffice-3-devel/files/patch-stoc+source+registry_tdprovider+makefile.mk
deleted file mode 100644
index 9d974d1c0d10..000000000000
--- a/editors/openoffice-3-devel/files/patch-stoc+source+registry_tdprovider+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3-devel/files/patch-stoc+source+servicemanager+makefile.mk b/editors/openoffice-3-devel/files/patch-stoc+source+servicemanager+makefile.mk
deleted file mode 100644
index 746776d54759..000000000000
--- a/editors/openoffice-3-devel/files/patch-stoc+source+servicemanager+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-3-devel/files/patch-stoc+source+tdmanager+makefile.mk b/editors/openoffice-3-devel/files/patch-stoc+source+tdmanager+makefile.mk
deleted file mode 100644
index 76403fdde841..000000000000
--- a/editors/openoffice-3-devel/files/patch-stoc+source+tdmanager+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice-3-devel/files/patch-stoc+source+typeconv+makefile.mk b/editors/openoffice-3-devel/files/patch-stoc+source+typeconv+makefile.mk
deleted file mode 100644
index dc647f89a166..000000000000
--- a/editors/openoffice-3-devel/files/patch-stoc+source+typeconv+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3-devel/files/patch-store+util+makefile.mk b/editors/openoffice-3-devel/files/patch-store+util+makefile.mk
deleted file mode 100644
index 6bef6e960f2e..000000000000
--- a/editors/openoffice-3-devel/files/patch-store+util+makefile.mk
+++ /dev/null
@@ -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
- 
- 
diff --git a/editors/openoffice-3-devel/files/patch-svx+source+fmcomp+makefile.mk b/editors/openoffice-3-devel/files/patch-svx+source+fmcomp+makefile.mk
deleted file mode 100644
index b16030080c0d..000000000000
--- a/editors/openoffice-3-devel/files/patch-svx+source+fmcomp+makefile.mk
+++ /dev/null
@@ -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= \
diff --git a/editors/openoffice-3-devel/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice-3-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
deleted file mode 100644
index 3d7c2e22aa63..000000000000
--- a/editors/openoffice-3-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
-+++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
-@@ -84,7 +84,9 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- APP1LIBS=
-+.IF "$(OS)"!="FREEBSD"
- APP1STDLIBS=-ldl
-+.ENDIF
- 
- GNOMEFILES= \
- 	locales.tab
diff --git a/editors/openoffice-3-devel/files/patch-tools+source+string+tstring.cxx b/editors/openoffice-3-devel/files/patch-tools+source+string+tstring.cxx
deleted file mode 100644
index 12bd6bd0b244..000000000000
--- a/editors/openoffice-3-devel/files/patch-tools+source+string+tstring.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../tools/source/string/tstring.cxx.orig	Sat Aug 10 12:53:42 2002
-+++ ../tools/source/string/tstring.cxx	Sat Aug 10 12:54:16 2002
-@@ -103,6 +103,9 @@
- xub_StrLen ImplStringLen( const sal_Char* pStr )
- {
- 	const sal_Char* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
-@@ -113,6 +116,9 @@
- xub_StrLen ImplStringLen( const sal_Unicode* pStr )
- {
- 	const sal_Unicode* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
diff --git a/editors/openoffice-3-devel/files/patch-unoil+makefile.pmk b/editors/openoffice-3-devel/files/patch-unoil+makefile.pmk
deleted file mode 100644
index 7febdabf7b4b..000000000000
--- a/editors/openoffice-3-devel/files/patch-unoil+makefile.pmk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../unoil/makefile.pmk.orig	Fri Aug 31 18:04:43 2001
-+++ ../unoil/makefile.pmk	Thu Sep 12 12:17:50 2002
-@@ -74,8 +74,8 @@
- JAVAFILESLIST	:= $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java)
- .ENDIF          # "$(L10N_framework)"==""
- 
--GENJAVAFILES	:= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
--GENCLASSFILES	:= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
-+GENJAVAFILES	+= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
-+GENCLASSFILES	+= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
- 
- # --- Targets ------------------------------------------------------
- 
diff --git a/editors/openoffice-3-devel/files/patch-unzip+source+file_io.c b/editors/openoffice-3-devel/files/patch-unzip+source+file_io.c
deleted file mode 100644
index 2f85a108c185..000000000000
--- a/editors/openoffice-3-devel/files/patch-unzip+source+file_io.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../unzip/source/file_io.c.orig	Sat Oct 19 11:58:45 2002
-+++ ../unzip/source/file_io.c	Sat Oct 19 12:03:40 2002
-@@ -500,7 +500,7 @@
- #ifdef MPW
- 				pCallBack( 0 );
- #else
--				#if defined LINUX || defined MACOSX || defined NETBSD
-+				#if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD
- 				pCallBack( lseek(outfd, 0, SEEK_CUR) );
- 				#else
- 				pCallBack( tell( outfd ) );
-@@ -865,7 +865,9 @@
- 	static struct timeb tbp;
- #endif /* !__386BSD__ */
- #else /* !BSD */
-+#if (!defined(NETBSD) && !defined(FREEBSD))
- 	extern long timezone;
-+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
- #endif /* ?BSD */
- #endif /* ?AMIGA */
- 
diff --git a/editors/openoffice-3-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice-3-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
deleted file mode 100644
index 41defbd5eb59..000000000000
--- a/editors/openoffice-3-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
-+++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
-@@ -65,6 +65,8 @@
- #include <glyphcache.hxx>
- 
- #define Region XLIB_Region
-+typedef unsigned long CARD32;
-+#define Cursor CARD32
- #include <X11/extensions/Xrender.h>
- #undef Region
- 
diff --git a/editors/openoffice-3-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice-3-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
deleted file mode 100644
index fefc925db41f..000000000000
--- a/editors/openoffice-3-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
-@@ -78,6 +78,12 @@
- GETSTYLE_GNOME=getstyle-gnome-linux-intel
- HASGNOME2=TRUE
- .ENDIF
-+.IF "$_(HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
-+.ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
- HASGNOME2=TRUE
diff --git a/editors/openoffice-3-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice-3-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
deleted file mode 100644
index 984313fc540a..000000000000
--- a/editors/openoffice-3-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
-@@ -75,9 +75,15 @@
- 
- HASGNOME2=
- 
--.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
-+.IF "$(OS)$(CPU)"=="LINUXI"
- MSGBOX_GNOME=msgbox-gnome-linux-intel
- HASGNOME2=TRUE
-+.ENDIF
-+.IF "$(_HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+MSGBOX_GNOME=msgbox-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
- .ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice-3-devel/files/patch-vcl+workben+officeacceptthread.cxx b/editors/openoffice-3-devel/files/patch-vcl+workben+officeacceptthread.cxx
deleted file mode 100644
index 07d9f1060557..000000000000
--- a/editors/openoffice-3-devel/files/patch-vcl+workben+officeacceptthread.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/workben/officeacceptthread.cxx.orig	Wed Mar  5 20:25:36 2003
-+++ ../vcl/workben/officeacceptthread.cxx	Wed Mar  5 20:26:03 2003
-@@ -125,7 +125,7 @@
- #if defined (SOLARIS)
- 				int status;
- 				nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG);
--#elif defined(LINUX)
-+#elif defined(LINUX) || defined (FREEBSD)
- 				nRet = kill(aProcessInfo.Ident, 0);
- #endif
- #if defined (UNX)
diff --git a/editors/openoffice-3-devel/files/zipmoz.sh b/editors/openoffice-3-devel/files/zipmoz.sh
deleted file mode 100644
index 43a4591f3430..000000000000
--- a/editors/openoffice-3-devel/files/zipmoz.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/sh -f
-
-RUNTIME_FILES=" components/libabsyncsvc.so components/libaddrbook.so \
-		components/libmork.so components/libmozldap.so \
-		components/libnecko.so components/libprofile.so \
-		components/librdf.so components/libstrres.so \
-		components/libunicharutil.so components/libuconv.so \
-		components/libucvcn.so components/libucvibm.so \
-		components/libucvja.so components/libucvko.so \
-		components/libucvlatin.so components/libucvtw.so \
-		components/libucvtw2.so components/liburiloader.so \
-		components/libvcard.so components/libxpconnect.so \
-		components/libpref.so components/libchrome.so libmozjs.so \
-		libmsgbaseutil.so libldap50.so libnspr4.so libplc4.so \
-		libplds4.so libxpcom.so libmozz.so component.reg \
-		components/necko_dns.xpt components/xpcom_xpti.xpt \
-		components/xpcom_threads.xpt components/xpcom_io.xpt \
-		components/xpcom_ds.xpt components/xpcom_components.xpt \
-		components/xpcom_base.xpt components/xpti.dat \
-		defaults/pref/all.js defaults/pref/config.js \
-		defaults/pref/editor.js defaults/pref/initpref.js \
-		defaults/pref/inspector.js defaults/pref/mailnews.js \
-		defaults/pref/security-prefs.js defaults/pref/unix.js \
-		defaults/pref/xpinstall.js"
-
-LIB_FILES="	lib/libembed_base_s.a lib/libmozreg_s.a \
-		lib/libnspr4.so lib/libxpcom.so lib/libprldap50.so"
-
-INC_FILES="include/"
-INC_FILES2="public/"
-
-if [ $# -lt 2 -o $# -gt 3 ] ; then
-	echo 
-	echo usage: $0 mozilla_dist target [target_dir]
-	echo
-	echo where:
-	echo
-	echo "mozilla_dist points to the mozilla distribution"
-	echo "target concatenates  OS, compiler and CPU (e.g. FREEBSDGCCI etc)"
-	echo "target_dir is the directory to place the zips"
-	exit 1
-fi
-
-MOZ_DIST=$1
-TARGET=$2
-if [ "w$3" != "w" ]; then
-	TARGET_DIR=$3
-else
-	if [ "w$TARGET_DIR" == "w" ]; then
-		TARGET_DIR=
-	fi
-fi
-
-ZIP_TARGET=$TARGET_DIR
-if [ -z "$ZIP_TARGET" ] ; then
-	ZIP_TARGET=../
-fi
-
-# just to remember the current working directory
-STARTING_DIR=`pwd`
-
-echo
-echo --- creating zips for $TARGET, using mozilla distribution in $MOZ_DIST
-
-# Create the directories
-[ ! -d $TARGET_DIR/$TARGET/runtime ] && mkdir -p $TARGET_DIR/$TARGET/runtime
-[ ! -d $TARGET_DIR/$TARGET/runtime/components ] && mkdir -p $TARGET_DIR/$TARGET/runtime/components
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults/pref ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults/pref
-[ ! -d $TARGET_DIR/$TARGET/lib ] && mkdir -p $TARGET_DIR/$TARGET/lib
-[ ! -d $TARGET_DIR/$TARGET/inc ] && mkdir -p $TARGET_DIR/$TARGET/inc
-[ ! -d $TARGET_DIR/$TARGET/inc/nspr ] && mkdir -p $TARGET_DIR/$TARGET/inc/nspr
-[ ! -d $TARGET_DIR/$TARGET/inc/obsolete ] && mkdir -p $TARGET_DIR/$TARGET/inc/obsolete
-
-# Copy the files
-echo
-echo --- copying files
-echo
-
-for i in $RUNTIME_FILES; do
-	if [ ! -f $MOZ_DIST/bin/$i ]; then
-		echo $MOZ_DIST/bin/$i does not exist, check your distribution
-	else
-		if [ `echo $i | grep component` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/components/
-		elif [ `echo $i | grep defaults` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/defaults/pref/
-		else
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/
-		fi
-	fi
-done
-
-for i in $LIB_FILES; do
-	if [ ! -f $MOZ_DIST/$i ]; then
-		echo $MOZ_DIST/$i does not exist, check your distribution
-	else
-		cp -R -L $MOZ_DIST/$i $TARGET_DIR/$TARGET/lib/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES`; do
-	if [ ! -d $i ]; then 
-		cp -R -L $MOZ_DIST/include/$i $TARGET_DIR/$TARGET/inc/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES2`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/public/$i $TARGET_DIR/$TARGET/inc
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/$i $TARGET_DIR/$TARGET/inc/nspr
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr/obsolete`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/obsolete/$i $TARGET_DIR/$TARGET/inc/obsolete
-	fi
-done
-
-# delete old zips
-
-[ -f $TARGET_DIR/$TARGET/runtime.zip ] && rm -f $TARGET_DIR/$TARGET/runtime.zip
-[ -f $TARGET_DIR/$TARGET/lib.zip ] && rm -f $TARGET_DIR/$TARGET/lib.zip
-[ -f $TARGET_DIR/$TARGET/inc.zip ] && rm -f $TARGET_DIR/$TARGET/inc.zip
-
-# zip the runtime files
-
-echo
-echo --- creating ${TARGET}runtime.zip
-echo
-
-cd $TARGET_DIR/$TARGET/runtime
-find . -type f | zip $ZIP_TARGET/${TARGET}runtime.zip -@
-
-# zip the lib files
-echo 
-echo --- creating ${TARGET}lib.zip
-echo 
-
-cd $TARGET_DIR/$TARGET/lib
-find . -type f | zip $ZIP_TARGET/${TARGET}lib.zip -@
-
-# zip the inc files
-echo
-echo --- creating ${TARGET}inc.zip
-echo
-
-cd $TARGET_DIR/$TARGET/inc
-find . -type f | zip $ZIP_TARGET/${TARGET}inc.zip -@
-
-# remove dirs
-cd $STARTING_DIR
-rm -rf $TARGET_DIR/$TARGET
-
-echo
-echo --- done
-echo
-
diff --git a/editors/openoffice-3-devel/pkg-descr b/editors/openoffice-3-devel/pkg-descr
deleted file mode 100644
index 31fd1b12161a..000000000000
--- a/editors/openoffice-3-devel/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-OpenOffice.org is an Open Source, community-developed, multi-platform office
-productivity suite. It includes the key desktop applications, such as a
-word processor, spreadsheet, presentation manager, and drawing program,
-with a user interface and feature set similar to other office suites.
-
-Components include:
-  * A universal word processing application for creating business
-    letters, extensive text documents, professional layouts, and HTML
-    documents.
-  * A sophisticated application for performing advanced spreadsheet
-    functions, such as analyzing figures, creating lists, and viewing data.
-  * A tool for creating effective eye-catching presentations.
-  * A vector-oriented draw module that enables the creation of 3D
-    illustrations
diff --git a/editors/openoffice-3-devel/pkg-message b/editors/openoffice-3-devel/pkg-message
deleted file mode 100644
index 1dc749f301c2..000000000000
--- a/editors/openoffice-3-devel/pkg-message
+++ /dev/null
@@ -1,73 +0,0 @@
-OpenOffice.org Build 643 Personal Install How-To
-
-Written by:	Martin Blapp <mbr@freebsd.org>
-
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
-
-1 User installation
--------------------
-
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
---------------
-
-There are some wrappers installed for fast startup.
-Add "${PREFIX}/bin/" to your PATH and you will be able
-to use them.
-
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
-
-If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
-version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
diff --git a/editors/openoffice-3-devel/pkg-plist b/editors/openoffice-3-devel/pkg-plist
deleted file mode 100644
index 28bd78453b52..000000000000
--- a/editors/openoffice-3-devel/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, do not delete. Package list is generated automatically.
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
deleted file mode 100644
index 6f740924c399..000000000000
--- a/editors/openoffice-3/Makefile
+++ /dev/null
@@ -1,580 +0,0 @@
-# New ports collection makefile for: OpenOffice
-# Date created:		28 Februar 2002
-# Whom:                 Martin Blapp
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openoffice
-PORTVERSION=	644
-CATEGORIES+=	editors
-MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
-		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
-		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
-		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ny1.mirror.openoffice.org/miscellaneous/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
-MASTER_SITE_SUBDIR=	${PORTVERSION}
-DISTFILES+=	oo_${PORTVERSION}_src.tar.bz2 \
-		gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
-
-BROKEN=		"Does not build"
-
-SORT?=	/usr/bin/sort
-FIND?=	/usr/bin/find
-CUT?=	/usr/bin/cut
-AWK?=	/usr/bin/awk
-GREP?=	/usr/bin/grep
-ZIP?=	${PREFIX}/bin/zip
-UNZIP?=	${PREFIX}/bin/unzip
-ANT?=	${LOCALBASE}/bin/ant
-TCSH?=	/bin/tcsh
-PASTE?=	/usr/bin/paste
-
-.include <bsd.port.pre.mk>
-
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
-DIST_SUBDIR=		openoffice
-DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
-
-#
-# configuration for language specific slave ports
-#
-.if !defined(LANG_EXT)
-LANG_EXT=01
-.else
-#
-# Add pkg-descr and pkg-message if available
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-#
-# LANG_CONFIGURE_ARG is missing for the german port
-#
-.if defined(LANG_EXT)
-CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG},ENUS
-.endif
-.endif
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
-
-EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-
-MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/jakarta-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-.if !defined(DISPLAY)
-BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
-.endif
-.if !defined(WITH_BSD_JDK)
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk14
-.else
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-.endif
-
-USE_PERL5=	yes
-USE_BZIP2=	yes
-USE_BISON=	yes
-USE_GMAKE=	yes
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
-.if !defined(WITH_BSD_JDK)
-JDKDIR?=	${LOCALBASE}/linux-sun-jdk1.4.1
-.else
-JDKDIR?=	${LOCALBASE}/jdk1.4.1
-.endif
-JAVAVM=         ${JDKDIR}/bin/java
-
-GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
-LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
-BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
-
-.if !defined(DISPLAY)
-DISPLAYHACK=localhost:1001
-.endif
-
-CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
-			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
-
-.if !defined(WITH_BSD_JDK)
-CONFIGURE_ARGS+=	--enable-linuxjdk=yes
-.endif
-
-.if defined(WITH_DEBUG)
-.if ${WITH_DEBUG} == 2
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-.endif
-
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"prefered language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
-	@${ECHO} "OPTIONS:"
-.if !defined(USE_GCC)
-	@${ECHO}
-	@${ECHO} "You can compile OO with different"
-	@${ECHO} "gcc compiler versions:"
-	@${ECHO}
-	@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.2"
-	@${ECHO} "to compile openoffice with your"
-	@${ECHO} "prefered compiler."
-.endif
-.if !defined(WITH_BSD_JDK)
-	@${ECHO}
-	@${ECHO} "If you like to use the native BSD"
-	@${ECHO} "JDK for the build system, you can use"
-	@${ECHO} "WITH_BSD_JDK=TRUE to disable the"
-	@${ECHO} "usage of the linux-JDK and linux dependency."
-	@${ECHO}
-.endif
-.if !defined(WITH_DEBUG)
-	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
-	@${ECHO} "if you call make with WITH_DEBUG=1"
-	@${ECHO}
-	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
-	@${ECHO}
-.endif
-.if !defined(WITH_TTF_BYTECODE_ENABLED)
-	@${ECHO}
-	@${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES"
-	@${ECHO} "if you like to use the Freetype library to"
-	@${ECHO} "render TTF fonts. Normally the TTF lib is"
-	@${ECHO} "not used to render fonts."
-	@${ECHO}
-	@${ECHO} "If you have licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479"
-	@${ECHO} "you can enable this option to get better"
-	@${ECHO} "quality of glyphs at small bitmap sizes."
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 450002
-	@${ECHO}
-	@${ECHO} "OS-VERSION ${OSVERSION} too low"
-	@${ECHO}
-	@${ECHO} "OO need some important libc_r and"
-	@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
-	@${ECHO} "RELEASE or 4.6 STABLE."
-	@${FALSE}
-.endif
-	@${ECHO}
-	@${ECHO} "NOTICE:"
-	@${ECHO}
-	@${ECHO} "To build Openoffice, you should have a lot"
-.if defined(WITH_DEBUG)
-	@${ECHO} "of free diskspace (~ 8GB)."
-.else
-	@${ECHO} "of free diskspace (~ 4GB)."
-.endif
-	@${ECHO}
-.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
-    (${OSVERSION} < 500000 && !defined(USE_GCC))
-	@${ECHO} "KERNEL CONFIGURATION:"
-	@${ECHO}
-	@${ECHO} "Openoffice needs a larger stack- and"
-	@${ECHO} "datasize to build. Check your limit"
-	@${ECHO} "settings and and put this in /boot/loader.conf"
-	@${ECHO} "if neccessary:"
-	@${ECHO}
-	@${ECHO} "kern.maxdsiz=\"1073741824\""
-	@${ECHO} "kern.maxssiz=\"268435456\""
-.endif
-	@${ECHO}
-.if ${OSVERSION} < 460002
-	@${ECHO} "REQUIRED SYSTEM PATCHES:"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO} "OO.org can crash if you enter a non existing path"
-	@${ECHO} "or URL in the location bar. To fix these crashes"
-	@${ECHO} "you need a uncommitted system patch for rtld:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460001
-	@${ECHO}
-	@${ECHO} "OO setup is broken on STABLE < 4.6"
-	@${ECHO} "including 4.6 RELEASE."
-	@${ECHO} "You'll need a system patch to solve"
-	@${ECHO} "this problem:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460002
-	@${ECHO}
-	@${ECHO} "OO.org soffice binary can deadlock. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO}
-	@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
-	@${ECHO}
-.endif
-.if !exists(/usr/include/langinfo.h)
-	@${ECHO}
-	@${ECHO} "langinfo.h is missing !"
-	@${ECHO}
-	@${ECHO} "Please upgrade to 4.6 RELEASE or"
-	@${ECHO} "4.6 STABLE."
-	@${ECHO}
-	@${FALSE}
-.endif
-
-post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
-	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
-	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@-${RM} -f ${WRKSRC}/../moz/zipped/*.zip
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
-.if defined(L10NHELP)
-	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
-	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
-.endif
-
-post-patch:
-	@${MAKE} patch-mozilla
-.if defined(WITH_TTF_BYTECODE_ENABLED)
-	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
-		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-			${ECHO_MSG} "===>   Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \
-		fi; \
-		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
-	fi
-.endif
-.if defined(WITH_DEBUG)
-	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
-		PATCHES_APPLIED="" ; \
-		for i in ${PATCHDIR}/debugpatch-*; do \
-			case $$i in \
-				*.orig|*.rej|*~) \
-					${ECHO_MSG} "===>   Ignoring patchfile $$i" ; \
-					;; \
-				*) \
-					if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-						${ECHO_MSG} "===>   Applying ${OPSYS} patch $$i" ; \
-					fi; \
-					if ${PATCH} ${PATCH_ARGS} < $$i ; then \
-						PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
-					else \
-						${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
-						if [ x"$$PATCHES_APPLIED" != x"" ]; then \
-							${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
-						fi; \
-						${FALSE} ; \
-					fi; \
-					;; \
-			esac; \
-		done; \
-	fi;
-.endif
-	@${ECHO_MSG} "===>  Find old malloc.h defines and fix them in ${PKGNAME} source"
-	@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
-		${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
-
-extract-mozilla:
-.if ! exists(${WRKDIR}/mozilla/Makefile)
-	@${ECHO_MSG} "===>  Extracting mozilla sub project"
-	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
-.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment)
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
-.endif
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
-.endif
-	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
-
-patch-mozilla:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
-		${WRKDIR}/mozilla/files/
-	@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
-
-build-mozilla:
-.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
-	@${ECHO_MSG} "===>  Building mozilla sub project"
-.if defined(WITH_DEBUG)
-	@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
-	@${SED} -e 's|--disable-debug||' \
-		-e 's|--disable-cpp-rtti||' \
-		-e 's|--enable-strip||' \
-		< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
-.endif
-.if defined(USE_GCC)
-	@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
-.else
-	@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
-.endif
-	@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
-	@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
-	@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
-.endif
-
-install-mozilla:
-	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
-
-register-mozilla:
-.if exists(${WRKDIR}/mozilla-runtime)
-	@${RM} -rf ${WRKDIR}/mozilla-runtime
-.endif
-	@${MKDIR} ${WRKDIR}/mozilla-runtime
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
-	@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
-	@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
-	@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
-		&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom 
-	@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
-		${WRKDIR}/mozilla-runtime/components/xptitemp.dat
-	@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
-	@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
-		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
-
-mozilla:
-	@${MAKE} extract-mozilla
-	@${MAKE} patch-mozilla
-	@${MAKE} build-mozilla
-	@${MAKE} register-mozilla
-	@${MAKE} install-mozilla
-
-do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
-	@${MAKE} mozilla
-.endif
-.endif
-.endif
-.if exists(${WRKDIR}/.Xvfb.pid)
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.endif
-.if !defined(DISPLAY)
-	#
-	# This is a UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-.endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
-	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-.endif
-.if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
-.endif
-
-pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-
-do-install:
-.if !defined(DISPLAY)
-	#
-	# UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-.endif
-
-install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
-
-post-install:
-	@${ECHO_MSG} "===>  Add wrapper scripts";
-	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
-	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
-
-package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
-.if defined(LANG_SUFFIX)
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
-.else
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
-.endif
-
-update:
-	@${MAKE} fetch
-	@${MAKE} extract
-	@cd ${WRKSRC}/.. && for dir in *; do \
-	    if [ -d $$dir ]; then \
-		cd $$dir; cvs update -d; cd ..; \
-	    fi \
-	done
-
-.include <bsd.port.post.mk>
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
deleted file mode 100644
index ec9d6788f104..000000000000
--- a/editors/openoffice-3/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
-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
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
diff --git a/editors/openoffice-3/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice-3/files/debugpatch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 96c651ce22c8..000000000000
--- a/editors/openoffice-3/files/debugpatch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../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
-@@ -902,6 +902,7 @@
- 
- void KillSetupDir()
- {
-+#if 0
-     DIR* pDir = opendir( strTmpPath );
-     struct dirent* pFile;
- 
-@@ -915,6 +916,10 @@
- 
-     chdir( strInitPath );
-     rmdir( strTmpPath );
-+#else
-+	fprintf(stderr, "\nLeaving behind temporary directory: %s\n",
-+	strTmpPath);
-+#endif
- }
- 
- void makeSymLink( char* s )
diff --git a/editors/openoffice-3/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice-3/files/debugpatch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 52bd2b3d58d6..000000000000
--- a/editors/openoffice-3/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
-+++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
- 
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- 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
- 
- # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
diff --git a/editors/openoffice-3/files/oo_setup.resp b/editors/openoffice-3/files/oo_setup.resp
deleted file mode 100644
index 8eeeb11bd95e..000000000000
--- a/editors/openoffice-3/files/oo_setup.resp
+++ /dev/null
@@ -1,7 +0,0 @@
-[Environment]
-InstallationMode = INSTALL_NETWORK
-InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org-643
-
-[Java]
-JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice-3/files/openoffice-wrapper b/editors/openoffice-3/files/openoffice-wrapper
deleted file mode 100644
index 3eb9a5dadabb..000000000000
--- a/editors/openoffice-3/files/openoffice-wrapper
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/openoffice-wrapper,v 1.3 2003-03-05 23:24:05 mbr Exp $
-
-oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/
-program=`echo $0 | sed -e 's|.*-||'`
-
-if [ ! $LANG ]; then
-	export LANG=%%LANG%%
-fi
-
-case $program in
-$0)
-	exec $oopath/soffice "$@"
-	;;
-	*)
-	exec $oopath/$program "$@"
-	;;
-esac
diff --git a/editors/openoffice-3/files/optpatch-freetype+patch b/editors/openoffice-3/files/optpatch-freetype+patch
deleted file mode 100644
index b426a8fb7fcc..000000000000
--- a/editors/openoffice-3/files/optpatch-freetype+patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Index: files/patch-freetype::patch
-===================================================================
-RCS file: files/patch-freetype::patch
-diff -N files/patch-freetype::patch
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-freetype::patch	4 Aug 2002 15:27:42 -0000
-@@ -0,0 +1,201 @@
-+diff -ur ../freetype/freetype-2.0.5.patch oo641d_patched/freetype/freetype-2.0.5.patch
-+--- ../freetype/freetype-2.0.5.patch	Fri Apr  5 21:07:34 2002
-++++ ../freetype/freetype-2.0.5.patch	Sat Mar  9 18:04:17 2002
-+@@ -1,118 +1,79 @@
-+-*** misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 14 00:44:33 2000
-+---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 63,69 ****
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+---- 63,69 ----
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+-*** misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Jun  7 19:36:17 2001
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 631,637 ****
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+---- 631,637 ----
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile -DPIC $pic_flag"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Mon Jan  1 18:25:21 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 1,7 ****
-+---- 1,9 ----
-+-  FT_USE_MODULE(autohint_module_class)
-+-  FT_USE_MODULE(cff_driver_class)
-+-  FT_USE_MODULE(t1cid_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(pcf_driver_class)
-+-+ */
-+-  FT_USE_MODULE(psaux_module_class)
-+-  FT_USE_MODULE(psnames_module_class)
-+-  FT_USE_MODULE(ft_raster1_renderer_class)
-+-***************
-+-*** 9,12 ****
-+---- 11,16 ----
-+-  FT_USE_MODULE(ft_smooth_renderer_class)
-+-  FT_USE_MODULE(tt_driver_class)
-+-  FT_USE_MODULE(t1_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(winfnt_driver_class)
-+-+ */
-+-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h	Tue Aug 21 10:50:45 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 70,76 ****
-+---- 70,79 ----
-+-    /*   All convenience functions are declared as such in their             */
-+-    /*   documentation.                                                      */
-+-    /*                                                                       */
-+-+ /*
-+-  #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-+ */
-+-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-  
-+-  
-+-    /*************************************************************************/
-+-***************
-+-*** 108,116 ****
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-- 
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+---- 111,121 ----
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-+ /*
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-+ */
-+-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig	Mon Jan  7 14:21:35 2002
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Mon Jan  7 14:21:40 2002
-+-***************
-+-*** 2251,2257 ****
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age + 1`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-+---- 2251,2257 ----
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk
-++--- misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:49:17 2001
-++@@ -63,7 +63,7 @@
-++ #   ANSI compliance.
-++ #
-++ ifndef CFLAGS
-++-  CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+++  CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-++ endif
-++ 
-++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh
-++--- misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:47:56 2001
-+++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:49:17 2001
-++@@ -631,7 +631,7 @@
-++     if test "$build_old_libs" = yes; then
-++       if test "$pic_mode" != yes; then
-++ 	# Don't build PIC code
-++-	command="$base_compile $srcfile"
-+++	command="$base_compile $srcfile -DPIC $pic_flag"
-++       else
-++ 	# All platforms use -DPIC, to notify preprocessed assembler code.
-++ 	command="$base_compile $srcfile $pic_flag -DPIC"
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:49:17 2001
-++@@ -1,7 +1,9 @@
-++ FT_USE_MODULE(autohint_module_class)
-++ FT_USE_MODULE(cff_driver_class)
-++ FT_USE_MODULE(t1cid_driver_class)
-+++/*
-++ FT_USE_MODULE(pcf_driver_class)
-+++*/
-++ FT_USE_MODULE(psaux_module_class)
-++ FT_USE_MODULE(psnames_module_class)
-++ FT_USE_MODULE(ft_raster1_renderer_class)
-++@@ -9,4 +11,6 @@
-++ FT_USE_MODULE(ft_smooth_renderer_class)
-++ FT_USE_MODULE(tt_driver_class)
-++ FT_USE_MODULE(t1_driver_class)
-+++/*
-++ FT_USE_MODULE(winfnt_driver_class)
-+++*/
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:51:15 2001
-++@@ -70,7 +70,10 @@
-++   /*   All convenience functions are declared as such in their             */
-++   /*   documentation.                                                      */
-++   /*                                                                       */
-+++/*
-++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+++*/
-+++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-++ 
-++ 
-++   /*************************************************************************/
-++@@ -108,8 +111,10 @@
-++   /*   use a vector `plotter' format that isn't supported when this        */
-++   /*   macro is undefined.                                                 */
-++   /*                                                                       */
-+++/*
-++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++-
-+++*/
-+++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++ 
-++   /*************************************************************************/
-++   /*                                                                       */
-++@@ -338,7 +343,7 @@
-++   /* By undefining this, you will only compile the code necessary to load  */
-++   /* TrueType glyphs without hinting.                                      */
-++   /*                                                                       */
-++-#undef  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-+++#define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-++ 
-++ 
-++   /*************************************************************************/
diff --git a/editors/openoffice-3/files/optpatch-vcl+util+makefile.pmk b/editors/openoffice-3/files/optpatch-vcl+util+makefile.pmk
deleted file mode 100644
index 41341ff0b4e8..000000000000
--- a/editors/openoffice-3/files/optpatch-vcl+util+makefile.pmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/util/makefile.pmk.orig	Mon Aug  5 01:39:41 2002
-+++ ../vcl/util/makefile.pmk	Mon Aug  5 01:40:03 2002
-@@ -64,7 +64,7 @@
- PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch
- PDBTARGET=vcl
- 
--.IF "$(OS)" != "MACOSX"
-+.IF "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- .IF "$(remote)" != ""
- USE_BUILTIN_RASTERIZER=true
- .ENDIF
diff --git a/editors/openoffice-3/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice-3/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 078685f3b516..000000000000
--- a/editors/openoffice-3/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../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 freebsd genunix";;
-  	*)		JINCSUBDIRS="genunix";;
-  	esac
-  
diff --git a/editors/openoffice-3/files/patch-bridges+prj+build.lst b/editors/openoffice-3/files/patch-bridges+prj+build.lst
deleted file mode 100644
index fee3d847c5e6..000000000000
--- a/editors/openoffice-3/files/patch-bridges+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
deleted file mode 100644
index 99b8c566fb61..000000000000
--- a/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ /dev/null
@@ -1,102 +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 );
-+    }
- }
- 
- }
diff --git a/editors/openoffice-3/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice-3/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
deleted file mode 100644
index 4622b7fe21c4..000000000000
--- a/editors/openoffice-3/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice-3/files/patch-comphelper+util+makefile.mk b/editors/openoffice-3/files/patch-comphelper+util+makefile.mk
deleted file mode 100644
index f2d3092c2ddf..000000000000
--- a/editors/openoffice-3/files/patch-comphelper+util+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-3/files/patch-config_office+configure.in b/editors/openoffice-3/files/patch-config_office+configure.in
deleted file mode 100644
index a45332fcbec0..000000000000
--- a/editors/openoffice-3/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,66 +0,0 @@
---- configure.in.orig	Thu Feb 20 15:49:32 2003
-+++ configure.in	Wed Mar  5 21:22:34 2003
-@@ -95,6 +95,12 @@
-                           
-                           Usage: --enable-macos9
- ],,)
-+AC_ARG_ENABLE(linuxjdk,
-+[  --enable-linuxjdk         Use this option option if you like to use
-+                          the linux-jdk instead of the native jdk.
-+
-+                          Usage: --enable-linuxjdk
-+],,)
- AC_ARG_WITH(lang,
- [  --with-lang             Use this option to build OpenOffice.org with
-                           additional language support. US English is always
-@@ -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
-@@ -1232,7 +1249,11 @@
- if test -n "$enable_debug"; then
-    ENABLE_DEBUG="TRUE"
- else
--   ENABLE_DEBUG="FALSE"
-+fi
-+if test -n "$enable_linuxjdk"; then
-+   USE_LINUXJDK="TRUE"
-+else
-+   USE_LINUXJDK="FALSE"
- fi
- 
- dnl ===================================================================
-@@ -1278,6 +1299,7 @@
- AC_SUBST(PTHREAD_CFLAGS)
- AC_SUBST(PTHREAD_LIBS)
- AC_SUBST(ENABLE_DEBUG)
-+AC_SUBST(USE_LINUXJDK)
- 
- AC_OUTPUT([set_soenv])
- 
diff --git a/editors/openoffice-3/files/patch-config_office+set_soenv.in b/editors/openoffice-3/files/patch-config_office+set_soenv.in
deleted file mode 100644
index 9ea6b11bdab2..000000000000
--- a/editors/openoffice-3/files/patch-config_office+set_soenv.in
+++ /dev/null
@@ -1,44 +0,0 @@
---- set_soenv.in.orig	Thu Feb 27 15:12:36 2003
-+++ set_soenv.in	Wed Mar  5 21:16:43 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, 
-@@ -88,7 +88,7 @@
-      $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
-      $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS,
-      $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
--     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG );
-+     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $USE_LINUXJDK );
- #
- #-------------------------------------------
- # IId. Declaring the aliases.
-@@ -140,7 +140,8 @@
- $CC			= '@CC@';           # C compiler
- $CXX		= '@CXX@';          # C++ compiler
- $EXCEPTIONS	= '@EXCEPTIONS@';   # Exception handling type
--$ENABLE_DEBUG	= '@ENABLE_DEBUG@';  # Enable a debug build
-+$ENABLE_DEBUG	= '@ENABLE_DEBUG@'; # Enable a debug build
-+$USE_LINUXJDK	= '@USE_LINUXJDK@'; # Use the Linux JDK
- $WRAPCMD	= "";				# Wrapper (only for winnt)
- 
- #
-@@ -1265,7 +1266,12 @@
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
- }
- elsif ($platform eq "$FreeBSD")
--{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+{
-+   if ($USE_LINUXJDK eq "TRUE") {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
-+   } else {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+   }
- }
- elsif ($platform eq "$NetBSD")
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
diff --git a/editors/openoffice-3/files/patch-connectivity+source+drivers+mozab+makefile.mk b/editors/openoffice-3/files/patch-connectivity+source+drivers+mozab+makefile.mk
deleted file mode 100644
index 2b83f2cd2ec7..000000000000
--- a/editors/openoffice-3/files/patch-connectivity+source+drivers+mozab+makefile.mk
+++ /dev/null
@@ -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)					\
diff --git a/editors/openoffice-3/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice-3/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
deleted file mode 100644
index 3601766ee561..000000000000
--- a/editors/openoffice-3/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../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
-@@ -64,8 +64,8 @@
- #mozilla specific stuff.
- MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
- MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
--#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
--#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
-+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
-+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
- #End of mozilla specific stuff.
- 
- PRJ=..$/..$/..$/..
-@@ -107,7 +107,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -123,7 +123,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -141,7 +141,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS+=	    -DMOZILLA_CLIENT \
-             -DOSTYPE=\"Linux2.2.14-5\" -DOJI
- .IF "$(OS)" == "LINUX"
-@@ -157,6 +157,13 @@
-             -fno-rtti -Wall -Wconversion -Wpointer-arith \
-             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-             -Wno-long-long 
-+CDEFS     += -DTRACING
-+.ELIF "$(OS)" == "FREEBSD"
-+CFLAGS +=   -fPIC
-+CFLAGSCXX += \
-+            -fno-rtti -Wall -Wconversion -Wpointer-arith \
-+            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-+            -Wno-long-long -pthread 
- CDEFS     += -DTRACING
- .ENDIF
- .ENDIF
diff --git a/editors/openoffice-3/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk b/editors/openoffice-3/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
deleted file mode 100644
index b63d2a25f184..000000000000
--- a/editors/openoffice-3/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-3/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice-3/files/patch-cppu+inc+uno+lbnames.h
deleted file mode 100644
index cb43c2d165e9..000000000000
--- a/editors/openoffice-3/files/patch-cppu+inc+uno+lbnames.h
+++ /dev/null
@@ -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."
diff --git a/editors/openoffice-3/files/patch-cppu+prj+build.lst b/editors/openoffice-3/files/patch-cppu+prj+build.lst
deleted file mode 100644
index 78fd210a1193..000000000000
--- a/editors/openoffice-3/files/patch-cppu+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice-3/files/patch-cppuhelper+source+makefile.mk
deleted file mode 100644
index 5fb5bd636eb1..000000000000
--- a/editors/openoffice-3/files/patch-cppuhelper+source+makefile.mk
+++ /dev/null
@@ -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 ------------------------------------------------------
diff --git a/editors/openoffice-3/files/patch-desktop+source+pkgchk+pkgchk_misc.h b/editors/openoffice-3/files/patch-desktop+source+pkgchk+pkgchk_misc.h
deleted file mode 100644
index 391667b66ebd..000000000000
--- a/editors/openoffice-3/files/patch-desktop+source+pkgchk+pkgchk_misc.h
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3/files/patch-desktop+util+makefile.mk b/editors/openoffice-3/files/patch-desktop+util+makefile.mk
deleted file mode 100644
index 025d644a8077..000000000000
--- a/editors/openoffice-3/files/patch-desktop+util+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3/files/patch-dtrans+source+X11+makefile.mk b/editors/openoffice-3/files/patch-dtrans+source+X11+makefile.mk
deleted file mode 100644
index 5881f5d7f6a5..000000000000
--- a/editors/openoffice-3/files/patch-dtrans+source+X11+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice-3/files/patch-eventattacher+source+makefile.mk b/editors/openoffice-3/files/patch-eventattacher+source+makefile.mk
deleted file mode 100644
index 4552698eb132..000000000000
--- a/editors/openoffice-3/files/patch-eventattacher+source+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-3/files/patch-external+gcc3_specific+makefile.mk b/editors/openoffice-3/files/patch-external+gcc3_specific+makefile.mk
deleted file mode 100644
index 6b8071f4030e..000000000000
--- a/editors/openoffice-3/files/patch-external+gcc3_specific+makefile.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../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"
- 
- .IF "$(OS)"!="MACOSX"
-+.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 @@
-         -rm -f $@
-         +ln -s libgcc_s.so.1 $@
- 
-+.ENDIF 
- .ENDIF 
- 
- .ENDIF
diff --git a/editors/openoffice-3/files/patch-freetype+makefile.mk b/editors/openoffice-3/files/patch-freetype+makefile.mk
deleted file mode 100644
index 3e5a8dd19f18..000000000000
--- a/editors/openoffice-3/files/patch-freetype+makefile.mk
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice-3/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice-3/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice-3/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
- 
- /* 
diff --git a/editors/openoffice-3/files/patch-javaunohelper+source+makefile.mk b/editors/openoffice-3/files/patch-javaunohelper+source+makefile.mk
deleted file mode 100644
index 19f6b86e5ab5..000000000000
--- a/editors/openoffice-3/files/patch-javaunohelper+source+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice-3/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice-3/files/patch-jni_uno+jni_java2uno.cxx
deleted file mode 100644
index a9ff9e3fed88..000000000000
--- a/editors/openoffice-3/files/patch-jni_uno+jni_java2uno.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice-3/files/patch-nas+nas-1.6.patch b/editors/openoffice-3/files/patch-nas+nas-1.6.patch
deleted file mode 100644
index b6096654ebaf..000000000000
--- a/editors/openoffice-3/files/patch-nas+nas-1.6.patch
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice-3/files/patch-offapi+com+sun+star+setup+OSType.idl b/editors/openoffice-3/files/patch-offapi+com+sun+star+setup+OSType.idl
deleted file mode 100644
index 3fee562c6d38..000000000000
--- a/editors/openoffice-3/files/patch-offapi+com+sun+star+setup+OSType.idl
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3/files/patch-offapi+util+makefile.pmk b/editors/openoffice-3/files/patch-offapi+util+makefile.pmk
deleted file mode 100644
index 5cdbb1b4aa4a..000000000000
--- a/editors/openoffice-3/files/patch-offapi+util+makefile.pmk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3/files/patch-package+inc+HashMaps.hxx b/editors/openoffice-3/files/patch-package+inc+HashMaps.hxx
deleted file mode 100644
index 35052d291ef7..000000000000
--- a/editors/openoffice-3/files/patch-package+inc+HashMaps.hxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice-3/files/patch-package+inc+ZipPackageFolder.hxx b/editors/openoffice-3/files/patch-package+inc+ZipPackageFolder.hxx
deleted file mode 100644
index 014c61403380..000000000000
--- a/editors/openoffice-3/files/patch-package+inc+ZipPackageFolder.hxx
+++ /dev/null
@@ -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()
diff --git a/editors/openoffice-3/files/patch-package+source+zippackage+ContentInfo.hxx b/editors/openoffice-3/files/patch-package+source+zippackage+ContentInfo.hxx
deleted file mode 100644
index c4bf35e79f64..000000000000
--- a/editors/openoffice-3/files/patch-package+source+zippackage+ContentInfo.hxx
+++ /dev/null
@@ -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();
diff --git a/editors/openoffice-3/files/patch-package+source+zippackage+ZipPackageFolder.cxx b/editors/openoffice-3/files/patch-package+source+zippackage+ZipPackageFolder.cxx
deleted file mode 100644
index bb504c834eef..000000000000
--- a/editors/openoffice-3/files/patch-package+source+zippackage+ZipPackageFolder.cxx
+++ /dev/null
@@ -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 );
diff --git a/editors/openoffice-3/files/patch-registry+source+regkey.cxx b/editors/openoffice-3/files/patch-registry+source+regkey.cxx
deleted file mode 100644
index fad069f83f14..000000000000
--- a/editors/openoffice-3/files/patch-registry+source+regkey.cxx
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice-3/files/patch-rsc+source+rscpp+cpp.h b/editors/openoffice-3/files/patch-rsc+source+rscpp+cpp.h
deleted file mode 100644
index 417ab33ba52f..000000000000
--- a/editors/openoffice-3/files/patch-rsc+source+rscpp+cpp.h
+++ /dev/null
@@ -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              */
- 
diff --git a/editors/openoffice-3/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice-3/files/patch-sal+osl+unx+nlsupport.c
deleted file mode 100644
index 49fe0da8589b..000000000000
--- a/editors/openoffice-3/files/patch-sal+osl+unx+nlsupport.c
+++ /dev/null
@@ -1,160 +0,0 @@
---- ../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
-@@ -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)
- 
-@@ -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 @@
-     { "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-3/files/patch-sal+osl+unx+pipe.c b/editors/openoffice-3/files/patch-sal+osl+unx+pipe.c
deleted file mode 100644
index 4aa7b8af1a61..000000000000
--- a/editors/openoffice-3/files/patch-sal+osl+unx+pipe.c
+++ /dev/null
@@ -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 )
- 	{			
diff --git a/editors/openoffice-3/files/patch-sal+osl+unx+process.c b/editors/openoffice-3/files/patch-sal+osl+unx+process.c
deleted file mode 100644
index 50023576bec4..000000000000
--- a/editors/openoffice-3/files/patch-sal+osl+unx+process.c
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice-3/files/patch-sal+osl+unx+security.c b/editors/openoffice-3/files/patch-sal+osl+unx+security.c
deleted file mode 100644
index 0cc321dcd544..000000000000
--- a/editors/openoffice-3/files/patch-sal+osl+unx+security.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../sal/osl/unx/security.c.orig	Sat Jul 20 22:53:31 2002
-+++ ../sal/osl/unx/security.c	Sat Jul 20 22:52:39 2002
-@@ -739,7 +739,7 @@
- 	}
- 
- 
--#elif (LINUX && (GLIBC >= 2))
-+#elif ((LINUX && (GLIBC >= 2)) || defined(FREEBSD))
- 	
- 	struct passwd	*pPasswd; 
- 	
diff --git a/editors/openoffice-3/files/patch-sal+osl+unx+socket.c b/editors/openoffice-3/files/patch-sal+osl+unx+socket.c
deleted file mode 100644
index 9541cac8583f..000000000000
--- a/editors/openoffice-3/files/patch-sal+osl+unx+socket.c
+++ /dev/null
@@ -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! */
diff --git a/editors/openoffice-3/files/patch-sal+osl+unx+system.c b/editors/openoffice-3/files/patch-sal+osl+unx+system.c
deleted file mode 100644
index 8dc663ac03fc..000000000000
--- a/editors/openoffice-3/files/patch-sal+osl+unx+system.c
+++ /dev/null
@@ -1,127 +0,0 @@
---- ../sal/osl/unx/system.c.orig	Sun Mar 17 12:34:13 2002
-+++ ../sal/osl/unx/system.c	Wed Apr  3 01:03:36 2002
-@@ -195,6 +195,73 @@
- }
- #endif
- 
-+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
-+           size_t buflen, struct passwd **result)
-+{
-+  struct passwd* res;
-+
-+  pthread_mutex_lock(&getrtl_mutex);
-+
-+  if ( res = getpwuid(uid) )
-+  {
-+    size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell;
-+
-+    pw_name = strlen(res->pw_name)+1;
-+    pw_passwd = strlen(res->pw_passwd)+1;
-+    pw_class = strlen(res->pw_class)+1;
-+    pw_gecos = strlen(res->pw_gecos)+1;
-+    pw_dir = strlen(res->pw_dir)+1;
-+    pw_shell = strlen(res->pw_shell)+1;
-+
-+    if (pw_name+pw_passwd+pw_class+pw_gecos
-+                                 +pw_dir+pw_shell < buflen)
-+    {
-+      memcpy(pwd, res, sizeof(struct passwd));
-+
-+      strncpy(buffer, res->pw_name, pw_name);
-+      pwd->pw_name = buffer;
-+      buffer += pw_name;
-+
-+      strncpy(buffer, res->pw_passwd, pw_passwd);
-+      pwd->pw_passwd = buffer;
-+      buffer += pw_passwd;
-+
-+      strncpy(buffer, res->pw_class, pw_class);
-+      pwd->pw_class = buffer;
-+      buffer += pw_class;
-+
-+      strncpy(buffer, res->pw_gecos, pw_gecos);
-+      pwd->pw_gecos = buffer;
-+      buffer += pw_gecos;
-+
-+      strncpy(buffer, res->pw_dir, pw_dir);
-+      pwd->pw_dir = buffer;
-+      buffer += pw_dir;
-+
-+      strncpy(buffer, res->pw_shell, pw_shell);
-+      pwd->pw_shell = buffer;
-+      buffer += pw_shell;
-+
-+      *result = pwd ;
-+      res = 0 ;
-+
-+    } else {
-+
-+      res = ENOMEM ;
-+
-+    }      
-+  
-+  } else {
-+
-+    res = errno ;
-+ 
-+  } 
-+
-+  pthread_mutex_unlock(&getrtl_mutex);
-+
-+  return res;
-+}
-+
- struct tm *localtime_r(const time_t *timep, struct tm *buffer)
- {
- 	struct tm* res;
-@@ -518,3 +585,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-3/files/patch-sal+osl+unx+system.h b/editors/openoffice-3/files/patch-sal+osl+unx+system.h
deleted file mode 100644
index c4e255952fc7..000000000000
--- a/editors/openoffice-3/files/patch-sal+osl+unx+system.h
+++ /dev/null
@@ -1,35 +0,0 @@
---- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
-+++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
-@@ -205,6 +205,13 @@
- #   include <sys/ioctl.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 <machine/vmparam.h>
-+#   include <machine/pmap.h>
- #	include <sys/un.h>
- #   include <netinet/tcp.h>
- #	define 	IORESOURCE_TRANSFER_BSD 
-@@ -216,12 +223,13 @@
- #   elif BYTE_ORDER == PDP_ENDIAN
- #   	define _PDP_ENDIAN
- #   endif
--#   define  sched_yield() 				pthread_yield()
--#   define  pthread_testcancel()
- #	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
diff --git a/editors/openoffice-3/files/patch-sal+textenc+tencinfo.c b/editors/openoffice-3/files/patch-sal+textenc+tencinfo.c
deleted file mode 100644
index 7cf80c18d0a0..000000000000
--- a/editors/openoffice-3/files/patch-sal+textenc+tencinfo.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
-     /* 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 */
-+
-+    if (pMimeCharset == NULL)
-+	pMimeCharset = "usascii";
-+
-     static ImplStrCharsetDef const aVIPMimeCharsetTab[] =
-     {
-         { "usascii", RTL_TEXTENCODING_ASCII_US },
diff --git a/editors/openoffice-3/files/patch-sal+workben+makefile.mk b/editors/openoffice-3/files/patch-sal+workben+makefile.mk
deleted file mode 100644
index 369935e31d66..000000000000
--- a/editors/openoffice-3/files/patch-sal+workben+makefile.mk
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../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 @@
- 
- .IF "$(TESTAPP)" == "salstattest"
- 
--	CFLAGS+= /DUSE_SAL_STATIC
-+	CFLAGS+= -DUSE_SAL_STATIC
- 
- 	OBJFILES=	$(OBJ)$/salstattest.obj
- 
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- 
- CXXFILES=	tgetpwnam.cxx
- OBJFILES=	$(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN=	$(SLB)$/sal.lib
- 
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd | freebsd)
- .ENDIF # tgetpwname
- 
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-3/files/patch-salhelper+source+gcc2_freebsd_intel.map b/editors/openoffice-3/files/patch-salhelper+source+gcc2_freebsd_intel.map
deleted file mode 100644
index 1ffacf889bc6..000000000000
--- a/editors/openoffice-3/files/patch-salhelper+source+gcc2_freebsd_intel.map
+++ /dev/null
@@ -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:
-+*;
-+};
diff --git a/editors/openoffice-3/files/patch-salhelper+source+gcc3_freebsd_intel.map b/editors/openoffice-3/files/patch-salhelper+source+gcc3_freebsd_intel.map
deleted file mode 100644
index 823cff316ec7..000000000000
--- a/editors/openoffice-3/files/patch-salhelper+source+gcc3_freebsd_intel.map
+++ /dev/null
@@ -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:
-+		*;
-+};
-+
diff --git a/editors/openoffice-3/files/patch-salhelper+source+makefile.mk b/editors/openoffice-3/files/patch-salhelper+source+makefile.mk
deleted file mode 100644
index 3687664d8d16..000000000000
--- a/editors/openoffice-3/files/patch-salhelper+source+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../salhelper/source/makefile.mk.orig	Wed Nov 14 14:19:21 2001
-+++ ../salhelper/source/makefile.mk	Sun Mar  3 17:58:15 2002
-@@ -109,6 +109,10 @@
- SHL1VERSIONMAP=lngi.map
- .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
- SHL1VERSIONMAP=gcc3_linux_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
- .ENDIF
- 
- 
diff --git a/editors/openoffice-3/files/patch-salhelper+test+rtti+makefile.mk b/editors/openoffice-3/files/patch-salhelper+test+rtti+makefile.mk
deleted file mode 100644
index 70f25048a24a..000000000000
--- a/editors/openoffice-3/files/patch-salhelper+test+rtti+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
- 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
- .ENDIF
- 
- 
diff --git a/editors/openoffice-3/files/patch-sc+source+core+data+cell.cxx b/editors/openoffice-3/files/patch-sc+source+core+data+cell.cxx
deleted file mode 100644
index 529f67a3e35f..000000000000
--- a/editors/openoffice-3/files/patch-sc+source+core+data+cell.cxx
+++ /dev/null
@@ -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>
diff --git a/editors/openoffice-3/files/patch-scp+source+global+udk_base.scp b/editors/openoffice-3/files/patch-scp+source+global+udk_base.scp
deleted file mode 100644
index 623eccb0ff09..000000000000
--- a/editors/openoffice-3/files/patch-scp+source+global+udk_base.scp
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3/files/patch-scp+source+player+player.scp b/editors/openoffice-3/files/patch-scp+source+player+player.scp
deleted file mode 100644
index 2f8daab35cdd..000000000000
--- a/editors/openoffice-3/files/patch-scp+source+player+player.scp
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice-3/files/patch-scptools+source+linker+searchcache b/editors/openoffice-3/files/patch-scptools+source+linker+searchcache
deleted file mode 100644
index 593e9eabf5bc..000000000000
--- a/editors/openoffice-3/files/patch-scptools+source+linker+searchcache
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: files/patch-scptools::source::linker::searchcache
-===================================================================
-RCS file: files/patch-scptools::source::linker::searchcache
-diff -N files/patch-scptools::source::linker::searchcache
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-scptools::source::linker::searchcache	4 Aug 2002 15:28:04 -0000
-@@ -0,0 +1,27 @@
-+--- ../scptools/source/linker/searchcache.hxx.orig	Fri Aug  2 22:53:46 2002
-++++ ../scptools/source/linker/searchcache.hxx	Fri Aug  2 22:54:50 2002
-+@@ -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	Fri Aug  2 22:53:35 2002
-++++ ../scptools/source/linker/searchcache.cxx	Fri Aug  2 22:55:14 2002
-+@@ -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-3/files/patch-scptools+source+linker+ziplst.cxx b/editors/openoffice-3/files/patch-scptools+source+linker+ziplst.cxx
deleted file mode 100644
index 83b84631542e..000000000000
--- a/editors/openoffice-3/files/patch-scptools+source+linker+ziplst.cxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice-3/files/patch-setup2+inc+fields.hxx b/editors/openoffice-3/files/patch-setup2+inc+fields.hxx
deleted file mode 100644
index d56e12f2abf4..000000000000
--- a/editors/openoffice-3/files/patch-setup2+inc+fields.hxx
+++ /dev/null
@@ -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[];
diff --git a/editors/openoffice-3/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice-3/files/patch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 396c586ee3a3..000000000000
--- a/editors/openoffice-3/files/patch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,30 +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"
- 
-@@ -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" \
diff --git a/editors/openoffice-3/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice-3/files/patch-setup2+mow+source+loader+makefile.mk
deleted file mode 100644
index 5460e4296587..000000000000
--- a/editors/openoffice-3/files/patch-setup2+mow+source+loader+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice-3/files/patch-setup2+patch+makefile.mk b/editors/openoffice-3/files/patch-setup2+patch+makefile.mk
deleted file mode 100644
index 53846a8bdfc9..000000000000
--- a/editors/openoffice-3/files/patch-setup2+patch+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3/files/patch-setup2+script+setupserver b/editors/openoffice-3/files/patch-setup2+script+setupserver
deleted file mode 100644
index 450ea386c841..000000000000
--- a/editors/openoffice-3/files/patch-setup2+script+setupserver
+++ /dev/null
@@ -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`"
diff --git a/editors/openoffice-3/files/patch-setup2+source+compiler+decltor.cxx b/editors/openoffice-3/files/patch-setup2+source+compiler+decltor.cxx
deleted file mode 100644
index 98f6ad2f7567..000000000000
--- a/editors/openoffice-3/files/patch-setup2+source+compiler+decltor.cxx
+++ /dev/null
@@ -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";
diff --git a/editors/openoffice-3/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx b/editors/openoffice-3/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
deleted file mode 100644
index ac0b39a6aa47..000000000000
--- a/editors/openoffice-3/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
+++ /dev/null
@@ -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) );
diff --git a/editors/openoffice-3/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice-3/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
deleted file mode 100644
index f199b18823e1..000000000000
--- a/editors/openoffice-3/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice-3/files/patch-setup2+source+service+interface.cxx b/editors/openoffice-3/files/patch-setup2+source+service+interface.cxx
deleted file mode 100644
index 8e478e17971d..000000000000
--- a/editors/openoffice-3/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-3/files/patch-shell+source+cmdmail+makefile.mk b/editors/openoffice-3/files/patch-shell+source+cmdmail+makefile.mk
deleted file mode 100644
index 0476285c802e..000000000000
--- a/editors/openoffice-3/files/patch-shell+source+cmdmail+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice-3/files/patch-shell+source+proxysettings+makefile.mk b/editors/openoffice-3/files/patch-shell+source+proxysettings+makefile.mk
deleted file mode 100644
index e83cf7c9d7a1..000000000000
--- a/editors/openoffice-3/files/patch-shell+source+proxysettings+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice-3/files/patch-shell+source+unix+exec+makefile.mk b/editors/openoffice-3/files/patch-shell+source+unix+exec+makefile.mk
deleted file mode 100644
index 0b7712ee35f8..000000000000
--- a/editors/openoffice-3/files/patch-shell+source+unix+exec+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice-3/files/patch-solenv+bin+addsym.awk b/editors/openoffice-3/files/patch-solenv+bin+addsym.awk
deleted file mode 100644
index 996e282b350b..000000000000
--- a/editors/openoffice-3/files/patch-solenv+bin+addsym.awk
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
-+++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
-@@ -72,11 +72,11 @@
- END {
-     if (state == 0) {
-         print "# Weak RTTI symbols for C++ exceptions:"
--        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
-+        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
-     }
- }
- state == 2 {
--    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
-+    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
-     state = 3
- }
- /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice-3/files/patch-solenv+bin+mapgen.pl b/editors/openoffice-3/files/patch-solenv+bin+mapgen.pl
deleted file mode 100644
index 71ebdb934120..000000000000
--- a/editors/openoffice-3/files/patch-solenv+bin+mapgen.pl
+++ /dev/null
@@ -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, $_);
- 	};
diff --git a/editors/openoffice-3/files/patch-solenv+inc+startup+FREEBSD+macros.mk b/editors/openoffice-3/files/patch-solenv+inc+startup+FREEBSD+macros.mk
deleted file mode 100644
index 0c1b107de988..000000000000
--- a/editors/openoffice-3/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-3/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice-3/files/patch-solenv+inc+tg_ext.mk
deleted file mode 100644
index 701692c9425a..000000000000
--- a/editors/openoffice-3/files/patch-solenv+inc+tg_ext.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3/files/patch-solenv+inc+tg_moz.mk b/editors/openoffice-3/files/patch-solenv+inc+tg_moz.mk
deleted file mode 100644
index 255a41f92281..000000000000
--- a/editors/openoffice-3/files/patch-solenv+inc+tg_moz.mk
+++ /dev/null
@@ -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) $@
diff --git a/editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index b4764485aa86..000000000000
--- a/editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,202 +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
-+# 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*=$(CC)
-+
-+# default linker flags
-+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -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
diff --git a/editors/openoffice-3/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice-3/files/patch-soltools+checkdll+makefile.mk
deleted file mode 100644
index e6407402258a..000000000000
--- a/editors/openoffice-3/files/patch-soltools+checkdll+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3/files/patch-soltools+mkdepend+main.c b/editors/openoffice-3/files/patch-soltools+mkdepend+main.c
deleted file mode 100644
index cffd5cbb1f43..000000000000
--- a/editors/openoffice-3/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-3/files/patch-stlport+makefile.mk b/editors/openoffice-3/files/patch-stlport+makefile.mk
deleted file mode 100644
index 797817ba85be..000000000000
--- a/editors/openoffice-3/files/patch-stlport+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3/files/patch-stoc+source+corereflection+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+corereflection+makefile.mk
deleted file mode 100644
index 4b319b08d401..000000000000
--- a/editors/openoffice-3/files/patch-stoc+source+corereflection+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-3/files/patch-stoc+source+defaultregistry+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+defaultregistry+makefile.mk
deleted file mode 100644
index 4cae0476415a..000000000000
--- a/editors/openoffice-3/files/patch-stoc+source+defaultregistry+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice-3/files/patch-stoc+source+implementationregistration+implreg.cxx b/editors/openoffice-3/files/patch-stoc+source+implementationregistration+implreg.cxx
deleted file mode 100644
index 341d621d872c..000000000000
--- a/editors/openoffice-3/files/patch-stoc+source+implementationregistration+implreg.cxx
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3/files/patch-stoc+source+implementationregistration+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+implementationregistration+makefile.mk
deleted file mode 100644
index 0051043b7ecb..000000000000
--- a/editors/openoffice-3/files/patch-stoc+source+implementationregistration+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-3/files/patch-stoc+source+inspect+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+inspect+makefile.mk
deleted file mode 100644
index c7cd85253c11..000000000000
--- a/editors/openoffice-3/files/patch-stoc+source+inspect+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-3/files/patch-stoc+source+invocation+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+invocation+makefile.mk
deleted file mode 100644
index 9ac2072a5612..000000000000
--- a/editors/openoffice-3/files/patch-stoc+source+invocation+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice-3/files/patch-stoc+source+invocation_adapterfactory+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
deleted file mode 100644
index 8853ad39a90e..000000000000
--- a/editors/openoffice-3/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice-3/files/patch-stoc+source+javaloader+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+javaloader+makefile.mk
deleted file mode 100644
index cea499f15c57..000000000000
--- a/editors/openoffice-3/files/patch-stoc+source+javaloader+makefile.mk
+++ /dev/null
@@ -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=		
diff --git a/editors/openoffice-3/files/patch-stoc+source+javavm+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+javavm+makefile.mk
deleted file mode 100644
index b895a2b968d4..000000000000
--- a/editors/openoffice-3/files/patch-stoc+source+javavm+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice-3/files/patch-stoc+source+loader+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+loader+makefile.mk
deleted file mode 100644
index 5a08ee5937b6..000000000000
--- a/editors/openoffice-3/files/patch-stoc+source+loader+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice-3/files/patch-stoc+source+namingservice+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+namingservice+makefile.mk
deleted file mode 100644
index e573081bc21d..000000000000
--- a/editors/openoffice-3/files/patch-stoc+source+namingservice+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice-3/files/patch-stoc+source+proxy_factory+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+proxy_factory+makefile.mk
deleted file mode 100644
index 9110b2f50cd1..000000000000
--- a/editors/openoffice-3/files/patch-stoc+source+proxy_factory+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-3/files/patch-stoc+source+registry_tdprovider+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+registry_tdprovider+makefile.mk
deleted file mode 100644
index 9d974d1c0d10..000000000000
--- a/editors/openoffice-3/files/patch-stoc+source+registry_tdprovider+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3/files/patch-stoc+source+servicemanager+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+servicemanager+makefile.mk
deleted file mode 100644
index 746776d54759..000000000000
--- a/editors/openoffice-3/files/patch-stoc+source+servicemanager+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice-3/files/patch-stoc+source+tdmanager+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+tdmanager+makefile.mk
deleted file mode 100644
index 76403fdde841..000000000000
--- a/editors/openoffice-3/files/patch-stoc+source+tdmanager+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice-3/files/patch-stoc+source+typeconv+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+typeconv+makefile.mk
deleted file mode 100644
index dc647f89a166..000000000000
--- a/editors/openoffice-3/files/patch-stoc+source+typeconv+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice-3/files/patch-store+util+makefile.mk b/editors/openoffice-3/files/patch-store+util+makefile.mk
deleted file mode 100644
index 6bef6e960f2e..000000000000
--- a/editors/openoffice-3/files/patch-store+util+makefile.mk
+++ /dev/null
@@ -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
- 
- 
diff --git a/editors/openoffice-3/files/patch-svx+source+fmcomp+makefile.mk b/editors/openoffice-3/files/patch-svx+source+fmcomp+makefile.mk
deleted file mode 100644
index b16030080c0d..000000000000
--- a/editors/openoffice-3/files/patch-svx+source+fmcomp+makefile.mk
+++ /dev/null
@@ -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= \
diff --git a/editors/openoffice-3/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice-3/files/patch-sysui+oounix+office+gnome+makefile.mk
deleted file mode 100644
index 3d7c2e22aa63..000000000000
--- a/editors/openoffice-3/files/patch-sysui+oounix+office+gnome+makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
-+++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
-@@ -84,7 +84,9 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- APP1LIBS=
-+.IF "$(OS)"!="FREEBSD"
- APP1STDLIBS=-ldl
-+.ENDIF
- 
- GNOMEFILES= \
- 	locales.tab
diff --git a/editors/openoffice-3/files/patch-tools+source+string+tstring.cxx b/editors/openoffice-3/files/patch-tools+source+string+tstring.cxx
deleted file mode 100644
index 12bd6bd0b244..000000000000
--- a/editors/openoffice-3/files/patch-tools+source+string+tstring.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../tools/source/string/tstring.cxx.orig	Sat Aug 10 12:53:42 2002
-+++ ../tools/source/string/tstring.cxx	Sat Aug 10 12:54:16 2002
-@@ -103,6 +103,9 @@
- xub_StrLen ImplStringLen( const sal_Char* pStr )
- {
- 	const sal_Char* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
-@@ -113,6 +116,9 @@
- xub_StrLen ImplStringLen( const sal_Unicode* pStr )
- {
- 	const sal_Unicode* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
diff --git a/editors/openoffice-3/files/patch-unoil+makefile.pmk b/editors/openoffice-3/files/patch-unoil+makefile.pmk
deleted file mode 100644
index 7febdabf7b4b..000000000000
--- a/editors/openoffice-3/files/patch-unoil+makefile.pmk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../unoil/makefile.pmk.orig	Fri Aug 31 18:04:43 2001
-+++ ../unoil/makefile.pmk	Thu Sep 12 12:17:50 2002
-@@ -74,8 +74,8 @@
- JAVAFILESLIST	:= $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java)
- .ENDIF          # "$(L10N_framework)"==""
- 
--GENJAVAFILES	:= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
--GENCLASSFILES	:= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
-+GENJAVAFILES	+= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
-+GENCLASSFILES	+= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
- 
- # --- Targets ------------------------------------------------------
- 
diff --git a/editors/openoffice-3/files/patch-unzip+source+file_io.c b/editors/openoffice-3/files/patch-unzip+source+file_io.c
deleted file mode 100644
index 2f85a108c185..000000000000
--- a/editors/openoffice-3/files/patch-unzip+source+file_io.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../unzip/source/file_io.c.orig	Sat Oct 19 11:58:45 2002
-+++ ../unzip/source/file_io.c	Sat Oct 19 12:03:40 2002
-@@ -500,7 +500,7 @@
- #ifdef MPW
- 				pCallBack( 0 );
- #else
--				#if defined LINUX || defined MACOSX || defined NETBSD
-+				#if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD
- 				pCallBack( lseek(outfd, 0, SEEK_CUR) );
- 				#else
- 				pCallBack( tell( outfd ) );
-@@ -865,7 +865,9 @@
- 	static struct timeb tbp;
- #endif /* !__386BSD__ */
- #else /* !BSD */
-+#if (!defined(NETBSD) && !defined(FREEBSD))
- 	extern long timezone;
-+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
- #endif /* ?BSD */
- #endif /* ?AMIGA */
- 
diff --git a/editors/openoffice-3/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice-3/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
deleted file mode 100644
index 41defbd5eb59..000000000000
--- a/editors/openoffice-3/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
-+++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
-@@ -65,6 +65,8 @@
- #include <glyphcache.hxx>
- 
- #define Region XLIB_Region
-+typedef unsigned long CARD32;
-+#define Cursor CARD32
- #include <X11/extensions/Xrender.h>
- #undef Region
- 
diff --git a/editors/openoffice-3/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice-3/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
deleted file mode 100644
index fefc925db41f..000000000000
--- a/editors/openoffice-3/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
-@@ -78,6 +78,12 @@
- GETSTYLE_GNOME=getstyle-gnome-linux-intel
- HASGNOME2=TRUE
- .ENDIF
-+.IF "$_(HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
-+.ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
- HASGNOME2=TRUE
diff --git a/editors/openoffice-3/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice-3/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
deleted file mode 100644
index 984313fc540a..000000000000
--- a/editors/openoffice-3/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
-@@ -75,9 +75,15 @@
- 
- HASGNOME2=
- 
--.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
-+.IF "$(OS)$(CPU)"=="LINUXI"
- MSGBOX_GNOME=msgbox-gnome-linux-intel
- HASGNOME2=TRUE
-+.ENDIF
-+.IF "$(_HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+MSGBOX_GNOME=msgbox-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
- .ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice-3/files/patch-vcl+workben+officeacceptthread.cxx b/editors/openoffice-3/files/patch-vcl+workben+officeacceptthread.cxx
deleted file mode 100644
index 07d9f1060557..000000000000
--- a/editors/openoffice-3/files/patch-vcl+workben+officeacceptthread.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/workben/officeacceptthread.cxx.orig	Wed Mar  5 20:25:36 2003
-+++ ../vcl/workben/officeacceptthread.cxx	Wed Mar  5 20:26:03 2003
-@@ -125,7 +125,7 @@
- #if defined (SOLARIS)
- 				int status;
- 				nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG);
--#elif defined(LINUX)
-+#elif defined(LINUX) || defined (FREEBSD)
- 				nRet = kill(aProcessInfo.Ident, 0);
- #endif
- #if defined (UNX)
diff --git a/editors/openoffice-3/files/zipmoz.sh b/editors/openoffice-3/files/zipmoz.sh
deleted file mode 100644
index 43a4591f3430..000000000000
--- a/editors/openoffice-3/files/zipmoz.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/sh -f
-
-RUNTIME_FILES=" components/libabsyncsvc.so components/libaddrbook.so \
-		components/libmork.so components/libmozldap.so \
-		components/libnecko.so components/libprofile.so \
-		components/librdf.so components/libstrres.so \
-		components/libunicharutil.so components/libuconv.so \
-		components/libucvcn.so components/libucvibm.so \
-		components/libucvja.so components/libucvko.so \
-		components/libucvlatin.so components/libucvtw.so \
-		components/libucvtw2.so components/liburiloader.so \
-		components/libvcard.so components/libxpconnect.so \
-		components/libpref.so components/libchrome.so libmozjs.so \
-		libmsgbaseutil.so libldap50.so libnspr4.so libplc4.so \
-		libplds4.so libxpcom.so libmozz.so component.reg \
-		components/necko_dns.xpt components/xpcom_xpti.xpt \
-		components/xpcom_threads.xpt components/xpcom_io.xpt \
-		components/xpcom_ds.xpt components/xpcom_components.xpt \
-		components/xpcom_base.xpt components/xpti.dat \
-		defaults/pref/all.js defaults/pref/config.js \
-		defaults/pref/editor.js defaults/pref/initpref.js \
-		defaults/pref/inspector.js defaults/pref/mailnews.js \
-		defaults/pref/security-prefs.js defaults/pref/unix.js \
-		defaults/pref/xpinstall.js"
-
-LIB_FILES="	lib/libembed_base_s.a lib/libmozreg_s.a \
-		lib/libnspr4.so lib/libxpcom.so lib/libprldap50.so"
-
-INC_FILES="include/"
-INC_FILES2="public/"
-
-if [ $# -lt 2 -o $# -gt 3 ] ; then
-	echo 
-	echo usage: $0 mozilla_dist target [target_dir]
-	echo
-	echo where:
-	echo
-	echo "mozilla_dist points to the mozilla distribution"
-	echo "target concatenates  OS, compiler and CPU (e.g. FREEBSDGCCI etc)"
-	echo "target_dir is the directory to place the zips"
-	exit 1
-fi
-
-MOZ_DIST=$1
-TARGET=$2
-if [ "w$3" != "w" ]; then
-	TARGET_DIR=$3
-else
-	if [ "w$TARGET_DIR" == "w" ]; then
-		TARGET_DIR=
-	fi
-fi
-
-ZIP_TARGET=$TARGET_DIR
-if [ -z "$ZIP_TARGET" ] ; then
-	ZIP_TARGET=../
-fi
-
-# just to remember the current working directory
-STARTING_DIR=`pwd`
-
-echo
-echo --- creating zips for $TARGET, using mozilla distribution in $MOZ_DIST
-
-# Create the directories
-[ ! -d $TARGET_DIR/$TARGET/runtime ] && mkdir -p $TARGET_DIR/$TARGET/runtime
-[ ! -d $TARGET_DIR/$TARGET/runtime/components ] && mkdir -p $TARGET_DIR/$TARGET/runtime/components
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults/pref ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults/pref
-[ ! -d $TARGET_DIR/$TARGET/lib ] && mkdir -p $TARGET_DIR/$TARGET/lib
-[ ! -d $TARGET_DIR/$TARGET/inc ] && mkdir -p $TARGET_DIR/$TARGET/inc
-[ ! -d $TARGET_DIR/$TARGET/inc/nspr ] && mkdir -p $TARGET_DIR/$TARGET/inc/nspr
-[ ! -d $TARGET_DIR/$TARGET/inc/obsolete ] && mkdir -p $TARGET_DIR/$TARGET/inc/obsolete
-
-# Copy the files
-echo
-echo --- copying files
-echo
-
-for i in $RUNTIME_FILES; do
-	if [ ! -f $MOZ_DIST/bin/$i ]; then
-		echo $MOZ_DIST/bin/$i does not exist, check your distribution
-	else
-		if [ `echo $i | grep component` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/components/
-		elif [ `echo $i | grep defaults` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/defaults/pref/
-		else
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/
-		fi
-	fi
-done
-
-for i in $LIB_FILES; do
-	if [ ! -f $MOZ_DIST/$i ]; then
-		echo $MOZ_DIST/$i does not exist, check your distribution
-	else
-		cp -R -L $MOZ_DIST/$i $TARGET_DIR/$TARGET/lib/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES`; do
-	if [ ! -d $i ]; then 
-		cp -R -L $MOZ_DIST/include/$i $TARGET_DIR/$TARGET/inc/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES2`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/public/$i $TARGET_DIR/$TARGET/inc
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/$i $TARGET_DIR/$TARGET/inc/nspr
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr/obsolete`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/obsolete/$i $TARGET_DIR/$TARGET/inc/obsolete
-	fi
-done
-
-# delete old zips
-
-[ -f $TARGET_DIR/$TARGET/runtime.zip ] && rm -f $TARGET_DIR/$TARGET/runtime.zip
-[ -f $TARGET_DIR/$TARGET/lib.zip ] && rm -f $TARGET_DIR/$TARGET/lib.zip
-[ -f $TARGET_DIR/$TARGET/inc.zip ] && rm -f $TARGET_DIR/$TARGET/inc.zip
-
-# zip the runtime files
-
-echo
-echo --- creating ${TARGET}runtime.zip
-echo
-
-cd $TARGET_DIR/$TARGET/runtime
-find . -type f | zip $ZIP_TARGET/${TARGET}runtime.zip -@
-
-# zip the lib files
-echo 
-echo --- creating ${TARGET}lib.zip
-echo 
-
-cd $TARGET_DIR/$TARGET/lib
-find . -type f | zip $ZIP_TARGET/${TARGET}lib.zip -@
-
-# zip the inc files
-echo
-echo --- creating ${TARGET}inc.zip
-echo
-
-cd $TARGET_DIR/$TARGET/inc
-find . -type f | zip $ZIP_TARGET/${TARGET}inc.zip -@
-
-# remove dirs
-cd $STARTING_DIR
-rm -rf $TARGET_DIR/$TARGET
-
-echo
-echo --- done
-echo
-
diff --git a/editors/openoffice-3/pkg-descr b/editors/openoffice-3/pkg-descr
deleted file mode 100644
index 31fd1b12161a..000000000000
--- a/editors/openoffice-3/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-OpenOffice.org is an Open Source, community-developed, multi-platform office
-productivity suite. It includes the key desktop applications, such as a
-word processor, spreadsheet, presentation manager, and drawing program,
-with a user interface and feature set similar to other office suites.
-
-Components include:
-  * A universal word processing application for creating business
-    letters, extensive text documents, professional layouts, and HTML
-    documents.
-  * A sophisticated application for performing advanced spreadsheet
-    functions, such as analyzing figures, creating lists, and viewing data.
-  * A tool for creating effective eye-catching presentations.
-  * A vector-oriented draw module that enables the creation of 3D
-    illustrations
diff --git a/editors/openoffice-3/pkg-message b/editors/openoffice-3/pkg-message
deleted file mode 100644
index 1dc749f301c2..000000000000
--- a/editors/openoffice-3/pkg-message
+++ /dev/null
@@ -1,73 +0,0 @@
-OpenOffice.org Build 643 Personal Install How-To
-
-Written by:	Martin Blapp <mbr@freebsd.org>
-
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
-
-1 User installation
--------------------
-
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
---------------
-
-There are some wrappers installed for fast startup.
-Add "${PREFIX}/bin/" to your PATH and you will be able
-to use them.
-
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
-
-If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
-version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
diff --git a/editors/openoffice-3/pkg-plist b/editors/openoffice-3/pkg-plist
deleted file mode 100644
index 28bd78453b52..000000000000
--- a/editors/openoffice-3/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, do not delete. Package list is generated automatically.
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
deleted file mode 100644
index 545132d817fb..000000000000
--- a/editors/openoffice.org-1.0/Makefile
+++ /dev/null
@@ -1,566 +0,0 @@
-# New ports collection makefile for: OpenOffice
-# Date created:		28 Februar 2002
-# Whom:                 Martin Blapp
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openoffice
-PORTVERSION=	1.0.2
-PORTREVISION=	1
-CATEGORIES+=	editors
-MASTER_SITES+=	http://ny1.mirror.openoffice.org/%SUBDIR%/ \
-		http://ftp.gwdg.de/pub/misc/openoffice/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/&,} \
-		ftp://ftp.chg.ru/pub/OpenOffice/%SUBDIR%/ \
-		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		ftp://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}
-DISTFILES+=	OOo_${PORTVERSION}_source.tar.bz2 \
-		gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
-
-SORT?=	/usr/bin/sort
-FIND?=	/usr/bin/find
-CUT?=	/usr/bin/cut
-AWK?=	/usr/bin/awk
-GREP?=	/usr/bin/grep
-MOUNT?=	/sbin/mount
-ZIP?=	${PREFIX}/bin/zip
-UNZIP?=	${PREFIX}/bin/unzip
-ANT?=	${LOCALBASE}/bin/ant
-TCSH?=	/bin/tcsh
-PASTE?= /usr/bin/paste
-
-.include <bsd.port.pre.mk>
-
-INSTALLATION_BASEDIR=	OpenOffice.org1.0
-BUILD_NR=		641
-DIST_SUBDIR=		openoffice
-DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
-
-#
-# configuration for language specific slave ports
-#
-.if !defined(LANG_EXT)
-LANG_EXT=01
-.else
-#
-# Add pkg-descr and pkg-message if available
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-#
-# LANG_CONFIGURE_ARG is missing for the german port
-#
-.if defined(LANG_EXT)
-CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG},ENUS
-.endif
-.endif
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=	`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
-
-EXTRACT_ONLY=	OOo_${PORTVERSION}_source.tar.bz2
-
-MAINTAINER=	openoffice@FreeBSD.org
-COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/jakarta-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-.if !defined(DISPLAY)
-BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
-.endif
-.if !defined(WITH_BSD_JDK)
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk13
-.else
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
-.endif
-
-USE_PERL5=	yes
-USE_BZIP2=	yes
-USE_BISON=	yes
-USE_GMAKE=	yes
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
-.if !defined(WITH_BSD_JDK)
-JDK13DIR?=      ${LOCALBASE}/linux-sun-jdk1.3.1
-.else
-JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
-.endif
-JAVAVM=         ${JDK13DIR}/bin/java
-
-GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
-LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
-BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
-
-.if !defined(DISPLAY)
-DISPLAYHACK=localhost:1001
-.endif
-
-CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
-			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDK13DIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
-
-.if !defined(WITH_BSD_JDK)
-CONFIGURE_ARGS+=	--enable-linuxjdk=yes
-.endif
-
-.if defined(WITH_DEBUG)
-.if ${WITH_DEBUG} == 2
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-.endif
-
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"prefered language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
-	@${ECHO} "OPTIONS:"
-.if !defined(USE_GCC)
-	@${ECHO}
-	@${ECHO} "You can compile OO with different"
-	@${ECHO} "gcc compiler versions:"
-	@${ECHO}
-	@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.1"
-	@${ECHO} "to compile openoffice with your"
-	@${ECHO} "prefered compiler."
-.endif
-.if !defined(WITH_BSD_JDK)
-	@${ECHO}
-	@${ECHO} "If you like to use the native BSD"
-	@${ECHO} "JDK for the build system, you can use"
-	@${ECHO} "WITH_BSD_JDK=TRUE to disable the"
-	@${ECHO} "usage of the linux-JDK and linux dependency."
-	@${ECHO}
-.endif
-.if !defined(WITH_DEBUG)
-	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
-	@${ECHO} "if you call make with WITH_DEBUG=1"
-	@${ECHO}
-	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
-	@${ECHO}
-.endif
-.if !defined(WITH_TTF_BYTECODE_ENABLED)
-	@${ECHO}
-	@${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES"
-	@${ECHO} "if you like to use the Freetype library to"
-	@${ECHO} "render TTF fonts. Normally the TTF lib is"
-	@${ECHO} "not used to render fonts."
-	@${ECHO}
-	@${ECHO} "If you have licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479"
-	@${ECHO} "you can enable this option to get better"
-	@${ECHO} "quality of glyphs at small bitmap sizes."
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 450002
-	@${ECHO}
-	@${ECHO} "OS-VERSION ${OSVERSION} too low"
-	@${ECHO}
-	@${ECHO} "OO need some important libc_r and"
-	@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
-	@${ECHO} "RELEASE or 4.6 STABLE."
-	@${FALSE}
-.endif
-	@${ECHO}
-	@${ECHO} "NOTICE:"
-	@${ECHO}
-	@${ECHO} "To build Openoffice, you should have a lot"
-.if defined(WITH_DEBUG)
-	@${ECHO} "of free diskspace (~ 8GB)."
-.else
-	@${ECHO} "of free diskspace (~ 4GB)."
-.endif
-	@${ECHO}
-.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
-    (${OSVERSION} < 500000 && !defined(USE_GCC))
-	@${ECHO} "KERNEL CONFIGURATION:"
-	@${ECHO}
-	@${ECHO} "Openoffice needs a larger stack- and"
-	@${ECHO} "datasize to build. Check your limit"
-	@${ECHO} "settings and and put this in /boot/loader.conf"
-	@${ECHO} "if neccessary:"
-	@${ECHO}
-	@${ECHO} "kern.maxdsiz=\"1073741824\""
-	@${ECHO} "kern.maxssiz=\"268435456\""
-.endif
-	@${ECHO}
-.if ${OSVERSION} < 460002
-	@${ECHO} "REQUIRED SYSTEM PATCHES:"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO} "OO.org can crash if you enter a non existing path"
-	@${ECHO} "or URL in the location bar. To fix these crashes"
-	@${ECHO} "you need a uncommitted system patch for rtld:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460001
-	@${ECHO}
-	@${ECHO} "OO setup is broken on STABLE < 4.6"
-	@${ECHO} "including 4.6 RELEASE."
-	@${ECHO} "You'll need a system patch to solve"
-	@${ECHO} "this problem:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460002
-	@${ECHO}
-	@${ECHO} "OO.org soffice binary can deadlock. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO}
-	@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
-	@${ECHO}
-.endif
-.if !exists(/usr/include/langinfo.h)
-	@${ECHO}
-	@${ECHO} "langinfo.h is missing !"
-	@${ECHO}
-	@${ECHO} "Please upgrade to 4.6 RELEASE or"
-	@${ECHO} "4.6 STABLE."
-	@${ECHO}
-	@${FALSE}
-.endif
-
-post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
-	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
-	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@-${RM} ${WRKSRC}/../moz/zipped/*.zip
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
-.if defined(L10NHELP)
-	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
-	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
-.endif
-
-post-patch:
-	@${MAKE} patch-mozilla
-.if defined(WITH_TTF_BYTECODE_ENABLED)
-	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
-		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-			${ECHO_MSG} "===>   Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \
-		fi; \
-		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
-	fi
-.endif
-.if defined(WITH_DEBUG)
-	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
-		PATCHES_APPLIED="" ; \
-		for i in ${PATCHDIR}/debugpatch-*; do \
-			case $$i in \
-				*.orig|*.rej|*~) \
-					${ECHO_MSG} "===>   Ignoring patchfile $$i" ; \
-					;; \
-				*) \
-					if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-						${ECHO_MSG} "===>   Applying ${OPSYS} patch $$i" ; \
-					fi; \
-					if ${PATCH} ${PATCH_ARGS} < $$i ; then \
-						PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
-					else \
-						${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
-						if [ x"$$PATCHES_APPLIED" != x"" ]; then \
-							${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
-						fi; \
-						${FALSE} ; \
-					fi; \
-					;; \
-			esac; \
-		done; \
-	fi;
-.endif
-	@${ECHO_MSG} "===>  Find old malloc.h defines and fix them in ${PKGNAME} source"
-	@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
-		${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
-
-extract-mozilla:
-.if ! exists(${WRKDIR}/mozilla/Makefile)
-	@${ECHO_MSG} "===>  Extracting mozilla sub project"
-	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
-	
-.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment)
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
-.endif
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
-.endif
-	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
-
-patch-mozilla:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
-		${WRKDIR}/mozilla/files/
-	@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
-
-build-mozilla:
-.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
-	@${ECHO_MSG} "===>  Building mozilla sub project"
-.if defined(WITH_DEBUG)
-	@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
-	@${SED} -e 's|--disable-debug||' \
-		-e 's|--disable-cpp-rtti||' \
-		-e 's|--enable-strip||' \
-		< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
-.endif
-.if defined(USE_GCC)
-	@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
-.else
-	@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
-.endif
-	@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
-	@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
-	@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
-.endif
-
-install-mozilla:
-	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
-
-register-mozilla:
-.if exists(${WRKDIR}/mozilla-runtime)
-	@${RM} -rf ${WRKDIR}/mozilla-runtime
-.endif
-	@${MKDIR} ${WRKDIR}/mozilla-runtime
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
-	@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
-	@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
-	@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
-		&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom 
-	@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
-		${WRKDIR}/mozilla-runtime/components/xptitemp.dat
-	@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
-	@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
-		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
-
-mozilla:
-	@${MAKE} extract-mozilla
-	@${MAKE} patch-mozilla
-	@${MAKE} build-mozilla
-	@${MAKE} register-mozilla
-	@${MAKE} install-mozilla
-
-do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
-	@${MAKE} mozilla
-.endif
-.endif
-.endif
-.if exists(${WRKDIR}/.Xvfb.pid)
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.endif
-.if !defined(DISPLAY)
-	#
-	# This is a UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-.endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
-	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck 
-	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-.endif
-.if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
-.endif
-
-pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-
-do-install:
-.if !defined(DISPLAY)
-	#
-	# UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-.endif
-
-install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
-
-post-install:
-	@${ECHO_MSG} "===>  Add wrapper scripts";
-	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
-	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
-
-package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
-.if defined(LANG_SUFFIX)
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
-.else
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-1.0/distinfo b/editors/openoffice.org-1.0/distinfo
deleted file mode 100644
index 577a3ec9fd1f..000000000000
--- a/editors/openoffice.org-1.0/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-MD5 (openoffice/OOo_1.0.2_source.tar.bz2) = 8a82b4dbdd4e305b6f6db70ea65dce8c
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-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
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
-MD5 (openoffice/patch-translation-ru-1.0.2.bz2) = 47d7a3cb565361816d71968efa31754a
diff --git a/editors/openoffice.org-1.0/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-1.0/files/debugpatch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 96c651ce22c8..000000000000
--- a/editors/openoffice.org-1.0/files/debugpatch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../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
-@@ -902,6 +902,7 @@
- 
- void KillSetupDir()
- {
-+#if 0
-     DIR* pDir = opendir( strTmpPath );
-     struct dirent* pFile;
- 
-@@ -915,6 +916,10 @@
- 
-     chdir( strInitPath );
-     rmdir( strTmpPath );
-+#else
-+	fprintf(stderr, "\nLeaving behind temporary directory: %s\n",
-+	strTmpPath);
-+#endif
- }
- 
- void makeSymLink( char* s )
diff --git a/editors/openoffice.org-1.0/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-1.0/files/debugpatch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 52bd2b3d58d6..000000000000
--- a/editors/openoffice.org-1.0/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
-+++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
- 
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- 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
- 
- # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
diff --git a/editors/openoffice.org-1.0/files/oo_setup.resp b/editors/openoffice.org-1.0/files/oo_setup.resp
deleted file mode 100644
index 364169bdd695..000000000000
--- a/editors/openoffice.org-1.0/files/oo_setup.resp
+++ /dev/null
@@ -1,7 +0,0 @@
-[Environment]
-InstallationMode = INSTALL_NETWORK
-InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org1.0
-
-[Java]
-JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-1.0/files/openoffice-wrapper b/editors/openoffice.org-1.0/files/openoffice-wrapper
deleted file mode 100644
index 4c34abc864cc..000000000000
--- a/editors/openoffice.org-1.0/files/openoffice-wrapper
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.0/files/Attic/openoffice-wrapper,v 1.3 2003-01-21 17:09:39 mbr Exp $
-
-oopath=%%PREFIX%%/OpenOffice.org1.0/program/
-program=`echo $0 | sed -e 's|.*-||'`
-
-if [ ! $LANG ]; then
-	export LANG=%%LANG%%
-fi
-
-case $program in
-$0)
-	exec $oopath/soffice "$@"
-	;;
-	*)
-	exec $oopath/$program "$@"
-	;;
-esac
diff --git a/editors/openoffice.org-1.0/files/optpatch-freetype+patch b/editors/openoffice.org-1.0/files/optpatch-freetype+patch
deleted file mode 100644
index b426a8fb7fcc..000000000000
--- a/editors/openoffice.org-1.0/files/optpatch-freetype+patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Index: files/patch-freetype::patch
-===================================================================
-RCS file: files/patch-freetype::patch
-diff -N files/patch-freetype::patch
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-freetype::patch	4 Aug 2002 15:27:42 -0000
-@@ -0,0 +1,201 @@
-+diff -ur ../freetype/freetype-2.0.5.patch oo641d_patched/freetype/freetype-2.0.5.patch
-+--- ../freetype/freetype-2.0.5.patch	Fri Apr  5 21:07:34 2002
-++++ ../freetype/freetype-2.0.5.patch	Sat Mar  9 18:04:17 2002
-+@@ -1,118 +1,79 @@
-+-*** misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 14 00:44:33 2000
-+---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 63,69 ****
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+---- 63,69 ----
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+-*** misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Jun  7 19:36:17 2001
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 631,637 ****
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+---- 631,637 ----
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile -DPIC $pic_flag"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Mon Jan  1 18:25:21 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 1,7 ****
-+---- 1,9 ----
-+-  FT_USE_MODULE(autohint_module_class)
-+-  FT_USE_MODULE(cff_driver_class)
-+-  FT_USE_MODULE(t1cid_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(pcf_driver_class)
-+-+ */
-+-  FT_USE_MODULE(psaux_module_class)
-+-  FT_USE_MODULE(psnames_module_class)
-+-  FT_USE_MODULE(ft_raster1_renderer_class)
-+-***************
-+-*** 9,12 ****
-+---- 11,16 ----
-+-  FT_USE_MODULE(ft_smooth_renderer_class)
-+-  FT_USE_MODULE(tt_driver_class)
-+-  FT_USE_MODULE(t1_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(winfnt_driver_class)
-+-+ */
-+-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h	Tue Aug 21 10:50:45 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 70,76 ****
-+---- 70,79 ----
-+-    /*   All convenience functions are declared as such in their             */
-+-    /*   documentation.                                                      */
-+-    /*                                                                       */
-+-+ /*
-+-  #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-+ */
-+-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-  
-+-  
-+-    /*************************************************************************/
-+-***************
-+-*** 108,116 ****
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-- 
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+---- 111,121 ----
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-+ /*
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-+ */
-+-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig	Mon Jan  7 14:21:35 2002
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Mon Jan  7 14:21:40 2002
-+-***************
-+-*** 2251,2257 ****
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age + 1`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-+---- 2251,2257 ----
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk
-++--- misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:49:17 2001
-++@@ -63,7 +63,7 @@
-++ #   ANSI compliance.
-++ #
-++ ifndef CFLAGS
-++-  CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+++  CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-++ endif
-++ 
-++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh
-++--- misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:47:56 2001
-+++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:49:17 2001
-++@@ -631,7 +631,7 @@
-++     if test "$build_old_libs" = yes; then
-++       if test "$pic_mode" != yes; then
-++ 	# Don't build PIC code
-++-	command="$base_compile $srcfile"
-+++	command="$base_compile $srcfile -DPIC $pic_flag"
-++       else
-++ 	# All platforms use -DPIC, to notify preprocessed assembler code.
-++ 	command="$base_compile $srcfile $pic_flag -DPIC"
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:49:17 2001
-++@@ -1,7 +1,9 @@
-++ FT_USE_MODULE(autohint_module_class)
-++ FT_USE_MODULE(cff_driver_class)
-++ FT_USE_MODULE(t1cid_driver_class)
-+++/*
-++ FT_USE_MODULE(pcf_driver_class)
-+++*/
-++ FT_USE_MODULE(psaux_module_class)
-++ FT_USE_MODULE(psnames_module_class)
-++ FT_USE_MODULE(ft_raster1_renderer_class)
-++@@ -9,4 +11,6 @@
-++ FT_USE_MODULE(ft_smooth_renderer_class)
-++ FT_USE_MODULE(tt_driver_class)
-++ FT_USE_MODULE(t1_driver_class)
-+++/*
-++ FT_USE_MODULE(winfnt_driver_class)
-+++*/
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:51:15 2001
-++@@ -70,7 +70,10 @@
-++   /*   All convenience functions are declared as such in their             */
-++   /*   documentation.                                                      */
-++   /*                                                                       */
-+++/*
-++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+++*/
-+++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-++ 
-++ 
-++   /*************************************************************************/
-++@@ -108,8 +111,10 @@
-++   /*   use a vector `plotter' format that isn't supported when this        */
-++   /*   macro is undefined.                                                 */
-++   /*                                                                       */
-+++/*
-++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++-
-+++*/
-+++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++ 
-++   /*************************************************************************/
-++   /*                                                                       */
-++@@ -338,7 +343,7 @@
-++   /* By undefining this, you will only compile the code necessary to load  */
-++   /* TrueType glyphs without hinting.                                      */
-++   /*                                                                       */
-++-#undef  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-+++#define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-++ 
-++ 
-++   /*************************************************************************/
diff --git a/editors/openoffice.org-1.0/files/optpatch-vcl+util+makefile.pmk b/editors/openoffice.org-1.0/files/optpatch-vcl+util+makefile.pmk
deleted file mode 100644
index 41341ff0b4e8..000000000000
--- a/editors/openoffice.org-1.0/files/optpatch-vcl+util+makefile.pmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/util/makefile.pmk.orig	Mon Aug  5 01:39:41 2002
-+++ ../vcl/util/makefile.pmk	Mon Aug  5 01:40:03 2002
-@@ -64,7 +64,7 @@
- PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch
- PDBTARGET=vcl
- 
--.IF "$(OS)" != "MACOSX"
-+.IF "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- .IF "$(remote)" != ""
- USE_BUILTIN_RASTERIZER=true
- .ENDIF
diff --git a/editors/openoffice.org-1.0/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-1.0/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index b3f090de1f03..000000000000
--- a/editors/openoffice.org-1.0/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,132 +0,0 @@
---- ../berkeleydb/db-3.2.9.patch.orig	Sun Jan 19 14:58:19 2003
-+++ ../berkeleydb/db-3.2.9.patch	Sun Jan 19 15:00:02 2003
-@@ -45,52 +45,82 @@
-   CCLINK=		@MAKEFILE_CCLINK@
- *** misc/db-3.2.9/dist/configure	Wed Jan 24 10:16:18 2001
- --- misc/build/db-3.2.9/dist/configure	Tue Jan  7 11:37:05 2003
--***************
--*** 995,1000 ****
----- 995,1001 ----
--  	   CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
--  mpeix*)	   CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS"
--  	   LIBS="-lsocket -lsvipc $LIBS";;
--+ netbsd*)   optimize_def="-O2";;
--  osf*)	   CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
--  *qnx)	   cat >> confdefs.h <<\EOF
--  #define HAVE_QNX 1
--***************
--*** 1795,1800 ****
----- 1796,1803 ----
--  	case "$host_os" in
--  	solaris*)	JINCSUBDIRS="solaris";;
--  	linux*)		JINCSUBDIRS="linux genunix";;
--+ 	irix*)		JINCSUBDIRS="irix";;
--+ netbsd*)	JINCSUBDIRS="netbsd linux solaris genunix";;
--  	*)		JINCSUBDIRS="genunix";;
--  	esac
--  
-+@@ -984,9 +984,9 @@
-+ 	   optimize_def="-O2"
-+ 	   LIBS="-lipc $LIBS";;
-+ bsdi*)	   optimize_def="-O2";;
-+-freebsd*)  optimize_def="-O2"
-+-	   CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS"
-+-           LIBS="-pthread";;
-++freebsd*)  optimize_def="-O"
-++	   CPPFLAGS="$PTHREAD_CFLAGS $CPPFLAGS"
-++           LIBS="$PTHREAD_LIBS";;
-+ hpux*)	   CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
-+ irix*)	   optimize_def="-O2"
-+ 	   CPPFLAGS="-D_SGI_MP_SOURCE $CPPFLAGS";;
-+@@ -995,6 +995,7 @@
-+ 	   CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
-+ mpeix*)	   CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS"
-+ 	   LIBS="-lsocket -lsvipc $LIBS";;
-++netbsd*)   optimize_def="-O2";;
-+ osf*)	   CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
-+ *qnx)	   cat >> confdefs.h <<\EOF
-+ #define HAVE_QNX 1
-+@@ -1795,6 +1796,9 @@
-+ 	case "$host_os" in
-+ 	solaris*)	JINCSUBDIRS="solaris";;
-+ 	linux*)		JINCSUBDIRS="linux genunix";;
-++	irix*)		JINCSUBDIRS="irix";;
-++	netbsd*)        JINCSUBDIRS="netbsd linux solaris genunix";;
-++	freebsd*)	JINCSUBDIRS="freebsd linux solaris genunix";;
-+ 	*)		JINCSUBDIRS="genunix";;
-+ 	esac
-+ 
- *** misc/db-3.2.9/dist/ltconfig	Fri Oct 13 16:23:00 2000
- --- misc/build/db-3.2.9/dist/ltconfig	Tue Jan  7 11:37:05 2003
--***************
--*** 1194,1204 ****
--  
--    netbsd*)
--      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
---       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
---       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
---     else
--        archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
--        # can we support soname and/or expsyms with a.out? -oliva
--      fi
--      ;;
--  
----- 1194,1205 ----
--  
--    netbsd*)
--      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--        archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
--        # can we support soname and/or expsyms with a.out? -oliva
--+     else
--+       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
--+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--+       need_version=no
--      fi
--      ;;
--  
-+@@ -1194,11 +1194,12 @@
-+ 
-+   netbsd*)
-+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+-      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+-    else
-+       archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-+       # can we support soname and/or expsyms with a.out? -oliva
-++    else
-++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-++      need_version=no
-+     fi
-+     ;;
-+ 
-+@@ -1365,10 +1366,13 @@
-+ 
-+   # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+   freebsd*)
-+-    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts'
-++    archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-++    archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname \
-++	${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+     hardcode_libdir_flag_spec='-R$libdir'
-+     hardcode_direct=yes
-+     hardcode_shlibpath_var=no
-++    need_version=no
-+     ;;
-+ 
-+   hpux9* | hpux10* | hpux11*)
-+@@ -2020,6 +2024,14 @@
-+     soname_spec='${libname}${release}.so$major'
-+     dynamic_linker='NetBSD ld.elf_so'
-+   fi
-++  shlibpath_var=LD_LIBRARY_PATH
-++  ;;
-++
-++freebsd*)
-++  version_type=sunos
-++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-++  soname_spec='${libname}${release}.so$major'
-++  dynamic_linker='FreeBSD ld.elf_so'
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
diff --git a/editors/openoffice.org-1.0/files/patch-bridges+prj+build.lst b/editors/openoffice.org-1.0/files/patch-bridges+prj+build.lst
deleted file mode 100644
index cd979b062a34..000000000000
--- a/editors/openoffice.org-1.0/files/patch-bridges+prj+build.lst
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../bridges/prj/build.lst.orig	Tue Mar 19 22:06:50 2002
-+++ ../bridges/prj/build.lst	Tue Jun  4 12:24:46 2002
-@@ -9,6 +9,8 @@
- br	bridges\source\cpp_uno\gcc2_linux_intel	nmake	-	u	br_gccli br_unotypes NULL
- br	bridges\source\cpp_uno\gcc3_linux_intel	nmake	-	u	br_gcc3li 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\cpp_uno\gcc2_linux_powerpc	nmake	-	u	br_gcclp br_unotypes NULL
- br	bridges\source\cpp_uno\gcc2_macosx_powerpc			nmake	-	u	br_gccmacoxp br_unotypes NULL
- br	bridges\source\cpp_uno\cc50_solaris_sparc			nmake	-	u	br_cc50sols br_unotypes NULL
diff --git a/editors/openoffice.org-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk b/editors/openoffice.org-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk
deleted file mode 100644
index 512a57e75b9b..000000000000
--- a/editors/openoffice.org-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk.orig	Fri May 31 10:22:18 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk	Fri May 31 10:22:46 2002
-@@ -76,7 +76,7 @@
- 
- # --- Files --------------------------------------------------------
- 
--.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI"
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-dwarf2"
- 
- CFLAGSNOOPT=-O0
- NOOPTFILES=$(SLO)$/uno2cpp.obj
diff --git a/editors/openoffice.org-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj b/editors/openoffice.org-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
deleted file mode 100644
index 95874155c7db..000000000000
--- a/editors/openoffice.org-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
+++ /dev/null
@@ -1,1735 +0,0 @@
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx	Tue Jun  4 10:49:43 2002
-@@ -0,0 +1,615 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( (2*(nSize+1)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + (2*(nSize+1)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[(nPos << 1) + 2 ] = NULL;
-+		pvft[(nPos << 1) + 3 ] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__sjthrow();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx	Tue Jun  4 10:49:36 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_freebsd_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __sjthrow(void) __attribute__ ((__noreturn__));
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk	Tue Jun  4 12:20:58 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.1 $
-+#
-+#   last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-sjlj"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,473 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs,
-+									  sal_Int32 nThisOffset )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $1, %%eax\n\t" // first entry is reserved
-+		"shl  $3, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov %4, %%eax\n\t"
-+		"movswl (%%edx), %%ecx\n\t"
-+                "add  %%esp, %%eax\n\t"
-+                "add  %%ecx, (%%eax)\n\t"
-+		"mov  4(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %5\n\t"
-+ 		"mov  %%edx, %6\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
-+                    "m"(nThisOffset), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+
-+        sal_Int32 nThisOffset = 0;
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack  += sizeof(void *);
-+                        nThisOffset = sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32),
-+			nThisOffset);
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_freebsd_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice.org-1.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-1.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
deleted file mode 100644
index 20b13ea25cb2..000000000000
--- a/editors/openoffice.org-1.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ /dev/null
@@ -1,1608 +0,0 @@
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,594 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/26 07:22:57 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <hash_map>
-+
-+#include <rtl/alloc.h>
-+#include <osl/mutex.hxx>
-+
-+#include <uno/data.h>
-+#include <typelib/typedescription.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+    {
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+    }
-+    
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("illegal vtable index!"),
-+            (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+    
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("no member description found!"),
-+            (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+	typelib_TypeClass aType = cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+    
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+    typedef ::std::hash_map< OUString, void *, OUStringHash > t_classdata_map;
-+	t_classdata_map m_map;
-+	Mutex m_mutex;
-+    
-+public:
-+	void const * get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () );
-+    
-+	inline MediateClassData() SAL_THROW( () )
-+        {}
-+	~MediateClassData() SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData() SAL_THROW( () )
-+{
-+	OSL_TRACE( "> calling ~MediateClassData(): freeing mediate vtables." );
-+	
-+	for ( t_classdata_map::const_iterator iPos( m_map.begin() ); iPos != m_map.end(); ++iPos )
-+	{
-+		::rtl_freeMemory( iPos->second );
-+	}
-+}
-+//--------------------------------------------------------------------------------------------------
-+static inline void codeSnippet( char * code, sal_uInt32 vtable_pos, bool simple_ret_type ) SAL_THROW( () )
-+{
-+    if (! simple_ret_type)
-+        vtable_pos |= 0x80000000;
-+    OSL_ASSERT( sizeof (long) == 4 );
-+    // mov $nPos, %eax
-+    *code++ = 0xb8;
-+    *(long *)code = vtable_pos;
-+    code += sizeof (long);
-+    // mov %esp, %edx
-+    *code++ = 0x89;
-+    *code++ = 0xe2;
-+    // jmp cpp_vtable_call
-+    *code++ = 0xe9;
-+    *(long *)code = ((char *)cpp_vtable_call) - code - sizeof (long);
-+}
-+//__________________________________________________________________________________________________
-+void const * MediateClassData::get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () )
-+{
-+    void * buffer;
-+    
-+    // avoiding locked counts
-+    OUString const & unoName = *(OUString const *)&((typelib_TypeDescription *)pTD)->pTypeName;
-+    {
-+	MutexGuard aGuard( m_mutex );
-+	t_classdata_map::const_iterator iFind( m_map.find( unoName ) );
-+	if (iFind == m_map.end())
-+    {
-+        // create new vtable
-+        sal_Int32 nSlots = pTD->nMapFunctionIndexToMemberIndex;
-+        buffer = ::rtl_allocateMemory( ((2+ nSlots) * sizeof (void *)) + (nSlots *20) );
-+        
-+        ::std::pair< t_classdata_map::iterator, bool > insertion(
-+            m_map.insert( t_classdata_map::value_type( unoName, buffer ) ) );
-+        OSL_ENSURE( insertion.second, "### inserting new vtable buffer failed?!" );
-+        
-+        void ** slots = (void **)buffer;
-+        *slots++ = 0;
-+        *slots++ = 0; // rtti
-+        char * code = (char *)(slots + nSlots);
-+        
-+        sal_uInt32 vtable_pos = 0;
-+        sal_Int32 nAllMembers = pTD->nAllMembers;
-+        typelib_TypeDescriptionReference ** ppAllMembers = pTD->ppAllMembers;
-+        for ( sal_Int32 nPos = 0; nPos < nAllMembers; ++nPos )
-+        {
-+            typelib_TypeDescription * pTD = 0;
-+            TYPELIB_DANGER_GET( &pTD, ppAllMembers[ nPos ] );
-+            OSL_ASSERT( pTD );
-+            if (typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass)
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceAttributeTypeDescription *)pTD)->pAttributeTypeRef->eTypeClass );
-+                // get method
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+                if (! ((typelib_InterfaceAttributeTypeDescription *)pTD)->bReadOnly)
-+                {
-+                    // set method
-+                    *slots++ = code;
-+                    codeSnippet( code, vtable_pos++, true );
-+                    code += 20;
-+                }
-+            }
-+            else
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceMethodTypeDescription *)pTD)->pReturnTypeRef->eTypeClass );
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+            }
-+            TYPELIB_DANGER_RELEASE( pTD );
-+        }
-+        OSL_ASSERT( vtable_pos == nSlots );
-+    }
-+    else
-+    {
-+        buffer = iFind->second;
-+    }
-+    }
-+    
-+    return ((void **)buffer +2);
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(void const **)pCppI = s_pMediateClassData->get_vtable( pTypeDescr );
-+}
-+
-+}
-+
-+extern "C"
-+{
-+//##################################################################################################
-+sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload(
-+        &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment(
-+        pCppEnv );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping(
-+        ppMapping, pFrom, pTo );
-+}
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,317 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.6 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/11/08 12:35:28 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdio.h>
-+#include <dlfcn.h>
-+#include <cxxabi.h>
-+#include <hash_map>
-+
-+#include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
-+#include <osl/diagnose.h>
-+#include <osl/mutex.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <typelib/typedescription.hxx>
-+#include <uno/any2.h>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::std;
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+using namespace ::__cxxabiv1;
-+
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+    
-+void dummy_can_throw_anything( char const * )
-+{
-+}
-+
-+//==================================================================================================
-+static OUString toUNOname( char const * p ) SAL_THROW( () )
-+{
-+#ifdef DEBUG
-+    char const * start = p;
-+#endif
-+    
-+    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-+    
-+	OUStringBuffer buf( 64 );
-+    OSL_ASSERT( 'N' == *p );
-+    ++p; // skip N
-+    
-+    while ('E' != *p)
-+    {
-+        // read chars count
-+        long n = (*p++ - '0');
-+        while ('0' <= *p && '9' >= *p)
-+        {
-+            n *= 10;
-+            n += (*p++ - '0');
-+        }
-+        buf.appendAscii( p, n );
-+        p += n;
-+        if ('E' != *p)
-+            buf.append( (sal_Unicode)'.' );
-+    }
-+    
-+#ifdef DEBUG
-+    OUString ret( buf.makeStringAndClear() );
-+    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
-+    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
-+    return ret;
-+#else
-+    return buf.makeStringAndClear();
-+#endif
-+}
-+
-+//==================================================================================================
-+class RTTI
-+{
-+    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-+    
-+    Mutex m_mutex;
-+	t_rtti_map m_rttis;
-+    t_rtti_map m_generatedRttis;
-+
-+    void * m_hApp;
-+    
-+public:
-+    RTTI() SAL_THROW( () );
-+    ~RTTI() SAL_THROW( () );
-+    
-+    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+RTTI::RTTI() SAL_THROW( () )
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+{
-+}
-+//__________________________________________________________________________________________________
-+RTTI::~RTTI() SAL_THROW( () )
-+{
-+    dlclose( m_hApp );
-+}
-+
-+//__________________________________________________________________________________________________
-+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
-+{
-+    type_info * rtti;
-+    
-+    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-+    
-+    MutexGuard guard( m_mutex );
-+    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-+    if (iFind == m_rttis.end())
-+    {
-+        // RTTI symbol
-+        OStringBuffer buf( 64 );
-+        buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
-+        sal_Int32 index = 0;
-+        do
-+        {
-+            OUString token( unoName.getToken( 0, '.', index ) );
-+            buf.append( token.getLength() );
-+            OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) );
-+            buf.append( c_token );
-+        }
-+        while (index >= 0);
-+        buf.append( 'E' );
-+        
-+        OString symName( buf.makeStringAndClear() );
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+
-+        if (rtti)
-+        {
-+            pair< t_rtti_map::iterator, bool > insertion(
-+                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+            OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
-+        }
-+        else
-+        {
-+            // try to lookup the symbol in the generated rtti map
-+            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
-+            if (iFind == m_generatedRttis.end())
-+            {
-+                // we must generate it !
-+                // symbol and rtti-name is nearly identical,
-+                // the symbol is prefixed with _ZTI
-+                char const * rttiName = symName.getStr() +4;
-+#ifdef DEBUG
-+                fprintf( stderr,"generated rtti for %s\n", rttiName );
-+#endif
-+                if (pTypeDescr->pBaseTypeDescription)
-+                {
-+                    // ensure availability of base
-+                    type_info * base_rtti = getRTTI(
-+                        (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
-+                    rtti = new __si_class_type_info(
-+                        strdup( rttiName ), (__class_type_info *)base_rtti );
-+                }
-+                else
-+                {
-+                    // this class has no base class
-+                    rtti = new __class_type_info( strdup( rttiName ) );
-+                }
-+                
-+                pair< t_rtti_map::iterator, bool > insertion(
-+                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+                OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
-+            }
-+            else // taking already generated rtti
-+            {
-+                rtti = iFind->second;
-+            }
-+        }
-+    }
-+    else
-+    {
-+        rtti = iFind->second;
-+    }
-+    
-+    return rtti;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+static void deleteException( void * pExc )
-+{
-+    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-+    typelib_TypeDescription * pTD = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+    ::typelib_typedescription_getByName( &pTD, unoName.pData );
-+    OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
-+    if (pTD)
-+    {
-+		::uno_destructData( pExc, pTD, cpp_release );
-+		::typelib_typedescription_release( pTD );
-+	}
-+}
-+
-+//==================================================================================================
-+void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+    void * pCppExc;
-+    type_info * rtti;
-+
-+    {
-+    // construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-+    OSL_ASSERT( pTypeDescr );
-+    if (! pTypeDescr)
-+        terminate();
-+    
-+	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-+	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	::uno_any_destruct( pUnoExc, 0 );
-+    // avoiding locked counts
-+    static RTTI * s_rtti = 0;
-+    if (! s_rtti)
-+    {
-+        MutexGuard guard( Mutex::getGlobalMutex() );
-+        if (! s_rtti)
-+        {
-+#ifdef LEAK_STATIC_DATA
-+            s_rtti = new RTTI();
-+#else
-+            static RTTI rtti_data;
-+            s_rtti = &rtti_data;
-+#endif
-+        }
-+    }
-+	rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
-+    TYPELIB_DANGER_RELEASE( pTypeDescr );
-+    OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-+    if (! rtti)
-+        terminate();
-+    }
-+    
-+	__cxa_throw( pCppExc, rtti, deleteException );
-+}
-+
-+//==================================================================================================
-+void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
-+{
-+    OSL_ENSURE( header, "### no exception header!!!" );
-+    if (! header)
-+        terminate();
-+    
-+	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 );
-+}
-+
-+}
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Mon Mar  4 21:24:53 2002
-@@ -0,0 +1,112 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.2 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc3_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
-+
-+.IF "$(cppu_no_leak)" == ""
-+CFLAGS += -DLEAK_STATIC_DATA
-+.ENDIF
-+
-+CFLAGSNOOPT=-O0
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB=i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB)			\
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,120 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: share.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/19 13:32:39 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <typeinfo>
-+#include <exception>
-+#include <cstddef>
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
-+
-+struct _Unwind_Exception
-+{
-+    unsigned exception_class __attribute__((__mode__(__DI__)));
-+    void * exception_cleanup;
-+    unsigned private_1 __attribute__((__mode__(__word__)));
-+    unsigned private_2 __attribute__((__mode__(__word__)));
-+} __attribute__((__aligned__));
-+
-+struct __cxa_exception
-+{ 
-+    ::std::type_info *exceptionType;
-+    void (*exceptionDestructor)(void *); 
-+    
-+    ::std::unexpected_handler unexpectedHandler;
-+    ::std::terminate_handler terminateHandler;
-+    
-+    __cxa_exception *nextException;
-+    
-+    int handlerCount;
-+    
-+    int handlerSwitchValue;
-+    const unsigned char *actionRecord;
-+    const unsigned char *languageSpecificData;
-+    void *catchTemp;
-+    void *adjustedPtr;
-+    
-+    _Unwind_Exception unwindHeader;
-+};    
-+
-+extern "C" void *__cxa_allocate_exception(
-+    std::size_t thrown_size ) throw();
-+extern "C" void __cxa_throw (
-+    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
-+
-+struct __cxa_eh_globals
-+{
-+    __cxa_exception *caughtExceptions;
-+    unsigned int uncaughtExceptions;
-+};
-+extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-+
-+// -----
-+
-+//==================================================================================================
-+void raiseException(
-+    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+//==================================================================================================
-+void fillUnoException(
-+    __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,450 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2001/10/31 14:46:47 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <rtl/alloc.h>
-+
-+#include <uno/data.h>
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+void dummy_can_throw_anything( char const * );
-+
-+//==================================================================================================
-+static void callVirtualMethod(
-+    void * pThis,
-+    sal_Int32 nVtableIndex,
-+    void * pRegisterReturn,
-+    typelib_TypeClass eReturnType,
-+    sal_Int32 * pStackLongs,
-+    sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+    
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+    
-+    // never called
-+    if (! pThis) dummy_can_throw_anything("xxx"); // address something
-+    
-+	volatile long edx = 0, eax = 0; // for register returns
-+	asm volatile (
-+		// copy values
-+		"mov   %0, %%eax\n\t"
-+		"mov   %%eax, %%edx\n\t"
-+		"dec   %%edx\n\t"
-+		"shl   $2, %%edx\n\t"
-+		"add   %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"pushl 0(%%edx)\n\t"
-+		"sub   $4, %%edx\n\t"
-+		"dec   %%eax\n\t"
-+		"jne   Lcopy\n\t"
-+		// do the actual call
-+		"mov   %2, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"mov   %3, %%eax\n\t"
-+		"shl   $2, %%eax\n\t"
-+		"add   %%eax, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"call  *%%edx\n\t"
-+		// save return registers
-+ 		"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"
-+		:
-+        : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
-+        : "eax", "edx" );
-+    
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch (...)
-+ 	{
-+  		// fill uno exception
-+		fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+        
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice.org-1.0/files/patch-bridges+source+prot_uno+makefile.mk b/editors/openoffice.org-1.0/files/patch-bridges+source+prot_uno+makefile.mk
deleted file mode 100644
index 595ea6cb5ac9..000000000000
--- a/editors/openoffice.org-1.0/files/patch-bridges+source+prot_uno+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../bridges/source/prot_uno/makefile.mk.orig	Fri Oct 26 09:22:57 2001
-+++ ../bridges/source/prot_uno/makefile.mk	Wed Mar  6 15:45:09 2002
-@@ -88,8 +88,8 @@
- SHL1VERSIONMAP=..$/bridge_exports.map
- 
- SHL1STDLIBS= \
--	$(CPPULIB)		\
--	$(SALLIB)
-+	$(SALLIB) \
-+	$(CPPULIB)
- 
- DEF1NAME=$(SHL1TARGET)
- 
diff --git a/editors/openoffice.org-1.0/files/patch-chaos+util+makefile.mk b/editors/openoffice.org-1.0/files/patch-chaos+util+makefile.mk
deleted file mode 100644
index ba211f9044c4..000000000000
--- a/editors/openoffice.org-1.0/files/patch-chaos+util+makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../chaos/util/makefile.mk.orig	Wed Jun 12 01:16:35 2002
-+++ ../chaos/util/makefile.mk	Wed Jun 12 01:16:47 2002
-@@ -100,7 +100,7 @@
- 
- SHL1TARGET=	cnt$(UPD)$(DLLPOSTFIX)
- SHL1IMPLIB=	i$(TARGET)
--.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
-+.IF "$(OS)"=="MACOSX"
- #SHL1VERSIONMAP=	exports.$(DLLPOSTFIX).map
- .ELSE
- SHL1VERSIONMAP=	exports.map
diff --git a/editors/openoffice.org-1.0/files/patch-comphelper+util+makefile.mk b/editors/openoffice.org-1.0/files/patch-comphelper+util+makefile.mk
deleted file mode 100644
index 997719c43dd8..000000000000
--- a/editors/openoffice.org-1.0/files/patch-comphelper+util+makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../comphelper/util/makefile.mk.orig	Tue Feb 19 13:26:37 2002
-+++ ../comphelper/util/makefile.mk	Wed Apr  3 00:16:43 2002
-@@ -85,11 +85,11 @@
- 
- SHL1TARGET=$(COMPHLP_TARGET)$(COMPHLP_MAJOR)
- SHL1STDLIBS=\
-+	$(SALLIB)					\
- 	$(CPPULIB)					\
- 	$(CPPUHELPERLIB)			\
- 	$(VOSLIB)					\
- 	$(OSLLIB)					\
--	$(SALLIB)					\
- 	$(CPPRTLLIB)
- 
- .IF "$(OS)$(CPU)"=="SOLARISS"
diff --git a/editors/openoffice.org-1.0/files/patch-config_office+configure.in b/editors/openoffice.org-1.0/files/patch-config_office+configure.in
deleted file mode 100644
index 94d4b1cf08dc..000000000000
--- a/editors/openoffice.org-1.0/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,85 +0,0 @@
---- configure.in.orig	Thu Jan 16 13:42:46 2003
-+++ configure.in	Sat Jan 25 18:24:08 2003
-@@ -89,6 +89,12 @@
-  
-                           Usage: --enable-check-only=yes
- ],,)
-+AC_ARG_ENABLE(linuxjdk,
-+[  --enable-linuxjdk         Use this option option if you like to use
-+                          the linux-jdk instead of the native jdk.
-+                          
-+                          Usage: --enable-linuxjdk
-+],,)
- AC_ARG_ENABLE(macos9,
- [  --enable-macos9         Use this option option if you want to generate a
-                           macos9 environment on macosx.
-@@ -352,10 +358,7 @@
-    if test "$COMPATH" != "NO_GCC"; then
-       AC_MSG_RESULT([checked (gcc $_gcc_version)])
-    fi
--
--dnl Set the include paths
--   _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include 
--fi  
-+fi
- 
- dnl ===================================================================
- dnl Search all the common names for GNU make
-@@ -553,14 +556,27 @@
- 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`
-+   _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
-+   _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - \
-+	| $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1`
- dnl This is the original code...
--dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include 
-+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
-@@ -1222,12 +1238,16 @@
- else
-    with_lang=","$with_lang","
- fi
--
- if test -n "$enable_debug"; then
-    ENABLE_DEBUG="TRUE"
- else
-    ENABLE_DEBUG="FALSE"
- fi
-+if test -n "$enable_linuxjdk"; then
-+   USE_LINUXJDK="TRUE"
-+else
-+   USE_LINUXJDK="FALSE"
-+fi
- 
- dnl ===================================================================
- dnl Bits to substitute into set_soenv.in
-@@ -1272,6 +1292,7 @@
- AC_SUBST(PTHREAD_CFLAGS)
- AC_SUBST(PTHREAD_LIBS)
- AC_SUBST(ENABLE_DEBUG)
-+AC_SUBST(USE_LINUXJDK)
- 
- AC_OUTPUT([set_soenv])
- 
diff --git a/editors/openoffice.org-1.0/files/patch-config_office+setsoenv.in b/editors/openoffice.org-1.0/files/patch-config_office+setsoenv.in
deleted file mode 100644
index 8f159960ab19..000000000000
--- a/editors/openoffice.org-1.0/files/patch-config_office+setsoenv.in
+++ /dev/null
@@ -1,44 +0,0 @@
---- set_soenv.in.orig	Thu Jan  9 14:41:31 2003
-+++ set_soenv.in	Sat Jan 25 18:27:08 2003
-@@ -52,8 +52,8 @@
- #-------------------------------------------------
- #
- # Platform independent constant values.
--my @LANGUAGES = ("ARAB", "CHINSIM", "CHINTRAD", "DAN", "DTCH", "ENUS", "FREN", "GREEK", "ITAL",
--"JAPN", "KOREAN", "POL", "PORT", "RUSS", "SPAN", "SWED", "TURK" ); 
-+my @LANGUAGES = ("ARAB", "CHINSIM", "CHINTRAD", "DAN", "DTCH", "ENUS", "FREN", "GREEK", "GER",
-+"ITAL", "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, 
-      $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, 
-@@ -88,7 +88,7 @@
-      $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
-      $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME,
-      $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
--     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG );
-+     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $USE_LINUXJDK);
- #
- #-------------------------------------------
- # IId. Declaring the aliases.
-@@ -141,6 +141,7 @@
- $CXX		= '@CXX@';          # C++ compiler
- $EXCEPTIONS	= '@EXCEPTIONS@';   # Exception handling type
- $ENABLE_DEBUG	= '@ENABLE_DEBUG@';  # Enable a debug build
-+$USE_LINUXJDK	= '@USE_LINUXJDK@';  # Enable a debug build
- $WRAPCMD	= "";				# Wrapper (only for winnt)
- 
- #
-@@ -1265,7 +1266,12 @@
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
- }
- elsif ($platform eq "$FreeBSD")
--{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+{
-+   if ($USE_LINUXJDK eq "TRUE") {
-+   	$SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
-+   } else {
-+   	$SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+   }
- }
- elsif ($platform eq "$NetBSD")
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
diff --git a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+adabas+makefile.mk b/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+adabas+makefile.mk
deleted file mode 100644
index fdab3ab41e7d..000000000000
--- a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+adabas+makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../connectivity/source/drivers/adabas/makefile.mk.orig	Wed Jun 12 01:06:20 2002
-+++ ../connectivity/source/drivers/adabas/makefile.mk	Wed Jun 12 01:06:34 2002
-@@ -104,7 +104,7 @@
- 		$(SLO)$/BResultSetMetaData.obj			\
-         $(SLO)$/BResultSet.obj
- 		
--.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
-+.IF "$(OS)"=="MACOSX"
- #SHL1VERSIONMAP=$(ADABAS_TARGET).$(DLLPOSTFIX).map
- .ELSE      
- SHL1VERSIONMAP=$(ADABAS_TARGET).map
diff --git a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+calc+makefile.mk b/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+calc+makefile.mk
deleted file mode 100644
index 043038a77f4b..000000000000
--- a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+calc+makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../connectivity/source/drivers/calc/makefile.mk.orig	Wed Jun 12 01:36:16 2002
-+++ ../connectivity/source/drivers/calc/makefile.mk	Wed Jun 12 01:36:22 2002
-@@ -92,9 +92,7 @@
- 	$(SLO)$/CDriver.obj
- 
- .IF "$(OS)"!="MACOSX"
--.IF "$(OS)"!="FREEBSD"
- SHL1VERSIONMAP= $(TARGET).map
--.ENDIF
- .ENDIF
- # --- Library -----------------------------------
- 
diff --git a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+dbase+makefile.mk b/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+dbase+makefile.mk
deleted file mode 100644
index 029f04a655c7..000000000000
--- a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+dbase+makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../connectivity/source/drivers/dbase/makefile.mk.orig	Wed Jun 12 01:26:39 2002
-+++ ../connectivity/source/drivers/dbase/makefile.mk	Wed Jun 12 01:26:48 2002
-@@ -116,7 +116,7 @@
- 	$(SLO)$/DDriver.obj
- 
- 
--.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD"
-+.IF "$(OS)"=="MACOSX"
- #SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map
- .ELSE      
- SHL1VERSIONMAP=$(TARGET).map
diff --git a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+file+makefile.mk b/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+file+makefile.mk
deleted file mode 100644
index 8776a49f52f1..000000000000
--- a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+file+makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../connectivity/source/drivers/file/makefile.mk.orig	Wed Jun 12 01:12:42 2002
-+++ ../connectivity/source/drivers/file/makefile.mk	Wed Jun 12 01:12:44 2002
-@@ -112,7 +112,7 @@
- 	$(SLO)$/fanalyzer.obj			\
- 	$(SLO)$/fcomp.obj
- 
--.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD"
-+.IF "$(OS)"=="MACOSX"
- #SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map
- .ELSE      
- #SHL1VERSIONMAP=$(TARGET).map
diff --git a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+flat+makefile.mk b/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+flat+makefile.mk
deleted file mode 100644
index d6af428b7794..000000000000
--- a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+flat+makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../connectivity/source/drivers/flat/makefile.mk.orig	Wed Jun 12 01:14:43 2002
-+++ ../connectivity/source/drivers/flat/makefile.mk	Wed Jun 12 01:15:03 2002
-@@ -104,7 +104,7 @@
- 	$(SLO)$/EDriver.obj
- 
- 
--.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD"
-+.IF "$(OS)"=="MACOSX"
- #SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map
- .ELSE      
- SHL1VERSIONMAP=$(TARGET).map
diff --git a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+jdbc+makefile.mk b/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+jdbc+makefile.mk
deleted file mode 100644
index 1801ae3083c4..000000000000
--- a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+jdbc+makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../connectivity/source/drivers/jdbc/makefile.mk.orig	Wed Jun 12 00:57:12 2002
-+++ ../connectivity/source/drivers/jdbc/makefile.mk	Wed Jun 12 00:57:21 2002
-@@ -111,7 +111,7 @@
- 		$(SLO)$/tools.obj
- 		
- 
--.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD"
-+.IF "$(OS)"=="MACOSX"
- #SHL1VERSIONMAP=$(JDBC_TARGET).$(DLLPOSTFIX).map
- .ELSE      
- SHL1VERSIONMAP=$(JDBC_TARGET).map
diff --git a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+mozab+makefile.mk b/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+mozab+makefile.mk
deleted file mode 100644
index f422040f99d4..000000000000
--- a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+mozab+makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../connectivity/source/drivers/mozab/makefile.mk.orig	Wed Jun 12 01:37:30 2002
-+++ ../connectivity/source/drivers/mozab/makefile.mk	Wed Jun 12 01:37:47 2002
-@@ -107,9 +107,7 @@
- # --- MOZAB BASE Library -----------------------------------
- 
- SHL1VERSIONMAP= $(TARGET).map
--.IF "$(OS)"!="FREEBSD"
- SHL1TARGET=	$(TARGET)$(MOZAB_MAJOR)
--.ENDIF
- SHL1OBJS=$(SLOFILES)
- SHL1STDLIBS=\
- 	$(CPPULIB)					\
diff --git a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
deleted file mode 100644
index 3601766ee561..000000000000
--- a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../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
-@@ -64,8 +64,8 @@
- #mozilla specific stuff.
- MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
- MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
--#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
--#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
-+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
-+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
- #End of mozilla specific stuff.
- 
- PRJ=..$/..$/..$/..
-@@ -107,7 +107,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -123,7 +123,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -141,7 +141,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS+=	    -DMOZILLA_CLIENT \
-             -DOSTYPE=\"Linux2.2.14-5\" -DOJI
- .IF "$(OS)" == "LINUX"
-@@ -157,6 +157,13 @@
-             -fno-rtti -Wall -Wconversion -Wpointer-arith \
-             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-             -Wno-long-long 
-+CDEFS     += -DTRACING
-+.ELIF "$(OS)" == "FREEBSD"
-+CFLAGS +=   -fPIC
-+CFLAGSCXX += \
-+            -fno-rtti -Wall -Wconversion -Wpointer-arith \
-+            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-+            -Wno-long-long -pthread 
- CDEFS     += -DTRACING
- .ENDIF
- .ENDIF
diff --git a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk b/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
deleted file mode 100644
index b63d2a25f184..000000000000
--- a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-1.0/files/patch-cppu+inc+cppu+macros.hxx b/editors/openoffice.org-1.0/files/patch-cppu+inc+cppu+macros.hxx
deleted file mode 100644
index dad8a1f99a5c..000000000000
--- a/editors/openoffice.org-1.0/files/patch-cppu+inc+cppu+macros.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../cppu/inc/cppu/macros.hxx.kan	Wed Jul 24 23:28:55 2002
-+++ ../cppu/inc/cppu/macros.hxx	Wed Jul 24 23:29:45 2002
-@@ -76,7 +76,7 @@
-     the struct inherits from a base struct the first member is no double or [unsigned] long long.
-     @internal
- */
--#if defined(__GNUC__) && defined(LINUX) && (defined(INTEL) || defined(POWERPC)) && (__GNUC__ == 3)
-+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && (defined(INTEL) || defined(POWERPC)) && (__GNUC__ == 3)
- #define CPPU_GCC3_ALIGN( base_struct ) __attribute__ ((aligned (__alignof__ (base_struct))))
- #else
- #define CPPU_GCC3_ALIGN( base_struct )
diff --git a/editors/openoffice.org-1.0/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-1.0/files/patch-cppu+inc+uno+lbnames.h
deleted file mode 100644
index cb43c2d165e9..000000000000
--- a/editors/openoffice.org-1.0/files/patch-cppu+inc+uno+lbnames.h
+++ /dev/null
@@ -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."
diff --git a/editors/openoffice.org-1.0/files/patch-cppu+prj+build.lst b/editors/openoffice.org-1.0/files/patch-cppu+prj+build.lst
deleted file mode 100644
index 78fd210a1193..000000000000
--- a/editors/openoffice.org-1.0/files/patch-cppu+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.0/files/patch-cppu+source+uno+data.cxx b/editors/openoffice.org-1.0/files/patch-cppu+source+uno+data.cxx
deleted file mode 100644
index 9c0e34bfb60b..000000000000
--- a/editors/openoffice.org-1.0/files/patch-cppu+source+uno+data.cxx
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../cppu/source/uno/data.cxx.kan	Wed Jul 24 23:39:23 2002
-+++ ../cppu/source/uno/data.cxx	Wed Jul 24 23:38:49 2002
-@@ -295,7 +295,7 @@
- #	pragma pack(8)
- #endif
- 
--#if defined(__GNUC__) && defined(LINUX) && defined(INTEL)
-+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && defined(INTEL)
- #define MAX_ALIGNMENT_4
- #endif
- 
-@@ -307,7 +307,7 @@
-     if (OFFSET_OF(s, m) != n) { fprintf( stderr, "### OFFSET_OF(" #s ", "  #m ") = %d instead of expected %d!!!\n", OFFSET_OF(s, m), n ); abort(); }
- 
- #ifdef DEBUG
--#if defined(__GNUC__) && defined(LINUX) && (defined(INTEL) || defined(POWERPC))
-+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && (defined(INTEL) || defined(POWERPC))
- #define BINTEST_VERIFYSIZE( s, n ) \
-     fprintf( stderr, "> sizeof(" #s ") = %d; __alignof__ (" #s ") = %d\n", sizeof(s), __alignof__ (s) ); \
-     if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of expected %d!!!\n", sizeof(s), n ); abort(); }
diff --git a/editors/openoffice.org-1.0/files/patch-cppu+test+alignment+diagnose.h b/editors/openoffice.org-1.0/files/patch-cppu+test+alignment+diagnose.h
deleted file mode 100644
index 2a6650400a1e..000000000000
--- a/editors/openoffice.org-1.0/files/patch-cppu+test+alignment+diagnose.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../cppu/test/alignment/diagnose.h.orig	Sat Jul 20 23:54:59 2002
-+++ ../cppu/test/alignment/diagnose.h	Sat Jul 20 23:55:06 2002
-@@ -64,7 +64,7 @@
- #include <sal/types.h>
- #include <stdio.h>
- 
--#if defined(__GNUC__) && defined(LINUX) && defined(INTEL)
-+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && defined(INTEL)
- #define __ALIGNMENT__(s, n) __alignof__ (s)
- #else
- #define __ALIGNMENT__(s, n) n
diff --git a/editors/openoffice.org-1.0/files/patch-cppu+util+makefile.mk b/editors/openoffice.org-1.0/files/patch-cppu+util+makefile.mk
deleted file mode 100644
index 875a5fb6deeb..000000000000
--- a/editors/openoffice.org-1.0/files/patch-cppu+util+makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../cppu/util/makefile.mk.orig	Wed Jun 12 01:39:28 2002
-+++ ../cppu/util/makefile.mk	Wed Jun 12 01:39:32 2002
-@@ -87,9 +87,7 @@
- 
- SHL1DEPN=
- SHL1IMPLIB=i$(TARGET)
--.IF "$(OS)"!="FREEBSD"
- SHL1DEF=$(MISC)$/$(SHL1TARGET).def
--.ENDIF
- 
- SHL1VERSIONMAP=$(TARGET).map
- 
diff --git a/editors/openoffice.org-1.0/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-1.0/files/patch-cppuhelper+source+makefile.mk
deleted file mode 100644
index 62e971de324a..000000000000
--- a/editors/openoffice.org-1.0/files/patch-cppuhelper+source+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
---- ../cppuhelper/source/makefile.mk.orig	Mon Mar 11 22:17:52 2002
-+++ ../cppuhelper/source/makefile.mk	Wed Apr  3 00:31:19 2002
-@@ -149,8 +149,8 @@
- SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID)
- 
- SHL1STDLIBS= \
--		$(CPPULIB)		\
--		$(SALLIB)
-+		$(SALLIB)		\
-+		$(CPPULIB)
- 
- SHL1DEPN=
- SHL1IMPLIB=i$(TARGET)
-@@ -175,6 +175,10 @@
- #SHL1VERSIONMAP=gcc2_freebsd_intel.map
- .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
- SHL1VERSIONMAP=gcc3_linux_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
-+#SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
-+#SHL1VERSIONMAP=gcc3_freebsd_intel.map
- .ENDIF
- 
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-1.0/files/patch-cpputools+source+registercomponent+makefile.mk b/editors/openoffice.org-1.0/files/patch-cpputools+source+registercomponent+makefile.mk
deleted file mode 100644
index 8134445349f1..000000000000
--- a/editors/openoffice.org-1.0/files/patch-cpputools+source+registercomponent+makefile.mk
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../cpputools/source/registercomponent/makefile.mk.orig	Mon Apr 22 22:46:11 2002
-+++ ../cpputools/source/registercomponent/makefile.mk	Mon Apr 22 22:46:44 2002
-@@ -104,6 +104,7 @@
- 
- APP1STDLIBS=\
- 			$(SALLIB) \
-+			$(TOOLSLIB) \
- 			$(CPPULIB)	\
- 			$(CPPUHELPERLIB)
- 
diff --git a/editors/openoffice.org-1.0/files/patch-desktop+source+pkgchk_packages.cxx b/editors/openoffice.org-1.0/files/patch-desktop+source+pkgchk_packages.cxx
deleted file mode 100644
index 7b01e4f554b5..000000000000
--- a/editors/openoffice.org-1.0/files/patch-desktop+source+pkgchk_packages.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../desktop/source/pkgchk/pkgchk_packages.cxx.orig	Sun Jan 19 20:00:08 2003
-+++ ../desktop/source/pkgchk/pkgchk_packages.cxx	Sun Jan 19 20:01:51 2003
-@@ -124,6 +124,10 @@
- static char const s_platform_path [] = "/macosx_powerpc.plt";
- #elif defined (NETBSD) && defined (SPARC)
- static char const s_platform_path [] = "/netbsd_sparc.plt";
-+#elif defined (FREEBSD) && defined (INTEL)
-+static char const s_platform_path [] = "/freebsd_x86.plt";
-+#elif defined (FREEBSD) && defined (SPARC)
-+static char const s_platform_path [] = "/freebsd_sparc.plt";
- #else
- #error "unkonwn platform"
- insert your platform identifier above; inserted for the case the preprocessor ignores error
diff --git a/editors/openoffice.org-1.0/files/patch-desktop+util+makefile.mk b/editors/openoffice.org-1.0/files/patch-desktop+util+makefile.mk
deleted file mode 100644
index 8ceb57682cc7..000000000000
--- a/editors/openoffice.org-1.0/files/patch-desktop+util+makefile.mk
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../desktop/util/makefile.mk.orig	Sun Jul 21 00:04:35 2002
-+++ ../desktop/util/makefile.mk	Sun Jul 21 00:04:38 2002
-@@ -81,7 +81,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=
-@@ -111,7 +111,7 @@
- 	$(SALHELPERLIB)
- 
- .IF "$(GUI)" == "UNX"
--.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- 
- APP1STDLIBS+= -lXext -lSM -lICE
- 
diff --git a/editors/openoffice.org-1.0/files/patch-dmake+unix+linux+gnu+make.sh b/editors/openoffice.org-1.0/files/patch-dmake+unix+linux+gnu+make.sh
deleted file mode 100644
index d60afa8e32e8..000000000000
--- a/editors/openoffice.org-1.0/files/patch-dmake+unix+linux+gnu+make.sh
+++ /dev/null
@@ -1,244 +0,0 @@
---- ../dmake/unix/linux/gnu/make.sh.orig	Wed Mar 13 20:32:53 2002
-+++ ../dmake/unix/linux/gnu/make.sh	Wed Mar 13 20:33:00 2002
-@@ -3,188 +3,188 @@
- mkdir objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c
- fi
- mv infer.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c
- fi
- mv make.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c
- fi
- mv stat.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c
- fi
- mv expand.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c
- fi
- mv dmstring.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c
- fi
- mv hash.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c
- fi
- mv dag.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c
- fi
- mv dmake.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c
- fi
- mv path.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c
- fi
- mv imacs.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c
- fi
- mv sysintf.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c
- fi
- mv parse.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c
- fi
- mv getinp.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c
- fi
- mv quit.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c
- fi
- mv state.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c
- fi
- mv dmdump.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c
- fi
- mv macparse.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c
- fi
- mv rulparse.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c
- fi
- mv percent.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c
- fi
- mv function.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c
- fi
- mv arlib.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c
- fi
- mv dirbrk.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c
- fi
- mv rmprq.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c
- fi
- mv ruletab.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c
- fi
- mv runargv.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
--gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c
- else
--gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c
- fi
- mv dcache.o objects
- 
--gcc -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
-+${CC} ${CFLAGS} -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
- objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \
- objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \
- objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \
diff --git a/editors/openoffice.org-1.0/files/patch-dtrans+source+X11+X11_selection.cxx b/editors/openoffice.org-1.0/files/patch-dtrans+source+X11+X11_selection.cxx
deleted file mode 100644
index e3159c23c1a3..000000000000
--- a/editors/openoffice.org-1.0/files/patch-dtrans+source+X11+X11_selection.cxx
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../dtrans/source/X11/X11_selection.cxx.orig	Sat Jul 20 23:18:03 2002
-+++ ../dtrans/source/X11/X11_selection.cxx	Sat Jul 20 23:18:05 2002
-@@ -65,7 +65,7 @@
- #include <X11/keysym.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
--#if defined(LINUX) || defined(NETBSD)
-+#if defined(LINUX) || defined(NETBSD) || defined (FREEBSD)
- #include <sys/poll.h>
- #else
- #include <poll.h>
-@@ -175,6 +175,7 @@
- 	{ 0, "text/plain;charset=ksc5601.1992-0", "KSC5601.1992-0", 8 },
- 	// eastern european encodings
- 	{ 0, "text/plain;charset=koi8-r", "KOI8-R", 8 },
-+	{ 0, "text/plain;charset=koi8-u", "KOI8-U", 8 },
- 	// String (== iso8859-1)
- 	{ XA_STRING, "text/plain;charset=string", "STRING", 8 },
-     // special for compound text
diff --git a/editors/openoffice.org-1.0/files/patch-dtrans+source+X11+makefile.mk b/editors/openoffice.org-1.0/files/patch-dtrans+source+X11+makefile.mk
deleted file mode 100644
index 5881f5d7f6a5..000000000000
--- a/editors/openoffice.org-1.0/files/patch-dtrans+source+X11+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice.org-1.0/files/patch-eventattacher+source+makefile.mk b/editors/openoffice.org-1.0/files/patch-eventattacher+source+makefile.mk
deleted file mode 100644
index b09408500c2d..000000000000
--- a/editors/openoffice.org-1.0/files/patch-eventattacher+source+makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../eventattacher/source/makefile.mk.orig	Tue Jan  1 14:09:28 2002
-+++ ../eventattacher/source/makefile.mk
-@@ -110,10 +110,10 @@
- SHL1TARGET=	$(TARGET)
- 
- SHL1STDLIBS= \
-+		$(SALLIB)					\
- 		$(CPPULIB)					\
- 		$(CPPUHELPERLIB)				\
--		$(VOSLIB)					\
--		$(SALLIB)
-+		$(VOSLIB)					
- 
- SHL1DEPN=
- SHL1IMPLIB=	i$(TARGET)
diff --git a/editors/openoffice.org-1.0/files/patch-external+dt+dtpatch.sh b/editors/openoffice.org-1.0/files/patch-external+dt+dtpatch.sh
deleted file mode 100644
index e5122bcb45c1..000000000000
--- a/editors/openoffice.org-1.0/files/patch-external+dt+dtpatch.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../external/dt/dtpatch.sh.orig	Wed Mar 13 17:09:43 2002
-+++ ../external/dt/dtpatch.sh	Wed Mar 13 17:09:47 2002
-@@ -96,7 +96,7 @@
-     done
- 
-     chmod -R +w rtufiles/*.h
--    patch -i pat/editor.h.pat rtufiles/editor.h 2> newpatch
-+    patch < pat/editor.h.pat rtufiles/editor.h 2> newpatch
- 
-     if test -s "patcherror"; then
-        echo "Please install the SUNWdtinc Version 1.2 package on your Solaris machine" >> patcherror
diff --git a/editors/openoffice.org-1.0/files/patch-external+expat+expatpatch.sh b/editors/openoffice.org-1.0/files/patch-external+expat+expatpatch.sh
deleted file mode 100644
index ce07edcfffd8..000000000000
--- a/editors/openoffice.org-1.0/files/patch-external+expat+expatpatch.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../external/expat/expatpatch.sh.orig	Wed Mar 13 16:59:16 2002
-+++ ../external/expat/expatpatch.sh	Wed Mar 13 17:00:18 2002
-@@ -87,7 +87,7 @@
- 
-   for PNAME in `cat flist.pat`
-   do
--     patch -i pat/$PNAME.pat rtufiles/$PNAME
-+     patch < pat/$PNAME.pat rtufiles/$PNAME
-   done
- 
-   for SDNAME in `cat flist.sd`
diff --git a/editors/openoffice.org-1.0/files/patch-external+glibc+glibcpatch b/editors/openoffice.org-1.0/files/patch-external+glibc+glibcpatch
deleted file mode 100644
index 07e2f5373ee8..000000000000
--- a/editors/openoffice.org-1.0/files/patch-external+glibc+glibcpatch
+++ /dev/null
@@ -1,35 +0,0 @@
---- /dev/null	Sun Jun  2 16:11:00 2002
-+++ ../external/glibc/flist.pat	Sun Jun  2 12:00:09 2002
-@@ -0,0 +1 @@
-+patch-getopt.h
---- /dev/null	Sun Jun  2 16:11:00 2002
-+++ ../external/glibc/patch-getopt.h	Sun Jun  2 16:14:52 2002
-@@ -0,0 +1,14 @@
-+--- rtufiles/getopt.h.orig	Fri May 31 16:46:21 2002
-++++ rtufiles/getopt.h	Fri May 31 17:07:19 2002
-+@@ -133,7 +133,11 @@
-+    errors, only prototype getopt for the GNU C library.  */
-+ extern int getopt (int __argc, char *const *__argv, const char *__shortopts);
-+ # else /* not __GNU_LIBRARY__ */
-++#if (__GNUC__ == 3 && defined(FREEBSD))
-++/* skip getopt() definition , it conflicts with std.h */
-++#else
-+ extern int getopt ();
-++# endif /* FREEBSD */
-+ # endif /* __GNU_LIBRARY__ */
-+ 
-+ # ifndef __need_getopt
---- ../external/glibc/glibcpatch.sh.orig	Sun Jun  2 11:46:42 2002
-+++ ../external/glibc/glibcpatch.sh	Sun Jun  2 16:13:51 2002
-@@ -113,7 +113,10 @@
- # apply the patches
- #
- 
--# there is no need to apply patch here
-+for PNAME in `cat flist.pat`
-+  do
-+      patch < $PNAME
-+  done
- 
- 
- #
diff --git a/editors/openoffice.org-1.0/files/patch-external+jpeg+jpegpatch.sh b/editors/openoffice.org-1.0/files/patch-external+jpeg+jpegpatch.sh
deleted file mode 100644
index 4fb55f5d70d0..000000000000
--- a/editors/openoffice.org-1.0/files/patch-external+jpeg+jpegpatch.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../external/jpeg/jpegpatch.sh.orig	Wed Mar 13 17:04:35 2002
-+++ ../external/jpeg/jpegpatch.sh	Wed Mar 13 17:08:02 2002
-@@ -112,7 +112,7 @@
- 
-   for PNAME in `cat flist.pat`
-   do
--      patch -i pat/$PNAME.pat $PNAME
-+      patch < pat/$PNAME.pat $PNAME
-   done
- 
-   cp -rf jpeg-6b/* rtufiles/
diff --git a/editors/openoffice.org-1.0/files/patch-external+neon+md5.c.pat b/editors/openoffice.org-1.0/files/patch-external+neon+md5.c.pat
deleted file mode 100644
index 46c5e062128e..000000000000
--- a/editors/openoffice.org-1.0/files/patch-external+neon+md5.c.pat
+++ /dev/null
@@ -1,112 +0,0 @@
---- /dev/null	Thu Aug  8 22:39:51 2002
-+++ ../external/neon/md5.c.pat	Thu Aug  8 22:35:33 2002
-@@ -0,0 +1,109 @@
-+*** ..\download\neon-0.14.0\src\md5.c	Sun Apr 29 13:23:08 2001
-+--- sub\md5.c	Tue May 08 12:52:02 2001
-+***************
-+*** 278,290 ****
-+       const void *buffer;
-+       size_t len;
-+       struct md5_ctx *ctx;
-+  {
-+    md5_uint32 correct_words[16];
-+!   const md5_uint32 *words = buffer;
-+!   size_t nwords = len / sizeof (md5_uint32);
-+!   const md5_uint32 *endp = words + nwords;
-+    md5_uint32 A = ctx->A;
-+    md5_uint32 B = ctx->B;
-+    md5_uint32 C = ctx->C;
-+    md5_uint32 D = ctx->D;
-+  
-+--- 278,289 ----
-+       const void *buffer;
-+       size_t len;
-+       struct md5_ctx *ctx;
-+  {
-+    md5_uint32 correct_words[16];
-+!   const unsigned char *words = buffer;
-+!   const unsigned char *endp = words + len;
-+    md5_uint32 A = ctx->A;
-+    md5_uint32 B = ctx->B;
-+    md5_uint32 C = ctx->C;
-+    md5_uint32 D = ctx->D;
-+  
-+***************
-+*** 313,324 ****
-+  	 we store the swapped words in the array CORRECT_WORDS.  */
-+  
-+  #define OP(a, b, c, d, s, T)						\
-+        do								\
-+          {								\
-+! 	  a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T;		\
-+! 	  ++words;							\
-+  	  CYCLIC (a, s);						\
-+  	  a += b;							\
-+          }								\
-+        while (0)
-+  
-+--- 312,325 ----
-+  	 we store the swapped words in the array CORRECT_WORDS.  */
-+  
-+  #define OP(a, b, c, d, s, T)						\
-+        do								\
-+          {								\
-+!       md5_uint32 WORD_ = words[0] | (words[1] << 8) \
-+! 	                   | (words[2] << 16) | (words[3] << 24); \
-+! 	  a += FF (b, c, d) + (*cwp++ = WORD_) + T;		\
-+! 	  words += 4;							\
-+  	  CYCLIC (a, s);						\
-+  	  a += b;							\
-+          }								\
-+        while (0)
-+  
-+***************
-+*** 431,441 ****
-+    ctx->D = D;
-+  }
-+  
-+  /* Writes the ASCII representation of the MD5 digest into the
-+   * given buffer, which must be at least 33 characters long. */
-+! void ne_md5_to_ascii(const unsigned char md5_buf[16], char *buffer) 
-+  {
-+      int count;
-+      for (count = 0; count<16; count++) {
-+  	buffer[count*2] = HEX2ASC(md5_buf[count] >> 4);
-+  	buffer[count*2+1] = HEX2ASC(md5_buf[count] & 0x0f);
-+--- 432,442 ----
-+    ctx->D = D;
-+  }
-+  
-+  /* Writes the ASCII representation of the MD5 digest into the
-+   * given buffer, which must be at least 33 characters long. */
-+! void ne_md5_to_ascii(const unsigned char md5_buf[16], char *buffer)
-+  {
-+      int count;
-+      for (count = 0; count<16; count++) {
-+  	buffer[count*2] = HEX2ASC(md5_buf[count] >> 4);
-+  	buffer[count*2+1] = HEX2ASC(md5_buf[count] & 0x0f);
-+***************
-+*** 443,453 ****
-+      buffer[32] = '\0';
-+  }
-+  
-+  /* Reads the ASCII representation of an MD5 digest. The buffer must
-+   * be at least 32 characters long. */
-+! void ne_ascii_to_md5(const char *buffer, unsigned char md5_buf[16]) 
-+  {
-+      int count;
-+      for (count = 0; count<16; count++) {
-+  	md5_buf[count] = ((ASC2HEX(buffer[count*2])) << 4) |
-+  	    ASC2HEX(buffer[count*2+1]);
-+--- 444,454 ----
-+      buffer[32] = '\0';
-+  }
-+  
-+  /* Reads the ASCII representation of an MD5 digest. The buffer must
-+   * be at least 32 characters long. */
-+! void ne_ascii_to_md5(const char *buffer, unsigned char md5_buf[16])
-+  {
-+      int count;
-+      for (count = 0; count<16; count++) {
-+  	md5_buf[count] = ((ASC2HEX(buffer[count*2])) << 4) |
-+  	    ASC2HEX(buffer[count*2+1]);
diff --git a/editors/openoffice.org-1.0/files/patch-external+neon+neonpatch.sh b/editors/openoffice.org-1.0/files/patch-external+neon+neonpatch.sh
deleted file mode 100644
index 1ccc1adf27f9..000000000000
--- a/editors/openoffice.org-1.0/files/patch-external+neon+neonpatch.sh
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../external/neon/neonpatch.sh.orig	Tue May 29 17:40:10 2001
-+++ ../external/neon/neonpatch.sh	Thu Aug  8 22:43:04 2002
-@@ -119,10 +119,7 @@
- # apply the patches
- #
- 
--  for PNAME in `cat flist.pat`
--  do
--      patch -i pat/$PNAME.pat rtufiles/$PNAME
--  done
-+  patch < md5.c.pat rtufiles/md5.c
- 
- #
- # copy the SD files into rtufiles directory
diff --git a/editors/openoffice.org-1.0/files/patch-external+npsdk+npsdkpatch.sh b/editors/openoffice.org-1.0/files/patch-external+npsdk+npsdkpatch.sh
deleted file mode 100644
index 49a3056831dd..000000000000
--- a/editors/openoffice.org-1.0/files/patch-external+npsdk+npsdkpatch.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../external/npsdk/npsdkpatch.sh.orig	Wed Mar 13 16:49:19 2002
-+++ ../external/npsdk/npsdkpatch.sh	Wed Mar 13 16:49:39 2002
-@@ -121,7 +121,7 @@
- 
-   for PNAME in `cat flist.pat`
-   do
--    patch -i pat/$PNAME.pat rtufiles/$PNAME
-+    patch < pat/$PNAME.pat rtufiles/$PNAME
-   done
- 
- #
diff --git a/editors/openoffice.org-1.0/files/patch-freetype+makefile.mk b/editors/openoffice.org-1.0/files/patch-freetype+makefile.mk
deleted file mode 100644
index 802c6b4d1a8b..000000000000
--- a/editors/openoffice.org-1.0/files/patch-freetype+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
---- ../freetype/makefile.mk.orig	Fri Aug 16 17:28:36 2002
-+++ ../freetype/makefile.mk	Sat Jan 18 13:39:03 2003
-@@ -86,7 +86,11 @@
- .IF "$(GUI)"=="UNX"
- #relative to CONFIGURE_DIR
- CONFIGURE_ACTION=$(GNUMAKE)
--CONFIGURE_FLAGS=setup
-+.IF "$(debug)"==""
-+CONFIGURE_FLAGS=setup CFLAGS="-O"
-+.ELSE                 # "$(debug)"==""
-+CONFIGURE_FLAGS=setup CFLAGS="-O -g -ggdb"
-+.ENDIF
- 
- BUILD_DIR=$(CONFIGURE_DIR)
- BUILD_ACTION=$(GNUMAKE)
-@@ -95,6 +99,8 @@
- 	objs$/.libs$/libfreetype.a
- .IF "$(OS)"=="MACOSX"
- OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
-+.ELIF "$(OS)"=="FREEBSD"
-+OUT2LIB+=objs$/.libs$/libfreetype.so.7*
- .ELSE
- OUT2LIB+=objs$/.libs$/libfreetype.so.6*
- .ENDIF          # "$(OS)"=="MACOSX"
diff --git a/editors/openoffice.org-1.0/files/patch-i18n+inc+collator.hxx b/editors/openoffice.org-1.0/files/patch-i18n+inc+collator.hxx
deleted file mode 100644
index 796b7bbf4567..000000000000
--- a/editors/openoffice.org-1.0/files/patch-i18n+inc+collator.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../i18n/inc/collator.hxx.orig	Sat Apr  6 12:19:32 2002
-+++ ../i18n/inc/collator.hxx	Wed May  1 22:31:57 2002
-@@ -78,7 +78,7 @@
- #include <com/sun/star/lang/XServiceInfo.hpp>
- #endif
- 
--#if !(defined WIN32 || defined MACOSX || defined NETBSD)
-+#if !(defined WIN32 || defined MACOSX || defined NETBSD || defined FREEBSD)
- #include <alloca.h>
- #endif
- #include <tools/string.hxx>
diff --git a/editors/openoffice.org-1.0/files/patch-i18npool+source+localedata+localedata.cxx b/editors/openoffice.org-1.0/files/patch-i18npool+source+localedata+localedata.cxx
deleted file mode 100644
index dc4af11250f4..000000000000
--- a/editors/openoffice.org-1.0/files/patch-i18npool+source+localedata+localedata.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../i18npool/source/localedata/localedata.cxx.orig	Mon Feb 24 17:47:22 2003
-+++ ../i18npool/source/localedata/localedata.cxx	Tue Feb 25 16:41:58 2003
-@@ -150,6 +150,7 @@
- 	{ "pt_BR",  lcl_ASCII },
- 	{ "pt_PT",  lcl_ASCII },
- 	{ "ru_RU",  lcl_ASCII },
-+	{ "uk_UA",  lcl_ASCII },
- 	{ "sv_FI",  lcl_ASCII },
- 	{ "tr_TR",  lcl_ASCII },
- 	{ "th_TH",  lcl_ASCII },    // PlaDao convenience entry
diff --git a/editors/openoffice.org-1.0/files/patch-i18npool+source+localedata_ascii+makefile.mk b/editors/openoffice.org-1.0/files/patch-i18npool+source+localedata_ascii+makefile.mk
deleted file mode 100644
index 47957effbdbf..000000000000
--- a/editors/openoffice.org-1.0/files/patch-i18npool+source+localedata_ascii+makefile.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../i18npool/source/localedata_ascii/makefile.mk.orig	Sun Nov 17 23:27:32 2002
-+++ ../i18npool/source/localedata_ascii/makefile.mk	Tue Feb 25 16:43:21 2003
-@@ -138,6 +138,7 @@
- 	$(MISC)$/localedata_pt_BR.cxx	\
- 	$(MISC)$/localedata_pt_PT.cxx	\
- 	$(MISC)$/localedata_ru_RU.cxx	\
-+	$(MISC)$/localedata_uk_UA.cxx	\
- 	$(MISC)$/localedata_sv_FI.cxx	\
- 	$(MISC)$/localedata_tr_TR.cxx	\
- 	$(MISC)$/localedata_nb_NO.cxx	\
-@@ -208,6 +209,7 @@
- 	$(SLO)$/localedata_pt_BR.obj	\
- 	$(SLO)$/localedata_pt_PT.obj	\
- 	$(SLO)$/localedata_ru_RU.obj	\
-+	$(SLO)$/localedata_uk_UA.obj	\
- 	$(SLO)$/localedata_sv_FI.obj	\
- 	$(SLO)$/localedata_tr_TR.obj	\
- 	$(SLO)$/localedata_nb_NO.obj	\
diff --git a/editors/openoffice.org-1.0/files/patch-i18npool+source+localedata_ascii+uk_UA.xml b/editors/openoffice.org-1.0/files/patch-i18npool+source+localedata_ascii+uk_UA.xml
deleted file mode 100644
index 68325b32eff0..000000000000
--- a/editors/openoffice.org-1.0/files/patch-i18npool+source+localedata_ascii+uk_UA.xml
+++ /dev/null
@@ -1,454 +0,0 @@
---- ../i18npool/source/localedata_ascii/uk_UA.xml.orig	Thu Jan  1 00:00:00 1970
-+++ ../i18npool/source/localedata_ascii/uk_UA.xml	Fri Feb 28 13:04:01 2003
-@@ -0,0 +1,451 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE Locale SYSTEM 'locale.dtd'>
-+<Locale version="1.2">
-+<LC_INFO>
-+<Language>
-+<LangID>uk</LangID>
-+<DefaultName>Ukrainian</DefaultName>
-+</Language>
-+<Country>
-+<CountryID>UA</CountryID>
-+<DefaultName>Ukraine</DefaultName>
-+</Country>
-+<Platform>
-+<PlatformID>generic</PlatformID>
-+</Platform>
-+<Varient></Varient>
-+</LC_INFO>
-+<LC_CTYPE unoid="generic">
-+<Separators>
-+<DateSeparator>.</DateSeparator>
-+<ThousandSeparator> </ThousandSeparator>
-+<DecimalSeparator>,</DecimalSeparator>
-+<TimeSeparator>:</TimeSeparator>
-+<Time100SecSeparator>,</Time100SecSeparator>
-+<ListSeparator>;</ListSeparator>
-+<LongDateDayOfWeekSeparator></LongDateDayOfWeekSeparator>
-+<LongDateDaySeparator> </LongDateDaySeparator>
-+<LongDateMonthSeparator> </LongDateMonthSeparator>
-+<LongDateYearSeparator> р.</LongDateYearSeparator>
-+</Separators>
-+<Markers>
-+<QuotationStart>‘</QuotationStart>
-+<QuotationEnd>’</QuotationEnd>
-+<DoubleQuotationStart>“</DoubleQuotationStart>
-+<DoubleQuotationEnd>�</DoubleQuotationEnd>
-+</Markers>
-+<TimeAM>AM</TimeAM>
-+<TimePM>PM</TimePM>
-+<MeasurementSystem>Metric</MeasurementSystem>
-+</LC_CTYPE>
-+<LC_FORMAT>
-+<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
-+<FormatCode>M/D/YY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28">
-+<FormatCode>NN DD/MMM YY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34">
-+<FormatCode>MM/YY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35">
-+<FormatCode>MMM DD</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36">
-+<FormatCode>MMMM</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37">
-+<FormatCode>QQ YY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21">
-+<FormatCode>MM/DD/YYYY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20">
-+<FormatCode>MM/DD/YY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19">
-+<FormatCode>NNNNMMMM DD, YYYY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22">
-+<FormatCode>MMM D, YY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23">
-+<FormatCode>MMM D, YYYY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25">
-+<FormatCode>MMMM D, YYYY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27">
-+<FormatCode>NN, MMM D, YY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29">
-+<FormatCode>NN, MMMM D, YYYY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30">
-+<FormatCode>NNNNMMMM D, YYYY</FormatCode>
-+<DefaultName>DIN 5008 (EN 28601) </DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24">
-+<FormatCode>D. MMM. YYYY</FormatCode>
-+<DefaultName>DIN 5008 (EN 28601) </DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26">
-+<FormatCode>D. MMMM YYYY</FormatCode>
-+<DefaultName>DIN 5008 (EN 28601) </DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31">
-+<FormatCode>MM-DD</FormatCode>
-+<DefaultName>DIN 5008 (EN 28601) </DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32">
-+<FormatCode>YY-MM-DD</FormatCode>
-+<DefaultName>DIN 5008 (EN 28601) </DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey20" default="false" type="medium" usage="DATE" formatindex="33">
-+<FormatCode>YYYY-MM-DD</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey21" default="false" type="medium" usage="DATE" formatindex="38">
-+<FormatCode>WW</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="TimeFormatskey1" default="true" type="short" usage="TIME"  formatindex="39">
-+<FormatCode>HH:MM</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="TimeFormatskey2" default="true" type="medium" usage="TIME"  formatindex="40">
-+<FormatCode>HH:MM:SS</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="TimeFormatskey3" default="false" type="short" usage="TIME"  formatindex="41">
-+<FormatCode>HH:MM AM/PM</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="TimeFormatskey4" default="false" type="medium" usage="TIME"  formatindex="42">
-+<FormatCode>HH:MM:SS AM/PM</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME"  formatindex="43">
-+<FormatCode>[HH]:MM:SS</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME"  formatindex="44">
-+<FormatCode>MM:SS,00</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME"  formatindex="45">
-+<FormatCode>[HH]:MM:SS,00</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME"  formatindex="46">
-+<FormatCode>MM/DD/YY HH:MM</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME"  formatindex="47">
-+<FormatCode>MM/DD/YYYY HH:MM:SS</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER"  formatindex="0">
-+<FormatCode>Standard</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER"  formatindex="1">
-+<FormatCode>0</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="2">
-+<FormatCode>0,00</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER"  formatindex="3">
-+<FormatCode># ##0</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="4">
-+<FormatCode># ##0,00</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="5">
-+<FormatCode># ###,00</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY"  formatindex="12">
-+<FormatCode>[$грн.-419]# ##0;-[$грн.-419]# ##0</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY"  formatindex="13">
-+<FormatCode>[$грн.-419]# ##0,00;-[$грн.-419]# ##0,00</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY"  formatindex="14">
-+	<FormatCode>[$грн.-419]# ##0;[RED]-[$грн.-419]# ##0</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY"  formatindex="15">
-+<FormatCode>[$грн.-419]# ##0,00;[RED]-[$грн.-419]# ##0,00</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY"  formatindex="16">
-+<FormatCode># ##0,00 CCC</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY"  formatindex="17">
-+<FormatCode>[$грн.-419]# ##0,--;[RED]-[$грн.-419]# ##0,--</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER"  formatindex="8">
-+<FormatCode>0%</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER"  formatindex="9">
-+<FormatCode>0,00%</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="6">
-+<FormatCode>0,00E+000</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="7">
-+<FormatCode>0,00E+00</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+</LC_FORMAT>
-+<LC_COLLATION>
-+<Collator unoid="uk_UA.alphanumeric" default="true"/>
-+<CollationOptions>
-+<TransliterationModules>IGNORE_CASE</TransliterationModules>
-+</CollationOptions>
-+</LC_COLLATION>
-+<LC_SEARCH>
-+<SearchOptions>
-+<TransliterationModules>IGNORE_CASE</TransliterationModules>
-+</SearchOptions>
-+</LC_SEARCH>
-+<LC_CALENDAR>
-+<Calendar unoid="gregorian" default="true">
-+<DaysOfWeek>
-+<Day>
-+<DayID>sun</DayID>
-+<DefaultAbbrvName>�д</DefaultAbbrvName>
-+<DefaultFullName>неділ�</DefaultFullName>
-+</Day>
-+<Day>
-+<DayID>mon</DayID>
-+<DefaultAbbrvName>Пн</DefaultAbbrvName>
-+<DefaultFullName>понеділок</DefaultFullName>
-+</Day>
-+<Day>
-+<DayID>tue</DayID>
-+<DefaultAbbrvName>Ð’Ñ‚</DefaultAbbrvName>
-+<DefaultFullName>вівторок</DefaultFullName>
-+</Day>
-+<Day>
-+<DayID>wed</DayID>
-+<DefaultAbbrvName>Ср</DefaultAbbrvName>
-+<DefaultFullName>�ереда</DefaultFullName>
-+</Day>
-+<Day>
-+<DayID>thu</DayID>
-+<DefaultAbbrvName>Чт</DefaultAbbrvName>
-+<DefaultFullName>четвер</DefaultFullName>
-+</Day>
-+<Day>
-+<DayID>fri</DayID>
-+<DefaultAbbrvName>Пт</DefaultAbbrvName>
-+<DefaultFullName>п'�тниц�</DefaultFullName>
-+</Day>
-+<Day>
-+<DayID>sat</DayID>
-+<DefaultAbbrvName>Сб</DefaultAbbrvName>
-+<DefaultFullName>�убота</DefaultFullName>
-+</Day>
-+</DaysOfWeek>
-+<MonthsOfYear>
-+<Month>
-+<MonthID>jan</MonthID>
-+<DefaultAbbrvName>�іч</DefaultAbbrvName>
-+<DefaultFullName>Січень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>feb</MonthID>
-+<DefaultAbbrvName>лют</DefaultAbbrvName>
-+<DefaultFullName>Лютий</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>mar</MonthID>
-+<DefaultAbbrvName>бер</DefaultAbbrvName>
-+<DefaultFullName>Березень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>apr</MonthID>
-+<DefaultAbbrvName>квт</DefaultAbbrvName>
-+<DefaultFullName>Квітень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>may</MonthID>
-+<DefaultAbbrvName>трв</DefaultAbbrvName>
-+<DefaultFullName>Травень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>jun</MonthID>
-+<DefaultAbbrvName>чер</DefaultAbbrvName>
-+<DefaultFullName>Червень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>jul</MonthID>
-+<DefaultAbbrvName>лип</DefaultAbbrvName>
-+<DefaultFullName>Липень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>aug</MonthID>
-+<DefaultAbbrvName>�ер</DefaultAbbrvName>
-+<DefaultFullName>Серпень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>sep</MonthID>
-+<DefaultAbbrvName>вер</DefaultAbbrvName>
-+<DefaultFullName>Вере�ень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>oct</MonthID>
-+<DefaultAbbrvName>жов</DefaultAbbrvName>
-+<DefaultFullName>Жовтень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>nov</MonthID>
-+<DefaultAbbrvName>ли�</DefaultAbbrvName>
-+<DefaultFullName>Ли�топад</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>dec</MonthID>
-+<DefaultAbbrvName>гру</DefaultAbbrvName>
-+<DefaultFullName>Грудень</DefaultFullName>
-+</Month>
-+</MonthsOfYear>
-+<Eras>
-+<Era>
-+<EraID>bc</EraID>
-+<DefaultAbbrvName>до н.е.</DefaultAbbrvName>
-+<DefaultFullName>до н.е.</DefaultFullName>
-+</Era>
-+<Era>
-+<EraID>ad</EraID>
-+<DefaultAbbrvName>н.е.</DefaultAbbrvName>
-+<DefaultFullName>н.е.</DefaultFullName>
-+</Era>
-+</Eras>
-+<StartDayOfWeek>
-+<DayID>sun</DayID>
-+</StartDayOfWeek>
-+<MinimalDaysInFirstWeek>1</MinimalDaysInFirstWeek>
-+</Calendar>
-+</LC_CALENDAR>
-+<LC_CURRENCY>
-+<Currency default="true" usedInCompatibleFormatCodes="true">
-+<CurrencyID>грн.</CurrencyID>
-+<CurrencySymbol>грн.</CurrencySymbol>
-+<BankSymbol>UAH</BankSymbol>
-+<CurrencyName>Hrivnya</CurrencyName>
-+<DecimalPlaces>2</DecimalPlaces>
-+</Currency>
-+</LC_CURRENCY>
-+<LC_TRANSLITERATION>
-+<Transliteration unoid="UPPERCASE_LOWERCASE"/>
-+<Transliteration unoid="IGNORE_CASE"/>
-+<Transliteration unoid="LOWERCASE_UPPERCASE" />
-+</LC_TRANSLITERATION>
-+<LC_MISC>
-+<ReservedWords>
-+<trueWord>true</trueWord>
-+<falseWord>false</falseWord>
-+<quarter1Word>1st quarter</quarter1Word>
-+<quarter2Word>2nd quarter</quarter2Word>
-+<quarter3Word>3rd quarter</quarter3Word>
-+<quarter4Word>4th quarter</quarter4Word>
-+<aboveWord>above</aboveWord>
-+<belowWord>below</belowWord>
-+</ReservedWords>
-+</LC_MISC>
-+<LC_NumberingLevel>
-+<NumberingLevel Prefix=" " NumType="4" Suffix=")" />
-+<NumberingLevel Prefix=" " NumType="4" Suffix="." />
-+<NumberingLevel Prefix="(" NumType="4" Suffix="." />
-+<NumberingLevel Prefix=" " NumType="2" Suffix="." />
-+<NumberingLevel Prefix=" " NumType="0" Suffix=")" />
-+<NumberingLevel Prefix=" " NumType="1" Suffix=")" />
-+<NumberingLevel Prefix="(" NumType="1" Suffix=")" />
-+<NumberingLevel Prefix=" " NumType="3" Suffix="." />
-+</LC_NumberingLevel>
-+<LC_OutLineNumberingLevel>
-+<OutlineStyle>
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="1" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
-+</OutlineStyle>
-+<OutlineStyle>
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
-+</OutlineStyle>
-+<OutlineStyle>
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix="(" NumType="1" Suffix=")" BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix="." BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
-+</OutlineStyle>
-+<OutlineStyle>
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
-+</OutlineStyle>
-+<OutlineStyle>
-+<OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
-+</OutlineStyle>
-+<OutlineStyle>
-+<OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="1" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
-+</OutlineStyle>
-+<OutlineStyle>
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020"  BulletFontName=""            ParentNumbering="1" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020"  BulletFontName=""            ParentNumbering="2" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020"  BulletFontName=""            ParentNumbering="3" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020"  BulletFontName=""            ParentNumbering="4" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
-+</OutlineStyle>
-+<OutlineStyle>
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="27A2"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="E006"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=")" BulletChar="E004"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
-+</OutlineStyle>
-+</LC_OutLineNumberingLevel>
-+</Locale>
diff --git a/editors/openoffice.org-1.0/files/patch-idlc+source+parser.yy b/editors/openoffice.org-1.0/files/patch-idlc+source+parser.yy
deleted file mode 100644
index 5ad06d2a4100..000000000000
--- a/editors/openoffice.org-1.0/files/patch-idlc+source+parser.yy
+++ /dev/null
@@ -1,36 +0,0 @@
---- ../idlc/source/parser.yy.orig	Wed Jul 10 11:43:18 2002
-+++ ../idlc/source/parser.yy	Thu Oct 31 10:00:47 2002
-@@ -995,7 +995,8 @@
- 	{
- 		idlc()->setParseState(PS_ConstantDeclSeen);
- 	}
--	';'
-+	';' {};
-+
- 
- const_dcl : 
- 	IDL_CONST
-@@ -1316,7 +1317,7 @@
- 		 * Push the scope of the exception on the scopes stack
- 		 */
- 		idlc()->scopes()->push(pExcept);
--		delete $1
-+		delete $1;
- 	}
- 	'{'
- 	{
-@@ -1705,10 +1706,10 @@
- 	{
- 		idlc()->setParseState(PS_TypedefSeen);
- 	}
--	type_declarator
--	| struct_type
--	| union_type
--	| enum_type
-+	type_declarator {}
-+	| struct_type {}
-+	| union_type {}
-+	| enum_type {}
- 	;
- 
- type_declarator :
diff --git a/editors/openoffice.org-1.0/files/patch-javaunohelper+source+makefile.mk b/editors/openoffice.org-1.0/files/patch-javaunohelper+source+makefile.mk
deleted file mode 100644
index 7f2cd2f1d220..000000000000
--- a/editors/openoffice.org-1.0/files/patch-javaunohelper+source+makefile.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../javaunohelper/source/makefile.mk.orig	Tue Jan  1 14:10:20 2002
-+++ ../javaunohelper/source/makefile.mk
-@@ -110,9 +110,9 @@
- SHL1TARGET=	$(TARGET)
- 
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
--		$(CPPUHELPERLIB)	\
--		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1DEPN=
- SHL1IMPLIB=	i$(TARGET)
diff --git a/editors/openoffice.org-1.0/files/patch-moz+prj+d.lst b/editors/openoffice.org-1.0/files/patch-moz+prj+d.lst
deleted file mode 100644
index d65f2df6cf3b..000000000000
--- a/editors/openoffice.org-1.0/files/patch-moz+prj+d.lst
+++ /dev/null
@@ -1,34 +0,0 @@
---- ../moz/prj/d.lst	Sat May 18 16:06:23 2002
-+++ ../moz/prj/d.lst	Sat May 18 16:16:33 2002
-@@ -43,6 +43,7 @@
- mkdir: %_DEST%\inc%_EXT%\mozilla\layout_xul
- mkdir: %_DEST%\inc%_EXT%\mozilla\ldap
- mkdir: %_DEST%\inc%_EXT%\mozilla\ldap\ldap
-+mkdir: %_DEST%\inc%_EXT%\mozilla\ldap-nspr
- mkdir: %_DEST%\inc%_EXT%\mozilla\locale
- mkdir: %_DEST%\inc%_EXT%\mozilla\lwbrk
- mkdir: %_DEST%\inc%_EXT%\mozilla\mailnews
-@@ -71,6 +72,7 @@
- mkdir: %_DEST%\inc%_EXT%\mozilla\nspr\private
- mkdir: %_DEST%\inc%_EXT%\mozilla\nsprefm
- mkdir: %_DEST%\inc%_EXT%\mozilla\oji
-+mkdir: %_DEST%\inc%_EXT%\mozilla\obsolete
- mkdir: %_DEST%\inc%_EXT%\mozilla\plugin
- mkdir: %_DEST%\inc%_EXT%\mozilla\png
- mkdir: %_DEST%\inc%_EXT%\mozilla\pref
-@@ -158,6 +160,7 @@
- ..\%__SRC%\inc\layout_xul\* %_DEST%\inc%_EXT%\mozilla\layout_xul
- ..\%__SRC%\inc\ldap\* %_DEST%\inc%_EXT%\mozilla\ldap
- ..\%__SRC%\inc\ldap\ldap\* %_DEST%\inc%_EXT%\mozilla\ldap\ldap
-+..\%__SRC%\inc\ldap-nspr\* %_DEST%\inc%_EXT%\mozilla\ldap-nspr
- ..\%__SRC%\inc\locale\* %_DEST%\inc%_EXT%\mozilla\locale
- ..\%__SRC%\inc\lwbrk\* %_DEST%\inc%_EXT%\mozilla\lwbrk
- ..\%__SRC%\inc\mailnews\* %_DEST%\inc%_EXT%\mozilla\mailnews
-@@ -186,6 +189,7 @@
- ..\%__SRC%\inc\nspr\private\* %_DEST%\inc%_EXT%\mozilla\nspr\private
- ..\%__SRC%\inc\nsprefm\* %_DEST%\inc%_EXT%\mozilla\nsprefm
- ..\%__SRC%\inc\oji\* %_DEST%\inc%_EXT%\mozilla\oji
-+..\%__SRC%\inc\obsolete\* %_DEST%\inc%_EXT%\mozilla\obsolete
- ..\%__SRC%\inc\plugin\* %_DEST%\inc%_EXT%\mozilla\plugin
- ..\%__SRC%\inc\png\* %_DEST%\inc%_EXT%\mozilla\png
- ..\%__SRC%\inc\pref\* %_DEST%\inc%_EXT%\mozilla\pref
diff --git a/editors/openoffice.org-1.0/files/patch-nas+nas-1.4.1.patch b/editors/openoffice.org-1.0/files/patch-nas+nas-1.4.1.patch
deleted file mode 100644
index 5432812bb50c..000000000000
--- a/editors/openoffice.org-1.0/files/patch-nas+nas-1.4.1.patch
+++ /dev/null
@@ -1,246 +0,0 @@
---- ../nas/nas-1.4.1.patch.orig	Wed Jan  8 02:52:13 2003
-+++ ../nas/nas-1.4.1.patch	Sat Jan 18 17:55:19 2003
-@@ -1,5 +1,5 @@
--*** misc/nas-1.4.1/config/NetAudio.tmpl	Sat Mar  4 21:40:50 2000
----- misc/build/nas-1.4.1/config/NetAudio.tmpl	Tue Jan  7 19:30:41 2003
-+*** misc/nas-1.4.1/config/NetAudio.tmpl	Sun Mar  5 03:40:50 2000
-+--- misc/build/nas-1.4.1/config/NetAudio.tmpl	Thu Nov  1 13:08:21 2001
- ***************
- *** 166,171 ****
- --- 166,177 ----
-@@ -15,8 +15,8 @@
-       INCLUDESRC = $(TOP)/include
-           INCDIR = $(INCROOT)/audio
-       WIDGET_DIR = $(TOP)/clients/audio/widgets
--*** misc/nas-1.4.1/lib/audio/Alibint.c	Sun Oct 24 13:45:21 1999
----- misc/build/nas-1.4.1/lib/audio/Alibint.c	Tue Jan  7 19:30:41 2003
-+*** misc/nas-1.4.1/lib/audio/Alibint.c	Sun Oct 24 19:45:21 1999
-+--- misc/build/nas-1.4.1/lib/audio/Alibint.c	Thu Nov  1 13:11:51 2001
- ***************
- *** 1336,1348 ****
-   static char *_SysErrorMsg (n)
-@@ -40,8 +40,8 @@
-   }
-   
-   #endif 	/* USL sharedlibs in don't define for AUD3.2 */
--*** misc/nas-1.4.1/lib/audio/Astreams.c	Sat May  8 21:10:05 1999
----- misc/build/nas-1.4.1/lib/audio/Astreams.c	Tue Jan  7 19:30:41 2003
-+*** misc/nas-1.4.1/lib/audio/Astreams.c	Sun May  9 03:10:05 1999
-+--- misc/build/nas-1.4.1/lib/audio/Astreams.c	Thu Nov  1 13:05:48 2001
- ***************
- *** 51,59 ****
-   #include <errno.h>
-@@ -120,59 +120,157 @@
-   	    return(-1);
-   	}
-   
--*** misc/nas-1.4.1/lib/audio/Imakefile	Sat Jan  1 04:28:13 2000
----- misc/build/nas-1.4.1/lib/audio/Imakefile	Tue Jan  7 19:30:41 2003
--***************
--*** 25,30 ****
----- 25,32 ----
--  
--  #include "../../config/NetAudio.tmpl"
--  
--+ CCOPTIONS += $(EXTRA_CCOPTIONS)
--+ 
--  #if ProjectX < 5
--  /* Pre-X11R5 compatability */
--  #ifndef NormalLibX
--***************
--*** 119,124 ****
----- 121,127 ----
--  
--  #endif
--  BuildIncludes($(HEADERS),audio,..)
--+ BuildIncludes($(HEADERS),audio,$(BUILDINCTOP:../..=.))
--  InstallMultiple($(HEADERS),$(INCDIR))
--  #if ProjectX >= 5
--  InstallNonExecFile(AuErrorDB,$(LIBDIR))
--*** misc/nas-1.4.1/server/dia/gram.y	Sat Jan  1 22:35:49 2000
----- misc/build/nas-1.4.1/server/dia/gram.y	Tue Jan  7 19:42:40 2003
--***************
--*** 119,132 ****
--  			}
--  		| MAXRATE number
--  			{ ddaSetConfig(MAXRATE, (void *)$2); }
--! 		| MINRATE number
--! 			{ ddaSetConfig(MINRATE, (void *)$2); }
--  
--  string		: STRING		{ ptr = (char *)malloc(strlen($1)+1);
--  					  strcpy(ptr, $1);
--  					  RemoveDQuote(ptr);
--  					  $$ = ptr;
--! 					}
--  number		: NUMBER		{ $$ = $1; }
--  		;
--  
----- 119,132 ----
--  			}
--  		| MAXRATE number
--  			{ ddaSetConfig(MAXRATE, (void *)$2); }
--! 		| MINRATE number 
--!                         { ddaSetConfig(MINRATE, (void *)$2); } ;
--  
--  string		: STRING		{ ptr = (char *)malloc(strlen($1)+1);
--  					  strcpy(ptr, $1);
--  					  RemoveDQuote(ptr);
--  					  $$ = ptr;
--!                                         };
--  number		: NUMBER		{ $$ = $1; }
--  		;
--  
-+--- misc/nas-1.4.1/Imakefile.orig	Wed Mar  6 02:20:01 2002
-++++ misc/build/nas-1.4.1/Imakefile	Wed Mar  6 02:20:07 2002
-+@@ -42,6 +42,8 @@
-+ 	@echo ""
-+ 	Date
-+ 	@echo ""
-++	@find . | egrep "\.(cxx|h|c)$$" | xargs \
-++                ${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
-+ 	$(MAKE) $(MFLAGS) Makefiles
-+ 	$(MAKE) $(MFLAGS) clean
-+ 	$(MAKE) $(MFLAGS) includes
-+--- misc/nas-1.4.1/clients/audio/audial/audial.c.orig	Wed Nov  5 18:50:21 1997
-++++ misc/build/nas-1.4.1/clients/audio/audial/audial.c	Wed Nov  5 18:56:33 1997
-+@@ -133,6 +133,7 @@
-+     signal(SIGALRM, SIG_DFL);
-+ }
-+ 
-++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3)
-+ static void
-+ usleep(usecs)
-+ unsigned int    usecs;
-+@@ -149,7 +150,7 @@
-+     setitimer(ITIMER_REAL, &ntval, &otval);
-+     pause();
-+ }
-+-
-++#endif
-+ #endif						/* SYSV else not */
-+ #endif						/* VMS else not */
-+ #endif						/* NEEDUSLEEP */
-+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig	Sun Mar  5 03:40:55 2000
-++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c	Sat Dec 16 22:11:35 2000
-+@@ -155,8 +155,10 @@
-+ #include <assert.h>
-+ 
-+ #ifdef __FreeBSD__
-+-# include <machine/soundcard.h>
-+-# include <machine/pcaudioio.h>
-++# include <sys/soundcard.h>
-++# ifdef __i386__
-++#  include <machine/pcaudioio.h>
-++# endif
-+ #else
-+ # ifdef __NetBSD__
-+ #  include <sys/ioctl.h>
-+@@ -610,7 +612,11 @@
-+ 
-+     if(sndStatOut.fd == -1)
-+     {
-++#ifdef __FreeBSD__
-++       while ((sndStatOut.fd = open(sndStatOut.device, O_RDWR)) == -1 && wait)
-++#else
-+        while ((sndStatOut.fd = open(sndStatOut.device, O_RDWR|O_SYNC)) == -1 && wait)
-++#endif
-+        {
-+            osLogMsg("openDevice: waiting on output device\n");
-+            sleep(1);
-+@@ -1230,6 +1236,11 @@
-+ /*
-+  * Setup soundcard at maximum audio quality.
-+  */
-++
-++#ifdef __FreeBSD__
-++#define NO_16_BIT_SAMPLING
-++#endif
-++
-+ static void setupSoundcard(sndStatPtr)
-+ SndStat* sndStatPtr;
-+ {
-+@@ -1380,7 +1391,11 @@
-+ 
-+     AL_initialized = AuTrue;
-+ 
-++#ifdef __FreeBSD__
-++    if ((fd = open(sndStatOut.device, O_RDWR, 0)) == -1) {
-++#else
-+     if ((fd = open(sndStatOut.device, O_RDWR|O_SYNC, 0)) == -1) {
-++#endif
-+         UNIDENTMSG;
-+         return AuFalse;
-+     }
-+--- misc/nas-1.4.1/clients/audio/auedit/Graph.c.orig	Mon Oct 25 02:24:08 1999
-++++ misc/build/nas-1.4.1/clients/audio/auedit/Graph.c	Sat Mar 25 14:56:23 2000
-+@@ -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.4.1/lib/audio/Imakefile.orig	Sun May 19 14:52:20 2002
-++++ misc/build/nas-1.4.1/lib/audio/Imakefile	Sun May 19 14:54:25 2002
-+@@ -25,6 +25,8 @@
-+ 
-+ #include "../../config/NetAudio.tmpl"
-+ 
-++CCOPTIONS += $(EXTRA_CCOPTIONS)
-++
-+ #if ProjectX < 5
-+ /* Pre-X11R5 compatability */
-+ #ifndef NormalLibX
-+@@ -64,10 +66,14 @@
-+     COMPAT_OBJS = AuGetBest.o
-+ #endif /* ProjectX < 5 */
-+ 
-++#if HasBSD44Sockets
-++    SOCK_DEFINES = -DBSD44SOCKETS
-++#endif
-++
-+      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 \
-+@@ -119,6 +125,7 @@
-+ 
-+ #endif
-+ BuildIncludes($(HEADERS),audio,..)
-++BuildIncludes($(HEADERS),audio,$(BUILDINCTOP:../..=.))
-+ InstallMultiple($(HEADERS),$(INCDIR))
-+ #if ProjectX >= 5
-+ InstallNonExecFile(AuErrorDB,$(LIBDIR))
-+--- misc/nas-1.4.1/config/NetAudio.def.orig	Sun Feb 13 05:31:14 2000
-++++ misc/build/nas-1.4.1/config/NetAudio.def	Fri Mar 24 04:55:49 2000
-+@@ -8,5 +8,5 @@
-+ 
-+ 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.4.1/server/dia/gram.y.orig	Thu Oct 31 10:13:28 2002
-++++ misc/build/nas-1.4.1/server/dia/gram.y	Thu Oct 31 10:15:18 2002
-+@@ -120,13 +120,13 @@
-+ 		| MAXRATE number
-+ 			{ ddaSetConfig(MAXRATE, (void *)$2); }
-+ 		| MINRATE number
-+-			{ ddaSetConfig(MINRATE, (void *)$2); }
-++			{ ddaSetConfig(MINRATE, (void *)$2); };
-+ 
-+ string		: STRING		{ ptr = (char *)malloc(strlen($1)+1);
-+ 					  strcpy(ptr, $1);
-+ 					  RemoveDQuote(ptr);
-+ 					  $$ = ptr;
-+-					}
-++					};
-+ number		: NUMBER		{ $$ = $1; }
-+ 		;
-+ 
diff --git a/editors/openoffice.org-1.0/files/patch-offapi+com+sun+star+setup+OSType.idl b/editors/openoffice.org-1.0/files/patch-offapi+com+sun+star+setup+OSType.idl
deleted file mode 100644
index 3fee562c6d38..000000000000
--- a/editors/openoffice.org-1.0/files/patch-offapi+com+sun+star+setup+OSType.idl
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.0/files/patch-offapi+util+makefile.pmk b/editors/openoffice.org-1.0/files/patch-offapi+util+makefile.pmk
deleted file mode 100644
index 5cdbb1b4aa4a..000000000000
--- a/editors/openoffice.org-1.0/files/patch-offapi+util+makefile.pmk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.0/files/patch-package+inc+HashMaps.hxx b/editors/openoffice.org-1.0/files/patch-package+inc+HashMaps.hxx
deleted file mode 100644
index 35052d291ef7..000000000000
--- a/editors/openoffice.org-1.0/files/patch-package+inc+HashMaps.hxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice.org-1.0/files/patch-package+inc+ZipPackageFolder.hxx b/editors/openoffice.org-1.0/files/patch-package+inc+ZipPackageFolder.hxx
deleted file mode 100644
index 014c61403380..000000000000
--- a/editors/openoffice.org-1.0/files/patch-package+inc+ZipPackageFolder.hxx
+++ /dev/null
@@ -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()
diff --git a/editors/openoffice.org-1.0/files/patch-package+source+zippackage+ContentInfo.hxx b/editors/openoffice.org-1.0/files/patch-package+source+zippackage+ContentInfo.hxx
deleted file mode 100644
index c4bf35e79f64..000000000000
--- a/editors/openoffice.org-1.0/files/patch-package+source+zippackage+ContentInfo.hxx
+++ /dev/null
@@ -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();
diff --git a/editors/openoffice.org-1.0/files/patch-package+source+zippackage+ZipPackageFolder.cxx b/editors/openoffice.org-1.0/files/patch-package+source+zippackage+ZipPackageFolder.cxx
deleted file mode 100644
index bb504c834eef..000000000000
--- a/editors/openoffice.org-1.0/files/patch-package+source+zippackage+ZipPackageFolder.cxx
+++ /dev/null
@@ -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 );
diff --git a/editors/openoffice.org-1.0/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice.org-1.0/files/patch-product+inc+scp+udk_basefiles.scp
deleted file mode 100644
index 0f59b9ebee9b..000000000000
--- a/editors/openoffice.org-1.0/files/patch-product+inc+scp+udk_basefiles.scp
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../product/inc/scp/udk_basefiles.scp.orig	Tue Jan  7 14:52:10 2003
-+++ ../product/inc/scp/udk_basefiles.scp	Sun Jan 19 22:37:05 2003
-@@ -2,6 +2,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 ( LINUX ))
- #if ( defined( _gcc3 ) && defined( C300 ) )
- 
- File gid_File_Lib_gcc
-@@ -34,6 +35,7 @@
- End
- 
- 
-+#endif
- #endif
- 
- File gid_File_Lib_Sal
diff --git a/editors/openoffice.org-1.0/files/patch-product+settings+settings.mk b/editors/openoffice.org-1.0/files/patch-product+settings+settings.mk
deleted file mode 100644
index 3dae50f091a3..000000000000
--- a/editors/openoffice.org-1.0/files/patch-product+settings+settings.mk
+++ /dev/null
@@ -1,75 +0,0 @@
---- ../product/settings/settings.mk.orig	Sat Jan 18 18:23:17 2003
-+++ ../product/settings/settings.mk	Sat Jan 18 18:37:12 2003
-@@ -225,3 +226,72 @@
- 
- endif
- 
-+ifeq "$(PLATFORM)" "FreeBSD"
-+# Settings for Linux using gcc compiler
-+
-+OS=LINUX
-+PLATFORM=linux
-+PS=/
-+LINK=$(CC)
-+LIB=$(CC)
-+ECHO=@echo
-+MKDIR=mkdir -p
-+CAT=cat
-+OBJ_EXT=o
-+SHAREDLIB_EXT=so
-+SHAREDLIB_PRE=lib
-+SHAREDLIB_OUT=$(OUT_LIB)
-+PACKAGE_LIB_DIR=linux_x86.plt
-+    
-+GCC_VERSION=$(shell $(CC) -dumpversion)
-+
-+ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3"
-+COMID=gcc3
-+CPPU_ENV=gcc3
-+else
-+COMID=GCC
-+CPPU_ENV=gcc2
-+endif
-+
-+OSEP=\<
-+CSEP=\>
-+    
-+DEL=rm -f
-+DELRECURSIVE=rm -rf
-+COPY=cp
-+URLPREFIX=file://
-+
-+# Include UDK version numbers
-+include $(PRJ)/include/udkversion.mk
-+
-+SALLIB=-lsal
-+CPPULIB=-lcppu
-+CPPUHELPERLIB=-lcppuhelper$(COMID)
-+SALHELPERLIB=-lsalhelper$(COMID)
-+STLPORTLIB=-lstlport_gcc
-+
-+EMPTYSTRING=
-+PATH_SEPARATOR=:
-+
-+# -O is necessary for inlining (see gcc documentation)
-+ifeq "$(DEBUG)" "yes"
-+CC_FLAGS=-c -g
-+else
-+CC_FLAGS=-c -O
-+endif
-+SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/linux
-+CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include
-+STL_INCLUDES=-I$(OO_STLPORT_HOME)/stlport
-+CC_DEFINES=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV)
-+
-+# define for used compiler necessary for UNO
-+#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95
-+#-DCPPU_ENV=gcc3 -- gcc3 3.0
-+
-+CC_OUTPUT_SWITCH=-o
-+
-+LIBRARY_LINK_FLAGS=-shared
-+EXE_LINK_FLAGS=-Wl -export-dynamic
-+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH)
-+
-+endif
diff --git a/editors/openoffice.org-1.0/files/patch-product+util+makefile.mk b/editors/openoffice.org-1.0/files/patch-product+util+makefile.mk
deleted file mode 100644
index 6e72982a23bf..000000000000
--- a/editors/openoffice.org-1.0/files/patch-product+util+makefile.mk
+++ /dev/null
@@ -1,32 +0,0 @@
---- ../product/util/makefile.mk.orig	Sat Jan 18 13:31:50 2003
-+++ ../product/util/makefile.mk	Sat Jan 18 13:30:54 2003
-@@ -131,13 +131,6 @@
- DESTDIRDLL=$(DESTDIRLIB)
- STLPORTLIBNAME=libstlport_gcc.so
- BINDINGDLL=$(COMNAME)_uno
--.IF "$(COMID)"=="gcc3"
--ADDITIONAL_DLLS= \
--       $(DESTDIRDLL)$/libgcc_s.so.1            \
--       $(DESTDIRDLL)$/libgcc_s.so              \
--       $(DESTDIRDLL)$/libstdc++.so.$(SHORTSTDCPP3)           \
--       $(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3)
--.ENDIF
- 
- .ELIF "$(OS)"=="NETBSD"
- ###########
-@@ -491,6 +484,7 @@
- # special targets for linux gcc3 
- .IF "$(COMID)"=="gcc3"
- 
-+.IF "$(OS)"!="FREEBSD"
- $(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) :
-        $(GCCINSTLIB) libstdc++.so.$(LIBSTDCPP3) $(DLLOUT)
- 
-@@ -514,6 +508,7 @@
- $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
- 	-rm -f $@
- 	+ln -s libgcc_s.so.1 $@
-+.ENDIF
- #-------------------------------------------------------------
- 
- $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
diff --git a/editors/openoffice.org-1.0/files/patch-psprint+source+printer+printerinfomanager.cxx b/editors/openoffice.org-1.0/files/patch-psprint+source+printer+printerinfomanager.cxx
deleted file mode 100644
index 4947227f8d52..000000000000
--- a/editors/openoffice.org-1.0/files/patch-psprint+source+printer+printerinfomanager.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../psprint/source/printer/printerinfomanager.cxx.orig	Sat Apr  6 11:56:35 2002
-+++ ../psprint/source/printer/printerinfomanager.cxx	Wed May  1 22:42:58 2002
-@@ -883,7 +883,7 @@
- 
- static const struct SystemCommandParameters aParms[] =
- {
--#if defined(LINUX) || defined(NETBSD)
-+#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD)
-     { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 },
-     { "lpc status", "lpr -P (PRINTER)", "", ":", 0 },
-     { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 }
diff --git a/editors/openoffice.org-1.0/files/patch-psprint+source+printergfx+psheader.ps b/editors/openoffice.org-1.0/files/patch-psprint+source+printergfx+psheader.ps
deleted file mode 100644
index 2118d0fe6c93..000000000000
--- a/editors/openoffice.org-1.0/files/patch-psprint+source+printergfx+psheader.ps
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../psprint/source/printergfx/psheader.ps.orig	Tue Jun  4 22:33:58 2002
-+++ ../psprint/source/printergfx/psheader.ps
-@@ -303,8 +303,8 @@
-     /h /i /j /k /l /m /n /o
-     /p /q /r /s /t /u /v /w
-     /x /y /z /braceleft /bar /braceright /asciitilde /unused
--    /euro /unused /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
--    /circumflex /perthousand /Scaron /guilsinglleft /OE /unused /zcaron /unused
-+    /Euro /unused /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
-+    /circumflex /perthousand /Scaron /guilsinglleft /OE /unused /Zcaron /unused
-     /unused /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
-     /tilde /trademark /scaron /guilsinglright /oe /unused /zcaron /Ydieresis
-     /space /exclamdown /cent /sterling /currency /yen /brokenbar /section
diff --git a/editors/openoffice.org-1.0/files/patch-registry+source+regkey.cxx b/editors/openoffice.org-1.0/files/patch-registry+source+regkey.cxx
deleted file mode 100644
index fad069f83f14..000000000000
--- a/editors/openoffice.org-1.0/files/patch-registry+source+regkey.cxx
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-1.0/files/patch-remotebridges+source+unourl_resolver+makefile.mk b/editors/openoffice.org-1.0/files/patch-remotebridges+source+unourl_resolver+makefile.mk
deleted file mode 100644
index 72e5a97234f4..000000000000
--- a/editors/openoffice.org-1.0/files/patch-remotebridges+source+unourl_resolver+makefile.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../remotebridges/source/unourl_resolver/makefile.mk.orig	Tue Jan  1 14:11:01 2002
-+++ ../remotebridges/source/unourl_resolver/makefile.mk
-@@ -102,9 +102,9 @@
- SHL1VERSIONMAP=	$(TARGET).map
- 
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
--		$(CPPUHELPERLIB)	\
--		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1DEPN=
- SHL1IMPLIB=	i$(TARGET)
diff --git a/editors/openoffice.org-1.0/files/patch-rsc+source+rscpp+cpp.h b/editors/openoffice.org-1.0/files/patch-rsc+source+rscpp+cpp.h
deleted file mode 100644
index 417ab33ba52f..000000000000
--- a/editors/openoffice.org-1.0/files/patch-rsc+source+rscpp+cpp.h
+++ /dev/null
@@ -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              */
- 
diff --git a/editors/openoffice.org-1.0/files/patch-rsc+source+rscpp+cpp3.c b/editors/openoffice.org-1.0/files/patch-rsc+source+rscpp+cpp3.c
deleted file mode 100644
index f74de7504d2e..000000000000
--- a/editors/openoffice.org-1.0/files/patch-rsc+source+rscpp+cpp3.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../rsc/source/rscpp/cpp3.c.orig	Thu Jul 25 00:00:25 2002
-+++ ../rsc/source/rscpp/cpp3.c	Thu Jul 25 00:01:50 2002
-@@ -82,7 +82,9 @@
- #ifdef IRIX
- extern void 	abort(void);
- #else
-+#ifndef FREEBSD
- extern int      abort();                /* For debugging                */
-+#endif
- #endif
- #endif
- 
diff --git a/editors/openoffice.org-1.0/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice.org-1.0/files/patch-sablot+Sablot-0.52.patch
deleted file mode 100644
index c3a0ffc47e73..000000000000
--- a/editors/openoffice.org-1.0/files/patch-sablot+Sablot-0.52.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../sablot/Sablot-0.52.patch.orig	Sun Jan 19 15:13:42 2003
-+++ ../sablot/Sablot-0.52.patch	Sun Jan 19 15:15:15 2003
-@@ -3,7 +3,7 @@
- ***************
- *** 1 ****
- ! dummy
----- 1,159 ----
-+--- 1,161 ----
- ! #*************************************************************************
- ! #
- ! #   $RCSfile: makefile.mk,v $
-@@ -96,6 +96,8 @@
- ! .IF "$(GUI)"=="UNX"
- ! .IF "$(OS)"=="NETBSD"
- ! CFLAGS+=     -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
-+! .ELIF "$(OS)"=="FREEBSD"
-+! CFLAGS+=     -DHAVE_SYS_TIME_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
- ! .ELSE
- ! .IF "$(OS)"=="MACOSX"
- ! CFLAGS+=     -DHAVE_GETTIMEOFDAY -DHAVE_SYS_TIME_H -DHAVE_ISNAN -DHAVE_FINITE
diff --git a/editors/openoffice.org-1.0/files/patch-sal+inc+rtl+textenc.h b/editors/openoffice.org-1.0/files/patch-sal+inc+rtl+textenc.h
deleted file mode 100644
index 10731179cff5..000000000000
--- a/editors/openoffice.org-1.0/files/patch-sal+inc+rtl+textenc.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../sal/inc/rtl/textenc.h.orig	Mon Feb 24 17:46:26 2003
-+++ ../sal/inc/rtl/textenc.h	Tue Feb 25 16:45:00 2003
-@@ -173,8 +173,9 @@
- #define RTL_TEXTENCODING_MS_1361                (RTL_TEXTENC_CAST( 84 ))
- #define RTL_TEXTENCODING_GB_18030               (RTL_TEXTENC_CAST( 85 ))
- #define RTL_TEXTENCODING_BIG5_HKSCS             (RTL_TEXTENC_CAST( 86 ))
-+#define RTL_TEXTENCODING_KOI8_U                 (RTL_TEXTENC_CAST( 87 ))
- 
--#define RTL_TEXTENCODING_STD_COUNT              (RTL_TEXTENC_CAST( 87 ))
-+#define RTL_TEXTENCODING_STD_COUNT              (RTL_TEXTENC_CAST( 88 ))
- 
- #define RTL_TEXTENCODING_USER_START             (RTL_TEXTENC_CAST( 0x8000 ))
- #define RTL_TEXTENCODING_USER_END               (RTL_TEXTENC_CAST( 0xEFFF ))
-@@ -223,6 +224,7 @@
- Cyrillic (DOS/OS2-866/Russian)                  RTL_TEXTENCODING_IBM_866
- Cyrillic (ISO-8859-5)                           RTL_TEXTENCODING_ISO_8859_5
- Cyrillic (KOI8-R)                               RTL_TEXTENCODING_KOI8_R
-+Cyrillic (KOI8-U)                               RTL_TEXTENCODING_KOI8_U
- Cyrillic (Windows-1251)                         RTL_TEXTENCODING_MS_1251
- 
- Greek (Apple Macintosh)                         RTL_TEXTENCODING_APPLE_GREEK
diff --git a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+interlck.c b/editors/openoffice.org-1.0/files/patch-sal+osl+unx+interlck.c
deleted file mode 100644
index 60ea1f414d1a..000000000000
--- a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+interlck.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- ../sal/osl/unx/interlck.c.orig	Mon Jul 22 17:51:34 2002
-+++ ../sal/osl/unx/interlck.c	Mon Jul 22 18:03:42 2002
-@@ -81,10 +81,10 @@
- 	__asm__ __volatile__ (
- 		"movl $1, %0\n\t"
- 		"lock\n\t" 
--		"xadd %0, %2\n\t"
-+		"xadd %0, %1\n\t"
- 		"incl %0"
--	:	"=a" (nCount), "=m" (*pCount)
--	:	"m" (*pCount)
-+	:	"=&a" (nCount), "+m" (*pCount)
-+	:
- 	:	"memory");
- }
- 
-@@ -95,10 +95,10 @@
- 	__asm__ __volatile__ (
- 		"movl $-1, %0\n\t"
- 		"lock\n\t"
--		"xadd %0, %2\n\t"
-+		"xadd %0, %1\n\t"
- 		"decl %0"
--	:	"=a" (nCount), "=m" (*pCount)
--	:	"m" (*pCount)
-+	:	"=&a" (nCount), "+m" (*pCount)
-+	:
- 	:	"memory");
- }
- 
diff --git a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-1.0/files/patch-sal+osl+unx+nlsupport.c
deleted file mode 100644
index 9bebad2b4386..000000000000
--- a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+nlsupport.c
+++ /dev/null
@@ -1,184 +0,0 @@
---- ../sal/osl/unx/nlsupport.c.orig	Tue May 21 15:22:11 2002
-+++ ../sal/osl/unx/nlsupport.c	Tue Sep  3 12:58:48 2002
-@@ -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(FREEBSD) || defined(NETBSD)
- #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,13 @@
-     return NULL;
- }
-         
--#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD)
-+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(FREEBSD) || defined(NETBSD)
- 
- /*
-  * This implementation of osl_getTextEncodingFromLocale maps 
-  * from nl_langinfo(CODESET) to rtl_textencoding defines. 
-- * nl_langinfo() is supported only on Linux, Solaris and IRIX. 
-+ * 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 +260,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)
- 
-@@ -299,23 +305,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 */
-@@ -496,7 +502,59 @@
-     { "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 */
-+   { "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 */
-+   { "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;
- 
-@@ -618,7 +676,7 @@
-     return ret;
- }
- 
--#elif defined(MACOSX) /* ifdef LINUX || SOLARIS || NETBSD */
-+#elif defined(MACOSX) /* ifdef LINUX || SOLARIS || IRIX || FREEBSD || NETBSD */
- 
- /*
-  * FIXME: the MacOS X implemetation is missing
-@@ -651,7 +709,7 @@
-     return 0;
- }
- 
--#else /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */
-+#else /* ifdef LINUX || SOLARIS || IRIX || FREEBSD || NETBSD || MACOSX */
- 
- /*
-  * This implementation of osl_getTextEncodingFromLocale maps 
-@@ -684,6 +742,7 @@
-     { "iso8859-8",    RTL_TEXTENCODING_ISO_8859_8  },
-     { "iso8859-9",    RTL_TEXTENCODING_ISO_8859_9  },
-     { "koi8-r",       RTL_TEXTENCODING_KOI8_R      },
-+    { "koi8-u",       RTL_TEXTENCODING_KOI8_U      },
-     { "pck",          RTL_TEXTENCODING_MS_932      },
- #if (0)
-     { "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW    },
-@@ -887,6 +946,6 @@
-     return 0;
- }
- 
--#endif /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */
-+#endif /* ifdef LINUX || SOLARIS || FREEBSD || NETBSD || MACOSX */
- 
- 
diff --git a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+pipe.c b/editors/openoffice.org-1.0/files/patch-sal+osl+unx+pipe.c
deleted file mode 100644
index 217bd0be4d58..000000000000
--- a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+pipe.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../sal/osl/unx/pipe.c.orig	Mon Feb 18 13:48:55 2002
-+++ ../sal/osl/unx/pipe.c	Wed Apr  3 00:59:15 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 )
- 	{			
diff --git a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+process.c b/editors/openoffice.org-1.0/files/patch-sal+osl+unx+process.c
deleted file mode 100644
index 4c3fdcc8f0ad..000000000000
--- a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+process.c
+++ /dev/null
@@ -1,20 +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;
-@@ -862,7 +862,7 @@
- 
- 			if (! INIT_GROUPS(data.m_name, data.m_gid) || (setuid(data.m_uid) != 0))
- 				OSL_TRACE("Failed to change uid and guid, errno=%d (%s)\n", errno, strerror(errno));
--#ifdef LINUX
-+#if defined(LINUX) || defined(FREEBSD)
- 			unsetenv("HOME");
- #else
- 			putenv("HOME=");
diff --git a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+security.c b/editors/openoffice.org-1.0/files/patch-sal+osl+unx+security.c
deleted file mode 100644
index 0cc321dcd544..000000000000
--- a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+security.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../sal/osl/unx/security.c.orig	Sat Jul 20 22:53:31 2002
-+++ ../sal/osl/unx/security.c	Sat Jul 20 22:52:39 2002
-@@ -739,7 +739,7 @@
- 	}
- 
- 
--#elif (LINUX && (GLIBC >= 2))
-+#elif ((LINUX && (GLIBC >= 2)) || defined(FREEBSD))
- 	
- 	struct passwd	*pPasswd; 
- 	
diff --git a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+socket.c b/editors/openoffice.org-1.0/files/patch-sal+osl+unx+socket.c
deleted file mode 100644
index b6e0e2fa0901..000000000000
--- a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+socket.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../sal/osl/unx/socket.c.orig	Sun Mar 17 12:46:37 2002
-+++ ../sal/osl/unx/socket.c	Wed Apr  3 01:01:14 2002
-@@ -82,7 +82,7 @@
- #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 */
-@@ -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! */
diff --git a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+system.c b/editors/openoffice.org-1.0/files/patch-sal+osl+unx+system.c
deleted file mode 100644
index 8dc663ac03fc..000000000000
--- a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+system.c
+++ /dev/null
@@ -1,127 +0,0 @@
---- ../sal/osl/unx/system.c.orig	Sun Mar 17 12:34:13 2002
-+++ ../sal/osl/unx/system.c	Wed Apr  3 01:03:36 2002
-@@ -195,6 +195,73 @@
- }
- #endif
- 
-+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
-+           size_t buflen, struct passwd **result)
-+{
-+  struct passwd* res;
-+
-+  pthread_mutex_lock(&getrtl_mutex);
-+
-+  if ( res = getpwuid(uid) )
-+  {
-+    size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell;
-+
-+    pw_name = strlen(res->pw_name)+1;
-+    pw_passwd = strlen(res->pw_passwd)+1;
-+    pw_class = strlen(res->pw_class)+1;
-+    pw_gecos = strlen(res->pw_gecos)+1;
-+    pw_dir = strlen(res->pw_dir)+1;
-+    pw_shell = strlen(res->pw_shell)+1;
-+
-+    if (pw_name+pw_passwd+pw_class+pw_gecos
-+                                 +pw_dir+pw_shell < buflen)
-+    {
-+      memcpy(pwd, res, sizeof(struct passwd));
-+
-+      strncpy(buffer, res->pw_name, pw_name);
-+      pwd->pw_name = buffer;
-+      buffer += pw_name;
-+
-+      strncpy(buffer, res->pw_passwd, pw_passwd);
-+      pwd->pw_passwd = buffer;
-+      buffer += pw_passwd;
-+
-+      strncpy(buffer, res->pw_class, pw_class);
-+      pwd->pw_class = buffer;
-+      buffer += pw_class;
-+
-+      strncpy(buffer, res->pw_gecos, pw_gecos);
-+      pwd->pw_gecos = buffer;
-+      buffer += pw_gecos;
-+
-+      strncpy(buffer, res->pw_dir, pw_dir);
-+      pwd->pw_dir = buffer;
-+      buffer += pw_dir;
-+
-+      strncpy(buffer, res->pw_shell, pw_shell);
-+      pwd->pw_shell = buffer;
-+      buffer += pw_shell;
-+
-+      *result = pwd ;
-+      res = 0 ;
-+
-+    } else {
-+
-+      res = ENOMEM ;
-+
-+    }      
-+  
-+  } else {
-+
-+    res = errno ;
-+ 
-+  } 
-+
-+  pthread_mutex_unlock(&getrtl_mutex);
-+
-+  return res;
-+}
-+
- struct tm *localtime_r(const time_t *timep, struct tm *buffer)
- {
- 	struct tm* res;
-@@ -518,3 +585,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.0/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-1.0/files/patch-sal+osl+unx+system.h
deleted file mode 100644
index c4e255952fc7..000000000000
--- a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+system.h
+++ /dev/null
@@ -1,35 +0,0 @@
---- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
-+++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
-@@ -205,6 +205,13 @@
- #   include <sys/ioctl.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 <machine/vmparam.h>
-+#   include <machine/pmap.h>
- #	include <sys/un.h>
- #   include <netinet/tcp.h>
- #	define 	IORESOURCE_TRANSFER_BSD 
-@@ -216,12 +223,13 @@
- #   elif BYTE_ORDER == PDP_ENDIAN
- #   	define _PDP_ENDIAN
- #   endif
--#   define  sched_yield() 				pthread_yield()
--#   define  pthread_testcancel()
- #	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
diff --git a/editors/openoffice.org-1.0/files/patch-sal+rtl+source+strtmpl.c b/editors/openoffice.org-1.0/files/patch-sal+rtl+source+strtmpl.c
deleted file mode 100644
index 91a5289d6636..000000000000
--- a/editors/openoffice.org-1.0/files/patch-sal+rtl+source+strtmpl.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../sal/rtl/source/strtmpl.c.orig	Mon Mar 11 01:28:38 2002
-+++ ../sal/rtl/source/strtmpl.c	Mon Mar 11 01:30:42 2002
-@@ -1104,10 +1104,12 @@
-         }
-         else if ( *pStr == '+' )
-         {
--            if ( bExp && (nExp != 0) )
--                break;
--            if ( fRet != 0.0 )
--                break;
-+		if ( bExp ) {
-+			if ( nExp != 0 )
-+				break;
-+			}
-+		else if ( fRet != 0.0 )
-+			break;
-         }
-         /* Exponent separator */
-         else if ( (*pStr == 'e') || (*pStr == 'E') )
diff --git a/editors/openoffice.org-1.0/files/patch-sal+textenc+tcvtest1.tab b/editors/openoffice.org-1.0/files/patch-sal+textenc+tcvtest1.tab
deleted file mode 100644
index 3597a0587962..000000000000
--- a/editors/openoffice.org-1.0/files/patch-sal+textenc+tcvtest1.tab
+++ /dev/null
@@ -1,173 +0,0 @@
---- ../sal/textenc/tcvtest1.tab.orig	Fri Oct 12 13:44:53 2001
-+++ ../sal/textenc/tcvtest1.tab	Tue Feb 25 16:47:50 2003
-@@ -4328,3 +4328,170 @@
-         "koi8-r",
-         RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME };
-     /* SCRIPT_CYRILLIC, pc code page 866 (855?), mac encoding 7 */
-+
-+/* ======================================================================= */
-+
-+/* KOI8_U */
-+/* Standard Charset for Ukrainian Cyrillic */
-+/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
-+/* Convert-Tables: typed per hand */
-+/* Last-Changes from us: */
-+
-+#define KOI8UUNI_START                  0x80
-+#define KOI8UUNI_END                    0xFF
-+static sal_uInt16 const aImplKOI8UToUniTab[KOI8UUNI_END - KOI8UUNI_START + 1] =
-+{
-+/*       0       1       2       3       4       5       6       7 */
-+/*       8       9       A       B       C       D       E       F */
-+    0x2500, 0x2502, 0x250C, 0x2510, 0x2514, 0x2518, 0x251C, 0x2524, /* 0x80 */
-+    0x252C, 0x2534, 0x253C, 0x2580, 0x2584, 0x2588, 0x258C, 0x2590, /* 0x80 */
-+    0x2591, 0x2592, 0x2593, 0x2320, 0x25A0, 0x2219, 0x221A, 0x2248, /* 0x90 */
-+    0x2264, 0x2265, 0x00A0, 0x2321, 0x00B0, 0x00B2, 0x00B7, 0x00F7, /* 0x90 */
-+    0x2550, 0x2551, 0x2552, 0x0451, 0x0454, 0x2554, 0x0456, 0x0457, /* 0xA0 */
-+    0x2557, 0x2558, 0x2559, 0x255A, 0x255B, 0x0491, 0x255D, 0x255E, /* 0xA0 */
-+    0x255F, 0x2560, 0x2561, 0x0401, 0x0404, 0x2563, 0x0406, 0x0407, /* 0xB0 */
-+    0x2566, 0x2567, 0x2568, 0x2569, 0x256A, 0x0490, 0x256C, 0x00A9, /* 0xB0 */
-+    0x044E, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, /* 0xC0 */
-+    0x0445, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, /* 0xC0 */
-+    0x043F, 0x044F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, /* 0xD0 */
-+    0x044C, 0x044B, 0x0437, 0x0448, 0x044D, 0x0449, 0x0447, 0x044A, /* 0xD0 */
-+    0x042E, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, /* 0xE0 */
-+    0x0425, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, /* 0xE0 */
-+    0x041F, 0x042F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, /* 0xF0 */
-+    0x042C, 0x042B, 0x0417, 0x0428, 0x042D, 0x0429, 0x0427, 0x042A  /* 0xF0 */
-+};
-+
-+/* ----------------------------------------------------------------------- */
-+
-+#define KOI8UCHAR_START                 0x0410
-+#define KOI8UCHAR_END                   0x044F
-+static sal_uChar const aImplKOI8UToCharTab[KOI8UCHAR_END - KOI8UCHAR_START + 1] =
-+{
-+/*     0     1     2     3     4     5     6     7 */
-+/*     8     9     A     B     C     D     E     F */
-+    0xE1, 0xE2, 0xF7, 0xE7, 0xE4, 0xE5, 0xF6, 0xFA, /* 0x0410 */
-+    0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, /* 0x0410 */
-+    0xF2, 0xF3, 0xF4, 0xF5, 0xE6, 0xE8, 0xE3, 0xFE, /* 0x0420 */
-+    0xFB, 0xFD, 0xFF, 0xF9, 0xF8, 0xFC, 0xE0, 0xF1, /* 0x0420 */
-+    0xC1, 0xC2, 0xD7, 0xC7, 0xC4, 0xC5, 0xD6, 0xDA, /* 0x0430 */
-+    0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, /* 0x0430 */
-+    0xD2, 0xD3, 0xD4, 0xD5, 0xC6, 0xC8, 0xC3, 0xDE, /* 0x0440 */
-+    0xDB, 0xDD, 0xDF, 0xD9, 0xD8, 0xDC, 0xC0, 0xD1  /* 0x0440 */
-+};
-+
-+/* ----------------------------------------------------------------------- */
-+
-+#define KOI8UTOCHARTABEX_COUNT          72
-+static ImplUniCharTabData const aImplKOI8UToCharTabEx[KOI8UTOCHARTABEX_COUNT] =
-+{
-+  { 0x00A0, 0x9A },
-+  { 0x00A9, 0xBF },
-+  { 0x00B0, 0x9C },
-+  { 0x00B2, 0x9D },
-+  { 0x00B7, 0x9E },
-+  { 0x00F7, 0x9F },
-+  { 0x0401, 0xB3 },
-+  { 0x0404, 0xB4 },
-+  { 0x0406, 0xB6 },
-+  { 0x0407, 0xB7 },
-+  { 0x0451, 0xA3 },
-+  { 0x0454, 0xA4 },
-+  { 0x0456, 0xA6 },
-+  { 0x0457, 0xA7 },
-+  { 0x0490, 0xBD },
-+  { 0x0491, 0xAD },
-+  { 0x2219, 0x95 },
-+  { 0x221A, 0x96 },
-+  { 0x2248, 0x97 },
-+  { 0x2264, 0x98 },
-+  { 0x2265, 0x99 },
-+  { 0x2320, 0x93 },
-+  { 0x2321, 0x9B },
-+  { 0x2500, 0x80 },
-+  { 0x2502, 0x81 },
-+  { 0x250C, 0x82 },
-+  { 0x2510, 0x83 },
-+  { 0x2514, 0x84 },
-+  { 0x2518, 0x85 },
-+  { 0x251C, 0x86 },
-+  { 0x2524, 0x87 },
-+  { 0x252C, 0x88 },
-+  { 0x2534, 0x89 },
-+  { 0x253C, 0x8A },
-+  { 0x2550, 0xA0 },
-+  { 0x2551, 0xA1 },
-+  { 0x2552, 0xA2 },
-+  { 0x2553, 0xA4 },
-+  { 0x2554, 0xA5 },
-+  { 0x2555, 0xA6 },
-+  { 0x2556, 0xA7 },
-+  { 0x2557, 0xA8 },
-+  { 0x2558, 0xA9 },
-+  { 0x2559, 0xAA },
-+  { 0x255A, 0xAB },
-+  { 0x255B, 0xAC },
-+  { 0x255C, 0xAD },
-+  { 0x255D, 0xAE },
-+  { 0x255E, 0xAF },
-+  { 0x255F, 0xB0 },
-+  { 0x2560, 0xB1 },
-+  { 0x2561, 0xB2 },
-+  { 0x2562, 0xB4 },
-+  { 0x2563, 0xB5 },
-+  { 0x2564, 0xB6 },
-+  { 0x2565, 0xB7 },
-+  { 0x2566, 0xB8 },
-+  { 0x2567, 0xB9 },
-+  { 0x2568, 0xBA },
-+  { 0x2569, 0xBB },
-+  { 0x256A, 0xBC },
-+  { 0x256B, 0xBD },
-+  { 0x256C, 0xBE },
-+  { 0x2580, 0x8B },
-+  { 0x2584, 0x8C },
-+  { 0x2588, 0x8D },
-+  { 0x258C, 0x8E },
-+  { 0x2590, 0x8F },
-+  { 0x2591, 0x90 },
-+  { 0x2592, 0x91 },
-+  { 0x2593, 0x92 },
-+  { 0x25A0, 0x94 }
-+};
-+
-+/* ----------------------------------------------------------------------- */
-+
-+static ImplByteConvertData const aImplKOI8UByteCvtData =
-+{
-+    aImplKOI8UToUniTab,
-+    NULL,
-+    KOI8UUNI_START, KOI8UUNI_END,
-+    NOTABUNI_START, NOTABUNI_END,
-+    aImplKOI8UToCharTab,
-+    NULL,
-+    aImplKOI8UToCharTabEx,
-+    KOI8UCHAR_START, KOI8UCHAR_END,
-+    NOTABCHAR_START, NOTABCHAR_END,
-+    KOI8UTOCHARTABEX_COUNT
-+};
-+
-+/* ----------------------------------------------------------------------- */
-+
-+static ImplTextEncodingData const aImplKOI8UTextEncodingData
-+    = { { &aImplKOI8UByteCvtData,
-+          ImplCharToUnicode,
-+          ImplUnicodeToChar,
-+          NULL,
-+          NULL,
-+          NULL,
-+          NULL,
-+          NULL,
-+          NULL },
-+        RTL_TEXTENCODING_KOI8_U,
-+        1,
-+        1,
-+        1,
-+        204,
-+        "koi8-u",
-+        "koi8-u",
-+        RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME };
-+    /* SCRIPT_CYRILLIC, pc code page 866 (855?), mac encoding 7 */
diff --git a/editors/openoffice.org-1.0/files/patch-sal+textenc+tencinfo.c b/editors/openoffice.org-1.0/files/patch-sal+textenc+tencinfo.c
deleted file mode 100644
index 03825fb8b4a5..000000000000
--- a/editors/openoffice.org-1.0/files/patch-sal+textenc+tencinfo.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- ../sal/textenc/tencinfo.c.orig	Wed Jul 31 11:44:35 2002
-+++ ../sal/textenc/tencinfo.c	Wed Jul 31 11:45:47 2002
-@@ -532,6 +532,7 @@
-     static ImplStrCharsetDef const aUnixCharsetKOI8Tab[] =
-     {
-         { "r", RTL_TEXTENCODING_KOI8_R },
-+        { "u", RTL_TEXTENCODING_KOI8_U },
-         { NULL, RTL_TEXTENCODING_DONTKNOW }
-     };
- 
-@@ -695,6 +695,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 */
-+
-+    if (pMimeCharset == NULL)
-+	pMimeCharset = "usascii";
-+
-     static ImplStrCharsetDef const aVIPMimeCharsetTab[] =
-     {
-         { "usascii", RTL_TEXTENCODING_ASCII_US },
-@@ -741,6 +742,7 @@
-         { "windows1256", RTL_TEXTENCODING_MS_1256 },
-         { "windows1257", RTL_TEXTENCODING_MS_1257 },
-         { "windows1258", RTL_TEXTENCODING_MS_1258 },
-+        { "koi8u", RTL_TEXTENCODING_KOI8_U },
-         { NULL, RTL_TEXTENCODING_DONTKNOW }
-     };
- 
-@@ -815,6 +817,7 @@
-         { "iso10646us", RTL_TEXTENCODING_ASCII_US },
-         { "iso646irv", RTL_TEXTENCODING_ASCII_US },
-         { "cskoi8r", RTL_TEXTENCODING_KOI8_R },
-+        { "cskoi8u", RTL_TEXTENCODING_KOI8_U },
-         { "ibm437", RTL_TEXTENCODING_IBM_437 },
-         { "cp437", RTL_TEXTENCODING_IBM_437 },
-         { "437", RTL_TEXTENCODING_IBM_437 },
diff --git a/editors/openoffice.org-1.0/files/patch-sal+textenc+textenc.c b/editors/openoffice.org-1.0/files/patch-sal+textenc+textenc.c
deleted file mode 100644
index 1e822ae076ce..000000000000
--- a/editors/openoffice.org-1.0/files/patch-sal+textenc+textenc.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sal/textenc/textenc.c.orig	Mon Feb 24 17:46:29 2003
-+++ ../sal/textenc/textenc.c	Tue Feb 25 16:51:28 2003
-@@ -254,7 +254,8 @@
-             &aImplJISX0212TextEncodingData, /* JIS_X_0212 */
-             &aImplMS1361TextEncodingData, /* MS_1361 */
-             &aImplGb18030TextEncodingData, /* GB_18030 */
--            &aImplBig5HkscsTextEncodingData }; /* BIG5_HKSCS */
-+            &aImplBig5HkscsTextEncodingData, /* BIG5_HKSCS */
-+            &aImplKOI8UTextEncodingData }; /* KOI8_U */
-     OSL_ENSURE(nEncoding >= RTL_TEXTENCODING_DONTKNOW
-                && nEncoding <= RTL_TEXTENCODING_UNICODE,
-                "specification violation");
diff --git a/editors/openoffice.org-1.0/files/patch-sal+workben+makefile.mk b/editors/openoffice.org-1.0/files/patch-sal+workben+makefile.mk
deleted file mode 100644
index 369935e31d66..000000000000
--- a/editors/openoffice.org-1.0/files/patch-sal+workben+makefile.mk
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../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 @@
- 
- .IF "$(TESTAPP)" == "salstattest"
- 
--	CFLAGS+= /DUSE_SAL_STATIC
-+	CFLAGS+= -DUSE_SAL_STATIC
- 
- 	OBJFILES=	$(OBJ)$/salstattest.obj
- 
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- 
- CXXFILES=	tgetpwnam.cxx
- OBJFILES=	$(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN=	$(SLB)$/sal.lib
- 
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd | freebsd)
- .ENDIF # tgetpwname
- 
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-1.0/files/patch-salhelper+source+gcc2_freebsd_intel.map b/editors/openoffice.org-1.0/files/patch-salhelper+source+gcc2_freebsd_intel.map
deleted file mode 100644
index 1ffacf889bc6..000000000000
--- a/editors/openoffice.org-1.0/files/patch-salhelper+source+gcc2_freebsd_intel.map
+++ /dev/null
@@ -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:
-+*;
-+};
diff --git a/editors/openoffice.org-1.0/files/patch-salhelper+source+gcc3_freebsd_intel.map b/editors/openoffice.org-1.0/files/patch-salhelper+source+gcc3_freebsd_intel.map
deleted file mode 100644
index 823cff316ec7..000000000000
--- a/editors/openoffice.org-1.0/files/patch-salhelper+source+gcc3_freebsd_intel.map
+++ /dev/null
@@ -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:
-+		*;
-+};
-+
diff --git a/editors/openoffice.org-1.0/files/patch-salhelper+source+makefile.mk b/editors/openoffice.org-1.0/files/patch-salhelper+source+makefile.mk
deleted file mode 100644
index 3687664d8d16..000000000000
--- a/editors/openoffice.org-1.0/files/patch-salhelper+source+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../salhelper/source/makefile.mk.orig	Wed Nov 14 14:19:21 2001
-+++ ../salhelper/source/makefile.mk	Sun Mar  3 17:58:15 2002
-@@ -109,6 +109,10 @@
- SHL1VERSIONMAP=lngi.map
- .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
- SHL1VERSIONMAP=gcc3_linux_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
- .ENDIF
- 
- 
diff --git a/editors/openoffice.org-1.0/files/patch-salhelper+test+rtti+makefile.mk b/editors/openoffice.org-1.0/files/patch-salhelper+test+rtti+makefile.mk
deleted file mode 100644
index 70f25048a24a..000000000000
--- a/editors/openoffice.org-1.0/files/patch-salhelper+test+rtti+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
- 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
- .ENDIF
- 
- 
diff --git a/editors/openoffice.org-1.0/files/patch-sc+source+core+data+cell.cxx b/editors/openoffice.org-1.0/files/patch-sc+source+core+data+cell.cxx
deleted file mode 100644
index 529f67a3e35f..000000000000
--- a/editors/openoffice.org-1.0/files/patch-sc+source+core+data+cell.cxx
+++ /dev/null
@@ -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>
diff --git a/editors/openoffice.org-1.0/files/patch-scp+source+player+player.scp b/editors/openoffice.org-1.0/files/patch-scp+source+player+player.scp
deleted file mode 100644
index 2f8daab35cdd..000000000000
--- a/editors/openoffice.org-1.0/files/patch-scp+source+player+player.scp
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-1.0/files/patch-scptools+source+linker+searchcache b/editors/openoffice.org-1.0/files/patch-scptools+source+linker+searchcache
deleted file mode 100644
index 593e9eabf5bc..000000000000
--- a/editors/openoffice.org-1.0/files/patch-scptools+source+linker+searchcache
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: files/patch-scptools::source::linker::searchcache
-===================================================================
-RCS file: files/patch-scptools::source::linker::searchcache
-diff -N files/patch-scptools::source::linker::searchcache
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-scptools::source::linker::searchcache	4 Aug 2002 15:28:04 -0000
-@@ -0,0 +1,27 @@
-+--- ../scptools/source/linker/searchcache.hxx.orig	Fri Aug  2 22:53:46 2002
-++++ ../scptools/source/linker/searchcache.hxx	Fri Aug  2 22:54:50 2002
-+@@ -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	Fri Aug  2 22:53:35 2002
-++++ ../scptools/source/linker/searchcache.cxx	Fri Aug  2 22:55:14 2002
-+@@ -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.0/files/patch-scptools+source+linker+ziplst.cxx b/editors/openoffice.org-1.0/files/patch-scptools+source+linker+ziplst.cxx
deleted file mode 100644
index 83b84631542e..000000000000
--- a/editors/openoffice.org-1.0/files/patch-scptools+source+linker+ziplst.cxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice.org-1.0/files/patch-setup2+inc+fields.hxx b/editors/openoffice.org-1.0/files/patch-setup2+inc+fields.hxx
deleted file mode 100644
index d56e12f2abf4..000000000000
--- a/editors/openoffice.org-1.0/files/patch-setup2+inc+fields.hxx
+++ /dev/null
@@ -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[];
diff --git a/editors/openoffice.org-1.0/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-1.0/files/patch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 396c586ee3a3..000000000000
--- a/editors/openoffice.org-1.0/files/patch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,30 +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"
- 
-@@ -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" \
diff --git a/editors/openoffice.org-1.0/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice.org-1.0/files/patch-setup2+mow+source+loader+makefile.mk
deleted file mode 100644
index 007c0f69b6f9..000000000000
--- a/editors/openoffice.org-1.0/files/patch-setup2+mow+source+loader+makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../setup2/mow/source/loader/makefile.mk.orig	Sun Mar  3 01:45:18 2002
-+++ ../setup2/mow/source/loader/makefile.mk	Sun Mar  3 01:45:22 2002
-@@ -85,7 +85,7 @@
- APP1NOSAL=TRUE
- APP1TARGET= $(TARGET)
- APP1OBJS=  $(OBJFILES)
--APP1STDLIBS= $(SVUNZIPLIB) $(LOADERLIB)
-+APP1STDLIBS= $(SVUNZIPLIB) $(LOADERLIB) -lX11
- 
- .ENDIF			# "$(OS)"=="MACOSX"
- 
diff --git a/editors/openoffice.org-1.0/files/patch-setup2+patch+makefile.mk b/editors/openoffice.org-1.0/files/patch-setup2+patch+makefile.mk
deleted file mode 100644
index 53846a8bdfc9..000000000000
--- a/editors/openoffice.org-1.0/files/patch-setup2+patch+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.0/files/patch-setup2+script+setupserver b/editors/openoffice.org-1.0/files/patch-setup2+script+setupserver
deleted file mode 100644
index 7d3b13f659b9..000000000000
--- a/editors/openoffice.org-1.0/files/patch-setup2+script+setupserver
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../setup2/script/setupserver.orig	Sat Apr  6 12:22:21 2002
-+++ ../setup2/script/setupserver	Wed May  1 22:30:13 2002
-@@ -234,6 +234,7 @@
- sd_platform=`uname -s`
- case $sd_platform in
- 	SCO_SV) test=/bin/test     ;;
-+	FreeBSD) test=/bin/test     ;;
- 	NetBSD) test=/bin/test     ;;
-   	*)      test=/usr/bin/test ;;
- esac
diff --git a/editors/openoffice.org-1.0/files/patch-setup2+source+compiler+decltor.cxx b/editors/openoffice.org-1.0/files/patch-setup2+source+compiler+decltor.cxx
deleted file mode 100644
index 98f6ad2f7567..000000000000
--- a/editors/openoffice.org-1.0/files/patch-setup2+source+compiler+decltor.cxx
+++ /dev/null
@@ -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";
diff --git a/editors/openoffice.org-1.0/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx b/editors/openoffice.org-1.0/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
deleted file mode 100644
index ac0b39a6aa47..000000000000
--- a/editors/openoffice.org-1.0/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
+++ /dev/null
@@ -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) );
diff --git a/editors/openoffice.org-1.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-1.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
deleted file mode 100644
index 1919789038db..000000000000
--- a/editors/openoffice.org-1.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig	Sat Apr  6 12:22:21 2002
-+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh	Wed May  1 22:38:21 2002
-@@ -66,6 +66,7 @@
- case $sd_platform in
- 	SCO_SV) test=/bin/test     ;;
- 	NetBSD) test=/bin/test     ;;
-+	FreeBSD) test=/bin/test    ;;
- 	*)      test=/usr/bin/test ;;
- esac
- 
diff --git a/editors/openoffice.org-1.0/files/patch-setup2+source+service+interface.cxx b/editors/openoffice.org-1.0/files/patch-setup2+source+service+interface.cxx
deleted file mode 100644
index 8e478e17971d..000000000000
--- a/editors/openoffice.org-1.0/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.0/files/patch-sfx2+source+appl+officeacceptthread.cxx b/editors/openoffice.org-1.0/files/patch-sfx2+source+appl+officeacceptthread.cxx
deleted file mode 100644
index a33491e0d8b2..000000000000
--- a/editors/openoffice.org-1.0/files/patch-sfx2+source+appl+officeacceptthread.cxx
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../sfx2/source/appl/officeacceptthread.cxx.orig	Sat Jul 20 22:56:19 2002
-+++ ../sfx2/source/appl/officeacceptthread.cxx	Sat Jul 20 22:56:54 2002
-@@ -123,13 +123,13 @@
- 			sal_Bool static isProcessRunning( ::vos::OProcess::TProcessInfo& aProcessInfo )
- 			{
- 				int nRet;
--#if defined (SOLARIS) || defined (IRIX)
-+#if defined (SOLARIS) || defined (IRIX) || defined (FREEBSD) || defined (NETBSD)
- 				int status;
- 				nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG);
- #elif defined(LINUX)
- 				nRet = kill(aProcessInfo.Ident, 0);
- #endif
--#if defined (LINUX) || defined (SOLARIS) || defined (IRIX)
-+#if defined (LINUX) || defined (SOLARIS) || defined (IRIX) || defined (FREEBSD) || defined (NETBSD)
- 				if ( nRet == 0 )
- 					return sal_True; // process is running
- 				if ( nRet < 0 )
diff --git a/editors/openoffice.org-1.0/files/patch-shell+source+cmdmail+makefile.mk b/editors/openoffice.org-1.0/files/patch-shell+source+cmdmail+makefile.mk
deleted file mode 100644
index 0476285c802e..000000000000
--- a/editors/openoffice.org-1.0/files/patch-shell+source+cmdmail+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-1.0/files/patch-shell+source+proxysettings+makefile.mk b/editors/openoffice.org-1.0/files/patch-shell+source+proxysettings+makefile.mk
deleted file mode 100644
index e83cf7c9d7a1..000000000000
--- a/editors/openoffice.org-1.0/files/patch-shell+source+proxysettings+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-1.0/files/patch-shell+source+unix+exec+makefile.mk b/editors/openoffice.org-1.0/files/patch-shell+source+unix+exec+makefile.mk
deleted file mode 100644
index 0b7712ee35f8..000000000000
--- a/editors/openoffice.org-1.0/files/patch-shell+source+unix+exec+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-1.0/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-1.0/files/patch-solenv+bin+addsym.awk
deleted file mode 100644
index d4b9daeb8a48..000000000000
--- a/editors/openoffice.org-1.0/files/patch-solenv+bin+addsym.awk
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../solenv/bin/addsym.awk.kan	Sat Jul 27 10:10:19 2002
-+++ ../solenv/bin/addsym.awk	Thu Jul 25 14:49:30 2002
-@@ -62,6 +62,7 @@
- BEGIN { global_found = "false" }
- /[ \t]*local:/ { global_found = "false" }
- global_found == "true"  { 
-+    print "\t\tGetVersionInfo;"
-     print "\t\t_ZTS*;"
-     print "\t\t_ZTI*;"
-     global_found = "false" }
diff --git a/editors/openoffice.org-1.0/files/patch-solenv+bin+build.pl b/editors/openoffice.org-1.0/files/patch-solenv+bin+build.pl
deleted file mode 100644
index 923b99e5d065..000000000000
--- a/editors/openoffice.org-1.0/files/patch-solenv+bin+build.pl
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../solenv/bin/build.pl.orig	Sun Jan 19 00:08:38 2003
-+++ ../solenv/bin/build.pl	Sun Jan 19 00:07:25 2003
-@@ -292,7 +292,6 @@
- 		cwd();
- 		$! = 0;
- 		system ("$dmake");
--		&print_error("dmake - " . lc($!)) if ($!);
- 		if ($? && ($? != -1) && (!$child)) {
- 			&print_error("Error $? occurred while making $BuildDir");
- 		};
diff --git a/editors/openoffice.org-1.0/files/patch-solenv+bin+mapgen.pl b/editors/openoffice.org-1.0/files/patch-solenv+bin+mapgen.pl
deleted file mode 100644
index 71ebdb934120..000000000000
--- a/editors/openoffice.org-1.0/files/patch-solenv+bin+mapgen.pl
+++ /dev/null
@@ -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, $_);
- 	};
diff --git a/editors/openoffice.org-1.0/files/patch-solenv+inc+postset.mk b/editors/openoffice.org-1.0/files/patch-solenv+inc+postset.mk
deleted file mode 100644
index 722ec086cc54..000000000000
--- a/editors/openoffice.org-1.0/files/patch-solenv+inc+postset.mk
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../solenv/inc/postset.mk.orig	Tue Jan  7 17:22:04 2003
-+++ ../solenv/inc/postset.mk	Tue Feb 25 16:52:34 2003
-@@ -220,6 +220,19 @@
- RCLANGFLAGS_07+= -d RUSS
- iso_07=ru
- 
-+.IF "$(RES_UKRA)"!="" || "$(give_me_all_languages)"!=""
-+alllangext+=38
-+ukra$(LANG_GUI)*=$(default$(LANG_GUI))
-+cmd_ukra:=ukra 38 -lgUKRAINIAN $(IBM_PC_852) $(ukra$(LANG_GUI))
-+lang_38=ukra
-+longlang_38=ukrainian
-+langext_38=38
-+rsclang_38=-lgUKRAINIAN $(IBM_PC_852)
-+rescharset_38=$(ukra$(LANG_GUI))
-+RCLANGFLAGS_38+= -d UKRA
-+iso_38=uk
-+.ENDIF
-+
- .IF "$(RES_POL)"!="" || "$(give_me_all_languages)"!=""
- alllangext+=48
- .ENDIF 
diff --git a/editors/openoffice.org-1.0/files/patch-solenv+inc+startup+FREEBSD+macros.mk b/editors/openoffice.org-1.0/files/patch-solenv+inc+startup+FREEBSD+macros.mk
deleted file mode 100644
index 0c1b107de988..000000000000
--- a/editors/openoffice.org-1.0/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.0/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_ext.mk
deleted file mode 100644
index 701692c9425a..000000000000
--- a/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_ext.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_moz.mk b/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_moz.mk
deleted file mode 100644
index 255a41f92281..000000000000
--- a/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_moz.mk
+++ /dev/null
@@ -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) $@
diff --git a/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_shl.mk b/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_shl.mk
deleted file mode 100644
index 2a9d4ba1b65c..000000000000
--- a/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_shl.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../solenv/inc/tg_shl.mk.orig	Tue Jan  7 16:22:13 2003
-+++ ../solenv/inc/tg_shl.mk	Sat Jan 18 12:51:58 2003
-@@ -319,7 +319,7 @@
- .IF "$(GUI)" == "WNT"
- .IF "$(UPDATER)"=="YES"
- .IF "$(COM)"=="GCC"
--			gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
-+			${CC} -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
- .ELSE
- 			$(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
- .ENDIF			# "$(COM)"=="GCC"
diff --git a/editors/openoffice.org-1.0/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-1.0/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 4c2fd26f5c2c..000000000000
--- a/editors/openoffice.org-1.0/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,209 +0,0 @@
---- ../solenv/inc/unxfbsdi.mk.orig	Tue Jan  7 16:22:18 2003
-+++ ../solenv/inc/unxfbsdi.mk	Sat Jan 18 13:04:17 2003
-@@ -1,84 +1,139 @@
--
- # mak file fuer unxfbsdi
- 
--ASM=
--AFLAGS=
-+ASM=$(CC)
-+AFLAGS=-x assembler-with-cpp -c $(CDEFS)
- 
- SOLAR_JAVA=TRUE
- JAVAFLAGSDEBUG=-g
- 
-+# 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=400 -DOSVERSION=$(OSVERSION)
-+CDEFS+=$(PTHREAD_CFLAGS)
-+
-+# 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
-+
-+# flags for C and C++ Compiler
-+CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/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
-+
-+# Flags for disabling exception handling
-+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
- 
--CC=				gcc
--CXX=				g++
--CDEFS+=			-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400
--CDEFS+=			-D_REENTRANT -D_PTHREADS -D_THREAD_SAFE
--CFLAGS+= -w -c $(INCLUDE)
--CFLAGS+= -I/usr/X11R6/include
--CFLAGSCC= -pipe
--CFLAGSCXX= -pipe -fno-for-scope -fpermissive
--CFLAGSEXCEPTIONS= -fexceptions
--CFLAGS_NO_EXCEPTIONS= -fno-exceptions
--CFLAGSOBJGUIST= -fPIC
--CFLAGSOBJCUIST= -fPIC
--CFLAGSOBJGUIMT= -fPIC
--CFLAGSOBJCUIMT= -fPIC
--CFLAGSSLOGUIMT=	-fPIC
--CFLAGSSLOCUIMT=	-fPIC
--CFLAGSPROF=     -pg
--CFLAGSDEBUG=	-g
-+# 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 profiling
-+CFLAGSPROF=-pg
-+
-+# Compiler flags for debugging
-+CFLAGSDEBUG=-g -ggdb
- CFLAGSDBGUTIL=
--CFLAGSOPT= -O2
--CFLAGSNOOPT= -O
--CFLAGSOUTOBJ= -o
--
--STATIC=	-Wl,-Bstatic
--DYNAMIC= -Wl,-Bdynamic
--
--#THREADLIB= -pthread
--LINK= gcc
--# -v -nostdlib
-+
-+# Compiler flags to enable optimizations
-+# -02 is broken for FreeBSD
-+CFLAGSOPT=-O
-+
-+# Compiler flags to disable optimizations
-+# -0 is broken for STLport
-+CFLAGSNOOPT=-O0
-+
-+# Compiler flags for the output path
-+CFLAGSOUTOBJ=-o
-+
-+# switches for dynamic and static linking
-+STATIC=-Wl,-Bstatic
-+DYNAMIC=-Wl,-Bdynamic
-+
-+LINK=$(CXX)
- LINKFLAGS=
--LINKFLAGSAPPGUI= -Wl,-export-dynamic
--LINKFLAGSAPPCUI= -Wl,-export-dynamic
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= 
-+LINKFLAGSAPPCUI= 
-+
-+# linker flags for linking shared libraries
- LINKFLAGSSHLGUI= -shared
- LINKFLAGSSHLCUI= -shared
- LINKFLAGSTACK=
- LINKFLAGSPROF=
- LINKFLAGSDEBUG=-g
--LINKFLAGSOPT=
-+LINKFLAGSOPT=-O
- 
- .IF "$(NO_BSYMBOLIC)"==""
- .IF "$(PRJNAME)" != "envtest"
--LINKFLAGSSHLGUI+= -Wl,-Bsymbolic
--LINKFLAGSSHLCUI+= -Wl,-Bsymbolic
-+LINKFLAGSSHLGUI+=-Wl,-Bsymbolic
-+LINKFLAGSSHLCUI+=-Wl,-Bsymbolic
- .ENDIF
- .ENDIF
- 
- 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
-+# libraries for linking applications
-+STDLIBCUIST=-lm
-+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
-+
-+# STLport always needs pthread.
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(PTHREAD_LIBS)
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
- 
-+# default objectfilenames to lin
- STDOBJGUI=
- STDSLOGUI=
- STDOBJCUI=
- STDSLOCUI=
- 
--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
--LIBEXT=			.a
-+LIBMGR=ar
-+LIBFLAGS=-r
-+LIBEXT=.a
- 
- IMPLIB=
- IMPLIBFLAGS=
-@@ -87,12 +142,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
diff --git a/editors/openoffice.org-1.0/files/patch-soltools+mkdepend+main.c b/editors/openoffice.org-1.0/files/patch-soltools+mkdepend+main.c
deleted file mode 100644
index cffd5cbb1f43..000000000000
--- a/editors/openoffice.org-1.0/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.0/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-1.0/files/patch-stlport+STLport-4.5.patch
deleted file mode 100644
index 2a34de03f4b1..000000000000
--- a/editors/openoffice.org-1.0/files/patch-stlport+STLport-4.5.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- ../stlport/STLport-4.5.patch.orig	Mon Jan 14 18:33:17 2002
-+++ ../stlport/STLport-4.5.patch	Tue May 28 23:55:42 2002
-@@ -174,3 +174,110 @@
-   class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-   public:
-     __Named_exception(const string& __str) 
-+--- misc/STLport-4.5/src/gcc-freebsd.mak	Sun Jul 29 05:36:25 2001
-++++ misc/build/STLport-4.5/src/gcc-freebsd.mak	Tue May 28 23:04:27 2002
-+@@ -5,8 +5,8 @@
-+ #
-+ # compiler
-+ #
-+-CC = gcc -pthread
-+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-+ 
-+ #
-+ # Basename for libraries
-+@@ -19,7 +19,7 @@
-+ #
-+ LINK=ar cr
-+ # 2.95 flag
-+-DYN_LINK=c++ -pthread -fexceptions -shared -o
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
-+ 
-+ OBJEXT=o
-+ DYNEXT=so
-+@@ -41,8 +41,8 @@
-+ 
-+ CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-+ 
-+-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
-+-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-+ 
-+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+--- /dev/null	Tue May 28 22:55:00 2002
-++++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak	Tue May 28 22:38:52 2002
-+@@ -0,0 +1,59 @@
-++#
-++# Note : this makefile is for gcc-3 !
-++#
-++
-++#
-++# compiler
-++#
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-++
-++#
-++# Basename for libraries
-++#
-++LIB_BASENAME = libstlport_gcc
-++
-++#
-++# guts for common stuff
-++#
-++#
-++LINK=ar cr
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
-++
-++OBJEXT=o
-++DYNEXT=so
-++STEXT=a
-++RM=rm -rf
-++PATH_SEP=/
-++MKDIR=mkdir -p
-++COMP=GCC-FREEBSD
-++INSTALL_STEP = install_unix 
-++
-++all:  all_dynamic all_static symbolic_links 
-++
-++include common_macros.mak
-++
-++WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-++
-++CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-++
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-++
-++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-++
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-++
-++include common_percent_rules.mak
-++include common_rules.mak
-++
-++
-++#install: all
-++#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-++
-++#%.s: %.cpp
-++#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-++
-++
-+--- misc/STLport-4.5/stlport/cwchar.orig	Tue May 28 22:51:31 2002
-++++ misc/build/STLport-4.5/stlport/cwchar	Tue May 28 22:55:33 2002
-+@@ -21,6 +21,9 @@
-+ #  include <stl/_prolog.h>
-+ # endif
-+ 
-++#ifdef __FreeBSD__
-++# include <../wchar.h>
-++#endif
-+ # include <stl/_cwchar.h>
-+ 
-+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
diff --git a/editors/openoffice.org-1.0/files/patch-stlport+makefile.mk b/editors/openoffice.org-1.0/files/patch-stlport+makefile.mk
deleted file mode 100644
index 70ec58c3428e..000000000000
--- a/editors/openoffice.org-1.0/files/patch-stlport+makefile.mk
+++ /dev/null
@@ -1,36 +0,0 @@
---- ../stlport/makefile.mk.orig	Tue Jan  7 13:13:37 2003
-+++ ../stlport/makefile.mk	Sat Jan 18 13:01:53 2003
-@@ -98,16 +98,28 @@
- 
- .IF "$(COM)"=="GCC"
- .IF "$(COMID)"=="gcc3"
--BUILD_FLAGS=-f gcc-3.0.mak
-+.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
-+# FreeBSD / MacOS X/Darwin need a special makefile
- .IF "$(OS)"=="MACOSX"
-     BUILD_FLAGS=-f gcc-apple-macosx.mak
--.ELSE # "$(OS)"=="MACOSX"
-+.ELSIF # "$(OS)"=="FREEBSD"
-+    BUILD_FLAGS=-f gcc-freebsd.mak
-+.ELSE
-     BUILD_FLAGS=-f gcc.mak
--.ENDIF # "$(OS)"=="MACOSX"
-+.ENDIF # "$(OS)"=="MACOSX || $(OS)"=="FREEBSD"
- .ENDIF # "$(COMID)"=="gcc3"
--BUILD_ACTION=make
-+
-+.IF "$(OS)"=="FREEBSD"
-+    BUILD_ACTION=gmake
-+.ELSE
-+    BUILD_ACTION=make
-+.ENDIF
-+
- # build in parallel
- BUILD_FLAGS+= -j$(MAXPROCESS)
- .ENDIF
diff --git a/editors/openoffice.org-1.0/files/patch-stoc+source+corereflection+makefile.mk b/editors/openoffice.org-1.0/files/patch-stoc+source+corereflection+makefile.mk
deleted file mode 100644
index 4b319b08d401..000000000000
--- a/editors/openoffice.org-1.0/files/patch-stoc+source+corereflection+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-1.0/files/patch-stoc+source+defaultregistry+makefile.mk b/editors/openoffice.org-1.0/files/patch-stoc+source+defaultregistry+makefile.mk
deleted file mode 100644
index 4cae0476415a..000000000000
--- a/editors/openoffice.org-1.0/files/patch-stoc+source+defaultregistry+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-1.0/files/patch-stoc+source+implementationregistration+implreg.cxx b/editors/openoffice.org-1.0/files/patch-stoc+source+implementationregistration+implreg.cxx
deleted file mode 100644
index 341d621d872c..000000000000
--- a/editors/openoffice.org-1.0/files/patch-stoc+source+implementationregistration+implreg.cxx
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.0/files/patch-stoc+source+implementationregistration+makefile.mk b/editors/openoffice.org-1.0/files/patch-stoc+source+implementationregistration+makefile.mk
deleted file mode 100644
index 0051043b7ecb..000000000000
--- a/editors/openoffice.org-1.0/files/patch-stoc+source+implementationregistration+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-1.0/files/patch-stoc+source+inspect+makefile.mk b/editors/openoffice.org-1.0/files/patch-stoc+source+inspect+makefile.mk
deleted file mode 100644
index c7cd85253c11..000000000000
--- a/editors/openoffice.org-1.0/files/patch-stoc+source+inspect+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-1.0/files/patch-stoc+source+invocation+makefile.mk b/editors/openoffice.org-1.0/files/patch-stoc+source+invocation+makefile.mk
deleted file mode 100644
index 9ac2072a5612..000000000000
--- a/editors/openoffice.org-1.0/files/patch-stoc+source+invocation+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-1.0/files/patch-stoc+source+invocation_adapterfactory+makefile.mk b/editors/openoffice.org-1.0/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
deleted file mode 100644
index 8853ad39a90e..000000000000
--- a/editors/openoffice.org-1.0/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-1.0/files/patch-stoc+source+javaloader+makefile.mk b/editors/openoffice.org-1.0/files/patch-stoc+source+javaloader+makefile.mk
deleted file mode 100644
index af0fb9af619c..000000000000
--- a/editors/openoffice.org-1.0/files/patch-stoc+source+javaloader+makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../stoc/source/javaloader/makefile.mk.orig	Tue Jan  1 14:12:02 2002
-+++ ../stoc/source/javaloader/makefile.mk
-@@ -83,9 +83,10 @@
- SHL1TARGET= $(TARGET)
- 
- SHL1STDLIBS=\
-+		$(SALLIB)		\
- 		$(CPPUHELPERLIB) 	\
--		$(CPPULIB)			\
--		$(SALLIB)
-+		$(CPPULIB)
-+
- SHL1VERSIONMAP=$(TARGET).map
- SHL1DEPN=		
- SHL1IMPLIB=		i$(TARGET)
diff --git a/editors/openoffice.org-1.0/files/patch-stoc+source+javavm+makefile.mk b/editors/openoffice.org-1.0/files/patch-stoc+source+javavm+makefile.mk
deleted file mode 100644
index f97af0ea270d..000000000000
--- a/editors/openoffice.org-1.0/files/patch-stoc+source+javavm+makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../stoc/source/javavm/makefile.mk.orig	Tue Jan  1 14:12:02 2002
-+++ ../stoc/source/javavm/makefile.mk
-@@ -91,10 +91,10 @@
- SHL1TARGET= $(TARGET)
- SHL1VERSIONMAP=$(TARGET).map
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPUHELPERLIB) 	\
- 		$(CPPULIB)	    	\
--		$(UNOLIB)	    	\
--		$(SALLIB)
-+		$(UNOLIB)
- 
- .IF "$(GUI)"=="WNT"
- SHL1STDLIBS += advapi32.lib
diff --git a/editors/openoffice.org-1.0/files/patch-stoc+source+loader+makefile.mk b/editors/openoffice.org-1.0/files/patch-stoc+source+loader+makefile.mk
deleted file mode 100644
index 5a08ee5937b6..000000000000
--- a/editors/openoffice.org-1.0/files/patch-stoc+source+loader+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-1.0/files/patch-stoc+source+namingservice+makefile.mk b/editors/openoffice.org-1.0/files/patch-stoc+source+namingservice+makefile.mk
deleted file mode 100644
index e573081bc21d..000000000000
--- a/editors/openoffice.org-1.0/files/patch-stoc+source+namingservice+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-1.0/files/patch-stoc+source+proxy_factory+makefile.mk b/editors/openoffice.org-1.0/files/patch-stoc+source+proxy_factory+makefile.mk
deleted file mode 100644
index 9110b2f50cd1..000000000000
--- a/editors/openoffice.org-1.0/files/patch-stoc+source+proxy_factory+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-1.0/files/patch-stoc+source+registry_tdprovider+makefile.mk b/editors/openoffice.org-1.0/files/patch-stoc+source+registry_tdprovider+makefile.mk
deleted file mode 100644
index 9d974d1c0d10..000000000000
--- a/editors/openoffice.org-1.0/files/patch-stoc+source+registry_tdprovider+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.0/files/patch-stoc+source+servicemanager+makefile.mk b/editors/openoffice.org-1.0/files/patch-stoc+source+servicemanager+makefile.mk
deleted file mode 100644
index 746776d54759..000000000000
--- a/editors/openoffice.org-1.0/files/patch-stoc+source+servicemanager+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-1.0/files/patch-stoc+source+tdmanager+makefile.mk b/editors/openoffice.org-1.0/files/patch-stoc+source+tdmanager+makefile.mk
deleted file mode 100644
index 76403fdde841..000000000000
--- a/editors/openoffice.org-1.0/files/patch-stoc+source+tdmanager+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-1.0/files/patch-stoc+source+typeconv+makefile.mk b/editors/openoffice.org-1.0/files/patch-stoc+source+typeconv+makefile.mk
deleted file mode 100644
index dc647f89a166..000000000000
--- a/editors/openoffice.org-1.0/files/patch-stoc+source+typeconv+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.0/files/patch-svx+source+dialog+txenctab.src b/editors/openoffice.org-1.0/files/patch-svx+source+dialog+txenctab.src
deleted file mode 100644
index b8178b78384c..000000000000
--- a/editors/openoffice.org-1.0/files/patch-svx+source+dialog+txenctab.src
+++ /dev/null
@@ -1,44 +0,0 @@
---- ../svx/source/dialog/txenctab.src.orig	Thu Oct 31 23:18:23 2002
-+++ ../svx/source/dialog/txenctab.src	Tue Feb 25 16:57:06 2003
-@@ -147,6 +147,7 @@
-         < "Japanisch (ISO-2022-JP)"                         ; RTL_TEXTENCODING_ISO_2022_JP      ; > ;
-         < "Chinesisch vereinfacht (ISO-2022-CN)"            ; RTL_TEXTENCODING_ISO_2022_CN      ; > ;
- 		< "Kyrillisch (KOI8-R)"								; RTL_TEXTENCODING_KOI8_R			; > ;
-+		< "Kyrillisch (KOI8-U)"								; RTL_TEXTENCODING_KOI8_U			; > ;
- 		< "Unicode (UTF-7)"									; RTL_TEXTENCODING_UTF7				; > ;
- 		< "Unicode (UTF-8)"									; RTL_TEXTENCODING_UTF8				; > ;
- 		< "Osteuropa (ISO-8859-10)"							; RTL_TEXTENCODING_ISO_8859_10		; > ;
-@@ -235,6 +236,7 @@
-         < "Japanese (ISO-2022-JP)"                          ; RTL_TEXTENCODING_ISO_2022_JP      ; > ;
-         < "Chinese Simplified (ISO-2022-CN)"                ; RTL_TEXTENCODING_ISO_2022_CN      ; > ;
- 		< "Cyrillic (KOI8-R)"                               ; RTL_TEXTENCODING_KOI8_R			; > ;
-+		< "Cyrillic (KOI8-U)"                               ; RTL_TEXTENCODING_KOI8_U			; > ;
- 		< "Unicode (UTF-7)"                                 ; RTL_TEXTENCODING_UTF7				; > ;
- 		< "Unicode (UTF-8)"                                 ; RTL_TEXTENCODING_UTF8				; > ;
- 		< "Central European (ISO-8859-10)"                  ; RTL_TEXTENCODING_ISO_8859_10		; > ;
-@@ -308,6 +310,7 @@
-         < "Japanisch (ISO-2022-JP)"                         ; RTL_TEXTENCODING_ISO_2022_JP      ; > ;
-         < "Chinesisch vereinfacht (ISO-2022-CN)"            ; RTL_TEXTENCODING_ISO_2022_CN      ; > ;
- 		< "Kyrillisch (KOI8-R)"								; RTL_TEXTENCODING_KOI8_R			; > ;
-+		< "Kyrillisch (KOI8-U)"								; RTL_TEXTENCODING_KOI8_U			; > ;
- 		< "Unicode (UTF-7)"									; RTL_TEXTENCODING_UTF7				; > ;
- 		< "Unicode (UTF-8)"									; RTL_TEXTENCODING_UTF8				; > ;
- 		< "Osteuropa (ISO-8859-10)"							; RTL_TEXTENCODING_ISO_8859_10		; > ;
-@@ -378,6 +381,7 @@
-         < "Japanese (ISO-2022-JP)"                         ; RTL_TEXTENCODING_ISO_2022_JP      ; > ;
-         < "Chinese simplified (ISO-2022-CN)"            ; RTL_TEXTENCODING_ISO_2022_CN      ; > ;
- 		< "Cyrillic (KOI8-R)"								; RTL_TEXTENCODING_KOI8_R			; > ;
-+		< "Cyrillic (KOI8-U)"								; RTL_TEXTENCODING_KOI8_U			; > ;
- 		< "Unicode (UTF-7)"									; RTL_TEXTENCODING_UTF7				; > ;
- 		< "Unicode (UTF-8)"									; RTL_TEXTENCODING_UTF8				; > ;
- 		< "Eastern Europe (ISO-8859-10)"							; RTL_TEXTENCODING_ISO_8859_10		; > ;
-@@ -512,7 +516,8 @@
- 		< "Êèòàéñêèé òðàäèöèîííûé (BIG5)"			; RTL_TEXTENCODING_GBK				; > ;
- 		< "ßïîíñêèé (EUC-JP)"					; RTL_TEXTENCODING_BIG5				; > ;
- 		< "Êèòàéñêèé óïðîùåííûé (EUC-CN)"								; RTL_TEXTENCODING_EUC_JP			; > ;
--		< "Êèðèëëè÷åñêèé (KOI8-R)"					; RTL_TEXTENCODING_EUC_CN			; > ;
-+		< "Êèðèëëè÷åñêèé (KOI8-R)"					; RTL_TEXTENCODING_KOI8_R			; > ;
-+		< "Êèðèëëè÷åñêèé (KOI8-U)"					; RTL_TEXTENCODING_KOI8_U			; > ;
-         < "Þíèêîä (UTF-7)"                ; RTL_TEXTENCODING_EUC_TW           ; > ;
-         < "Þíèêîä (UTF-8)"                         ; RTL_TEXTENCODING_ISO_2022_JP      ; > ;
-         < "Âîñòî÷íîåâðîïåéñêèé (ISO-8859-10)"            ; RTL_TEXTENCODING_ISO_2022_CN      ; > ;
diff --git a/editors/openoffice.org-1.0/files/patch-svx+source+fmcomp+makefile.mk b/editors/openoffice.org-1.0/files/patch-svx+source+fmcomp+makefile.mk
deleted file mode 100644
index b16030080c0d..000000000000
--- a/editors/openoffice.org-1.0/files/patch-svx+source+fmcomp+makefile.mk
+++ /dev/null
@@ -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= \
diff --git a/editors/openoffice.org-1.0/files/patch-sw+source+filter+basflt+fltini.cxx b/editors/openoffice.org-1.0/files/patch-sw+source+filter+basflt+fltini.cxx
deleted file mode 100644
index 4029175a3236..000000000000
--- a/editors/openoffice.org-1.0/files/patch-sw+source+filter+basflt+fltini.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../sw/source/filter/basflt/fltini.cxx.orig	Mon Feb 24 17:46:43 2003
-+++ ../sw/source/filter/basflt/fltini.cxx	Tue Feb 25 16:59:03 2003
-@@ -1007,7 +1007,8 @@
- 		sToken081[] = "JIS_X_212",
- 		sToken082[] = "MS_1361",
- 		sToken083[] = "GB_18030",
--		sToken084[] = "UNICODE_2"
-+		sToken084[] = "KOI8_U",
-+		sToken085[] = "UNICODE_2"
- 			;
- 	struct _Dummy_MAP
- 	{
-@@ -1099,7 +1100,8 @@
- 		RTL_TEXTENCODING_JIS_X_0212,            sToken081,
- 		RTL_TEXTENCODING_MS_1361,               sToken082,
- 		RTL_TEXTENCODING_GB_18030,              sToken083,
--		RTL_TEXTENCODING_UCS2,              	sToken084
-+		RTL_TEXTENCODING_KOI8_U,              	sToken084,
-+		RTL_TEXTENCODING_UCS2,              	sToken085
- 	};
- 
- 	BOOL bFnd = FALSE;
diff --git a/editors/openoffice.org-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index ec91def86fe6..000000000000
--- a/editors/openoffice.org-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Fri Aug 16 18:56:19 2002
-+++ ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx	Sat Jan 18 13:06:16 2003
-@@ -62,7 +62,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
--#ifndef MACOSX
-+#if !(defined NETBSD || defined FREEBSD || defined MACOSX)
- #include <alloca.h>
- #endif
- #include <string.h>
diff --git a/editors/openoffice.org-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx b/editors/openoffice.org-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx
deleted file mode 100644
index e7497406c222..000000000000
--- a/editors/openoffice.org-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../sysui/tools/lngconv/lngconv.cxx.orig	Sat Jul 20 23:14:29 2002
-+++ ../sysui/tools/lngconv/lngconv.cxx	Sat Jul 20 23:14:34 2002
-@@ -62,7 +62,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- 
--#if defined( LINUX ) || defined (SOLARIS)
-+#if defined(LINUX) || defined (SOLARIS) || defined (FREEBSD)
- #include <locale.h>
- #include <langinfo.h>
- #endif
-@@ -143,6 +143,7 @@
-     { "iso8859-8",    RTL_TEXTENCODING_ISO_8859_8  },
-     { "iso8859-9",    RTL_TEXTENCODING_ISO_8859_9  },
-     { "koi8-r",       RTL_TEXTENCODING_KOI8_R      },
-+    { "koi8-u",       RTL_TEXTENCODING_KOI8_U      },
-     { "pck",          RTL_TEXTENCODING_MS_932      },
- #if (0)
-     { "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW    },
diff --git a/editors/openoffice.org-1.0/files/patch-sysui+unix+office+cde+locales.tab b/editors/openoffice.org-1.0/files/patch-sysui+unix+office+cde+locales.tab
deleted file mode 100644
index 0c91acc455d1..000000000000
--- a/editors/openoffice.org-1.0/files/patch-sysui+unix+office+cde+locales.tab
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../sysui/unix/office/cde/locales.tab.orig	Tue Nov 20 19:26:28 2001
-+++ ../sysui/unix/office/cde/locales.tab	Tue Feb 25 17:04:36 2003
-@@ -7,6 +7,7 @@
- locales+=$(assign locale_34 = es es.UTF-8)
- locales+=$(assign locale_35 = fi fi.UTF-8)
- locales+=$(assign locale_37 = ca)
-+locales+=$(assign locale_38 = uk uk_UA.KOI8-U)
- locales+=$(assign locale_39 = it it.UTF-8)
- locales+=$(assign locale_45 = da da.UTF-8)
- locales+=$(assign locale_46 = sv sv.UTF-8)
diff --git a/editors/openoffice.org-1.0/files/patch-tools+bootstrp+makefile.mk b/editors/openoffice.org-1.0/files/patch-tools+bootstrp+makefile.mk
deleted file mode 100644
index b188641846f0..000000000000
--- a/editors/openoffice.org-1.0/files/patch-tools+bootstrp+makefile.mk
+++ /dev/null
@@ -1,23 +0,0 @@
---- ../tools/bootstrp/makefile.mk.orig	Tue Jan  1 14:12:19 2002
-+++ ../tools/bootstrp/makefile.mk
-@@ -83,6 +83,15 @@
- 	@echo No bootstrp for Mac OS
- .ELSE	# "$(OS)"=="MACOS"
- 
-+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
-+ALLTAR2: $(LB)$/libgcc_pic.a $(LB)$/libgcc.a ALLTAR 
-+	@echo ""
-+$(LB)$/libgcc_pic.a:
-+	-objcopy -L set_new_handler__FPFv_v /usr/lib/libgcc_pic.a $(LB)$/libgcc_pic.a
-+$(LB)$/libgcc.a:
-+	objcopy -L set_new_handler__FPFv_v `gcc -print-libgcc-file-name` $(LB)$/libgcc.a
-+.ENDIF
-+
- OBJFILES=                       \
- 	$(OBJ)$/sstring.obj     \
- 	$(OBJ)$/appdef.obj      \
-@@ -172,3 +181,4 @@
- # --- Targets ------------------------------------------------------
- 
- .INCLUDE :  target.mk
-+
diff --git a/editors/openoffice.org-1.0/files/patch-tools+inc+inetdef.hxx b/editors/openoffice.org-1.0/files/patch-tools+inc+inetdef.hxx
deleted file mode 100644
index a9e02c684019..000000000000
--- a/editors/openoffice.org-1.0/files/patch-tools+inc+inetdef.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../tools/inc/inetdef.hxx.orig	Sun Jul 21 00:59:36 2002
-+++ ../tools/inc/inetdef.hxx	Sun Jul 21 00:59:38 2002
-@@ -90,6 +90,8 @@
- #define TOOLS_INETDEF_OS "NETBSD Sparc"
- #elif defined LINUX && defined X86
- #define TOOLS_INETDEF_OS "Linux"
-+#elif defined FREEBSD && defined X86
-+#define TOOLS_INETDEF_OS "FreeBSD"
- #elif defined SINIX
- #define TOOLS_INETDEF_OS "SINIX"
- #elif defined IRIX
diff --git a/editors/openoffice.org-1.0/files/patch-tools+source+inet+inetmime.cxx b/editors/openoffice.org-1.0/files/patch-tools+source+inet+inetmime.cxx
deleted file mode 100644
index 58fc8db2a85b..000000000000
--- a/editors/openoffice.org-1.0/files/patch-tools+source+inet+inetmime.cxx
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../tools/source/inet/inetmime.cxx.orig	Mon Feb 24 17:46:55 2003
-+++ ../tools/source/inet/inetmime.cxx	Tue Feb 25 17:08:22 2003
-@@ -1633,7 +1633,8 @@
- 				"ISO-8859-10", // RTL_TEXTENCODING_ISO_8859_10, RFC 2047
- 				"ISO-8859-13", // RTL_TEXTENCODING_ISO_8859_13, RFC 2047
- 				"EUC-KR", // RTL_TEXTENCODING_EUC_KR
--				"ISO-2022-KR" }; // RTL_TEXTENCODING_ISO_2022_KR
-+				"ISO-2022-KR", // RTL_TEXTENCODING_ISO_2022_KR
-+				"KOI8-U" }; // RTL_TEXTENCODING_KOI8_U
- 		DBG_ASSERT(aMap[eEncoding],
- 				   "INetMIME::getCharsetName(): Unsupported encoding");
- 		return aMap[eEncoding];
-@@ -1841,7 +1842,8 @@
- 		{ "ISO-10646-UCS-4", RTL_TEXTENCODING_UCS4 },
- 		{ "CSUCS4", RTL_TEXTENCODING_UCS4 },
- 		{ "ISO-10646-UCS-2", RTL_TEXTENCODING_UCS2 },
--		{ "CSUNICODE", RTL_TEXTENCODING_UCS2 } };
-+		{ "CSUNICODE", RTL_TEXTENCODING_UCS2 },
-+		{ "KOI8-U", RTL_TEXTENCODING_KOI8_U } };
- 
- //============================================================================
- template< typename T >
-@@ -2012,6 +2014,18 @@
- 		// <ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/KOI8-R.TXT>
- 		// version 1.0 of 18 August 1999
- 
-+	static const sal_uInt32 aKOI8URanges[]
-+		= { 0, 0x7F, 0xA0, 0xA0, 0xA9, 0xA9, 0xB0, 0xB0, 0xB2, 0xB2,
-+			0xB7, 0xB7, 0xF7, 0xF7, 0x401, 0x401, 0x410, 0x44F, 0x451, 0x451,
-+			0x2219, 0x221A, 0x2248, 0x2248, 0x2264, 0x2265, 0x2320, 0x2321,
-+			0x2500, 0x2500, 0x2502, 0x2502, 0x250C, 0x250C, 0x2510, 0x2510,
-+			0x2514, 0x2514, 0x2518, 0x2518, 0x251C, 0x251C, 0x2524, 0x2524,
-+			0x252C, 0x252C, 0x2534, 0x2534, 0x253C, 0x253C, 0x2550, 0x256C,
-+			0x2580, 0x2580, 0x2584, 0x2584, 0x2588, 0x2588, 0x258C, 0x258C,
-+			0x2590, 0x2593, 0x25A0, 0x25A0, sal_uInt32(-1) };
-+		// <ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/KOI8-R.TXT>
-+		// version 1.0 of 18 August 1999
-+
- 	static const sal_uInt32 aWindows1252Ranges[]
- 		= { 0, 0x7F, 0xA0, 0xFF, 0x152, 0x153, 0x160, 0x161, 0x178, 0x178,
- 			0x17D, 0x17E, 0x192, 0x192, 0x2C6, 0x2C6, 0x2DC, 0x2DC,
-@@ -2133,6 +2147,12 @@
- 			pList->prepend(Charset(RTL_TEXTENCODING_ISO_8859_5,
- 								   aISO88595Ranges));
- 			pList->prepend(Charset(RTL_TEXTENCODING_KOI8_R, aKOI8RRanges));
-+			break;
-+
-+		case RTL_TEXTENCODING_KOI8_U:
-+			pList->prepend(Charset(RTL_TEXTENCODING_ISO_8859_5,
-+								   aISO88595Ranges));
-+			pList->prepend(Charset(RTL_TEXTENCODING_KOI8_U, aKOI8URanges));
- 			break;
- 
- 		default: //@@@ more cases are missing!
diff --git a/editors/openoffice.org-1.0/files/patch-tools+source+rc+resmgr.cxx b/editors/openoffice.org-1.0/files/patch-tools+source+rc+resmgr.cxx
deleted file mode 100644
index 7e6174dd56fe..000000000000
--- a/editors/openoffice.org-1.0/files/patch-tools+source+rc+resmgr.cxx
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../tools/source/rc/resmgr.cxx.orig	Mon Feb 24 17:46:55 2003
-+++ ../tools/source/rc/resmgr.cxx	Tue Feb 25 17:09:39 2003
-@@ -1189,6 +1189,8 @@
-                 return "36";
-             case LANGUAGE_RUSSIAN:
-                 return "07";
-+            case LANGUAGE_UKRAINIAN:
-+                return "38";
-             case LANGUAGE_SLOVAK:
-                 return "04";
-             case LANGUAGE_GREEK:
-@@ -1339,6 +1341,7 @@
-         LANGUAGE_HUNGARIAN,
-         LANGUAGE_CZECH,
-         LANGUAGE_RUSSIAN,
-+        LANGUAGE_UKRAINIAN,
-         LANGUAGE_ARABIC,
-         LANGUAGE_GREEK,
-         LANGUAGE_KOREAN,
diff --git a/editors/openoffice.org-1.0/files/patch-tools+source+string+tstring.cxx b/editors/openoffice.org-1.0/files/patch-tools+source+string+tstring.cxx
deleted file mode 100644
index 12bd6bd0b244..000000000000
--- a/editors/openoffice.org-1.0/files/patch-tools+source+string+tstring.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../tools/source/string/tstring.cxx.orig	Sat Aug 10 12:53:42 2002
-+++ ../tools/source/string/tstring.cxx	Sat Aug 10 12:54:16 2002
-@@ -103,6 +103,9 @@
- xub_StrLen ImplStringLen( const sal_Char* pStr )
- {
- 	const sal_Char* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
-@@ -113,6 +116,9 @@
- xub_StrLen ImplStringLen( const sal_Unicode* pStr )
- {
- 	const sal_Unicode* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
diff --git a/editors/openoffice.org-1.0/files/patch-transex3+inc+export.hxx b/editors/openoffice.org-1.0/files/patch-transex3+inc+export.hxx
deleted file mode 100644
index 1263573285d3..000000000000
--- a/editors/openoffice.org-1.0/files/patch-transex3+inc+export.hxx
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../transex3/inc/export.hxx.orig	Fri May 24 15:26:18 2002
-+++ ../transex3/inc/export.hxx	Tue Feb 25 17:13:09 2003
-@@ -187,18 +187,22 @@
- #define CATALAN_ISO				"ca"
- #define CATALAN_INDEX				28
- 
-+#define UKRAINIAN					38
-+#define UKRAINIAN_ISO				"uk"
-+#define UKRAINIAN_INDEX				29
-+
- #define THAI					66
- #define THAI_ISO				"th"
--#define THAI_INDEX					29
-+#define THAI_INDEX					30
- 
- // special language for l10n framework
- #define EXTERN					99
--#define EXTERN_INDEX				30
-+#define EXTERN_INDEX				31
- 
--#define LANGUAGES					31
-+#define LANGUAGES					32
- 
- #define LANGUAGE_ALLOWED( n )  (( n != 0xFFFF ) && ( Export::LanguageAllowed( Export::LangId[ n ] )) && 													\
--							   (( Export::LangId[ n ] == 01 ) || ( Export::LangId[ n ] == 03 ) || ( Export::LangId[ n ] == 07 ) || 	\
-+							   (( Export::LangId[ n ] == 01 ) || ( Export::LangId[ n ] == 03 ) || ( Export::LangId[ n ] == 07 ) || ( Export::LangId[ n ] == 38 ) ||	\
- 								( Export::LangId[ n ] == 30 ) || ( Export::LangId[ n ] == 31 ) || ( Export::LangId[ n ] == 33 ) ||   	\
- 								( Export::LangId[ n ] == 34 ) || ( Export::LangId[ n ] == 35 ) || ( Export::LangId[ n ] == 37 ) || 	\
- 								( Export::LangId[ n ] == 39 ) || ( Export::LangId[ n ] == 45 ) || ( Export::LangId[ n ] == 46 ) || 	\
diff --git a/editors/openoffice.org-1.0/files/patch-transex3+source+export.cxx b/editors/openoffice.org-1.0/files/patch-transex3+source+export.cxx
deleted file mode 100644
index b5ee0d1b294e..000000000000
--- a/editors/openoffice.org-1.0/files/patch-transex3+source+export.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../transex3/source/export.cxx.orig	Mon Feb 24 17:45:55 2003
-+++ ../transex3/source/export.cxx	Tue Feb 25 17:14:06 2003
-@@ -1205,6 +1205,8 @@
- 		return PORTUGUESE_INDEX;
- 	else if ( sLang == "RUSSIAN" )
- 		return RUSSIAN_INDEX;
-+	else if ( sLang == "UKRAINIAN" )
-+		return UKRAINIAN_INDEX;
- 	else if ( sLang == "GREEK" )
- 		return GREEK_INDEX;
- 	else if ( sLang == "DUTCH" )
diff --git a/editors/openoffice.org-1.0/files/patch-transex3+source+export2.cxx b/editors/openoffice.org-1.0/files/patch-transex3+source+export2.cxx
deleted file mode 100644
index 031b9bdf4b8f..000000000000
--- a/editors/openoffice.org-1.0/files/patch-transex3+source+export2.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
---- ../transex3/source/export2.cxx.orig	Mon Feb 24 17:45:55 2003
-+++ ../transex3/source/export2.cxx	Tue Feb 25 17:19:19 2003
-@@ -144,6 +144,7 @@
- 	ARABIC,
- 	HEBREW,
- 	CATALAN,
-+	UKRAINIAN,
- 	THAI,
- 	EXTERN
- };
-@@ -192,6 +193,7 @@
- 		case ARABIC: return RTL_TEXTENCODING_MS_1256;
- 		case HEBREW: return RTL_TEXTENCODING_MS_1255;
- 		case CATALAN: return RTL_TEXTENCODING_MS_1252;
-+		case UKRAINIAN: return RTL_TEXTENCODING_MS_1251;
- 		case THAI: return RTL_TEXTENCODING_UTF8;
- 		case EXTERN: return RTL_TEXTENCODING_UTF8;
- 	}
-@@ -214,6 +216,8 @@
- 		return PORTUGUESE;
- 	else if ( sLang == ByteString( RUSSIAN_ISO ).ToUpperAscii())
- 		return RUSSIAN;
-+	else if ( sLang == ByteString( UKRAINIAN_ISO ).ToUpperAscii())
-+		return UKRAINIAN;
- 	else if ( sLang == ByteString( GREEK_ISO ).ToUpperAscii())
- 		return GREEK;
- 	else if ( sLang == ByteString( DUTCH_ISO ).ToUpperAscii())
-@@ -279,6 +283,7 @@
- 		case ENGLISH_US_INDEX: return ENGLISH_US_ISO;
- 		case PORTUGUESE_INDEX: return PORTUGUESE_ISO;
- 		case RUSSIAN_INDEX: return RUSSIAN_ISO;
-+		case UKRAINIAN_INDEX: return UKRAINIAN_ISO;
- 		case GREEK_INDEX: return GREEK_ISO;
- 		case DUTCH_INDEX: return DUTCH_ISO;
- 		case FRENCH_INDEX: return FRENCH_ISO;
-@@ -429,6 +434,7 @@
- 	"arabic",
- 	"hebrew",
- 	"catalan",
-+	"ukrainian",
- 	"thai",
- 	"extern"
- };
diff --git a/editors/openoffice.org-1.0/files/patch-transex3+source+gsiconv.cxx b/editors/openoffice.org-1.0/files/patch-transex3+source+gsiconv.cxx
deleted file mode 100644
index 4bad0a9b6b2b..000000000000
--- a/editors/openoffice.org-1.0/files/patch-transex3+source+gsiconv.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../transex3/source/gsiconv.cxx.orig	Mon Feb 24 17:45:55 2003
-+++ ../transex3/source/gsiconv.cxx	Tue Feb 25 17:20:08 2003
-@@ -210,6 +210,7 @@
- 	fprintf( stdout, "          34 => SPANISH\n" );
- 	fprintf( stdout, "          35 => FINNISH\n" );
- 	fprintf( stdout, "          36 => HUNGARIAN\n" );
-+	fprintf( stdout, "          38 => UKRAINIAN\n" );
- 	fprintf( stdout, "          39 => ITALIAN\n" );
- 	fprintf( stdout, "          42 => CZECH\n" );
- 	fprintf( stdout, "          44 => ENGLISH (UK)\n" );
diff --git a/editors/openoffice.org-1.0/files/patch-transex3+source+merge.cxx b/editors/openoffice.org-1.0/files/patch-transex3+source+merge.cxx
deleted file mode 100644
index 6137c2a2408d..000000000000
--- a/editors/openoffice.org-1.0/files/patch-transex3+source+merge.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../transex3/source/merge.cxx.orig	Mon Feb 24 17:45:55 2003
-+++ ../transex3/source/merge.cxx	Tue Feb 25 17:20:43 2003
-@@ -388,6 +388,7 @@
- 		case ENGLISH_US: return ENGLISH_US_INDEX;
- 		case PORTUGUESE: return PORTUGUESE_INDEX;
- 		case RUSSIAN: return RUSSIAN_INDEX;
-+		case UKRAINIAN: return UKRAINIAN_INDEX;
- 		case GREEK: return GREEK_INDEX;
- 		case DUTCH: return DUTCH_INDEX;
- 		case FRENCH: return FRENCH_INDEX;
diff --git a/editors/openoffice.org-1.0/files/patch-ucb+source+ucp+hierarchy+makefile.mk b/editors/openoffice.org-1.0/files/patch-ucb+source+ucp+hierarchy+makefile.mk
deleted file mode 100644
index 18e68e89120b..000000000000
--- a/editors/openoffice.org-1.0/files/patch-ucb+source+ucp+hierarchy+makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../ucb/source/ucp/hierarchy/makefile.mk.orig	Wed Jun 12 01:34:50 2002
-+++ ../ucb/source/ucp/hierarchy/makefile.mk	Wed Jun 12 01:34:52 2002
-@@ -96,7 +96,7 @@
- 
- SHL1TARGET=$(TARGET)$(UCPHIER_MAJOR)
- SHL1IMPLIB=i$(TARGET)
--.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD"
-+.IF "$(OS)"=="MACOSX"
- .ELSE
- SHL1VERSIONMAP=	$(TARGET).map
- .ENDIF
diff --git a/editors/openoffice.org-1.0/files/patch-ucb+source+ucp+webdav+makefile.mk b/editors/openoffice.org-1.0/files/patch-ucb+source+ucp+webdav+makefile.mk
deleted file mode 100644
index 4b505c6571d8..000000000000
--- a/editors/openoffice.org-1.0/files/patch-ucb+source+ucp+webdav+makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../ucb/source/ucp/webdav/makefile.mk.orig	Wed Jun 12 01:04:43 2002
-+++ ../ucb/source/ucp/webdav/makefile.mk	Wed Jun 12 01:04:53 2002
-@@ -120,7 +120,7 @@
- 
- SHL1TARGET=$(TARGET)$(UCP_VERSION)
- SHL1IMPLIB=i$(TARGET)
--.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
-+.IF "$(OS)"=="MACOSX"
- .ELSE
- SHL1VERSIONMAP=exports.map
- .ENDIF
diff --git a/editors/openoffice.org-1.0/files/patch-unoil+com+sun+star+document+makefile.mk b/editors/openoffice.org-1.0/files/patch-unoil+com+sun+star+document+makefile.mk
deleted file mode 100644
index 63b73d0e107c..000000000000
--- a/editors/openoffice.org-1.0/files/patch-unoil+com+sun+star+document+makefile.mk
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../unoil/com/sun/star/document/makefile.mk.orig	Wed Sep 11 11:51:49 2002
-+++ ../unoil/com/sun/star/document/makefile.mk	Wed Sep 11 11:52:08 2002
-@@ -64,6 +64,7 @@
- PRJ		= ..$/..$/..$/..
- TARGET	= unoil_document
- PACKAGE	= com$/sun$/star$/document
-+GENJAVAFILES = $(GENJAVADIR)$/com/sun/star/task/XInteractionContinuation.java
- 
- # --- Settings -----------------------------------------------------
- 
diff --git a/editors/openoffice.org-1.0/files/patch-unoil+makefile.pmk b/editors/openoffice.org-1.0/files/patch-unoil+makefile.pmk
deleted file mode 100644
index 7febdabf7b4b..000000000000
--- a/editors/openoffice.org-1.0/files/patch-unoil+makefile.pmk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../unoil/makefile.pmk.orig	Fri Aug 31 18:04:43 2001
-+++ ../unoil/makefile.pmk	Thu Sep 12 12:17:50 2002
-@@ -74,8 +74,8 @@
- JAVAFILESLIST	:= $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java)
- .ENDIF          # "$(L10N_framework)"==""
- 
--GENJAVAFILES	:= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
--GENCLASSFILES	:= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
-+GENJAVAFILES	+= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
-+GENCLASSFILES	+= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
- 
- # --- Targets ------------------------------------------------------
- 
diff --git a/editors/openoffice.org-1.0/files/patch-unzip+source+file_io.c b/editors/openoffice.org-1.0/files/patch-unzip+source+file_io.c
deleted file mode 100644
index 2a838fe377b1..000000000000
--- a/editors/openoffice.org-1.0/files/patch-unzip+source+file_io.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../unzip/source/file_io.c.orig	Sat Apr  6 12:13:38 2002
-+++ ../unzip/source/file_io.c	Wed May  1 22:34:51 2002
-@@ -864,7 +864,7 @@
- #ifndef __386BSD__
- 	static struct timeb tbp;
- #endif /* !__386BSD__ */
--#elif !defined(NETBSD) /* !BSD */
-+#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */
- 	extern long timezone;
- #endif /* ?BSD */
- #endif /* ?AMIGA */
diff --git a/editors/openoffice.org-1.0/files/patch-unzip+source+misc.c b/editors/openoffice.org-1.0/files/patch-unzip+source+misc.c
deleted file mode 100644
index 649a976f4c4d..000000000000
--- a/editors/openoffice.org-1.0/files/patch-unzip+source+misc.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../unzip/source/misc.c.orig	Mon Jul 15 14:25:32 2002
-+++ ../unzip/source/misc.c	Mon Jul 15 14:27:15 2002
-@@ -300,9 +300,9 @@
-     static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
-     int yr, mo, dy, hh, mm, ss, leap;
-     long m_time, days=0;
--#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD))
--#if (defined(BSD) || defined(MTS) || defined(FREEBSD))
--#if !defined __386BSD__ && !defined FREEBSD
-+#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD))
-+#if (defined(BSD) || defined(MTS)
-+#if !defined __386BSD__
-     static struct timeb tbp;
- #endif /* __386BSD__ */
- #else /* !(BSD || MTS) */
diff --git a/editors/openoffice.org-1.0/files/patch-vcl+unx+source+app+osssound.cxx b/editors/openoffice.org-1.0/files/patch-vcl+unx+source+app+osssound.cxx
deleted file mode 100644
index af681e020472..000000000000
--- a/editors/openoffice.org-1.0/files/patch-vcl+unx+source+app+osssound.cxx
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../vcl/unx/source/app/osssound.cxx.orig	Sun Jul 21 10:20:34 2002
-+++ ../vcl/unx/source/app/osssound.cxx	Sun Jul 21 10:21:28 2002
-@@ -72,7 +72,11 @@
- #include <unistd.h>
- #include <string.h>
- #include <sys/ioctl.h>
-+#ifdef LINUX
- #include <linux/soundcard.h>
-+#else
-+#include <sys/soundcard.h>
-+#endif
- #include <errno.h>
- 
- #ifdef _USE_NAMESPACE
diff --git a/editors/openoffice.org-1.0/files/patch-vcl+unx+source+app+rptpsound.cxx b/editors/openoffice.org-1.0/files/patch-vcl+unx+source+app+rptpsound.cxx
deleted file mode 100644
index fca5510022f9..000000000000
--- a/editors/openoffice.org-1.0/files/patch-vcl+unx+source+app+rptpsound.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../vcl/unx/source/app/rptpsound.cxx.orig	Wed Oct 24 18:32:21 2001
-+++ ../vcl/unx/source/app/rptpsound.cxx	Sun Jun  2 22:01:07 2002
-@@ -78,6 +78,10 @@
- extern "C" int usleep(unsigned int);
- #endif
- 
-+#ifdef FREEBSD
-+#include <unistd.h>
-+#endif
-+
- #ifdef _USE_NAMESPACE
- using namespace vcl_sal;
- using namespace vos;
diff --git a/editors/openoffice.org-1.0/files/patch-vcl+unx+source+app+saldata.cxx b/editors/openoffice.org-1.0/files/patch-vcl+unx+source+app+saldata.cxx
deleted file mode 100644
index c292a93a8313..000000000000
--- a/editors/openoffice.org-1.0/files/patch-vcl+unx+source+app+saldata.cxx
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../vcl/unx/source/app/saldata.cxx.orig	Sun Jun  2 22:07:34 2002
-+++ ../vcl/unx/source/app/saldata.cxx	Sun Jun  2 22:08:22 2002
-@@ -78,6 +78,11 @@
- #ifdef AIX
- #include <strings.h>
- #endif
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#include <sys/time.h>
-+#include <unistd.h>
-+#endif
- 
- #ifndef _VOS_MUTEX_HXX
- #include <vos/mutex.hxx>
diff --git a/editors/openoffice.org-1.0/files/patch-vcl+unx+source+app+vsound.hxx b/editors/openoffice.org-1.0/files/patch-vcl+unx+source+app+vsound.hxx
deleted file mode 100644
index 028e7c9d64c1..000000000000
--- a/editors/openoffice.org-1.0/files/patch-vcl+unx+source+app+vsound.hxx
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../vcl/unx/source/app/vsound.hxx.orig	Sun Jul 21 00:10:24 2002
-+++ ../vcl/unx/source/app/vsound.hxx	Sun Jul 21 00:10:27 2002
-@@ -61,7 +61,7 @@
- #ifndef _VCL_VSOUND_HXX
- #define _VCL_VSOUND_HXX
- 
--#ifdef LINUX
-+#if defined(LINUX) || defined(FREEBSD)
- #define USE_OSS
- #endif
- 
-@@ -69,7 +69,7 @@
- #define USE_DEVAUDIO
- #endif
- 
--#if defined LINUX || defined SOLARIS
-+#if defined (LINUX) || defined(FREEBSD) || defined (SOLARIS)
- #define USE_NAS
- #endif
- 
diff --git a/editors/openoffice.org-1.0/files/patch-vcl+unx+source+gdi+salcvt.cxx b/editors/openoffice.org-1.0/files/patch-vcl+unx+source+gdi+salcvt.cxx
deleted file mode 100644
index 8b588120c718..000000000000
--- a/editors/openoffice.org-1.0/files/patch-vcl+unx+source+gdi+salcvt.cxx
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../vcl/unx/source/gdi/salcvt.cxx.orig	Mon Feb 24 17:46:21 2003
-+++ ../vcl/unx/source/gdi/salcvt.cxx	Tue Feb 25 17:21:50 2003
-@@ -261,6 +261,17 @@
- 					||	( nChar >= 0x2500 && nChar <= 0x25a0 );
- 			break;
- 
-+		case RTL_TEXTENCODING_KOI8_U:
-+			bMatch = 	( nChar >= 0x0020 && nChar <= 0x007e )
-+					||	( nChar >= 0x00a0 && nChar <= 0x00b7 )
-+					||	( nChar == 0x00f7 )
-+					||	( nChar >= 0x0401 && nChar <= 0x0491 )
-+					||	( nChar >= 0x2219 && nChar <= 0x221a )
-+					||	( nChar >= 0x2248 && nChar <= 0x2265 )
-+					||	( nChar >= 0x2320 && nChar <= 0x2321 )
-+					||	( nChar >= 0x2500 && nChar <= 0x25a0 );
-+			break;
-+
- 		case RTL_TEXTENCODING_UNICODE:
- 			bMatch = True;
- 			break;
diff --git a/editors/openoffice.org-1.0/files/patch-vcl+unx+source+gdi+xlfd_extd.cxx b/editors/openoffice.org-1.0/files/patch-vcl+unx+source+gdi+xlfd_extd.cxx
deleted file mode 100644
index 15142495e078..000000000000
--- a/editors/openoffice.org-1.0/files/patch-vcl+unx+source+gdi+xlfd_extd.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../vcl/unx/source/gdi/xlfd_extd.cxx.orig	Mon Feb 24 17:46:21 2003
-+++ ../vcl/unx/source/gdi/xlfd_extd.cxx	Tue Feb 25 17:22:26 2003
-@@ -205,6 +205,7 @@
- 			case RTL_TEXTENCODING_ISO_8859_15:
- 			case RTL_TEXTENCODING_MS_1251:
- 			case RTL_TEXTENCODING_KOI8_R:
-+			case RTL_TEXTENCODING_KOI8_U:
- 			case RTL_TEXTENCODING_JIS_X_0201:
- 				if ( nLargestRange < 0x0080 )
- 				{
diff --git a/editors/openoffice.org-1.0/files/patch-vcl+util+makefile.mk b/editors/openoffice.org-1.0/files/patch-vcl+util+makefile.mk
deleted file mode 100644
index 1ea13157ce57..000000000000
--- a/editors/openoffice.org-1.0/files/patch-vcl+util+makefile.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../vcl/util/makefile.mk.orig	Sun Jul 21 00:12:09 2002
-+++ ../vcl/util/makefile.mk	Sun Jul 21 00:12:11 2002
-@@ -293,9 +293,9 @@
- .ENDIF          # "$(OS)"=="MACOSX"
- .ENDIF          # "$(OS)"=="SOLARIS"
- 
--.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS"
-+.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
- SHL1STDLIBS += -laudio
--.ENDIF          # "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS"
-+.ENDIF          # "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
- 
- .ENDIF          # "$(GUI)"=="UNX"
- 
diff --git a/editors/openoffice.org-1.0/files/zipmoz.sh b/editors/openoffice.org-1.0/files/zipmoz.sh
deleted file mode 100644
index 43a4591f3430..000000000000
--- a/editors/openoffice.org-1.0/files/zipmoz.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/sh -f
-
-RUNTIME_FILES=" components/libabsyncsvc.so components/libaddrbook.so \
-		components/libmork.so components/libmozldap.so \
-		components/libnecko.so components/libprofile.so \
-		components/librdf.so components/libstrres.so \
-		components/libunicharutil.so components/libuconv.so \
-		components/libucvcn.so components/libucvibm.so \
-		components/libucvja.so components/libucvko.so \
-		components/libucvlatin.so components/libucvtw.so \
-		components/libucvtw2.so components/liburiloader.so \
-		components/libvcard.so components/libxpconnect.so \
-		components/libpref.so components/libchrome.so libmozjs.so \
-		libmsgbaseutil.so libldap50.so libnspr4.so libplc4.so \
-		libplds4.so libxpcom.so libmozz.so component.reg \
-		components/necko_dns.xpt components/xpcom_xpti.xpt \
-		components/xpcom_threads.xpt components/xpcom_io.xpt \
-		components/xpcom_ds.xpt components/xpcom_components.xpt \
-		components/xpcom_base.xpt components/xpti.dat \
-		defaults/pref/all.js defaults/pref/config.js \
-		defaults/pref/editor.js defaults/pref/initpref.js \
-		defaults/pref/inspector.js defaults/pref/mailnews.js \
-		defaults/pref/security-prefs.js defaults/pref/unix.js \
-		defaults/pref/xpinstall.js"
-
-LIB_FILES="	lib/libembed_base_s.a lib/libmozreg_s.a \
-		lib/libnspr4.so lib/libxpcom.so lib/libprldap50.so"
-
-INC_FILES="include/"
-INC_FILES2="public/"
-
-if [ $# -lt 2 -o $# -gt 3 ] ; then
-	echo 
-	echo usage: $0 mozilla_dist target [target_dir]
-	echo
-	echo where:
-	echo
-	echo "mozilla_dist points to the mozilla distribution"
-	echo "target concatenates  OS, compiler and CPU (e.g. FREEBSDGCCI etc)"
-	echo "target_dir is the directory to place the zips"
-	exit 1
-fi
-
-MOZ_DIST=$1
-TARGET=$2
-if [ "w$3" != "w" ]; then
-	TARGET_DIR=$3
-else
-	if [ "w$TARGET_DIR" == "w" ]; then
-		TARGET_DIR=
-	fi
-fi
-
-ZIP_TARGET=$TARGET_DIR
-if [ -z "$ZIP_TARGET" ] ; then
-	ZIP_TARGET=../
-fi
-
-# just to remember the current working directory
-STARTING_DIR=`pwd`
-
-echo
-echo --- creating zips for $TARGET, using mozilla distribution in $MOZ_DIST
-
-# Create the directories
-[ ! -d $TARGET_DIR/$TARGET/runtime ] && mkdir -p $TARGET_DIR/$TARGET/runtime
-[ ! -d $TARGET_DIR/$TARGET/runtime/components ] && mkdir -p $TARGET_DIR/$TARGET/runtime/components
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults/pref ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults/pref
-[ ! -d $TARGET_DIR/$TARGET/lib ] && mkdir -p $TARGET_DIR/$TARGET/lib
-[ ! -d $TARGET_DIR/$TARGET/inc ] && mkdir -p $TARGET_DIR/$TARGET/inc
-[ ! -d $TARGET_DIR/$TARGET/inc/nspr ] && mkdir -p $TARGET_DIR/$TARGET/inc/nspr
-[ ! -d $TARGET_DIR/$TARGET/inc/obsolete ] && mkdir -p $TARGET_DIR/$TARGET/inc/obsolete
-
-# Copy the files
-echo
-echo --- copying files
-echo
-
-for i in $RUNTIME_FILES; do
-	if [ ! -f $MOZ_DIST/bin/$i ]; then
-		echo $MOZ_DIST/bin/$i does not exist, check your distribution
-	else
-		if [ `echo $i | grep component` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/components/
-		elif [ `echo $i | grep defaults` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/defaults/pref/
-		else
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/
-		fi
-	fi
-done
-
-for i in $LIB_FILES; do
-	if [ ! -f $MOZ_DIST/$i ]; then
-		echo $MOZ_DIST/$i does not exist, check your distribution
-	else
-		cp -R -L $MOZ_DIST/$i $TARGET_DIR/$TARGET/lib/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES`; do
-	if [ ! -d $i ]; then 
-		cp -R -L $MOZ_DIST/include/$i $TARGET_DIR/$TARGET/inc/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES2`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/public/$i $TARGET_DIR/$TARGET/inc
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/$i $TARGET_DIR/$TARGET/inc/nspr
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr/obsolete`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/obsolete/$i $TARGET_DIR/$TARGET/inc/obsolete
-	fi
-done
-
-# delete old zips
-
-[ -f $TARGET_DIR/$TARGET/runtime.zip ] && rm -f $TARGET_DIR/$TARGET/runtime.zip
-[ -f $TARGET_DIR/$TARGET/lib.zip ] && rm -f $TARGET_DIR/$TARGET/lib.zip
-[ -f $TARGET_DIR/$TARGET/inc.zip ] && rm -f $TARGET_DIR/$TARGET/inc.zip
-
-# zip the runtime files
-
-echo
-echo --- creating ${TARGET}runtime.zip
-echo
-
-cd $TARGET_DIR/$TARGET/runtime
-find . -type f | zip $ZIP_TARGET/${TARGET}runtime.zip -@
-
-# zip the lib files
-echo 
-echo --- creating ${TARGET}lib.zip
-echo 
-
-cd $TARGET_DIR/$TARGET/lib
-find . -type f | zip $ZIP_TARGET/${TARGET}lib.zip -@
-
-# zip the inc files
-echo
-echo --- creating ${TARGET}inc.zip
-echo
-
-cd $TARGET_DIR/$TARGET/inc
-find . -type f | zip $ZIP_TARGET/${TARGET}inc.zip -@
-
-# remove dirs
-cd $STARTING_DIR
-rm -rf $TARGET_DIR/$TARGET
-
-echo
-echo --- done
-echo
-
diff --git a/editors/openoffice.org-1.0/pkg-descr b/editors/openoffice.org-1.0/pkg-descr
deleted file mode 100644
index 31fd1b12161a..000000000000
--- a/editors/openoffice.org-1.0/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-OpenOffice.org is an Open Source, community-developed, multi-platform office
-productivity suite. It includes the key desktop applications, such as a
-word processor, spreadsheet, presentation manager, and drawing program,
-with a user interface and feature set similar to other office suites.
-
-Components include:
-  * A universal word processing application for creating business
-    letters, extensive text documents, professional layouts, and HTML
-    documents.
-  * A sophisticated application for performing advanced spreadsheet
-    functions, such as analyzing figures, creating lists, and viewing data.
-  * A tool for creating effective eye-catching presentations.
-  * A vector-oriented draw module that enables the creation of 3D
-    illustrations
diff --git a/editors/openoffice.org-1.0/pkg-message b/editors/openoffice.org-1.0/pkg-message
deleted file mode 100644
index d34987ae0817..000000000000
--- a/editors/openoffice.org-1.0/pkg-message
+++ /dev/null
@@ -1,82 +0,0 @@
-OpenOffice.org Build 1.0.2 Personal Install How-To
-
-Written by:	Martin Blapp <mbr@freebsd.org>
-
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org1.0/
-
-1 User installation
--------------------
-
-Just type "openoffice" after you have successfully
-installed the package. If there is no installed
-OO.org dir in hour homedir, you'll be prompted to
-install some files and choose a installed JDK.
-The setup installs a "OpenOffice.org1.0.2" folder
-in your homedir.
-
-If the setup tells you there is already an installed
-version, you may look at the file ".sversionrc" in
-your homedir. In this file OpenOffice and StarOffice
-have both a line for each version which is installed.
-After removing the problematic line you should be able to
-install again.
-
-2 Start OO.org
---------------
-
-There are some wrappers installed for fast startup.
-Add "${PREFIX}/bin/" to your PATH and you will be able
-to use them.
-
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-OO.org does need $LANG to be set to a suitable value.
-If it is not already set, a default value is chosen.
-Some old X-Servers before XFree86 4.2 do not like the
-western locale with Euro symbol (ISO_8859-15).
-You should ignore the warning message then or upgrade to
-to a more recent X-server.
-
-If you have chosen US-ASCII as locale, you cannot load
-and save documents with special characters and these
-characters are also not available in swriter and scalc.
-
-3 Setup problems (FreeBSD < 4.7-RELEASE only)
----------------------------------------------
-
-If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the latest
-version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE.
-
-4 Crashes in URL-location bar (FreeBSD < 4.7-RELEASE only)
-----------------------------------------------------------
-
-OO.org can crash if you enter a non existing path
-or URL in the location bar. To fix these crashes
-you need the following patch. You will see this
-bug only if your OS is older than FreeBSD 4.7-RELEASE.
-
-http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff
-
-5 Crash at startup after using a localized version
---------------------------------------------------
-
-If you had installed the english version, and then have
-switched to a localized OO.org, it will crash instantly.
-
-To solve this issue, please remove the already installed
-OpenOffice.org1.0.2 dir in your homedir and remove the
-appropriate entry from ".sversionrc". After you have done
-this, redo the user installation and the problem will
-go away.
diff --git a/editors/openoffice.org-1.0/pkg-plist b/editors/openoffice.org-1.0/pkg-plist
deleted file mode 100644
index 28bd78453b52..000000000000
--- a/editors/openoffice.org-1.0/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, do not delete. Package list is generated automatically.
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
deleted file mode 100644
index 6f740924c399..000000000000
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ /dev/null
@@ -1,580 +0,0 @@
-# New ports collection makefile for: OpenOffice
-# Date created:		28 Februar 2002
-# Whom:                 Martin Blapp
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openoffice
-PORTVERSION=	644
-CATEGORIES+=	editors
-MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
-		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
-		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
-		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ny1.mirror.openoffice.org/miscellaneous/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
-MASTER_SITE_SUBDIR=	${PORTVERSION}
-DISTFILES+=	oo_${PORTVERSION}_src.tar.bz2 \
-		gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
-
-BROKEN=		"Does not build"
-
-SORT?=	/usr/bin/sort
-FIND?=	/usr/bin/find
-CUT?=	/usr/bin/cut
-AWK?=	/usr/bin/awk
-GREP?=	/usr/bin/grep
-ZIP?=	${PREFIX}/bin/zip
-UNZIP?=	${PREFIX}/bin/unzip
-ANT?=	${LOCALBASE}/bin/ant
-TCSH?=	/bin/tcsh
-PASTE?=	/usr/bin/paste
-
-.include <bsd.port.pre.mk>
-
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
-DIST_SUBDIR=		openoffice
-DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
-
-#
-# configuration for language specific slave ports
-#
-.if !defined(LANG_EXT)
-LANG_EXT=01
-.else
-#
-# Add pkg-descr and pkg-message if available
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-#
-# LANG_CONFIGURE_ARG is missing for the german port
-#
-.if defined(LANG_EXT)
-CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG},ENUS
-.endif
-.endif
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
-
-EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-
-MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/jakarta-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-.if !defined(DISPLAY)
-BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
-.endif
-.if !defined(WITH_BSD_JDK)
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk14
-.else
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-.endif
-
-USE_PERL5=	yes
-USE_BZIP2=	yes
-USE_BISON=	yes
-USE_GMAKE=	yes
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
-.if !defined(WITH_BSD_JDK)
-JDKDIR?=	${LOCALBASE}/linux-sun-jdk1.4.1
-.else
-JDKDIR?=	${LOCALBASE}/jdk1.4.1
-.endif
-JAVAVM=         ${JDKDIR}/bin/java
-
-GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
-LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
-BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
-
-.if !defined(DISPLAY)
-DISPLAYHACK=localhost:1001
-.endif
-
-CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
-			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
-
-.if !defined(WITH_BSD_JDK)
-CONFIGURE_ARGS+=	--enable-linuxjdk=yes
-.endif
-
-.if defined(WITH_DEBUG)
-.if ${WITH_DEBUG} == 2
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-.endif
-
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"prefered language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
-	@${ECHO} "OPTIONS:"
-.if !defined(USE_GCC)
-	@${ECHO}
-	@${ECHO} "You can compile OO with different"
-	@${ECHO} "gcc compiler versions:"
-	@${ECHO}
-	@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.2"
-	@${ECHO} "to compile openoffice with your"
-	@${ECHO} "prefered compiler."
-.endif
-.if !defined(WITH_BSD_JDK)
-	@${ECHO}
-	@${ECHO} "If you like to use the native BSD"
-	@${ECHO} "JDK for the build system, you can use"
-	@${ECHO} "WITH_BSD_JDK=TRUE to disable the"
-	@${ECHO} "usage of the linux-JDK and linux dependency."
-	@${ECHO}
-.endif
-.if !defined(WITH_DEBUG)
-	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
-	@${ECHO} "if you call make with WITH_DEBUG=1"
-	@${ECHO}
-	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
-	@${ECHO}
-.endif
-.if !defined(WITH_TTF_BYTECODE_ENABLED)
-	@${ECHO}
-	@${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES"
-	@${ECHO} "if you like to use the Freetype library to"
-	@${ECHO} "render TTF fonts. Normally the TTF lib is"
-	@${ECHO} "not used to render fonts."
-	@${ECHO}
-	@${ECHO} "If you have licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479"
-	@${ECHO} "you can enable this option to get better"
-	@${ECHO} "quality of glyphs at small bitmap sizes."
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 450002
-	@${ECHO}
-	@${ECHO} "OS-VERSION ${OSVERSION} too low"
-	@${ECHO}
-	@${ECHO} "OO need some important libc_r and"
-	@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
-	@${ECHO} "RELEASE or 4.6 STABLE."
-	@${FALSE}
-.endif
-	@${ECHO}
-	@${ECHO} "NOTICE:"
-	@${ECHO}
-	@${ECHO} "To build Openoffice, you should have a lot"
-.if defined(WITH_DEBUG)
-	@${ECHO} "of free diskspace (~ 8GB)."
-.else
-	@${ECHO} "of free diskspace (~ 4GB)."
-.endif
-	@${ECHO}
-.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
-    (${OSVERSION} < 500000 && !defined(USE_GCC))
-	@${ECHO} "KERNEL CONFIGURATION:"
-	@${ECHO}
-	@${ECHO} "Openoffice needs a larger stack- and"
-	@${ECHO} "datasize to build. Check your limit"
-	@${ECHO} "settings and and put this in /boot/loader.conf"
-	@${ECHO} "if neccessary:"
-	@${ECHO}
-	@${ECHO} "kern.maxdsiz=\"1073741824\""
-	@${ECHO} "kern.maxssiz=\"268435456\""
-.endif
-	@${ECHO}
-.if ${OSVERSION} < 460002
-	@${ECHO} "REQUIRED SYSTEM PATCHES:"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO} "OO.org can crash if you enter a non existing path"
-	@${ECHO} "or URL in the location bar. To fix these crashes"
-	@${ECHO} "you need a uncommitted system patch for rtld:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460001
-	@${ECHO}
-	@${ECHO} "OO setup is broken on STABLE < 4.6"
-	@${ECHO} "including 4.6 RELEASE."
-	@${ECHO} "You'll need a system patch to solve"
-	@${ECHO} "this problem:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460002
-	@${ECHO}
-	@${ECHO} "OO.org soffice binary can deadlock. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO}
-	@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
-	@${ECHO}
-.endif
-.if !exists(/usr/include/langinfo.h)
-	@${ECHO}
-	@${ECHO} "langinfo.h is missing !"
-	@${ECHO}
-	@${ECHO} "Please upgrade to 4.6 RELEASE or"
-	@${ECHO} "4.6 STABLE."
-	@${ECHO}
-	@${FALSE}
-.endif
-
-post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
-	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
-	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@-${RM} -f ${WRKSRC}/../moz/zipped/*.zip
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
-.if defined(L10NHELP)
-	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
-	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
-.endif
-
-post-patch:
-	@${MAKE} patch-mozilla
-.if defined(WITH_TTF_BYTECODE_ENABLED)
-	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
-		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-			${ECHO_MSG} "===>   Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \
-		fi; \
-		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
-	fi
-.endif
-.if defined(WITH_DEBUG)
-	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
-		PATCHES_APPLIED="" ; \
-		for i in ${PATCHDIR}/debugpatch-*; do \
-			case $$i in \
-				*.orig|*.rej|*~) \
-					${ECHO_MSG} "===>   Ignoring patchfile $$i" ; \
-					;; \
-				*) \
-					if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-						${ECHO_MSG} "===>   Applying ${OPSYS} patch $$i" ; \
-					fi; \
-					if ${PATCH} ${PATCH_ARGS} < $$i ; then \
-						PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
-					else \
-						${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
-						if [ x"$$PATCHES_APPLIED" != x"" ]; then \
-							${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
-						fi; \
-						${FALSE} ; \
-					fi; \
-					;; \
-			esac; \
-		done; \
-	fi;
-.endif
-	@${ECHO_MSG} "===>  Find old malloc.h defines and fix them in ${PKGNAME} source"
-	@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
-		${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
-
-extract-mozilla:
-.if ! exists(${WRKDIR}/mozilla/Makefile)
-	@${ECHO_MSG} "===>  Extracting mozilla sub project"
-	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
-.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment)
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
-.endif
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
-.endif
-	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
-
-patch-mozilla:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
-		${WRKDIR}/mozilla/files/
-	@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
-
-build-mozilla:
-.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
-	@${ECHO_MSG} "===>  Building mozilla sub project"
-.if defined(WITH_DEBUG)
-	@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
-	@${SED} -e 's|--disable-debug||' \
-		-e 's|--disable-cpp-rtti||' \
-		-e 's|--enable-strip||' \
-		< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
-.endif
-.if defined(USE_GCC)
-	@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
-.else
-	@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
-.endif
-	@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
-	@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
-	@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
-.endif
-
-install-mozilla:
-	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
-
-register-mozilla:
-.if exists(${WRKDIR}/mozilla-runtime)
-	@${RM} -rf ${WRKDIR}/mozilla-runtime
-.endif
-	@${MKDIR} ${WRKDIR}/mozilla-runtime
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
-	@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
-	@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
-	@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
-		&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom 
-	@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
-		${WRKDIR}/mozilla-runtime/components/xptitemp.dat
-	@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
-	@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
-		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
-
-mozilla:
-	@${MAKE} extract-mozilla
-	@${MAKE} patch-mozilla
-	@${MAKE} build-mozilla
-	@${MAKE} register-mozilla
-	@${MAKE} install-mozilla
-
-do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
-	@${MAKE} mozilla
-.endif
-.endif
-.endif
-.if exists(${WRKDIR}/.Xvfb.pid)
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.endif
-.if !defined(DISPLAY)
-	#
-	# This is a UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-.endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
-	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-.endif
-.if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
-.endif
-
-pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-
-do-install:
-.if !defined(DISPLAY)
-	#
-	# UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-.endif
-
-install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
-
-post-install:
-	@${ECHO_MSG} "===>  Add wrapper scripts";
-	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
-	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
-
-package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
-.if defined(LANG_SUFFIX)
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
-.else
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
-.endif
-
-update:
-	@${MAKE} fetch
-	@${MAKE} extract
-	@cd ${WRKSRC}/.. && for dir in *; do \
-	    if [ -d $$dir ]; then \
-		cd $$dir; cvs update -d; cd ..; \
-	    fi \
-	done
-
-.include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-1.1-devel/distinfo b/editors/openoffice.org-1.1-devel/distinfo
deleted file mode 100644
index ec9d6788f104..000000000000
--- a/editors/openoffice.org-1.1-devel/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
-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
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
diff --git a/editors/openoffice.org-1.1-devel/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-1.1-devel/files/debugpatch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 96c651ce22c8..000000000000
--- a/editors/openoffice.org-1.1-devel/files/debugpatch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../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
-@@ -902,6 +902,7 @@
- 
- void KillSetupDir()
- {
-+#if 0
-     DIR* pDir = opendir( strTmpPath );
-     struct dirent* pFile;
- 
-@@ -915,6 +916,10 @@
- 
-     chdir( strInitPath );
-     rmdir( strTmpPath );
-+#else
-+	fprintf(stderr, "\nLeaving behind temporary directory: %s\n",
-+	strTmpPath);
-+#endif
- }
- 
- void makeSymLink( char* s )
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
deleted file mode 100644
index 52bd2b3d58d6..000000000000
--- a/editors/openoffice.org-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
-+++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
- 
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- 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
- 
- # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
diff --git a/editors/openoffice.org-1.1-devel/files/oo_setup.resp b/editors/openoffice.org-1.1-devel/files/oo_setup.resp
deleted file mode 100644
index 8eeeb11bd95e..000000000000
--- a/editors/openoffice.org-1.1-devel/files/oo_setup.resp
+++ /dev/null
@@ -1,7 +0,0 @@
-[Environment]
-InstallationMode = INSTALL_NETWORK
-InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org-643
-
-[Java]
-JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-1.1-devel/files/openoffice-wrapper b/editors/openoffice.org-1.1-devel/files/openoffice-wrapper
deleted file mode 100644
index 5693e944b847..000000000000
--- a/editors/openoffice.org-1.1-devel/files/openoffice-wrapper
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1-devel/files/Attic/openoffice-wrapper,v 1.3 2003-03-05 23:24:05 mbr Exp $
-
-oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/
-program=`echo $0 | sed -e 's|.*-||'`
-
-if [ ! $LANG ]; then
-	export LANG=%%LANG%%
-fi
-
-case $program in
-$0)
-	exec $oopath/soffice "$@"
-	;;
-	*)
-	exec $oopath/$program "$@"
-	;;
-esac
diff --git a/editors/openoffice.org-1.1-devel/files/optpatch-freetype+patch b/editors/openoffice.org-1.1-devel/files/optpatch-freetype+patch
deleted file mode 100644
index b426a8fb7fcc..000000000000
--- a/editors/openoffice.org-1.1-devel/files/optpatch-freetype+patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Index: files/patch-freetype::patch
-===================================================================
-RCS file: files/patch-freetype::patch
-diff -N files/patch-freetype::patch
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-freetype::patch	4 Aug 2002 15:27:42 -0000
-@@ -0,0 +1,201 @@
-+diff -ur ../freetype/freetype-2.0.5.patch oo641d_patched/freetype/freetype-2.0.5.patch
-+--- ../freetype/freetype-2.0.5.patch	Fri Apr  5 21:07:34 2002
-++++ ../freetype/freetype-2.0.5.patch	Sat Mar  9 18:04:17 2002
-+@@ -1,118 +1,79 @@
-+-*** misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 14 00:44:33 2000
-+---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 63,69 ****
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+---- 63,69 ----
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+-*** misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Jun  7 19:36:17 2001
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 631,637 ****
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+---- 631,637 ----
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile -DPIC $pic_flag"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Mon Jan  1 18:25:21 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 1,7 ****
-+---- 1,9 ----
-+-  FT_USE_MODULE(autohint_module_class)
-+-  FT_USE_MODULE(cff_driver_class)
-+-  FT_USE_MODULE(t1cid_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(pcf_driver_class)
-+-+ */
-+-  FT_USE_MODULE(psaux_module_class)
-+-  FT_USE_MODULE(psnames_module_class)
-+-  FT_USE_MODULE(ft_raster1_renderer_class)
-+-***************
-+-*** 9,12 ****
-+---- 11,16 ----
-+-  FT_USE_MODULE(ft_smooth_renderer_class)
-+-  FT_USE_MODULE(tt_driver_class)
-+-  FT_USE_MODULE(t1_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(winfnt_driver_class)
-+-+ */
-+-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h	Tue Aug 21 10:50:45 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 70,76 ****
-+---- 70,79 ----
-+-    /*   All convenience functions are declared as such in their             */
-+-    /*   documentation.                                                      */
-+-    /*                                                                       */
-+-+ /*
-+-  #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-+ */
-+-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-  
-+-  
-+-    /*************************************************************************/
-+-***************
-+-*** 108,116 ****
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-- 
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+---- 111,121 ----
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-+ /*
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-+ */
-+-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig	Mon Jan  7 14:21:35 2002
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Mon Jan  7 14:21:40 2002
-+-***************
-+-*** 2251,2257 ****
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age + 1`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-+---- 2251,2257 ----
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk
-++--- misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:49:17 2001
-++@@ -63,7 +63,7 @@
-++ #   ANSI compliance.
-++ #
-++ ifndef CFLAGS
-++-  CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+++  CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-++ endif
-++ 
-++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh
-++--- misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:47:56 2001
-+++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:49:17 2001
-++@@ -631,7 +631,7 @@
-++     if test "$build_old_libs" = yes; then
-++       if test "$pic_mode" != yes; then
-++ 	# Don't build PIC code
-++-	command="$base_compile $srcfile"
-+++	command="$base_compile $srcfile -DPIC $pic_flag"
-++       else
-++ 	# All platforms use -DPIC, to notify preprocessed assembler code.
-++ 	command="$base_compile $srcfile $pic_flag -DPIC"
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:49:17 2001
-++@@ -1,7 +1,9 @@
-++ FT_USE_MODULE(autohint_module_class)
-++ FT_USE_MODULE(cff_driver_class)
-++ FT_USE_MODULE(t1cid_driver_class)
-+++/*
-++ FT_USE_MODULE(pcf_driver_class)
-+++*/
-++ FT_USE_MODULE(psaux_module_class)
-++ FT_USE_MODULE(psnames_module_class)
-++ FT_USE_MODULE(ft_raster1_renderer_class)
-++@@ -9,4 +11,6 @@
-++ FT_USE_MODULE(ft_smooth_renderer_class)
-++ FT_USE_MODULE(tt_driver_class)
-++ FT_USE_MODULE(t1_driver_class)
-+++/*
-++ FT_USE_MODULE(winfnt_driver_class)
-+++*/
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:51:15 2001
-++@@ -70,7 +70,10 @@
-++   /*   All convenience functions are declared as such in their             */
-++   /*   documentation.                                                      */
-++   /*                                                                       */
-+++/*
-++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+++*/
-+++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-++ 
-++ 
-++   /*************************************************************************/
-++@@ -108,8 +111,10 @@
-++   /*   use a vector `plotter' format that isn't supported when this        */
-++   /*   macro is undefined.                                                 */
-++   /*                                                                       */
-+++/*
-++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++-
-+++*/
-+++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++ 
-++   /*************************************************************************/
-++   /*                                                                       */
-++@@ -338,7 +343,7 @@
-++   /* By undefining this, you will only compile the code necessary to load  */
-++   /* TrueType glyphs without hinting.                                      */
-++   /*                                                                       */
-++-#undef  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-+++#define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-++ 
-++ 
-++   /*************************************************************************/
diff --git a/editors/openoffice.org-1.1-devel/files/optpatch-vcl+util+makefile.pmk b/editors/openoffice.org-1.1-devel/files/optpatch-vcl+util+makefile.pmk
deleted file mode 100644
index 41341ff0b4e8..000000000000
--- a/editors/openoffice.org-1.1-devel/files/optpatch-vcl+util+makefile.pmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/util/makefile.pmk.orig	Mon Aug  5 01:39:41 2002
-+++ ../vcl/util/makefile.pmk	Mon Aug  5 01:40:03 2002
-@@ -64,7 +64,7 @@
- PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch
- PDBTARGET=vcl
- 
--.IF "$(OS)" != "MACOSX"
-+.IF "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- .IF "$(remote)" != ""
- USE_BUILTIN_RASTERIZER=true
- .ENDIF
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 078685f3b516..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	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 freebsd genunix";;
-  	*)		JINCSUBDIRS="genunix";;
-  	esac
-  
diff --git a/editors/openoffice.org-1.1-devel/files/patch-bridges+prj+build.lst b/editors/openoffice.org-1.1-devel/files/patch-bridges+prj+build.lst
deleted file mode 100644
index fee3d847c5e6..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-bridges+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
deleted file mode 100644
index 99b8c566fb61..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ /dev/null
@@ -1,102 +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 );
-+    }
- }
- 
- }
diff --git a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice.org-1.1-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
deleted file mode 100644
index 4622b7fe21c4..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-1.1-devel/files/patch-comphelper+util+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-comphelper+util+makefile.mk
deleted file mode 100644
index f2d3092c2ddf..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-comphelper+util+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-1.1-devel/files/patch-config_office+configure.in b/editors/openoffice.org-1.1-devel/files/patch-config_office+configure.in
deleted file mode 100644
index a45332fcbec0..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,66 +0,0 @@
---- configure.in.orig	Thu Feb 20 15:49:32 2003
-+++ configure.in	Wed Mar  5 21:22:34 2003
-@@ -95,6 +95,12 @@
-                           
-                           Usage: --enable-macos9
- ],,)
-+AC_ARG_ENABLE(linuxjdk,
-+[  --enable-linuxjdk         Use this option option if you like to use
-+                          the linux-jdk instead of the native jdk.
-+
-+                          Usage: --enable-linuxjdk
-+],,)
- AC_ARG_WITH(lang,
- [  --with-lang             Use this option to build OpenOffice.org with
-                           additional language support. US English is always
-@@ -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
-@@ -1232,7 +1249,11 @@
- if test -n "$enable_debug"; then
-    ENABLE_DEBUG="TRUE"
- else
--   ENABLE_DEBUG="FALSE"
-+fi
-+if test -n "$enable_linuxjdk"; then
-+   USE_LINUXJDK="TRUE"
-+else
-+   USE_LINUXJDK="FALSE"
- fi
- 
- dnl ===================================================================
-@@ -1278,6 +1299,7 @@
- AC_SUBST(PTHREAD_CFLAGS)
- AC_SUBST(PTHREAD_LIBS)
- AC_SUBST(ENABLE_DEBUG)
-+AC_SUBST(USE_LINUXJDK)
- 
- AC_OUTPUT([set_soenv])
- 
diff --git a/editors/openoffice.org-1.1-devel/files/patch-config_office+set_soenv.in b/editors/openoffice.org-1.1-devel/files/patch-config_office+set_soenv.in
deleted file mode 100644
index 9ea6b11bdab2..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-config_office+set_soenv.in
+++ /dev/null
@@ -1,44 +0,0 @@
---- set_soenv.in.orig	Thu Feb 27 15:12:36 2003
-+++ set_soenv.in	Wed Mar  5 21:16:43 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, 
-@@ -88,7 +88,7 @@
-      $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
-      $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS,
-      $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
--     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG );
-+     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $USE_LINUXJDK );
- #
- #-------------------------------------------
- # IId. Declaring the aliases.
-@@ -140,7 +140,8 @@
- $CC			= '@CC@';           # C compiler
- $CXX		= '@CXX@';          # C++ compiler
- $EXCEPTIONS	= '@EXCEPTIONS@';   # Exception handling type
--$ENABLE_DEBUG	= '@ENABLE_DEBUG@';  # Enable a debug build
-+$ENABLE_DEBUG	= '@ENABLE_DEBUG@'; # Enable a debug build
-+$USE_LINUXJDK	= '@USE_LINUXJDK@'; # Use the Linux JDK
- $WRAPCMD	= "";				# Wrapper (only for winnt)
- 
- #
-@@ -1265,7 +1266,12 @@
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
- }
- elsif ($platform eq "$FreeBSD")
--{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+{
-+   if ($USE_LINUXJDK eq "TRUE") {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
-+   } else {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+   }
- }
- elsif ($platform eq "$NetBSD")
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
diff --git a/editors/openoffice.org-1.1-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk
deleted file mode 100644
index 2b83f2cd2ec7..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk
+++ /dev/null
@@ -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)					\
diff --git a/editors/openoffice.org-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
deleted file mode 100644
index 3601766ee561..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../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
-@@ -64,8 +64,8 @@
- #mozilla specific stuff.
- MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
- MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
--#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
--#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
-+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
-+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
- #End of mozilla specific stuff.
- 
- PRJ=..$/..$/..$/..
-@@ -107,7 +107,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -123,7 +123,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -141,7 +141,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS+=	    -DMOZILLA_CLIENT \
-             -DOSTYPE=\"Linux2.2.14-5\" -DOJI
- .IF "$(OS)" == "LINUX"
-@@ -157,6 +157,13 @@
-             -fno-rtti -Wall -Wconversion -Wpointer-arith \
-             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-             -Wno-long-long 
-+CDEFS     += -DTRACING
-+.ELIF "$(OS)" == "FREEBSD"
-+CFLAGS +=   -fPIC
-+CFLAGSCXX += \
-+            -fno-rtti -Wall -Wconversion -Wpointer-arith \
-+            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-+            -Wno-long-long -pthread 
- CDEFS     += -DTRACING
- .ENDIF
- .ENDIF
diff --git a/editors/openoffice.org-1.1-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
deleted file mode 100644
index b63d2a25f184..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-1.1-devel/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-1.1-devel/files/patch-cppu+inc+uno+lbnames.h
deleted file mode 100644
index cb43c2d165e9..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-cppu+inc+uno+lbnames.h
+++ /dev/null
@@ -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."
diff --git a/editors/openoffice.org-1.1-devel/files/patch-cppu+prj+build.lst b/editors/openoffice.org-1.1-devel/files/patch-cppu+prj+build.lst
deleted file mode 100644
index 78fd210a1193..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-cppu+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1-devel/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-cppuhelper+source+makefile.mk
deleted file mode 100644
index 5fb5bd636eb1..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-cppuhelper+source+makefile.mk
+++ /dev/null
@@ -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 ------------------------------------------------------
diff --git a/editors/openoffice.org-1.1-devel/files/patch-desktop+source+pkgchk+pkgchk_misc.h b/editors/openoffice.org-1.1-devel/files/patch-desktop+source+pkgchk+pkgchk_misc.h
deleted file mode 100644
index 391667b66ebd..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-desktop+source+pkgchk+pkgchk_misc.h
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1-devel/files/patch-desktop+util+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-desktop+util+makefile.mk
deleted file mode 100644
index 025d644a8077..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-desktop+util+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1-devel/files/patch-dtrans+source+X11+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-dtrans+source+X11+makefile.mk
deleted file mode 100644
index 5881f5d7f6a5..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-dtrans+source+X11+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice.org-1.1-devel/files/patch-eventattacher+source+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-eventattacher+source+makefile.mk
deleted file mode 100644
index 4552698eb132..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-eventattacher+source+makefile.mk
+++ /dev/null
@@ -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)
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 6b8071f4030e..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	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"
- 
- .IF "$(OS)"!="MACOSX"
-+.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 @@
-         -rm -f $@
-         +ln -s libgcc_s.so.1 $@
- 
-+.ENDIF 
- .ENDIF 
- 
- .ENDIF
diff --git a/editors/openoffice.org-1.1-devel/files/patch-freetype+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-freetype+makefile.mk
deleted file mode 100644
index 3e5a8dd19f18..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-freetype+makefile.mk
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-1.1-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-1.1-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
- 
- /* 
diff --git a/editors/openoffice.org-1.1-devel/files/patch-javaunohelper+source+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-javaunohelper+source+makefile.mk
deleted file mode 100644
index 19f6b86e5ab5..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-javaunohelper+source+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice.org-1.1-devel/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice.org-1.1-devel/files/patch-jni_uno+jni_java2uno.cxx
deleted file mode 100644
index a9ff9e3fed88..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-jni_uno+jni_java2uno.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-1.1-devel/files/patch-nas+nas-1.6.patch b/editors/openoffice.org-1.1-devel/files/patch-nas+nas-1.6.patch
deleted file mode 100644
index b6096654ebaf..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-nas+nas-1.6.patch
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-1.1-devel/files/patch-offapi+com+sun+star+setup+OSType.idl b/editors/openoffice.org-1.1-devel/files/patch-offapi+com+sun+star+setup+OSType.idl
deleted file mode 100644
index 3fee562c6d38..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-offapi+com+sun+star+setup+OSType.idl
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1-devel/files/patch-offapi+util+makefile.pmk b/editors/openoffice.org-1.1-devel/files/patch-offapi+util+makefile.pmk
deleted file mode 100644
index 5cdbb1b4aa4a..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-offapi+util+makefile.pmk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1-devel/files/patch-package+inc+HashMaps.hxx b/editors/openoffice.org-1.1-devel/files/patch-package+inc+HashMaps.hxx
deleted file mode 100644
index 35052d291ef7..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-package+inc+HashMaps.hxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice.org-1.1-devel/files/patch-package+inc+ZipPackageFolder.hxx b/editors/openoffice.org-1.1-devel/files/patch-package+inc+ZipPackageFolder.hxx
deleted file mode 100644
index 014c61403380..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-package+inc+ZipPackageFolder.hxx
+++ /dev/null
@@ -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()
diff --git a/editors/openoffice.org-1.1-devel/files/patch-package+source+zippackage+ContentInfo.hxx b/editors/openoffice.org-1.1-devel/files/patch-package+source+zippackage+ContentInfo.hxx
deleted file mode 100644
index c4bf35e79f64..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-package+source+zippackage+ContentInfo.hxx
+++ /dev/null
@@ -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();
diff --git a/editors/openoffice.org-1.1-devel/files/patch-package+source+zippackage+ZipPackageFolder.cxx b/editors/openoffice.org-1.1-devel/files/patch-package+source+zippackage+ZipPackageFolder.cxx
deleted file mode 100644
index bb504c834eef..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-package+source+zippackage+ZipPackageFolder.cxx
+++ /dev/null
@@ -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 );
diff --git a/editors/openoffice.org-1.1-devel/files/patch-registry+source+regkey.cxx b/editors/openoffice.org-1.1-devel/files/patch-registry+source+regkey.cxx
deleted file mode 100644
index fad069f83f14..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-registry+source+regkey.cxx
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-1.1-devel/files/patch-rsc+source+rscpp+cpp.h b/editors/openoffice.org-1.1-devel/files/patch-rsc+source+rscpp+cpp.h
deleted file mode 100644
index 417ab33ba52f..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-rsc+source+rscpp+cpp.h
+++ /dev/null
@@ -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              */
- 
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 49fe0da8589b..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+nlsupport.c
+++ /dev/null
@@ -1,160 +0,0 @@
---- ../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
-@@ -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)
- 
-@@ -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 @@
-     { "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+pipe.c b/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+pipe.c
deleted file mode 100644
index 4aa7b8af1a61..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+pipe.c
+++ /dev/null
@@ -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 )
- 	{			
diff --git a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+process.c b/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+process.c
deleted file mode 100644
index 50023576bec4..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+process.c
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+security.c b/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+security.c
deleted file mode 100644
index 0cc321dcd544..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+security.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../sal/osl/unx/security.c.orig	Sat Jul 20 22:53:31 2002
-+++ ../sal/osl/unx/security.c	Sat Jul 20 22:52:39 2002
-@@ -739,7 +739,7 @@
- 	}
- 
- 
--#elif (LINUX && (GLIBC >= 2))
-+#elif ((LINUX && (GLIBC >= 2)) || defined(FREEBSD))
- 	
- 	struct passwd	*pPasswd; 
- 	
diff --git a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+socket.c b/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+socket.c
deleted file mode 100644
index 9541cac8583f..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+socket.c
+++ /dev/null
@@ -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! */
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 8dc663ac03fc..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+system.c
+++ /dev/null
@@ -1,127 +0,0 @@
---- ../sal/osl/unx/system.c.orig	Sun Mar 17 12:34:13 2002
-+++ ../sal/osl/unx/system.c	Wed Apr  3 01:03:36 2002
-@@ -195,6 +195,73 @@
- }
- #endif
- 
-+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
-+           size_t buflen, struct passwd **result)
-+{
-+  struct passwd* res;
-+
-+  pthread_mutex_lock(&getrtl_mutex);
-+
-+  if ( res = getpwuid(uid) )
-+  {
-+    size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell;
-+
-+    pw_name = strlen(res->pw_name)+1;
-+    pw_passwd = strlen(res->pw_passwd)+1;
-+    pw_class = strlen(res->pw_class)+1;
-+    pw_gecos = strlen(res->pw_gecos)+1;
-+    pw_dir = strlen(res->pw_dir)+1;
-+    pw_shell = strlen(res->pw_shell)+1;
-+
-+    if (pw_name+pw_passwd+pw_class+pw_gecos
-+                                 +pw_dir+pw_shell < buflen)
-+    {
-+      memcpy(pwd, res, sizeof(struct passwd));
-+
-+      strncpy(buffer, res->pw_name, pw_name);
-+      pwd->pw_name = buffer;
-+      buffer += pw_name;
-+
-+      strncpy(buffer, res->pw_passwd, pw_passwd);
-+      pwd->pw_passwd = buffer;
-+      buffer += pw_passwd;
-+
-+      strncpy(buffer, res->pw_class, pw_class);
-+      pwd->pw_class = buffer;
-+      buffer += pw_class;
-+
-+      strncpy(buffer, res->pw_gecos, pw_gecos);
-+      pwd->pw_gecos = buffer;
-+      buffer += pw_gecos;
-+
-+      strncpy(buffer, res->pw_dir, pw_dir);
-+      pwd->pw_dir = buffer;
-+      buffer += pw_dir;
-+
-+      strncpy(buffer, res->pw_shell, pw_shell);
-+      pwd->pw_shell = buffer;
-+      buffer += pw_shell;
-+
-+      *result = pwd ;
-+      res = 0 ;
-+
-+    } else {
-+
-+      res = ENOMEM ;
-+
-+    }      
-+  
-+  } else {
-+
-+    res = errno ;
-+ 
-+  } 
-+
-+  pthread_mutex_unlock(&getrtl_mutex);
-+
-+  return res;
-+}
-+
- struct tm *localtime_r(const time_t *timep, struct tm *buffer)
- {
- 	struct tm* res;
-@@ -518,3 +585,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 c4e255952fc7..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+system.h
+++ /dev/null
@@ -1,35 +0,0 @@
---- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
-+++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
-@@ -205,6 +205,13 @@
- #   include <sys/ioctl.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 <machine/vmparam.h>
-+#   include <machine/pmap.h>
- #	include <sys/un.h>
- #   include <netinet/tcp.h>
- #	define 	IORESOURCE_TRANSFER_BSD 
-@@ -216,12 +223,13 @@
- #   elif BYTE_ORDER == PDP_ENDIAN
- #   	define _PDP_ENDIAN
- #   endif
--#   define  sched_yield() 				pthread_yield()
--#   define  pthread_testcancel()
- #	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
diff --git a/editors/openoffice.org-1.1-devel/files/patch-sal+textenc+tencinfo.c b/editors/openoffice.org-1.1-devel/files/patch-sal+textenc+tencinfo.c
deleted file mode 100644
index 7cf80c18d0a0..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-sal+textenc+tencinfo.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
-     /* 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 */
-+
-+    if (pMimeCharset == NULL)
-+	pMimeCharset = "usascii";
-+
-     static ImplStrCharsetDef const aVIPMimeCharsetTab[] =
-     {
-         { "usascii", RTL_TEXTENCODING_ASCII_US },
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 369935e31d66..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 May 15 14:11:20 2001
-+++ ../sal/workben/makefile.mk	Sun Mar 10 23:46:59 2002
-@@ -113,7 +113,7 @@
- 
- .IF "$(TESTAPP)" == "salstattest"
- 
--	CFLAGS+= /DUSE_SAL_STATIC
-+	CFLAGS+= -DUSE_SAL_STATIC
- 
- 	OBJFILES=	$(OBJ)$/salstattest.obj
- 
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- 
- CXXFILES=	tgetpwnam.cxx
- OBJFILES=	$(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,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+gcc2_freebsd_intel.map b/editors/openoffice.org-1.1-devel/files/patch-salhelper+source+gcc2_freebsd_intel.map
deleted file mode 100644
index 1ffacf889bc6..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-salhelper+source+gcc2_freebsd_intel.map
+++ /dev/null
@@ -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:
-+*;
-+};
diff --git a/editors/openoffice.org-1.1-devel/files/patch-salhelper+source+gcc3_freebsd_intel.map b/editors/openoffice.org-1.1-devel/files/patch-salhelper+source+gcc3_freebsd_intel.map
deleted file mode 100644
index 823cff316ec7..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-salhelper+source+gcc3_freebsd_intel.map
+++ /dev/null
@@ -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:
-+		*;
-+};
-+
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 3687664d8d16..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	Wed Nov 14 14:19:21 2001
-+++ ../salhelper/source/makefile.mk	Sun Mar  3 17:58:15 2002
-@@ -109,6 +109,10 @@
- SHL1VERSIONMAP=lngi.map
- .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
- SHL1VERSIONMAP=gcc3_linux_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
- .ENDIF
- 
- 
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 70f25048a24a..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-salhelper+test+rtti+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
- 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
- .ENDIF
- 
- 
diff --git a/editors/openoffice.org-1.1-devel/files/patch-sc+source+core+data+cell.cxx b/editors/openoffice.org-1.1-devel/files/patch-sc+source+core+data+cell.cxx
deleted file mode 100644
index 529f67a3e35f..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-sc+source+core+data+cell.cxx
+++ /dev/null
@@ -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>
diff --git a/editors/openoffice.org-1.1-devel/files/patch-scp+source+global+udk_base.scp b/editors/openoffice.org-1.1-devel/files/patch-scp+source+global+udk_base.scp
deleted file mode 100644
index 623eccb0ff09..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-scp+source+global+udk_base.scp
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1-devel/files/patch-scp+source+player+player.scp b/editors/openoffice.org-1.1-devel/files/patch-scp+source+player+player.scp
deleted file mode 100644
index 2f8daab35cdd..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-scp+source+player+player.scp
+++ /dev/null
@@ -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;
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 593e9eabf5bc..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-scptools+source+linker+searchcache
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: files/patch-scptools::source::linker::searchcache
-===================================================================
-RCS file: files/patch-scptools::source::linker::searchcache
-diff -N files/patch-scptools::source::linker::searchcache
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-scptools::source::linker::searchcache	4 Aug 2002 15:28:04 -0000
-@@ -0,0 +1,27 @@
-+--- ../scptools/source/linker/searchcache.hxx.orig	Fri Aug  2 22:53:46 2002
-++++ ../scptools/source/linker/searchcache.hxx	Fri Aug  2 22:54:50 2002
-+@@ -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	Fri Aug  2 22:53:35 2002
-++++ ../scptools/source/linker/searchcache.cxx	Fri Aug  2 22:55:14 2002
-+@@ -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-scptools+source+linker+ziplst.cxx b/editors/openoffice.org-1.1-devel/files/patch-scptools+source+linker+ziplst.cxx
deleted file mode 100644
index 83b84631542e..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-scptools+source+linker+ziplst.cxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice.org-1.1-devel/files/patch-setup2+inc+fields.hxx b/editors/openoffice.org-1.1-devel/files/patch-setup2+inc+fields.hxx
deleted file mode 100644
index d56e12f2abf4..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-setup2+inc+fields.hxx
+++ /dev/null
@@ -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[];
diff --git a/editors/openoffice.org-1.1-devel/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-1.1-devel/files/patch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 396c586ee3a3..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,30 +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"
- 
-@@ -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" \
diff --git a/editors/openoffice.org-1.1-devel/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-setup2+mow+source+loader+makefile.mk
deleted file mode 100644
index 5460e4296587..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-setup2+mow+source+loader+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice.org-1.1-devel/files/patch-setup2+patch+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-setup2+patch+makefile.mk
deleted file mode 100644
index 53846a8bdfc9..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-setup2+patch+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1-devel/files/patch-setup2+script+setupserver b/editors/openoffice.org-1.1-devel/files/patch-setup2+script+setupserver
deleted file mode 100644
index 450ea386c841..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-setup2+script+setupserver
+++ /dev/null
@@ -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`"
diff --git a/editors/openoffice.org-1.1-devel/files/patch-setup2+source+compiler+decltor.cxx b/editors/openoffice.org-1.1-devel/files/patch-setup2+source+compiler+decltor.cxx
deleted file mode 100644
index 98f6ad2f7567..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-setup2+source+compiler+decltor.cxx
+++ /dev/null
@@ -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";
diff --git a/editors/openoffice.org-1.1-devel/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx b/editors/openoffice.org-1.1-devel/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
deleted file mode 100644
index ac0b39a6aa47..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
+++ /dev/null
@@ -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) );
diff --git a/editors/openoffice.org-1.1-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-1.1-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
deleted file mode 100644
index f199b18823e1..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
+++ /dev/null
@@ -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
- 
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-shell+source+cmdmail+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-shell+source+cmdmail+makefile.mk
deleted file mode 100644
index 0476285c802e..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-shell+source+cmdmail+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-1.1-devel/files/patch-shell+source+proxysettings+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-shell+source+proxysettings+makefile.mk
deleted file mode 100644
index e83cf7c9d7a1..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-shell+source+proxysettings+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-1.1-devel/files/patch-shell+source+unix+exec+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-shell+source+unix+exec+makefile.mk
deleted file mode 100644
index 0b7712ee35f8..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-shell+source+unix+exec+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-1.1-devel/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-1.1-devel/files/patch-solenv+bin+addsym.awk
deleted file mode 100644
index 996e282b350b..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-solenv+bin+addsym.awk
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
-+++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
-@@ -72,11 +72,11 @@
- END {
-     if (state == 0) {
-         print "# Weak RTTI symbols for C++ exceptions:"
--        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
-+        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
-     }
- }
- state == 2 {
--    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
-+    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
-     state = 3
- }
- /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice.org-1.1-devel/files/patch-solenv+bin+mapgen.pl b/editors/openoffice.org-1.1-devel/files/patch-solenv+bin+mapgen.pl
deleted file mode 100644
index 71ebdb934120..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-solenv+bin+mapgen.pl
+++ /dev/null
@@ -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, $_);
- 	};
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-solenv+inc+tg_ext.mk b/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+tg_ext.mk
deleted file mode 100644
index 701692c9425a..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+tg_ext.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+tg_moz.mk b/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+tg_moz.mk
deleted file mode 100644
index 255a41f92281..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+tg_moz.mk
+++ /dev/null
@@ -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) $@
diff --git a/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index b4764485aa86..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,202 +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
-+# 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*=$(CC)
-+
-+# default linker flags
-+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -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
diff --git a/editors/openoffice.org-1.1-devel/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-soltools+checkdll+makefile.mk
deleted file mode 100644
index e6407402258a..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-soltools+checkdll+makefile.mk
+++ /dev/null
@@ -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
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-stlport+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-stlport+makefile.mk
deleted file mode 100644
index 797817ba85be..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-stlport+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+corereflection+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-stoc+source+corereflection+makefile.mk
deleted file mode 100644
index 4b319b08d401..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+corereflection+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+defaultregistry+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-stoc+source+defaultregistry+makefile.mk
deleted file mode 100644
index 4cae0476415a..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+defaultregistry+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+implementationregistration+implreg.cxx b/editors/openoffice.org-1.1-devel/files/patch-stoc+source+implementationregistration+implreg.cxx
deleted file mode 100644
index 341d621d872c..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+implementationregistration+implreg.cxx
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+implementationregistration+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-stoc+source+implementationregistration+makefile.mk
deleted file mode 100644
index 0051043b7ecb..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+implementationregistration+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+inspect+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-stoc+source+inspect+makefile.mk
deleted file mode 100644
index c7cd85253c11..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+inspect+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+invocation+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-stoc+source+invocation+makefile.mk
deleted file mode 100644
index 9ac2072a5612..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+invocation+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+invocation_adapterfactory+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
deleted file mode 100644
index 8853ad39a90e..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+javaloader+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-stoc+source+javaloader+makefile.mk
deleted file mode 100644
index cea499f15c57..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+javaloader+makefile.mk
+++ /dev/null
@@ -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=		
diff --git a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+javavm+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-stoc+source+javavm+makefile.mk
deleted file mode 100644
index b895a2b968d4..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+javavm+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+loader+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-stoc+source+loader+makefile.mk
deleted file mode 100644
index 5a08ee5937b6..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+loader+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+namingservice+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-stoc+source+namingservice+makefile.mk
deleted file mode 100644
index e573081bc21d..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+namingservice+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+proxy_factory+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-stoc+source+proxy_factory+makefile.mk
deleted file mode 100644
index 9110b2f50cd1..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+proxy_factory+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+registry_tdprovider+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-stoc+source+registry_tdprovider+makefile.mk
deleted file mode 100644
index 9d974d1c0d10..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+registry_tdprovider+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+servicemanager+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-stoc+source+servicemanager+makefile.mk
deleted file mode 100644
index 746776d54759..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+servicemanager+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+tdmanager+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-stoc+source+tdmanager+makefile.mk
deleted file mode 100644
index 76403fdde841..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+tdmanager+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+typeconv+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-stoc+source+typeconv+makefile.mk
deleted file mode 100644
index dc647f89a166..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+typeconv+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1-devel/files/patch-store+util+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-store+util+makefile.mk
deleted file mode 100644
index 6bef6e960f2e..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-store+util+makefile.mk
+++ /dev/null
@@ -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
- 
- 
diff --git a/editors/openoffice.org-1.1-devel/files/patch-svx+source+fmcomp+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-svx+source+fmcomp+makefile.mk
deleted file mode 100644
index b16030080c0d..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-svx+source+fmcomp+makefile.mk
+++ /dev/null
@@ -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= \
diff --git a/editors/openoffice.org-1.1-devel/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
deleted file mode 100644
index 3d7c2e22aa63..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
-+++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
-@@ -84,7 +84,9 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- APP1LIBS=
-+.IF "$(OS)"!="FREEBSD"
- APP1STDLIBS=-ldl
-+.ENDIF
- 
- GNOMEFILES= \
- 	locales.tab
diff --git a/editors/openoffice.org-1.1-devel/files/patch-tools+source+string+tstring.cxx b/editors/openoffice.org-1.1-devel/files/patch-tools+source+string+tstring.cxx
deleted file mode 100644
index 12bd6bd0b244..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-tools+source+string+tstring.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../tools/source/string/tstring.cxx.orig	Sat Aug 10 12:53:42 2002
-+++ ../tools/source/string/tstring.cxx	Sat Aug 10 12:54:16 2002
-@@ -103,6 +103,9 @@
- xub_StrLen ImplStringLen( const sal_Char* pStr )
- {
- 	const sal_Char* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
-@@ -113,6 +116,9 @@
- xub_StrLen ImplStringLen( const sal_Unicode* pStr )
- {
- 	const sal_Unicode* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
diff --git a/editors/openoffice.org-1.1-devel/files/patch-unoil+makefile.pmk b/editors/openoffice.org-1.1-devel/files/patch-unoil+makefile.pmk
deleted file mode 100644
index 7febdabf7b4b..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-unoil+makefile.pmk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../unoil/makefile.pmk.orig	Fri Aug 31 18:04:43 2001
-+++ ../unoil/makefile.pmk	Thu Sep 12 12:17:50 2002
-@@ -74,8 +74,8 @@
- JAVAFILESLIST	:= $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java)
- .ENDIF          # "$(L10N_framework)"==""
- 
--GENJAVAFILES	:= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
--GENCLASSFILES	:= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
-+GENJAVAFILES	+= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
-+GENCLASSFILES	+= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
- 
- # --- Targets ------------------------------------------------------
- 
diff --git a/editors/openoffice.org-1.1-devel/files/patch-unzip+source+file_io.c b/editors/openoffice.org-1.1-devel/files/patch-unzip+source+file_io.c
deleted file mode 100644
index 2f85a108c185..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-unzip+source+file_io.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../unzip/source/file_io.c.orig	Sat Oct 19 11:58:45 2002
-+++ ../unzip/source/file_io.c	Sat Oct 19 12:03:40 2002
-@@ -500,7 +500,7 @@
- #ifdef MPW
- 				pCallBack( 0 );
- #else
--				#if defined LINUX || defined MACOSX || defined NETBSD
-+				#if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD
- 				pCallBack( lseek(outfd, 0, SEEK_CUR) );
- 				#else
- 				pCallBack( tell( outfd ) );
-@@ -865,7 +865,9 @@
- 	static struct timeb tbp;
- #endif /* !__386BSD__ */
- #else /* !BSD */
-+#if (!defined(NETBSD) && !defined(FREEBSD))
- 	extern long timezone;
-+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
- #endif /* ?BSD */
- #endif /* ?AMIGA */
- 
diff --git a/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
deleted file mode 100644
index 41defbd5eb59..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
-+++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
-@@ -65,6 +65,8 @@
- #include <glyphcache.hxx>
- 
- #define Region XLIB_Region
-+typedef unsigned long CARD32;
-+#define Cursor CARD32
- #include <X11/extensions/Xrender.h>
- #undef Region
- 
diff --git a/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
deleted file mode 100644
index fefc925db41f..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
-@@ -78,6 +78,12 @@
- GETSTYLE_GNOME=getstyle-gnome-linux-intel
- HASGNOME2=TRUE
- .ENDIF
-+.IF "$_(HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
-+.ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
- HASGNOME2=TRUE
diff --git a/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
deleted file mode 100644
index 984313fc540a..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
-@@ -75,9 +75,15 @@
- 
- HASGNOME2=
- 
--.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
-+.IF "$(OS)$(CPU)"=="LINUXI"
- MSGBOX_GNOME=msgbox-gnome-linux-intel
- HASGNOME2=TRUE
-+.ENDIF
-+.IF "$(_HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+MSGBOX_GNOME=msgbox-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
- .ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- MSGBOX_GNOME=msgbox-gnome-solaris-sparc
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 07d9f1060557..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-vcl+workben+officeacceptthread.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/workben/officeacceptthread.cxx.orig	Wed Mar  5 20:25:36 2003
-+++ ../vcl/workben/officeacceptthread.cxx	Wed Mar  5 20:26:03 2003
-@@ -125,7 +125,7 @@
- #if defined (SOLARIS)
- 				int status;
- 				nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG);
--#elif defined(LINUX)
-+#elif defined(LINUX) || defined (FREEBSD)
- 				nRet = kill(aProcessInfo.Ident, 0);
- #endif
- #if defined (UNX)
diff --git a/editors/openoffice.org-1.1-devel/files/zipmoz.sh b/editors/openoffice.org-1.1-devel/files/zipmoz.sh
deleted file mode 100644
index 43a4591f3430..000000000000
--- a/editors/openoffice.org-1.1-devel/files/zipmoz.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/sh -f
-
-RUNTIME_FILES=" components/libabsyncsvc.so components/libaddrbook.so \
-		components/libmork.so components/libmozldap.so \
-		components/libnecko.so components/libprofile.so \
-		components/librdf.so components/libstrres.so \
-		components/libunicharutil.so components/libuconv.so \
-		components/libucvcn.so components/libucvibm.so \
-		components/libucvja.so components/libucvko.so \
-		components/libucvlatin.so components/libucvtw.so \
-		components/libucvtw2.so components/liburiloader.so \
-		components/libvcard.so components/libxpconnect.so \
-		components/libpref.so components/libchrome.so libmozjs.so \
-		libmsgbaseutil.so libldap50.so libnspr4.so libplc4.so \
-		libplds4.so libxpcom.so libmozz.so component.reg \
-		components/necko_dns.xpt components/xpcom_xpti.xpt \
-		components/xpcom_threads.xpt components/xpcom_io.xpt \
-		components/xpcom_ds.xpt components/xpcom_components.xpt \
-		components/xpcom_base.xpt components/xpti.dat \
-		defaults/pref/all.js defaults/pref/config.js \
-		defaults/pref/editor.js defaults/pref/initpref.js \
-		defaults/pref/inspector.js defaults/pref/mailnews.js \
-		defaults/pref/security-prefs.js defaults/pref/unix.js \
-		defaults/pref/xpinstall.js"
-
-LIB_FILES="	lib/libembed_base_s.a lib/libmozreg_s.a \
-		lib/libnspr4.so lib/libxpcom.so lib/libprldap50.so"
-
-INC_FILES="include/"
-INC_FILES2="public/"
-
-if [ $# -lt 2 -o $# -gt 3 ] ; then
-	echo 
-	echo usage: $0 mozilla_dist target [target_dir]
-	echo
-	echo where:
-	echo
-	echo "mozilla_dist points to the mozilla distribution"
-	echo "target concatenates  OS, compiler and CPU (e.g. FREEBSDGCCI etc)"
-	echo "target_dir is the directory to place the zips"
-	exit 1
-fi
-
-MOZ_DIST=$1
-TARGET=$2
-if [ "w$3" != "w" ]; then
-	TARGET_DIR=$3
-else
-	if [ "w$TARGET_DIR" == "w" ]; then
-		TARGET_DIR=
-	fi
-fi
-
-ZIP_TARGET=$TARGET_DIR
-if [ -z "$ZIP_TARGET" ] ; then
-	ZIP_TARGET=../
-fi
-
-# just to remember the current working directory
-STARTING_DIR=`pwd`
-
-echo
-echo --- creating zips for $TARGET, using mozilla distribution in $MOZ_DIST
-
-# Create the directories
-[ ! -d $TARGET_DIR/$TARGET/runtime ] && mkdir -p $TARGET_DIR/$TARGET/runtime
-[ ! -d $TARGET_DIR/$TARGET/runtime/components ] && mkdir -p $TARGET_DIR/$TARGET/runtime/components
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults/pref ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults/pref
-[ ! -d $TARGET_DIR/$TARGET/lib ] && mkdir -p $TARGET_DIR/$TARGET/lib
-[ ! -d $TARGET_DIR/$TARGET/inc ] && mkdir -p $TARGET_DIR/$TARGET/inc
-[ ! -d $TARGET_DIR/$TARGET/inc/nspr ] && mkdir -p $TARGET_DIR/$TARGET/inc/nspr
-[ ! -d $TARGET_DIR/$TARGET/inc/obsolete ] && mkdir -p $TARGET_DIR/$TARGET/inc/obsolete
-
-# Copy the files
-echo
-echo --- copying files
-echo
-
-for i in $RUNTIME_FILES; do
-	if [ ! -f $MOZ_DIST/bin/$i ]; then
-		echo $MOZ_DIST/bin/$i does not exist, check your distribution
-	else
-		if [ `echo $i | grep component` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/components/
-		elif [ `echo $i | grep defaults` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/defaults/pref/
-		else
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/
-		fi
-	fi
-done
-
-for i in $LIB_FILES; do
-	if [ ! -f $MOZ_DIST/$i ]; then
-		echo $MOZ_DIST/$i does not exist, check your distribution
-	else
-		cp -R -L $MOZ_DIST/$i $TARGET_DIR/$TARGET/lib/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES`; do
-	if [ ! -d $i ]; then 
-		cp -R -L $MOZ_DIST/include/$i $TARGET_DIR/$TARGET/inc/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES2`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/public/$i $TARGET_DIR/$TARGET/inc
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/$i $TARGET_DIR/$TARGET/inc/nspr
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr/obsolete`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/obsolete/$i $TARGET_DIR/$TARGET/inc/obsolete
-	fi
-done
-
-# delete old zips
-
-[ -f $TARGET_DIR/$TARGET/runtime.zip ] && rm -f $TARGET_DIR/$TARGET/runtime.zip
-[ -f $TARGET_DIR/$TARGET/lib.zip ] && rm -f $TARGET_DIR/$TARGET/lib.zip
-[ -f $TARGET_DIR/$TARGET/inc.zip ] && rm -f $TARGET_DIR/$TARGET/inc.zip
-
-# zip the runtime files
-
-echo
-echo --- creating ${TARGET}runtime.zip
-echo
-
-cd $TARGET_DIR/$TARGET/runtime
-find . -type f | zip $ZIP_TARGET/${TARGET}runtime.zip -@
-
-# zip the lib files
-echo 
-echo --- creating ${TARGET}lib.zip
-echo 
-
-cd $TARGET_DIR/$TARGET/lib
-find . -type f | zip $ZIP_TARGET/${TARGET}lib.zip -@
-
-# zip the inc files
-echo
-echo --- creating ${TARGET}inc.zip
-echo
-
-cd $TARGET_DIR/$TARGET/inc
-find . -type f | zip $ZIP_TARGET/${TARGET}inc.zip -@
-
-# remove dirs
-cd $STARTING_DIR
-rm -rf $TARGET_DIR/$TARGET
-
-echo
-echo --- done
-echo
-
diff --git a/editors/openoffice.org-1.1-devel/pkg-descr b/editors/openoffice.org-1.1-devel/pkg-descr
deleted file mode 100644
index 31fd1b12161a..000000000000
--- a/editors/openoffice.org-1.1-devel/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-OpenOffice.org is an Open Source, community-developed, multi-platform office
-productivity suite. It includes the key desktop applications, such as a
-word processor, spreadsheet, presentation manager, and drawing program,
-with a user interface and feature set similar to other office suites.
-
-Components include:
-  * A universal word processing application for creating business
-    letters, extensive text documents, professional layouts, and HTML
-    documents.
-  * A sophisticated application for performing advanced spreadsheet
-    functions, such as analyzing figures, creating lists, and viewing data.
-  * A tool for creating effective eye-catching presentations.
-  * A vector-oriented draw module that enables the creation of 3D
-    illustrations
diff --git a/editors/openoffice.org-1.1-devel/pkg-message b/editors/openoffice.org-1.1-devel/pkg-message
deleted file mode 100644
index 1dc749f301c2..000000000000
--- a/editors/openoffice.org-1.1-devel/pkg-message
+++ /dev/null
@@ -1,73 +0,0 @@
-OpenOffice.org Build 643 Personal Install How-To
-
-Written by:	Martin Blapp <mbr@freebsd.org>
-
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
-
-1 User installation
--------------------
-
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
---------------
-
-There are some wrappers installed for fast startup.
-Add "${PREFIX}/bin/" to your PATH and you will be able
-to use them.
-
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
-
-If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
-version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
diff --git a/editors/openoffice.org-1.1-devel/pkg-plist b/editors/openoffice.org-1.1-devel/pkg-plist
deleted file mode 100644
index 28bd78453b52..000000000000
--- a/editors/openoffice.org-1.1-devel/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, do not delete. Package list is generated automatically.
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
deleted file mode 100644
index 6f740924c399..000000000000
--- a/editors/openoffice.org-1.1/Makefile
+++ /dev/null
@@ -1,580 +0,0 @@
-# New ports collection makefile for: OpenOffice
-# Date created:		28 Februar 2002
-# Whom:                 Martin Blapp
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openoffice
-PORTVERSION=	644
-CATEGORIES+=	editors
-MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
-		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
-		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
-		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ny1.mirror.openoffice.org/miscellaneous/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
-MASTER_SITE_SUBDIR=	${PORTVERSION}
-DISTFILES+=	oo_${PORTVERSION}_src.tar.bz2 \
-		gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
-
-BROKEN=		"Does not build"
-
-SORT?=	/usr/bin/sort
-FIND?=	/usr/bin/find
-CUT?=	/usr/bin/cut
-AWK?=	/usr/bin/awk
-GREP?=	/usr/bin/grep
-ZIP?=	${PREFIX}/bin/zip
-UNZIP?=	${PREFIX}/bin/unzip
-ANT?=	${LOCALBASE}/bin/ant
-TCSH?=	/bin/tcsh
-PASTE?=	/usr/bin/paste
-
-.include <bsd.port.pre.mk>
-
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
-DIST_SUBDIR=		openoffice
-DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
-
-#
-# configuration for language specific slave ports
-#
-.if !defined(LANG_EXT)
-LANG_EXT=01
-.else
-#
-# Add pkg-descr and pkg-message if available
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-#
-# LANG_CONFIGURE_ARG is missing for the german port
-#
-.if defined(LANG_EXT)
-CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG},ENUS
-.endif
-.endif
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
-
-EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-
-MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/jakarta-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-.if !defined(DISPLAY)
-BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
-.endif
-.if !defined(WITH_BSD_JDK)
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk14
-.else
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-.endif
-
-USE_PERL5=	yes
-USE_BZIP2=	yes
-USE_BISON=	yes
-USE_GMAKE=	yes
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
-.if !defined(WITH_BSD_JDK)
-JDKDIR?=	${LOCALBASE}/linux-sun-jdk1.4.1
-.else
-JDKDIR?=	${LOCALBASE}/jdk1.4.1
-.endif
-JAVAVM=         ${JDKDIR}/bin/java
-
-GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
-LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
-BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
-
-.if !defined(DISPLAY)
-DISPLAYHACK=localhost:1001
-.endif
-
-CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
-			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
-
-.if !defined(WITH_BSD_JDK)
-CONFIGURE_ARGS+=	--enable-linuxjdk=yes
-.endif
-
-.if defined(WITH_DEBUG)
-.if ${WITH_DEBUG} == 2
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-.endif
-
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"prefered language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
-	@${ECHO} "OPTIONS:"
-.if !defined(USE_GCC)
-	@${ECHO}
-	@${ECHO} "You can compile OO with different"
-	@${ECHO} "gcc compiler versions:"
-	@${ECHO}
-	@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.2"
-	@${ECHO} "to compile openoffice with your"
-	@${ECHO} "prefered compiler."
-.endif
-.if !defined(WITH_BSD_JDK)
-	@${ECHO}
-	@${ECHO} "If you like to use the native BSD"
-	@${ECHO} "JDK for the build system, you can use"
-	@${ECHO} "WITH_BSD_JDK=TRUE to disable the"
-	@${ECHO} "usage of the linux-JDK and linux dependency."
-	@${ECHO}
-.endif
-.if !defined(WITH_DEBUG)
-	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
-	@${ECHO} "if you call make with WITH_DEBUG=1"
-	@${ECHO}
-	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
-	@${ECHO}
-.endif
-.if !defined(WITH_TTF_BYTECODE_ENABLED)
-	@${ECHO}
-	@${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES"
-	@${ECHO} "if you like to use the Freetype library to"
-	@${ECHO} "render TTF fonts. Normally the TTF lib is"
-	@${ECHO} "not used to render fonts."
-	@${ECHO}
-	@${ECHO} "If you have licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479"
-	@${ECHO} "you can enable this option to get better"
-	@${ECHO} "quality of glyphs at small bitmap sizes."
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 450002
-	@${ECHO}
-	@${ECHO} "OS-VERSION ${OSVERSION} too low"
-	@${ECHO}
-	@${ECHO} "OO need some important libc_r and"
-	@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
-	@${ECHO} "RELEASE or 4.6 STABLE."
-	@${FALSE}
-.endif
-	@${ECHO}
-	@${ECHO} "NOTICE:"
-	@${ECHO}
-	@${ECHO} "To build Openoffice, you should have a lot"
-.if defined(WITH_DEBUG)
-	@${ECHO} "of free diskspace (~ 8GB)."
-.else
-	@${ECHO} "of free diskspace (~ 4GB)."
-.endif
-	@${ECHO}
-.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
-    (${OSVERSION} < 500000 && !defined(USE_GCC))
-	@${ECHO} "KERNEL CONFIGURATION:"
-	@${ECHO}
-	@${ECHO} "Openoffice needs a larger stack- and"
-	@${ECHO} "datasize to build. Check your limit"
-	@${ECHO} "settings and and put this in /boot/loader.conf"
-	@${ECHO} "if neccessary:"
-	@${ECHO}
-	@${ECHO} "kern.maxdsiz=\"1073741824\""
-	@${ECHO} "kern.maxssiz=\"268435456\""
-.endif
-	@${ECHO}
-.if ${OSVERSION} < 460002
-	@${ECHO} "REQUIRED SYSTEM PATCHES:"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO} "OO.org can crash if you enter a non existing path"
-	@${ECHO} "or URL in the location bar. To fix these crashes"
-	@${ECHO} "you need a uncommitted system patch for rtld:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460001
-	@${ECHO}
-	@${ECHO} "OO setup is broken on STABLE < 4.6"
-	@${ECHO} "including 4.6 RELEASE."
-	@${ECHO} "You'll need a system patch to solve"
-	@${ECHO} "this problem:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460002
-	@${ECHO}
-	@${ECHO} "OO.org soffice binary can deadlock. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO}
-	@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
-	@${ECHO}
-.endif
-.if !exists(/usr/include/langinfo.h)
-	@${ECHO}
-	@${ECHO} "langinfo.h is missing !"
-	@${ECHO}
-	@${ECHO} "Please upgrade to 4.6 RELEASE or"
-	@${ECHO} "4.6 STABLE."
-	@${ECHO}
-	@${FALSE}
-.endif
-
-post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
-	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
-	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@-${RM} -f ${WRKSRC}/../moz/zipped/*.zip
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
-.if defined(L10NHELP)
-	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
-	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
-.endif
-
-post-patch:
-	@${MAKE} patch-mozilla
-.if defined(WITH_TTF_BYTECODE_ENABLED)
-	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
-		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-			${ECHO_MSG} "===>   Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \
-		fi; \
-		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
-	fi
-.endif
-.if defined(WITH_DEBUG)
-	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
-		PATCHES_APPLIED="" ; \
-		for i in ${PATCHDIR}/debugpatch-*; do \
-			case $$i in \
-				*.orig|*.rej|*~) \
-					${ECHO_MSG} "===>   Ignoring patchfile $$i" ; \
-					;; \
-				*) \
-					if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-						${ECHO_MSG} "===>   Applying ${OPSYS} patch $$i" ; \
-					fi; \
-					if ${PATCH} ${PATCH_ARGS} < $$i ; then \
-						PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
-					else \
-						${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
-						if [ x"$$PATCHES_APPLIED" != x"" ]; then \
-							${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
-						fi; \
-						${FALSE} ; \
-					fi; \
-					;; \
-			esac; \
-		done; \
-	fi;
-.endif
-	@${ECHO_MSG} "===>  Find old malloc.h defines and fix them in ${PKGNAME} source"
-	@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
-		${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
-
-extract-mozilla:
-.if ! exists(${WRKDIR}/mozilla/Makefile)
-	@${ECHO_MSG} "===>  Extracting mozilla sub project"
-	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
-.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment)
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
-.endif
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
-.endif
-	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
-
-patch-mozilla:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
-		${WRKDIR}/mozilla/files/
-	@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
-
-build-mozilla:
-.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
-	@${ECHO_MSG} "===>  Building mozilla sub project"
-.if defined(WITH_DEBUG)
-	@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
-	@${SED} -e 's|--disable-debug||' \
-		-e 's|--disable-cpp-rtti||' \
-		-e 's|--enable-strip||' \
-		< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
-.endif
-.if defined(USE_GCC)
-	@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
-.else
-	@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
-.endif
-	@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
-	@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
-	@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
-.endif
-
-install-mozilla:
-	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
-
-register-mozilla:
-.if exists(${WRKDIR}/mozilla-runtime)
-	@${RM} -rf ${WRKDIR}/mozilla-runtime
-.endif
-	@${MKDIR} ${WRKDIR}/mozilla-runtime
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
-	@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
-	@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
-	@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
-		&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom 
-	@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
-		${WRKDIR}/mozilla-runtime/components/xptitemp.dat
-	@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
-	@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
-		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
-
-mozilla:
-	@${MAKE} extract-mozilla
-	@${MAKE} patch-mozilla
-	@${MAKE} build-mozilla
-	@${MAKE} register-mozilla
-	@${MAKE} install-mozilla
-
-do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
-	@${MAKE} mozilla
-.endif
-.endif
-.endif
-.if exists(${WRKDIR}/.Xvfb.pid)
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.endif
-.if !defined(DISPLAY)
-	#
-	# This is a UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-.endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
-	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-.endif
-.if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
-.endif
-
-pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-
-do-install:
-.if !defined(DISPLAY)
-	#
-	# UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-.endif
-
-install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
-
-post-install:
-	@${ECHO_MSG} "===>  Add wrapper scripts";
-	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
-	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
-
-package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
-.if defined(LANG_SUFFIX)
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
-.else
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
-.endif
-
-update:
-	@${MAKE} fetch
-	@${MAKE} extract
-	@cd ${WRKSRC}/.. && for dir in *; do \
-	    if [ -d $$dir ]; then \
-		cd $$dir; cvs update -d; cd ..; \
-	    fi \
-	done
-
-.include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-1.1/distinfo b/editors/openoffice.org-1.1/distinfo
deleted file mode 100644
index ec9d6788f104..000000000000
--- a/editors/openoffice.org-1.1/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
-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
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
diff --git a/editors/openoffice.org-1.1/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-1.1/files/debugpatch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 96c651ce22c8..000000000000
--- a/editors/openoffice.org-1.1/files/debugpatch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../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
-@@ -902,6 +902,7 @@
- 
- void KillSetupDir()
- {
-+#if 0
-     DIR* pDir = opendir( strTmpPath );
-     struct dirent* pFile;
- 
-@@ -915,6 +916,10 @@
- 
-     chdir( strInitPath );
-     rmdir( strTmpPath );
-+#else
-+	fprintf(stderr, "\nLeaving behind temporary directory: %s\n",
-+	strTmpPath);
-+#endif
- }
- 
- void makeSymLink( char* s )
diff --git a/editors/openoffice.org-1.1/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-1.1/files/debugpatch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 52bd2b3d58d6..000000000000
--- a/editors/openoffice.org-1.1/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
-+++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
- 
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- 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
- 
- # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
diff --git a/editors/openoffice.org-1.1/files/oo_setup.resp b/editors/openoffice.org-1.1/files/oo_setup.resp
deleted file mode 100644
index 8eeeb11bd95e..000000000000
--- a/editors/openoffice.org-1.1/files/oo_setup.resp
+++ /dev/null
@@ -1,7 +0,0 @@
-[Environment]
-InstallationMode = INSTALL_NETWORK
-InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org-643
-
-[Java]
-JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-1.1/files/openoffice-wrapper b/editors/openoffice.org-1.1/files/openoffice-wrapper
deleted file mode 100644
index e780a65aeeba..000000000000
--- a/editors/openoffice.org-1.1/files/openoffice-wrapper
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1/files/Attic/openoffice-wrapper,v 1.3 2003-03-05 23:24:05 mbr Exp $
-
-oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/
-program=`echo $0 | sed -e 's|.*-||'`
-
-if [ ! $LANG ]; then
-	export LANG=%%LANG%%
-fi
-
-case $program in
-$0)
-	exec $oopath/soffice "$@"
-	;;
-	*)
-	exec $oopath/$program "$@"
-	;;
-esac
diff --git a/editors/openoffice.org-1.1/files/optpatch-freetype+patch b/editors/openoffice.org-1.1/files/optpatch-freetype+patch
deleted file mode 100644
index b426a8fb7fcc..000000000000
--- a/editors/openoffice.org-1.1/files/optpatch-freetype+patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Index: files/patch-freetype::patch
-===================================================================
-RCS file: files/patch-freetype::patch
-diff -N files/patch-freetype::patch
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-freetype::patch	4 Aug 2002 15:27:42 -0000
-@@ -0,0 +1,201 @@
-+diff -ur ../freetype/freetype-2.0.5.patch oo641d_patched/freetype/freetype-2.0.5.patch
-+--- ../freetype/freetype-2.0.5.patch	Fri Apr  5 21:07:34 2002
-++++ ../freetype/freetype-2.0.5.patch	Sat Mar  9 18:04:17 2002
-+@@ -1,118 +1,79 @@
-+-*** misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 14 00:44:33 2000
-+---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 63,69 ****
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+---- 63,69 ----
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+-*** misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Jun  7 19:36:17 2001
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 631,637 ****
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+---- 631,637 ----
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile -DPIC $pic_flag"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Mon Jan  1 18:25:21 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 1,7 ****
-+---- 1,9 ----
-+-  FT_USE_MODULE(autohint_module_class)
-+-  FT_USE_MODULE(cff_driver_class)
-+-  FT_USE_MODULE(t1cid_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(pcf_driver_class)
-+-+ */
-+-  FT_USE_MODULE(psaux_module_class)
-+-  FT_USE_MODULE(psnames_module_class)
-+-  FT_USE_MODULE(ft_raster1_renderer_class)
-+-***************
-+-*** 9,12 ****
-+---- 11,16 ----
-+-  FT_USE_MODULE(ft_smooth_renderer_class)
-+-  FT_USE_MODULE(tt_driver_class)
-+-  FT_USE_MODULE(t1_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(winfnt_driver_class)
-+-+ */
-+-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h	Tue Aug 21 10:50:45 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 70,76 ****
-+---- 70,79 ----
-+-    /*   All convenience functions are declared as such in their             */
-+-    /*   documentation.                                                      */
-+-    /*                                                                       */
-+-+ /*
-+-  #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-+ */
-+-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-  
-+-  
-+-    /*************************************************************************/
-+-***************
-+-*** 108,116 ****
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-- 
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+---- 111,121 ----
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-+ /*
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-+ */
-+-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig	Mon Jan  7 14:21:35 2002
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Mon Jan  7 14:21:40 2002
-+-***************
-+-*** 2251,2257 ****
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age + 1`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-+---- 2251,2257 ----
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk
-++--- misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:49:17 2001
-++@@ -63,7 +63,7 @@
-++ #   ANSI compliance.
-++ #
-++ ifndef CFLAGS
-++-  CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+++  CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-++ endif
-++ 
-++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh
-++--- misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:47:56 2001
-+++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:49:17 2001
-++@@ -631,7 +631,7 @@
-++     if test "$build_old_libs" = yes; then
-++       if test "$pic_mode" != yes; then
-++ 	# Don't build PIC code
-++-	command="$base_compile $srcfile"
-+++	command="$base_compile $srcfile -DPIC $pic_flag"
-++       else
-++ 	# All platforms use -DPIC, to notify preprocessed assembler code.
-++ 	command="$base_compile $srcfile $pic_flag -DPIC"
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:49:17 2001
-++@@ -1,7 +1,9 @@
-++ FT_USE_MODULE(autohint_module_class)
-++ FT_USE_MODULE(cff_driver_class)
-++ FT_USE_MODULE(t1cid_driver_class)
-+++/*
-++ FT_USE_MODULE(pcf_driver_class)
-+++*/
-++ FT_USE_MODULE(psaux_module_class)
-++ FT_USE_MODULE(psnames_module_class)
-++ FT_USE_MODULE(ft_raster1_renderer_class)
-++@@ -9,4 +11,6 @@
-++ FT_USE_MODULE(ft_smooth_renderer_class)
-++ FT_USE_MODULE(tt_driver_class)
-++ FT_USE_MODULE(t1_driver_class)
-+++/*
-++ FT_USE_MODULE(winfnt_driver_class)
-+++*/
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:51:15 2001
-++@@ -70,7 +70,10 @@
-++   /*   All convenience functions are declared as such in their             */
-++   /*   documentation.                                                      */
-++   /*                                                                       */
-+++/*
-++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+++*/
-+++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-++ 
-++ 
-++   /*************************************************************************/
-++@@ -108,8 +111,10 @@
-++   /*   use a vector `plotter' format that isn't supported when this        */
-++   /*   macro is undefined.                                                 */
-++   /*                                                                       */
-+++/*
-++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++-
-+++*/
-+++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++ 
-++   /*************************************************************************/
-++   /*                                                                       */
-++@@ -338,7 +343,7 @@
-++   /* By undefining this, you will only compile the code necessary to load  */
-++   /* TrueType glyphs without hinting.                                      */
-++   /*                                                                       */
-++-#undef  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-+++#define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-++ 
-++ 
-++   /*************************************************************************/
diff --git a/editors/openoffice.org-1.1/files/optpatch-vcl+util+makefile.pmk b/editors/openoffice.org-1.1/files/optpatch-vcl+util+makefile.pmk
deleted file mode 100644
index 41341ff0b4e8..000000000000
--- a/editors/openoffice.org-1.1/files/optpatch-vcl+util+makefile.pmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/util/makefile.pmk.orig	Mon Aug  5 01:39:41 2002
-+++ ../vcl/util/makefile.pmk	Mon Aug  5 01:40:03 2002
-@@ -64,7 +64,7 @@
- PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch
- PDBTARGET=vcl
- 
--.IF "$(OS)" != "MACOSX"
-+.IF "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- .IF "$(remote)" != ""
- USE_BUILTIN_RASTERIZER=true
- .ENDIF
diff --git a/editors/openoffice.org-1.1/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-1.1/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 078685f3b516..000000000000
--- a/editors/openoffice.org-1.1/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../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 freebsd genunix";;
-  	*)		JINCSUBDIRS="genunix";;
-  	esac
-  
diff --git a/editors/openoffice.org-1.1/files/patch-bridges+prj+build.lst b/editors/openoffice.org-1.1/files/patch-bridges+prj+build.lst
deleted file mode 100644
index fee3d847c5e6..000000000000
--- a/editors/openoffice.org-1.1/files/patch-bridges+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
deleted file mode 100644
index 99b8c566fb61..000000000000
--- a/editors/openoffice.org-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ /dev/null
@@ -1,102 +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 );
-+    }
- }
- 
- }
diff --git a/editors/openoffice.org-1.1/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice.org-1.1/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
deleted file mode 100644
index 4622b7fe21c4..000000000000
--- a/editors/openoffice.org-1.1/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-1.1/files/patch-comphelper+util+makefile.mk b/editors/openoffice.org-1.1/files/patch-comphelper+util+makefile.mk
deleted file mode 100644
index f2d3092c2ddf..000000000000
--- a/editors/openoffice.org-1.1/files/patch-comphelper+util+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-1.1/files/patch-config_office+configure.in b/editors/openoffice.org-1.1/files/patch-config_office+configure.in
deleted file mode 100644
index a45332fcbec0..000000000000
--- a/editors/openoffice.org-1.1/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,66 +0,0 @@
---- configure.in.orig	Thu Feb 20 15:49:32 2003
-+++ configure.in	Wed Mar  5 21:22:34 2003
-@@ -95,6 +95,12 @@
-                           
-                           Usage: --enable-macos9
- ],,)
-+AC_ARG_ENABLE(linuxjdk,
-+[  --enable-linuxjdk         Use this option option if you like to use
-+                          the linux-jdk instead of the native jdk.
-+
-+                          Usage: --enable-linuxjdk
-+],,)
- AC_ARG_WITH(lang,
- [  --with-lang             Use this option to build OpenOffice.org with
-                           additional language support. US English is always
-@@ -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
-@@ -1232,7 +1249,11 @@
- if test -n "$enable_debug"; then
-    ENABLE_DEBUG="TRUE"
- else
--   ENABLE_DEBUG="FALSE"
-+fi
-+if test -n "$enable_linuxjdk"; then
-+   USE_LINUXJDK="TRUE"
-+else
-+   USE_LINUXJDK="FALSE"
- fi
- 
- dnl ===================================================================
-@@ -1278,6 +1299,7 @@
- AC_SUBST(PTHREAD_CFLAGS)
- AC_SUBST(PTHREAD_LIBS)
- AC_SUBST(ENABLE_DEBUG)
-+AC_SUBST(USE_LINUXJDK)
- 
- AC_OUTPUT([set_soenv])
- 
diff --git a/editors/openoffice.org-1.1/files/patch-config_office+set_soenv.in b/editors/openoffice.org-1.1/files/patch-config_office+set_soenv.in
deleted file mode 100644
index 9ea6b11bdab2..000000000000
--- a/editors/openoffice.org-1.1/files/patch-config_office+set_soenv.in
+++ /dev/null
@@ -1,44 +0,0 @@
---- set_soenv.in.orig	Thu Feb 27 15:12:36 2003
-+++ set_soenv.in	Wed Mar  5 21:16:43 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, 
-@@ -88,7 +88,7 @@
-      $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
-      $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS,
-      $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
--     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG );
-+     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $USE_LINUXJDK );
- #
- #-------------------------------------------
- # IId. Declaring the aliases.
-@@ -140,7 +140,8 @@
- $CC			= '@CC@';           # C compiler
- $CXX		= '@CXX@';          # C++ compiler
- $EXCEPTIONS	= '@EXCEPTIONS@';   # Exception handling type
--$ENABLE_DEBUG	= '@ENABLE_DEBUG@';  # Enable a debug build
-+$ENABLE_DEBUG	= '@ENABLE_DEBUG@'; # Enable a debug build
-+$USE_LINUXJDK	= '@USE_LINUXJDK@'; # Use the Linux JDK
- $WRAPCMD	= "";				# Wrapper (only for winnt)
- 
- #
-@@ -1265,7 +1266,12 @@
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
- }
- elsif ($platform eq "$FreeBSD")
--{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+{
-+   if ($USE_LINUXJDK eq "TRUE") {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
-+   } else {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+   }
- }
- elsif ($platform eq "$NetBSD")
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
diff --git a/editors/openoffice.org-1.1/files/patch-connectivity+source+drivers+mozab+makefile.mk b/editors/openoffice.org-1.1/files/patch-connectivity+source+drivers+mozab+makefile.mk
deleted file mode 100644
index 2b83f2cd2ec7..000000000000
--- a/editors/openoffice.org-1.1/files/patch-connectivity+source+drivers+mozab+makefile.mk
+++ /dev/null
@@ -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)					\
diff --git a/editors/openoffice.org-1.1/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-1.1/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
deleted file mode 100644
index 3601766ee561..000000000000
--- a/editors/openoffice.org-1.1/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../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
-@@ -64,8 +64,8 @@
- #mozilla specific stuff.
- MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
- MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
--#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
--#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
-+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
-+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
- #End of mozilla specific stuff.
- 
- PRJ=..$/..$/..$/..
-@@ -107,7 +107,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -123,7 +123,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -141,7 +141,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS+=	    -DMOZILLA_CLIENT \
-             -DOSTYPE=\"Linux2.2.14-5\" -DOJI
- .IF "$(OS)" == "LINUX"
-@@ -157,6 +157,13 @@
-             -fno-rtti -Wall -Wconversion -Wpointer-arith \
-             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-             -Wno-long-long 
-+CDEFS     += -DTRACING
-+.ELIF "$(OS)" == "FREEBSD"
-+CFLAGS +=   -fPIC
-+CFLAGSCXX += \
-+            -fno-rtti -Wall -Wconversion -Wpointer-arith \
-+            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-+            -Wno-long-long -pthread 
- CDEFS     += -DTRACING
- .ENDIF
- .ENDIF
diff --git a/editors/openoffice.org-1.1/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk b/editors/openoffice.org-1.1/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
deleted file mode 100644
index b63d2a25f184..000000000000
--- a/editors/openoffice.org-1.1/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-1.1/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-1.1/files/patch-cppu+inc+uno+lbnames.h
deleted file mode 100644
index cb43c2d165e9..000000000000
--- a/editors/openoffice.org-1.1/files/patch-cppu+inc+uno+lbnames.h
+++ /dev/null
@@ -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."
diff --git a/editors/openoffice.org-1.1/files/patch-cppu+prj+build.lst b/editors/openoffice.org-1.1/files/patch-cppu+prj+build.lst
deleted file mode 100644
index 78fd210a1193..000000000000
--- a/editors/openoffice.org-1.1/files/patch-cppu+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-1.1/files/patch-cppuhelper+source+makefile.mk
deleted file mode 100644
index 5fb5bd636eb1..000000000000
--- a/editors/openoffice.org-1.1/files/patch-cppuhelper+source+makefile.mk
+++ /dev/null
@@ -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 ------------------------------------------------------
diff --git a/editors/openoffice.org-1.1/files/patch-desktop+source+pkgchk+pkgchk_misc.h b/editors/openoffice.org-1.1/files/patch-desktop+source+pkgchk+pkgchk_misc.h
deleted file mode 100644
index 391667b66ebd..000000000000
--- a/editors/openoffice.org-1.1/files/patch-desktop+source+pkgchk+pkgchk_misc.h
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1/files/patch-desktop+util+makefile.mk b/editors/openoffice.org-1.1/files/patch-desktop+util+makefile.mk
deleted file mode 100644
index 025d644a8077..000000000000
--- a/editors/openoffice.org-1.1/files/patch-desktop+util+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1/files/patch-dtrans+source+X11+makefile.mk b/editors/openoffice.org-1.1/files/patch-dtrans+source+X11+makefile.mk
deleted file mode 100644
index 5881f5d7f6a5..000000000000
--- a/editors/openoffice.org-1.1/files/patch-dtrans+source+X11+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice.org-1.1/files/patch-eventattacher+source+makefile.mk b/editors/openoffice.org-1.1/files/patch-eventattacher+source+makefile.mk
deleted file mode 100644
index 4552698eb132..000000000000
--- a/editors/openoffice.org-1.1/files/patch-eventattacher+source+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-1.1/files/patch-external+gcc3_specific+makefile.mk b/editors/openoffice.org-1.1/files/patch-external+gcc3_specific+makefile.mk
deleted file mode 100644
index 6b8071f4030e..000000000000
--- a/editors/openoffice.org-1.1/files/patch-external+gcc3_specific+makefile.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../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"
- 
- .IF "$(OS)"!="MACOSX"
-+.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 @@
-         -rm -f $@
-         +ln -s libgcc_s.so.1 $@
- 
-+.ENDIF 
- .ENDIF 
- 
- .ENDIF
diff --git a/editors/openoffice.org-1.1/files/patch-freetype+makefile.mk b/editors/openoffice.org-1.1/files/patch-freetype+makefile.mk
deleted file mode 100644
index 3e5a8dd19f18..000000000000
--- a/editors/openoffice.org-1.1/files/patch-freetype+makefile.mk
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-1.1/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-1.1/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice.org-1.1/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
- 
- /* 
diff --git a/editors/openoffice.org-1.1/files/patch-javaunohelper+source+makefile.mk b/editors/openoffice.org-1.1/files/patch-javaunohelper+source+makefile.mk
deleted file mode 100644
index 19f6b86e5ab5..000000000000
--- a/editors/openoffice.org-1.1/files/patch-javaunohelper+source+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice.org-1.1/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice.org-1.1/files/patch-jni_uno+jni_java2uno.cxx
deleted file mode 100644
index a9ff9e3fed88..000000000000
--- a/editors/openoffice.org-1.1/files/patch-jni_uno+jni_java2uno.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-1.1/files/patch-nas+nas-1.6.patch b/editors/openoffice.org-1.1/files/patch-nas+nas-1.6.patch
deleted file mode 100644
index b6096654ebaf..000000000000
--- a/editors/openoffice.org-1.1/files/patch-nas+nas-1.6.patch
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-1.1/files/patch-offapi+com+sun+star+setup+OSType.idl b/editors/openoffice.org-1.1/files/patch-offapi+com+sun+star+setup+OSType.idl
deleted file mode 100644
index 3fee562c6d38..000000000000
--- a/editors/openoffice.org-1.1/files/patch-offapi+com+sun+star+setup+OSType.idl
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1/files/patch-offapi+util+makefile.pmk b/editors/openoffice.org-1.1/files/patch-offapi+util+makefile.pmk
deleted file mode 100644
index 5cdbb1b4aa4a..000000000000
--- a/editors/openoffice.org-1.1/files/patch-offapi+util+makefile.pmk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1/files/patch-package+inc+HashMaps.hxx b/editors/openoffice.org-1.1/files/patch-package+inc+HashMaps.hxx
deleted file mode 100644
index 35052d291ef7..000000000000
--- a/editors/openoffice.org-1.1/files/patch-package+inc+HashMaps.hxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice.org-1.1/files/patch-package+inc+ZipPackageFolder.hxx b/editors/openoffice.org-1.1/files/patch-package+inc+ZipPackageFolder.hxx
deleted file mode 100644
index 014c61403380..000000000000
--- a/editors/openoffice.org-1.1/files/patch-package+inc+ZipPackageFolder.hxx
+++ /dev/null
@@ -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()
diff --git a/editors/openoffice.org-1.1/files/patch-package+source+zippackage+ContentInfo.hxx b/editors/openoffice.org-1.1/files/patch-package+source+zippackage+ContentInfo.hxx
deleted file mode 100644
index c4bf35e79f64..000000000000
--- a/editors/openoffice.org-1.1/files/patch-package+source+zippackage+ContentInfo.hxx
+++ /dev/null
@@ -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();
diff --git a/editors/openoffice.org-1.1/files/patch-package+source+zippackage+ZipPackageFolder.cxx b/editors/openoffice.org-1.1/files/patch-package+source+zippackage+ZipPackageFolder.cxx
deleted file mode 100644
index bb504c834eef..000000000000
--- a/editors/openoffice.org-1.1/files/patch-package+source+zippackage+ZipPackageFolder.cxx
+++ /dev/null
@@ -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 );
diff --git a/editors/openoffice.org-1.1/files/patch-registry+source+regkey.cxx b/editors/openoffice.org-1.1/files/patch-registry+source+regkey.cxx
deleted file mode 100644
index fad069f83f14..000000000000
--- a/editors/openoffice.org-1.1/files/patch-registry+source+regkey.cxx
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-1.1/files/patch-rsc+source+rscpp+cpp.h b/editors/openoffice.org-1.1/files/patch-rsc+source+rscpp+cpp.h
deleted file mode 100644
index 417ab33ba52f..000000000000
--- a/editors/openoffice.org-1.1/files/patch-rsc+source+rscpp+cpp.h
+++ /dev/null
@@ -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              */
- 
diff --git a/editors/openoffice.org-1.1/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-1.1/files/patch-sal+osl+unx+nlsupport.c
deleted file mode 100644
index 49fe0da8589b..000000000000
--- a/editors/openoffice.org-1.1/files/patch-sal+osl+unx+nlsupport.c
+++ /dev/null
@@ -1,160 +0,0 @@
---- ../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
-@@ -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)
- 
-@@ -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 @@
-     { "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/files/patch-sal+osl+unx+pipe.c b/editors/openoffice.org-1.1/files/patch-sal+osl+unx+pipe.c
deleted file mode 100644
index 4aa7b8af1a61..000000000000
--- a/editors/openoffice.org-1.1/files/patch-sal+osl+unx+pipe.c
+++ /dev/null
@@ -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 )
- 	{			
diff --git a/editors/openoffice.org-1.1/files/patch-sal+osl+unx+process.c b/editors/openoffice.org-1.1/files/patch-sal+osl+unx+process.c
deleted file mode 100644
index 50023576bec4..000000000000
--- a/editors/openoffice.org-1.1/files/patch-sal+osl+unx+process.c
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-1.1/files/patch-sal+osl+unx+security.c b/editors/openoffice.org-1.1/files/patch-sal+osl+unx+security.c
deleted file mode 100644
index 0cc321dcd544..000000000000
--- a/editors/openoffice.org-1.1/files/patch-sal+osl+unx+security.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../sal/osl/unx/security.c.orig	Sat Jul 20 22:53:31 2002
-+++ ../sal/osl/unx/security.c	Sat Jul 20 22:52:39 2002
-@@ -739,7 +739,7 @@
- 	}
- 
- 
--#elif (LINUX && (GLIBC >= 2))
-+#elif ((LINUX && (GLIBC >= 2)) || defined(FREEBSD))
- 	
- 	struct passwd	*pPasswd; 
- 	
diff --git a/editors/openoffice.org-1.1/files/patch-sal+osl+unx+socket.c b/editors/openoffice.org-1.1/files/patch-sal+osl+unx+socket.c
deleted file mode 100644
index 9541cac8583f..000000000000
--- a/editors/openoffice.org-1.1/files/patch-sal+osl+unx+socket.c
+++ /dev/null
@@ -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! */
diff --git a/editors/openoffice.org-1.1/files/patch-sal+osl+unx+system.c b/editors/openoffice.org-1.1/files/patch-sal+osl+unx+system.c
deleted file mode 100644
index 8dc663ac03fc..000000000000
--- a/editors/openoffice.org-1.1/files/patch-sal+osl+unx+system.c
+++ /dev/null
@@ -1,127 +0,0 @@
---- ../sal/osl/unx/system.c.orig	Sun Mar 17 12:34:13 2002
-+++ ../sal/osl/unx/system.c	Wed Apr  3 01:03:36 2002
-@@ -195,6 +195,73 @@
- }
- #endif
- 
-+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
-+           size_t buflen, struct passwd **result)
-+{
-+  struct passwd* res;
-+
-+  pthread_mutex_lock(&getrtl_mutex);
-+
-+  if ( res = getpwuid(uid) )
-+  {
-+    size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell;
-+
-+    pw_name = strlen(res->pw_name)+1;
-+    pw_passwd = strlen(res->pw_passwd)+1;
-+    pw_class = strlen(res->pw_class)+1;
-+    pw_gecos = strlen(res->pw_gecos)+1;
-+    pw_dir = strlen(res->pw_dir)+1;
-+    pw_shell = strlen(res->pw_shell)+1;
-+
-+    if (pw_name+pw_passwd+pw_class+pw_gecos
-+                                 +pw_dir+pw_shell < buflen)
-+    {
-+      memcpy(pwd, res, sizeof(struct passwd));
-+
-+      strncpy(buffer, res->pw_name, pw_name);
-+      pwd->pw_name = buffer;
-+      buffer += pw_name;
-+
-+      strncpy(buffer, res->pw_passwd, pw_passwd);
-+      pwd->pw_passwd = buffer;
-+      buffer += pw_passwd;
-+
-+      strncpy(buffer, res->pw_class, pw_class);
-+      pwd->pw_class = buffer;
-+      buffer += pw_class;
-+
-+      strncpy(buffer, res->pw_gecos, pw_gecos);
-+      pwd->pw_gecos = buffer;
-+      buffer += pw_gecos;
-+
-+      strncpy(buffer, res->pw_dir, pw_dir);
-+      pwd->pw_dir = buffer;
-+      buffer += pw_dir;
-+
-+      strncpy(buffer, res->pw_shell, pw_shell);
-+      pwd->pw_shell = buffer;
-+      buffer += pw_shell;
-+
-+      *result = pwd ;
-+      res = 0 ;
-+
-+    } else {
-+
-+      res = ENOMEM ;
-+
-+    }      
-+  
-+  } else {
-+
-+    res = errno ;
-+ 
-+  } 
-+
-+  pthread_mutex_unlock(&getrtl_mutex);
-+
-+  return res;
-+}
-+
- struct tm *localtime_r(const time_t *timep, struct tm *buffer)
- {
- 	struct tm* res;
-@@ -518,3 +585,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/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-1.1/files/patch-sal+osl+unx+system.h
deleted file mode 100644
index c4e255952fc7..000000000000
--- a/editors/openoffice.org-1.1/files/patch-sal+osl+unx+system.h
+++ /dev/null
@@ -1,35 +0,0 @@
---- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
-+++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
-@@ -205,6 +205,13 @@
- #   include <sys/ioctl.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 <machine/vmparam.h>
-+#   include <machine/pmap.h>
- #	include <sys/un.h>
- #   include <netinet/tcp.h>
- #	define 	IORESOURCE_TRANSFER_BSD 
-@@ -216,12 +223,13 @@
- #   elif BYTE_ORDER == PDP_ENDIAN
- #   	define _PDP_ENDIAN
- #   endif
--#   define  sched_yield() 				pthread_yield()
--#   define  pthread_testcancel()
- #	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
diff --git a/editors/openoffice.org-1.1/files/patch-sal+textenc+tencinfo.c b/editors/openoffice.org-1.1/files/patch-sal+textenc+tencinfo.c
deleted file mode 100644
index 7cf80c18d0a0..000000000000
--- a/editors/openoffice.org-1.1/files/patch-sal+textenc+tencinfo.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
-     /* 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 */
-+
-+    if (pMimeCharset == NULL)
-+	pMimeCharset = "usascii";
-+
-     static ImplStrCharsetDef const aVIPMimeCharsetTab[] =
-     {
-         { "usascii", RTL_TEXTENCODING_ASCII_US },
diff --git a/editors/openoffice.org-1.1/files/patch-sal+workben+makefile.mk b/editors/openoffice.org-1.1/files/patch-sal+workben+makefile.mk
deleted file mode 100644
index 369935e31d66..000000000000
--- a/editors/openoffice.org-1.1/files/patch-sal+workben+makefile.mk
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../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 @@
- 
- .IF "$(TESTAPP)" == "salstattest"
- 
--	CFLAGS+= /DUSE_SAL_STATIC
-+	CFLAGS+= -DUSE_SAL_STATIC
- 
- 	OBJFILES=	$(OBJ)$/salstattest.obj
- 
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- 
- CXXFILES=	tgetpwnam.cxx
- OBJFILES=	$(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,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/files/patch-salhelper+source+gcc2_freebsd_intel.map b/editors/openoffice.org-1.1/files/patch-salhelper+source+gcc2_freebsd_intel.map
deleted file mode 100644
index 1ffacf889bc6..000000000000
--- a/editors/openoffice.org-1.1/files/patch-salhelper+source+gcc2_freebsd_intel.map
+++ /dev/null
@@ -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:
-+*;
-+};
diff --git a/editors/openoffice.org-1.1/files/patch-salhelper+source+gcc3_freebsd_intel.map b/editors/openoffice.org-1.1/files/patch-salhelper+source+gcc3_freebsd_intel.map
deleted file mode 100644
index 823cff316ec7..000000000000
--- a/editors/openoffice.org-1.1/files/patch-salhelper+source+gcc3_freebsd_intel.map
+++ /dev/null
@@ -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:
-+		*;
-+};
-+
diff --git a/editors/openoffice.org-1.1/files/patch-salhelper+source+makefile.mk b/editors/openoffice.org-1.1/files/patch-salhelper+source+makefile.mk
deleted file mode 100644
index 3687664d8d16..000000000000
--- a/editors/openoffice.org-1.1/files/patch-salhelper+source+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../salhelper/source/makefile.mk.orig	Wed Nov 14 14:19:21 2001
-+++ ../salhelper/source/makefile.mk	Sun Mar  3 17:58:15 2002
-@@ -109,6 +109,10 @@
- SHL1VERSIONMAP=lngi.map
- .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
- SHL1VERSIONMAP=gcc3_linux_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
- .ENDIF
- 
- 
diff --git a/editors/openoffice.org-1.1/files/patch-salhelper+test+rtti+makefile.mk b/editors/openoffice.org-1.1/files/patch-salhelper+test+rtti+makefile.mk
deleted file mode 100644
index 70f25048a24a..000000000000
--- a/editors/openoffice.org-1.1/files/patch-salhelper+test+rtti+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
- 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
- .ENDIF
- 
- 
diff --git a/editors/openoffice.org-1.1/files/patch-sc+source+core+data+cell.cxx b/editors/openoffice.org-1.1/files/patch-sc+source+core+data+cell.cxx
deleted file mode 100644
index 529f67a3e35f..000000000000
--- a/editors/openoffice.org-1.1/files/patch-sc+source+core+data+cell.cxx
+++ /dev/null
@@ -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>
diff --git a/editors/openoffice.org-1.1/files/patch-scp+source+global+udk_base.scp b/editors/openoffice.org-1.1/files/patch-scp+source+global+udk_base.scp
deleted file mode 100644
index 623eccb0ff09..000000000000
--- a/editors/openoffice.org-1.1/files/patch-scp+source+global+udk_base.scp
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1/files/patch-scp+source+player+player.scp b/editors/openoffice.org-1.1/files/patch-scp+source+player+player.scp
deleted file mode 100644
index 2f8daab35cdd..000000000000
--- a/editors/openoffice.org-1.1/files/patch-scp+source+player+player.scp
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-1.1/files/patch-scptools+source+linker+searchcache b/editors/openoffice.org-1.1/files/patch-scptools+source+linker+searchcache
deleted file mode 100644
index 593e9eabf5bc..000000000000
--- a/editors/openoffice.org-1.1/files/patch-scptools+source+linker+searchcache
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: files/patch-scptools::source::linker::searchcache
-===================================================================
-RCS file: files/patch-scptools::source::linker::searchcache
-diff -N files/patch-scptools::source::linker::searchcache
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-scptools::source::linker::searchcache	4 Aug 2002 15:28:04 -0000
-@@ -0,0 +1,27 @@
-+--- ../scptools/source/linker/searchcache.hxx.orig	Fri Aug  2 22:53:46 2002
-++++ ../scptools/source/linker/searchcache.hxx	Fri Aug  2 22:54:50 2002
-+@@ -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	Fri Aug  2 22:53:35 2002
-++++ ../scptools/source/linker/searchcache.cxx	Fri Aug  2 22:55:14 2002
-+@@ -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/files/patch-scptools+source+linker+ziplst.cxx b/editors/openoffice.org-1.1/files/patch-scptools+source+linker+ziplst.cxx
deleted file mode 100644
index 83b84631542e..000000000000
--- a/editors/openoffice.org-1.1/files/patch-scptools+source+linker+ziplst.cxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice.org-1.1/files/patch-setup2+inc+fields.hxx b/editors/openoffice.org-1.1/files/patch-setup2+inc+fields.hxx
deleted file mode 100644
index d56e12f2abf4..000000000000
--- a/editors/openoffice.org-1.1/files/patch-setup2+inc+fields.hxx
+++ /dev/null
@@ -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[];
diff --git a/editors/openoffice.org-1.1/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-1.1/files/patch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 396c586ee3a3..000000000000
--- a/editors/openoffice.org-1.1/files/patch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,30 +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"
- 
-@@ -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" \
diff --git a/editors/openoffice.org-1.1/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice.org-1.1/files/patch-setup2+mow+source+loader+makefile.mk
deleted file mode 100644
index 5460e4296587..000000000000
--- a/editors/openoffice.org-1.1/files/patch-setup2+mow+source+loader+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice.org-1.1/files/patch-setup2+patch+makefile.mk b/editors/openoffice.org-1.1/files/patch-setup2+patch+makefile.mk
deleted file mode 100644
index 53846a8bdfc9..000000000000
--- a/editors/openoffice.org-1.1/files/patch-setup2+patch+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1/files/patch-setup2+script+setupserver b/editors/openoffice.org-1.1/files/patch-setup2+script+setupserver
deleted file mode 100644
index 450ea386c841..000000000000
--- a/editors/openoffice.org-1.1/files/patch-setup2+script+setupserver
+++ /dev/null
@@ -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`"
diff --git a/editors/openoffice.org-1.1/files/patch-setup2+source+compiler+decltor.cxx b/editors/openoffice.org-1.1/files/patch-setup2+source+compiler+decltor.cxx
deleted file mode 100644
index 98f6ad2f7567..000000000000
--- a/editors/openoffice.org-1.1/files/patch-setup2+source+compiler+decltor.cxx
+++ /dev/null
@@ -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";
diff --git a/editors/openoffice.org-1.1/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx b/editors/openoffice.org-1.1/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
deleted file mode 100644
index ac0b39a6aa47..000000000000
--- a/editors/openoffice.org-1.1/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
+++ /dev/null
@@ -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) );
diff --git a/editors/openoffice.org-1.1/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-1.1/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
deleted file mode 100644
index f199b18823e1..000000000000
--- a/editors/openoffice.org-1.1/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-1.1/files/patch-setup2+source+service+interface.cxx b/editors/openoffice.org-1.1/files/patch-setup2+source+service+interface.cxx
deleted file mode 100644
index 8e478e17971d..000000000000
--- a/editors/openoffice.org-1.1/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/files/patch-shell+source+cmdmail+makefile.mk b/editors/openoffice.org-1.1/files/patch-shell+source+cmdmail+makefile.mk
deleted file mode 100644
index 0476285c802e..000000000000
--- a/editors/openoffice.org-1.1/files/patch-shell+source+cmdmail+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-1.1/files/patch-shell+source+proxysettings+makefile.mk b/editors/openoffice.org-1.1/files/patch-shell+source+proxysettings+makefile.mk
deleted file mode 100644
index e83cf7c9d7a1..000000000000
--- a/editors/openoffice.org-1.1/files/patch-shell+source+proxysettings+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-1.1/files/patch-shell+source+unix+exec+makefile.mk b/editors/openoffice.org-1.1/files/patch-shell+source+unix+exec+makefile.mk
deleted file mode 100644
index 0b7712ee35f8..000000000000
--- a/editors/openoffice.org-1.1/files/patch-shell+source+unix+exec+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-1.1/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-1.1/files/patch-solenv+bin+addsym.awk
deleted file mode 100644
index 996e282b350b..000000000000
--- a/editors/openoffice.org-1.1/files/patch-solenv+bin+addsym.awk
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
-+++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
-@@ -72,11 +72,11 @@
- END {
-     if (state == 0) {
-         print "# Weak RTTI symbols for C++ exceptions:"
--        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
-+        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
-     }
- }
- state == 2 {
--    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
-+    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
-     state = 3
- }
- /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice.org-1.1/files/patch-solenv+bin+mapgen.pl b/editors/openoffice.org-1.1/files/patch-solenv+bin+mapgen.pl
deleted file mode 100644
index 71ebdb934120..000000000000
--- a/editors/openoffice.org-1.1/files/patch-solenv+bin+mapgen.pl
+++ /dev/null
@@ -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, $_);
- 	};
diff --git a/editors/openoffice.org-1.1/files/patch-solenv+inc+startup+FREEBSD+macros.mk b/editors/openoffice.org-1.1/files/patch-solenv+inc+startup+FREEBSD+macros.mk
deleted file mode 100644
index 0c1b107de988..000000000000
--- a/editors/openoffice.org-1.1/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/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-1.1/files/patch-solenv+inc+tg_ext.mk
deleted file mode 100644
index 701692c9425a..000000000000
--- a/editors/openoffice.org-1.1/files/patch-solenv+inc+tg_ext.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1/files/patch-solenv+inc+tg_moz.mk b/editors/openoffice.org-1.1/files/patch-solenv+inc+tg_moz.mk
deleted file mode 100644
index 255a41f92281..000000000000
--- a/editors/openoffice.org-1.1/files/patch-solenv+inc+tg_moz.mk
+++ /dev/null
@@ -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) $@
diff --git a/editors/openoffice.org-1.1/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-1.1/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index b4764485aa86..000000000000
--- a/editors/openoffice.org-1.1/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,202 +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
-+# 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*=$(CC)
-+
-+# default linker flags
-+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -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
diff --git a/editors/openoffice.org-1.1/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice.org-1.1/files/patch-soltools+checkdll+makefile.mk
deleted file mode 100644
index e6407402258a..000000000000
--- a/editors/openoffice.org-1.1/files/patch-soltools+checkdll+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1/files/patch-soltools+mkdepend+main.c b/editors/openoffice.org-1.1/files/patch-soltools+mkdepend+main.c
deleted file mode 100644
index cffd5cbb1f43..000000000000
--- a/editors/openoffice.org-1.1/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/files/patch-stlport+makefile.mk b/editors/openoffice.org-1.1/files/patch-stlport+makefile.mk
deleted file mode 100644
index 797817ba85be..000000000000
--- a/editors/openoffice.org-1.1/files/patch-stlport+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1/files/patch-stoc+source+corereflection+makefile.mk b/editors/openoffice.org-1.1/files/patch-stoc+source+corereflection+makefile.mk
deleted file mode 100644
index 4b319b08d401..000000000000
--- a/editors/openoffice.org-1.1/files/patch-stoc+source+corereflection+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-1.1/files/patch-stoc+source+defaultregistry+makefile.mk b/editors/openoffice.org-1.1/files/patch-stoc+source+defaultregistry+makefile.mk
deleted file mode 100644
index 4cae0476415a..000000000000
--- a/editors/openoffice.org-1.1/files/patch-stoc+source+defaultregistry+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-1.1/files/patch-stoc+source+implementationregistration+implreg.cxx b/editors/openoffice.org-1.1/files/patch-stoc+source+implementationregistration+implreg.cxx
deleted file mode 100644
index 341d621d872c..000000000000
--- a/editors/openoffice.org-1.1/files/patch-stoc+source+implementationregistration+implreg.cxx
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1/files/patch-stoc+source+implementationregistration+makefile.mk b/editors/openoffice.org-1.1/files/patch-stoc+source+implementationregistration+makefile.mk
deleted file mode 100644
index 0051043b7ecb..000000000000
--- a/editors/openoffice.org-1.1/files/patch-stoc+source+implementationregistration+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-1.1/files/patch-stoc+source+inspect+makefile.mk b/editors/openoffice.org-1.1/files/patch-stoc+source+inspect+makefile.mk
deleted file mode 100644
index c7cd85253c11..000000000000
--- a/editors/openoffice.org-1.1/files/patch-stoc+source+inspect+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-1.1/files/patch-stoc+source+invocation+makefile.mk b/editors/openoffice.org-1.1/files/patch-stoc+source+invocation+makefile.mk
deleted file mode 100644
index 9ac2072a5612..000000000000
--- a/editors/openoffice.org-1.1/files/patch-stoc+source+invocation+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-1.1/files/patch-stoc+source+invocation_adapterfactory+makefile.mk b/editors/openoffice.org-1.1/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
deleted file mode 100644
index 8853ad39a90e..000000000000
--- a/editors/openoffice.org-1.1/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-1.1/files/patch-stoc+source+javaloader+makefile.mk b/editors/openoffice.org-1.1/files/patch-stoc+source+javaloader+makefile.mk
deleted file mode 100644
index cea499f15c57..000000000000
--- a/editors/openoffice.org-1.1/files/patch-stoc+source+javaloader+makefile.mk
+++ /dev/null
@@ -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=		
diff --git a/editors/openoffice.org-1.1/files/patch-stoc+source+javavm+makefile.mk b/editors/openoffice.org-1.1/files/patch-stoc+source+javavm+makefile.mk
deleted file mode 100644
index b895a2b968d4..000000000000
--- a/editors/openoffice.org-1.1/files/patch-stoc+source+javavm+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice.org-1.1/files/patch-stoc+source+loader+makefile.mk b/editors/openoffice.org-1.1/files/patch-stoc+source+loader+makefile.mk
deleted file mode 100644
index 5a08ee5937b6..000000000000
--- a/editors/openoffice.org-1.1/files/patch-stoc+source+loader+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-1.1/files/patch-stoc+source+namingservice+makefile.mk b/editors/openoffice.org-1.1/files/patch-stoc+source+namingservice+makefile.mk
deleted file mode 100644
index e573081bc21d..000000000000
--- a/editors/openoffice.org-1.1/files/patch-stoc+source+namingservice+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-1.1/files/patch-stoc+source+proxy_factory+makefile.mk b/editors/openoffice.org-1.1/files/patch-stoc+source+proxy_factory+makefile.mk
deleted file mode 100644
index 9110b2f50cd1..000000000000
--- a/editors/openoffice.org-1.1/files/patch-stoc+source+proxy_factory+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-1.1/files/patch-stoc+source+registry_tdprovider+makefile.mk b/editors/openoffice.org-1.1/files/patch-stoc+source+registry_tdprovider+makefile.mk
deleted file mode 100644
index 9d974d1c0d10..000000000000
--- a/editors/openoffice.org-1.1/files/patch-stoc+source+registry_tdprovider+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1/files/patch-stoc+source+servicemanager+makefile.mk b/editors/openoffice.org-1.1/files/patch-stoc+source+servicemanager+makefile.mk
deleted file mode 100644
index 746776d54759..000000000000
--- a/editors/openoffice.org-1.1/files/patch-stoc+source+servicemanager+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-1.1/files/patch-stoc+source+tdmanager+makefile.mk b/editors/openoffice.org-1.1/files/patch-stoc+source+tdmanager+makefile.mk
deleted file mode 100644
index 76403fdde841..000000000000
--- a/editors/openoffice.org-1.1/files/patch-stoc+source+tdmanager+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-1.1/files/patch-stoc+source+typeconv+makefile.mk b/editors/openoffice.org-1.1/files/patch-stoc+source+typeconv+makefile.mk
deleted file mode 100644
index dc647f89a166..000000000000
--- a/editors/openoffice.org-1.1/files/patch-stoc+source+typeconv+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-1.1/files/patch-store+util+makefile.mk b/editors/openoffice.org-1.1/files/patch-store+util+makefile.mk
deleted file mode 100644
index 6bef6e960f2e..000000000000
--- a/editors/openoffice.org-1.1/files/patch-store+util+makefile.mk
+++ /dev/null
@@ -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
- 
- 
diff --git a/editors/openoffice.org-1.1/files/patch-svx+source+fmcomp+makefile.mk b/editors/openoffice.org-1.1/files/patch-svx+source+fmcomp+makefile.mk
deleted file mode 100644
index b16030080c0d..000000000000
--- a/editors/openoffice.org-1.1/files/patch-svx+source+fmcomp+makefile.mk
+++ /dev/null
@@ -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= \
diff --git a/editors/openoffice.org-1.1/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice.org-1.1/files/patch-sysui+oounix+office+gnome+makefile.mk
deleted file mode 100644
index 3d7c2e22aa63..000000000000
--- a/editors/openoffice.org-1.1/files/patch-sysui+oounix+office+gnome+makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
-+++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
-@@ -84,7 +84,9 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- APP1LIBS=
-+.IF "$(OS)"!="FREEBSD"
- APP1STDLIBS=-ldl
-+.ENDIF
- 
- GNOMEFILES= \
- 	locales.tab
diff --git a/editors/openoffice.org-1.1/files/patch-tools+source+string+tstring.cxx b/editors/openoffice.org-1.1/files/patch-tools+source+string+tstring.cxx
deleted file mode 100644
index 12bd6bd0b244..000000000000
--- a/editors/openoffice.org-1.1/files/patch-tools+source+string+tstring.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../tools/source/string/tstring.cxx.orig	Sat Aug 10 12:53:42 2002
-+++ ../tools/source/string/tstring.cxx	Sat Aug 10 12:54:16 2002
-@@ -103,6 +103,9 @@
- xub_StrLen ImplStringLen( const sal_Char* pStr )
- {
- 	const sal_Char* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
-@@ -113,6 +116,9 @@
- xub_StrLen ImplStringLen( const sal_Unicode* pStr )
- {
- 	const sal_Unicode* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
diff --git a/editors/openoffice.org-1.1/files/patch-unoil+makefile.pmk b/editors/openoffice.org-1.1/files/patch-unoil+makefile.pmk
deleted file mode 100644
index 7febdabf7b4b..000000000000
--- a/editors/openoffice.org-1.1/files/patch-unoil+makefile.pmk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../unoil/makefile.pmk.orig	Fri Aug 31 18:04:43 2001
-+++ ../unoil/makefile.pmk	Thu Sep 12 12:17:50 2002
-@@ -74,8 +74,8 @@
- JAVAFILESLIST	:= $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java)
- .ENDIF          # "$(L10N_framework)"==""
- 
--GENJAVAFILES	:= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
--GENCLASSFILES	:= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
-+GENJAVAFILES	+= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
-+GENCLASSFILES	+= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
- 
- # --- Targets ------------------------------------------------------
- 
diff --git a/editors/openoffice.org-1.1/files/patch-unzip+source+file_io.c b/editors/openoffice.org-1.1/files/patch-unzip+source+file_io.c
deleted file mode 100644
index 2f85a108c185..000000000000
--- a/editors/openoffice.org-1.1/files/patch-unzip+source+file_io.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../unzip/source/file_io.c.orig	Sat Oct 19 11:58:45 2002
-+++ ../unzip/source/file_io.c	Sat Oct 19 12:03:40 2002
-@@ -500,7 +500,7 @@
- #ifdef MPW
- 				pCallBack( 0 );
- #else
--				#if defined LINUX || defined MACOSX || defined NETBSD
-+				#if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD
- 				pCallBack( lseek(outfd, 0, SEEK_CUR) );
- 				#else
- 				pCallBack( tell( outfd ) );
-@@ -865,7 +865,9 @@
- 	static struct timeb tbp;
- #endif /* !__386BSD__ */
- #else /* !BSD */
-+#if (!defined(NETBSD) && !defined(FREEBSD))
- 	extern long timezone;
-+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
- #endif /* ?BSD */
- #endif /* ?AMIGA */
- 
diff --git a/editors/openoffice.org-1.1/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice.org-1.1/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
deleted file mode 100644
index 41defbd5eb59..000000000000
--- a/editors/openoffice.org-1.1/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
-+++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
-@@ -65,6 +65,8 @@
- #include <glyphcache.hxx>
- 
- #define Region XLIB_Region
-+typedef unsigned long CARD32;
-+#define Cursor CARD32
- #include <X11/extensions/Xrender.h>
- #undef Region
- 
diff --git a/editors/openoffice.org-1.1/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice.org-1.1/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
deleted file mode 100644
index fefc925db41f..000000000000
--- a/editors/openoffice.org-1.1/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
-@@ -78,6 +78,12 @@
- GETSTYLE_GNOME=getstyle-gnome-linux-intel
- HASGNOME2=TRUE
- .ENDIF
-+.IF "$_(HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
-+.ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
- HASGNOME2=TRUE
diff --git a/editors/openoffice.org-1.1/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice.org-1.1/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
deleted file mode 100644
index 984313fc540a..000000000000
--- a/editors/openoffice.org-1.1/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
-@@ -75,9 +75,15 @@
- 
- HASGNOME2=
- 
--.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
-+.IF "$(OS)$(CPU)"=="LINUXI"
- MSGBOX_GNOME=msgbox-gnome-linux-intel
- HASGNOME2=TRUE
-+.ENDIF
-+.IF "$(_HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+MSGBOX_GNOME=msgbox-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
- .ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice.org-1.1/files/patch-vcl+workben+officeacceptthread.cxx b/editors/openoffice.org-1.1/files/patch-vcl+workben+officeacceptthread.cxx
deleted file mode 100644
index 07d9f1060557..000000000000
--- a/editors/openoffice.org-1.1/files/patch-vcl+workben+officeacceptthread.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/workben/officeacceptthread.cxx.orig	Wed Mar  5 20:25:36 2003
-+++ ../vcl/workben/officeacceptthread.cxx	Wed Mar  5 20:26:03 2003
-@@ -125,7 +125,7 @@
- #if defined (SOLARIS)
- 				int status;
- 				nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG);
--#elif defined(LINUX)
-+#elif defined(LINUX) || defined (FREEBSD)
- 				nRet = kill(aProcessInfo.Ident, 0);
- #endif
- #if defined (UNX)
diff --git a/editors/openoffice.org-1.1/files/zipmoz.sh b/editors/openoffice.org-1.1/files/zipmoz.sh
deleted file mode 100644
index 43a4591f3430..000000000000
--- a/editors/openoffice.org-1.1/files/zipmoz.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/sh -f
-
-RUNTIME_FILES=" components/libabsyncsvc.so components/libaddrbook.so \
-		components/libmork.so components/libmozldap.so \
-		components/libnecko.so components/libprofile.so \
-		components/librdf.so components/libstrres.so \
-		components/libunicharutil.so components/libuconv.so \
-		components/libucvcn.so components/libucvibm.so \
-		components/libucvja.so components/libucvko.so \
-		components/libucvlatin.so components/libucvtw.so \
-		components/libucvtw2.so components/liburiloader.so \
-		components/libvcard.so components/libxpconnect.so \
-		components/libpref.so components/libchrome.so libmozjs.so \
-		libmsgbaseutil.so libldap50.so libnspr4.so libplc4.so \
-		libplds4.so libxpcom.so libmozz.so component.reg \
-		components/necko_dns.xpt components/xpcom_xpti.xpt \
-		components/xpcom_threads.xpt components/xpcom_io.xpt \
-		components/xpcom_ds.xpt components/xpcom_components.xpt \
-		components/xpcom_base.xpt components/xpti.dat \
-		defaults/pref/all.js defaults/pref/config.js \
-		defaults/pref/editor.js defaults/pref/initpref.js \
-		defaults/pref/inspector.js defaults/pref/mailnews.js \
-		defaults/pref/security-prefs.js defaults/pref/unix.js \
-		defaults/pref/xpinstall.js"
-
-LIB_FILES="	lib/libembed_base_s.a lib/libmozreg_s.a \
-		lib/libnspr4.so lib/libxpcom.so lib/libprldap50.so"
-
-INC_FILES="include/"
-INC_FILES2="public/"
-
-if [ $# -lt 2 -o $# -gt 3 ] ; then
-	echo 
-	echo usage: $0 mozilla_dist target [target_dir]
-	echo
-	echo where:
-	echo
-	echo "mozilla_dist points to the mozilla distribution"
-	echo "target concatenates  OS, compiler and CPU (e.g. FREEBSDGCCI etc)"
-	echo "target_dir is the directory to place the zips"
-	exit 1
-fi
-
-MOZ_DIST=$1
-TARGET=$2
-if [ "w$3" != "w" ]; then
-	TARGET_DIR=$3
-else
-	if [ "w$TARGET_DIR" == "w" ]; then
-		TARGET_DIR=
-	fi
-fi
-
-ZIP_TARGET=$TARGET_DIR
-if [ -z "$ZIP_TARGET" ] ; then
-	ZIP_TARGET=../
-fi
-
-# just to remember the current working directory
-STARTING_DIR=`pwd`
-
-echo
-echo --- creating zips for $TARGET, using mozilla distribution in $MOZ_DIST
-
-# Create the directories
-[ ! -d $TARGET_DIR/$TARGET/runtime ] && mkdir -p $TARGET_DIR/$TARGET/runtime
-[ ! -d $TARGET_DIR/$TARGET/runtime/components ] && mkdir -p $TARGET_DIR/$TARGET/runtime/components
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults/pref ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults/pref
-[ ! -d $TARGET_DIR/$TARGET/lib ] && mkdir -p $TARGET_DIR/$TARGET/lib
-[ ! -d $TARGET_DIR/$TARGET/inc ] && mkdir -p $TARGET_DIR/$TARGET/inc
-[ ! -d $TARGET_DIR/$TARGET/inc/nspr ] && mkdir -p $TARGET_DIR/$TARGET/inc/nspr
-[ ! -d $TARGET_DIR/$TARGET/inc/obsolete ] && mkdir -p $TARGET_DIR/$TARGET/inc/obsolete
-
-# Copy the files
-echo
-echo --- copying files
-echo
-
-for i in $RUNTIME_FILES; do
-	if [ ! -f $MOZ_DIST/bin/$i ]; then
-		echo $MOZ_DIST/bin/$i does not exist, check your distribution
-	else
-		if [ `echo $i | grep component` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/components/
-		elif [ `echo $i | grep defaults` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/defaults/pref/
-		else
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/
-		fi
-	fi
-done
-
-for i in $LIB_FILES; do
-	if [ ! -f $MOZ_DIST/$i ]; then
-		echo $MOZ_DIST/$i does not exist, check your distribution
-	else
-		cp -R -L $MOZ_DIST/$i $TARGET_DIR/$TARGET/lib/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES`; do
-	if [ ! -d $i ]; then 
-		cp -R -L $MOZ_DIST/include/$i $TARGET_DIR/$TARGET/inc/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES2`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/public/$i $TARGET_DIR/$TARGET/inc
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/$i $TARGET_DIR/$TARGET/inc/nspr
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr/obsolete`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/obsolete/$i $TARGET_DIR/$TARGET/inc/obsolete
-	fi
-done
-
-# delete old zips
-
-[ -f $TARGET_DIR/$TARGET/runtime.zip ] && rm -f $TARGET_DIR/$TARGET/runtime.zip
-[ -f $TARGET_DIR/$TARGET/lib.zip ] && rm -f $TARGET_DIR/$TARGET/lib.zip
-[ -f $TARGET_DIR/$TARGET/inc.zip ] && rm -f $TARGET_DIR/$TARGET/inc.zip
-
-# zip the runtime files
-
-echo
-echo --- creating ${TARGET}runtime.zip
-echo
-
-cd $TARGET_DIR/$TARGET/runtime
-find . -type f | zip $ZIP_TARGET/${TARGET}runtime.zip -@
-
-# zip the lib files
-echo 
-echo --- creating ${TARGET}lib.zip
-echo 
-
-cd $TARGET_DIR/$TARGET/lib
-find . -type f | zip $ZIP_TARGET/${TARGET}lib.zip -@
-
-# zip the inc files
-echo
-echo --- creating ${TARGET}inc.zip
-echo
-
-cd $TARGET_DIR/$TARGET/inc
-find . -type f | zip $ZIP_TARGET/${TARGET}inc.zip -@
-
-# remove dirs
-cd $STARTING_DIR
-rm -rf $TARGET_DIR/$TARGET
-
-echo
-echo --- done
-echo
-
diff --git a/editors/openoffice.org-1.1/pkg-descr b/editors/openoffice.org-1.1/pkg-descr
deleted file mode 100644
index 31fd1b12161a..000000000000
--- a/editors/openoffice.org-1.1/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-OpenOffice.org is an Open Source, community-developed, multi-platform office
-productivity suite. It includes the key desktop applications, such as a
-word processor, spreadsheet, presentation manager, and drawing program,
-with a user interface and feature set similar to other office suites.
-
-Components include:
-  * A universal word processing application for creating business
-    letters, extensive text documents, professional layouts, and HTML
-    documents.
-  * A sophisticated application for performing advanced spreadsheet
-    functions, such as analyzing figures, creating lists, and viewing data.
-  * A tool for creating effective eye-catching presentations.
-  * A vector-oriented draw module that enables the creation of 3D
-    illustrations
diff --git a/editors/openoffice.org-1.1/pkg-message b/editors/openoffice.org-1.1/pkg-message
deleted file mode 100644
index 1dc749f301c2..000000000000
--- a/editors/openoffice.org-1.1/pkg-message
+++ /dev/null
@@ -1,73 +0,0 @@
-OpenOffice.org Build 643 Personal Install How-To
-
-Written by:	Martin Blapp <mbr@freebsd.org>
-
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
-
-1 User installation
--------------------
-
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
---------------
-
-There are some wrappers installed for fast startup.
-Add "${PREFIX}/bin/" to your PATH and you will be able
-to use them.
-
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
-
-If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
-version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
diff --git a/editors/openoffice.org-1.1/pkg-plist b/editors/openoffice.org-1.1/pkg-plist
deleted file mode 100644
index 28bd78453b52..000000000000
--- a/editors/openoffice.org-1.1/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, do not delete. Package list is generated automatically.
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
deleted file mode 100644
index 6f740924c399..000000000000
--- a/editors/openoffice.org-2-RC/Makefile
+++ /dev/null
@@ -1,580 +0,0 @@
-# New ports collection makefile for: OpenOffice
-# Date created:		28 Februar 2002
-# Whom:                 Martin Blapp
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openoffice
-PORTVERSION=	644
-CATEGORIES+=	editors
-MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
-		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
-		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
-		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ny1.mirror.openoffice.org/miscellaneous/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
-MASTER_SITE_SUBDIR=	${PORTVERSION}
-DISTFILES+=	oo_${PORTVERSION}_src.tar.bz2 \
-		gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
-
-BROKEN=		"Does not build"
-
-SORT?=	/usr/bin/sort
-FIND?=	/usr/bin/find
-CUT?=	/usr/bin/cut
-AWK?=	/usr/bin/awk
-GREP?=	/usr/bin/grep
-ZIP?=	${PREFIX}/bin/zip
-UNZIP?=	${PREFIX}/bin/unzip
-ANT?=	${LOCALBASE}/bin/ant
-TCSH?=	/bin/tcsh
-PASTE?=	/usr/bin/paste
-
-.include <bsd.port.pre.mk>
-
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
-DIST_SUBDIR=		openoffice
-DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
-
-#
-# configuration for language specific slave ports
-#
-.if !defined(LANG_EXT)
-LANG_EXT=01
-.else
-#
-# Add pkg-descr and pkg-message if available
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-#
-# LANG_CONFIGURE_ARG is missing for the german port
-#
-.if defined(LANG_EXT)
-CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG},ENUS
-.endif
-.endif
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
-
-EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-
-MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/jakarta-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-.if !defined(DISPLAY)
-BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
-.endif
-.if !defined(WITH_BSD_JDK)
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk14
-.else
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-.endif
-
-USE_PERL5=	yes
-USE_BZIP2=	yes
-USE_BISON=	yes
-USE_GMAKE=	yes
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
-.if !defined(WITH_BSD_JDK)
-JDKDIR?=	${LOCALBASE}/linux-sun-jdk1.4.1
-.else
-JDKDIR?=	${LOCALBASE}/jdk1.4.1
-.endif
-JAVAVM=         ${JDKDIR}/bin/java
-
-GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
-LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
-BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
-
-.if !defined(DISPLAY)
-DISPLAYHACK=localhost:1001
-.endif
-
-CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
-			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
-
-.if !defined(WITH_BSD_JDK)
-CONFIGURE_ARGS+=	--enable-linuxjdk=yes
-.endif
-
-.if defined(WITH_DEBUG)
-.if ${WITH_DEBUG} == 2
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-.endif
-
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"prefered language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
-	@${ECHO} "OPTIONS:"
-.if !defined(USE_GCC)
-	@${ECHO}
-	@${ECHO} "You can compile OO with different"
-	@${ECHO} "gcc compiler versions:"
-	@${ECHO}
-	@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.2"
-	@${ECHO} "to compile openoffice with your"
-	@${ECHO} "prefered compiler."
-.endif
-.if !defined(WITH_BSD_JDK)
-	@${ECHO}
-	@${ECHO} "If you like to use the native BSD"
-	@${ECHO} "JDK for the build system, you can use"
-	@${ECHO} "WITH_BSD_JDK=TRUE to disable the"
-	@${ECHO} "usage of the linux-JDK and linux dependency."
-	@${ECHO}
-.endif
-.if !defined(WITH_DEBUG)
-	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
-	@${ECHO} "if you call make with WITH_DEBUG=1"
-	@${ECHO}
-	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
-	@${ECHO}
-.endif
-.if !defined(WITH_TTF_BYTECODE_ENABLED)
-	@${ECHO}
-	@${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES"
-	@${ECHO} "if you like to use the Freetype library to"
-	@${ECHO} "render TTF fonts. Normally the TTF lib is"
-	@${ECHO} "not used to render fonts."
-	@${ECHO}
-	@${ECHO} "If you have licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479"
-	@${ECHO} "you can enable this option to get better"
-	@${ECHO} "quality of glyphs at small bitmap sizes."
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 450002
-	@${ECHO}
-	@${ECHO} "OS-VERSION ${OSVERSION} too low"
-	@${ECHO}
-	@${ECHO} "OO need some important libc_r and"
-	@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
-	@${ECHO} "RELEASE or 4.6 STABLE."
-	@${FALSE}
-.endif
-	@${ECHO}
-	@${ECHO} "NOTICE:"
-	@${ECHO}
-	@${ECHO} "To build Openoffice, you should have a lot"
-.if defined(WITH_DEBUG)
-	@${ECHO} "of free diskspace (~ 8GB)."
-.else
-	@${ECHO} "of free diskspace (~ 4GB)."
-.endif
-	@${ECHO}
-.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
-    (${OSVERSION} < 500000 && !defined(USE_GCC))
-	@${ECHO} "KERNEL CONFIGURATION:"
-	@${ECHO}
-	@${ECHO} "Openoffice needs a larger stack- and"
-	@${ECHO} "datasize to build. Check your limit"
-	@${ECHO} "settings and and put this in /boot/loader.conf"
-	@${ECHO} "if neccessary:"
-	@${ECHO}
-	@${ECHO} "kern.maxdsiz=\"1073741824\""
-	@${ECHO} "kern.maxssiz=\"268435456\""
-.endif
-	@${ECHO}
-.if ${OSVERSION} < 460002
-	@${ECHO} "REQUIRED SYSTEM PATCHES:"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO} "OO.org can crash if you enter a non existing path"
-	@${ECHO} "or URL in the location bar. To fix these crashes"
-	@${ECHO} "you need a uncommitted system patch for rtld:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460001
-	@${ECHO}
-	@${ECHO} "OO setup is broken on STABLE < 4.6"
-	@${ECHO} "including 4.6 RELEASE."
-	@${ECHO} "You'll need a system patch to solve"
-	@${ECHO} "this problem:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460002
-	@${ECHO}
-	@${ECHO} "OO.org soffice binary can deadlock. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO}
-	@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
-	@${ECHO}
-.endif
-.if !exists(/usr/include/langinfo.h)
-	@${ECHO}
-	@${ECHO} "langinfo.h is missing !"
-	@${ECHO}
-	@${ECHO} "Please upgrade to 4.6 RELEASE or"
-	@${ECHO} "4.6 STABLE."
-	@${ECHO}
-	@${FALSE}
-.endif
-
-post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
-	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
-	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@-${RM} -f ${WRKSRC}/../moz/zipped/*.zip
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
-.if defined(L10NHELP)
-	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
-	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
-.endif
-
-post-patch:
-	@${MAKE} patch-mozilla
-.if defined(WITH_TTF_BYTECODE_ENABLED)
-	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
-		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-			${ECHO_MSG} "===>   Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \
-		fi; \
-		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
-	fi
-.endif
-.if defined(WITH_DEBUG)
-	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
-		PATCHES_APPLIED="" ; \
-		for i in ${PATCHDIR}/debugpatch-*; do \
-			case $$i in \
-				*.orig|*.rej|*~) \
-					${ECHO_MSG} "===>   Ignoring patchfile $$i" ; \
-					;; \
-				*) \
-					if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-						${ECHO_MSG} "===>   Applying ${OPSYS} patch $$i" ; \
-					fi; \
-					if ${PATCH} ${PATCH_ARGS} < $$i ; then \
-						PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
-					else \
-						${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
-						if [ x"$$PATCHES_APPLIED" != x"" ]; then \
-							${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
-						fi; \
-						${FALSE} ; \
-					fi; \
-					;; \
-			esac; \
-		done; \
-	fi;
-.endif
-	@${ECHO_MSG} "===>  Find old malloc.h defines and fix them in ${PKGNAME} source"
-	@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
-		${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
-
-extract-mozilla:
-.if ! exists(${WRKDIR}/mozilla/Makefile)
-	@${ECHO_MSG} "===>  Extracting mozilla sub project"
-	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
-.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment)
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
-.endif
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
-.endif
-	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
-
-patch-mozilla:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
-		${WRKDIR}/mozilla/files/
-	@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
-
-build-mozilla:
-.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
-	@${ECHO_MSG} "===>  Building mozilla sub project"
-.if defined(WITH_DEBUG)
-	@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
-	@${SED} -e 's|--disable-debug||' \
-		-e 's|--disable-cpp-rtti||' \
-		-e 's|--enable-strip||' \
-		< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
-.endif
-.if defined(USE_GCC)
-	@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
-.else
-	@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
-.endif
-	@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
-	@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
-	@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
-.endif
-
-install-mozilla:
-	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
-
-register-mozilla:
-.if exists(${WRKDIR}/mozilla-runtime)
-	@${RM} -rf ${WRKDIR}/mozilla-runtime
-.endif
-	@${MKDIR} ${WRKDIR}/mozilla-runtime
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
-	@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
-	@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
-	@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
-		&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom 
-	@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
-		${WRKDIR}/mozilla-runtime/components/xptitemp.dat
-	@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
-	@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
-		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
-
-mozilla:
-	@${MAKE} extract-mozilla
-	@${MAKE} patch-mozilla
-	@${MAKE} build-mozilla
-	@${MAKE} register-mozilla
-	@${MAKE} install-mozilla
-
-do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
-	@${MAKE} mozilla
-.endif
-.endif
-.endif
-.if exists(${WRKDIR}/.Xvfb.pid)
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.endif
-.if !defined(DISPLAY)
-	#
-	# This is a UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-.endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
-	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-.endif
-.if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
-.endif
-
-pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-
-do-install:
-.if !defined(DISPLAY)
-	#
-	# UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-.endif
-
-install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
-
-post-install:
-	@${ECHO_MSG} "===>  Add wrapper scripts";
-	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
-	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
-
-package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
-.if defined(LANG_SUFFIX)
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
-.else
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
-.endif
-
-update:
-	@${MAKE} fetch
-	@${MAKE} extract
-	@cd ${WRKSRC}/.. && for dir in *; do \
-	    if [ -d $$dir ]; then \
-		cd $$dir; cvs update -d; cd ..; \
-	    fi \
-	done
-
-.include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
deleted file mode 100644
index ec9d6788f104..000000000000
--- a/editors/openoffice.org-2-RC/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
-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
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
diff --git a/editors/openoffice.org-2-RC/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-2-RC/files/debugpatch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 96c651ce22c8..000000000000
--- a/editors/openoffice.org-2-RC/files/debugpatch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../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
-@@ -902,6 +902,7 @@
- 
- void KillSetupDir()
- {
-+#if 0
-     DIR* pDir = opendir( strTmpPath );
-     struct dirent* pFile;
- 
-@@ -915,6 +916,10 @@
- 
-     chdir( strInitPath );
-     rmdir( strTmpPath );
-+#else
-+	fprintf(stderr, "\nLeaving behind temporary directory: %s\n",
-+	strTmpPath);
-+#endif
- }
- 
- void makeSymLink( char* s )
diff --git a/editors/openoffice.org-2-RC/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2-RC/files/debugpatch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 52bd2b3d58d6..000000000000
--- a/editors/openoffice.org-2-RC/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
-+++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
- 
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- 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
- 
- # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
diff --git a/editors/openoffice.org-2-RC/files/oo_setup.resp b/editors/openoffice.org-2-RC/files/oo_setup.resp
deleted file mode 100644
index 8eeeb11bd95e..000000000000
--- a/editors/openoffice.org-2-RC/files/oo_setup.resp
+++ /dev/null
@@ -1,7 +0,0 @@
-[Environment]
-InstallationMode = INSTALL_NETWORK
-InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org-643
-
-[Java]
-JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-2-RC/files/openoffice-wrapper b/editors/openoffice.org-2-RC/files/openoffice-wrapper
deleted file mode 100644
index a0e1c8efe500..000000000000
--- a/editors/openoffice.org-2-RC/files/openoffice-wrapper
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-RC/files/Attic/openoffice-wrapper,v 1.3 2003-03-05 23:24:05 mbr Exp $
-
-oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/
-program=`echo $0 | sed -e 's|.*-||'`
-
-if [ ! $LANG ]; then
-	export LANG=%%LANG%%
-fi
-
-case $program in
-$0)
-	exec $oopath/soffice "$@"
-	;;
-	*)
-	exec $oopath/$program "$@"
-	;;
-esac
diff --git a/editors/openoffice.org-2-RC/files/optpatch-freetype+patch b/editors/openoffice.org-2-RC/files/optpatch-freetype+patch
deleted file mode 100644
index b426a8fb7fcc..000000000000
--- a/editors/openoffice.org-2-RC/files/optpatch-freetype+patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Index: files/patch-freetype::patch
-===================================================================
-RCS file: files/patch-freetype::patch
-diff -N files/patch-freetype::patch
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-freetype::patch	4 Aug 2002 15:27:42 -0000
-@@ -0,0 +1,201 @@
-+diff -ur ../freetype/freetype-2.0.5.patch oo641d_patched/freetype/freetype-2.0.5.patch
-+--- ../freetype/freetype-2.0.5.patch	Fri Apr  5 21:07:34 2002
-++++ ../freetype/freetype-2.0.5.patch	Sat Mar  9 18:04:17 2002
-+@@ -1,118 +1,79 @@
-+-*** misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 14 00:44:33 2000
-+---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 63,69 ****
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+---- 63,69 ----
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+-*** misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Jun  7 19:36:17 2001
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 631,637 ****
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+---- 631,637 ----
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile -DPIC $pic_flag"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Mon Jan  1 18:25:21 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 1,7 ****
-+---- 1,9 ----
-+-  FT_USE_MODULE(autohint_module_class)
-+-  FT_USE_MODULE(cff_driver_class)
-+-  FT_USE_MODULE(t1cid_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(pcf_driver_class)
-+-+ */
-+-  FT_USE_MODULE(psaux_module_class)
-+-  FT_USE_MODULE(psnames_module_class)
-+-  FT_USE_MODULE(ft_raster1_renderer_class)
-+-***************
-+-*** 9,12 ****
-+---- 11,16 ----
-+-  FT_USE_MODULE(ft_smooth_renderer_class)
-+-  FT_USE_MODULE(tt_driver_class)
-+-  FT_USE_MODULE(t1_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(winfnt_driver_class)
-+-+ */
-+-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h	Tue Aug 21 10:50:45 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 70,76 ****
-+---- 70,79 ----
-+-    /*   All convenience functions are declared as such in their             */
-+-    /*   documentation.                                                      */
-+-    /*                                                                       */
-+-+ /*
-+-  #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-+ */
-+-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-  
-+-  
-+-    /*************************************************************************/
-+-***************
-+-*** 108,116 ****
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-- 
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+---- 111,121 ----
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-+ /*
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-+ */
-+-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig	Mon Jan  7 14:21:35 2002
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Mon Jan  7 14:21:40 2002
-+-***************
-+-*** 2251,2257 ****
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age + 1`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-+---- 2251,2257 ----
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk
-++--- misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:49:17 2001
-++@@ -63,7 +63,7 @@
-++ #   ANSI compliance.
-++ #
-++ ifndef CFLAGS
-++-  CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+++  CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-++ endif
-++ 
-++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh
-++--- misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:47:56 2001
-+++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:49:17 2001
-++@@ -631,7 +631,7 @@
-++     if test "$build_old_libs" = yes; then
-++       if test "$pic_mode" != yes; then
-++ 	# Don't build PIC code
-++-	command="$base_compile $srcfile"
-+++	command="$base_compile $srcfile -DPIC $pic_flag"
-++       else
-++ 	# All platforms use -DPIC, to notify preprocessed assembler code.
-++ 	command="$base_compile $srcfile $pic_flag -DPIC"
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:49:17 2001
-++@@ -1,7 +1,9 @@
-++ FT_USE_MODULE(autohint_module_class)
-++ FT_USE_MODULE(cff_driver_class)
-++ FT_USE_MODULE(t1cid_driver_class)
-+++/*
-++ FT_USE_MODULE(pcf_driver_class)
-+++*/
-++ FT_USE_MODULE(psaux_module_class)
-++ FT_USE_MODULE(psnames_module_class)
-++ FT_USE_MODULE(ft_raster1_renderer_class)
-++@@ -9,4 +11,6 @@
-++ FT_USE_MODULE(ft_smooth_renderer_class)
-++ FT_USE_MODULE(tt_driver_class)
-++ FT_USE_MODULE(t1_driver_class)
-+++/*
-++ FT_USE_MODULE(winfnt_driver_class)
-+++*/
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:51:15 2001
-++@@ -70,7 +70,10 @@
-++   /*   All convenience functions are declared as such in their             */
-++   /*   documentation.                                                      */
-++   /*                                                                       */
-+++/*
-++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+++*/
-+++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-++ 
-++ 
-++   /*************************************************************************/
-++@@ -108,8 +111,10 @@
-++   /*   use a vector `plotter' format that isn't supported when this        */
-++   /*   macro is undefined.                                                 */
-++   /*                                                                       */
-+++/*
-++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++-
-+++*/
-+++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++ 
-++   /*************************************************************************/
-++   /*                                                                       */
-++@@ -338,7 +343,7 @@
-++   /* By undefining this, you will only compile the code necessary to load  */
-++   /* TrueType glyphs without hinting.                                      */
-++   /*                                                                       */
-++-#undef  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-+++#define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-++ 
-++ 
-++   /*************************************************************************/
diff --git a/editors/openoffice.org-2-RC/files/optpatch-vcl+util+makefile.pmk b/editors/openoffice.org-2-RC/files/optpatch-vcl+util+makefile.pmk
deleted file mode 100644
index 41341ff0b4e8..000000000000
--- a/editors/openoffice.org-2-RC/files/optpatch-vcl+util+makefile.pmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/util/makefile.pmk.orig	Mon Aug  5 01:39:41 2002
-+++ ../vcl/util/makefile.pmk	Mon Aug  5 01:40:03 2002
-@@ -64,7 +64,7 @@
- PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch
- PDBTARGET=vcl
- 
--.IF "$(OS)" != "MACOSX"
-+.IF "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- .IF "$(remote)" != ""
- USE_BUILTIN_RASTERIZER=true
- .ENDIF
diff --git a/editors/openoffice.org-2-RC/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-2-RC/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 078685f3b516..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../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 freebsd genunix";;
-  	*)		JINCSUBDIRS="genunix";;
-  	esac
-  
diff --git a/editors/openoffice.org-2-RC/files/patch-bridges+prj+build.lst b/editors/openoffice.org-2-RC/files/patch-bridges+prj+build.lst
deleted file mode 100644
index fee3d847c5e6..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-bridges+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
deleted file mode 100644
index 99b8c566fb61..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ /dev/null
@@ -1,102 +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 );
-+    }
- }
- 
- }
diff --git a/editors/openoffice.org-2-RC/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice.org-2-RC/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
deleted file mode 100644
index 4622b7fe21c4..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-2-RC/files/patch-comphelper+util+makefile.mk b/editors/openoffice.org-2-RC/files/patch-comphelper+util+makefile.mk
deleted file mode 100644
index f2d3092c2ddf..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-comphelper+util+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2-RC/files/patch-config_office+configure.in b/editors/openoffice.org-2-RC/files/patch-config_office+configure.in
deleted file mode 100644
index a45332fcbec0..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,66 +0,0 @@
---- configure.in.orig	Thu Feb 20 15:49:32 2003
-+++ configure.in	Wed Mar  5 21:22:34 2003
-@@ -95,6 +95,12 @@
-                           
-                           Usage: --enable-macos9
- ],,)
-+AC_ARG_ENABLE(linuxjdk,
-+[  --enable-linuxjdk         Use this option option if you like to use
-+                          the linux-jdk instead of the native jdk.
-+
-+                          Usage: --enable-linuxjdk
-+],,)
- AC_ARG_WITH(lang,
- [  --with-lang             Use this option to build OpenOffice.org with
-                           additional language support. US English is always
-@@ -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
-@@ -1232,7 +1249,11 @@
- if test -n "$enable_debug"; then
-    ENABLE_DEBUG="TRUE"
- else
--   ENABLE_DEBUG="FALSE"
-+fi
-+if test -n "$enable_linuxjdk"; then
-+   USE_LINUXJDK="TRUE"
-+else
-+   USE_LINUXJDK="FALSE"
- fi
- 
- dnl ===================================================================
-@@ -1278,6 +1299,7 @@
- AC_SUBST(PTHREAD_CFLAGS)
- AC_SUBST(PTHREAD_LIBS)
- AC_SUBST(ENABLE_DEBUG)
-+AC_SUBST(USE_LINUXJDK)
- 
- AC_OUTPUT([set_soenv])
- 
diff --git a/editors/openoffice.org-2-RC/files/patch-config_office+set_soenv.in b/editors/openoffice.org-2-RC/files/patch-config_office+set_soenv.in
deleted file mode 100644
index 9ea6b11bdab2..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-config_office+set_soenv.in
+++ /dev/null
@@ -1,44 +0,0 @@
---- set_soenv.in.orig	Thu Feb 27 15:12:36 2003
-+++ set_soenv.in	Wed Mar  5 21:16:43 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, 
-@@ -88,7 +88,7 @@
-      $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
-      $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS,
-      $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
--     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG );
-+     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $USE_LINUXJDK );
- #
- #-------------------------------------------
- # IId. Declaring the aliases.
-@@ -140,7 +140,8 @@
- $CC			= '@CC@';           # C compiler
- $CXX		= '@CXX@';          # C++ compiler
- $EXCEPTIONS	= '@EXCEPTIONS@';   # Exception handling type
--$ENABLE_DEBUG	= '@ENABLE_DEBUG@';  # Enable a debug build
-+$ENABLE_DEBUG	= '@ENABLE_DEBUG@'; # Enable a debug build
-+$USE_LINUXJDK	= '@USE_LINUXJDK@'; # Use the Linux JDK
- $WRAPCMD	= "";				# Wrapper (only for winnt)
- 
- #
-@@ -1265,7 +1266,12 @@
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
- }
- elsif ($platform eq "$FreeBSD")
--{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+{
-+   if ($USE_LINUXJDK eq "TRUE") {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
-+   } else {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+   }
- }
- elsif ($platform eq "$NetBSD")
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
diff --git a/editors/openoffice.org-2-RC/files/patch-connectivity+source+drivers+mozab+makefile.mk b/editors/openoffice.org-2-RC/files/patch-connectivity+source+drivers+mozab+makefile.mk
deleted file mode 100644
index 2b83f2cd2ec7..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-connectivity+source+drivers+mozab+makefile.mk
+++ /dev/null
@@ -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)					\
diff --git a/editors/openoffice.org-2-RC/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-2-RC/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
deleted file mode 100644
index 3601766ee561..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../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
-@@ -64,8 +64,8 @@
- #mozilla specific stuff.
- MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
- MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
--#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
--#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
-+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
-+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
- #End of mozilla specific stuff.
- 
- PRJ=..$/..$/..$/..
-@@ -107,7 +107,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -123,7 +123,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -141,7 +141,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS+=	    -DMOZILLA_CLIENT \
-             -DOSTYPE=\"Linux2.2.14-5\" -DOJI
- .IF "$(OS)" == "LINUX"
-@@ -157,6 +157,13 @@
-             -fno-rtti -Wall -Wconversion -Wpointer-arith \
-             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-             -Wno-long-long 
-+CDEFS     += -DTRACING
-+.ELIF "$(OS)" == "FREEBSD"
-+CFLAGS +=   -fPIC
-+CFLAGSCXX += \
-+            -fno-rtti -Wall -Wconversion -Wpointer-arith \
-+            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-+            -Wno-long-long -pthread 
- CDEFS     += -DTRACING
- .ENDIF
- .ENDIF
diff --git a/editors/openoffice.org-2-RC/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk b/editors/openoffice.org-2-RC/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
deleted file mode 100644
index b63d2a25f184..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2-RC/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-2-RC/files/patch-cppu+inc+uno+lbnames.h
deleted file mode 100644
index cb43c2d165e9..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-cppu+inc+uno+lbnames.h
+++ /dev/null
@@ -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."
diff --git a/editors/openoffice.org-2-RC/files/patch-cppu+prj+build.lst b/editors/openoffice.org-2-RC/files/patch-cppu+prj+build.lst
deleted file mode 100644
index 78fd210a1193..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-cppu+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-RC/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-2-RC/files/patch-cppuhelper+source+makefile.mk
deleted file mode 100644
index 5fb5bd636eb1..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-cppuhelper+source+makefile.mk
+++ /dev/null
@@ -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 ------------------------------------------------------
diff --git a/editors/openoffice.org-2-RC/files/patch-desktop+source+pkgchk+pkgchk_misc.h b/editors/openoffice.org-2-RC/files/patch-desktop+source+pkgchk+pkgchk_misc.h
deleted file mode 100644
index 391667b66ebd..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-desktop+source+pkgchk+pkgchk_misc.h
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-RC/files/patch-desktop+util+makefile.mk b/editors/openoffice.org-2-RC/files/patch-desktop+util+makefile.mk
deleted file mode 100644
index 025d644a8077..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-desktop+util+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-RC/files/patch-dtrans+source+X11+makefile.mk b/editors/openoffice.org-2-RC/files/patch-dtrans+source+X11+makefile.mk
deleted file mode 100644
index 5881f5d7f6a5..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-dtrans+source+X11+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice.org-2-RC/files/patch-eventattacher+source+makefile.mk b/editors/openoffice.org-2-RC/files/patch-eventattacher+source+makefile.mk
deleted file mode 100644
index 4552698eb132..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-eventattacher+source+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2-RC/files/patch-external+gcc3_specific+makefile.mk b/editors/openoffice.org-2-RC/files/patch-external+gcc3_specific+makefile.mk
deleted file mode 100644
index 6b8071f4030e..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-external+gcc3_specific+makefile.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../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"
- 
- .IF "$(OS)"!="MACOSX"
-+.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 @@
-         -rm -f $@
-         +ln -s libgcc_s.so.1 $@
- 
-+.ENDIF 
- .ENDIF 
- 
- .ENDIF
diff --git a/editors/openoffice.org-2-RC/files/patch-freetype+makefile.mk b/editors/openoffice.org-2-RC/files/patch-freetype+makefile.mk
deleted file mode 100644
index 3e5a8dd19f18..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-freetype+makefile.mk
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-2-RC/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-2-RC/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
- 
- /* 
diff --git a/editors/openoffice.org-2-RC/files/patch-javaunohelper+source+makefile.mk b/editors/openoffice.org-2-RC/files/patch-javaunohelper+source+makefile.mk
deleted file mode 100644
index 19f6b86e5ab5..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-javaunohelper+source+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice.org-2-RC/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice.org-2-RC/files/patch-jni_uno+jni_java2uno.cxx
deleted file mode 100644
index a9ff9e3fed88..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-jni_uno+jni_java2uno.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-2-RC/files/patch-nas+nas-1.6.patch b/editors/openoffice.org-2-RC/files/patch-nas+nas-1.6.patch
deleted file mode 100644
index b6096654ebaf..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-nas+nas-1.6.patch
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-2-RC/files/patch-offapi+com+sun+star+setup+OSType.idl b/editors/openoffice.org-2-RC/files/patch-offapi+com+sun+star+setup+OSType.idl
deleted file mode 100644
index 3fee562c6d38..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-offapi+com+sun+star+setup+OSType.idl
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-RC/files/patch-offapi+util+makefile.pmk b/editors/openoffice.org-2-RC/files/patch-offapi+util+makefile.pmk
deleted file mode 100644
index 5cdbb1b4aa4a..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-offapi+util+makefile.pmk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-RC/files/patch-package+inc+HashMaps.hxx b/editors/openoffice.org-2-RC/files/patch-package+inc+HashMaps.hxx
deleted file mode 100644
index 35052d291ef7..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-package+inc+HashMaps.hxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice.org-2-RC/files/patch-package+inc+ZipPackageFolder.hxx b/editors/openoffice.org-2-RC/files/patch-package+inc+ZipPackageFolder.hxx
deleted file mode 100644
index 014c61403380..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-package+inc+ZipPackageFolder.hxx
+++ /dev/null
@@ -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()
diff --git a/editors/openoffice.org-2-RC/files/patch-package+source+zippackage+ContentInfo.hxx b/editors/openoffice.org-2-RC/files/patch-package+source+zippackage+ContentInfo.hxx
deleted file mode 100644
index c4bf35e79f64..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-package+source+zippackage+ContentInfo.hxx
+++ /dev/null
@@ -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();
diff --git a/editors/openoffice.org-2-RC/files/patch-package+source+zippackage+ZipPackageFolder.cxx b/editors/openoffice.org-2-RC/files/patch-package+source+zippackage+ZipPackageFolder.cxx
deleted file mode 100644
index bb504c834eef..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-package+source+zippackage+ZipPackageFolder.cxx
+++ /dev/null
@@ -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 );
diff --git a/editors/openoffice.org-2-RC/files/patch-registry+source+regkey.cxx b/editors/openoffice.org-2-RC/files/patch-registry+source+regkey.cxx
deleted file mode 100644
index fad069f83f14..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-registry+source+regkey.cxx
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-2-RC/files/patch-rsc+source+rscpp+cpp.h b/editors/openoffice.org-2-RC/files/patch-rsc+source+rscpp+cpp.h
deleted file mode 100644
index 417ab33ba52f..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-rsc+source+rscpp+cpp.h
+++ /dev/null
@@ -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              */
- 
diff --git a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+nlsupport.c
deleted file mode 100644
index 49fe0da8589b..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+nlsupport.c
+++ /dev/null
@@ -1,160 +0,0 @@
---- ../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
-@@ -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)
- 
-@@ -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 @@
-     { "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-2-RC/files/patch-sal+osl+unx+pipe.c b/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+pipe.c
deleted file mode 100644
index 4aa7b8af1a61..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+pipe.c
+++ /dev/null
@@ -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 )
- 	{			
diff --git a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+process.c b/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+process.c
deleted file mode 100644
index 50023576bec4..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+process.c
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+security.c b/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+security.c
deleted file mode 100644
index 0cc321dcd544..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+security.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../sal/osl/unx/security.c.orig	Sat Jul 20 22:53:31 2002
-+++ ../sal/osl/unx/security.c	Sat Jul 20 22:52:39 2002
-@@ -739,7 +739,7 @@
- 	}
- 
- 
--#elif (LINUX && (GLIBC >= 2))
-+#elif ((LINUX && (GLIBC >= 2)) || defined(FREEBSD))
- 	
- 	struct passwd	*pPasswd; 
- 	
diff --git a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+socket.c b/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+socket.c
deleted file mode 100644
index 9541cac8583f..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+socket.c
+++ /dev/null
@@ -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! */
diff --git a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+system.c b/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+system.c
deleted file mode 100644
index 8dc663ac03fc..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+system.c
+++ /dev/null
@@ -1,127 +0,0 @@
---- ../sal/osl/unx/system.c.orig	Sun Mar 17 12:34:13 2002
-+++ ../sal/osl/unx/system.c	Wed Apr  3 01:03:36 2002
-@@ -195,6 +195,73 @@
- }
- #endif
- 
-+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
-+           size_t buflen, struct passwd **result)
-+{
-+  struct passwd* res;
-+
-+  pthread_mutex_lock(&getrtl_mutex);
-+
-+  if ( res = getpwuid(uid) )
-+  {
-+    size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell;
-+
-+    pw_name = strlen(res->pw_name)+1;
-+    pw_passwd = strlen(res->pw_passwd)+1;
-+    pw_class = strlen(res->pw_class)+1;
-+    pw_gecos = strlen(res->pw_gecos)+1;
-+    pw_dir = strlen(res->pw_dir)+1;
-+    pw_shell = strlen(res->pw_shell)+1;
-+
-+    if (pw_name+pw_passwd+pw_class+pw_gecos
-+                                 +pw_dir+pw_shell < buflen)
-+    {
-+      memcpy(pwd, res, sizeof(struct passwd));
-+
-+      strncpy(buffer, res->pw_name, pw_name);
-+      pwd->pw_name = buffer;
-+      buffer += pw_name;
-+
-+      strncpy(buffer, res->pw_passwd, pw_passwd);
-+      pwd->pw_passwd = buffer;
-+      buffer += pw_passwd;
-+
-+      strncpy(buffer, res->pw_class, pw_class);
-+      pwd->pw_class = buffer;
-+      buffer += pw_class;
-+
-+      strncpy(buffer, res->pw_gecos, pw_gecos);
-+      pwd->pw_gecos = buffer;
-+      buffer += pw_gecos;
-+
-+      strncpy(buffer, res->pw_dir, pw_dir);
-+      pwd->pw_dir = buffer;
-+      buffer += pw_dir;
-+
-+      strncpy(buffer, res->pw_shell, pw_shell);
-+      pwd->pw_shell = buffer;
-+      buffer += pw_shell;
-+
-+      *result = pwd ;
-+      res = 0 ;
-+
-+    } else {
-+
-+      res = ENOMEM ;
-+
-+    }      
-+  
-+  } else {
-+
-+    res = errno ;
-+ 
-+  } 
-+
-+  pthread_mutex_unlock(&getrtl_mutex);
-+
-+  return res;
-+}
-+
- struct tm *localtime_r(const time_t *timep, struct tm *buffer)
- {
- 	struct tm* res;
-@@ -518,3 +585,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-2-RC/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+system.h
deleted file mode 100644
index c4e255952fc7..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+system.h
+++ /dev/null
@@ -1,35 +0,0 @@
---- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
-+++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
-@@ -205,6 +205,13 @@
- #   include <sys/ioctl.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 <machine/vmparam.h>
-+#   include <machine/pmap.h>
- #	include <sys/un.h>
- #   include <netinet/tcp.h>
- #	define 	IORESOURCE_TRANSFER_BSD 
-@@ -216,12 +223,13 @@
- #   elif BYTE_ORDER == PDP_ENDIAN
- #   	define _PDP_ENDIAN
- #   endif
--#   define  sched_yield() 				pthread_yield()
--#   define  pthread_testcancel()
- #	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
diff --git a/editors/openoffice.org-2-RC/files/patch-sal+textenc+tencinfo.c b/editors/openoffice.org-2-RC/files/patch-sal+textenc+tencinfo.c
deleted file mode 100644
index 7cf80c18d0a0..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-sal+textenc+tencinfo.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
-     /* 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 */
-+
-+    if (pMimeCharset == NULL)
-+	pMimeCharset = "usascii";
-+
-     static ImplStrCharsetDef const aVIPMimeCharsetTab[] =
-     {
-         { "usascii", RTL_TEXTENCODING_ASCII_US },
diff --git a/editors/openoffice.org-2-RC/files/patch-sal+workben+makefile.mk b/editors/openoffice.org-2-RC/files/patch-sal+workben+makefile.mk
deleted file mode 100644
index 369935e31d66..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-sal+workben+makefile.mk
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../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 @@
- 
- .IF "$(TESTAPP)" == "salstattest"
- 
--	CFLAGS+= /DUSE_SAL_STATIC
-+	CFLAGS+= -DUSE_SAL_STATIC
- 
- 	OBJFILES=	$(OBJ)$/salstattest.obj
- 
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- 
- CXXFILES=	tgetpwnam.cxx
- OBJFILES=	$(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN=	$(SLB)$/sal.lib
- 
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd | freebsd)
- .ENDIF # tgetpwname
- 
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-2-RC/files/patch-salhelper+source+gcc2_freebsd_intel.map b/editors/openoffice.org-2-RC/files/patch-salhelper+source+gcc2_freebsd_intel.map
deleted file mode 100644
index 1ffacf889bc6..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-salhelper+source+gcc2_freebsd_intel.map
+++ /dev/null
@@ -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:
-+*;
-+};
diff --git a/editors/openoffice.org-2-RC/files/patch-salhelper+source+gcc3_freebsd_intel.map b/editors/openoffice.org-2-RC/files/patch-salhelper+source+gcc3_freebsd_intel.map
deleted file mode 100644
index 823cff316ec7..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-salhelper+source+gcc3_freebsd_intel.map
+++ /dev/null
@@ -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:
-+		*;
-+};
-+
diff --git a/editors/openoffice.org-2-RC/files/patch-salhelper+source+makefile.mk b/editors/openoffice.org-2-RC/files/patch-salhelper+source+makefile.mk
deleted file mode 100644
index 3687664d8d16..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-salhelper+source+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../salhelper/source/makefile.mk.orig	Wed Nov 14 14:19:21 2001
-+++ ../salhelper/source/makefile.mk	Sun Mar  3 17:58:15 2002
-@@ -109,6 +109,10 @@
- SHL1VERSIONMAP=lngi.map
- .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
- SHL1VERSIONMAP=gcc3_linux_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
- .ENDIF
- 
- 
diff --git a/editors/openoffice.org-2-RC/files/patch-salhelper+test+rtti+makefile.mk b/editors/openoffice.org-2-RC/files/patch-salhelper+test+rtti+makefile.mk
deleted file mode 100644
index 70f25048a24a..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-salhelper+test+rtti+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
- 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
- .ENDIF
- 
- 
diff --git a/editors/openoffice.org-2-RC/files/patch-sc+source+core+data+cell.cxx b/editors/openoffice.org-2-RC/files/patch-sc+source+core+data+cell.cxx
deleted file mode 100644
index 529f67a3e35f..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-sc+source+core+data+cell.cxx
+++ /dev/null
@@ -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>
diff --git a/editors/openoffice.org-2-RC/files/patch-scp+source+global+udk_base.scp b/editors/openoffice.org-2-RC/files/patch-scp+source+global+udk_base.scp
deleted file mode 100644
index 623eccb0ff09..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-scp+source+global+udk_base.scp
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-RC/files/patch-scp+source+player+player.scp b/editors/openoffice.org-2-RC/files/patch-scp+source+player+player.scp
deleted file mode 100644
index 2f8daab35cdd..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-scp+source+player+player.scp
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-2-RC/files/patch-scptools+source+linker+searchcache b/editors/openoffice.org-2-RC/files/patch-scptools+source+linker+searchcache
deleted file mode 100644
index 593e9eabf5bc..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-scptools+source+linker+searchcache
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: files/patch-scptools::source::linker::searchcache
-===================================================================
-RCS file: files/patch-scptools::source::linker::searchcache
-diff -N files/patch-scptools::source::linker::searchcache
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-scptools::source::linker::searchcache	4 Aug 2002 15:28:04 -0000
-@@ -0,0 +1,27 @@
-+--- ../scptools/source/linker/searchcache.hxx.orig	Fri Aug  2 22:53:46 2002
-++++ ../scptools/source/linker/searchcache.hxx	Fri Aug  2 22:54:50 2002
-+@@ -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	Fri Aug  2 22:53:35 2002
-++++ ../scptools/source/linker/searchcache.cxx	Fri Aug  2 22:55:14 2002
-+@@ -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-2-RC/files/patch-scptools+source+linker+ziplst.cxx b/editors/openoffice.org-2-RC/files/patch-scptools+source+linker+ziplst.cxx
deleted file mode 100644
index 83b84631542e..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-scptools+source+linker+ziplst.cxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice.org-2-RC/files/patch-setup2+inc+fields.hxx b/editors/openoffice.org-2-RC/files/patch-setup2+inc+fields.hxx
deleted file mode 100644
index d56e12f2abf4..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-setup2+inc+fields.hxx
+++ /dev/null
@@ -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[];
diff --git a/editors/openoffice.org-2-RC/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-2-RC/files/patch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 396c586ee3a3..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,30 +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"
- 
-@@ -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" \
diff --git a/editors/openoffice.org-2-RC/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice.org-2-RC/files/patch-setup2+mow+source+loader+makefile.mk
deleted file mode 100644
index 5460e4296587..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-setup2+mow+source+loader+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice.org-2-RC/files/patch-setup2+patch+makefile.mk b/editors/openoffice.org-2-RC/files/patch-setup2+patch+makefile.mk
deleted file mode 100644
index 53846a8bdfc9..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-setup2+patch+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-RC/files/patch-setup2+script+setupserver b/editors/openoffice.org-2-RC/files/patch-setup2+script+setupserver
deleted file mode 100644
index 450ea386c841..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-setup2+script+setupserver
+++ /dev/null
@@ -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`"
diff --git a/editors/openoffice.org-2-RC/files/patch-setup2+source+compiler+decltor.cxx b/editors/openoffice.org-2-RC/files/patch-setup2+source+compiler+decltor.cxx
deleted file mode 100644
index 98f6ad2f7567..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-setup2+source+compiler+decltor.cxx
+++ /dev/null
@@ -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";
diff --git a/editors/openoffice.org-2-RC/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx b/editors/openoffice.org-2-RC/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
deleted file mode 100644
index ac0b39a6aa47..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
+++ /dev/null
@@ -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) );
diff --git a/editors/openoffice.org-2-RC/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-2-RC/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
deleted file mode 100644
index f199b18823e1..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-2-RC/files/patch-setup2+source+service+interface.cxx b/editors/openoffice.org-2-RC/files/patch-setup2+source+service+interface.cxx
deleted file mode 100644
index 8e478e17971d..000000000000
--- a/editors/openoffice.org-2-RC/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-2-RC/files/patch-shell+source+cmdmail+makefile.mk b/editors/openoffice.org-2-RC/files/patch-shell+source+cmdmail+makefile.mk
deleted file mode 100644
index 0476285c802e..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-shell+source+cmdmail+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-2-RC/files/patch-shell+source+proxysettings+makefile.mk b/editors/openoffice.org-2-RC/files/patch-shell+source+proxysettings+makefile.mk
deleted file mode 100644
index e83cf7c9d7a1..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-shell+source+proxysettings+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-2-RC/files/patch-shell+source+unix+exec+makefile.mk b/editors/openoffice.org-2-RC/files/patch-shell+source+unix+exec+makefile.mk
deleted file mode 100644
index 0b7712ee35f8..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-shell+source+unix+exec+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-2-RC/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-2-RC/files/patch-solenv+bin+addsym.awk
deleted file mode 100644
index 996e282b350b..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-solenv+bin+addsym.awk
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
-+++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
-@@ -72,11 +72,11 @@
- END {
-     if (state == 0) {
-         print "# Weak RTTI symbols for C++ exceptions:"
--        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
-+        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
-     }
- }
- state == 2 {
--    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
-+    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
-     state = 3
- }
- /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice.org-2-RC/files/patch-solenv+bin+mapgen.pl b/editors/openoffice.org-2-RC/files/patch-solenv+bin+mapgen.pl
deleted file mode 100644
index 71ebdb934120..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-solenv+bin+mapgen.pl
+++ /dev/null
@@ -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, $_);
- 	};
diff --git a/editors/openoffice.org-2-RC/files/patch-solenv+inc+startup+FREEBSD+macros.mk b/editors/openoffice.org-2-RC/files/patch-solenv+inc+startup+FREEBSD+macros.mk
deleted file mode 100644
index 0c1b107de988..000000000000
--- a/editors/openoffice.org-2-RC/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-2-RC/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-2-RC/files/patch-solenv+inc+tg_ext.mk
deleted file mode 100644
index 701692c9425a..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-solenv+inc+tg_ext.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-RC/files/patch-solenv+inc+tg_moz.mk b/editors/openoffice.org-2-RC/files/patch-solenv+inc+tg_moz.mk
deleted file mode 100644
index 255a41f92281..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-solenv+inc+tg_moz.mk
+++ /dev/null
@@ -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) $@
diff --git a/editors/openoffice.org-2-RC/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2-RC/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index b4764485aa86..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,202 +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
-+# 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*=$(CC)
-+
-+# default linker flags
-+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -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
diff --git a/editors/openoffice.org-2-RC/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice.org-2-RC/files/patch-soltools+checkdll+makefile.mk
deleted file mode 100644
index e6407402258a..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-soltools+checkdll+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-RC/files/patch-soltools+mkdepend+main.c b/editors/openoffice.org-2-RC/files/patch-soltools+mkdepend+main.c
deleted file mode 100644
index cffd5cbb1f43..000000000000
--- a/editors/openoffice.org-2-RC/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-2-RC/files/patch-stlport+makefile.mk b/editors/openoffice.org-2-RC/files/patch-stlport+makefile.mk
deleted file mode 100644
index 797817ba85be..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-stlport+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-RC/files/patch-stoc+source+corereflection+makefile.mk b/editors/openoffice.org-2-RC/files/patch-stoc+source+corereflection+makefile.mk
deleted file mode 100644
index 4b319b08d401..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-stoc+source+corereflection+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2-RC/files/patch-stoc+source+defaultregistry+makefile.mk b/editors/openoffice.org-2-RC/files/patch-stoc+source+defaultregistry+makefile.mk
deleted file mode 100644
index 4cae0476415a..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-stoc+source+defaultregistry+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-2-RC/files/patch-stoc+source+implementationregistration+implreg.cxx b/editors/openoffice.org-2-RC/files/patch-stoc+source+implementationregistration+implreg.cxx
deleted file mode 100644
index 341d621d872c..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-stoc+source+implementationregistration+implreg.cxx
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-RC/files/patch-stoc+source+implementationregistration+makefile.mk b/editors/openoffice.org-2-RC/files/patch-stoc+source+implementationregistration+makefile.mk
deleted file mode 100644
index 0051043b7ecb..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-stoc+source+implementationregistration+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2-RC/files/patch-stoc+source+inspect+makefile.mk b/editors/openoffice.org-2-RC/files/patch-stoc+source+inspect+makefile.mk
deleted file mode 100644
index c7cd85253c11..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-stoc+source+inspect+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2-RC/files/patch-stoc+source+invocation+makefile.mk b/editors/openoffice.org-2-RC/files/patch-stoc+source+invocation+makefile.mk
deleted file mode 100644
index 9ac2072a5612..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-stoc+source+invocation+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-2-RC/files/patch-stoc+source+invocation_adapterfactory+makefile.mk b/editors/openoffice.org-2-RC/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
deleted file mode 100644
index 8853ad39a90e..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-2-RC/files/patch-stoc+source+javaloader+makefile.mk b/editors/openoffice.org-2-RC/files/patch-stoc+source+javaloader+makefile.mk
deleted file mode 100644
index cea499f15c57..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-stoc+source+javaloader+makefile.mk
+++ /dev/null
@@ -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=		
diff --git a/editors/openoffice.org-2-RC/files/patch-stoc+source+javavm+makefile.mk b/editors/openoffice.org-2-RC/files/patch-stoc+source+javavm+makefile.mk
deleted file mode 100644
index b895a2b968d4..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-stoc+source+javavm+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice.org-2-RC/files/patch-stoc+source+loader+makefile.mk b/editors/openoffice.org-2-RC/files/patch-stoc+source+loader+makefile.mk
deleted file mode 100644
index 5a08ee5937b6..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-stoc+source+loader+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-2-RC/files/patch-stoc+source+namingservice+makefile.mk b/editors/openoffice.org-2-RC/files/patch-stoc+source+namingservice+makefile.mk
deleted file mode 100644
index e573081bc21d..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-stoc+source+namingservice+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-2-RC/files/patch-stoc+source+proxy_factory+makefile.mk b/editors/openoffice.org-2-RC/files/patch-stoc+source+proxy_factory+makefile.mk
deleted file mode 100644
index 9110b2f50cd1..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-stoc+source+proxy_factory+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2-RC/files/patch-stoc+source+registry_tdprovider+makefile.mk b/editors/openoffice.org-2-RC/files/patch-stoc+source+registry_tdprovider+makefile.mk
deleted file mode 100644
index 9d974d1c0d10..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-stoc+source+registry_tdprovider+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-RC/files/patch-stoc+source+servicemanager+makefile.mk b/editors/openoffice.org-2-RC/files/patch-stoc+source+servicemanager+makefile.mk
deleted file mode 100644
index 746776d54759..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-stoc+source+servicemanager+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2-RC/files/patch-stoc+source+tdmanager+makefile.mk b/editors/openoffice.org-2-RC/files/patch-stoc+source+tdmanager+makefile.mk
deleted file mode 100644
index 76403fdde841..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-stoc+source+tdmanager+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-2-RC/files/patch-stoc+source+typeconv+makefile.mk b/editors/openoffice.org-2-RC/files/patch-stoc+source+typeconv+makefile.mk
deleted file mode 100644
index dc647f89a166..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-stoc+source+typeconv+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-RC/files/patch-store+util+makefile.mk b/editors/openoffice.org-2-RC/files/patch-store+util+makefile.mk
deleted file mode 100644
index 6bef6e960f2e..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-store+util+makefile.mk
+++ /dev/null
@@ -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
- 
- 
diff --git a/editors/openoffice.org-2-RC/files/patch-svx+source+fmcomp+makefile.mk b/editors/openoffice.org-2-RC/files/patch-svx+source+fmcomp+makefile.mk
deleted file mode 100644
index b16030080c0d..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-svx+source+fmcomp+makefile.mk
+++ /dev/null
@@ -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= \
diff --git a/editors/openoffice.org-2-RC/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice.org-2-RC/files/patch-sysui+oounix+office+gnome+makefile.mk
deleted file mode 100644
index 3d7c2e22aa63..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-sysui+oounix+office+gnome+makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
-+++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
-@@ -84,7 +84,9 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- APP1LIBS=
-+.IF "$(OS)"!="FREEBSD"
- APP1STDLIBS=-ldl
-+.ENDIF
- 
- GNOMEFILES= \
- 	locales.tab
diff --git a/editors/openoffice.org-2-RC/files/patch-tools+source+string+tstring.cxx b/editors/openoffice.org-2-RC/files/patch-tools+source+string+tstring.cxx
deleted file mode 100644
index 12bd6bd0b244..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-tools+source+string+tstring.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../tools/source/string/tstring.cxx.orig	Sat Aug 10 12:53:42 2002
-+++ ../tools/source/string/tstring.cxx	Sat Aug 10 12:54:16 2002
-@@ -103,6 +103,9 @@
- xub_StrLen ImplStringLen( const sal_Char* pStr )
- {
- 	const sal_Char* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
-@@ -113,6 +116,9 @@
- xub_StrLen ImplStringLen( const sal_Unicode* pStr )
- {
- 	const sal_Unicode* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
diff --git a/editors/openoffice.org-2-RC/files/patch-unoil+makefile.pmk b/editors/openoffice.org-2-RC/files/patch-unoil+makefile.pmk
deleted file mode 100644
index 7febdabf7b4b..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-unoil+makefile.pmk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../unoil/makefile.pmk.orig	Fri Aug 31 18:04:43 2001
-+++ ../unoil/makefile.pmk	Thu Sep 12 12:17:50 2002
-@@ -74,8 +74,8 @@
- JAVAFILESLIST	:= $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java)
- .ENDIF          # "$(L10N_framework)"==""
- 
--GENJAVAFILES	:= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
--GENCLASSFILES	:= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
-+GENJAVAFILES	+= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
-+GENCLASSFILES	+= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
- 
- # --- Targets ------------------------------------------------------
- 
diff --git a/editors/openoffice.org-2-RC/files/patch-unzip+source+file_io.c b/editors/openoffice.org-2-RC/files/patch-unzip+source+file_io.c
deleted file mode 100644
index 2f85a108c185..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-unzip+source+file_io.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../unzip/source/file_io.c.orig	Sat Oct 19 11:58:45 2002
-+++ ../unzip/source/file_io.c	Sat Oct 19 12:03:40 2002
-@@ -500,7 +500,7 @@
- #ifdef MPW
- 				pCallBack( 0 );
- #else
--				#if defined LINUX || defined MACOSX || defined NETBSD
-+				#if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD
- 				pCallBack( lseek(outfd, 0, SEEK_CUR) );
- 				#else
- 				pCallBack( tell( outfd ) );
-@@ -865,7 +865,9 @@
- 	static struct timeb tbp;
- #endif /* !__386BSD__ */
- #else /* !BSD */
-+#if (!defined(NETBSD) && !defined(FREEBSD))
- 	extern long timezone;
-+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
- #endif /* ?BSD */
- #endif /* ?AMIGA */
- 
diff --git a/editors/openoffice.org-2-RC/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice.org-2-RC/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
deleted file mode 100644
index 41defbd5eb59..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
-+++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
-@@ -65,6 +65,8 @@
- #include <glyphcache.hxx>
- 
- #define Region XLIB_Region
-+typedef unsigned long CARD32;
-+#define Cursor CARD32
- #include <X11/extensions/Xrender.h>
- #undef Region
- 
diff --git a/editors/openoffice.org-2-RC/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice.org-2-RC/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
deleted file mode 100644
index fefc925db41f..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
-@@ -78,6 +78,12 @@
- GETSTYLE_GNOME=getstyle-gnome-linux-intel
- HASGNOME2=TRUE
- .ENDIF
-+.IF "$_(HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
-+.ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
- HASGNOME2=TRUE
diff --git a/editors/openoffice.org-2-RC/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice.org-2-RC/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
deleted file mode 100644
index 984313fc540a..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
-@@ -75,9 +75,15 @@
- 
- HASGNOME2=
- 
--.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
-+.IF "$(OS)$(CPU)"=="LINUXI"
- MSGBOX_GNOME=msgbox-gnome-linux-intel
- HASGNOME2=TRUE
-+.ENDIF
-+.IF "$(_HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+MSGBOX_GNOME=msgbox-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
- .ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice.org-2-RC/files/patch-vcl+workben+officeacceptthread.cxx b/editors/openoffice.org-2-RC/files/patch-vcl+workben+officeacceptthread.cxx
deleted file mode 100644
index 07d9f1060557..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-vcl+workben+officeacceptthread.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/workben/officeacceptthread.cxx.orig	Wed Mar  5 20:25:36 2003
-+++ ../vcl/workben/officeacceptthread.cxx	Wed Mar  5 20:26:03 2003
-@@ -125,7 +125,7 @@
- #if defined (SOLARIS)
- 				int status;
- 				nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG);
--#elif defined(LINUX)
-+#elif defined(LINUX) || defined (FREEBSD)
- 				nRet = kill(aProcessInfo.Ident, 0);
- #endif
- #if defined (UNX)
diff --git a/editors/openoffice.org-2-RC/files/zipmoz.sh b/editors/openoffice.org-2-RC/files/zipmoz.sh
deleted file mode 100644
index 43a4591f3430..000000000000
--- a/editors/openoffice.org-2-RC/files/zipmoz.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/sh -f
-
-RUNTIME_FILES=" components/libabsyncsvc.so components/libaddrbook.so \
-		components/libmork.so components/libmozldap.so \
-		components/libnecko.so components/libprofile.so \
-		components/librdf.so components/libstrres.so \
-		components/libunicharutil.so components/libuconv.so \
-		components/libucvcn.so components/libucvibm.so \
-		components/libucvja.so components/libucvko.so \
-		components/libucvlatin.so components/libucvtw.so \
-		components/libucvtw2.so components/liburiloader.so \
-		components/libvcard.so components/libxpconnect.so \
-		components/libpref.so components/libchrome.so libmozjs.so \
-		libmsgbaseutil.so libldap50.so libnspr4.so libplc4.so \
-		libplds4.so libxpcom.so libmozz.so component.reg \
-		components/necko_dns.xpt components/xpcom_xpti.xpt \
-		components/xpcom_threads.xpt components/xpcom_io.xpt \
-		components/xpcom_ds.xpt components/xpcom_components.xpt \
-		components/xpcom_base.xpt components/xpti.dat \
-		defaults/pref/all.js defaults/pref/config.js \
-		defaults/pref/editor.js defaults/pref/initpref.js \
-		defaults/pref/inspector.js defaults/pref/mailnews.js \
-		defaults/pref/security-prefs.js defaults/pref/unix.js \
-		defaults/pref/xpinstall.js"
-
-LIB_FILES="	lib/libembed_base_s.a lib/libmozreg_s.a \
-		lib/libnspr4.so lib/libxpcom.so lib/libprldap50.so"
-
-INC_FILES="include/"
-INC_FILES2="public/"
-
-if [ $# -lt 2 -o $# -gt 3 ] ; then
-	echo 
-	echo usage: $0 mozilla_dist target [target_dir]
-	echo
-	echo where:
-	echo
-	echo "mozilla_dist points to the mozilla distribution"
-	echo "target concatenates  OS, compiler and CPU (e.g. FREEBSDGCCI etc)"
-	echo "target_dir is the directory to place the zips"
-	exit 1
-fi
-
-MOZ_DIST=$1
-TARGET=$2
-if [ "w$3" != "w" ]; then
-	TARGET_DIR=$3
-else
-	if [ "w$TARGET_DIR" == "w" ]; then
-		TARGET_DIR=
-	fi
-fi
-
-ZIP_TARGET=$TARGET_DIR
-if [ -z "$ZIP_TARGET" ] ; then
-	ZIP_TARGET=../
-fi
-
-# just to remember the current working directory
-STARTING_DIR=`pwd`
-
-echo
-echo --- creating zips for $TARGET, using mozilla distribution in $MOZ_DIST
-
-# Create the directories
-[ ! -d $TARGET_DIR/$TARGET/runtime ] && mkdir -p $TARGET_DIR/$TARGET/runtime
-[ ! -d $TARGET_DIR/$TARGET/runtime/components ] && mkdir -p $TARGET_DIR/$TARGET/runtime/components
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults/pref ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults/pref
-[ ! -d $TARGET_DIR/$TARGET/lib ] && mkdir -p $TARGET_DIR/$TARGET/lib
-[ ! -d $TARGET_DIR/$TARGET/inc ] && mkdir -p $TARGET_DIR/$TARGET/inc
-[ ! -d $TARGET_DIR/$TARGET/inc/nspr ] && mkdir -p $TARGET_DIR/$TARGET/inc/nspr
-[ ! -d $TARGET_DIR/$TARGET/inc/obsolete ] && mkdir -p $TARGET_DIR/$TARGET/inc/obsolete
-
-# Copy the files
-echo
-echo --- copying files
-echo
-
-for i in $RUNTIME_FILES; do
-	if [ ! -f $MOZ_DIST/bin/$i ]; then
-		echo $MOZ_DIST/bin/$i does not exist, check your distribution
-	else
-		if [ `echo $i | grep component` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/components/
-		elif [ `echo $i | grep defaults` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/defaults/pref/
-		else
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/
-		fi
-	fi
-done
-
-for i in $LIB_FILES; do
-	if [ ! -f $MOZ_DIST/$i ]; then
-		echo $MOZ_DIST/$i does not exist, check your distribution
-	else
-		cp -R -L $MOZ_DIST/$i $TARGET_DIR/$TARGET/lib/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES`; do
-	if [ ! -d $i ]; then 
-		cp -R -L $MOZ_DIST/include/$i $TARGET_DIR/$TARGET/inc/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES2`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/public/$i $TARGET_DIR/$TARGET/inc
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/$i $TARGET_DIR/$TARGET/inc/nspr
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr/obsolete`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/obsolete/$i $TARGET_DIR/$TARGET/inc/obsolete
-	fi
-done
-
-# delete old zips
-
-[ -f $TARGET_DIR/$TARGET/runtime.zip ] && rm -f $TARGET_DIR/$TARGET/runtime.zip
-[ -f $TARGET_DIR/$TARGET/lib.zip ] && rm -f $TARGET_DIR/$TARGET/lib.zip
-[ -f $TARGET_DIR/$TARGET/inc.zip ] && rm -f $TARGET_DIR/$TARGET/inc.zip
-
-# zip the runtime files
-
-echo
-echo --- creating ${TARGET}runtime.zip
-echo
-
-cd $TARGET_DIR/$TARGET/runtime
-find . -type f | zip $ZIP_TARGET/${TARGET}runtime.zip -@
-
-# zip the lib files
-echo 
-echo --- creating ${TARGET}lib.zip
-echo 
-
-cd $TARGET_DIR/$TARGET/lib
-find . -type f | zip $ZIP_TARGET/${TARGET}lib.zip -@
-
-# zip the inc files
-echo
-echo --- creating ${TARGET}inc.zip
-echo
-
-cd $TARGET_DIR/$TARGET/inc
-find . -type f | zip $ZIP_TARGET/${TARGET}inc.zip -@
-
-# remove dirs
-cd $STARTING_DIR
-rm -rf $TARGET_DIR/$TARGET
-
-echo
-echo --- done
-echo
-
diff --git a/editors/openoffice.org-2-RC/pkg-descr b/editors/openoffice.org-2-RC/pkg-descr
deleted file mode 100644
index 31fd1b12161a..000000000000
--- a/editors/openoffice.org-2-RC/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-OpenOffice.org is an Open Source, community-developed, multi-platform office
-productivity suite. It includes the key desktop applications, such as a
-word processor, spreadsheet, presentation manager, and drawing program,
-with a user interface and feature set similar to other office suites.
-
-Components include:
-  * A universal word processing application for creating business
-    letters, extensive text documents, professional layouts, and HTML
-    documents.
-  * A sophisticated application for performing advanced spreadsheet
-    functions, such as analyzing figures, creating lists, and viewing data.
-  * A tool for creating effective eye-catching presentations.
-  * A vector-oriented draw module that enables the creation of 3D
-    illustrations
diff --git a/editors/openoffice.org-2-RC/pkg-message b/editors/openoffice.org-2-RC/pkg-message
deleted file mode 100644
index 1dc749f301c2..000000000000
--- a/editors/openoffice.org-2-RC/pkg-message
+++ /dev/null
@@ -1,73 +0,0 @@
-OpenOffice.org Build 643 Personal Install How-To
-
-Written by:	Martin Blapp <mbr@freebsd.org>
-
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
-
-1 User installation
--------------------
-
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
---------------
-
-There are some wrappers installed for fast startup.
-Add "${PREFIX}/bin/" to your PATH and you will be able
-to use them.
-
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
-
-If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
-version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
diff --git a/editors/openoffice.org-2-RC/pkg-plist b/editors/openoffice.org-2-RC/pkg-plist
deleted file mode 100644
index 28bd78453b52..000000000000
--- a/editors/openoffice.org-2-RC/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, do not delete. Package list is generated automatically.
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
deleted file mode 100644
index 6f740924c399..000000000000
--- a/editors/openoffice.org-2-devel/Makefile
+++ /dev/null
@@ -1,580 +0,0 @@
-# New ports collection makefile for: OpenOffice
-# Date created:		28 Februar 2002
-# Whom:                 Martin Blapp
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openoffice
-PORTVERSION=	644
-CATEGORIES+=	editors
-MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
-		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
-		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
-		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ny1.mirror.openoffice.org/miscellaneous/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
-MASTER_SITE_SUBDIR=	${PORTVERSION}
-DISTFILES+=	oo_${PORTVERSION}_src.tar.bz2 \
-		gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
-
-BROKEN=		"Does not build"
-
-SORT?=	/usr/bin/sort
-FIND?=	/usr/bin/find
-CUT?=	/usr/bin/cut
-AWK?=	/usr/bin/awk
-GREP?=	/usr/bin/grep
-ZIP?=	${PREFIX}/bin/zip
-UNZIP?=	${PREFIX}/bin/unzip
-ANT?=	${LOCALBASE}/bin/ant
-TCSH?=	/bin/tcsh
-PASTE?=	/usr/bin/paste
-
-.include <bsd.port.pre.mk>
-
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
-DIST_SUBDIR=		openoffice
-DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
-
-#
-# configuration for language specific slave ports
-#
-.if !defined(LANG_EXT)
-LANG_EXT=01
-.else
-#
-# Add pkg-descr and pkg-message if available
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-#
-# LANG_CONFIGURE_ARG is missing for the german port
-#
-.if defined(LANG_EXT)
-CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG},ENUS
-.endif
-.endif
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
-
-EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-
-MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/jakarta-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-.if !defined(DISPLAY)
-BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
-.endif
-.if !defined(WITH_BSD_JDK)
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk14
-.else
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-.endif
-
-USE_PERL5=	yes
-USE_BZIP2=	yes
-USE_BISON=	yes
-USE_GMAKE=	yes
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
-.if !defined(WITH_BSD_JDK)
-JDKDIR?=	${LOCALBASE}/linux-sun-jdk1.4.1
-.else
-JDKDIR?=	${LOCALBASE}/jdk1.4.1
-.endif
-JAVAVM=         ${JDKDIR}/bin/java
-
-GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
-LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
-BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
-
-.if !defined(DISPLAY)
-DISPLAYHACK=localhost:1001
-.endif
-
-CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
-			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
-
-.if !defined(WITH_BSD_JDK)
-CONFIGURE_ARGS+=	--enable-linuxjdk=yes
-.endif
-
-.if defined(WITH_DEBUG)
-.if ${WITH_DEBUG} == 2
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-.endif
-
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"prefered language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
-	@${ECHO} "OPTIONS:"
-.if !defined(USE_GCC)
-	@${ECHO}
-	@${ECHO} "You can compile OO with different"
-	@${ECHO} "gcc compiler versions:"
-	@${ECHO}
-	@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.2"
-	@${ECHO} "to compile openoffice with your"
-	@${ECHO} "prefered compiler."
-.endif
-.if !defined(WITH_BSD_JDK)
-	@${ECHO}
-	@${ECHO} "If you like to use the native BSD"
-	@${ECHO} "JDK for the build system, you can use"
-	@${ECHO} "WITH_BSD_JDK=TRUE to disable the"
-	@${ECHO} "usage of the linux-JDK and linux dependency."
-	@${ECHO}
-.endif
-.if !defined(WITH_DEBUG)
-	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
-	@${ECHO} "if you call make with WITH_DEBUG=1"
-	@${ECHO}
-	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
-	@${ECHO}
-.endif
-.if !defined(WITH_TTF_BYTECODE_ENABLED)
-	@${ECHO}
-	@${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES"
-	@${ECHO} "if you like to use the Freetype library to"
-	@${ECHO} "render TTF fonts. Normally the TTF lib is"
-	@${ECHO} "not used to render fonts."
-	@${ECHO}
-	@${ECHO} "If you have licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479"
-	@${ECHO} "you can enable this option to get better"
-	@${ECHO} "quality of glyphs at small bitmap sizes."
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 450002
-	@${ECHO}
-	@${ECHO} "OS-VERSION ${OSVERSION} too low"
-	@${ECHO}
-	@${ECHO} "OO need some important libc_r and"
-	@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
-	@${ECHO} "RELEASE or 4.6 STABLE."
-	@${FALSE}
-.endif
-	@${ECHO}
-	@${ECHO} "NOTICE:"
-	@${ECHO}
-	@${ECHO} "To build Openoffice, you should have a lot"
-.if defined(WITH_DEBUG)
-	@${ECHO} "of free diskspace (~ 8GB)."
-.else
-	@${ECHO} "of free diskspace (~ 4GB)."
-.endif
-	@${ECHO}
-.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
-    (${OSVERSION} < 500000 && !defined(USE_GCC))
-	@${ECHO} "KERNEL CONFIGURATION:"
-	@${ECHO}
-	@${ECHO} "Openoffice needs a larger stack- and"
-	@${ECHO} "datasize to build. Check your limit"
-	@${ECHO} "settings and and put this in /boot/loader.conf"
-	@${ECHO} "if neccessary:"
-	@${ECHO}
-	@${ECHO} "kern.maxdsiz=\"1073741824\""
-	@${ECHO} "kern.maxssiz=\"268435456\""
-.endif
-	@${ECHO}
-.if ${OSVERSION} < 460002
-	@${ECHO} "REQUIRED SYSTEM PATCHES:"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO} "OO.org can crash if you enter a non existing path"
-	@${ECHO} "or URL in the location bar. To fix these crashes"
-	@${ECHO} "you need a uncommitted system patch for rtld:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460001
-	@${ECHO}
-	@${ECHO} "OO setup is broken on STABLE < 4.6"
-	@${ECHO} "including 4.6 RELEASE."
-	@${ECHO} "You'll need a system patch to solve"
-	@${ECHO} "this problem:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460002
-	@${ECHO}
-	@${ECHO} "OO.org soffice binary can deadlock. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO}
-	@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
-	@${ECHO}
-.endif
-.if !exists(/usr/include/langinfo.h)
-	@${ECHO}
-	@${ECHO} "langinfo.h is missing !"
-	@${ECHO}
-	@${ECHO} "Please upgrade to 4.6 RELEASE or"
-	@${ECHO} "4.6 STABLE."
-	@${ECHO}
-	@${FALSE}
-.endif
-
-post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
-	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
-	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@-${RM} -f ${WRKSRC}/../moz/zipped/*.zip
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
-.if defined(L10NHELP)
-	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
-	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
-.endif
-
-post-patch:
-	@${MAKE} patch-mozilla
-.if defined(WITH_TTF_BYTECODE_ENABLED)
-	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
-		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-			${ECHO_MSG} "===>   Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \
-		fi; \
-		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
-	fi
-.endif
-.if defined(WITH_DEBUG)
-	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
-		PATCHES_APPLIED="" ; \
-		for i in ${PATCHDIR}/debugpatch-*; do \
-			case $$i in \
-				*.orig|*.rej|*~) \
-					${ECHO_MSG} "===>   Ignoring patchfile $$i" ; \
-					;; \
-				*) \
-					if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-						${ECHO_MSG} "===>   Applying ${OPSYS} patch $$i" ; \
-					fi; \
-					if ${PATCH} ${PATCH_ARGS} < $$i ; then \
-						PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
-					else \
-						${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
-						if [ x"$$PATCHES_APPLIED" != x"" ]; then \
-							${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
-						fi; \
-						${FALSE} ; \
-					fi; \
-					;; \
-			esac; \
-		done; \
-	fi;
-.endif
-	@${ECHO_MSG} "===>  Find old malloc.h defines and fix them in ${PKGNAME} source"
-	@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
-		${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
-
-extract-mozilla:
-.if ! exists(${WRKDIR}/mozilla/Makefile)
-	@${ECHO_MSG} "===>  Extracting mozilla sub project"
-	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
-.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment)
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
-.endif
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
-.endif
-	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
-
-patch-mozilla:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
-		${WRKDIR}/mozilla/files/
-	@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
-
-build-mozilla:
-.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
-	@${ECHO_MSG} "===>  Building mozilla sub project"
-.if defined(WITH_DEBUG)
-	@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
-	@${SED} -e 's|--disable-debug||' \
-		-e 's|--disable-cpp-rtti||' \
-		-e 's|--enable-strip||' \
-		< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
-.endif
-.if defined(USE_GCC)
-	@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
-.else
-	@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
-.endif
-	@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
-	@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
-	@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
-.endif
-
-install-mozilla:
-	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
-
-register-mozilla:
-.if exists(${WRKDIR}/mozilla-runtime)
-	@${RM} -rf ${WRKDIR}/mozilla-runtime
-.endif
-	@${MKDIR} ${WRKDIR}/mozilla-runtime
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
-	@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
-	@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
-	@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
-		&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom 
-	@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
-		${WRKDIR}/mozilla-runtime/components/xptitemp.dat
-	@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
-	@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
-		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
-
-mozilla:
-	@${MAKE} extract-mozilla
-	@${MAKE} patch-mozilla
-	@${MAKE} build-mozilla
-	@${MAKE} register-mozilla
-	@${MAKE} install-mozilla
-
-do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
-	@${MAKE} mozilla
-.endif
-.endif
-.endif
-.if exists(${WRKDIR}/.Xvfb.pid)
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.endif
-.if !defined(DISPLAY)
-	#
-	# This is a UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-.endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
-	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-.endif
-.if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
-.endif
-
-pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-
-do-install:
-.if !defined(DISPLAY)
-	#
-	# UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-.endif
-
-install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
-
-post-install:
-	@${ECHO_MSG} "===>  Add wrapper scripts";
-	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
-	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
-
-package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
-.if defined(LANG_SUFFIX)
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
-.else
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
-.endif
-
-update:
-	@${MAKE} fetch
-	@${MAKE} extract
-	@cd ${WRKSRC}/.. && for dir in *; do \
-	    if [ -d $$dir ]; then \
-		cd $$dir; cvs update -d; cd ..; \
-	    fi \
-	done
-
-.include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
deleted file mode 100644
index ec9d6788f104..000000000000
--- a/editors/openoffice.org-2-devel/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
-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
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
diff --git a/editors/openoffice.org-2-devel/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-2-devel/files/debugpatch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 96c651ce22c8..000000000000
--- a/editors/openoffice.org-2-devel/files/debugpatch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../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
-@@ -902,6 +902,7 @@
- 
- void KillSetupDir()
- {
-+#if 0
-     DIR* pDir = opendir( strTmpPath );
-     struct dirent* pFile;
- 
-@@ -915,6 +916,10 @@
- 
-     chdir( strInitPath );
-     rmdir( strTmpPath );
-+#else
-+	fprintf(stderr, "\nLeaving behind temporary directory: %s\n",
-+	strTmpPath);
-+#endif
- }
- 
- void makeSymLink( char* s )
diff --git a/editors/openoffice.org-2-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 52bd2b3d58d6..000000000000
--- a/editors/openoffice.org-2-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
-+++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
- 
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- 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
- 
- # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
diff --git a/editors/openoffice.org-2-devel/files/oo_setup.resp b/editors/openoffice.org-2-devel/files/oo_setup.resp
deleted file mode 100644
index 8eeeb11bd95e..000000000000
--- a/editors/openoffice.org-2-devel/files/oo_setup.resp
+++ /dev/null
@@ -1,7 +0,0 @@
-[Environment]
-InstallationMode = INSTALL_NETWORK
-InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org-643
-
-[Java]
-JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-2-devel/files/openoffice-wrapper b/editors/openoffice.org-2-devel/files/openoffice-wrapper
deleted file mode 100644
index 235266613d8d..000000000000
--- a/editors/openoffice.org-2-devel/files/openoffice-wrapper
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-devel/files/Attic/openoffice-wrapper,v 1.3 2003-03-05 23:24:05 mbr Exp $
-
-oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/
-program=`echo $0 | sed -e 's|.*-||'`
-
-if [ ! $LANG ]; then
-	export LANG=%%LANG%%
-fi
-
-case $program in
-$0)
-	exec $oopath/soffice "$@"
-	;;
-	*)
-	exec $oopath/$program "$@"
-	;;
-esac
diff --git a/editors/openoffice.org-2-devel/files/optpatch-freetype+patch b/editors/openoffice.org-2-devel/files/optpatch-freetype+patch
deleted file mode 100644
index b426a8fb7fcc..000000000000
--- a/editors/openoffice.org-2-devel/files/optpatch-freetype+patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Index: files/patch-freetype::patch
-===================================================================
-RCS file: files/patch-freetype::patch
-diff -N files/patch-freetype::patch
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-freetype::patch	4 Aug 2002 15:27:42 -0000
-@@ -0,0 +1,201 @@
-+diff -ur ../freetype/freetype-2.0.5.patch oo641d_patched/freetype/freetype-2.0.5.patch
-+--- ../freetype/freetype-2.0.5.patch	Fri Apr  5 21:07:34 2002
-++++ ../freetype/freetype-2.0.5.patch	Sat Mar  9 18:04:17 2002
-+@@ -1,118 +1,79 @@
-+-*** misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 14 00:44:33 2000
-+---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 63,69 ****
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+---- 63,69 ----
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+-*** misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Jun  7 19:36:17 2001
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 631,637 ****
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+---- 631,637 ----
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile -DPIC $pic_flag"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Mon Jan  1 18:25:21 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 1,7 ****
-+---- 1,9 ----
-+-  FT_USE_MODULE(autohint_module_class)
-+-  FT_USE_MODULE(cff_driver_class)
-+-  FT_USE_MODULE(t1cid_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(pcf_driver_class)
-+-+ */
-+-  FT_USE_MODULE(psaux_module_class)
-+-  FT_USE_MODULE(psnames_module_class)
-+-  FT_USE_MODULE(ft_raster1_renderer_class)
-+-***************
-+-*** 9,12 ****
-+---- 11,16 ----
-+-  FT_USE_MODULE(ft_smooth_renderer_class)
-+-  FT_USE_MODULE(tt_driver_class)
-+-  FT_USE_MODULE(t1_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(winfnt_driver_class)
-+-+ */
-+-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h	Tue Aug 21 10:50:45 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 70,76 ****
-+---- 70,79 ----
-+-    /*   All convenience functions are declared as such in their             */
-+-    /*   documentation.                                                      */
-+-    /*                                                                       */
-+-+ /*
-+-  #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-+ */
-+-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-  
-+-  
-+-    /*************************************************************************/
-+-***************
-+-*** 108,116 ****
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-- 
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+---- 111,121 ----
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-+ /*
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-+ */
-+-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig	Mon Jan  7 14:21:35 2002
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Mon Jan  7 14:21:40 2002
-+-***************
-+-*** 2251,2257 ****
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age + 1`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-+---- 2251,2257 ----
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk
-++--- misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:49:17 2001
-++@@ -63,7 +63,7 @@
-++ #   ANSI compliance.
-++ #
-++ ifndef CFLAGS
-++-  CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+++  CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-++ endif
-++ 
-++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh
-++--- misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:47:56 2001
-+++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:49:17 2001
-++@@ -631,7 +631,7 @@
-++     if test "$build_old_libs" = yes; then
-++       if test "$pic_mode" != yes; then
-++ 	# Don't build PIC code
-++-	command="$base_compile $srcfile"
-+++	command="$base_compile $srcfile -DPIC $pic_flag"
-++       else
-++ 	# All platforms use -DPIC, to notify preprocessed assembler code.
-++ 	command="$base_compile $srcfile $pic_flag -DPIC"
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:49:17 2001
-++@@ -1,7 +1,9 @@
-++ FT_USE_MODULE(autohint_module_class)
-++ FT_USE_MODULE(cff_driver_class)
-++ FT_USE_MODULE(t1cid_driver_class)
-+++/*
-++ FT_USE_MODULE(pcf_driver_class)
-+++*/
-++ FT_USE_MODULE(psaux_module_class)
-++ FT_USE_MODULE(psnames_module_class)
-++ FT_USE_MODULE(ft_raster1_renderer_class)
-++@@ -9,4 +11,6 @@
-++ FT_USE_MODULE(ft_smooth_renderer_class)
-++ FT_USE_MODULE(tt_driver_class)
-++ FT_USE_MODULE(t1_driver_class)
-+++/*
-++ FT_USE_MODULE(winfnt_driver_class)
-+++*/
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:51:15 2001
-++@@ -70,7 +70,10 @@
-++   /*   All convenience functions are declared as such in their             */
-++   /*   documentation.                                                      */
-++   /*                                                                       */
-+++/*
-++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+++*/
-+++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-++ 
-++ 
-++   /*************************************************************************/
-++@@ -108,8 +111,10 @@
-++   /*   use a vector `plotter' format that isn't supported when this        */
-++   /*   macro is undefined.                                                 */
-++   /*                                                                       */
-+++/*
-++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++-
-+++*/
-+++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++ 
-++   /*************************************************************************/
-++   /*                                                                       */
-++@@ -338,7 +343,7 @@
-++   /* By undefining this, you will only compile the code necessary to load  */
-++   /* TrueType glyphs without hinting.                                      */
-++   /*                                                                       */
-++-#undef  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-+++#define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-++ 
-++ 
-++   /*************************************************************************/
diff --git a/editors/openoffice.org-2-devel/files/optpatch-vcl+util+makefile.pmk b/editors/openoffice.org-2-devel/files/optpatch-vcl+util+makefile.pmk
deleted file mode 100644
index 41341ff0b4e8..000000000000
--- a/editors/openoffice.org-2-devel/files/optpatch-vcl+util+makefile.pmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/util/makefile.pmk.orig	Mon Aug  5 01:39:41 2002
-+++ ../vcl/util/makefile.pmk	Mon Aug  5 01:40:03 2002
-@@ -64,7 +64,7 @@
- PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch
- PDBTARGET=vcl
- 
--.IF "$(OS)" != "MACOSX"
-+.IF "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- .IF "$(remote)" != ""
- USE_BUILTIN_RASTERIZER=true
- .ENDIF
diff --git a/editors/openoffice.org-2-devel/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-2-devel/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 078685f3b516..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../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 freebsd genunix";;
-  	*)		JINCSUBDIRS="genunix";;
-  	esac
-  
diff --git a/editors/openoffice.org-2-devel/files/patch-bridges+prj+build.lst b/editors/openoffice.org-2-devel/files/patch-bridges+prj+build.lst
deleted file mode 100644
index fee3d847c5e6..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-bridges+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
deleted file mode 100644
index 99b8c566fb61..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ /dev/null
@@ -1,102 +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 );
-+    }
- }
- 
- }
diff --git a/editors/openoffice.org-2-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice.org-2-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
deleted file mode 100644
index 4622b7fe21c4..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-2-devel/files/patch-comphelper+util+makefile.mk b/editors/openoffice.org-2-devel/files/patch-comphelper+util+makefile.mk
deleted file mode 100644
index f2d3092c2ddf..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-comphelper+util+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2-devel/files/patch-config_office+configure.in b/editors/openoffice.org-2-devel/files/patch-config_office+configure.in
deleted file mode 100644
index a45332fcbec0..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,66 +0,0 @@
---- configure.in.orig	Thu Feb 20 15:49:32 2003
-+++ configure.in	Wed Mar  5 21:22:34 2003
-@@ -95,6 +95,12 @@
-                           
-                           Usage: --enable-macos9
- ],,)
-+AC_ARG_ENABLE(linuxjdk,
-+[  --enable-linuxjdk         Use this option option if you like to use
-+                          the linux-jdk instead of the native jdk.
-+
-+                          Usage: --enable-linuxjdk
-+],,)
- AC_ARG_WITH(lang,
- [  --with-lang             Use this option to build OpenOffice.org with
-                           additional language support. US English is always
-@@ -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
-@@ -1232,7 +1249,11 @@
- if test -n "$enable_debug"; then
-    ENABLE_DEBUG="TRUE"
- else
--   ENABLE_DEBUG="FALSE"
-+fi
-+if test -n "$enable_linuxjdk"; then
-+   USE_LINUXJDK="TRUE"
-+else
-+   USE_LINUXJDK="FALSE"
- fi
- 
- dnl ===================================================================
-@@ -1278,6 +1299,7 @@
- AC_SUBST(PTHREAD_CFLAGS)
- AC_SUBST(PTHREAD_LIBS)
- AC_SUBST(ENABLE_DEBUG)
-+AC_SUBST(USE_LINUXJDK)
- 
- AC_OUTPUT([set_soenv])
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-config_office+set_soenv.in b/editors/openoffice.org-2-devel/files/patch-config_office+set_soenv.in
deleted file mode 100644
index 9ea6b11bdab2..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-config_office+set_soenv.in
+++ /dev/null
@@ -1,44 +0,0 @@
---- set_soenv.in.orig	Thu Feb 27 15:12:36 2003
-+++ set_soenv.in	Wed Mar  5 21:16:43 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, 
-@@ -88,7 +88,7 @@
-      $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
-      $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS,
-      $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
--     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG );
-+     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $USE_LINUXJDK );
- #
- #-------------------------------------------
- # IId. Declaring the aliases.
-@@ -140,7 +140,8 @@
- $CC			= '@CC@';           # C compiler
- $CXX		= '@CXX@';          # C++ compiler
- $EXCEPTIONS	= '@EXCEPTIONS@';   # Exception handling type
--$ENABLE_DEBUG	= '@ENABLE_DEBUG@';  # Enable a debug build
-+$ENABLE_DEBUG	= '@ENABLE_DEBUG@'; # Enable a debug build
-+$USE_LINUXJDK	= '@USE_LINUXJDK@'; # Use the Linux JDK
- $WRAPCMD	= "";				# Wrapper (only for winnt)
- 
- #
-@@ -1265,7 +1266,12 @@
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
- }
- elsif ($platform eq "$FreeBSD")
--{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+{
-+   if ($USE_LINUXJDK eq "TRUE") {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
-+   } else {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+   }
- }
- elsif ($platform eq "$NetBSD")
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
diff --git a/editors/openoffice.org-2-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk b/editors/openoffice.org-2-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk
deleted file mode 100644
index 2b83f2cd2ec7..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk
+++ /dev/null
@@ -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)					\
diff --git a/editors/openoffice.org-2-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-2-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
deleted file mode 100644
index 3601766ee561..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../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
-@@ -64,8 +64,8 @@
- #mozilla specific stuff.
- MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
- MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
--#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
--#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
-+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
-+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
- #End of mozilla specific stuff.
- 
- PRJ=..$/..$/..$/..
-@@ -107,7 +107,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -123,7 +123,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -141,7 +141,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS+=	    -DMOZILLA_CLIENT \
-             -DOSTYPE=\"Linux2.2.14-5\" -DOJI
- .IF "$(OS)" == "LINUX"
-@@ -157,6 +157,13 @@
-             -fno-rtti -Wall -Wconversion -Wpointer-arith \
-             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-             -Wno-long-long 
-+CDEFS     += -DTRACING
-+.ELIF "$(OS)" == "FREEBSD"
-+CFLAGS +=   -fPIC
-+CFLAGSCXX += \
-+            -fno-rtti -Wall -Wconversion -Wpointer-arith \
-+            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-+            -Wno-long-long -pthread 
- CDEFS     += -DTRACING
- .ENDIF
- .ENDIF
diff --git a/editors/openoffice.org-2-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk b/editors/openoffice.org-2-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
deleted file mode 100644
index b63d2a25f184..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2-devel/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-2-devel/files/patch-cppu+inc+uno+lbnames.h
deleted file mode 100644
index cb43c2d165e9..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-cppu+inc+uno+lbnames.h
+++ /dev/null
@@ -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."
diff --git a/editors/openoffice.org-2-devel/files/patch-cppu+prj+build.lst b/editors/openoffice.org-2-devel/files/patch-cppu+prj+build.lst
deleted file mode 100644
index 78fd210a1193..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-cppu+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-devel/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-2-devel/files/patch-cppuhelper+source+makefile.mk
deleted file mode 100644
index 5fb5bd636eb1..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-cppuhelper+source+makefile.mk
+++ /dev/null
@@ -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 ------------------------------------------------------
diff --git a/editors/openoffice.org-2-devel/files/patch-desktop+source+pkgchk+pkgchk_misc.h b/editors/openoffice.org-2-devel/files/patch-desktop+source+pkgchk+pkgchk_misc.h
deleted file mode 100644
index 391667b66ebd..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-desktop+source+pkgchk+pkgchk_misc.h
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-devel/files/patch-desktop+util+makefile.mk b/editors/openoffice.org-2-devel/files/patch-desktop+util+makefile.mk
deleted file mode 100644
index 025d644a8077..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-desktop+util+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-devel/files/patch-dtrans+source+X11+makefile.mk b/editors/openoffice.org-2-devel/files/patch-dtrans+source+X11+makefile.mk
deleted file mode 100644
index 5881f5d7f6a5..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-dtrans+source+X11+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-eventattacher+source+makefile.mk b/editors/openoffice.org-2-devel/files/patch-eventattacher+source+makefile.mk
deleted file mode 100644
index 4552698eb132..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-eventattacher+source+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2-devel/files/patch-external+gcc3_specific+makefile.mk b/editors/openoffice.org-2-devel/files/patch-external+gcc3_specific+makefile.mk
deleted file mode 100644
index 6b8071f4030e..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-external+gcc3_specific+makefile.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../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"
- 
- .IF "$(OS)"!="MACOSX"
-+.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 @@
-         -rm -f $@
-         +ln -s libgcc_s.so.1 $@
- 
-+.ENDIF 
- .ENDIF 
- 
- .ENDIF
diff --git a/editors/openoffice.org-2-devel/files/patch-freetype+makefile.mk b/editors/openoffice.org-2-devel/files/patch-freetype+makefile.mk
deleted file mode 100644
index 3e5a8dd19f18..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-freetype+makefile.mk
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-2-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-2-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
- 
- /* 
diff --git a/editors/openoffice.org-2-devel/files/patch-javaunohelper+source+makefile.mk b/editors/openoffice.org-2-devel/files/patch-javaunohelper+source+makefile.mk
deleted file mode 100644
index 19f6b86e5ab5..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-javaunohelper+source+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice.org-2-devel/files/patch-jni_uno+jni_java2uno.cxx
deleted file mode 100644
index a9ff9e3fed88..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-jni_uno+jni_java2uno.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-2-devel/files/patch-nas+nas-1.6.patch b/editors/openoffice.org-2-devel/files/patch-nas+nas-1.6.patch
deleted file mode 100644
index b6096654ebaf..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-nas+nas-1.6.patch
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-2-devel/files/patch-offapi+com+sun+star+setup+OSType.idl b/editors/openoffice.org-2-devel/files/patch-offapi+com+sun+star+setup+OSType.idl
deleted file mode 100644
index 3fee562c6d38..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-offapi+com+sun+star+setup+OSType.idl
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-devel/files/patch-offapi+util+makefile.pmk b/editors/openoffice.org-2-devel/files/patch-offapi+util+makefile.pmk
deleted file mode 100644
index 5cdbb1b4aa4a..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-offapi+util+makefile.pmk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-devel/files/patch-package+inc+HashMaps.hxx b/editors/openoffice.org-2-devel/files/patch-package+inc+HashMaps.hxx
deleted file mode 100644
index 35052d291ef7..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-package+inc+HashMaps.hxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-package+inc+ZipPackageFolder.hxx b/editors/openoffice.org-2-devel/files/patch-package+inc+ZipPackageFolder.hxx
deleted file mode 100644
index 014c61403380..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-package+inc+ZipPackageFolder.hxx
+++ /dev/null
@@ -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()
diff --git a/editors/openoffice.org-2-devel/files/patch-package+source+zippackage+ContentInfo.hxx b/editors/openoffice.org-2-devel/files/patch-package+source+zippackage+ContentInfo.hxx
deleted file mode 100644
index c4bf35e79f64..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-package+source+zippackage+ContentInfo.hxx
+++ /dev/null
@@ -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();
diff --git a/editors/openoffice.org-2-devel/files/patch-package+source+zippackage+ZipPackageFolder.cxx b/editors/openoffice.org-2-devel/files/patch-package+source+zippackage+ZipPackageFolder.cxx
deleted file mode 100644
index bb504c834eef..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-package+source+zippackage+ZipPackageFolder.cxx
+++ /dev/null
@@ -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 );
diff --git a/editors/openoffice.org-2-devel/files/patch-registry+source+regkey.cxx b/editors/openoffice.org-2-devel/files/patch-registry+source+regkey.cxx
deleted file mode 100644
index fad069f83f14..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-registry+source+regkey.cxx
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-2-devel/files/patch-rsc+source+rscpp+cpp.h b/editors/openoffice.org-2-devel/files/patch-rsc+source+rscpp+cpp.h
deleted file mode 100644
index 417ab33ba52f..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-rsc+source+rscpp+cpp.h
+++ /dev/null
@@ -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              */
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+nlsupport.c
deleted file mode 100644
index 49fe0da8589b..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+nlsupport.c
+++ /dev/null
@@ -1,160 +0,0 @@
---- ../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
-@@ -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)
- 
-@@ -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 @@
-     { "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-2-devel/files/patch-sal+osl+unx+pipe.c b/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+pipe.c
deleted file mode 100644
index 4aa7b8af1a61..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+pipe.c
+++ /dev/null
@@ -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 )
- 	{			
diff --git a/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+process.c b/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+process.c
deleted file mode 100644
index 50023576bec4..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+process.c
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+security.c b/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+security.c
deleted file mode 100644
index 0cc321dcd544..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+security.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../sal/osl/unx/security.c.orig	Sat Jul 20 22:53:31 2002
-+++ ../sal/osl/unx/security.c	Sat Jul 20 22:52:39 2002
-@@ -739,7 +739,7 @@
- 	}
- 
- 
--#elif (LINUX && (GLIBC >= 2))
-+#elif ((LINUX && (GLIBC >= 2)) || defined(FREEBSD))
- 	
- 	struct passwd	*pPasswd; 
- 	
diff --git a/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+socket.c b/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+socket.c
deleted file mode 100644
index 9541cac8583f..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+socket.c
+++ /dev/null
@@ -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! */
diff --git a/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+system.c b/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+system.c
deleted file mode 100644
index 8dc663ac03fc..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+system.c
+++ /dev/null
@@ -1,127 +0,0 @@
---- ../sal/osl/unx/system.c.orig	Sun Mar 17 12:34:13 2002
-+++ ../sal/osl/unx/system.c	Wed Apr  3 01:03:36 2002
-@@ -195,6 +195,73 @@
- }
- #endif
- 
-+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
-+           size_t buflen, struct passwd **result)
-+{
-+  struct passwd* res;
-+
-+  pthread_mutex_lock(&getrtl_mutex);
-+
-+  if ( res = getpwuid(uid) )
-+  {
-+    size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell;
-+
-+    pw_name = strlen(res->pw_name)+1;
-+    pw_passwd = strlen(res->pw_passwd)+1;
-+    pw_class = strlen(res->pw_class)+1;
-+    pw_gecos = strlen(res->pw_gecos)+1;
-+    pw_dir = strlen(res->pw_dir)+1;
-+    pw_shell = strlen(res->pw_shell)+1;
-+
-+    if (pw_name+pw_passwd+pw_class+pw_gecos
-+                                 +pw_dir+pw_shell < buflen)
-+    {
-+      memcpy(pwd, res, sizeof(struct passwd));
-+
-+      strncpy(buffer, res->pw_name, pw_name);
-+      pwd->pw_name = buffer;
-+      buffer += pw_name;
-+
-+      strncpy(buffer, res->pw_passwd, pw_passwd);
-+      pwd->pw_passwd = buffer;
-+      buffer += pw_passwd;
-+
-+      strncpy(buffer, res->pw_class, pw_class);
-+      pwd->pw_class = buffer;
-+      buffer += pw_class;
-+
-+      strncpy(buffer, res->pw_gecos, pw_gecos);
-+      pwd->pw_gecos = buffer;
-+      buffer += pw_gecos;
-+
-+      strncpy(buffer, res->pw_dir, pw_dir);
-+      pwd->pw_dir = buffer;
-+      buffer += pw_dir;
-+
-+      strncpy(buffer, res->pw_shell, pw_shell);
-+      pwd->pw_shell = buffer;
-+      buffer += pw_shell;
-+
-+      *result = pwd ;
-+      res = 0 ;
-+
-+    } else {
-+
-+      res = ENOMEM ;
-+
-+    }      
-+  
-+  } else {
-+
-+    res = errno ;
-+ 
-+  } 
-+
-+  pthread_mutex_unlock(&getrtl_mutex);
-+
-+  return res;
-+}
-+
- struct tm *localtime_r(const time_t *timep, struct tm *buffer)
- {
- 	struct tm* res;
-@@ -518,3 +585,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-2-devel/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+system.h
deleted file mode 100644
index c4e255952fc7..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+system.h
+++ /dev/null
@@ -1,35 +0,0 @@
---- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
-+++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
-@@ -205,6 +205,13 @@
- #   include <sys/ioctl.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 <machine/vmparam.h>
-+#   include <machine/pmap.h>
- #	include <sys/un.h>
- #   include <netinet/tcp.h>
- #	define 	IORESOURCE_TRANSFER_BSD 
-@@ -216,12 +223,13 @@
- #   elif BYTE_ORDER == PDP_ENDIAN
- #   	define _PDP_ENDIAN
- #   endif
--#   define  sched_yield() 				pthread_yield()
--#   define  pthread_testcancel()
- #	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
diff --git a/editors/openoffice.org-2-devel/files/patch-sal+textenc+tencinfo.c b/editors/openoffice.org-2-devel/files/patch-sal+textenc+tencinfo.c
deleted file mode 100644
index 7cf80c18d0a0..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sal+textenc+tencinfo.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
-     /* 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 */
-+
-+    if (pMimeCharset == NULL)
-+	pMimeCharset = "usascii";
-+
-     static ImplStrCharsetDef const aVIPMimeCharsetTab[] =
-     {
-         { "usascii", RTL_TEXTENCODING_ASCII_US },
diff --git a/editors/openoffice.org-2-devel/files/patch-sal+workben+makefile.mk b/editors/openoffice.org-2-devel/files/patch-sal+workben+makefile.mk
deleted file mode 100644
index 369935e31d66..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sal+workben+makefile.mk
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../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 @@
- 
- .IF "$(TESTAPP)" == "salstattest"
- 
--	CFLAGS+= /DUSE_SAL_STATIC
-+	CFLAGS+= -DUSE_SAL_STATIC
- 
- 	OBJFILES=	$(OBJ)$/salstattest.obj
- 
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- 
- CXXFILES=	tgetpwnam.cxx
- OBJFILES=	$(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN=	$(SLB)$/sal.lib
- 
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd | freebsd)
- .ENDIF # tgetpwname
- 
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-2-devel/files/patch-salhelper+source+gcc2_freebsd_intel.map b/editors/openoffice.org-2-devel/files/patch-salhelper+source+gcc2_freebsd_intel.map
deleted file mode 100644
index 1ffacf889bc6..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-salhelper+source+gcc2_freebsd_intel.map
+++ /dev/null
@@ -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:
-+*;
-+};
diff --git a/editors/openoffice.org-2-devel/files/patch-salhelper+source+gcc3_freebsd_intel.map b/editors/openoffice.org-2-devel/files/patch-salhelper+source+gcc3_freebsd_intel.map
deleted file mode 100644
index 823cff316ec7..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-salhelper+source+gcc3_freebsd_intel.map
+++ /dev/null
@@ -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:
-+		*;
-+};
-+
diff --git a/editors/openoffice.org-2-devel/files/patch-salhelper+source+makefile.mk b/editors/openoffice.org-2-devel/files/patch-salhelper+source+makefile.mk
deleted file mode 100644
index 3687664d8d16..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-salhelper+source+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../salhelper/source/makefile.mk.orig	Wed Nov 14 14:19:21 2001
-+++ ../salhelper/source/makefile.mk	Sun Mar  3 17:58:15 2002
-@@ -109,6 +109,10 @@
- SHL1VERSIONMAP=lngi.map
- .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
- SHL1VERSIONMAP=gcc3_linux_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
- .ENDIF
- 
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-salhelper+test+rtti+makefile.mk b/editors/openoffice.org-2-devel/files/patch-salhelper+test+rtti+makefile.mk
deleted file mode 100644
index 70f25048a24a..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-salhelper+test+rtti+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
- 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
- .ENDIF
- 
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-sc+source+core+data+cell.cxx b/editors/openoffice.org-2-devel/files/patch-sc+source+core+data+cell.cxx
deleted file mode 100644
index 529f67a3e35f..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sc+source+core+data+cell.cxx
+++ /dev/null
@@ -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>
diff --git a/editors/openoffice.org-2-devel/files/patch-scp+source+global+udk_base.scp b/editors/openoffice.org-2-devel/files/patch-scp+source+global+udk_base.scp
deleted file mode 100644
index 623eccb0ff09..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-scp+source+global+udk_base.scp
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-devel/files/patch-scp+source+player+player.scp b/editors/openoffice.org-2-devel/files/patch-scp+source+player+player.scp
deleted file mode 100644
index 2f8daab35cdd..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-scp+source+player+player.scp
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-2-devel/files/patch-scptools+source+linker+searchcache b/editors/openoffice.org-2-devel/files/patch-scptools+source+linker+searchcache
deleted file mode 100644
index 593e9eabf5bc..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-scptools+source+linker+searchcache
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: files/patch-scptools::source::linker::searchcache
-===================================================================
-RCS file: files/patch-scptools::source::linker::searchcache
-diff -N files/patch-scptools::source::linker::searchcache
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-scptools::source::linker::searchcache	4 Aug 2002 15:28:04 -0000
-@@ -0,0 +1,27 @@
-+--- ../scptools/source/linker/searchcache.hxx.orig	Fri Aug  2 22:53:46 2002
-++++ ../scptools/source/linker/searchcache.hxx	Fri Aug  2 22:54:50 2002
-+@@ -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	Fri Aug  2 22:53:35 2002
-++++ ../scptools/source/linker/searchcache.cxx	Fri Aug  2 22:55:14 2002
-+@@ -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-2-devel/files/patch-scptools+source+linker+ziplst.cxx b/editors/openoffice.org-2-devel/files/patch-scptools+source+linker+ziplst.cxx
deleted file mode 100644
index 83b84631542e..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-scptools+source+linker+ziplst.cxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-setup2+inc+fields.hxx b/editors/openoffice.org-2-devel/files/patch-setup2+inc+fields.hxx
deleted file mode 100644
index d56e12f2abf4..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-setup2+inc+fields.hxx
+++ /dev/null
@@ -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[];
diff --git a/editors/openoffice.org-2-devel/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-2-devel/files/patch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 396c586ee3a3..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,30 +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"
- 
-@@ -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" \
diff --git a/editors/openoffice.org-2-devel/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice.org-2-devel/files/patch-setup2+mow+source+loader+makefile.mk
deleted file mode 100644
index 5460e4296587..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-setup2+mow+source+loader+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-setup2+patch+makefile.mk b/editors/openoffice.org-2-devel/files/patch-setup2+patch+makefile.mk
deleted file mode 100644
index 53846a8bdfc9..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-setup2+patch+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-devel/files/patch-setup2+script+setupserver b/editors/openoffice.org-2-devel/files/patch-setup2+script+setupserver
deleted file mode 100644
index 450ea386c841..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-setup2+script+setupserver
+++ /dev/null
@@ -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`"
diff --git a/editors/openoffice.org-2-devel/files/patch-setup2+source+compiler+decltor.cxx b/editors/openoffice.org-2-devel/files/patch-setup2+source+compiler+decltor.cxx
deleted file mode 100644
index 98f6ad2f7567..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-setup2+source+compiler+decltor.cxx
+++ /dev/null
@@ -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";
diff --git a/editors/openoffice.org-2-devel/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx b/editors/openoffice.org-2-devel/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
deleted file mode 100644
index ac0b39a6aa47..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
+++ /dev/null
@@ -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) );
diff --git a/editors/openoffice.org-2-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-2-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
deleted file mode 100644
index f199b18823e1..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-setup2+source+service+interface.cxx b/editors/openoffice.org-2-devel/files/patch-setup2+source+service+interface.cxx
deleted file mode 100644
index 8e478e17971d..000000000000
--- a/editors/openoffice.org-2-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-2-devel/files/patch-shell+source+cmdmail+makefile.mk b/editors/openoffice.org-2-devel/files/patch-shell+source+cmdmail+makefile.mk
deleted file mode 100644
index 0476285c802e..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-shell+source+cmdmail+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-2-devel/files/patch-shell+source+proxysettings+makefile.mk b/editors/openoffice.org-2-devel/files/patch-shell+source+proxysettings+makefile.mk
deleted file mode 100644
index e83cf7c9d7a1..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-shell+source+proxysettings+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-2-devel/files/patch-shell+source+unix+exec+makefile.mk b/editors/openoffice.org-2-devel/files/patch-shell+source+unix+exec+makefile.mk
deleted file mode 100644
index 0b7712ee35f8..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-shell+source+unix+exec+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-2-devel/files/patch-solenv+bin+addsym.awk
deleted file mode 100644
index 996e282b350b..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-solenv+bin+addsym.awk
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
-+++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
-@@ -72,11 +72,11 @@
- END {
-     if (state == 0) {
-         print "# Weak RTTI symbols for C++ exceptions:"
--        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
-+        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
-     }
- }
- state == 2 {
--    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
-+    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
-     state = 3
- }
- /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv+bin+mapgen.pl b/editors/openoffice.org-2-devel/files/patch-solenv+bin+mapgen.pl
deleted file mode 100644
index 71ebdb934120..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-solenv+bin+mapgen.pl
+++ /dev/null
@@ -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, $_);
- 	};
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv+inc+startup+FREEBSD+macros.mk b/editors/openoffice.org-2-devel/files/patch-solenv+inc+startup+FREEBSD+macros.mk
deleted file mode 100644
index 0c1b107de988..000000000000
--- a/editors/openoffice.org-2-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-2-devel/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-2-devel/files/patch-solenv+inc+tg_ext.mk
deleted file mode 100644
index 701692c9425a..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-solenv+inc+tg_ext.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv+inc+tg_moz.mk b/editors/openoffice.org-2-devel/files/patch-solenv+inc+tg_moz.mk
deleted file mode 100644
index 255a41f92281..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-solenv+inc+tg_moz.mk
+++ /dev/null
@@ -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) $@
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index b4764485aa86..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,202 +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
-+# 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*=$(CC)
-+
-+# default linker flags
-+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -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
diff --git a/editors/openoffice.org-2-devel/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice.org-2-devel/files/patch-soltools+checkdll+makefile.mk
deleted file mode 100644
index e6407402258a..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-soltools+checkdll+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-devel/files/patch-soltools+mkdepend+main.c b/editors/openoffice.org-2-devel/files/patch-soltools+mkdepend+main.c
deleted file mode 100644
index cffd5cbb1f43..000000000000
--- a/editors/openoffice.org-2-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-2-devel/files/patch-stlport+makefile.mk b/editors/openoffice.org-2-devel/files/patch-stlport+makefile.mk
deleted file mode 100644
index 797817ba85be..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stlport+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc+source+corereflection+makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc+source+corereflection+makefile.mk
deleted file mode 100644
index 4b319b08d401..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc+source+corereflection+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc+source+defaultregistry+makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc+source+defaultregistry+makefile.mk
deleted file mode 100644
index 4cae0476415a..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc+source+defaultregistry+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc+source+implementationregistration+implreg.cxx b/editors/openoffice.org-2-devel/files/patch-stoc+source+implementationregistration+implreg.cxx
deleted file mode 100644
index 341d621d872c..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc+source+implementationregistration+implreg.cxx
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc+source+implementationregistration+makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc+source+implementationregistration+makefile.mk
deleted file mode 100644
index 0051043b7ecb..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc+source+implementationregistration+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc+source+inspect+makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc+source+inspect+makefile.mk
deleted file mode 100644
index c7cd85253c11..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc+source+inspect+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc+source+invocation+makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc+source+invocation+makefile.mk
deleted file mode 100644
index 9ac2072a5612..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc+source+invocation+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc+source+invocation_adapterfactory+makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
deleted file mode 100644
index 8853ad39a90e..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc+source+javaloader+makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc+source+javaloader+makefile.mk
deleted file mode 100644
index cea499f15c57..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc+source+javaloader+makefile.mk
+++ /dev/null
@@ -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=		
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc+source+javavm+makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc+source+javavm+makefile.mk
deleted file mode 100644
index b895a2b968d4..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc+source+javavm+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc+source+loader+makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc+source+loader+makefile.mk
deleted file mode 100644
index 5a08ee5937b6..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc+source+loader+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc+source+namingservice+makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc+source+namingservice+makefile.mk
deleted file mode 100644
index e573081bc21d..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc+source+namingservice+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc+source+proxy_factory+makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc+source+proxy_factory+makefile.mk
deleted file mode 100644
index 9110b2f50cd1..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc+source+proxy_factory+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc+source+registry_tdprovider+makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc+source+registry_tdprovider+makefile.mk
deleted file mode 100644
index 9d974d1c0d10..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc+source+registry_tdprovider+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc+source+servicemanager+makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc+source+servicemanager+makefile.mk
deleted file mode 100644
index 746776d54759..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc+source+servicemanager+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc+source+tdmanager+makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc+source+tdmanager+makefile.mk
deleted file mode 100644
index 76403fdde841..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc+source+tdmanager+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc+source+typeconv+makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc+source+typeconv+makefile.mk
deleted file mode 100644
index dc647f89a166..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc+source+typeconv+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-devel/files/patch-store+util+makefile.mk b/editors/openoffice.org-2-devel/files/patch-store+util+makefile.mk
deleted file mode 100644
index 6bef6e960f2e..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-store+util+makefile.mk
+++ /dev/null
@@ -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
- 
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-svx+source+fmcomp+makefile.mk b/editors/openoffice.org-2-devel/files/patch-svx+source+fmcomp+makefile.mk
deleted file mode 100644
index b16030080c0d..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-svx+source+fmcomp+makefile.mk
+++ /dev/null
@@ -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= \
diff --git a/editors/openoffice.org-2-devel/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice.org-2-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
deleted file mode 100644
index 3d7c2e22aa63..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
-+++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
-@@ -84,7 +84,9 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- APP1LIBS=
-+.IF "$(OS)"!="FREEBSD"
- APP1STDLIBS=-ldl
-+.ENDIF
- 
- GNOMEFILES= \
- 	locales.tab
diff --git a/editors/openoffice.org-2-devel/files/patch-tools+source+string+tstring.cxx b/editors/openoffice.org-2-devel/files/patch-tools+source+string+tstring.cxx
deleted file mode 100644
index 12bd6bd0b244..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-tools+source+string+tstring.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../tools/source/string/tstring.cxx.orig	Sat Aug 10 12:53:42 2002
-+++ ../tools/source/string/tstring.cxx	Sat Aug 10 12:54:16 2002
-@@ -103,6 +103,9 @@
- xub_StrLen ImplStringLen( const sal_Char* pStr )
- {
- 	const sal_Char* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
-@@ -113,6 +116,9 @@
- xub_StrLen ImplStringLen( const sal_Unicode* pStr )
- {
- 	const sal_Unicode* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
diff --git a/editors/openoffice.org-2-devel/files/patch-unoil+makefile.pmk b/editors/openoffice.org-2-devel/files/patch-unoil+makefile.pmk
deleted file mode 100644
index 7febdabf7b4b..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-unoil+makefile.pmk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../unoil/makefile.pmk.orig	Fri Aug 31 18:04:43 2001
-+++ ../unoil/makefile.pmk	Thu Sep 12 12:17:50 2002
-@@ -74,8 +74,8 @@
- JAVAFILESLIST	:= $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java)
- .ENDIF          # "$(L10N_framework)"==""
- 
--GENJAVAFILES	:= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
--GENCLASSFILES	:= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
-+GENJAVAFILES	+= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
-+GENCLASSFILES	+= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
- 
- # --- Targets ------------------------------------------------------
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-unzip+source+file_io.c b/editors/openoffice.org-2-devel/files/patch-unzip+source+file_io.c
deleted file mode 100644
index 2f85a108c185..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-unzip+source+file_io.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../unzip/source/file_io.c.orig	Sat Oct 19 11:58:45 2002
-+++ ../unzip/source/file_io.c	Sat Oct 19 12:03:40 2002
-@@ -500,7 +500,7 @@
- #ifdef MPW
- 				pCallBack( 0 );
- #else
--				#if defined LINUX || defined MACOSX || defined NETBSD
-+				#if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD
- 				pCallBack( lseek(outfd, 0, SEEK_CUR) );
- 				#else
- 				pCallBack( tell( outfd ) );
-@@ -865,7 +865,9 @@
- 	static struct timeb tbp;
- #endif /* !__386BSD__ */
- #else /* !BSD */
-+#if (!defined(NETBSD) && !defined(FREEBSD))
- 	extern long timezone;
-+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
- #endif /* ?BSD */
- #endif /* ?AMIGA */
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice.org-2-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
deleted file mode 100644
index 41defbd5eb59..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
-+++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
-@@ -65,6 +65,8 @@
- #include <glyphcache.hxx>
- 
- #define Region XLIB_Region
-+typedef unsigned long CARD32;
-+#define Cursor CARD32
- #include <X11/extensions/Xrender.h>
- #undef Region
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice.org-2-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
deleted file mode 100644
index fefc925db41f..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
-@@ -78,6 +78,12 @@
- GETSTYLE_GNOME=getstyle-gnome-linux-intel
- HASGNOME2=TRUE
- .ENDIF
-+.IF "$_(HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
-+.ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
- HASGNOME2=TRUE
diff --git a/editors/openoffice.org-2-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice.org-2-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
deleted file mode 100644
index 984313fc540a..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
-@@ -75,9 +75,15 @@
- 
- HASGNOME2=
- 
--.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
-+.IF "$(OS)$(CPU)"=="LINUXI"
- MSGBOX_GNOME=msgbox-gnome-linux-intel
- HASGNOME2=TRUE
-+.ENDIF
-+.IF "$(_HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+MSGBOX_GNOME=msgbox-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
- .ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice.org-2-devel/files/patch-vcl+workben+officeacceptthread.cxx b/editors/openoffice.org-2-devel/files/patch-vcl+workben+officeacceptthread.cxx
deleted file mode 100644
index 07d9f1060557..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-vcl+workben+officeacceptthread.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/workben/officeacceptthread.cxx.orig	Wed Mar  5 20:25:36 2003
-+++ ../vcl/workben/officeacceptthread.cxx	Wed Mar  5 20:26:03 2003
-@@ -125,7 +125,7 @@
- #if defined (SOLARIS)
- 				int status;
- 				nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG);
--#elif defined(LINUX)
-+#elif defined(LINUX) || defined (FREEBSD)
- 				nRet = kill(aProcessInfo.Ident, 0);
- #endif
- #if defined (UNX)
diff --git a/editors/openoffice.org-2-devel/files/zipmoz.sh b/editors/openoffice.org-2-devel/files/zipmoz.sh
deleted file mode 100644
index 43a4591f3430..000000000000
--- a/editors/openoffice.org-2-devel/files/zipmoz.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/sh -f
-
-RUNTIME_FILES=" components/libabsyncsvc.so components/libaddrbook.so \
-		components/libmork.so components/libmozldap.so \
-		components/libnecko.so components/libprofile.so \
-		components/librdf.so components/libstrres.so \
-		components/libunicharutil.so components/libuconv.so \
-		components/libucvcn.so components/libucvibm.so \
-		components/libucvja.so components/libucvko.so \
-		components/libucvlatin.so components/libucvtw.so \
-		components/libucvtw2.so components/liburiloader.so \
-		components/libvcard.so components/libxpconnect.so \
-		components/libpref.so components/libchrome.so libmozjs.so \
-		libmsgbaseutil.so libldap50.so libnspr4.so libplc4.so \
-		libplds4.so libxpcom.so libmozz.so component.reg \
-		components/necko_dns.xpt components/xpcom_xpti.xpt \
-		components/xpcom_threads.xpt components/xpcom_io.xpt \
-		components/xpcom_ds.xpt components/xpcom_components.xpt \
-		components/xpcom_base.xpt components/xpti.dat \
-		defaults/pref/all.js defaults/pref/config.js \
-		defaults/pref/editor.js defaults/pref/initpref.js \
-		defaults/pref/inspector.js defaults/pref/mailnews.js \
-		defaults/pref/security-prefs.js defaults/pref/unix.js \
-		defaults/pref/xpinstall.js"
-
-LIB_FILES="	lib/libembed_base_s.a lib/libmozreg_s.a \
-		lib/libnspr4.so lib/libxpcom.so lib/libprldap50.so"
-
-INC_FILES="include/"
-INC_FILES2="public/"
-
-if [ $# -lt 2 -o $# -gt 3 ] ; then
-	echo 
-	echo usage: $0 mozilla_dist target [target_dir]
-	echo
-	echo where:
-	echo
-	echo "mozilla_dist points to the mozilla distribution"
-	echo "target concatenates  OS, compiler and CPU (e.g. FREEBSDGCCI etc)"
-	echo "target_dir is the directory to place the zips"
-	exit 1
-fi
-
-MOZ_DIST=$1
-TARGET=$2
-if [ "w$3" != "w" ]; then
-	TARGET_DIR=$3
-else
-	if [ "w$TARGET_DIR" == "w" ]; then
-		TARGET_DIR=
-	fi
-fi
-
-ZIP_TARGET=$TARGET_DIR
-if [ -z "$ZIP_TARGET" ] ; then
-	ZIP_TARGET=../
-fi
-
-# just to remember the current working directory
-STARTING_DIR=`pwd`
-
-echo
-echo --- creating zips for $TARGET, using mozilla distribution in $MOZ_DIST
-
-# Create the directories
-[ ! -d $TARGET_DIR/$TARGET/runtime ] && mkdir -p $TARGET_DIR/$TARGET/runtime
-[ ! -d $TARGET_DIR/$TARGET/runtime/components ] && mkdir -p $TARGET_DIR/$TARGET/runtime/components
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults/pref ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults/pref
-[ ! -d $TARGET_DIR/$TARGET/lib ] && mkdir -p $TARGET_DIR/$TARGET/lib
-[ ! -d $TARGET_DIR/$TARGET/inc ] && mkdir -p $TARGET_DIR/$TARGET/inc
-[ ! -d $TARGET_DIR/$TARGET/inc/nspr ] && mkdir -p $TARGET_DIR/$TARGET/inc/nspr
-[ ! -d $TARGET_DIR/$TARGET/inc/obsolete ] && mkdir -p $TARGET_DIR/$TARGET/inc/obsolete
-
-# Copy the files
-echo
-echo --- copying files
-echo
-
-for i in $RUNTIME_FILES; do
-	if [ ! -f $MOZ_DIST/bin/$i ]; then
-		echo $MOZ_DIST/bin/$i does not exist, check your distribution
-	else
-		if [ `echo $i | grep component` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/components/
-		elif [ `echo $i | grep defaults` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/defaults/pref/
-		else
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/
-		fi
-	fi
-done
-
-for i in $LIB_FILES; do
-	if [ ! -f $MOZ_DIST/$i ]; then
-		echo $MOZ_DIST/$i does not exist, check your distribution
-	else
-		cp -R -L $MOZ_DIST/$i $TARGET_DIR/$TARGET/lib/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES`; do
-	if [ ! -d $i ]; then 
-		cp -R -L $MOZ_DIST/include/$i $TARGET_DIR/$TARGET/inc/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES2`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/public/$i $TARGET_DIR/$TARGET/inc
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/$i $TARGET_DIR/$TARGET/inc/nspr
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr/obsolete`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/obsolete/$i $TARGET_DIR/$TARGET/inc/obsolete
-	fi
-done
-
-# delete old zips
-
-[ -f $TARGET_DIR/$TARGET/runtime.zip ] && rm -f $TARGET_DIR/$TARGET/runtime.zip
-[ -f $TARGET_DIR/$TARGET/lib.zip ] && rm -f $TARGET_DIR/$TARGET/lib.zip
-[ -f $TARGET_DIR/$TARGET/inc.zip ] && rm -f $TARGET_DIR/$TARGET/inc.zip
-
-# zip the runtime files
-
-echo
-echo --- creating ${TARGET}runtime.zip
-echo
-
-cd $TARGET_DIR/$TARGET/runtime
-find . -type f | zip $ZIP_TARGET/${TARGET}runtime.zip -@
-
-# zip the lib files
-echo 
-echo --- creating ${TARGET}lib.zip
-echo 
-
-cd $TARGET_DIR/$TARGET/lib
-find . -type f | zip $ZIP_TARGET/${TARGET}lib.zip -@
-
-# zip the inc files
-echo
-echo --- creating ${TARGET}inc.zip
-echo
-
-cd $TARGET_DIR/$TARGET/inc
-find . -type f | zip $ZIP_TARGET/${TARGET}inc.zip -@
-
-# remove dirs
-cd $STARTING_DIR
-rm -rf $TARGET_DIR/$TARGET
-
-echo
-echo --- done
-echo
-
diff --git a/editors/openoffice.org-2-devel/pkg-descr b/editors/openoffice.org-2-devel/pkg-descr
deleted file mode 100644
index 31fd1b12161a..000000000000
--- a/editors/openoffice.org-2-devel/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-OpenOffice.org is an Open Source, community-developed, multi-platform office
-productivity suite. It includes the key desktop applications, such as a
-word processor, spreadsheet, presentation manager, and drawing program,
-with a user interface and feature set similar to other office suites.
-
-Components include:
-  * A universal word processing application for creating business
-    letters, extensive text documents, professional layouts, and HTML
-    documents.
-  * A sophisticated application for performing advanced spreadsheet
-    functions, such as analyzing figures, creating lists, and viewing data.
-  * A tool for creating effective eye-catching presentations.
-  * A vector-oriented draw module that enables the creation of 3D
-    illustrations
diff --git a/editors/openoffice.org-2-devel/pkg-message b/editors/openoffice.org-2-devel/pkg-message
deleted file mode 100644
index 1dc749f301c2..000000000000
--- a/editors/openoffice.org-2-devel/pkg-message
+++ /dev/null
@@ -1,73 +0,0 @@
-OpenOffice.org Build 643 Personal Install How-To
-
-Written by:	Martin Blapp <mbr@freebsd.org>
-
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
-
-1 User installation
--------------------
-
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
---------------
-
-There are some wrappers installed for fast startup.
-Add "${PREFIX}/bin/" to your PATH and you will be able
-to use them.
-
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
-
-If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
-version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
diff --git a/editors/openoffice.org-2-devel/pkg-plist b/editors/openoffice.org-2-devel/pkg-plist
deleted file mode 100644
index 28bd78453b52..000000000000
--- a/editors/openoffice.org-2-devel/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, do not delete. Package list is generated automatically.
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
deleted file mode 100644
index 6f740924c399..000000000000
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ /dev/null
@@ -1,580 +0,0 @@
-# New ports collection makefile for: OpenOffice
-# Date created:		28 Februar 2002
-# Whom:                 Martin Blapp
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openoffice
-PORTVERSION=	644
-CATEGORIES+=	editors
-MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
-		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
-		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
-		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ny1.mirror.openoffice.org/miscellaneous/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
-MASTER_SITE_SUBDIR=	${PORTVERSION}
-DISTFILES+=	oo_${PORTVERSION}_src.tar.bz2 \
-		gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
-
-BROKEN=		"Does not build"
-
-SORT?=	/usr/bin/sort
-FIND?=	/usr/bin/find
-CUT?=	/usr/bin/cut
-AWK?=	/usr/bin/awk
-GREP?=	/usr/bin/grep
-ZIP?=	${PREFIX}/bin/zip
-UNZIP?=	${PREFIX}/bin/unzip
-ANT?=	${LOCALBASE}/bin/ant
-TCSH?=	/bin/tcsh
-PASTE?=	/usr/bin/paste
-
-.include <bsd.port.pre.mk>
-
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
-DIST_SUBDIR=		openoffice
-DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
-
-#
-# configuration for language specific slave ports
-#
-.if !defined(LANG_EXT)
-LANG_EXT=01
-.else
-#
-# Add pkg-descr and pkg-message if available
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-#
-# LANG_CONFIGURE_ARG is missing for the german port
-#
-.if defined(LANG_EXT)
-CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG},ENUS
-.endif
-.endif
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
-
-EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-
-MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/jakarta-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-.if !defined(DISPLAY)
-BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
-.endif
-.if !defined(WITH_BSD_JDK)
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk14
-.else
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-.endif
-
-USE_PERL5=	yes
-USE_BZIP2=	yes
-USE_BISON=	yes
-USE_GMAKE=	yes
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
-.if !defined(WITH_BSD_JDK)
-JDKDIR?=	${LOCALBASE}/linux-sun-jdk1.4.1
-.else
-JDKDIR?=	${LOCALBASE}/jdk1.4.1
-.endif
-JAVAVM=         ${JDKDIR}/bin/java
-
-GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
-LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
-BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
-
-.if !defined(DISPLAY)
-DISPLAYHACK=localhost:1001
-.endif
-
-CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
-			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
-
-.if !defined(WITH_BSD_JDK)
-CONFIGURE_ARGS+=	--enable-linuxjdk=yes
-.endif
-
-.if defined(WITH_DEBUG)
-.if ${WITH_DEBUG} == 2
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-.endif
-
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"prefered language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
-	@${ECHO} "OPTIONS:"
-.if !defined(USE_GCC)
-	@${ECHO}
-	@${ECHO} "You can compile OO with different"
-	@${ECHO} "gcc compiler versions:"
-	@${ECHO}
-	@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.2"
-	@${ECHO} "to compile openoffice with your"
-	@${ECHO} "prefered compiler."
-.endif
-.if !defined(WITH_BSD_JDK)
-	@${ECHO}
-	@${ECHO} "If you like to use the native BSD"
-	@${ECHO} "JDK for the build system, you can use"
-	@${ECHO} "WITH_BSD_JDK=TRUE to disable the"
-	@${ECHO} "usage of the linux-JDK and linux dependency."
-	@${ECHO}
-.endif
-.if !defined(WITH_DEBUG)
-	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
-	@${ECHO} "if you call make with WITH_DEBUG=1"
-	@${ECHO}
-	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
-	@${ECHO}
-.endif
-.if !defined(WITH_TTF_BYTECODE_ENABLED)
-	@${ECHO}
-	@${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES"
-	@${ECHO} "if you like to use the Freetype library to"
-	@${ECHO} "render TTF fonts. Normally the TTF lib is"
-	@${ECHO} "not used to render fonts."
-	@${ECHO}
-	@${ECHO} "If you have licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479"
-	@${ECHO} "you can enable this option to get better"
-	@${ECHO} "quality of glyphs at small bitmap sizes."
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 450002
-	@${ECHO}
-	@${ECHO} "OS-VERSION ${OSVERSION} too low"
-	@${ECHO}
-	@${ECHO} "OO need some important libc_r and"
-	@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
-	@${ECHO} "RELEASE or 4.6 STABLE."
-	@${FALSE}
-.endif
-	@${ECHO}
-	@${ECHO} "NOTICE:"
-	@${ECHO}
-	@${ECHO} "To build Openoffice, you should have a lot"
-.if defined(WITH_DEBUG)
-	@${ECHO} "of free diskspace (~ 8GB)."
-.else
-	@${ECHO} "of free diskspace (~ 4GB)."
-.endif
-	@${ECHO}
-.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
-    (${OSVERSION} < 500000 && !defined(USE_GCC))
-	@${ECHO} "KERNEL CONFIGURATION:"
-	@${ECHO}
-	@${ECHO} "Openoffice needs a larger stack- and"
-	@${ECHO} "datasize to build. Check your limit"
-	@${ECHO} "settings and and put this in /boot/loader.conf"
-	@${ECHO} "if neccessary:"
-	@${ECHO}
-	@${ECHO} "kern.maxdsiz=\"1073741824\""
-	@${ECHO} "kern.maxssiz=\"268435456\""
-.endif
-	@${ECHO}
-.if ${OSVERSION} < 460002
-	@${ECHO} "REQUIRED SYSTEM PATCHES:"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO} "OO.org can crash if you enter a non existing path"
-	@${ECHO} "or URL in the location bar. To fix these crashes"
-	@${ECHO} "you need a uncommitted system patch for rtld:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460001
-	@${ECHO}
-	@${ECHO} "OO setup is broken on STABLE < 4.6"
-	@${ECHO} "including 4.6 RELEASE."
-	@${ECHO} "You'll need a system patch to solve"
-	@${ECHO} "this problem:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460002
-	@${ECHO}
-	@${ECHO} "OO.org soffice binary can deadlock. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO}
-	@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
-	@${ECHO}
-.endif
-.if !exists(/usr/include/langinfo.h)
-	@${ECHO}
-	@${ECHO} "langinfo.h is missing !"
-	@${ECHO}
-	@${ECHO} "Please upgrade to 4.6 RELEASE or"
-	@${ECHO} "4.6 STABLE."
-	@${ECHO}
-	@${FALSE}
-.endif
-
-post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
-	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
-	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@-${RM} -f ${WRKSRC}/../moz/zipped/*.zip
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
-.if defined(L10NHELP)
-	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
-	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
-.endif
-
-post-patch:
-	@${MAKE} patch-mozilla
-.if defined(WITH_TTF_BYTECODE_ENABLED)
-	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
-		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-			${ECHO_MSG} "===>   Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \
-		fi; \
-		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
-	fi
-.endif
-.if defined(WITH_DEBUG)
-	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
-		PATCHES_APPLIED="" ; \
-		for i in ${PATCHDIR}/debugpatch-*; do \
-			case $$i in \
-				*.orig|*.rej|*~) \
-					${ECHO_MSG} "===>   Ignoring patchfile $$i" ; \
-					;; \
-				*) \
-					if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-						${ECHO_MSG} "===>   Applying ${OPSYS} patch $$i" ; \
-					fi; \
-					if ${PATCH} ${PATCH_ARGS} < $$i ; then \
-						PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
-					else \
-						${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
-						if [ x"$$PATCHES_APPLIED" != x"" ]; then \
-							${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
-						fi; \
-						${FALSE} ; \
-					fi; \
-					;; \
-			esac; \
-		done; \
-	fi;
-.endif
-	@${ECHO_MSG} "===>  Find old malloc.h defines and fix them in ${PKGNAME} source"
-	@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
-		${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
-
-extract-mozilla:
-.if ! exists(${WRKDIR}/mozilla/Makefile)
-	@${ECHO_MSG} "===>  Extracting mozilla sub project"
-	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
-.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment)
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
-.endif
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
-.endif
-	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
-
-patch-mozilla:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
-		${WRKDIR}/mozilla/files/
-	@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
-
-build-mozilla:
-.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
-	@${ECHO_MSG} "===>  Building mozilla sub project"
-.if defined(WITH_DEBUG)
-	@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
-	@${SED} -e 's|--disable-debug||' \
-		-e 's|--disable-cpp-rtti||' \
-		-e 's|--enable-strip||' \
-		< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
-.endif
-.if defined(USE_GCC)
-	@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
-.else
-	@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
-.endif
-	@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
-	@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
-	@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
-.endif
-
-install-mozilla:
-	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
-
-register-mozilla:
-.if exists(${WRKDIR}/mozilla-runtime)
-	@${RM} -rf ${WRKDIR}/mozilla-runtime
-.endif
-	@${MKDIR} ${WRKDIR}/mozilla-runtime
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
-	@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
-	@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
-	@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
-		&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom 
-	@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
-		${WRKDIR}/mozilla-runtime/components/xptitemp.dat
-	@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
-	@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
-		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
-
-mozilla:
-	@${MAKE} extract-mozilla
-	@${MAKE} patch-mozilla
-	@${MAKE} build-mozilla
-	@${MAKE} register-mozilla
-	@${MAKE} install-mozilla
-
-do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
-	@${MAKE} mozilla
-.endif
-.endif
-.endif
-.if exists(${WRKDIR}/.Xvfb.pid)
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.endif
-.if !defined(DISPLAY)
-	#
-	# This is a UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-.endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
-	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-.endif
-.if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
-.endif
-
-pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-
-do-install:
-.if !defined(DISPLAY)
-	#
-	# UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-.endif
-
-install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
-
-post-install:
-	@${ECHO_MSG} "===>  Add wrapper scripts";
-	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
-	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
-
-package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
-.if defined(LANG_SUFFIX)
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
-.else
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
-.endif
-
-update:
-	@${MAKE} fetch
-	@${MAKE} extract
-	@cd ${WRKSRC}/.. && for dir in *; do \
-	    if [ -d $$dir ]; then \
-		cd $$dir; cvs update -d; cd ..; \
-	    fi \
-	done
-
-.include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
deleted file mode 100644
index ec9d6788f104..000000000000
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
-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
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
diff --git a/editors/openoffice.org-2.0-devel/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-2.0-devel/files/debugpatch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 96c651ce22c8..000000000000
--- a/editors/openoffice.org-2.0-devel/files/debugpatch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../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
-@@ -902,6 +902,7 @@
- 
- void KillSetupDir()
- {
-+#if 0
-     DIR* pDir = opendir( strTmpPath );
-     struct dirent* pFile;
- 
-@@ -915,6 +916,10 @@
- 
-     chdir( strInitPath );
-     rmdir( strTmpPath );
-+#else
-+	fprintf(stderr, "\nLeaving behind temporary directory: %s\n",
-+	strTmpPath);
-+#endif
- }
- 
- void makeSymLink( char* s )
diff --git a/editors/openoffice.org-2.0-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2.0-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 52bd2b3d58d6..000000000000
--- a/editors/openoffice.org-2.0-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
-+++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
- 
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- 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
- 
- # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
diff --git a/editors/openoffice.org-2.0-devel/files/oo_setup.resp b/editors/openoffice.org-2.0-devel/files/oo_setup.resp
deleted file mode 100644
index 8eeeb11bd95e..000000000000
--- a/editors/openoffice.org-2.0-devel/files/oo_setup.resp
+++ /dev/null
@@ -1,7 +0,0 @@
-[Environment]
-InstallationMode = INSTALL_NETWORK
-InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org-643
-
-[Java]
-JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-2.0-devel/files/openoffice-wrapper b/editors/openoffice.org-2.0-devel/files/openoffice-wrapper
deleted file mode 100644
index 9f4924c712a2..000000000000
--- a/editors/openoffice.org-2.0-devel/files/openoffice-wrapper
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2.0-devel/files/Attic/openoffice-wrapper,v 1.3 2003-03-05 23:24:05 mbr Exp $
-
-oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/
-program=`echo $0 | sed -e 's|.*-||'`
-
-if [ ! $LANG ]; then
-	export LANG=%%LANG%%
-fi
-
-case $program in
-$0)
-	exec $oopath/soffice "$@"
-	;;
-	*)
-	exec $oopath/$program "$@"
-	;;
-esac
diff --git a/editors/openoffice.org-2.0-devel/files/optpatch-freetype+patch b/editors/openoffice.org-2.0-devel/files/optpatch-freetype+patch
deleted file mode 100644
index b426a8fb7fcc..000000000000
--- a/editors/openoffice.org-2.0-devel/files/optpatch-freetype+patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Index: files/patch-freetype::patch
-===================================================================
-RCS file: files/patch-freetype::patch
-diff -N files/patch-freetype::patch
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-freetype::patch	4 Aug 2002 15:27:42 -0000
-@@ -0,0 +1,201 @@
-+diff -ur ../freetype/freetype-2.0.5.patch oo641d_patched/freetype/freetype-2.0.5.patch
-+--- ../freetype/freetype-2.0.5.patch	Fri Apr  5 21:07:34 2002
-++++ ../freetype/freetype-2.0.5.patch	Sat Mar  9 18:04:17 2002
-+@@ -1,118 +1,79 @@
-+-*** misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 14 00:44:33 2000
-+---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 63,69 ****
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+---- 63,69 ----
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+-*** misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Jun  7 19:36:17 2001
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 631,637 ****
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+---- 631,637 ----
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile -DPIC $pic_flag"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Mon Jan  1 18:25:21 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 1,7 ****
-+---- 1,9 ----
-+-  FT_USE_MODULE(autohint_module_class)
-+-  FT_USE_MODULE(cff_driver_class)
-+-  FT_USE_MODULE(t1cid_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(pcf_driver_class)
-+-+ */
-+-  FT_USE_MODULE(psaux_module_class)
-+-  FT_USE_MODULE(psnames_module_class)
-+-  FT_USE_MODULE(ft_raster1_renderer_class)
-+-***************
-+-*** 9,12 ****
-+---- 11,16 ----
-+-  FT_USE_MODULE(ft_smooth_renderer_class)
-+-  FT_USE_MODULE(tt_driver_class)
-+-  FT_USE_MODULE(t1_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(winfnt_driver_class)
-+-+ */
-+-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h	Tue Aug 21 10:50:45 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 70,76 ****
-+---- 70,79 ----
-+-    /*   All convenience functions are declared as such in their             */
-+-    /*   documentation.                                                      */
-+-    /*                                                                       */
-+-+ /*
-+-  #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-+ */
-+-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-  
-+-  
-+-    /*************************************************************************/
-+-***************
-+-*** 108,116 ****
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-- 
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+---- 111,121 ----
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-+ /*
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-+ */
-+-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig	Mon Jan  7 14:21:35 2002
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Mon Jan  7 14:21:40 2002
-+-***************
-+-*** 2251,2257 ****
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age + 1`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-+---- 2251,2257 ----
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk
-++--- misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:49:17 2001
-++@@ -63,7 +63,7 @@
-++ #   ANSI compliance.
-++ #
-++ ifndef CFLAGS
-++-  CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+++  CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-++ endif
-++ 
-++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh
-++--- misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:47:56 2001
-+++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:49:17 2001
-++@@ -631,7 +631,7 @@
-++     if test "$build_old_libs" = yes; then
-++       if test "$pic_mode" != yes; then
-++ 	# Don't build PIC code
-++-	command="$base_compile $srcfile"
-+++	command="$base_compile $srcfile -DPIC $pic_flag"
-++       else
-++ 	# All platforms use -DPIC, to notify preprocessed assembler code.
-++ 	command="$base_compile $srcfile $pic_flag -DPIC"
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:49:17 2001
-++@@ -1,7 +1,9 @@
-++ FT_USE_MODULE(autohint_module_class)
-++ FT_USE_MODULE(cff_driver_class)
-++ FT_USE_MODULE(t1cid_driver_class)
-+++/*
-++ FT_USE_MODULE(pcf_driver_class)
-+++*/
-++ FT_USE_MODULE(psaux_module_class)
-++ FT_USE_MODULE(psnames_module_class)
-++ FT_USE_MODULE(ft_raster1_renderer_class)
-++@@ -9,4 +11,6 @@
-++ FT_USE_MODULE(ft_smooth_renderer_class)
-++ FT_USE_MODULE(tt_driver_class)
-++ FT_USE_MODULE(t1_driver_class)
-+++/*
-++ FT_USE_MODULE(winfnt_driver_class)
-+++*/
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:51:15 2001
-++@@ -70,7 +70,10 @@
-++   /*   All convenience functions are declared as such in their             */
-++   /*   documentation.                                                      */
-++   /*                                                                       */
-+++/*
-++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+++*/
-+++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-++ 
-++ 
-++   /*************************************************************************/
-++@@ -108,8 +111,10 @@
-++   /*   use a vector `plotter' format that isn't supported when this        */
-++   /*   macro is undefined.                                                 */
-++   /*                                                                       */
-+++/*
-++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++-
-+++*/
-+++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++ 
-++   /*************************************************************************/
-++   /*                                                                       */
-++@@ -338,7 +343,7 @@
-++   /* By undefining this, you will only compile the code necessary to load  */
-++   /* TrueType glyphs without hinting.                                      */
-++   /*                                                                       */
-++-#undef  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-+++#define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-++ 
-++ 
-++   /*************************************************************************/
diff --git a/editors/openoffice.org-2.0-devel/files/optpatch-vcl+util+makefile.pmk b/editors/openoffice.org-2.0-devel/files/optpatch-vcl+util+makefile.pmk
deleted file mode 100644
index 41341ff0b4e8..000000000000
--- a/editors/openoffice.org-2.0-devel/files/optpatch-vcl+util+makefile.pmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/util/makefile.pmk.orig	Mon Aug  5 01:39:41 2002
-+++ ../vcl/util/makefile.pmk	Mon Aug  5 01:40:03 2002
-@@ -64,7 +64,7 @@
- PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch
- PDBTARGET=vcl
- 
--.IF "$(OS)" != "MACOSX"
-+.IF "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- .IF "$(remote)" != ""
- USE_BUILTIN_RASTERIZER=true
- .ENDIF
diff --git a/editors/openoffice.org-2.0-devel/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-2.0-devel/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 078685f3b516..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../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 freebsd genunix";;
-  	*)		JINCSUBDIRS="genunix";;
-  	esac
-  
diff --git a/editors/openoffice.org-2.0-devel/files/patch-bridges+prj+build.lst b/editors/openoffice.org-2.0-devel/files/patch-bridges+prj+build.lst
deleted file mode 100644
index fee3d847c5e6..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-bridges+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
deleted file mode 100644
index 99b8c566fb61..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ /dev/null
@@ -1,102 +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 );
-+    }
- }
- 
- }
diff --git a/editors/openoffice.org-2.0-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice.org-2.0-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
deleted file mode 100644
index 4622b7fe21c4..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-2.0-devel/files/patch-comphelper+util+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-comphelper+util+makefile.mk
deleted file mode 100644
index f2d3092c2ddf..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-comphelper+util+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2.0-devel/files/patch-config_office+configure.in b/editors/openoffice.org-2.0-devel/files/patch-config_office+configure.in
deleted file mode 100644
index a45332fcbec0..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,66 +0,0 @@
---- configure.in.orig	Thu Feb 20 15:49:32 2003
-+++ configure.in	Wed Mar  5 21:22:34 2003
-@@ -95,6 +95,12 @@
-                           
-                           Usage: --enable-macos9
- ],,)
-+AC_ARG_ENABLE(linuxjdk,
-+[  --enable-linuxjdk         Use this option option if you like to use
-+                          the linux-jdk instead of the native jdk.
-+
-+                          Usage: --enable-linuxjdk
-+],,)
- AC_ARG_WITH(lang,
- [  --with-lang             Use this option to build OpenOffice.org with
-                           additional language support. US English is always
-@@ -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
-@@ -1232,7 +1249,11 @@
- if test -n "$enable_debug"; then
-    ENABLE_DEBUG="TRUE"
- else
--   ENABLE_DEBUG="FALSE"
-+fi
-+if test -n "$enable_linuxjdk"; then
-+   USE_LINUXJDK="TRUE"
-+else
-+   USE_LINUXJDK="FALSE"
- fi
- 
- dnl ===================================================================
-@@ -1278,6 +1299,7 @@
- AC_SUBST(PTHREAD_CFLAGS)
- AC_SUBST(PTHREAD_LIBS)
- AC_SUBST(ENABLE_DEBUG)
-+AC_SUBST(USE_LINUXJDK)
- 
- AC_OUTPUT([set_soenv])
- 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-config_office+set_soenv.in b/editors/openoffice.org-2.0-devel/files/patch-config_office+set_soenv.in
deleted file mode 100644
index 9ea6b11bdab2..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-config_office+set_soenv.in
+++ /dev/null
@@ -1,44 +0,0 @@
---- set_soenv.in.orig	Thu Feb 27 15:12:36 2003
-+++ set_soenv.in	Wed Mar  5 21:16:43 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, 
-@@ -88,7 +88,7 @@
-      $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
-      $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS,
-      $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
--     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG );
-+     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $USE_LINUXJDK );
- #
- #-------------------------------------------
- # IId. Declaring the aliases.
-@@ -140,7 +140,8 @@
- $CC			= '@CC@';           # C compiler
- $CXX		= '@CXX@';          # C++ compiler
- $EXCEPTIONS	= '@EXCEPTIONS@';   # Exception handling type
--$ENABLE_DEBUG	= '@ENABLE_DEBUG@';  # Enable a debug build
-+$ENABLE_DEBUG	= '@ENABLE_DEBUG@'; # Enable a debug build
-+$USE_LINUXJDK	= '@USE_LINUXJDK@'; # Use the Linux JDK
- $WRAPCMD	= "";				# Wrapper (only for winnt)
- 
- #
-@@ -1265,7 +1266,12 @@
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
- }
- elsif ($platform eq "$FreeBSD")
--{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+{
-+   if ($USE_LINUXJDK eq "TRUE") {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
-+   } else {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+   }
- }
- elsif ($platform eq "$NetBSD")
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
diff --git a/editors/openoffice.org-2.0-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk
deleted file mode 100644
index 2b83f2cd2ec7..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk
+++ /dev/null
@@ -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)					\
diff --git a/editors/openoffice.org-2.0-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
deleted file mode 100644
index 3601766ee561..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../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
-@@ -64,8 +64,8 @@
- #mozilla specific stuff.
- MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
- MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
--#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
--#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
-+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
-+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
- #End of mozilla specific stuff.
- 
- PRJ=..$/..$/..$/..
-@@ -107,7 +107,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -123,7 +123,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -141,7 +141,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS+=	    -DMOZILLA_CLIENT \
-             -DOSTYPE=\"Linux2.2.14-5\" -DOJI
- .IF "$(OS)" == "LINUX"
-@@ -157,6 +157,13 @@
-             -fno-rtti -Wall -Wconversion -Wpointer-arith \
-             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-             -Wno-long-long 
-+CDEFS     += -DTRACING
-+.ELIF "$(OS)" == "FREEBSD"
-+CFLAGS +=   -fPIC
-+CFLAGSCXX += \
-+            -fno-rtti -Wall -Wconversion -Wpointer-arith \
-+            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-+            -Wno-long-long -pthread 
- CDEFS     += -DTRACING
- .ENDIF
- .ENDIF
diff --git a/editors/openoffice.org-2.0-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
deleted file mode 100644
index b63d2a25f184..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2.0-devel/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-2.0-devel/files/patch-cppu+inc+uno+lbnames.h
deleted file mode 100644
index cb43c2d165e9..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-cppu+inc+uno+lbnames.h
+++ /dev/null
@@ -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."
diff --git a/editors/openoffice.org-2.0-devel/files/patch-cppu+prj+build.lst b/editors/openoffice.org-2.0-devel/files/patch-cppu+prj+build.lst
deleted file mode 100644
index 78fd210a1193..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-cppu+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0-devel/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-cppuhelper+source+makefile.mk
deleted file mode 100644
index 5fb5bd636eb1..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-cppuhelper+source+makefile.mk
+++ /dev/null
@@ -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 ------------------------------------------------------
diff --git a/editors/openoffice.org-2.0-devel/files/patch-desktop+source+pkgchk+pkgchk_misc.h b/editors/openoffice.org-2.0-devel/files/patch-desktop+source+pkgchk+pkgchk_misc.h
deleted file mode 100644
index 391667b66ebd..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-desktop+source+pkgchk+pkgchk_misc.h
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0-devel/files/patch-desktop+util+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-desktop+util+makefile.mk
deleted file mode 100644
index 025d644a8077..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-desktop+util+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0-devel/files/patch-dtrans+source+X11+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-dtrans+source+X11+makefile.mk
deleted file mode 100644
index 5881f5d7f6a5..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-dtrans+source+X11+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-eventattacher+source+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-eventattacher+source+makefile.mk
deleted file mode 100644
index 4552698eb132..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-eventattacher+source+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2.0-devel/files/patch-external+gcc3_specific+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-external+gcc3_specific+makefile.mk
deleted file mode 100644
index 6b8071f4030e..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-external+gcc3_specific+makefile.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../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"
- 
- .IF "$(OS)"!="MACOSX"
-+.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 @@
-         -rm -f $@
-         +ln -s libgcc_s.so.1 $@
- 
-+.ENDIF 
- .ENDIF 
- 
- .ENDIF
diff --git a/editors/openoffice.org-2.0-devel/files/patch-freetype+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-freetype+makefile.mk
deleted file mode 100644
index 3e5a8dd19f18..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-freetype+makefile.mk
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-2.0-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-2.0-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
- 
- /* 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-javaunohelper+source+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-javaunohelper+source+makefile.mk
deleted file mode 100644
index 19f6b86e5ab5..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-javaunohelper+source+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice.org-2.0-devel/files/patch-jni_uno+jni_java2uno.cxx
deleted file mode 100644
index a9ff9e3fed88..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-jni_uno+jni_java2uno.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-2.0-devel/files/patch-nas+nas-1.6.patch b/editors/openoffice.org-2.0-devel/files/patch-nas+nas-1.6.patch
deleted file mode 100644
index b6096654ebaf..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-nas+nas-1.6.patch
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-2.0-devel/files/patch-offapi+com+sun+star+setup+OSType.idl b/editors/openoffice.org-2.0-devel/files/patch-offapi+com+sun+star+setup+OSType.idl
deleted file mode 100644
index 3fee562c6d38..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-offapi+com+sun+star+setup+OSType.idl
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0-devel/files/patch-offapi+util+makefile.pmk b/editors/openoffice.org-2.0-devel/files/patch-offapi+util+makefile.pmk
deleted file mode 100644
index 5cdbb1b4aa4a..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-offapi+util+makefile.pmk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0-devel/files/patch-package+inc+HashMaps.hxx b/editors/openoffice.org-2.0-devel/files/patch-package+inc+HashMaps.hxx
deleted file mode 100644
index 35052d291ef7..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-package+inc+HashMaps.hxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-package+inc+ZipPackageFolder.hxx b/editors/openoffice.org-2.0-devel/files/patch-package+inc+ZipPackageFolder.hxx
deleted file mode 100644
index 014c61403380..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-package+inc+ZipPackageFolder.hxx
+++ /dev/null
@@ -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()
diff --git a/editors/openoffice.org-2.0-devel/files/patch-package+source+zippackage+ContentInfo.hxx b/editors/openoffice.org-2.0-devel/files/patch-package+source+zippackage+ContentInfo.hxx
deleted file mode 100644
index c4bf35e79f64..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-package+source+zippackage+ContentInfo.hxx
+++ /dev/null
@@ -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();
diff --git a/editors/openoffice.org-2.0-devel/files/patch-package+source+zippackage+ZipPackageFolder.cxx b/editors/openoffice.org-2.0-devel/files/patch-package+source+zippackage+ZipPackageFolder.cxx
deleted file mode 100644
index bb504c834eef..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-package+source+zippackage+ZipPackageFolder.cxx
+++ /dev/null
@@ -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 );
diff --git a/editors/openoffice.org-2.0-devel/files/patch-registry+source+regkey.cxx b/editors/openoffice.org-2.0-devel/files/patch-registry+source+regkey.cxx
deleted file mode 100644
index fad069f83f14..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-registry+source+regkey.cxx
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-2.0-devel/files/patch-rsc+source+rscpp+cpp.h b/editors/openoffice.org-2.0-devel/files/patch-rsc+source+rscpp+cpp.h
deleted file mode 100644
index 417ab33ba52f..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-rsc+source+rscpp+cpp.h
+++ /dev/null
@@ -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              */
- 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+nlsupport.c
deleted file mode 100644
index 49fe0da8589b..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+nlsupport.c
+++ /dev/null
@@ -1,160 +0,0 @@
---- ../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
-@@ -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)
- 
-@@ -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 @@
-     { "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-2.0-devel/files/patch-sal+osl+unx+pipe.c b/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+pipe.c
deleted file mode 100644
index 4aa7b8af1a61..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+pipe.c
+++ /dev/null
@@ -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 )
- 	{			
diff --git a/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+process.c b/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+process.c
deleted file mode 100644
index 50023576bec4..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+process.c
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+security.c b/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+security.c
deleted file mode 100644
index 0cc321dcd544..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+security.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../sal/osl/unx/security.c.orig	Sat Jul 20 22:53:31 2002
-+++ ../sal/osl/unx/security.c	Sat Jul 20 22:52:39 2002
-@@ -739,7 +739,7 @@
- 	}
- 
- 
--#elif (LINUX && (GLIBC >= 2))
-+#elif ((LINUX && (GLIBC >= 2)) || defined(FREEBSD))
- 	
- 	struct passwd	*pPasswd; 
- 	
diff --git a/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+socket.c b/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+socket.c
deleted file mode 100644
index 9541cac8583f..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+socket.c
+++ /dev/null
@@ -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! */
diff --git a/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+system.c b/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+system.c
deleted file mode 100644
index 8dc663ac03fc..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+system.c
+++ /dev/null
@@ -1,127 +0,0 @@
---- ../sal/osl/unx/system.c.orig	Sun Mar 17 12:34:13 2002
-+++ ../sal/osl/unx/system.c	Wed Apr  3 01:03:36 2002
-@@ -195,6 +195,73 @@
- }
- #endif
- 
-+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
-+           size_t buflen, struct passwd **result)
-+{
-+  struct passwd* res;
-+
-+  pthread_mutex_lock(&getrtl_mutex);
-+
-+  if ( res = getpwuid(uid) )
-+  {
-+    size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell;
-+
-+    pw_name = strlen(res->pw_name)+1;
-+    pw_passwd = strlen(res->pw_passwd)+1;
-+    pw_class = strlen(res->pw_class)+1;
-+    pw_gecos = strlen(res->pw_gecos)+1;
-+    pw_dir = strlen(res->pw_dir)+1;
-+    pw_shell = strlen(res->pw_shell)+1;
-+
-+    if (pw_name+pw_passwd+pw_class+pw_gecos
-+                                 +pw_dir+pw_shell < buflen)
-+    {
-+      memcpy(pwd, res, sizeof(struct passwd));
-+
-+      strncpy(buffer, res->pw_name, pw_name);
-+      pwd->pw_name = buffer;
-+      buffer += pw_name;
-+
-+      strncpy(buffer, res->pw_passwd, pw_passwd);
-+      pwd->pw_passwd = buffer;
-+      buffer += pw_passwd;
-+
-+      strncpy(buffer, res->pw_class, pw_class);
-+      pwd->pw_class = buffer;
-+      buffer += pw_class;
-+
-+      strncpy(buffer, res->pw_gecos, pw_gecos);
-+      pwd->pw_gecos = buffer;
-+      buffer += pw_gecos;
-+
-+      strncpy(buffer, res->pw_dir, pw_dir);
-+      pwd->pw_dir = buffer;
-+      buffer += pw_dir;
-+
-+      strncpy(buffer, res->pw_shell, pw_shell);
-+      pwd->pw_shell = buffer;
-+      buffer += pw_shell;
-+
-+      *result = pwd ;
-+      res = 0 ;
-+
-+    } else {
-+
-+      res = ENOMEM ;
-+
-+    }      
-+  
-+  } else {
-+
-+    res = errno ;
-+ 
-+  } 
-+
-+  pthread_mutex_unlock(&getrtl_mutex);
-+
-+  return res;
-+}
-+
- struct tm *localtime_r(const time_t *timep, struct tm *buffer)
- {
- 	struct tm* res;
-@@ -518,3 +585,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-2.0-devel/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+system.h
deleted file mode 100644
index c4e255952fc7..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+system.h
+++ /dev/null
@@ -1,35 +0,0 @@
---- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
-+++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
-@@ -205,6 +205,13 @@
- #   include <sys/ioctl.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 <machine/vmparam.h>
-+#   include <machine/pmap.h>
- #	include <sys/un.h>
- #   include <netinet/tcp.h>
- #	define 	IORESOURCE_TRANSFER_BSD 
-@@ -216,12 +223,13 @@
- #   elif BYTE_ORDER == PDP_ENDIAN
- #   	define _PDP_ENDIAN
- #   endif
--#   define  sched_yield() 				pthread_yield()
--#   define  pthread_testcancel()
- #	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
diff --git a/editors/openoffice.org-2.0-devel/files/patch-sal+textenc+tencinfo.c b/editors/openoffice.org-2.0-devel/files/patch-sal+textenc+tencinfo.c
deleted file mode 100644
index 7cf80c18d0a0..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-sal+textenc+tencinfo.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
-     /* 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 */
-+
-+    if (pMimeCharset == NULL)
-+	pMimeCharset = "usascii";
-+
-     static ImplStrCharsetDef const aVIPMimeCharsetTab[] =
-     {
-         { "usascii", RTL_TEXTENCODING_ASCII_US },
diff --git a/editors/openoffice.org-2.0-devel/files/patch-sal+workben+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-sal+workben+makefile.mk
deleted file mode 100644
index 369935e31d66..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-sal+workben+makefile.mk
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../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 @@
- 
- .IF "$(TESTAPP)" == "salstattest"
- 
--	CFLAGS+= /DUSE_SAL_STATIC
-+	CFLAGS+= -DUSE_SAL_STATIC
- 
- 	OBJFILES=	$(OBJ)$/salstattest.obj
- 
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- 
- CXXFILES=	tgetpwnam.cxx
- OBJFILES=	$(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN=	$(SLB)$/sal.lib
- 
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd | freebsd)
- .ENDIF # tgetpwname
- 
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-2.0-devel/files/patch-salhelper+source+gcc2_freebsd_intel.map b/editors/openoffice.org-2.0-devel/files/patch-salhelper+source+gcc2_freebsd_intel.map
deleted file mode 100644
index 1ffacf889bc6..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-salhelper+source+gcc2_freebsd_intel.map
+++ /dev/null
@@ -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:
-+*;
-+};
diff --git a/editors/openoffice.org-2.0-devel/files/patch-salhelper+source+gcc3_freebsd_intel.map b/editors/openoffice.org-2.0-devel/files/patch-salhelper+source+gcc3_freebsd_intel.map
deleted file mode 100644
index 823cff316ec7..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-salhelper+source+gcc3_freebsd_intel.map
+++ /dev/null
@@ -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:
-+		*;
-+};
-+
diff --git a/editors/openoffice.org-2.0-devel/files/patch-salhelper+source+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-salhelper+source+makefile.mk
deleted file mode 100644
index 3687664d8d16..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-salhelper+source+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../salhelper/source/makefile.mk.orig	Wed Nov 14 14:19:21 2001
-+++ ../salhelper/source/makefile.mk	Sun Mar  3 17:58:15 2002
-@@ -109,6 +109,10 @@
- SHL1VERSIONMAP=lngi.map
- .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
- SHL1VERSIONMAP=gcc3_linux_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
- .ENDIF
- 
- 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-salhelper+test+rtti+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-salhelper+test+rtti+makefile.mk
deleted file mode 100644
index 70f25048a24a..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-salhelper+test+rtti+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
- 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
- .ENDIF
- 
- 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-sc+source+core+data+cell.cxx b/editors/openoffice.org-2.0-devel/files/patch-sc+source+core+data+cell.cxx
deleted file mode 100644
index 529f67a3e35f..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-sc+source+core+data+cell.cxx
+++ /dev/null
@@ -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>
diff --git a/editors/openoffice.org-2.0-devel/files/patch-scp+source+global+udk_base.scp b/editors/openoffice.org-2.0-devel/files/patch-scp+source+global+udk_base.scp
deleted file mode 100644
index 623eccb0ff09..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-scp+source+global+udk_base.scp
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0-devel/files/patch-scp+source+player+player.scp b/editors/openoffice.org-2.0-devel/files/patch-scp+source+player+player.scp
deleted file mode 100644
index 2f8daab35cdd..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-scp+source+player+player.scp
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-2.0-devel/files/patch-scptools+source+linker+searchcache b/editors/openoffice.org-2.0-devel/files/patch-scptools+source+linker+searchcache
deleted file mode 100644
index 593e9eabf5bc..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-scptools+source+linker+searchcache
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: files/patch-scptools::source::linker::searchcache
-===================================================================
-RCS file: files/patch-scptools::source::linker::searchcache
-diff -N files/patch-scptools::source::linker::searchcache
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-scptools::source::linker::searchcache	4 Aug 2002 15:28:04 -0000
-@@ -0,0 +1,27 @@
-+--- ../scptools/source/linker/searchcache.hxx.orig	Fri Aug  2 22:53:46 2002
-++++ ../scptools/source/linker/searchcache.hxx	Fri Aug  2 22:54:50 2002
-+@@ -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	Fri Aug  2 22:53:35 2002
-++++ ../scptools/source/linker/searchcache.cxx	Fri Aug  2 22:55:14 2002
-+@@ -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-2.0-devel/files/patch-scptools+source+linker+ziplst.cxx b/editors/openoffice.org-2.0-devel/files/patch-scptools+source+linker+ziplst.cxx
deleted file mode 100644
index 83b84631542e..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-scptools+source+linker+ziplst.cxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-setup2+inc+fields.hxx b/editors/openoffice.org-2.0-devel/files/patch-setup2+inc+fields.hxx
deleted file mode 100644
index d56e12f2abf4..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-setup2+inc+fields.hxx
+++ /dev/null
@@ -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[];
diff --git a/editors/openoffice.org-2.0-devel/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-2.0-devel/files/patch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 396c586ee3a3..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,30 +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"
- 
-@@ -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" \
diff --git a/editors/openoffice.org-2.0-devel/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-setup2+mow+source+loader+makefile.mk
deleted file mode 100644
index 5460e4296587..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-setup2+mow+source+loader+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-setup2+patch+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-setup2+patch+makefile.mk
deleted file mode 100644
index 53846a8bdfc9..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-setup2+patch+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0-devel/files/patch-setup2+script+setupserver b/editors/openoffice.org-2.0-devel/files/patch-setup2+script+setupserver
deleted file mode 100644
index 450ea386c841..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-setup2+script+setupserver
+++ /dev/null
@@ -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`"
diff --git a/editors/openoffice.org-2.0-devel/files/patch-setup2+source+compiler+decltor.cxx b/editors/openoffice.org-2.0-devel/files/patch-setup2+source+compiler+decltor.cxx
deleted file mode 100644
index 98f6ad2f7567..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-setup2+source+compiler+decltor.cxx
+++ /dev/null
@@ -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";
diff --git a/editors/openoffice.org-2.0-devel/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx b/editors/openoffice.org-2.0-devel/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
deleted file mode 100644
index ac0b39a6aa47..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
+++ /dev/null
@@ -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) );
diff --git a/editors/openoffice.org-2.0-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-2.0-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
deleted file mode 100644
index f199b18823e1..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-setup2+source+service+interface.cxx b/editors/openoffice.org-2.0-devel/files/patch-setup2+source+service+interface.cxx
deleted file mode 100644
index 8e478e17971d..000000000000
--- a/editors/openoffice.org-2.0-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-2.0-devel/files/patch-shell+source+cmdmail+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-shell+source+cmdmail+makefile.mk
deleted file mode 100644
index 0476285c802e..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-shell+source+cmdmail+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-2.0-devel/files/patch-shell+source+proxysettings+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-shell+source+proxysettings+makefile.mk
deleted file mode 100644
index e83cf7c9d7a1..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-shell+source+proxysettings+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-2.0-devel/files/patch-shell+source+unix+exec+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-shell+source+unix+exec+makefile.mk
deleted file mode 100644
index 0b7712ee35f8..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-shell+source+unix+exec+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-2.0-devel/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-2.0-devel/files/patch-solenv+bin+addsym.awk
deleted file mode 100644
index 996e282b350b..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-solenv+bin+addsym.awk
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
-+++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
-@@ -72,11 +72,11 @@
- END {
-     if (state == 0) {
-         print "# Weak RTTI symbols for C++ exceptions:"
--        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
-+        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
-     }
- }
- state == 2 {
--    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
-+    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
-     state = 3
- }
- /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice.org-2.0-devel/files/patch-solenv+bin+mapgen.pl b/editors/openoffice.org-2.0-devel/files/patch-solenv+bin+mapgen.pl
deleted file mode 100644
index 71ebdb934120..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-solenv+bin+mapgen.pl
+++ /dev/null
@@ -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, $_);
- 	};
diff --git a/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+startup+FREEBSD+macros.mk b/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+startup+FREEBSD+macros.mk
deleted file mode 100644
index 0c1b107de988..000000000000
--- a/editors/openoffice.org-2.0-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-2.0-devel/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+tg_ext.mk
deleted file mode 100644
index 701692c9425a..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+tg_ext.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+tg_moz.mk b/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+tg_moz.mk
deleted file mode 100644
index 255a41f92281..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+tg_moz.mk
+++ /dev/null
@@ -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) $@
diff --git a/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index b4764485aa86..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,202 +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
-+# 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*=$(CC)
-+
-+# default linker flags
-+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -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
diff --git a/editors/openoffice.org-2.0-devel/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-soltools+checkdll+makefile.mk
deleted file mode 100644
index e6407402258a..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-soltools+checkdll+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0-devel/files/patch-soltools+mkdepend+main.c b/editors/openoffice.org-2.0-devel/files/patch-soltools+mkdepend+main.c
deleted file mode 100644
index cffd5cbb1f43..000000000000
--- a/editors/openoffice.org-2.0-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-2.0-devel/files/patch-stlport+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-stlport+makefile.mk
deleted file mode 100644
index 797817ba85be..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-stlport+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+corereflection+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-stoc+source+corereflection+makefile.mk
deleted file mode 100644
index 4b319b08d401..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+corereflection+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+defaultregistry+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-stoc+source+defaultregistry+makefile.mk
deleted file mode 100644
index 4cae0476415a..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+defaultregistry+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+implementationregistration+implreg.cxx b/editors/openoffice.org-2.0-devel/files/patch-stoc+source+implementationregistration+implreg.cxx
deleted file mode 100644
index 341d621d872c..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+implementationregistration+implreg.cxx
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+implementationregistration+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-stoc+source+implementationregistration+makefile.mk
deleted file mode 100644
index 0051043b7ecb..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+implementationregistration+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+inspect+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-stoc+source+inspect+makefile.mk
deleted file mode 100644
index c7cd85253c11..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+inspect+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+invocation+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-stoc+source+invocation+makefile.mk
deleted file mode 100644
index 9ac2072a5612..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+invocation+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+invocation_adapterfactory+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
deleted file mode 100644
index 8853ad39a90e..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+javaloader+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-stoc+source+javaloader+makefile.mk
deleted file mode 100644
index cea499f15c57..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+javaloader+makefile.mk
+++ /dev/null
@@ -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=		
diff --git a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+javavm+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-stoc+source+javavm+makefile.mk
deleted file mode 100644
index b895a2b968d4..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+javavm+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+loader+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-stoc+source+loader+makefile.mk
deleted file mode 100644
index 5a08ee5937b6..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+loader+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+namingservice+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-stoc+source+namingservice+makefile.mk
deleted file mode 100644
index e573081bc21d..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+namingservice+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+proxy_factory+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-stoc+source+proxy_factory+makefile.mk
deleted file mode 100644
index 9110b2f50cd1..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+proxy_factory+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+registry_tdprovider+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-stoc+source+registry_tdprovider+makefile.mk
deleted file mode 100644
index 9d974d1c0d10..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+registry_tdprovider+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+servicemanager+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-stoc+source+servicemanager+makefile.mk
deleted file mode 100644
index 746776d54759..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+servicemanager+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+tdmanager+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-stoc+source+tdmanager+makefile.mk
deleted file mode 100644
index 76403fdde841..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+tdmanager+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+typeconv+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-stoc+source+typeconv+makefile.mk
deleted file mode 100644
index dc647f89a166..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+typeconv+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0-devel/files/patch-store+util+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-store+util+makefile.mk
deleted file mode 100644
index 6bef6e960f2e..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-store+util+makefile.mk
+++ /dev/null
@@ -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
- 
- 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-svx+source+fmcomp+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-svx+source+fmcomp+makefile.mk
deleted file mode 100644
index b16030080c0d..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-svx+source+fmcomp+makefile.mk
+++ /dev/null
@@ -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= \
diff --git a/editors/openoffice.org-2.0-devel/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
deleted file mode 100644
index 3d7c2e22aa63..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
-+++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
-@@ -84,7 +84,9 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- APP1LIBS=
-+.IF "$(OS)"!="FREEBSD"
- APP1STDLIBS=-ldl
-+.ENDIF
- 
- GNOMEFILES= \
- 	locales.tab
diff --git a/editors/openoffice.org-2.0-devel/files/patch-tools+source+string+tstring.cxx b/editors/openoffice.org-2.0-devel/files/patch-tools+source+string+tstring.cxx
deleted file mode 100644
index 12bd6bd0b244..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-tools+source+string+tstring.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../tools/source/string/tstring.cxx.orig	Sat Aug 10 12:53:42 2002
-+++ ../tools/source/string/tstring.cxx	Sat Aug 10 12:54:16 2002
-@@ -103,6 +103,9 @@
- xub_StrLen ImplStringLen( const sal_Char* pStr )
- {
- 	const sal_Char* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
-@@ -113,6 +116,9 @@
- xub_StrLen ImplStringLen( const sal_Unicode* pStr )
- {
- 	const sal_Unicode* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
diff --git a/editors/openoffice.org-2.0-devel/files/patch-unoil+makefile.pmk b/editors/openoffice.org-2.0-devel/files/patch-unoil+makefile.pmk
deleted file mode 100644
index 7febdabf7b4b..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-unoil+makefile.pmk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../unoil/makefile.pmk.orig	Fri Aug 31 18:04:43 2001
-+++ ../unoil/makefile.pmk	Thu Sep 12 12:17:50 2002
-@@ -74,8 +74,8 @@
- JAVAFILESLIST	:= $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java)
- .ENDIF          # "$(L10N_framework)"==""
- 
--GENJAVAFILES	:= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
--GENCLASSFILES	:= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
-+GENJAVAFILES	+= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
-+GENCLASSFILES	+= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
- 
- # --- Targets ------------------------------------------------------
- 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-unzip+source+file_io.c b/editors/openoffice.org-2.0-devel/files/patch-unzip+source+file_io.c
deleted file mode 100644
index 2f85a108c185..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-unzip+source+file_io.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../unzip/source/file_io.c.orig	Sat Oct 19 11:58:45 2002
-+++ ../unzip/source/file_io.c	Sat Oct 19 12:03:40 2002
-@@ -500,7 +500,7 @@
- #ifdef MPW
- 				pCallBack( 0 );
- #else
--				#if defined LINUX || defined MACOSX || defined NETBSD
-+				#if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD
- 				pCallBack( lseek(outfd, 0, SEEK_CUR) );
- 				#else
- 				pCallBack( tell( outfd ) );
-@@ -865,7 +865,9 @@
- 	static struct timeb tbp;
- #endif /* !__386BSD__ */
- #else /* !BSD */
-+#if (!defined(NETBSD) && !defined(FREEBSD))
- 	extern long timezone;
-+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
- #endif /* ?BSD */
- #endif /* ?AMIGA */
- 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice.org-2.0-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
deleted file mode 100644
index 41defbd5eb59..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
-+++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
-@@ -65,6 +65,8 @@
- #include <glyphcache.hxx>
- 
- #define Region XLIB_Region
-+typedef unsigned long CARD32;
-+#define Cursor CARD32
- #include <X11/extensions/Xrender.h>
- #undef Region
- 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
deleted file mode 100644
index fefc925db41f..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
-@@ -78,6 +78,12 @@
- GETSTYLE_GNOME=getstyle-gnome-linux-intel
- HASGNOME2=TRUE
- .ENDIF
-+.IF "$_(HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
-+.ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
- HASGNOME2=TRUE
diff --git a/editors/openoffice.org-2.0-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
deleted file mode 100644
index 984313fc540a..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
-@@ -75,9 +75,15 @@
- 
- HASGNOME2=
- 
--.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
-+.IF "$(OS)$(CPU)"=="LINUXI"
- MSGBOX_GNOME=msgbox-gnome-linux-intel
- HASGNOME2=TRUE
-+.ENDIF
-+.IF "$(_HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+MSGBOX_GNOME=msgbox-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
- .ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice.org-2.0-devel/files/patch-vcl+workben+officeacceptthread.cxx b/editors/openoffice.org-2.0-devel/files/patch-vcl+workben+officeacceptthread.cxx
deleted file mode 100644
index 07d9f1060557..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-vcl+workben+officeacceptthread.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/workben/officeacceptthread.cxx.orig	Wed Mar  5 20:25:36 2003
-+++ ../vcl/workben/officeacceptthread.cxx	Wed Mar  5 20:26:03 2003
-@@ -125,7 +125,7 @@
- #if defined (SOLARIS)
- 				int status;
- 				nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG);
--#elif defined(LINUX)
-+#elif defined(LINUX) || defined (FREEBSD)
- 				nRet = kill(aProcessInfo.Ident, 0);
- #endif
- #if defined (UNX)
diff --git a/editors/openoffice.org-2.0-devel/files/zipmoz.sh b/editors/openoffice.org-2.0-devel/files/zipmoz.sh
deleted file mode 100644
index 43a4591f3430..000000000000
--- a/editors/openoffice.org-2.0-devel/files/zipmoz.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/sh -f
-
-RUNTIME_FILES=" components/libabsyncsvc.so components/libaddrbook.so \
-		components/libmork.so components/libmozldap.so \
-		components/libnecko.so components/libprofile.so \
-		components/librdf.so components/libstrres.so \
-		components/libunicharutil.so components/libuconv.so \
-		components/libucvcn.so components/libucvibm.so \
-		components/libucvja.so components/libucvko.so \
-		components/libucvlatin.so components/libucvtw.so \
-		components/libucvtw2.so components/liburiloader.so \
-		components/libvcard.so components/libxpconnect.so \
-		components/libpref.so components/libchrome.so libmozjs.so \
-		libmsgbaseutil.so libldap50.so libnspr4.so libplc4.so \
-		libplds4.so libxpcom.so libmozz.so component.reg \
-		components/necko_dns.xpt components/xpcom_xpti.xpt \
-		components/xpcom_threads.xpt components/xpcom_io.xpt \
-		components/xpcom_ds.xpt components/xpcom_components.xpt \
-		components/xpcom_base.xpt components/xpti.dat \
-		defaults/pref/all.js defaults/pref/config.js \
-		defaults/pref/editor.js defaults/pref/initpref.js \
-		defaults/pref/inspector.js defaults/pref/mailnews.js \
-		defaults/pref/security-prefs.js defaults/pref/unix.js \
-		defaults/pref/xpinstall.js"
-
-LIB_FILES="	lib/libembed_base_s.a lib/libmozreg_s.a \
-		lib/libnspr4.so lib/libxpcom.so lib/libprldap50.so"
-
-INC_FILES="include/"
-INC_FILES2="public/"
-
-if [ $# -lt 2 -o $# -gt 3 ] ; then
-	echo 
-	echo usage: $0 mozilla_dist target [target_dir]
-	echo
-	echo where:
-	echo
-	echo "mozilla_dist points to the mozilla distribution"
-	echo "target concatenates  OS, compiler and CPU (e.g. FREEBSDGCCI etc)"
-	echo "target_dir is the directory to place the zips"
-	exit 1
-fi
-
-MOZ_DIST=$1
-TARGET=$2
-if [ "w$3" != "w" ]; then
-	TARGET_DIR=$3
-else
-	if [ "w$TARGET_DIR" == "w" ]; then
-		TARGET_DIR=
-	fi
-fi
-
-ZIP_TARGET=$TARGET_DIR
-if [ -z "$ZIP_TARGET" ] ; then
-	ZIP_TARGET=../
-fi
-
-# just to remember the current working directory
-STARTING_DIR=`pwd`
-
-echo
-echo --- creating zips for $TARGET, using mozilla distribution in $MOZ_DIST
-
-# Create the directories
-[ ! -d $TARGET_DIR/$TARGET/runtime ] && mkdir -p $TARGET_DIR/$TARGET/runtime
-[ ! -d $TARGET_DIR/$TARGET/runtime/components ] && mkdir -p $TARGET_DIR/$TARGET/runtime/components
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults/pref ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults/pref
-[ ! -d $TARGET_DIR/$TARGET/lib ] && mkdir -p $TARGET_DIR/$TARGET/lib
-[ ! -d $TARGET_DIR/$TARGET/inc ] && mkdir -p $TARGET_DIR/$TARGET/inc
-[ ! -d $TARGET_DIR/$TARGET/inc/nspr ] && mkdir -p $TARGET_DIR/$TARGET/inc/nspr
-[ ! -d $TARGET_DIR/$TARGET/inc/obsolete ] && mkdir -p $TARGET_DIR/$TARGET/inc/obsolete
-
-# Copy the files
-echo
-echo --- copying files
-echo
-
-for i in $RUNTIME_FILES; do
-	if [ ! -f $MOZ_DIST/bin/$i ]; then
-		echo $MOZ_DIST/bin/$i does not exist, check your distribution
-	else
-		if [ `echo $i | grep component` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/components/
-		elif [ `echo $i | grep defaults` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/defaults/pref/
-		else
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/
-		fi
-	fi
-done
-
-for i in $LIB_FILES; do
-	if [ ! -f $MOZ_DIST/$i ]; then
-		echo $MOZ_DIST/$i does not exist, check your distribution
-	else
-		cp -R -L $MOZ_DIST/$i $TARGET_DIR/$TARGET/lib/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES`; do
-	if [ ! -d $i ]; then 
-		cp -R -L $MOZ_DIST/include/$i $TARGET_DIR/$TARGET/inc/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES2`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/public/$i $TARGET_DIR/$TARGET/inc
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/$i $TARGET_DIR/$TARGET/inc/nspr
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr/obsolete`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/obsolete/$i $TARGET_DIR/$TARGET/inc/obsolete
-	fi
-done
-
-# delete old zips
-
-[ -f $TARGET_DIR/$TARGET/runtime.zip ] && rm -f $TARGET_DIR/$TARGET/runtime.zip
-[ -f $TARGET_DIR/$TARGET/lib.zip ] && rm -f $TARGET_DIR/$TARGET/lib.zip
-[ -f $TARGET_DIR/$TARGET/inc.zip ] && rm -f $TARGET_DIR/$TARGET/inc.zip
-
-# zip the runtime files
-
-echo
-echo --- creating ${TARGET}runtime.zip
-echo
-
-cd $TARGET_DIR/$TARGET/runtime
-find . -type f | zip $ZIP_TARGET/${TARGET}runtime.zip -@
-
-# zip the lib files
-echo 
-echo --- creating ${TARGET}lib.zip
-echo 
-
-cd $TARGET_DIR/$TARGET/lib
-find . -type f | zip $ZIP_TARGET/${TARGET}lib.zip -@
-
-# zip the inc files
-echo
-echo --- creating ${TARGET}inc.zip
-echo
-
-cd $TARGET_DIR/$TARGET/inc
-find . -type f | zip $ZIP_TARGET/${TARGET}inc.zip -@
-
-# remove dirs
-cd $STARTING_DIR
-rm -rf $TARGET_DIR/$TARGET
-
-echo
-echo --- done
-echo
-
diff --git a/editors/openoffice.org-2.0-devel/pkg-descr b/editors/openoffice.org-2.0-devel/pkg-descr
deleted file mode 100644
index 31fd1b12161a..000000000000
--- a/editors/openoffice.org-2.0-devel/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-OpenOffice.org is an Open Source, community-developed, multi-platform office
-productivity suite. It includes the key desktop applications, such as a
-word processor, spreadsheet, presentation manager, and drawing program,
-with a user interface and feature set similar to other office suites.
-
-Components include:
-  * A universal word processing application for creating business
-    letters, extensive text documents, professional layouts, and HTML
-    documents.
-  * A sophisticated application for performing advanced spreadsheet
-    functions, such as analyzing figures, creating lists, and viewing data.
-  * A tool for creating effective eye-catching presentations.
-  * A vector-oriented draw module that enables the creation of 3D
-    illustrations
diff --git a/editors/openoffice.org-2.0-devel/pkg-message b/editors/openoffice.org-2.0-devel/pkg-message
deleted file mode 100644
index 1dc749f301c2..000000000000
--- a/editors/openoffice.org-2.0-devel/pkg-message
+++ /dev/null
@@ -1,73 +0,0 @@
-OpenOffice.org Build 643 Personal Install How-To
-
-Written by:	Martin Blapp <mbr@freebsd.org>
-
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
-
-1 User installation
--------------------
-
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
---------------
-
-There are some wrappers installed for fast startup.
-Add "${PREFIX}/bin/" to your PATH and you will be able
-to use them.
-
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
-
-If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
-version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
diff --git a/editors/openoffice.org-2.0-devel/pkg-plist b/editors/openoffice.org-2.0-devel/pkg-plist
deleted file mode 100644
index 28bd78453b52..000000000000
--- a/editors/openoffice.org-2.0-devel/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, do not delete. Package list is generated automatically.
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
deleted file mode 100644
index 6f740924c399..000000000000
--- a/editors/openoffice.org-2.0/Makefile
+++ /dev/null
@@ -1,580 +0,0 @@
-# New ports collection makefile for: OpenOffice
-# Date created:		28 Februar 2002
-# Whom:                 Martin Blapp
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openoffice
-PORTVERSION=	644
-CATEGORIES+=	editors
-MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
-		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
-		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
-		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ny1.mirror.openoffice.org/miscellaneous/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
-MASTER_SITE_SUBDIR=	${PORTVERSION}
-DISTFILES+=	oo_${PORTVERSION}_src.tar.bz2 \
-		gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
-
-BROKEN=		"Does not build"
-
-SORT?=	/usr/bin/sort
-FIND?=	/usr/bin/find
-CUT?=	/usr/bin/cut
-AWK?=	/usr/bin/awk
-GREP?=	/usr/bin/grep
-ZIP?=	${PREFIX}/bin/zip
-UNZIP?=	${PREFIX}/bin/unzip
-ANT?=	${LOCALBASE}/bin/ant
-TCSH?=	/bin/tcsh
-PASTE?=	/usr/bin/paste
-
-.include <bsd.port.pre.mk>
-
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
-DIST_SUBDIR=		openoffice
-DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
-
-#
-# configuration for language specific slave ports
-#
-.if !defined(LANG_EXT)
-LANG_EXT=01
-.else
-#
-# Add pkg-descr and pkg-message if available
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-#
-# LANG_CONFIGURE_ARG is missing for the german port
-#
-.if defined(LANG_EXT)
-CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG},ENUS
-.endif
-.endif
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
-
-EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-
-MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/jakarta-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-.if !defined(DISPLAY)
-BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
-.endif
-.if !defined(WITH_BSD_JDK)
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk14
-.else
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-.endif
-
-USE_PERL5=	yes
-USE_BZIP2=	yes
-USE_BISON=	yes
-USE_GMAKE=	yes
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
-.if !defined(WITH_BSD_JDK)
-JDKDIR?=	${LOCALBASE}/linux-sun-jdk1.4.1
-.else
-JDKDIR?=	${LOCALBASE}/jdk1.4.1
-.endif
-JAVAVM=         ${JDKDIR}/bin/java
-
-GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
-LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
-BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
-
-.if !defined(DISPLAY)
-DISPLAYHACK=localhost:1001
-.endif
-
-CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
-			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
-
-.if !defined(WITH_BSD_JDK)
-CONFIGURE_ARGS+=	--enable-linuxjdk=yes
-.endif
-
-.if defined(WITH_DEBUG)
-.if ${WITH_DEBUG} == 2
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-.endif
-
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"prefered language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
-	@${ECHO} "OPTIONS:"
-.if !defined(USE_GCC)
-	@${ECHO}
-	@${ECHO} "You can compile OO with different"
-	@${ECHO} "gcc compiler versions:"
-	@${ECHO}
-	@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.2"
-	@${ECHO} "to compile openoffice with your"
-	@${ECHO} "prefered compiler."
-.endif
-.if !defined(WITH_BSD_JDK)
-	@${ECHO}
-	@${ECHO} "If you like to use the native BSD"
-	@${ECHO} "JDK for the build system, you can use"
-	@${ECHO} "WITH_BSD_JDK=TRUE to disable the"
-	@${ECHO} "usage of the linux-JDK and linux dependency."
-	@${ECHO}
-.endif
-.if !defined(WITH_DEBUG)
-	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
-	@${ECHO} "if you call make with WITH_DEBUG=1"
-	@${ECHO}
-	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
-	@${ECHO}
-.endif
-.if !defined(WITH_TTF_BYTECODE_ENABLED)
-	@${ECHO}
-	@${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES"
-	@${ECHO} "if you like to use the Freetype library to"
-	@${ECHO} "render TTF fonts. Normally the TTF lib is"
-	@${ECHO} "not used to render fonts."
-	@${ECHO}
-	@${ECHO} "If you have licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479"
-	@${ECHO} "you can enable this option to get better"
-	@${ECHO} "quality of glyphs at small bitmap sizes."
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 450002
-	@${ECHO}
-	@${ECHO} "OS-VERSION ${OSVERSION} too low"
-	@${ECHO}
-	@${ECHO} "OO need some important libc_r and"
-	@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
-	@${ECHO} "RELEASE or 4.6 STABLE."
-	@${FALSE}
-.endif
-	@${ECHO}
-	@${ECHO} "NOTICE:"
-	@${ECHO}
-	@${ECHO} "To build Openoffice, you should have a lot"
-.if defined(WITH_DEBUG)
-	@${ECHO} "of free diskspace (~ 8GB)."
-.else
-	@${ECHO} "of free diskspace (~ 4GB)."
-.endif
-	@${ECHO}
-.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
-    (${OSVERSION} < 500000 && !defined(USE_GCC))
-	@${ECHO} "KERNEL CONFIGURATION:"
-	@${ECHO}
-	@${ECHO} "Openoffice needs a larger stack- and"
-	@${ECHO} "datasize to build. Check your limit"
-	@${ECHO} "settings and and put this in /boot/loader.conf"
-	@${ECHO} "if neccessary:"
-	@${ECHO}
-	@${ECHO} "kern.maxdsiz=\"1073741824\""
-	@${ECHO} "kern.maxssiz=\"268435456\""
-.endif
-	@${ECHO}
-.if ${OSVERSION} < 460002
-	@${ECHO} "REQUIRED SYSTEM PATCHES:"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO} "OO.org can crash if you enter a non existing path"
-	@${ECHO} "or URL in the location bar. To fix these crashes"
-	@${ECHO} "you need a uncommitted system patch for rtld:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460001
-	@${ECHO}
-	@${ECHO} "OO setup is broken on STABLE < 4.6"
-	@${ECHO} "including 4.6 RELEASE."
-	@${ECHO} "You'll need a system patch to solve"
-	@${ECHO} "this problem:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460002
-	@${ECHO}
-	@${ECHO} "OO.org soffice binary can deadlock. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO}
-	@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
-	@${ECHO}
-.endif
-.if !exists(/usr/include/langinfo.h)
-	@${ECHO}
-	@${ECHO} "langinfo.h is missing !"
-	@${ECHO}
-	@${ECHO} "Please upgrade to 4.6 RELEASE or"
-	@${ECHO} "4.6 STABLE."
-	@${ECHO}
-	@${FALSE}
-.endif
-
-post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
-	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
-	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@-${RM} -f ${WRKSRC}/../moz/zipped/*.zip
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
-.if defined(L10NHELP)
-	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
-	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
-.endif
-
-post-patch:
-	@${MAKE} patch-mozilla
-.if defined(WITH_TTF_BYTECODE_ENABLED)
-	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
-		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-			${ECHO_MSG} "===>   Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \
-		fi; \
-		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
-	fi
-.endif
-.if defined(WITH_DEBUG)
-	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
-		PATCHES_APPLIED="" ; \
-		for i in ${PATCHDIR}/debugpatch-*; do \
-			case $$i in \
-				*.orig|*.rej|*~) \
-					${ECHO_MSG} "===>   Ignoring patchfile $$i" ; \
-					;; \
-				*) \
-					if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-						${ECHO_MSG} "===>   Applying ${OPSYS} patch $$i" ; \
-					fi; \
-					if ${PATCH} ${PATCH_ARGS} < $$i ; then \
-						PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
-					else \
-						${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
-						if [ x"$$PATCHES_APPLIED" != x"" ]; then \
-							${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
-						fi; \
-						${FALSE} ; \
-					fi; \
-					;; \
-			esac; \
-		done; \
-	fi;
-.endif
-	@${ECHO_MSG} "===>  Find old malloc.h defines and fix them in ${PKGNAME} source"
-	@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
-		${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
-
-extract-mozilla:
-.if ! exists(${WRKDIR}/mozilla/Makefile)
-	@${ECHO_MSG} "===>  Extracting mozilla sub project"
-	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
-.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment)
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
-.endif
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
-.endif
-	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
-
-patch-mozilla:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
-		${WRKDIR}/mozilla/files/
-	@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
-
-build-mozilla:
-.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
-	@${ECHO_MSG} "===>  Building mozilla sub project"
-.if defined(WITH_DEBUG)
-	@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
-	@${SED} -e 's|--disable-debug||' \
-		-e 's|--disable-cpp-rtti||' \
-		-e 's|--enable-strip||' \
-		< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
-.endif
-.if defined(USE_GCC)
-	@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
-.else
-	@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
-.endif
-	@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
-	@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
-	@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
-.endif
-
-install-mozilla:
-	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
-
-register-mozilla:
-.if exists(${WRKDIR}/mozilla-runtime)
-	@${RM} -rf ${WRKDIR}/mozilla-runtime
-.endif
-	@${MKDIR} ${WRKDIR}/mozilla-runtime
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
-	@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
-	@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
-	@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
-		&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom 
-	@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
-		${WRKDIR}/mozilla-runtime/components/xptitemp.dat
-	@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
-	@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
-		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
-
-mozilla:
-	@${MAKE} extract-mozilla
-	@${MAKE} patch-mozilla
-	@${MAKE} build-mozilla
-	@${MAKE} register-mozilla
-	@${MAKE} install-mozilla
-
-do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
-	@${MAKE} mozilla
-.endif
-.endif
-.endif
-.if exists(${WRKDIR}/.Xvfb.pid)
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.endif
-.if !defined(DISPLAY)
-	#
-	# This is a UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-.endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
-	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-.endif
-.if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
-.endif
-
-pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-
-do-install:
-.if !defined(DISPLAY)
-	#
-	# UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-.endif
-
-install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
-
-post-install:
-	@${ECHO_MSG} "===>  Add wrapper scripts";
-	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
-	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
-
-package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
-.if defined(LANG_SUFFIX)
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
-.else
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
-.endif
-
-update:
-	@${MAKE} fetch
-	@${MAKE} extract
-	@cd ${WRKSRC}/.. && for dir in *; do \
-	    if [ -d $$dir ]; then \
-		cd $$dir; cvs update -d; cd ..; \
-	    fi \
-	done
-
-.include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo
deleted file mode 100644
index ec9d6788f104..000000000000
--- a/editors/openoffice.org-2.0/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
-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
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
diff --git a/editors/openoffice.org-2.0/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-2.0/files/debugpatch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 96c651ce22c8..000000000000
--- a/editors/openoffice.org-2.0/files/debugpatch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../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
-@@ -902,6 +902,7 @@
- 
- void KillSetupDir()
- {
-+#if 0
-     DIR* pDir = opendir( strTmpPath );
-     struct dirent* pFile;
- 
-@@ -915,6 +916,10 @@
- 
-     chdir( strInitPath );
-     rmdir( strTmpPath );
-+#else
-+	fprintf(stderr, "\nLeaving behind temporary directory: %s\n",
-+	strTmpPath);
-+#endif
- }
- 
- void makeSymLink( char* s )
diff --git a/editors/openoffice.org-2.0/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2.0/files/debugpatch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 52bd2b3d58d6..000000000000
--- a/editors/openoffice.org-2.0/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
-+++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
- 
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- 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
- 
- # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
diff --git a/editors/openoffice.org-2.0/files/oo_setup.resp b/editors/openoffice.org-2.0/files/oo_setup.resp
deleted file mode 100644
index 8eeeb11bd95e..000000000000
--- a/editors/openoffice.org-2.0/files/oo_setup.resp
+++ /dev/null
@@ -1,7 +0,0 @@
-[Environment]
-InstallationMode = INSTALL_NETWORK
-InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org-643
-
-[Java]
-JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-2.0/files/openoffice-wrapper b/editors/openoffice.org-2.0/files/openoffice-wrapper
deleted file mode 100644
index 13e8160197a3..000000000000
--- a/editors/openoffice.org-2.0/files/openoffice-wrapper
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2.0/files/Attic/openoffice-wrapper,v 1.3 2003-03-05 23:24:05 mbr Exp $
-
-oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/
-program=`echo $0 | sed -e 's|.*-||'`
-
-if [ ! $LANG ]; then
-	export LANG=%%LANG%%
-fi
-
-case $program in
-$0)
-	exec $oopath/soffice "$@"
-	;;
-	*)
-	exec $oopath/$program "$@"
-	;;
-esac
diff --git a/editors/openoffice.org-2.0/files/optpatch-freetype+patch b/editors/openoffice.org-2.0/files/optpatch-freetype+patch
deleted file mode 100644
index b426a8fb7fcc..000000000000
--- a/editors/openoffice.org-2.0/files/optpatch-freetype+patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Index: files/patch-freetype::patch
-===================================================================
-RCS file: files/patch-freetype::patch
-diff -N files/patch-freetype::patch
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-freetype::patch	4 Aug 2002 15:27:42 -0000
-@@ -0,0 +1,201 @@
-+diff -ur ../freetype/freetype-2.0.5.patch oo641d_patched/freetype/freetype-2.0.5.patch
-+--- ../freetype/freetype-2.0.5.patch	Fri Apr  5 21:07:34 2002
-++++ ../freetype/freetype-2.0.5.patch	Sat Mar  9 18:04:17 2002
-+@@ -1,118 +1,79 @@
-+-*** misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 14 00:44:33 2000
-+---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 63,69 ****
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+---- 63,69 ----
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+-*** misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Jun  7 19:36:17 2001
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 631,637 ****
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+---- 631,637 ----
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile -DPIC $pic_flag"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Mon Jan  1 18:25:21 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 1,7 ****
-+---- 1,9 ----
-+-  FT_USE_MODULE(autohint_module_class)
-+-  FT_USE_MODULE(cff_driver_class)
-+-  FT_USE_MODULE(t1cid_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(pcf_driver_class)
-+-+ */
-+-  FT_USE_MODULE(psaux_module_class)
-+-  FT_USE_MODULE(psnames_module_class)
-+-  FT_USE_MODULE(ft_raster1_renderer_class)
-+-***************
-+-*** 9,12 ****
-+---- 11,16 ----
-+-  FT_USE_MODULE(ft_smooth_renderer_class)
-+-  FT_USE_MODULE(tt_driver_class)
-+-  FT_USE_MODULE(t1_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(winfnt_driver_class)
-+-+ */
-+-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h	Tue Aug 21 10:50:45 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 70,76 ****
-+---- 70,79 ----
-+-    /*   All convenience functions are declared as such in their             */
-+-    /*   documentation.                                                      */
-+-    /*                                                                       */
-+-+ /*
-+-  #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-+ */
-+-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-  
-+-  
-+-    /*************************************************************************/
-+-***************
-+-*** 108,116 ****
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-- 
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+---- 111,121 ----
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-+ /*
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-+ */
-+-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig	Mon Jan  7 14:21:35 2002
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Mon Jan  7 14:21:40 2002
-+-***************
-+-*** 2251,2257 ****
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age + 1`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-+---- 2251,2257 ----
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk
-++--- misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:49:17 2001
-++@@ -63,7 +63,7 @@
-++ #   ANSI compliance.
-++ #
-++ ifndef CFLAGS
-++-  CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+++  CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-++ endif
-++ 
-++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh
-++--- misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:47:56 2001
-+++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:49:17 2001
-++@@ -631,7 +631,7 @@
-++     if test "$build_old_libs" = yes; then
-++       if test "$pic_mode" != yes; then
-++ 	# Don't build PIC code
-++-	command="$base_compile $srcfile"
-+++	command="$base_compile $srcfile -DPIC $pic_flag"
-++       else
-++ 	# All platforms use -DPIC, to notify preprocessed assembler code.
-++ 	command="$base_compile $srcfile $pic_flag -DPIC"
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:49:17 2001
-++@@ -1,7 +1,9 @@
-++ FT_USE_MODULE(autohint_module_class)
-++ FT_USE_MODULE(cff_driver_class)
-++ FT_USE_MODULE(t1cid_driver_class)
-+++/*
-++ FT_USE_MODULE(pcf_driver_class)
-+++*/
-++ FT_USE_MODULE(psaux_module_class)
-++ FT_USE_MODULE(psnames_module_class)
-++ FT_USE_MODULE(ft_raster1_renderer_class)
-++@@ -9,4 +11,6 @@
-++ FT_USE_MODULE(ft_smooth_renderer_class)
-++ FT_USE_MODULE(tt_driver_class)
-++ FT_USE_MODULE(t1_driver_class)
-+++/*
-++ FT_USE_MODULE(winfnt_driver_class)
-+++*/
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:51:15 2001
-++@@ -70,7 +70,10 @@
-++   /*   All convenience functions are declared as such in their             */
-++   /*   documentation.                                                      */
-++   /*                                                                       */
-+++/*
-++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+++*/
-+++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-++ 
-++ 
-++   /*************************************************************************/
-++@@ -108,8 +111,10 @@
-++   /*   use a vector `plotter' format that isn't supported when this        */
-++   /*   macro is undefined.                                                 */
-++   /*                                                                       */
-+++/*
-++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++-
-+++*/
-+++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++ 
-++   /*************************************************************************/
-++   /*                                                                       */
-++@@ -338,7 +343,7 @@
-++   /* By undefining this, you will only compile the code necessary to load  */
-++   /* TrueType glyphs without hinting.                                      */
-++   /*                                                                       */
-++-#undef  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-+++#define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-++ 
-++ 
-++   /*************************************************************************/
diff --git a/editors/openoffice.org-2.0/files/optpatch-vcl+util+makefile.pmk b/editors/openoffice.org-2.0/files/optpatch-vcl+util+makefile.pmk
deleted file mode 100644
index 41341ff0b4e8..000000000000
--- a/editors/openoffice.org-2.0/files/optpatch-vcl+util+makefile.pmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/util/makefile.pmk.orig	Mon Aug  5 01:39:41 2002
-+++ ../vcl/util/makefile.pmk	Mon Aug  5 01:40:03 2002
-@@ -64,7 +64,7 @@
- PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch
- PDBTARGET=vcl
- 
--.IF "$(OS)" != "MACOSX"
-+.IF "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- .IF "$(remote)" != ""
- USE_BUILTIN_RASTERIZER=true
- .ENDIF
diff --git a/editors/openoffice.org-2.0/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-2.0/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 078685f3b516..000000000000
--- a/editors/openoffice.org-2.0/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../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 freebsd genunix";;
-  	*)		JINCSUBDIRS="genunix";;
-  	esac
-  
diff --git a/editors/openoffice.org-2.0/files/patch-bridges+prj+build.lst b/editors/openoffice.org-2.0/files/patch-bridges+prj+build.lst
deleted file mode 100644
index fee3d847c5e6..000000000000
--- a/editors/openoffice.org-2.0/files/patch-bridges+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
deleted file mode 100644
index 99b8c566fb61..000000000000
--- a/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ /dev/null
@@ -1,102 +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 );
-+    }
- }
- 
- }
diff --git a/editors/openoffice.org-2.0/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice.org-2.0/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
deleted file mode 100644
index 4622b7fe21c4..000000000000
--- a/editors/openoffice.org-2.0/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-2.0/files/patch-comphelper+util+makefile.mk b/editors/openoffice.org-2.0/files/patch-comphelper+util+makefile.mk
deleted file mode 100644
index f2d3092c2ddf..000000000000
--- a/editors/openoffice.org-2.0/files/patch-comphelper+util+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2.0/files/patch-config_office+configure.in b/editors/openoffice.org-2.0/files/patch-config_office+configure.in
deleted file mode 100644
index a45332fcbec0..000000000000
--- a/editors/openoffice.org-2.0/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,66 +0,0 @@
---- configure.in.orig	Thu Feb 20 15:49:32 2003
-+++ configure.in	Wed Mar  5 21:22:34 2003
-@@ -95,6 +95,12 @@
-                           
-                           Usage: --enable-macos9
- ],,)
-+AC_ARG_ENABLE(linuxjdk,
-+[  --enable-linuxjdk         Use this option option if you like to use
-+                          the linux-jdk instead of the native jdk.
-+
-+                          Usage: --enable-linuxjdk
-+],,)
- AC_ARG_WITH(lang,
- [  --with-lang             Use this option to build OpenOffice.org with
-                           additional language support. US English is always
-@@ -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
-@@ -1232,7 +1249,11 @@
- if test -n "$enable_debug"; then
-    ENABLE_DEBUG="TRUE"
- else
--   ENABLE_DEBUG="FALSE"
-+fi
-+if test -n "$enable_linuxjdk"; then
-+   USE_LINUXJDK="TRUE"
-+else
-+   USE_LINUXJDK="FALSE"
- fi
- 
- dnl ===================================================================
-@@ -1278,6 +1299,7 @@
- AC_SUBST(PTHREAD_CFLAGS)
- AC_SUBST(PTHREAD_LIBS)
- AC_SUBST(ENABLE_DEBUG)
-+AC_SUBST(USE_LINUXJDK)
- 
- AC_OUTPUT([set_soenv])
- 
diff --git a/editors/openoffice.org-2.0/files/patch-config_office+set_soenv.in b/editors/openoffice.org-2.0/files/patch-config_office+set_soenv.in
deleted file mode 100644
index 9ea6b11bdab2..000000000000
--- a/editors/openoffice.org-2.0/files/patch-config_office+set_soenv.in
+++ /dev/null
@@ -1,44 +0,0 @@
---- set_soenv.in.orig	Thu Feb 27 15:12:36 2003
-+++ set_soenv.in	Wed Mar  5 21:16:43 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, 
-@@ -88,7 +88,7 @@
-      $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
-      $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS,
-      $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
--     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG );
-+     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $USE_LINUXJDK );
- #
- #-------------------------------------------
- # IId. Declaring the aliases.
-@@ -140,7 +140,8 @@
- $CC			= '@CC@';           # C compiler
- $CXX		= '@CXX@';          # C++ compiler
- $EXCEPTIONS	= '@EXCEPTIONS@';   # Exception handling type
--$ENABLE_DEBUG	= '@ENABLE_DEBUG@';  # Enable a debug build
-+$ENABLE_DEBUG	= '@ENABLE_DEBUG@'; # Enable a debug build
-+$USE_LINUXJDK	= '@USE_LINUXJDK@'; # Use the Linux JDK
- $WRAPCMD	= "";				# Wrapper (only for winnt)
- 
- #
-@@ -1265,7 +1266,12 @@
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
- }
- elsif ($platform eq "$FreeBSD")
--{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+{
-+   if ($USE_LINUXJDK eq "TRUE") {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
-+   } else {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+   }
- }
- elsif ($platform eq "$NetBSD")
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
diff --git a/editors/openoffice.org-2.0/files/patch-connectivity+source+drivers+mozab+makefile.mk b/editors/openoffice.org-2.0/files/patch-connectivity+source+drivers+mozab+makefile.mk
deleted file mode 100644
index 2b83f2cd2ec7..000000000000
--- a/editors/openoffice.org-2.0/files/patch-connectivity+source+drivers+mozab+makefile.mk
+++ /dev/null
@@ -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)					\
diff --git a/editors/openoffice.org-2.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-2.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
deleted file mode 100644
index 3601766ee561..000000000000
--- a/editors/openoffice.org-2.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../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
-@@ -64,8 +64,8 @@
- #mozilla specific stuff.
- MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
- MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
--#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
--#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
-+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
-+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
- #End of mozilla specific stuff.
- 
- PRJ=..$/..$/..$/..
-@@ -107,7 +107,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -123,7 +123,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -141,7 +141,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS+=	    -DMOZILLA_CLIENT \
-             -DOSTYPE=\"Linux2.2.14-5\" -DOJI
- .IF "$(OS)" == "LINUX"
-@@ -157,6 +157,13 @@
-             -fno-rtti -Wall -Wconversion -Wpointer-arith \
-             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-             -Wno-long-long 
-+CDEFS     += -DTRACING
-+.ELIF "$(OS)" == "FREEBSD"
-+CFLAGS +=   -fPIC
-+CFLAGSCXX += \
-+            -fno-rtti -Wall -Wconversion -Wpointer-arith \
-+            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-+            -Wno-long-long -pthread 
- CDEFS     += -DTRACING
- .ENDIF
- .ENDIF
diff --git a/editors/openoffice.org-2.0/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk b/editors/openoffice.org-2.0/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
deleted file mode 100644
index b63d2a25f184..000000000000
--- a/editors/openoffice.org-2.0/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2.0/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-2.0/files/patch-cppu+inc+uno+lbnames.h
deleted file mode 100644
index cb43c2d165e9..000000000000
--- a/editors/openoffice.org-2.0/files/patch-cppu+inc+uno+lbnames.h
+++ /dev/null
@@ -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."
diff --git a/editors/openoffice.org-2.0/files/patch-cppu+prj+build.lst b/editors/openoffice.org-2.0/files/patch-cppu+prj+build.lst
deleted file mode 100644
index 78fd210a1193..000000000000
--- a/editors/openoffice.org-2.0/files/patch-cppu+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-2.0/files/patch-cppuhelper+source+makefile.mk
deleted file mode 100644
index 5fb5bd636eb1..000000000000
--- a/editors/openoffice.org-2.0/files/patch-cppuhelper+source+makefile.mk
+++ /dev/null
@@ -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 ------------------------------------------------------
diff --git a/editors/openoffice.org-2.0/files/patch-desktop+source+pkgchk+pkgchk_misc.h b/editors/openoffice.org-2.0/files/patch-desktop+source+pkgchk+pkgchk_misc.h
deleted file mode 100644
index 391667b66ebd..000000000000
--- a/editors/openoffice.org-2.0/files/patch-desktop+source+pkgchk+pkgchk_misc.h
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0/files/patch-desktop+util+makefile.mk b/editors/openoffice.org-2.0/files/patch-desktop+util+makefile.mk
deleted file mode 100644
index 025d644a8077..000000000000
--- a/editors/openoffice.org-2.0/files/patch-desktop+util+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0/files/patch-dtrans+source+X11+makefile.mk b/editors/openoffice.org-2.0/files/patch-dtrans+source+X11+makefile.mk
deleted file mode 100644
index 5881f5d7f6a5..000000000000
--- a/editors/openoffice.org-2.0/files/patch-dtrans+source+X11+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice.org-2.0/files/patch-eventattacher+source+makefile.mk b/editors/openoffice.org-2.0/files/patch-eventattacher+source+makefile.mk
deleted file mode 100644
index 4552698eb132..000000000000
--- a/editors/openoffice.org-2.0/files/patch-eventattacher+source+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2.0/files/patch-external+gcc3_specific+makefile.mk b/editors/openoffice.org-2.0/files/patch-external+gcc3_specific+makefile.mk
deleted file mode 100644
index 6b8071f4030e..000000000000
--- a/editors/openoffice.org-2.0/files/patch-external+gcc3_specific+makefile.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../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"
- 
- .IF "$(OS)"!="MACOSX"
-+.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 @@
-         -rm -f $@
-         +ln -s libgcc_s.so.1 $@
- 
-+.ENDIF 
- .ENDIF 
- 
- .ENDIF
diff --git a/editors/openoffice.org-2.0/files/patch-freetype+makefile.mk b/editors/openoffice.org-2.0/files/patch-freetype+makefile.mk
deleted file mode 100644
index 3e5a8dd19f18..000000000000
--- a/editors/openoffice.org-2.0/files/patch-freetype+makefile.mk
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-2.0/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-2.0/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice.org-2.0/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
- 
- /* 
diff --git a/editors/openoffice.org-2.0/files/patch-javaunohelper+source+makefile.mk b/editors/openoffice.org-2.0/files/patch-javaunohelper+source+makefile.mk
deleted file mode 100644
index 19f6b86e5ab5..000000000000
--- a/editors/openoffice.org-2.0/files/patch-javaunohelper+source+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice.org-2.0/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice.org-2.0/files/patch-jni_uno+jni_java2uno.cxx
deleted file mode 100644
index a9ff9e3fed88..000000000000
--- a/editors/openoffice.org-2.0/files/patch-jni_uno+jni_java2uno.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-2.0/files/patch-nas+nas-1.6.patch b/editors/openoffice.org-2.0/files/patch-nas+nas-1.6.patch
deleted file mode 100644
index b6096654ebaf..000000000000
--- a/editors/openoffice.org-2.0/files/patch-nas+nas-1.6.patch
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-2.0/files/patch-offapi+com+sun+star+setup+OSType.idl b/editors/openoffice.org-2.0/files/patch-offapi+com+sun+star+setup+OSType.idl
deleted file mode 100644
index 3fee562c6d38..000000000000
--- a/editors/openoffice.org-2.0/files/patch-offapi+com+sun+star+setup+OSType.idl
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0/files/patch-offapi+util+makefile.pmk b/editors/openoffice.org-2.0/files/patch-offapi+util+makefile.pmk
deleted file mode 100644
index 5cdbb1b4aa4a..000000000000
--- a/editors/openoffice.org-2.0/files/patch-offapi+util+makefile.pmk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0/files/patch-package+inc+HashMaps.hxx b/editors/openoffice.org-2.0/files/patch-package+inc+HashMaps.hxx
deleted file mode 100644
index 35052d291ef7..000000000000
--- a/editors/openoffice.org-2.0/files/patch-package+inc+HashMaps.hxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice.org-2.0/files/patch-package+inc+ZipPackageFolder.hxx b/editors/openoffice.org-2.0/files/patch-package+inc+ZipPackageFolder.hxx
deleted file mode 100644
index 014c61403380..000000000000
--- a/editors/openoffice.org-2.0/files/patch-package+inc+ZipPackageFolder.hxx
+++ /dev/null
@@ -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()
diff --git a/editors/openoffice.org-2.0/files/patch-package+source+zippackage+ContentInfo.hxx b/editors/openoffice.org-2.0/files/patch-package+source+zippackage+ContentInfo.hxx
deleted file mode 100644
index c4bf35e79f64..000000000000
--- a/editors/openoffice.org-2.0/files/patch-package+source+zippackage+ContentInfo.hxx
+++ /dev/null
@@ -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();
diff --git a/editors/openoffice.org-2.0/files/patch-package+source+zippackage+ZipPackageFolder.cxx b/editors/openoffice.org-2.0/files/patch-package+source+zippackage+ZipPackageFolder.cxx
deleted file mode 100644
index bb504c834eef..000000000000
--- a/editors/openoffice.org-2.0/files/patch-package+source+zippackage+ZipPackageFolder.cxx
+++ /dev/null
@@ -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 );
diff --git a/editors/openoffice.org-2.0/files/patch-registry+source+regkey.cxx b/editors/openoffice.org-2.0/files/patch-registry+source+regkey.cxx
deleted file mode 100644
index fad069f83f14..000000000000
--- a/editors/openoffice.org-2.0/files/patch-registry+source+regkey.cxx
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-2.0/files/patch-rsc+source+rscpp+cpp.h b/editors/openoffice.org-2.0/files/patch-rsc+source+rscpp+cpp.h
deleted file mode 100644
index 417ab33ba52f..000000000000
--- a/editors/openoffice.org-2.0/files/patch-rsc+source+rscpp+cpp.h
+++ /dev/null
@@ -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              */
- 
diff --git a/editors/openoffice.org-2.0/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-2.0/files/patch-sal+osl+unx+nlsupport.c
deleted file mode 100644
index 49fe0da8589b..000000000000
--- a/editors/openoffice.org-2.0/files/patch-sal+osl+unx+nlsupport.c
+++ /dev/null
@@ -1,160 +0,0 @@
---- ../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
-@@ -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)
- 
-@@ -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 @@
-     { "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-2.0/files/patch-sal+osl+unx+pipe.c b/editors/openoffice.org-2.0/files/patch-sal+osl+unx+pipe.c
deleted file mode 100644
index 4aa7b8af1a61..000000000000
--- a/editors/openoffice.org-2.0/files/patch-sal+osl+unx+pipe.c
+++ /dev/null
@@ -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 )
- 	{			
diff --git a/editors/openoffice.org-2.0/files/patch-sal+osl+unx+process.c b/editors/openoffice.org-2.0/files/patch-sal+osl+unx+process.c
deleted file mode 100644
index 50023576bec4..000000000000
--- a/editors/openoffice.org-2.0/files/patch-sal+osl+unx+process.c
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-2.0/files/patch-sal+osl+unx+security.c b/editors/openoffice.org-2.0/files/patch-sal+osl+unx+security.c
deleted file mode 100644
index 0cc321dcd544..000000000000
--- a/editors/openoffice.org-2.0/files/patch-sal+osl+unx+security.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../sal/osl/unx/security.c.orig	Sat Jul 20 22:53:31 2002
-+++ ../sal/osl/unx/security.c	Sat Jul 20 22:52:39 2002
-@@ -739,7 +739,7 @@
- 	}
- 
- 
--#elif (LINUX && (GLIBC >= 2))
-+#elif ((LINUX && (GLIBC >= 2)) || defined(FREEBSD))
- 	
- 	struct passwd	*pPasswd; 
- 	
diff --git a/editors/openoffice.org-2.0/files/patch-sal+osl+unx+socket.c b/editors/openoffice.org-2.0/files/patch-sal+osl+unx+socket.c
deleted file mode 100644
index 9541cac8583f..000000000000
--- a/editors/openoffice.org-2.0/files/patch-sal+osl+unx+socket.c
+++ /dev/null
@@ -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! */
diff --git a/editors/openoffice.org-2.0/files/patch-sal+osl+unx+system.c b/editors/openoffice.org-2.0/files/patch-sal+osl+unx+system.c
deleted file mode 100644
index 8dc663ac03fc..000000000000
--- a/editors/openoffice.org-2.0/files/patch-sal+osl+unx+system.c
+++ /dev/null
@@ -1,127 +0,0 @@
---- ../sal/osl/unx/system.c.orig	Sun Mar 17 12:34:13 2002
-+++ ../sal/osl/unx/system.c	Wed Apr  3 01:03:36 2002
-@@ -195,6 +195,73 @@
- }
- #endif
- 
-+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
-+           size_t buflen, struct passwd **result)
-+{
-+  struct passwd* res;
-+
-+  pthread_mutex_lock(&getrtl_mutex);
-+
-+  if ( res = getpwuid(uid) )
-+  {
-+    size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell;
-+
-+    pw_name = strlen(res->pw_name)+1;
-+    pw_passwd = strlen(res->pw_passwd)+1;
-+    pw_class = strlen(res->pw_class)+1;
-+    pw_gecos = strlen(res->pw_gecos)+1;
-+    pw_dir = strlen(res->pw_dir)+1;
-+    pw_shell = strlen(res->pw_shell)+1;
-+
-+    if (pw_name+pw_passwd+pw_class+pw_gecos
-+                                 +pw_dir+pw_shell < buflen)
-+    {
-+      memcpy(pwd, res, sizeof(struct passwd));
-+
-+      strncpy(buffer, res->pw_name, pw_name);
-+      pwd->pw_name = buffer;
-+      buffer += pw_name;
-+
-+      strncpy(buffer, res->pw_passwd, pw_passwd);
-+      pwd->pw_passwd = buffer;
-+      buffer += pw_passwd;
-+
-+      strncpy(buffer, res->pw_class, pw_class);
-+      pwd->pw_class = buffer;
-+      buffer += pw_class;
-+
-+      strncpy(buffer, res->pw_gecos, pw_gecos);
-+      pwd->pw_gecos = buffer;
-+      buffer += pw_gecos;
-+
-+      strncpy(buffer, res->pw_dir, pw_dir);
-+      pwd->pw_dir = buffer;
-+      buffer += pw_dir;
-+
-+      strncpy(buffer, res->pw_shell, pw_shell);
-+      pwd->pw_shell = buffer;
-+      buffer += pw_shell;
-+
-+      *result = pwd ;
-+      res = 0 ;
-+
-+    } else {
-+
-+      res = ENOMEM ;
-+
-+    }      
-+  
-+  } else {
-+
-+    res = errno ;
-+ 
-+  } 
-+
-+  pthread_mutex_unlock(&getrtl_mutex);
-+
-+  return res;
-+}
-+
- struct tm *localtime_r(const time_t *timep, struct tm *buffer)
- {
- 	struct tm* res;
-@@ -518,3 +585,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-2.0/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-2.0/files/patch-sal+osl+unx+system.h
deleted file mode 100644
index c4e255952fc7..000000000000
--- a/editors/openoffice.org-2.0/files/patch-sal+osl+unx+system.h
+++ /dev/null
@@ -1,35 +0,0 @@
---- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
-+++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
-@@ -205,6 +205,13 @@
- #   include <sys/ioctl.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 <machine/vmparam.h>
-+#   include <machine/pmap.h>
- #	include <sys/un.h>
- #   include <netinet/tcp.h>
- #	define 	IORESOURCE_TRANSFER_BSD 
-@@ -216,12 +223,13 @@
- #   elif BYTE_ORDER == PDP_ENDIAN
- #   	define _PDP_ENDIAN
- #   endif
--#   define  sched_yield() 				pthread_yield()
--#   define  pthread_testcancel()
- #	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
diff --git a/editors/openoffice.org-2.0/files/patch-sal+textenc+tencinfo.c b/editors/openoffice.org-2.0/files/patch-sal+textenc+tencinfo.c
deleted file mode 100644
index 7cf80c18d0a0..000000000000
--- a/editors/openoffice.org-2.0/files/patch-sal+textenc+tencinfo.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
-     /* 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 */
-+
-+    if (pMimeCharset == NULL)
-+	pMimeCharset = "usascii";
-+
-     static ImplStrCharsetDef const aVIPMimeCharsetTab[] =
-     {
-         { "usascii", RTL_TEXTENCODING_ASCII_US },
diff --git a/editors/openoffice.org-2.0/files/patch-sal+workben+makefile.mk b/editors/openoffice.org-2.0/files/patch-sal+workben+makefile.mk
deleted file mode 100644
index 369935e31d66..000000000000
--- a/editors/openoffice.org-2.0/files/patch-sal+workben+makefile.mk
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../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 @@
- 
- .IF "$(TESTAPP)" == "salstattest"
- 
--	CFLAGS+= /DUSE_SAL_STATIC
-+	CFLAGS+= -DUSE_SAL_STATIC
- 
- 	OBJFILES=	$(OBJ)$/salstattest.obj
- 
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- 
- CXXFILES=	tgetpwnam.cxx
- OBJFILES=	$(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN=	$(SLB)$/sal.lib
- 
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd | freebsd)
- .ENDIF # tgetpwname
- 
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-2.0/files/patch-salhelper+source+gcc2_freebsd_intel.map b/editors/openoffice.org-2.0/files/patch-salhelper+source+gcc2_freebsd_intel.map
deleted file mode 100644
index 1ffacf889bc6..000000000000
--- a/editors/openoffice.org-2.0/files/patch-salhelper+source+gcc2_freebsd_intel.map
+++ /dev/null
@@ -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:
-+*;
-+};
diff --git a/editors/openoffice.org-2.0/files/patch-salhelper+source+gcc3_freebsd_intel.map b/editors/openoffice.org-2.0/files/patch-salhelper+source+gcc3_freebsd_intel.map
deleted file mode 100644
index 823cff316ec7..000000000000
--- a/editors/openoffice.org-2.0/files/patch-salhelper+source+gcc3_freebsd_intel.map
+++ /dev/null
@@ -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:
-+		*;
-+};
-+
diff --git a/editors/openoffice.org-2.0/files/patch-salhelper+source+makefile.mk b/editors/openoffice.org-2.0/files/patch-salhelper+source+makefile.mk
deleted file mode 100644
index 3687664d8d16..000000000000
--- a/editors/openoffice.org-2.0/files/patch-salhelper+source+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../salhelper/source/makefile.mk.orig	Wed Nov 14 14:19:21 2001
-+++ ../salhelper/source/makefile.mk	Sun Mar  3 17:58:15 2002
-@@ -109,6 +109,10 @@
- SHL1VERSIONMAP=lngi.map
- .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
- SHL1VERSIONMAP=gcc3_linux_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
- .ENDIF
- 
- 
diff --git a/editors/openoffice.org-2.0/files/patch-salhelper+test+rtti+makefile.mk b/editors/openoffice.org-2.0/files/patch-salhelper+test+rtti+makefile.mk
deleted file mode 100644
index 70f25048a24a..000000000000
--- a/editors/openoffice.org-2.0/files/patch-salhelper+test+rtti+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
- 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
- .ENDIF
- 
- 
diff --git a/editors/openoffice.org-2.0/files/patch-sc+source+core+data+cell.cxx b/editors/openoffice.org-2.0/files/patch-sc+source+core+data+cell.cxx
deleted file mode 100644
index 529f67a3e35f..000000000000
--- a/editors/openoffice.org-2.0/files/patch-sc+source+core+data+cell.cxx
+++ /dev/null
@@ -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>
diff --git a/editors/openoffice.org-2.0/files/patch-scp+source+global+udk_base.scp b/editors/openoffice.org-2.0/files/patch-scp+source+global+udk_base.scp
deleted file mode 100644
index 623eccb0ff09..000000000000
--- a/editors/openoffice.org-2.0/files/patch-scp+source+global+udk_base.scp
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0/files/patch-scp+source+player+player.scp b/editors/openoffice.org-2.0/files/patch-scp+source+player+player.scp
deleted file mode 100644
index 2f8daab35cdd..000000000000
--- a/editors/openoffice.org-2.0/files/patch-scp+source+player+player.scp
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-2.0/files/patch-scptools+source+linker+searchcache b/editors/openoffice.org-2.0/files/patch-scptools+source+linker+searchcache
deleted file mode 100644
index 593e9eabf5bc..000000000000
--- a/editors/openoffice.org-2.0/files/patch-scptools+source+linker+searchcache
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: files/patch-scptools::source::linker::searchcache
-===================================================================
-RCS file: files/patch-scptools::source::linker::searchcache
-diff -N files/patch-scptools::source::linker::searchcache
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-scptools::source::linker::searchcache	4 Aug 2002 15:28:04 -0000
-@@ -0,0 +1,27 @@
-+--- ../scptools/source/linker/searchcache.hxx.orig	Fri Aug  2 22:53:46 2002
-++++ ../scptools/source/linker/searchcache.hxx	Fri Aug  2 22:54:50 2002
-+@@ -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	Fri Aug  2 22:53:35 2002
-++++ ../scptools/source/linker/searchcache.cxx	Fri Aug  2 22:55:14 2002
-+@@ -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-2.0/files/patch-scptools+source+linker+ziplst.cxx b/editors/openoffice.org-2.0/files/patch-scptools+source+linker+ziplst.cxx
deleted file mode 100644
index 83b84631542e..000000000000
--- a/editors/openoffice.org-2.0/files/patch-scptools+source+linker+ziplst.cxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice.org-2.0/files/patch-setup2+inc+fields.hxx b/editors/openoffice.org-2.0/files/patch-setup2+inc+fields.hxx
deleted file mode 100644
index d56e12f2abf4..000000000000
--- a/editors/openoffice.org-2.0/files/patch-setup2+inc+fields.hxx
+++ /dev/null
@@ -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[];
diff --git a/editors/openoffice.org-2.0/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-2.0/files/patch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 396c586ee3a3..000000000000
--- a/editors/openoffice.org-2.0/files/patch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,30 +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"
- 
-@@ -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" \
diff --git a/editors/openoffice.org-2.0/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice.org-2.0/files/patch-setup2+mow+source+loader+makefile.mk
deleted file mode 100644
index 5460e4296587..000000000000
--- a/editors/openoffice.org-2.0/files/patch-setup2+mow+source+loader+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice.org-2.0/files/patch-setup2+patch+makefile.mk b/editors/openoffice.org-2.0/files/patch-setup2+patch+makefile.mk
deleted file mode 100644
index 53846a8bdfc9..000000000000
--- a/editors/openoffice.org-2.0/files/patch-setup2+patch+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0/files/patch-setup2+script+setupserver b/editors/openoffice.org-2.0/files/patch-setup2+script+setupserver
deleted file mode 100644
index 450ea386c841..000000000000
--- a/editors/openoffice.org-2.0/files/patch-setup2+script+setupserver
+++ /dev/null
@@ -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`"
diff --git a/editors/openoffice.org-2.0/files/patch-setup2+source+compiler+decltor.cxx b/editors/openoffice.org-2.0/files/patch-setup2+source+compiler+decltor.cxx
deleted file mode 100644
index 98f6ad2f7567..000000000000
--- a/editors/openoffice.org-2.0/files/patch-setup2+source+compiler+decltor.cxx
+++ /dev/null
@@ -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";
diff --git a/editors/openoffice.org-2.0/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx b/editors/openoffice.org-2.0/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
deleted file mode 100644
index ac0b39a6aa47..000000000000
--- a/editors/openoffice.org-2.0/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
+++ /dev/null
@@ -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) );
diff --git a/editors/openoffice.org-2.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-2.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
deleted file mode 100644
index f199b18823e1..000000000000
--- a/editors/openoffice.org-2.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-2.0/files/patch-setup2+source+service+interface.cxx b/editors/openoffice.org-2.0/files/patch-setup2+source+service+interface.cxx
deleted file mode 100644
index 8e478e17971d..000000000000
--- a/editors/openoffice.org-2.0/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-2.0/files/patch-shell+source+cmdmail+makefile.mk b/editors/openoffice.org-2.0/files/patch-shell+source+cmdmail+makefile.mk
deleted file mode 100644
index 0476285c802e..000000000000
--- a/editors/openoffice.org-2.0/files/patch-shell+source+cmdmail+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-2.0/files/patch-shell+source+proxysettings+makefile.mk b/editors/openoffice.org-2.0/files/patch-shell+source+proxysettings+makefile.mk
deleted file mode 100644
index e83cf7c9d7a1..000000000000
--- a/editors/openoffice.org-2.0/files/patch-shell+source+proxysettings+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-2.0/files/patch-shell+source+unix+exec+makefile.mk b/editors/openoffice.org-2.0/files/patch-shell+source+unix+exec+makefile.mk
deleted file mode 100644
index 0b7712ee35f8..000000000000
--- a/editors/openoffice.org-2.0/files/patch-shell+source+unix+exec+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-2.0/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-2.0/files/patch-solenv+bin+addsym.awk
deleted file mode 100644
index 996e282b350b..000000000000
--- a/editors/openoffice.org-2.0/files/patch-solenv+bin+addsym.awk
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
-+++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
-@@ -72,11 +72,11 @@
- END {
-     if (state == 0) {
-         print "# Weak RTTI symbols for C++ exceptions:"
--        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
-+        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
-     }
- }
- state == 2 {
--    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
-+    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
-     state = 3
- }
- /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice.org-2.0/files/patch-solenv+bin+mapgen.pl b/editors/openoffice.org-2.0/files/patch-solenv+bin+mapgen.pl
deleted file mode 100644
index 71ebdb934120..000000000000
--- a/editors/openoffice.org-2.0/files/patch-solenv+bin+mapgen.pl
+++ /dev/null
@@ -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, $_);
- 	};
diff --git a/editors/openoffice.org-2.0/files/patch-solenv+inc+startup+FREEBSD+macros.mk b/editors/openoffice.org-2.0/files/patch-solenv+inc+startup+FREEBSD+macros.mk
deleted file mode 100644
index 0c1b107de988..000000000000
--- a/editors/openoffice.org-2.0/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-2.0/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-2.0/files/patch-solenv+inc+tg_ext.mk
deleted file mode 100644
index 701692c9425a..000000000000
--- a/editors/openoffice.org-2.0/files/patch-solenv+inc+tg_ext.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0/files/patch-solenv+inc+tg_moz.mk b/editors/openoffice.org-2.0/files/patch-solenv+inc+tg_moz.mk
deleted file mode 100644
index 255a41f92281..000000000000
--- a/editors/openoffice.org-2.0/files/patch-solenv+inc+tg_moz.mk
+++ /dev/null
@@ -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) $@
diff --git a/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index b4764485aa86..000000000000
--- a/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,202 +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
-+# 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*=$(CC)
-+
-+# default linker flags
-+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -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
diff --git a/editors/openoffice.org-2.0/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice.org-2.0/files/patch-soltools+checkdll+makefile.mk
deleted file mode 100644
index e6407402258a..000000000000
--- a/editors/openoffice.org-2.0/files/patch-soltools+checkdll+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0/files/patch-soltools+mkdepend+main.c b/editors/openoffice.org-2.0/files/patch-soltools+mkdepend+main.c
deleted file mode 100644
index cffd5cbb1f43..000000000000
--- a/editors/openoffice.org-2.0/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-2.0/files/patch-stlport+makefile.mk b/editors/openoffice.org-2.0/files/patch-stlport+makefile.mk
deleted file mode 100644
index 797817ba85be..000000000000
--- a/editors/openoffice.org-2.0/files/patch-stlport+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0/files/patch-stoc+source+corereflection+makefile.mk b/editors/openoffice.org-2.0/files/patch-stoc+source+corereflection+makefile.mk
deleted file mode 100644
index 4b319b08d401..000000000000
--- a/editors/openoffice.org-2.0/files/patch-stoc+source+corereflection+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2.0/files/patch-stoc+source+defaultregistry+makefile.mk b/editors/openoffice.org-2.0/files/patch-stoc+source+defaultregistry+makefile.mk
deleted file mode 100644
index 4cae0476415a..000000000000
--- a/editors/openoffice.org-2.0/files/patch-stoc+source+defaultregistry+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-2.0/files/patch-stoc+source+implementationregistration+implreg.cxx b/editors/openoffice.org-2.0/files/patch-stoc+source+implementationregistration+implreg.cxx
deleted file mode 100644
index 341d621d872c..000000000000
--- a/editors/openoffice.org-2.0/files/patch-stoc+source+implementationregistration+implreg.cxx
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0/files/patch-stoc+source+implementationregistration+makefile.mk b/editors/openoffice.org-2.0/files/patch-stoc+source+implementationregistration+makefile.mk
deleted file mode 100644
index 0051043b7ecb..000000000000
--- a/editors/openoffice.org-2.0/files/patch-stoc+source+implementationregistration+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2.0/files/patch-stoc+source+inspect+makefile.mk b/editors/openoffice.org-2.0/files/patch-stoc+source+inspect+makefile.mk
deleted file mode 100644
index c7cd85253c11..000000000000
--- a/editors/openoffice.org-2.0/files/patch-stoc+source+inspect+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2.0/files/patch-stoc+source+invocation+makefile.mk b/editors/openoffice.org-2.0/files/patch-stoc+source+invocation+makefile.mk
deleted file mode 100644
index 9ac2072a5612..000000000000
--- a/editors/openoffice.org-2.0/files/patch-stoc+source+invocation+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-2.0/files/patch-stoc+source+invocation_adapterfactory+makefile.mk b/editors/openoffice.org-2.0/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
deleted file mode 100644
index 8853ad39a90e..000000000000
--- a/editors/openoffice.org-2.0/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-2.0/files/patch-stoc+source+javaloader+makefile.mk b/editors/openoffice.org-2.0/files/patch-stoc+source+javaloader+makefile.mk
deleted file mode 100644
index cea499f15c57..000000000000
--- a/editors/openoffice.org-2.0/files/patch-stoc+source+javaloader+makefile.mk
+++ /dev/null
@@ -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=		
diff --git a/editors/openoffice.org-2.0/files/patch-stoc+source+javavm+makefile.mk b/editors/openoffice.org-2.0/files/patch-stoc+source+javavm+makefile.mk
deleted file mode 100644
index b895a2b968d4..000000000000
--- a/editors/openoffice.org-2.0/files/patch-stoc+source+javavm+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice.org-2.0/files/patch-stoc+source+loader+makefile.mk b/editors/openoffice.org-2.0/files/patch-stoc+source+loader+makefile.mk
deleted file mode 100644
index 5a08ee5937b6..000000000000
--- a/editors/openoffice.org-2.0/files/patch-stoc+source+loader+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-2.0/files/patch-stoc+source+namingservice+makefile.mk b/editors/openoffice.org-2.0/files/patch-stoc+source+namingservice+makefile.mk
deleted file mode 100644
index e573081bc21d..000000000000
--- a/editors/openoffice.org-2.0/files/patch-stoc+source+namingservice+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-2.0/files/patch-stoc+source+proxy_factory+makefile.mk b/editors/openoffice.org-2.0/files/patch-stoc+source+proxy_factory+makefile.mk
deleted file mode 100644
index 9110b2f50cd1..000000000000
--- a/editors/openoffice.org-2.0/files/patch-stoc+source+proxy_factory+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2.0/files/patch-stoc+source+registry_tdprovider+makefile.mk b/editors/openoffice.org-2.0/files/patch-stoc+source+registry_tdprovider+makefile.mk
deleted file mode 100644
index 9d974d1c0d10..000000000000
--- a/editors/openoffice.org-2.0/files/patch-stoc+source+registry_tdprovider+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0/files/patch-stoc+source+servicemanager+makefile.mk b/editors/openoffice.org-2.0/files/patch-stoc+source+servicemanager+makefile.mk
deleted file mode 100644
index 746776d54759..000000000000
--- a/editors/openoffice.org-2.0/files/patch-stoc+source+servicemanager+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2.0/files/patch-stoc+source+tdmanager+makefile.mk b/editors/openoffice.org-2.0/files/patch-stoc+source+tdmanager+makefile.mk
deleted file mode 100644
index 76403fdde841..000000000000
--- a/editors/openoffice.org-2.0/files/patch-stoc+source+tdmanager+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-2.0/files/patch-stoc+source+typeconv+makefile.mk b/editors/openoffice.org-2.0/files/patch-stoc+source+typeconv+makefile.mk
deleted file mode 100644
index dc647f89a166..000000000000
--- a/editors/openoffice.org-2.0/files/patch-stoc+source+typeconv+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2.0/files/patch-store+util+makefile.mk b/editors/openoffice.org-2.0/files/patch-store+util+makefile.mk
deleted file mode 100644
index 6bef6e960f2e..000000000000
--- a/editors/openoffice.org-2.0/files/patch-store+util+makefile.mk
+++ /dev/null
@@ -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
- 
- 
diff --git a/editors/openoffice.org-2.0/files/patch-svx+source+fmcomp+makefile.mk b/editors/openoffice.org-2.0/files/patch-svx+source+fmcomp+makefile.mk
deleted file mode 100644
index b16030080c0d..000000000000
--- a/editors/openoffice.org-2.0/files/patch-svx+source+fmcomp+makefile.mk
+++ /dev/null
@@ -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= \
diff --git a/editors/openoffice.org-2.0/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice.org-2.0/files/patch-sysui+oounix+office+gnome+makefile.mk
deleted file mode 100644
index 3d7c2e22aa63..000000000000
--- a/editors/openoffice.org-2.0/files/patch-sysui+oounix+office+gnome+makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
-+++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
-@@ -84,7 +84,9 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- APP1LIBS=
-+.IF "$(OS)"!="FREEBSD"
- APP1STDLIBS=-ldl
-+.ENDIF
- 
- GNOMEFILES= \
- 	locales.tab
diff --git a/editors/openoffice.org-2.0/files/patch-tools+source+string+tstring.cxx b/editors/openoffice.org-2.0/files/patch-tools+source+string+tstring.cxx
deleted file mode 100644
index 12bd6bd0b244..000000000000
--- a/editors/openoffice.org-2.0/files/patch-tools+source+string+tstring.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../tools/source/string/tstring.cxx.orig	Sat Aug 10 12:53:42 2002
-+++ ../tools/source/string/tstring.cxx	Sat Aug 10 12:54:16 2002
-@@ -103,6 +103,9 @@
- xub_StrLen ImplStringLen( const sal_Char* pStr )
- {
- 	const sal_Char* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
-@@ -113,6 +116,9 @@
- xub_StrLen ImplStringLen( const sal_Unicode* pStr )
- {
- 	const sal_Unicode* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
diff --git a/editors/openoffice.org-2.0/files/patch-unoil+makefile.pmk b/editors/openoffice.org-2.0/files/patch-unoil+makefile.pmk
deleted file mode 100644
index 7febdabf7b4b..000000000000
--- a/editors/openoffice.org-2.0/files/patch-unoil+makefile.pmk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../unoil/makefile.pmk.orig	Fri Aug 31 18:04:43 2001
-+++ ../unoil/makefile.pmk	Thu Sep 12 12:17:50 2002
-@@ -74,8 +74,8 @@
- JAVAFILESLIST	:= $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java)
- .ENDIF          # "$(L10N_framework)"==""
- 
--GENJAVAFILES	:= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
--GENCLASSFILES	:= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
-+GENJAVAFILES	+= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
-+GENCLASSFILES	+= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
- 
- # --- Targets ------------------------------------------------------
- 
diff --git a/editors/openoffice.org-2.0/files/patch-unzip+source+file_io.c b/editors/openoffice.org-2.0/files/patch-unzip+source+file_io.c
deleted file mode 100644
index 2f85a108c185..000000000000
--- a/editors/openoffice.org-2.0/files/patch-unzip+source+file_io.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../unzip/source/file_io.c.orig	Sat Oct 19 11:58:45 2002
-+++ ../unzip/source/file_io.c	Sat Oct 19 12:03:40 2002
-@@ -500,7 +500,7 @@
- #ifdef MPW
- 				pCallBack( 0 );
- #else
--				#if defined LINUX || defined MACOSX || defined NETBSD
-+				#if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD
- 				pCallBack( lseek(outfd, 0, SEEK_CUR) );
- 				#else
- 				pCallBack( tell( outfd ) );
-@@ -865,7 +865,9 @@
- 	static struct timeb tbp;
- #endif /* !__386BSD__ */
- #else /* !BSD */
-+#if (!defined(NETBSD) && !defined(FREEBSD))
- 	extern long timezone;
-+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
- #endif /* ?BSD */
- #endif /* ?AMIGA */
- 
diff --git a/editors/openoffice.org-2.0/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice.org-2.0/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
deleted file mode 100644
index 41defbd5eb59..000000000000
--- a/editors/openoffice.org-2.0/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
-+++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
-@@ -65,6 +65,8 @@
- #include <glyphcache.hxx>
- 
- #define Region XLIB_Region
-+typedef unsigned long CARD32;
-+#define Cursor CARD32
- #include <X11/extensions/Xrender.h>
- #undef Region
- 
diff --git a/editors/openoffice.org-2.0/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice.org-2.0/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
deleted file mode 100644
index fefc925db41f..000000000000
--- a/editors/openoffice.org-2.0/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
-@@ -78,6 +78,12 @@
- GETSTYLE_GNOME=getstyle-gnome-linux-intel
- HASGNOME2=TRUE
- .ENDIF
-+.IF "$_(HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
-+.ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
- HASGNOME2=TRUE
diff --git a/editors/openoffice.org-2.0/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice.org-2.0/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
deleted file mode 100644
index 984313fc540a..000000000000
--- a/editors/openoffice.org-2.0/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
-@@ -75,9 +75,15 @@
- 
- HASGNOME2=
- 
--.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
-+.IF "$(OS)$(CPU)"=="LINUXI"
- MSGBOX_GNOME=msgbox-gnome-linux-intel
- HASGNOME2=TRUE
-+.ENDIF
-+.IF "$(_HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+MSGBOX_GNOME=msgbox-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
- .ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice.org-2.0/files/patch-vcl+workben+officeacceptthread.cxx b/editors/openoffice.org-2.0/files/patch-vcl+workben+officeacceptthread.cxx
deleted file mode 100644
index 07d9f1060557..000000000000
--- a/editors/openoffice.org-2.0/files/patch-vcl+workben+officeacceptthread.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/workben/officeacceptthread.cxx.orig	Wed Mar  5 20:25:36 2003
-+++ ../vcl/workben/officeacceptthread.cxx	Wed Mar  5 20:26:03 2003
-@@ -125,7 +125,7 @@
- #if defined (SOLARIS)
- 				int status;
- 				nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG);
--#elif defined(LINUX)
-+#elif defined(LINUX) || defined (FREEBSD)
- 				nRet = kill(aProcessInfo.Ident, 0);
- #endif
- #if defined (UNX)
diff --git a/editors/openoffice.org-2.0/files/zipmoz.sh b/editors/openoffice.org-2.0/files/zipmoz.sh
deleted file mode 100644
index 43a4591f3430..000000000000
--- a/editors/openoffice.org-2.0/files/zipmoz.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/sh -f
-
-RUNTIME_FILES=" components/libabsyncsvc.so components/libaddrbook.so \
-		components/libmork.so components/libmozldap.so \
-		components/libnecko.so components/libprofile.so \
-		components/librdf.so components/libstrres.so \
-		components/libunicharutil.so components/libuconv.so \
-		components/libucvcn.so components/libucvibm.so \
-		components/libucvja.so components/libucvko.so \
-		components/libucvlatin.so components/libucvtw.so \
-		components/libucvtw2.so components/liburiloader.so \
-		components/libvcard.so components/libxpconnect.so \
-		components/libpref.so components/libchrome.so libmozjs.so \
-		libmsgbaseutil.so libldap50.so libnspr4.so libplc4.so \
-		libplds4.so libxpcom.so libmozz.so component.reg \
-		components/necko_dns.xpt components/xpcom_xpti.xpt \
-		components/xpcom_threads.xpt components/xpcom_io.xpt \
-		components/xpcom_ds.xpt components/xpcom_components.xpt \
-		components/xpcom_base.xpt components/xpti.dat \
-		defaults/pref/all.js defaults/pref/config.js \
-		defaults/pref/editor.js defaults/pref/initpref.js \
-		defaults/pref/inspector.js defaults/pref/mailnews.js \
-		defaults/pref/security-prefs.js defaults/pref/unix.js \
-		defaults/pref/xpinstall.js"
-
-LIB_FILES="	lib/libembed_base_s.a lib/libmozreg_s.a \
-		lib/libnspr4.so lib/libxpcom.so lib/libprldap50.so"
-
-INC_FILES="include/"
-INC_FILES2="public/"
-
-if [ $# -lt 2 -o $# -gt 3 ] ; then
-	echo 
-	echo usage: $0 mozilla_dist target [target_dir]
-	echo
-	echo where:
-	echo
-	echo "mozilla_dist points to the mozilla distribution"
-	echo "target concatenates  OS, compiler and CPU (e.g. FREEBSDGCCI etc)"
-	echo "target_dir is the directory to place the zips"
-	exit 1
-fi
-
-MOZ_DIST=$1
-TARGET=$2
-if [ "w$3" != "w" ]; then
-	TARGET_DIR=$3
-else
-	if [ "w$TARGET_DIR" == "w" ]; then
-		TARGET_DIR=
-	fi
-fi
-
-ZIP_TARGET=$TARGET_DIR
-if [ -z "$ZIP_TARGET" ] ; then
-	ZIP_TARGET=../
-fi
-
-# just to remember the current working directory
-STARTING_DIR=`pwd`
-
-echo
-echo --- creating zips for $TARGET, using mozilla distribution in $MOZ_DIST
-
-# Create the directories
-[ ! -d $TARGET_DIR/$TARGET/runtime ] && mkdir -p $TARGET_DIR/$TARGET/runtime
-[ ! -d $TARGET_DIR/$TARGET/runtime/components ] && mkdir -p $TARGET_DIR/$TARGET/runtime/components
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults/pref ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults/pref
-[ ! -d $TARGET_DIR/$TARGET/lib ] && mkdir -p $TARGET_DIR/$TARGET/lib
-[ ! -d $TARGET_DIR/$TARGET/inc ] && mkdir -p $TARGET_DIR/$TARGET/inc
-[ ! -d $TARGET_DIR/$TARGET/inc/nspr ] && mkdir -p $TARGET_DIR/$TARGET/inc/nspr
-[ ! -d $TARGET_DIR/$TARGET/inc/obsolete ] && mkdir -p $TARGET_DIR/$TARGET/inc/obsolete
-
-# Copy the files
-echo
-echo --- copying files
-echo
-
-for i in $RUNTIME_FILES; do
-	if [ ! -f $MOZ_DIST/bin/$i ]; then
-		echo $MOZ_DIST/bin/$i does not exist, check your distribution
-	else
-		if [ `echo $i | grep component` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/components/
-		elif [ `echo $i | grep defaults` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/defaults/pref/
-		else
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/
-		fi
-	fi
-done
-
-for i in $LIB_FILES; do
-	if [ ! -f $MOZ_DIST/$i ]; then
-		echo $MOZ_DIST/$i does not exist, check your distribution
-	else
-		cp -R -L $MOZ_DIST/$i $TARGET_DIR/$TARGET/lib/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES`; do
-	if [ ! -d $i ]; then 
-		cp -R -L $MOZ_DIST/include/$i $TARGET_DIR/$TARGET/inc/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES2`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/public/$i $TARGET_DIR/$TARGET/inc
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/$i $TARGET_DIR/$TARGET/inc/nspr
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr/obsolete`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/obsolete/$i $TARGET_DIR/$TARGET/inc/obsolete
-	fi
-done
-
-# delete old zips
-
-[ -f $TARGET_DIR/$TARGET/runtime.zip ] && rm -f $TARGET_DIR/$TARGET/runtime.zip
-[ -f $TARGET_DIR/$TARGET/lib.zip ] && rm -f $TARGET_DIR/$TARGET/lib.zip
-[ -f $TARGET_DIR/$TARGET/inc.zip ] && rm -f $TARGET_DIR/$TARGET/inc.zip
-
-# zip the runtime files
-
-echo
-echo --- creating ${TARGET}runtime.zip
-echo
-
-cd $TARGET_DIR/$TARGET/runtime
-find . -type f | zip $ZIP_TARGET/${TARGET}runtime.zip -@
-
-# zip the lib files
-echo 
-echo --- creating ${TARGET}lib.zip
-echo 
-
-cd $TARGET_DIR/$TARGET/lib
-find . -type f | zip $ZIP_TARGET/${TARGET}lib.zip -@
-
-# zip the inc files
-echo
-echo --- creating ${TARGET}inc.zip
-echo
-
-cd $TARGET_DIR/$TARGET/inc
-find . -type f | zip $ZIP_TARGET/${TARGET}inc.zip -@
-
-# remove dirs
-cd $STARTING_DIR
-rm -rf $TARGET_DIR/$TARGET
-
-echo
-echo --- done
-echo
-
diff --git a/editors/openoffice.org-2.0/pkg-descr b/editors/openoffice.org-2.0/pkg-descr
deleted file mode 100644
index 31fd1b12161a..000000000000
--- a/editors/openoffice.org-2.0/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-OpenOffice.org is an Open Source, community-developed, multi-platform office
-productivity suite. It includes the key desktop applications, such as a
-word processor, spreadsheet, presentation manager, and drawing program,
-with a user interface and feature set similar to other office suites.
-
-Components include:
-  * A universal word processing application for creating business
-    letters, extensive text documents, professional layouts, and HTML
-    documents.
-  * A sophisticated application for performing advanced spreadsheet
-    functions, such as analyzing figures, creating lists, and viewing data.
-  * A tool for creating effective eye-catching presentations.
-  * A vector-oriented draw module that enables the creation of 3D
-    illustrations
diff --git a/editors/openoffice.org-2.0/pkg-message b/editors/openoffice.org-2.0/pkg-message
deleted file mode 100644
index 1dc749f301c2..000000000000
--- a/editors/openoffice.org-2.0/pkg-message
+++ /dev/null
@@ -1,73 +0,0 @@
-OpenOffice.org Build 643 Personal Install How-To
-
-Written by:	Martin Blapp <mbr@freebsd.org>
-
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
-
-1 User installation
--------------------
-
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
---------------
-
-There are some wrappers installed for fast startup.
-Add "${PREFIX}/bin/" to your PATH and you will be able
-to use them.
-
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
-
-If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
-version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
diff --git a/editors/openoffice.org-2.0/pkg-plist b/editors/openoffice.org-2.0/pkg-plist
deleted file mode 100644
index 28bd78453b52..000000000000
--- a/editors/openoffice.org-2.0/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, do not delete. Package list is generated automatically.
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
deleted file mode 100644
index 6f740924c399..000000000000
--- a/editors/openoffice.org-2/Makefile
+++ /dev/null
@@ -1,580 +0,0 @@
-# New ports collection makefile for: OpenOffice
-# Date created:		28 Februar 2002
-# Whom:                 Martin Blapp
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openoffice
-PORTVERSION=	644
-CATEGORIES+=	editors
-MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
-		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
-		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
-		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ny1.mirror.openoffice.org/miscellaneous/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
-MASTER_SITE_SUBDIR=	${PORTVERSION}
-DISTFILES+=	oo_${PORTVERSION}_src.tar.bz2 \
-		gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
-
-BROKEN=		"Does not build"
-
-SORT?=	/usr/bin/sort
-FIND?=	/usr/bin/find
-CUT?=	/usr/bin/cut
-AWK?=	/usr/bin/awk
-GREP?=	/usr/bin/grep
-ZIP?=	${PREFIX}/bin/zip
-UNZIP?=	${PREFIX}/bin/unzip
-ANT?=	${LOCALBASE}/bin/ant
-TCSH?=	/bin/tcsh
-PASTE?=	/usr/bin/paste
-
-.include <bsd.port.pre.mk>
-
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
-DIST_SUBDIR=		openoffice
-DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
-
-#
-# configuration for language specific slave ports
-#
-.if !defined(LANG_EXT)
-LANG_EXT=01
-.else
-#
-# Add pkg-descr and pkg-message if available
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-#
-# LANG_CONFIGURE_ARG is missing for the german port
-#
-.if defined(LANG_EXT)
-CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG},ENUS
-.endif
-.endif
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
-
-EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-
-MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/jakarta-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-.if !defined(DISPLAY)
-BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
-.endif
-.if !defined(WITH_BSD_JDK)
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk14
-.else
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-.endif
-
-USE_PERL5=	yes
-USE_BZIP2=	yes
-USE_BISON=	yes
-USE_GMAKE=	yes
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
-.if !defined(WITH_BSD_JDK)
-JDKDIR?=	${LOCALBASE}/linux-sun-jdk1.4.1
-.else
-JDKDIR?=	${LOCALBASE}/jdk1.4.1
-.endif
-JAVAVM=         ${JDKDIR}/bin/java
-
-GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
-LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
-BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
-
-.if !defined(DISPLAY)
-DISPLAYHACK=localhost:1001
-.endif
-
-CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
-			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
-
-.if !defined(WITH_BSD_JDK)
-CONFIGURE_ARGS+=	--enable-linuxjdk=yes
-.endif
-
-.if defined(WITH_DEBUG)
-.if ${WITH_DEBUG} == 2
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-.endif
-
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"prefered language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
-	@${ECHO} "OPTIONS:"
-.if !defined(USE_GCC)
-	@${ECHO}
-	@${ECHO} "You can compile OO with different"
-	@${ECHO} "gcc compiler versions:"
-	@${ECHO}
-	@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.2"
-	@${ECHO} "to compile openoffice with your"
-	@${ECHO} "prefered compiler."
-.endif
-.if !defined(WITH_BSD_JDK)
-	@${ECHO}
-	@${ECHO} "If you like to use the native BSD"
-	@${ECHO} "JDK for the build system, you can use"
-	@${ECHO} "WITH_BSD_JDK=TRUE to disable the"
-	@${ECHO} "usage of the linux-JDK and linux dependency."
-	@${ECHO}
-.endif
-.if !defined(WITH_DEBUG)
-	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
-	@${ECHO} "if you call make with WITH_DEBUG=1"
-	@${ECHO}
-	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
-	@${ECHO}
-.endif
-.if !defined(WITH_TTF_BYTECODE_ENABLED)
-	@${ECHO}
-	@${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES"
-	@${ECHO} "if you like to use the Freetype library to"
-	@${ECHO} "render TTF fonts. Normally the TTF lib is"
-	@${ECHO} "not used to render fonts."
-	@${ECHO}
-	@${ECHO} "If you have licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479"
-	@${ECHO} "you can enable this option to get better"
-	@${ECHO} "quality of glyphs at small bitmap sizes."
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 450002
-	@${ECHO}
-	@${ECHO} "OS-VERSION ${OSVERSION} too low"
-	@${ECHO}
-	@${ECHO} "OO need some important libc_r and"
-	@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
-	@${ECHO} "RELEASE or 4.6 STABLE."
-	@${FALSE}
-.endif
-	@${ECHO}
-	@${ECHO} "NOTICE:"
-	@${ECHO}
-	@${ECHO} "To build Openoffice, you should have a lot"
-.if defined(WITH_DEBUG)
-	@${ECHO} "of free diskspace (~ 8GB)."
-.else
-	@${ECHO} "of free diskspace (~ 4GB)."
-.endif
-	@${ECHO}
-.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
-    (${OSVERSION} < 500000 && !defined(USE_GCC))
-	@${ECHO} "KERNEL CONFIGURATION:"
-	@${ECHO}
-	@${ECHO} "Openoffice needs a larger stack- and"
-	@${ECHO} "datasize to build. Check your limit"
-	@${ECHO} "settings and and put this in /boot/loader.conf"
-	@${ECHO} "if neccessary:"
-	@${ECHO}
-	@${ECHO} "kern.maxdsiz=\"1073741824\""
-	@${ECHO} "kern.maxssiz=\"268435456\""
-.endif
-	@${ECHO}
-.if ${OSVERSION} < 460002
-	@${ECHO} "REQUIRED SYSTEM PATCHES:"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO} "OO.org can crash if you enter a non existing path"
-	@${ECHO} "or URL in the location bar. To fix these crashes"
-	@${ECHO} "you need a uncommitted system patch for rtld:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460001
-	@${ECHO}
-	@${ECHO} "OO setup is broken on STABLE < 4.6"
-	@${ECHO} "including 4.6 RELEASE."
-	@${ECHO} "You'll need a system patch to solve"
-	@${ECHO} "this problem:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460002
-	@${ECHO}
-	@${ECHO} "OO.org soffice binary can deadlock. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO}
-	@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
-	@${ECHO}
-.endif
-.if !exists(/usr/include/langinfo.h)
-	@${ECHO}
-	@${ECHO} "langinfo.h is missing !"
-	@${ECHO}
-	@${ECHO} "Please upgrade to 4.6 RELEASE or"
-	@${ECHO} "4.6 STABLE."
-	@${ECHO}
-	@${FALSE}
-.endif
-
-post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
-	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
-	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@-${RM} -f ${WRKSRC}/../moz/zipped/*.zip
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
-.if defined(L10NHELP)
-	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
-	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
-.endif
-
-post-patch:
-	@${MAKE} patch-mozilla
-.if defined(WITH_TTF_BYTECODE_ENABLED)
-	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
-		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-			${ECHO_MSG} "===>   Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \
-		fi; \
-		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
-	fi
-.endif
-.if defined(WITH_DEBUG)
-	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
-		PATCHES_APPLIED="" ; \
-		for i in ${PATCHDIR}/debugpatch-*; do \
-			case $$i in \
-				*.orig|*.rej|*~) \
-					${ECHO_MSG} "===>   Ignoring patchfile $$i" ; \
-					;; \
-				*) \
-					if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-						${ECHO_MSG} "===>   Applying ${OPSYS} patch $$i" ; \
-					fi; \
-					if ${PATCH} ${PATCH_ARGS} < $$i ; then \
-						PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
-					else \
-						${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
-						if [ x"$$PATCHES_APPLIED" != x"" ]; then \
-							${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
-						fi; \
-						${FALSE} ; \
-					fi; \
-					;; \
-			esac; \
-		done; \
-	fi;
-.endif
-	@${ECHO_MSG} "===>  Find old malloc.h defines and fix them in ${PKGNAME} source"
-	@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
-		${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
-
-extract-mozilla:
-.if ! exists(${WRKDIR}/mozilla/Makefile)
-	@${ECHO_MSG} "===>  Extracting mozilla sub project"
-	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
-.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment)
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
-.endif
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
-.endif
-	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
-
-patch-mozilla:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
-		${WRKDIR}/mozilla/files/
-	@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
-
-build-mozilla:
-.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
-	@${ECHO_MSG} "===>  Building mozilla sub project"
-.if defined(WITH_DEBUG)
-	@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
-	@${SED} -e 's|--disable-debug||' \
-		-e 's|--disable-cpp-rtti||' \
-		-e 's|--enable-strip||' \
-		< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
-.endif
-.if defined(USE_GCC)
-	@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
-.else
-	@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
-.endif
-	@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
-	@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
-	@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
-.endif
-
-install-mozilla:
-	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
-
-register-mozilla:
-.if exists(${WRKDIR}/mozilla-runtime)
-	@${RM} -rf ${WRKDIR}/mozilla-runtime
-.endif
-	@${MKDIR} ${WRKDIR}/mozilla-runtime
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
-	@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
-	@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
-	@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
-		&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom 
-	@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
-		${WRKDIR}/mozilla-runtime/components/xptitemp.dat
-	@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
-	@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
-		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
-
-mozilla:
-	@${MAKE} extract-mozilla
-	@${MAKE} patch-mozilla
-	@${MAKE} build-mozilla
-	@${MAKE} register-mozilla
-	@${MAKE} install-mozilla
-
-do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
-	@${MAKE} mozilla
-.endif
-.endif
-.endif
-.if exists(${WRKDIR}/.Xvfb.pid)
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.endif
-.if !defined(DISPLAY)
-	#
-	# This is a UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-.endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
-	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-.endif
-.if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
-.endif
-
-pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-
-do-install:
-.if !defined(DISPLAY)
-	#
-	# UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-.endif
-
-install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
-
-post-install:
-	@${ECHO_MSG} "===>  Add wrapper scripts";
-	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
-	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
-
-package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
-.if defined(LANG_SUFFIX)
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
-.else
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
-.endif
-
-update:
-	@${MAKE} fetch
-	@${MAKE} extract
-	@cd ${WRKSRC}/.. && for dir in *; do \
-	    if [ -d $$dir ]; then \
-		cd $$dir; cvs update -d; cd ..; \
-	    fi \
-	done
-
-.include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
deleted file mode 100644
index ec9d6788f104..000000000000
--- a/editors/openoffice.org-2/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
-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
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
diff --git a/editors/openoffice.org-2/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-2/files/debugpatch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 96c651ce22c8..000000000000
--- a/editors/openoffice.org-2/files/debugpatch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../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
-@@ -902,6 +902,7 @@
- 
- void KillSetupDir()
- {
-+#if 0
-     DIR* pDir = opendir( strTmpPath );
-     struct dirent* pFile;
- 
-@@ -915,6 +916,10 @@
- 
-     chdir( strInitPath );
-     rmdir( strTmpPath );
-+#else
-+	fprintf(stderr, "\nLeaving behind temporary directory: %s\n",
-+	strTmpPath);
-+#endif
- }
- 
- void makeSymLink( char* s )
diff --git a/editors/openoffice.org-2/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2/files/debugpatch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 52bd2b3d58d6..000000000000
--- a/editors/openoffice.org-2/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
-+++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
- 
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- 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
- 
- # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
diff --git a/editors/openoffice.org-2/files/oo_setup.resp b/editors/openoffice.org-2/files/oo_setup.resp
deleted file mode 100644
index 8eeeb11bd95e..000000000000
--- a/editors/openoffice.org-2/files/oo_setup.resp
+++ /dev/null
@@ -1,7 +0,0 @@
-[Environment]
-InstallationMode = INSTALL_NETWORK
-InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org-643
-
-[Java]
-JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-2/files/openoffice-wrapper b/editors/openoffice.org-2/files/openoffice-wrapper
deleted file mode 100644
index a2249fa84c5d..000000000000
--- a/editors/openoffice.org-2/files/openoffice-wrapper
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2/files/Attic/openoffice-wrapper,v 1.3 2003-03-05 23:24:05 mbr Exp $
-
-oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/
-program=`echo $0 | sed -e 's|.*-||'`
-
-if [ ! $LANG ]; then
-	export LANG=%%LANG%%
-fi
-
-case $program in
-$0)
-	exec $oopath/soffice "$@"
-	;;
-	*)
-	exec $oopath/$program "$@"
-	;;
-esac
diff --git a/editors/openoffice.org-2/files/optpatch-freetype+patch b/editors/openoffice.org-2/files/optpatch-freetype+patch
deleted file mode 100644
index b426a8fb7fcc..000000000000
--- a/editors/openoffice.org-2/files/optpatch-freetype+patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Index: files/patch-freetype::patch
-===================================================================
-RCS file: files/patch-freetype::patch
-diff -N files/patch-freetype::patch
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-freetype::patch	4 Aug 2002 15:27:42 -0000
-@@ -0,0 +1,201 @@
-+diff -ur ../freetype/freetype-2.0.5.patch oo641d_patched/freetype/freetype-2.0.5.patch
-+--- ../freetype/freetype-2.0.5.patch	Fri Apr  5 21:07:34 2002
-++++ ../freetype/freetype-2.0.5.patch	Sat Mar  9 18:04:17 2002
-+@@ -1,118 +1,79 @@
-+-*** misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 14 00:44:33 2000
-+---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 63,69 ****
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+---- 63,69 ----
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+-*** misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Jun  7 19:36:17 2001
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 631,637 ****
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+---- 631,637 ----
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile -DPIC $pic_flag"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Mon Jan  1 18:25:21 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 1,7 ****
-+---- 1,9 ----
-+-  FT_USE_MODULE(autohint_module_class)
-+-  FT_USE_MODULE(cff_driver_class)
-+-  FT_USE_MODULE(t1cid_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(pcf_driver_class)
-+-+ */
-+-  FT_USE_MODULE(psaux_module_class)
-+-  FT_USE_MODULE(psnames_module_class)
-+-  FT_USE_MODULE(ft_raster1_renderer_class)
-+-***************
-+-*** 9,12 ****
-+---- 11,16 ----
-+-  FT_USE_MODULE(ft_smooth_renderer_class)
-+-  FT_USE_MODULE(tt_driver_class)
-+-  FT_USE_MODULE(t1_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(winfnt_driver_class)
-+-+ */
-+-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h	Tue Aug 21 10:50:45 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 70,76 ****
-+---- 70,79 ----
-+-    /*   All convenience functions are declared as such in their             */
-+-    /*   documentation.                                                      */
-+-    /*                                                                       */
-+-+ /*
-+-  #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-+ */
-+-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-  
-+-  
-+-    /*************************************************************************/
-+-***************
-+-*** 108,116 ****
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-- 
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+---- 111,121 ----
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-+ /*
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-+ */
-+-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig	Mon Jan  7 14:21:35 2002
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Mon Jan  7 14:21:40 2002
-+-***************
-+-*** 2251,2257 ****
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age + 1`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-+---- 2251,2257 ----
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk
-++--- misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:49:17 2001
-++@@ -63,7 +63,7 @@
-++ #   ANSI compliance.
-++ #
-++ ifndef CFLAGS
-++-  CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+++  CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-++ endif
-++ 
-++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh
-++--- misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:47:56 2001
-+++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:49:17 2001
-++@@ -631,7 +631,7 @@
-++     if test "$build_old_libs" = yes; then
-++       if test "$pic_mode" != yes; then
-++ 	# Don't build PIC code
-++-	command="$base_compile $srcfile"
-+++	command="$base_compile $srcfile -DPIC $pic_flag"
-++       else
-++ 	# All platforms use -DPIC, to notify preprocessed assembler code.
-++ 	command="$base_compile $srcfile $pic_flag -DPIC"
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:49:17 2001
-++@@ -1,7 +1,9 @@
-++ FT_USE_MODULE(autohint_module_class)
-++ FT_USE_MODULE(cff_driver_class)
-++ FT_USE_MODULE(t1cid_driver_class)
-+++/*
-++ FT_USE_MODULE(pcf_driver_class)
-+++*/
-++ FT_USE_MODULE(psaux_module_class)
-++ FT_USE_MODULE(psnames_module_class)
-++ FT_USE_MODULE(ft_raster1_renderer_class)
-++@@ -9,4 +11,6 @@
-++ FT_USE_MODULE(ft_smooth_renderer_class)
-++ FT_USE_MODULE(tt_driver_class)
-++ FT_USE_MODULE(t1_driver_class)
-+++/*
-++ FT_USE_MODULE(winfnt_driver_class)
-+++*/
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:51:15 2001
-++@@ -70,7 +70,10 @@
-++   /*   All convenience functions are declared as such in their             */
-++   /*   documentation.                                                      */
-++   /*                                                                       */
-+++/*
-++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+++*/
-+++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-++ 
-++ 
-++   /*************************************************************************/
-++@@ -108,8 +111,10 @@
-++   /*   use a vector `plotter' format that isn't supported when this        */
-++   /*   macro is undefined.                                                 */
-++   /*                                                                       */
-+++/*
-++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++-
-+++*/
-+++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++ 
-++   /*************************************************************************/
-++   /*                                                                       */
-++@@ -338,7 +343,7 @@
-++   /* By undefining this, you will only compile the code necessary to load  */
-++   /* TrueType glyphs without hinting.                                      */
-++   /*                                                                       */
-++-#undef  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-+++#define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-++ 
-++ 
-++   /*************************************************************************/
diff --git a/editors/openoffice.org-2/files/optpatch-vcl+util+makefile.pmk b/editors/openoffice.org-2/files/optpatch-vcl+util+makefile.pmk
deleted file mode 100644
index 41341ff0b4e8..000000000000
--- a/editors/openoffice.org-2/files/optpatch-vcl+util+makefile.pmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/util/makefile.pmk.orig	Mon Aug  5 01:39:41 2002
-+++ ../vcl/util/makefile.pmk	Mon Aug  5 01:40:03 2002
-@@ -64,7 +64,7 @@
- PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch
- PDBTARGET=vcl
- 
--.IF "$(OS)" != "MACOSX"
-+.IF "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- .IF "$(remote)" != ""
- USE_BUILTIN_RASTERIZER=true
- .ENDIF
diff --git a/editors/openoffice.org-2/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-2/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 078685f3b516..000000000000
--- a/editors/openoffice.org-2/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../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 freebsd genunix";;
-  	*)		JINCSUBDIRS="genunix";;
-  	esac
-  
diff --git a/editors/openoffice.org-2/files/patch-bridges+prj+build.lst b/editors/openoffice.org-2/files/patch-bridges+prj+build.lst
deleted file mode 100644
index fee3d847c5e6..000000000000
--- a/editors/openoffice.org-2/files/patch-bridges+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
deleted file mode 100644
index 99b8c566fb61..000000000000
--- a/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ /dev/null
@@ -1,102 +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 );
-+    }
- }
- 
- }
diff --git a/editors/openoffice.org-2/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice.org-2/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
deleted file mode 100644
index 4622b7fe21c4..000000000000
--- a/editors/openoffice.org-2/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-2/files/patch-comphelper+util+makefile.mk b/editors/openoffice.org-2/files/patch-comphelper+util+makefile.mk
deleted file mode 100644
index f2d3092c2ddf..000000000000
--- a/editors/openoffice.org-2/files/patch-comphelper+util+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2/files/patch-config_office+configure.in b/editors/openoffice.org-2/files/patch-config_office+configure.in
deleted file mode 100644
index a45332fcbec0..000000000000
--- a/editors/openoffice.org-2/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,66 +0,0 @@
---- configure.in.orig	Thu Feb 20 15:49:32 2003
-+++ configure.in	Wed Mar  5 21:22:34 2003
-@@ -95,6 +95,12 @@
-                           
-                           Usage: --enable-macos9
- ],,)
-+AC_ARG_ENABLE(linuxjdk,
-+[  --enable-linuxjdk         Use this option option if you like to use
-+                          the linux-jdk instead of the native jdk.
-+
-+                          Usage: --enable-linuxjdk
-+],,)
- AC_ARG_WITH(lang,
- [  --with-lang             Use this option to build OpenOffice.org with
-                           additional language support. US English is always
-@@ -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
-@@ -1232,7 +1249,11 @@
- if test -n "$enable_debug"; then
-    ENABLE_DEBUG="TRUE"
- else
--   ENABLE_DEBUG="FALSE"
-+fi
-+if test -n "$enable_linuxjdk"; then
-+   USE_LINUXJDK="TRUE"
-+else
-+   USE_LINUXJDK="FALSE"
- fi
- 
- dnl ===================================================================
-@@ -1278,6 +1299,7 @@
- AC_SUBST(PTHREAD_CFLAGS)
- AC_SUBST(PTHREAD_LIBS)
- AC_SUBST(ENABLE_DEBUG)
-+AC_SUBST(USE_LINUXJDK)
- 
- AC_OUTPUT([set_soenv])
- 
diff --git a/editors/openoffice.org-2/files/patch-config_office+set_soenv.in b/editors/openoffice.org-2/files/patch-config_office+set_soenv.in
deleted file mode 100644
index 9ea6b11bdab2..000000000000
--- a/editors/openoffice.org-2/files/patch-config_office+set_soenv.in
+++ /dev/null
@@ -1,44 +0,0 @@
---- set_soenv.in.orig	Thu Feb 27 15:12:36 2003
-+++ set_soenv.in	Wed Mar  5 21:16:43 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, 
-@@ -88,7 +88,7 @@
-      $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
-      $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS,
-      $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
--     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG );
-+     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $USE_LINUXJDK );
- #
- #-------------------------------------------
- # IId. Declaring the aliases.
-@@ -140,7 +140,8 @@
- $CC			= '@CC@';           # C compiler
- $CXX		= '@CXX@';          # C++ compiler
- $EXCEPTIONS	= '@EXCEPTIONS@';   # Exception handling type
--$ENABLE_DEBUG	= '@ENABLE_DEBUG@';  # Enable a debug build
-+$ENABLE_DEBUG	= '@ENABLE_DEBUG@'; # Enable a debug build
-+$USE_LINUXJDK	= '@USE_LINUXJDK@'; # Use the Linux JDK
- $WRAPCMD	= "";				# Wrapper (only for winnt)
- 
- #
-@@ -1265,7 +1266,12 @@
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
- }
- elsif ($platform eq "$FreeBSD")
--{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+{
-+   if ($USE_LINUXJDK eq "TRUE") {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
-+   } else {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+   }
- }
- elsif ($platform eq "$NetBSD")
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
diff --git a/editors/openoffice.org-2/files/patch-connectivity+source+drivers+mozab+makefile.mk b/editors/openoffice.org-2/files/patch-connectivity+source+drivers+mozab+makefile.mk
deleted file mode 100644
index 2b83f2cd2ec7..000000000000
--- a/editors/openoffice.org-2/files/patch-connectivity+source+drivers+mozab+makefile.mk
+++ /dev/null
@@ -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)					\
diff --git a/editors/openoffice.org-2/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-2/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
deleted file mode 100644
index 3601766ee561..000000000000
--- a/editors/openoffice.org-2/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../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
-@@ -64,8 +64,8 @@
- #mozilla specific stuff.
- MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
- MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
--#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
--#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
-+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
-+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
- #End of mozilla specific stuff.
- 
- PRJ=..$/..$/..$/..
-@@ -107,7 +107,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -123,7 +123,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -141,7 +141,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS+=	    -DMOZILLA_CLIENT \
-             -DOSTYPE=\"Linux2.2.14-5\" -DOJI
- .IF "$(OS)" == "LINUX"
-@@ -157,6 +157,13 @@
-             -fno-rtti -Wall -Wconversion -Wpointer-arith \
-             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-             -Wno-long-long 
-+CDEFS     += -DTRACING
-+.ELIF "$(OS)" == "FREEBSD"
-+CFLAGS +=   -fPIC
-+CFLAGSCXX += \
-+            -fno-rtti -Wall -Wconversion -Wpointer-arith \
-+            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-+            -Wno-long-long -pthread 
- CDEFS     += -DTRACING
- .ENDIF
- .ENDIF
diff --git a/editors/openoffice.org-2/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk b/editors/openoffice.org-2/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
deleted file mode 100644
index b63d2a25f184..000000000000
--- a/editors/openoffice.org-2/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-2/files/patch-cppu+inc+uno+lbnames.h
deleted file mode 100644
index cb43c2d165e9..000000000000
--- a/editors/openoffice.org-2/files/patch-cppu+inc+uno+lbnames.h
+++ /dev/null
@@ -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."
diff --git a/editors/openoffice.org-2/files/patch-cppu+prj+build.lst b/editors/openoffice.org-2/files/patch-cppu+prj+build.lst
deleted file mode 100644
index 78fd210a1193..000000000000
--- a/editors/openoffice.org-2/files/patch-cppu+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-2/files/patch-cppuhelper+source+makefile.mk
deleted file mode 100644
index 5fb5bd636eb1..000000000000
--- a/editors/openoffice.org-2/files/patch-cppuhelper+source+makefile.mk
+++ /dev/null
@@ -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 ------------------------------------------------------
diff --git a/editors/openoffice.org-2/files/patch-desktop+source+pkgchk+pkgchk_misc.h b/editors/openoffice.org-2/files/patch-desktop+source+pkgchk+pkgchk_misc.h
deleted file mode 100644
index 391667b66ebd..000000000000
--- a/editors/openoffice.org-2/files/patch-desktop+source+pkgchk+pkgchk_misc.h
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2/files/patch-desktop+util+makefile.mk b/editors/openoffice.org-2/files/patch-desktop+util+makefile.mk
deleted file mode 100644
index 025d644a8077..000000000000
--- a/editors/openoffice.org-2/files/patch-desktop+util+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2/files/patch-dtrans+source+X11+makefile.mk b/editors/openoffice.org-2/files/patch-dtrans+source+X11+makefile.mk
deleted file mode 100644
index 5881f5d7f6a5..000000000000
--- a/editors/openoffice.org-2/files/patch-dtrans+source+X11+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice.org-2/files/patch-eventattacher+source+makefile.mk b/editors/openoffice.org-2/files/patch-eventattacher+source+makefile.mk
deleted file mode 100644
index 4552698eb132..000000000000
--- a/editors/openoffice.org-2/files/patch-eventattacher+source+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2/files/patch-external+gcc3_specific+makefile.mk b/editors/openoffice.org-2/files/patch-external+gcc3_specific+makefile.mk
deleted file mode 100644
index 6b8071f4030e..000000000000
--- a/editors/openoffice.org-2/files/patch-external+gcc3_specific+makefile.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../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"
- 
- .IF "$(OS)"!="MACOSX"
-+.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 @@
-         -rm -f $@
-         +ln -s libgcc_s.so.1 $@
- 
-+.ENDIF 
- .ENDIF 
- 
- .ENDIF
diff --git a/editors/openoffice.org-2/files/patch-freetype+makefile.mk b/editors/openoffice.org-2/files/patch-freetype+makefile.mk
deleted file mode 100644
index 3e5a8dd19f18..000000000000
--- a/editors/openoffice.org-2/files/patch-freetype+makefile.mk
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-2/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-2/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice.org-2/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
- 
- /* 
diff --git a/editors/openoffice.org-2/files/patch-javaunohelper+source+makefile.mk b/editors/openoffice.org-2/files/patch-javaunohelper+source+makefile.mk
deleted file mode 100644
index 19f6b86e5ab5..000000000000
--- a/editors/openoffice.org-2/files/patch-javaunohelper+source+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice.org-2/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice.org-2/files/patch-jni_uno+jni_java2uno.cxx
deleted file mode 100644
index a9ff9e3fed88..000000000000
--- a/editors/openoffice.org-2/files/patch-jni_uno+jni_java2uno.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-2/files/patch-nas+nas-1.6.patch b/editors/openoffice.org-2/files/patch-nas+nas-1.6.patch
deleted file mode 100644
index b6096654ebaf..000000000000
--- a/editors/openoffice.org-2/files/patch-nas+nas-1.6.patch
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-2/files/patch-offapi+com+sun+star+setup+OSType.idl b/editors/openoffice.org-2/files/patch-offapi+com+sun+star+setup+OSType.idl
deleted file mode 100644
index 3fee562c6d38..000000000000
--- a/editors/openoffice.org-2/files/patch-offapi+com+sun+star+setup+OSType.idl
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2/files/patch-offapi+util+makefile.pmk b/editors/openoffice.org-2/files/patch-offapi+util+makefile.pmk
deleted file mode 100644
index 5cdbb1b4aa4a..000000000000
--- a/editors/openoffice.org-2/files/patch-offapi+util+makefile.pmk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2/files/patch-package+inc+HashMaps.hxx b/editors/openoffice.org-2/files/patch-package+inc+HashMaps.hxx
deleted file mode 100644
index 35052d291ef7..000000000000
--- a/editors/openoffice.org-2/files/patch-package+inc+HashMaps.hxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice.org-2/files/patch-package+inc+ZipPackageFolder.hxx b/editors/openoffice.org-2/files/patch-package+inc+ZipPackageFolder.hxx
deleted file mode 100644
index 014c61403380..000000000000
--- a/editors/openoffice.org-2/files/patch-package+inc+ZipPackageFolder.hxx
+++ /dev/null
@@ -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()
diff --git a/editors/openoffice.org-2/files/patch-package+source+zippackage+ContentInfo.hxx b/editors/openoffice.org-2/files/patch-package+source+zippackage+ContentInfo.hxx
deleted file mode 100644
index c4bf35e79f64..000000000000
--- a/editors/openoffice.org-2/files/patch-package+source+zippackage+ContentInfo.hxx
+++ /dev/null
@@ -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();
diff --git a/editors/openoffice.org-2/files/patch-package+source+zippackage+ZipPackageFolder.cxx b/editors/openoffice.org-2/files/patch-package+source+zippackage+ZipPackageFolder.cxx
deleted file mode 100644
index bb504c834eef..000000000000
--- a/editors/openoffice.org-2/files/patch-package+source+zippackage+ZipPackageFolder.cxx
+++ /dev/null
@@ -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 );
diff --git a/editors/openoffice.org-2/files/patch-registry+source+regkey.cxx b/editors/openoffice.org-2/files/patch-registry+source+regkey.cxx
deleted file mode 100644
index fad069f83f14..000000000000
--- a/editors/openoffice.org-2/files/patch-registry+source+regkey.cxx
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-2/files/patch-rsc+source+rscpp+cpp.h b/editors/openoffice.org-2/files/patch-rsc+source+rscpp+cpp.h
deleted file mode 100644
index 417ab33ba52f..000000000000
--- a/editors/openoffice.org-2/files/patch-rsc+source+rscpp+cpp.h
+++ /dev/null
@@ -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              */
- 
diff --git a/editors/openoffice.org-2/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-2/files/patch-sal+osl+unx+nlsupport.c
deleted file mode 100644
index 49fe0da8589b..000000000000
--- a/editors/openoffice.org-2/files/patch-sal+osl+unx+nlsupport.c
+++ /dev/null
@@ -1,160 +0,0 @@
---- ../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
-@@ -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)
- 
-@@ -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 @@
-     { "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-2/files/patch-sal+osl+unx+pipe.c b/editors/openoffice.org-2/files/patch-sal+osl+unx+pipe.c
deleted file mode 100644
index 4aa7b8af1a61..000000000000
--- a/editors/openoffice.org-2/files/patch-sal+osl+unx+pipe.c
+++ /dev/null
@@ -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 )
- 	{			
diff --git a/editors/openoffice.org-2/files/patch-sal+osl+unx+process.c b/editors/openoffice.org-2/files/patch-sal+osl+unx+process.c
deleted file mode 100644
index 50023576bec4..000000000000
--- a/editors/openoffice.org-2/files/patch-sal+osl+unx+process.c
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-2/files/patch-sal+osl+unx+security.c b/editors/openoffice.org-2/files/patch-sal+osl+unx+security.c
deleted file mode 100644
index 0cc321dcd544..000000000000
--- a/editors/openoffice.org-2/files/patch-sal+osl+unx+security.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../sal/osl/unx/security.c.orig	Sat Jul 20 22:53:31 2002
-+++ ../sal/osl/unx/security.c	Sat Jul 20 22:52:39 2002
-@@ -739,7 +739,7 @@
- 	}
- 
- 
--#elif (LINUX && (GLIBC >= 2))
-+#elif ((LINUX && (GLIBC >= 2)) || defined(FREEBSD))
- 	
- 	struct passwd	*pPasswd; 
- 	
diff --git a/editors/openoffice.org-2/files/patch-sal+osl+unx+socket.c b/editors/openoffice.org-2/files/patch-sal+osl+unx+socket.c
deleted file mode 100644
index 9541cac8583f..000000000000
--- a/editors/openoffice.org-2/files/patch-sal+osl+unx+socket.c
+++ /dev/null
@@ -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! */
diff --git a/editors/openoffice.org-2/files/patch-sal+osl+unx+system.c b/editors/openoffice.org-2/files/patch-sal+osl+unx+system.c
deleted file mode 100644
index 8dc663ac03fc..000000000000
--- a/editors/openoffice.org-2/files/patch-sal+osl+unx+system.c
+++ /dev/null
@@ -1,127 +0,0 @@
---- ../sal/osl/unx/system.c.orig	Sun Mar 17 12:34:13 2002
-+++ ../sal/osl/unx/system.c	Wed Apr  3 01:03:36 2002
-@@ -195,6 +195,73 @@
- }
- #endif
- 
-+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
-+           size_t buflen, struct passwd **result)
-+{
-+  struct passwd* res;
-+
-+  pthread_mutex_lock(&getrtl_mutex);
-+
-+  if ( res = getpwuid(uid) )
-+  {
-+    size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell;
-+
-+    pw_name = strlen(res->pw_name)+1;
-+    pw_passwd = strlen(res->pw_passwd)+1;
-+    pw_class = strlen(res->pw_class)+1;
-+    pw_gecos = strlen(res->pw_gecos)+1;
-+    pw_dir = strlen(res->pw_dir)+1;
-+    pw_shell = strlen(res->pw_shell)+1;
-+
-+    if (pw_name+pw_passwd+pw_class+pw_gecos
-+                                 +pw_dir+pw_shell < buflen)
-+    {
-+      memcpy(pwd, res, sizeof(struct passwd));
-+
-+      strncpy(buffer, res->pw_name, pw_name);
-+      pwd->pw_name = buffer;
-+      buffer += pw_name;
-+
-+      strncpy(buffer, res->pw_passwd, pw_passwd);
-+      pwd->pw_passwd = buffer;
-+      buffer += pw_passwd;
-+
-+      strncpy(buffer, res->pw_class, pw_class);
-+      pwd->pw_class = buffer;
-+      buffer += pw_class;
-+
-+      strncpy(buffer, res->pw_gecos, pw_gecos);
-+      pwd->pw_gecos = buffer;
-+      buffer += pw_gecos;
-+
-+      strncpy(buffer, res->pw_dir, pw_dir);
-+      pwd->pw_dir = buffer;
-+      buffer += pw_dir;
-+
-+      strncpy(buffer, res->pw_shell, pw_shell);
-+      pwd->pw_shell = buffer;
-+      buffer += pw_shell;
-+
-+      *result = pwd ;
-+      res = 0 ;
-+
-+    } else {
-+
-+      res = ENOMEM ;
-+
-+    }      
-+  
-+  } else {
-+
-+    res = errno ;
-+ 
-+  } 
-+
-+  pthread_mutex_unlock(&getrtl_mutex);
-+
-+  return res;
-+}
-+
- struct tm *localtime_r(const time_t *timep, struct tm *buffer)
- {
- 	struct tm* res;
-@@ -518,3 +585,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-2/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-2/files/patch-sal+osl+unx+system.h
deleted file mode 100644
index c4e255952fc7..000000000000
--- a/editors/openoffice.org-2/files/patch-sal+osl+unx+system.h
+++ /dev/null
@@ -1,35 +0,0 @@
---- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
-+++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
-@@ -205,6 +205,13 @@
- #   include <sys/ioctl.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 <machine/vmparam.h>
-+#   include <machine/pmap.h>
- #	include <sys/un.h>
- #   include <netinet/tcp.h>
- #	define 	IORESOURCE_TRANSFER_BSD 
-@@ -216,12 +223,13 @@
- #   elif BYTE_ORDER == PDP_ENDIAN
- #   	define _PDP_ENDIAN
- #   endif
--#   define  sched_yield() 				pthread_yield()
--#   define  pthread_testcancel()
- #	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
diff --git a/editors/openoffice.org-2/files/patch-sal+textenc+tencinfo.c b/editors/openoffice.org-2/files/patch-sal+textenc+tencinfo.c
deleted file mode 100644
index 7cf80c18d0a0..000000000000
--- a/editors/openoffice.org-2/files/patch-sal+textenc+tencinfo.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
-     /* 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 */
-+
-+    if (pMimeCharset == NULL)
-+	pMimeCharset = "usascii";
-+
-     static ImplStrCharsetDef const aVIPMimeCharsetTab[] =
-     {
-         { "usascii", RTL_TEXTENCODING_ASCII_US },
diff --git a/editors/openoffice.org-2/files/patch-sal+workben+makefile.mk b/editors/openoffice.org-2/files/patch-sal+workben+makefile.mk
deleted file mode 100644
index 369935e31d66..000000000000
--- a/editors/openoffice.org-2/files/patch-sal+workben+makefile.mk
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../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 @@
- 
- .IF "$(TESTAPP)" == "salstattest"
- 
--	CFLAGS+= /DUSE_SAL_STATIC
-+	CFLAGS+= -DUSE_SAL_STATIC
- 
- 	OBJFILES=	$(OBJ)$/salstattest.obj
- 
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- 
- CXXFILES=	tgetpwnam.cxx
- OBJFILES=	$(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN=	$(SLB)$/sal.lib
- 
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd | freebsd)
- .ENDIF # tgetpwname
- 
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-2/files/patch-salhelper+source+gcc2_freebsd_intel.map b/editors/openoffice.org-2/files/patch-salhelper+source+gcc2_freebsd_intel.map
deleted file mode 100644
index 1ffacf889bc6..000000000000
--- a/editors/openoffice.org-2/files/patch-salhelper+source+gcc2_freebsd_intel.map
+++ /dev/null
@@ -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:
-+*;
-+};
diff --git a/editors/openoffice.org-2/files/patch-salhelper+source+gcc3_freebsd_intel.map b/editors/openoffice.org-2/files/patch-salhelper+source+gcc3_freebsd_intel.map
deleted file mode 100644
index 823cff316ec7..000000000000
--- a/editors/openoffice.org-2/files/patch-salhelper+source+gcc3_freebsd_intel.map
+++ /dev/null
@@ -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:
-+		*;
-+};
-+
diff --git a/editors/openoffice.org-2/files/patch-salhelper+source+makefile.mk b/editors/openoffice.org-2/files/patch-salhelper+source+makefile.mk
deleted file mode 100644
index 3687664d8d16..000000000000
--- a/editors/openoffice.org-2/files/patch-salhelper+source+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../salhelper/source/makefile.mk.orig	Wed Nov 14 14:19:21 2001
-+++ ../salhelper/source/makefile.mk	Sun Mar  3 17:58:15 2002
-@@ -109,6 +109,10 @@
- SHL1VERSIONMAP=lngi.map
- .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
- SHL1VERSIONMAP=gcc3_linux_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
- .ENDIF
- 
- 
diff --git a/editors/openoffice.org-2/files/patch-salhelper+test+rtti+makefile.mk b/editors/openoffice.org-2/files/patch-salhelper+test+rtti+makefile.mk
deleted file mode 100644
index 70f25048a24a..000000000000
--- a/editors/openoffice.org-2/files/patch-salhelper+test+rtti+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
- 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
- .ENDIF
- 
- 
diff --git a/editors/openoffice.org-2/files/patch-sc+source+core+data+cell.cxx b/editors/openoffice.org-2/files/patch-sc+source+core+data+cell.cxx
deleted file mode 100644
index 529f67a3e35f..000000000000
--- a/editors/openoffice.org-2/files/patch-sc+source+core+data+cell.cxx
+++ /dev/null
@@ -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>
diff --git a/editors/openoffice.org-2/files/patch-scp+source+global+udk_base.scp b/editors/openoffice.org-2/files/patch-scp+source+global+udk_base.scp
deleted file mode 100644
index 623eccb0ff09..000000000000
--- a/editors/openoffice.org-2/files/patch-scp+source+global+udk_base.scp
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2/files/patch-scp+source+player+player.scp b/editors/openoffice.org-2/files/patch-scp+source+player+player.scp
deleted file mode 100644
index 2f8daab35cdd..000000000000
--- a/editors/openoffice.org-2/files/patch-scp+source+player+player.scp
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-2/files/patch-scptools+source+linker+searchcache b/editors/openoffice.org-2/files/patch-scptools+source+linker+searchcache
deleted file mode 100644
index 593e9eabf5bc..000000000000
--- a/editors/openoffice.org-2/files/patch-scptools+source+linker+searchcache
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: files/patch-scptools::source::linker::searchcache
-===================================================================
-RCS file: files/patch-scptools::source::linker::searchcache
-diff -N files/patch-scptools::source::linker::searchcache
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-scptools::source::linker::searchcache	4 Aug 2002 15:28:04 -0000
-@@ -0,0 +1,27 @@
-+--- ../scptools/source/linker/searchcache.hxx.orig	Fri Aug  2 22:53:46 2002
-++++ ../scptools/source/linker/searchcache.hxx	Fri Aug  2 22:54:50 2002
-+@@ -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	Fri Aug  2 22:53:35 2002
-++++ ../scptools/source/linker/searchcache.cxx	Fri Aug  2 22:55:14 2002
-+@@ -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-2/files/patch-scptools+source+linker+ziplst.cxx b/editors/openoffice.org-2/files/patch-scptools+source+linker+ziplst.cxx
deleted file mode 100644
index 83b84631542e..000000000000
--- a/editors/openoffice.org-2/files/patch-scptools+source+linker+ziplst.cxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice.org-2/files/patch-setup2+inc+fields.hxx b/editors/openoffice.org-2/files/patch-setup2+inc+fields.hxx
deleted file mode 100644
index d56e12f2abf4..000000000000
--- a/editors/openoffice.org-2/files/patch-setup2+inc+fields.hxx
+++ /dev/null
@@ -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[];
diff --git a/editors/openoffice.org-2/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-2/files/patch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 396c586ee3a3..000000000000
--- a/editors/openoffice.org-2/files/patch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,30 +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"
- 
-@@ -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" \
diff --git a/editors/openoffice.org-2/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice.org-2/files/patch-setup2+mow+source+loader+makefile.mk
deleted file mode 100644
index 5460e4296587..000000000000
--- a/editors/openoffice.org-2/files/patch-setup2+mow+source+loader+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice.org-2/files/patch-setup2+patch+makefile.mk b/editors/openoffice.org-2/files/patch-setup2+patch+makefile.mk
deleted file mode 100644
index 53846a8bdfc9..000000000000
--- a/editors/openoffice.org-2/files/patch-setup2+patch+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2/files/patch-setup2+script+setupserver b/editors/openoffice.org-2/files/patch-setup2+script+setupserver
deleted file mode 100644
index 450ea386c841..000000000000
--- a/editors/openoffice.org-2/files/patch-setup2+script+setupserver
+++ /dev/null
@@ -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`"
diff --git a/editors/openoffice.org-2/files/patch-setup2+source+compiler+decltor.cxx b/editors/openoffice.org-2/files/patch-setup2+source+compiler+decltor.cxx
deleted file mode 100644
index 98f6ad2f7567..000000000000
--- a/editors/openoffice.org-2/files/patch-setup2+source+compiler+decltor.cxx
+++ /dev/null
@@ -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";
diff --git a/editors/openoffice.org-2/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx b/editors/openoffice.org-2/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
deleted file mode 100644
index ac0b39a6aa47..000000000000
--- a/editors/openoffice.org-2/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
+++ /dev/null
@@ -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) );
diff --git a/editors/openoffice.org-2/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-2/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
deleted file mode 100644
index f199b18823e1..000000000000
--- a/editors/openoffice.org-2/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-2/files/patch-setup2+source+service+interface.cxx b/editors/openoffice.org-2/files/patch-setup2+source+service+interface.cxx
deleted file mode 100644
index 8e478e17971d..000000000000
--- a/editors/openoffice.org-2/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-2/files/patch-shell+source+cmdmail+makefile.mk b/editors/openoffice.org-2/files/patch-shell+source+cmdmail+makefile.mk
deleted file mode 100644
index 0476285c802e..000000000000
--- a/editors/openoffice.org-2/files/patch-shell+source+cmdmail+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-2/files/patch-shell+source+proxysettings+makefile.mk b/editors/openoffice.org-2/files/patch-shell+source+proxysettings+makefile.mk
deleted file mode 100644
index e83cf7c9d7a1..000000000000
--- a/editors/openoffice.org-2/files/patch-shell+source+proxysettings+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-2/files/patch-shell+source+unix+exec+makefile.mk b/editors/openoffice.org-2/files/patch-shell+source+unix+exec+makefile.mk
deleted file mode 100644
index 0b7712ee35f8..000000000000
--- a/editors/openoffice.org-2/files/patch-shell+source+unix+exec+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-2/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-2/files/patch-solenv+bin+addsym.awk
deleted file mode 100644
index 996e282b350b..000000000000
--- a/editors/openoffice.org-2/files/patch-solenv+bin+addsym.awk
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
-+++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
-@@ -72,11 +72,11 @@
- END {
-     if (state == 0) {
-         print "# Weak RTTI symbols for C++ exceptions:"
--        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
-+        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
-     }
- }
- state == 2 {
--    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
-+    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
-     state = 3
- }
- /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice.org-2/files/patch-solenv+bin+mapgen.pl b/editors/openoffice.org-2/files/patch-solenv+bin+mapgen.pl
deleted file mode 100644
index 71ebdb934120..000000000000
--- a/editors/openoffice.org-2/files/patch-solenv+bin+mapgen.pl
+++ /dev/null
@@ -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, $_);
- 	};
diff --git a/editors/openoffice.org-2/files/patch-solenv+inc+startup+FREEBSD+macros.mk b/editors/openoffice.org-2/files/patch-solenv+inc+startup+FREEBSD+macros.mk
deleted file mode 100644
index 0c1b107de988..000000000000
--- a/editors/openoffice.org-2/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-2/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-2/files/patch-solenv+inc+tg_ext.mk
deleted file mode 100644
index 701692c9425a..000000000000
--- a/editors/openoffice.org-2/files/patch-solenv+inc+tg_ext.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2/files/patch-solenv+inc+tg_moz.mk b/editors/openoffice.org-2/files/patch-solenv+inc+tg_moz.mk
deleted file mode 100644
index 255a41f92281..000000000000
--- a/editors/openoffice.org-2/files/patch-solenv+inc+tg_moz.mk
+++ /dev/null
@@ -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) $@
diff --git a/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index b4764485aa86..000000000000
--- a/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,202 +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
-+# 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*=$(CC)
-+
-+# default linker flags
-+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -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
diff --git a/editors/openoffice.org-2/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice.org-2/files/patch-soltools+checkdll+makefile.mk
deleted file mode 100644
index e6407402258a..000000000000
--- a/editors/openoffice.org-2/files/patch-soltools+checkdll+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2/files/patch-soltools+mkdepend+main.c b/editors/openoffice.org-2/files/patch-soltools+mkdepend+main.c
deleted file mode 100644
index cffd5cbb1f43..000000000000
--- a/editors/openoffice.org-2/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-2/files/patch-stlport+makefile.mk b/editors/openoffice.org-2/files/patch-stlport+makefile.mk
deleted file mode 100644
index 797817ba85be..000000000000
--- a/editors/openoffice.org-2/files/patch-stlport+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2/files/patch-stoc+source+corereflection+makefile.mk b/editors/openoffice.org-2/files/patch-stoc+source+corereflection+makefile.mk
deleted file mode 100644
index 4b319b08d401..000000000000
--- a/editors/openoffice.org-2/files/patch-stoc+source+corereflection+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2/files/patch-stoc+source+defaultregistry+makefile.mk b/editors/openoffice.org-2/files/patch-stoc+source+defaultregistry+makefile.mk
deleted file mode 100644
index 4cae0476415a..000000000000
--- a/editors/openoffice.org-2/files/patch-stoc+source+defaultregistry+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-2/files/patch-stoc+source+implementationregistration+implreg.cxx b/editors/openoffice.org-2/files/patch-stoc+source+implementationregistration+implreg.cxx
deleted file mode 100644
index 341d621d872c..000000000000
--- a/editors/openoffice.org-2/files/patch-stoc+source+implementationregistration+implreg.cxx
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2/files/patch-stoc+source+implementationregistration+makefile.mk b/editors/openoffice.org-2/files/patch-stoc+source+implementationregistration+makefile.mk
deleted file mode 100644
index 0051043b7ecb..000000000000
--- a/editors/openoffice.org-2/files/patch-stoc+source+implementationregistration+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2/files/patch-stoc+source+inspect+makefile.mk b/editors/openoffice.org-2/files/patch-stoc+source+inspect+makefile.mk
deleted file mode 100644
index c7cd85253c11..000000000000
--- a/editors/openoffice.org-2/files/patch-stoc+source+inspect+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2/files/patch-stoc+source+invocation+makefile.mk b/editors/openoffice.org-2/files/patch-stoc+source+invocation+makefile.mk
deleted file mode 100644
index 9ac2072a5612..000000000000
--- a/editors/openoffice.org-2/files/patch-stoc+source+invocation+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-2/files/patch-stoc+source+invocation_adapterfactory+makefile.mk b/editors/openoffice.org-2/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
deleted file mode 100644
index 8853ad39a90e..000000000000
--- a/editors/openoffice.org-2/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-2/files/patch-stoc+source+javaloader+makefile.mk b/editors/openoffice.org-2/files/patch-stoc+source+javaloader+makefile.mk
deleted file mode 100644
index cea499f15c57..000000000000
--- a/editors/openoffice.org-2/files/patch-stoc+source+javaloader+makefile.mk
+++ /dev/null
@@ -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=		
diff --git a/editors/openoffice.org-2/files/patch-stoc+source+javavm+makefile.mk b/editors/openoffice.org-2/files/patch-stoc+source+javavm+makefile.mk
deleted file mode 100644
index b895a2b968d4..000000000000
--- a/editors/openoffice.org-2/files/patch-stoc+source+javavm+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice.org-2/files/patch-stoc+source+loader+makefile.mk b/editors/openoffice.org-2/files/patch-stoc+source+loader+makefile.mk
deleted file mode 100644
index 5a08ee5937b6..000000000000
--- a/editors/openoffice.org-2/files/patch-stoc+source+loader+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-2/files/patch-stoc+source+namingservice+makefile.mk b/editors/openoffice.org-2/files/patch-stoc+source+namingservice+makefile.mk
deleted file mode 100644
index e573081bc21d..000000000000
--- a/editors/openoffice.org-2/files/patch-stoc+source+namingservice+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-2/files/patch-stoc+source+proxy_factory+makefile.mk b/editors/openoffice.org-2/files/patch-stoc+source+proxy_factory+makefile.mk
deleted file mode 100644
index 9110b2f50cd1..000000000000
--- a/editors/openoffice.org-2/files/patch-stoc+source+proxy_factory+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2/files/patch-stoc+source+registry_tdprovider+makefile.mk b/editors/openoffice.org-2/files/patch-stoc+source+registry_tdprovider+makefile.mk
deleted file mode 100644
index 9d974d1c0d10..000000000000
--- a/editors/openoffice.org-2/files/patch-stoc+source+registry_tdprovider+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2/files/patch-stoc+source+servicemanager+makefile.mk b/editors/openoffice.org-2/files/patch-stoc+source+servicemanager+makefile.mk
deleted file mode 100644
index 746776d54759..000000000000
--- a/editors/openoffice.org-2/files/patch-stoc+source+servicemanager+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-2/files/patch-stoc+source+tdmanager+makefile.mk b/editors/openoffice.org-2/files/patch-stoc+source+tdmanager+makefile.mk
deleted file mode 100644
index 76403fdde841..000000000000
--- a/editors/openoffice.org-2/files/patch-stoc+source+tdmanager+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-2/files/patch-stoc+source+typeconv+makefile.mk b/editors/openoffice.org-2/files/patch-stoc+source+typeconv+makefile.mk
deleted file mode 100644
index dc647f89a166..000000000000
--- a/editors/openoffice.org-2/files/patch-stoc+source+typeconv+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2/files/patch-store+util+makefile.mk b/editors/openoffice.org-2/files/patch-store+util+makefile.mk
deleted file mode 100644
index 6bef6e960f2e..000000000000
--- a/editors/openoffice.org-2/files/patch-store+util+makefile.mk
+++ /dev/null
@@ -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
- 
- 
diff --git a/editors/openoffice.org-2/files/patch-svx+source+fmcomp+makefile.mk b/editors/openoffice.org-2/files/patch-svx+source+fmcomp+makefile.mk
deleted file mode 100644
index b16030080c0d..000000000000
--- a/editors/openoffice.org-2/files/patch-svx+source+fmcomp+makefile.mk
+++ /dev/null
@@ -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= \
diff --git a/editors/openoffice.org-2/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice.org-2/files/patch-sysui+oounix+office+gnome+makefile.mk
deleted file mode 100644
index 3d7c2e22aa63..000000000000
--- a/editors/openoffice.org-2/files/patch-sysui+oounix+office+gnome+makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
-+++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
-@@ -84,7 +84,9 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- APP1LIBS=
-+.IF "$(OS)"!="FREEBSD"
- APP1STDLIBS=-ldl
-+.ENDIF
- 
- GNOMEFILES= \
- 	locales.tab
diff --git a/editors/openoffice.org-2/files/patch-tools+source+string+tstring.cxx b/editors/openoffice.org-2/files/patch-tools+source+string+tstring.cxx
deleted file mode 100644
index 12bd6bd0b244..000000000000
--- a/editors/openoffice.org-2/files/patch-tools+source+string+tstring.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../tools/source/string/tstring.cxx.orig	Sat Aug 10 12:53:42 2002
-+++ ../tools/source/string/tstring.cxx	Sat Aug 10 12:54:16 2002
-@@ -103,6 +103,9 @@
- xub_StrLen ImplStringLen( const sal_Char* pStr )
- {
- 	const sal_Char* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
-@@ -113,6 +116,9 @@
- xub_StrLen ImplStringLen( const sal_Unicode* pStr )
- {
- 	const sal_Unicode* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
diff --git a/editors/openoffice.org-2/files/patch-unoil+makefile.pmk b/editors/openoffice.org-2/files/patch-unoil+makefile.pmk
deleted file mode 100644
index 7febdabf7b4b..000000000000
--- a/editors/openoffice.org-2/files/patch-unoil+makefile.pmk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../unoil/makefile.pmk.orig	Fri Aug 31 18:04:43 2001
-+++ ../unoil/makefile.pmk	Thu Sep 12 12:17:50 2002
-@@ -74,8 +74,8 @@
- JAVAFILESLIST	:= $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java)
- .ENDIF          # "$(L10N_framework)"==""
- 
--GENJAVAFILES	:= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
--GENCLASSFILES	:= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
-+GENJAVAFILES	+= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
-+GENCLASSFILES	+= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
- 
- # --- Targets ------------------------------------------------------
- 
diff --git a/editors/openoffice.org-2/files/patch-unzip+source+file_io.c b/editors/openoffice.org-2/files/patch-unzip+source+file_io.c
deleted file mode 100644
index 2f85a108c185..000000000000
--- a/editors/openoffice.org-2/files/patch-unzip+source+file_io.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../unzip/source/file_io.c.orig	Sat Oct 19 11:58:45 2002
-+++ ../unzip/source/file_io.c	Sat Oct 19 12:03:40 2002
-@@ -500,7 +500,7 @@
- #ifdef MPW
- 				pCallBack( 0 );
- #else
--				#if defined LINUX || defined MACOSX || defined NETBSD
-+				#if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD
- 				pCallBack( lseek(outfd, 0, SEEK_CUR) );
- 				#else
- 				pCallBack( tell( outfd ) );
-@@ -865,7 +865,9 @@
- 	static struct timeb tbp;
- #endif /* !__386BSD__ */
- #else /* !BSD */
-+#if (!defined(NETBSD) && !defined(FREEBSD))
- 	extern long timezone;
-+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
- #endif /* ?BSD */
- #endif /* ?AMIGA */
- 
diff --git a/editors/openoffice.org-2/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice.org-2/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
deleted file mode 100644
index 41defbd5eb59..000000000000
--- a/editors/openoffice.org-2/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
-+++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
-@@ -65,6 +65,8 @@
- #include <glyphcache.hxx>
- 
- #define Region XLIB_Region
-+typedef unsigned long CARD32;
-+#define Cursor CARD32
- #include <X11/extensions/Xrender.h>
- #undef Region
- 
diff --git a/editors/openoffice.org-2/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice.org-2/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
deleted file mode 100644
index fefc925db41f..000000000000
--- a/editors/openoffice.org-2/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
-@@ -78,6 +78,12 @@
- GETSTYLE_GNOME=getstyle-gnome-linux-intel
- HASGNOME2=TRUE
- .ENDIF
-+.IF "$_(HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
-+.ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
- HASGNOME2=TRUE
diff --git a/editors/openoffice.org-2/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice.org-2/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
deleted file mode 100644
index 984313fc540a..000000000000
--- a/editors/openoffice.org-2/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
-@@ -75,9 +75,15 @@
- 
- HASGNOME2=
- 
--.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
-+.IF "$(OS)$(CPU)"=="LINUXI"
- MSGBOX_GNOME=msgbox-gnome-linux-intel
- HASGNOME2=TRUE
-+.ENDIF
-+.IF "$(_HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+MSGBOX_GNOME=msgbox-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
- .ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice.org-2/files/patch-vcl+workben+officeacceptthread.cxx b/editors/openoffice.org-2/files/patch-vcl+workben+officeacceptthread.cxx
deleted file mode 100644
index 07d9f1060557..000000000000
--- a/editors/openoffice.org-2/files/patch-vcl+workben+officeacceptthread.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/workben/officeacceptthread.cxx.orig	Wed Mar  5 20:25:36 2003
-+++ ../vcl/workben/officeacceptthread.cxx	Wed Mar  5 20:26:03 2003
-@@ -125,7 +125,7 @@
- #if defined (SOLARIS)
- 				int status;
- 				nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG);
--#elif defined(LINUX)
-+#elif defined(LINUX) || defined (FREEBSD)
- 				nRet = kill(aProcessInfo.Ident, 0);
- #endif
- #if defined (UNX)
diff --git a/editors/openoffice.org-2/files/zipmoz.sh b/editors/openoffice.org-2/files/zipmoz.sh
deleted file mode 100644
index 43a4591f3430..000000000000
--- a/editors/openoffice.org-2/files/zipmoz.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/sh -f
-
-RUNTIME_FILES=" components/libabsyncsvc.so components/libaddrbook.so \
-		components/libmork.so components/libmozldap.so \
-		components/libnecko.so components/libprofile.so \
-		components/librdf.so components/libstrres.so \
-		components/libunicharutil.so components/libuconv.so \
-		components/libucvcn.so components/libucvibm.so \
-		components/libucvja.so components/libucvko.so \
-		components/libucvlatin.so components/libucvtw.so \
-		components/libucvtw2.so components/liburiloader.so \
-		components/libvcard.so components/libxpconnect.so \
-		components/libpref.so components/libchrome.so libmozjs.so \
-		libmsgbaseutil.so libldap50.so libnspr4.so libplc4.so \
-		libplds4.so libxpcom.so libmozz.so component.reg \
-		components/necko_dns.xpt components/xpcom_xpti.xpt \
-		components/xpcom_threads.xpt components/xpcom_io.xpt \
-		components/xpcom_ds.xpt components/xpcom_components.xpt \
-		components/xpcom_base.xpt components/xpti.dat \
-		defaults/pref/all.js defaults/pref/config.js \
-		defaults/pref/editor.js defaults/pref/initpref.js \
-		defaults/pref/inspector.js defaults/pref/mailnews.js \
-		defaults/pref/security-prefs.js defaults/pref/unix.js \
-		defaults/pref/xpinstall.js"
-
-LIB_FILES="	lib/libembed_base_s.a lib/libmozreg_s.a \
-		lib/libnspr4.so lib/libxpcom.so lib/libprldap50.so"
-
-INC_FILES="include/"
-INC_FILES2="public/"
-
-if [ $# -lt 2 -o $# -gt 3 ] ; then
-	echo 
-	echo usage: $0 mozilla_dist target [target_dir]
-	echo
-	echo where:
-	echo
-	echo "mozilla_dist points to the mozilla distribution"
-	echo "target concatenates  OS, compiler and CPU (e.g. FREEBSDGCCI etc)"
-	echo "target_dir is the directory to place the zips"
-	exit 1
-fi
-
-MOZ_DIST=$1
-TARGET=$2
-if [ "w$3" != "w" ]; then
-	TARGET_DIR=$3
-else
-	if [ "w$TARGET_DIR" == "w" ]; then
-		TARGET_DIR=
-	fi
-fi
-
-ZIP_TARGET=$TARGET_DIR
-if [ -z "$ZIP_TARGET" ] ; then
-	ZIP_TARGET=../
-fi
-
-# just to remember the current working directory
-STARTING_DIR=`pwd`
-
-echo
-echo --- creating zips for $TARGET, using mozilla distribution in $MOZ_DIST
-
-# Create the directories
-[ ! -d $TARGET_DIR/$TARGET/runtime ] && mkdir -p $TARGET_DIR/$TARGET/runtime
-[ ! -d $TARGET_DIR/$TARGET/runtime/components ] && mkdir -p $TARGET_DIR/$TARGET/runtime/components
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults/pref ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults/pref
-[ ! -d $TARGET_DIR/$TARGET/lib ] && mkdir -p $TARGET_DIR/$TARGET/lib
-[ ! -d $TARGET_DIR/$TARGET/inc ] && mkdir -p $TARGET_DIR/$TARGET/inc
-[ ! -d $TARGET_DIR/$TARGET/inc/nspr ] && mkdir -p $TARGET_DIR/$TARGET/inc/nspr
-[ ! -d $TARGET_DIR/$TARGET/inc/obsolete ] && mkdir -p $TARGET_DIR/$TARGET/inc/obsolete
-
-# Copy the files
-echo
-echo --- copying files
-echo
-
-for i in $RUNTIME_FILES; do
-	if [ ! -f $MOZ_DIST/bin/$i ]; then
-		echo $MOZ_DIST/bin/$i does not exist, check your distribution
-	else
-		if [ `echo $i | grep component` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/components/
-		elif [ `echo $i | grep defaults` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/defaults/pref/
-		else
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/
-		fi
-	fi
-done
-
-for i in $LIB_FILES; do
-	if [ ! -f $MOZ_DIST/$i ]; then
-		echo $MOZ_DIST/$i does not exist, check your distribution
-	else
-		cp -R -L $MOZ_DIST/$i $TARGET_DIR/$TARGET/lib/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES`; do
-	if [ ! -d $i ]; then 
-		cp -R -L $MOZ_DIST/include/$i $TARGET_DIR/$TARGET/inc/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES2`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/public/$i $TARGET_DIR/$TARGET/inc
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/$i $TARGET_DIR/$TARGET/inc/nspr
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr/obsolete`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/obsolete/$i $TARGET_DIR/$TARGET/inc/obsolete
-	fi
-done
-
-# delete old zips
-
-[ -f $TARGET_DIR/$TARGET/runtime.zip ] && rm -f $TARGET_DIR/$TARGET/runtime.zip
-[ -f $TARGET_DIR/$TARGET/lib.zip ] && rm -f $TARGET_DIR/$TARGET/lib.zip
-[ -f $TARGET_DIR/$TARGET/inc.zip ] && rm -f $TARGET_DIR/$TARGET/inc.zip
-
-# zip the runtime files
-
-echo
-echo --- creating ${TARGET}runtime.zip
-echo
-
-cd $TARGET_DIR/$TARGET/runtime
-find . -type f | zip $ZIP_TARGET/${TARGET}runtime.zip -@
-
-# zip the lib files
-echo 
-echo --- creating ${TARGET}lib.zip
-echo 
-
-cd $TARGET_DIR/$TARGET/lib
-find . -type f | zip $ZIP_TARGET/${TARGET}lib.zip -@
-
-# zip the inc files
-echo
-echo --- creating ${TARGET}inc.zip
-echo
-
-cd $TARGET_DIR/$TARGET/inc
-find . -type f | zip $ZIP_TARGET/${TARGET}inc.zip -@
-
-# remove dirs
-cd $STARTING_DIR
-rm -rf $TARGET_DIR/$TARGET
-
-echo
-echo --- done
-echo
-
diff --git a/editors/openoffice.org-2/pkg-descr b/editors/openoffice.org-2/pkg-descr
deleted file mode 100644
index 31fd1b12161a..000000000000
--- a/editors/openoffice.org-2/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-OpenOffice.org is an Open Source, community-developed, multi-platform office
-productivity suite. It includes the key desktop applications, such as a
-word processor, spreadsheet, presentation manager, and drawing program,
-with a user interface and feature set similar to other office suites.
-
-Components include:
-  * A universal word processing application for creating business
-    letters, extensive text documents, professional layouts, and HTML
-    documents.
-  * A sophisticated application for performing advanced spreadsheet
-    functions, such as analyzing figures, creating lists, and viewing data.
-  * A tool for creating effective eye-catching presentations.
-  * A vector-oriented draw module that enables the creation of 3D
-    illustrations
diff --git a/editors/openoffice.org-2/pkg-message b/editors/openoffice.org-2/pkg-message
deleted file mode 100644
index 1dc749f301c2..000000000000
--- a/editors/openoffice.org-2/pkg-message
+++ /dev/null
@@ -1,73 +0,0 @@
-OpenOffice.org Build 643 Personal Install How-To
-
-Written by:	Martin Blapp <mbr@freebsd.org>
-
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
-
-1 User installation
--------------------
-
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
---------------
-
-There are some wrappers installed for fast startup.
-Add "${PREFIX}/bin/" to your PATH and you will be able
-to use them.
-
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
-
-If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
-version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
diff --git a/editors/openoffice.org-2/pkg-plist b/editors/openoffice.org-2/pkg-plist
deleted file mode 100644
index 28bd78453b52..000000000000
--- a/editors/openoffice.org-2/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, do not delete. Package list is generated automatically.
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
deleted file mode 100644
index 6f740924c399..000000000000
--- a/editors/openoffice.org-3-RC/Makefile
+++ /dev/null
@@ -1,580 +0,0 @@
-# New ports collection makefile for: OpenOffice
-# Date created:		28 Februar 2002
-# Whom:                 Martin Blapp
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openoffice
-PORTVERSION=	644
-CATEGORIES+=	editors
-MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
-		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
-		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
-		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ny1.mirror.openoffice.org/miscellaneous/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
-MASTER_SITE_SUBDIR=	${PORTVERSION}
-DISTFILES+=	oo_${PORTVERSION}_src.tar.bz2 \
-		gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
-
-BROKEN=		"Does not build"
-
-SORT?=	/usr/bin/sort
-FIND?=	/usr/bin/find
-CUT?=	/usr/bin/cut
-AWK?=	/usr/bin/awk
-GREP?=	/usr/bin/grep
-ZIP?=	${PREFIX}/bin/zip
-UNZIP?=	${PREFIX}/bin/unzip
-ANT?=	${LOCALBASE}/bin/ant
-TCSH?=	/bin/tcsh
-PASTE?=	/usr/bin/paste
-
-.include <bsd.port.pre.mk>
-
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
-DIST_SUBDIR=		openoffice
-DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
-
-#
-# configuration for language specific slave ports
-#
-.if !defined(LANG_EXT)
-LANG_EXT=01
-.else
-#
-# Add pkg-descr and pkg-message if available
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-#
-# LANG_CONFIGURE_ARG is missing for the german port
-#
-.if defined(LANG_EXT)
-CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG},ENUS
-.endif
-.endif
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
-
-EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-
-MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/jakarta-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-.if !defined(DISPLAY)
-BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
-.endif
-.if !defined(WITH_BSD_JDK)
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk14
-.else
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-.endif
-
-USE_PERL5=	yes
-USE_BZIP2=	yes
-USE_BISON=	yes
-USE_GMAKE=	yes
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
-.if !defined(WITH_BSD_JDK)
-JDKDIR?=	${LOCALBASE}/linux-sun-jdk1.4.1
-.else
-JDKDIR?=	${LOCALBASE}/jdk1.4.1
-.endif
-JAVAVM=         ${JDKDIR}/bin/java
-
-GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
-LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
-BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
-
-.if !defined(DISPLAY)
-DISPLAYHACK=localhost:1001
-.endif
-
-CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
-			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
-
-.if !defined(WITH_BSD_JDK)
-CONFIGURE_ARGS+=	--enable-linuxjdk=yes
-.endif
-
-.if defined(WITH_DEBUG)
-.if ${WITH_DEBUG} == 2
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-.endif
-
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"prefered language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
-	@${ECHO} "OPTIONS:"
-.if !defined(USE_GCC)
-	@${ECHO}
-	@${ECHO} "You can compile OO with different"
-	@${ECHO} "gcc compiler versions:"
-	@${ECHO}
-	@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.2"
-	@${ECHO} "to compile openoffice with your"
-	@${ECHO} "prefered compiler."
-.endif
-.if !defined(WITH_BSD_JDK)
-	@${ECHO}
-	@${ECHO} "If you like to use the native BSD"
-	@${ECHO} "JDK for the build system, you can use"
-	@${ECHO} "WITH_BSD_JDK=TRUE to disable the"
-	@${ECHO} "usage of the linux-JDK and linux dependency."
-	@${ECHO}
-.endif
-.if !defined(WITH_DEBUG)
-	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
-	@${ECHO} "if you call make with WITH_DEBUG=1"
-	@${ECHO}
-	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
-	@${ECHO}
-.endif
-.if !defined(WITH_TTF_BYTECODE_ENABLED)
-	@${ECHO}
-	@${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES"
-	@${ECHO} "if you like to use the Freetype library to"
-	@${ECHO} "render TTF fonts. Normally the TTF lib is"
-	@${ECHO} "not used to render fonts."
-	@${ECHO}
-	@${ECHO} "If you have licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479"
-	@${ECHO} "you can enable this option to get better"
-	@${ECHO} "quality of glyphs at small bitmap sizes."
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 450002
-	@${ECHO}
-	@${ECHO} "OS-VERSION ${OSVERSION} too low"
-	@${ECHO}
-	@${ECHO} "OO need some important libc_r and"
-	@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
-	@${ECHO} "RELEASE or 4.6 STABLE."
-	@${FALSE}
-.endif
-	@${ECHO}
-	@${ECHO} "NOTICE:"
-	@${ECHO}
-	@${ECHO} "To build Openoffice, you should have a lot"
-.if defined(WITH_DEBUG)
-	@${ECHO} "of free diskspace (~ 8GB)."
-.else
-	@${ECHO} "of free diskspace (~ 4GB)."
-.endif
-	@${ECHO}
-.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
-    (${OSVERSION} < 500000 && !defined(USE_GCC))
-	@${ECHO} "KERNEL CONFIGURATION:"
-	@${ECHO}
-	@${ECHO} "Openoffice needs a larger stack- and"
-	@${ECHO} "datasize to build. Check your limit"
-	@${ECHO} "settings and and put this in /boot/loader.conf"
-	@${ECHO} "if neccessary:"
-	@${ECHO}
-	@${ECHO} "kern.maxdsiz=\"1073741824\""
-	@${ECHO} "kern.maxssiz=\"268435456\""
-.endif
-	@${ECHO}
-.if ${OSVERSION} < 460002
-	@${ECHO} "REQUIRED SYSTEM PATCHES:"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO} "OO.org can crash if you enter a non existing path"
-	@${ECHO} "or URL in the location bar. To fix these crashes"
-	@${ECHO} "you need a uncommitted system patch for rtld:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460001
-	@${ECHO}
-	@${ECHO} "OO setup is broken on STABLE < 4.6"
-	@${ECHO} "including 4.6 RELEASE."
-	@${ECHO} "You'll need a system patch to solve"
-	@${ECHO} "this problem:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460002
-	@${ECHO}
-	@${ECHO} "OO.org soffice binary can deadlock. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO}
-	@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
-	@${ECHO}
-.endif
-.if !exists(/usr/include/langinfo.h)
-	@${ECHO}
-	@${ECHO} "langinfo.h is missing !"
-	@${ECHO}
-	@${ECHO} "Please upgrade to 4.6 RELEASE or"
-	@${ECHO} "4.6 STABLE."
-	@${ECHO}
-	@${FALSE}
-.endif
-
-post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
-	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
-	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@-${RM} -f ${WRKSRC}/../moz/zipped/*.zip
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
-.if defined(L10NHELP)
-	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
-	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
-.endif
-
-post-patch:
-	@${MAKE} patch-mozilla
-.if defined(WITH_TTF_BYTECODE_ENABLED)
-	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
-		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-			${ECHO_MSG} "===>   Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \
-		fi; \
-		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
-	fi
-.endif
-.if defined(WITH_DEBUG)
-	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
-		PATCHES_APPLIED="" ; \
-		for i in ${PATCHDIR}/debugpatch-*; do \
-			case $$i in \
-				*.orig|*.rej|*~) \
-					${ECHO_MSG} "===>   Ignoring patchfile $$i" ; \
-					;; \
-				*) \
-					if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-						${ECHO_MSG} "===>   Applying ${OPSYS} patch $$i" ; \
-					fi; \
-					if ${PATCH} ${PATCH_ARGS} < $$i ; then \
-						PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
-					else \
-						${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
-						if [ x"$$PATCHES_APPLIED" != x"" ]; then \
-							${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
-						fi; \
-						${FALSE} ; \
-					fi; \
-					;; \
-			esac; \
-		done; \
-	fi;
-.endif
-	@${ECHO_MSG} "===>  Find old malloc.h defines and fix them in ${PKGNAME} source"
-	@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
-		${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
-
-extract-mozilla:
-.if ! exists(${WRKDIR}/mozilla/Makefile)
-	@${ECHO_MSG} "===>  Extracting mozilla sub project"
-	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
-.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment)
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
-.endif
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
-.endif
-	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
-
-patch-mozilla:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
-		${WRKDIR}/mozilla/files/
-	@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
-
-build-mozilla:
-.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
-	@${ECHO_MSG} "===>  Building mozilla sub project"
-.if defined(WITH_DEBUG)
-	@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
-	@${SED} -e 's|--disable-debug||' \
-		-e 's|--disable-cpp-rtti||' \
-		-e 's|--enable-strip||' \
-		< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
-.endif
-.if defined(USE_GCC)
-	@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
-.else
-	@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
-.endif
-	@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
-	@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
-	@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
-.endif
-
-install-mozilla:
-	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
-
-register-mozilla:
-.if exists(${WRKDIR}/mozilla-runtime)
-	@${RM} -rf ${WRKDIR}/mozilla-runtime
-.endif
-	@${MKDIR} ${WRKDIR}/mozilla-runtime
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
-	@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
-	@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
-	@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
-		&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom 
-	@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
-		${WRKDIR}/mozilla-runtime/components/xptitemp.dat
-	@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
-	@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
-		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
-
-mozilla:
-	@${MAKE} extract-mozilla
-	@${MAKE} patch-mozilla
-	@${MAKE} build-mozilla
-	@${MAKE} register-mozilla
-	@${MAKE} install-mozilla
-
-do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
-	@${MAKE} mozilla
-.endif
-.endif
-.endif
-.if exists(${WRKDIR}/.Xvfb.pid)
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.endif
-.if !defined(DISPLAY)
-	#
-	# This is a UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-.endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
-	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-.endif
-.if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
-.endif
-
-pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-
-do-install:
-.if !defined(DISPLAY)
-	#
-	# UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-.endif
-
-install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
-
-post-install:
-	@${ECHO_MSG} "===>  Add wrapper scripts";
-	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
-	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
-
-package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
-.if defined(LANG_SUFFIX)
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
-.else
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
-.endif
-
-update:
-	@${MAKE} fetch
-	@${MAKE} extract
-	@cd ${WRKSRC}/.. && for dir in *; do \
-	    if [ -d $$dir ]; then \
-		cd $$dir; cvs update -d; cd ..; \
-	    fi \
-	done
-
-.include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
deleted file mode 100644
index ec9d6788f104..000000000000
--- a/editors/openoffice.org-3-RC/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
-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
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
diff --git a/editors/openoffice.org-3-RC/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-3-RC/files/debugpatch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 96c651ce22c8..000000000000
--- a/editors/openoffice.org-3-RC/files/debugpatch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../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
-@@ -902,6 +902,7 @@
- 
- void KillSetupDir()
- {
-+#if 0
-     DIR* pDir = opendir( strTmpPath );
-     struct dirent* pFile;
- 
-@@ -915,6 +916,10 @@
- 
-     chdir( strInitPath );
-     rmdir( strTmpPath );
-+#else
-+	fprintf(stderr, "\nLeaving behind temporary directory: %s\n",
-+	strTmpPath);
-+#endif
- }
- 
- void makeSymLink( char* s )
diff --git a/editors/openoffice.org-3-RC/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3-RC/files/debugpatch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 52bd2b3d58d6..000000000000
--- a/editors/openoffice.org-3-RC/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
-+++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
- 
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- 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
- 
- # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
diff --git a/editors/openoffice.org-3-RC/files/oo_setup.resp b/editors/openoffice.org-3-RC/files/oo_setup.resp
deleted file mode 100644
index 8eeeb11bd95e..000000000000
--- a/editors/openoffice.org-3-RC/files/oo_setup.resp
+++ /dev/null
@@ -1,7 +0,0 @@
-[Environment]
-InstallationMode = INSTALL_NETWORK
-InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org-643
-
-[Java]
-JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-3-RC/files/openoffice-wrapper b/editors/openoffice.org-3-RC/files/openoffice-wrapper
deleted file mode 100644
index b3b6a4ba2df6..000000000000
--- a/editors/openoffice.org-3-RC/files/openoffice-wrapper
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-RC/files/Attic/openoffice-wrapper,v 1.3 2003-03-05 23:24:05 mbr Exp $
-
-oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/
-program=`echo $0 | sed -e 's|.*-||'`
-
-if [ ! $LANG ]; then
-	export LANG=%%LANG%%
-fi
-
-case $program in
-$0)
-	exec $oopath/soffice "$@"
-	;;
-	*)
-	exec $oopath/$program "$@"
-	;;
-esac
diff --git a/editors/openoffice.org-3-RC/files/optpatch-freetype+patch b/editors/openoffice.org-3-RC/files/optpatch-freetype+patch
deleted file mode 100644
index b426a8fb7fcc..000000000000
--- a/editors/openoffice.org-3-RC/files/optpatch-freetype+patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Index: files/patch-freetype::patch
-===================================================================
-RCS file: files/patch-freetype::patch
-diff -N files/patch-freetype::patch
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-freetype::patch	4 Aug 2002 15:27:42 -0000
-@@ -0,0 +1,201 @@
-+diff -ur ../freetype/freetype-2.0.5.patch oo641d_patched/freetype/freetype-2.0.5.patch
-+--- ../freetype/freetype-2.0.5.patch	Fri Apr  5 21:07:34 2002
-++++ ../freetype/freetype-2.0.5.patch	Sat Mar  9 18:04:17 2002
-+@@ -1,118 +1,79 @@
-+-*** misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 14 00:44:33 2000
-+---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 63,69 ****
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+---- 63,69 ----
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+-*** misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Jun  7 19:36:17 2001
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 631,637 ****
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+---- 631,637 ----
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile -DPIC $pic_flag"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Mon Jan  1 18:25:21 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 1,7 ****
-+---- 1,9 ----
-+-  FT_USE_MODULE(autohint_module_class)
-+-  FT_USE_MODULE(cff_driver_class)
-+-  FT_USE_MODULE(t1cid_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(pcf_driver_class)
-+-+ */
-+-  FT_USE_MODULE(psaux_module_class)
-+-  FT_USE_MODULE(psnames_module_class)
-+-  FT_USE_MODULE(ft_raster1_renderer_class)
-+-***************
-+-*** 9,12 ****
-+---- 11,16 ----
-+-  FT_USE_MODULE(ft_smooth_renderer_class)
-+-  FT_USE_MODULE(tt_driver_class)
-+-  FT_USE_MODULE(t1_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(winfnt_driver_class)
-+-+ */
-+-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h	Tue Aug 21 10:50:45 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 70,76 ****
-+---- 70,79 ----
-+-    /*   All convenience functions are declared as such in their             */
-+-    /*   documentation.                                                      */
-+-    /*                                                                       */
-+-+ /*
-+-  #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-+ */
-+-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-  
-+-  
-+-    /*************************************************************************/
-+-***************
-+-*** 108,116 ****
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-- 
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+---- 111,121 ----
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-+ /*
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-+ */
-+-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig	Mon Jan  7 14:21:35 2002
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Mon Jan  7 14:21:40 2002
-+-***************
-+-*** 2251,2257 ****
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age + 1`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-+---- 2251,2257 ----
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk
-++--- misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:49:17 2001
-++@@ -63,7 +63,7 @@
-++ #   ANSI compliance.
-++ #
-++ ifndef CFLAGS
-++-  CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+++  CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-++ endif
-++ 
-++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh
-++--- misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:47:56 2001
-+++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:49:17 2001
-++@@ -631,7 +631,7 @@
-++     if test "$build_old_libs" = yes; then
-++       if test "$pic_mode" != yes; then
-++ 	# Don't build PIC code
-++-	command="$base_compile $srcfile"
-+++	command="$base_compile $srcfile -DPIC $pic_flag"
-++       else
-++ 	# All platforms use -DPIC, to notify preprocessed assembler code.
-++ 	command="$base_compile $srcfile $pic_flag -DPIC"
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:49:17 2001
-++@@ -1,7 +1,9 @@
-++ FT_USE_MODULE(autohint_module_class)
-++ FT_USE_MODULE(cff_driver_class)
-++ FT_USE_MODULE(t1cid_driver_class)
-+++/*
-++ FT_USE_MODULE(pcf_driver_class)
-+++*/
-++ FT_USE_MODULE(psaux_module_class)
-++ FT_USE_MODULE(psnames_module_class)
-++ FT_USE_MODULE(ft_raster1_renderer_class)
-++@@ -9,4 +11,6 @@
-++ FT_USE_MODULE(ft_smooth_renderer_class)
-++ FT_USE_MODULE(tt_driver_class)
-++ FT_USE_MODULE(t1_driver_class)
-+++/*
-++ FT_USE_MODULE(winfnt_driver_class)
-+++*/
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:51:15 2001
-++@@ -70,7 +70,10 @@
-++   /*   All convenience functions are declared as such in their             */
-++   /*   documentation.                                                      */
-++   /*                                                                       */
-+++/*
-++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+++*/
-+++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-++ 
-++ 
-++   /*************************************************************************/
-++@@ -108,8 +111,10 @@
-++   /*   use a vector `plotter' format that isn't supported when this        */
-++   /*   macro is undefined.                                                 */
-++   /*                                                                       */
-+++/*
-++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++-
-+++*/
-+++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++ 
-++   /*************************************************************************/
-++   /*                                                                       */
-++@@ -338,7 +343,7 @@
-++   /* By undefining this, you will only compile the code necessary to load  */
-++   /* TrueType glyphs without hinting.                                      */
-++   /*                                                                       */
-++-#undef  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-+++#define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-++ 
-++ 
-++   /*************************************************************************/
diff --git a/editors/openoffice.org-3-RC/files/optpatch-vcl+util+makefile.pmk b/editors/openoffice.org-3-RC/files/optpatch-vcl+util+makefile.pmk
deleted file mode 100644
index 41341ff0b4e8..000000000000
--- a/editors/openoffice.org-3-RC/files/optpatch-vcl+util+makefile.pmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/util/makefile.pmk.orig	Mon Aug  5 01:39:41 2002
-+++ ../vcl/util/makefile.pmk	Mon Aug  5 01:40:03 2002
-@@ -64,7 +64,7 @@
- PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch
- PDBTARGET=vcl
- 
--.IF "$(OS)" != "MACOSX"
-+.IF "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- .IF "$(remote)" != ""
- USE_BUILTIN_RASTERIZER=true
- .ENDIF
diff --git a/editors/openoffice.org-3-RC/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-3-RC/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 078685f3b516..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../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 freebsd genunix";;
-  	*)		JINCSUBDIRS="genunix";;
-  	esac
-  
diff --git a/editors/openoffice.org-3-RC/files/patch-bridges+prj+build.lst b/editors/openoffice.org-3-RC/files/patch-bridges+prj+build.lst
deleted file mode 100644
index fee3d847c5e6..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-bridges+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
deleted file mode 100644
index 99b8c566fb61..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ /dev/null
@@ -1,102 +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 );
-+    }
- }
- 
- }
diff --git a/editors/openoffice.org-3-RC/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice.org-3-RC/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
deleted file mode 100644
index 4622b7fe21c4..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-3-RC/files/patch-comphelper+util+makefile.mk b/editors/openoffice.org-3-RC/files/patch-comphelper+util+makefile.mk
deleted file mode 100644
index f2d3092c2ddf..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-comphelper+util+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-3-RC/files/patch-config_office+configure.in b/editors/openoffice.org-3-RC/files/patch-config_office+configure.in
deleted file mode 100644
index a45332fcbec0..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,66 +0,0 @@
---- configure.in.orig	Thu Feb 20 15:49:32 2003
-+++ configure.in	Wed Mar  5 21:22:34 2003
-@@ -95,6 +95,12 @@
-                           
-                           Usage: --enable-macos9
- ],,)
-+AC_ARG_ENABLE(linuxjdk,
-+[  --enable-linuxjdk         Use this option option if you like to use
-+                          the linux-jdk instead of the native jdk.
-+
-+                          Usage: --enable-linuxjdk
-+],,)
- AC_ARG_WITH(lang,
- [  --with-lang             Use this option to build OpenOffice.org with
-                           additional language support. US English is always
-@@ -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
-@@ -1232,7 +1249,11 @@
- if test -n "$enable_debug"; then
-    ENABLE_DEBUG="TRUE"
- else
--   ENABLE_DEBUG="FALSE"
-+fi
-+if test -n "$enable_linuxjdk"; then
-+   USE_LINUXJDK="TRUE"
-+else
-+   USE_LINUXJDK="FALSE"
- fi
- 
- dnl ===================================================================
-@@ -1278,6 +1299,7 @@
- AC_SUBST(PTHREAD_CFLAGS)
- AC_SUBST(PTHREAD_LIBS)
- AC_SUBST(ENABLE_DEBUG)
-+AC_SUBST(USE_LINUXJDK)
- 
- AC_OUTPUT([set_soenv])
- 
diff --git a/editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in b/editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in
deleted file mode 100644
index 9ea6b11bdab2..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in
+++ /dev/null
@@ -1,44 +0,0 @@
---- set_soenv.in.orig	Thu Feb 27 15:12:36 2003
-+++ set_soenv.in	Wed Mar  5 21:16:43 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, 
-@@ -88,7 +88,7 @@
-      $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
-      $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS,
-      $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
--     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG );
-+     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $USE_LINUXJDK );
- #
- #-------------------------------------------
- # IId. Declaring the aliases.
-@@ -140,7 +140,8 @@
- $CC			= '@CC@';           # C compiler
- $CXX		= '@CXX@';          # C++ compiler
- $EXCEPTIONS	= '@EXCEPTIONS@';   # Exception handling type
--$ENABLE_DEBUG	= '@ENABLE_DEBUG@';  # Enable a debug build
-+$ENABLE_DEBUG	= '@ENABLE_DEBUG@'; # Enable a debug build
-+$USE_LINUXJDK	= '@USE_LINUXJDK@'; # Use the Linux JDK
- $WRAPCMD	= "";				# Wrapper (only for winnt)
- 
- #
-@@ -1265,7 +1266,12 @@
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
- }
- elsif ($platform eq "$FreeBSD")
--{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+{
-+   if ($USE_LINUXJDK eq "TRUE") {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
-+   } else {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+   }
- }
- elsif ($platform eq "$NetBSD")
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
diff --git a/editors/openoffice.org-3-RC/files/patch-connectivity+source+drivers+mozab+makefile.mk b/editors/openoffice.org-3-RC/files/patch-connectivity+source+drivers+mozab+makefile.mk
deleted file mode 100644
index 2b83f2cd2ec7..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-connectivity+source+drivers+mozab+makefile.mk
+++ /dev/null
@@ -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)					\
diff --git a/editors/openoffice.org-3-RC/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-3-RC/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
deleted file mode 100644
index 3601766ee561..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../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
-@@ -64,8 +64,8 @@
- #mozilla specific stuff.
- MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
- MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
--#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
--#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
-+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
-+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
- #End of mozilla specific stuff.
- 
- PRJ=..$/..$/..$/..
-@@ -107,7 +107,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -123,7 +123,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -141,7 +141,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS+=	    -DMOZILLA_CLIENT \
-             -DOSTYPE=\"Linux2.2.14-5\" -DOJI
- .IF "$(OS)" == "LINUX"
-@@ -157,6 +157,13 @@
-             -fno-rtti -Wall -Wconversion -Wpointer-arith \
-             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-             -Wno-long-long 
-+CDEFS     += -DTRACING
-+.ELIF "$(OS)" == "FREEBSD"
-+CFLAGS +=   -fPIC
-+CFLAGSCXX += \
-+            -fno-rtti -Wall -Wconversion -Wpointer-arith \
-+            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-+            -Wno-long-long -pthread 
- CDEFS     += -DTRACING
- .ENDIF
- .ENDIF
diff --git a/editors/openoffice.org-3-RC/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk b/editors/openoffice.org-3-RC/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
deleted file mode 100644
index b63d2a25f184..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-3-RC/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-3-RC/files/patch-cppu+inc+uno+lbnames.h
deleted file mode 100644
index cb43c2d165e9..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-cppu+inc+uno+lbnames.h
+++ /dev/null
@@ -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."
diff --git a/editors/openoffice.org-3-RC/files/patch-cppu+prj+build.lst b/editors/openoffice.org-3-RC/files/patch-cppu+prj+build.lst
deleted file mode 100644
index 78fd210a1193..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-cppu+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-RC/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-3-RC/files/patch-cppuhelper+source+makefile.mk
deleted file mode 100644
index 5fb5bd636eb1..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-cppuhelper+source+makefile.mk
+++ /dev/null
@@ -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 ------------------------------------------------------
diff --git a/editors/openoffice.org-3-RC/files/patch-desktop+source+pkgchk+pkgchk_misc.h b/editors/openoffice.org-3-RC/files/patch-desktop+source+pkgchk+pkgchk_misc.h
deleted file mode 100644
index 391667b66ebd..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-desktop+source+pkgchk+pkgchk_misc.h
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-RC/files/patch-desktop+util+makefile.mk b/editors/openoffice.org-3-RC/files/patch-desktop+util+makefile.mk
deleted file mode 100644
index 025d644a8077..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-desktop+util+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-RC/files/patch-dtrans+source+X11+makefile.mk b/editors/openoffice.org-3-RC/files/patch-dtrans+source+X11+makefile.mk
deleted file mode 100644
index 5881f5d7f6a5..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-dtrans+source+X11+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice.org-3-RC/files/patch-eventattacher+source+makefile.mk b/editors/openoffice.org-3-RC/files/patch-eventattacher+source+makefile.mk
deleted file mode 100644
index 4552698eb132..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-eventattacher+source+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-3-RC/files/patch-external+gcc3_specific+makefile.mk b/editors/openoffice.org-3-RC/files/patch-external+gcc3_specific+makefile.mk
deleted file mode 100644
index 6b8071f4030e..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-external+gcc3_specific+makefile.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../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"
- 
- .IF "$(OS)"!="MACOSX"
-+.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 @@
-         -rm -f $@
-         +ln -s libgcc_s.so.1 $@
- 
-+.ENDIF 
- .ENDIF 
- 
- .ENDIF
diff --git a/editors/openoffice.org-3-RC/files/patch-freetype+makefile.mk b/editors/openoffice.org-3-RC/files/patch-freetype+makefile.mk
deleted file mode 100644
index 3e5a8dd19f18..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-freetype+makefile.mk
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-3-RC/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-3-RC/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
- 
- /* 
diff --git a/editors/openoffice.org-3-RC/files/patch-javaunohelper+source+makefile.mk b/editors/openoffice.org-3-RC/files/patch-javaunohelper+source+makefile.mk
deleted file mode 100644
index 19f6b86e5ab5..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-javaunohelper+source+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice.org-3-RC/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice.org-3-RC/files/patch-jni_uno+jni_java2uno.cxx
deleted file mode 100644
index a9ff9e3fed88..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-jni_uno+jni_java2uno.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-3-RC/files/patch-nas+nas-1.6.patch b/editors/openoffice.org-3-RC/files/patch-nas+nas-1.6.patch
deleted file mode 100644
index b6096654ebaf..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-nas+nas-1.6.patch
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-3-RC/files/patch-offapi+com+sun+star+setup+OSType.idl b/editors/openoffice.org-3-RC/files/patch-offapi+com+sun+star+setup+OSType.idl
deleted file mode 100644
index 3fee562c6d38..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-offapi+com+sun+star+setup+OSType.idl
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-RC/files/patch-offapi+util+makefile.pmk b/editors/openoffice.org-3-RC/files/patch-offapi+util+makefile.pmk
deleted file mode 100644
index 5cdbb1b4aa4a..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-offapi+util+makefile.pmk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-RC/files/patch-package+inc+HashMaps.hxx b/editors/openoffice.org-3-RC/files/patch-package+inc+HashMaps.hxx
deleted file mode 100644
index 35052d291ef7..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-package+inc+HashMaps.hxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice.org-3-RC/files/patch-package+inc+ZipPackageFolder.hxx b/editors/openoffice.org-3-RC/files/patch-package+inc+ZipPackageFolder.hxx
deleted file mode 100644
index 014c61403380..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-package+inc+ZipPackageFolder.hxx
+++ /dev/null
@@ -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()
diff --git a/editors/openoffice.org-3-RC/files/patch-package+source+zippackage+ContentInfo.hxx b/editors/openoffice.org-3-RC/files/patch-package+source+zippackage+ContentInfo.hxx
deleted file mode 100644
index c4bf35e79f64..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-package+source+zippackage+ContentInfo.hxx
+++ /dev/null
@@ -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();
diff --git a/editors/openoffice.org-3-RC/files/patch-package+source+zippackage+ZipPackageFolder.cxx b/editors/openoffice.org-3-RC/files/patch-package+source+zippackage+ZipPackageFolder.cxx
deleted file mode 100644
index bb504c834eef..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-package+source+zippackage+ZipPackageFolder.cxx
+++ /dev/null
@@ -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 );
diff --git a/editors/openoffice.org-3-RC/files/patch-registry+source+regkey.cxx b/editors/openoffice.org-3-RC/files/patch-registry+source+regkey.cxx
deleted file mode 100644
index fad069f83f14..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-registry+source+regkey.cxx
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-3-RC/files/patch-rsc+source+rscpp+cpp.h b/editors/openoffice.org-3-RC/files/patch-rsc+source+rscpp+cpp.h
deleted file mode 100644
index 417ab33ba52f..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-rsc+source+rscpp+cpp.h
+++ /dev/null
@@ -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              */
- 
diff --git a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+nlsupport.c
deleted file mode 100644
index 49fe0da8589b..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+nlsupport.c
+++ /dev/null
@@ -1,160 +0,0 @@
---- ../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
-@@ -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)
- 
-@@ -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 @@
-     { "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-3-RC/files/patch-sal+osl+unx+pipe.c b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+pipe.c
deleted file mode 100644
index 4aa7b8af1a61..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+pipe.c
+++ /dev/null
@@ -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 )
- 	{			
diff --git a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+process.c b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+process.c
deleted file mode 100644
index 50023576bec4..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+process.c
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+security.c b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+security.c
deleted file mode 100644
index 0cc321dcd544..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+security.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../sal/osl/unx/security.c.orig	Sat Jul 20 22:53:31 2002
-+++ ../sal/osl/unx/security.c	Sat Jul 20 22:52:39 2002
-@@ -739,7 +739,7 @@
- 	}
- 
- 
--#elif (LINUX && (GLIBC >= 2))
-+#elif ((LINUX && (GLIBC >= 2)) || defined(FREEBSD))
- 	
- 	struct passwd	*pPasswd; 
- 	
diff --git a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+socket.c b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+socket.c
deleted file mode 100644
index 9541cac8583f..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+socket.c
+++ /dev/null
@@ -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! */
diff --git a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+system.c b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+system.c
deleted file mode 100644
index 8dc663ac03fc..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+system.c
+++ /dev/null
@@ -1,127 +0,0 @@
---- ../sal/osl/unx/system.c.orig	Sun Mar 17 12:34:13 2002
-+++ ../sal/osl/unx/system.c	Wed Apr  3 01:03:36 2002
-@@ -195,6 +195,73 @@
- }
- #endif
- 
-+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
-+           size_t buflen, struct passwd **result)
-+{
-+  struct passwd* res;
-+
-+  pthread_mutex_lock(&getrtl_mutex);
-+
-+  if ( res = getpwuid(uid) )
-+  {
-+    size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell;
-+
-+    pw_name = strlen(res->pw_name)+1;
-+    pw_passwd = strlen(res->pw_passwd)+1;
-+    pw_class = strlen(res->pw_class)+1;
-+    pw_gecos = strlen(res->pw_gecos)+1;
-+    pw_dir = strlen(res->pw_dir)+1;
-+    pw_shell = strlen(res->pw_shell)+1;
-+
-+    if (pw_name+pw_passwd+pw_class+pw_gecos
-+                                 +pw_dir+pw_shell < buflen)
-+    {
-+      memcpy(pwd, res, sizeof(struct passwd));
-+
-+      strncpy(buffer, res->pw_name, pw_name);
-+      pwd->pw_name = buffer;
-+      buffer += pw_name;
-+
-+      strncpy(buffer, res->pw_passwd, pw_passwd);
-+      pwd->pw_passwd = buffer;
-+      buffer += pw_passwd;
-+
-+      strncpy(buffer, res->pw_class, pw_class);
-+      pwd->pw_class = buffer;
-+      buffer += pw_class;
-+
-+      strncpy(buffer, res->pw_gecos, pw_gecos);
-+      pwd->pw_gecos = buffer;
-+      buffer += pw_gecos;
-+
-+      strncpy(buffer, res->pw_dir, pw_dir);
-+      pwd->pw_dir = buffer;
-+      buffer += pw_dir;
-+
-+      strncpy(buffer, res->pw_shell, pw_shell);
-+      pwd->pw_shell = buffer;
-+      buffer += pw_shell;
-+
-+      *result = pwd ;
-+      res = 0 ;
-+
-+    } else {
-+
-+      res = ENOMEM ;
-+
-+    }      
-+  
-+  } else {
-+
-+    res = errno ;
-+ 
-+  } 
-+
-+  pthread_mutex_unlock(&getrtl_mutex);
-+
-+  return res;
-+}
-+
- struct tm *localtime_r(const time_t *timep, struct tm *buffer)
- {
- 	struct tm* res;
-@@ -518,3 +585,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-3-RC/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+system.h
deleted file mode 100644
index c4e255952fc7..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+system.h
+++ /dev/null
@@ -1,35 +0,0 @@
---- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
-+++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
-@@ -205,6 +205,13 @@
- #   include <sys/ioctl.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 <machine/vmparam.h>
-+#   include <machine/pmap.h>
- #	include <sys/un.h>
- #   include <netinet/tcp.h>
- #	define 	IORESOURCE_TRANSFER_BSD 
-@@ -216,12 +223,13 @@
- #   elif BYTE_ORDER == PDP_ENDIAN
- #   	define _PDP_ENDIAN
- #   endif
--#   define  sched_yield() 				pthread_yield()
--#   define  pthread_testcancel()
- #	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
diff --git a/editors/openoffice.org-3-RC/files/patch-sal+textenc+tencinfo.c b/editors/openoffice.org-3-RC/files/patch-sal+textenc+tencinfo.c
deleted file mode 100644
index 7cf80c18d0a0..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-sal+textenc+tencinfo.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
-     /* 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 */
-+
-+    if (pMimeCharset == NULL)
-+	pMimeCharset = "usascii";
-+
-     static ImplStrCharsetDef const aVIPMimeCharsetTab[] =
-     {
-         { "usascii", RTL_TEXTENCODING_ASCII_US },
diff --git a/editors/openoffice.org-3-RC/files/patch-sal+workben+makefile.mk b/editors/openoffice.org-3-RC/files/patch-sal+workben+makefile.mk
deleted file mode 100644
index 369935e31d66..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-sal+workben+makefile.mk
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../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 @@
- 
- .IF "$(TESTAPP)" == "salstattest"
- 
--	CFLAGS+= /DUSE_SAL_STATIC
-+	CFLAGS+= -DUSE_SAL_STATIC
- 
- 	OBJFILES=	$(OBJ)$/salstattest.obj
- 
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- 
- CXXFILES=	tgetpwnam.cxx
- OBJFILES=	$(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN=	$(SLB)$/sal.lib
- 
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd | freebsd)
- .ENDIF # tgetpwname
- 
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-3-RC/files/patch-salhelper+source+gcc2_freebsd_intel.map b/editors/openoffice.org-3-RC/files/patch-salhelper+source+gcc2_freebsd_intel.map
deleted file mode 100644
index 1ffacf889bc6..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-salhelper+source+gcc2_freebsd_intel.map
+++ /dev/null
@@ -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:
-+*;
-+};
diff --git a/editors/openoffice.org-3-RC/files/patch-salhelper+source+gcc3_freebsd_intel.map b/editors/openoffice.org-3-RC/files/patch-salhelper+source+gcc3_freebsd_intel.map
deleted file mode 100644
index 823cff316ec7..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-salhelper+source+gcc3_freebsd_intel.map
+++ /dev/null
@@ -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:
-+		*;
-+};
-+
diff --git a/editors/openoffice.org-3-RC/files/patch-salhelper+source+makefile.mk b/editors/openoffice.org-3-RC/files/patch-salhelper+source+makefile.mk
deleted file mode 100644
index 3687664d8d16..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-salhelper+source+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../salhelper/source/makefile.mk.orig	Wed Nov 14 14:19:21 2001
-+++ ../salhelper/source/makefile.mk	Sun Mar  3 17:58:15 2002
-@@ -109,6 +109,10 @@
- SHL1VERSIONMAP=lngi.map
- .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
- SHL1VERSIONMAP=gcc3_linux_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
- .ENDIF
- 
- 
diff --git a/editors/openoffice.org-3-RC/files/patch-salhelper+test+rtti+makefile.mk b/editors/openoffice.org-3-RC/files/patch-salhelper+test+rtti+makefile.mk
deleted file mode 100644
index 70f25048a24a..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-salhelper+test+rtti+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
- 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
- .ENDIF
- 
- 
diff --git a/editors/openoffice.org-3-RC/files/patch-sc+source+core+data+cell.cxx b/editors/openoffice.org-3-RC/files/patch-sc+source+core+data+cell.cxx
deleted file mode 100644
index 529f67a3e35f..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-sc+source+core+data+cell.cxx
+++ /dev/null
@@ -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>
diff --git a/editors/openoffice.org-3-RC/files/patch-scp+source+global+udk_base.scp b/editors/openoffice.org-3-RC/files/patch-scp+source+global+udk_base.scp
deleted file mode 100644
index 623eccb0ff09..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-scp+source+global+udk_base.scp
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-RC/files/patch-scp+source+player+player.scp b/editors/openoffice.org-3-RC/files/patch-scp+source+player+player.scp
deleted file mode 100644
index 2f8daab35cdd..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-scp+source+player+player.scp
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-3-RC/files/patch-scptools+source+linker+searchcache b/editors/openoffice.org-3-RC/files/patch-scptools+source+linker+searchcache
deleted file mode 100644
index 593e9eabf5bc..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-scptools+source+linker+searchcache
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: files/patch-scptools::source::linker::searchcache
-===================================================================
-RCS file: files/patch-scptools::source::linker::searchcache
-diff -N files/patch-scptools::source::linker::searchcache
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-scptools::source::linker::searchcache	4 Aug 2002 15:28:04 -0000
-@@ -0,0 +1,27 @@
-+--- ../scptools/source/linker/searchcache.hxx.orig	Fri Aug  2 22:53:46 2002
-++++ ../scptools/source/linker/searchcache.hxx	Fri Aug  2 22:54:50 2002
-+@@ -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	Fri Aug  2 22:53:35 2002
-++++ ../scptools/source/linker/searchcache.cxx	Fri Aug  2 22:55:14 2002
-+@@ -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-3-RC/files/patch-scptools+source+linker+ziplst.cxx b/editors/openoffice.org-3-RC/files/patch-scptools+source+linker+ziplst.cxx
deleted file mode 100644
index 83b84631542e..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-scptools+source+linker+ziplst.cxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice.org-3-RC/files/patch-setup2+inc+fields.hxx b/editors/openoffice.org-3-RC/files/patch-setup2+inc+fields.hxx
deleted file mode 100644
index d56e12f2abf4..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-setup2+inc+fields.hxx
+++ /dev/null
@@ -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[];
diff --git a/editors/openoffice.org-3-RC/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-3-RC/files/patch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 396c586ee3a3..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,30 +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"
- 
-@@ -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" \
diff --git a/editors/openoffice.org-3-RC/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice.org-3-RC/files/patch-setup2+mow+source+loader+makefile.mk
deleted file mode 100644
index 5460e4296587..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-setup2+mow+source+loader+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice.org-3-RC/files/patch-setup2+patch+makefile.mk b/editors/openoffice.org-3-RC/files/patch-setup2+patch+makefile.mk
deleted file mode 100644
index 53846a8bdfc9..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-setup2+patch+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-RC/files/patch-setup2+script+setupserver b/editors/openoffice.org-3-RC/files/patch-setup2+script+setupserver
deleted file mode 100644
index 450ea386c841..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-setup2+script+setupserver
+++ /dev/null
@@ -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`"
diff --git a/editors/openoffice.org-3-RC/files/patch-setup2+source+compiler+decltor.cxx b/editors/openoffice.org-3-RC/files/patch-setup2+source+compiler+decltor.cxx
deleted file mode 100644
index 98f6ad2f7567..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-setup2+source+compiler+decltor.cxx
+++ /dev/null
@@ -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";
diff --git a/editors/openoffice.org-3-RC/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx b/editors/openoffice.org-3-RC/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
deleted file mode 100644
index ac0b39a6aa47..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
+++ /dev/null
@@ -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) );
diff --git a/editors/openoffice.org-3-RC/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-3-RC/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
deleted file mode 100644
index f199b18823e1..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-3-RC/files/patch-setup2+source+service+interface.cxx b/editors/openoffice.org-3-RC/files/patch-setup2+source+service+interface.cxx
deleted file mode 100644
index 8e478e17971d..000000000000
--- a/editors/openoffice.org-3-RC/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-3-RC/files/patch-shell+source+cmdmail+makefile.mk b/editors/openoffice.org-3-RC/files/patch-shell+source+cmdmail+makefile.mk
deleted file mode 100644
index 0476285c802e..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-shell+source+cmdmail+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-3-RC/files/patch-shell+source+proxysettings+makefile.mk b/editors/openoffice.org-3-RC/files/patch-shell+source+proxysettings+makefile.mk
deleted file mode 100644
index e83cf7c9d7a1..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-shell+source+proxysettings+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-3-RC/files/patch-shell+source+unix+exec+makefile.mk b/editors/openoffice.org-3-RC/files/patch-shell+source+unix+exec+makefile.mk
deleted file mode 100644
index 0b7712ee35f8..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-shell+source+unix+exec+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-3-RC/files/patch-solenv+bin+addsym.awk
deleted file mode 100644
index 996e282b350b..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-solenv+bin+addsym.awk
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
-+++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
-@@ -72,11 +72,11 @@
- END {
-     if (state == 0) {
-         print "# Weak RTTI symbols for C++ exceptions:"
--        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
-+        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
-     }
- }
- state == 2 {
--    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
-+    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
-     state = 3
- }
- /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+bin+mapgen.pl b/editors/openoffice.org-3-RC/files/patch-solenv+bin+mapgen.pl
deleted file mode 100644
index 71ebdb934120..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-solenv+bin+mapgen.pl
+++ /dev/null
@@ -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, $_);
- 	};
diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+startup+FREEBSD+macros.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+startup+FREEBSD+macros.mk
deleted file mode 100644
index 0c1b107de988..000000000000
--- a/editors/openoffice.org-3-RC/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-3-RC/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+tg_ext.mk
deleted file mode 100644
index 701692c9425a..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-solenv+inc+tg_ext.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+tg_moz.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+tg_moz.mk
deleted file mode 100644
index 255a41f92281..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-solenv+inc+tg_moz.mk
+++ /dev/null
@@ -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) $@
diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index b4764485aa86..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,202 +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
-+# 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*=$(CC)
-+
-+# default linker flags
-+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -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
diff --git a/editors/openoffice.org-3-RC/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice.org-3-RC/files/patch-soltools+checkdll+makefile.mk
deleted file mode 100644
index e6407402258a..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-soltools+checkdll+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-RC/files/patch-soltools+mkdepend+main.c b/editors/openoffice.org-3-RC/files/patch-soltools+mkdepend+main.c
deleted file mode 100644
index cffd5cbb1f43..000000000000
--- a/editors/openoffice.org-3-RC/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-3-RC/files/patch-stlport+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stlport+makefile.mk
deleted file mode 100644
index 797817ba85be..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-stlport+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-RC/files/patch-stoc+source+corereflection+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+corereflection+makefile.mk
deleted file mode 100644
index 4b319b08d401..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-stoc+source+corereflection+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-3-RC/files/patch-stoc+source+defaultregistry+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+defaultregistry+makefile.mk
deleted file mode 100644
index 4cae0476415a..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-stoc+source+defaultregistry+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-3-RC/files/patch-stoc+source+implementationregistration+implreg.cxx b/editors/openoffice.org-3-RC/files/patch-stoc+source+implementationregistration+implreg.cxx
deleted file mode 100644
index 341d621d872c..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-stoc+source+implementationregistration+implreg.cxx
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-RC/files/patch-stoc+source+implementationregistration+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+implementationregistration+makefile.mk
deleted file mode 100644
index 0051043b7ecb..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-stoc+source+implementationregistration+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-3-RC/files/patch-stoc+source+inspect+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+inspect+makefile.mk
deleted file mode 100644
index c7cd85253c11..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-stoc+source+inspect+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-3-RC/files/patch-stoc+source+invocation+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+invocation+makefile.mk
deleted file mode 100644
index 9ac2072a5612..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-stoc+source+invocation+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-3-RC/files/patch-stoc+source+invocation_adapterfactory+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
deleted file mode 100644
index 8853ad39a90e..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-3-RC/files/patch-stoc+source+javaloader+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+javaloader+makefile.mk
deleted file mode 100644
index cea499f15c57..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-stoc+source+javaloader+makefile.mk
+++ /dev/null
@@ -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=		
diff --git a/editors/openoffice.org-3-RC/files/patch-stoc+source+javavm+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+javavm+makefile.mk
deleted file mode 100644
index b895a2b968d4..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-stoc+source+javavm+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice.org-3-RC/files/patch-stoc+source+loader+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+loader+makefile.mk
deleted file mode 100644
index 5a08ee5937b6..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-stoc+source+loader+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-3-RC/files/patch-stoc+source+namingservice+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+namingservice+makefile.mk
deleted file mode 100644
index e573081bc21d..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-stoc+source+namingservice+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-3-RC/files/patch-stoc+source+proxy_factory+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+proxy_factory+makefile.mk
deleted file mode 100644
index 9110b2f50cd1..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-stoc+source+proxy_factory+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-3-RC/files/patch-stoc+source+registry_tdprovider+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+registry_tdprovider+makefile.mk
deleted file mode 100644
index 9d974d1c0d10..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-stoc+source+registry_tdprovider+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-RC/files/patch-stoc+source+servicemanager+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+servicemanager+makefile.mk
deleted file mode 100644
index 746776d54759..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-stoc+source+servicemanager+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-3-RC/files/patch-stoc+source+tdmanager+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+tdmanager+makefile.mk
deleted file mode 100644
index 76403fdde841..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-stoc+source+tdmanager+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-3-RC/files/patch-stoc+source+typeconv+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+typeconv+makefile.mk
deleted file mode 100644
index dc647f89a166..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-stoc+source+typeconv+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-RC/files/patch-store+util+makefile.mk b/editors/openoffice.org-3-RC/files/patch-store+util+makefile.mk
deleted file mode 100644
index 6bef6e960f2e..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-store+util+makefile.mk
+++ /dev/null
@@ -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
- 
- 
diff --git a/editors/openoffice.org-3-RC/files/patch-svx+source+fmcomp+makefile.mk b/editors/openoffice.org-3-RC/files/patch-svx+source+fmcomp+makefile.mk
deleted file mode 100644
index b16030080c0d..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-svx+source+fmcomp+makefile.mk
+++ /dev/null
@@ -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= \
diff --git a/editors/openoffice.org-3-RC/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice.org-3-RC/files/patch-sysui+oounix+office+gnome+makefile.mk
deleted file mode 100644
index 3d7c2e22aa63..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-sysui+oounix+office+gnome+makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
-+++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
-@@ -84,7 +84,9 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- APP1LIBS=
-+.IF "$(OS)"!="FREEBSD"
- APP1STDLIBS=-ldl
-+.ENDIF
- 
- GNOMEFILES= \
- 	locales.tab
diff --git a/editors/openoffice.org-3-RC/files/patch-tools+source+string+tstring.cxx b/editors/openoffice.org-3-RC/files/patch-tools+source+string+tstring.cxx
deleted file mode 100644
index 12bd6bd0b244..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-tools+source+string+tstring.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../tools/source/string/tstring.cxx.orig	Sat Aug 10 12:53:42 2002
-+++ ../tools/source/string/tstring.cxx	Sat Aug 10 12:54:16 2002
-@@ -103,6 +103,9 @@
- xub_StrLen ImplStringLen( const sal_Char* pStr )
- {
- 	const sal_Char* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
-@@ -113,6 +116,9 @@
- xub_StrLen ImplStringLen( const sal_Unicode* pStr )
- {
- 	const sal_Unicode* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
diff --git a/editors/openoffice.org-3-RC/files/patch-unoil+makefile.pmk b/editors/openoffice.org-3-RC/files/patch-unoil+makefile.pmk
deleted file mode 100644
index 7febdabf7b4b..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-unoil+makefile.pmk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../unoil/makefile.pmk.orig	Fri Aug 31 18:04:43 2001
-+++ ../unoil/makefile.pmk	Thu Sep 12 12:17:50 2002
-@@ -74,8 +74,8 @@
- JAVAFILESLIST	:= $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java)
- .ENDIF          # "$(L10N_framework)"==""
- 
--GENJAVAFILES	:= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
--GENCLASSFILES	:= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
-+GENJAVAFILES	+= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
-+GENCLASSFILES	+= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
- 
- # --- Targets ------------------------------------------------------
- 
diff --git a/editors/openoffice.org-3-RC/files/patch-unzip+source+file_io.c b/editors/openoffice.org-3-RC/files/patch-unzip+source+file_io.c
deleted file mode 100644
index 2f85a108c185..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-unzip+source+file_io.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../unzip/source/file_io.c.orig	Sat Oct 19 11:58:45 2002
-+++ ../unzip/source/file_io.c	Sat Oct 19 12:03:40 2002
-@@ -500,7 +500,7 @@
- #ifdef MPW
- 				pCallBack( 0 );
- #else
--				#if defined LINUX || defined MACOSX || defined NETBSD
-+				#if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD
- 				pCallBack( lseek(outfd, 0, SEEK_CUR) );
- 				#else
- 				pCallBack( tell( outfd ) );
-@@ -865,7 +865,9 @@
- 	static struct timeb tbp;
- #endif /* !__386BSD__ */
- #else /* !BSD */
-+#if (!defined(NETBSD) && !defined(FREEBSD))
- 	extern long timezone;
-+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
- #endif /* ?BSD */
- #endif /* ?AMIGA */
- 
diff --git a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
deleted file mode 100644
index 41defbd5eb59..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
-+++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
-@@ -65,6 +65,8 @@
- #include <glyphcache.hxx>
- 
- #define Region XLIB_Region
-+typedef unsigned long CARD32;
-+#define Cursor CARD32
- #include <X11/extensions/Xrender.h>
- #undef Region
- 
diff --git a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
deleted file mode 100644
index fefc925db41f..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
-@@ -78,6 +78,12 @@
- GETSTYLE_GNOME=getstyle-gnome-linux-intel
- HASGNOME2=TRUE
- .ENDIF
-+.IF "$_(HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
-+.ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
- HASGNOME2=TRUE
diff --git a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
deleted file mode 100644
index 984313fc540a..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
-@@ -75,9 +75,15 @@
- 
- HASGNOME2=
- 
--.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
-+.IF "$(OS)$(CPU)"=="LINUXI"
- MSGBOX_GNOME=msgbox-gnome-linux-intel
- HASGNOME2=TRUE
-+.ENDIF
-+.IF "$(_HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+MSGBOX_GNOME=msgbox-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
- .ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice.org-3-RC/files/patch-vcl+workben+officeacceptthread.cxx b/editors/openoffice.org-3-RC/files/patch-vcl+workben+officeacceptthread.cxx
deleted file mode 100644
index 07d9f1060557..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-vcl+workben+officeacceptthread.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/workben/officeacceptthread.cxx.orig	Wed Mar  5 20:25:36 2003
-+++ ../vcl/workben/officeacceptthread.cxx	Wed Mar  5 20:26:03 2003
-@@ -125,7 +125,7 @@
- #if defined (SOLARIS)
- 				int status;
- 				nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG);
--#elif defined(LINUX)
-+#elif defined(LINUX) || defined (FREEBSD)
- 				nRet = kill(aProcessInfo.Ident, 0);
- #endif
- #if defined (UNX)
diff --git a/editors/openoffice.org-3-RC/files/zipmoz.sh b/editors/openoffice.org-3-RC/files/zipmoz.sh
deleted file mode 100644
index 43a4591f3430..000000000000
--- a/editors/openoffice.org-3-RC/files/zipmoz.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/sh -f
-
-RUNTIME_FILES=" components/libabsyncsvc.so components/libaddrbook.so \
-		components/libmork.so components/libmozldap.so \
-		components/libnecko.so components/libprofile.so \
-		components/librdf.so components/libstrres.so \
-		components/libunicharutil.so components/libuconv.so \
-		components/libucvcn.so components/libucvibm.so \
-		components/libucvja.so components/libucvko.so \
-		components/libucvlatin.so components/libucvtw.so \
-		components/libucvtw2.so components/liburiloader.so \
-		components/libvcard.so components/libxpconnect.so \
-		components/libpref.so components/libchrome.so libmozjs.so \
-		libmsgbaseutil.so libldap50.so libnspr4.so libplc4.so \
-		libplds4.so libxpcom.so libmozz.so component.reg \
-		components/necko_dns.xpt components/xpcom_xpti.xpt \
-		components/xpcom_threads.xpt components/xpcom_io.xpt \
-		components/xpcom_ds.xpt components/xpcom_components.xpt \
-		components/xpcom_base.xpt components/xpti.dat \
-		defaults/pref/all.js defaults/pref/config.js \
-		defaults/pref/editor.js defaults/pref/initpref.js \
-		defaults/pref/inspector.js defaults/pref/mailnews.js \
-		defaults/pref/security-prefs.js defaults/pref/unix.js \
-		defaults/pref/xpinstall.js"
-
-LIB_FILES="	lib/libembed_base_s.a lib/libmozreg_s.a \
-		lib/libnspr4.so lib/libxpcom.so lib/libprldap50.so"
-
-INC_FILES="include/"
-INC_FILES2="public/"
-
-if [ $# -lt 2 -o $# -gt 3 ] ; then
-	echo 
-	echo usage: $0 mozilla_dist target [target_dir]
-	echo
-	echo where:
-	echo
-	echo "mozilla_dist points to the mozilla distribution"
-	echo "target concatenates  OS, compiler and CPU (e.g. FREEBSDGCCI etc)"
-	echo "target_dir is the directory to place the zips"
-	exit 1
-fi
-
-MOZ_DIST=$1
-TARGET=$2
-if [ "w$3" != "w" ]; then
-	TARGET_DIR=$3
-else
-	if [ "w$TARGET_DIR" == "w" ]; then
-		TARGET_DIR=
-	fi
-fi
-
-ZIP_TARGET=$TARGET_DIR
-if [ -z "$ZIP_TARGET" ] ; then
-	ZIP_TARGET=../
-fi
-
-# just to remember the current working directory
-STARTING_DIR=`pwd`
-
-echo
-echo --- creating zips for $TARGET, using mozilla distribution in $MOZ_DIST
-
-# Create the directories
-[ ! -d $TARGET_DIR/$TARGET/runtime ] && mkdir -p $TARGET_DIR/$TARGET/runtime
-[ ! -d $TARGET_DIR/$TARGET/runtime/components ] && mkdir -p $TARGET_DIR/$TARGET/runtime/components
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults/pref ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults/pref
-[ ! -d $TARGET_DIR/$TARGET/lib ] && mkdir -p $TARGET_DIR/$TARGET/lib
-[ ! -d $TARGET_DIR/$TARGET/inc ] && mkdir -p $TARGET_DIR/$TARGET/inc
-[ ! -d $TARGET_DIR/$TARGET/inc/nspr ] && mkdir -p $TARGET_DIR/$TARGET/inc/nspr
-[ ! -d $TARGET_DIR/$TARGET/inc/obsolete ] && mkdir -p $TARGET_DIR/$TARGET/inc/obsolete
-
-# Copy the files
-echo
-echo --- copying files
-echo
-
-for i in $RUNTIME_FILES; do
-	if [ ! -f $MOZ_DIST/bin/$i ]; then
-		echo $MOZ_DIST/bin/$i does not exist, check your distribution
-	else
-		if [ `echo $i | grep component` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/components/
-		elif [ `echo $i | grep defaults` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/defaults/pref/
-		else
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/
-		fi
-	fi
-done
-
-for i in $LIB_FILES; do
-	if [ ! -f $MOZ_DIST/$i ]; then
-		echo $MOZ_DIST/$i does not exist, check your distribution
-	else
-		cp -R -L $MOZ_DIST/$i $TARGET_DIR/$TARGET/lib/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES`; do
-	if [ ! -d $i ]; then 
-		cp -R -L $MOZ_DIST/include/$i $TARGET_DIR/$TARGET/inc/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES2`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/public/$i $TARGET_DIR/$TARGET/inc
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/$i $TARGET_DIR/$TARGET/inc/nspr
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr/obsolete`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/obsolete/$i $TARGET_DIR/$TARGET/inc/obsolete
-	fi
-done
-
-# delete old zips
-
-[ -f $TARGET_DIR/$TARGET/runtime.zip ] && rm -f $TARGET_DIR/$TARGET/runtime.zip
-[ -f $TARGET_DIR/$TARGET/lib.zip ] && rm -f $TARGET_DIR/$TARGET/lib.zip
-[ -f $TARGET_DIR/$TARGET/inc.zip ] && rm -f $TARGET_DIR/$TARGET/inc.zip
-
-# zip the runtime files
-
-echo
-echo --- creating ${TARGET}runtime.zip
-echo
-
-cd $TARGET_DIR/$TARGET/runtime
-find . -type f | zip $ZIP_TARGET/${TARGET}runtime.zip -@
-
-# zip the lib files
-echo 
-echo --- creating ${TARGET}lib.zip
-echo 
-
-cd $TARGET_DIR/$TARGET/lib
-find . -type f | zip $ZIP_TARGET/${TARGET}lib.zip -@
-
-# zip the inc files
-echo
-echo --- creating ${TARGET}inc.zip
-echo
-
-cd $TARGET_DIR/$TARGET/inc
-find . -type f | zip $ZIP_TARGET/${TARGET}inc.zip -@
-
-# remove dirs
-cd $STARTING_DIR
-rm -rf $TARGET_DIR/$TARGET
-
-echo
-echo --- done
-echo
-
diff --git a/editors/openoffice.org-3-RC/pkg-descr b/editors/openoffice.org-3-RC/pkg-descr
deleted file mode 100644
index 31fd1b12161a..000000000000
--- a/editors/openoffice.org-3-RC/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-OpenOffice.org is an Open Source, community-developed, multi-platform office
-productivity suite. It includes the key desktop applications, such as a
-word processor, spreadsheet, presentation manager, and drawing program,
-with a user interface and feature set similar to other office suites.
-
-Components include:
-  * A universal word processing application for creating business
-    letters, extensive text documents, professional layouts, and HTML
-    documents.
-  * A sophisticated application for performing advanced spreadsheet
-    functions, such as analyzing figures, creating lists, and viewing data.
-  * A tool for creating effective eye-catching presentations.
-  * A vector-oriented draw module that enables the creation of 3D
-    illustrations
diff --git a/editors/openoffice.org-3-RC/pkg-message b/editors/openoffice.org-3-RC/pkg-message
deleted file mode 100644
index 1dc749f301c2..000000000000
--- a/editors/openoffice.org-3-RC/pkg-message
+++ /dev/null
@@ -1,73 +0,0 @@
-OpenOffice.org Build 643 Personal Install How-To
-
-Written by:	Martin Blapp <mbr@freebsd.org>
-
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
-
-1 User installation
--------------------
-
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
---------------
-
-There are some wrappers installed for fast startup.
-Add "${PREFIX}/bin/" to your PATH and you will be able
-to use them.
-
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
-
-If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
-version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
diff --git a/editors/openoffice.org-3-RC/pkg-plist b/editors/openoffice.org-3-RC/pkg-plist
deleted file mode 100644
index 28bd78453b52..000000000000
--- a/editors/openoffice.org-3-RC/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, do not delete. Package list is generated automatically.
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
deleted file mode 100644
index 6f740924c399..000000000000
--- a/editors/openoffice.org-3-devel/Makefile
+++ /dev/null
@@ -1,580 +0,0 @@
-# New ports collection makefile for: OpenOffice
-# Date created:		28 Februar 2002
-# Whom:                 Martin Blapp
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openoffice
-PORTVERSION=	644
-CATEGORIES+=	editors
-MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
-		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
-		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
-		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ny1.mirror.openoffice.org/miscellaneous/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
-MASTER_SITE_SUBDIR=	${PORTVERSION}
-DISTFILES+=	oo_${PORTVERSION}_src.tar.bz2 \
-		gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
-
-BROKEN=		"Does not build"
-
-SORT?=	/usr/bin/sort
-FIND?=	/usr/bin/find
-CUT?=	/usr/bin/cut
-AWK?=	/usr/bin/awk
-GREP?=	/usr/bin/grep
-ZIP?=	${PREFIX}/bin/zip
-UNZIP?=	${PREFIX}/bin/unzip
-ANT?=	${LOCALBASE}/bin/ant
-TCSH?=	/bin/tcsh
-PASTE?=	/usr/bin/paste
-
-.include <bsd.port.pre.mk>
-
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
-DIST_SUBDIR=		openoffice
-DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
-
-#
-# configuration for language specific slave ports
-#
-.if !defined(LANG_EXT)
-LANG_EXT=01
-.else
-#
-# Add pkg-descr and pkg-message if available
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-#
-# LANG_CONFIGURE_ARG is missing for the german port
-#
-.if defined(LANG_EXT)
-CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG},ENUS
-.endif
-.endif
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
-
-EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-
-MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/jakarta-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-.if !defined(DISPLAY)
-BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
-.endif
-.if !defined(WITH_BSD_JDK)
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk14
-.else
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-.endif
-
-USE_PERL5=	yes
-USE_BZIP2=	yes
-USE_BISON=	yes
-USE_GMAKE=	yes
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
-.if !defined(WITH_BSD_JDK)
-JDKDIR?=	${LOCALBASE}/linux-sun-jdk1.4.1
-.else
-JDKDIR?=	${LOCALBASE}/jdk1.4.1
-.endif
-JAVAVM=         ${JDKDIR}/bin/java
-
-GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
-LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
-BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
-
-.if !defined(DISPLAY)
-DISPLAYHACK=localhost:1001
-.endif
-
-CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
-			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
-
-.if !defined(WITH_BSD_JDK)
-CONFIGURE_ARGS+=	--enable-linuxjdk=yes
-.endif
-
-.if defined(WITH_DEBUG)
-.if ${WITH_DEBUG} == 2
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-.endif
-
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"prefered language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
-	@${ECHO} "OPTIONS:"
-.if !defined(USE_GCC)
-	@${ECHO}
-	@${ECHO} "You can compile OO with different"
-	@${ECHO} "gcc compiler versions:"
-	@${ECHO}
-	@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.2"
-	@${ECHO} "to compile openoffice with your"
-	@${ECHO} "prefered compiler."
-.endif
-.if !defined(WITH_BSD_JDK)
-	@${ECHO}
-	@${ECHO} "If you like to use the native BSD"
-	@${ECHO} "JDK for the build system, you can use"
-	@${ECHO} "WITH_BSD_JDK=TRUE to disable the"
-	@${ECHO} "usage of the linux-JDK and linux dependency."
-	@${ECHO}
-.endif
-.if !defined(WITH_DEBUG)
-	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
-	@${ECHO} "if you call make with WITH_DEBUG=1"
-	@${ECHO}
-	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
-	@${ECHO}
-.endif
-.if !defined(WITH_TTF_BYTECODE_ENABLED)
-	@${ECHO}
-	@${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES"
-	@${ECHO} "if you like to use the Freetype library to"
-	@${ECHO} "render TTF fonts. Normally the TTF lib is"
-	@${ECHO} "not used to render fonts."
-	@${ECHO}
-	@${ECHO} "If you have licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479"
-	@${ECHO} "you can enable this option to get better"
-	@${ECHO} "quality of glyphs at small bitmap sizes."
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 450002
-	@${ECHO}
-	@${ECHO} "OS-VERSION ${OSVERSION} too low"
-	@${ECHO}
-	@${ECHO} "OO need some important libc_r and"
-	@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
-	@${ECHO} "RELEASE or 4.6 STABLE."
-	@${FALSE}
-.endif
-	@${ECHO}
-	@${ECHO} "NOTICE:"
-	@${ECHO}
-	@${ECHO} "To build Openoffice, you should have a lot"
-.if defined(WITH_DEBUG)
-	@${ECHO} "of free diskspace (~ 8GB)."
-.else
-	@${ECHO} "of free diskspace (~ 4GB)."
-.endif
-	@${ECHO}
-.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
-    (${OSVERSION} < 500000 && !defined(USE_GCC))
-	@${ECHO} "KERNEL CONFIGURATION:"
-	@${ECHO}
-	@${ECHO} "Openoffice needs a larger stack- and"
-	@${ECHO} "datasize to build. Check your limit"
-	@${ECHO} "settings and and put this in /boot/loader.conf"
-	@${ECHO} "if neccessary:"
-	@${ECHO}
-	@${ECHO} "kern.maxdsiz=\"1073741824\""
-	@${ECHO} "kern.maxssiz=\"268435456\""
-.endif
-	@${ECHO}
-.if ${OSVERSION} < 460002
-	@${ECHO} "REQUIRED SYSTEM PATCHES:"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO} "OO.org can crash if you enter a non existing path"
-	@${ECHO} "or URL in the location bar. To fix these crashes"
-	@${ECHO} "you need a uncommitted system patch for rtld:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460001
-	@${ECHO}
-	@${ECHO} "OO setup is broken on STABLE < 4.6"
-	@${ECHO} "including 4.6 RELEASE."
-	@${ECHO} "You'll need a system patch to solve"
-	@${ECHO} "this problem:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460002
-	@${ECHO}
-	@${ECHO} "OO.org soffice binary can deadlock. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO}
-	@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
-	@${ECHO}
-.endif
-.if !exists(/usr/include/langinfo.h)
-	@${ECHO}
-	@${ECHO} "langinfo.h is missing !"
-	@${ECHO}
-	@${ECHO} "Please upgrade to 4.6 RELEASE or"
-	@${ECHO} "4.6 STABLE."
-	@${ECHO}
-	@${FALSE}
-.endif
-
-post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
-	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
-	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@-${RM} -f ${WRKSRC}/../moz/zipped/*.zip
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
-.if defined(L10NHELP)
-	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
-	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
-.endif
-
-post-patch:
-	@${MAKE} patch-mozilla
-.if defined(WITH_TTF_BYTECODE_ENABLED)
-	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
-		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-			${ECHO_MSG} "===>   Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \
-		fi; \
-		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
-	fi
-.endif
-.if defined(WITH_DEBUG)
-	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
-		PATCHES_APPLIED="" ; \
-		for i in ${PATCHDIR}/debugpatch-*; do \
-			case $$i in \
-				*.orig|*.rej|*~) \
-					${ECHO_MSG} "===>   Ignoring patchfile $$i" ; \
-					;; \
-				*) \
-					if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-						${ECHO_MSG} "===>   Applying ${OPSYS} patch $$i" ; \
-					fi; \
-					if ${PATCH} ${PATCH_ARGS} < $$i ; then \
-						PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
-					else \
-						${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
-						if [ x"$$PATCHES_APPLIED" != x"" ]; then \
-							${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
-						fi; \
-						${FALSE} ; \
-					fi; \
-					;; \
-			esac; \
-		done; \
-	fi;
-.endif
-	@${ECHO_MSG} "===>  Find old malloc.h defines and fix them in ${PKGNAME} source"
-	@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
-		${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
-
-extract-mozilla:
-.if ! exists(${WRKDIR}/mozilla/Makefile)
-	@${ECHO_MSG} "===>  Extracting mozilla sub project"
-	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
-.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment)
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
-.endif
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
-.endif
-	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
-
-patch-mozilla:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
-		${WRKDIR}/mozilla/files/
-	@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
-
-build-mozilla:
-.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
-	@${ECHO_MSG} "===>  Building mozilla sub project"
-.if defined(WITH_DEBUG)
-	@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
-	@${SED} -e 's|--disable-debug||' \
-		-e 's|--disable-cpp-rtti||' \
-		-e 's|--enable-strip||' \
-		< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
-.endif
-.if defined(USE_GCC)
-	@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
-.else
-	@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
-.endif
-	@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
-	@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
-	@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
-.endif
-
-install-mozilla:
-	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
-
-register-mozilla:
-.if exists(${WRKDIR}/mozilla-runtime)
-	@${RM} -rf ${WRKDIR}/mozilla-runtime
-.endif
-	@${MKDIR} ${WRKDIR}/mozilla-runtime
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
-	@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
-	@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
-	@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
-		&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom 
-	@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
-		${WRKDIR}/mozilla-runtime/components/xptitemp.dat
-	@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
-	@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
-		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
-
-mozilla:
-	@${MAKE} extract-mozilla
-	@${MAKE} patch-mozilla
-	@${MAKE} build-mozilla
-	@${MAKE} register-mozilla
-	@${MAKE} install-mozilla
-
-do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
-	@${MAKE} mozilla
-.endif
-.endif
-.endif
-.if exists(${WRKDIR}/.Xvfb.pid)
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.endif
-.if !defined(DISPLAY)
-	#
-	# This is a UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-.endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
-	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-.endif
-.if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
-.endif
-
-pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-
-do-install:
-.if !defined(DISPLAY)
-	#
-	# UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-.endif
-
-install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
-
-post-install:
-	@${ECHO_MSG} "===>  Add wrapper scripts";
-	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
-	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
-
-package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
-.if defined(LANG_SUFFIX)
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
-.else
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
-.endif
-
-update:
-	@${MAKE} fetch
-	@${MAKE} extract
-	@cd ${WRKSRC}/.. && for dir in *; do \
-	    if [ -d $$dir ]; then \
-		cd $$dir; cvs update -d; cd ..; \
-	    fi \
-	done
-
-.include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
deleted file mode 100644
index ec9d6788f104..000000000000
--- a/editors/openoffice.org-3-devel/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
-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
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
diff --git a/editors/openoffice.org-3-devel/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-3-devel/files/debugpatch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 96c651ce22c8..000000000000
--- a/editors/openoffice.org-3-devel/files/debugpatch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../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
-@@ -902,6 +902,7 @@
- 
- void KillSetupDir()
- {
-+#if 0
-     DIR* pDir = opendir( strTmpPath );
-     struct dirent* pFile;
- 
-@@ -915,6 +916,10 @@
- 
-     chdir( strInitPath );
-     rmdir( strTmpPath );
-+#else
-+	fprintf(stderr, "\nLeaving behind temporary directory: %s\n",
-+	strTmpPath);
-+#endif
- }
- 
- void makeSymLink( char* s )
diff --git a/editors/openoffice.org-3-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 52bd2b3d58d6..000000000000
--- a/editors/openoffice.org-3-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
-+++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
- 
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- 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
- 
- # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
diff --git a/editors/openoffice.org-3-devel/files/oo_setup.resp b/editors/openoffice.org-3-devel/files/oo_setup.resp
deleted file mode 100644
index 8eeeb11bd95e..000000000000
--- a/editors/openoffice.org-3-devel/files/oo_setup.resp
+++ /dev/null
@@ -1,7 +0,0 @@
-[Environment]
-InstallationMode = INSTALL_NETWORK
-InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org-643
-
-[Java]
-JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-3-devel/files/openoffice-wrapper b/editors/openoffice.org-3-devel/files/openoffice-wrapper
deleted file mode 100644
index dce65821651b..000000000000
--- a/editors/openoffice.org-3-devel/files/openoffice-wrapper
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-devel/files/Attic/openoffice-wrapper,v 1.3 2003-03-05 23:24:05 mbr Exp $
-
-oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/
-program=`echo $0 | sed -e 's|.*-||'`
-
-if [ ! $LANG ]; then
-	export LANG=%%LANG%%
-fi
-
-case $program in
-$0)
-	exec $oopath/soffice "$@"
-	;;
-	*)
-	exec $oopath/$program "$@"
-	;;
-esac
diff --git a/editors/openoffice.org-3-devel/files/optpatch-freetype+patch b/editors/openoffice.org-3-devel/files/optpatch-freetype+patch
deleted file mode 100644
index b426a8fb7fcc..000000000000
--- a/editors/openoffice.org-3-devel/files/optpatch-freetype+patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Index: files/patch-freetype::patch
-===================================================================
-RCS file: files/patch-freetype::patch
-diff -N files/patch-freetype::patch
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-freetype::patch	4 Aug 2002 15:27:42 -0000
-@@ -0,0 +1,201 @@
-+diff -ur ../freetype/freetype-2.0.5.patch oo641d_patched/freetype/freetype-2.0.5.patch
-+--- ../freetype/freetype-2.0.5.patch	Fri Apr  5 21:07:34 2002
-++++ ../freetype/freetype-2.0.5.patch	Sat Mar  9 18:04:17 2002
-+@@ -1,118 +1,79 @@
-+-*** misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 14 00:44:33 2000
-+---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 63,69 ****
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+---- 63,69 ----
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+-*** misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Jun  7 19:36:17 2001
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 631,637 ****
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+---- 631,637 ----
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile -DPIC $pic_flag"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Mon Jan  1 18:25:21 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 1,7 ****
-+---- 1,9 ----
-+-  FT_USE_MODULE(autohint_module_class)
-+-  FT_USE_MODULE(cff_driver_class)
-+-  FT_USE_MODULE(t1cid_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(pcf_driver_class)
-+-+ */
-+-  FT_USE_MODULE(psaux_module_class)
-+-  FT_USE_MODULE(psnames_module_class)
-+-  FT_USE_MODULE(ft_raster1_renderer_class)
-+-***************
-+-*** 9,12 ****
-+---- 11,16 ----
-+-  FT_USE_MODULE(ft_smooth_renderer_class)
-+-  FT_USE_MODULE(tt_driver_class)
-+-  FT_USE_MODULE(t1_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(winfnt_driver_class)
-+-+ */
-+-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h	Tue Aug 21 10:50:45 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 70,76 ****
-+---- 70,79 ----
-+-    /*   All convenience functions are declared as such in their             */
-+-    /*   documentation.                                                      */
-+-    /*                                                                       */
-+-+ /*
-+-  #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-+ */
-+-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-  
-+-  
-+-    /*************************************************************************/
-+-***************
-+-*** 108,116 ****
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-- 
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+---- 111,121 ----
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-+ /*
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-+ */
-+-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig	Mon Jan  7 14:21:35 2002
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Mon Jan  7 14:21:40 2002
-+-***************
-+-*** 2251,2257 ****
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age + 1`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-+---- 2251,2257 ----
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk
-++--- misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:49:17 2001
-++@@ -63,7 +63,7 @@
-++ #   ANSI compliance.
-++ #
-++ ifndef CFLAGS
-++-  CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+++  CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-++ endif
-++ 
-++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh
-++--- misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:47:56 2001
-+++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:49:17 2001
-++@@ -631,7 +631,7 @@
-++     if test "$build_old_libs" = yes; then
-++       if test "$pic_mode" != yes; then
-++ 	# Don't build PIC code
-++-	command="$base_compile $srcfile"
-+++	command="$base_compile $srcfile -DPIC $pic_flag"
-++       else
-++ 	# All platforms use -DPIC, to notify preprocessed assembler code.
-++ 	command="$base_compile $srcfile $pic_flag -DPIC"
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:49:17 2001
-++@@ -1,7 +1,9 @@
-++ FT_USE_MODULE(autohint_module_class)
-++ FT_USE_MODULE(cff_driver_class)
-++ FT_USE_MODULE(t1cid_driver_class)
-+++/*
-++ FT_USE_MODULE(pcf_driver_class)
-+++*/
-++ FT_USE_MODULE(psaux_module_class)
-++ FT_USE_MODULE(psnames_module_class)
-++ FT_USE_MODULE(ft_raster1_renderer_class)
-++@@ -9,4 +11,6 @@
-++ FT_USE_MODULE(ft_smooth_renderer_class)
-++ FT_USE_MODULE(tt_driver_class)
-++ FT_USE_MODULE(t1_driver_class)
-+++/*
-++ FT_USE_MODULE(winfnt_driver_class)
-+++*/
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:51:15 2001
-++@@ -70,7 +70,10 @@
-++   /*   All convenience functions are declared as such in their             */
-++   /*   documentation.                                                      */
-++   /*                                                                       */
-+++/*
-++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+++*/
-+++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-++ 
-++ 
-++   /*************************************************************************/
-++@@ -108,8 +111,10 @@
-++   /*   use a vector `plotter' format that isn't supported when this        */
-++   /*   macro is undefined.                                                 */
-++   /*                                                                       */
-+++/*
-++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++-
-+++*/
-+++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++ 
-++   /*************************************************************************/
-++   /*                                                                       */
-++@@ -338,7 +343,7 @@
-++   /* By undefining this, you will only compile the code necessary to load  */
-++   /* TrueType glyphs without hinting.                                      */
-++   /*                                                                       */
-++-#undef  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-+++#define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-++ 
-++ 
-++   /*************************************************************************/
diff --git a/editors/openoffice.org-3-devel/files/optpatch-vcl+util+makefile.pmk b/editors/openoffice.org-3-devel/files/optpatch-vcl+util+makefile.pmk
deleted file mode 100644
index 41341ff0b4e8..000000000000
--- a/editors/openoffice.org-3-devel/files/optpatch-vcl+util+makefile.pmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/util/makefile.pmk.orig	Mon Aug  5 01:39:41 2002
-+++ ../vcl/util/makefile.pmk	Mon Aug  5 01:40:03 2002
-@@ -64,7 +64,7 @@
- PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch
- PDBTARGET=vcl
- 
--.IF "$(OS)" != "MACOSX"
-+.IF "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- .IF "$(remote)" != ""
- USE_BUILTIN_RASTERIZER=true
- .ENDIF
diff --git a/editors/openoffice.org-3-devel/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-3-devel/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 078685f3b516..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../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 freebsd genunix";;
-  	*)		JINCSUBDIRS="genunix";;
-  	esac
-  
diff --git a/editors/openoffice.org-3-devel/files/patch-bridges+prj+build.lst b/editors/openoffice.org-3-devel/files/patch-bridges+prj+build.lst
deleted file mode 100644
index fee3d847c5e6..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-bridges+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
deleted file mode 100644
index 99b8c566fb61..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ /dev/null
@@ -1,102 +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 );
-+    }
- }
- 
- }
diff --git a/editors/openoffice.org-3-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice.org-3-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
deleted file mode 100644
index 4622b7fe21c4..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-3-devel/files/patch-comphelper+util+makefile.mk b/editors/openoffice.org-3-devel/files/patch-comphelper+util+makefile.mk
deleted file mode 100644
index f2d3092c2ddf..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-comphelper+util+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-3-devel/files/patch-config_office+configure.in b/editors/openoffice.org-3-devel/files/patch-config_office+configure.in
deleted file mode 100644
index a45332fcbec0..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,66 +0,0 @@
---- configure.in.orig	Thu Feb 20 15:49:32 2003
-+++ configure.in	Wed Mar  5 21:22:34 2003
-@@ -95,6 +95,12 @@
-                           
-                           Usage: --enable-macos9
- ],,)
-+AC_ARG_ENABLE(linuxjdk,
-+[  --enable-linuxjdk         Use this option option if you like to use
-+                          the linux-jdk instead of the native jdk.
-+
-+                          Usage: --enable-linuxjdk
-+],,)
- AC_ARG_WITH(lang,
- [  --with-lang             Use this option to build OpenOffice.org with
-                           additional language support. US English is always
-@@ -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
-@@ -1232,7 +1249,11 @@
- if test -n "$enable_debug"; then
-    ENABLE_DEBUG="TRUE"
- else
--   ENABLE_DEBUG="FALSE"
-+fi
-+if test -n "$enable_linuxjdk"; then
-+   USE_LINUXJDK="TRUE"
-+else
-+   USE_LINUXJDK="FALSE"
- fi
- 
- dnl ===================================================================
-@@ -1278,6 +1299,7 @@
- AC_SUBST(PTHREAD_CFLAGS)
- AC_SUBST(PTHREAD_LIBS)
- AC_SUBST(ENABLE_DEBUG)
-+AC_SUBST(USE_LINUXJDK)
- 
- AC_OUTPUT([set_soenv])
- 
diff --git a/editors/openoffice.org-3-devel/files/patch-config_office+set_soenv.in b/editors/openoffice.org-3-devel/files/patch-config_office+set_soenv.in
deleted file mode 100644
index 9ea6b11bdab2..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-config_office+set_soenv.in
+++ /dev/null
@@ -1,44 +0,0 @@
---- set_soenv.in.orig	Thu Feb 27 15:12:36 2003
-+++ set_soenv.in	Wed Mar  5 21:16:43 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, 
-@@ -88,7 +88,7 @@
-      $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
-      $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS,
-      $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
--     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG );
-+     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $USE_LINUXJDK );
- #
- #-------------------------------------------
- # IId. Declaring the aliases.
-@@ -140,7 +140,8 @@
- $CC			= '@CC@';           # C compiler
- $CXX		= '@CXX@';          # C++ compiler
- $EXCEPTIONS	= '@EXCEPTIONS@';   # Exception handling type
--$ENABLE_DEBUG	= '@ENABLE_DEBUG@';  # Enable a debug build
-+$ENABLE_DEBUG	= '@ENABLE_DEBUG@'; # Enable a debug build
-+$USE_LINUXJDK	= '@USE_LINUXJDK@'; # Use the Linux JDK
- $WRAPCMD	= "";				# Wrapper (only for winnt)
- 
- #
-@@ -1265,7 +1266,12 @@
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
- }
- elsif ($platform eq "$FreeBSD")
--{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+{
-+   if ($USE_LINUXJDK eq "TRUE") {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
-+   } else {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+   }
- }
- elsif ($platform eq "$NetBSD")
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
diff --git a/editors/openoffice.org-3-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk b/editors/openoffice.org-3-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk
deleted file mode 100644
index 2b83f2cd2ec7..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk
+++ /dev/null
@@ -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)					\
diff --git a/editors/openoffice.org-3-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-3-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
deleted file mode 100644
index 3601766ee561..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../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
-@@ -64,8 +64,8 @@
- #mozilla specific stuff.
- MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
- MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
--#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
--#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
-+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
-+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
- #End of mozilla specific stuff.
- 
- PRJ=..$/..$/..$/..
-@@ -107,7 +107,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -123,7 +123,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -141,7 +141,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS+=	    -DMOZILLA_CLIENT \
-             -DOSTYPE=\"Linux2.2.14-5\" -DOJI
- .IF "$(OS)" == "LINUX"
-@@ -157,6 +157,13 @@
-             -fno-rtti -Wall -Wconversion -Wpointer-arith \
-             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-             -Wno-long-long 
-+CDEFS     += -DTRACING
-+.ELIF "$(OS)" == "FREEBSD"
-+CFLAGS +=   -fPIC
-+CFLAGSCXX += \
-+            -fno-rtti -Wall -Wconversion -Wpointer-arith \
-+            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-+            -Wno-long-long -pthread 
- CDEFS     += -DTRACING
- .ENDIF
- .ENDIF
diff --git a/editors/openoffice.org-3-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk b/editors/openoffice.org-3-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
deleted file mode 100644
index b63d2a25f184..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-3-devel/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-3-devel/files/patch-cppu+inc+uno+lbnames.h
deleted file mode 100644
index cb43c2d165e9..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-cppu+inc+uno+lbnames.h
+++ /dev/null
@@ -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."
diff --git a/editors/openoffice.org-3-devel/files/patch-cppu+prj+build.lst b/editors/openoffice.org-3-devel/files/patch-cppu+prj+build.lst
deleted file mode 100644
index 78fd210a1193..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-cppu+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-devel/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-3-devel/files/patch-cppuhelper+source+makefile.mk
deleted file mode 100644
index 5fb5bd636eb1..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-cppuhelper+source+makefile.mk
+++ /dev/null
@@ -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 ------------------------------------------------------
diff --git a/editors/openoffice.org-3-devel/files/patch-desktop+source+pkgchk+pkgchk_misc.h b/editors/openoffice.org-3-devel/files/patch-desktop+source+pkgchk+pkgchk_misc.h
deleted file mode 100644
index 391667b66ebd..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-desktop+source+pkgchk+pkgchk_misc.h
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-devel/files/patch-desktop+util+makefile.mk b/editors/openoffice.org-3-devel/files/patch-desktop+util+makefile.mk
deleted file mode 100644
index 025d644a8077..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-desktop+util+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-devel/files/patch-dtrans+source+X11+makefile.mk b/editors/openoffice.org-3-devel/files/patch-dtrans+source+X11+makefile.mk
deleted file mode 100644
index 5881f5d7f6a5..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-dtrans+source+X11+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice.org-3-devel/files/patch-eventattacher+source+makefile.mk b/editors/openoffice.org-3-devel/files/patch-eventattacher+source+makefile.mk
deleted file mode 100644
index 4552698eb132..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-eventattacher+source+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-3-devel/files/patch-external+gcc3_specific+makefile.mk b/editors/openoffice.org-3-devel/files/patch-external+gcc3_specific+makefile.mk
deleted file mode 100644
index 6b8071f4030e..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-external+gcc3_specific+makefile.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../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"
- 
- .IF "$(OS)"!="MACOSX"
-+.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 @@
-         -rm -f $@
-         +ln -s libgcc_s.so.1 $@
- 
-+.ENDIF 
- .ENDIF 
- 
- .ENDIF
diff --git a/editors/openoffice.org-3-devel/files/patch-freetype+makefile.mk b/editors/openoffice.org-3-devel/files/patch-freetype+makefile.mk
deleted file mode 100644
index 3e5a8dd19f18..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-freetype+makefile.mk
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-3-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-3-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
- 
- /* 
diff --git a/editors/openoffice.org-3-devel/files/patch-javaunohelper+source+makefile.mk b/editors/openoffice.org-3-devel/files/patch-javaunohelper+source+makefile.mk
deleted file mode 100644
index 19f6b86e5ab5..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-javaunohelper+source+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice.org-3-devel/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice.org-3-devel/files/patch-jni_uno+jni_java2uno.cxx
deleted file mode 100644
index a9ff9e3fed88..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-jni_uno+jni_java2uno.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-3-devel/files/patch-nas+nas-1.6.patch b/editors/openoffice.org-3-devel/files/patch-nas+nas-1.6.patch
deleted file mode 100644
index b6096654ebaf..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-nas+nas-1.6.patch
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-3-devel/files/patch-offapi+com+sun+star+setup+OSType.idl b/editors/openoffice.org-3-devel/files/patch-offapi+com+sun+star+setup+OSType.idl
deleted file mode 100644
index 3fee562c6d38..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-offapi+com+sun+star+setup+OSType.idl
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-devel/files/patch-offapi+util+makefile.pmk b/editors/openoffice.org-3-devel/files/patch-offapi+util+makefile.pmk
deleted file mode 100644
index 5cdbb1b4aa4a..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-offapi+util+makefile.pmk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-devel/files/patch-package+inc+HashMaps.hxx b/editors/openoffice.org-3-devel/files/patch-package+inc+HashMaps.hxx
deleted file mode 100644
index 35052d291ef7..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-package+inc+HashMaps.hxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice.org-3-devel/files/patch-package+inc+ZipPackageFolder.hxx b/editors/openoffice.org-3-devel/files/patch-package+inc+ZipPackageFolder.hxx
deleted file mode 100644
index 014c61403380..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-package+inc+ZipPackageFolder.hxx
+++ /dev/null
@@ -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()
diff --git a/editors/openoffice.org-3-devel/files/patch-package+source+zippackage+ContentInfo.hxx b/editors/openoffice.org-3-devel/files/patch-package+source+zippackage+ContentInfo.hxx
deleted file mode 100644
index c4bf35e79f64..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-package+source+zippackage+ContentInfo.hxx
+++ /dev/null
@@ -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();
diff --git a/editors/openoffice.org-3-devel/files/patch-package+source+zippackage+ZipPackageFolder.cxx b/editors/openoffice.org-3-devel/files/patch-package+source+zippackage+ZipPackageFolder.cxx
deleted file mode 100644
index bb504c834eef..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-package+source+zippackage+ZipPackageFolder.cxx
+++ /dev/null
@@ -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 );
diff --git a/editors/openoffice.org-3-devel/files/patch-registry+source+regkey.cxx b/editors/openoffice.org-3-devel/files/patch-registry+source+regkey.cxx
deleted file mode 100644
index fad069f83f14..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-registry+source+regkey.cxx
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-3-devel/files/patch-rsc+source+rscpp+cpp.h b/editors/openoffice.org-3-devel/files/patch-rsc+source+rscpp+cpp.h
deleted file mode 100644
index 417ab33ba52f..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-rsc+source+rscpp+cpp.h
+++ /dev/null
@@ -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              */
- 
diff --git a/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+nlsupport.c
deleted file mode 100644
index 49fe0da8589b..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+nlsupport.c
+++ /dev/null
@@ -1,160 +0,0 @@
---- ../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
-@@ -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)
- 
-@@ -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 @@
-     { "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-3-devel/files/patch-sal+osl+unx+pipe.c b/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+pipe.c
deleted file mode 100644
index 4aa7b8af1a61..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+pipe.c
+++ /dev/null
@@ -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 )
- 	{			
diff --git a/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+process.c b/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+process.c
deleted file mode 100644
index 50023576bec4..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+process.c
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+security.c b/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+security.c
deleted file mode 100644
index 0cc321dcd544..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+security.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../sal/osl/unx/security.c.orig	Sat Jul 20 22:53:31 2002
-+++ ../sal/osl/unx/security.c	Sat Jul 20 22:52:39 2002
-@@ -739,7 +739,7 @@
- 	}
- 
- 
--#elif (LINUX && (GLIBC >= 2))
-+#elif ((LINUX && (GLIBC >= 2)) || defined(FREEBSD))
- 	
- 	struct passwd	*pPasswd; 
- 	
diff --git a/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+socket.c b/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+socket.c
deleted file mode 100644
index 9541cac8583f..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+socket.c
+++ /dev/null
@@ -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! */
diff --git a/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+system.c b/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+system.c
deleted file mode 100644
index 8dc663ac03fc..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+system.c
+++ /dev/null
@@ -1,127 +0,0 @@
---- ../sal/osl/unx/system.c.orig	Sun Mar 17 12:34:13 2002
-+++ ../sal/osl/unx/system.c	Wed Apr  3 01:03:36 2002
-@@ -195,6 +195,73 @@
- }
- #endif
- 
-+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
-+           size_t buflen, struct passwd **result)
-+{
-+  struct passwd* res;
-+
-+  pthread_mutex_lock(&getrtl_mutex);
-+
-+  if ( res = getpwuid(uid) )
-+  {
-+    size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell;
-+
-+    pw_name = strlen(res->pw_name)+1;
-+    pw_passwd = strlen(res->pw_passwd)+1;
-+    pw_class = strlen(res->pw_class)+1;
-+    pw_gecos = strlen(res->pw_gecos)+1;
-+    pw_dir = strlen(res->pw_dir)+1;
-+    pw_shell = strlen(res->pw_shell)+1;
-+
-+    if (pw_name+pw_passwd+pw_class+pw_gecos
-+                                 +pw_dir+pw_shell < buflen)
-+    {
-+      memcpy(pwd, res, sizeof(struct passwd));
-+
-+      strncpy(buffer, res->pw_name, pw_name);
-+      pwd->pw_name = buffer;
-+      buffer += pw_name;
-+
-+      strncpy(buffer, res->pw_passwd, pw_passwd);
-+      pwd->pw_passwd = buffer;
-+      buffer += pw_passwd;
-+
-+      strncpy(buffer, res->pw_class, pw_class);
-+      pwd->pw_class = buffer;
-+      buffer += pw_class;
-+
-+      strncpy(buffer, res->pw_gecos, pw_gecos);
-+      pwd->pw_gecos = buffer;
-+      buffer += pw_gecos;
-+
-+      strncpy(buffer, res->pw_dir, pw_dir);
-+      pwd->pw_dir = buffer;
-+      buffer += pw_dir;
-+
-+      strncpy(buffer, res->pw_shell, pw_shell);
-+      pwd->pw_shell = buffer;
-+      buffer += pw_shell;
-+
-+      *result = pwd ;
-+      res = 0 ;
-+
-+    } else {
-+
-+      res = ENOMEM ;
-+
-+    }      
-+  
-+  } else {
-+
-+    res = errno ;
-+ 
-+  } 
-+
-+  pthread_mutex_unlock(&getrtl_mutex);
-+
-+  return res;
-+}
-+
- struct tm *localtime_r(const time_t *timep, struct tm *buffer)
- {
- 	struct tm* res;
-@@ -518,3 +585,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-3-devel/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+system.h
deleted file mode 100644
index c4e255952fc7..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+system.h
+++ /dev/null
@@ -1,35 +0,0 @@
---- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
-+++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
-@@ -205,6 +205,13 @@
- #   include <sys/ioctl.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 <machine/vmparam.h>
-+#   include <machine/pmap.h>
- #	include <sys/un.h>
- #   include <netinet/tcp.h>
- #	define 	IORESOURCE_TRANSFER_BSD 
-@@ -216,12 +223,13 @@
- #   elif BYTE_ORDER == PDP_ENDIAN
- #   	define _PDP_ENDIAN
- #   endif
--#   define  sched_yield() 				pthread_yield()
--#   define  pthread_testcancel()
- #	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
diff --git a/editors/openoffice.org-3-devel/files/patch-sal+textenc+tencinfo.c b/editors/openoffice.org-3-devel/files/patch-sal+textenc+tencinfo.c
deleted file mode 100644
index 7cf80c18d0a0..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-sal+textenc+tencinfo.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
-     /* 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 */
-+
-+    if (pMimeCharset == NULL)
-+	pMimeCharset = "usascii";
-+
-     static ImplStrCharsetDef const aVIPMimeCharsetTab[] =
-     {
-         { "usascii", RTL_TEXTENCODING_ASCII_US },
diff --git a/editors/openoffice.org-3-devel/files/patch-sal+workben+makefile.mk b/editors/openoffice.org-3-devel/files/patch-sal+workben+makefile.mk
deleted file mode 100644
index 369935e31d66..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-sal+workben+makefile.mk
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../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 @@
- 
- .IF "$(TESTAPP)" == "salstattest"
- 
--	CFLAGS+= /DUSE_SAL_STATIC
-+	CFLAGS+= -DUSE_SAL_STATIC
- 
- 	OBJFILES=	$(OBJ)$/salstattest.obj
- 
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- 
- CXXFILES=	tgetpwnam.cxx
- OBJFILES=	$(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN=	$(SLB)$/sal.lib
- 
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd | freebsd)
- .ENDIF # tgetpwname
- 
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-3-devel/files/patch-salhelper+source+gcc2_freebsd_intel.map b/editors/openoffice.org-3-devel/files/patch-salhelper+source+gcc2_freebsd_intel.map
deleted file mode 100644
index 1ffacf889bc6..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-salhelper+source+gcc2_freebsd_intel.map
+++ /dev/null
@@ -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:
-+*;
-+};
diff --git a/editors/openoffice.org-3-devel/files/patch-salhelper+source+gcc3_freebsd_intel.map b/editors/openoffice.org-3-devel/files/patch-salhelper+source+gcc3_freebsd_intel.map
deleted file mode 100644
index 823cff316ec7..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-salhelper+source+gcc3_freebsd_intel.map
+++ /dev/null
@@ -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:
-+		*;
-+};
-+
diff --git a/editors/openoffice.org-3-devel/files/patch-salhelper+source+makefile.mk b/editors/openoffice.org-3-devel/files/patch-salhelper+source+makefile.mk
deleted file mode 100644
index 3687664d8d16..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-salhelper+source+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../salhelper/source/makefile.mk.orig	Wed Nov 14 14:19:21 2001
-+++ ../salhelper/source/makefile.mk	Sun Mar  3 17:58:15 2002
-@@ -109,6 +109,10 @@
- SHL1VERSIONMAP=lngi.map
- .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
- SHL1VERSIONMAP=gcc3_linux_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
- .ENDIF
- 
- 
diff --git a/editors/openoffice.org-3-devel/files/patch-salhelper+test+rtti+makefile.mk b/editors/openoffice.org-3-devel/files/patch-salhelper+test+rtti+makefile.mk
deleted file mode 100644
index 70f25048a24a..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-salhelper+test+rtti+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
- 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
- .ENDIF
- 
- 
diff --git a/editors/openoffice.org-3-devel/files/patch-sc+source+core+data+cell.cxx b/editors/openoffice.org-3-devel/files/patch-sc+source+core+data+cell.cxx
deleted file mode 100644
index 529f67a3e35f..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-sc+source+core+data+cell.cxx
+++ /dev/null
@@ -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>
diff --git a/editors/openoffice.org-3-devel/files/patch-scp+source+global+udk_base.scp b/editors/openoffice.org-3-devel/files/patch-scp+source+global+udk_base.scp
deleted file mode 100644
index 623eccb0ff09..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-scp+source+global+udk_base.scp
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-devel/files/patch-scp+source+player+player.scp b/editors/openoffice.org-3-devel/files/patch-scp+source+player+player.scp
deleted file mode 100644
index 2f8daab35cdd..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-scp+source+player+player.scp
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-3-devel/files/patch-scptools+source+linker+searchcache b/editors/openoffice.org-3-devel/files/patch-scptools+source+linker+searchcache
deleted file mode 100644
index 593e9eabf5bc..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-scptools+source+linker+searchcache
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: files/patch-scptools::source::linker::searchcache
-===================================================================
-RCS file: files/patch-scptools::source::linker::searchcache
-diff -N files/patch-scptools::source::linker::searchcache
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-scptools::source::linker::searchcache	4 Aug 2002 15:28:04 -0000
-@@ -0,0 +1,27 @@
-+--- ../scptools/source/linker/searchcache.hxx.orig	Fri Aug  2 22:53:46 2002
-++++ ../scptools/source/linker/searchcache.hxx	Fri Aug  2 22:54:50 2002
-+@@ -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	Fri Aug  2 22:53:35 2002
-++++ ../scptools/source/linker/searchcache.cxx	Fri Aug  2 22:55:14 2002
-+@@ -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-3-devel/files/patch-scptools+source+linker+ziplst.cxx b/editors/openoffice.org-3-devel/files/patch-scptools+source+linker+ziplst.cxx
deleted file mode 100644
index 83b84631542e..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-scptools+source+linker+ziplst.cxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice.org-3-devel/files/patch-setup2+inc+fields.hxx b/editors/openoffice.org-3-devel/files/patch-setup2+inc+fields.hxx
deleted file mode 100644
index d56e12f2abf4..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-setup2+inc+fields.hxx
+++ /dev/null
@@ -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[];
diff --git a/editors/openoffice.org-3-devel/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-3-devel/files/patch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 396c586ee3a3..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,30 +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"
- 
-@@ -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" \
diff --git a/editors/openoffice.org-3-devel/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice.org-3-devel/files/patch-setup2+mow+source+loader+makefile.mk
deleted file mode 100644
index 5460e4296587..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-setup2+mow+source+loader+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice.org-3-devel/files/patch-setup2+patch+makefile.mk b/editors/openoffice.org-3-devel/files/patch-setup2+patch+makefile.mk
deleted file mode 100644
index 53846a8bdfc9..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-setup2+patch+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-devel/files/patch-setup2+script+setupserver b/editors/openoffice.org-3-devel/files/patch-setup2+script+setupserver
deleted file mode 100644
index 450ea386c841..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-setup2+script+setupserver
+++ /dev/null
@@ -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`"
diff --git a/editors/openoffice.org-3-devel/files/patch-setup2+source+compiler+decltor.cxx b/editors/openoffice.org-3-devel/files/patch-setup2+source+compiler+decltor.cxx
deleted file mode 100644
index 98f6ad2f7567..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-setup2+source+compiler+decltor.cxx
+++ /dev/null
@@ -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";
diff --git a/editors/openoffice.org-3-devel/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx b/editors/openoffice.org-3-devel/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
deleted file mode 100644
index ac0b39a6aa47..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
+++ /dev/null
@@ -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) );
diff --git a/editors/openoffice.org-3-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-3-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
deleted file mode 100644
index f199b18823e1..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-3-devel/files/patch-setup2+source+service+interface.cxx b/editors/openoffice.org-3-devel/files/patch-setup2+source+service+interface.cxx
deleted file mode 100644
index 8e478e17971d..000000000000
--- a/editors/openoffice.org-3-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-3-devel/files/patch-shell+source+cmdmail+makefile.mk b/editors/openoffice.org-3-devel/files/patch-shell+source+cmdmail+makefile.mk
deleted file mode 100644
index 0476285c802e..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-shell+source+cmdmail+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-3-devel/files/patch-shell+source+proxysettings+makefile.mk b/editors/openoffice.org-3-devel/files/patch-shell+source+proxysettings+makefile.mk
deleted file mode 100644
index e83cf7c9d7a1..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-shell+source+proxysettings+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-3-devel/files/patch-shell+source+unix+exec+makefile.mk b/editors/openoffice.org-3-devel/files/patch-shell+source+unix+exec+makefile.mk
deleted file mode 100644
index 0b7712ee35f8..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-shell+source+unix+exec+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-3-devel/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-3-devel/files/patch-solenv+bin+addsym.awk
deleted file mode 100644
index 996e282b350b..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-solenv+bin+addsym.awk
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
-+++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
-@@ -72,11 +72,11 @@
- END {
-     if (state == 0) {
-         print "# Weak RTTI symbols for C++ exceptions:"
--        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
-+        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
-     }
- }
- state == 2 {
--    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
-+    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
-     state = 3
- }
- /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice.org-3-devel/files/patch-solenv+bin+mapgen.pl b/editors/openoffice.org-3-devel/files/patch-solenv+bin+mapgen.pl
deleted file mode 100644
index 71ebdb934120..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-solenv+bin+mapgen.pl
+++ /dev/null
@@ -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, $_);
- 	};
diff --git a/editors/openoffice.org-3-devel/files/patch-solenv+inc+startup+FREEBSD+macros.mk b/editors/openoffice.org-3-devel/files/patch-solenv+inc+startup+FREEBSD+macros.mk
deleted file mode 100644
index 0c1b107de988..000000000000
--- a/editors/openoffice.org-3-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-3-devel/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-3-devel/files/patch-solenv+inc+tg_ext.mk
deleted file mode 100644
index 701692c9425a..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-solenv+inc+tg_ext.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-devel/files/patch-solenv+inc+tg_moz.mk b/editors/openoffice.org-3-devel/files/patch-solenv+inc+tg_moz.mk
deleted file mode 100644
index 255a41f92281..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-solenv+inc+tg_moz.mk
+++ /dev/null
@@ -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) $@
diff --git a/editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index b4764485aa86..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,202 +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
-+# 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*=$(CC)
-+
-+# default linker flags
-+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -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
diff --git a/editors/openoffice.org-3-devel/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice.org-3-devel/files/patch-soltools+checkdll+makefile.mk
deleted file mode 100644
index e6407402258a..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-soltools+checkdll+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-devel/files/patch-soltools+mkdepend+main.c b/editors/openoffice.org-3-devel/files/patch-soltools+mkdepend+main.c
deleted file mode 100644
index cffd5cbb1f43..000000000000
--- a/editors/openoffice.org-3-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-3-devel/files/patch-stlport+makefile.mk b/editors/openoffice.org-3-devel/files/patch-stlport+makefile.mk
deleted file mode 100644
index 797817ba85be..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-stlport+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-devel/files/patch-stoc+source+corereflection+makefile.mk b/editors/openoffice.org-3-devel/files/patch-stoc+source+corereflection+makefile.mk
deleted file mode 100644
index 4b319b08d401..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-stoc+source+corereflection+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-3-devel/files/patch-stoc+source+defaultregistry+makefile.mk b/editors/openoffice.org-3-devel/files/patch-stoc+source+defaultregistry+makefile.mk
deleted file mode 100644
index 4cae0476415a..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-stoc+source+defaultregistry+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-3-devel/files/patch-stoc+source+implementationregistration+implreg.cxx b/editors/openoffice.org-3-devel/files/patch-stoc+source+implementationregistration+implreg.cxx
deleted file mode 100644
index 341d621d872c..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-stoc+source+implementationregistration+implreg.cxx
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-devel/files/patch-stoc+source+implementationregistration+makefile.mk b/editors/openoffice.org-3-devel/files/patch-stoc+source+implementationregistration+makefile.mk
deleted file mode 100644
index 0051043b7ecb..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-stoc+source+implementationregistration+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-3-devel/files/patch-stoc+source+inspect+makefile.mk b/editors/openoffice.org-3-devel/files/patch-stoc+source+inspect+makefile.mk
deleted file mode 100644
index c7cd85253c11..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-stoc+source+inspect+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-3-devel/files/patch-stoc+source+invocation+makefile.mk b/editors/openoffice.org-3-devel/files/patch-stoc+source+invocation+makefile.mk
deleted file mode 100644
index 9ac2072a5612..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-stoc+source+invocation+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-3-devel/files/patch-stoc+source+invocation_adapterfactory+makefile.mk b/editors/openoffice.org-3-devel/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
deleted file mode 100644
index 8853ad39a90e..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-3-devel/files/patch-stoc+source+javaloader+makefile.mk b/editors/openoffice.org-3-devel/files/patch-stoc+source+javaloader+makefile.mk
deleted file mode 100644
index cea499f15c57..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-stoc+source+javaloader+makefile.mk
+++ /dev/null
@@ -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=		
diff --git a/editors/openoffice.org-3-devel/files/patch-stoc+source+javavm+makefile.mk b/editors/openoffice.org-3-devel/files/patch-stoc+source+javavm+makefile.mk
deleted file mode 100644
index b895a2b968d4..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-stoc+source+javavm+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice.org-3-devel/files/patch-stoc+source+loader+makefile.mk b/editors/openoffice.org-3-devel/files/patch-stoc+source+loader+makefile.mk
deleted file mode 100644
index 5a08ee5937b6..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-stoc+source+loader+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-3-devel/files/patch-stoc+source+namingservice+makefile.mk b/editors/openoffice.org-3-devel/files/patch-stoc+source+namingservice+makefile.mk
deleted file mode 100644
index e573081bc21d..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-stoc+source+namingservice+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-3-devel/files/patch-stoc+source+proxy_factory+makefile.mk b/editors/openoffice.org-3-devel/files/patch-stoc+source+proxy_factory+makefile.mk
deleted file mode 100644
index 9110b2f50cd1..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-stoc+source+proxy_factory+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-3-devel/files/patch-stoc+source+registry_tdprovider+makefile.mk b/editors/openoffice.org-3-devel/files/patch-stoc+source+registry_tdprovider+makefile.mk
deleted file mode 100644
index 9d974d1c0d10..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-stoc+source+registry_tdprovider+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-devel/files/patch-stoc+source+servicemanager+makefile.mk b/editors/openoffice.org-3-devel/files/patch-stoc+source+servicemanager+makefile.mk
deleted file mode 100644
index 746776d54759..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-stoc+source+servicemanager+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-3-devel/files/patch-stoc+source+tdmanager+makefile.mk b/editors/openoffice.org-3-devel/files/patch-stoc+source+tdmanager+makefile.mk
deleted file mode 100644
index 76403fdde841..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-stoc+source+tdmanager+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-3-devel/files/patch-stoc+source+typeconv+makefile.mk b/editors/openoffice.org-3-devel/files/patch-stoc+source+typeconv+makefile.mk
deleted file mode 100644
index dc647f89a166..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-stoc+source+typeconv+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3-devel/files/patch-store+util+makefile.mk b/editors/openoffice.org-3-devel/files/patch-store+util+makefile.mk
deleted file mode 100644
index 6bef6e960f2e..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-store+util+makefile.mk
+++ /dev/null
@@ -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
- 
- 
diff --git a/editors/openoffice.org-3-devel/files/patch-svx+source+fmcomp+makefile.mk b/editors/openoffice.org-3-devel/files/patch-svx+source+fmcomp+makefile.mk
deleted file mode 100644
index b16030080c0d..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-svx+source+fmcomp+makefile.mk
+++ /dev/null
@@ -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= \
diff --git a/editors/openoffice.org-3-devel/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice.org-3-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
deleted file mode 100644
index 3d7c2e22aa63..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
-+++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
-@@ -84,7 +84,9 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- APP1LIBS=
-+.IF "$(OS)"!="FREEBSD"
- APP1STDLIBS=-ldl
-+.ENDIF
- 
- GNOMEFILES= \
- 	locales.tab
diff --git a/editors/openoffice.org-3-devel/files/patch-tools+source+string+tstring.cxx b/editors/openoffice.org-3-devel/files/patch-tools+source+string+tstring.cxx
deleted file mode 100644
index 12bd6bd0b244..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-tools+source+string+tstring.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../tools/source/string/tstring.cxx.orig	Sat Aug 10 12:53:42 2002
-+++ ../tools/source/string/tstring.cxx	Sat Aug 10 12:54:16 2002
-@@ -103,6 +103,9 @@
- xub_StrLen ImplStringLen( const sal_Char* pStr )
- {
- 	const sal_Char* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
-@@ -113,6 +116,9 @@
- xub_StrLen ImplStringLen( const sal_Unicode* pStr )
- {
- 	const sal_Unicode* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
diff --git a/editors/openoffice.org-3-devel/files/patch-unoil+makefile.pmk b/editors/openoffice.org-3-devel/files/patch-unoil+makefile.pmk
deleted file mode 100644
index 7febdabf7b4b..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-unoil+makefile.pmk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../unoil/makefile.pmk.orig	Fri Aug 31 18:04:43 2001
-+++ ../unoil/makefile.pmk	Thu Sep 12 12:17:50 2002
-@@ -74,8 +74,8 @@
- JAVAFILESLIST	:= $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java)
- .ENDIF          # "$(L10N_framework)"==""
- 
--GENJAVAFILES	:= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
--GENCLASSFILES	:= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
-+GENJAVAFILES	+= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
-+GENCLASSFILES	+= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
- 
- # --- Targets ------------------------------------------------------
- 
diff --git a/editors/openoffice.org-3-devel/files/patch-unzip+source+file_io.c b/editors/openoffice.org-3-devel/files/patch-unzip+source+file_io.c
deleted file mode 100644
index 2f85a108c185..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-unzip+source+file_io.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../unzip/source/file_io.c.orig	Sat Oct 19 11:58:45 2002
-+++ ../unzip/source/file_io.c	Sat Oct 19 12:03:40 2002
-@@ -500,7 +500,7 @@
- #ifdef MPW
- 				pCallBack( 0 );
- #else
--				#if defined LINUX || defined MACOSX || defined NETBSD
-+				#if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD
- 				pCallBack( lseek(outfd, 0, SEEK_CUR) );
- 				#else
- 				pCallBack( tell( outfd ) );
-@@ -865,7 +865,9 @@
- 	static struct timeb tbp;
- #endif /* !__386BSD__ */
- #else /* !BSD */
-+#if (!defined(NETBSD) && !defined(FREEBSD))
- 	extern long timezone;
-+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
- #endif /* ?BSD */
- #endif /* ?AMIGA */
- 
diff --git a/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
deleted file mode 100644
index 41defbd5eb59..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
-+++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
-@@ -65,6 +65,8 @@
- #include <glyphcache.hxx>
- 
- #define Region XLIB_Region
-+typedef unsigned long CARD32;
-+#define Cursor CARD32
- #include <X11/extensions/Xrender.h>
- #undef Region
- 
diff --git a/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
deleted file mode 100644
index fefc925db41f..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
-@@ -78,6 +78,12 @@
- GETSTYLE_GNOME=getstyle-gnome-linux-intel
- HASGNOME2=TRUE
- .ENDIF
-+.IF "$_(HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
-+.ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
- HASGNOME2=TRUE
diff --git a/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
deleted file mode 100644
index 984313fc540a..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
-@@ -75,9 +75,15 @@
- 
- HASGNOME2=
- 
--.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
-+.IF "$(OS)$(CPU)"=="LINUXI"
- MSGBOX_GNOME=msgbox-gnome-linux-intel
- HASGNOME2=TRUE
-+.ENDIF
-+.IF "$(_HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+MSGBOX_GNOME=msgbox-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
- .ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice.org-3-devel/files/patch-vcl+workben+officeacceptthread.cxx b/editors/openoffice.org-3-devel/files/patch-vcl+workben+officeacceptthread.cxx
deleted file mode 100644
index 07d9f1060557..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-vcl+workben+officeacceptthread.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/workben/officeacceptthread.cxx.orig	Wed Mar  5 20:25:36 2003
-+++ ../vcl/workben/officeacceptthread.cxx	Wed Mar  5 20:26:03 2003
-@@ -125,7 +125,7 @@
- #if defined (SOLARIS)
- 				int status;
- 				nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG);
--#elif defined(LINUX)
-+#elif defined(LINUX) || defined (FREEBSD)
- 				nRet = kill(aProcessInfo.Ident, 0);
- #endif
- #if defined (UNX)
diff --git a/editors/openoffice.org-3-devel/files/zipmoz.sh b/editors/openoffice.org-3-devel/files/zipmoz.sh
deleted file mode 100644
index 43a4591f3430..000000000000
--- a/editors/openoffice.org-3-devel/files/zipmoz.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/sh -f
-
-RUNTIME_FILES=" components/libabsyncsvc.so components/libaddrbook.so \
-		components/libmork.so components/libmozldap.so \
-		components/libnecko.so components/libprofile.so \
-		components/librdf.so components/libstrres.so \
-		components/libunicharutil.so components/libuconv.so \
-		components/libucvcn.so components/libucvibm.so \
-		components/libucvja.so components/libucvko.so \
-		components/libucvlatin.so components/libucvtw.so \
-		components/libucvtw2.so components/liburiloader.so \
-		components/libvcard.so components/libxpconnect.so \
-		components/libpref.so components/libchrome.so libmozjs.so \
-		libmsgbaseutil.so libldap50.so libnspr4.so libplc4.so \
-		libplds4.so libxpcom.so libmozz.so component.reg \
-		components/necko_dns.xpt components/xpcom_xpti.xpt \
-		components/xpcom_threads.xpt components/xpcom_io.xpt \
-		components/xpcom_ds.xpt components/xpcom_components.xpt \
-		components/xpcom_base.xpt components/xpti.dat \
-		defaults/pref/all.js defaults/pref/config.js \
-		defaults/pref/editor.js defaults/pref/initpref.js \
-		defaults/pref/inspector.js defaults/pref/mailnews.js \
-		defaults/pref/security-prefs.js defaults/pref/unix.js \
-		defaults/pref/xpinstall.js"
-
-LIB_FILES="	lib/libembed_base_s.a lib/libmozreg_s.a \
-		lib/libnspr4.so lib/libxpcom.so lib/libprldap50.so"
-
-INC_FILES="include/"
-INC_FILES2="public/"
-
-if [ $# -lt 2 -o $# -gt 3 ] ; then
-	echo 
-	echo usage: $0 mozilla_dist target [target_dir]
-	echo
-	echo where:
-	echo
-	echo "mozilla_dist points to the mozilla distribution"
-	echo "target concatenates  OS, compiler and CPU (e.g. FREEBSDGCCI etc)"
-	echo "target_dir is the directory to place the zips"
-	exit 1
-fi
-
-MOZ_DIST=$1
-TARGET=$2
-if [ "w$3" != "w" ]; then
-	TARGET_DIR=$3
-else
-	if [ "w$TARGET_DIR" == "w" ]; then
-		TARGET_DIR=
-	fi
-fi
-
-ZIP_TARGET=$TARGET_DIR
-if [ -z "$ZIP_TARGET" ] ; then
-	ZIP_TARGET=../
-fi
-
-# just to remember the current working directory
-STARTING_DIR=`pwd`
-
-echo
-echo --- creating zips for $TARGET, using mozilla distribution in $MOZ_DIST
-
-# Create the directories
-[ ! -d $TARGET_DIR/$TARGET/runtime ] && mkdir -p $TARGET_DIR/$TARGET/runtime
-[ ! -d $TARGET_DIR/$TARGET/runtime/components ] && mkdir -p $TARGET_DIR/$TARGET/runtime/components
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults/pref ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults/pref
-[ ! -d $TARGET_DIR/$TARGET/lib ] && mkdir -p $TARGET_DIR/$TARGET/lib
-[ ! -d $TARGET_DIR/$TARGET/inc ] && mkdir -p $TARGET_DIR/$TARGET/inc
-[ ! -d $TARGET_DIR/$TARGET/inc/nspr ] && mkdir -p $TARGET_DIR/$TARGET/inc/nspr
-[ ! -d $TARGET_DIR/$TARGET/inc/obsolete ] && mkdir -p $TARGET_DIR/$TARGET/inc/obsolete
-
-# Copy the files
-echo
-echo --- copying files
-echo
-
-for i in $RUNTIME_FILES; do
-	if [ ! -f $MOZ_DIST/bin/$i ]; then
-		echo $MOZ_DIST/bin/$i does not exist, check your distribution
-	else
-		if [ `echo $i | grep component` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/components/
-		elif [ `echo $i | grep defaults` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/defaults/pref/
-		else
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/
-		fi
-	fi
-done
-
-for i in $LIB_FILES; do
-	if [ ! -f $MOZ_DIST/$i ]; then
-		echo $MOZ_DIST/$i does not exist, check your distribution
-	else
-		cp -R -L $MOZ_DIST/$i $TARGET_DIR/$TARGET/lib/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES`; do
-	if [ ! -d $i ]; then 
-		cp -R -L $MOZ_DIST/include/$i $TARGET_DIR/$TARGET/inc/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES2`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/public/$i $TARGET_DIR/$TARGET/inc
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/$i $TARGET_DIR/$TARGET/inc/nspr
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr/obsolete`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/obsolete/$i $TARGET_DIR/$TARGET/inc/obsolete
-	fi
-done
-
-# delete old zips
-
-[ -f $TARGET_DIR/$TARGET/runtime.zip ] && rm -f $TARGET_DIR/$TARGET/runtime.zip
-[ -f $TARGET_DIR/$TARGET/lib.zip ] && rm -f $TARGET_DIR/$TARGET/lib.zip
-[ -f $TARGET_DIR/$TARGET/inc.zip ] && rm -f $TARGET_DIR/$TARGET/inc.zip
-
-# zip the runtime files
-
-echo
-echo --- creating ${TARGET}runtime.zip
-echo
-
-cd $TARGET_DIR/$TARGET/runtime
-find . -type f | zip $ZIP_TARGET/${TARGET}runtime.zip -@
-
-# zip the lib files
-echo 
-echo --- creating ${TARGET}lib.zip
-echo 
-
-cd $TARGET_DIR/$TARGET/lib
-find . -type f | zip $ZIP_TARGET/${TARGET}lib.zip -@
-
-# zip the inc files
-echo
-echo --- creating ${TARGET}inc.zip
-echo
-
-cd $TARGET_DIR/$TARGET/inc
-find . -type f | zip $ZIP_TARGET/${TARGET}inc.zip -@
-
-# remove dirs
-cd $STARTING_DIR
-rm -rf $TARGET_DIR/$TARGET
-
-echo
-echo --- done
-echo
-
diff --git a/editors/openoffice.org-3-devel/pkg-descr b/editors/openoffice.org-3-devel/pkg-descr
deleted file mode 100644
index 31fd1b12161a..000000000000
--- a/editors/openoffice.org-3-devel/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-OpenOffice.org is an Open Source, community-developed, multi-platform office
-productivity suite. It includes the key desktop applications, such as a
-word processor, spreadsheet, presentation manager, and drawing program,
-with a user interface and feature set similar to other office suites.
-
-Components include:
-  * A universal word processing application for creating business
-    letters, extensive text documents, professional layouts, and HTML
-    documents.
-  * A sophisticated application for performing advanced spreadsheet
-    functions, such as analyzing figures, creating lists, and viewing data.
-  * A tool for creating effective eye-catching presentations.
-  * A vector-oriented draw module that enables the creation of 3D
-    illustrations
diff --git a/editors/openoffice.org-3-devel/pkg-message b/editors/openoffice.org-3-devel/pkg-message
deleted file mode 100644
index 1dc749f301c2..000000000000
--- a/editors/openoffice.org-3-devel/pkg-message
+++ /dev/null
@@ -1,73 +0,0 @@
-OpenOffice.org Build 643 Personal Install How-To
-
-Written by:	Martin Blapp <mbr@freebsd.org>
-
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
-
-1 User installation
--------------------
-
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
---------------
-
-There are some wrappers installed for fast startup.
-Add "${PREFIX}/bin/" to your PATH and you will be able
-to use them.
-
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
-
-If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
-version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
diff --git a/editors/openoffice.org-3-devel/pkg-plist b/editors/openoffice.org-3-devel/pkg-plist
deleted file mode 100644
index 28bd78453b52..000000000000
--- a/editors/openoffice.org-3-devel/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, do not delete. Package list is generated automatically.
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
deleted file mode 100644
index 6f740924c399..000000000000
--- a/editors/openoffice.org-3/Makefile
+++ /dev/null
@@ -1,580 +0,0 @@
-# New ports collection makefile for: OpenOffice
-# Date created:		28 Februar 2002
-# Whom:                 Martin Blapp
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openoffice
-PORTVERSION=	644
-CATEGORIES+=	editors
-MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
-		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
-		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
-		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ny1.mirror.openoffice.org/miscellaneous/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
-MASTER_SITE_SUBDIR=	${PORTVERSION}
-DISTFILES+=	oo_${PORTVERSION}_src.tar.bz2 \
-		gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
-
-BROKEN=		"Does not build"
-
-SORT?=	/usr/bin/sort
-FIND?=	/usr/bin/find
-CUT?=	/usr/bin/cut
-AWK?=	/usr/bin/awk
-GREP?=	/usr/bin/grep
-ZIP?=	${PREFIX}/bin/zip
-UNZIP?=	${PREFIX}/bin/unzip
-ANT?=	${LOCALBASE}/bin/ant
-TCSH?=	/bin/tcsh
-PASTE?=	/usr/bin/paste
-
-.include <bsd.port.pre.mk>
-
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
-DIST_SUBDIR=		openoffice
-DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
-
-#
-# configuration for language specific slave ports
-#
-.if !defined(LANG_EXT)
-LANG_EXT=01
-.else
-#
-# Add pkg-descr and pkg-message if available
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-#
-# LANG_CONFIGURE_ARG is missing for the german port
-#
-.if defined(LANG_EXT)
-CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG},ENUS
-.endif
-.endif
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
-
-EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-
-MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/jakarta-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-.if !defined(DISPLAY)
-BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
-.endif
-.if !defined(WITH_BSD_JDK)
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk14
-.else
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-.endif
-
-USE_PERL5=	yes
-USE_BZIP2=	yes
-USE_BISON=	yes
-USE_GMAKE=	yes
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
-.if !defined(WITH_BSD_JDK)
-JDKDIR?=	${LOCALBASE}/linux-sun-jdk1.4.1
-.else
-JDKDIR?=	${LOCALBASE}/jdk1.4.1
-.endif
-JAVAVM=         ${JDKDIR}/bin/java
-
-GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
-LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
-BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
-
-.if !defined(DISPLAY)
-DISPLAYHACK=localhost:1001
-.endif
-
-CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
-			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
-
-.if !defined(WITH_BSD_JDK)
-CONFIGURE_ARGS+=	--enable-linuxjdk=yes
-.endif
-
-.if defined(WITH_DEBUG)
-.if ${WITH_DEBUG} == 2
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-.endif
-
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"prefered language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
-	@${ECHO} "OPTIONS:"
-.if !defined(USE_GCC)
-	@${ECHO}
-	@${ECHO} "You can compile OO with different"
-	@${ECHO} "gcc compiler versions:"
-	@${ECHO}
-	@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.2"
-	@${ECHO} "to compile openoffice with your"
-	@${ECHO} "prefered compiler."
-.endif
-.if !defined(WITH_BSD_JDK)
-	@${ECHO}
-	@${ECHO} "If you like to use the native BSD"
-	@${ECHO} "JDK for the build system, you can use"
-	@${ECHO} "WITH_BSD_JDK=TRUE to disable the"
-	@${ECHO} "usage of the linux-JDK and linux dependency."
-	@${ECHO}
-.endif
-.if !defined(WITH_DEBUG)
-	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
-	@${ECHO} "if you call make with WITH_DEBUG=1"
-	@${ECHO}
-	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
-	@${ECHO}
-.endif
-.if !defined(WITH_TTF_BYTECODE_ENABLED)
-	@${ECHO}
-	@${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES"
-	@${ECHO} "if you like to use the Freetype library to"
-	@${ECHO} "render TTF fonts. Normally the TTF lib is"
-	@${ECHO} "not used to render fonts."
-	@${ECHO}
-	@${ECHO} "If you have licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479"
-	@${ECHO} "you can enable this option to get better"
-	@${ECHO} "quality of glyphs at small bitmap sizes."
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 450002
-	@${ECHO}
-	@${ECHO} "OS-VERSION ${OSVERSION} too low"
-	@${ECHO}
-	@${ECHO} "OO need some important libc_r and"
-	@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
-	@${ECHO} "RELEASE or 4.6 STABLE."
-	@${FALSE}
-.endif
-	@${ECHO}
-	@${ECHO} "NOTICE:"
-	@${ECHO}
-	@${ECHO} "To build Openoffice, you should have a lot"
-.if defined(WITH_DEBUG)
-	@${ECHO} "of free diskspace (~ 8GB)."
-.else
-	@${ECHO} "of free diskspace (~ 4GB)."
-.endif
-	@${ECHO}
-.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
-    (${OSVERSION} < 500000 && !defined(USE_GCC))
-	@${ECHO} "KERNEL CONFIGURATION:"
-	@${ECHO}
-	@${ECHO} "Openoffice needs a larger stack- and"
-	@${ECHO} "datasize to build. Check your limit"
-	@${ECHO} "settings and and put this in /boot/loader.conf"
-	@${ECHO} "if neccessary:"
-	@${ECHO}
-	@${ECHO} "kern.maxdsiz=\"1073741824\""
-	@${ECHO} "kern.maxssiz=\"268435456\""
-.endif
-	@${ECHO}
-.if ${OSVERSION} < 460002
-	@${ECHO} "REQUIRED SYSTEM PATCHES:"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO} "OO.org can crash if you enter a non existing path"
-	@${ECHO} "or URL in the location bar. To fix these crashes"
-	@${ECHO} "you need a uncommitted system patch for rtld:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460001
-	@${ECHO}
-	@${ECHO} "OO setup is broken on STABLE < 4.6"
-	@${ECHO} "including 4.6 RELEASE."
-	@${ECHO} "You'll need a system patch to solve"
-	@${ECHO} "this problem:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460002
-	@${ECHO}
-	@${ECHO} "OO.org soffice binary can deadlock. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO}
-	@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
-	@${ECHO}
-.endif
-.if !exists(/usr/include/langinfo.h)
-	@${ECHO}
-	@${ECHO} "langinfo.h is missing !"
-	@${ECHO}
-	@${ECHO} "Please upgrade to 4.6 RELEASE or"
-	@${ECHO} "4.6 STABLE."
-	@${ECHO}
-	@${FALSE}
-.endif
-
-post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
-	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
-	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@-${RM} -f ${WRKSRC}/../moz/zipped/*.zip
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
-.if defined(L10NHELP)
-	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
-	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
-.endif
-
-post-patch:
-	@${MAKE} patch-mozilla
-.if defined(WITH_TTF_BYTECODE_ENABLED)
-	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
-		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-			${ECHO_MSG} "===>   Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \
-		fi; \
-		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
-	fi
-.endif
-.if defined(WITH_DEBUG)
-	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
-		PATCHES_APPLIED="" ; \
-		for i in ${PATCHDIR}/debugpatch-*; do \
-			case $$i in \
-				*.orig|*.rej|*~) \
-					${ECHO_MSG} "===>   Ignoring patchfile $$i" ; \
-					;; \
-				*) \
-					if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-						${ECHO_MSG} "===>   Applying ${OPSYS} patch $$i" ; \
-					fi; \
-					if ${PATCH} ${PATCH_ARGS} < $$i ; then \
-						PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
-					else \
-						${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
-						if [ x"$$PATCHES_APPLIED" != x"" ]; then \
-							${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
-						fi; \
-						${FALSE} ; \
-					fi; \
-					;; \
-			esac; \
-		done; \
-	fi;
-.endif
-	@${ECHO_MSG} "===>  Find old malloc.h defines and fix them in ${PKGNAME} source"
-	@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
-		${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
-
-extract-mozilla:
-.if ! exists(${WRKDIR}/mozilla/Makefile)
-	@${ECHO_MSG} "===>  Extracting mozilla sub project"
-	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
-.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment)
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
-.endif
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
-.endif
-	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
-
-patch-mozilla:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
-		${WRKDIR}/mozilla/files/
-	@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
-
-build-mozilla:
-.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
-	@${ECHO_MSG} "===>  Building mozilla sub project"
-.if defined(WITH_DEBUG)
-	@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
-	@${SED} -e 's|--disable-debug||' \
-		-e 's|--disable-cpp-rtti||' \
-		-e 's|--enable-strip||' \
-		< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
-.endif
-.if defined(USE_GCC)
-	@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
-.else
-	@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
-.endif
-	@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
-	@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
-	@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
-.endif
-
-install-mozilla:
-	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
-
-register-mozilla:
-.if exists(${WRKDIR}/mozilla-runtime)
-	@${RM} -rf ${WRKDIR}/mozilla-runtime
-.endif
-	@${MKDIR} ${WRKDIR}/mozilla-runtime
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
-	@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
-	@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
-	@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
-		&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom 
-	@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
-		${WRKDIR}/mozilla-runtime/components/xptitemp.dat
-	@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
-	@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
-		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
-
-mozilla:
-	@${MAKE} extract-mozilla
-	@${MAKE} patch-mozilla
-	@${MAKE} build-mozilla
-	@${MAKE} register-mozilla
-	@${MAKE} install-mozilla
-
-do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
-	@${MAKE} mozilla
-.endif
-.endif
-.endif
-.if exists(${WRKDIR}/.Xvfb.pid)
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.endif
-.if !defined(DISPLAY)
-	#
-	# This is a UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-.endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
-	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-.endif
-.if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
-.endif
-
-pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-
-do-install:
-.if !defined(DISPLAY)
-	#
-	# UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-.endif
-
-install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
-
-post-install:
-	@${ECHO_MSG} "===>  Add wrapper scripts";
-	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
-	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
-
-package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
-.if defined(LANG_SUFFIX)
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
-.else
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
-.endif
-
-update:
-	@${MAKE} fetch
-	@${MAKE} extract
-	@cd ${WRKSRC}/.. && for dir in *; do \
-	    if [ -d $$dir ]; then \
-		cd $$dir; cvs update -d; cd ..; \
-	    fi \
-	done
-
-.include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
deleted file mode 100644
index ec9d6788f104..000000000000
--- a/editors/openoffice.org-3/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
-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
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
diff --git a/editors/openoffice.org-3/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-3/files/debugpatch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 96c651ce22c8..000000000000
--- a/editors/openoffice.org-3/files/debugpatch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../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
-@@ -902,6 +902,7 @@
- 
- void KillSetupDir()
- {
-+#if 0
-     DIR* pDir = opendir( strTmpPath );
-     struct dirent* pFile;
- 
-@@ -915,6 +916,10 @@
- 
-     chdir( strInitPath );
-     rmdir( strTmpPath );
-+#else
-+	fprintf(stderr, "\nLeaving behind temporary directory: %s\n",
-+	strTmpPath);
-+#endif
- }
- 
- void makeSymLink( char* s )
diff --git a/editors/openoffice.org-3/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3/files/debugpatch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 52bd2b3d58d6..000000000000
--- a/editors/openoffice.org-3/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
-+++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
- 
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- 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
- 
- # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
diff --git a/editors/openoffice.org-3/files/oo_setup.resp b/editors/openoffice.org-3/files/oo_setup.resp
deleted file mode 100644
index 8eeeb11bd95e..000000000000
--- a/editors/openoffice.org-3/files/oo_setup.resp
+++ /dev/null
@@ -1,7 +0,0 @@
-[Environment]
-InstallationMode = INSTALL_NETWORK
-InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org-643
-
-[Java]
-JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-3/files/openoffice-wrapper b/editors/openoffice.org-3/files/openoffice-wrapper
deleted file mode 100644
index fc640b16e686..000000000000
--- a/editors/openoffice.org-3/files/openoffice-wrapper
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3/files/Attic/openoffice-wrapper,v 1.3 2003-03-05 23:24:05 mbr Exp $
-
-oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/
-program=`echo $0 | sed -e 's|.*-||'`
-
-if [ ! $LANG ]; then
-	export LANG=%%LANG%%
-fi
-
-case $program in
-$0)
-	exec $oopath/soffice "$@"
-	;;
-	*)
-	exec $oopath/$program "$@"
-	;;
-esac
diff --git a/editors/openoffice.org-3/files/optpatch-freetype+patch b/editors/openoffice.org-3/files/optpatch-freetype+patch
deleted file mode 100644
index b426a8fb7fcc..000000000000
--- a/editors/openoffice.org-3/files/optpatch-freetype+patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Index: files/patch-freetype::patch
-===================================================================
-RCS file: files/patch-freetype::patch
-diff -N files/patch-freetype::patch
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-freetype::patch	4 Aug 2002 15:27:42 -0000
-@@ -0,0 +1,201 @@
-+diff -ur ../freetype/freetype-2.0.5.patch oo641d_patched/freetype/freetype-2.0.5.patch
-+--- ../freetype/freetype-2.0.5.patch	Fri Apr  5 21:07:34 2002
-++++ ../freetype/freetype-2.0.5.patch	Sat Mar  9 18:04:17 2002
-+@@ -1,118 +1,79 @@
-+-*** misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 14 00:44:33 2000
-+---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 63,69 ****
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+---- 63,69 ----
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+-*** misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Jun  7 19:36:17 2001
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 631,637 ****
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+---- 631,637 ----
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile -DPIC $pic_flag"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Mon Jan  1 18:25:21 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 1,7 ****
-+---- 1,9 ----
-+-  FT_USE_MODULE(autohint_module_class)
-+-  FT_USE_MODULE(cff_driver_class)
-+-  FT_USE_MODULE(t1cid_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(pcf_driver_class)
-+-+ */
-+-  FT_USE_MODULE(psaux_module_class)
-+-  FT_USE_MODULE(psnames_module_class)
-+-  FT_USE_MODULE(ft_raster1_renderer_class)
-+-***************
-+-*** 9,12 ****
-+---- 11,16 ----
-+-  FT_USE_MODULE(ft_smooth_renderer_class)
-+-  FT_USE_MODULE(tt_driver_class)
-+-  FT_USE_MODULE(t1_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(winfnt_driver_class)
-+-+ */
-+-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h	Tue Aug 21 10:50:45 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 70,76 ****
-+---- 70,79 ----
-+-    /*   All convenience functions are declared as such in their             */
-+-    /*   documentation.                                                      */
-+-    /*                                                                       */
-+-+ /*
-+-  #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-+ */
-+-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-  
-+-  
-+-    /*************************************************************************/
-+-***************
-+-*** 108,116 ****
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-- 
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+---- 111,121 ----
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-+ /*
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-+ */
-+-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig	Mon Jan  7 14:21:35 2002
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Mon Jan  7 14:21:40 2002
-+-***************
-+-*** 2251,2257 ****
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age + 1`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-+---- 2251,2257 ----
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk
-++--- misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:49:17 2001
-++@@ -63,7 +63,7 @@
-++ #   ANSI compliance.
-++ #
-++ ifndef CFLAGS
-++-  CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+++  CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-++ endif
-++ 
-++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh
-++--- misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:47:56 2001
-+++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:49:17 2001
-++@@ -631,7 +631,7 @@
-++     if test "$build_old_libs" = yes; then
-++       if test "$pic_mode" != yes; then
-++ 	# Don't build PIC code
-++-	command="$base_compile $srcfile"
-+++	command="$base_compile $srcfile -DPIC $pic_flag"
-++       else
-++ 	# All platforms use -DPIC, to notify preprocessed assembler code.
-++ 	command="$base_compile $srcfile $pic_flag -DPIC"
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:49:17 2001
-++@@ -1,7 +1,9 @@
-++ FT_USE_MODULE(autohint_module_class)
-++ FT_USE_MODULE(cff_driver_class)
-++ FT_USE_MODULE(t1cid_driver_class)
-+++/*
-++ FT_USE_MODULE(pcf_driver_class)
-+++*/
-++ FT_USE_MODULE(psaux_module_class)
-++ FT_USE_MODULE(psnames_module_class)
-++ FT_USE_MODULE(ft_raster1_renderer_class)
-++@@ -9,4 +11,6 @@
-++ FT_USE_MODULE(ft_smooth_renderer_class)
-++ FT_USE_MODULE(tt_driver_class)
-++ FT_USE_MODULE(t1_driver_class)
-+++/*
-++ FT_USE_MODULE(winfnt_driver_class)
-+++*/
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:51:15 2001
-++@@ -70,7 +70,10 @@
-++   /*   All convenience functions are declared as such in their             */
-++   /*   documentation.                                                      */
-++   /*                                                                       */
-+++/*
-++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+++*/
-+++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-++ 
-++ 
-++   /*************************************************************************/
-++@@ -108,8 +111,10 @@
-++   /*   use a vector `plotter' format that isn't supported when this        */
-++   /*   macro is undefined.                                                 */
-++   /*                                                                       */
-+++/*
-++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++-
-+++*/
-+++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++ 
-++   /*************************************************************************/
-++   /*                                                                       */
-++@@ -338,7 +343,7 @@
-++   /* By undefining this, you will only compile the code necessary to load  */
-++   /* TrueType glyphs without hinting.                                      */
-++   /*                                                                       */
-++-#undef  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-+++#define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-++ 
-++ 
-++   /*************************************************************************/
diff --git a/editors/openoffice.org-3/files/optpatch-vcl+util+makefile.pmk b/editors/openoffice.org-3/files/optpatch-vcl+util+makefile.pmk
deleted file mode 100644
index 41341ff0b4e8..000000000000
--- a/editors/openoffice.org-3/files/optpatch-vcl+util+makefile.pmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/util/makefile.pmk.orig	Mon Aug  5 01:39:41 2002
-+++ ../vcl/util/makefile.pmk	Mon Aug  5 01:40:03 2002
-@@ -64,7 +64,7 @@
- PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch
- PDBTARGET=vcl
- 
--.IF "$(OS)" != "MACOSX"
-+.IF "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- .IF "$(remote)" != ""
- USE_BUILTIN_RASTERIZER=true
- .ENDIF
diff --git a/editors/openoffice.org-3/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-3/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 078685f3b516..000000000000
--- a/editors/openoffice.org-3/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../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 freebsd genunix";;
-  	*)		JINCSUBDIRS="genunix";;
-  	esac
-  
diff --git a/editors/openoffice.org-3/files/patch-bridges+prj+build.lst b/editors/openoffice.org-3/files/patch-bridges+prj+build.lst
deleted file mode 100644
index fee3d847c5e6..000000000000
--- a/editors/openoffice.org-3/files/patch-bridges+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
deleted file mode 100644
index 99b8c566fb61..000000000000
--- a/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ /dev/null
@@ -1,102 +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 );
-+    }
- }
- 
- }
diff --git a/editors/openoffice.org-3/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice.org-3/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
deleted file mode 100644
index 4622b7fe21c4..000000000000
--- a/editors/openoffice.org-3/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-3/files/patch-comphelper+util+makefile.mk b/editors/openoffice.org-3/files/patch-comphelper+util+makefile.mk
deleted file mode 100644
index f2d3092c2ddf..000000000000
--- a/editors/openoffice.org-3/files/patch-comphelper+util+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-3/files/patch-config_office+configure.in b/editors/openoffice.org-3/files/patch-config_office+configure.in
deleted file mode 100644
index a45332fcbec0..000000000000
--- a/editors/openoffice.org-3/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,66 +0,0 @@
---- configure.in.orig	Thu Feb 20 15:49:32 2003
-+++ configure.in	Wed Mar  5 21:22:34 2003
-@@ -95,6 +95,12 @@
-                           
-                           Usage: --enable-macos9
- ],,)
-+AC_ARG_ENABLE(linuxjdk,
-+[  --enable-linuxjdk         Use this option option if you like to use
-+                          the linux-jdk instead of the native jdk.
-+
-+                          Usage: --enable-linuxjdk
-+],,)
- AC_ARG_WITH(lang,
- [  --with-lang             Use this option to build OpenOffice.org with
-                           additional language support. US English is always
-@@ -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
-@@ -1232,7 +1249,11 @@
- if test -n "$enable_debug"; then
-    ENABLE_DEBUG="TRUE"
- else
--   ENABLE_DEBUG="FALSE"
-+fi
-+if test -n "$enable_linuxjdk"; then
-+   USE_LINUXJDK="TRUE"
-+else
-+   USE_LINUXJDK="FALSE"
- fi
- 
- dnl ===================================================================
-@@ -1278,6 +1299,7 @@
- AC_SUBST(PTHREAD_CFLAGS)
- AC_SUBST(PTHREAD_LIBS)
- AC_SUBST(ENABLE_DEBUG)
-+AC_SUBST(USE_LINUXJDK)
- 
- AC_OUTPUT([set_soenv])
- 
diff --git a/editors/openoffice.org-3/files/patch-config_office+set_soenv.in b/editors/openoffice.org-3/files/patch-config_office+set_soenv.in
deleted file mode 100644
index 9ea6b11bdab2..000000000000
--- a/editors/openoffice.org-3/files/patch-config_office+set_soenv.in
+++ /dev/null
@@ -1,44 +0,0 @@
---- set_soenv.in.orig	Thu Feb 27 15:12:36 2003
-+++ set_soenv.in	Wed Mar  5 21:16:43 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, 
-@@ -88,7 +88,7 @@
-      $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
-      $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS,
-      $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
--     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG );
-+     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $USE_LINUXJDK );
- #
- #-------------------------------------------
- # IId. Declaring the aliases.
-@@ -140,7 +140,8 @@
- $CC			= '@CC@';           # C compiler
- $CXX		= '@CXX@';          # C++ compiler
- $EXCEPTIONS	= '@EXCEPTIONS@';   # Exception handling type
--$ENABLE_DEBUG	= '@ENABLE_DEBUG@';  # Enable a debug build
-+$ENABLE_DEBUG	= '@ENABLE_DEBUG@'; # Enable a debug build
-+$USE_LINUXJDK	= '@USE_LINUXJDK@'; # Use the Linux JDK
- $WRAPCMD	= "";				# Wrapper (only for winnt)
- 
- #
-@@ -1265,7 +1266,12 @@
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
- }
- elsif ($platform eq "$FreeBSD")
--{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+{
-+   if ($USE_LINUXJDK eq "TRUE") {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
-+   } else {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+   }
- }
- elsif ($platform eq "$NetBSD")
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
diff --git a/editors/openoffice.org-3/files/patch-connectivity+source+drivers+mozab+makefile.mk b/editors/openoffice.org-3/files/patch-connectivity+source+drivers+mozab+makefile.mk
deleted file mode 100644
index 2b83f2cd2ec7..000000000000
--- a/editors/openoffice.org-3/files/patch-connectivity+source+drivers+mozab+makefile.mk
+++ /dev/null
@@ -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)					\
diff --git a/editors/openoffice.org-3/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-3/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
deleted file mode 100644
index 3601766ee561..000000000000
--- a/editors/openoffice.org-3/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../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
-@@ -64,8 +64,8 @@
- #mozilla specific stuff.
- MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
- MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
--#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
--#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
-+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
-+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
- #End of mozilla specific stuff.
- 
- PRJ=..$/..$/..$/..
-@@ -107,7 +107,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -123,7 +123,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -141,7 +141,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS+=	    -DMOZILLA_CLIENT \
-             -DOSTYPE=\"Linux2.2.14-5\" -DOJI
- .IF "$(OS)" == "LINUX"
-@@ -157,6 +157,13 @@
-             -fno-rtti -Wall -Wconversion -Wpointer-arith \
-             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-             -Wno-long-long 
-+CDEFS     += -DTRACING
-+.ELIF "$(OS)" == "FREEBSD"
-+CFLAGS +=   -fPIC
-+CFLAGSCXX += \
-+            -fno-rtti -Wall -Wconversion -Wpointer-arith \
-+            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-+            -Wno-long-long -pthread 
- CDEFS     += -DTRACING
- .ENDIF
- .ENDIF
diff --git a/editors/openoffice.org-3/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk b/editors/openoffice.org-3/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
deleted file mode 100644
index b63d2a25f184..000000000000
--- a/editors/openoffice.org-3/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-3/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-3/files/patch-cppu+inc+uno+lbnames.h
deleted file mode 100644
index cb43c2d165e9..000000000000
--- a/editors/openoffice.org-3/files/patch-cppu+inc+uno+lbnames.h
+++ /dev/null
@@ -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."
diff --git a/editors/openoffice.org-3/files/patch-cppu+prj+build.lst b/editors/openoffice.org-3/files/patch-cppu+prj+build.lst
deleted file mode 100644
index 78fd210a1193..000000000000
--- a/editors/openoffice.org-3/files/patch-cppu+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-3/files/patch-cppuhelper+source+makefile.mk
deleted file mode 100644
index 5fb5bd636eb1..000000000000
--- a/editors/openoffice.org-3/files/patch-cppuhelper+source+makefile.mk
+++ /dev/null
@@ -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 ------------------------------------------------------
diff --git a/editors/openoffice.org-3/files/patch-desktop+source+pkgchk+pkgchk_misc.h b/editors/openoffice.org-3/files/patch-desktop+source+pkgchk+pkgchk_misc.h
deleted file mode 100644
index 391667b66ebd..000000000000
--- a/editors/openoffice.org-3/files/patch-desktop+source+pkgchk+pkgchk_misc.h
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3/files/patch-desktop+util+makefile.mk b/editors/openoffice.org-3/files/patch-desktop+util+makefile.mk
deleted file mode 100644
index 025d644a8077..000000000000
--- a/editors/openoffice.org-3/files/patch-desktop+util+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3/files/patch-dtrans+source+X11+makefile.mk b/editors/openoffice.org-3/files/patch-dtrans+source+X11+makefile.mk
deleted file mode 100644
index 5881f5d7f6a5..000000000000
--- a/editors/openoffice.org-3/files/patch-dtrans+source+X11+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice.org-3/files/patch-eventattacher+source+makefile.mk b/editors/openoffice.org-3/files/patch-eventattacher+source+makefile.mk
deleted file mode 100644
index 4552698eb132..000000000000
--- a/editors/openoffice.org-3/files/patch-eventattacher+source+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-3/files/patch-external+gcc3_specific+makefile.mk b/editors/openoffice.org-3/files/patch-external+gcc3_specific+makefile.mk
deleted file mode 100644
index 6b8071f4030e..000000000000
--- a/editors/openoffice.org-3/files/patch-external+gcc3_specific+makefile.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../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"
- 
- .IF "$(OS)"!="MACOSX"
-+.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 @@
-         -rm -f $@
-         +ln -s libgcc_s.so.1 $@
- 
-+.ENDIF 
- .ENDIF 
- 
- .ENDIF
diff --git a/editors/openoffice.org-3/files/patch-freetype+makefile.mk b/editors/openoffice.org-3/files/patch-freetype+makefile.mk
deleted file mode 100644
index 3e5a8dd19f18..000000000000
--- a/editors/openoffice.org-3/files/patch-freetype+makefile.mk
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-3/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-3/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice.org-3/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
- 
- /* 
diff --git a/editors/openoffice.org-3/files/patch-javaunohelper+source+makefile.mk b/editors/openoffice.org-3/files/patch-javaunohelper+source+makefile.mk
deleted file mode 100644
index 19f6b86e5ab5..000000000000
--- a/editors/openoffice.org-3/files/patch-javaunohelper+source+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice.org-3/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice.org-3/files/patch-jni_uno+jni_java2uno.cxx
deleted file mode 100644
index a9ff9e3fed88..000000000000
--- a/editors/openoffice.org-3/files/patch-jni_uno+jni_java2uno.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-3/files/patch-nas+nas-1.6.patch b/editors/openoffice.org-3/files/patch-nas+nas-1.6.patch
deleted file mode 100644
index b6096654ebaf..000000000000
--- a/editors/openoffice.org-3/files/patch-nas+nas-1.6.patch
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-3/files/patch-offapi+com+sun+star+setup+OSType.idl b/editors/openoffice.org-3/files/patch-offapi+com+sun+star+setup+OSType.idl
deleted file mode 100644
index 3fee562c6d38..000000000000
--- a/editors/openoffice.org-3/files/patch-offapi+com+sun+star+setup+OSType.idl
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3/files/patch-offapi+util+makefile.pmk b/editors/openoffice.org-3/files/patch-offapi+util+makefile.pmk
deleted file mode 100644
index 5cdbb1b4aa4a..000000000000
--- a/editors/openoffice.org-3/files/patch-offapi+util+makefile.pmk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3/files/patch-package+inc+HashMaps.hxx b/editors/openoffice.org-3/files/patch-package+inc+HashMaps.hxx
deleted file mode 100644
index 35052d291ef7..000000000000
--- a/editors/openoffice.org-3/files/patch-package+inc+HashMaps.hxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice.org-3/files/patch-package+inc+ZipPackageFolder.hxx b/editors/openoffice.org-3/files/patch-package+inc+ZipPackageFolder.hxx
deleted file mode 100644
index 014c61403380..000000000000
--- a/editors/openoffice.org-3/files/patch-package+inc+ZipPackageFolder.hxx
+++ /dev/null
@@ -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()
diff --git a/editors/openoffice.org-3/files/patch-package+source+zippackage+ContentInfo.hxx b/editors/openoffice.org-3/files/patch-package+source+zippackage+ContentInfo.hxx
deleted file mode 100644
index c4bf35e79f64..000000000000
--- a/editors/openoffice.org-3/files/patch-package+source+zippackage+ContentInfo.hxx
+++ /dev/null
@@ -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();
diff --git a/editors/openoffice.org-3/files/patch-package+source+zippackage+ZipPackageFolder.cxx b/editors/openoffice.org-3/files/patch-package+source+zippackage+ZipPackageFolder.cxx
deleted file mode 100644
index bb504c834eef..000000000000
--- a/editors/openoffice.org-3/files/patch-package+source+zippackage+ZipPackageFolder.cxx
+++ /dev/null
@@ -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 );
diff --git a/editors/openoffice.org-3/files/patch-registry+source+regkey.cxx b/editors/openoffice.org-3/files/patch-registry+source+regkey.cxx
deleted file mode 100644
index fad069f83f14..000000000000
--- a/editors/openoffice.org-3/files/patch-registry+source+regkey.cxx
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-3/files/patch-rsc+source+rscpp+cpp.h b/editors/openoffice.org-3/files/patch-rsc+source+rscpp+cpp.h
deleted file mode 100644
index 417ab33ba52f..000000000000
--- a/editors/openoffice.org-3/files/patch-rsc+source+rscpp+cpp.h
+++ /dev/null
@@ -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              */
- 
diff --git a/editors/openoffice.org-3/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-3/files/patch-sal+osl+unx+nlsupport.c
deleted file mode 100644
index 49fe0da8589b..000000000000
--- a/editors/openoffice.org-3/files/patch-sal+osl+unx+nlsupport.c
+++ /dev/null
@@ -1,160 +0,0 @@
---- ../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
-@@ -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)
- 
-@@ -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 @@
-     { "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-3/files/patch-sal+osl+unx+pipe.c b/editors/openoffice.org-3/files/patch-sal+osl+unx+pipe.c
deleted file mode 100644
index 4aa7b8af1a61..000000000000
--- a/editors/openoffice.org-3/files/patch-sal+osl+unx+pipe.c
+++ /dev/null
@@ -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 )
- 	{			
diff --git a/editors/openoffice.org-3/files/patch-sal+osl+unx+process.c b/editors/openoffice.org-3/files/patch-sal+osl+unx+process.c
deleted file mode 100644
index 50023576bec4..000000000000
--- a/editors/openoffice.org-3/files/patch-sal+osl+unx+process.c
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-3/files/patch-sal+osl+unx+security.c b/editors/openoffice.org-3/files/patch-sal+osl+unx+security.c
deleted file mode 100644
index 0cc321dcd544..000000000000
--- a/editors/openoffice.org-3/files/patch-sal+osl+unx+security.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../sal/osl/unx/security.c.orig	Sat Jul 20 22:53:31 2002
-+++ ../sal/osl/unx/security.c	Sat Jul 20 22:52:39 2002
-@@ -739,7 +739,7 @@
- 	}
- 
- 
--#elif (LINUX && (GLIBC >= 2))
-+#elif ((LINUX && (GLIBC >= 2)) || defined(FREEBSD))
- 	
- 	struct passwd	*pPasswd; 
- 	
diff --git a/editors/openoffice.org-3/files/patch-sal+osl+unx+socket.c b/editors/openoffice.org-3/files/patch-sal+osl+unx+socket.c
deleted file mode 100644
index 9541cac8583f..000000000000
--- a/editors/openoffice.org-3/files/patch-sal+osl+unx+socket.c
+++ /dev/null
@@ -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! */
diff --git a/editors/openoffice.org-3/files/patch-sal+osl+unx+system.c b/editors/openoffice.org-3/files/patch-sal+osl+unx+system.c
deleted file mode 100644
index 8dc663ac03fc..000000000000
--- a/editors/openoffice.org-3/files/patch-sal+osl+unx+system.c
+++ /dev/null
@@ -1,127 +0,0 @@
---- ../sal/osl/unx/system.c.orig	Sun Mar 17 12:34:13 2002
-+++ ../sal/osl/unx/system.c	Wed Apr  3 01:03:36 2002
-@@ -195,6 +195,73 @@
- }
- #endif
- 
-+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
-+           size_t buflen, struct passwd **result)
-+{
-+  struct passwd* res;
-+
-+  pthread_mutex_lock(&getrtl_mutex);
-+
-+  if ( res = getpwuid(uid) )
-+  {
-+    size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell;
-+
-+    pw_name = strlen(res->pw_name)+1;
-+    pw_passwd = strlen(res->pw_passwd)+1;
-+    pw_class = strlen(res->pw_class)+1;
-+    pw_gecos = strlen(res->pw_gecos)+1;
-+    pw_dir = strlen(res->pw_dir)+1;
-+    pw_shell = strlen(res->pw_shell)+1;
-+
-+    if (pw_name+pw_passwd+pw_class+pw_gecos
-+                                 +pw_dir+pw_shell < buflen)
-+    {
-+      memcpy(pwd, res, sizeof(struct passwd));
-+
-+      strncpy(buffer, res->pw_name, pw_name);
-+      pwd->pw_name = buffer;
-+      buffer += pw_name;
-+
-+      strncpy(buffer, res->pw_passwd, pw_passwd);
-+      pwd->pw_passwd = buffer;
-+      buffer += pw_passwd;
-+
-+      strncpy(buffer, res->pw_class, pw_class);
-+      pwd->pw_class = buffer;
-+      buffer += pw_class;
-+
-+      strncpy(buffer, res->pw_gecos, pw_gecos);
-+      pwd->pw_gecos = buffer;
-+      buffer += pw_gecos;
-+
-+      strncpy(buffer, res->pw_dir, pw_dir);
-+      pwd->pw_dir = buffer;
-+      buffer += pw_dir;
-+
-+      strncpy(buffer, res->pw_shell, pw_shell);
-+      pwd->pw_shell = buffer;
-+      buffer += pw_shell;
-+
-+      *result = pwd ;
-+      res = 0 ;
-+
-+    } else {
-+
-+      res = ENOMEM ;
-+
-+    }      
-+  
-+  } else {
-+
-+    res = errno ;
-+ 
-+  } 
-+
-+  pthread_mutex_unlock(&getrtl_mutex);
-+
-+  return res;
-+}
-+
- struct tm *localtime_r(const time_t *timep, struct tm *buffer)
- {
- 	struct tm* res;
-@@ -518,3 +585,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-3/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-3/files/patch-sal+osl+unx+system.h
deleted file mode 100644
index c4e255952fc7..000000000000
--- a/editors/openoffice.org-3/files/patch-sal+osl+unx+system.h
+++ /dev/null
@@ -1,35 +0,0 @@
---- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
-+++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
-@@ -205,6 +205,13 @@
- #   include <sys/ioctl.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 <machine/vmparam.h>
-+#   include <machine/pmap.h>
- #	include <sys/un.h>
- #   include <netinet/tcp.h>
- #	define 	IORESOURCE_TRANSFER_BSD 
-@@ -216,12 +223,13 @@
- #   elif BYTE_ORDER == PDP_ENDIAN
- #   	define _PDP_ENDIAN
- #   endif
--#   define  sched_yield() 				pthread_yield()
--#   define  pthread_testcancel()
- #	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
diff --git a/editors/openoffice.org-3/files/patch-sal+textenc+tencinfo.c b/editors/openoffice.org-3/files/patch-sal+textenc+tencinfo.c
deleted file mode 100644
index 7cf80c18d0a0..000000000000
--- a/editors/openoffice.org-3/files/patch-sal+textenc+tencinfo.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
-     /* 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 */
-+
-+    if (pMimeCharset == NULL)
-+	pMimeCharset = "usascii";
-+
-     static ImplStrCharsetDef const aVIPMimeCharsetTab[] =
-     {
-         { "usascii", RTL_TEXTENCODING_ASCII_US },
diff --git a/editors/openoffice.org-3/files/patch-sal+workben+makefile.mk b/editors/openoffice.org-3/files/patch-sal+workben+makefile.mk
deleted file mode 100644
index 369935e31d66..000000000000
--- a/editors/openoffice.org-3/files/patch-sal+workben+makefile.mk
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../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 @@
- 
- .IF "$(TESTAPP)" == "salstattest"
- 
--	CFLAGS+= /DUSE_SAL_STATIC
-+	CFLAGS+= -DUSE_SAL_STATIC
- 
- 	OBJFILES=	$(OBJ)$/salstattest.obj
- 
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- 
- CXXFILES=	tgetpwnam.cxx
- OBJFILES=	$(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN=	$(SLB)$/sal.lib
- 
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd | freebsd)
- .ENDIF # tgetpwname
- 
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-3/files/patch-salhelper+source+gcc2_freebsd_intel.map b/editors/openoffice.org-3/files/patch-salhelper+source+gcc2_freebsd_intel.map
deleted file mode 100644
index 1ffacf889bc6..000000000000
--- a/editors/openoffice.org-3/files/patch-salhelper+source+gcc2_freebsd_intel.map
+++ /dev/null
@@ -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:
-+*;
-+};
diff --git a/editors/openoffice.org-3/files/patch-salhelper+source+gcc3_freebsd_intel.map b/editors/openoffice.org-3/files/patch-salhelper+source+gcc3_freebsd_intel.map
deleted file mode 100644
index 823cff316ec7..000000000000
--- a/editors/openoffice.org-3/files/patch-salhelper+source+gcc3_freebsd_intel.map
+++ /dev/null
@@ -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:
-+		*;
-+};
-+
diff --git a/editors/openoffice.org-3/files/patch-salhelper+source+makefile.mk b/editors/openoffice.org-3/files/patch-salhelper+source+makefile.mk
deleted file mode 100644
index 3687664d8d16..000000000000
--- a/editors/openoffice.org-3/files/patch-salhelper+source+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../salhelper/source/makefile.mk.orig	Wed Nov 14 14:19:21 2001
-+++ ../salhelper/source/makefile.mk	Sun Mar  3 17:58:15 2002
-@@ -109,6 +109,10 @@
- SHL1VERSIONMAP=lngi.map
- .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
- SHL1VERSIONMAP=gcc3_linux_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
- .ENDIF
- 
- 
diff --git a/editors/openoffice.org-3/files/patch-salhelper+test+rtti+makefile.mk b/editors/openoffice.org-3/files/patch-salhelper+test+rtti+makefile.mk
deleted file mode 100644
index 70f25048a24a..000000000000
--- a/editors/openoffice.org-3/files/patch-salhelper+test+rtti+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
- 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
- .ENDIF
- 
- 
diff --git a/editors/openoffice.org-3/files/patch-sc+source+core+data+cell.cxx b/editors/openoffice.org-3/files/patch-sc+source+core+data+cell.cxx
deleted file mode 100644
index 529f67a3e35f..000000000000
--- a/editors/openoffice.org-3/files/patch-sc+source+core+data+cell.cxx
+++ /dev/null
@@ -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>
diff --git a/editors/openoffice.org-3/files/patch-scp+source+global+udk_base.scp b/editors/openoffice.org-3/files/patch-scp+source+global+udk_base.scp
deleted file mode 100644
index 623eccb0ff09..000000000000
--- a/editors/openoffice.org-3/files/patch-scp+source+global+udk_base.scp
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3/files/patch-scp+source+player+player.scp b/editors/openoffice.org-3/files/patch-scp+source+player+player.scp
deleted file mode 100644
index 2f8daab35cdd..000000000000
--- a/editors/openoffice.org-3/files/patch-scp+source+player+player.scp
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-3/files/patch-scptools+source+linker+searchcache b/editors/openoffice.org-3/files/patch-scptools+source+linker+searchcache
deleted file mode 100644
index 593e9eabf5bc..000000000000
--- a/editors/openoffice.org-3/files/patch-scptools+source+linker+searchcache
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: files/patch-scptools::source::linker::searchcache
-===================================================================
-RCS file: files/patch-scptools::source::linker::searchcache
-diff -N files/patch-scptools::source::linker::searchcache
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-scptools::source::linker::searchcache	4 Aug 2002 15:28:04 -0000
-@@ -0,0 +1,27 @@
-+--- ../scptools/source/linker/searchcache.hxx.orig	Fri Aug  2 22:53:46 2002
-++++ ../scptools/source/linker/searchcache.hxx	Fri Aug  2 22:54:50 2002
-+@@ -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	Fri Aug  2 22:53:35 2002
-++++ ../scptools/source/linker/searchcache.cxx	Fri Aug  2 22:55:14 2002
-+@@ -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-3/files/patch-scptools+source+linker+ziplst.cxx b/editors/openoffice.org-3/files/patch-scptools+source+linker+ziplst.cxx
deleted file mode 100644
index 83b84631542e..000000000000
--- a/editors/openoffice.org-3/files/patch-scptools+source+linker+ziplst.cxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice.org-3/files/patch-setup2+inc+fields.hxx b/editors/openoffice.org-3/files/patch-setup2+inc+fields.hxx
deleted file mode 100644
index d56e12f2abf4..000000000000
--- a/editors/openoffice.org-3/files/patch-setup2+inc+fields.hxx
+++ /dev/null
@@ -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[];
diff --git a/editors/openoffice.org-3/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-3/files/patch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 396c586ee3a3..000000000000
--- a/editors/openoffice.org-3/files/patch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,30 +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"
- 
-@@ -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" \
diff --git a/editors/openoffice.org-3/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice.org-3/files/patch-setup2+mow+source+loader+makefile.mk
deleted file mode 100644
index 5460e4296587..000000000000
--- a/editors/openoffice.org-3/files/patch-setup2+mow+source+loader+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice.org-3/files/patch-setup2+patch+makefile.mk b/editors/openoffice.org-3/files/patch-setup2+patch+makefile.mk
deleted file mode 100644
index 53846a8bdfc9..000000000000
--- a/editors/openoffice.org-3/files/patch-setup2+patch+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3/files/patch-setup2+script+setupserver b/editors/openoffice.org-3/files/patch-setup2+script+setupserver
deleted file mode 100644
index 450ea386c841..000000000000
--- a/editors/openoffice.org-3/files/patch-setup2+script+setupserver
+++ /dev/null
@@ -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`"
diff --git a/editors/openoffice.org-3/files/patch-setup2+source+compiler+decltor.cxx b/editors/openoffice.org-3/files/patch-setup2+source+compiler+decltor.cxx
deleted file mode 100644
index 98f6ad2f7567..000000000000
--- a/editors/openoffice.org-3/files/patch-setup2+source+compiler+decltor.cxx
+++ /dev/null
@@ -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";
diff --git a/editors/openoffice.org-3/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx b/editors/openoffice.org-3/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
deleted file mode 100644
index ac0b39a6aa47..000000000000
--- a/editors/openoffice.org-3/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
+++ /dev/null
@@ -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) );
diff --git a/editors/openoffice.org-3/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-3/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
deleted file mode 100644
index f199b18823e1..000000000000
--- a/editors/openoffice.org-3/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-3/files/patch-setup2+source+service+interface.cxx b/editors/openoffice.org-3/files/patch-setup2+source+service+interface.cxx
deleted file mode 100644
index 8e478e17971d..000000000000
--- a/editors/openoffice.org-3/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-3/files/patch-shell+source+cmdmail+makefile.mk b/editors/openoffice.org-3/files/patch-shell+source+cmdmail+makefile.mk
deleted file mode 100644
index 0476285c802e..000000000000
--- a/editors/openoffice.org-3/files/patch-shell+source+cmdmail+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-3/files/patch-shell+source+proxysettings+makefile.mk b/editors/openoffice.org-3/files/patch-shell+source+proxysettings+makefile.mk
deleted file mode 100644
index e83cf7c9d7a1..000000000000
--- a/editors/openoffice.org-3/files/patch-shell+source+proxysettings+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-3/files/patch-shell+source+unix+exec+makefile.mk b/editors/openoffice.org-3/files/patch-shell+source+unix+exec+makefile.mk
deleted file mode 100644
index 0b7712ee35f8..000000000000
--- a/editors/openoffice.org-3/files/patch-shell+source+unix+exec+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-3/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-3/files/patch-solenv+bin+addsym.awk
deleted file mode 100644
index 996e282b350b..000000000000
--- a/editors/openoffice.org-3/files/patch-solenv+bin+addsym.awk
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
-+++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
-@@ -72,11 +72,11 @@
- END {
-     if (state == 0) {
-         print "# Weak RTTI symbols for C++ exceptions:"
--        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
-+        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
-     }
- }
- state == 2 {
--    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
-+    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
-     state = 3
- }
- /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice.org-3/files/patch-solenv+bin+mapgen.pl b/editors/openoffice.org-3/files/patch-solenv+bin+mapgen.pl
deleted file mode 100644
index 71ebdb934120..000000000000
--- a/editors/openoffice.org-3/files/patch-solenv+bin+mapgen.pl
+++ /dev/null
@@ -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, $_);
- 	};
diff --git a/editors/openoffice.org-3/files/patch-solenv+inc+startup+FREEBSD+macros.mk b/editors/openoffice.org-3/files/patch-solenv+inc+startup+FREEBSD+macros.mk
deleted file mode 100644
index 0c1b107de988..000000000000
--- a/editors/openoffice.org-3/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-3/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-3/files/patch-solenv+inc+tg_ext.mk
deleted file mode 100644
index 701692c9425a..000000000000
--- a/editors/openoffice.org-3/files/patch-solenv+inc+tg_ext.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3/files/patch-solenv+inc+tg_moz.mk b/editors/openoffice.org-3/files/patch-solenv+inc+tg_moz.mk
deleted file mode 100644
index 255a41f92281..000000000000
--- a/editors/openoffice.org-3/files/patch-solenv+inc+tg_moz.mk
+++ /dev/null
@@ -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) $@
diff --git a/editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index b4764485aa86..000000000000
--- a/editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,202 +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
-+# 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*=$(CC)
-+
-+# default linker flags
-+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -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
diff --git a/editors/openoffice.org-3/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice.org-3/files/patch-soltools+checkdll+makefile.mk
deleted file mode 100644
index e6407402258a..000000000000
--- a/editors/openoffice.org-3/files/patch-soltools+checkdll+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3/files/patch-soltools+mkdepend+main.c b/editors/openoffice.org-3/files/patch-soltools+mkdepend+main.c
deleted file mode 100644
index cffd5cbb1f43..000000000000
--- a/editors/openoffice.org-3/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-3/files/patch-stlport+makefile.mk b/editors/openoffice.org-3/files/patch-stlport+makefile.mk
deleted file mode 100644
index 797817ba85be..000000000000
--- a/editors/openoffice.org-3/files/patch-stlport+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3/files/patch-stoc+source+corereflection+makefile.mk b/editors/openoffice.org-3/files/patch-stoc+source+corereflection+makefile.mk
deleted file mode 100644
index 4b319b08d401..000000000000
--- a/editors/openoffice.org-3/files/patch-stoc+source+corereflection+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-3/files/patch-stoc+source+defaultregistry+makefile.mk b/editors/openoffice.org-3/files/patch-stoc+source+defaultregistry+makefile.mk
deleted file mode 100644
index 4cae0476415a..000000000000
--- a/editors/openoffice.org-3/files/patch-stoc+source+defaultregistry+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-3/files/patch-stoc+source+implementationregistration+implreg.cxx b/editors/openoffice.org-3/files/patch-stoc+source+implementationregistration+implreg.cxx
deleted file mode 100644
index 341d621d872c..000000000000
--- a/editors/openoffice.org-3/files/patch-stoc+source+implementationregistration+implreg.cxx
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3/files/patch-stoc+source+implementationregistration+makefile.mk b/editors/openoffice.org-3/files/patch-stoc+source+implementationregistration+makefile.mk
deleted file mode 100644
index 0051043b7ecb..000000000000
--- a/editors/openoffice.org-3/files/patch-stoc+source+implementationregistration+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-3/files/patch-stoc+source+inspect+makefile.mk b/editors/openoffice.org-3/files/patch-stoc+source+inspect+makefile.mk
deleted file mode 100644
index c7cd85253c11..000000000000
--- a/editors/openoffice.org-3/files/patch-stoc+source+inspect+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-3/files/patch-stoc+source+invocation+makefile.mk b/editors/openoffice.org-3/files/patch-stoc+source+invocation+makefile.mk
deleted file mode 100644
index 9ac2072a5612..000000000000
--- a/editors/openoffice.org-3/files/patch-stoc+source+invocation+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-3/files/patch-stoc+source+invocation_adapterfactory+makefile.mk b/editors/openoffice.org-3/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
deleted file mode 100644
index 8853ad39a90e..000000000000
--- a/editors/openoffice.org-3/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-3/files/patch-stoc+source+javaloader+makefile.mk b/editors/openoffice.org-3/files/patch-stoc+source+javaloader+makefile.mk
deleted file mode 100644
index cea499f15c57..000000000000
--- a/editors/openoffice.org-3/files/patch-stoc+source+javaloader+makefile.mk
+++ /dev/null
@@ -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=		
diff --git a/editors/openoffice.org-3/files/patch-stoc+source+javavm+makefile.mk b/editors/openoffice.org-3/files/patch-stoc+source+javavm+makefile.mk
deleted file mode 100644
index b895a2b968d4..000000000000
--- a/editors/openoffice.org-3/files/patch-stoc+source+javavm+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice.org-3/files/patch-stoc+source+loader+makefile.mk b/editors/openoffice.org-3/files/patch-stoc+source+loader+makefile.mk
deleted file mode 100644
index 5a08ee5937b6..000000000000
--- a/editors/openoffice.org-3/files/patch-stoc+source+loader+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-3/files/patch-stoc+source+namingservice+makefile.mk b/editors/openoffice.org-3/files/patch-stoc+source+namingservice+makefile.mk
deleted file mode 100644
index e573081bc21d..000000000000
--- a/editors/openoffice.org-3/files/patch-stoc+source+namingservice+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-3/files/patch-stoc+source+proxy_factory+makefile.mk b/editors/openoffice.org-3/files/patch-stoc+source+proxy_factory+makefile.mk
deleted file mode 100644
index 9110b2f50cd1..000000000000
--- a/editors/openoffice.org-3/files/patch-stoc+source+proxy_factory+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-3/files/patch-stoc+source+registry_tdprovider+makefile.mk b/editors/openoffice.org-3/files/patch-stoc+source+registry_tdprovider+makefile.mk
deleted file mode 100644
index 9d974d1c0d10..000000000000
--- a/editors/openoffice.org-3/files/patch-stoc+source+registry_tdprovider+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3/files/patch-stoc+source+servicemanager+makefile.mk b/editors/openoffice.org-3/files/patch-stoc+source+servicemanager+makefile.mk
deleted file mode 100644
index 746776d54759..000000000000
--- a/editors/openoffice.org-3/files/patch-stoc+source+servicemanager+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-3/files/patch-stoc+source+tdmanager+makefile.mk b/editors/openoffice.org-3/files/patch-stoc+source+tdmanager+makefile.mk
deleted file mode 100644
index 76403fdde841..000000000000
--- a/editors/openoffice.org-3/files/patch-stoc+source+tdmanager+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-3/files/patch-stoc+source+typeconv+makefile.mk b/editors/openoffice.org-3/files/patch-stoc+source+typeconv+makefile.mk
deleted file mode 100644
index dc647f89a166..000000000000
--- a/editors/openoffice.org-3/files/patch-stoc+source+typeconv+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-3/files/patch-store+util+makefile.mk b/editors/openoffice.org-3/files/patch-store+util+makefile.mk
deleted file mode 100644
index 6bef6e960f2e..000000000000
--- a/editors/openoffice.org-3/files/patch-store+util+makefile.mk
+++ /dev/null
@@ -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
- 
- 
diff --git a/editors/openoffice.org-3/files/patch-svx+source+fmcomp+makefile.mk b/editors/openoffice.org-3/files/patch-svx+source+fmcomp+makefile.mk
deleted file mode 100644
index b16030080c0d..000000000000
--- a/editors/openoffice.org-3/files/patch-svx+source+fmcomp+makefile.mk
+++ /dev/null
@@ -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= \
diff --git a/editors/openoffice.org-3/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice.org-3/files/patch-sysui+oounix+office+gnome+makefile.mk
deleted file mode 100644
index 3d7c2e22aa63..000000000000
--- a/editors/openoffice.org-3/files/patch-sysui+oounix+office+gnome+makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
-+++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
-@@ -84,7 +84,9 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- APP1LIBS=
-+.IF "$(OS)"!="FREEBSD"
- APP1STDLIBS=-ldl
-+.ENDIF
- 
- GNOMEFILES= \
- 	locales.tab
diff --git a/editors/openoffice.org-3/files/patch-tools+source+string+tstring.cxx b/editors/openoffice.org-3/files/patch-tools+source+string+tstring.cxx
deleted file mode 100644
index 12bd6bd0b244..000000000000
--- a/editors/openoffice.org-3/files/patch-tools+source+string+tstring.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../tools/source/string/tstring.cxx.orig	Sat Aug 10 12:53:42 2002
-+++ ../tools/source/string/tstring.cxx	Sat Aug 10 12:54:16 2002
-@@ -103,6 +103,9 @@
- xub_StrLen ImplStringLen( const sal_Char* pStr )
- {
- 	const sal_Char* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
-@@ -113,6 +116,9 @@
- xub_StrLen ImplStringLen( const sal_Unicode* pStr )
- {
- 	const sal_Unicode* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
diff --git a/editors/openoffice.org-3/files/patch-unoil+makefile.pmk b/editors/openoffice.org-3/files/patch-unoil+makefile.pmk
deleted file mode 100644
index 7febdabf7b4b..000000000000
--- a/editors/openoffice.org-3/files/patch-unoil+makefile.pmk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../unoil/makefile.pmk.orig	Fri Aug 31 18:04:43 2001
-+++ ../unoil/makefile.pmk	Thu Sep 12 12:17:50 2002
-@@ -74,8 +74,8 @@
- JAVAFILESLIST	:= $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java)
- .ENDIF          # "$(L10N_framework)"==""
- 
--GENJAVAFILES	:= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
--GENCLASSFILES	:= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
-+GENJAVAFILES	+= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
-+GENCLASSFILES	+= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
- 
- # --- Targets ------------------------------------------------------
- 
diff --git a/editors/openoffice.org-3/files/patch-unzip+source+file_io.c b/editors/openoffice.org-3/files/patch-unzip+source+file_io.c
deleted file mode 100644
index 2f85a108c185..000000000000
--- a/editors/openoffice.org-3/files/patch-unzip+source+file_io.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../unzip/source/file_io.c.orig	Sat Oct 19 11:58:45 2002
-+++ ../unzip/source/file_io.c	Sat Oct 19 12:03:40 2002
-@@ -500,7 +500,7 @@
- #ifdef MPW
- 				pCallBack( 0 );
- #else
--				#if defined LINUX || defined MACOSX || defined NETBSD
-+				#if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD
- 				pCallBack( lseek(outfd, 0, SEEK_CUR) );
- 				#else
- 				pCallBack( tell( outfd ) );
-@@ -865,7 +865,9 @@
- 	static struct timeb tbp;
- #endif /* !__386BSD__ */
- #else /* !BSD */
-+#if (!defined(NETBSD) && !defined(FREEBSD))
- 	extern long timezone;
-+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
- #endif /* ?BSD */
- #endif /* ?AMIGA */
- 
diff --git a/editors/openoffice.org-3/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice.org-3/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
deleted file mode 100644
index 41defbd5eb59..000000000000
--- a/editors/openoffice.org-3/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
-+++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
-@@ -65,6 +65,8 @@
- #include <glyphcache.hxx>
- 
- #define Region XLIB_Region
-+typedef unsigned long CARD32;
-+#define Cursor CARD32
- #include <X11/extensions/Xrender.h>
- #undef Region
- 
diff --git a/editors/openoffice.org-3/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice.org-3/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
deleted file mode 100644
index fefc925db41f..000000000000
--- a/editors/openoffice.org-3/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
-@@ -78,6 +78,12 @@
- GETSTYLE_GNOME=getstyle-gnome-linux-intel
- HASGNOME2=TRUE
- .ENDIF
-+.IF "$_(HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
-+.ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
- HASGNOME2=TRUE
diff --git a/editors/openoffice.org-3/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice.org-3/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
deleted file mode 100644
index 984313fc540a..000000000000
--- a/editors/openoffice.org-3/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
-@@ -75,9 +75,15 @@
- 
- HASGNOME2=
- 
--.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
-+.IF "$(OS)$(CPU)"=="LINUXI"
- MSGBOX_GNOME=msgbox-gnome-linux-intel
- HASGNOME2=TRUE
-+.ENDIF
-+.IF "$(_HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+MSGBOX_GNOME=msgbox-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
- .ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice.org-3/files/patch-vcl+workben+officeacceptthread.cxx b/editors/openoffice.org-3/files/patch-vcl+workben+officeacceptthread.cxx
deleted file mode 100644
index 07d9f1060557..000000000000
--- a/editors/openoffice.org-3/files/patch-vcl+workben+officeacceptthread.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/workben/officeacceptthread.cxx.orig	Wed Mar  5 20:25:36 2003
-+++ ../vcl/workben/officeacceptthread.cxx	Wed Mar  5 20:26:03 2003
-@@ -125,7 +125,7 @@
- #if defined (SOLARIS)
- 				int status;
- 				nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG);
--#elif defined(LINUX)
-+#elif defined(LINUX) || defined (FREEBSD)
- 				nRet = kill(aProcessInfo.Ident, 0);
- #endif
- #if defined (UNX)
diff --git a/editors/openoffice.org-3/files/zipmoz.sh b/editors/openoffice.org-3/files/zipmoz.sh
deleted file mode 100644
index 43a4591f3430..000000000000
--- a/editors/openoffice.org-3/files/zipmoz.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/sh -f
-
-RUNTIME_FILES=" components/libabsyncsvc.so components/libaddrbook.so \
-		components/libmork.so components/libmozldap.so \
-		components/libnecko.so components/libprofile.so \
-		components/librdf.so components/libstrres.so \
-		components/libunicharutil.so components/libuconv.so \
-		components/libucvcn.so components/libucvibm.so \
-		components/libucvja.so components/libucvko.so \
-		components/libucvlatin.so components/libucvtw.so \
-		components/libucvtw2.so components/liburiloader.so \
-		components/libvcard.so components/libxpconnect.so \
-		components/libpref.so components/libchrome.so libmozjs.so \
-		libmsgbaseutil.so libldap50.so libnspr4.so libplc4.so \
-		libplds4.so libxpcom.so libmozz.so component.reg \
-		components/necko_dns.xpt components/xpcom_xpti.xpt \
-		components/xpcom_threads.xpt components/xpcom_io.xpt \
-		components/xpcom_ds.xpt components/xpcom_components.xpt \
-		components/xpcom_base.xpt components/xpti.dat \
-		defaults/pref/all.js defaults/pref/config.js \
-		defaults/pref/editor.js defaults/pref/initpref.js \
-		defaults/pref/inspector.js defaults/pref/mailnews.js \
-		defaults/pref/security-prefs.js defaults/pref/unix.js \
-		defaults/pref/xpinstall.js"
-
-LIB_FILES="	lib/libembed_base_s.a lib/libmozreg_s.a \
-		lib/libnspr4.so lib/libxpcom.so lib/libprldap50.so"
-
-INC_FILES="include/"
-INC_FILES2="public/"
-
-if [ $# -lt 2 -o $# -gt 3 ] ; then
-	echo 
-	echo usage: $0 mozilla_dist target [target_dir]
-	echo
-	echo where:
-	echo
-	echo "mozilla_dist points to the mozilla distribution"
-	echo "target concatenates  OS, compiler and CPU (e.g. FREEBSDGCCI etc)"
-	echo "target_dir is the directory to place the zips"
-	exit 1
-fi
-
-MOZ_DIST=$1
-TARGET=$2
-if [ "w$3" != "w" ]; then
-	TARGET_DIR=$3
-else
-	if [ "w$TARGET_DIR" == "w" ]; then
-		TARGET_DIR=
-	fi
-fi
-
-ZIP_TARGET=$TARGET_DIR
-if [ -z "$ZIP_TARGET" ] ; then
-	ZIP_TARGET=../
-fi
-
-# just to remember the current working directory
-STARTING_DIR=`pwd`
-
-echo
-echo --- creating zips for $TARGET, using mozilla distribution in $MOZ_DIST
-
-# Create the directories
-[ ! -d $TARGET_DIR/$TARGET/runtime ] && mkdir -p $TARGET_DIR/$TARGET/runtime
-[ ! -d $TARGET_DIR/$TARGET/runtime/components ] && mkdir -p $TARGET_DIR/$TARGET/runtime/components
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults/pref ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults/pref
-[ ! -d $TARGET_DIR/$TARGET/lib ] && mkdir -p $TARGET_DIR/$TARGET/lib
-[ ! -d $TARGET_DIR/$TARGET/inc ] && mkdir -p $TARGET_DIR/$TARGET/inc
-[ ! -d $TARGET_DIR/$TARGET/inc/nspr ] && mkdir -p $TARGET_DIR/$TARGET/inc/nspr
-[ ! -d $TARGET_DIR/$TARGET/inc/obsolete ] && mkdir -p $TARGET_DIR/$TARGET/inc/obsolete
-
-# Copy the files
-echo
-echo --- copying files
-echo
-
-for i in $RUNTIME_FILES; do
-	if [ ! -f $MOZ_DIST/bin/$i ]; then
-		echo $MOZ_DIST/bin/$i does not exist, check your distribution
-	else
-		if [ `echo $i | grep component` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/components/
-		elif [ `echo $i | grep defaults` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/defaults/pref/
-		else
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/
-		fi
-	fi
-done
-
-for i in $LIB_FILES; do
-	if [ ! -f $MOZ_DIST/$i ]; then
-		echo $MOZ_DIST/$i does not exist, check your distribution
-	else
-		cp -R -L $MOZ_DIST/$i $TARGET_DIR/$TARGET/lib/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES`; do
-	if [ ! -d $i ]; then 
-		cp -R -L $MOZ_DIST/include/$i $TARGET_DIR/$TARGET/inc/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES2`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/public/$i $TARGET_DIR/$TARGET/inc
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/$i $TARGET_DIR/$TARGET/inc/nspr
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr/obsolete`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/obsolete/$i $TARGET_DIR/$TARGET/inc/obsolete
-	fi
-done
-
-# delete old zips
-
-[ -f $TARGET_DIR/$TARGET/runtime.zip ] && rm -f $TARGET_DIR/$TARGET/runtime.zip
-[ -f $TARGET_DIR/$TARGET/lib.zip ] && rm -f $TARGET_DIR/$TARGET/lib.zip
-[ -f $TARGET_DIR/$TARGET/inc.zip ] && rm -f $TARGET_DIR/$TARGET/inc.zip
-
-# zip the runtime files
-
-echo
-echo --- creating ${TARGET}runtime.zip
-echo
-
-cd $TARGET_DIR/$TARGET/runtime
-find . -type f | zip $ZIP_TARGET/${TARGET}runtime.zip -@
-
-# zip the lib files
-echo 
-echo --- creating ${TARGET}lib.zip
-echo 
-
-cd $TARGET_DIR/$TARGET/lib
-find . -type f | zip $ZIP_TARGET/${TARGET}lib.zip -@
-
-# zip the inc files
-echo
-echo --- creating ${TARGET}inc.zip
-echo
-
-cd $TARGET_DIR/$TARGET/inc
-find . -type f | zip $ZIP_TARGET/${TARGET}inc.zip -@
-
-# remove dirs
-cd $STARTING_DIR
-rm -rf $TARGET_DIR/$TARGET
-
-echo
-echo --- done
-echo
-
diff --git a/editors/openoffice.org-3/pkg-descr b/editors/openoffice.org-3/pkg-descr
deleted file mode 100644
index 31fd1b12161a..000000000000
--- a/editors/openoffice.org-3/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-OpenOffice.org is an Open Source, community-developed, multi-platform office
-productivity suite. It includes the key desktop applications, such as a
-word processor, spreadsheet, presentation manager, and drawing program,
-with a user interface and feature set similar to other office suites.
-
-Components include:
-  * A universal word processing application for creating business
-    letters, extensive text documents, professional layouts, and HTML
-    documents.
-  * A sophisticated application for performing advanced spreadsheet
-    functions, such as analyzing figures, creating lists, and viewing data.
-  * A tool for creating effective eye-catching presentations.
-  * A vector-oriented draw module that enables the creation of 3D
-    illustrations
diff --git a/editors/openoffice.org-3/pkg-message b/editors/openoffice.org-3/pkg-message
deleted file mode 100644
index 1dc749f301c2..000000000000
--- a/editors/openoffice.org-3/pkg-message
+++ /dev/null
@@ -1,73 +0,0 @@
-OpenOffice.org Build 643 Personal Install How-To
-
-Written by:	Martin Blapp <mbr@freebsd.org>
-
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
-
-1 User installation
--------------------
-
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
---------------
-
-There are some wrappers installed for fast startup.
-Add "${PREFIX}/bin/" to your PATH and you will be able
-to use them.
-
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
-
-If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
-version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
diff --git a/editors/openoffice.org-3/pkg-plist b/editors/openoffice.org-3/pkg-plist
deleted file mode 100644
index 28bd78453b52..000000000000
--- a/editors/openoffice.org-3/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, do not delete. Package list is generated automatically.
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
deleted file mode 100644
index 6f740924c399..000000000000
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ /dev/null
@@ -1,580 +0,0 @@
-# New ports collection makefile for: OpenOffice
-# Date created:		28 Februar 2002
-# Whom:                 Martin Blapp
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openoffice
-PORTVERSION=	644
-CATEGORIES+=	editors
-MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
-		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
-		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
-		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ny1.mirror.openoffice.org/miscellaneous/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
-MASTER_SITE_SUBDIR=	${PORTVERSION}
-DISTFILES+=	oo_${PORTVERSION}_src.tar.bz2 \
-		gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
-
-BROKEN=		"Does not build"
-
-SORT?=	/usr/bin/sort
-FIND?=	/usr/bin/find
-CUT?=	/usr/bin/cut
-AWK?=	/usr/bin/awk
-GREP?=	/usr/bin/grep
-ZIP?=	${PREFIX}/bin/zip
-UNZIP?=	${PREFIX}/bin/unzip
-ANT?=	${LOCALBASE}/bin/ant
-TCSH?=	/bin/tcsh
-PASTE?=	/usr/bin/paste
-
-.include <bsd.port.pre.mk>
-
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
-DIST_SUBDIR=		openoffice
-DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
-
-#
-# configuration for language specific slave ports
-#
-.if !defined(LANG_EXT)
-LANG_EXT=01
-.else
-#
-# Add pkg-descr and pkg-message if available
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-#
-# LANG_CONFIGURE_ARG is missing for the german port
-#
-.if defined(LANG_EXT)
-CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG},ENUS
-.endif
-.endif
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
-
-EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-
-MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/jakarta-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-.if !defined(DISPLAY)
-BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
-.endif
-.if !defined(WITH_BSD_JDK)
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk14
-.else
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-.endif
-
-USE_PERL5=	yes
-USE_BZIP2=	yes
-USE_BISON=	yes
-USE_GMAKE=	yes
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
-.if !defined(WITH_BSD_JDK)
-JDKDIR?=	${LOCALBASE}/linux-sun-jdk1.4.1
-.else
-JDKDIR?=	${LOCALBASE}/jdk1.4.1
-.endif
-JAVAVM=         ${JDKDIR}/bin/java
-
-GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
-LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
-BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
-
-.if !defined(DISPLAY)
-DISPLAYHACK=localhost:1001
-.endif
-
-CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
-			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
-
-.if !defined(WITH_BSD_JDK)
-CONFIGURE_ARGS+=	--enable-linuxjdk=yes
-.endif
-
-.if defined(WITH_DEBUG)
-.if ${WITH_DEBUG} == 2
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-.endif
-
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"prefered language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
-	@${ECHO} "OPTIONS:"
-.if !defined(USE_GCC)
-	@${ECHO}
-	@${ECHO} "You can compile OO with different"
-	@${ECHO} "gcc compiler versions:"
-	@${ECHO}
-	@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.2"
-	@${ECHO} "to compile openoffice with your"
-	@${ECHO} "prefered compiler."
-.endif
-.if !defined(WITH_BSD_JDK)
-	@${ECHO}
-	@${ECHO} "If you like to use the native BSD"
-	@${ECHO} "JDK for the build system, you can use"
-	@${ECHO} "WITH_BSD_JDK=TRUE to disable the"
-	@${ECHO} "usage of the linux-JDK and linux dependency."
-	@${ECHO}
-.endif
-.if !defined(WITH_DEBUG)
-	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
-	@${ECHO} "if you call make with WITH_DEBUG=1"
-	@${ECHO}
-	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
-	@${ECHO}
-.endif
-.if !defined(WITH_TTF_BYTECODE_ENABLED)
-	@${ECHO}
-	@${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES"
-	@${ECHO} "if you like to use the Freetype library to"
-	@${ECHO} "render TTF fonts. Normally the TTF lib is"
-	@${ECHO} "not used to render fonts."
-	@${ECHO}
-	@${ECHO} "If you have licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479"
-	@${ECHO} "you can enable this option to get better"
-	@${ECHO} "quality of glyphs at small bitmap sizes."
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 450002
-	@${ECHO}
-	@${ECHO} "OS-VERSION ${OSVERSION} too low"
-	@${ECHO}
-	@${ECHO} "OO need some important libc_r and"
-	@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
-	@${ECHO} "RELEASE or 4.6 STABLE."
-	@${FALSE}
-.endif
-	@${ECHO}
-	@${ECHO} "NOTICE:"
-	@${ECHO}
-	@${ECHO} "To build Openoffice, you should have a lot"
-.if defined(WITH_DEBUG)
-	@${ECHO} "of free diskspace (~ 8GB)."
-.else
-	@${ECHO} "of free diskspace (~ 4GB)."
-.endif
-	@${ECHO}
-.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
-    (${OSVERSION} < 500000 && !defined(USE_GCC))
-	@${ECHO} "KERNEL CONFIGURATION:"
-	@${ECHO}
-	@${ECHO} "Openoffice needs a larger stack- and"
-	@${ECHO} "datasize to build. Check your limit"
-	@${ECHO} "settings and and put this in /boot/loader.conf"
-	@${ECHO} "if neccessary:"
-	@${ECHO}
-	@${ECHO} "kern.maxdsiz=\"1073741824\""
-	@${ECHO} "kern.maxssiz=\"268435456\""
-.endif
-	@${ECHO}
-.if ${OSVERSION} < 460002
-	@${ECHO} "REQUIRED SYSTEM PATCHES:"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO} "OO.org can crash if you enter a non existing path"
-	@${ECHO} "or URL in the location bar. To fix these crashes"
-	@${ECHO} "you need a uncommitted system patch for rtld:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460001
-	@${ECHO}
-	@${ECHO} "OO setup is broken on STABLE < 4.6"
-	@${ECHO} "including 4.6 RELEASE."
-	@${ECHO} "You'll need a system patch to solve"
-	@${ECHO} "this problem:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 460002
-	@${ECHO}
-	@${ECHO} "OO.org soffice binary can deadlock. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
-	@${ECHO}
-.endif
-.if ${OSVERSION} < 500000
-	@${ECHO}
-	@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
-	@${ECHO} "this problem with this patch:"
-	@${ECHO}
-	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
-	@${ECHO}
-.endif
-.if !exists(/usr/include/langinfo.h)
-	@${ECHO}
-	@${ECHO} "langinfo.h is missing !"
-	@${ECHO}
-	@${ECHO} "Please upgrade to 4.6 RELEASE or"
-	@${ECHO} "4.6 STABLE."
-	@${ECHO}
-	@${FALSE}
-.endif
-
-post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
-	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
-	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@-${RM} -f ${WRKSRC}/../moz/zipped/*.zip
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
-.if defined(L10NHELP)
-	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
-	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
-.endif
-
-post-patch:
-	@${MAKE} patch-mozilla
-.if defined(WITH_TTF_BYTECODE_ENABLED)
-	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
-		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-			${ECHO_MSG} "===>   Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \
-		fi; \
-		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
-	fi
-.endif
-.if defined(WITH_DEBUG)
-	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
-		PATCHES_APPLIED="" ; \
-		for i in ${PATCHDIR}/debugpatch-*; do \
-			case $$i in \
-				*.orig|*.rej|*~) \
-					${ECHO_MSG} "===>   Ignoring patchfile $$i" ; \
-					;; \
-				*) \
-					if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-						${ECHO_MSG} "===>   Applying ${OPSYS} patch $$i" ; \
-					fi; \
-					if ${PATCH} ${PATCH_ARGS} < $$i ; then \
-						PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
-					else \
-						${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
-						if [ x"$$PATCHES_APPLIED" != x"" ]; then \
-							${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
-						fi; \
-						${FALSE} ; \
-					fi; \
-					;; \
-			esac; \
-		done; \
-	fi;
-.endif
-	@${ECHO_MSG} "===>  Find old malloc.h defines and fix them in ${PKGNAME} source"
-	@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
-		${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
-
-extract-mozilla:
-.if ! exists(${WRKDIR}/mozilla/Makefile)
-	@${ECHO_MSG} "===>  Extracting mozilla sub project"
-	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
-.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment)
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
-.endif
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
-.endif
-	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
-
-patch-mozilla:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
-		${WRKDIR}/mozilla/files/
-	@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
-
-build-mozilla:
-.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
-	@${ECHO_MSG} "===>  Building mozilla sub project"
-.if defined(WITH_DEBUG)
-	@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
-	@${SED} -e 's|--disable-debug||' \
-		-e 's|--disable-cpp-rtti||' \
-		-e 's|--enable-strip||' \
-		< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
-.endif
-.if defined(USE_GCC)
-	@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
-.else
-	@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
-.endif
-	@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
-	@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
-	@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
-.endif
-
-install-mozilla:
-	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
-
-register-mozilla:
-.if exists(${WRKDIR}/mozilla-runtime)
-	@${RM} -rf ${WRKDIR}/mozilla-runtime
-.endif
-	@${MKDIR} ${WRKDIR}/mozilla-runtime
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
-	@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
-	@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
-	@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
-		&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom 
-	@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
-		${WRKDIR}/mozilla-runtime/components/xptitemp.dat
-	@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
-	@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
-		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
-
-mozilla:
-	@${MAKE} extract-mozilla
-	@${MAKE} patch-mozilla
-	@${MAKE} build-mozilla
-	@${MAKE} register-mozilla
-	@${MAKE} install-mozilla
-
-do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
-	@${MAKE} mozilla
-.endif
-.endif
-.endif
-.if exists(${WRKDIR}/.Xvfb.pid)
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.endif
-.if !defined(DISPLAY)
-	#
-	# This is a UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-.endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
-	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
-.endif
-.if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
-.endif
-
-pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-
-do-install:
-.if !defined(DISPLAY)
-	#
-	# UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
-.endif
-
-install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
-
-post-install:
-	@${ECHO_MSG} "===>  Add wrapper scripts";
-	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
-	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
-	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
-
-package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
-.if defined(LANG_SUFFIX)
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
-.else
-	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
-.endif
-
-update:
-	@${MAKE} fetch
-	@${MAKE} extract
-	@cd ${WRKSRC}/.. && for dir in *; do \
-	    if [ -d $$dir ]; then \
-		cd $$dir; cvs update -d; cd ..; \
-	    fi \
-	done
-
-.include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
deleted file mode 100644
index ec9d6788f104..000000000000
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
-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
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
diff --git a/editors/openoffice.org-vcltesttool/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-vcltesttool/files/debugpatch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 96c651ce22c8..000000000000
--- a/editors/openoffice.org-vcltesttool/files/debugpatch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../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
-@@ -902,6 +902,7 @@
- 
- void KillSetupDir()
- {
-+#if 0
-     DIR* pDir = opendir( strTmpPath );
-     struct dirent* pFile;
- 
-@@ -915,6 +916,10 @@
- 
-     chdir( strInitPath );
-     rmdir( strTmpPath );
-+#else
-+	fprintf(stderr, "\nLeaving behind temporary directory: %s\n",
-+	strTmpPath);
-+#endif
- }
- 
- void makeSymLink( char* s )
diff --git a/editors/openoffice.org-vcltesttool/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-vcltesttool/files/debugpatch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 52bd2b3d58d6..000000000000
--- a/editors/openoffice.org-vcltesttool/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
-+++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
- 
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- 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
- 
- # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
diff --git a/editors/openoffice.org-vcltesttool/files/oo_setup.resp b/editors/openoffice.org-vcltesttool/files/oo_setup.resp
deleted file mode 100644
index 8eeeb11bd95e..000000000000
--- a/editors/openoffice.org-vcltesttool/files/oo_setup.resp
+++ /dev/null
@@ -1,7 +0,0 @@
-[Environment]
-InstallationMode = INSTALL_NETWORK
-InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org-643
-
-[Java]
-JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-vcltesttool/files/openoffice-wrapper b/editors/openoffice.org-vcltesttool/files/openoffice-wrapper
deleted file mode 100644
index f1d7b28ffc4c..000000000000
--- a/editors/openoffice.org-vcltesttool/files/openoffice-wrapper
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-vcltesttool/files/Attic/openoffice-wrapper,v 1.3 2003-03-05 23:24:05 mbr Exp $
-
-oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/
-program=`echo $0 | sed -e 's|.*-||'`
-
-if [ ! $LANG ]; then
-	export LANG=%%LANG%%
-fi
-
-case $program in
-$0)
-	exec $oopath/soffice "$@"
-	;;
-	*)
-	exec $oopath/$program "$@"
-	;;
-esac
diff --git a/editors/openoffice.org-vcltesttool/files/optpatch-freetype+patch b/editors/openoffice.org-vcltesttool/files/optpatch-freetype+patch
deleted file mode 100644
index b426a8fb7fcc..000000000000
--- a/editors/openoffice.org-vcltesttool/files/optpatch-freetype+patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Index: files/patch-freetype::patch
-===================================================================
-RCS file: files/patch-freetype::patch
-diff -N files/patch-freetype::patch
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-freetype::patch	4 Aug 2002 15:27:42 -0000
-@@ -0,0 +1,201 @@
-+diff -ur ../freetype/freetype-2.0.5.patch oo641d_patched/freetype/freetype-2.0.5.patch
-+--- ../freetype/freetype-2.0.5.patch	Fri Apr  5 21:07:34 2002
-++++ ../freetype/freetype-2.0.5.patch	Sat Mar  9 18:04:17 2002
-+@@ -1,118 +1,79 @@
-+-*** misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 14 00:44:33 2000
-+---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 63,69 ****
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+---- 63,69 ----
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+-*** misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Jun  7 19:36:17 2001
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 631,637 ****
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+---- 631,637 ----
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile -DPIC $pic_flag"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Mon Jan  1 18:25:21 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 1,7 ****
-+---- 1,9 ----
-+-  FT_USE_MODULE(autohint_module_class)
-+-  FT_USE_MODULE(cff_driver_class)
-+-  FT_USE_MODULE(t1cid_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(pcf_driver_class)
-+-+ */
-+-  FT_USE_MODULE(psaux_module_class)
-+-  FT_USE_MODULE(psnames_module_class)
-+-  FT_USE_MODULE(ft_raster1_renderer_class)
-+-***************
-+-*** 9,12 ****
-+---- 11,16 ----
-+-  FT_USE_MODULE(ft_smooth_renderer_class)
-+-  FT_USE_MODULE(tt_driver_class)
-+-  FT_USE_MODULE(t1_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(winfnt_driver_class)
-+-+ */
-+-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h	Tue Aug 21 10:50:45 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 70,76 ****
-+---- 70,79 ----
-+-    /*   All convenience functions are declared as such in their             */
-+-    /*   documentation.                                                      */
-+-    /*                                                                       */
-+-+ /*
-+-  #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-+ */
-+-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-  
-+-  
-+-    /*************************************************************************/
-+-***************
-+-*** 108,116 ****
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-- 
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+---- 111,121 ----
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-+ /*
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-+ */
-+-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig	Mon Jan  7 14:21:35 2002
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Mon Jan  7 14:21:40 2002
-+-***************
-+-*** 2251,2257 ****
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age + 1`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-+---- 2251,2257 ----
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk
-++--- misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:49:17 2001
-++@@ -63,7 +63,7 @@
-++ #   ANSI compliance.
-++ #
-++ ifndef CFLAGS
-++-  CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+++  CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-++ endif
-++ 
-++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh
-++--- misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:47:56 2001
-+++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:49:17 2001
-++@@ -631,7 +631,7 @@
-++     if test "$build_old_libs" = yes; then
-++       if test "$pic_mode" != yes; then
-++ 	# Don't build PIC code
-++-	command="$base_compile $srcfile"
-+++	command="$base_compile $srcfile -DPIC $pic_flag"
-++       else
-++ 	# All platforms use -DPIC, to notify preprocessed assembler code.
-++ 	command="$base_compile $srcfile $pic_flag -DPIC"
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:49:17 2001
-++@@ -1,7 +1,9 @@
-++ FT_USE_MODULE(autohint_module_class)
-++ FT_USE_MODULE(cff_driver_class)
-++ FT_USE_MODULE(t1cid_driver_class)
-+++/*
-++ FT_USE_MODULE(pcf_driver_class)
-+++*/
-++ FT_USE_MODULE(psaux_module_class)
-++ FT_USE_MODULE(psnames_module_class)
-++ FT_USE_MODULE(ft_raster1_renderer_class)
-++@@ -9,4 +11,6 @@
-++ FT_USE_MODULE(ft_smooth_renderer_class)
-++ FT_USE_MODULE(tt_driver_class)
-++ FT_USE_MODULE(t1_driver_class)
-+++/*
-++ FT_USE_MODULE(winfnt_driver_class)
-+++*/
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:51:15 2001
-++@@ -70,7 +70,10 @@
-++   /*   All convenience functions are declared as such in their             */
-++   /*   documentation.                                                      */
-++   /*                                                                       */
-+++/*
-++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+++*/
-+++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-++ 
-++ 
-++   /*************************************************************************/
-++@@ -108,8 +111,10 @@
-++   /*   use a vector `plotter' format that isn't supported when this        */
-++   /*   macro is undefined.                                                 */
-++   /*                                                                       */
-+++/*
-++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++-
-+++*/
-+++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++ 
-++   /*************************************************************************/
-++   /*                                                                       */
-++@@ -338,7 +343,7 @@
-++   /* By undefining this, you will only compile the code necessary to load  */
-++   /* TrueType glyphs without hinting.                                      */
-++   /*                                                                       */
-++-#undef  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-+++#define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-++ 
-++ 
-++   /*************************************************************************/
diff --git a/editors/openoffice.org-vcltesttool/files/optpatch-vcl+util+makefile.pmk b/editors/openoffice.org-vcltesttool/files/optpatch-vcl+util+makefile.pmk
deleted file mode 100644
index 41341ff0b4e8..000000000000
--- a/editors/openoffice.org-vcltesttool/files/optpatch-vcl+util+makefile.pmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/util/makefile.pmk.orig	Mon Aug  5 01:39:41 2002
-+++ ../vcl/util/makefile.pmk	Mon Aug  5 01:40:03 2002
-@@ -64,7 +64,7 @@
- PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch
- PDBTARGET=vcl
- 
--.IF "$(OS)" != "MACOSX"
-+.IF "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- .IF "$(remote)" != ""
- USE_BUILTIN_RASTERIZER=true
- .ENDIF
diff --git a/editors/openoffice.org-vcltesttool/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-vcltesttool/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 078685f3b516..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../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 freebsd genunix";;
-  	*)		JINCSUBDIRS="genunix";;
-  	esac
-  
diff --git a/editors/openoffice.org-vcltesttool/files/patch-bridges+prj+build.lst b/editors/openoffice.org-vcltesttool/files/patch-bridges+prj+build.lst
deleted file mode 100644
index fee3d847c5e6..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-bridges+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
deleted file mode 100644
index 99b8c566fb61..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ /dev/null
@@ -1,102 +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 );
-+    }
- }
- 
- }
diff --git a/editors/openoffice.org-vcltesttool/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice.org-vcltesttool/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
deleted file mode 100644
index 4622b7fe21c4..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-vcltesttool/files/patch-comphelper+util+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-comphelper+util+makefile.mk
deleted file mode 100644
index f2d3092c2ddf..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-comphelper+util+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in b/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in
deleted file mode 100644
index a45332fcbec0..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,66 +0,0 @@
---- configure.in.orig	Thu Feb 20 15:49:32 2003
-+++ configure.in	Wed Mar  5 21:22:34 2003
-@@ -95,6 +95,12 @@
-                           
-                           Usage: --enable-macos9
- ],,)
-+AC_ARG_ENABLE(linuxjdk,
-+[  --enable-linuxjdk         Use this option option if you like to use
-+                          the linux-jdk instead of the native jdk.
-+
-+                          Usage: --enable-linuxjdk
-+],,)
- AC_ARG_WITH(lang,
- [  --with-lang             Use this option to build OpenOffice.org with
-                           additional language support. US English is always
-@@ -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
-@@ -1232,7 +1249,11 @@
- if test -n "$enable_debug"; then
-    ENABLE_DEBUG="TRUE"
- else
--   ENABLE_DEBUG="FALSE"
-+fi
-+if test -n "$enable_linuxjdk"; then
-+   USE_LINUXJDK="TRUE"
-+else
-+   USE_LINUXJDK="FALSE"
- fi
- 
- dnl ===================================================================
-@@ -1278,6 +1299,7 @@
- AC_SUBST(PTHREAD_CFLAGS)
- AC_SUBST(PTHREAD_LIBS)
- AC_SUBST(ENABLE_DEBUG)
-+AC_SUBST(USE_LINUXJDK)
- 
- AC_OUTPUT([set_soenv])
- 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-config_office+set_soenv.in b/editors/openoffice.org-vcltesttool/files/patch-config_office+set_soenv.in
deleted file mode 100644
index 9ea6b11bdab2..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-config_office+set_soenv.in
+++ /dev/null
@@ -1,44 +0,0 @@
---- set_soenv.in.orig	Thu Feb 27 15:12:36 2003
-+++ set_soenv.in	Wed Mar  5 21:16:43 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, 
-@@ -88,7 +88,7 @@
-      $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
-      $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS,
-      $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
--     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG );
-+     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $USE_LINUXJDK );
- #
- #-------------------------------------------
- # IId. Declaring the aliases.
-@@ -140,7 +140,8 @@
- $CC			= '@CC@';           # C compiler
- $CXX		= '@CXX@';          # C++ compiler
- $EXCEPTIONS	= '@EXCEPTIONS@';   # Exception handling type
--$ENABLE_DEBUG	= '@ENABLE_DEBUG@';  # Enable a debug build
-+$ENABLE_DEBUG	= '@ENABLE_DEBUG@'; # Enable a debug build
-+$USE_LINUXJDK	= '@USE_LINUXJDK@'; # Use the Linux JDK
- $WRAPCMD	= "";				# Wrapper (only for winnt)
- 
- #
-@@ -1265,7 +1266,12 @@
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
- }
- elsif ($platform eq "$FreeBSD")
--{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+{
-+   if ($USE_LINUXJDK eq "TRUE") {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
-+   } else {
-+       $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+   }
- }
- elsif ($platform eq "$NetBSD")
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
diff --git a/editors/openoffice.org-vcltesttool/files/patch-connectivity+source+drivers+mozab+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-connectivity+source+drivers+mozab+makefile.mk
deleted file mode 100644
index 2b83f2cd2ec7..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-connectivity+source+drivers+mozab+makefile.mk
+++ /dev/null
@@ -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)					\
diff --git a/editors/openoffice.org-vcltesttool/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
deleted file mode 100644
index 3601766ee561..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../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
-@@ -64,8 +64,8 @@
- #mozilla specific stuff.
- MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
- MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
--#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
--#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
-+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
-+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
- #End of mozilla specific stuff.
- 
- PRJ=..$/..$/..$/..
-@@ -107,7 +107,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -123,7 +123,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -141,7 +141,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
--	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS+=	    -DMOZILLA_CLIENT \
-             -DOSTYPE=\"Linux2.2.14-5\" -DOJI
- .IF "$(OS)" == "LINUX"
-@@ -157,6 +157,13 @@
-             -fno-rtti -Wall -Wconversion -Wpointer-arith \
-             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-             -Wno-long-long 
-+CDEFS     += -DTRACING
-+.ELIF "$(OS)" == "FREEBSD"
-+CFLAGS +=   -fPIC
-+CFLAGSCXX += \
-+            -fno-rtti -Wall -Wconversion -Wpointer-arith \
-+            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-+            -Wno-long-long -pthread 
- CDEFS     += -DTRACING
- .ENDIF
- .ENDIF
diff --git a/editors/openoffice.org-vcltesttool/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
deleted file mode 100644
index b63d2a25f184..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-vcltesttool/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-vcltesttool/files/patch-cppu+inc+uno+lbnames.h
deleted file mode 100644
index cb43c2d165e9..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-cppu+inc+uno+lbnames.h
+++ /dev/null
@@ -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."
diff --git a/editors/openoffice.org-vcltesttool/files/patch-cppu+prj+build.lst b/editors/openoffice.org-vcltesttool/files/patch-cppu+prj+build.lst
deleted file mode 100644
index 78fd210a1193..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-cppu+prj+build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-vcltesttool/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-cppuhelper+source+makefile.mk
deleted file mode 100644
index 5fb5bd636eb1..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-cppuhelper+source+makefile.mk
+++ /dev/null
@@ -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 ------------------------------------------------------
diff --git a/editors/openoffice.org-vcltesttool/files/patch-desktop+source+pkgchk+pkgchk_misc.h b/editors/openoffice.org-vcltesttool/files/patch-desktop+source+pkgchk+pkgchk_misc.h
deleted file mode 100644
index 391667b66ebd..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-desktop+source+pkgchk+pkgchk_misc.h
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-vcltesttool/files/patch-desktop+util+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-desktop+util+makefile.mk
deleted file mode 100644
index 025d644a8077..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-desktop+util+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-vcltesttool/files/patch-dtrans+source+X11+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-dtrans+source+X11+makefile.mk
deleted file mode 100644
index 5881f5d7f6a5..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-dtrans+source+X11+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-eventattacher+source+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-eventattacher+source+makefile.mk
deleted file mode 100644
index 4552698eb132..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-eventattacher+source+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-vcltesttool/files/patch-external+gcc3_specific+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-external+gcc3_specific+makefile.mk
deleted file mode 100644
index 6b8071f4030e..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-external+gcc3_specific+makefile.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../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"
- 
- .IF "$(OS)"!="MACOSX"
-+.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 @@
-         -rm -f $@
-         +ln -s libgcc_s.so.1 $@
- 
-+.ENDIF 
- .ENDIF 
- 
- .ENDIF
diff --git a/editors/openoffice.org-vcltesttool/files/patch-freetype+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-freetype+makefile.mk
deleted file mode 100644
index 3e5a8dd19f18..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-freetype+makefile.mk
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-vcltesttool/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-vcltesttool/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
- 
- /* 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-javaunohelper+source+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-javaunohelper+source+makefile.mk
deleted file mode 100644
index 19f6b86e5ab5..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-javaunohelper+source+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice.org-vcltesttool/files/patch-jni_uno+jni_java2uno.cxx
deleted file mode 100644
index a9ff9e3fed88..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-jni_uno+jni_java2uno.cxx
+++ /dev/null
@@ -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"
diff --git a/editors/openoffice.org-vcltesttool/files/patch-nas+nas-1.6.patch b/editors/openoffice.org-vcltesttool/files/patch-nas+nas-1.6.patch
deleted file mode 100644
index b6096654ebaf..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-nas+nas-1.6.patch
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-vcltesttool/files/patch-offapi+com+sun+star+setup+OSType.idl b/editors/openoffice.org-vcltesttool/files/patch-offapi+com+sun+star+setup+OSType.idl
deleted file mode 100644
index 3fee562c6d38..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-offapi+com+sun+star+setup+OSType.idl
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-vcltesttool/files/patch-offapi+util+makefile.pmk b/editors/openoffice.org-vcltesttool/files/patch-offapi+util+makefile.pmk
deleted file mode 100644
index 5cdbb1b4aa4a..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-offapi+util+makefile.pmk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-vcltesttool/files/patch-package+inc+HashMaps.hxx b/editors/openoffice.org-vcltesttool/files/patch-package+inc+HashMaps.hxx
deleted file mode 100644
index 35052d291ef7..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-package+inc+HashMaps.hxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-package+inc+ZipPackageFolder.hxx b/editors/openoffice.org-vcltesttool/files/patch-package+inc+ZipPackageFolder.hxx
deleted file mode 100644
index 014c61403380..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-package+inc+ZipPackageFolder.hxx
+++ /dev/null
@@ -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()
diff --git a/editors/openoffice.org-vcltesttool/files/patch-package+source+zippackage+ContentInfo.hxx b/editors/openoffice.org-vcltesttool/files/patch-package+source+zippackage+ContentInfo.hxx
deleted file mode 100644
index c4bf35e79f64..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-package+source+zippackage+ContentInfo.hxx
+++ /dev/null
@@ -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();
diff --git a/editors/openoffice.org-vcltesttool/files/patch-package+source+zippackage+ZipPackageFolder.cxx b/editors/openoffice.org-vcltesttool/files/patch-package+source+zippackage+ZipPackageFolder.cxx
deleted file mode 100644
index bb504c834eef..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-package+source+zippackage+ZipPackageFolder.cxx
+++ /dev/null
@@ -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 );
diff --git a/editors/openoffice.org-vcltesttool/files/patch-registry+source+regkey.cxx b/editors/openoffice.org-vcltesttool/files/patch-registry+source+regkey.cxx
deleted file mode 100644
index fad069f83f14..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-registry+source+regkey.cxx
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-vcltesttool/files/patch-rsc+source+rscpp+cpp.h b/editors/openoffice.org-vcltesttool/files/patch-rsc+source+rscpp+cpp.h
deleted file mode 100644
index 417ab33ba52f..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-rsc+source+rscpp+cpp.h
+++ /dev/null
@@ -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              */
- 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+nlsupport.c
deleted file mode 100644
index 49fe0da8589b..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+nlsupport.c
+++ /dev/null
@@ -1,160 +0,0 @@
---- ../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
-@@ -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)
- 
-@@ -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 @@
-     { "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-vcltesttool/files/patch-sal+osl+unx+pipe.c b/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+pipe.c
deleted file mode 100644
index 4aa7b8af1a61..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+pipe.c
+++ /dev/null
@@ -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 )
- 	{			
diff --git a/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+process.c b/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+process.c
deleted file mode 100644
index 50023576bec4..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+process.c
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+security.c b/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+security.c
deleted file mode 100644
index 0cc321dcd544..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+security.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../sal/osl/unx/security.c.orig	Sat Jul 20 22:53:31 2002
-+++ ../sal/osl/unx/security.c	Sat Jul 20 22:52:39 2002
-@@ -739,7 +739,7 @@
- 	}
- 
- 
--#elif (LINUX && (GLIBC >= 2))
-+#elif ((LINUX && (GLIBC >= 2)) || defined(FREEBSD))
- 	
- 	struct passwd	*pPasswd; 
- 	
diff --git a/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+socket.c b/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+socket.c
deleted file mode 100644
index 9541cac8583f..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+socket.c
+++ /dev/null
@@ -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! */
diff --git a/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+system.c b/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+system.c
deleted file mode 100644
index 8dc663ac03fc..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+system.c
+++ /dev/null
@@ -1,127 +0,0 @@
---- ../sal/osl/unx/system.c.orig	Sun Mar 17 12:34:13 2002
-+++ ../sal/osl/unx/system.c	Wed Apr  3 01:03:36 2002
-@@ -195,6 +195,73 @@
- }
- #endif
- 
-+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
-+           size_t buflen, struct passwd **result)
-+{
-+  struct passwd* res;
-+
-+  pthread_mutex_lock(&getrtl_mutex);
-+
-+  if ( res = getpwuid(uid) )
-+  {
-+    size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell;
-+
-+    pw_name = strlen(res->pw_name)+1;
-+    pw_passwd = strlen(res->pw_passwd)+1;
-+    pw_class = strlen(res->pw_class)+1;
-+    pw_gecos = strlen(res->pw_gecos)+1;
-+    pw_dir = strlen(res->pw_dir)+1;
-+    pw_shell = strlen(res->pw_shell)+1;
-+
-+    if (pw_name+pw_passwd+pw_class+pw_gecos
-+                                 +pw_dir+pw_shell < buflen)
-+    {
-+      memcpy(pwd, res, sizeof(struct passwd));
-+
-+      strncpy(buffer, res->pw_name, pw_name);
-+      pwd->pw_name = buffer;
-+      buffer += pw_name;
-+
-+      strncpy(buffer, res->pw_passwd, pw_passwd);
-+      pwd->pw_passwd = buffer;
-+      buffer += pw_passwd;
-+
-+      strncpy(buffer, res->pw_class, pw_class);
-+      pwd->pw_class = buffer;
-+      buffer += pw_class;
-+
-+      strncpy(buffer, res->pw_gecos, pw_gecos);
-+      pwd->pw_gecos = buffer;
-+      buffer += pw_gecos;
-+
-+      strncpy(buffer, res->pw_dir, pw_dir);
-+      pwd->pw_dir = buffer;
-+      buffer += pw_dir;
-+
-+      strncpy(buffer, res->pw_shell, pw_shell);
-+      pwd->pw_shell = buffer;
-+      buffer += pw_shell;
-+
-+      *result = pwd ;
-+      res = 0 ;
-+
-+    } else {
-+
-+      res = ENOMEM ;
-+
-+    }      
-+  
-+  } else {
-+
-+    res = errno ;
-+ 
-+  } 
-+
-+  pthread_mutex_unlock(&getrtl_mutex);
-+
-+  return res;
-+}
-+
- struct tm *localtime_r(const time_t *timep, struct tm *buffer)
- {
- 	struct tm* res;
-@@ -518,3 +585,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-vcltesttool/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+system.h
deleted file mode 100644
index c4e255952fc7..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+system.h
+++ /dev/null
@@ -1,35 +0,0 @@
---- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
-+++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
-@@ -205,6 +205,13 @@
- #   include <sys/ioctl.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 <machine/vmparam.h>
-+#   include <machine/pmap.h>
- #	include <sys/un.h>
- #   include <netinet/tcp.h>
- #	define 	IORESOURCE_TRANSFER_BSD 
-@@ -216,12 +223,13 @@
- #   elif BYTE_ORDER == PDP_ENDIAN
- #   	define _PDP_ENDIAN
- #   endif
--#   define  sched_yield() 				pthread_yield()
--#   define  pthread_testcancel()
- #	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
diff --git a/editors/openoffice.org-vcltesttool/files/patch-sal+textenc+tencinfo.c b/editors/openoffice.org-vcltesttool/files/patch-sal+textenc+tencinfo.c
deleted file mode 100644
index 7cf80c18d0a0..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-sal+textenc+tencinfo.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
-     /* 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 */
-+
-+    if (pMimeCharset == NULL)
-+	pMimeCharset = "usascii";
-+
-     static ImplStrCharsetDef const aVIPMimeCharsetTab[] =
-     {
-         { "usascii", RTL_TEXTENCODING_ASCII_US },
diff --git a/editors/openoffice.org-vcltesttool/files/patch-sal+workben+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-sal+workben+makefile.mk
deleted file mode 100644
index 369935e31d66..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-sal+workben+makefile.mk
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../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 @@
- 
- .IF "$(TESTAPP)" == "salstattest"
- 
--	CFLAGS+= /DUSE_SAL_STATIC
-+	CFLAGS+= -DUSE_SAL_STATIC
- 
- 	OBJFILES=	$(OBJ)$/salstattest.obj
- 
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- 
- CXXFILES=	tgetpwnam.cxx
- OBJFILES=	$(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN=	$(SLB)$/sal.lib
- 
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd | freebsd)
- .ENDIF # tgetpwname
- 
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-vcltesttool/files/patch-salhelper+source+gcc2_freebsd_intel.map b/editors/openoffice.org-vcltesttool/files/patch-salhelper+source+gcc2_freebsd_intel.map
deleted file mode 100644
index 1ffacf889bc6..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-salhelper+source+gcc2_freebsd_intel.map
+++ /dev/null
@@ -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:
-+*;
-+};
diff --git a/editors/openoffice.org-vcltesttool/files/patch-salhelper+source+gcc3_freebsd_intel.map b/editors/openoffice.org-vcltesttool/files/patch-salhelper+source+gcc3_freebsd_intel.map
deleted file mode 100644
index 823cff316ec7..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-salhelper+source+gcc3_freebsd_intel.map
+++ /dev/null
@@ -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:
-+		*;
-+};
-+
diff --git a/editors/openoffice.org-vcltesttool/files/patch-salhelper+source+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-salhelper+source+makefile.mk
deleted file mode 100644
index 3687664d8d16..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-salhelper+source+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../salhelper/source/makefile.mk.orig	Wed Nov 14 14:19:21 2001
-+++ ../salhelper/source/makefile.mk	Sun Mar  3 17:58:15 2002
-@@ -109,6 +109,10 @@
- SHL1VERSIONMAP=lngi.map
- .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
- SHL1VERSIONMAP=gcc3_linux_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
- .ENDIF
- 
- 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-salhelper+test+rtti+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-salhelper+test+rtti+makefile.mk
deleted file mode 100644
index 70f25048a24a..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-salhelper+test+rtti+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../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 @@
- 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
- .ENDIF
- 
- 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-sc+source+core+data+cell.cxx b/editors/openoffice.org-vcltesttool/files/patch-sc+source+core+data+cell.cxx
deleted file mode 100644
index 529f67a3e35f..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-sc+source+core+data+cell.cxx
+++ /dev/null
@@ -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>
diff --git a/editors/openoffice.org-vcltesttool/files/patch-scp+source+global+udk_base.scp b/editors/openoffice.org-vcltesttool/files/patch-scp+source+global+udk_base.scp
deleted file mode 100644
index 623eccb0ff09..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-scp+source+global+udk_base.scp
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-vcltesttool/files/patch-scp+source+player+player.scp b/editors/openoffice.org-vcltesttool/files/patch-scp+source+player+player.scp
deleted file mode 100644
index 2f8daab35cdd..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-scp+source+player+player.scp
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-vcltesttool/files/patch-scptools+source+linker+searchcache b/editors/openoffice.org-vcltesttool/files/patch-scptools+source+linker+searchcache
deleted file mode 100644
index 593e9eabf5bc..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-scptools+source+linker+searchcache
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: files/patch-scptools::source::linker::searchcache
-===================================================================
-RCS file: files/patch-scptools::source::linker::searchcache
-diff -N files/patch-scptools::source::linker::searchcache
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-scptools::source::linker::searchcache	4 Aug 2002 15:28:04 -0000
-@@ -0,0 +1,27 @@
-+--- ../scptools/source/linker/searchcache.hxx.orig	Fri Aug  2 22:53:46 2002
-++++ ../scptools/source/linker/searchcache.hxx	Fri Aug  2 22:54:50 2002
-+@@ -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	Fri Aug  2 22:53:35 2002
-++++ ../scptools/source/linker/searchcache.cxx	Fri Aug  2 22:55:14 2002
-+@@ -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-vcltesttool/files/patch-scptools+source+linker+ziplst.cxx b/editors/openoffice.org-vcltesttool/files/patch-scptools+source+linker+ziplst.cxx
deleted file mode 100644
index 83b84631542e..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-scptools+source+linker+ziplst.cxx
+++ /dev/null
@@ -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;
- 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-setup2+inc+fields.hxx b/editors/openoffice.org-vcltesttool/files/patch-setup2+inc+fields.hxx
deleted file mode 100644
index d56e12f2abf4..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-setup2+inc+fields.hxx
+++ /dev/null
@@ -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[];
diff --git a/editors/openoffice.org-vcltesttool/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-vcltesttool/files/patch-setup2+mow+source+loader+loader.c
deleted file mode 100644
index 396c586ee3a3..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-setup2+mow+source+loader+loader.c
+++ /dev/null
@@ -1,30 +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"
- 
-@@ -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" \
diff --git a/editors/openoffice.org-vcltesttool/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-setup2+mow+source+loader+makefile.mk
deleted file mode 100644
index 5460e4296587..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-setup2+mow+source+loader+makefile.mk
+++ /dev/null
@@ -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"
- 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-setup2+patch+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-setup2+patch+makefile.mk
deleted file mode 100644
index 53846a8bdfc9..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-setup2+patch+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-vcltesttool/files/patch-setup2+script+setupserver b/editors/openoffice.org-vcltesttool/files/patch-setup2+script+setupserver
deleted file mode 100644
index 450ea386c841..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-setup2+script+setupserver
+++ /dev/null
@@ -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`"
diff --git a/editors/openoffice.org-vcltesttool/files/patch-setup2+source+compiler+decltor.cxx b/editors/openoffice.org-vcltesttool/files/patch-setup2+source+compiler+decltor.cxx
deleted file mode 100644
index 98f6ad2f7567..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-setup2+source+compiler+decltor.cxx
+++ /dev/null
@@ -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";
diff --git a/editors/openoffice.org-vcltesttool/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx b/editors/openoffice.org-vcltesttool/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
deleted file mode 100644
index ac0b39a6aa47..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx
+++ /dev/null
@@ -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) );
diff --git a/editors/openoffice.org-vcltesttool/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-vcltesttool/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
deleted file mode 100644
index f199b18823e1..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-setup2+source+service+interface.cxx b/editors/openoffice.org-vcltesttool/files/patch-setup2+source+service+interface.cxx
deleted file mode 100644
index 8e478e17971d..000000000000
--- a/editors/openoffice.org-vcltesttool/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-vcltesttool/files/patch-shell+source+cmdmail+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-shell+source+cmdmail+makefile.mk
deleted file mode 100644
index 0476285c802e..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-shell+source+cmdmail+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-vcltesttool/files/patch-shell+source+proxysettings+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-shell+source+proxysettings+makefile.mk
deleted file mode 100644
index e83cf7c9d7a1..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-shell+source+proxysettings+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-vcltesttool/files/patch-shell+source+unix+exec+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-shell+source+unix+exec+makefile.mk
deleted file mode 100644
index 0b7712ee35f8..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-shell+source+unix+exec+makefile.mk
+++ /dev/null
@@ -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=
- 		
diff --git a/editors/openoffice.org-vcltesttool/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-vcltesttool/files/patch-solenv+bin+addsym.awk
deleted file mode 100644
index 996e282b350b..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-solenv+bin+addsym.awk
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
-+++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
-@@ -72,11 +72,11 @@
- END {
-     if (state == 0) {
-         print "# Weak RTTI symbols for C++ exceptions:"
--        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
-+        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
-     }
- }
- state == 2 {
--    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
-+    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
-     state = 3
- }
- /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice.org-vcltesttool/files/patch-solenv+bin+mapgen.pl b/editors/openoffice.org-vcltesttool/files/patch-solenv+bin+mapgen.pl
deleted file mode 100644
index 71ebdb934120..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-solenv+bin+mapgen.pl
+++ /dev/null
@@ -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, $_);
- 	};
diff --git a/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+startup+FREEBSD+macros.mk b/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+startup+FREEBSD+macros.mk
deleted file mode 100644
index 0c1b107de988..000000000000
--- a/editors/openoffice.org-vcltesttool/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-vcltesttool/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+tg_ext.mk
deleted file mode 100644
index 701692c9425a..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+tg_ext.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+tg_moz.mk b/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+tg_moz.mk
deleted file mode 100644
index 255a41f92281..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+tg_moz.mk
+++ /dev/null
@@ -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) $@
diff --git a/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index b4764485aa86..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,202 +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
-+# 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*=$(CC)
-+
-+# default linker flags
-+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -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
diff --git a/editors/openoffice.org-vcltesttool/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-soltools+checkdll+makefile.mk
deleted file mode 100644
index e6407402258a..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-soltools+checkdll+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-vcltesttool/files/patch-soltools+mkdepend+main.c b/editors/openoffice.org-vcltesttool/files/patch-soltools+mkdepend+main.c
deleted file mode 100644
index cffd5cbb1f43..000000000000
--- a/editors/openoffice.org-vcltesttool/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-vcltesttool/files/patch-stlport+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-stlport+makefile.mk
deleted file mode 100644
index 797817ba85be..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-stlport+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+corereflection+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-stoc+source+corereflection+makefile.mk
deleted file mode 100644
index 4b319b08d401..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+corereflection+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+defaultregistry+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-stoc+source+defaultregistry+makefile.mk
deleted file mode 100644
index 4cae0476415a..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+defaultregistry+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+implementationregistration+implreg.cxx b/editors/openoffice.org-vcltesttool/files/patch-stoc+source+implementationregistration+implreg.cxx
deleted file mode 100644
index 341d621d872c..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+implementationregistration+implreg.cxx
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+implementationregistration+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-stoc+source+implementationregistration+makefile.mk
deleted file mode 100644
index 0051043b7ecb..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+implementationregistration+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+inspect+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-stoc+source+inspect+makefile.mk
deleted file mode 100644
index c7cd85253c11..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+inspect+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+invocation+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-stoc+source+invocation+makefile.mk
deleted file mode 100644
index 9ac2072a5612..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+invocation+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+invocation_adapterfactory+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
deleted file mode 100644
index 8853ad39a90e..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+javaloader+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-stoc+source+javaloader+makefile.mk
deleted file mode 100644
index cea499f15c57..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+javaloader+makefile.mk
+++ /dev/null
@@ -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=		
diff --git a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+javavm+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-stoc+source+javavm+makefile.mk
deleted file mode 100644
index b895a2b968d4..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+javavm+makefile.mk
+++ /dev/null
@@ -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)
- 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+loader+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-stoc+source+loader+makefile.mk
deleted file mode 100644
index 5a08ee5937b6..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+loader+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+namingservice+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-stoc+source+namingservice+makefile.mk
deleted file mode 100644
index e573081bc21d..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+namingservice+makefile.mk
+++ /dev/null
@@ -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
- 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+proxy_factory+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-stoc+source+proxy_factory+makefile.mk
deleted file mode 100644
index 9110b2f50cd1..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+proxy_factory+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+registry_tdprovider+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-stoc+source+registry_tdprovider+makefile.mk
deleted file mode 100644
index 9d974d1c0d10..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+registry_tdprovider+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+servicemanager+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-stoc+source+servicemanager+makefile.mk
deleted file mode 100644
index 746776d54759..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+servicemanager+makefile.mk
+++ /dev/null
@@ -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)
diff --git a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+tdmanager+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-stoc+source+tdmanager+makefile.mk
deleted file mode 100644
index 76403fdde841..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+tdmanager+makefile.mk
+++ /dev/null
@@ -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=
diff --git a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+typeconv+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-stoc+source+typeconv+makefile.mk
deleted file mode 100644
index dc647f89a166..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+typeconv+makefile.mk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-vcltesttool/files/patch-store+util+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-store+util+makefile.mk
deleted file mode 100644
index 6bef6e960f2e..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-store+util+makefile.mk
+++ /dev/null
@@ -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
- 
- 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-svx+source+fmcomp+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-svx+source+fmcomp+makefile.mk
deleted file mode 100644
index b16030080c0d..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-svx+source+fmcomp+makefile.mk
+++ /dev/null
@@ -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= \
diff --git a/editors/openoffice.org-vcltesttool/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-sysui+oounix+office+gnome+makefile.mk
deleted file mode 100644
index 3d7c2e22aa63..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-sysui+oounix+office+gnome+makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
-+++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
-@@ -84,7 +84,9 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- APP1LIBS=
-+.IF "$(OS)"!="FREEBSD"
- APP1STDLIBS=-ldl
-+.ENDIF
- 
- GNOMEFILES= \
- 	locales.tab
diff --git a/editors/openoffice.org-vcltesttool/files/patch-tools+source+string+tstring.cxx b/editors/openoffice.org-vcltesttool/files/patch-tools+source+string+tstring.cxx
deleted file mode 100644
index 12bd6bd0b244..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-tools+source+string+tstring.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../tools/source/string/tstring.cxx.orig	Sat Aug 10 12:53:42 2002
-+++ ../tools/source/string/tstring.cxx	Sat Aug 10 12:54:16 2002
-@@ -103,6 +103,9 @@
- xub_StrLen ImplStringLen( const sal_Char* pStr )
- {
- 	const sal_Char* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
-@@ -113,6 +116,9 @@
- xub_StrLen ImplStringLen( const sal_Unicode* pStr )
- {
- 	const sal_Unicode* pTempStr = pStr;
-+
-+	if (pStr == NULL)
-+		return(0);
- 	while( *pTempStr )
- 		pTempStr++;
- 	return (xub_StrLen)(pTempStr-pStr);
diff --git a/editors/openoffice.org-vcltesttool/files/patch-unoil+makefile.pmk b/editors/openoffice.org-vcltesttool/files/patch-unoil+makefile.pmk
deleted file mode 100644
index 7febdabf7b4b..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-unoil+makefile.pmk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../unoil/makefile.pmk.orig	Fri Aug 31 18:04:43 2001
-+++ ../unoil/makefile.pmk	Thu Sep 12 12:17:50 2002
-@@ -74,8 +74,8 @@
- JAVAFILESLIST	:= $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java)
- .ENDIF          # "$(L10N_framework)"==""
- 
--GENJAVAFILES	:= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
--GENCLASSFILES	:= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
-+GENJAVAFILES	+= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
-+GENCLASSFILES	+= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
- 
- # --- Targets ------------------------------------------------------
- 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-unzip+source+file_io.c b/editors/openoffice.org-vcltesttool/files/patch-unzip+source+file_io.c
deleted file mode 100644
index 2f85a108c185..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-unzip+source+file_io.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../unzip/source/file_io.c.orig	Sat Oct 19 11:58:45 2002
-+++ ../unzip/source/file_io.c	Sat Oct 19 12:03:40 2002
-@@ -500,7 +500,7 @@
- #ifdef MPW
- 				pCallBack( 0 );
- #else
--				#if defined LINUX || defined MACOSX || defined NETBSD
-+				#if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD
- 				pCallBack( lseek(outfd, 0, SEEK_CUR) );
- 				#else
- 				pCallBack( tell( outfd ) );
-@@ -865,7 +865,9 @@
- 	static struct timeb tbp;
- #endif /* !__386BSD__ */
- #else /* !BSD */
-+#if (!defined(NETBSD) && !defined(FREEBSD))
- 	extern long timezone;
-+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
- #endif /* ?BSD */
- #endif /* ?AMIGA */
- 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice.org-vcltesttool/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
deleted file mode 100644
index 41defbd5eb59..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
-+++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
-@@ -65,6 +65,8 @@
- #include <glyphcache.hxx>
- 
- #define Region XLIB_Region
-+typedef unsigned long CARD32;
-+#define Cursor CARD32
- #include <X11/extensions/Xrender.h>
- #undef Region
- 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
deleted file mode 100644
index fefc925db41f..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
-@@ -78,6 +78,12 @@
- GETSTYLE_GNOME=getstyle-gnome-linux-intel
- HASGNOME2=TRUE
- .ENDIF
-+.IF "$_(HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
-+.ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
- HASGNOME2=TRUE
diff --git a/editors/openoffice.org-vcltesttool/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
deleted file mode 100644
index 984313fc540a..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
-@@ -75,9 +75,15 @@
- 
- HASGNOME2=
- 
--.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
-+.IF "$(OS)$(CPU)"=="LINUXI"
- MSGBOX_GNOME=msgbox-gnome-linux-intel
- HASGNOME2=TRUE
-+.ENDIF
-+.IF "$(_HAS_GNOME2)"=="TRUE"
-+.IF "$(OS)$(CPU)"=="FREEBSDI"
-+MSGBOX_GNOME=msgbox-gnome-freebsd-intel
-+HASGNOME2=TRUE
-+.ENDIF
- .ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISS"
- MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice.org-vcltesttool/files/patch-vcl+workben+officeacceptthread.cxx b/editors/openoffice.org-vcltesttool/files/patch-vcl+workben+officeacceptthread.cxx
deleted file mode 100644
index 07d9f1060557..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-vcl+workben+officeacceptthread.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/workben/officeacceptthread.cxx.orig	Wed Mar  5 20:25:36 2003
-+++ ../vcl/workben/officeacceptthread.cxx	Wed Mar  5 20:26:03 2003
-@@ -125,7 +125,7 @@
- #if defined (SOLARIS)
- 				int status;
- 				nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG);
--#elif defined(LINUX)
-+#elif defined(LINUX) || defined (FREEBSD)
- 				nRet = kill(aProcessInfo.Ident, 0);
- #endif
- #if defined (UNX)
diff --git a/editors/openoffice.org-vcltesttool/files/zipmoz.sh b/editors/openoffice.org-vcltesttool/files/zipmoz.sh
deleted file mode 100644
index 43a4591f3430..000000000000
--- a/editors/openoffice.org-vcltesttool/files/zipmoz.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/sh -f
-
-RUNTIME_FILES=" components/libabsyncsvc.so components/libaddrbook.so \
-		components/libmork.so components/libmozldap.so \
-		components/libnecko.so components/libprofile.so \
-		components/librdf.so components/libstrres.so \
-		components/libunicharutil.so components/libuconv.so \
-		components/libucvcn.so components/libucvibm.so \
-		components/libucvja.so components/libucvko.so \
-		components/libucvlatin.so components/libucvtw.so \
-		components/libucvtw2.so components/liburiloader.so \
-		components/libvcard.so components/libxpconnect.so \
-		components/libpref.so components/libchrome.so libmozjs.so \
-		libmsgbaseutil.so libldap50.so libnspr4.so libplc4.so \
-		libplds4.so libxpcom.so libmozz.so component.reg \
-		components/necko_dns.xpt components/xpcom_xpti.xpt \
-		components/xpcom_threads.xpt components/xpcom_io.xpt \
-		components/xpcom_ds.xpt components/xpcom_components.xpt \
-		components/xpcom_base.xpt components/xpti.dat \
-		defaults/pref/all.js defaults/pref/config.js \
-		defaults/pref/editor.js defaults/pref/initpref.js \
-		defaults/pref/inspector.js defaults/pref/mailnews.js \
-		defaults/pref/security-prefs.js defaults/pref/unix.js \
-		defaults/pref/xpinstall.js"
-
-LIB_FILES="	lib/libembed_base_s.a lib/libmozreg_s.a \
-		lib/libnspr4.so lib/libxpcom.so lib/libprldap50.so"
-
-INC_FILES="include/"
-INC_FILES2="public/"
-
-if [ $# -lt 2 -o $# -gt 3 ] ; then
-	echo 
-	echo usage: $0 mozilla_dist target [target_dir]
-	echo
-	echo where:
-	echo
-	echo "mozilla_dist points to the mozilla distribution"
-	echo "target concatenates  OS, compiler and CPU (e.g. FREEBSDGCCI etc)"
-	echo "target_dir is the directory to place the zips"
-	exit 1
-fi
-
-MOZ_DIST=$1
-TARGET=$2
-if [ "w$3" != "w" ]; then
-	TARGET_DIR=$3
-else
-	if [ "w$TARGET_DIR" == "w" ]; then
-		TARGET_DIR=
-	fi
-fi
-
-ZIP_TARGET=$TARGET_DIR
-if [ -z "$ZIP_TARGET" ] ; then
-	ZIP_TARGET=../
-fi
-
-# just to remember the current working directory
-STARTING_DIR=`pwd`
-
-echo
-echo --- creating zips for $TARGET, using mozilla distribution in $MOZ_DIST
-
-# Create the directories
-[ ! -d $TARGET_DIR/$TARGET/runtime ] && mkdir -p $TARGET_DIR/$TARGET/runtime
-[ ! -d $TARGET_DIR/$TARGET/runtime/components ] && mkdir -p $TARGET_DIR/$TARGET/runtime/components
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults/pref ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults/pref
-[ ! -d $TARGET_DIR/$TARGET/lib ] && mkdir -p $TARGET_DIR/$TARGET/lib
-[ ! -d $TARGET_DIR/$TARGET/inc ] && mkdir -p $TARGET_DIR/$TARGET/inc
-[ ! -d $TARGET_DIR/$TARGET/inc/nspr ] && mkdir -p $TARGET_DIR/$TARGET/inc/nspr
-[ ! -d $TARGET_DIR/$TARGET/inc/obsolete ] && mkdir -p $TARGET_DIR/$TARGET/inc/obsolete
-
-# Copy the files
-echo
-echo --- copying files
-echo
-
-for i in $RUNTIME_FILES; do
-	if [ ! -f $MOZ_DIST/bin/$i ]; then
-		echo $MOZ_DIST/bin/$i does not exist, check your distribution
-	else
-		if [ `echo $i | grep component` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/components/
-		elif [ `echo $i | grep defaults` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/defaults/pref/
-		else
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/
-		fi
-	fi
-done
-
-for i in $LIB_FILES; do
-	if [ ! -f $MOZ_DIST/$i ]; then
-		echo $MOZ_DIST/$i does not exist, check your distribution
-	else
-		cp -R -L $MOZ_DIST/$i $TARGET_DIR/$TARGET/lib/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES`; do
-	if [ ! -d $i ]; then 
-		cp -R -L $MOZ_DIST/include/$i $TARGET_DIR/$TARGET/inc/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES2`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/public/$i $TARGET_DIR/$TARGET/inc
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/$i $TARGET_DIR/$TARGET/inc/nspr
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr/obsolete`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/obsolete/$i $TARGET_DIR/$TARGET/inc/obsolete
-	fi
-done
-
-# delete old zips
-
-[ -f $TARGET_DIR/$TARGET/runtime.zip ] && rm -f $TARGET_DIR/$TARGET/runtime.zip
-[ -f $TARGET_DIR/$TARGET/lib.zip ] && rm -f $TARGET_DIR/$TARGET/lib.zip
-[ -f $TARGET_DIR/$TARGET/inc.zip ] && rm -f $TARGET_DIR/$TARGET/inc.zip
-
-# zip the runtime files
-
-echo
-echo --- creating ${TARGET}runtime.zip
-echo
-
-cd $TARGET_DIR/$TARGET/runtime
-find . -type f | zip $ZIP_TARGET/${TARGET}runtime.zip -@
-
-# zip the lib files
-echo 
-echo --- creating ${TARGET}lib.zip
-echo 
-
-cd $TARGET_DIR/$TARGET/lib
-find . -type f | zip $ZIP_TARGET/${TARGET}lib.zip -@
-
-# zip the inc files
-echo
-echo --- creating ${TARGET}inc.zip
-echo
-
-cd $TARGET_DIR/$TARGET/inc
-find . -type f | zip $ZIP_TARGET/${TARGET}inc.zip -@
-
-# remove dirs
-cd $STARTING_DIR
-rm -rf $TARGET_DIR/$TARGET
-
-echo
-echo --- done
-echo
-
diff --git a/editors/openoffice.org-vcltesttool/pkg-descr b/editors/openoffice.org-vcltesttool/pkg-descr
deleted file mode 100644
index 31fd1b12161a..000000000000
--- a/editors/openoffice.org-vcltesttool/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-OpenOffice.org is an Open Source, community-developed, multi-platform office
-productivity suite. It includes the key desktop applications, such as a
-word processor, spreadsheet, presentation manager, and drawing program,
-with a user interface and feature set similar to other office suites.
-
-Components include:
-  * A universal word processing application for creating business
-    letters, extensive text documents, professional layouts, and HTML
-    documents.
-  * A sophisticated application for performing advanced spreadsheet
-    functions, such as analyzing figures, creating lists, and viewing data.
-  * A tool for creating effective eye-catching presentations.
-  * A vector-oriented draw module that enables the creation of 3D
-    illustrations
diff --git a/editors/openoffice.org-vcltesttool/pkg-message b/editors/openoffice.org-vcltesttool/pkg-message
deleted file mode 100644
index 1dc749f301c2..000000000000
--- a/editors/openoffice.org-vcltesttool/pkg-message
+++ /dev/null
@@ -1,73 +0,0 @@
-OpenOffice.org Build 643 Personal Install How-To
-
-Written by:	Martin Blapp <mbr@freebsd.org>
-
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
-
-1 User installation
--------------------
-
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
---------------
-
-There are some wrappers installed for fast startup.
-Add "${PREFIX}/bin/" to your PATH and you will be able
-to use them.
-
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
-
-If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
-version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
diff --git a/editors/openoffice.org-vcltesttool/pkg-plist b/editors/openoffice.org-vcltesttool/pkg-plist
deleted file mode 100644
index 28bd78453b52..000000000000
--- a/editors/openoffice.org-vcltesttool/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, do not delete. Package list is generated automatically.
diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile
deleted file mode 100644
index 9c71de2359bf..000000000000
--- a/editors/staroffice70/Makefile
+++ /dev/null
@@ -1,242 +0,0 @@
-# New ports collection makefile for: StarOffice 6.0
-# Date created:		03 October 2001
-# Whom:                 Martin Blapp
-#
-# $FreeBSD$
-#
-
-PORTNAME=	staroffice
-PORTVERSION=	6.0
-PORTREVISION=	2
-CATEGORIES=	editors linux
-MASTER_SITES=	ftp://ftp.sunsite.auc.dk/disk6/sun-patches/:patch \
-		ftp://ftp.math.ohio-state.edu/private/sun/.../:patch \
-		ftp://ftp.uga.edu/pub/unix/sun/patches/:patch \
-		ftp://ftp.cs.tu-berlin.de/pub/sun/sun-fixes/.../:patch
-DISTNAME=	so-6_0-ga-bin-linux-en.bin
-.if !defined(USE_CDROM)
-DISTFILES=      so-6_0-ga-bin-linux-en.bin 112887-03.tar:patch
-.endif
-.if defined(WITH_ADABAS)
-DISTFILES+=	soa-6_0-ga-bin-linux-en.bin
-.endif
-
-EXTRACT_ONLY=	112887-03.tar
-
-MAINTAINER=	mbr@FreeBSD.org
-COMMENT=	Wordprocessor/dbase/spreadheet/drawing/chart
-
-ONLY_FOR_ARCHS=	i386
-NO_CDROM=	'Must be bought and downloaded direct from Sun via www interface'
-
-USE_LINUX=	yes
-IS_INTERACTIVE=	yes
-NO_BUILD=	yes
-SOVERSION=	${PORTNAME}${PORTVERSION}
-WRKSRC=		${WRKDIR}/${SOVERSION}
-TMPDIR=		${WRKDIR}/tmp
-LD_PATH=	${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib
-INSTDB.INS=	${PREFIX}/${SOVERSION}/program/instdb.ins
-SUNSOLVE=	${WRKDIR}/112887-03
-ADABAS_DIST=	soa-6_0-ga-bin-linux-en.bin
-
-.include <bsd.port.pre.mk>
-
-SIZE!=		/bin/df -k . | ${TAIL} -n 1 | ${AWK} '{print $$4}'
-LINPROCFS!=	/sbin/mount | ${GREP} linprocfs | ${AWK} '{print $1}'
-
-pre-fetch:
-.if ${LINPROCFS}
-	@${ECHO}
-	@${ECHO} Check if linprocfs is running: YES
-.else
-	@${ECHO} Check if linprocfs is running: NO
-	@${ECHO}
-	@${ECHO} ERROR:
-	@${ECHO}
-	@${ECHO} Staroffice setup needs a running linprocfs. it seems
-	@${ECHO} that procfs is not mounted on your system.  Please
-	@${ECHO} read the linprocfs\(5\) manpage and ensure the
-	@${ECHO} the following line is in /etc/fstab, and that the
-	@${ECHO} linprocfs file system is mounted:
-	@${ECHO}
-	@${ECHO} linproc /compat/linux/proc linprocfs rw 0 0
-	@${ECHO}
-	@${FALSE}
-.endif
-.if !exists(${LINUXBASE}/etc/mtab)
-	@${ECHO}
-	@${ECHO} ERROR:
-	@${ECHO}
-	@${ECHO} The file ${LINUXBASE}/etc/mtab is missing.
-	@${ECHO} Staroffice needs this file else some functions
-	@${ECHO} are not working. You can create it with
-	@${ECHO}
-	@${ECHO} touch ${LINUXBASE}/etc/mtab
-	@${ECHO}
-	@${FALSE}
-.else
-	@${ECHO} Check if ${LINUXBASE}/etc/mtab exists: YES
-.endif
-.if ${OSVERSION} < 450000
-	@${ECHO}
-	@${ECHO} ERROR:
-	@${ECHO}
-	@${ECHO} OS-VERSION ${OSVERSION}
-	@${ECHO}
-	@${ECHO} Staroffice depends on a scripting fix for
-	@${ECHO} /usr/src/sys/i386/linux/linux_sysvec.c
-	@${ECHO}
-	@${ECHO} Please upgrade to FreeBSD 4.5 or later.
-	@${ECHO}
-	@${FALSE}
-.endif
-.if ${SIZE} < 400000
-	@${ECHO}
-	@${ECHO} ERROR:
-	@${ECHO}
-	@${ECHO} There is only ${SIZE}K free disk space in
-	@${ECHO} ${WRKDIRPREFIX}. To unpack Staroffice needs
-	@${ECHO} at least 400000K free diskspace.
-	@${FALSE}
-.endif
-.if !defined(WITH_ADABAS)
-	@${ECHO}
-	@${ECHO} If you like to install staroffice with ADABAS database support,
-	@${ECHO} cancel this installation now and start make again with
-	@${ECHO} WITH_ADABAS=YES.
-	@${ECHO}
-.endif
-.if defined(USE_CDROM)
-DLTEST=112887-03.tar
-.else
-.if exists(/cdrom/linux/office60/setup)
-	@${ECHO}
-	@${ECHO} It seems that you have a Sun StarOffice 6.0 CDROM
-	@${ECHO} mounted on ${CD_MOUNTPT}.  If you wish to install from
-	@${ECHO} this CD-ROM, please run 
-	@${ECHO}
-	@${ECHO}        make -USE_CDROM
-	@${ECHO}
-	@${ECHO} Otherwise please unmount the CD-ROM.
-	@${ECHO}
-	@${FALSE}
-.endif
-DLTEST=${DISTNAME}
-.endif
-.if !exists(${DISTDIR}/${DLTEST})
-IGNORE="Please manually download ${DLTEST} from http://www.sun.com/staroffice.  Put ${DLTEST} into the directory ${DISTDIR} and run make again."
-.endif
-
-post-extract:
-.if !defined(DISPLAY) || ${DISPLAY} == ""
-	@ ${ECHO}
-	@ ${ECHO} Can\'t open display:
-	@ ${ECHO} Please check your DISPLAY variable.
-	@ ${ECHO}
-	@ ${FALSE}
-.else
-	@${MKDIR} ${WRKSRC}
-.if defined(USE_CDROM)
-	@ln -sf /cdrom/linux/office60/* ${WRKSRC}
-.else
-	@${MKDIR} ${TMPDIR}
-	@${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
-	@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
-	@cd ${WRKSRC}
-	@SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
-	@${RM} ${WRKSRC}/${DISTNAME}
-.endif
-.if defined(WITH_ADABAS)
-	@${CP} ${_DISTDIR}/${ADABAS_DIST} ${WRKSRC}
-	@${CHMOD} 755 ${WRKSRC}/${ADABAS_DIST}
-.endif
-.endif
-
-post-configure:
-	@${SED} -i .orig -e \
-	    's|DefaultDestPath = "staroffice%PRODUCTVERSION";|DefaultDestPath = "${PREFIX}/staroffice%PRODUCTVERSION";|' \
-	    ${WRKSRC}/setup.ins
-
-do-install:
-.if !defined(DISPLAY) || ${DISPLAY} == ""
-	@ ${ECHO}
-	@ ${ECHO} Can\'t open display:
-	@ ${ECHO} Please check your DISPLAY variable.
-	@ ${ECHO}
-	@ ${FALSE}
-.else
-.if exists(${LINUXBASE}/${PREFIX})
-	@${LN} -fs ${LINUXBASE}/${PREFIX}/${SOVERSION} ${PREFIX}/${SOVERSION}
-.endif
-.if !exists(${LINUXBASE}/usr/X11R6/lib/libXrender.so)
-.if exists(${LINUXBASE}/usr/X11R6/lib/libXrender.so.1.0)
-	@${LN} -fs ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1.0 \
-		${WRKDIR}/tmp/libXrender.so
-.endif
-.endif
-	@${ECHO} ;
-	@${ECHO_MSG} "===>   STEP 1: Main Setup ${PKGNAME}"
-	@${ECHO} ;
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${TMPDIR} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net'
-	@if [ -f ${PREFIX}/${SOVERSION}/program/setup ]; then \
-		${ECHO} ; \
-		${ECHO} Ignore the error message. StarOffice6.0 has been installed ; \
-		${ECHO} successfully on your system. ; \
-		${ECHO} ; \
-	else \
-		${ECHO} ; \
-		${ECHO} An error occured during StarOffice6.0 install. Please send a mail with debug-output and ; \
-		${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. ; \
-		${ECHO} ; \
-		${FALSE} ; \
-	fi
-	@${ECHO} ;
-	@${ECHO_MSG} "===>   STEP 2: Choosing now a workstation installation for user root"
-	@${ECHO} ;
-	@${ECHO} This step is needed to be able to install the service pack. ;
-	@${ECHO} ;
-.if !exists(${LINUXBASE}/usr/X11R6/lib/libXrender.so)
-	@${LN} -fs ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1.0 ${PREFIX}/${SOVERSION}/program/libXrender.so
-.endif
-	@${SED} -i .orig -e 's%DefaultDestPath = "${PREFIX}/staroffice%DefaultDestPath = "staroffice%' \
-	${INSTDB.INS}
-.endif
-.if defined(WITH_ADABAS)
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${TMPDIR} ${LINUXBASE}/bin/sh -c '${WRKSRC}/${ADABAS_DIST}'
-.endif
-	@${ECHO} ;
-	@${ECHO_MSG} "===>   STEP 3: Applying sunsolve patches for ${PKGNAME}"
-	@${ECHO} ;
-	@make install-patch
-	@${CAT} ${PKGMESSAGE}
-
-post-install:
-	@${ECHO_MSG} "===>  Add wrapper scripts";
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/wrapper \
-	   > ${WRKDIR}/staroffice6
-	 @${INSTALL_SCRIPT} ${WRKDIR}/staroffice6 ${PREFIX}/bin/staroffice6
-	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-sagenda
-	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-scalc
-	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-sdraw
-	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-setup
-	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-sfax
-	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-simpress
-	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-spadmin
-	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-sweb
-	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-swriter
-	@${ECHO} StarOffice6.0 has been installed successfully.  In order to use
-	@${ECHO} it, execute ${PREFIX}/bin/staroffice6.
-	@${ECHO} 
-
-install-patch:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${TMPDIR} ${LINUXBASE}/bin/sh -c '${WRKSRC}/../112887-03/so-6_0-pp2-bin-linux.bin -patch:${PREFIX}/staroffice6.0'
-
-install-update:
-	@make extract
-	@make install-patch
-
-.include <bsd.port.post.mk>
diff --git a/editors/staroffice70/distinfo b/editors/staroffice70/distinfo
deleted file mode 100644
index 8c5e14088faa..000000000000
--- a/editors/staroffice70/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (soa-6_0-ga-bin-linux-en.bin) = 7f7003401e8533e7795faa0fd112111c
-MD5 (so-6_0-ga-bin-linux-en.bin) = 97cba97cb348d071bea7e8fc08079151
-MD5 (112887-03.tar) = 019298e5fb7be33944cc792b433fbb6f
diff --git a/editors/staroffice70/files/wrapper b/editors/staroffice70/files/wrapper
deleted file mode 100644
index 2d33ccef2198..000000000000
--- a/editors/staroffice70/files/wrapper
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/editors/staroffice70/files/Attic/wrapper,v 1.1 2003-02-05 14:11:27 mbr Exp $
-
-sopath=%%PREFIX%%/staroffice6.0/program/
-program=`echo $0 | sed -e 's|.*-||'`
-
-case $program in
-$0)
-	exec $sopath/soffice "$@"
-	;;
-	*)
-	exec $sopath/$program "$@"
-	;;
-esac
diff --git a/editors/staroffice70/pkg-descr b/editors/staroffice70/pkg-descr
deleted file mode 100644
index 45767200a063..000000000000
--- a/editors/staroffice70/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-StarOffice 6.0 is a suite of office productivity applications containing
-a word processor, spreadsheet, graphics and presentation, image
-manipulation, and charting.  StarOffice offers the ability to read and
-write Microsoft Office files.
-
-The integrated StarOffice5.2 desktop, email-client and calendar have been
-removed to concentrate work on the core applications.
diff --git a/editors/staroffice70/pkg-message b/editors/staroffice70/pkg-message
deleted file mode 100644
index 4607a37a2030..000000000000
--- a/editors/staroffice70/pkg-message
+++ /dev/null
@@ -1,26 +0,0 @@
-StarOffice 6.0 Personal Install How-To
-
-Written by:   Martin Blapp <mb@imp.ch>
-
-------------------------------------------------------------------
-
-BUGS:
-
-If a user installation fails, just restart it. It will
-work the second time. Remove then your $HOME/staroffice6.0
-directory and the line beginning with "StarOffice 6.0" in
-your $HOME/.sversionrc and restart the installation.
-
-------------------------------------------------------------------
-
-You will very shortly have finished  a network install of
-StarOffice 6.0. Once that is done exit X11 and run it again as
-the user that you usually use. There are some wrappers
-installed in $PREFIX. Run "staroffice6" and begin a standard
-workstation install. 
-
-It will then be ready to use.
-
-Good Luck
-
-------------------------------------------------------------------
diff --git a/editors/staroffice70/pkg-plist b/editors/staroffice70/pkg-plist
deleted file mode 100644
index 9dba2be3b913..000000000000
--- a/editors/staroffice70/pkg-plist
+++ /dev/null
@@ -1,3632 +0,0 @@
-@comment $FreeBSD$
-staroffice6.0/LICENSE
-staroffice6.0/README
-staroffice6.0/help/custom.css
-staroffice6.0/help/en/common.jar
-staroffice6.0/help/en/custom.css
-staroffice6.0/help/en/err.html
-staroffice6.0/help/en/picture.db
-staroffice6.0/help/en/picture.jar
-staroffice6.0/help/en/sbasic.cfg
-staroffice6.0/help/en/sbasic.db
-staroffice6.0/help/en/sbasic.ht
-staroffice6.0/help/en/sbasic.idx/CONTEXTS
-staroffice6.0/help/en/sbasic.idx/DICTIONARY
-staroffice6.0/help/en/sbasic.idx/DOCS
-staroffice6.0/help/en/sbasic.idx/DOCS.TAB
-staroffice6.0/help/en/sbasic.idx/EDGE
-staroffice6.0/help/en/sbasic.idx/LINKNAMES
-staroffice6.0/help/en/sbasic.idx/OFFSETS
-staroffice6.0/help/en/sbasic.idx/POSITIONS
-staroffice6.0/help/en/sbasic.idx/SCHEMA
-staroffice6.0/help/en/sbasic.jar
-staroffice6.0/help/en/sbasic.key
-staroffice6.0/help/en/scalc.cfg
-staroffice6.0/help/en/scalc.db
-staroffice6.0/help/en/scalc.ht
-staroffice6.0/help/en/scalc.idx/CONTEXTS
-staroffice6.0/help/en/scalc.idx/DICTIONARY
-staroffice6.0/help/en/scalc.idx/DOCS
-staroffice6.0/help/en/scalc.idx/DOCS.TAB
-staroffice6.0/help/en/scalc.idx/EDGE
-staroffice6.0/help/en/scalc.idx/LINKNAMES
-staroffice6.0/help/en/scalc.idx/OFFSETS
-staroffice6.0/help/en/scalc.idx/POSITIONS
-staroffice6.0/help/en/scalc.idx/SCHEMA
-staroffice6.0/help/en/scalc.jar
-staroffice6.0/help/en/scalc.key
-staroffice6.0/help/en/schart.cfg
-staroffice6.0/help/en/schart.db
-staroffice6.0/help/en/schart.ht
-staroffice6.0/help/en/schart.idx/CONTEXTS
-staroffice6.0/help/en/schart.idx/DICTIONARY
-staroffice6.0/help/en/schart.idx/DOCS
-staroffice6.0/help/en/schart.idx/DOCS.TAB
-staroffice6.0/help/en/schart.idx/EDGE
-staroffice6.0/help/en/schart.idx/LINKNAMES
-staroffice6.0/help/en/schart.idx/OFFSETS
-staroffice6.0/help/en/schart.idx/POSITIONS
-staroffice6.0/help/en/schart.idx/SCHEMA
-staroffice6.0/help/en/schart.jar
-staroffice6.0/help/en/schart.key
-staroffice6.0/help/en/sdraw.cfg
-staroffice6.0/help/en/sdraw.db
-staroffice6.0/help/en/sdraw.ht
-staroffice6.0/help/en/sdraw.idx/CONTEXTS
-staroffice6.0/help/en/sdraw.idx/DICTIONARY
-staroffice6.0/help/en/sdraw.idx/DOCS
-staroffice6.0/help/en/sdraw.idx/DOCS.TAB
-staroffice6.0/help/en/sdraw.idx/EDGE
-staroffice6.0/help/en/sdraw.idx/LINKNAMES
-staroffice6.0/help/en/sdraw.idx/OFFSETS
-staroffice6.0/help/en/sdraw.idx/POSITIONS
-staroffice6.0/help/en/sdraw.idx/SCHEMA
-staroffice6.0/help/en/sdraw.jar
-staroffice6.0/help/en/sdraw.key
-staroffice6.0/help/en/simpress.cfg
-staroffice6.0/help/en/simpress.db
-staroffice6.0/help/en/simpress.ht
-staroffice6.0/help/en/simpress.idx/CONTEXTS
-staroffice6.0/help/en/simpress.idx/DICTIONARY
-staroffice6.0/help/en/simpress.idx/DOCS
-staroffice6.0/help/en/simpress.idx/DOCS.TAB
-staroffice6.0/help/en/simpress.idx/EDGE
-staroffice6.0/help/en/simpress.idx/LINKNAMES
-staroffice6.0/help/en/simpress.idx/OFFSETS
-staroffice6.0/help/en/simpress.idx/POSITIONS
-staroffice6.0/help/en/simpress.idx/SCHEMA
-staroffice6.0/help/en/simpress.jar
-staroffice6.0/help/en/simpress.key
-staroffice6.0/help/en/smath.cfg
-staroffice6.0/help/en/smath.db
-staroffice6.0/help/en/smath.ht
-staroffice6.0/help/en/smath.idx/CONTEXTS
-staroffice6.0/help/en/smath.idx/DICTIONARY
-staroffice6.0/help/en/smath.idx/DOCS
-staroffice6.0/help/en/smath.idx/DOCS.TAB
-staroffice6.0/help/en/smath.idx/EDGE
-staroffice6.0/help/en/smath.idx/LINKNAMES
-staroffice6.0/help/en/smath.idx/OFFSETS
-staroffice6.0/help/en/smath.idx/POSITIONS
-staroffice6.0/help/en/smath.idx/SCHEMA
-staroffice6.0/help/en/smath.jar
-staroffice6.0/help/en/smath.key
-staroffice6.0/help/en/swriter.cfg
-staroffice6.0/help/en/swriter.db
-staroffice6.0/help/en/swriter.ht
-staroffice6.0/help/en/swriter.idx/CONTEXTS
-staroffice6.0/help/en/swriter.idx/DICTIONARY
-staroffice6.0/help/en/swriter.idx/DOCS
-staroffice6.0/help/en/swriter.idx/DOCS.TAB
-staroffice6.0/help/en/swriter.idx/EDGE
-staroffice6.0/help/en/swriter.idx/LINKNAMES
-staroffice6.0/help/en/swriter.idx/OFFSETS
-staroffice6.0/help/en/swriter.idx/POSITIONS
-staroffice6.0/help/en/swriter.idx/SCHEMA
-staroffice6.0/help/en/swriter.jar
-staroffice6.0/help/en/swriter.key
-staroffice6.0/help/en/treeview.xml
-staroffice6.0/help/main_transform.xsl
-staroffice6.0/program/StarOffice_about.bmp
-staroffice6.0/program/StarOffice_intro.bmp
-staroffice6.0/program/StarSuite_about.bmp
-staroffice6.0/program/StarSuite_intro.bmp
-staroffice6.0/program/addin/libdfa638li.so
-staroffice6.0/program/addin/librot638li.so
-staroffice6.0/program/addin/source/addin.h
-staroffice6.0/program/addin/source/dfa.hrc
-staroffice6.0/program/addin/source/rot13.hrc
-staroffice6.0/program/addin/source/xdfa.c
-staroffice6.0/program/addin/source/xlang.h
-staroffice6.0/program/addin/source/xrot.c
-staroffice6.0/program/allgemein.bmp
-staroffice6.0/program/applicat.rdb
-staroffice6.0/program/bootstraprc
-staroffice6.0/program/classes/classes.jar
-staroffice6.0/program/classes/db.jar
-staroffice6.0/program/classes/java_uno.jar
-staroffice6.0/program/classes/juh.jar
-staroffice6.0/program/classes/jurt.jar
-staroffice6.0/program/classes/jut.jar
-staroffice6.0/program/classes/ridl.jar
-staroffice6.0/program/classes/sandbox.jar
-staroffice6.0/program/classes/unoil.jar
-staroffice6.0/program/classes/xmlhelp.jar
-staroffice6.0/program/classes/xmlsearch.jar
-staroffice6.0/program/classes/xt.jar
-staroffice6.0/program/component.reg
-staroffice6.0/program/components/libabsyncsvc.so
-staroffice6.0/program/components/libaddrbook.so
-staroffice6.0/program/components/libmork.so
-staroffice6.0/program/components/libmozldap.so
-staroffice6.0/program/components/libnecko.so
-staroffice6.0/program/components/libpref.so
-staroffice6.0/program/components/libprofile.so
-staroffice6.0/program/components/librdf.so
-staroffice6.0/program/components/libstrres.so
-staroffice6.0/program/components/libuconv.so
-staroffice6.0/program/components/libucvcn.so
-staroffice6.0/program/components/libucvibm.so
-staroffice6.0/program/components/libucvja.so
-staroffice6.0/program/components/libucvko.so
-staroffice6.0/program/components/libucvlatin.so
-staroffice6.0/program/components/libucvtw.so
-staroffice6.0/program/components/libucvtw2.so
-staroffice6.0/program/components/libunicharutil.so
-staroffice6.0/program/components/liburiloader.so
-staroffice6.0/program/components/libvcard.so
-staroffice6.0/program/components/libxpconnect.so
-staroffice6.0/program/filter/libegi638li.so
-staroffice6.0/program/filter/libeme638li.so
-staroffice6.0/program/filter/libemp638li.so
-staroffice6.0/program/filter/libepb638li.so
-staroffice6.0/program/filter/libepg638li.so
-staroffice6.0/program/filter/libepn638li.so
-staroffice6.0/program/filter/libepp638li.so
-staroffice6.0/program/filter/libeps638li.so
-staroffice6.0/program/filter/libept638li.so
-staroffice6.0/program/filter/libera638li.so
-staroffice6.0/program/filter/libeti638li.so
-staroffice6.0/program/filter/libexp638li.so
-staroffice6.0/program/filter/libicd638li.so
-staroffice6.0/program/filter/libicg638li.so
-staroffice6.0/program/filter/libidx638li.so
-staroffice6.0/program/filter/libime638li.so
-staroffice6.0/program/filter/libipb638li.so
-staroffice6.0/program/filter/libipd638li.so
-staroffice6.0/program/filter/libips638li.so
-staroffice6.0/program/filter/libipt638li.so
-staroffice6.0/program/filter/libipx638li.so
-staroffice6.0/program/filter/libira638li.so
-staroffice6.0/program/filter/libitg638li.so
-staroffice6.0/program/filter/libiti638li.so
-staroffice6.0/program/fromtemplate
-staroffice6.0/program/instdb.ins
-staroffice6.0/program/instdb.ins.orig
-staroffice6.0/program/j2re-1_3_1-linux-i386.bin
-staroffice6.0/program/javaldx
-staroffice6.0/program/jvmsetup
-staroffice6.0/program/jvmsetup.bin
-staroffice6.0/program/jvmsetuprc
-staroffice6.0/program/libabp638li.so
-staroffice6.0/program/libacceptor.so
-staroffice6.0/program/libadabas2.so
-staroffice6.0/program/libanalysis638li.so
-staroffice6.0/program/libbasctl638li.so
-staroffice6.0/program/libbib638li.so
-staroffice6.0/program/libbrdgfctr.so
-staroffice6.0/program/libcached1.so
-staroffice6.0/program/libcalc638li.so
-staroffice6.0/program/libcfgmgr2.so
-staroffice6.0/program/libcmdmail.so
-staroffice6.0/program/libcnt638li.so
-staroffice6.0/program/libcollator.so
-staroffice6.0/program/libcomphelp2.so
-staroffice6.0/program/libconnectr.so
-staroffice6.0/program/libcorefl.so
-staroffice6.0/program/libcpld.so
-staroffice6.0/program/libcppu.so.3.0.0
-staroffice6.0/program/libcppuhelper3GCC.so
-staroffice6.0/program/libctl638li.so
-staroffice6.0/program/libdb-3.2.so
-staroffice6.0/program/libdb_cxx-3.2.so
-staroffice6.0/program/libdb_java-3.2.so
-staroffice6.0/program/libdba638li.so
-staroffice6.0/program/libdbase638li.so
-staroffice6.0/program/libdbext638li.so
-staroffice6.0/program/libdbi638li.so
-staroffice6.0/program/libdbp638li.so
-staroffice6.0/program/libdbpool2.so
-staroffice6.0/program/libdbtools2.so
-staroffice6.0/program/libdbu638li.so
-staroffice6.0/program/libdefreg.so
-staroffice6.0/program/libdict_ja_JP.so
-staroffice6.0/program/libdict_zh_CN.so
-staroffice6.0/program/libdict_zh_TW.so
-staroffice6.0/program/libdtransX11638li.so
-staroffice6.0/program/libevtatt.so
-staroffice6.0/program/libfile638li.so
-staroffice6.0/program/libfileacc.so
-staroffice6.0/program/libflat638li.so
-staroffice6.0/program/libfrm638li.so
-staroffice6.0/program/libfwe638li.so
-staroffice6.0/program/libfwi638li.so
-staroffice6.0/program/libfwk638li.so
-staroffice6.0/program/libfwl638li.so
-staroffice6.0/program/libgcc2_uno.so
-staroffice6.0/program/libgo638li.so
-staroffice6.0/program/libhwpreaderli.so
-staroffice6.0/program/libi18n638li.so
-staroffice6.0/program/libimpreg.so
-staroffice6.0/program/libimr638li.so
-staroffice6.0/program/libinsp.so
-staroffice6.0/program/libinv.so
-staroffice6.0/program/libinvadp.so
-staroffice6.0/program/libj638li_g.so
-staroffice6.0/program/libjava_uno.so
-staroffice6.0/program/libjavaloader.so
-staroffice6.0/program/libjdbc2.so
-staroffice6.0/program/libjen.so
-staroffice6.0/program/libjsreaderli.so
-staroffice6.0/program/libjvm638li.so
-staroffice6.0/program/liblber40.so
-staroffice6.0/program/libldap40.so
-staroffice6.0/program/libldh638li.so
-staroffice6.0/program/liblds638li.so
-staroffice6.0/program/libldt638li.so
-staroffice6.0/program/liblgd638li.so
-staroffice6.0/program/liblng638li.so
-staroffice6.0/program/liblnn638li.so
-staroffice6.0/program/liblocaledata_CJK.so
-staroffice6.0/program/liblocaledata_ascii.so
-staroffice6.0/program/libmcnttype.so
-staroffice6.0/program/libmig638li.so
-staroffice6.0/program/libmozab638li.so
-staroffice6.0/program/libmozjs.so
-staroffice6.0/program/libmsgbaseutil.so
-staroffice6.0/program/libnamingservice.so
-staroffice6.0/program/libni638li.so
-staroffice6.0/program/libnspr4.so
-staroffice6.0/program/libodbc2.so
-staroffice6.0/program/libodbcbase2.so
-staroffice6.0/program/libofa638li.so
-staroffice6.0/program/liboic638li.so
-staroffice6.0/program/libpackage2.so
-staroffice6.0/program/libpcr638li.so
-staroffice6.0/program/libpk638li.so
-staroffice6.0/program/libpl638li.so
-staroffice6.0/program/libplc4.so
-staroffice6.0/program/libplds4.so
-staroffice6.0/program/libproxyfac.so
-staroffice6.0/program/libproxyset.so
-staroffice6.0/program/libpsp638li.so
-staroffice6.0/program/librdbtdp.so
-staroffice6.0/program/libreg.so.3.0.0
-staroffice6.0/program/libremotebridge.so
-staroffice6.0/program/libres638li.so
-staroffice6.0/program/librmcxt.so.3.0.0
-staroffice6.0/program/libsal.so.3.0.0
-staroffice6.0/program/libsalhelper3GCC.so
-staroffice6.0/program/libsax.so
-staroffice6.0/program/libsb638li.so
-staroffice6.0/program/libsbl638li.so
-staroffice6.0/program/libsc638li.so
-staroffice6.0/program/libsch638li.so
-staroffice6.0/program/libscn638li.so
-staroffice6.0/program/libsd638li.so
-staroffice6.0/program/libsdbc2.so
-staroffice6.0/program/libset638li.so
-staroffice6.0/program/libsfx638li.so
-staroffice6.0/program/libsimreg.so
-staroffice6.0/program/libsm638li.so
-staroffice6.0/program/libsmgr.so
-staroffice6.0/program/libso638li.so
-staroffice6.0/program/libsot638li.so
-staroffice6.0/program/libspa638li.so
-staroffice6.0/program/libsrtrs1.so
-staroffice6.0/program/libstlport_gcc.so
-staroffice6.0/program/libstm.so
-staroffice6.0/program/libstore.so.3.0.0
-staroffice6.0/program/libsvg638li.so
-staroffice6.0/program/libsvl638li.so
-staroffice6.0/program/libsvt638li.so
-staroffice6.0/program/libsvx638li.so
-staroffice6.0/program/libsw638li.so
-staroffice6.0/program/libsyssh.so
-staroffice6.0/program/libtcv.so
-staroffice6.0/program/libtdmgr.so
-staroffice6.0/program/libtinstrm.so
-staroffice6.0/program/libtk638li.so
-staroffice6.0/program/libtl638li.so
-staroffice6.0/program/libtoutstrm.so
-staroffice6.0/program/libtplx638li.so
-staroffice6.0/program/libtvhlp1.so
-staroffice6.0/program/libucb1.so
-staroffice6.0/program/libucbhelper1GCC.so
-staroffice6.0/program/libucpchelp1.so
-staroffice6.0/program/libucpdav1.so
-staroffice6.0/program/libucpfile1.so
-staroffice6.0/program/libucpfpx638li.so
-staroffice6.0/program/libucphier1.so
-staroffice6.0/program/libucppkg1.so
-staroffice6.0/program/liburp_uno.so
-staroffice6.0/program/libutl638li.so
-staroffice6.0/program/libuui638li.so
-staroffice6.0/program/libuuresolver.so
-staroffice6.0/program/libvcl638li.so
-staroffice6.0/program/libvos2GCC.so
-staroffice6.0/program/libwps2starli.so
-staroffice6.0/program/libwrp638li.so
-staroffice6.0/program/libxcr638li.so
-staroffice6.0/program/libxmx638li.so
-staroffice6.0/program/libxo638li.so
-staroffice6.0/program/libxpcom.so
-staroffice6.0/program/libzip638li.so
-staroffice6.0/program/nswrapper
-staroffice6.0/program/resource/abp63801.res
-staroffice6.0/program/resource/analysis63801.res
-staroffice6.0/program/resource/basctl63801.res
-staroffice6.0/program/resource/bib63801.res
-staroffice6.0/program/resource/cal63801.res
-staroffice6.0/program/resource/cnt63801.res
-staroffice6.0/program/resource/dba63801.res
-staroffice6.0/program/resource/dbext63801.res
-staroffice6.0/program/resource/dbi63801.res
-staroffice6.0/program/resource/dbp63801.res
-staroffice6.0/program/resource/dbu63801.res
-staroffice6.0/program/resource/dbw63801.res
-staroffice6.0/program/resource/dkt63801.res
-staroffice6.0/program/resource/egi63801.res
-staroffice6.0/program/resource/eme63801.res
-staroffice6.0/program/resource/epb63801.res
-staroffice6.0/program/resource/epg63801.res
-staroffice6.0/program/resource/epn63801.res
-staroffice6.0/program/resource/epp63801.res
-staroffice6.0/program/resource/eps63801.res
-staroffice6.0/program/resource/ept63801.res
-staroffice6.0/program/resource/eur63801.res
-staroffice6.0/program/resource/frm63801.res
-staroffice6.0/program/resource/fwk63801.res
-staroffice6.0/program/resource/gal63801.res
-staroffice6.0/program/resource/imp63801.res
-staroffice6.0/program/resource/iso63801.res
-staroffice6.0/program/resource/jvm63801.res
-staroffice6.0/program/resource/lgd63801.res
-staroffice6.0/program/resource/lnn63801.res
-staroffice6.0/program/resource/ofa63801.res
-staroffice6.0/program/resource/oic63801.res
-staroffice6.0/program/resource/pcr63801.res
-staroffice6.0/program/resource/san63801.res
-staroffice6.0/program/resource/sc63801.res
-staroffice6.0/program/resource/sch63801.res
-staroffice6.0/program/resource/sd63801.res
-staroffice6.0/program/resource/set63801.res
-staroffice6.0/program/resource/sfx63801.res
-staroffice6.0/program/resource/sm63801.res
-staroffice6.0/program/resource/spa63801.res
-staroffice6.0/program/resource/svs63801.res
-staroffice6.0/program/resource/svt63801.res
-staroffice6.0/program/resource/svx63801.res
-staroffice6.0/program/resource/sw63801.res
-staroffice6.0/program/resource/tpl63801.res
-staroffice6.0/program/resource/tplx63801.res
-staroffice6.0/program/resource/uui63801.res
-staroffice6.0/program/resource/vcl63801.res
-staroffice6.0/program/resource/wwz63801.res
-staroffice6.0/program/sagenda
-staroffice6.0/program/scalc
-staroffice6.0/program/sdraw
-staroffice6.0/program/setup
-staroffice6.0/program/setup.bin
-staroffice6.0/program/setup.log
-staroffice6.0/program/setup_services.rdb
-staroffice6.0/program/setup_types.rdb
-staroffice6.0/program/setuprc
-staroffice6.0/program/sfax
-staroffice6.0/program/simpress
-staroffice6.0/program/slabel
-staroffice6.0/program/sletter
-staroffice6.0/program/smaster
-staroffice6.0/program/smath
-staroffice6.0/program/smemo
-staroffice6.0/program/so60.bmp
-staroffice6.0/program/soffice
-staroffice6.0/program/soffice.bin
-staroffice6.0/program/sofficerc
-staroffice6.0/program/sopatchlevel.sh
-staroffice6.0/program/spadmin
-staroffice6.0/program/spadmin.bin
-staroffice6.0/program/svcard
-staroffice6.0/program/sweb
-staroffice6.0/program/swriter
-staroffice6.0/share/autocorr/acor1033.dat
-staroffice6.0/share/autotext/english/crdbus50.bau
-staroffice6.0/share/autotext/english/crdbus54.bau
-staroffice6.0/share/autotext/english/crdprv50.bau
-staroffice6.0/share/autotext/english/crdprv54.bau
-staroffice6.0/share/autotext/english/standard.bau
-staroffice6.0/share/autotext/english/template.bau
-staroffice6.0/share/basic/Euro/AutoPilotRun.xba
-staroffice6.0/share/basic/Euro/Common.xba
-staroffice6.0/share/basic/Euro/ConvertRun.xba
-staroffice6.0/share/basic/Euro/DlgConvert.xdl
-staroffice6.0/share/basic/Euro/DlgPassword.xdl
-staroffice6.0/share/basic/Euro/Hard.xba
-staroffice6.0/share/basic/Euro/Init.xba
-staroffice6.0/share/basic/Euro/Protect.xba
-staroffice6.0/share/basic/Euro/Soft.xba
-staroffice6.0/share/basic/Euro/Writer.xba
-staroffice6.0/share/basic/FormWizard/DBMeta.xba
-staroffice6.0/share/basic/FormWizard/DlgFormDB.xdl
-staroffice6.0/share/basic/FormWizard/DlgTools.xba
-staroffice6.0/share/basic/FormWizard/FormWizard.xba
-staroffice6.0/share/basic/FormWizard/Language.xba
-staroffice6.0/share/basic/FormWizard/Layouter.xba
-staroffice6.0/share/basic/FormWizard/develop.xba
-staroffice6.0/share/basic/FormWizard/tools.xba
-staroffice6.0/share/basic/Gimmicks/AutoText.xba
-staroffice6.0/share/basic/Gimmicks/AutoTextLanguage.xba
-staroffice6.0/share/basic/Gimmicks/ChangeAllChars.xba
-staroffice6.0/share/basic/Gimmicks/GetTexts.xba
-staroffice6.0/share/basic/Gimmicks/ReadDir.xba
-staroffice6.0/share/basic/Gimmicks/ReadDirdlg.xdl
-staroffice6.0/share/basic/Gimmicks/UserfieldDlg.xdl
-staroffice6.0/share/basic/Gimmicks/Userfields.xba
-staroffice6.0/share/basic/Gimmicks/UserfieldsLanguage.xba
-staroffice6.0/share/basic/ImportWizard/API.xba
-staroffice6.0/share/basic/ImportWizard/DialogModul.xba
-staroffice6.0/share/basic/ImportWizard/FilesModul.xba
-staroffice6.0/share/basic/ImportWizard/ImportDialog.xdl
-staroffice6.0/share/basic/ImportWizard/Language.xba
-staroffice6.0/share/basic/ImportWizard/Main.xba
-staroffice6.0/share/basic/Schedule/BankHoliday.xba
-staroffice6.0/share/basic/Schedule/CalendarMain.xba
-staroffice6.0/share/basic/Schedule/CreateTable.xba
-staroffice6.0/share/basic/Schedule/DlgCalendar.xdl
-staroffice6.0/share/basic/Schedule/DlgControl.xba
-staroffice6.0/share/basic/Schedule/HolidayDanmark.xba
-staroffice6.0/share/basic/Schedule/HolidayFrance.xba
-staroffice6.0/share/basic/Schedule/HolidayGerman.xba
-staroffice6.0/share/basic/Schedule/HolidayItalia.xba
-staroffice6.0/share/basic/Schedule/HolidayNetherlands.xba
-staroffice6.0/share/basic/Schedule/HolidayPoland.xba
-staroffice6.0/share/basic/Schedule/HolidayPortugal.xba
-staroffice6.0/share/basic/Schedule/HolidayRussia.xba
-staroffice6.0/share/basic/Schedule/HolidaySpain.xba
-staroffice6.0/share/basic/Schedule/HolidaySweden.xba
-staroffice6.0/share/basic/Schedule/HolidayUSA.xba
-staroffice6.0/share/basic/Schedule/Language.xba
-staroffice6.0/share/basic/Schedule/OwnEvents.xba
-staroffice6.0/share/basic/Template/Autotext.xba
-staroffice6.0/share/basic/Template/Correspondence.xba
-staroffice6.0/share/basic/Template/DialogStyles.xdl
-staroffice6.0/share/basic/Template/DlgGreeting.xdl
-staroffice6.0/share/basic/Template/Greeting.xba
-staroffice6.0/share/basic/Template/ModuleAgenda.xba
-staroffice6.0/share/basic/Template/Samples.xba
-staroffice6.0/share/basic/Template/TemplateDialog.xdl
-staroffice6.0/share/basic/Tools/Debug.xba
-staroffice6.0/share/basic/Tools/Listbox.xba
-staroffice6.0/share/basic/Tools/Misc.xba
-staroffice6.0/share/basic/Tools/ModuleControls.xba
-staroffice6.0/share/basic/Tools/Recursive.xba
-staroffice6.0/share/basic/Tools/Strings.xba
-staroffice6.0/share/basic/WebWizard/Bullets.xba
-staroffice6.0/share/basic/WebWizard/Common.xba
-staroffice6.0/share/basic/WebWizard/HtmlAutoPilotBasic.xba
-staroffice6.0/share/basic/WebWizard/Language.xba
-staroffice6.0/share/basic/WebWizard/WebWzrd.xdl
-staroffice6.0/share/config/psetup.xpm
-staroffice6.0/share/config/psetupl.xpm
-staroffice6.0/share/config/registry/cache/instance/org/openoffice/Inet.dat
-staroffice6.0/share/config/registry/cache/instance/org/openoffice/Office/Calc.dat
-staroffice6.0/share/config/registry/cache/instance/org/openoffice/Office/Chart.dat
-staroffice6.0/share/config/registry/cache/instance/org/openoffice/Office/Common.dat
-staroffice6.0/share/config/registry/cache/instance/org/openoffice/Office/DataAccess.dat
-staroffice6.0/share/config/registry/cache/instance/org/openoffice/Office/Draw.dat
-staroffice6.0/share/config/registry/cache/instance/org/openoffice/Office/Impress.dat
-staroffice6.0/share/config/registry/cache/instance/org/openoffice/Office/Java.dat
-staroffice6.0/share/config/registry/cache/instance/org/openoffice/Office/Labels.dat
-staroffice6.0/share/config/registry/cache/instance/org/openoffice/Office/Linguistic.dat
-staroffice6.0/share/config/registry/cache/instance/org/openoffice/Office/Math.dat
-staroffice6.0/share/config/registry/cache/instance/org/openoffice/Office/SFX.dat
-staroffice6.0/share/config/registry/cache/instance/org/openoffice/Office/TypeDetection.dat
-staroffice6.0/share/config/registry/cache/instance/org/openoffice/Office/Views.dat
-staroffice6.0/share/config/registry/cache/instance/org/openoffice/Office/Writer.dat
-staroffice6.0/share/config/registry/cache/instance/org/openoffice/Office/WriterWeb.dat
-staroffice6.0/share/config/registry/cache/instance/org/openoffice/Setup.dat
-staroffice6.0/share/config/registry/cache/instance/org/openoffice/UserProfile.dat
-staroffice6.0/share/config/registry/cache/instance/org/openoffice/ucb/Configuration.dat
-staroffice6.0/share/config/registry/cache/instance/org/openoffice/ucb/Hierarchy.dat
-staroffice6.0/share/config/registry/cache/instance/org/openoffice/ucb/Store.dat
-staroffice6.0/share/config/registry/instance/org/openoffice/Inet.xml
-staroffice6.0/share/config/registry/instance/org/openoffice/Office/Calc.xml
-staroffice6.0/share/config/registry/instance/org/openoffice/Office/Chart.xml
-staroffice6.0/share/config/registry/instance/org/openoffice/Office/Common.xml
-staroffice6.0/share/config/registry/instance/org/openoffice/Office/DataAccess.xml
-staroffice6.0/share/config/registry/instance/org/openoffice/Office/Draw.xml
-staroffice6.0/share/config/registry/instance/org/openoffice/Office/Impress.xml
-staroffice6.0/share/config/registry/instance/org/openoffice/Office/Java.xml
-staroffice6.0/share/config/registry/instance/org/openoffice/Office/Labels.xml
-staroffice6.0/share/config/registry/instance/org/openoffice/Office/Linguistic.xml
-staroffice6.0/share/config/registry/instance/org/openoffice/Office/Math.xml
-staroffice6.0/share/config/registry/instance/org/openoffice/Office/SFX.xml
-staroffice6.0/share/config/registry/instance/org/openoffice/Office/TypeDetection.xml
-staroffice6.0/share/config/registry/instance/org/openoffice/Office/Views.xml
-staroffice6.0/share/config/registry/instance/org/openoffice/Office/Writer.xml
-staroffice6.0/share/config/registry/instance/org/openoffice/Office/WriterWeb.xml
-staroffice6.0/share/config/registry/instance/org/openoffice/Setup.xml
-staroffice6.0/share/config/registry/instance/org/openoffice/UserProfile.xml
-staroffice6.0/share/config/registry/instance/org/openoffice/ucb/Configuration.xml
-staroffice6.0/share/config/registry/instance/org/openoffice/ucb/Hierarchy.xml
-staroffice6.0/share/config/registry/instance/org/openoffice/ucb/Store.xml
-staroffice6.0/share/config/registry/template/org/openoffice/Inet.xml
-staroffice6.0/share/config/registry/template/org/openoffice/Office/Calc.xml
-staroffice6.0/share/config/registry/template/org/openoffice/Office/Chart.xml
-staroffice6.0/share/config/registry/template/org/openoffice/Office/Common.xml
-staroffice6.0/share/config/registry/template/org/openoffice/Office/DataAccess.xml
-staroffice6.0/share/config/registry/template/org/openoffice/Office/Draw.xml
-staroffice6.0/share/config/registry/template/org/openoffice/Office/Impress.xml
-staroffice6.0/share/config/registry/template/org/openoffice/Office/Java.xml
-staroffice6.0/share/config/registry/template/org/openoffice/Office/Labels.xml
-staroffice6.0/share/config/registry/template/org/openoffice/Office/Linguistic.xml
-staroffice6.0/share/config/registry/template/org/openoffice/Office/Math.xml
-staroffice6.0/share/config/registry/template/org/openoffice/Office/TypeDetection.xml
-staroffice6.0/share/config/registry/template/org/openoffice/Office/Views.xml
-staroffice6.0/share/config/registry/template/org/openoffice/Office/Writer.xml
-staroffice6.0/share/config/registry/template/org/openoffice/Office/WriterWeb.xml
-staroffice6.0/share/config/registry/template/org/openoffice/Setup.xml
-staroffice6.0/share/config/registry/template/org/openoffice/UserProfile.xml
-staroffice6.0/share/config/registry/template/org/openoffice/ucb/Configuration.xml
-staroffice6.0/share/config/registry/template/org/openoffice/ucb/Hierarchy.xml
-staroffice6.0/share/config/registry/template/org/openoffice/ucb/Store.xml
-staroffice6.0/share/config/symbol/sc00000.bmp
-staroffice6.0/share/config/symbol/sc05300.bmp
-staroffice6.0/share/config/symbol/sc05302.bmp
-staroffice6.0/share/config/symbol/sc05325.bmp
-staroffice6.0/share/config/symbol/sc05331.bmp
-staroffice6.0/share/config/symbol/sc05338.bmp
-staroffice6.0/share/config/symbol/sc05339.bmp
-staroffice6.0/share/config/symbol/sc05361.bmp
-staroffice6.0/share/config/symbol/sc05362.bmp
-staroffice6.0/share/config/symbol/sc05363.bmp
-staroffice6.0/share/config/symbol/sc05364.bmp
-staroffice6.0/share/config/symbol/sc05365.bmp
-staroffice6.0/share/config/symbol/sc05366.bmp
-staroffice6.0/share/config/symbol/sc05367.bmp
-staroffice6.0/share/config/symbol/sc05368.bmp
-staroffice6.0/share/config/symbol/sc05369.bmp
-staroffice6.0/share/config/symbol/sc05370.bmp
-staroffice6.0/share/config/symbol/sc05371.bmp
-staroffice6.0/share/config/symbol/sc05373.bmp
-staroffice6.0/share/config/symbol/sc05374.bmp
-staroffice6.0/share/config/symbol/sc05375.bmp
-staroffice6.0/share/config/symbol/sc05377.bmp
-staroffice6.0/share/config/symbol/sc05381.bmp
-staroffice6.0/share/config/symbol/sc05382.bmp
-staroffice6.0/share/config/symbol/sc05383.bmp
-staroffice6.0/share/config/symbol/sc05384.bmp
-staroffice6.0/share/config/symbol/sc05386.bmp
-staroffice6.0/share/config/symbol/sc05387.bmp
-staroffice6.0/share/config/symbol/sc05401.bmp
-staroffice6.0/share/config/symbol/sc05402.bmp
-staroffice6.0/share/config/symbol/sc05410.bmp
-staroffice6.0/share/config/symbol/sc05411.bmp
-staroffice6.0/share/config/symbol/sc05412.bmp
-staroffice6.0/share/config/symbol/sc05413.bmp
-staroffice6.0/share/config/symbol/sc05414.bmp
-staroffice6.0/share/config/symbol/sc05415.bmp
-staroffice6.0/share/config/symbol/sc05500.bmp
-staroffice6.0/share/config/symbol/sc05501.bmp
-staroffice6.0/share/config/symbol/sc05502.bmp
-staroffice6.0/share/config/symbol/sc05503.bmp
-staroffice6.0/share/config/symbol/sc05504.bmp
-staroffice6.0/share/config/symbol/sc05505.bmp
-staroffice6.0/share/config/symbol/sc05508.bmp
-staroffice6.0/share/config/symbol/sc05509.bmp
-staroffice6.0/share/config/symbol/sc05532.bmp
-staroffice6.0/share/config/symbol/sc05533.bmp
-staroffice6.0/share/config/symbol/sc05535.bmp
-staroffice6.0/share/config/symbol/sc05537.bmp
-staroffice6.0/share/config/symbol/sc05538.bmp
-staroffice6.0/share/config/symbol/sc05539.bmp
-staroffice6.0/share/config/symbol/sc05552.bmp
-staroffice6.0/share/config/symbol/sc05555.bmp
-staroffice6.0/share/config/symbol/sc05556.bmp
-staroffice6.0/share/config/symbol/sc05561.bmp
-staroffice6.0/share/config/symbol/sc05563.bmp
-staroffice6.0/share/config/symbol/sc05595.bmp
-staroffice6.0/share/config/symbol/sc05596.bmp
-staroffice6.0/share/config/symbol/sc05624.bmp
-staroffice6.0/share/config/symbol/sc05646.bmp
-staroffice6.0/share/config/symbol/sc05647.bmp
-staroffice6.0/share/config/symbol/sc05648.bmp
-staroffice6.0/share/config/symbol/sc05649.bmp
-staroffice6.0/share/config/symbol/sc05650.bmp
-staroffice6.0/share/config/symbol/sc05651.bmp
-staroffice6.0/share/config/symbol/sc05672.bmp
-staroffice6.0/share/config/symbol/sc05673.bmp
-staroffice6.0/share/config/symbol/sc05675.bmp
-staroffice6.0/share/config/symbol/sc05694.bmp
-staroffice6.0/share/config/symbol/sc05700.bmp
-staroffice6.0/share/config/symbol/sc05701.bmp
-staroffice6.0/share/config/symbol/sc05702.bmp
-staroffice6.0/share/config/symbol/sc05710.bmp
-staroffice6.0/share/config/symbol/sc05711.bmp
-staroffice6.0/share/config/symbol/sc05712.bmp
-staroffice6.0/share/config/symbol/sc05713.bmp
-staroffice6.0/share/config/symbol/sc05723.bmp
-staroffice6.0/share/config/symbol/sc05800.bmp
-staroffice6.0/share/config/symbol/sc05801.bmp
-staroffice6.0/share/config/symbol/sc05802.bmp
-staroffice6.0/share/config/symbol/sc05904.bmp
-staroffice6.0/share/config/symbol/sc05905.bmp
-staroffice6.0/share/config/symbol/sc05906.bmp
-staroffice6.0/share/config/symbol/sc05951.bmp
-staroffice6.0/share/config/symbol/sc05952.bmp
-staroffice6.0/share/config/symbol/sc05953.bmp
-staroffice6.0/share/config/symbol/sc05954.bmp
-staroffice6.0/share/config/symbol/sc05955.bmp
-staroffice6.0/share/config/symbol/sc05956.bmp
-staroffice6.0/share/config/symbol/sc05957.bmp
-staroffice6.0/share/config/symbol/sc05958.bmp
-staroffice6.0/share/config/symbol/sc05959.bmp
-staroffice6.0/share/config/symbol/sc05960.bmp
-staroffice6.0/share/config/symbol/sc05961.bmp
-staroffice6.0/share/config/symbol/sc05962.bmp
-staroffice6.0/share/config/symbol/sc05963.bmp
-staroffice6.0/share/config/symbol/sc06300.bmp
-staroffice6.0/share/config/symbol/sc06301.bmp
-staroffice6.0/share/config/symbol/sc06302.bmp
-staroffice6.0/share/config/symbol/sc06303.bmp
-staroffice6.0/share/config/symbol/sc06304.bmp
-staroffice6.0/share/config/symbol/sc06305.bmp
-staroffice6.0/share/config/symbol/sc06306.bmp
-staroffice6.0/share/config/symbol/sc06308.bmp
-staroffice6.0/share/config/symbol/sc06309.bmp
-staroffice6.0/share/config/symbol/sc06312.bmp
-staroffice6.0/share/config/symbol/sc06313.bmp
-staroffice6.0/share/config/symbol/sc06314.bmp
-staroffice6.0/share/config/symbol/sc06315.bmp
-staroffice6.0/share/config/symbol/sc06318.bmp
-staroffice6.0/share/config/symbol/sc06330.bmp
-staroffice6.0/share/config/symbol/sc06331.bmp
-staroffice6.0/share/config/symbol/sc06332.bmp
-staroffice6.0/share/config/symbol/sc06333.bmp
-staroffice6.0/share/config/symbol/sc06334.bmp
-staroffice6.0/share/config/symbol/sc06335.bmp
-staroffice6.0/share/config/symbol/sc06336.bmp
-staroffice6.0/share/config/symbol/sc06337.bmp
-staroffice6.0/share/config/symbol/sc06338.bmp
-staroffice6.0/share/config/symbol/sc06339.bmp
-staroffice6.0/share/config/symbol/sc06350.bmp
-staroffice6.0/share/config/symbol/sc06351.bmp
-staroffice6.0/share/config/symbol/sc06352.bmp
-staroffice6.0/share/config/symbol/sc06353.bmp
-staroffice6.0/share/config/symbol/sc06354.bmp
-staroffice6.0/share/config/symbol/sc06355.bmp
-staroffice6.0/share/config/symbol/sc06356.bmp
-staroffice6.0/share/config/symbol/sc06357.bmp
-staroffice6.0/share/config/symbol/sc06362.bmp
-staroffice6.0/share/config/symbol/sc06363.bmp
-staroffice6.0/share/config/symbol/sc06364.bmp
-staroffice6.0/share/config/symbol/sc06370.bmp
-staroffice6.0/share/config/symbol/sc06377.bmp
-staroffice6.0/share/config/symbol/sc06379.bmp
-staroffice6.0/share/config/symbol/sc06384.bmp
-staroffice6.0/share/config/symbol/sc06522.bmp
-staroffice6.0/share/config/symbol/sc10000.bmp
-staroffice6.0/share/config/symbol/sc10006.bmp
-staroffice6.0/share/config/symbol/sc10007.bmp
-staroffice6.0/share/config/symbol/sc10008.bmp
-staroffice6.0/share/config/symbol/sc10009.bmp
-staroffice6.0/share/config/symbol/sc10010.bmp
-staroffice6.0/share/config/symbol/sc10012.bmp
-staroffice6.0/share/config/symbol/sc10013.bmp
-staroffice6.0/share/config/symbol/sc10014.bmp
-staroffice6.0/share/config/symbol/sc10015.bmp
-staroffice6.0/share/config/symbol/sc10016.bmp
-staroffice6.0/share/config/symbol/sc10017.bmp
-staroffice6.0/share/config/symbol/sc10028.bmp
-staroffice6.0/share/config/symbol/sc10029.bmp
-staroffice6.0/share/config/symbol/sc10030.bmp
-staroffice6.0/share/config/symbol/sc10031.bmp
-staroffice6.0/share/config/symbol/sc10035.bmp
-staroffice6.0/share/config/symbol/sc10036.bmp
-staroffice6.0/share/config/symbol/sc10045.bmp
-staroffice6.0/share/config/symbol/sc10050.bmp
-staroffice6.0/share/config/symbol/sc10055.bmp
-staroffice6.0/share/config/symbol/sc10087.bmp
-staroffice6.0/share/config/symbol/sc10096.bmp
-staroffice6.0/share/config/symbol/sc10097.bmp
-staroffice6.0/share/config/symbol/sc10098.bmp
-staroffice6.0/share/config/symbol/sc10099.bmp
-staroffice6.0/share/config/symbol/sc10100.bmp
-staroffice6.0/share/config/symbol/sc10101.bmp
-staroffice6.0/share/config/symbol/sc10102.bmp
-staroffice6.0/share/config/symbol/sc10103.bmp
-staroffice6.0/share/config/symbol/sc10104.bmp
-staroffice6.0/share/config/symbol/sc10105.bmp
-staroffice6.0/share/config/symbol/sc10106.bmp
-staroffice6.0/share/config/symbol/sc10109.bmp
-staroffice6.0/share/config/symbol/sc10110.bmp
-staroffice6.0/share/config/symbol/sc10112.bmp
-staroffice6.0/share/config/symbol/sc10114.bmp
-staroffice6.0/share/config/symbol/sc10115.bmp
-staroffice6.0/share/config/symbol/sc10116.bmp
-staroffice6.0/share/config/symbol/sc10117.bmp
-staroffice6.0/share/config/symbol/sc10118.bmp
-staroffice6.0/share/config/symbol/sc10119.bmp
-staroffice6.0/share/config/symbol/sc10120.bmp
-staroffice6.0/share/config/symbol/sc10121.bmp
-staroffice6.0/share/config/symbol/sc10122.bmp
-staroffice6.0/share/config/symbol/sc10123.bmp
-staroffice6.0/share/config/symbol/sc10124.bmp
-staroffice6.0/share/config/symbol/sc10125.bmp
-staroffice6.0/share/config/symbol/sc10126.bmp
-staroffice6.0/share/config/symbol/sc10127.bmp
-staroffice6.0/share/config/symbol/sc10128.bmp
-staroffice6.0/share/config/symbol/sc10129.bmp
-staroffice6.0/share/config/symbol/sc10130.bmp
-staroffice6.0/share/config/symbol/sc10131.bmp
-staroffice6.0/share/config/symbol/sc10132.bmp
-staroffice6.0/share/config/symbol/sc10133.bmp
-staroffice6.0/share/config/symbol/sc10134.bmp
-staroffice6.0/share/config/symbol/sc10135.bmp
-staroffice6.0/share/config/symbol/sc10136.bmp
-staroffice6.0/share/config/symbol/sc10137.bmp
-staroffice6.0/share/config/symbol/sc10138.bmp
-staroffice6.0/share/config/symbol/sc10139.bmp
-staroffice6.0/share/config/symbol/sc10140.bmp
-staroffice6.0/share/config/symbol/sc10141.bmp
-staroffice6.0/share/config/symbol/sc10142.bmp
-staroffice6.0/share/config/symbol/sc10143.bmp
-staroffice6.0/share/config/symbol/sc10144.bmp
-staroffice6.0/share/config/symbol/sc10145.bmp
-staroffice6.0/share/config/symbol/sc10146.bmp
-staroffice6.0/share/config/symbol/sc10147.bmp
-staroffice6.0/share/config/symbol/sc10148.bmp
-staroffice6.0/share/config/symbol/sc10150.bmp
-staroffice6.0/share/config/symbol/sc10151.bmp
-staroffice6.0/share/config/symbol/sc10152.bmp
-staroffice6.0/share/config/symbol/sc10153.bmp
-staroffice6.0/share/config/symbol/sc10154.bmp
-staroffice6.0/share/config/symbol/sc10155.bmp
-staroffice6.0/share/config/symbol/sc10156.bmp
-staroffice6.0/share/config/symbol/sc10157.bmp
-staroffice6.0/share/config/symbol/sc10158.bmp
-staroffice6.0/share/config/symbol/sc10159.bmp
-staroffice6.0/share/config/symbol/sc10160.bmp
-staroffice6.0/share/config/symbol/sc10161.bmp
-staroffice6.0/share/config/symbol/sc10162.bmp
-staroffice6.0/share/config/symbol/sc10163.bmp
-staroffice6.0/share/config/symbol/sc10164.bmp
-staroffice6.0/share/config/symbol/sc10185.bmp
-staroffice6.0/share/config/symbol/sc10186.bmp
-staroffice6.0/share/config/symbol/sc10187.bmp
-staroffice6.0/share/config/symbol/sc10188.bmp
-staroffice6.0/share/config/symbol/sc10189.bmp
-staroffice6.0/share/config/symbol/sc10190.bmp
-staroffice6.0/share/config/symbol/sc10191.bmp
-staroffice6.0/share/config/symbol/sc10192.bmp
-staroffice6.0/share/config/symbol/sc10193.bmp
-staroffice6.0/share/config/symbol/sc10194.bmp
-staroffice6.0/share/config/symbol/sc10195.bmp
-staroffice6.0/share/config/symbol/sc10196.bmp
-staroffice6.0/share/config/symbol/sc10197.bmp
-staroffice6.0/share/config/symbol/sc10199.bmp
-staroffice6.0/share/config/symbol/sc10200.bmp
-staroffice6.0/share/config/symbol/sc10201.bmp
-staroffice6.0/share/config/symbol/sc10217.bmp
-staroffice6.0/share/config/symbol/sc10223.bmp
-staroffice6.0/share/config/symbol/sc10224.bmp
-staroffice6.0/share/config/symbol/sc10231.bmp
-staroffice6.0/share/config/symbol/sc10232.bmp
-staroffice6.0/share/config/symbol/sc10233.bmp
-staroffice6.0/share/config/symbol/sc10240.bmp
-staroffice6.0/share/config/symbol/sc10241.bmp
-staroffice6.0/share/config/symbol/sc10242.bmp
-staroffice6.0/share/config/symbol/sc10243.bmp
-staroffice6.0/share/config/symbol/sc10244.bmp
-staroffice6.0/share/config/symbol/sc10253.bmp
-staroffice6.0/share/config/symbol/sc10254.bmp
-staroffice6.0/share/config/symbol/sc10255.bmp
-staroffice6.0/share/config/symbol/sc10256.bmp
-staroffice6.0/share/config/symbol/sc10282.bmp
-staroffice6.0/share/config/symbol/sc10283.bmp
-staroffice6.0/share/config/symbol/sc10286.bmp
-staroffice6.0/share/config/symbol/sc10287.bmp
-staroffice6.0/share/config/symbol/sc10294.bmp
-staroffice6.0/share/config/symbol/sc10295.bmp
-staroffice6.0/share/config/symbol/sc10296.bmp
-staroffice6.0/share/config/symbol/sc10297.bmp
-staroffice6.0/share/config/symbol/sc10301.bmp
-staroffice6.0/share/config/symbol/sc10350.bmp
-staroffice6.0/share/config/symbol/sc10360.bmp
-staroffice6.0/share/config/symbol/sc10366.bmp
-staroffice6.0/share/config/symbol/sc10371.bmp
-staroffice6.0/share/config/symbol/sc10375.bmp
-staroffice6.0/share/config/symbol/sc10376.bmp
-staroffice6.0/share/config/symbol/sc10378.bmp
-staroffice6.0/share/config/symbol/sc10379.bmp
-staroffice6.0/share/config/symbol/sc10380.bmp
-staroffice6.0/share/config/symbol/sc10381.bmp
-staroffice6.0/share/config/symbol/sc10382.bmp
-staroffice6.0/share/config/symbol/sc10383.bmp
-staroffice6.0/share/config/symbol/sc10384.bmp
-staroffice6.0/share/config/symbol/sc10385.bmp
-staroffice6.0/share/config/symbol/sc10386.bmp
-staroffice6.0/share/config/symbol/sc10387.bmp
-staroffice6.0/share/config/symbol/sc10388.bmp
-staroffice6.0/share/config/symbol/sc10389.bmp
-staroffice6.0/share/config/symbol/sc10390.bmp
-staroffice6.0/share/config/symbol/sc10391.bmp
-staroffice6.0/share/config/symbol/sc10393.bmp
-staroffice6.0/share/config/symbol/sc10394.bmp
-staroffice6.0/share/config/symbol/sc10395.bmp
-staroffice6.0/share/config/symbol/sc10396.bmp
-staroffice6.0/share/config/symbol/sc10397.bmp
-staroffice6.0/share/config/symbol/sc10398.bmp
-staroffice6.0/share/config/symbol/sc10399.bmp
-staroffice6.0/share/config/symbol/sc10401.bmp
-staroffice6.0/share/config/symbol/sc10402.bmp
-staroffice6.0/share/config/symbol/sc10403.bmp
-staroffice6.0/share/config/symbol/sc10434.bmp
-staroffice6.0/share/config/symbol/sc10458.bmp
-staroffice6.0/share/config/symbol/sc10461.bmp
-staroffice6.0/share/config/symbol/sc10462.bmp
-staroffice6.0/share/config/symbol/sc10463.bmp
-staroffice6.0/share/config/symbol/sc10464.bmp
-staroffice6.0/share/config/symbol/sc10465.bmp
-staroffice6.0/share/config/symbol/sc10503.bmp
-staroffice6.0/share/config/symbol/sc12021.bmp
-staroffice6.0/share/config/symbol/sc12201.bmp
-staroffice6.0/share/config/symbol/sc12202.bmp
-staroffice6.0/share/config/symbol/sc12203.bmp
-staroffice6.0/share/config/symbol/sc12204.bmp
-staroffice6.0/share/config/symbol/sc12212.bmp
-staroffice6.0/share/config/symbol/sc12221.bmp
-staroffice6.0/share/config/symbol/sc12222.bmp
-staroffice6.0/share/config/symbol/sc12223.bmp
-staroffice6.0/share/config/symbol/sc12224.bmp
-staroffice6.0/share/config/symbol/sc12225.bmp
-staroffice6.0/share/config/symbol/sc12226.bmp
-staroffice6.0/share/config/symbol/sc12227.bmp
-staroffice6.0/share/config/symbol/sc12228.bmp
-staroffice6.0/share/config/symbol/sc12229.bmp
-staroffice6.0/share/config/symbol/sc12230.bmp
-staroffice6.0/share/config/symbol/sc12231.bmp
-staroffice6.0/share/config/symbol/sc12232.bmp
-staroffice6.0/share/config/symbol/sc12234.bmp
-staroffice6.0/share/config/symbol/sc14780.bmp
-staroffice6.0/share/config/symbol/sc14781.bmp
-staroffice6.0/share/config/symbol/sc14785.bmp
-staroffice6.0/share/config/symbol/sc14786.bmp
-staroffice6.0/share/config/symbol/sc21050.bmp
-staroffice6.0/share/config/symbol/sc21051.bmp
-staroffice6.0/share/config/symbol/sc21060.bmp
-staroffice6.0/share/config/symbol/sc21061.bmp
-staroffice6.0/share/config/symbol/sc21062.bmp
-staroffice6.0/share/config/symbol/sc21070.bmp
-staroffice6.0/share/config/symbol/sc21080.bmp
-staroffice6.0/share/config/symbol/sc21100.bmp
-staroffice6.0/share/config/symbol/sc21101.bmp
-staroffice6.0/share/config/symbol/sc21102.bmp
-staroffice6.0/share/config/symbol/sc21103.bmp
-staroffice6.0/share/config/symbol/sc21104.bmp
-staroffice6.0/share/config/symbol/sc21105.bmp
-staroffice6.0/share/config/symbol/sc21110.bmp
-staroffice6.0/share/config/symbol/sc21111.bmp
-staroffice6.0/share/config/symbol/sc21120.bmp
-staroffice6.0/share/config/symbol/sc21121.bmp
-staroffice6.0/share/config/symbol/sc21130.bmp
-staroffice6.0/share/config/symbol/sc21140.bmp
-staroffice6.0/share/config/symbol/sc21141.bmp
-staroffice6.0/share/config/symbol/sc21142.bmp
-staroffice6.0/share/config/symbol/sc21150.bmp
-staroffice6.0/share/config/symbol/sc21160.bmp
-staroffice6.0/share/config/symbol/sc21170.bmp
-staroffice6.0/share/config/symbol/sc21180.bmp
-staroffice6.0/share/config/symbol/sc21190.bmp
-staroffice6.0/share/config/symbol/sc21200.bmp
-staroffice6.0/share/config/symbol/sc21210.bmp
-staroffice6.0/share/config/symbol/sc21220.bmp
-staroffice6.0/share/config/symbol/sc21230.bmp
-staroffice6.0/share/config/symbol/sc21240.bmp
-staroffice6.0/share/config/symbol/sc21250.bmp
-staroffice6.0/share/config/symbol/sc27030.bmp
-staroffice6.0/share/config/symbol/sc27065.bmp
-staroffice6.0/share/config/symbol/sc27066.bmp
-staroffice6.0/share/config/symbol/sc27067.bmp
-staroffice6.0/share/config/symbol/sc30000.bmp
-staroffice6.0/share/config/symbol/sc30002.bmp
-staroffice6.0/share/config/symbol/sc30003.bmp
-staroffice6.0/share/config/symbol/sc30004.bmp
-staroffice6.0/share/config/symbol/sc30005.bmp
-staroffice6.0/share/config/symbol/sc30007.bmp
-staroffice6.0/share/config/symbol/sc30008.bmp
-staroffice6.0/share/config/symbol/sc30009.bmp
-staroffice6.0/share/config/symbol/sc30010.bmp
-staroffice6.0/share/config/symbol/sc30011.bmp
-staroffice6.0/share/config/symbol/sc30012.bmp
-staroffice6.0/share/config/symbol/sc30770.bmp
-staroffice6.0/share/config/symbol/sc30773.bmp
-staroffice6.0/share/config/symbol/sc30774.bmp
-staroffice6.0/share/config/symbol/sc30782.bmp
-staroffice6.0/share/config/symbol/sc6377.bmp
-staroffice6.0/share/config/symbol/scbullet.bmp
-staroffice6.0/share/config/symbol/scnumb.bmp
-staroffice6.0/share/config/symbol/sco161.bmp
-staroffice6.0/share/config/symbol/sco261.bmp
-staroffice6.0/share/config/symbol/sco262.bmp
-staroffice6.0/share/config/symbol/sortd.bmp
-staroffice6.0/share/config/symbol/sortu.bmp
-staroffice6.0/share/config/symbol/u_high.bmp
-staroffice6.0/share/config/symbol/u_low.bmp
-staroffice6.0/share/config/symbol/u_normal.bmp
-staroffice6.0/share/config/webcast/common.inc
-staroffice6.0/share/config/webcast/common.pl
-staroffice6.0/share/config/webcast/edit.asp
-staroffice6.0/share/config/webcast/edit.pl
-staroffice6.0/share/config/webcast/editpic.asp
-staroffice6.0/share/config/webcast/editpic.pl
-staroffice6.0/share/config/webcast/index.pl
-staroffice6.0/share/config/webcast/poll.asp
-staroffice6.0/share/config/webcast/poll.pl
-staroffice6.0/share/config/webcast/savepic.asp
-staroffice6.0/share/config/webcast/savepic.pl
-staroffice6.0/share/config/webcast/show.asp
-staroffice6.0/share/config/webcast/show.pl
-staroffice6.0/share/config/webcast/webcast.asp
-staroffice6.0/share/config/webcast/webcast.pl
-staroffice6.0/share/dict/01-44-hyph.dat
-staroffice6.0/share/dict/01-44-spell.dat
-staroffice6.0/share/dict/01_thes.dat
-staroffice6.0/share/dict/33-hyph.dat
-staroffice6.0/share/dict/33-spell.dat
-staroffice6.0/share/dict/33_thes.dat
-staroffice6.0/share/dict/34-hyph.dat
-staroffice6.0/share/dict/34-spell.dat
-staroffice6.0/share/dict/34_thes.dat
-staroffice6.0/share/dict/44_thes.dat
-staroffice6.0/share/dict/49-hyph.dat
-staroffice6.0/share/dict/49-ohyph.dat
-staroffice6.0/share/dict/49-ospell.dat
-staroffice6.0/share/dict/49-spell.dat
-staroffice6.0/share/dict/49_thes.dat
-staroffice6.0/share/dict/dhco40
-staroffice6.0/share/dict/dhta40
-staroffice6.0/share/dict/ds40.bin
-staroffice6.0/share/dict/dt40.bin
-staroffice6.0/share/dict/dt40.cut
-staroffice6.0/share/dict/dt40.prl
-staroffice6.0/share/dict/dtco40
-staroffice6.0/share/dict/dtex40no.cat
-staroffice6.0/share/dtd/math/1_01/math.dtd
-staroffice6.0/share/dtd/math/1_01/w3c_ipr_software_notice.html
-staroffice6.0/share/dtd/officedocument/1_0/Manifest.dtd
-staroffice6.0/share/dtd/officedocument/1_0/accelerator.dtd
-staroffice6.0/share/dtd/officedocument/1_0/chart.mod
-staroffice6.0/share/dtd/officedocument/1_0/datastyl.mod
-staroffice6.0/share/dtd/officedocument/1_0/dialog.dtd
-staroffice6.0/share/dtd/officedocument/1_0/drawing.mod
-staroffice6.0/share/dtd/officedocument/1_0/dtypes.mod
-staroffice6.0/share/dtd/officedocument/1_0/event.dtd
-staroffice6.0/share/dtd/officedocument/1_0/form.mod
-staroffice6.0/share/dtd/officedocument/1_0/libraries.dtd
-staroffice6.0/share/dtd/officedocument/1_0/menubar.dtd
-staroffice6.0/share/dtd/officedocument/1_0/meta.mod
-staroffice6.0/share/dtd/officedocument/1_0/module.dtd
-staroffice6.0/share/dtd/officedocument/1_0/nmspace.mod
-staroffice6.0/share/dtd/officedocument/1_0/office.dtd
-staroffice6.0/share/dtd/officedocument/1_0/office.mod
-staroffice6.0/share/dtd/officedocument/1_0/script.mod
-staroffice6.0/share/dtd/officedocument/1_0/settings.mod
-staroffice6.0/share/dtd/officedocument/1_0/statusbar.dtd
-staroffice6.0/share/dtd/officedocument/1_0/style.mod
-staroffice6.0/share/dtd/officedocument/1_0/table.mod
-staroffice6.0/share/dtd/officedocument/1_0/text.mod
-staroffice6.0/share/dtd/officedocument/1_0/toolbar.dtd
-staroffice6.0/share/fonts/truetype/albanybc.ttf
-staroffice6.0/share/fonts/truetype/albanyc.ttf
-staroffice6.0/share/fonts/truetype/albanyic.ttf
-staroffice6.0/share/fonts/truetype/albanyzc.ttf
-staroffice6.0/share/fonts/truetype/ans_____.ttf
-staroffice6.0/share/fonts/truetype/ansb____.ttf
-staroffice6.0/share/fonts/truetype/ansbi___.ttf
-staroffice6.0/share/fonts/truetype/ansi____.ttf
-staroffice6.0/share/fonts/truetype/arialn.ttf
-staroffice6.0/share/fonts/truetype/arialnb.ttf
-staroffice6.0/share/fonts/truetype/arialnbi.ttf
-staroffice6.0/share/fonts/truetype/arialni.ttf
-staroffice6.0/share/fonts/truetype/ariblk.ttf
-staroffice6.0/share/fonts/truetype/broad.ttf
-staroffice6.0/share/fonts/truetype/cumbbc.ttf
-staroffice6.0/share/fonts/truetype/cumbbic.ttf
-staroffice6.0/share/fonts/truetype/cumbc.ttf
-staroffice6.0/share/fonts/truetype/cumbic.ttf
-staroffice6.0/share/fonts/truetype/fonts.dir
-staroffice6.0/share/fonts/truetype/gara_bd.ttf
-staroffice6.0/share/fonts/truetype/gara_bdi.ttf
-staroffice6.0/share/fonts/truetype/gara_i.ttf
-staroffice6.0/share/fonts/truetype/gara_r.ttf
-staroffice6.0/share/fonts/truetype/ims_i.ttf
-staroffice6.0/share/fonts/truetype/is______.ttf
-staroffice6.0/share/fonts/truetype/kidpr.ttf
-staroffice6.0/share/fonts/truetype/kidprbol.ttf
-staroffice6.0/share/fonts/truetype/palscr.ttf
-staroffice6.0/share/fonts/truetype/pascsb.ttf
-staroffice6.0/share/fonts/truetype/shef_bd.ttf
-staroffice6.0/share/fonts/truetype/shef_it.ttf
-staroffice6.0/share/fonts/truetype/shef_rg.ttf
-staroffice6.0/share/fonts/truetype/soui.ttf
-staroffice6.0/share/fonts/truetype/starsymb.ttf
-staroffice6.0/share/fonts/truetype/thornbcp.ttf
-staroffice6.0/share/fonts/truetype/thorncp.ttf
-staroffice6.0/share/fonts/truetype/thornicp.ttf
-staroffice6.0/share/fonts/truetype/thornzcp.ttf
-staroffice6.0/share/gallery/apples.gif
-staroffice6.0/share/gallery/arrows/3d_down.wmf
-staroffice6.0/share/gallery/arrows/3d_left.wmf
-staroffice6.0/share/gallery/arrows/3d_right.wmf
-staroffice6.0/share/gallery/arrows/3d_up.wmf
-staroffice6.0/share/gallery/arrows/arrow1_both.wmf
-staroffice6.0/share/gallery/arrows/arrow1_circ.wmf
-staroffice6.0/share/gallery/arrows/arrow1_dow-l.wmf
-staroffice6.0/share/gallery/arrows/arrow1_dow-r.wmf
-staroffice6.0/share/gallery/arrows/arrow1_dow.wmf
-staroffice6.0/share/gallery/arrows/arrow1_fork.wmf
-staroffice6.0/share/gallery/arrows/arrow1_l.wmf
-staroffice6.0/share/gallery/arrows/arrow1_meet.wmf
-staroffice6.0/share/gallery/arrows/arrow1_r.wmf
-staroffice6.0/share/gallery/arrows/arrow1_swap.wmf
-staroffice6.0/share/gallery/arrows/arrow1_turn-l.wmf
-staroffice6.0/share/gallery/arrows/arrow1_turn-r.wmf
-staroffice6.0/share/gallery/arrows/arrow1_up-l.wmf
-staroffice6.0/share/gallery/arrows/arrow1_up-r.wmf
-staroffice6.0/share/gallery/arrows/arrow1_up.wmf
-staroffice6.0/share/gallery/arrows/arrow2_both.wmf
-staroffice6.0/share/gallery/arrows/arrow2_dow-l.wmf
-staroffice6.0/share/gallery/arrows/arrow2_dow-r.wmf
-staroffice6.0/share/gallery/arrows/arrow2_dow.wmf
-staroffice6.0/share/gallery/arrows/arrow2_fork.wmf
-staroffice6.0/share/gallery/arrows/arrow2_l.wmf
-staroffice6.0/share/gallery/arrows/arrow2_meet.wmf
-staroffice6.0/share/gallery/arrows/arrow2_r.wmf
-staroffice6.0/share/gallery/arrows/arrow2_up-l.wmf
-staroffice6.0/share/gallery/arrows/arrow2_up-r.wmf
-staroffice6.0/share/gallery/arrows/arrow2_up.wmf
-staroffice6.0/share/gallery/arrows/arrow3_dow.wmf
-staroffice6.0/share/gallery/arrows/arrow3_l.wmf
-staroffice6.0/share/gallery/arrows/arrow3_r.wmf
-staroffice6.0/share/gallery/arrows/arrow3_thin_dow.wmf
-staroffice6.0/share/gallery/arrows/arrow3_thin_l.wmf
-staroffice6.0/share/gallery/arrows/arrow3_thin_r.wmf
-staroffice6.0/share/gallery/arrows/arrow3_thin_up.wmf
-staroffice6.0/share/gallery/arrows/arrow3_up.wmf
-staroffice6.0/share/gallery/arrows/arrow4_both.wmf
-staroffice6.0/share/gallery/arrows/arrow4_circ1.wmf
-staroffice6.0/share/gallery/arrows/arrow4_circ2.wmf
-staroffice6.0/share/gallery/arrows/arrow4_circ3.wmf
-staroffice6.0/share/gallery/arrows/arrow4_circ4.wmf
-staroffice6.0/share/gallery/arrows/arrow4_dow.wmf
-staroffice6.0/share/gallery/arrows/arrow4_fork.wmf
-staroffice6.0/share/gallery/arrows/arrow4_half.wmf
-staroffice6.0/share/gallery/arrows/arrow4_heavy_dow.wmf
-staroffice6.0/share/gallery/arrows/arrow4_heavy_l.wmf
-staroffice6.0/share/gallery/arrows/arrow4_heavy_r.wmf
-staroffice6.0/share/gallery/arrows/arrow4_heavy_up.wmf
-staroffice6.0/share/gallery/arrows/arrow4_l.wmf
-staroffice6.0/share/gallery/arrows/arrow4_lift.wmf
-staroffice6.0/share/gallery/arrows/arrow4_medi_dow.wmf
-staroffice6.0/share/gallery/arrows/arrow4_medi_l.wmf
-staroffice6.0/share/gallery/arrows/arrow4_medi_r.wmf
-staroffice6.0/share/gallery/arrows/arrow4_medi_up.wmf
-staroffice6.0/share/gallery/arrows/arrow4_quart.wmf
-staroffice6.0/share/gallery/arrows/arrow4_r.wmf
-staroffice6.0/share/gallery/arrows/arrow4_swap.wmf
-staroffice6.0/share/gallery/arrows/arrow4_t-quart.wmf
-staroffice6.0/share/gallery/arrows/arrow4_thin_dow.wmf
-staroffice6.0/share/gallery/arrows/arrow4_thin_l.wmf
-staroffice6.0/share/gallery/arrows/arrow4_thin_r.wmf
-staroffice6.0/share/gallery/arrows/arrow4_thin_up.wmf
-staroffice6.0/share/gallery/arrows/arrow4_up.wmf
-staroffice6.0/share/gallery/arrows/arrow5_l.wmf
-staroffice6.0/share/gallery/arrows/arrow5_r.wmf
-staroffice6.0/share/gallery/arrows/arrow6_l.wmf
-staroffice6.0/share/gallery/arrows/arrow6_r.wmf
-staroffice6.0/share/gallery/arrows/buffer_both.wmf
-staroffice6.0/share/gallery/arrows/buffer_dow.wmf
-staroffice6.0/share/gallery/arrows/buffer_l.wmf
-staroffice6.0/share/gallery/arrows/buffer_r.wmf
-staroffice6.0/share/gallery/arrows/buffer_up.wmf
-staroffice6.0/share/gallery/arrows/dots_both.wmf
-staroffice6.0/share/gallery/arrows/dots_dow-l.wmf
-staroffice6.0/share/gallery/arrows/dots_dow-r.wmf
-staroffice6.0/share/gallery/arrows/dots_down.wmf
-staroffice6.0/share/gallery/arrows/dots_fork.wmf
-staroffice6.0/share/gallery/arrows/dots_l.wmf
-staroffice6.0/share/gallery/arrows/dots_r.wmf
-staroffice6.0/share/gallery/arrows/dots_swap.wmf
-staroffice6.0/share/gallery/arrows/dots_up-l.wmf
-staroffice6.0/share/gallery/arrows/dots_up-r.wmf
-staroffice6.0/share/gallery/arrows/dots_up.wmf
-staroffice6.0/share/gallery/arrows/free_dow.wmf
-staroffice6.0/share/gallery/arrows/free_fork.wmf
-staroffice6.0/share/gallery/arrows/free_l.wmf
-staroffice6.0/share/gallery/arrows/free_r.wmf
-staroffice6.0/share/gallery/arrows/free_up.wmf
-staroffice6.0/share/gallery/arrows/heavy_do-l.wmf
-staroffice6.0/share/gallery/arrows/heavy_do-r.wmf
-staroffice6.0/share/gallery/arrows/heavy_down.wmf
-staroffice6.0/share/gallery/arrows/heavy_l.wmf
-staroffice6.0/share/gallery/arrows/heavy_r.wmf
-staroffice6.0/share/gallery/arrows/heavy_up-l.wmf
-staroffice6.0/share/gallery/arrows/heavy_up-r.wmf
-staroffice6.0/share/gallery/arrows/heavy_up.wmf
-staroffice6.0/share/gallery/arrows/peak-only_down.wmf
-staroffice6.0/share/gallery/arrows/peak-only_l.wmf
-staroffice6.0/share/gallery/arrows/peak-only_r.wmf
-staroffice6.0/share/gallery/arrows/peak-only_up.wmf
-staroffice6.0/share/gallery/arrows/peak_arrow_l.wmf
-staroffice6.0/share/gallery/arrows/peak_arrow_r.wmf
-staroffice6.0/share/gallery/arrows/peak_down.wmf
-staroffice6.0/share/gallery/arrows/peak_l.wmf
-staroffice6.0/share/gallery/arrows/peak_r.wmf
-staroffice6.0/share/gallery/arrows/peak_up.wmf
-staroffice6.0/share/gallery/arrows/plump_both.wmf
-staroffice6.0/share/gallery/arrows/plump_down.wmf
-staroffice6.0/share/gallery/arrows/plump_l.wmf
-staroffice6.0/share/gallery/arrows/plump_r.wmf
-staroffice6.0/share/gallery/arrows/plump_up.wmf
-staroffice6.0/share/gallery/arrows/point_l.wmf
-staroffice6.0/share/gallery/arrows/point_r.wmf
-staroffice6.0/share/gallery/arrows/puffed_dow.wmf
-staroffice6.0/share/gallery/arrows/puffed_l.wmf
-staroffice6.0/share/gallery/arrows/puffed_r.wmf
-staroffice6.0/share/gallery/arrows/puffed_up.wmf
-staroffice6.0/share/gallery/arrows/rounded_both.wmf
-staroffice6.0/share/gallery/arrows/rounded_down.wmf
-staroffice6.0/share/gallery/arrows/rounded_fork.wmf
-staroffice6.0/share/gallery/arrows/rounded_l.wmf
-staroffice6.0/share/gallery/arrows/rounded_r.wmf
-staroffice6.0/share/gallery/arrows/rounded_return.wmf
-staroffice6.0/share/gallery/arrows/rounded_turn-l.wmf
-staroffice6.0/share/gallery/arrows/rounded_turn-r.wmf
-staroffice6.0/share/gallery/arrows/rounded_up.wmf
-staroffice6.0/share/gallery/arrows/sharp_dow.wmf
-staroffice6.0/share/gallery/arrows/sharp_l.wmf
-staroffice6.0/share/gallery/arrows/sharp_r.wmf
-staroffice6.0/share/gallery/arrows/sharp_up.wmf
-staroffice6.0/share/gallery/arrows/signpost.wmf
-staroffice6.0/share/gallery/arrows/smooth_arrow_l.wmf
-staroffice6.0/share/gallery/arrows/smooth_arrow_r.wmf
-staroffice6.0/share/gallery/arrows/smooth_dow.wmf
-staroffice6.0/share/gallery/arrows/smooth_heavy_dow.wmf
-staroffice6.0/share/gallery/arrows/smooth_heavy_l.wmf
-staroffice6.0/share/gallery/arrows/smooth_heavy_r.wmf
-staroffice6.0/share/gallery/arrows/smooth_heavy_up.wmf
-staroffice6.0/share/gallery/arrows/smooth_l.wmf
-staroffice6.0/share/gallery/arrows/smooth_r.wmf
-staroffice6.0/share/gallery/arrows/smooth_up.wmf
-staroffice6.0/share/gallery/balloons/balloon_left.wmf
-staroffice6.0/share/gallery/balloons/balloon_middle.wmf
-staroffice6.0/share/gallery/balloons/balloon_right.wmf
-staroffice6.0/share/gallery/balloons/cloudy_discus.wmf
-staroffice6.0/share/gallery/balloons/cloudy_left-l.wmf
-staroffice6.0/share/gallery/balloons/cloudy_left-m.wmf
-staroffice6.0/share/gallery/balloons/cloudy_left-s.wmf
-staroffice6.0/share/gallery/balloons/cloudy_middle-l.wmf
-staroffice6.0/share/gallery/balloons/cloudy_middle-m.wmf
-staroffice6.0/share/gallery/balloons/cloudy_middle-s.wmf
-staroffice6.0/share/gallery/balloons/cloudy_right-l.wmf
-staroffice6.0/share/gallery/balloons/cloudy_right-m.wmf
-staroffice6.0/share/gallery/balloons/cloudy_right-s.wmf
-staroffice6.0/share/gallery/balloons/corner_discus.wmf
-staroffice6.0/share/gallery/balloons/corner_left-l.wmf
-staroffice6.0/share/gallery/balloons/corner_left-m.wmf
-staroffice6.0/share/gallery/balloons/corner_left-s.wmf
-staroffice6.0/share/gallery/balloons/corner_middle-l.wmf
-staroffice6.0/share/gallery/balloons/corner_middle-m.wmf
-staroffice6.0/share/gallery/balloons/corner_middle-s.wmf
-staroffice6.0/share/gallery/balloons/corner_right-l.wmf
-staroffice6.0/share/gallery/balloons/corner_right-m.wmf
-staroffice6.0/share/gallery/balloons/corner_right-s.wmf
-staroffice6.0/share/gallery/balloons/round_discus.wmf
-staroffice6.0/share/gallery/balloons/round_left-l.wmf
-staroffice6.0/share/gallery/balloons/round_left-m.wmf
-staroffice6.0/share/gallery/balloons/round_left-s.wmf
-staroffice6.0/share/gallery/balloons/round_middle-l.wmf
-staroffice6.0/share/gallery/balloons/round_middle-m.wmf
-staroffice6.0/share/gallery/balloons/round_middle-s.wmf
-staroffice6.0/share/gallery/balloons/round_right-l.wmf
-staroffice6.0/share/gallery/balloons/round_right-m.wmf
-staroffice6.0/share/gallery/balloons/round_right-s.wmf
-staroffice6.0/share/gallery/balloons/skriek_discus.wmf
-staroffice6.0/share/gallery/balloons/skriek_left-l.wmf
-staroffice6.0/share/gallery/balloons/skriek_left-m.wmf
-staroffice6.0/share/gallery/balloons/skriek_left-s.wmf
-staroffice6.0/share/gallery/balloons/skriek_middle-l.wmf
-staroffice6.0/share/gallery/balloons/skriek_middle-m.wmf
-staroffice6.0/share/gallery/balloons/skriek_middle-s.wmf
-staroffice6.0/share/gallery/balloons/skriek_right-l.wmf
-staroffice6.0/share/gallery/balloons/skriek_right-m.wmf
-staroffice6.0/share/gallery/balloons/skriek_right-s.wmf
-staroffice6.0/share/gallery/balloons/splash-left.wmf
-staroffice6.0/share/gallery/balloons/splash-middle.wmf
-staroffice6.0/share/gallery/balloons/splash-right.wmf
-staroffice6.0/share/gallery/balloons/think_left.wmf
-staroffice6.0/share/gallery/balloons/think_middle.wmf
-staroffice6.0/share/gallery/balloons/think_right.wmf
-staroffice6.0/share/gallery/bigapple.gif
-staroffice6.0/share/gallery/bullets/blkpearl.gif
-staroffice6.0/share/gallery/bullets/bluarrow.gif
-staroffice6.0/share/gallery/bullets/bluball.gif
-staroffice6.0/share/gallery/bullets/bludiamd.gif
-staroffice6.0/share/gallery/bullets/bluered.gif
-staroffice6.0/share/gallery/bullets/blusqare.gif
-staroffice6.0/share/gallery/bullets/blustar.gif
-staroffice6.0/share/gallery/bullets/coffee_1.gif
-staroffice6.0/share/gallery/bullets/coffee_2.gif
-staroffice6.0/share/gallery/bullets/coffee_3.gif
-staroffice6.0/share/gallery/bullets/coffee_4.gif
-staroffice6.0/share/gallery/bullets/coffee_5.gif
-staroffice6.0/share/gallery/bullets/con-blue.gif
-staroffice6.0/share/gallery/bullets/con-cyan.gif
-staroffice6.0/share/gallery/bullets/con-green.gif
-staroffice6.0/share/gallery/bullets/con-lilac.gif
-staroffice6.0/share/gallery/bullets/con-oran.gif
-staroffice6.0/share/gallery/bullets/con-pink.gif
-staroffice6.0/share/gallery/bullets/con-red.gif
-staroffice6.0/share/gallery/bullets/con-yellow.gif
-staroffice6.0/share/gallery/bullets/corner_1.gif
-staroffice6.0/share/gallery/bullets/corner_2.gif
-staroffice6.0/share/gallery/bullets/corner_3.gif
-staroffice6.0/share/gallery/bullets/corner_4.gif
-staroffice6.0/share/gallery/bullets/darkball.gif
-staroffice6.0/share/gallery/bullets/darkblue.gif
-staroffice6.0/share/gallery/bullets/gldpearl.gif
-staroffice6.0/share/gallery/bullets/golfball.gif
-staroffice6.0/share/gallery/bullets/grnarrow.gif
-staroffice6.0/share/gallery/bullets/grnball.gif
-staroffice6.0/share/gallery/bullets/grndiamd.gif
-staroffice6.0/share/gallery/bullets/grnpearl.gif
-staroffice6.0/share/gallery/bullets/grnsqare.gif
-staroffice6.0/share/gallery/bullets/grnstar.gif
-staroffice6.0/share/gallery/bullets/gryarrow.gif
-staroffice6.0/share/gallery/bullets/gryball.gif
-staroffice6.0/share/gallery/bullets/grydiamd.gif
-staroffice6.0/share/gallery/bullets/grysqare.gif
-staroffice6.0/share/gallery/bullets/grystar.gif
-staroffice6.0/share/gallery/bullets/orgarrow.gif
-staroffice6.0/share/gallery/bullets/orgball.gif
-staroffice6.0/share/gallery/bullets/orgdiamd.gif
-staroffice6.0/share/gallery/bullets/orgsqare.gif
-staroffice6.0/share/gallery/bullets/orgstar.gif
-staroffice6.0/share/gallery/bullets/pebble_1.gif
-staroffice6.0/share/gallery/bullets/pebble_2.gif
-staroffice6.0/share/gallery/bullets/pebble_3.gif
-staroffice6.0/share/gallery/bullets/poliball.gif
-staroffice6.0/share/gallery/bullets/popcorn_1.gif
-staroffice6.0/share/gallery/bullets/popcorn_2.gif
-staroffice6.0/share/gallery/bullets/rainbow.gif
-staroffice6.0/share/gallery/bullets/redarrow.gif
-staroffice6.0/share/gallery/bullets/redball.gif
-staroffice6.0/share/gallery/bullets/reddiamd.gif
-staroffice6.0/share/gallery/bullets/redsqare.gif
-staroffice6.0/share/gallery/bullets/redstar.gif
-staroffice6.0/share/gallery/bullets/whtpearl.gif
-staroffice6.0/share/gallery/bullets/ylwarrow.gif
-staroffice6.0/share/gallery/bullets/ylwball.gif
-staroffice6.0/share/gallery/bullets/ylwdiamd.gif
-staroffice6.0/share/gallery/bullets/ylwsqare.gif
-staroffice6.0/share/gallery/bullets/ylwstar.gif
-staroffice6.0/share/gallery/calendar/date_1-s.wmf
-staroffice6.0/share/gallery/calendar/date_1.wmf
-staroffice6.0/share/gallery/calendar/date_10-s.wmf
-staroffice6.0/share/gallery/calendar/date_10.wmf
-staroffice6.0/share/gallery/calendar/date_11-s.wmf
-staroffice6.0/share/gallery/calendar/date_11.wmf
-staroffice6.0/share/gallery/calendar/date_12-s.wmf
-staroffice6.0/share/gallery/calendar/date_12.wmf
-staroffice6.0/share/gallery/calendar/date_13-s.wmf
-staroffice6.0/share/gallery/calendar/date_13.wmf
-staroffice6.0/share/gallery/calendar/date_14-s.wmf
-staroffice6.0/share/gallery/calendar/date_14.wmf
-staroffice6.0/share/gallery/calendar/date_15-s.wmf
-staroffice6.0/share/gallery/calendar/date_15.wmf
-staroffice6.0/share/gallery/calendar/date_16-s.wmf
-staroffice6.0/share/gallery/calendar/date_16.wmf
-staroffice6.0/share/gallery/calendar/date_17-s.wmf
-staroffice6.0/share/gallery/calendar/date_17.wmf
-staroffice6.0/share/gallery/calendar/date_18-s.wmf
-staroffice6.0/share/gallery/calendar/date_18.wmf
-staroffice6.0/share/gallery/calendar/date_19-s.wmf
-staroffice6.0/share/gallery/calendar/date_19.wmf
-staroffice6.0/share/gallery/calendar/date_2-s.wmf
-staroffice6.0/share/gallery/calendar/date_2.wmf
-staroffice6.0/share/gallery/calendar/date_20-s.wmf
-staroffice6.0/share/gallery/calendar/date_20.wmf
-staroffice6.0/share/gallery/calendar/date_21-s.wmf
-staroffice6.0/share/gallery/calendar/date_21.wmf
-staroffice6.0/share/gallery/calendar/date_22-s.wmf
-staroffice6.0/share/gallery/calendar/date_22.wmf
-staroffice6.0/share/gallery/calendar/date_23-s.wmf
-staroffice6.0/share/gallery/calendar/date_23.wmf
-staroffice6.0/share/gallery/calendar/date_24-s.wmf
-staroffice6.0/share/gallery/calendar/date_24.wmf
-staroffice6.0/share/gallery/calendar/date_25-s.wmf
-staroffice6.0/share/gallery/calendar/date_25.wmf
-staroffice6.0/share/gallery/calendar/date_26-s.wmf
-staroffice6.0/share/gallery/calendar/date_26.wmf
-staroffice6.0/share/gallery/calendar/date_27-s.wmf
-staroffice6.0/share/gallery/calendar/date_27.wmf
-staroffice6.0/share/gallery/calendar/date_28-s.wmf
-staroffice6.0/share/gallery/calendar/date_28.wmf
-staroffice6.0/share/gallery/calendar/date_29-s.wmf
-staroffice6.0/share/gallery/calendar/date_29.wmf
-staroffice6.0/share/gallery/calendar/date_3-s.wmf
-staroffice6.0/share/gallery/calendar/date_3.wmf
-staroffice6.0/share/gallery/calendar/date_30-s.wmf
-staroffice6.0/share/gallery/calendar/date_30.wmf
-staroffice6.0/share/gallery/calendar/date_31-s.wmf
-staroffice6.0/share/gallery/calendar/date_31.wmf
-staroffice6.0/share/gallery/calendar/date_4-s.wmf
-staroffice6.0/share/gallery/calendar/date_4.wmf
-staroffice6.0/share/gallery/calendar/date_5-s.wmf
-staroffice6.0/share/gallery/calendar/date_5.wmf
-staroffice6.0/share/gallery/calendar/date_6-s.wmf
-staroffice6.0/share/gallery/calendar/date_6.wmf
-staroffice6.0/share/gallery/calendar/date_7-s.wmf
-staroffice6.0/share/gallery/calendar/date_7.wmf
-staroffice6.0/share/gallery/calendar/date_8-s.wmf
-staroffice6.0/share/gallery/calendar/date_8.wmf
-staroffice6.0/share/gallery/calendar/date_9-s.wmf
-staroffice6.0/share/gallery/calendar/date_9.wmf
-staroffice6.0/share/gallery/calendar/date_leer.wmf
-staroffice6.0/share/gallery/clima/autumn.wmf
-staroffice6.0/share/gallery/clima/cloud2.wmf
-staroffice6.0/share/gallery/clima/compassrose_1.wmf
-staroffice6.0/share/gallery/clima/cool_drink.wmf
-staroffice6.0/share/gallery/clima/ice_cream.wmf
-staroffice6.0/share/gallery/clima/icicle.wmf
-staroffice6.0/share/gallery/clima/igloo.wmf
-staroffice6.0/share/gallery/clima/moon.wmf
-staroffice6.0/share/gallery/clima/moon_funny.wmf
-staroffice6.0/share/gallery/clima/raincloud.wmf
-staroffice6.0/share/gallery/clima/snowman.wmf
-staroffice6.0/share/gallery/clima/spring.wmf
-staroffice6.0/share/gallery/clima/star.wmf
-staroffice6.0/share/gallery/clima/stars.wmf
-staroffice6.0/share/gallery/clima/summer.wmf
-staroffice6.0/share/gallery/clima/sun_funny.wmf
-staroffice6.0/share/gallery/clima/sun_yellow.wmf
-staroffice6.0/share/gallery/clima/sunglasses.wmf
-staroffice6.0/share/gallery/clima/sunshade.wmf
-staroffice6.0/share/gallery/clima/thundercloud.wmf
-staroffice6.0/share/gallery/clima/umbrella.wmf
-staroffice6.0/share/gallery/clima/weathercock.wmf
-staroffice6.0/share/gallery/clima/weatherman.wmf
-staroffice6.0/share/gallery/clima/windsock.wmf
-staroffice6.0/share/gallery/clima/winter.wmf
-staroffice6.0/share/gallery/communic/flipchart.wmf
-staroffice6.0/share/gallery/communic/handy_blue.wmf
-staroffice6.0/share/gallery/communic/handy_green.wmf
-staroffice6.0/share/gallery/communic/handy_grey.wmf
-staroffice6.0/share/gallery/communic/handy_red.wmf
-staroffice6.0/share/gallery/communic/handy_yellow.wmf
-staroffice6.0/share/gallery/communic/mail.wmf
-staroffice6.0/share/gallery/communic/megaphone.wmf
-staroffice6.0/share/gallery/communic/satellite.wmf
-staroffice6.0/share/gallery/communic/satellitedish.wmf
-staroffice6.0/share/gallery/computer/around-the-world.wmf
-staroffice6.0/share/gallery/computer/beamer.wmf
-staroffice6.0/share/gallery/computer/binary.wmf
-staroffice6.0/share/gallery/computer/board.wmf
-staroffice6.0/share/gallery/computer/cablechaos.wmf
-staroffice6.0/share/gallery/computer/cd-rom.wmf
-staroffice6.0/share/gallery/computer/chip.wmf
-staroffice6.0/share/gallery/computer/computer.wmf
-staroffice6.0/share/gallery/computer/disk_blue.wmf
-staroffice6.0/share/gallery/computer/disk_green.wmf
-staroffice6.0/share/gallery/computer/disk_red.wmf
-staroffice6.0/share/gallery/computer/disk_yellow.wmf
-staroffice6.0/share/gallery/computer/e-mail.wmf
-staroffice6.0/share/gallery/computer/inkjet.wmf
-staroffice6.0/share/gallery/computer/keyboard.wmf
-staroffice6.0/share/gallery/computer/laserprinter.wmf
-staroffice6.0/share/gallery/computer/monitor-keyb.wmf
-staroffice6.0/share/gallery/computer/monitor.wmf
-staroffice6.0/share/gallery/computer/mouse.wmf
-staroffice6.0/share/gallery/computer/notebook.wmf
-staroffice6.0/share/gallery/computer/palmtop.wmf
-staroffice6.0/share/gallery/computer/rom.wmf
-staroffice6.0/share/gallery/computer/router.wmf
-staroffice6.0/share/gallery/computer/screen-keyb_white.wmf
-staroffice6.0/share/gallery/computer/screen_white.wmf
-staroffice6.0/share/gallery/computer/workstation.wmf
-staroffice6.0/share/gallery/computer/workstation_white.wmf
-staroffice6.0/share/gallery/computer/world.wmf
-staroffice6.0/share/gallery/computer/worldwideweb.wmf
-staroffice6.0/share/gallery/education/blackboard.wmf
-staroffice6.0/share/gallery/education/blotch_blue.wmf
-staroffice6.0/share/gallery/education/blotch_green.wmf
-staroffice6.0/share/gallery/education/blotch_li-blue.wmf
-staroffice6.0/share/gallery/education/blotch_orange.wmf
-staroffice6.0/share/gallery/education/blotch_pink.wmf
-staroffice6.0/share/gallery/education/blotch_red.wmf
-staroffice6.0/share/gallery/education/blotch_violet.wmf
-staroffice6.0/share/gallery/education/blotch_yellow.wmf
-staroffice6.0/share/gallery/education/brush_blue.wmf
-staroffice6.0/share/gallery/education/brush_green.wmf
-staroffice6.0/share/gallery/education/brush_li-blue.wmf
-staroffice6.0/share/gallery/education/brush_orange.wmf
-staroffice6.0/share/gallery/education/brush_pink.wmf
-staroffice6.0/share/gallery/education/brush_red.wmf
-staroffice6.0/share/gallery/education/brush_violet.wmf
-staroffice6.0/share/gallery/education/brush_yellow.wmf
-staroffice6.0/share/gallery/education/childscissors.wmf
-staroffice6.0/share/gallery/education/compasses.wmf
-staroffice6.0/share/gallery/education/eraser.wmf
-staroffice6.0/share/gallery/education/file_blue.wmf
-staroffice6.0/share/gallery/education/file_green.wmf
-staroffice6.0/share/gallery/education/file_grey.wmf
-staroffice6.0/share/gallery/education/file_red.wmf
-staroffice6.0/share/gallery/education/file_yellow.wmf
-staroffice6.0/share/gallery/education/files.wmf
-staroffice6.0/share/gallery/education/files_more.wmf
-staroffice6.0/share/gallery/education/globe.wmf
-staroffice6.0/share/gallery/education/graduate.wmf
-staroffice6.0/share/gallery/education/inkpot.wmf
-staroffice6.0/share/gallery/education/pen_blue.wmf
-staroffice6.0/share/gallery/education/pen_green.wmf
-staroffice6.0/share/gallery/education/pen_li-blue.wmf
-staroffice6.0/share/gallery/education/pen_natural.wmf
-staroffice6.0/share/gallery/education/pen_orange.wmf
-staroffice6.0/share/gallery/education/pen_pink.wmf
-staroffice6.0/share/gallery/education/pen_violet.wmf
-staroffice6.0/share/gallery/education/pen_yellow.wmf
-staroffice6.0/share/gallery/education/pot_blue.wmf
-staroffice6.0/share/gallery/education/pot_green.wmf
-staroffice6.0/share/gallery/education/pot_li-blue.wmf
-staroffice6.0/share/gallery/education/pot_orange.wmf
-staroffice6.0/share/gallery/education/pot_pink.wmf
-staroffice6.0/share/gallery/education/pot_red.wmf
-staroffice6.0/share/gallery/education/pot_violet.wmf
-staroffice6.0/share/gallery/education/pot_yellow.wmf
-staroffice6.0/share/gallery/education/rulers.wmf
-staroffice6.0/share/gallery/education/satchel_blue.wmf
-staroffice6.0/share/gallery/education/satchel_brown.wmf
-staroffice6.0/share/gallery/education/satchel_red.wmf
-staroffice6.0/share/gallery/education/tube_blue.wmf
-staroffice6.0/share/gallery/education/tube_green.wmf
-staroffice6.0/share/gallery/education/tube_li-blue.wmf
-staroffice6.0/share/gallery/education/tube_orange.wmf
-staroffice6.0/share/gallery/education/tube_pink.wmf
-staroffice6.0/share/gallery/education/tube_red.wmf
-staroffice6.0/share/gallery/education/tube_violet.wmf
-staroffice6.0/share/gallery/education/tube_yellow.wmf
-staroffice6.0/share/gallery/education/worldmap.wmf
-staroffice6.0/share/gallery/education/worldmap2.wmf
-staroffice6.0/share/gallery/emoicons/amazed.gif
-staroffice6.0/share/gallery/emoicons/angry.gif
-staroffice6.0/share/gallery/emoicons/asleep.gif
-staroffice6.0/share/gallery/emoicons/big_nose.gif
-staroffice6.0/share/gallery/emoicons/black_eye.gif
-staroffice6.0/share/gallery/emoicons/blink.gif
-staroffice6.0/share/gallery/emoicons/bloody_funny.gif
-staroffice6.0/share/gallery/emoicons/booze.gif
-staroffice6.0/share/gallery/emoicons/cheeky.gif
-staroffice6.0/share/gallery/emoicons/confused.gif
-staroffice6.0/share/gallery/emoicons/cry.gif
-staroffice6.0/share/gallery/emoicons/disappointed.gif
-staroffice6.0/share/gallery/emoicons/discreet.gif
-staroffice6.0/share/gallery/emoicons/drunk.gif
-staroffice6.0/share/gallery/emoicons/dumb.gif
-staroffice6.0/share/gallery/emoicons/dying.gif
-staroffice6.0/share/gallery/emoicons/fright.gif
-staroffice6.0/share/gallery/emoicons/frog.gif
-staroffice6.0/share/gallery/emoicons/funny_nose.gif
-staroffice6.0/share/gallery/emoicons/gasbag.gif
-staroffice6.0/share/gallery/emoicons/glasses.gif
-staroffice6.0/share/gallery/emoicons/grin.gif
-staroffice6.0/share/gallery/emoicons/happy.gif
-staroffice6.0/share/gallery/emoicons/ill.gif
-staroffice6.0/share/gallery/emoicons/kiss.gif
-staroffice6.0/share/gallery/emoicons/laugh.gif
-staroffice6.0/share/gallery/emoicons/lipstick.gif
-staroffice6.0/share/gallery/emoicons/mad.gif
-staroffice6.0/share/gallery/emoicons/mixed.gif
-staroffice6.0/share/gallery/emoicons/moustache.gif
-staroffice6.0/share/gallery/emoicons/need_haircut.gif
-staroffice6.0/share/gallery/emoicons/nose.gif
-staroffice6.0/share/gallery/emoicons/offended.gif
-staroffice6.0/share/gallery/emoicons/pet_smiley.gif
-staroffice6.0/share/gallery/emoicons/pig.gif
-staroffice6.0/share/gallery/emoicons/poor_bloke.gif
-staroffice6.0/share/gallery/emoicons/punk.gif
-staroffice6.0/share/gallery/emoicons/robot.gif
-staroffice6.0/share/gallery/emoicons/sad.gif
-staroffice6.0/share/gallery/emoicons/sceptical.gif
-staroffice6.0/share/gallery/emoicons/scuba.gif
-staroffice6.0/share/gallery/emoicons/smoker.gif
-staroffice6.0/share/gallery/emoicons/sunglasses.gif
-staroffice6.0/share/gallery/emoicons/tear.gif
-staroffice6.0/share/gallery/emoicons/tipsy.gif
-staroffice6.0/share/gallery/emoicons/tongue.gif
-staroffice6.0/share/gallery/emoicons/tongue_out.gif
-staroffice6.0/share/gallery/emoicons/turban.gif
-staroffice6.0/share/gallery/emoicons/vampire.gif
-staroffice6.0/share/gallery/emoicons/very_angry.gif
-staroffice6.0/share/gallery/emoicons/very_drunk.gif
-staroffice6.0/share/gallery/emoicons/very_sad.gif
-staroffice6.0/share/gallery/emoicons/whistle.gif
-staroffice6.0/share/gallery/emoicons/wink.gif
-staroffice6.0/share/gallery/emoicons/yawn.gif
-staroffice6.0/share/gallery/emoicons/yawning.gif
-staroffice6.0/share/gallery/emoicons/yuppie.gif
-staroffice6.0/share/gallery/finances/abacus.wmf
-staroffice6.0/share/gallery/finances/bag.wmf
-staroffice6.0/share/gallery/finances/banknote.wmf
-staroffice6.0/share/gallery/finances/banknote_3.wmf
-staroffice6.0/share/gallery/finances/banknotes_1.wmf
-staroffice6.0/share/gallery/finances/banknotes_2.wmf
-staroffice6.0/share/gallery/finances/calculator.wmf
-staroffice6.0/share/gallery/finances/coin.wmf
-staroffice6.0/share/gallery/finances/coins_1.wmf
-staroffice6.0/share/gallery/finances/coins_2.wmf
-staroffice6.0/share/gallery/finances/coins_3.wmf
-staroffice6.0/share/gallery/finances/dollar_g.wmf
-staroffice6.0/share/gallery/finances/dollar_s.wmf
-staroffice6.0/share/gallery/finances/euro_g.wmf
-staroffice6.0/share/gallery/finances/euro_s.wmf
-staroffice6.0/share/gallery/finances/fall.wmf
-staroffice6.0/share/gallery/finances/increase.wmf
-staroffice6.0/share/gallery/finances/piggy-bank.wmf
-staroffice6.0/share/gallery/finances/save.wmf
-staroffice6.0/share/gallery/finances/yen_g.wmf
-staroffice6.0/share/gallery/finances/yen_s.wmf
-staroffice6.0/share/gallery/flags/algeria.wmf
-staroffice6.0/share/gallery/flags/algeria2.wmf
-staroffice6.0/share/gallery/flags/argent2.wmf
-staroffice6.0/share/gallery/flags/argentina.wmf
-staroffice6.0/share/gallery/flags/austral2.wmf
-staroffice6.0/share/gallery/flags/australia.wmf
-staroffice6.0/share/gallery/flags/austria.wmf
-staroffice6.0/share/gallery/flags/austria2.wmf
-staroffice6.0/share/gallery/flags/bahrain.wmf
-staroffice6.0/share/gallery/flags/bahrain2.wmf
-staroffice6.0/share/gallery/flags/belarus.wmf
-staroffice6.0/share/gallery/flags/belgium.wmf
-staroffice6.0/share/gallery/flags/belgium2.wmf
-staroffice6.0/share/gallery/flags/bolivia.wmf
-staroffice6.0/share/gallery/flags/brasil2.wmf
-staroffice6.0/share/gallery/flags/brazil.wmf
-staroffice6.0/share/gallery/flags/brunei.wmf
-staroffice6.0/share/gallery/flags/bulgari2.wmf
-staroffice6.0/share/gallery/flags/bulgaria.wmf
-staroffice6.0/share/gallery/flags/canada.wmf
-staroffice6.0/share/gallery/flags/canada2.wmf
-staroffice6.0/share/gallery/flags/chile.wmf
-staroffice6.0/share/gallery/flags/chile2.wmf
-staroffice6.0/share/gallery/flags/china.wmf
-staroffice6.0/share/gallery/flags/china2.wmf
-staroffice6.0/share/gallery/flags/colombi2.wmf
-staroffice6.0/share/gallery/flags/colombia.wmf
-staroffice6.0/share/gallery/flags/costa_rica.wmf
-staroffice6.0/share/gallery/flags/cuba.wmf
-staroffice6.0/share/gallery/flags/cuba2.wmf
-staroffice6.0/share/gallery/flags/cyprus.wmf
-staroffice6.0/share/gallery/flags/cyprus2.wmf
-staroffice6.0/share/gallery/flags/czech2.wmf
-staroffice6.0/share/gallery/flags/czech_republic.wmf
-staroffice6.0/share/gallery/flags/denmark.wmf
-staroffice6.0/share/gallery/flags/denmark2.wmf
-staroffice6.0/share/gallery/flags/dominican_rep.wmf
-staroffice6.0/share/gallery/flags/ecuador.wmf
-staroffice6.0/share/gallery/flags/egypt.wmf
-staroffice6.0/share/gallery/flags/egypt2.wmf
-staroffice6.0/share/gallery/flags/el_salvador.wmf
-staroffice6.0/share/gallery/flags/europe1.wmf
-staroffice6.0/share/gallery/flags/finland.wmf
-staroffice6.0/share/gallery/flags/finland2.wmf
-staroffice6.0/share/gallery/flags/france.wmf
-staroffice6.0/share/gallery/flags/france2.wmf
-staroffice6.0/share/gallery/flags/georgia.wmf
-staroffice6.0/share/gallery/flags/georgia2.wmf
-staroffice6.0/share/gallery/flags/germany.wmf
-staroffice6.0/share/gallery/flags/germany2.wmf
-staroffice6.0/share/gallery/flags/greatbr2.wmf
-staroffice6.0/share/gallery/flags/greece.wmf
-staroffice6.0/share/gallery/flags/greece2.wmf
-staroffice6.0/share/gallery/flags/greenland.wmf
-staroffice6.0/share/gallery/flags/greenland2.wmf
-staroffice6.0/share/gallery/flags/guatema2.wmf
-staroffice6.0/share/gallery/flags/guatemala.wmf
-staroffice6.0/share/gallery/flags/honduras.wmf
-staroffice6.0/share/gallery/flags/honduras2.wmf
-staroffice6.0/share/gallery/flags/hungary.wmf
-staroffice6.0/share/gallery/flags/hungary2.wmf
-staroffice6.0/share/gallery/flags/iceland.wmf
-staroffice6.0/share/gallery/flags/iceland2.wmf
-staroffice6.0/share/gallery/flags/india.wmf
-staroffice6.0/share/gallery/flags/india2.wmf
-staroffice6.0/share/gallery/flags/indon2.wmf
-staroffice6.0/share/gallery/flags/indonesia.wmf
-staroffice6.0/share/gallery/flags/iraq.wmf
-staroffice6.0/share/gallery/flags/ireland.wmf
-staroffice6.0/share/gallery/flags/ireland2.wmf
-staroffice6.0/share/gallery/flags/israel.wmf
-staroffice6.0/share/gallery/flags/israel2.wmf
-staroffice6.0/share/gallery/flags/italy.wmf
-staroffice6.0/share/gallery/flags/italy2.wmf
-staroffice6.0/share/gallery/flags/jamica.wmf
-staroffice6.0/share/gallery/flags/japan.wmf
-staroffice6.0/share/gallery/flags/japan2.wmf
-staroffice6.0/share/gallery/flags/jordan.wmf
-staroffice6.0/share/gallery/flags/jordan2.wmf
-staroffice6.0/share/gallery/flags/kazakhstan.wmf
-staroffice6.0/share/gallery/flags/kenya.wmf
-staroffice6.0/share/gallery/flags/kenya2.wmf
-staroffice6.0/share/gallery/flags/korea_n.wmf
-staroffice6.0/share/gallery/flags/korea_s.wmf
-staroffice6.0/share/gallery/flags/kuwait.wmf
-staroffice6.0/share/gallery/flags/kuwait2.wmf
-staroffice6.0/share/gallery/flags/lebanon.wmf
-staroffice6.0/share/gallery/flags/lebanon2.wmf
-staroffice6.0/share/gallery/flags/libya.wmf
-staroffice6.0/share/gallery/flags/lichtenstein.wmf
-staroffice6.0/share/gallery/flags/liecht2.wmf
-staroffice6.0/share/gallery/flags/luxemb2.wmf
-staroffice6.0/share/gallery/flags/luxembourg.wmf
-staroffice6.0/share/gallery/flags/lybia2.wmf
-staroffice6.0/share/gallery/flags/malaysi2.wmf
-staroffice6.0/share/gallery/flags/malaysia.wmf
-staroffice6.0/share/gallery/flags/malta.wmf
-staroffice6.0/share/gallery/flags/malta2.wmf
-staroffice6.0/share/gallery/flags/marocco.wmf
-staroffice6.0/share/gallery/flags/marocco2.wmf
-staroffice6.0/share/gallery/flags/mexico.wmf
-staroffice6.0/share/gallery/flags/mexico2.wmf
-staroffice6.0/share/gallery/flags/monaco.wmf
-staroffice6.0/share/gallery/flags/monaco2.wmf
-staroffice6.0/share/gallery/flags/nederl2.wmf
-staroffice6.0/share/gallery/flags/netherlands.wmf
-staroffice6.0/share/gallery/flags/new_zealand.wmf
-staroffice6.0/share/gallery/flags/newzea2.wmf
-staroffice6.0/share/gallery/flags/nicaragua.wmf
-staroffice6.0/share/gallery/flags/nigeria.wmf
-staroffice6.0/share/gallery/flags/nigeria2.wmf
-staroffice6.0/share/gallery/flags/norge2.wmf
-staroffice6.0/share/gallery/flags/northko2.wmf
-staroffice6.0/share/gallery/flags/norway.wmf
-staroffice6.0/share/gallery/flags/oman.wmf
-staroffice6.0/share/gallery/flags/oman2.wmf
-staroffice6.0/share/gallery/flags/pakist2.wmf
-staroffice6.0/share/gallery/flags/pakistan.wmf
-staroffice6.0/share/gallery/flags/panama.wmf
-staroffice6.0/share/gallery/flags/panama2.wmf
-staroffice6.0/share/gallery/flags/paragua2.wmf
-staroffice6.0/share/gallery/flags/paraguay.wmf
-staroffice6.0/share/gallery/flags/peru.wmf
-staroffice6.0/share/gallery/flags/peru2.wmf
-staroffice6.0/share/gallery/flags/philippin2.wmf
-staroffice6.0/share/gallery/flags/philippines.wmf
-staroffice6.0/share/gallery/flags/poland.wmf
-staroffice6.0/share/gallery/flags/poland2.wmf
-staroffice6.0/share/gallery/flags/portug2.wmf
-staroffice6.0/share/gallery/flags/portugal.wmf
-staroffice6.0/share/gallery/flags/puerto-ric2.wmf
-staroffice6.0/share/gallery/flags/puerto_rico.wmf
-staroffice6.0/share/gallery/flags/qatar.wmf
-staroffice6.0/share/gallery/flags/qatar2.wmf
-staroffice6.0/share/gallery/flags/romania.wmf
-staroffice6.0/share/gallery/flags/romania2.wmf
-staroffice6.0/share/gallery/flags/russia.wmf
-staroffice6.0/share/gallery/flags/russia2.wmf
-staroffice6.0/share/gallery/flags/saudi_arab2.wmf
-staroffice6.0/share/gallery/flags/saudi_arabia.wmf
-staroffice6.0/share/gallery/flags/singa1.wmf
-staroffice6.0/share/gallery/flags/singa2.wmf
-staroffice6.0/share/gallery/flags/slovakia.wmf
-staroffice6.0/share/gallery/flags/slovenia.wmf
-staroffice6.0/share/gallery/flags/slowak2.wmf
-staroffice6.0/share/gallery/flags/south_africa.wmf
-staroffice6.0/share/gallery/flags/southko2.wmf
-staroffice6.0/share/gallery/flags/spain.wmf
-staroffice6.0/share/gallery/flags/spain2.wmf
-staroffice6.0/share/gallery/flags/sthafri2.wmf
-staroffice6.0/share/gallery/flags/sweden.wmf
-staroffice6.0/share/gallery/flags/sweden2.wmf
-staroffice6.0/share/gallery/flags/switz2.wmf
-staroffice6.0/share/gallery/flags/switzerland.wmf
-staroffice6.0/share/gallery/flags/syria.wmf
-staroffice6.0/share/gallery/flags/syria2.wmf
-staroffice6.0/share/gallery/flags/tajikistan.wmf
-staroffice6.0/share/gallery/flags/thaila2.wmf
-staroffice6.0/share/gallery/flags/thailand.wmf
-staroffice6.0/share/gallery/flags/tunisia.wmf
-staroffice6.0/share/gallery/flags/turkey.wmf
-staroffice6.0/share/gallery/flags/turkey2.wmf
-staroffice6.0/share/gallery/flags/turkmenistan.wmf
-staroffice6.0/share/gallery/flags/ukraine.wmf
-staroffice6.0/share/gallery/flags/united-arb-emi2.wmf
-staroffice6.0/share/gallery/flags/united_arb_emi.wmf
-staroffice6.0/share/gallery/flags/united_kingdom.wmf
-staroffice6.0/share/gallery/flags/united_states.wmf
-staroffice6.0/share/gallery/flags/uno1.wmf
-staroffice6.0/share/gallery/flags/uruguay.wmf
-staroffice6.0/share/gallery/flags/uruguay2.wmf
-staroffice6.0/share/gallery/flags/usa2.wmf
-staroffice6.0/share/gallery/flags/uzbeki2.wmf
-staroffice6.0/share/gallery/flags/uzbekistan.wmf
-staroffice6.0/share/gallery/flags/venez2.wmf
-staroffice6.0/share/gallery/flags/venezuela.wmf
-staroffice6.0/share/gallery/flags/vietnam.wmf
-staroffice6.0/share/gallery/flags/vietnam2.wmf
-staroffice6.0/share/gallery/flags/yemen.wmf
-staroffice6.0/share/gallery/flags/yemen2.wmf
-staroffice6.0/share/gallery/flower.gif
-staroffice6.0/share/gallery/flowers.gif
-staroffice6.0/share/gallery/htmlexpo/bludown.gif
-staroffice6.0/share/gallery/htmlexpo/blufirs.gif
-staroffice6.0/share/gallery/htmlexpo/blufirs_.gif
-staroffice6.0/share/gallery/htmlexpo/blulast.gif
-staroffice6.0/share/gallery/htmlexpo/blulast_.gif
-staroffice6.0/share/gallery/htmlexpo/blunav.gif
-staroffice6.0/share/gallery/htmlexpo/blunext.gif
-staroffice6.0/share/gallery/htmlexpo/blunext_.gif
-staroffice6.0/share/gallery/htmlexpo/bluprev.gif
-staroffice6.0/share/gallery/htmlexpo/bluprev_.gif
-staroffice6.0/share/gallery/htmlexpo/blutext.gif
-staroffice6.0/share/gallery/htmlexpo/bluup.gif
-staroffice6.0/share/gallery/htmlexpo/cubdown.gif
-staroffice6.0/share/gallery/htmlexpo/cubfirs.gif
-staroffice6.0/share/gallery/htmlexpo/cubfirs_.gif
-staroffice6.0/share/gallery/htmlexpo/cublast.gif
-staroffice6.0/share/gallery/htmlexpo/cublast_.gif
-staroffice6.0/share/gallery/htmlexpo/cubnav.gif
-staroffice6.0/share/gallery/htmlexpo/cubnext.gif
-staroffice6.0/share/gallery/htmlexpo/cubnext_.gif
-staroffice6.0/share/gallery/htmlexpo/cubprev.gif
-staroffice6.0/share/gallery/htmlexpo/cubprev_.gif
-staroffice6.0/share/gallery/htmlexpo/cubtext.gif
-staroffice6.0/share/gallery/htmlexpo/cubup.gif
-staroffice6.0/share/gallery/htmlexpo/gredown.gif
-staroffice6.0/share/gallery/htmlexpo/grefirs.gif
-staroffice6.0/share/gallery/htmlexpo/grefirs_.gif
-staroffice6.0/share/gallery/htmlexpo/grelast.gif
-staroffice6.0/share/gallery/htmlexpo/grelast_.gif
-staroffice6.0/share/gallery/htmlexpo/grenav.gif
-staroffice6.0/share/gallery/htmlexpo/grenext.gif
-staroffice6.0/share/gallery/htmlexpo/grenext_.gif
-staroffice6.0/share/gallery/htmlexpo/greprev.gif
-staroffice6.0/share/gallery/htmlexpo/greprev_.gif
-staroffice6.0/share/gallery/htmlexpo/gretext.gif
-staroffice6.0/share/gallery/htmlexpo/greup.gif
-staroffice6.0/share/gallery/htmlexpo/simdown.gif
-staroffice6.0/share/gallery/htmlexpo/simfirs.gif
-staroffice6.0/share/gallery/htmlexpo/simfirs_.gif
-staroffice6.0/share/gallery/htmlexpo/simlast.gif
-staroffice6.0/share/gallery/htmlexpo/simlast_.gif
-staroffice6.0/share/gallery/htmlexpo/simnav.gif
-staroffice6.0/share/gallery/htmlexpo/simnext.gif
-staroffice6.0/share/gallery/htmlexpo/simnext_.gif
-staroffice6.0/share/gallery/htmlexpo/simprev.gif
-staroffice6.0/share/gallery/htmlexpo/simprev_.gif
-staroffice6.0/share/gallery/htmlexpo/simtext.gif
-staroffice6.0/share/gallery/htmlexpo/simup.gif
-staroffice6.0/share/gallery/htmlexpo/sologo.gif
-staroffice6.0/share/gallery/keyboard/0.gif
-staroffice6.0/share/gallery/keyboard/1.gif
-staroffice6.0/share/gallery/keyboard/2.gif
-staroffice6.0/share/gallery/keyboard/3.gif
-staroffice6.0/share/gallery/keyboard/4.gif
-staroffice6.0/share/gallery/keyboard/5.gif
-staroffice6.0/share/gallery/keyboard/6.gif
-staroffice6.0/share/gallery/keyboard/7.gif
-staroffice6.0/share/gallery/keyboard/8.gif
-staroffice6.0/share/gallery/keyboard/9.gif
-staroffice6.0/share/gallery/keyboard/a.gif
-staroffice6.0/share/gallery/keyboard/alt.gif
-staroffice6.0/share/gallery/keyboard/b.gif
-staroffice6.0/share/gallery/keyboard/c.gif
-staroffice6.0/share/gallery/keyboard/ctrl.gif
-staroffice6.0/share/gallery/keyboard/d.gif
-staroffice6.0/share/gallery/keyboard/e.gif
-staroffice6.0/share/gallery/keyboard/f.gif
-staroffice6.0/share/gallery/keyboard/f1.gif
-staroffice6.0/share/gallery/keyboard/f10.gif
-staroffice6.0/share/gallery/keyboard/f11.gif
-staroffice6.0/share/gallery/keyboard/f12.gif
-staroffice6.0/share/gallery/keyboard/f2.gif
-staroffice6.0/share/gallery/keyboard/f3.gif
-staroffice6.0/share/gallery/keyboard/f4.gif
-staroffice6.0/share/gallery/keyboard/f5.gif
-staroffice6.0/share/gallery/keyboard/f6.gif
-staroffice6.0/share/gallery/keyboard/f7.gif
-staroffice6.0/share/gallery/keyboard/f8.gif
-staroffice6.0/share/gallery/keyboard/f9.gif
-staroffice6.0/share/gallery/keyboard/g.gif
-staroffice6.0/share/gallery/keyboard/h.gif
-staroffice6.0/share/gallery/keyboard/i.gif
-staroffice6.0/share/gallery/keyboard/j.gif
-staroffice6.0/share/gallery/keyboard/k.gif
-staroffice6.0/share/gallery/keyboard/l.gif
-staroffice6.0/share/gallery/keyboard/m.gif
-staroffice6.0/share/gallery/keyboard/n.gif
-staroffice6.0/share/gallery/keyboard/o.gif
-staroffice6.0/share/gallery/keyboard/p.gif
-staroffice6.0/share/gallery/keyboard/q.gif
-staroffice6.0/share/gallery/keyboard/r.gif
-staroffice6.0/share/gallery/keyboard/s.gif
-staroffice6.0/share/gallery/keyboard/shift.gif
-staroffice6.0/share/gallery/keyboard/strg.gif
-staroffice6.0/share/gallery/keyboard/t.gif
-staroffice6.0/share/gallery/keyboard/u.gif
-staroffice6.0/share/gallery/keyboard/v.gif
-staroffice6.0/share/gallery/keyboard/w.gif
-staroffice6.0/share/gallery/keyboard/x.gif
-staroffice6.0/share/gallery/keyboard/y.gif
-staroffice6.0/share/gallery/keyboard/z.gif
-staroffice6.0/share/gallery/navi-2d/bl_at.gif
-staroffice6.0/share/gallery/navi-2d/bl_attention.gif
-staroffice6.0/share/gallery/navi-2d/bl_back-s.gif
-staroffice6.0/share/gallery/navi-2d/bl_back.gif
-staroffice6.0/share/gallery/navi-2d/bl_bottom.gif
-staroffice6.0/share/gallery/navi-2d/bl_dot.gif
-staroffice6.0/share/gallery/navi-2d/bl_double.gif
-staroffice6.0/share/gallery/navi-2d/bl_down-s.gif
-staroffice6.0/share/gallery/navi-2d/bl_down.gif
-staroffice6.0/share/gallery/navi-2d/bl_fastback-s.gif
-staroffice6.0/share/gallery/navi-2d/bl_fastback.gif
-staroffice6.0/share/gallery/navi-2d/bl_fastforw-s.gif
-staroffice6.0/share/gallery/navi-2d/bl_fastforw.gif
-staroffice6.0/share/gallery/navi-2d/bl_forw-s.gif
-staroffice6.0/share/gallery/navi-2d/bl_forw.gif
-staroffice6.0/share/gallery/navi-2d/bl_home.gif
-staroffice6.0/share/gallery/navi-2d/bl_info.gif
-staroffice6.0/share/gallery/navi-2d/bl_left.gif
-staroffice6.0/share/gallery/navi-2d/bl_less.gif
-staroffice6.0/share/gallery/navi-2d/bl_mail.gif
-staroffice6.0/share/gallery/navi-2d/bl_more.gif
-staroffice6.0/share/gallery/navi-2d/bl_point.gif
-staroffice6.0/share/gallery/navi-2d/bl_question.gif
-staroffice6.0/share/gallery/navi-2d/bl_return.gif
-staroffice6.0/share/gallery/navi-2d/bl_right.gif
-staroffice6.0/share/gallery/navi-2d/bl_skipback-s.gif
-staroffice6.0/share/gallery/navi-2d/bl_skipback.gif
-staroffice6.0/share/gallery/navi-2d/bl_skipforw-s.gif
-staroffice6.0/share/gallery/navi-2d/bl_skipforw.gif
-staroffice6.0/share/gallery/navi-2d/bl_stop-s.gif
-staroffice6.0/share/gallery/navi-2d/bl_stop.gif
-staroffice6.0/share/gallery/navi-2d/bl_top.gif
-staroffice6.0/share/gallery/navi-2d/bl_up-s.gif
-staroffice6.0/share/gallery/navi-2d/bl_up.gif
-staroffice6.0/share/gallery/navi-2d/gr_at.gif
-staroffice6.0/share/gallery/navi-2d/gr_attention.gif
-staroffice6.0/share/gallery/navi-2d/gr_back-s.gif
-staroffice6.0/share/gallery/navi-2d/gr_back.gif
-staroffice6.0/share/gallery/navi-2d/gr_bottom.gif
-staroffice6.0/share/gallery/navi-2d/gr_dot.gif
-staroffice6.0/share/gallery/navi-2d/gr_double.gif
-staroffice6.0/share/gallery/navi-2d/gr_down-s.gif
-staroffice6.0/share/gallery/navi-2d/gr_down.gif
-staroffice6.0/share/gallery/navi-2d/gr_fastback-s.gif
-staroffice6.0/share/gallery/navi-2d/gr_fastback.gif
-staroffice6.0/share/gallery/navi-2d/gr_fastforw-s.gif
-staroffice6.0/share/gallery/navi-2d/gr_fastforw.gif
-staroffice6.0/share/gallery/navi-2d/gr_forw-s.gif
-staroffice6.0/share/gallery/navi-2d/gr_forw.gif
-staroffice6.0/share/gallery/navi-2d/gr_home.gif
-staroffice6.0/share/gallery/navi-2d/gr_info.gif
-staroffice6.0/share/gallery/navi-2d/gr_left.gif
-staroffice6.0/share/gallery/navi-2d/gr_less.gif
-staroffice6.0/share/gallery/navi-2d/gr_mail.gif
-staroffice6.0/share/gallery/navi-2d/gr_more.gif
-staroffice6.0/share/gallery/navi-2d/gr_point.gif
-staroffice6.0/share/gallery/navi-2d/gr_question.gif
-staroffice6.0/share/gallery/navi-2d/gr_return.gif
-staroffice6.0/share/gallery/navi-2d/gr_right.gif
-staroffice6.0/share/gallery/navi-2d/gr_skipback-s.gif
-staroffice6.0/share/gallery/navi-2d/gr_skipback.gif
-staroffice6.0/share/gallery/navi-2d/gr_skipforw-s.gif
-staroffice6.0/share/gallery/navi-2d/gr_skipforw.gif
-staroffice6.0/share/gallery/navi-2d/gr_stop-s.gif
-staroffice6.0/share/gallery/navi-2d/gr_stop.gif
-staroffice6.0/share/gallery/navi-2d/gr_top.gif
-staroffice6.0/share/gallery/navi-2d/gr_up-s.gif
-staroffice6.0/share/gallery/navi-2d/gr_up.gif
-staroffice6.0/share/gallery/navi-2d/li_at.gif
-staroffice6.0/share/gallery/navi-2d/li_attention.gif
-staroffice6.0/share/gallery/navi-2d/li_back-s.gif
-staroffice6.0/share/gallery/navi-2d/li_back.gif
-staroffice6.0/share/gallery/navi-2d/li_bottom.gif
-staroffice6.0/share/gallery/navi-2d/li_dot.gif
-staroffice6.0/share/gallery/navi-2d/li_double.gif
-staroffice6.0/share/gallery/navi-2d/li_down-s.gif
-staroffice6.0/share/gallery/navi-2d/li_down.gif
-staroffice6.0/share/gallery/navi-2d/li_fastback-s.gif
-staroffice6.0/share/gallery/navi-2d/li_fastback.gif
-staroffice6.0/share/gallery/navi-2d/li_fastforw-s.gif
-staroffice6.0/share/gallery/navi-2d/li_fastforw.gif
-staroffice6.0/share/gallery/navi-2d/li_forw-s.gif
-staroffice6.0/share/gallery/navi-2d/li_forw.gif
-staroffice6.0/share/gallery/navi-2d/li_home.gif
-staroffice6.0/share/gallery/navi-2d/li_info.gif
-staroffice6.0/share/gallery/navi-2d/li_left.gif
-staroffice6.0/share/gallery/navi-2d/li_less.gif
-staroffice6.0/share/gallery/navi-2d/li_mail.gif
-staroffice6.0/share/gallery/navi-2d/li_more.gif
-staroffice6.0/share/gallery/navi-2d/li_point.gif
-staroffice6.0/share/gallery/navi-2d/li_question.gif
-staroffice6.0/share/gallery/navi-2d/li_return.gif
-staroffice6.0/share/gallery/navi-2d/li_right.gif
-staroffice6.0/share/gallery/navi-2d/li_skipback-s.gif
-staroffice6.0/share/gallery/navi-2d/li_skipback.gif
-staroffice6.0/share/gallery/navi-2d/li_skipforw-s.gif
-staroffice6.0/share/gallery/navi-2d/li_skipforw.gif
-staroffice6.0/share/gallery/navi-2d/li_stop-s.gif
-staroffice6.0/share/gallery/navi-2d/li_stop.gif
-staroffice6.0/share/gallery/navi-2d/li_top.gif
-staroffice6.0/share/gallery/navi-2d/li_up-s.gif
-staroffice6.0/share/gallery/navi-2d/li_up.gif
-staroffice6.0/share/gallery/navi-2d/or_at.gif
-staroffice6.0/share/gallery/navi-2d/or_attention.gif
-staroffice6.0/share/gallery/navi-2d/or_back-s.gif
-staroffice6.0/share/gallery/navi-2d/or_back.gif
-staroffice6.0/share/gallery/navi-2d/or_bottom.gif
-staroffice6.0/share/gallery/navi-2d/or_dot.gif
-staroffice6.0/share/gallery/navi-2d/or_double.gif
-staroffice6.0/share/gallery/navi-2d/or_down-s.gif
-staroffice6.0/share/gallery/navi-2d/or_down.gif
-staroffice6.0/share/gallery/navi-2d/or_fastback-s.gif
-staroffice6.0/share/gallery/navi-2d/or_fastback.gif
-staroffice6.0/share/gallery/navi-2d/or_fastforw-s.gif
-staroffice6.0/share/gallery/navi-2d/or_fastforw.gif
-staroffice6.0/share/gallery/navi-2d/or_forw-s.gif
-staroffice6.0/share/gallery/navi-2d/or_forw.gif
-staroffice6.0/share/gallery/navi-2d/or_home.gif
-staroffice6.0/share/gallery/navi-2d/or_info.gif
-staroffice6.0/share/gallery/navi-2d/or_left.gif
-staroffice6.0/share/gallery/navi-2d/or_less.gif
-staroffice6.0/share/gallery/navi-2d/or_mail.gif
-staroffice6.0/share/gallery/navi-2d/or_more.gif
-staroffice6.0/share/gallery/navi-2d/or_point.gif
-staroffice6.0/share/gallery/navi-2d/or_question.gif
-staroffice6.0/share/gallery/navi-2d/or_return.gif
-staroffice6.0/share/gallery/navi-2d/or_right.gif
-staroffice6.0/share/gallery/navi-2d/or_skipback-s.gif
-staroffice6.0/share/gallery/navi-2d/or_skipback.gif
-staroffice6.0/share/gallery/navi-2d/or_skipforw-s.gif
-staroffice6.0/share/gallery/navi-2d/or_skipforw.gif
-staroffice6.0/share/gallery/navi-2d/or_stop-s.gif
-staroffice6.0/share/gallery/navi-2d/or_stop.gif
-staroffice6.0/share/gallery/navi-2d/or_top.gif
-staroffice6.0/share/gallery/navi-2d/or_up-s.gif
-staroffice6.0/share/gallery/navi-2d/or_up.gif
-staroffice6.0/share/gallery/navi-2d/re_at.gif
-staroffice6.0/share/gallery/navi-2d/re_attention.gif
-staroffice6.0/share/gallery/navi-2d/re_back-s.gif
-staroffice6.0/share/gallery/navi-2d/re_back.gif
-staroffice6.0/share/gallery/navi-2d/re_bottom.gif
-staroffice6.0/share/gallery/navi-2d/re_dot.gif
-staroffice6.0/share/gallery/navi-2d/re_double.gif
-staroffice6.0/share/gallery/navi-2d/re_down-s.gif
-staroffice6.0/share/gallery/navi-2d/re_down.gif
-staroffice6.0/share/gallery/navi-2d/re_fastback-s.gif
-staroffice6.0/share/gallery/navi-2d/re_fastback.gif
-staroffice6.0/share/gallery/navi-2d/re_fastforw-s.gif
-staroffice6.0/share/gallery/navi-2d/re_fastforw.gif
-staroffice6.0/share/gallery/navi-2d/re_forw-s.gif
-staroffice6.0/share/gallery/navi-2d/re_forw.gif
-staroffice6.0/share/gallery/navi-2d/re_home.gif
-staroffice6.0/share/gallery/navi-2d/re_info.gif
-staroffice6.0/share/gallery/navi-2d/re_left.gif
-staroffice6.0/share/gallery/navi-2d/re_less.gif
-staroffice6.0/share/gallery/navi-2d/re_mail.gif
-staroffice6.0/share/gallery/navi-2d/re_more.gif
-staroffice6.0/share/gallery/navi-2d/re_point.gif
-staroffice6.0/share/gallery/navi-2d/re_question.gif
-staroffice6.0/share/gallery/navi-2d/re_return.gif
-staroffice6.0/share/gallery/navi-2d/re_right.gif
-staroffice6.0/share/gallery/navi-2d/re_skipback-s.gif
-staroffice6.0/share/gallery/navi-2d/re_skipback.gif
-staroffice6.0/share/gallery/navi-2d/re_skipforw-s.gif
-staroffice6.0/share/gallery/navi-2d/re_skipforw.gif
-staroffice6.0/share/gallery/navi-2d/re_stop-s.gif
-staroffice6.0/share/gallery/navi-2d/re_stop.gif
-staroffice6.0/share/gallery/navi-2d/re_top.gif
-staroffice6.0/share/gallery/navi-2d/re_up-s.gif
-staroffice6.0/share/gallery/navi-2d/re_up.gif
-staroffice6.0/share/gallery/navi-2d/wh_at.gif
-staroffice6.0/share/gallery/navi-2d/wh_attention.gif
-staroffice6.0/share/gallery/navi-2d/wh_back-s.gif
-staroffice6.0/share/gallery/navi-2d/wh_back.gif
-staroffice6.0/share/gallery/navi-2d/wh_bottom.gif
-staroffice6.0/share/gallery/navi-2d/wh_dot.gif
-staroffice6.0/share/gallery/navi-2d/wh_double.gif
-staroffice6.0/share/gallery/navi-2d/wh_down-s.gif
-staroffice6.0/share/gallery/navi-2d/wh_down.gif
-staroffice6.0/share/gallery/navi-2d/wh_fastback-s.gif
-staroffice6.0/share/gallery/navi-2d/wh_fastback.gif
-staroffice6.0/share/gallery/navi-2d/wh_fastforw-s.gif
-staroffice6.0/share/gallery/navi-2d/wh_fastforw.gif
-staroffice6.0/share/gallery/navi-2d/wh_forw-s.gif
-staroffice6.0/share/gallery/navi-2d/wh_forw.gif
-staroffice6.0/share/gallery/navi-2d/wh_home.gif
-staroffice6.0/share/gallery/navi-2d/wh_info.gif
-staroffice6.0/share/gallery/navi-2d/wh_left.gif
-staroffice6.0/share/gallery/navi-2d/wh_less.gif
-staroffice6.0/share/gallery/navi-2d/wh_mail.gif
-staroffice6.0/share/gallery/navi-2d/wh_more.gif
-staroffice6.0/share/gallery/navi-2d/wh_point.gif
-staroffice6.0/share/gallery/navi-2d/wh_question.gif
-staroffice6.0/share/gallery/navi-2d/wh_return.gif
-staroffice6.0/share/gallery/navi-2d/wh_right.gif
-staroffice6.0/share/gallery/navi-2d/wh_skipback-s.gif
-staroffice6.0/share/gallery/navi-2d/wh_skipback.gif
-staroffice6.0/share/gallery/navi-2d/wh_skipforw-s.gif
-staroffice6.0/share/gallery/navi-2d/wh_skipforw.gif
-staroffice6.0/share/gallery/navi-2d/wh_stop-s.gif
-staroffice6.0/share/gallery/navi-2d/wh_stop.gif
-staroffice6.0/share/gallery/navi-2d/wh_top.gif
-staroffice6.0/share/gallery/navi-2d/wh_up-s.gif
-staroffice6.0/share/gallery/navi-2d/wh_up.gif
-staroffice6.0/share/gallery/navi-2d/ye_at.gif
-staroffice6.0/share/gallery/navi-2d/ye_attention.gif
-staroffice6.0/share/gallery/navi-2d/ye_back-s.gif
-staroffice6.0/share/gallery/navi-2d/ye_back.gif
-staroffice6.0/share/gallery/navi-2d/ye_bottom.gif
-staroffice6.0/share/gallery/navi-2d/ye_dot.gif
-staroffice6.0/share/gallery/navi-2d/ye_double.gif
-staroffice6.0/share/gallery/navi-2d/ye_down-s.gif
-staroffice6.0/share/gallery/navi-2d/ye_down.gif
-staroffice6.0/share/gallery/navi-2d/ye_fastback-s.gif
-staroffice6.0/share/gallery/navi-2d/ye_fastback.gif
-staroffice6.0/share/gallery/navi-2d/ye_fastforw-s.gif
-staroffice6.0/share/gallery/navi-2d/ye_fastforw.gif
-staroffice6.0/share/gallery/navi-2d/ye_forw-s.gif
-staroffice6.0/share/gallery/navi-2d/ye_forw.gif
-staroffice6.0/share/gallery/navi-2d/ye_home.gif
-staroffice6.0/share/gallery/navi-2d/ye_info.gif
-staroffice6.0/share/gallery/navi-2d/ye_left.gif
-staroffice6.0/share/gallery/navi-2d/ye_less.gif
-staroffice6.0/share/gallery/navi-2d/ye_mail.gif
-staroffice6.0/share/gallery/navi-2d/ye_more.gif
-staroffice6.0/share/gallery/navi-2d/ye_point.gif
-staroffice6.0/share/gallery/navi-2d/ye_question.gif
-staroffice6.0/share/gallery/navi-2d/ye_return.gif
-staroffice6.0/share/gallery/navi-2d/ye_right.gif
-staroffice6.0/share/gallery/navi-2d/ye_skipback-s.gif
-staroffice6.0/share/gallery/navi-2d/ye_skipback.gif
-staroffice6.0/share/gallery/navi-2d/ye_skipforw-s.gif
-staroffice6.0/share/gallery/navi-2d/ye_skipforw.gif
-staroffice6.0/share/gallery/navi-2d/ye_stop-s.gif
-staroffice6.0/share/gallery/navi-2d/ye_stop.gif
-staroffice6.0/share/gallery/navi-2d/ye_top.gif
-staroffice6.0/share/gallery/navi-2d/ye_up-s.gif
-staroffice6.0/share/gallery/navi-2d/ye_up.gif
-staroffice6.0/share/gallery/officeart/certificate.wmf
-staroffice6.0/share/gallery/officeart/cigarette.wmf
-staroffice6.0/share/gallery/officeart/copymachine.wmf
-staroffice6.0/share/gallery/officeart/cup.wmf
-staroffice6.0/share/gallery/officeart/cup_of_coffee.wmf
-staroffice6.0/share/gallery/officeart/envelope_2.wmf
-staroffice6.0/share/gallery/officeart/faxmachine.wmf
-staroffice6.0/share/gallery/officeart/letter_1.wmf
-staroffice6.0/share/gallery/officeart/letter_3.wmf
-staroffice6.0/share/gallery/officeart/newspaper.wmf
-staroffice6.0/share/gallery/officeart/page.wmf
-staroffice6.0/share/gallery/officeart/pages.wmf
-staroffice6.0/share/gallery/officeart/paper_2s.wmf
-staroffice6.0/share/gallery/officeart/paperjam.wmf
-staroffice6.0/share/gallery/officeart/pen_blue.wmf
-staroffice6.0/share/gallery/officeart/pen_green.wmf
-staroffice6.0/share/gallery/officeart/pen_pink.wmf
-staroffice6.0/share/gallery/officeart/pen_red.wmf
-staroffice6.0/share/gallery/officeart/pen_yellow.wmf
-staroffice6.0/share/gallery/officeart/postcard.wmf
-staroffice6.0/share/gallery/people/audience_1.wmf
-staroffice6.0/share/gallery/people/audience_2.wmf
-staroffice6.0/share/gallery/people/boy.wmf
-staroffice6.0/share/gallery/people/desk.wmf
-staroffice6.0/share/gallery/people/family_1.wmf
-staroffice6.0/share/gallery/people/family_2.wmf
-staroffice6.0/share/gallery/people/girl.wmf
-staroffice6.0/share/gallery/people/group_1.wmf
-staroffice6.0/share/gallery/people/group_3.wmf
-staroffice6.0/share/gallery/people/group_4.wmf
-staroffice6.0/share/gallery/people/group_5.wmf
-staroffice6.0/share/gallery/people/group_6.wmf
-staroffice6.0/share/gallery/people/group_7.wmf
-staroffice6.0/share/gallery/people/kids.wmf
-staroffice6.0/share/gallery/people/lovers.wmf
-staroffice6.0/share/gallery/people/meeting.wmf
-staroffice6.0/share/gallery/people/misfit.wmf
-staroffice6.0/share/gallery/people/pair.wmf
-staroffice6.0/share/gallery/people/queue.wmf
-staroffice6.0/share/gallery/people/reading.wmf
-staroffice6.0/share/gallery/people/row.wmf
-staroffice6.0/share/gallery/people/running.wmf
-staroffice6.0/share/gallery/people/sleeping.wmf
-staroffice6.0/share/gallery/people/teacher.wmf
-staroffice6.0/share/gallery/people/team.wmf
-staroffice6.0/share/gallery/people/thinking.wmf
-staroffice6.0/share/gallery/people/waiting_2.wmf
-staroffice6.0/share/gallery/people/waiting_3.wmf
-staroffice6.0/share/gallery/photos/apples.jpg
-staroffice6.0/share/gallery/photos/autumn.jpg
-staroffice6.0/share/gallery/photos/beach.jpg
-staroffice6.0/share/gallery/photos/canyon.jpg
-staroffice6.0/share/gallery/photos/castle.jpg
-staroffice6.0/share/gallery/photos/clouds.jpg
-staroffice6.0/share/gallery/photos/desert1.jpg
-staroffice6.0/share/gallery/photos/desert2.jpg
-staroffice6.0/share/gallery/photos/desert3.jpg
-staroffice6.0/share/gallery/photos/fern.jpg
-staroffice6.0/share/gallery/photos/field.jpg
-staroffice6.0/share/gallery/photos/flowers.jpg
-staroffice6.0/share/gallery/photos/forest1.jpg
-staroffice6.0/share/gallery/photos/forest2.jpg
-staroffice6.0/share/gallery/photos/gldngate.jpg
-staroffice6.0/share/gallery/photos/meadow.jpg
-staroffice6.0/share/gallery/photos/mountns1.jpg
-staroffice6.0/share/gallery/photos/mountns2.jpg
-staroffice6.0/share/gallery/photos/ocean.jpg
-staroffice6.0/share/gallery/photos/palms.jpg
-staroffice6.0/share/gallery/photos/railroad.jpg
-staroffice6.0/share/gallery/photos/rose.jpg
-staroffice6.0/share/gallery/photos/sunflowr.jpg
-staroffice6.0/share/gallery/photos/sunset1.jpg
-staroffice6.0/share/gallery/photos/sunset2.jpg
-staroffice6.0/share/gallery/photos/sunset3.jpg
-staroffice6.0/share/gallery/photos/sunset4.jpg
-staroffice6.0/share/gallery/photos/tajmahal.jpg
-staroffice6.0/share/gallery/photos/watrlily.jpg
-staroffice6.0/share/gallery/rulers/blkballs.gif
-staroffice6.0/share/gallery/rulers/blurulr1.gif
-staroffice6.0/share/gallery/rulers/blurulr2.gif
-staroffice6.0/share/gallery/rulers/blurulr3.gif
-staroffice6.0/share/gallery/rulers/blurulr4.gif
-staroffice6.0/share/gallery/rulers/blurulr5.gif
-staroffice6.0/share/gallery/rulers/blurulr6.gif
-staroffice6.0/share/gallery/rulers/gldballs.gif
-staroffice6.0/share/gallery/rulers/grnballs.gif
-staroffice6.0/share/gallery/rulers/grnrulr1.gif
-staroffice6.0/share/gallery/rulers/grnrulr2.gif
-staroffice6.0/share/gallery/rulers/grnrulr3.gif
-staroffice6.0/share/gallery/rulers/grnrulr4.gif
-staroffice6.0/share/gallery/rulers/gryrulr1.gif
-staroffice6.0/share/gallery/rulers/gryrulr2.gif
-staroffice6.0/share/gallery/rulers/gryrulr3.gif
-staroffice6.0/share/gallery/rulers/orgrulr1.gif
-staroffice6.0/share/gallery/rulers/redrulr1.gif
-staroffice6.0/share/gallery/rulers/redrulr2.gif
-staroffice6.0/share/gallery/rulers/redrulr3.gif
-staroffice6.0/share/gallery/rulers/redrulr4.gif
-staroffice6.0/share/gallery/rulers/redrulr5.gif
-staroffice6.0/share/gallery/rulers/striped.gif
-staroffice6.0/share/gallery/rulers/whtballs.gif
-staroffice6.0/share/gallery/rulers/ylwrulr1.gif
-staroffice6.0/share/gallery/sdddndx1
-staroffice6.0/share/gallery/sg1.sdg
-staroffice6.0/share/gallery/sg1.sdv
-staroffice6.0/share/gallery/sg1.thm
-staroffice6.0/share/gallery/sg10.sdg
-staroffice6.0/share/gallery/sg10.sdv
-staroffice6.0/share/gallery/sg10.thm
-staroffice6.0/share/gallery/sg11.sdg
-staroffice6.0/share/gallery/sg11.sdv
-staroffice6.0/share/gallery/sg11.thm
-staroffice6.0/share/gallery/sg12.sdg
-staroffice6.0/share/gallery/sg12.sdv
-staroffice6.0/share/gallery/sg12.thm
-staroffice6.0/share/gallery/sg13.sdg
-staroffice6.0/share/gallery/sg13.sdv
-staroffice6.0/share/gallery/sg13.thm
-staroffice6.0/share/gallery/sg14.sdg
-staroffice6.0/share/gallery/sg14.sdv
-staroffice6.0/share/gallery/sg14.thm
-staroffice6.0/share/gallery/sg15.sdg
-staroffice6.0/share/gallery/sg15.sdv
-staroffice6.0/share/gallery/sg15.thm
-staroffice6.0/share/gallery/sg16.sdg
-staroffice6.0/share/gallery/sg16.sdv
-staroffice6.0/share/gallery/sg16.thm
-staroffice6.0/share/gallery/sg17.sdg
-staroffice6.0/share/gallery/sg17.sdv
-staroffice6.0/share/gallery/sg17.thm
-staroffice6.0/share/gallery/sg18.sdg
-staroffice6.0/share/gallery/sg18.sdv
-staroffice6.0/share/gallery/sg18.thm
-staroffice6.0/share/gallery/sg19.sdg
-staroffice6.0/share/gallery/sg19.sdv
-staroffice6.0/share/gallery/sg19.thm
-staroffice6.0/share/gallery/sg2.sdg
-staroffice6.0/share/gallery/sg2.sdv
-staroffice6.0/share/gallery/sg2.thm
-staroffice6.0/share/gallery/sg20.sdg
-staroffice6.0/share/gallery/sg20.sdv
-staroffice6.0/share/gallery/sg20.thm
-staroffice6.0/share/gallery/sg21.sdg
-staroffice6.0/share/gallery/sg21.sdv
-staroffice6.0/share/gallery/sg21.thm
-staroffice6.0/share/gallery/sg22.sdg
-staroffice6.0/share/gallery/sg22.sdv
-staroffice6.0/share/gallery/sg22.thm
-staroffice6.0/share/gallery/sg23.sdg
-staroffice6.0/share/gallery/sg23.sdv
-staroffice6.0/share/gallery/sg23.thm
-staroffice6.0/share/gallery/sg24.sdg
-staroffice6.0/share/gallery/sg24.sdv
-staroffice6.0/share/gallery/sg24.thm
-staroffice6.0/share/gallery/sg25.sdg
-staroffice6.0/share/gallery/sg25.sdv
-staroffice6.0/share/gallery/sg25.thm
-staroffice6.0/share/gallery/sg26.sdg
-staroffice6.0/share/gallery/sg26.sdv
-staroffice6.0/share/gallery/sg26.thm
-staroffice6.0/share/gallery/sg27.sdg
-staroffice6.0/share/gallery/sg27.sdv
-staroffice6.0/share/gallery/sg27.thm
-staroffice6.0/share/gallery/sg28.sdg
-staroffice6.0/share/gallery/sg28.sdv
-staroffice6.0/share/gallery/sg28.thm
-staroffice6.0/share/gallery/sg29.sdg
-staroffice6.0/share/gallery/sg29.sdv
-staroffice6.0/share/gallery/sg29.thm
-staroffice6.0/share/gallery/sg3.sdg
-staroffice6.0/share/gallery/sg3.sdv
-staroffice6.0/share/gallery/sg3.thm
-staroffice6.0/share/gallery/sg31.sdg
-staroffice6.0/share/gallery/sg31.sdv
-staroffice6.0/share/gallery/sg31.thm
-staroffice6.0/share/gallery/sg32.sdg
-staroffice6.0/share/gallery/sg32.sdv
-staroffice6.0/share/gallery/sg32.thm
-staroffice6.0/share/gallery/sg33.sdg
-staroffice6.0/share/gallery/sg33.sdv
-staroffice6.0/share/gallery/sg33.thm
-staroffice6.0/share/gallery/sg4.sdg
-staroffice6.0/share/gallery/sg4.sdv
-staroffice6.0/share/gallery/sg4.thm
-staroffice6.0/share/gallery/sg5.sdg
-staroffice6.0/share/gallery/sg5.sdv
-staroffice6.0/share/gallery/sg5.thm
-staroffice6.0/share/gallery/sg6.sdg
-staroffice6.0/share/gallery/sg6.sdv
-staroffice6.0/share/gallery/sg6.thm
-staroffice6.0/share/gallery/sg7.sdg
-staroffice6.0/share/gallery/sg7.sdv
-staroffice6.0/share/gallery/sg7.thm
-staroffice6.0/share/gallery/sg8.sdg
-staroffice6.0/share/gallery/sg8.sdv
-staroffice6.0/share/gallery/sg8.thm
-staroffice6.0/share/gallery/sg9.sdg
-staroffice6.0/share/gallery/sg9.sdv
-staroffice6.0/share/gallery/sg9.thm
-staroffice6.0/share/gallery/sky.gif
-staroffice6.0/share/gallery/sounds/apert.wav
-staroffice6.0/share/gallery/sounds/apert2.wav
-staroffice6.0/share/gallery/sounds/applause.wav
-staroffice6.0/share/gallery/sounds/beam.wav
-staroffice6.0/share/gallery/sounds/beam2.wav
-staroffice6.0/share/gallery/sounds/cow.wav
-staroffice6.0/share/gallery/sounds/curve.wav
-staroffice6.0/share/gallery/sounds/drama.wav
-staroffice6.0/share/gallery/sounds/explos.wav
-staroffice6.0/share/gallery/sounds/falling.wav
-staroffice6.0/share/gallery/sounds/glasses.wav
-staroffice6.0/share/gallery/sounds/gong.wav
-staroffice6.0/share/gallery/sounds/horse.wav
-staroffice6.0/share/gallery/sounds/kling.wav
-staroffice6.0/share/gallery/sounds/kongas.wav
-staroffice6.0/share/gallery/sounds/laser.wav
-staroffice6.0/share/gallery/sounds/left.wav
-staroffice6.0/share/gallery/sounds/nature1.wav
-staroffice6.0/share/gallery/sounds/nature2.wav
-staroffice6.0/share/gallery/sounds/ok.wav
-staroffice6.0/share/gallery/sounds/pluck.wav
-staroffice6.0/share/gallery/sounds/roll.wav
-staroffice6.0/share/gallery/sounds/romans.wav
-staroffice6.0/share/gallery/sounds/soft.wav
-staroffice6.0/share/gallery/sounds/space.wav
-staroffice6.0/share/gallery/sounds/space2.wav
-staroffice6.0/share/gallery/sounds/space3.wav
-staroffice6.0/share/gallery/sounds/sparcle.wav
-staroffice6.0/share/gallery/sounds/strom.wav
-staroffice6.0/share/gallery/sounds/theetone.wav
-staroffice6.0/share/gallery/sounds/top.wav
-staroffice6.0/share/gallery/sounds/train.wav
-staroffice6.0/share/gallery/sounds/untie.wav
-staroffice6.0/share/gallery/sounds/ups.wav
-staroffice6.0/share/gallery/sounds/wallewal.wav
-staroffice6.0/share/gallery/surface/berries.jpg
-staroffice6.0/share/gallery/surface/blue-coarse.jpg
-staroffice6.0/share/gallery/surface/board.jpg
-staroffice6.0/share/gallery/surface/coffee.gif
-staroffice6.0/share/gallery/surface/crazy-blue.jpg
-staroffice6.0/share/gallery/surface/crazy-green.jpg
-staroffice6.0/share/gallery/surface/drops.jpg
-staroffice6.0/share/gallery/surface/fiery.jpg
-staroffice6.0/share/gallery/surface/green-pasta.gif
-staroffice6.0/share/gallery/surface/green_drops.jpg
-staroffice6.0/share/gallery/surface/grooved.jpg
-staroffice6.0/share/gallery/surface/hyper-metal.jpg
-staroffice6.0/share/gallery/surface/leaves-brown.jpg
-staroffice6.0/share/gallery/surface/leaves-green.jpg
-staroffice6.0/share/gallery/surface/linen-blue.jpg
-staroffice6.0/share/gallery/surface/linen.jpg
-staroffice6.0/share/gallery/surface/lino-blue.jpg
-staroffice6.0/share/gallery/surface/metal-blue.jpg
-staroffice6.0/share/gallery/surface/mosaic.jpg
-staroffice6.0/share/gallery/surface/mussel.jpg
-staroffice6.0/share/gallery/surface/orange.gif
-staroffice6.0/share/gallery/surface/pasta.jpg
-staroffice6.0/share/gallery/surface/pattern-big.jpg
-staroffice6.0/share/gallery/surface/pebbles.jpg
-staroffice6.0/share/gallery/surface/roughcast.jpg
-staroffice6.0/share/gallery/surface/sandstone.jpg
-staroffice6.0/share/gallery/surface/space-metal.jpg
-staroffice6.0/share/gallery/surface/sunflowers.jpg
-staroffice6.0/share/gallery/surface/tulip.jpg
-staroffice6.0/share/gallery/surface/wall-red.jpg
-staroffice6.0/share/gallery/surface/wall1.jpg
-staroffice6.0/share/gallery/surface/wall2.jpg
-staroffice6.0/share/gallery/surface/wallpaper-blue.jpg
-staroffice6.0/share/gallery/surface/wallpaper-green.jpg
-staroffice6.0/share/gallery/surface/wallpaper-pink.jpg
-staroffice6.0/share/gallery/surface/wallpaper-yellow.jpg
-staroffice6.0/share/gallery/surface/wallpaper_red.jpg
-staroffice6.0/share/gallery/surface/wet.jpg
-staroffice6.0/share/gallery/symbols/answer.wmf
-staroffice6.0/share/gallery/symbols/attention.wmf
-staroffice6.0/share/gallery/symbols/baby.wmf
-staroffice6.0/share/gallery/symbols/bomb.wmf
-staroffice6.0/share/gallery/symbols/cloud.wmf
-staroffice6.0/share/gallery/symbols/cloudy.wmf
-staroffice6.0/share/gallery/symbols/cold.wmf
-staroffice6.0/share/gallery/symbols/compassrose.wmf
-staroffice6.0/share/gallery/symbols/computer.wmf
-staroffice6.0/share/gallery/symbols/cup.wmf
-staroffice6.0/share/gallery/symbols/cut.wmf
-staroffice6.0/share/gallery/symbols/down.wmf
-staroffice6.0/share/gallery/symbols/downstairs.wmf
-staroffice6.0/share/gallery/symbols/drop.wmf
-staroffice6.0/share/gallery/symbols/exting.wmf
-staroffice6.0/share/gallery/symbols/female.wmf
-staroffice6.0/share/gallery/symbols/fire-exit.wmf
-staroffice6.0/share/gallery/symbols/five.wmf
-staroffice6.0/share/gallery/symbols/flash.wmf
-staroffice6.0/share/gallery/symbols/four.wmf
-staroffice6.0/share/gallery/symbols/handshake.wmf
-staroffice6.0/share/gallery/symbols/help.wmf
-staroffice6.0/share/gallery/symbols/hot.wmf
-staroffice6.0/share/gallery/symbols/idea.wmf
-staroffice6.0/share/gallery/symbols/left.wmf
-staroffice6.0/share/gallery/symbols/letter.wmf
-staroffice6.0/share/gallery/symbols/letter_2.wmf
-staroffice6.0/share/gallery/symbols/loudspeaker.wmf
-staroffice6.0/share/gallery/symbols/male.wmf
-staroffice6.0/share/gallery/symbols/man.wmf
-staroffice6.0/share/gallery/symbols/medal.wmf
-staroffice6.0/share/gallery/symbols/mild.wmf
-staroffice6.0/share/gallery/symbols/monitor.wmf
-staroffice6.0/share/gallery/symbols/network.wmf
-staroffice6.0/share/gallery/symbols/no_smoking.wmf
-staroffice6.0/share/gallery/symbols/one.wmf
-staroffice6.0/share/gallery/symbols/page.wmf
-staroffice6.0/share/gallery/symbols/paper.wmf
-staroffice6.0/share/gallery/symbols/paperclip.wmf
-staroffice6.0/share/gallery/symbols/pen.wmf
-staroffice6.0/share/gallery/symbols/plane.wmf
-staroffice6.0/share/gallery/symbols/q_and_a.wmf
-staroffice6.0/share/gallery/symbols/question.wmf
-staroffice6.0/share/gallery/symbols/rain.wmf
-staroffice6.0/share/gallery/symbols/right.wmf
-staroffice6.0/share/gallery/symbols/scissors.wmf
-staroffice6.0/share/gallery/symbols/senior.wmf
-staroffice6.0/share/gallery/symbols/ship.wmf
-staroffice6.0/share/gallery/symbols/snowflake.wmf
-staroffice6.0/share/gallery/symbols/stop.wmf
-staroffice6.0/share/gallery/symbols/sun.wmf
-staroffice6.0/share/gallery/symbols/three.wmf
-staroffice6.0/share/gallery/symbols/throw_away.wmf
-staroffice6.0/share/gallery/symbols/top.wmf
-staroffice6.0/share/gallery/symbols/train.wmf
-staroffice6.0/share/gallery/symbols/two.wmf
-staroffice6.0/share/gallery/symbols/upstairs.wmf
-staroffice6.0/share/gallery/symbols/waiting_1.wmf
-staroffice6.0/share/gallery/symbols/web.wmf
-staroffice6.0/share/gallery/symbols/wheelchair.wmf
-staroffice6.0/share/gallery/symbols/woman.wmf
-staroffice6.0/share/gallery/symbols/writing.wmf
-staroffice6.0/share/gallery/symbols/zero.wmf
-staroffice6.0/share/gallery/time/0-00.wmf
-staroffice6.0/share/gallery/time/0-30.wmf
-staroffice6.0/share/gallery/time/1-00.wmf
-staroffice6.0/share/gallery/time/1-30.wmf
-staroffice6.0/share/gallery/time/10-00.wmf
-staroffice6.0/share/gallery/time/10-30.wmf
-staroffice6.0/share/gallery/time/11-00.wmf
-staroffice6.0/share/gallery/time/11-30.wmf
-staroffice6.0/share/gallery/time/2-00.wmf
-staroffice6.0/share/gallery/time/2-30.wmf
-staroffice6.0/share/gallery/time/3-00.wmf
-staroffice6.0/share/gallery/time/3-30.wmf
-staroffice6.0/share/gallery/time/4-00.wmf
-staroffice6.0/share/gallery/time/4-30.wmf
-staroffice6.0/share/gallery/time/5-00.wmf
-staroffice6.0/share/gallery/time/5-30.wmf
-staroffice6.0/share/gallery/time/5-to-12.wmf
-staroffice6.0/share/gallery/time/6-00.wmf
-staroffice6.0/share/gallery/time/6-30.wmf
-staroffice6.0/share/gallery/time/7-00.wmf
-staroffice6.0/share/gallery/time/7-30.wmf
-staroffice6.0/share/gallery/time/8-00.wmf
-staroffice6.0/share/gallery/time/8-30.wmf
-staroffice6.0/share/gallery/time/9-00.wmf
-staroffice6.0/share/gallery/time/9-30.wmf
-staroffice6.0/share/gallery/time/hourglass_1.wmf
-staroffice6.0/share/gallery/time/hourglass_2.wmf
-staroffice6.0/share/gallery/time/hourglass_3.wmf
-staroffice6.0/share/gallery/time/minut_10.wmf
-staroffice6.0/share/gallery/time/minut_15.wmf
-staroffice6.0/share/gallery/time/minut_20.wmf
-staroffice6.0/share/gallery/time/minut_25.wmf
-staroffice6.0/share/gallery/time/minut_30.wmf
-staroffice6.0/share/gallery/time/minut_35.wmf
-staroffice6.0/share/gallery/time/minut_40.wmf
-staroffice6.0/share/gallery/time/minut_45.wmf
-staroffice6.0/share/gallery/time/minut_5.wmf
-staroffice6.0/share/gallery/time/minut_50.wmf
-staroffice6.0/share/gallery/time/minut_55.wmf
-staroffice6.0/share/gallery/time/minut_60.wmf
-staroffice6.0/share/gallery/troubleshooting/anchor.wmf
-staroffice6.0/share/gallery/troubleshooting/battery.wmf
-staroffice6.0/share/gallery/troubleshooting/battery_empty.wmf
-staroffice6.0/share/gallery/troubleshooting/battery_full.wmf
-staroffice6.0/share/gallery/troubleshooting/battery_half.wmf
-staroffice6.0/share/gallery/troubleshooting/bridge.wmf
-staroffice6.0/share/gallery/troubleshooting/dice_blue.wmf
-staroffice6.0/share/gallery/troubleshooting/dice_green.wmf
-staroffice6.0/share/gallery/troubleshooting/dice_red.wmf
-staroffice6.0/share/gallery/troubleshooting/dice_yellow.wmf
-staroffice6.0/share/gallery/troubleshooting/exclamation_mark_blue.wmf
-staroffice6.0/share/gallery/troubleshooting/exclamation_mark_green.wmf
-staroffice6.0/share/gallery/troubleshooting/exclamation_mark_red.wmf
-staroffice6.0/share/gallery/troubleshooting/exclamation_mark_yellow.wmf
-staroffice6.0/share/gallery/troubleshooting/hit.wmf
-staroffice6.0/share/gallery/troubleshooting/ladder.wmf
-staroffice6.0/share/gallery/troubleshooting/lamp.wmf
-staroffice6.0/share/gallery/troubleshooting/lamp_broken.wmf
-staroffice6.0/share/gallery/troubleshooting/lamp_off.wmf
-staroffice6.0/share/gallery/troubleshooting/life_belt.wmf
-staroffice6.0/share/gallery/troubleshooting/magnet.wmf
-staroffice6.0/share/gallery/troubleshooting/piece_blue.wmf
-staroffice6.0/share/gallery/troubleshooting/piece_green.wmf
-staroffice6.0/share/gallery/troubleshooting/piece_red.wmf
-staroffice6.0/share/gallery/troubleshooting/piece_yellow.wmf
-staroffice6.0/share/gallery/troubleshooting/pieces.wmf
-staroffice6.0/share/gallery/troubleshooting/question-mark_blue.wmf
-staroffice6.0/share/gallery/troubleshooting/question-mark_green.wmf
-staroffice6.0/share/gallery/troubleshooting/question-mark_red.wmf
-staroffice6.0/share/gallery/troubleshooting/question-mark_yellow.wmf
-staroffice6.0/share/gallery/troubleshooting/ravine.wmf
-staroffice6.0/share/gallery/troubleshooting/start.wmf
-staroffice6.0/share/gallery/troubleshooting/stone-1.wmf
-staroffice6.0/share/gallery/troubleshooting/stone-2.wmf
-staroffice6.0/share/gallery/troubleshooting/stone-3.wmf
-staroffice6.0/share/gallery/troubleshooting/stone-4.wmf
-staroffice6.0/share/gallery/troubleshooting/stone-5.wmf
-staroffice6.0/share/gallery/troubleshooting/stone-6.wmf
-staroffice6.0/share/gallery/troubleshooting/target.wmf
-staroffice6.0/share/gallery/troubleshooting/traffic_light-green.wmf
-staroffice6.0/share/gallery/troubleshooting/traffic_light-off.wmf
-staroffice6.0/share/gallery/troubleshooting/traffic_light-red.wmf
-staroffice6.0/share/gallery/troubleshooting/traffic_light-yellow.wmf
-staroffice6.0/share/gallery/troubleshooting/victory_rostrum.wmf
-staroffice6.0/share/gallery/www-anim/15_min.gif
-staroffice6.0/share/gallery/www-anim/30_min.gif
-staroffice6.0/share/gallery/www-anim/45_min.gif
-staroffice6.0/share/gallery/www-anim/60_min.gif
-staroffice6.0/share/gallery/www-anim/barblak.gif
-staroffice6.0/share/gallery/www-anim/barwhit.gif
-staroffice6.0/share/gallery/www-anim/boxnew.gif
-staroffice6.0/share/gallery/www-anim/construction_1.gif
-staroffice6.0/share/gallery/www-anim/construction_2.gif
-staroffice6.0/share/gallery/www-anim/counting.gif
-staroffice6.0/share/gallery/www-anim/cubes.gif
-staroffice6.0/share/gallery/www-anim/diskblak.gif
-staroffice6.0/share/gallery/www-anim/diskwhit.gif
-staroffice6.0/share/gallery/www-anim/email.gif
-staroffice6.0/share/gallery/www-anim/envelope.gif
-staroffice6.0/share/gallery/www-anim/gearsnew.gif
-staroffice6.0/share/gallery/www-anim/glb4dark.gif
-staroffice6.0/share/gallery/www-anim/glb4lght.gif
-staroffice6.0/share/gallery/www-anim/traffic_light-go.gif
-staroffice6.0/share/gallery/www-anim/traffic_light-stop.gif
-staroffice6.0/share/gallery/www-back/aqua.jpg
-staroffice6.0/share/gallery/www-back/bathroom.jpg
-staroffice6.0/share/gallery/www-back/blocks.jpg
-staroffice6.0/share/gallery/www-back/blow_green.jpg
-staroffice6.0/share/gallery/www-back/blueblop.jpg
-staroffice6.0/share/gallery/www-back/bulging.jpg
-staroffice6.0/share/gallery/www-back/canvas_blue.jpg
-staroffice6.0/share/gallery/www-back/cheese.jpg
-staroffice6.0/share/gallery/www-back/chocolate.jpg
-staroffice6.0/share/gallery/www-back/citrus.jpg
-staroffice6.0/share/gallery/www-back/confetti.jpg
-staroffice6.0/share/gallery/www-back/daisy.jpg
-staroffice6.0/share/gallery/www-back/fluffy-grey.jpg
-staroffice6.0/share/gallery/www-back/fluffy.jpg
-staroffice6.0/share/gallery/www-back/fuzzy-blue.jpg
-staroffice6.0/share/gallery/www-back/fuzzy-darkgrey.jpg
-staroffice6.0/share/gallery/www-back/fuzzy-grey.jpg
-staroffice6.0/share/gallery/www-back/fuzzy-lightgrey.jpg
-staroffice6.0/share/gallery/www-back/fuzzy_light.jpg
-staroffice6.0/share/gallery/www-back/gregre.gif
-staroffice6.0/share/gallery/www-back/grey.gif
-staroffice6.0/share/gallery/www-back/grypaws.gif
-staroffice6.0/share/gallery/www-back/ice-blue.jpg
-staroffice6.0/share/gallery/www-back/ice-light.jpg
-staroffice6.0/share/gallery/www-back/imitation_leather.jpg
-staroffice6.0/share/gallery/www-back/interstices.jpg
-staroffice6.0/share/gallery/www-back/jeans.jpg
-staroffice6.0/share/gallery/www-back/jeansblk.jpg
-staroffice6.0/share/gallery/www-back/lawn-artificial.jpg
-staroffice6.0/share/gallery/www-back/lawn.jpg
-staroffice6.0/share/gallery/www-back/lightblue-wet.jpg
-staroffice6.0/share/gallery/www-back/linen-fine.jpg
-staroffice6.0/share/gallery/www-back/lino-green.jpg
-staroffice6.0/share/gallery/www-back/liquid-blue.jpg
-staroffice6.0/share/gallery/www-back/marble.jpg
-staroffice6.0/share/gallery/www-back/marble_dark.jpg
-staroffice6.0/share/gallery/www-back/mazes.jpg
-staroffice6.0/share/gallery/www-back/mint.gif
-staroffice6.0/share/gallery/www-back/notes.gif
-staroffice6.0/share/gallery/www-back/pattern.jpg
-staroffice6.0/share/gallery/www-back/pebble-light.jpg
-staroffice6.0/share/gallery/www-back/pink.gif
-staroffice6.0/share/gallery/www-back/pool.jpg
-staroffice6.0/share/gallery/www-back/popcorn.jpg
-staroffice6.0/share/gallery/www-back/purple.jpg
-staroffice6.0/share/gallery/www-back/reddark.jpg
-staroffice6.0/share/gallery/www-back/rings-green.jpg
-staroffice6.0/share/gallery/www-back/rings-orange.jpg
-staroffice6.0/share/gallery/www-back/roses.jpg
-staroffice6.0/share/gallery/www-back/sand-light.jpg
-staroffice6.0/share/gallery/www-back/sand.jpg
-staroffice6.0/share/gallery/www-back/sky.jpg
-staroffice6.0/share/gallery/www-back/soft-structure_grey.jpg
-staroffice6.0/share/gallery/www-back/space.jpg
-staroffice6.0/share/gallery/www-back/stone-dark.jpg
-staroffice6.0/share/gallery/www-back/stone.jpg
-staroffice6.0/share/gallery/www-back/structure.jpg
-staroffice6.0/share/gallery/www-back/structure_darkgreen.gif
-staroffice6.0/share/gallery/www-back/structure_green.jpg
-staroffice6.0/share/gallery/www-back/wall-grey.jpg
-staroffice6.0/share/gallery/www-back/wet-turquoise.jpg
-staroffice6.0/share/gallery/www-back/wood.jpg
-staroffice6.0/share/gallery/www-graf/bluat.gif
-staroffice6.0/share/gallery/www-graf/bluback.gif
-staroffice6.0/share/gallery/www-graf/bludisk.gif
-staroffice6.0/share/gallery/www-graf/bludown.gif
-staroffice6.0/share/gallery/www-graf/bluhome.gif
-staroffice6.0/share/gallery/www-graf/bluinfo.gif
-staroffice6.0/share/gallery/www-graf/bluleft.gif
-staroffice6.0/share/gallery/www-graf/blumail.gif
-staroffice6.0/share/gallery/www-graf/bluminus.gif
-staroffice6.0/share/gallery/www-graf/bluplus.gif
-staroffice6.0/share/gallery/www-graf/bluquest.gif
-staroffice6.0/share/gallery/www-graf/bluright.gif
-staroffice6.0/share/gallery/www-graf/bluup.gif
-staroffice6.0/share/gallery/www-graf/gredisk.gif
-staroffice6.0/share/gallery/www-graf/gredown.gif
-staroffice6.0/share/gallery/www-graf/grehome.gif
-staroffice6.0/share/gallery/www-graf/greinfo.gif
-staroffice6.0/share/gallery/www-graf/greleft.gif
-staroffice6.0/share/gallery/www-graf/gremail.gif
-staroffice6.0/share/gallery/www-graf/greminus.gif
-staroffice6.0/share/gallery/www-graf/greplus.gif
-staroffice6.0/share/gallery/www-graf/grequest.gif
-staroffice6.0/share/gallery/www-graf/greright.gif
-staroffice6.0/share/gallery/www-graf/greup.gif
-staroffice6.0/share/gallery/www-graf/grnat.gif
-staroffice6.0/share/gallery/www-graf/grnback.gif
-staroffice6.0/share/gallery/www-graf/grndisk.gif
-staroffice6.0/share/gallery/www-graf/grndown.gif
-staroffice6.0/share/gallery/www-graf/grnexcla.gif
-staroffice6.0/share/gallery/www-graf/grnhome.gif
-staroffice6.0/share/gallery/www-graf/grninfo.gif
-staroffice6.0/share/gallery/www-graf/grnleft.gif
-staroffice6.0/share/gallery/www-graf/grnmail.gif
-staroffice6.0/share/gallery/www-graf/grnminus.gif
-staroffice6.0/share/gallery/www-graf/grnplus.gif
-staroffice6.0/share/gallery/www-graf/grnquest.gif
-staroffice6.0/share/gallery/www-graf/grnright.gif
-staroffice6.0/share/gallery/www-graf/grnup.gif
-staroffice6.0/share/gallery/www-graf/gryat.gif
-staroffice6.0/share/gallery/www-graf/gryback.gif
-staroffice6.0/share/gallery/www-graf/grydisk.gif
-staroffice6.0/share/gallery/www-graf/grydown.gif
-staroffice6.0/share/gallery/www-graf/gryhome.gif
-staroffice6.0/share/gallery/www-graf/gryinfo.gif
-staroffice6.0/share/gallery/www-graf/gryleft.gif
-staroffice6.0/share/gallery/www-graf/grymail.gif
-staroffice6.0/share/gallery/www-graf/gryminus.gif
-staroffice6.0/share/gallery/www-graf/gryplus.gif
-staroffice6.0/share/gallery/www-graf/gryquest.gif
-staroffice6.0/share/gallery/www-graf/gryright.gif
-staroffice6.0/share/gallery/www-graf/gryup.gif
-staroffice6.0/share/gallery/www-graf/men@work.gif
-staroffice6.0/share/gallery/www-graf/orgat.gif
-staroffice6.0/share/gallery/www-graf/orgback.gif
-staroffice6.0/share/gallery/www-graf/orgdisk.gif
-staroffice6.0/share/gallery/www-graf/orgdown.gif
-staroffice6.0/share/gallery/www-graf/orghome.gif
-staroffice6.0/share/gallery/www-graf/orginfo.gif
-staroffice6.0/share/gallery/www-graf/orgleft.gif
-staroffice6.0/share/gallery/www-graf/orgmail.gif
-staroffice6.0/share/gallery/www-graf/orgminus.gif
-staroffice6.0/share/gallery/www-graf/orgplus.gif
-staroffice6.0/share/gallery/www-graf/orgquest.gif
-staroffice6.0/share/gallery/www-graf/orgright.gif
-staroffice6.0/share/gallery/www-graf/orgup.gif
-staroffice6.0/share/gallery/www-graf/redat.gif
-staroffice6.0/share/gallery/www-graf/redback.gif
-staroffice6.0/share/gallery/www-graf/reddisk.gif
-staroffice6.0/share/gallery/www-graf/reddown.gif
-staroffice6.0/share/gallery/www-graf/redhome.gif
-staroffice6.0/share/gallery/www-graf/redinfo.gif
-staroffice6.0/share/gallery/www-graf/redleft.gif
-staroffice6.0/share/gallery/www-graf/redmail.gif
-staroffice6.0/share/gallery/www-graf/redminus.gif
-staroffice6.0/share/gallery/www-graf/redplus.gif
-staroffice6.0/share/gallery/www-graf/redquest.gif
-staroffice6.0/share/gallery/www-graf/redright.gif
-staroffice6.0/share/gallery/www-graf/redup.gif
-staroffice6.0/share/gallery/www-graf/turdown.gif
-staroffice6.0/share/gallery/www-graf/turhome.gif
-staroffice6.0/share/gallery/www-graf/turleft.gif
-staroffice6.0/share/gallery/www-graf/turright.gif
-staroffice6.0/share/gallery/www-graf/turup.gif
-staroffice6.0/share/gallery/www-graf/viohome.gif
-staroffice6.0/share/gallery/www-graf/violeft.gif
-staroffice6.0/share/gallery/www-graf/vioright.gif
-staroffice6.0/share/gallery/www-graf/vioup.gif
-staroffice6.0/share/gallery/www-graf/ylwdown.gif
-staroffice6.0/share/gallery/www-graf/ylwhome.gif
-staroffice6.0/share/gallery/www-graf/ylwleft.gif
-staroffice6.0/share/gallery/www-graf/ylwmail.gif
-staroffice6.0/share/gallery/www-graf/ylwright.gif
-staroffice6.0/share/gallery/www-graf/ylwup.gif
-staroffice6.0/share/gnome/icons/001_star_butterfly.l.xpm
-staroffice6.0/share/gnome/icons/001_star_butterfly.m.xpm
-staroffice6.0/share/gnome/icons/001_star_butterfly.s.xpm
-staroffice6.0/share/gnome/icons/001_star_butterfly.t.xpm
-staroffice6.0/share/gnome/icons/002_text_document.l.xpm
-staroffice6.0/share/gnome/icons/002_text_document.m.xpm
-staroffice6.0/share/gnome/icons/002_text_document.s.xpm
-staroffice6.0/share/gnome/icons/002_text_document.t.xpm
-staroffice6.0/share/gnome/icons/003_text_template.l.xpm
-staroffice6.0/share/gnome/icons/003_text_template.m.xpm
-staroffice6.0/share/gnome/icons/003_text_template.s.xpm
-staroffice6.0/share/gnome/icons/003_text_template.t.xpm
-staroffice6.0/share/gnome/icons/004_spreadsheet_document.l.xpm
-staroffice6.0/share/gnome/icons/004_spreadsheet_document.m.xpm
-staroffice6.0/share/gnome/icons/004_spreadsheet_document.s.xpm
-staroffice6.0/share/gnome/icons/004_spreadsheet_document.t.xpm
-staroffice6.0/share/gnome/icons/005_spreadsheet_template.l.xpm
-staroffice6.0/share/gnome/icons/005_spreadsheet_template.m.xpm
-staroffice6.0/share/gnome/icons/005_spreadsheet_template.s.xpm
-staroffice6.0/share/gnome/icons/005_spreadsheet_template.t.xpm
-staroffice6.0/share/gnome/icons/006_drawing_document.l.xpm
-staroffice6.0/share/gnome/icons/006_drawing_document.m.xpm
-staroffice6.0/share/gnome/icons/006_drawing_document.s.xpm
-staroffice6.0/share/gnome/icons/006_drawing_document.t.xpm
-staroffice6.0/share/gnome/icons/007_drawing_template.l.xpm
-staroffice6.0/share/gnome/icons/007_drawing_template.m.xpm
-staroffice6.0/share/gnome/icons/007_drawing_template.s.xpm
-staroffice6.0/share/gnome/icons/007_drawing_template.t.xpm
-staroffice6.0/share/gnome/icons/008_presentation_document.l.xpm
-staroffice6.0/share/gnome/icons/008_presentation_document.m.xpm
-staroffice6.0/share/gnome/icons/008_presentation_document.s.xpm
-staroffice6.0/share/gnome/icons/008_presentation_document.t.xpm
-staroffice6.0/share/gnome/icons/009_presentation_template.l.xpm
-staroffice6.0/share/gnome/icons/009_presentation_template.m.xpm
-staroffice6.0/share/gnome/icons/009_presentation_template.s.xpm
-staroffice6.0/share/gnome/icons/009_presentation_template.t.xpm
-staroffice6.0/share/gnome/icons/010_presentation_compressed.l.xpm
-staroffice6.0/share/gnome/icons/010_presentation_compressed.m.xpm
-staroffice6.0/share/gnome/icons/010_presentation_compressed.s.xpm
-staroffice6.0/share/gnome/icons/010_presentation_compressed.t.xpm
-staroffice6.0/share/gnome/icons/011_global_document.l.xpm
-staroffice6.0/share/gnome/icons/011_global_document.m.xpm
-staroffice6.0/share/gnome/icons/011_global_document.s.xpm
-staroffice6.0/share/gnome/icons/011_global_document.t.xpm
-staroffice6.0/share/gnome/icons/012_html_document.l.xpm
-staroffice6.0/share/gnome/icons/012_html_document.m.xpm
-staroffice6.0/share/gnome/icons/012_html_document.s.xpm
-staroffice6.0/share/gnome/icons/012_html_document.t.xpm
-staroffice6.0/share/gnome/icons/013_chart_document.l.xpm
-staroffice6.0/share/gnome/icons/013_chart_document.m.xpm
-staroffice6.0/share/gnome/icons/013_chart_document.s.xpm
-staroffice6.0/share/gnome/icons/013_chart_document.t.xpm
-staroffice6.0/share/gnome/icons/014_database_document.l.xpm
-staroffice6.0/share/gnome/icons/014_database_document.m.xpm
-staroffice6.0/share/gnome/icons/014_database_document.s.xpm
-staroffice6.0/share/gnome/icons/014_database_document.t.xpm
-staroffice6.0/share/gnome/icons/015_math_document.l.xpm
-staroffice6.0/share/gnome/icons/015_math_document.m.xpm
-staroffice6.0/share/gnome/icons/015_math_document.s.xpm
-staroffice6.0/share/gnome/icons/015_math_document.t.xpm
-staroffice6.0/share/gnome/icons/016_template.l.xpm
-staroffice6.0/share/gnome/icons/016_template.m.xpm
-staroffice6.0/share/gnome/icons/016_template.s.xpm
-staroffice6.0/share/gnome/icons/016_template.t.xpm
-staroffice6.0/share/gnome/icons/017_macrolibrary.l.xpm
-staroffice6.0/share/gnome/icons/017_macrolibrary.m.xpm
-staroffice6.0/share/gnome/icons/017_macrolibrary.s.xpm
-staroffice6.0/share/gnome/icons/017_macrolibrary.t.xpm
-staroffice6.0/share/gnome/icons/500_setup.l.xpm
-staroffice6.0/share/gnome/icons/500_setup.m.xpm
-staroffice6.0/share/gnome/icons/500_setup.s.xpm
-staroffice6.0/share/gnome/icons/500_setup.t.xpm
-staroffice6.0/share/gnome/net/.directory
-staroffice6.0/share/gnome/net/.order
-staroffice6.0/share/gnome/net/auto pilots/.directory
-staroffice6.0/share/gnome/net/auto pilots/agenda.desktop
-staroffice6.0/share/gnome/net/auto pilots/fax.desktop
-staroffice6.0/share/gnome/net/auto pilots/letter.desktop
-staroffice6.0/share/gnome/net/auto pilots/memo.desktop
-staroffice6.0/share/gnome/net/drawing.desktop
-staroffice6.0/share/gnome/net/information and setup/.directory
-staroffice6.0/share/gnome/net/information and setup/setup.desktop
-staroffice6.0/share/gnome/net/other/.directory
-staroffice6.0/share/gnome/net/other/labels.desktop
-staroffice6.0/share/gnome/net/other/masterdoc.desktop
-staroffice6.0/share/gnome/net/other/mathdoc.desktop
-staroffice6.0/share/gnome/net/other/vcards.desktop
-staroffice6.0/share/gnome/net/presentation.desktop
-staroffice6.0/share/gnome/net/spreadsheet.desktop
-staroffice6.0/share/gnome/net/template.desktop
-staroffice6.0/share/gnome/net/textdoc.desktop
-staroffice6.0/share/gnome/net/webdoc.desktop
-staroffice6.0/share/kde/icons/001_star_butterfly.l.xpm
-staroffice6.0/share/kde/icons/001_star_butterfly.m.xpm
-staroffice6.0/share/kde/icons/001_star_butterfly.s.xpm
-staroffice6.0/share/kde/icons/001_star_butterfly.t.xpm
-staroffice6.0/share/kde/icons/002_text_document.l.xpm
-staroffice6.0/share/kde/icons/002_text_document.m.xpm
-staroffice6.0/share/kde/icons/002_text_document.s.xpm
-staroffice6.0/share/kde/icons/002_text_document.t.xpm
-staroffice6.0/share/kde/icons/003_text_template.l.xpm
-staroffice6.0/share/kde/icons/003_text_template.m.xpm
-staroffice6.0/share/kde/icons/003_text_template.s.xpm
-staroffice6.0/share/kde/icons/003_text_template.t.xpm
-staroffice6.0/share/kde/icons/004_spreadsheet_document.l.xpm
-staroffice6.0/share/kde/icons/004_spreadsheet_document.m.xpm
-staroffice6.0/share/kde/icons/004_spreadsheet_document.s.xpm
-staroffice6.0/share/kde/icons/004_spreadsheet_document.t.xpm
-staroffice6.0/share/kde/icons/005_spreadsheet_template.l.xpm
-staroffice6.0/share/kde/icons/005_spreadsheet_template.m.xpm
-staroffice6.0/share/kde/icons/005_spreadsheet_template.s.xpm
-staroffice6.0/share/kde/icons/005_spreadsheet_template.t.xpm
-staroffice6.0/share/kde/icons/006_drawing_document.l.xpm
-staroffice6.0/share/kde/icons/006_drawing_document.m.xpm
-staroffice6.0/share/kde/icons/006_drawing_document.s.xpm
-staroffice6.0/share/kde/icons/006_drawing_document.t.xpm
-staroffice6.0/share/kde/icons/007_drawing_template.l.xpm
-staroffice6.0/share/kde/icons/007_drawing_template.m.xpm
-staroffice6.0/share/kde/icons/007_drawing_template.s.xpm
-staroffice6.0/share/kde/icons/007_drawing_template.t.xpm
-staroffice6.0/share/kde/icons/008_presentation_document.l.xpm
-staroffice6.0/share/kde/icons/008_presentation_document.m.xpm
-staroffice6.0/share/kde/icons/008_presentation_document.s.xpm
-staroffice6.0/share/kde/icons/008_presentation_document.t.xpm
-staroffice6.0/share/kde/icons/009_presentation_template.l.xpm
-staroffice6.0/share/kde/icons/009_presentation_template.m.xpm
-staroffice6.0/share/kde/icons/009_presentation_template.s.xpm
-staroffice6.0/share/kde/icons/009_presentation_template.t.xpm
-staroffice6.0/share/kde/icons/010_presentation_compressed.l.xpm
-staroffice6.0/share/kde/icons/010_presentation_compressed.m.xpm
-staroffice6.0/share/kde/icons/010_presentation_compressed.s.xpm
-staroffice6.0/share/kde/icons/010_presentation_compressed.t.xpm
-staroffice6.0/share/kde/icons/011_global_document.l.xpm
-staroffice6.0/share/kde/icons/011_global_document.m.xpm
-staroffice6.0/share/kde/icons/011_global_document.s.xpm
-staroffice6.0/share/kde/icons/011_global_document.t.xpm
-staroffice6.0/share/kde/icons/012_html_document.l.xpm
-staroffice6.0/share/kde/icons/012_html_document.m.xpm
-staroffice6.0/share/kde/icons/012_html_document.s.xpm
-staroffice6.0/share/kde/icons/012_html_document.t.xpm
-staroffice6.0/share/kde/icons/013_chart_document.l.xpm
-staroffice6.0/share/kde/icons/013_chart_document.m.xpm
-staroffice6.0/share/kde/icons/013_chart_document.s.xpm
-staroffice6.0/share/kde/icons/013_chart_document.t.xpm
-staroffice6.0/share/kde/icons/014_database_document.l.xpm
-staroffice6.0/share/kde/icons/014_database_document.m.xpm
-staroffice6.0/share/kde/icons/014_database_document.s.xpm
-staroffice6.0/share/kde/icons/014_database_document.t.xpm
-staroffice6.0/share/kde/icons/015_math_document.l.xpm
-staroffice6.0/share/kde/icons/015_math_document.m.xpm
-staroffice6.0/share/kde/icons/015_math_document.s.xpm
-staroffice6.0/share/kde/icons/015_math_document.t.xpm
-staroffice6.0/share/kde/icons/016_template.l.xpm
-staroffice6.0/share/kde/icons/016_template.m.xpm
-staroffice6.0/share/kde/icons/016_template.s.xpm
-staroffice6.0/share/kde/icons/016_template.t.xpm
-staroffice6.0/share/kde/icons/017_macrolibrary.l.xpm
-staroffice6.0/share/kde/icons/017_macrolibrary.m.xpm
-staroffice6.0/share/kde/icons/017_macrolibrary.s.xpm
-staroffice6.0/share/kde/icons/017_macrolibrary.t.xpm
-staroffice6.0/share/kde/icons/500_setup.l.xpm
-staroffice6.0/share/kde/icons/500_setup.m.xpm
-staroffice6.0/share/kde/icons/500_setup.s.xpm
-staroffice6.0/share/kde/icons/500_setup.t.xpm
-staroffice6.0/share/kde/net/applnk/StarOffice 6.0/.directory
-staroffice6.0/share/kde/net/applnk/StarOffice 6.0/.order
-staroffice6.0/share/kde/net/applnk/StarOffice 6.0/auto pilots/.directory
-staroffice6.0/share/kde/net/applnk/StarOffice 6.0/auto pilots/agenda.desktop
-staroffice6.0/share/kde/net/applnk/StarOffice 6.0/auto pilots/fax.desktop
-staroffice6.0/share/kde/net/applnk/StarOffice 6.0/auto pilots/letter.desktop
-staroffice6.0/share/kde/net/applnk/StarOffice 6.0/auto pilots/memo.desktop
-staroffice6.0/share/kde/net/applnk/StarOffice 6.0/drawing.desktop
-staroffice6.0/share/kde/net/applnk/StarOffice 6.0/information and setup/.directory
-staroffice6.0/share/kde/net/applnk/StarOffice 6.0/information and setup/setup.desktop
-staroffice6.0/share/kde/net/applnk/StarOffice 6.0/other/.directory
-staroffice6.0/share/kde/net/applnk/StarOffice 6.0/other/labels.desktop
-staroffice6.0/share/kde/net/applnk/StarOffice 6.0/other/masterdoc.desktop
-staroffice6.0/share/kde/net/applnk/StarOffice 6.0/other/mathdoc.desktop
-staroffice6.0/share/kde/net/applnk/StarOffice 6.0/other/vcards.desktop
-staroffice6.0/share/kde/net/applnk/StarOffice 6.0/presentation.desktop
-staroffice6.0/share/kde/net/applnk/StarOffice 6.0/spreadsheet.desktop
-staroffice6.0/share/kde/net/applnk/StarOffice 6.0/template.desktop
-staroffice6.0/share/kde/net/applnk/StarOffice 6.0/textdoc.desktop
-staroffice6.0/share/kde/net/applnk/StarOffice 6.0/webdoc.desktop
-staroffice6.0/share/kde/net/mimelnk/application/vnd.stardivision.calc.desktop
-staroffice6.0/share/kde/net/mimelnk/application/vnd.stardivision.chart.desktop
-staroffice6.0/share/kde/net/mimelnk/application/vnd.stardivision.draw.desktop
-staroffice6.0/share/kde/net/mimelnk/application/vnd.stardivision.impress.desktop
-staroffice6.0/share/kde/net/mimelnk/application/vnd.stardivision.math.desktop
-staroffice6.0/share/kde/net/mimelnk/application/vnd.stardivision.writer-global.desktop
-staroffice6.0/share/kde/net/mimelnk/application/vnd.stardivision.writer.desktop
-staroffice6.0/share/kde/net/mimelnk/application/vnd.sun.xml.calc.desktop
-staroffice6.0/share/kde/net/mimelnk/application/vnd.sun.xml.draw.desktop
-staroffice6.0/share/kde/net/mimelnk/application/vnd.sun.xml.impress.desktop
-staroffice6.0/share/kde/net/mimelnk/application/vnd.sun.xml.math.desktop
-staroffice6.0/share/kde/net/mimelnk/application/vnd.sun.xml.writer.desktop
-staroffice6.0/share/kde/net/mimelnk/application/vnd.sun.xml.writer.global.desktop
-staroffice6.0/share/migration/MailConvert.sdw
-staroffice6.0/share/migration/_90_conv.url
-staroffice6.0/share/migration/libmbx569li.so
-staroffice6.0/share/psprint/driver/ADISTILL.PS
-staroffice6.0/share/psprint/driver/APLW3101.PS
-staroffice6.0/share/psprint/driver/APLW3201.PS
-staroffice6.0/share/psprint/driver/APLW3601.PS
-staroffice6.0/share/psprint/driver/APLW6101.PS
-staroffice6.0/share/psprint/driver/APLW8101.PS
-staroffice6.0/share/psprint/driver/APLW81F1.PS
-staroffice6.0/share/psprint/driver/APLWBGR1.PS
-staroffice6.0/share/psprint/driver/APLWCOB1.PS
-staroffice6.0/share/psprint/driver/APLWCSB1.PS
-staroffice6.0/share/psprint/driver/APLWGRF1.PS
-staroffice6.0/share/psprint/driver/APLWGRI1.PS
-staroffice6.0/share/psprint/driver/APLWGRJ1.PS
-staroffice6.0/share/psprint/driver/APLWIIF2.PS
-staroffice6.0/share/psprint/driver/APLWIIG2.PS
-staroffice6.0/share/psprint/driver/APLWLOT1.PS
-staroffice6.0/share/psprint/driver/APL_IIF1.PS
-staroffice6.0/share/psprint/driver/APL_IIG1.PS
-staroffice6.0/share/psprint/driver/APL_NTR1.PS
-staroffice6.0/share/psprint/driver/APNT518_.PS
-staroffice6.0/share/psprint/driver/APNTX501.PS
-staroffice6.0/share/psprint/driver/APNTXJ1_.PS
-staroffice6.0/share/psprint/driver/APPL_230.PS
-staroffice6.0/share/psprint/driver/APPL_380.PS
-staroffice6.0/share/psprint/driver/APPL_422.PS
-staroffice6.0/share/psprint/driver/APTOLLD1.PS
-staroffice6.0/share/psprint/driver/APTOLLW1.PS
-staroffice6.0/share/psprint/driver/CAECOGR1.PS
-staroffice6.0/share/psprint/driver/DC1152_1.PS
-staroffice6.0/share/psprint/driver/EFAX3010.PS
-staroffice6.0/share/psprint/driver/EFAX4010.PS
-staroffice6.0/share/psprint/driver/EFAX5010.PS
-staroffice6.0/share/psprint/driver/EFAX7010.PS
-staroffice6.0/share/psprint/driver/EFMX3010.PS
-staroffice6.0/share/psprint/driver/EFMX5010.PS
-staroffice6.0/share/psprint/driver/EFMX7010.PS
-staroffice6.0/share/psprint/driver/EFXJK1F3.PS
-staroffice6.0/share/psprint/driver/EFXJK2F3.PS
-staroffice6.0/share/psprint/driver/EFXJK303.PS
-staroffice6.0/share/psprint/driver/EFXJK3F3.PS
-staroffice6.0/share/psprint/driver/EP_08001.PS
-staroffice6.0/share/psprint/driver/EP_15201.PS
-staroffice6.0/share/psprint/driver/EP_30001.PS
-staroffice6.0/share/psprint/driver/EP_50001.PS
-staroffice6.0/share/psprint/driver/EP_82F21.PS
-staroffice6.0/share/psprint/driver/EP_82F51.PS
-staroffice6.0/share/psprint/driver/EP_P0701.PS
-staroffice6.0/share/psprint/driver/EP_P1201.PS
-staroffice6.0/share/psprint/driver/EP_STPH1.PS
-staroffice6.0/share/psprint/driver/GENERIC.PS
-staroffice6.0/share/psprint/driver/HP1200C1.PS
-staroffice6.0/share/psprint/driver/HP2500C1.PS
-staroffice6.0/share/psprint/driver/HP3SI52_.PS
-staroffice6.0/share/psprint/driver/HP3SIL21.PS
-staroffice6.0/share/psprint/driver/HP4M3_V1.PS
-staroffice6.0/share/psprint/driver/HP4M6_V1.PS
-staroffice6.0/share/psprint/driver/HP4ML_V1.PS
-staroffice6.0/share/psprint/driver/HP4MP3_1.PS
-staroffice6.0/share/psprint/driver/HP4MP6_1.PS
-staroffice6.0/share/psprint/driver/HP4PLUS3.PS
-staroffice6.0/share/psprint/driver/HP4PLUS6.PS
-staroffice6.0/share/psprint/driver/HP4SI3_1.PS
-staroffice6.0/share/psprint/driver/HP4SI6_1.PS
-staroffice6.0/share/psprint/driver/HPIID52_.PS
-staroffice6.0/share/psprint/driver/HPIII52_.PS
-staroffice6.0/share/psprint/driver/HPIIP52_.PS
-staroffice6.0/share/psprint/driver/HPLJ3D1_.PS
-staroffice6.0/share/psprint/driver/HPLJ3P1_.PS
-staroffice6.0/share/psprint/driver/HPLJ4MV1.PS
-staroffice6.0/share/psprint/driver/HPLJ5M_4.PS
-staroffice6.0/share/psprint/driver/HPLJ5P_1.PS
-staroffice6.0/share/psprint/driver/HPLJ5SI1.PS
-staroffice6.0/share/psprint/driver/HPLJ5SIM.PS
-staroffice6.0/share/psprint/driver/HPLJ__31.PS
-staroffice6.0/share/psprint/driver/HP_3D52_.PS
-staroffice6.0/share/psprint/driver/HP_3P52_.PS
-staroffice6.0/share/psprint/driver/HP__CLJ1.PS
-staroffice6.0/share/psprint/driver/KD8650P1.PS
-staroffice6.0/share/psprint/driver/KD92P001.PS
-staroffice6.0/share/psprint/driver/KDH00001.PS
-staroffice6.0/share/psprint/driver/KDH00002.PS
-staroffice6.0/share/psprint/driver/L10__425.PS
-staroffice6.0/share/psprint/driver/L20__471.PS
-staroffice6.0/share/psprint/driver/L20__493.PS
-staroffice6.0/share/psprint/driver/L30__471.PS
-staroffice6.0/share/psprint/driver/L30__493.PS
-staroffice6.0/share/psprint/driver/L333_523.PS
-staroffice6.0/share/psprint/driver/L33__523.PS
-staroffice6.0/share/psprint/driver/L50__493.PS
-staroffice6.0/share/psprint/driver/L533_523.PS
-staroffice6.0/share/psprint/driver/L53__523.PS
-staroffice6.0/share/psprint/driver/LEX4039P.PS
-staroffice6.0/share/psprint/driver/LEX4079P.PS
-staroffice6.0/share/psprint/driver/LEXOPTR_.PS
-staroffice6.0/share/psprint/driver/LHCFLRJ5.PS
-staroffice6.0/share/psprint/driver/LHCOFLC5.PS
-staroffice6.0/share/psprint/driver/LHCOFLR5.PS
-staroffice6.0/share/psprint/driver/LHGUBEH3.PS
-staroffice6.0/share/psprint/driver/LHGUBHJ4.PS
-staroffice6.0/share/psprint/driver/LHHERHJ4.PS
-staroffice6.0/share/psprint/driver/LHHERIJ4.PS
-staroffice6.0/share/psprint/driver/LHHERKH3.PS
-staroffice6.0/share/psprint/driver/LHHERKI4.PS
-staroffice6.0/share/psprint/driver/LHHKPHJ7.PS
-staroffice6.0/share/psprint/driver/LHHKPIJ7.PS
-staroffice6.0/share/psprint/driver/LHHRKPH7.PS
-staroffice6.0/share/psprint/driver/LHHRKPI7.PS
-staroffice6.0/share/psprint/driver/LHQUSHJ4.PS
-staroffice6.0/share/psprint/driver/LHQUSIJ4.PS
-staroffice6.0/share/psprint/driver/LHQUSRH3.PS
-staroffice6.0/share/psprint/driver/LHQUSRI3.PS
-staroffice6.0/share/psprint/driver/LHSIGHJ4.PS
-staroffice6.0/share/psprint/driver/LHSIGIJ4.PS
-staroffice6.0/share/psprint/driver/LHSIGNH3.PS
-staroffice6.0/share/psprint/driver/LHSIGNI3.PS
-staroffice6.0/share/psprint/driver/LOPC1200.PS
-staroffice6.0/share/psprint/driver/LOPC40.PS
-staroffice6.0/share/psprint/driver/LOPC45.PS
-staroffice6.0/share/psprint/driver/LOPE310.PS
-staroffice6.0/share/psprint/driver/LOPM410.PS
-staroffice6.0/share/psprint/driver/LOPS1255.PS
-staroffice6.0/share/psprint/driver/LOPS1625.PS
-staroffice6.0/share/psprint/driver/LOPS1855.PS
-staroffice6.0/share/psprint/driver/LOPS2455.PS
-staroffice6.0/share/psprint/driver/LOPS3455.PS
-staroffice6.0/share/psprint/driver/LOPT610.PS
-staroffice6.0/share/psprint/driver/LOPT612.PS
-staroffice6.0/share/psprint/driver/LOPT614.PS
-staroffice6.0/share/psprint/driver/LOPT616.PS
-staroffice6.0/share/psprint/driver/LOPTRAC.PS
-staroffice6.0/share/psprint/driver/LOPTRAEP.PS
-staroffice6.0/share/psprint/driver/LOPTRAK.PS
-staroffice6.0/share/psprint/driver/LOPTRAN.PS
-staroffice6.0/share/psprint/driver/LOPTRAP.PS
-staroffice6.0/share/psprint/driver/LOPTRAS.PS
-staroffice6.0/share/psprint/driver/LOPTRASC.PS
-staroffice6.0/share/psprint/driver/LOPW810.PS
-staroffice6.0/share/psprint/driver/LOS1255P.PS
-staroffice6.0/share/psprint/driver/LOS1625P.PS
-staroffice6.0/share/psprint/driver/LOS1855P.PS
-staroffice6.0/share/psprint/driver/LOS2455P.PS
-staroffice6.0/share/psprint/driver/LOS3455P.PS
-staroffice6.0/share/psprint/driver/LWNT_518.PS
-staroffice6.0/share/psprint/driver/SGENPRT.PS
-staroffice6.0/share/psprint/driver/SNSPREC1.PS
-staroffice6.0/share/psprint/driver/TK300PJ1.PS
-staroffice6.0/share/psprint/driver/TK300XJ1.PS
-staroffice6.0/share/psprint/driver/TK350171.PS
-staroffice6.0/share/psprint/driver/TK350172.PS
-staroffice6.0/share/psprint/driver/TK350691.PS
-staroffice6.0/share/psprint/driver/TK350692.PS
-staroffice6.0/share/psprint/driver/TK350PJ2.PS
-staroffice6.0/share/psprint/driver/TK360J21.PS
-staroffice6.0/share/psprint/driver/TK360J51.PS
-staroffice6.0/share/psprint/driver/TK360J71.PS
-staroffice6.0/share/psprint/driver/TK450PJ1.PS
-staroffice6.0/share/psprint/driver/TK550171.PS
-staroffice6.0/share/psprint/driver/TK550391.PS
-staroffice6.0/share/psprint/driver/TK550PJ1.PS
-staroffice6.0/share/psprint/driver/TKP350J2.PS
-staroffice6.0/share/psprint/driver/TKP360P1.PS
-staroffice6.0/share/psprint/driver/TKP380J1.PS
-staroffice6.0/share/psprint/driver/TKP380P1.PS
-staroffice6.0/share/psprint/driver/TKP450J1.PS
-staroffice6.0/share/psprint/driver/TKP450P1.PS
-staroffice6.0/share/psprint/driver/TKP550J1.PS
-staroffice6.0/share/psprint/driver/TKP600J1.PS
-staroffice6.0/share/psprint/driver/TKPH3801.PS
-staroffice6.0/share/psprint/driver/TKPH4501.PS
-staroffice6.0/share/psprint/driver/TKPH6001.PS
-staroffice6.0/share/psprint/driver/XRD61354.PS
-staroffice6.0/share/psprint/driver/XRD61801.PS
-staroffice6.0/share/psprint/driver/XRN17000.PS
-staroffice6.0/share/psprint/driver/XRN24320.PS
-staroffice6.0/share/psprint/driver/XR_DC230.PS
-staroffice6.0/share/psprint/fontmetric/AGaramond-Bold.afm
-staroffice6.0/share/psprint/fontmetric/AvantGarde-Book.afm
-staroffice6.0/share/psprint/fontmetric/AvantGarde-BookOblique.afm
-staroffice6.0/share/psprint/fontmetric/AvantGarde-Demi.afm
-staroffice6.0/share/psprint/fontmetric/AvantGarde-DemiOblique.afm
-staroffice6.0/share/psprint/fontmetric/Bookman-Demi.afm
-staroffice6.0/share/psprint/fontmetric/Bookman-DemiItalic.afm
-staroffice6.0/share/psprint/fontmetric/Bookman-Light.afm
-staroffice6.0/share/psprint/fontmetric/Bookman-LightItalic.afm
-staroffice6.0/share/psprint/fontmetric/Courier-Bold.afm
-staroffice6.0/share/psprint/fontmetric/Courier-BoldOblique.afm
-staroffice6.0/share/psprint/fontmetric/Courier-Oblique.afm
-staroffice6.0/share/psprint/fontmetric/Courier.afm
-staroffice6.0/share/psprint/fontmetric/GothicBBB-Medium-83pv-RKSJ-H.afm
-staroffice6.0/share/psprint/fontmetric/GothicBBB-Medium.Roman.afm
-staroffice6.0/share/psprint/fontmetric/Helvetica-Bold.afm
-staroffice6.0/share/psprint/fontmetric/Helvetica-BoldOblique.afm
-staroffice6.0/share/psprint/fontmetric/Helvetica-Oblique.afm
-staroffice6.0/share/psprint/fontmetric/Helvetica.afm
-staroffice6.0/share/psprint/fontmetric/NewBaskerville-Bold.afm
-staroffice6.0/share/psprint/fontmetric/NewBaskerville-BoldItalic.afm
-staroffice6.0/share/psprint/fontmetric/NewBaskerville-Italic.afm
-staroffice6.0/share/psprint/fontmetric/NewBaskerville-Roman.afm
-staroffice6.0/share/psprint/fontmetric/NewCenturySchlbk-Bold.afm
-staroffice6.0/share/psprint/fontmetric/NewCenturySchlbk-BoldItalic.afm
-staroffice6.0/share/psprint/fontmetric/NewCenturySchlbk-Italic.afm
-staroffice6.0/share/psprint/fontmetric/NewCenturySchlbk-Roman.afm
-staroffice6.0/share/psprint/fontmetric/Palatino-Bold.afm
-staroffice6.0/share/psprint/fontmetric/Palatino-BoldItalic.afm
-staroffice6.0/share/psprint/fontmetric/Palatino-Italic.afm
-staroffice6.0/share/psprint/fontmetric/Palatino-Roman.afm
-staroffice6.0/share/psprint/fontmetric/Ryumin-Light-83pv-RKSJ-H.afm
-staroffice6.0/share/psprint/fontmetric/Ryumin-Light.Roman.afm
-staroffice6.0/share/psprint/fontmetric/Symbol.afm
-staroffice6.0/share/psprint/fontmetric/Times-Bold.afm
-staroffice6.0/share/psprint/fontmetric/Times-BoldItalic.afm
-staroffice6.0/share/psprint/fontmetric/Times-Italic.afm
-staroffice6.0/share/psprint/fontmetric/Times-Roman.afm
-staroffice6.0/share/psprint/fontmetric/Windsor.afm
-staroffice6.0/share/psprint/fontmetric/ZapfChancery-MediumItalic.afm
-staroffice6.0/share/psprint/fontmetric/ZapfDingbats.afm
-staroffice6.0/share/psprint/psprint.conf
-staroffice6.0/share/samples/english/drawings/Automobile.sxd
-staroffice6.0/share/samples/english/drawings/Blueprint.sxd
-staroffice6.0/share/samples/english/drawings/ColorProfile.sxd
-staroffice6.0/share/samples/english/drawings/Jazz.sxd
-staroffice6.0/share/samples/english/drawings/Ship.sxd
-staroffice6.0/share/samples/english/drawings/Workshop.sxd
-staroffice6.0/share/samples/english/drawings/engine.sxd
-staroffice6.0/share/samples/english/formulas/Annuities.sxm
-staroffice6.0/share/samples/english/formulas/Cauchy.sxm
-staroffice6.0/share/samples/english/formulas/ChemicalElement.sxm
-staroffice6.0/share/samples/english/formulas/DefinitionStraightLine.sxm
-staroffice6.0/share/samples/english/formulas/EffectiveAnnualInterestRate.sxm
-staroffice6.0/share/samples/english/formulas/HamiltonOperator.sxm
-staroffice6.0/share/samples/english/formulas/InvestmentReturns.sxm
-staroffice6.0/share/samples/english/formulas/LawOfErrorPropagation.sxm
-staroffice6.0/share/samples/english/formulas/Limes.sxm
-staroffice6.0/share/samples/english/formulas/LinearRegression.sxm
-staroffice6.0/share/samples/english/formulas/Maxwell.sxm
-staroffice6.0/share/samples/english/formulas/ScalarProduct.sxm
-staroffice6.0/share/samples/english/formulas/Sinus.sxm
-staroffice6.0/share/samples/english/formulas/SquareRoot.sxm
-staroffice6.0/share/samples/english/formulas/StandardDeviation.sxm
-staroffice6.0/share/samples/english/formulas/VectorProduct.sxm
-staroffice6.0/share/samples/english/menu/drawings.url
-staroffice6.0/share/samples/english/menu/formulas.url
-staroffice6.0/share/samples/english/menu/presentations.url
-staroffice6.0/share/samples/english/menu/spreadsheets.url
-staroffice6.0/share/samples/english/menu/texts.url
-staroffice6.0/share/samples/english/presentations/Chess.sxi
-staroffice6.0/share/samples/english/presentations/CompanyTakeover.sxi
-staroffice6.0/share/samples/english/presentations/Orgchart.sxi
-staroffice6.0/share/samples/english/presentations/RecarShareholderMeeting.sxi
-staroffice6.0/share/samples/english/presentations/ThreeDimensions.sxi
-staroffice6.0/share/samples/english/presentations/VacationPhotos.sxi
-staroffice6.0/share/samples/english/spreadsheets/Biorhythm.sxc
-staroffice6.0/share/samples/english/spreadsheets/Buffet.sxc
-staroffice6.0/share/samples/english/spreadsheets/ConversionTable.sxc
-staroffice6.0/share/samples/english/spreadsheets/CurrencyConverter.sxc
-staroffice6.0/share/samples/english/spreadsheets/DataAnalysys.sxc
-staroffice6.0/share/samples/english/spreadsheets/Movie1.sxc
-staroffice6.0/share/samples/english/spreadsheets/Movie2.sxc
-staroffice6.0/share/samples/english/spreadsheets/Movie3.sxc
-staroffice6.0/share/samples/english/spreadsheets/OfficeSharingAssoc.sxc
-staroffice6.0/share/samples/english/spreadsheets/Recar-Scenarios.sxc
-staroffice6.0/share/samples/english/texts/Book.sxg
-staroffice6.0/share/samples/english/texts/Brochure.sxw
-staroffice6.0/share/samples/english/texts/Chapters/Chapter1.sxw
-staroffice6.0/share/samples/english/texts/Chapters/Chapter2.sxw
-staroffice6.0/share/samples/english/texts/Chapters/Chapter3.sxw
-staroffice6.0/share/samples/english/texts/Chapters/Glass.jpg
-staroffice6.0/share/samples/english/texts/Chapters/Ham.jpg
-staroffice6.0/share/samples/english/texts/Chapters/Strwbrry.jpg
-staroffice6.0/share/samples/english/texts/Chapters/Tennis.jpg
-staroffice6.0/share/samples/english/texts/Chapters/Villa1.jpg
-staroffice6.0/share/samples/english/texts/Chapters/Villa2.jpg
-staroffice6.0/share/samples/english/texts/Flyers.sxw
-staroffice6.0/share/samples/english/texts/Games.sxw
-staroffice6.0/share/samples/english/texts/Homepage/about.gif
-staroffice6.0/share/samples/english/texts/Homepage/about.html
-staroffice6.0/share/samples/english/texts/Homepage/abouto.gif
-staroffice6.0/share/samples/english/texts/Homepage/backgrnd.jpg
-staroffice6.0/share/samples/english/texts/Homepage/bar.gif
-staroffice6.0/share/samples/english/texts/Homepage/contact.gif
-staroffice6.0/share/samples/english/texts/Homepage/contact.html
-staroffice6.0/share/samples/english/texts/Homepage/contacto.gif
-staroffice6.0/share/samples/english/texts/Homepage/coop.html
-staroffice6.0/share/samples/english/texts/Homepage/empty.html
-staroffice6.0/share/samples/english/texts/Homepage/hole.gif
-staroffice6.0/share/samples/english/texts/Homepage/home.gif
-staroffice6.0/share/samples/english/texts/Homepage/info.gif
-staroffice6.0/share/samples/english/texts/Homepage/info.html
-staroffice6.0/share/samples/english/texts/Homepage/leftbar.gif
-staroffice6.0/share/samples/english/texts/Homepage/motor.html
-staroffice6.0/share/samples/english/texts/Homepage/partnero.gif
-staroffice6.0/share/samples/english/texts/Homepage/partners.gif
-staroffice6.0/share/samples/english/texts/Homepage/partners.html
-staroffice6.0/share/samples/english/texts/Homepage/producto.gif
-staroffice6.0/share/samples/english/texts/Homepage/products.gif
-staroffice6.0/share/samples/english/texts/Homepage/products.html
-staroffice6.0/share/samples/english/texts/Homepage/question.gif
-staroffice6.0/share/samples/english/texts/Homepage/question.html
-staroffice6.0/share/samples/english/texts/Homepage/race.html
-staroffice6.0/share/samples/english/texts/Homepage/recar.sxc
-staroffice6.0/share/samples/english/texts/Homepage/soffice.gif
-staroffice6.0/share/samples/english/texts/Homepage/start.html
-staroffice6.0/share/samples/english/texts/Homepage/story.gif
-staroffice6.0/share/samples/english/texts/Homepage/title.gif
-staroffice6.0/share/samples/english/texts/IceCreamMenu.sxw
-staroffice6.0/share/samples/english/texts/Invitation.sxw
-staroffice6.0/share/samples/english/texts/JobAd.sxw
-staroffice6.0/share/samples/english/texts/LostDogNotice.sxw
-staroffice6.0/share/samples/english/texts/Promoletter.sxw
-staroffice6.0/share/template/english/educate/paper.stw
-staroffice6.0/share/template/english/educate/scientfc.sti
-staroffice6.0/share/template/english/educate/timetabl.stc
-staroffice6.0/share/template/english/finance/budget.stc
-staroffice6.0/share/template/english/finance/carfince.stc
-staroffice6.0/share/template/english/finance/carmoney.stc
-staroffice6.0/share/template/english/finance/journal.stc
-staroffice6.0/share/template/english/finance/loancalc.stc
-staroffice6.0/share/template/english/forms/expenses.stw
-staroffice6.0/share/template/english/forms/gnrlsale.stw
-staroffice6.0/share/template/english/forms/intrnlnt.stw
-staroffice6.0/share/template/english/forms/leporell.stw
-staroffice6.0/share/template/english/forms/notes1.stw
-staroffice6.0/share/template/english/forms/notes2.stw
-staroffice6.0/share/template/english/forms/phonenot.stw
-staroffice6.0/share/template/english/internal/html.stw
-staroffice6.0/share/template/english/internal/idxexample.sxw
-staroffice6.0/share/template/english/internal/url_transfer.htm
-staroffice6.0/share/template/english/layout/lyt-2000.sti
-staroffice6.0/share/template/english/layout/lyt-2001.sti
-staroffice6.0/share/template/english/layout/lyt-2002.sti
-staroffice6.0/share/template/english/layout/lyt-2003.sti
-staroffice6.0/share/template/english/layout/lyt-bluebox.sti
-staroffice6.0/share/template/english/layout/lyt-bluecorn.sti
-staroffice6.0/share/template/english/layout/lyt-bluegray.sti
-staroffice6.0/share/template/english/layout/lyt-bluejeans.sti
-staroffice6.0/share/template/english/layout/lyt-blueline.sti
-staroffice6.0/share/template/english/layout/lyt-bluesimple.sti
-staroffice6.0/share/template/english/layout/lyt-bluetitle.sti
-staroffice6.0/share/template/english/layout/lyt-border.sti
-staroffice6.0/share/template/english/layout/lyt-comic.sti
-staroffice6.0/share/template/english/layout/lyt-confetti.sti
-staroffice6.0/share/template/english/layout/lyt-cool.sti
-staroffice6.0/share/template/english/layout/lyt-darkblue.sti
-staroffice6.0/share/template/english/layout/lyt-deco.sti
-staroffice6.0/share/template/english/layout/lyt-film.sti
-staroffice6.0/share/template/english/layout/lyt-greenblue.sti
-staroffice6.0/share/template/english/layout/lyt-ice.sti
-staroffice6.0/share/template/english/layout/lyt-lightblue.sti
-staroffice6.0/share/template/english/layout/lyt-lightgrey.sti
-staroffice6.0/share/template/english/layout/lyt-liquid.sti
-staroffice6.0/share/template/english/layout/lyt-marble.sti
-staroffice6.0/share/template/english/layout/lyt-mondrian.sti
-staroffice6.0/share/template/english/layout/lyt-notes.sti
-staroffice6.0/share/template/english/layout/lyt-platine.sti
-staroffice6.0/share/template/english/layout/lyt-popcorn.sti
-staroffice6.0/share/template/english/layout/lyt-rings.sti
-staroffice6.0/share/template/english/layout/lyt-roses.sti
-staroffice6.0/share/template/english/layout/lyt-sand.sti
-staroffice6.0/share/template/english/layout/lyt-seablue.sti
-staroffice6.0/share/template/english/layout/lyt-space.sti
-staroffice6.0/share/template/english/layout/lyt-spheres.sti
-staroffice6.0/share/template/english/layout/lyt-stone.sti
-staroffice6.0/share/template/english/layout/lyt-stonehenge.sti
-staroffice6.0/share/template/english/layout/lyt-tile.sti
-staroffice6.0/share/template/english/layout/lyt-turqgrad.sti
-staroffice6.0/share/template/english/layout/lyt-undrwatr.sti
-staroffice6.0/share/template/english/layout/lyt-whiteblue.sti
-staroffice6.0/share/template/english/misc/book.stw
-staroffice6.0/share/template/english/misc/calendar.stc
-staroffice6.0/share/template/english/misc/cassette.std
-staroffice6.0/share/template/english/misc/cd-booklet.stw
-staroffice6.0/share/template/english/misc/cd.std
-staroffice6.0/share/template/english/misc/competition.stc
-staroffice6.0/share/template/english/misc/giftcert.stw
-staroffice6.0/share/template/english/misc/newslttr.stw
-staroffice6.0/share/template/english/misc/schedule.stc
-staroffice6.0/share/template/english/misc/tournamentall.stc
-staroffice6.0/share/template/english/misc/tournamentko.stc
-staroffice6.0/share/template/english/misc/zip.std
-staroffice6.0/share/template/english/officorr/faxclassic.stw
-staroffice6.0/share/template/english/officorr/faxmodern.stw
-staroffice6.0/share/template/english/officorr/ltrclassic.stw
-staroffice6.0/share/template/english/officorr/ltrmodern.stw
-staroffice6.0/share/template/english/officorr/memclassic.stw
-staroffice6.0/share/template/english/officorr/memmodern.stw
-staroffice6.0/share/template/english/offimisc/invoiceclassic.stw
-staroffice6.0/share/template/english/offimisc/invoicemodern.stw
-staroffice6.0/share/template/english/offimisc/minclassic.stw
-staroffice6.0/share/template/english/offimisc/minmodern.stw
-staroffice6.0/share/template/english/offimisc/pressclassic.stw
-staroffice6.0/share/template/english/offimisc/pressmodern.stw
-staroffice6.0/share/template/english/offimisc/report.stw
-staroffice6.0/share/template/english/personal/currvita.stw
-staroffice6.0/share/template/english/personal/envelope.stw
-staroffice6.0/share/template/english/personal/faxfrml.stw
-staroffice6.0/share/template/english/personal/faxpriv.stw
-staroffice6.0/share/template/english/personal/formalletter.stw
-staroffice6.0/share/template/english/personal/formalletterblue.stw
-staroffice6.0/share/template/english/personal/formalletterelegant.stw
-staroffice6.0/share/template/english/personal/formalletterinitials.stw
-staroffice6.0/share/template/english/personal/formalletterorange.stw
-staroffice6.0/share/template/english/personal/formalletterred.stw
-staroffice6.0/share/template/english/personal/formallettertypewriter.stw
-staroffice6.0/share/template/english/personal/formalletteryellow.stw
-staroffice6.0/share/template/english/personal/personalletter.stw
-staroffice6.0/share/template/english/personal/personalletterbordeaux.stw
-staroffice6.0/share/template/english/personal/personalletterfire.stw
-staroffice6.0/share/template/english/personal/personalletterorange.stw
-staroffice6.0/share/template/english/personal/personalletterrainbow.stw
-staroffice6.0/share/template/english/personal/personallettersmiley.stw
-staroffice6.0/share/template/english/personal/personalletterwatermark.stw
-staroffice6.0/share/template/english/personal/personalletteryellow.stw
-staroffice6.0/share/template/english/personal/visit.stw
-staroffice6.0/share/template/english/presnt/prs-analysis.sti
-staroffice6.0/share/template/english/presnt/prs-bad.sti
-staroffice6.0/share/template/english/presnt/prs-comrep.sti
-staroffice6.0/share/template/english/presnt/prs-concept.sti
-staroffice6.0/share/template/english/presnt/prs-finance.sti
-staroffice6.0/share/template/english/presnt/prs-ideas.sti
-staroffice6.0/share/template/english/presnt/prs-info.sti
-staroffice6.0/share/template/english/presnt/prs-market.sti
-staroffice6.0/share/template/english/presnt/prs-meeting.sti
-staroffice6.0/share/template/english/presnt/prs-newemplo.sti
-staroffice6.0/share/template/english/presnt/prs-novelty.sti
-staroffice6.0/share/template/english/presnt/prs-pres.sti
-staroffice6.0/share/template/english/presnt/prs-project.sti
-staroffice6.0/share/template/english/presnt/prs-prorep.sti
-staroffice6.0/share/template/english/presnt/prs-sell.sti
-staroffice6.0/share/template/english/presnt/prs-standard.sti
-staroffice6.0/share/template/english/presnt/prs-strategy.sti
-staroffice6.0/share/template/english/presnt/prs-team.sti
-staroffice6.0/share/template/english/presnt/prs-tech.sti
-staroffice6.0/share/template/english/presnt/prs-training.sti
-staroffice6.0/share/template/english/wizard/bitmap/Arrange_1.gif
-staroffice6.0/share/template/english/wizard/bitmap/Arrange_2.gif
-staroffice6.0/share/template/english/wizard/bitmap/Arrange_3.gif
-staroffice6.0/share/template/english/wizard/bitmap/Arrange_4.gif
-staroffice6.0/share/template/english/wizard/bitmap/Arrange_5.gif
-staroffice6.0/share/template/english/wizard/bitmap/FormWizard_1.bmp
-staroffice6.0/share/template/english/wizard/bitmap/FormWizard_2.bmp
-staroffice6.0/share/template/english/wizard/bitmap/Import_1.bmp
-staroffice6.0/share/template/english/wizard/bitmap/Import_3.bmp
-staroffice6.0/share/template/english/wizard/bitmap/Import_4.bmp
-staroffice6.0/share/template/english/wizard/bitmap/MS-Import_2-1.bmp
-staroffice6.0/share/template/english/wizard/bitmap/MS-Import_2-2.bmp
-staroffice6.0/share/template/english/wizard/bitmap/MS-Import_2-3.bmp
-staroffice6.0/share/template/english/wizard/bitmap/XML-Import_2-1.bmp
-staroffice6.0/share/template/english/wizard/bitmap/XML-Import_2-2.bmp
-staroffice6.0/share/template/english/wizard/bitmap/XML-Import_2-3.bmp
-staroffice6.0/share/template/english/wizard/bitmap/XML-Import_2-4.bmp
-staroffice6.0/share/template/english/wizard/bitmap/brd.bmp
-staroffice6.0/share/template/english/wizard/bitmap/cancel_down.bmp
-staroffice6.0/share/template/english/wizard/bitmap/cancel_up.bmp
-staroffice6.0/share/template/english/wizard/bitmap/denmark.bmp
-staroffice6.0/share/template/english/wizard/bitmap/down.bmp
-staroffice6.0/share/template/english/wizard/bitmap/end.bmp
-staroffice6.0/share/template/english/wizard/bitmap/euro_1.bmp
-staroffice6.0/share/template/english/wizard/bitmap/euro_2.bmp
-staroffice6.0/share/template/english/wizard/bitmap/euro_3.bmp
-staroffice6.0/share/template/english/wizard/bitmap/france.bmp
-staroffice6.0/share/template/english/wizard/bitmap/italia.bmp
-staroffice6.0/share/template/english/wizard/bitmap/nedland.bmp
-staroffice6.0/share/template/english/wizard/bitmap/okay_down.bmp
-staroffice6.0/share/template/english/wizard/bitmap/okay_up.bmp
-staroffice6.0/share/template/english/wizard/bitmap/polska.bmp
-staroffice6.0/share/template/english/wizard/bitmap/portugal.bmp
-staroffice6.0/share/template/english/wizard/bitmap/russia.bmp
-staroffice6.0/share/template/english/wizard/bitmap/spain.bmp
-staroffice6.0/share/template/english/wizard/bitmap/sweden.bmp
-staroffice6.0/share/template/english/wizard/bitmap/up.bmp
-staroffice6.0/share/template/english/wizard/bitmap/usa.bmp
-staroffice6.0/share/template/english/wizard/bitmap/webwizard.bmp
-staroffice6.0/share/template/english/wizard/styles/black_white.stc
-staroffice6.0/share/template/english/wizard/styles/blackberry.stc
-staroffice6.0/share/template/english/wizard/styles/default.stc
-staroffice6.0/share/template/english/wizard/styles/diner.stc
-staroffice6.0/share/template/english/wizard/styles/fall.stc
-staroffice6.0/share/template/english/wizard/styles/glacier.stc
-staroffice6.0/share/template/english/wizard/styles/green_grapes.stc
-staroffice6.0/share/template/english/wizard/styles/jeans.stc
-staroffice6.0/share/template/english/wizard/styles/marine.stc
-staroffice6.0/share/template/english/wizard/styles/millennium.stc
-staroffice6.0/share/template/english/wizard/styles/nature.stc
-staroffice6.0/share/template/english/wizard/styles/neon.stc
-staroffice6.0/share/template/english/wizard/styles/night.stc
-staroffice6.0/share/template/english/wizard/styles/nostalgic.stc
-staroffice6.0/share/template/english/wizard/styles/pastell.stc
-staroffice6.0/share/template/english/wizard/styles/pool.stc
-staroffice6.0/share/template/english/wizard/styles/pumpkin.stc
-staroffice6.0/share/template/english/wizard/styles/sunstyle.stc
-staroffice6.0/share/template/english/wizard/styles/xos.stc
-staroffice6.0/share/template/english/wizard/web/cnt-album.stw
-staroffice6.0/share/template/english/wizard/web/cnt-bilingual.stw
-staroffice6.0/share/template/english/wizard/web/cnt-chapters.stw
-staroffice6.0/share/template/english/wizard/web/cnt-empty.stw
-staroffice6.0/share/template/english/wizard/web/cnt-fixonecol.stw
-staroffice6.0/share/template/english/wizard/web/cnt-fixtwocol.stw
-staroffice6.0/share/template/english/wizard/web/cnt-formcontact.stw
-staroffice6.0/share/template/english/wizard/web/cnt-formcustomer.stw
-staroffice6.0/share/template/english/wizard/web/cnt-formfix.stw
-staroffice6.0/share/template/english/wizard/web/cnt-formvar.stw
-staroffice6.0/share/template/english/wizard/web/cnt-list.stw
-staroffice6.0/share/template/english/wizard/web/cnt-onepic.stw
-staroffice6.0/share/template/english/wizard/web/cnt-standard.stw
-staroffice6.0/share/template/english/wizard/web/cnt-twotitles.stw
-staroffice6.0/share/template/english/wizard/web/stl-banana.stw
-staroffice6.0/share/template/english/wizard/web/stl-blkjeans.stw
-staroffice6.0/share/template/english/wizard/web/stl-blue.stw
-staroffice6.0/share/template/english/wizard/web/stl-blueblock.stw
-staroffice6.0/share/template/english/wizard/web/stl-bluejeans.stw
-staroffice6.0/share/template/english/wizard/web/stl-fieryred.stw
-staroffice6.0/share/template/english/wizard/web/stl-hightech.stw
-staroffice6.0/share/template/english/wizard/web/stl-mint.stw
-staroffice6.0/share/template/english/wizard/web/stl-music.stw
-staroffice6.0/share/template/english/wizard/web/stl-nostalg.stw
-staroffice6.0/share/template/english/wizard/web/stl-orange.stw
-staroffice6.0/share/template/english/wizard/web/stl-petrol.stw
-staroffice6.0/share/template/english/wizard/web/stl-seventies.stw
-staroffice6.0/share/template/english/wizard/web/stl-standard.stw
-staroffice6.0/share/template/english/wizard/web/stl-strwbryice.stw
-staroffice6.0/share/template/english/wizard/web/stl-sun.stw
-staroffice6.0/share/template/english/wizard/web/stl-tracks.stw
-staroffice6.0/share/template/english/wizard/web/stl-turquoise.stw
-staroffice6.0/share/template/english/wizard/web/stl-wetblue.stw
-staroffice6.0/share/template/english/wizard/wizagn1.stw
-staroffice6.0/share/template/english/wizard/wizagn2.stw
-staroffice6.0/share/template/english/wizard/wizagn3.stw
-staroffice6.0/share/template/english/wizard/wizbrf1.stw
-staroffice6.0/share/template/english/wizard/wizbrf2.stw
-staroffice6.0/share/template/english/wizard/wizbrf3.stw
-staroffice6.0/share/template/english/wizard/wizfax1.stw
-staroffice6.0/share/template/english/wizard/wizfax2.stw
-staroffice6.0/share/template/english/wizard/wizfax3.stw
-staroffice6.0/share/template/english/wizard/wizmem1.stw
-staroffice6.0/share/template/english/wizard/wizmem2.stw
-staroffice6.0/share/template/english/wizard/wizmem3.stw
-staroffice6.0/share/wordbook/english/soffice.dic
-staroffice6.0/share/wordbook/english/sun.dic
-staroffice6.0/user/autotext/english/mytexts.bau
-staroffice6.0/user/basic/dialogs.xli
-staroffice6.0/user/basic/script.xli
-staroffice6.0/user/config/arrowhd.soe
-staroffice6.0/user/config/autotbl.fmt
-staroffice6.0/user/config/classic.sog
-staroffice6.0/user/config/cmyk.soc
-staroffice6.0/user/config/dbtitle.rdb
-staroffice6.0/user/config/gallery.soc
-staroffice6.0/user/config/hatching.soh
-staroffice6.0/user/config/html.soc
-staroffice6.0/user/config/modern.sog
-staroffice6.0/user/config/palette.soc
-staroffice6.0/user/config/standard.sob
-staroffice6.0/user/config/standard.soc
-staroffice6.0/user/config/standard.sod
-staroffice6.0/user/config/standard.soe
-staroffice6.0/user/config/standard.sog
-staroffice6.0/user/config/standard.soh
-staroffice6.0/user/config/styles.sod
-staroffice6.0/user/config/web.soc
-staroffice6.0/user/database/biblio/biblio.dbf
-staroffice6.0/user/gallery/sg100.sdv
-staroffice6.0/user/gallery/sg100.thm
-staroffice6.0/user/gallery/sg30.sdv
-staroffice6.0/user/gallery/sg30.thm
-@dirrm staroffice6.0/help/en/smath.idx
-@dirrm staroffice6.0/help/en/sdraw.idx
-@dirrm staroffice6.0/help/en/simpress.idx
-@dirrm staroffice6.0/help/en/scalc.idx
-@dirrm staroffice6.0/help/en/swriter.idx
-@dirrm staroffice6.0/help/en/schart.idx
-@dirrm staroffice6.0/help/en/sbasic.idx
-@dirrm staroffice6.0/help/en
-@dirrm staroffice6.0/help
-@dirrm staroffice6.0/user/config.orig/registry/instance/org/openoffice/ucb
-@dirrm staroffice6.0/user/config.orig/registry/instance/org/openoffice/Office
-@dirrm staroffice6.0/user/config.orig/registry/instance/org/openoffice
-@dirrm staroffice6.0/user/config.orig/registry/instance/org
-@dirrm staroffice6.0/user/config.orig/registry/instance
-@dirrm staroffice6.0/user/config.orig/registry
-@dirrm staroffice6.0/user/config.orig
-@dirrm staroffice6.0/user/plugin
-@dirrm staroffice6.0/user/backup
-@dirrm staroffice6.0/user/wordbook
-@dirrm staroffice6.0/user/psprint/fontmetric
-@dirrm staroffice6.0/user/psprint/driver
-@dirrm staroffice6.0/user/psprint
-@dirrm staroffice6.0/user/store
-@dirrm staroffice6.0/user/temp
-@dirrm staroffice6.0/user/autocorr
-@dirrm staroffice6.0/user/template
-@dirrm staroffice6.0/user/config/registry/instance/org/openoffice/ucb
-@dirrm staroffice6.0/user/config/registry/instance/org/openoffice/Office
-@dirrm staroffice6.0/user/config/registry/instance/org/openoffice
-@dirrm staroffice6.0/user/config/registry/instance/org
-@dirrm staroffice6.0/user/config/registry/instance
-@dirrm staroffice6.0/user/config/registry
-@dirrm staroffice6.0/user/config
-@dirrm staroffice6.0/user/basic
-@dirrm staroffice6.0/user/gallery
-@dirrm staroffice6.0/user/database/biblio
-@dirrm staroffice6.0/user/database
-@dirrm staroffice6.0/user/autotext/english
-@dirrm staroffice6.0/user/autotext
-@dirrm staroffice6.0/user
-@dirrm staroffice6.0/share/config/symbol
-@dirrm staroffice6.0/share/config/registry/template/org/openoffice/ucb
-@dirrm staroffice6.0/share/config/registry/template/org/openoffice/Office
-@dirrm staroffice6.0/share/config/registry/template/org/openoffice
-@dirrm staroffice6.0/share/config/registry/template/org
-@dirrm staroffice6.0/share/config/registry/template
-@dirrm staroffice6.0/share/config/registry/instance/org/openoffice/ucb
-@dirrm staroffice6.0/share/config/registry/instance/org/openoffice/Office
-@dirrm staroffice6.0/share/config/registry/instance/org/openoffice
-@dirrm staroffice6.0/share/config/registry/instance/org
-@dirrm staroffice6.0/share/config/registry/instance
-@dirrm staroffice6.0/share/config/registry
-@dirrm staroffice6.0/share/config/webcast
-@dirrm staroffice6.0/share/config
-@dirrm staroffice6.0/share/kde/icons
-@dirrm staroffice6.0/share/kde/net/applnk/StarOffice 6.0/information and setup
-@dirrm staroffice6.0/share/kde/net/applnk/StarOffice 6.0/auto pilots
-@dirrm staroffice6.0/share/kde/net/applnk/StarOffice 6.0/other
-@dirrm staroffice6.0/share/kde/net/applnk/StarOffice 6.0
-@dirrm staroffice6.0/share/kde/net/applnk
-@dirrm staroffice6.0/share/kde/net/mimelnk/application
-@dirrm staroffice6.0/share/kde/net/mimelnk
-@dirrm staroffice6.0/share/kde/net
-@dirrm staroffice6.0/share/kde
-@dirrm staroffice6.0/share/gnome/icons
-@dirrm staroffice6.0/share/gnome/net/auto pilots
-@dirrm staroffice6.0/share/gnome/net/other
-@dirrm staroffice6.0/share/gnome/net/information and setup
-@dirrm staroffice6.0/share/gnome/net
-@dirrm staroffice6.0/share/gnome
-@dirrm staroffice6.0/share/dict
-@dirrm staroffice6.0/share/samples/english/formulas
-@dirrm staroffice6.0/share/samples/english/drawings
-@dirrm staroffice6.0/share/samples/english/presentations
-@dirrm staroffice6.0/share/samples/english/spreadsheets
-@dirrm staroffice6.0/share/samples/english/texts/Homepage
-@dirrm staroffice6.0/share/samples/english/texts/Chapters
-@dirrm staroffice6.0/share/samples/english/texts
-@dirrm staroffice6.0/share/samples/english/menu
-@dirrm staroffice6.0/share/samples/english
-@dirrm staroffice6.0/share/samples
-@dirrm staroffice6.0/share/plugin
-@dirrm staroffice6.0/share/cde/other
-@dirrm staroffice6.0/share/cde/auto pilots
-@dirrm staroffice6.0/share/cde/information and setup
-@dirrm staroffice6.0/share/cde
-@dirrm staroffice6.0/share/autocorr
-@dirrm staroffice6.0/share/psprint/driver
-@dirrm staroffice6.0/share/psprint/fontmetric
-@dirrm staroffice6.0/share/psprint
-@dirrm staroffice6.0/share/migration
-@dirrm staroffice6.0/share/autotext/english
-@dirrm staroffice6.0/share/autotext
-@dirrm staroffice6.0/share/wordbook/english
-@dirrm staroffice6.0/share/wordbook
-@dirrm staroffice6.0/share/gallery/troubleshooting
-@dirrm staroffice6.0/share/gallery/education
-@dirrm staroffice6.0/share/gallery/clima
-@dirrm staroffice6.0/share/gallery/time
-@dirrm staroffice6.0/share/gallery/people
-@dirrm staroffice6.0/share/gallery/officeart
-@dirrm staroffice6.0/share/gallery/navi-2d
-@dirrm staroffice6.0/share/gallery/keyboard
-@dirrm staroffice6.0/share/gallery/finances
-@dirrm staroffice6.0/share/gallery/emoicons
-@dirrm staroffice6.0/share/gallery/computer
-@dirrm staroffice6.0/share/gallery/communic
-@dirrm staroffice6.0/share/gallery/calendar
-@dirrm staroffice6.0/share/gallery/balloons
-@dirrm staroffice6.0/share/gallery/arrows
-@dirrm staroffice6.0/share/gallery/sounds
-@dirrm staroffice6.0/share/gallery/www-anim
-@dirrm staroffice6.0/share/gallery/flags
-@dirrm staroffice6.0/share/gallery/www-graf
-@dirrm staroffice6.0/share/gallery/rulers
-@dirrm staroffice6.0/share/gallery/surface
-@dirrm staroffice6.0/share/gallery/photos
-@dirrm staroffice6.0/share/gallery/symbols
-@dirrm staroffice6.0/share/gallery/bullets
-@dirrm staroffice6.0/share/gallery/www-back
-@dirrm staroffice6.0/share/gallery/htmlexpo
-@dirrm staroffice6.0/share/gallery
-@dirrm staroffice6.0/share/basic/Euro
-@dirrm staroffice6.0/share/basic/ImportWizard
-@dirrm staroffice6.0/share/basic/Tools
-@dirrm staroffice6.0/share/basic/Gimmicks
-@dirrm staroffice6.0/share/basic/Template
-@dirrm staroffice6.0/share/basic/WebWizard
-@dirrm staroffice6.0/share/basic/Schedule
-@dirrm staroffice6.0/share/basic/FormWizard
-@dirrm staroffice6.0/share/basic
-@dirrm staroffice6.0/share/fonts/truetype
-@dirrm staroffice6.0/share/fonts
-@dirrm staroffice6.0/share/config/symbol
-@dirrm staroffice6.0/share/config/registry/cache/instance/org/openoffice/ucb
-@dirrm staroffice6.0/share/config/registry/cache/instance/org/openoffice/Office
-@dirrm staroffice6.0/share/config/registry/cache/instance/org/openoffice
-@dirrm staroffice6.0/share/config/registry/cache/instance/org
-@dirrm staroffice6.0/share/config/registry/cache/instance
-@dirrm staroffice6.0/share/config/registry/cache
-@dirrm staroffice6.0/share/config/registry/template/org/openoffice/ucb
-@dirrm staroffice6.0/share/config/registry/template/org/openoffice/Office
-@dirrm staroffice6.0/share/config/registry/template/org/openoffice
-@dirrm staroffice6.0/share/config/registry/template/org
-@dirrm staroffice6.0/share/config/registry/template
-@dirrm staroffice6.0/share/config/registry/instance/org/openoffice/Webtop
-@dirrm staroffice6.0/share/config/registry/instance/org/openoffice/ucb
-@dirrm staroffice6.0/share/config/registry/instance/org/openoffice/Office
-@dirrm staroffice6.0/share/config/registry/instance/org/openoffice
-@dirrm staroffice6.0/share/config/registry/instance/org
-@dirrm staroffice6.0/share/config/registry/instance
-@dirrm staroffice6.0/share/config/registry
-@dirrm staroffice6.0/share/config/webcast
-@dirrm staroffice6.0/share/config
-@dirrm staroffice6.0/share/dtd/math/1_01
-@dirrm staroffice6.0/share/dtd/math
-@dirrm staroffice6.0/share/dtd/officedocument/1_0
-@dirrm staroffice6.0/share/dtd/officedocument
-@dirrm staroffice6.0/share/dtd
-@dirrm staroffice6.0/share/template/english/presnt
-@dirrm staroffice6.0/share/template/english/layout
-@dirrm staroffice6.0/share/template/english/finance
-@dirrm staroffice6.0/share/template/english/forms
-@dirrm staroffice6.0/share/template/english/educate
-@dirrm staroffice6.0/share/template/english/misc
-@dirrm staroffice6.0/share/template/english/personal
-@dirrm staroffice6.0/share/template/english/offimisc
-@dirrm staroffice6.0/share/template/english/officorr
-@dirrm staroffice6.0/share/template/english/internal
-@dirrm staroffice6.0/share/template/english/wizard/web
-@dirrm staroffice6.0/share/template/english/wizard/styles
-@dirrm staroffice6.0/share/template/english/wizard/bitmap
-@dirrm staroffice6.0/share/template/english/wizard
-@dirrm staroffice6.0/share/template/english
-@dirrm staroffice6.0/share/template
-@dirrm staroffice6.0/share
-@dirrm staroffice6.0/program/components
-@dirrm staroffice6.0/program/addin/source
-@dirrm staroffice6.0/program/addin
-@dirrm staroffice6.0/program/resource
-@dirrm staroffice6.0/program/classes
-@dirrm staroffice6.0/program/filter
-@dirrm staroffice6.0/program
-@dirrm staroffice6.0
diff --git a/editors/tamago-emacs21/Makefile b/editors/tamago-emacs21/Makefile
deleted file mode 100644
index c3634610f352..000000000000
--- a/editors/tamago-emacs21/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# New ports collection makefile for:	tamago
-# Date created:		6 March 2000
-# Whom:			tetsushi NAKAI <nakai@tsl.pe.u-tokyo.ac.jp>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	tamago
-PORTVERSION=	4.0.6
-CATEGORIES=	editors elisp
-MASTER_SITES=	ftp://ftp.m17n.org/pub/tamago/ \
-		ftp://ftp.kddlabs.co.jp/Japan/m17n.org/tamago/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-
-PATCH_SITES=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	kuriyama
-PATCHFILES=	tamago-${PORTVERSION}-20011028.patch.gz
-PATCH_DIST_STRIP=	-p1
-
-MAINTAINER?=	ports@FreeBSD.org
-COMMENT?=	The Multilingual Input Method - Egg V4
-
-USE_REINPLACE=	yes
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-
-EMACS_PORT_NAME?=	emacs21
-
-ELISPDIR=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
-PLIST_SUB=	ELISPDIR="${EMACS_LIBDIR_WITH_VER}/site-lisp"
-
-pre-configure:
-	@${REINPLACE_CMD} -e 's|emacs/site-lisp|${EMACS_NAME}/${EMACS_VER}/site-lisp|g' \
-	    ${WRKSRC}/configure
-
-.include <bsd.port.mk>
diff --git a/editors/tamago-emacs21/distinfo b/editors/tamago-emacs21/distinfo
deleted file mode 100644
index b74247d93f9e..000000000000
--- a/editors/tamago-emacs21/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (tamago-4.0.6.tar.gz) = e1ebac3ec05b2f9c274b831fd64ed7b1
-MD5 (tamago-4.0.6-20011028.patch.gz) = 2f3c02bba2dd3b9d6d039f568a4add1c
diff --git a/editors/tamago-emacs21/pkg-descr b/editors/tamago-emacs21/pkg-descr
deleted file mode 100644
index 4d1c4020a85d..000000000000
--- a/editors/tamago-emacs21/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-The Multilingual Input Method - Egg V4
-
-This enables you to input Multilingual Characters.
-
-Tamago is only coded by emacs lisp.
-
-This input method is working with various translation servers 
-(i.e. jserver, cserver, tserver, Wnn6, SJ3 ver 1 and ver 2,
-      cannaserver and wxgserver).
-
-WWW: http://www.m17n.org/tamago/
diff --git a/editors/tamago-emacs21/pkg-message b/editors/tamago-emacs21/pkg-message
deleted file mode 100644
index 6d3011f40a62..000000000000
--- a/editors/tamago-emacs21/pkg-message
+++ /dev/null
@@ -1,12 +0,0 @@
-Enabling Tamago
-=================
-  You can now tell your users to enable Tamago with Emacs 20.5 by adding
-
-  If you use with Asian Languages, select suitable languages, such as
-
-Japanese:	(set-language-environment "Japanese")
-Korean:		(set-language-environment "Korean")
-Chinese-GB:	(set-language-environment "Chinese-GB")
-Chinese-CNS:	(set-language-environment "Chinese-CNS")
-
-add to their `~/.emacs' file.
diff --git a/editors/tamago-emacs21/pkg-plist b/editors/tamago-emacs21/pkg-plist
deleted file mode 100644
index 69de85d67686..000000000000
--- a/editors/tamago-emacs21/pkg-plist
+++ /dev/null
@@ -1,65 +0,0 @@
-%%ELISPDIR%%/egg/egg-cnv.el
-%%ELISPDIR%%/egg/egg-cnv.elc
-%%ELISPDIR%%/egg/egg-com.el
-%%ELISPDIR%%/egg/egg-com.elc
-%%ELISPDIR%%/egg/egg-edep.el
-%%ELISPDIR%%/egg/egg-edep.elc
-%%ELISPDIR%%/egg/egg-mlh.el
-%%ELISPDIR%%/egg/egg-mlh.elc
-%%ELISPDIR%%/egg/egg-sim.el
-%%ELISPDIR%%/egg/egg-sim.elc
-%%ELISPDIR%%/egg/egg-util.el
-%%ELISPDIR%%/egg/egg-util.elc
-%%ELISPDIR%%/egg/egg.el
-%%ELISPDIR%%/egg/egg.elc
-%%ELISPDIR%%/egg/egg/canna.el
-%%ELISPDIR%%/egg/egg/canna.elc
-%%ELISPDIR%%/egg/egg/cannarpc.el
-%%ELISPDIR%%/egg/egg/cannarpc.elc
-%%ELISPDIR%%/egg/egg/sj3.el
-%%ELISPDIR%%/egg/egg/sj3.elc
-%%ELISPDIR%%/egg/egg/sj3rpc.el
-%%ELISPDIR%%/egg/egg/sj3rpc.elc
-%%ELISPDIR%%/egg/egg/wnn.el
-%%ELISPDIR%%/egg/egg/wnn.elc
-%%ELISPDIR%%/egg/egg/wnnrpc.el
-%%ELISPDIR%%/egg/egg/wnnrpc.elc
-%%ELISPDIR%%/egg/eggrc
-%%ELISPDIR%%/egg/its-keydef.el
-%%ELISPDIR%%/egg/its-keydef.elc
-%%ELISPDIR%%/egg/its.el
-%%ELISPDIR%%/egg/its.elc
-%%ELISPDIR%%/egg/its/ascii.el
-%%ELISPDIR%%/egg/its/ascii.elc
-%%ELISPDIR%%/egg/its/aynu.el
-%%ELISPDIR%%/egg/its/aynu.elc
-%%ELISPDIR%%/egg/its/bixing.el
-%%ELISPDIR%%/egg/its/bixing.elc
-%%ELISPDIR%%/egg/its/erpin.el
-%%ELISPDIR%%/egg/its/erpin.elc
-%%ELISPDIR%%/egg/its/hangul.el
-%%ELISPDIR%%/egg/its/hangul.elc
-%%ELISPDIR%%/egg/its/hankata.el
-%%ELISPDIR%%/egg/its/hankata.elc
-%%ELISPDIR%%/egg/its/hira.el
-%%ELISPDIR%%/egg/its/hira.elc
-%%ELISPDIR%%/egg/its/jeonkak.el
-%%ELISPDIR%%/egg/its/jeonkak.elc
-%%ELISPDIR%%/egg/its/kata.el
-%%ELISPDIR%%/egg/its/kata.elc
-%%ELISPDIR%%/egg/its/pinyin.el
-%%ELISPDIR%%/egg/its/pinyin.elc
-%%ELISPDIR%%/egg/its/quanjiao.el
-%%ELISPDIR%%/egg/its/quanjiao.elc
-%%ELISPDIR%%/egg/its/thai.el
-%%ELISPDIR%%/egg/its/thai.elc
-%%ELISPDIR%%/egg/its/zenkaku.el
-%%ELISPDIR%%/egg/its/zenkaku.elc
-%%ELISPDIR%%/egg/its/zhuyin.el
-%%ELISPDIR%%/egg/its/zhuyin.elc
-%%ELISPDIR%%/egg/leim-list.el
-%%ELISPDIR%%/egg/menudiag.el
-%%ELISPDIR%%/egg/menudiag.elc
-@dirrm %%ELISPDIR%%/egg/egg
-@dirrm %%ELISPDIR%%/egg/its
-@dirrm %%ELISPDIR%%/egg
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
deleted file mode 100644
index 2cf8931b19ad..000000000000
--- a/editors/xemacs/Makefile
+++ /dev/null
@@ -1,124 +0,0 @@
-# New ports collection makefile for:	X-Emacs
-# Date created:		25 Oct 2001
-# Whom:			Gary Jennejohn (gj@FreeBSD.org)
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xemacs-devel
-PORTVERSION=	${XEMACS_VER}
-CATEGORIES+=	editors
-MASTER_SITES=	${MASTER_SITE_XEMACS}
-MASTER_SITE_SUBDIR=	xemacs-${XEMACS_REL}
-DISTNAME=	xemacs-${XEMACS_VER}
-DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX} ${DISTNAME}-elc${EXTRACT_SUFX} ${DISTNAME}-info${EXTRACT_SUFX}
-DIST_SUBDIR=	xemacs
-
-MAINTAINER=	gj@FreeBSD.org
-COMMENT=	This port tracks the development (GAMMA) version of the XEmacs text editor
-
-RUN_DEPENDS+=	${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
-.if !defined(WITHOUT_X11)
-LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.5:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		compface.1:${PORTSDIR}/mail/faces
-USE_XLIB=	yes
-USE_XPM=	yes
-.endif
-
-XEMACS_REL=	21.4
-XEMACS_VER=	21.4.12
-XEMACS_ARCH=	${CONFIGURE_TARGET}
-
-STRIP=
-USE_AUTOCONF_VER=213
-CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
-
-CONFIGURE_ARGS?=--with-clash-detection \
-		--with-sound=native,nonas,noesd \
-		--site-includes=${LOCALBASE}/include \
-		--site-libraries=${LOCALBASE}/lib \
-		--with-ldap=no \
-		--with-site-lisp \
-		--with-database=berkdb \
-		${WITH_XFACE} ${WITH_DIALOGS} ${WITH_OFFIX} ${WITH_GTK}
-MAKE_ARGS=	prefix=${PREFIX}
-MAN1=		ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \
-		gnuserv.1 xemacs.1
-ALL_TARGET=	all dist
-
-PLIST_SUB=	XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH}
-
-pre-fetch:
-.if !defined(WANT_GTK)
-	@${ECHO_MSG} "If you want to use GTK, please set the environment variable WANT_GTK "
-	@${ECHO_MSG} "and recompile."
-.endif
-.if defined(HAVE_MOTIF)
-.if !defined(MOTIF_STATIC)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "If your MOTIF library is actually lesstif, you might occasionally"
-	@${ECHO_MSG} "experience locked-up frames."
-	@${ECHO_MSG} "In this case, set the environment variable MOTIF_STATIC and recompile, "
-	@${ECHO_MSG} "which will force the use of athena widgets for dialogs."
-.endif
-.if !defined(WITHOUT_X11)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Set the environment variable WITHOUT_X11 if you "
-	@${ECHO_MSG} "do not want to use X11."
-CONFIG_ARGS+= --with-png=yes --with-tiff=yes
-.endif
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS+=	--without-x11
-.endif
-
-# hack to avoid shipping binaries linked with Motif
-.if defined(MOTIF_STATIC)
-WITH_DIALOGS=	--with-dialogs=athena
-.endif
-
-.if defined(WITH_XAW3D)
-LIB_DEPENDS+=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
-.endif
-
-.if defined(WANT_GTK)
-WITH_GTK=	--with-gtk=yes \
-		--with-xpm=no
-USE_GNOMENG=	yes
-USE_GNOME=	gtk12
-USE_XPM=	no
-.endif
-
-# Drop faces (libcompface) and offix (libDnd) if building package,
-# autodetect otherwise
-.if defined(PACKAGE_BUILDING)
-WITH_XFACE?=	--with-xface=no
-WITH_OFFIX?=	--with-offix=no
-.endif
-.endif
-
-# fix .so references in a few man pages
-pre-configure::
-.for file in etc/ctags.1 etc/gnuattach.1 etc/gnuclient.1 etc/gnudoit.1
-	@${SED} -e 's/\.1/&.gz/' ${WRKSRC}/${file} > ${WRKDIR}/tmp_zot
-	@${MV} ${WRKDIR}/tmp_zot ${WRKSRC}/${file}
-.endfor
-
-post-install::
-.for file in b2m ctags ellcc etags gnuclient xemacs-${XEMACS_VER}
-	strip ${PREFIX}/bin/${file}
-.endfor
-# For some reason install no longer makes ${PREFIX}/lib/xemacs/site-lisp.
-# Do what PLIST does for pkg_add.
-	${MKDIR} ${PREFIX}/lib/xemacs/site-lisp
-	${CHMOD} 755 ${PREFIX}/lib/xemacs/site-lisp
-	${RM} -f ${PREFIX}/bin/send-pr
-.if defined(WANT_GTK)
-	@${ECHO_MSG} "Please be aware that GTK support is buggy. Do not report bugs to"
-	@${ECHO_MSG} "the maintainer."
-	@${ECHO_MSG} "Please also be aware that the package's name was automagically changed"
-	@${ECHO_MSG} "to ${PORTNAME}${PKGNAMESUFFIX}-${XEMACS_VER}."
-.endif
-
-.include <bsd.port.mk>
diff --git a/editors/xemacs/distinfo b/editors/xemacs/distinfo
deleted file mode 100644
index 656334adab9c..000000000000
--- a/editors/xemacs/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xemacs/xemacs-21.4.12-src.tar.gz) = 2e2c1502b1eb76af094108988c626a0e
-MD5 (xemacs/xemacs-21.4.12-elc.tar.gz) = 6e0931158967f433e46546595bf72904
-MD5 (xemacs/xemacs-21.4.12-info.tar.gz) = d31805fc1cff0337d40b77422ba86923
diff --git a/editors/xemacs/files/patch-aa b/editors/xemacs/files/patch-aa
deleted file mode 100644
index 45fbafd60623..000000000000
--- a/editors/xemacs/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib-src/Makefile.in.in~	Tue Feb  8 11:54:39 2000
-+++ lib-src/Makefile.in.in	Thu Sep 21 22:26:13 2000
-@@ -224,7 +224,7 @@
- 	(cd ${archlibdir} && \
- 	 $(RM) ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS})
- 
--.PHONY: mostlyclean clean distclean realclean extraclean
-+.PHONY: mostlyclean clean distclean realclean extraclean ${archlibdir}
- mostlyclean:
- 	$(RM) *.o *.i core
- clean: mostlyclean
diff --git a/editors/xemacs/files/patch-af b/editors/xemacs/files/patch-af
deleted file mode 100644
index c0c55cbf0aef..000000000000
--- a/editors/xemacs/files/patch-af
+++ /dev/null
@@ -1,53 +0,0 @@
---- configure.in.orig	Wed Jul 25 09:39:21 2001
-+++ configure.in	Sun Oct  7 23:20:24 2001
-@@ -1098,6 +1098,7 @@
- dnl Straightforward OS determination
- case "$canonical" in
-   *-*-linux*    ) opsys=linux ;;
-+  *-*-freebsd* ) opsys=freebsd ;;
-   *-*-netbsd*   ) opsys=netbsd ;;
-   *-*-openbsd*	) opsys=openbsd ;;
-   *-*-nextstep* ) opsys=nextstep ;;
-@@ -3661,21 +3662,24 @@
-     test "$ac_cv_func_crypt" != "yes" && { AC_CHECK_LIB(crypt, crypt) }
-   fi
-   dnl Back to our regularly scheduled wnn hunting
--  if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
--    AC_CHECK_LIB(wnn,jl_dic_list_e,libwnn=wnn,
--      AC_CHECK_LIB(wnn4,jl_dic_list_e,libwnn=wnn4,
--	AC_CHECK_LIB(wnn6,jl_dic_list_e,libwnn=wnn6,
--	  AC_CHECK_LIB(wnn6_fromsrc,dic_list_e,libwnn=wnn6_fromsrc,with_wnn=no))))
-+  if test "$with_wnn6" = "yes"; then
-+    AC_CHECK_LIB(wnn6,jl_fi_dic_list_e,libwnn=wnn6,
-+      AC_CHECK_LIB(wnn6_fromsrc,jl_fi_dic_list_e,libwnn=wnn6_fromsrc,
-+	AC_CHECK_LIB(wnn,jl_fi_dic_list_e,libwnn=wnn, [with_wnn6=no; with_wnn=no])))
-+  else
-+    if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
-+      AC_CHECK_LIB(wnn,jl_dic_list_e,libwnn=wnn,
-+	AC_CHECK_LIB(wnn4,jl_dic_list_e,libwnn=wnn4,
-+	  AC_CHECK_LIB(wnn6,jl_fi_dic_list_e,[libwnn=wnn6; with_wnn6=yes],
-+	    AC_CHECK_LIB(wnn6_fromsrc,jl_fi_dic_list_e, [libwnn=wnn6_fromsrc; with_wnn6=yes],with_wnn=no))))
-+    fi
-   fi
-   test -z "$with_wnn" && with_wnn=yes
-   if test "$with_wnn" = "yes"; then
-     AC_DEFINE(HAVE_WNN)
-     XE_PREPEND(-l$libwnn, libs_x)
-     XE_ADD_OBJS(mule-wnnfns.o)
--    if test "$with_wnn6" != "no"; then
--      AC_CHECK_LIB($libwnn, jl_fi_dic_list, with_wnn6=yes)
--      test "$with_wnn6" = "yes" && AC_DEFINE(WNN6)
--    fi
-+    test "$with_wnn6" = "yes" && AC_DEFINE(WNN6)
-   fi
- 
-   dnl Autodetect canna
-@@ -4257,7 +4261,7 @@
- dnl Check for Berkeley DB.
- if test "$with_database_berkdb" != "no"; then
-   AC_MSG_CHECKING(for Berkeley db.h)
--  for header in "db/db.h" "db.h"; do
-+  for header in "/usr/include/db.h" "db/db.h" "db.h"; do
-     AC_TRY_COMPILE([
- #include <stdlib.h>
- #if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1)
diff --git a/editors/xemacs/files/patch-ai b/editors/xemacs/files/patch-ai
deleted file mode 100644
index c91881639c5e..000000000000
--- a/editors/xemacs/files/patch-ai
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib-src/fakemail.c.orig	Tue Mar 23 22:09:58 1999
-+++ lib-src/fakemail.c	Tue Mar 23 22:12:20 1999
-@@ -157,9 +157,17 @@
- extern char *malloc (), *realloc ();
- #endif
- 
-+#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000
-+#define CURRENT_USER
-+#endif
-+
- #ifdef CURRENT_USER
- extern struct passwd *getpwuid ();
-+#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000
-+extern uid_t geteuid ();
-+#else
- extern unsigned short geteuid ();
-+#endif
- static struct passwd *my_entry;
- #define cuserid(s)				\
- (my_entry = getpwuid (((int) geteuid ())),	\
diff --git a/editors/xemacs/files/patch-ak b/editors/xemacs/files/patch-ak
deleted file mode 100644
index a45db5e1084d..000000000000
--- a/editors/xemacs/files/patch-ak
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./src/unexelf.c~    Sun Aug 15 03:29:56 1999
-+++ ./src/unexelf.c     Tue Nov  2 10:24:55 1999
-@@ -515,6 +515,14 @@
- # include <sys/exec_elf.h>
- #endif
- 
-+#if defined(__FreeBSD__) && defined(__alpha__)
-+# ifdef __STDC__
-+#  define ElfW(type)   Elf64_##type
-+# else
-+#  define ElfW(type)   Elf64_/**/type
-+# endif
-+#endif
-+
- #if __GNU_LIBRARY__ - 0 >= 6
- # include <link.h>     /* get ElfW etc */
- #endif
diff --git a/editors/xemacs/files/patch-al b/editors/xemacs/files/patch-al
deleted file mode 100644
index c6650ddf51c4..000000000000
--- a/editors/xemacs/files/patch-al
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lstream.c.orig	Sat Jun 29 18:17:20 2002
-+++ src/lstream.c	Sat Jun 29 18:14:06 2002
-@@ -181,7 +181,7 @@
-     }
- }
- 
--inline static size_t
-+/*inline*/ static size_t
- aligned_sizeof_lstream (size_t lstream_type_specific_size)
- {
-   return ALIGN_SIZE (offsetof (Lstream, data) + lstream_type_specific_size,
diff --git a/editors/xemacs/pkg-descr b/editors/xemacs/pkg-descr
deleted file mode 100644
index 1705d46af848..000000000000
--- a/editors/xemacs/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-XEmacs is a self-documenting, customizable, extensible real-time
-display editor.
-
-Users new to XEmacs will be able to use basic features fairly rapidly
-by studying the tutorial and using the self-documentation features.
-XEmacs also has an extensive interactive manual browser.  It is easily
-extensible since its editing commands are written in Lisp.
-
-XEmacs's many special packages handle mail reading (RMail) and sending
-(Mail), outline editing (Outline), compiling (Compile), running
-subshells within Emacs windows (Shell), running a Lisp read-eval-print
-loop (Lisp-Interaction-Mode), automated psychotherapy (Doctor :-) and
-many more. There is a WWW browsing mode written fully in elisp
-that looks and behaves much like the netscape WWW browser.
-
-XEmacs has similar functionality to GNU Emacs. It uses a different 
-display model, including support for Motif menu and scroll bars and the
-ability to run as a widget inside other applications. Many people say
-it looks nicer than GNU Emacs.
-
-WWW: http://www.xemacs.org/
diff --git a/editors/xemacs/pkg-plist b/editors/xemacs/pkg-plist
deleted file mode 100644
index 29c58d16aad4..000000000000
--- a/editors/xemacs/pkg-plist
+++ /dev/null
@@ -1,1384 +0,0 @@
-bin/b2m
-bin/ctags
-bin/ellcc
-bin/etags
-bin/gnuattach
-bin/gnuclient
-bin/gnudoit
-bin/ootags
-bin/rcs-checkin
-bin/xemacs-%%XEMACS_VER%%
-@exec ln -s %D/%F %B/xemacs
-@unexec rm %B/xemacs
-@exec mkdir -p %D/lib/xemacs/site-lisp ; chmod 755 %D/lib/xemacs/site-lisp
-lib/xemacs-%%XEMACS_VER%%/etc/BETA
-lib/xemacs-%%XEMACS_VER%%/etc/CHARSETS
-lib/xemacs-%%XEMACS_VER%%/etc/CODING-STANDARDS
-lib/xemacs-%%XEMACS_VER%%/etc/CODINGS
-lib/xemacs-%%XEMACS_VER%%/etc/COPYING
-lib/xemacs-%%XEMACS_VER%%/etc/COPYING.LIB
-lib/xemacs-%%XEMACS_VER%%/etc/DEBUG
-lib/xemacs-%%XEMACS_VER%%/etc/DISTRIB
-lib/xemacs-%%XEMACS_VER%%/etc/Emacs.ad
-lib/xemacs-%%XEMACS_VER%%/etc/FTP
-lib/xemacs-%%XEMACS_VER%%/etc/GNU
-lib/xemacs-%%XEMACS_VER%%/etc/HELLO
-lib/xemacs-%%XEMACS_VER%%/etc/InstallGuide
-lib/xemacs-%%XEMACS_VER%%/etc/LPF
-lib/xemacs-%%XEMACS_VER%%/etc/MACHINES
-lib/xemacs-%%XEMACS_VER%%/etc/MAILINGLISTS
-lib/xemacs-%%XEMACS_VER%%/etc/MORE.STUFF
-lib/xemacs-%%XEMACS_VER%%/etc/MOTIVATION
-lib/xemacs-%%XEMACS_VER%%/etc/NEWS
-lib/xemacs-%%XEMACS_VER%%/etc/ONEWS
-lib/xemacs-%%XEMACS_VER%%/etc/OONEWS
-lib/xemacs-%%XEMACS_VER%%/etc/OXYMORONS
-lib/xemacs-%%XEMACS_VER%%/etc/ORDERS
-lib/xemacs-%%XEMACS_VER%%/etc/ORDERS.EUROPE
-lib/xemacs-%%XEMACS_VER%%/etc/ORDERS.JAPAN
-lib/xemacs-%%XEMACS_VER%%/etc/PACKAGES
-lib/xemacs-%%XEMACS_VER%%/etc/README
-lib/xemacs-%%XEMACS_VER%%/etc/README.HYPERBOLE
-lib/xemacs-%%XEMACS_VER%%/etc/README.OO-BROWSER
-lib/xemacs-%%XEMACS_VER%%/etc/SERVICE
-lib/xemacs-%%XEMACS_VER%%/etc/TERMS
-lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL
-lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.de
-lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.fr
-lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.hr
-lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.ja
-lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.ko
-lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.no
-lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.pl
-lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.ro
-lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.ru
-lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.se
-lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.th
-lib/xemacs-%%XEMACS_VER%%/etc/XKeysymDB
-lib/xemacs-%%XEMACS_VER%%/etc/aliases.ksh
-lib/xemacs-%%XEMACS_VER%%/etc/cbx.png
-lib/xemacs-%%XEMACS_VER%%/etc/check_cygwin_setup.sh
-lib/xemacs-%%XEMACS_VER%%/etc/chr.png
-lib/xemacs-%%XEMACS_VER%%/etc/chrm.png
-lib/xemacs-%%XEMACS_VER%%/etc/ctags.1
-lib/xemacs-%%XEMACS_VER%%/etc/custom/example-themes/europe-theme.el
-lib/xemacs-%%XEMACS_VER%%/etc/custom/example-themes/ex-custom-file
-lib/xemacs-%%XEMACS_VER%%/etc/custom/example-themes/example-theme.el
-lib/xemacs-%%XEMACS_VER%%/etc/custom/check0.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/custom/check1.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/custom/choose-down.png
-lib/xemacs-%%XEMACS_VER%%/etc/custom/choose-up.png
-lib/xemacs-%%XEMACS_VER%%/etc/custom/done-down.png
-lib/xemacs-%%XEMACS_VER%%/etc/custom/done-up.png
-lib/xemacs-%%XEMACS_VER%%/etc/custom/down-pushed.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/custom/down.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/custom/face.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/custom/folder.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/custom/open-down.png
-lib/xemacs-%%XEMACS_VER%%/etc/custom/open-up.png
-lib/xemacs-%%XEMACS_VER%%/etc/custom/option.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/custom/radio0.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/custom/radio1.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/custom/reset-down.png
-lib/xemacs-%%XEMACS_VER%%/etc/custom/reset-up.png
-lib/xemacs-%%XEMACS_VER%%/etc/custom/right-pushed.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/custom/right.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/custom/save-down.png
-lib/xemacs-%%XEMACS_VER%%/etc/custom/save-up.png
-lib/xemacs-%%XEMACS_VER%%/etc/custom/set-down.png
-lib/xemacs-%%XEMACS_VER%%/etc/custom/set-up.png
-lib/xemacs-%%XEMACS_VER%%/etc/custom/state-down.png
-lib/xemacs-%%XEMACS_VER%%/etc/custom/state-up.png
-lib/xemacs-%%XEMACS_VER%%/etc/custom/toggle-off-down.png
-lib/xemacs-%%XEMACS_VER%%/etc/custom/toggle-off-up.png
-lib/xemacs-%%XEMACS_VER%%/etc/custom/toggle-on-down.png
-lib/xemacs-%%XEMACS_VER%%/etc/custom/toggle-on-up.png
-lib/xemacs-%%XEMACS_VER%%/etc/editclient.sh
-lib/xemacs-%%XEMACS_VER%%/etc/emacskeys.sco
-lib/xemacs-%%XEMACS_VER%%/etc/emacsstrs.sco
-lib/xemacs-%%XEMACS_VER%%/etc/eos/eos-build.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/eos/eos-clear-at.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/eos/eos-cont.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/eos/eos-dismiss.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/eos/eos-down.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/eos/eos-evaluate-star.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/eos/eos-evaluate.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/eos/eos-fix.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/eos/eos-intro.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/eos/eos-introB.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/eos/eos-introD.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/eos/eos-introDB.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/eos/eos-run.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/eos/eos-run2.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/eos/eos-step-into.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/eos/eos-step-over.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/eos/eos-stop-in.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/eos/eos-stop.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/eos/eos-type.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/eos/eos-up.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/etags.1
-lib/xemacs-%%XEMACS_VER%%/etc/gnu.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/gnu.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/gnuattach.1
-lib/xemacs-%%XEMACS_VER%%/etc/gnuclient.1
-lib/xemacs-%%XEMACS_VER%%/etc/gnudoit.1
-lib/xemacs-%%XEMACS_VER%%/etc/gnuserv.1
-lib/xemacs-%%XEMACS_VER%%/etc/gnuserv.README
-lib/xemacs-%%XEMACS_VER%%/etc/gray1.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/idd/drop
-lib/xemacs-%%XEMACS_VER%%/etc/idd/dropmsk
-lib/xemacs-%%XEMACS_VER%%/etc/ms-kermit
-lib/xemacs-%%XEMACS_VER%%/etc/ms-kermit-7bit
-lib/xemacs-%%XEMACS_VER%%/etc/package-index.LATEST.pgp
-lib/xemacs-%%XEMACS_VER%%/etc/photos/adrian.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/adrianm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/ajc.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/ajcm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/baw.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/bawm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/ben.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/benm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/bw.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/bwm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/cthomp.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/cthompm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/dkindred.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/dkindredm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/dmoore.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/dmoorem.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/dv.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/dvm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/fabrice.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/fabricem.png
-lib/xemacs-21.4.12/etc/photos/golubev.png
-lib/xemacs-21.4.12/etc/photos/golubevm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/hniksic.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/hniksicm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/jan.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/jareth.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/jarethm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/jens.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/jensm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/jmiller.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/jmillerm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/juhp.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/juhpm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/jwz.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/jwzm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/kazz.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/kazzm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/kyle.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/kylem.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/larsi.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/larsim.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/martin.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/martinm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/mcook.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/mcookm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/mly.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/mlym.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/morioka.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/moriokam.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/ograf.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/ografm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/pez.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/pezm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/piper.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/piperm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/rickc.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/rickcm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/slb.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/slbm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/sperber.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/sperberm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/stig.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/stigb.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/stigbm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/stigm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/thiessel.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/thiesselm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/vin.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/vinm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/vladimir.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/vladimirm.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/wmperry.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/wmperrym.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/youngs.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/youngsm.png
-lib/xemacs-%%XEMACS_VER%%/etc/recycle.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/recycle2.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/refcard.ps.gz
-lib/xemacs-%%XEMACS_VER%%/etc/refcard.tex
-lib/xemacs-%%XEMACS_VER%%/etc/sample.Xdefaults
-lib/xemacs-%%XEMACS_VER%%/etc/sample.init.el
-lib/xemacs-%%XEMACS_VER%%/etc/sink.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/sparcworks/SW.Editor.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/sparcworks/sunpro-mailcap
-lib/xemacs-%%XEMACS_VER%%/etc/tests/external-widget/Makefile
-lib/xemacs-%%XEMACS_VER%%/etc/tests/external-widget/test-ew-motif.c
-lib/xemacs-%%XEMACS_VER%%/etc/tests/external-widget/test-ew-xlib.c
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/compile-cap-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/compile-cap-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/compile-dn.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/compile-up.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/compile-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/compile-xx.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/compile-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/copy-cap-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/copy-cap-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/copy-dn.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/copy-up.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/copy-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/copy-xx.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/copy-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/cut-cap-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/cut-cap-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/cut-dn.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/cut-up.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/cut-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/cut-xx.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/cut-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/debug-cap-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/debug-cap-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/debug-dn.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/debug-up.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/debug-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/debug-xx.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/debug-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/disk-cap-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/disk-cap-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/disk-dn.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/disk-up.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/disk-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/disk-xx.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/disk-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/file-cap-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/file-cap-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/file-dn.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/file-up.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/file-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/file-xx.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/file-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/folder-cap-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/folder-cap-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/folder-dn.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/folder-up.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/folder-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/folder-xx.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/folder-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-def-cap-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-def-cap-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-def-dn.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-def-up.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-def-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-def-xx.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-def-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-exit-cap-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-exit-cap-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-exit-dn.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-exit-up.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-exit-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-exit-xx.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-exit-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-exit.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-exit.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-next-cap-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-next-cap-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-next-dn.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-next-up.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-next-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-next-xx.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-next-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-next.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-next.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-prev-cap-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-prev-cap-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-prev-dn.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-prev-up.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-prev-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-prev-xx.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-prev-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-prev.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-prev.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-up-cap-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-up-cap-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-up-dn.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-up-up.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-up-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-up-xx.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-up-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-up.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/info-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/last-win-cap-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/last-win-cap-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/last-win-dn.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/last-win-up.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/last-win-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/last-win-xx.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/last-win-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/mail-cap-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/mail-cap-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/mail-dn.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/mail-up.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/mail-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/mail-xx.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/mail-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/news-cap-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/news-cap-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/news-dn.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/news-up.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/news-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/news-xx.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/news-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/next-win-cap-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/next-win-cap-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/next-win-dn.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/next-win-up.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/next-win-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/next-win-xx.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/next-win-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/paste-cap-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/paste-cap-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/paste-dn.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/paste-up.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/paste-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/paste-xx.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/paste-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/printer-cap-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/printer-cap-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/printer-dn.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/printer-up.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/printer-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/printer-xx.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/printer-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/replace-cap-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/replace-cap-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/replace-dn.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/replace-up.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/replace-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/replace-xx.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/replace-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/spell-cap-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/spell-cap-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/spell-dn.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/spell-up.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/spell-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/spell-xx.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/spell-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/undo-cap-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/undo-cap-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/undo-dn.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/undo-up.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/undo-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/undo-xx.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/undo-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/workshop-cap-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/workshop-cap-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/workshop-up.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/toolbar/workshop-xx.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/trash.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/xemacs-beta.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/xemacs-enhanced.png
-lib/xemacs-%%XEMACS_VER%%/etc/xemacs-fe.sh
-lib/xemacs-%%XEMACS_VER%%/etc/xemacs-icon.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/xemacs-icon2.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/xemacs-icon2.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/xemacs-icon3.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/xemacs-ja.1
-lib/xemacs-%%XEMACS_VER%%/etc/xemacs.1
-lib/xemacs-%%XEMACS_VER%%/etc/xemacs.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/xemacs.xpm
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/7300.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/README
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/acorn.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/alliant-2800.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/alliant.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/alliant1.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/alliant4.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/alpha.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/altos.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/amdahl.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/apollo.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/arm.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/att3b.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/aviion.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/celerity.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/clipper.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/cnvrgnt.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/convex.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/cydra5.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/delta.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/delta88k.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/dpx2.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/dual.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/elxsi.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/ews4800r.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/gec63.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/gould-np1.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/gould.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/hp300bsd.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/hp800.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/hp9000s300.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/i860.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/ibm370aix.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/ibmps2-aix.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/ibmrs6000.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/ibmrt-aix.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/ibmrt.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/intel386.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/iris4d.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/iris5d.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/iris6d.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/irist.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/is386.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/isi-ov.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/luna88k.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/m68k.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/masscomp.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/mega68.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/mg1.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/mips-nec.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/mips-siemens.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/mips.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/mips4.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/ncr386.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/news-risc.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/news.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/next.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/nh3000.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/nh4000.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/ns16000.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/ns32000.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/nu.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/orion.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/orion105.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/paragon.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/pfa50.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/plexus.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/pmax.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/powerpc.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/pyramid.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/pyrmips.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/sequent-ptx.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/sequent.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/sgi-challenge.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/sgi3000.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/sparc.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/sps7.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/stride.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/sun1.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/sun2.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/sun3-68881.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/sun3-fpa.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/sun3-soft.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/sun3.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/sun386.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/symmetry.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/tad68k.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/tahoe.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/tandem-s2.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/targon31.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/tek4300.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/tekxd88.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/template.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/tower32.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/tower32v3.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/ustation.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/vax.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/wicat.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/windowsnt.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/xps100.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/3700.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/386-ix.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/386bsd.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/README
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/aix3-1.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/aix3-2-5.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/aix3-2.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/aix4-1.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/aix4-2.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/aix4.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/alliant-2800.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/alliant.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/altos.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/amdahl.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/bsd386.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/bsd4-1.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/bsd4-2.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/bsd4-3.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/bsdos2-1.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/bsdos2.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/bsdos3.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/bsdos4.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/cxux.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/cxux7.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/cygwin32.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/cygwin.sc
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/darwin.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/decosf1-2.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/decosf1-3.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/decosf3-1.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/decosf3-2.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/decosf4-0.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/dgux.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/dgux5-4r2.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/dgux5-4r3.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/dgux5-4r4.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/domain.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/esix.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/esix5r4.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/ewsux5r4.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/freebsd.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/gnu.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/hpux.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/hpux10-shr.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/hpux10.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/hpux11-shr.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/hpux11.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/hpux8-shr.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/hpux8.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/hpux9-shr.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/hpux9-x11r4.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/hpux9.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/hpux9shxr4.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/iris3-5.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/iris3-6.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/irix3-3.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/irix4-0.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/irix5-0.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/irix5-1.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/irix5-2.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/irix5-3.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/irix6-0.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/isc2-2.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/isc3-0.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/isc4-0.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/isc4-1.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/linux.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/mach-bsd4-3.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/mingw32.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/netbsd.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/newsos5.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/nextstep.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/openbsd.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/osf1.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/ptx.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/riscix1-1.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/riscix1-2.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/rtu.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/riscos5.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/sco4.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/sco5-shr.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/sco5.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/sco7.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/sol2.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/sunos4-0-shr.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/sunos4-0.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/sunos4-1-1.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/sunos4-1-2-shr.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/sunos4-1-2.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/sunos4-1-3-shr.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/sunos4-1-3.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/sunos4-1-4-shr.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/sunos4-1-4.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/sunos4-1-shr.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/sunos4-1.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/template.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/ultrix.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/ultrix4-3.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/umax.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/umips.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/unipl5-0.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/unipl5-2.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/usg5-0.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/usg5-2-2.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/usg5-2.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/usg5-3.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/usg5-4-2.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/usg5-4.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/windowsnt.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/xenix.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/Emacs.ad.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/EmacsFrame.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/EmacsFrameP.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/EmacsManager.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/EmacsManagerP.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/EmacsShell.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/EmacsShellP.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/ExternalClient.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/ExternalClientP.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/ExternalShell.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/ExternalShellP.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/backtrace.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/balloon_help.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/bitmaps.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/blocktype.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/broken-sun.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/buffer.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/bufslots.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/bytecode.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/casetab.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/chartab.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/cm.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/commands.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/config.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/conslots.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/console-gtk.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/console-msw.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/console-stream.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/console-tty.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/console-x.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/console.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/database.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/debug.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/device.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/dragdrop.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/dumper.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/eldap.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/elhash.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/emodules.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/events-mod.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/events.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/extents.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/extw-Xlib.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/extw-Xt.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/faces.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/file-coding.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/frame.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/frameslots.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/gccache-gtk.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/general-slots.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/getpagesize.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/gifrlib.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/glyphs-gtk.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/glyphs-msw.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/glyphs-x.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/glyphs.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/gpmevent.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/gtk-xemacs.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/gui-gtk.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/gui-x.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/gui.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/gutter.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/hash.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/imgproc.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/insdel.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/iso-wide.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/keymap.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/libsst.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/libst.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/lisp.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/line-number.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/lisp-disunion.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/lisp-union.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/lrecord.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/lstream.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/macros.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/mem-limits.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/menubar-msw.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/menubar.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/miscplay.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/mule-ccl.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/mule-charset.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/nativesound.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/ndir.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/nt.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/ntheap.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects-gtk.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects-msw.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects-tty.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects-x.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/offix-cursors.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/offix-types.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/offix.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/opaque.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/paths.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/postgresql.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/process.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/procimpl.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/rangetab.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/redisplay.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/regex.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/scrollbar-gtk.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/scrollbar-msw.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/scrollbar-x.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/scrollbar.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/select.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/sheap-adjust.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/specifier.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/symeval.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/symsinit.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/syntax.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/syscommctrl.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/sysdep.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/sysdir.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/sysdll.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/sysfile.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/sysfloat.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/sysproc.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/syspwd.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/syssignal.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/systime.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/systty.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/syswait.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/syswindows.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/toolbar.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/tooltalk.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/ui-gtk.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/universe.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/window.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/winslots.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xgccache.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xintrinsic.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xintrinsicp.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xmmanagerp.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xmprimitivep.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xmu.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/DOC
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/add-big-package.sh
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/config.values
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/cvtmail
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/digest-doc
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/fakemail
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/gnuserv
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/gzip-el.sh
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/hexl
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/make-docfile
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/mmencode
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/movemail
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/profile
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/rcs2log
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/sorted-doc
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/vcdiff
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/wakeup
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/yow
-lib/xemacs-%%XEMACS_VER%%/info/cl.info
-lib/xemacs-%%XEMACS_VER%%/info/cl.info-1
-lib/xemacs-%%XEMACS_VER%%/info/cl.info-2
-lib/xemacs-%%XEMACS_VER%%/info/cl.info-3
-lib/xemacs-%%XEMACS_VER%%/info/cl.info-4
-lib/xemacs-%%XEMACS_VER%%/info/cl.info-5
-lib/xemacs-%%XEMACS_VER%%/info/cl.info-6
-lib/xemacs-%%XEMACS_VER%%/info/custom.info
-lib/xemacs-%%XEMACS_VER%%/info/dir
-lib/xemacs-%%XEMACS_VER%%/info/emodules.info
-lib/xemacs-%%XEMACS_VER%%/info/external-widget.info
-lib/xemacs-%%XEMACS_VER%%/info/info.info
-lib/xemacs-%%XEMACS_VER%%/info/internals.info
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-1
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-2
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-3
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-4
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-5
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-6
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-7
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-8
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-9
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-1
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-10
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-11
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-12
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-13
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-14
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-15
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-16
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-17
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-18
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-19
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-2
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-20
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-21
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-22
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-23
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-24
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-25
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-26
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-27
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-28
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-29
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-3
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-30
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-31
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-32
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-33
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-34
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-35
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-36
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-37
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-38
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-39
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-4
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-40
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-41
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-42
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-43
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-44
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-45
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-46
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-47
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-48
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-49
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-5
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-50
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-6
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-7
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-8
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-9
-lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info
-lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info-1
-lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info-2
-lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info-3
-lib/xemacs-%%XEMACS_VER%%/info/standards.info
-lib/xemacs-%%XEMACS_VER%%/info/standards.info-1
-lib/xemacs-%%XEMACS_VER%%/info/standards.info-2
-lib/xemacs-%%XEMACS_VER%%/info/standards.info-3
-lib/xemacs-%%XEMACS_VER%%/info/standards.info-4
-lib/xemacs-%%XEMACS_VER%%/info/term.info
-lib/xemacs-%%XEMACS_VER%%/info/termcap.info
-lib/xemacs-%%XEMACS_VER%%/info/termcap.info-1
-lib/xemacs-%%XEMACS_VER%%/info/termcap.info-2
-lib/xemacs-%%XEMACS_VER%%/info/termcap.info-3
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-1
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-10
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-11
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-12
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-2
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-3
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-4
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-5
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-6
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-7
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-8
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-9
-lib/xemacs-%%XEMACS_VER%%/info/widget.info
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-1
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-2
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-3
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-4
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-5
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-6
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-1
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-10
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-11
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-12
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-13
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-14
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-15
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-16
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-17
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-18
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-19
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-2
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-20
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-21
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-22
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-23
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-3
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-4
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-5
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-6
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-7
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-8
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-9
-lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog
-lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog.1
-lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog.GTK
-lib/xemacs-%%XEMACS_VER%%/lisp/README
-lib/xemacs-%%XEMACS_VER%%/lisp/abbrev.el
-lib/xemacs-%%XEMACS_VER%%/lisp/abbrev.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/about.el
-lib/xemacs-%%XEMACS_VER%%/lisp/about.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/alist.el
-lib/xemacs-%%XEMACS_VER%%/lisp/alist.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/apropos.el
-lib/xemacs-%%XEMACS_VER%%/lisp/apropos.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/auto-autoloads.el
-lib/xemacs-%%XEMACS_VER%%/lisp/auto-autoloads.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/auto-save.el
-lib/xemacs-%%XEMACS_VER%%/lisp/auto-save.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/auto-show.el
-lib/xemacs-%%XEMACS_VER%%/lisp/auto-show.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/autoload.el
-lib/xemacs-%%XEMACS_VER%%/lisp/autoload.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/backquote.el
-lib/xemacs-%%XEMACS_VER%%/lisp/backquote.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/blessmail.el
-lib/xemacs-%%XEMACS_VER%%/lisp/blessmail.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/buff-menu.el
-lib/xemacs-%%XEMACS_VER%%/lisp/buff-menu.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/buffer.el
-lib/xemacs-%%XEMACS_VER%%/lisp/buffer.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/build-report.el
-lib/xemacs-%%XEMACS_VER%%/lisp/build-report.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/byte-optimize.el
-lib/xemacs-%%XEMACS_VER%%/lisp/byte-optimize.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/bytecomp-runtime.el
-lib/xemacs-%%XEMACS_VER%%/lisp/bytecomp-runtime.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/bytecomp.el
-lib/xemacs-%%XEMACS_VER%%/lisp/bytecomp.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/callers-of-rpt.el
-lib/xemacs-%%XEMACS_VER%%/lisp/callers-of-rpt.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/check-features.el
-lib/xemacs-%%XEMACS_VER%%/lisp/check-features.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/cl-compat.el
-lib/xemacs-%%XEMACS_VER%%/lisp/cl-compat.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/cl-extra.el
-lib/xemacs-%%XEMACS_VER%%/lisp/cl-extra.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/cl-macs.el
-lib/xemacs-%%XEMACS_VER%%/lisp/cl-macs.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/cl-seq.el
-lib/xemacs-%%XEMACS_VER%%/lisp/cl-seq.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/cl.el
-lib/xemacs-%%XEMACS_VER%%/lisp/cl.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/cmdloop.el
-lib/xemacs-%%XEMACS_VER%%/lisp/cmdloop.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/code-cmds.el
-lib/xemacs-%%XEMACS_VER%%/lisp/code-cmds.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/code-files.el
-lib/xemacs-%%XEMACS_VER%%/lisp/code-files.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/code-process.el
-lib/xemacs-%%XEMACS_VER%%/lisp/code-process.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/coding.el
-lib/xemacs-%%XEMACS_VER%%/lisp/coding.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/compat.el
-lib/xemacs-%%XEMACS_VER%%/lisp/compat.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/config.el
-lib/xemacs-%%XEMACS_VER%%/lisp/config.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/console.el
-lib/xemacs-%%XEMACS_VER%%/lisp/console.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/cus-dep.el
-lib/xemacs-%%XEMACS_VER%%/lisp/cus-dep.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/cus-edit.el
-lib/xemacs-%%XEMACS_VER%%/lisp/cus-edit.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/cus-face.el
-lib/xemacs-%%XEMACS_VER%%/lisp/cus-face.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/cus-file.el
-lib/xemacs-%%XEMACS_VER%%/lisp/cus-file.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/cus-load.el
-lib/xemacs-%%XEMACS_VER%%/lisp/cus-load.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/cus-start.el
-lib/xemacs-%%XEMACS_VER%%/lisp/cus-start.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/custom-load.el
-lib/xemacs-%%XEMACS_VER%%/lisp/custom-load.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/custom.el
-lib/xemacs-%%XEMACS_VER%%/lisp/custom.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/dialog-gtk.el
-lib/xemacs-%%XEMACS_VER%%/lisp/dialog-gtk.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/derived.el
-lib/xemacs-%%XEMACS_VER%%/lisp/derived.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/device.el
-lib/xemacs-%%XEMACS_VER%%/lisp/device.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/dialog-items.el
-lib/xemacs-%%XEMACS_VER%%/lisp/dialog-items.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/dialog.el
-lib/xemacs-%%XEMACS_VER%%/lisp/dialog.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/disass.el
-lib/xemacs-%%XEMACS_VER%%/lisp/disass.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/disp-table.el
-lib/xemacs-%%XEMACS_VER%%/lisp/disp-table.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/dragdrop.el
-lib/xemacs-%%XEMACS_VER%%/lisp/dragdrop.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/dump-paths.el
-lib/xemacs-%%XEMACS_VER%%/lisp/dump-paths.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/dumped-lisp.el
-lib/xemacs-%%XEMACS_VER%%/lisp/easymenu.el
-lib/xemacs-%%XEMACS_VER%%/lisp/easymenu.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/etags.el
-lib/xemacs-%%XEMACS_VER%%/lisp/etags.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/events.el
-lib/xemacs-%%XEMACS_VER%%/lisp/events.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/extents.el
-lib/xemacs-%%XEMACS_VER%%/lisp/extents.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/faces.el
-lib/xemacs-%%XEMACS_VER%%/lisp/faces.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/files-nomule.el
-lib/xemacs-%%XEMACS_VER%%/lisp/files-nomule.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/files.el
-lib/xemacs-%%XEMACS_VER%%/lisp/files.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/fill.el
-lib/xemacs-%%XEMACS_VER%%/lisp/fill.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/find-paths.el
-lib/xemacs-%%XEMACS_VER%%/lisp/find-paths.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/finder-inf.el
-lib/xemacs-%%XEMACS_VER%%/lisp/finder-inf.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/finder.el
-lib/xemacs-%%XEMACS_VER%%/lisp/finder.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/float-sup.el
-lib/xemacs-%%XEMACS_VER%%/lisp/float-sup.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/font-lock.el
-lib/xemacs-%%XEMACS_VER%%/lisp/font-lock.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/font-menu.el
-lib/xemacs-%%XEMACS_VER%%/lisp/font-menu.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/font.el
-lib/xemacs-%%XEMACS_VER%%/lisp/font.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/fontl-hooks.el
-lib/xemacs-%%XEMACS_VER%%/lisp/fontl-hooks.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/format.el
-lib/xemacs-%%XEMACS_VER%%/lisp/format.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/frame.el
-lib/xemacs-%%XEMACS_VER%%/lisp/frame.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/gdk.el
-lib/xemacs-%%XEMACS_VER%%/lisp/gdk.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/generic-widgets.el
-lib/xemacs-%%XEMACS_VER%%/lisp/generic-widgets.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/glade.el
-lib/xemacs-%%XEMACS_VER%%/lisp/glade.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/glyphs.el
-lib/xemacs-%%XEMACS_VER%%/lisp/glyphs.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/gnome-widgets.el
-lib/xemacs-%%XEMACS_VER%%/lisp/gnome-widgets.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/gnome.el
-lib/xemacs-%%XEMACS_VER%%/lisp/gnome.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/gnuserv.el
-lib/xemacs-%%XEMACS_VER%%/lisp/gnuserv.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/gpm.el
-lib/xemacs-%%XEMACS_VER%%/lisp/gpm.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-compose.el
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-compose.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-extra.el
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-extra.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-faces.el
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-faces.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-ffi.el
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-ffi.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-file-dialog.el
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-file-dialog.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-font-menu.el
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-font-menu.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-glyphs.el
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-glyphs.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-init.el
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-init.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-iso8859-1.el
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-iso8859-1.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-marshal.el
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-marshal.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-mouse.el
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-mouse.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-package.el
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-package.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-password-dialog.el
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-password-dialog.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-select.el
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-select.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-widget-accessors.el
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-widget-accessors.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-widgets.el
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk-widgets.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk.el
-lib/xemacs-%%XEMACS_VER%%/lisp/gtk.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/gui.el
-lib/xemacs-%%XEMACS_VER%%/lisp/gui.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/gutter-items.el
-lib/xemacs-%%XEMACS_VER%%/lisp/gutter-items.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/gutter.el
-lib/xemacs-%%XEMACS_VER%%/lisp/gutter.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/help-macro.el
-lib/xemacs-%%XEMACS_VER%%/lisp/help-macro.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/help-nomule.el
-lib/xemacs-%%XEMACS_VER%%/lisp/help-nomule.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/help.el
-lib/xemacs-%%XEMACS_VER%%/lisp/help.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/hyper-apropos.el
-lib/xemacs-%%XEMACS_VER%%/lisp/hyper-apropos.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/indent.el
-lib/xemacs-%%XEMACS_VER%%/lisp/indent.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/info.el
-lib/xemacs-%%XEMACS_VER%%/lisp/info.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/isearch-mode.el
-lib/xemacs-%%XEMACS_VER%%/lisp/isearch-mode.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/iso8859-1.el
-lib/xemacs-%%XEMACS_VER%%/lisp/iso8859-1.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/itimer-autosave.el
-lib/xemacs-%%XEMACS_VER%%/lisp/itimer-autosave.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/itimer.el
-lib/xemacs-%%XEMACS_VER%%/lisp/itimer.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/keydefs.el
-lib/xemacs-%%XEMACS_VER%%/lisp/keydefs.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/keymap.el
-lib/xemacs-%%XEMACS_VER%%/lisp/keymap.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/ldap.el
-lib/xemacs-%%XEMACS_VER%%/lisp/ldap.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/lib-complete.el
-lib/xemacs-%%XEMACS_VER%%/lisp/lib-complete.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/lisp-mnt.el
-lib/xemacs-%%XEMACS_VER%%/lisp/lisp-mnt.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/lisp-mode.el
-lib/xemacs-%%XEMACS_VER%%/lisp/lisp-mode.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/lisp.el
-lib/xemacs-%%XEMACS_VER%%/lisp/lisp.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/list-mode.el
-lib/xemacs-%%XEMACS_VER%%/lisp/list-mode.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/loaddefs.el
-lib/xemacs-%%XEMACS_VER%%/lisp/loaddefs.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/loadhist.el
-lib/xemacs-%%XEMACS_VER%%/lisp/loadhist.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/loadup-el.el
-lib/xemacs-%%XEMACS_VER%%/lisp/loadup.el
-lib/xemacs-%%XEMACS_VER%%/lisp/make-docfile.el
-lib/xemacs-%%XEMACS_VER%%/lisp/map-ynp.el
-lib/xemacs-%%XEMACS_VER%%/lisp/map-ynp.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/menubar-items.el
-lib/xemacs-%%XEMACS_VER%%/lisp/menubar-items.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/menubar.el
-lib/xemacs-%%XEMACS_VER%%/lisp/menubar.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/minibuf.el
-lib/xemacs-%%XEMACS_VER%%/lisp/minibuf.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/misc.el
-lib/xemacs-%%XEMACS_VER%%/lisp/misc.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mode-motion.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mode-motion.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/modeline.el
-lib/xemacs-%%XEMACS_VER%%/lisp/modeline.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mouse.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mouse.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/movemail.el
-lib/xemacs-%%XEMACS_VER%%/lisp/movemail.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/msw-faces.el
-lib/xemacs-%%XEMACS_VER%%/lisp/msw-faces.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/msw-font-menu.el
-lib/xemacs-%%XEMACS_VER%%/lisp/msw-font-menu.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/msw-glyphs.el
-lib/xemacs-%%XEMACS_VER%%/lisp/msw-glyphs.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/msw-init.el
-lib/xemacs-%%XEMACS_VER%%/lisp/msw-init.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/msw-mouse.el
-lib/xemacs-%%XEMACS_VER%%/lisp/msw-mouse.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/msw-select.el
-lib/xemacs-%%XEMACS_VER%%/lisp/msw-select.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/arabic.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/arabic.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/auto-autoloads.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/auto-autoloads.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/canna-leim.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/canna-leim.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/chinese.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/chinese.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/custom-load.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/cyrillic.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/cyrillic.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/english.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/english.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/ethiopic.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/ethiopic.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/european.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/european.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/greek.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/greek.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/hebrew.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/hebrew.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/japanese.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/japanese.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/kinsoku.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/kinsoku.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/korean.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/korean.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/latin.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/latin.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/misc-lang.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/misc-lang.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-category.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-category.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-ccl.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-ccl.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-charset.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-charset.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-cmds.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-cmds.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-coding.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-coding.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-help.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-help.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-init.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-init.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-misc.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-misc.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-tty-init.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-tty-init.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-x-init.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-x-init.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/thai-xtis-chars.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/thai-xtis-chars.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/thai-xtis.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/thai-xtis.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/viet-chars.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/viet-chars.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/vietnamese.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/vietnamese.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/multicast.el
-lib/xemacs-%%XEMACS_VER%%/lisp/multicast.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mwheel.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mwheel.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/objects.el
-lib/xemacs-%%XEMACS_VER%%/lisp/objects.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/obsolete.el
-lib/xemacs-%%XEMACS_VER%%/lisp/obsolete.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/package-admin.el
-lib/xemacs-%%XEMACS_VER%%/lisp/package-admin.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/package-get.el
-lib/xemacs-%%XEMACS_VER%%/lisp/package-get.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/package-info.el
-lib/xemacs-%%XEMACS_VER%%/lisp/package-info.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/package-net.el
-lib/xemacs-%%XEMACS_VER%%/lisp/package-net.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/package-ui.el
-lib/xemacs-%%XEMACS_VER%%/lisp/package-ui.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/packages.el
-lib/xemacs-%%XEMACS_VER%%/lisp/packages.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/page.el
-lib/xemacs-%%XEMACS_VER%%/lisp/page.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/paragraphs.el
-lib/xemacs-%%XEMACS_VER%%/lisp/paragraphs.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/paths.el
-lib/xemacs-%%XEMACS_VER%%/lisp/picture.el
-lib/xemacs-%%XEMACS_VER%%/lisp/picture.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/printer.el
-lib/xemacs-%%XEMACS_VER%%/lisp/printer.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/process.el
-lib/xemacs-%%XEMACS_VER%%/lisp/process.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/rect.el
-lib/xemacs-%%XEMACS_VER%%/lisp/rect.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/register.el
-lib/xemacs-%%XEMACS_VER%%/lisp/register.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/replace.el
-lib/xemacs-%%XEMACS_VER%%/lisp/replace.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/scrollbar.el
-lib/xemacs-%%XEMACS_VER%%/lisp/scrollbar.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/select.el
-lib/xemacs-%%XEMACS_VER%%/lisp/select.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/setup-paths.el
-lib/xemacs-%%XEMACS_VER%%/lisp/setup-paths.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/shadow.el
-lib/xemacs-%%XEMACS_VER%%/lisp/shadow.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/simple.el
-lib/xemacs-%%XEMACS_VER%%/lisp/simple.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/site-load.el
-lib/xemacs-%%XEMACS_VER%%/lisp/sound.el
-lib/xemacs-%%XEMACS_VER%%/lisp/sound.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/specifier.el
-lib/xemacs-%%XEMACS_VER%%/lisp/specifier.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/startup.el
-lib/xemacs-%%XEMACS_VER%%/lisp/startup.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/subr.el
-lib/xemacs-%%XEMACS_VER%%/lisp/subr.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/symbol-syntax.el
-lib/xemacs-%%XEMACS_VER%%/lisp/symbol-syntax.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/symbols.el
-lib/xemacs-%%XEMACS_VER%%/lisp/symbols.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/syntax.el
-lib/xemacs-%%XEMACS_VER%%/lisp/syntax.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/term/AT386.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/README
-lib/xemacs-%%XEMACS_VER%%/lisp/term/apollo.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/bg-mouse.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/bobcat.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/internal.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/keyswap.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/linux.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/lk201.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/news.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/pc-win.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/scoansi.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/sun-mouse.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/sun.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/sup-mouse.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/tvi970.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/vt-control.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/vt100-led.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/vt100.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/vt102.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/vt125.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/vt200.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/vt201.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/vt220.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/vt240.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/vt300.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/vt320.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/vt400.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/vt420.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/win32-win.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/wyse50.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/xterm.el
-lib/xemacs-%%XEMACS_VER%%/lisp/text-mode.el
-lib/xemacs-%%XEMACS_VER%%/lisp/text-mode.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/text-props.el
-lib/xemacs-%%XEMACS_VER%%/lisp/text-props.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/toolbar-items.el
-lib/xemacs-%%XEMACS_VER%%/lisp/toolbar-items.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/toolbar.el
-lib/xemacs-%%XEMACS_VER%%/lisp/toolbar.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/tty-init.el
-lib/xemacs-%%XEMACS_VER%%/lisp/tty-init.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/undo-stack.el
-lib/xemacs-%%XEMACS_VER%%/lisp/undo-stack.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/update-elc.el
-lib/xemacs-%%XEMACS_VER%%/lisp/update-elc-2.el
-lib/xemacs-%%XEMACS_VER%%/lisp/userlock.el
-lib/xemacs-%%XEMACS_VER%%/lisp/userlock.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/version.el
-lib/xemacs-%%XEMACS_VER%%/lisp/very-early-lisp.el
-lib/xemacs-%%XEMACS_VER%%/lisp/view-less.el
-lib/xemacs-%%XEMACS_VER%%/lisp/view-less.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/wid-browse.el
-lib/xemacs-%%XEMACS_VER%%/lisp/wid-browse.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/wid-edit.el
-lib/xemacs-%%XEMACS_VER%%/lisp/wid-edit.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/widgets-gtk.el
-lib/xemacs-%%XEMACS_VER%%/lisp/widgets-gtk.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/widget.el
-lib/xemacs-%%XEMACS_VER%%/lisp/widget.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/win32-native.el
-lib/xemacs-%%XEMACS_VER%%/lisp/win32-native.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/window-xemacs.el
-lib/xemacs-%%XEMACS_VER%%/lisp/window-xemacs.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/window.el
-lib/xemacs-%%XEMACS_VER%%/lisp/window.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/x-compose.el
-lib/xemacs-%%XEMACS_VER%%/lisp/x-compose.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/x-faces.el
-lib/xemacs-%%XEMACS_VER%%/lisp/x-faces.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/x-font-menu.el
-lib/xemacs-%%XEMACS_VER%%/lisp/x-font-menu.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/x-init.el
-lib/xemacs-%%XEMACS_VER%%/lisp/x-init.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/x-iso8859-1.el
-lib/xemacs-%%XEMACS_VER%%/lisp/x-iso8859-1.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/x-misc.el
-lib/xemacs-%%XEMACS_VER%%/lisp/x-misc.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/x-mouse.el
-lib/xemacs-%%XEMACS_VER%%/lisp/x-mouse.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/x-scrollbar.el
-lib/xemacs-%%XEMACS_VER%%/lisp/x-scrollbar.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/x-select.el
-lib/xemacs-%%XEMACS_VER%%/lisp/x-select.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/x-win-sun.el
-lib/xemacs-%%XEMACS_VER%%/lisp/x-win-sun.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.el
-lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/term
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mule
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp
-@dirrm lib/xemacs-%%XEMACS_VER%%/info
-@dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m
-@dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s
-@dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include
-@dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/modules
-@dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/toolbar
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/tests/external-widget
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/tests
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/sparcworks
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/photos
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/idd
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/eos
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/custom/example-themes
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/custom
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc
-@dirrm lib/xemacs-%%XEMACS_VER%%
-@unexec rmdir %D/lib/xemacs/site-lisp 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs 2>/dev/null || true