85 files changed, 6273 insertions, 0 deletions

diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index 5bb04213c156..79351770f737 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -246,6 +246,15 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@${ECHO}
+	@${ECHO} "You may set WITH_GIF_LZW_COMPRESSION=YES"
+	@${ECHO} "If you want to make compressed gif images"
+	@${ECHO}
+	@${ECHO} "If must have license from the Unisys and IBM patents"
+	@${ECHO} "to enable this option to get compressed GIF images."
+	@${ECHO}
+.endif
 .if ${OSVERSION} < 450002
 	@${ECHO}
 	@${ECHO} "OS-VERSION ${OSVERSION} too low"
@@ -358,6 +367,17 @@ post-patch:
 		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
 	fi
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@if [ "`echo ${PATCHDIR}/gifpatch-*`" != "${PATCHDIR}/gifpatch-*" ]; then \
+		${ECHO_MSG} "===>  Removing GIF LZW compression for ${PKGNAME}" ; \
+		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
+			${ECHO_MSG} "===>   Applying GIF LZW compression ${OPSYS} patch" ; \
+		fi; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \
+	fi
+.endif
 .if defined(WITH_DEBUG)
 	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
@@ -502,6 +522,8 @@ pre-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
 	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
 	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
+	@${CP}	${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
diff --git a/editors/openoffice-1.1-devel/distinfo b/editors/openoffice-1.1-devel/distinfo
index 0004033ec259..a55458016a47 100644
--- a/editors/openoffice-1.1-devel/distinfo
+++ b/editors/openoffice-1.1-devel/distinfo
@@ -7,3 +7,4 @@ 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/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
diff --git a/editors/openoffice-1.1-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx b/editors/openoffice-1.1-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
new file mode 100644
index 000000000000..0fcdf289cca3
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
@@ -0,0 +1,290 @@
+--- ../goodies/source/filter.vcl/egif/giflzwc.cxx	Sun Apr 13 14:33:24 2003
++++ /dev/null	Mon Apr 14 06:10:35 2003
+@@ -1,287 +0,0 @@
+-/*************************************************************************
+- *
+- *  $RCSfile: giflzwc.cxx,v $
+- *
+- *  $Revision: 1.1.1.1 $
+- *
+- *  last change: $Author: hr $ $Date: 2000/09/18 16:30:11 $
+- *
+- *  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 <tools/stream.hxx>
+-#include "giflzwc.hxx"
+-
+-// ----------------------------
+-// - GIFImageDataOutputStream -
+-// ----------------------------
+-
+-class GIFImageDataOutputStream
+-{
+-private:
+-
+-	void		FlushBlockBuf();
+-	inline void	FlushBitsBufsFullBytes();
+-
+-	SvStream&	rStream;
+-	BYTE*		pBlockBuf;
+-	BYTE		nBlockBufSize;
+-	ULONG		nBitsBuf;
+-	USHORT		nBitsBufSize;
+-
+-public:
+-
+-				GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize );
+-				~GIFImageDataOutputStream();
+-
+-	inline void	WriteBits( USHORT nCode, USHORT nCodeLen );
+-};
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
+-{
+-	while (nBitsBufSize>=8)
+-	{
+-		if( nBlockBufSize==255 )
+-			FlushBlockBuf();
+-
+-		pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf;
+-		nBitsBuf >>= 8;
+-		nBitsBufSize -= 8;
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen )
+-{
+-	if( nBitsBufSize+nCodeLen>32 )
+-		FlushBitsBufsFullBytes();
+-
+-	nBitsBuf |= (ULONG) nCode << nBitsBufSize;
+-	nBitsBufSize += nCodeLen;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) :
+-		rStream(rGIF)
+-{
+-	pBlockBuf = new BYTE[ 255 ];
+-	nBlockBufSize = 0;
+-	nBitsBufSize = 0;
+-	nBitsBuf = 0;
+-	rStream << nLZWDataSize;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-
+-GIFImageDataOutputStream::~GIFImageDataOutputStream()
+-{
+-	WriteBits(0,7);
+-	FlushBitsBufsFullBytes();
+-	FlushBlockBuf();
+-	rStream << (BYTE)0;
+-	delete[] pBlockBuf;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFImageDataOutputStream::FlushBlockBuf()
+-{
+-	if( nBlockBufSize )
+-	{
+-		rStream << (BYTE) nBlockBufSize;
+-		rStream.Write( pBlockBuf,nBlockBufSize );
+-		nBlockBufSize = 0;
+-	}
+-}
+-
+-// -------------------
+-// - GIFLZWCTreeNode -
+-// -------------------
+-
+-struct GIFLZWCTreeNode
+-{
+-
+-	GIFLZWCTreeNode*	pBrother;		// naechster Knoten, der den selben Vater hat
+-	GIFLZWCTreeNode*	pFirstChild;	// erster Sohn
+-	USHORT				nCode;			// Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
+-	USHORT				nValue;			// Der Pixelwert
+-};
+-
+-// --------------------
+-// - GIFLZWCompressor -
+-// --------------------
+-
+-GIFLZWCompressor::GIFLZWCompressor()
+-{
+-	pIDOS=NULL;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFLZWCompressor::~GIFLZWCompressor()
+-{
+-	if (pIDOS!=NULL) EndCompression();
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
+-{
+-	if( !pIDOS )
+-	{
+-		USHORT i;
+-
+-		nDataSize = nPixelSize;
+-
+-		if( nDataSize < 2 )
+-			nDataSize=2;
+-
+-		nClearCode=1<<nDataSize;
+-		nEOICode=nClearCode+1;
+-		nTableSize=nEOICode+1;
+-		nCodeSize=nDataSize+1;
+-
+-		pIDOS=new GIFImageDataOutputStream(rGIF,(BYTE)nDataSize);
+-		pTable=new GIFLZWCTreeNode[4096];
+-
+-		for (i=0; i<4096; i++)
+-		{
+-			pTable[i].pBrother = pTable[i].pFirstChild = NULL;
+-			pTable[i].nValue = (BYTE) ( pTable[i].nCode = i );
+-		}
+-
+-		pPrefix = NULL;
+-		pIDOS->WriteBits( nClearCode,nCodeSize );
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
+-{
+-	if( pIDOS )
+-	{
+-		GIFLZWCTreeNode*	p;
+-		USHORT				i;
+-		BYTE				nV;
+-
+-		if( !pPrefix && nSize )
+-		{
+-			pPrefix=pTable+(*pSrc++);
+-			nSize--;
+-		}
+-
+-		while( nSize )
+-		{
+-			nSize--;
+-			nV=*pSrc++;
+-			for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother )
+-			{
+-				if (p->nValue==nV)
+-					break;
+-			}
+-
+-			if( p)
+-				pPrefix=p;
+-			else
+-			{
+-				pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-				if (nTableSize==4096)
+-				{
+-					pIDOS->WriteBits(nClearCode,nCodeSize);
+-
+-					for (i=0; i<nClearCode; i++)
+-						pTable[i].pFirstChild=NULL;
+-
+-					nCodeSize=nDataSize+1;
+-					nTableSize=nEOICode+1;
+-				}
+-				else
+-				{
+-					if(nTableSize==(USHORT)(1<<nCodeSize))
+-						nCodeSize++;
+-
+-					p=pTable+(nTableSize++);
+-					p->pBrother=pPrefix->pFirstChild;
+-					pPrefix->pFirstChild=p;
+-					p->nValue=nV;
+-					p->pFirstChild=NULL;
+-				}
+-
+-				pPrefix=pTable+nV;
+-			}
+-		}
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::EndCompression()
+-{
+-	if( pIDOS )
+-	{
+-		if( pPrefix )
+-			pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-		pIDOS->WriteBits( nEOICode,nCodeSize );
+-		delete[] pTable;
+-		delete pIDOS;
+-		pIDOS=NULL;
+-	}
+-}
diff --git a/editors/openoffice-1.1-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx b/editors/openoffice-1.1-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
new file mode 100644
index 000000000000..223277a5cd7e
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
@@ -0,0 +1,45 @@
+--- /dev/null	1970-01-01 01:00:00.000000000 +0100
++++ ../goodies/source/filter.vcl/egif/giflzwc_disabled.cxx	2002-08-15 15:09:47.000000000 +0200
+@@ -0,0 +1,42 @@
++/**********************************
++ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed.
++ **********************************/ 
++
++//#include <tools/stream.hxx>
++#include "giflzwc.hxx"
++
++// --------------------
++// - GIFLZWCompressor -
++// --------------------
++
++GIFLZWCompressor::GIFLZWCompressor()
++{
++	pIDOS=NULL;
++}
++
++// ------------------------------------------------------------------------
++
++GIFLZWCompressor::~GIFLZWCompressor()
++{
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::EndCompression()
++{
++	/********************** DISABLED *************************/
++}
diff --git a/editors/openoffice-1.1-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk b/editors/openoffice-1.1-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
new file mode 100644
index 000000000000..dd9e199acc96
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
@@ -0,0 +1,11 @@
+--- ../goodies/source/filter.vcl/egif/makefile.mk.orig	Tue Aug 14 23:22:54 2001
++++ ../goodies/source/filter.vcl/egif/makefile.mk	Mon Apr 14 06:04:55 2003
+@@ -89,7 +89,7 @@
+ 
+ SLOFILES= 	$(SLO)$/egif.obj		\
+ 		$(SLO)$/dlgegif.obj	\
+-		$(SLO)$/giflzwc.obj
++		$(SLO)$/giflzwc_disabled.obj
+ 
+ 
+ # ==========================================================================
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index 5bb04213c156..79351770f737 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -246,6 +246,15 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@${ECHO}
+	@${ECHO} "You may set WITH_GIF_LZW_COMPRESSION=YES"
+	@${ECHO} "If you want to make compressed gif images"
+	@${ECHO}
+	@${ECHO} "If must have license from the Unisys and IBM patents"
+	@${ECHO} "to enable this option to get compressed GIF images."
+	@${ECHO}
+.endif
 .if ${OSVERSION} < 450002
 	@${ECHO}
 	@${ECHO} "OS-VERSION ${OSVERSION} too low"
@@ -358,6 +367,17 @@ post-patch:
 		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
 	fi
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@if [ "`echo ${PATCHDIR}/gifpatch-*`" != "${PATCHDIR}/gifpatch-*" ]; then \
+		${ECHO_MSG} "===>  Removing GIF LZW compression for ${PKGNAME}" ; \
+		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
+			${ECHO_MSG} "===>   Applying GIF LZW compression ${OPSYS} patch" ; \
+		fi; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \
+	fi
+.endif
 .if defined(WITH_DEBUG)
 	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
@@ -502,6 +522,8 @@ pre-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
 	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
 	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
+	@${CP}	${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
diff --git a/editors/openoffice-1.1/distinfo b/editors/openoffice-1.1/distinfo
index 0004033ec259..a55458016a47 100644
--- a/editors/openoffice-1.1/distinfo
+++ b/editors/openoffice-1.1/distinfo
@@ -7,3 +7,4 @@ 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/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
diff --git a/editors/openoffice-1.1/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx b/editors/openoffice-1.1/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
new file mode 100644
index 000000000000..0fcdf289cca3
--- /dev/null
+++ b/editors/openoffice-1.1/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
@@ -0,0 +1,290 @@
+--- ../goodies/source/filter.vcl/egif/giflzwc.cxx	Sun Apr 13 14:33:24 2003
++++ /dev/null	Mon Apr 14 06:10:35 2003
+@@ -1,287 +0,0 @@
+-/*************************************************************************
+- *
+- *  $RCSfile: giflzwc.cxx,v $
+- *
+- *  $Revision: 1.1.1.1 $
+- *
+- *  last change: $Author: hr $ $Date: 2000/09/18 16:30:11 $
+- *
+- *  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 <tools/stream.hxx>
+-#include "giflzwc.hxx"
+-
+-// ----------------------------
+-// - GIFImageDataOutputStream -
+-// ----------------------------
+-
+-class GIFImageDataOutputStream
+-{
+-private:
+-
+-	void		FlushBlockBuf();
+-	inline void	FlushBitsBufsFullBytes();
+-
+-	SvStream&	rStream;
+-	BYTE*		pBlockBuf;
+-	BYTE		nBlockBufSize;
+-	ULONG		nBitsBuf;
+-	USHORT		nBitsBufSize;
+-
+-public:
+-
+-				GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize );
+-				~GIFImageDataOutputStream();
+-
+-	inline void	WriteBits( USHORT nCode, USHORT nCodeLen );
+-};
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
+-{
+-	while (nBitsBufSize>=8)
+-	{
+-		if( nBlockBufSize==255 )
+-			FlushBlockBuf();
+-
+-		pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf;
+-		nBitsBuf >>= 8;
+-		nBitsBufSize -= 8;
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen )
+-{
+-	if( nBitsBufSize+nCodeLen>32 )
+-		FlushBitsBufsFullBytes();
+-
+-	nBitsBuf |= (ULONG) nCode << nBitsBufSize;
+-	nBitsBufSize += nCodeLen;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) :
+-		rStream(rGIF)
+-{
+-	pBlockBuf = new BYTE[ 255 ];
+-	nBlockBufSize = 0;
+-	nBitsBufSize = 0;
+-	nBitsBuf = 0;
+-	rStream << nLZWDataSize;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-
+-GIFImageDataOutputStream::~GIFImageDataOutputStream()
+-{
+-	WriteBits(0,7);
+-	FlushBitsBufsFullBytes();
+-	FlushBlockBuf();
+-	rStream << (BYTE)0;
+-	delete[] pBlockBuf;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFImageDataOutputStream::FlushBlockBuf()
+-{
+-	if( nBlockBufSize )
+-	{
+-		rStream << (BYTE) nBlockBufSize;
+-		rStream.Write( pBlockBuf,nBlockBufSize );
+-		nBlockBufSize = 0;
+-	}
+-}
+-
+-// -------------------
+-// - GIFLZWCTreeNode -
+-// -------------------
+-
+-struct GIFLZWCTreeNode
+-{
+-
+-	GIFLZWCTreeNode*	pBrother;		// naechster Knoten, der den selben Vater hat
+-	GIFLZWCTreeNode*	pFirstChild;	// erster Sohn
+-	USHORT				nCode;			// Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
+-	USHORT				nValue;			// Der Pixelwert
+-};
+-
+-// --------------------
+-// - GIFLZWCompressor -
+-// --------------------
+-
+-GIFLZWCompressor::GIFLZWCompressor()
+-{
+-	pIDOS=NULL;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFLZWCompressor::~GIFLZWCompressor()
+-{
+-	if (pIDOS!=NULL) EndCompression();
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
+-{
+-	if( !pIDOS )
+-	{
+-		USHORT i;
+-
+-		nDataSize = nPixelSize;
+-
+-		if( nDataSize < 2 )
+-			nDataSize=2;
+-
+-		nClearCode=1<<nDataSize;
+-		nEOICode=nClearCode+1;
+-		nTableSize=nEOICode+1;
+-		nCodeSize=nDataSize+1;
+-
+-		pIDOS=new GIFImageDataOutputStream(rGIF,(BYTE)nDataSize);
+-		pTable=new GIFLZWCTreeNode[4096];
+-
+-		for (i=0; i<4096; i++)
+-		{
+-			pTable[i].pBrother = pTable[i].pFirstChild = NULL;
+-			pTable[i].nValue = (BYTE) ( pTable[i].nCode = i );
+-		}
+-
+-		pPrefix = NULL;
+-		pIDOS->WriteBits( nClearCode,nCodeSize );
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
+-{
+-	if( pIDOS )
+-	{
+-		GIFLZWCTreeNode*	p;
+-		USHORT				i;
+-		BYTE				nV;
+-
+-		if( !pPrefix && nSize )
+-		{
+-			pPrefix=pTable+(*pSrc++);
+-			nSize--;
+-		}
+-
+-		while( nSize )
+-		{
+-			nSize--;
+-			nV=*pSrc++;
+-			for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother )
+-			{
+-				if (p->nValue==nV)
+-					break;
+-			}
+-
+-			if( p)
+-				pPrefix=p;
+-			else
+-			{
+-				pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-				if (nTableSize==4096)
+-				{
+-					pIDOS->WriteBits(nClearCode,nCodeSize);
+-
+-					for (i=0; i<nClearCode; i++)
+-						pTable[i].pFirstChild=NULL;
+-
+-					nCodeSize=nDataSize+1;
+-					nTableSize=nEOICode+1;
+-				}
+-				else
+-				{
+-					if(nTableSize==(USHORT)(1<<nCodeSize))
+-						nCodeSize++;
+-
+-					p=pTable+(nTableSize++);
+-					p->pBrother=pPrefix->pFirstChild;
+-					pPrefix->pFirstChild=p;
+-					p->nValue=nV;
+-					p->pFirstChild=NULL;
+-				}
+-
+-				pPrefix=pTable+nV;
+-			}
+-		}
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::EndCompression()
+-{
+-	if( pIDOS )
+-	{
+-		if( pPrefix )
+-			pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-		pIDOS->WriteBits( nEOICode,nCodeSize );
+-		delete[] pTable;
+-		delete pIDOS;
+-		pIDOS=NULL;
+-	}
+-}
diff --git a/editors/openoffice-1.1/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx b/editors/openoffice-1.1/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
new file mode 100644
index 000000000000..223277a5cd7e
--- /dev/null
+++ b/editors/openoffice-1.1/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
@@ -0,0 +1,45 @@
+--- /dev/null	1970-01-01 01:00:00.000000000 +0100
++++ ../goodies/source/filter.vcl/egif/giflzwc_disabled.cxx	2002-08-15 15:09:47.000000000 +0200
+@@ -0,0 +1,42 @@
++/**********************************
++ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed.
++ **********************************/ 
++
++//#include <tools/stream.hxx>
++#include "giflzwc.hxx"
++
++// --------------------
++// - GIFLZWCompressor -
++// --------------------
++
++GIFLZWCompressor::GIFLZWCompressor()
++{
++	pIDOS=NULL;
++}
++
++// ------------------------------------------------------------------------
++
++GIFLZWCompressor::~GIFLZWCompressor()
++{
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::EndCompression()
++{
++	/********************** DISABLED *************************/
++}
diff --git a/editors/openoffice-1.1/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk b/editors/openoffice-1.1/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
new file mode 100644
index 000000000000..dd9e199acc96
--- /dev/null
+++ b/editors/openoffice-1.1/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
@@ -0,0 +1,11 @@
+--- ../goodies/source/filter.vcl/egif/makefile.mk.orig	Tue Aug 14 23:22:54 2001
++++ ../goodies/source/filter.vcl/egif/makefile.mk	Mon Apr 14 06:04:55 2003
+@@ -89,7 +89,7 @@
+ 
+ SLOFILES= 	$(SLO)$/egif.obj		\
+ 		$(SLO)$/dlgegif.obj	\
+-		$(SLO)$/giflzwc.obj
++		$(SLO)$/giflzwc_disabled.obj
+ 
+ 
+ # ==========================================================================
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index 5bb04213c156..79351770f737 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -246,6 +246,15 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@${ECHO}
+	@${ECHO} "You may set WITH_GIF_LZW_COMPRESSION=YES"
+	@${ECHO} "If you want to make compressed gif images"
+	@${ECHO}
+	@${ECHO} "If must have license from the Unisys and IBM patents"
+	@${ECHO} "to enable this option to get compressed GIF images."
+	@${ECHO}
+.endif
 .if ${OSVERSION} < 450002
 	@${ECHO}
 	@${ECHO} "OS-VERSION ${OSVERSION} too low"
@@ -358,6 +367,17 @@ post-patch:
 		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
 	fi
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@if [ "`echo ${PATCHDIR}/gifpatch-*`" != "${PATCHDIR}/gifpatch-*" ]; then \
+		${ECHO_MSG} "===>  Removing GIF LZW compression for ${PKGNAME}" ; \
+		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
+			${ECHO_MSG} "===>   Applying GIF LZW compression ${OPSYS} patch" ; \
+		fi; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \
+	fi
+.endif
 .if defined(WITH_DEBUG)
 	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
@@ -502,6 +522,8 @@ pre-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
 	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
 	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
+	@${CP}	${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
diff --git a/editors/openoffice-2.0-devel/distinfo b/editors/openoffice-2.0-devel/distinfo
index 0004033ec259..a55458016a47 100644
--- a/editors/openoffice-2.0-devel/distinfo
+++ b/editors/openoffice-2.0-devel/distinfo
@@ -7,3 +7,4 @@ 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/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
diff --git a/editors/openoffice-2.0-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx b/editors/openoffice-2.0-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
new file mode 100644
index 000000000000..0fcdf289cca3
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
@@ -0,0 +1,290 @@
+--- ../goodies/source/filter.vcl/egif/giflzwc.cxx	Sun Apr 13 14:33:24 2003
++++ /dev/null	Mon Apr 14 06:10:35 2003
+@@ -1,287 +0,0 @@
+-/*************************************************************************
+- *
+- *  $RCSfile: giflzwc.cxx,v $
+- *
+- *  $Revision: 1.1.1.1 $
+- *
+- *  last change: $Author: hr $ $Date: 2000/09/18 16:30:11 $
+- *
+- *  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 <tools/stream.hxx>
+-#include "giflzwc.hxx"
+-
+-// ----------------------------
+-// - GIFImageDataOutputStream -
+-// ----------------------------
+-
+-class GIFImageDataOutputStream
+-{
+-private:
+-
+-	void		FlushBlockBuf();
+-	inline void	FlushBitsBufsFullBytes();
+-
+-	SvStream&	rStream;
+-	BYTE*		pBlockBuf;
+-	BYTE		nBlockBufSize;
+-	ULONG		nBitsBuf;
+-	USHORT		nBitsBufSize;
+-
+-public:
+-
+-				GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize );
+-				~GIFImageDataOutputStream();
+-
+-	inline void	WriteBits( USHORT nCode, USHORT nCodeLen );
+-};
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
+-{
+-	while (nBitsBufSize>=8)
+-	{
+-		if( nBlockBufSize==255 )
+-			FlushBlockBuf();
+-
+-		pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf;
+-		nBitsBuf >>= 8;
+-		nBitsBufSize -= 8;
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen )
+-{
+-	if( nBitsBufSize+nCodeLen>32 )
+-		FlushBitsBufsFullBytes();
+-
+-	nBitsBuf |= (ULONG) nCode << nBitsBufSize;
+-	nBitsBufSize += nCodeLen;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) :
+-		rStream(rGIF)
+-{
+-	pBlockBuf = new BYTE[ 255 ];
+-	nBlockBufSize = 0;
+-	nBitsBufSize = 0;
+-	nBitsBuf = 0;
+-	rStream << nLZWDataSize;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-
+-GIFImageDataOutputStream::~GIFImageDataOutputStream()
+-{
+-	WriteBits(0,7);
+-	FlushBitsBufsFullBytes();
+-	FlushBlockBuf();
+-	rStream << (BYTE)0;
+-	delete[] pBlockBuf;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFImageDataOutputStream::FlushBlockBuf()
+-{
+-	if( nBlockBufSize )
+-	{
+-		rStream << (BYTE) nBlockBufSize;
+-		rStream.Write( pBlockBuf,nBlockBufSize );
+-		nBlockBufSize = 0;
+-	}
+-}
+-
+-// -------------------
+-// - GIFLZWCTreeNode -
+-// -------------------
+-
+-struct GIFLZWCTreeNode
+-{
+-
+-	GIFLZWCTreeNode*	pBrother;		// naechster Knoten, der den selben Vater hat
+-	GIFLZWCTreeNode*	pFirstChild;	// erster Sohn
+-	USHORT				nCode;			// Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
+-	USHORT				nValue;			// Der Pixelwert
+-};
+-
+-// --------------------
+-// - GIFLZWCompressor -
+-// --------------------
+-
+-GIFLZWCompressor::GIFLZWCompressor()
+-{
+-	pIDOS=NULL;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFLZWCompressor::~GIFLZWCompressor()
+-{
+-	if (pIDOS!=NULL) EndCompression();
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
+-{
+-	if( !pIDOS )
+-	{
+-		USHORT i;
+-
+-		nDataSize = nPixelSize;
+-
+-		if( nDataSize < 2 )
+-			nDataSize=2;
+-
+-		nClearCode=1<<nDataSize;
+-		nEOICode=nClearCode+1;
+-		nTableSize=nEOICode+1;
+-		nCodeSize=nDataSize+1;
+-
+-		pIDOS=new GIFImageDataOutputStream(rGIF,(BYTE)nDataSize);
+-		pTable=new GIFLZWCTreeNode[4096];
+-
+-		for (i=0; i<4096; i++)
+-		{
+-			pTable[i].pBrother = pTable[i].pFirstChild = NULL;
+-			pTable[i].nValue = (BYTE) ( pTable[i].nCode = i );
+-		}
+-
+-		pPrefix = NULL;
+-		pIDOS->WriteBits( nClearCode,nCodeSize );
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
+-{
+-	if( pIDOS )
+-	{
+-		GIFLZWCTreeNode*	p;
+-		USHORT				i;
+-		BYTE				nV;
+-
+-		if( !pPrefix && nSize )
+-		{
+-			pPrefix=pTable+(*pSrc++);
+-			nSize--;
+-		}
+-
+-		while( nSize )
+-		{
+-			nSize--;
+-			nV=*pSrc++;
+-			for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother )
+-			{
+-				if (p->nValue==nV)
+-					break;
+-			}
+-
+-			if( p)
+-				pPrefix=p;
+-			else
+-			{
+-				pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-				if (nTableSize==4096)
+-				{
+-					pIDOS->WriteBits(nClearCode,nCodeSize);
+-
+-					for (i=0; i<nClearCode; i++)
+-						pTable[i].pFirstChild=NULL;
+-
+-					nCodeSize=nDataSize+1;
+-					nTableSize=nEOICode+1;
+-				}
+-				else
+-				{
+-					if(nTableSize==(USHORT)(1<<nCodeSize))
+-						nCodeSize++;
+-
+-					p=pTable+(nTableSize++);
+-					p->pBrother=pPrefix->pFirstChild;
+-					pPrefix->pFirstChild=p;
+-					p->nValue=nV;
+-					p->pFirstChild=NULL;
+-				}
+-
+-				pPrefix=pTable+nV;
+-			}
+-		}
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::EndCompression()
+-{
+-	if( pIDOS )
+-	{
+-		if( pPrefix )
+-			pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-		pIDOS->WriteBits( nEOICode,nCodeSize );
+-		delete[] pTable;
+-		delete pIDOS;
+-		pIDOS=NULL;
+-	}
+-}
diff --git a/editors/openoffice-2.0-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx b/editors/openoffice-2.0-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
new file mode 100644
index 000000000000..223277a5cd7e
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
@@ -0,0 +1,45 @@
+--- /dev/null	1970-01-01 01:00:00.000000000 +0100
++++ ../goodies/source/filter.vcl/egif/giflzwc_disabled.cxx	2002-08-15 15:09:47.000000000 +0200
+@@ -0,0 +1,42 @@
++/**********************************
++ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed.
++ **********************************/ 
++
++//#include <tools/stream.hxx>
++#include "giflzwc.hxx"
++
++// --------------------
++// - GIFLZWCompressor -
++// --------------------
++
++GIFLZWCompressor::GIFLZWCompressor()
++{
++	pIDOS=NULL;
++}
++
++// ------------------------------------------------------------------------
++
++GIFLZWCompressor::~GIFLZWCompressor()
++{
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::EndCompression()
++{
++	/********************** DISABLED *************************/
++}
diff --git a/editors/openoffice-2.0-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk b/editors/openoffice-2.0-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
new file mode 100644
index 000000000000..dd9e199acc96
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
@@ -0,0 +1,11 @@
+--- ../goodies/source/filter.vcl/egif/makefile.mk.orig	Tue Aug 14 23:22:54 2001
++++ ../goodies/source/filter.vcl/egif/makefile.mk	Mon Apr 14 06:04:55 2003
+@@ -89,7 +89,7 @@
+ 
+ SLOFILES= 	$(SLO)$/egif.obj		\
+ 		$(SLO)$/dlgegif.obj	\
+-		$(SLO)$/giflzwc.obj
++		$(SLO)$/giflzwc_disabled.obj
+ 
+ 
+ # ==========================================================================
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 5bb04213c156..79351770f737 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -246,6 +246,15 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@${ECHO}
+	@${ECHO} "You may set WITH_GIF_LZW_COMPRESSION=YES"
+	@${ECHO} "If you want to make compressed gif images"
+	@${ECHO}
+	@${ECHO} "If must have license from the Unisys and IBM patents"
+	@${ECHO} "to enable this option to get compressed GIF images."
+	@${ECHO}
+.endif
 .if ${OSVERSION} < 450002
 	@${ECHO}
 	@${ECHO} "OS-VERSION ${OSVERSION} too low"
@@ -358,6 +367,17 @@ post-patch:
 		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
 	fi
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@if [ "`echo ${PATCHDIR}/gifpatch-*`" != "${PATCHDIR}/gifpatch-*" ]; then \
+		${ECHO_MSG} "===>  Removing GIF LZW compression for ${PKGNAME}" ; \
+		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
+			${ECHO_MSG} "===>   Applying GIF LZW compression ${OPSYS} patch" ; \
+		fi; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \
+	fi
+.endif
 .if defined(WITH_DEBUG)
 	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
@@ -502,6 +522,8 @@ pre-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
 	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
 	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
+	@${CP}	${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 0004033ec259..a55458016a47 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -7,3 +7,4 @@ 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/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
diff --git a/editors/openoffice-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx b/editors/openoffice-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
new file mode 100644
index 000000000000..0fcdf289cca3
--- /dev/null
+++ b/editors/openoffice-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
@@ -0,0 +1,290 @@
+--- ../goodies/source/filter.vcl/egif/giflzwc.cxx	Sun Apr 13 14:33:24 2003
++++ /dev/null	Mon Apr 14 06:10:35 2003
+@@ -1,287 +0,0 @@
+-/*************************************************************************
+- *
+- *  $RCSfile: giflzwc.cxx,v $
+- *
+- *  $Revision: 1.1.1.1 $
+- *
+- *  last change: $Author: hr $ $Date: 2000/09/18 16:30:11 $
+- *
+- *  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 <tools/stream.hxx>
+-#include "giflzwc.hxx"
+-
+-// ----------------------------
+-// - GIFImageDataOutputStream -
+-// ----------------------------
+-
+-class GIFImageDataOutputStream
+-{
+-private:
+-
+-	void		FlushBlockBuf();
+-	inline void	FlushBitsBufsFullBytes();
+-
+-	SvStream&	rStream;
+-	BYTE*		pBlockBuf;
+-	BYTE		nBlockBufSize;
+-	ULONG		nBitsBuf;
+-	USHORT		nBitsBufSize;
+-
+-public:
+-
+-				GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize );
+-				~GIFImageDataOutputStream();
+-
+-	inline void	WriteBits( USHORT nCode, USHORT nCodeLen );
+-};
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
+-{
+-	while (nBitsBufSize>=8)
+-	{
+-		if( nBlockBufSize==255 )
+-			FlushBlockBuf();
+-
+-		pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf;
+-		nBitsBuf >>= 8;
+-		nBitsBufSize -= 8;
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen )
+-{
+-	if( nBitsBufSize+nCodeLen>32 )
+-		FlushBitsBufsFullBytes();
+-
+-	nBitsBuf |= (ULONG) nCode << nBitsBufSize;
+-	nBitsBufSize += nCodeLen;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) :
+-		rStream(rGIF)
+-{
+-	pBlockBuf = new BYTE[ 255 ];
+-	nBlockBufSize = 0;
+-	nBitsBufSize = 0;
+-	nBitsBuf = 0;
+-	rStream << nLZWDataSize;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-
+-GIFImageDataOutputStream::~GIFImageDataOutputStream()
+-{
+-	WriteBits(0,7);
+-	FlushBitsBufsFullBytes();
+-	FlushBlockBuf();
+-	rStream << (BYTE)0;
+-	delete[] pBlockBuf;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFImageDataOutputStream::FlushBlockBuf()
+-{
+-	if( nBlockBufSize )
+-	{
+-		rStream << (BYTE) nBlockBufSize;
+-		rStream.Write( pBlockBuf,nBlockBufSize );
+-		nBlockBufSize = 0;
+-	}
+-}
+-
+-// -------------------
+-// - GIFLZWCTreeNode -
+-// -------------------
+-
+-struct GIFLZWCTreeNode
+-{
+-
+-	GIFLZWCTreeNode*	pBrother;		// naechster Knoten, der den selben Vater hat
+-	GIFLZWCTreeNode*	pFirstChild;	// erster Sohn
+-	USHORT				nCode;			// Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
+-	USHORT				nValue;			// Der Pixelwert
+-};
+-
+-// --------------------
+-// - GIFLZWCompressor -
+-// --------------------
+-
+-GIFLZWCompressor::GIFLZWCompressor()
+-{
+-	pIDOS=NULL;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFLZWCompressor::~GIFLZWCompressor()
+-{
+-	if (pIDOS!=NULL) EndCompression();
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
+-{
+-	if( !pIDOS )
+-	{
+-		USHORT i;
+-
+-		nDataSize = nPixelSize;
+-
+-		if( nDataSize < 2 )
+-			nDataSize=2;
+-
+-		nClearCode=1<<nDataSize;
+-		nEOICode=nClearCode+1;
+-		nTableSize=nEOICode+1;
+-		nCodeSize=nDataSize+1;
+-
+-		pIDOS=new GIFImageDataOutputStream(rGIF,(BYTE)nDataSize);
+-		pTable=new GIFLZWCTreeNode[4096];
+-
+-		for (i=0; i<4096; i++)
+-		{
+-			pTable[i].pBrother = pTable[i].pFirstChild = NULL;
+-			pTable[i].nValue = (BYTE) ( pTable[i].nCode = i );
+-		}
+-
+-		pPrefix = NULL;
+-		pIDOS->WriteBits( nClearCode,nCodeSize );
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
+-{
+-	if( pIDOS )
+-	{
+-		GIFLZWCTreeNode*	p;
+-		USHORT				i;
+-		BYTE				nV;
+-
+-		if( !pPrefix && nSize )
+-		{
+-			pPrefix=pTable+(*pSrc++);
+-			nSize--;
+-		}
+-
+-		while( nSize )
+-		{
+-			nSize--;
+-			nV=*pSrc++;
+-			for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother )
+-			{
+-				if (p->nValue==nV)
+-					break;
+-			}
+-
+-			if( p)
+-				pPrefix=p;
+-			else
+-			{
+-				pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-				if (nTableSize==4096)
+-				{
+-					pIDOS->WriteBits(nClearCode,nCodeSize);
+-
+-					for (i=0; i<nClearCode; i++)
+-						pTable[i].pFirstChild=NULL;
+-
+-					nCodeSize=nDataSize+1;
+-					nTableSize=nEOICode+1;
+-				}
+-				else
+-				{
+-					if(nTableSize==(USHORT)(1<<nCodeSize))
+-						nCodeSize++;
+-
+-					p=pTable+(nTableSize++);
+-					p->pBrother=pPrefix->pFirstChild;
+-					pPrefix->pFirstChild=p;
+-					p->nValue=nV;
+-					p->pFirstChild=NULL;
+-				}
+-
+-				pPrefix=pTable+nV;
+-			}
+-		}
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::EndCompression()
+-{
+-	if( pIDOS )
+-	{
+-		if( pPrefix )
+-			pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-		pIDOS->WriteBits( nEOICode,nCodeSize );
+-		delete[] pTable;
+-		delete pIDOS;
+-		pIDOS=NULL;
+-	}
+-}
diff --git a/editors/openoffice-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx b/editors/openoffice-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
new file mode 100644
index 000000000000..223277a5cd7e
--- /dev/null
+++ b/editors/openoffice-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
@@ -0,0 +1,45 @@
+--- /dev/null	1970-01-01 01:00:00.000000000 +0100
++++ ../goodies/source/filter.vcl/egif/giflzwc_disabled.cxx	2002-08-15 15:09:47.000000000 +0200
+@@ -0,0 +1,42 @@
++/**********************************
++ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed.
++ **********************************/ 
++
++//#include <tools/stream.hxx>
++#include "giflzwc.hxx"
++
++// --------------------
++// - GIFLZWCompressor -
++// --------------------
++
++GIFLZWCompressor::GIFLZWCompressor()
++{
++	pIDOS=NULL;
++}
++
++// ------------------------------------------------------------------------
++
++GIFLZWCompressor::~GIFLZWCompressor()
++{
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::EndCompression()
++{
++	/********************** DISABLED *************************/
++}
diff --git a/editors/openoffice-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk b/editors/openoffice-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
new file mode 100644
index 000000000000..dd9e199acc96
--- /dev/null
+++ b/editors/openoffice-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
@@ -0,0 +1,11 @@
+--- ../goodies/source/filter.vcl/egif/makefile.mk.orig	Tue Aug 14 23:22:54 2001
++++ ../goodies/source/filter.vcl/egif/makefile.mk	Mon Apr 14 06:04:55 2003
+@@ -89,7 +89,7 @@
+ 
+ SLOFILES= 	$(SLO)$/egif.obj		\
+ 		$(SLO)$/dlgegif.obj	\
+-		$(SLO)$/giflzwc.obj
++		$(SLO)$/giflzwc_disabled.obj
+ 
+ 
+ # ==========================================================================
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 5bb04213c156..79351770f737 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -246,6 +246,15 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@${ECHO}
+	@${ECHO} "You may set WITH_GIF_LZW_COMPRESSION=YES"
+	@${ECHO} "If you want to make compressed gif images"
+	@${ECHO}
+	@${ECHO} "If must have license from the Unisys and IBM patents"
+	@${ECHO} "to enable this option to get compressed GIF images."
+	@${ECHO}
+.endif
 .if ${OSVERSION} < 450002
 	@${ECHO}
 	@${ECHO} "OS-VERSION ${OSVERSION} too low"
@@ -358,6 +367,17 @@ post-patch:
 		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
 	fi
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@if [ "`echo ${PATCHDIR}/gifpatch-*`" != "${PATCHDIR}/gifpatch-*" ]; then \
+		${ECHO_MSG} "===>  Removing GIF LZW compression for ${PKGNAME}" ; \
+		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
+			${ECHO_MSG} "===>   Applying GIF LZW compression ${OPSYS} patch" ; \
+		fi; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \
+	fi
+.endif
 .if defined(WITH_DEBUG)
 	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
@@ -502,6 +522,8 @@ pre-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
 	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
 	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
+	@${CP}	${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index 0004033ec259..a55458016a47 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -7,3 +7,4 @@ 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/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
diff --git a/editors/openoffice-3/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx b/editors/openoffice-3/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
new file mode 100644
index 000000000000..0fcdf289cca3
--- /dev/null
+++ b/editors/openoffice-3/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
@@ -0,0 +1,290 @@
+--- ../goodies/source/filter.vcl/egif/giflzwc.cxx	Sun Apr 13 14:33:24 2003
++++ /dev/null	Mon Apr 14 06:10:35 2003
+@@ -1,287 +0,0 @@
+-/*************************************************************************
+- *
+- *  $RCSfile: giflzwc.cxx,v $
+- *
+- *  $Revision: 1.1.1.1 $
+- *
+- *  last change: $Author: hr $ $Date: 2000/09/18 16:30:11 $
+- *
+- *  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 <tools/stream.hxx>
+-#include "giflzwc.hxx"
+-
+-// ----------------------------
+-// - GIFImageDataOutputStream -
+-// ----------------------------
+-
+-class GIFImageDataOutputStream
+-{
+-private:
+-
+-	void		FlushBlockBuf();
+-	inline void	FlushBitsBufsFullBytes();
+-
+-	SvStream&	rStream;
+-	BYTE*		pBlockBuf;
+-	BYTE		nBlockBufSize;
+-	ULONG		nBitsBuf;
+-	USHORT		nBitsBufSize;
+-
+-public:
+-
+-				GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize );
+-				~GIFImageDataOutputStream();
+-
+-	inline void	WriteBits( USHORT nCode, USHORT nCodeLen );
+-};
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
+-{
+-	while (nBitsBufSize>=8)
+-	{
+-		if( nBlockBufSize==255 )
+-			FlushBlockBuf();
+-
+-		pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf;
+-		nBitsBuf >>= 8;
+-		nBitsBufSize -= 8;
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen )
+-{
+-	if( nBitsBufSize+nCodeLen>32 )
+-		FlushBitsBufsFullBytes();
+-
+-	nBitsBuf |= (ULONG) nCode << nBitsBufSize;
+-	nBitsBufSize += nCodeLen;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) :
+-		rStream(rGIF)
+-{
+-	pBlockBuf = new BYTE[ 255 ];
+-	nBlockBufSize = 0;
+-	nBitsBufSize = 0;
+-	nBitsBuf = 0;
+-	rStream << nLZWDataSize;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-
+-GIFImageDataOutputStream::~GIFImageDataOutputStream()
+-{
+-	WriteBits(0,7);
+-	FlushBitsBufsFullBytes();
+-	FlushBlockBuf();
+-	rStream << (BYTE)0;
+-	delete[] pBlockBuf;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFImageDataOutputStream::FlushBlockBuf()
+-{
+-	if( nBlockBufSize )
+-	{
+-		rStream << (BYTE) nBlockBufSize;
+-		rStream.Write( pBlockBuf,nBlockBufSize );
+-		nBlockBufSize = 0;
+-	}
+-}
+-
+-// -------------------
+-// - GIFLZWCTreeNode -
+-// -------------------
+-
+-struct GIFLZWCTreeNode
+-{
+-
+-	GIFLZWCTreeNode*	pBrother;		// naechster Knoten, der den selben Vater hat
+-	GIFLZWCTreeNode*	pFirstChild;	// erster Sohn
+-	USHORT				nCode;			// Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
+-	USHORT				nValue;			// Der Pixelwert
+-};
+-
+-// --------------------
+-// - GIFLZWCompressor -
+-// --------------------
+-
+-GIFLZWCompressor::GIFLZWCompressor()
+-{
+-	pIDOS=NULL;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFLZWCompressor::~GIFLZWCompressor()
+-{
+-	if (pIDOS!=NULL) EndCompression();
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
+-{
+-	if( !pIDOS )
+-	{
+-		USHORT i;
+-
+-		nDataSize = nPixelSize;
+-
+-		if( nDataSize < 2 )
+-			nDataSize=2;
+-
+-		nClearCode=1<<nDataSize;
+-		nEOICode=nClearCode+1;
+-		nTableSize=nEOICode+1;
+-		nCodeSize=nDataSize+1;
+-
+-		pIDOS=new GIFImageDataOutputStream(rGIF,(BYTE)nDataSize);
+-		pTable=new GIFLZWCTreeNode[4096];
+-
+-		for (i=0; i<4096; i++)
+-		{
+-			pTable[i].pBrother = pTable[i].pFirstChild = NULL;
+-			pTable[i].nValue = (BYTE) ( pTable[i].nCode = i );
+-		}
+-
+-		pPrefix = NULL;
+-		pIDOS->WriteBits( nClearCode,nCodeSize );
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
+-{
+-	if( pIDOS )
+-	{
+-		GIFLZWCTreeNode*	p;
+-		USHORT				i;
+-		BYTE				nV;
+-
+-		if( !pPrefix && nSize )
+-		{
+-			pPrefix=pTable+(*pSrc++);
+-			nSize--;
+-		}
+-
+-		while( nSize )
+-		{
+-			nSize--;
+-			nV=*pSrc++;
+-			for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother )
+-			{
+-				if (p->nValue==nV)
+-					break;
+-			}
+-
+-			if( p)
+-				pPrefix=p;
+-			else
+-			{
+-				pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-				if (nTableSize==4096)
+-				{
+-					pIDOS->WriteBits(nClearCode,nCodeSize);
+-
+-					for (i=0; i<nClearCode; i++)
+-						pTable[i].pFirstChild=NULL;
+-
+-					nCodeSize=nDataSize+1;
+-					nTableSize=nEOICode+1;
+-				}
+-				else
+-				{
+-					if(nTableSize==(USHORT)(1<<nCodeSize))
+-						nCodeSize++;
+-
+-					p=pTable+(nTableSize++);
+-					p->pBrother=pPrefix->pFirstChild;
+-					pPrefix->pFirstChild=p;
+-					p->nValue=nV;
+-					p->pFirstChild=NULL;
+-				}
+-
+-				pPrefix=pTable+nV;
+-			}
+-		}
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::EndCompression()
+-{
+-	if( pIDOS )
+-	{
+-		if( pPrefix )
+-			pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-		pIDOS->WriteBits( nEOICode,nCodeSize );
+-		delete[] pTable;
+-		delete pIDOS;
+-		pIDOS=NULL;
+-	}
+-}
diff --git a/editors/openoffice-3/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx b/editors/openoffice-3/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
new file mode 100644
index 000000000000..223277a5cd7e
--- /dev/null
+++ b/editors/openoffice-3/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
@@ -0,0 +1,45 @@
+--- /dev/null	1970-01-01 01:00:00.000000000 +0100
++++ ../goodies/source/filter.vcl/egif/giflzwc_disabled.cxx	2002-08-15 15:09:47.000000000 +0200
+@@ -0,0 +1,42 @@
++/**********************************
++ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed.
++ **********************************/ 
++
++//#include <tools/stream.hxx>
++#include "giflzwc.hxx"
++
++// --------------------
++// - GIFLZWCompressor -
++// --------------------
++
++GIFLZWCompressor::GIFLZWCompressor()
++{
++	pIDOS=NULL;
++}
++
++// ------------------------------------------------------------------------
++
++GIFLZWCompressor::~GIFLZWCompressor()
++{
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::EndCompression()
++{
++	/********************** DISABLED *************************/
++}
diff --git a/editors/openoffice-3/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk b/editors/openoffice-3/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
new file mode 100644
index 000000000000..dd9e199acc96
--- /dev/null
+++ b/editors/openoffice-3/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
@@ -0,0 +1,11 @@
+--- ../goodies/source/filter.vcl/egif/makefile.mk.orig	Tue Aug 14 23:22:54 2001
++++ ../goodies/source/filter.vcl/egif/makefile.mk	Mon Apr 14 06:04:55 2003
+@@ -89,7 +89,7 @@
+ 
+ SLOFILES= 	$(SLO)$/egif.obj		\
+ 		$(SLO)$/dlgegif.obj	\
+-		$(SLO)$/giflzwc.obj
++		$(SLO)$/giflzwc_disabled.obj
+ 
+ 
+ # ==========================================================================
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 5bb04213c156..79351770f737 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -246,6 +246,15 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@${ECHO}
+	@${ECHO} "You may set WITH_GIF_LZW_COMPRESSION=YES"
+	@${ECHO} "If you want to make compressed gif images"
+	@${ECHO}
+	@${ECHO} "If must have license from the Unisys and IBM patents"
+	@${ECHO} "to enable this option to get compressed GIF images."
+	@${ECHO}
+.endif
 .if ${OSVERSION} < 450002
 	@${ECHO}
 	@${ECHO} "OS-VERSION ${OSVERSION} too low"
@@ -358,6 +367,17 @@ post-patch:
 		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
 	fi
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@if [ "`echo ${PATCHDIR}/gifpatch-*`" != "${PATCHDIR}/gifpatch-*" ]; then \
+		${ECHO_MSG} "===>  Removing GIF LZW compression for ${PKGNAME}" ; \
+		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
+			${ECHO_MSG} "===>   Applying GIF LZW compression ${OPSYS} patch" ; \
+		fi; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \
+	fi
+.endif
 .if defined(WITH_DEBUG)
 	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
@@ -502,6 +522,8 @@ pre-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
 	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
 	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
+	@${CP}	${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo
index 0004033ec259..a55458016a47 100644
--- a/editors/openoffice-devel/distinfo
+++ b/editors/openoffice-devel/distinfo
@@ -7,3 +7,4 @@ 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/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
diff --git a/editors/openoffice-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx b/editors/openoffice-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
new file mode 100644
index 000000000000..0fcdf289cca3
--- /dev/null
+++ b/editors/openoffice-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
@@ -0,0 +1,290 @@
+--- ../goodies/source/filter.vcl/egif/giflzwc.cxx	Sun Apr 13 14:33:24 2003
++++ /dev/null	Mon Apr 14 06:10:35 2003
+@@ -1,287 +0,0 @@
+-/*************************************************************************
+- *
+- *  $RCSfile: giflzwc.cxx,v $
+- *
+- *  $Revision: 1.1.1.1 $
+- *
+- *  last change: $Author: hr $ $Date: 2000/09/18 16:30:11 $
+- *
+- *  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 <tools/stream.hxx>
+-#include "giflzwc.hxx"
+-
+-// ----------------------------
+-// - GIFImageDataOutputStream -
+-// ----------------------------
+-
+-class GIFImageDataOutputStream
+-{
+-private:
+-
+-	void		FlushBlockBuf();
+-	inline void	FlushBitsBufsFullBytes();
+-
+-	SvStream&	rStream;
+-	BYTE*		pBlockBuf;
+-	BYTE		nBlockBufSize;
+-	ULONG		nBitsBuf;
+-	USHORT		nBitsBufSize;
+-
+-public:
+-
+-				GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize );
+-				~GIFImageDataOutputStream();
+-
+-	inline void	WriteBits( USHORT nCode, USHORT nCodeLen );
+-};
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
+-{
+-	while (nBitsBufSize>=8)
+-	{
+-		if( nBlockBufSize==255 )
+-			FlushBlockBuf();
+-
+-		pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf;
+-		nBitsBuf >>= 8;
+-		nBitsBufSize -= 8;
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen )
+-{
+-	if( nBitsBufSize+nCodeLen>32 )
+-		FlushBitsBufsFullBytes();
+-
+-	nBitsBuf |= (ULONG) nCode << nBitsBufSize;
+-	nBitsBufSize += nCodeLen;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) :
+-		rStream(rGIF)
+-{
+-	pBlockBuf = new BYTE[ 255 ];
+-	nBlockBufSize = 0;
+-	nBitsBufSize = 0;
+-	nBitsBuf = 0;
+-	rStream << nLZWDataSize;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-
+-GIFImageDataOutputStream::~GIFImageDataOutputStream()
+-{
+-	WriteBits(0,7);
+-	FlushBitsBufsFullBytes();
+-	FlushBlockBuf();
+-	rStream << (BYTE)0;
+-	delete[] pBlockBuf;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFImageDataOutputStream::FlushBlockBuf()
+-{
+-	if( nBlockBufSize )
+-	{
+-		rStream << (BYTE) nBlockBufSize;
+-		rStream.Write( pBlockBuf,nBlockBufSize );
+-		nBlockBufSize = 0;
+-	}
+-}
+-
+-// -------------------
+-// - GIFLZWCTreeNode -
+-// -------------------
+-
+-struct GIFLZWCTreeNode
+-{
+-
+-	GIFLZWCTreeNode*	pBrother;		// naechster Knoten, der den selben Vater hat
+-	GIFLZWCTreeNode*	pFirstChild;	// erster Sohn
+-	USHORT				nCode;			// Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
+-	USHORT				nValue;			// Der Pixelwert
+-};
+-
+-// --------------------
+-// - GIFLZWCompressor -
+-// --------------------
+-
+-GIFLZWCompressor::GIFLZWCompressor()
+-{
+-	pIDOS=NULL;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFLZWCompressor::~GIFLZWCompressor()
+-{
+-	if (pIDOS!=NULL) EndCompression();
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
+-{
+-	if( !pIDOS )
+-	{
+-		USHORT i;
+-
+-		nDataSize = nPixelSize;
+-
+-		if( nDataSize < 2 )
+-			nDataSize=2;
+-
+-		nClearCode=1<<nDataSize;
+-		nEOICode=nClearCode+1;
+-		nTableSize=nEOICode+1;
+-		nCodeSize=nDataSize+1;
+-
+-		pIDOS=new GIFImageDataOutputStream(rGIF,(BYTE)nDataSize);
+-		pTable=new GIFLZWCTreeNode[4096];
+-
+-		for (i=0; i<4096; i++)
+-		{
+-			pTable[i].pBrother = pTable[i].pFirstChild = NULL;
+-			pTable[i].nValue = (BYTE) ( pTable[i].nCode = i );
+-		}
+-
+-		pPrefix = NULL;
+-		pIDOS->WriteBits( nClearCode,nCodeSize );
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
+-{
+-	if( pIDOS )
+-	{
+-		GIFLZWCTreeNode*	p;
+-		USHORT				i;
+-		BYTE				nV;
+-
+-		if( !pPrefix && nSize )
+-		{
+-			pPrefix=pTable+(*pSrc++);
+-			nSize--;
+-		}
+-
+-		while( nSize )
+-		{
+-			nSize--;
+-			nV=*pSrc++;
+-			for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother )
+-			{
+-				if (p->nValue==nV)
+-					break;
+-			}
+-
+-			if( p)
+-				pPrefix=p;
+-			else
+-			{
+-				pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-				if (nTableSize==4096)
+-				{
+-					pIDOS->WriteBits(nClearCode,nCodeSize);
+-
+-					for (i=0; i<nClearCode; i++)
+-						pTable[i].pFirstChild=NULL;
+-
+-					nCodeSize=nDataSize+1;
+-					nTableSize=nEOICode+1;
+-				}
+-				else
+-				{
+-					if(nTableSize==(USHORT)(1<<nCodeSize))
+-						nCodeSize++;
+-
+-					p=pTable+(nTableSize++);
+-					p->pBrother=pPrefix->pFirstChild;
+-					pPrefix->pFirstChild=p;
+-					p->nValue=nV;
+-					p->pFirstChild=NULL;
+-				}
+-
+-				pPrefix=pTable+nV;
+-			}
+-		}
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::EndCompression()
+-{
+-	if( pIDOS )
+-	{
+-		if( pPrefix )
+-			pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-		pIDOS->WriteBits( nEOICode,nCodeSize );
+-		delete[] pTable;
+-		delete pIDOS;
+-		pIDOS=NULL;
+-	}
+-}
diff --git a/editors/openoffice-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx b/editors/openoffice-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
new file mode 100644
index 000000000000..223277a5cd7e
--- /dev/null
+++ b/editors/openoffice-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
@@ -0,0 +1,45 @@
+--- /dev/null	1970-01-01 01:00:00.000000000 +0100
++++ ../goodies/source/filter.vcl/egif/giflzwc_disabled.cxx	2002-08-15 15:09:47.000000000 +0200
+@@ -0,0 +1,42 @@
++/**********************************
++ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed.
++ **********************************/ 
++
++//#include <tools/stream.hxx>
++#include "giflzwc.hxx"
++
++// --------------------
++// - GIFLZWCompressor -
++// --------------------
++
++GIFLZWCompressor::GIFLZWCompressor()
++{
++	pIDOS=NULL;
++}
++
++// ------------------------------------------------------------------------
++
++GIFLZWCompressor::~GIFLZWCompressor()
++{
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::EndCompression()
++{
++	/********************** DISABLED *************************/
++}
diff --git a/editors/openoffice-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk b/editors/openoffice-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
new file mode 100644
index 000000000000..dd9e199acc96
--- /dev/null
+++ b/editors/openoffice-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
@@ -0,0 +1,11 @@
+--- ../goodies/source/filter.vcl/egif/makefile.mk.orig	Tue Aug 14 23:22:54 2001
++++ ../goodies/source/filter.vcl/egif/makefile.mk	Mon Apr 14 06:04:55 2003
+@@ -89,7 +89,7 @@
+ 
+ SLOFILES= 	$(SLO)$/egif.obj		\
+ 		$(SLO)$/dlgegif.obj	\
+-		$(SLO)$/giflzwc.obj
++		$(SLO)$/giflzwc_disabled.obj
+ 
+ 
+ # ==========================================================================
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index 5bb04213c156..79351770f737 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -246,6 +246,15 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@${ECHO}
+	@${ECHO} "You may set WITH_GIF_LZW_COMPRESSION=YES"
+	@${ECHO} "If you want to make compressed gif images"
+	@${ECHO}
+	@${ECHO} "If must have license from the Unisys and IBM patents"
+	@${ECHO} "to enable this option to get compressed GIF images."
+	@${ECHO}
+.endif
 .if ${OSVERSION} < 450002
 	@${ECHO}
 	@${ECHO} "OS-VERSION ${OSVERSION} too low"
@@ -358,6 +367,17 @@ post-patch:
 		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
 	fi
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@if [ "`echo ${PATCHDIR}/gifpatch-*`" != "${PATCHDIR}/gifpatch-*" ]; then \
+		${ECHO_MSG} "===>  Removing GIF LZW compression for ${PKGNAME}" ; \
+		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
+			${ECHO_MSG} "===>   Applying GIF LZW compression ${OPSYS} patch" ; \
+		fi; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \
+	fi
+.endif
 .if defined(WITH_DEBUG)
 	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
@@ -502,6 +522,8 @@ pre-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
 	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
 	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
+	@${CP}	${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
diff --git a/editors/openoffice.org-1.1-devel/distinfo b/editors/openoffice.org-1.1-devel/distinfo
index 0004033ec259..a55458016a47 100644
--- a/editors/openoffice.org-1.1-devel/distinfo
+++ b/editors/openoffice.org-1.1-devel/distinfo
@@ -7,3 +7,4 @@ 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/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
diff --git a/editors/openoffice.org-1.1-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx b/editors/openoffice.org-1.1-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
new file mode 100644
index 000000000000..0fcdf289cca3
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
@@ -0,0 +1,290 @@
+--- ../goodies/source/filter.vcl/egif/giflzwc.cxx	Sun Apr 13 14:33:24 2003
++++ /dev/null	Mon Apr 14 06:10:35 2003
+@@ -1,287 +0,0 @@
+-/*************************************************************************
+- *
+- *  $RCSfile: giflzwc.cxx,v $
+- *
+- *  $Revision: 1.1.1.1 $
+- *
+- *  last change: $Author: hr $ $Date: 2000/09/18 16:30:11 $
+- *
+- *  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 <tools/stream.hxx>
+-#include "giflzwc.hxx"
+-
+-// ----------------------------
+-// - GIFImageDataOutputStream -
+-// ----------------------------
+-
+-class GIFImageDataOutputStream
+-{
+-private:
+-
+-	void		FlushBlockBuf();
+-	inline void	FlushBitsBufsFullBytes();
+-
+-	SvStream&	rStream;
+-	BYTE*		pBlockBuf;
+-	BYTE		nBlockBufSize;
+-	ULONG		nBitsBuf;
+-	USHORT		nBitsBufSize;
+-
+-public:
+-
+-				GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize );
+-				~GIFImageDataOutputStream();
+-
+-	inline void	WriteBits( USHORT nCode, USHORT nCodeLen );
+-};
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
+-{
+-	while (nBitsBufSize>=8)
+-	{
+-		if( nBlockBufSize==255 )
+-			FlushBlockBuf();
+-
+-		pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf;
+-		nBitsBuf >>= 8;
+-		nBitsBufSize -= 8;
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen )
+-{
+-	if( nBitsBufSize+nCodeLen>32 )
+-		FlushBitsBufsFullBytes();
+-
+-	nBitsBuf |= (ULONG) nCode << nBitsBufSize;
+-	nBitsBufSize += nCodeLen;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) :
+-		rStream(rGIF)
+-{
+-	pBlockBuf = new BYTE[ 255 ];
+-	nBlockBufSize = 0;
+-	nBitsBufSize = 0;
+-	nBitsBuf = 0;
+-	rStream << nLZWDataSize;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-
+-GIFImageDataOutputStream::~GIFImageDataOutputStream()
+-{
+-	WriteBits(0,7);
+-	FlushBitsBufsFullBytes();
+-	FlushBlockBuf();
+-	rStream << (BYTE)0;
+-	delete[] pBlockBuf;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFImageDataOutputStream::FlushBlockBuf()
+-{
+-	if( nBlockBufSize )
+-	{
+-		rStream << (BYTE) nBlockBufSize;
+-		rStream.Write( pBlockBuf,nBlockBufSize );
+-		nBlockBufSize = 0;
+-	}
+-}
+-
+-// -------------------
+-// - GIFLZWCTreeNode -
+-// -------------------
+-
+-struct GIFLZWCTreeNode
+-{
+-
+-	GIFLZWCTreeNode*	pBrother;		// naechster Knoten, der den selben Vater hat
+-	GIFLZWCTreeNode*	pFirstChild;	// erster Sohn
+-	USHORT				nCode;			// Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
+-	USHORT				nValue;			// Der Pixelwert
+-};
+-
+-// --------------------
+-// - GIFLZWCompressor -
+-// --------------------
+-
+-GIFLZWCompressor::GIFLZWCompressor()
+-{
+-	pIDOS=NULL;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFLZWCompressor::~GIFLZWCompressor()
+-{
+-	if (pIDOS!=NULL) EndCompression();
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
+-{
+-	if( !pIDOS )
+-	{
+-		USHORT i;
+-
+-		nDataSize = nPixelSize;
+-
+-		if( nDataSize < 2 )
+-			nDataSize=2;
+-
+-		nClearCode=1<<nDataSize;
+-		nEOICode=nClearCode+1;
+-		nTableSize=nEOICode+1;
+-		nCodeSize=nDataSize+1;
+-
+-		pIDOS=new GIFImageDataOutputStream(rGIF,(BYTE)nDataSize);
+-		pTable=new GIFLZWCTreeNode[4096];
+-
+-		for (i=0; i<4096; i++)
+-		{
+-			pTable[i].pBrother = pTable[i].pFirstChild = NULL;
+-			pTable[i].nValue = (BYTE) ( pTable[i].nCode = i );
+-		}
+-
+-		pPrefix = NULL;
+-		pIDOS->WriteBits( nClearCode,nCodeSize );
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
+-{
+-	if( pIDOS )
+-	{
+-		GIFLZWCTreeNode*	p;
+-		USHORT				i;
+-		BYTE				nV;
+-
+-		if( !pPrefix && nSize )
+-		{
+-			pPrefix=pTable+(*pSrc++);
+-			nSize--;
+-		}
+-
+-		while( nSize )
+-		{
+-			nSize--;
+-			nV=*pSrc++;
+-			for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother )
+-			{
+-				if (p->nValue==nV)
+-					break;
+-			}
+-
+-			if( p)
+-				pPrefix=p;
+-			else
+-			{
+-				pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-				if (nTableSize==4096)
+-				{
+-					pIDOS->WriteBits(nClearCode,nCodeSize);
+-
+-					for (i=0; i<nClearCode; i++)
+-						pTable[i].pFirstChild=NULL;
+-
+-					nCodeSize=nDataSize+1;
+-					nTableSize=nEOICode+1;
+-				}
+-				else
+-				{
+-					if(nTableSize==(USHORT)(1<<nCodeSize))
+-						nCodeSize++;
+-
+-					p=pTable+(nTableSize++);
+-					p->pBrother=pPrefix->pFirstChild;
+-					pPrefix->pFirstChild=p;
+-					p->nValue=nV;
+-					p->pFirstChild=NULL;
+-				}
+-
+-				pPrefix=pTable+nV;
+-			}
+-		}
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::EndCompression()
+-{
+-	if( pIDOS )
+-	{
+-		if( pPrefix )
+-			pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-		pIDOS->WriteBits( nEOICode,nCodeSize );
+-		delete[] pTable;
+-		delete pIDOS;
+-		pIDOS=NULL;
+-	}
+-}
diff --git a/editors/openoffice.org-1.1-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx b/editors/openoffice.org-1.1-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
new file mode 100644
index 000000000000..223277a5cd7e
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
@@ -0,0 +1,45 @@
+--- /dev/null	1970-01-01 01:00:00.000000000 +0100
++++ ../goodies/source/filter.vcl/egif/giflzwc_disabled.cxx	2002-08-15 15:09:47.000000000 +0200
+@@ -0,0 +1,42 @@
++/**********************************
++ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed.
++ **********************************/ 
++
++//#include <tools/stream.hxx>
++#include "giflzwc.hxx"
++
++// --------------------
++// - GIFLZWCompressor -
++// --------------------
++
++GIFLZWCompressor::GIFLZWCompressor()
++{
++	pIDOS=NULL;
++}
++
++// ------------------------------------------------------------------------
++
++GIFLZWCompressor::~GIFLZWCompressor()
++{
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::EndCompression()
++{
++	/********************** DISABLED *************************/
++}
diff --git a/editors/openoffice.org-1.1-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk b/editors/openoffice.org-1.1-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
new file mode 100644
index 000000000000..dd9e199acc96
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
@@ -0,0 +1,11 @@
+--- ../goodies/source/filter.vcl/egif/makefile.mk.orig	Tue Aug 14 23:22:54 2001
++++ ../goodies/source/filter.vcl/egif/makefile.mk	Mon Apr 14 06:04:55 2003
+@@ -89,7 +89,7 @@
+ 
+ SLOFILES= 	$(SLO)$/egif.obj		\
+ 		$(SLO)$/dlgegif.obj	\
+-		$(SLO)$/giflzwc.obj
++		$(SLO)$/giflzwc_disabled.obj
+ 
+ 
+ # ==========================================================================
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index 5bb04213c156..79351770f737 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -246,6 +246,15 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@${ECHO}
+	@${ECHO} "You may set WITH_GIF_LZW_COMPRESSION=YES"
+	@${ECHO} "If you want to make compressed gif images"
+	@${ECHO}
+	@${ECHO} "If must have license from the Unisys and IBM patents"
+	@${ECHO} "to enable this option to get compressed GIF images."
+	@${ECHO}
+.endif
 .if ${OSVERSION} < 450002
 	@${ECHO}
 	@${ECHO} "OS-VERSION ${OSVERSION} too low"
@@ -358,6 +367,17 @@ post-patch:
 		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
 	fi
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@if [ "`echo ${PATCHDIR}/gifpatch-*`" != "${PATCHDIR}/gifpatch-*" ]; then \
+		${ECHO_MSG} "===>  Removing GIF LZW compression for ${PKGNAME}" ; \
+		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
+			${ECHO_MSG} "===>   Applying GIF LZW compression ${OPSYS} patch" ; \
+		fi; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \
+	fi
+.endif
 .if defined(WITH_DEBUG)
 	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
@@ -502,6 +522,8 @@ pre-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
 	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
 	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
+	@${CP}	${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
diff --git a/editors/openoffice.org-1.1/distinfo b/editors/openoffice.org-1.1/distinfo
index 0004033ec259..a55458016a47 100644
--- a/editors/openoffice.org-1.1/distinfo
+++ b/editors/openoffice.org-1.1/distinfo
@@ -7,3 +7,4 @@ 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/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
diff --git a/editors/openoffice.org-1.1/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx b/editors/openoffice.org-1.1/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
new file mode 100644
index 000000000000..0fcdf289cca3
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
@@ -0,0 +1,290 @@
+--- ../goodies/source/filter.vcl/egif/giflzwc.cxx	Sun Apr 13 14:33:24 2003
++++ /dev/null	Mon Apr 14 06:10:35 2003
+@@ -1,287 +0,0 @@
+-/*************************************************************************
+- *
+- *  $RCSfile: giflzwc.cxx,v $
+- *
+- *  $Revision: 1.1.1.1 $
+- *
+- *  last change: $Author: hr $ $Date: 2000/09/18 16:30:11 $
+- *
+- *  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 <tools/stream.hxx>
+-#include "giflzwc.hxx"
+-
+-// ----------------------------
+-// - GIFImageDataOutputStream -
+-// ----------------------------
+-
+-class GIFImageDataOutputStream
+-{
+-private:
+-
+-	void		FlushBlockBuf();
+-	inline void	FlushBitsBufsFullBytes();
+-
+-	SvStream&	rStream;
+-	BYTE*		pBlockBuf;
+-	BYTE		nBlockBufSize;
+-	ULONG		nBitsBuf;
+-	USHORT		nBitsBufSize;
+-
+-public:
+-
+-				GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize );
+-				~GIFImageDataOutputStream();
+-
+-	inline void	WriteBits( USHORT nCode, USHORT nCodeLen );
+-};
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
+-{
+-	while (nBitsBufSize>=8)
+-	{
+-		if( nBlockBufSize==255 )
+-			FlushBlockBuf();
+-
+-		pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf;
+-		nBitsBuf >>= 8;
+-		nBitsBufSize -= 8;
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen )
+-{
+-	if( nBitsBufSize+nCodeLen>32 )
+-		FlushBitsBufsFullBytes();
+-
+-	nBitsBuf |= (ULONG) nCode << nBitsBufSize;
+-	nBitsBufSize += nCodeLen;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) :
+-		rStream(rGIF)
+-{
+-	pBlockBuf = new BYTE[ 255 ];
+-	nBlockBufSize = 0;
+-	nBitsBufSize = 0;
+-	nBitsBuf = 0;
+-	rStream << nLZWDataSize;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-
+-GIFImageDataOutputStream::~GIFImageDataOutputStream()
+-{
+-	WriteBits(0,7);
+-	FlushBitsBufsFullBytes();
+-	FlushBlockBuf();
+-	rStream << (BYTE)0;
+-	delete[] pBlockBuf;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFImageDataOutputStream::FlushBlockBuf()
+-{
+-	if( nBlockBufSize )
+-	{
+-		rStream << (BYTE) nBlockBufSize;
+-		rStream.Write( pBlockBuf,nBlockBufSize );
+-		nBlockBufSize = 0;
+-	}
+-}
+-
+-// -------------------
+-// - GIFLZWCTreeNode -
+-// -------------------
+-
+-struct GIFLZWCTreeNode
+-{
+-
+-	GIFLZWCTreeNode*	pBrother;		// naechster Knoten, der den selben Vater hat
+-	GIFLZWCTreeNode*	pFirstChild;	// erster Sohn
+-	USHORT				nCode;			// Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
+-	USHORT				nValue;			// Der Pixelwert
+-};
+-
+-// --------------------
+-// - GIFLZWCompressor -
+-// --------------------
+-
+-GIFLZWCompressor::GIFLZWCompressor()
+-{
+-	pIDOS=NULL;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFLZWCompressor::~GIFLZWCompressor()
+-{
+-	if (pIDOS!=NULL) EndCompression();
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
+-{
+-	if( !pIDOS )
+-	{
+-		USHORT i;
+-
+-		nDataSize = nPixelSize;
+-
+-		if( nDataSize < 2 )
+-			nDataSize=2;
+-
+-		nClearCode=1<<nDataSize;
+-		nEOICode=nClearCode+1;
+-		nTableSize=nEOICode+1;
+-		nCodeSize=nDataSize+1;
+-
+-		pIDOS=new GIFImageDataOutputStream(rGIF,(BYTE)nDataSize);
+-		pTable=new GIFLZWCTreeNode[4096];
+-
+-		for (i=0; i<4096; i++)
+-		{
+-			pTable[i].pBrother = pTable[i].pFirstChild = NULL;
+-			pTable[i].nValue = (BYTE) ( pTable[i].nCode = i );
+-		}
+-
+-		pPrefix = NULL;
+-		pIDOS->WriteBits( nClearCode,nCodeSize );
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
+-{
+-	if( pIDOS )
+-	{
+-		GIFLZWCTreeNode*	p;
+-		USHORT				i;
+-		BYTE				nV;
+-
+-		if( !pPrefix && nSize )
+-		{
+-			pPrefix=pTable+(*pSrc++);
+-			nSize--;
+-		}
+-
+-		while( nSize )
+-		{
+-			nSize--;
+-			nV=*pSrc++;
+-			for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother )
+-			{
+-				if (p->nValue==nV)
+-					break;
+-			}
+-
+-			if( p)
+-				pPrefix=p;
+-			else
+-			{
+-				pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-				if (nTableSize==4096)
+-				{
+-					pIDOS->WriteBits(nClearCode,nCodeSize);
+-
+-					for (i=0; i<nClearCode; i++)
+-						pTable[i].pFirstChild=NULL;
+-
+-					nCodeSize=nDataSize+1;
+-					nTableSize=nEOICode+1;
+-				}
+-				else
+-				{
+-					if(nTableSize==(USHORT)(1<<nCodeSize))
+-						nCodeSize++;
+-
+-					p=pTable+(nTableSize++);
+-					p->pBrother=pPrefix->pFirstChild;
+-					pPrefix->pFirstChild=p;
+-					p->nValue=nV;
+-					p->pFirstChild=NULL;
+-				}
+-
+-				pPrefix=pTable+nV;
+-			}
+-		}
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::EndCompression()
+-{
+-	if( pIDOS )
+-	{
+-		if( pPrefix )
+-			pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-		pIDOS->WriteBits( nEOICode,nCodeSize );
+-		delete[] pTable;
+-		delete pIDOS;
+-		pIDOS=NULL;
+-	}
+-}
diff --git a/editors/openoffice.org-1.1/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx b/editors/openoffice.org-1.1/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
new file mode 100644
index 000000000000..223277a5cd7e
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
@@ -0,0 +1,45 @@
+--- /dev/null	1970-01-01 01:00:00.000000000 +0100
++++ ../goodies/source/filter.vcl/egif/giflzwc_disabled.cxx	2002-08-15 15:09:47.000000000 +0200
+@@ -0,0 +1,42 @@
++/**********************************
++ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed.
++ **********************************/ 
++
++//#include <tools/stream.hxx>
++#include "giflzwc.hxx"
++
++// --------------------
++// - GIFLZWCompressor -
++// --------------------
++
++GIFLZWCompressor::GIFLZWCompressor()
++{
++	pIDOS=NULL;
++}
++
++// ------------------------------------------------------------------------
++
++GIFLZWCompressor::~GIFLZWCompressor()
++{
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::EndCompression()
++{
++	/********************** DISABLED *************************/
++}
diff --git a/editors/openoffice.org-1.1/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk b/editors/openoffice.org-1.1/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
new file mode 100644
index 000000000000..dd9e199acc96
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
@@ -0,0 +1,11 @@
+--- ../goodies/source/filter.vcl/egif/makefile.mk.orig	Tue Aug 14 23:22:54 2001
++++ ../goodies/source/filter.vcl/egif/makefile.mk	Mon Apr 14 06:04:55 2003
+@@ -89,7 +89,7 @@
+ 
+ SLOFILES= 	$(SLO)$/egif.obj		\
+ 		$(SLO)$/dlgegif.obj	\
+-		$(SLO)$/giflzwc.obj
++		$(SLO)$/giflzwc_disabled.obj
+ 
+ 
+ # ==========================================================================
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 5bb04213c156..79351770f737 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -246,6 +246,15 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@${ECHO}
+	@${ECHO} "You may set WITH_GIF_LZW_COMPRESSION=YES"
+	@${ECHO} "If you want to make compressed gif images"
+	@${ECHO}
+	@${ECHO} "If must have license from the Unisys and IBM patents"
+	@${ECHO} "to enable this option to get compressed GIF images."
+	@${ECHO}
+.endif
 .if ${OSVERSION} < 450002
 	@${ECHO}
 	@${ECHO} "OS-VERSION ${OSVERSION} too low"
@@ -358,6 +367,17 @@ post-patch:
 		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
 	fi
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@if [ "`echo ${PATCHDIR}/gifpatch-*`" != "${PATCHDIR}/gifpatch-*" ]; then \
+		${ECHO_MSG} "===>  Removing GIF LZW compression for ${PKGNAME}" ; \
+		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
+			${ECHO_MSG} "===>   Applying GIF LZW compression ${OPSYS} patch" ; \
+		fi; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \
+	fi
+.endif
 .if defined(WITH_DEBUG)
 	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
@@ -502,6 +522,8 @@ pre-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
 	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
 	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
+	@${CP}	${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index 0004033ec259..a55458016a47 100644
--- a/editors/openoffice.org-2-RC/distinfo
+++ b/editors/openoffice.org-2-RC/distinfo
@@ -7,3 +7,4 @@ 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/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
diff --git a/editors/openoffice.org-2-RC/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx b/editors/openoffice.org-2-RC/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
new file mode 100644
index 000000000000..0fcdf289cca3
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
@@ -0,0 +1,290 @@
+--- ../goodies/source/filter.vcl/egif/giflzwc.cxx	Sun Apr 13 14:33:24 2003
++++ /dev/null	Mon Apr 14 06:10:35 2003
+@@ -1,287 +0,0 @@
+-/*************************************************************************
+- *
+- *  $RCSfile: giflzwc.cxx,v $
+- *
+- *  $Revision: 1.1.1.1 $
+- *
+- *  last change: $Author: hr $ $Date: 2000/09/18 16:30:11 $
+- *
+- *  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 <tools/stream.hxx>
+-#include "giflzwc.hxx"
+-
+-// ----------------------------
+-// - GIFImageDataOutputStream -
+-// ----------------------------
+-
+-class GIFImageDataOutputStream
+-{
+-private:
+-
+-	void		FlushBlockBuf();
+-	inline void	FlushBitsBufsFullBytes();
+-
+-	SvStream&	rStream;
+-	BYTE*		pBlockBuf;
+-	BYTE		nBlockBufSize;
+-	ULONG		nBitsBuf;
+-	USHORT		nBitsBufSize;
+-
+-public:
+-
+-				GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize );
+-				~GIFImageDataOutputStream();
+-
+-	inline void	WriteBits( USHORT nCode, USHORT nCodeLen );
+-};
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
+-{
+-	while (nBitsBufSize>=8)
+-	{
+-		if( nBlockBufSize==255 )
+-			FlushBlockBuf();
+-
+-		pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf;
+-		nBitsBuf >>= 8;
+-		nBitsBufSize -= 8;
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen )
+-{
+-	if( nBitsBufSize+nCodeLen>32 )
+-		FlushBitsBufsFullBytes();
+-
+-	nBitsBuf |= (ULONG) nCode << nBitsBufSize;
+-	nBitsBufSize += nCodeLen;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) :
+-		rStream(rGIF)
+-{
+-	pBlockBuf = new BYTE[ 255 ];
+-	nBlockBufSize = 0;
+-	nBitsBufSize = 0;
+-	nBitsBuf = 0;
+-	rStream << nLZWDataSize;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-
+-GIFImageDataOutputStream::~GIFImageDataOutputStream()
+-{
+-	WriteBits(0,7);
+-	FlushBitsBufsFullBytes();
+-	FlushBlockBuf();
+-	rStream << (BYTE)0;
+-	delete[] pBlockBuf;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFImageDataOutputStream::FlushBlockBuf()
+-{
+-	if( nBlockBufSize )
+-	{
+-		rStream << (BYTE) nBlockBufSize;
+-		rStream.Write( pBlockBuf,nBlockBufSize );
+-		nBlockBufSize = 0;
+-	}
+-}
+-
+-// -------------------
+-// - GIFLZWCTreeNode -
+-// -------------------
+-
+-struct GIFLZWCTreeNode
+-{
+-
+-	GIFLZWCTreeNode*	pBrother;		// naechster Knoten, der den selben Vater hat
+-	GIFLZWCTreeNode*	pFirstChild;	// erster Sohn
+-	USHORT				nCode;			// Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
+-	USHORT				nValue;			// Der Pixelwert
+-};
+-
+-// --------------------
+-// - GIFLZWCompressor -
+-// --------------------
+-
+-GIFLZWCompressor::GIFLZWCompressor()
+-{
+-	pIDOS=NULL;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFLZWCompressor::~GIFLZWCompressor()
+-{
+-	if (pIDOS!=NULL) EndCompression();
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
+-{
+-	if( !pIDOS )
+-	{
+-		USHORT i;
+-
+-		nDataSize = nPixelSize;
+-
+-		if( nDataSize < 2 )
+-			nDataSize=2;
+-
+-		nClearCode=1<<nDataSize;
+-		nEOICode=nClearCode+1;
+-		nTableSize=nEOICode+1;
+-		nCodeSize=nDataSize+1;
+-
+-		pIDOS=new GIFImageDataOutputStream(rGIF,(BYTE)nDataSize);
+-		pTable=new GIFLZWCTreeNode[4096];
+-
+-		for (i=0; i<4096; i++)
+-		{
+-			pTable[i].pBrother = pTable[i].pFirstChild = NULL;
+-			pTable[i].nValue = (BYTE) ( pTable[i].nCode = i );
+-		}
+-
+-		pPrefix = NULL;
+-		pIDOS->WriteBits( nClearCode,nCodeSize );
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
+-{
+-	if( pIDOS )
+-	{
+-		GIFLZWCTreeNode*	p;
+-		USHORT				i;
+-		BYTE				nV;
+-
+-		if( !pPrefix && nSize )
+-		{
+-			pPrefix=pTable+(*pSrc++);
+-			nSize--;
+-		}
+-
+-		while( nSize )
+-		{
+-			nSize--;
+-			nV=*pSrc++;
+-			for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother )
+-			{
+-				if (p->nValue==nV)
+-					break;
+-			}
+-
+-			if( p)
+-				pPrefix=p;
+-			else
+-			{
+-				pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-				if (nTableSize==4096)
+-				{
+-					pIDOS->WriteBits(nClearCode,nCodeSize);
+-
+-					for (i=0; i<nClearCode; i++)
+-						pTable[i].pFirstChild=NULL;
+-
+-					nCodeSize=nDataSize+1;
+-					nTableSize=nEOICode+1;
+-				}
+-				else
+-				{
+-					if(nTableSize==(USHORT)(1<<nCodeSize))
+-						nCodeSize++;
+-
+-					p=pTable+(nTableSize++);
+-					p->pBrother=pPrefix->pFirstChild;
+-					pPrefix->pFirstChild=p;
+-					p->nValue=nV;
+-					p->pFirstChild=NULL;
+-				}
+-
+-				pPrefix=pTable+nV;
+-			}
+-		}
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::EndCompression()
+-{
+-	if( pIDOS )
+-	{
+-		if( pPrefix )
+-			pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-		pIDOS->WriteBits( nEOICode,nCodeSize );
+-		delete[] pTable;
+-		delete pIDOS;
+-		pIDOS=NULL;
+-	}
+-}
diff --git a/editors/openoffice.org-2-RC/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx b/editors/openoffice.org-2-RC/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
new file mode 100644
index 000000000000..223277a5cd7e
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
@@ -0,0 +1,45 @@
+--- /dev/null	1970-01-01 01:00:00.000000000 +0100
++++ ../goodies/source/filter.vcl/egif/giflzwc_disabled.cxx	2002-08-15 15:09:47.000000000 +0200
+@@ -0,0 +1,42 @@
++/**********************************
++ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed.
++ **********************************/ 
++
++//#include <tools/stream.hxx>
++#include "giflzwc.hxx"
++
++// --------------------
++// - GIFLZWCompressor -
++// --------------------
++
++GIFLZWCompressor::GIFLZWCompressor()
++{
++	pIDOS=NULL;
++}
++
++// ------------------------------------------------------------------------
++
++GIFLZWCompressor::~GIFLZWCompressor()
++{
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::EndCompression()
++{
++	/********************** DISABLED *************************/
++}
diff --git a/editors/openoffice.org-2-RC/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk b/editors/openoffice.org-2-RC/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
new file mode 100644
index 000000000000..dd9e199acc96
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
@@ -0,0 +1,11 @@
+--- ../goodies/source/filter.vcl/egif/makefile.mk.orig	Tue Aug 14 23:22:54 2001
++++ ../goodies/source/filter.vcl/egif/makefile.mk	Mon Apr 14 06:04:55 2003
+@@ -89,7 +89,7 @@
+ 
+ SLOFILES= 	$(SLO)$/egif.obj		\
+ 		$(SLO)$/dlgegif.obj	\
+-		$(SLO)$/giflzwc.obj
++		$(SLO)$/giflzwc_disabled.obj
+ 
+ 
+ # ==========================================================================
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 5bb04213c156..79351770f737 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -246,6 +246,15 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@${ECHO}
+	@${ECHO} "You may set WITH_GIF_LZW_COMPRESSION=YES"
+	@${ECHO} "If you want to make compressed gif images"
+	@${ECHO}
+	@${ECHO} "If must have license from the Unisys and IBM patents"
+	@${ECHO} "to enable this option to get compressed GIF images."
+	@${ECHO}
+.endif
 .if ${OSVERSION} < 450002
 	@${ECHO}
 	@${ECHO} "OS-VERSION ${OSVERSION} too low"
@@ -358,6 +367,17 @@ post-patch:
 		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
 	fi
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@if [ "`echo ${PATCHDIR}/gifpatch-*`" != "${PATCHDIR}/gifpatch-*" ]; then \
+		${ECHO_MSG} "===>  Removing GIF LZW compression for ${PKGNAME}" ; \
+		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
+			${ECHO_MSG} "===>   Applying GIF LZW compression ${OPSYS} patch" ; \
+		fi; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \
+	fi
+.endif
 .if defined(WITH_DEBUG)
 	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
@@ -502,6 +522,8 @@ pre-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
 	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
 	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
+	@${CP}	${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index 0004033ec259..a55458016a47 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -7,3 +7,4 @@ 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/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
diff --git a/editors/openoffice.org-2-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx b/editors/openoffice.org-2-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
new file mode 100644
index 000000000000..0fcdf289cca3
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
@@ -0,0 +1,290 @@
+--- ../goodies/source/filter.vcl/egif/giflzwc.cxx	Sun Apr 13 14:33:24 2003
++++ /dev/null	Mon Apr 14 06:10:35 2003
+@@ -1,287 +0,0 @@
+-/*************************************************************************
+- *
+- *  $RCSfile: giflzwc.cxx,v $
+- *
+- *  $Revision: 1.1.1.1 $
+- *
+- *  last change: $Author: hr $ $Date: 2000/09/18 16:30:11 $
+- *
+- *  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 <tools/stream.hxx>
+-#include "giflzwc.hxx"
+-
+-// ----------------------------
+-// - GIFImageDataOutputStream -
+-// ----------------------------
+-
+-class GIFImageDataOutputStream
+-{
+-private:
+-
+-	void		FlushBlockBuf();
+-	inline void	FlushBitsBufsFullBytes();
+-
+-	SvStream&	rStream;
+-	BYTE*		pBlockBuf;
+-	BYTE		nBlockBufSize;
+-	ULONG		nBitsBuf;
+-	USHORT		nBitsBufSize;
+-
+-public:
+-
+-				GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize );
+-				~GIFImageDataOutputStream();
+-
+-	inline void	WriteBits( USHORT nCode, USHORT nCodeLen );
+-};
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
+-{
+-	while (nBitsBufSize>=8)
+-	{
+-		if( nBlockBufSize==255 )
+-			FlushBlockBuf();
+-
+-		pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf;
+-		nBitsBuf >>= 8;
+-		nBitsBufSize -= 8;
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen )
+-{
+-	if( nBitsBufSize+nCodeLen>32 )
+-		FlushBitsBufsFullBytes();
+-
+-	nBitsBuf |= (ULONG) nCode << nBitsBufSize;
+-	nBitsBufSize += nCodeLen;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) :
+-		rStream(rGIF)
+-{
+-	pBlockBuf = new BYTE[ 255 ];
+-	nBlockBufSize = 0;
+-	nBitsBufSize = 0;
+-	nBitsBuf = 0;
+-	rStream << nLZWDataSize;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-
+-GIFImageDataOutputStream::~GIFImageDataOutputStream()
+-{
+-	WriteBits(0,7);
+-	FlushBitsBufsFullBytes();
+-	FlushBlockBuf();
+-	rStream << (BYTE)0;
+-	delete[] pBlockBuf;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFImageDataOutputStream::FlushBlockBuf()
+-{
+-	if( nBlockBufSize )
+-	{
+-		rStream << (BYTE) nBlockBufSize;
+-		rStream.Write( pBlockBuf,nBlockBufSize );
+-		nBlockBufSize = 0;
+-	}
+-}
+-
+-// -------------------
+-// - GIFLZWCTreeNode -
+-// -------------------
+-
+-struct GIFLZWCTreeNode
+-{
+-
+-	GIFLZWCTreeNode*	pBrother;		// naechster Knoten, der den selben Vater hat
+-	GIFLZWCTreeNode*	pFirstChild;	// erster Sohn
+-	USHORT				nCode;			// Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
+-	USHORT				nValue;			// Der Pixelwert
+-};
+-
+-// --------------------
+-// - GIFLZWCompressor -
+-// --------------------
+-
+-GIFLZWCompressor::GIFLZWCompressor()
+-{
+-	pIDOS=NULL;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFLZWCompressor::~GIFLZWCompressor()
+-{
+-	if (pIDOS!=NULL) EndCompression();
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
+-{
+-	if( !pIDOS )
+-	{
+-		USHORT i;
+-
+-		nDataSize = nPixelSize;
+-
+-		if( nDataSize < 2 )
+-			nDataSize=2;
+-
+-		nClearCode=1<<nDataSize;
+-		nEOICode=nClearCode+1;
+-		nTableSize=nEOICode+1;
+-		nCodeSize=nDataSize+1;
+-
+-		pIDOS=new GIFImageDataOutputStream(rGIF,(BYTE)nDataSize);
+-		pTable=new GIFLZWCTreeNode[4096];
+-
+-		for (i=0; i<4096; i++)
+-		{
+-			pTable[i].pBrother = pTable[i].pFirstChild = NULL;
+-			pTable[i].nValue = (BYTE) ( pTable[i].nCode = i );
+-		}
+-
+-		pPrefix = NULL;
+-		pIDOS->WriteBits( nClearCode,nCodeSize );
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
+-{
+-	if( pIDOS )
+-	{
+-		GIFLZWCTreeNode*	p;
+-		USHORT				i;
+-		BYTE				nV;
+-
+-		if( !pPrefix && nSize )
+-		{
+-			pPrefix=pTable+(*pSrc++);
+-			nSize--;
+-		}
+-
+-		while( nSize )
+-		{
+-			nSize--;
+-			nV=*pSrc++;
+-			for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother )
+-			{
+-				if (p->nValue==nV)
+-					break;
+-			}
+-
+-			if( p)
+-				pPrefix=p;
+-			else
+-			{
+-				pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-				if (nTableSize==4096)
+-				{
+-					pIDOS->WriteBits(nClearCode,nCodeSize);
+-
+-					for (i=0; i<nClearCode; i++)
+-						pTable[i].pFirstChild=NULL;
+-
+-					nCodeSize=nDataSize+1;
+-					nTableSize=nEOICode+1;
+-				}
+-				else
+-				{
+-					if(nTableSize==(USHORT)(1<<nCodeSize))
+-						nCodeSize++;
+-
+-					p=pTable+(nTableSize++);
+-					p->pBrother=pPrefix->pFirstChild;
+-					pPrefix->pFirstChild=p;
+-					p->nValue=nV;
+-					p->pFirstChild=NULL;
+-				}
+-
+-				pPrefix=pTable+nV;
+-			}
+-		}
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::EndCompression()
+-{
+-	if( pIDOS )
+-	{
+-		if( pPrefix )
+-			pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-		pIDOS->WriteBits( nEOICode,nCodeSize );
+-		delete[] pTable;
+-		delete pIDOS;
+-		pIDOS=NULL;
+-	}
+-}
diff --git a/editors/openoffice.org-2-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx b/editors/openoffice.org-2-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
new file mode 100644
index 000000000000..223277a5cd7e
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
@@ -0,0 +1,45 @@
+--- /dev/null	1970-01-01 01:00:00.000000000 +0100
++++ ../goodies/source/filter.vcl/egif/giflzwc_disabled.cxx	2002-08-15 15:09:47.000000000 +0200
+@@ -0,0 +1,42 @@
++/**********************************
++ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed.
++ **********************************/ 
++
++//#include <tools/stream.hxx>
++#include "giflzwc.hxx"
++
++// --------------------
++// - GIFLZWCompressor -
++// --------------------
++
++GIFLZWCompressor::GIFLZWCompressor()
++{
++	pIDOS=NULL;
++}
++
++// ------------------------------------------------------------------------
++
++GIFLZWCompressor::~GIFLZWCompressor()
++{
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::EndCompression()
++{
++	/********************** DISABLED *************************/
++}
diff --git a/editors/openoffice.org-2-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk b/editors/openoffice.org-2-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
new file mode 100644
index 000000000000..dd9e199acc96
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
@@ -0,0 +1,11 @@
+--- ../goodies/source/filter.vcl/egif/makefile.mk.orig	Tue Aug 14 23:22:54 2001
++++ ../goodies/source/filter.vcl/egif/makefile.mk	Mon Apr 14 06:04:55 2003
+@@ -89,7 +89,7 @@
+ 
+ SLOFILES= 	$(SLO)$/egif.obj		\
+ 		$(SLO)$/dlgegif.obj	\
+-		$(SLO)$/giflzwc.obj
++		$(SLO)$/giflzwc_disabled.obj
+ 
+ 
+ # ==========================================================================
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 5bb04213c156..79351770f737 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -246,6 +246,15 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@${ECHO}
+	@${ECHO} "You may set WITH_GIF_LZW_COMPRESSION=YES"
+	@${ECHO} "If you want to make compressed gif images"
+	@${ECHO}
+	@${ECHO} "If must have license from the Unisys and IBM patents"
+	@${ECHO} "to enable this option to get compressed GIF images."
+	@${ECHO}
+.endif
 .if ${OSVERSION} < 450002
 	@${ECHO}
 	@${ECHO} "OS-VERSION ${OSVERSION} too low"
@@ -358,6 +367,17 @@ post-patch:
 		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
 	fi
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@if [ "`echo ${PATCHDIR}/gifpatch-*`" != "${PATCHDIR}/gifpatch-*" ]; then \
+		${ECHO_MSG} "===>  Removing GIF LZW compression for ${PKGNAME}" ; \
+		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
+			${ECHO_MSG} "===>   Applying GIF LZW compression ${OPSYS} patch" ; \
+		fi; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \
+	fi
+.endif
 .if defined(WITH_DEBUG)
 	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
@@ -502,6 +522,8 @@ pre-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
 	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
 	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
+	@${CP}	${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index 0004033ec259..a55458016a47 100644
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ b/editors/openoffice.org-2.0-devel/distinfo
@@ -7,3 +7,4 @@ 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/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
diff --git a/editors/openoffice.org-2.0-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx b/editors/openoffice.org-2.0-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
new file mode 100644
index 000000000000..0fcdf289cca3
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
@@ -0,0 +1,290 @@
+--- ../goodies/source/filter.vcl/egif/giflzwc.cxx	Sun Apr 13 14:33:24 2003
++++ /dev/null	Mon Apr 14 06:10:35 2003
+@@ -1,287 +0,0 @@
+-/*************************************************************************
+- *
+- *  $RCSfile: giflzwc.cxx,v $
+- *
+- *  $Revision: 1.1.1.1 $
+- *
+- *  last change: $Author: hr $ $Date: 2000/09/18 16:30:11 $
+- *
+- *  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 <tools/stream.hxx>
+-#include "giflzwc.hxx"
+-
+-// ----------------------------
+-// - GIFImageDataOutputStream -
+-// ----------------------------
+-
+-class GIFImageDataOutputStream
+-{
+-private:
+-
+-	void		FlushBlockBuf();
+-	inline void	FlushBitsBufsFullBytes();
+-
+-	SvStream&	rStream;
+-	BYTE*		pBlockBuf;
+-	BYTE		nBlockBufSize;
+-	ULONG		nBitsBuf;
+-	USHORT		nBitsBufSize;
+-
+-public:
+-
+-				GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize );
+-				~GIFImageDataOutputStream();
+-
+-	inline void	WriteBits( USHORT nCode, USHORT nCodeLen );
+-};
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
+-{
+-	while (nBitsBufSize>=8)
+-	{
+-		if( nBlockBufSize==255 )
+-			FlushBlockBuf();
+-
+-		pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf;
+-		nBitsBuf >>= 8;
+-		nBitsBufSize -= 8;
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen )
+-{
+-	if( nBitsBufSize+nCodeLen>32 )
+-		FlushBitsBufsFullBytes();
+-
+-	nBitsBuf |= (ULONG) nCode << nBitsBufSize;
+-	nBitsBufSize += nCodeLen;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) :
+-		rStream(rGIF)
+-{
+-	pBlockBuf = new BYTE[ 255 ];
+-	nBlockBufSize = 0;
+-	nBitsBufSize = 0;
+-	nBitsBuf = 0;
+-	rStream << nLZWDataSize;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-
+-GIFImageDataOutputStream::~GIFImageDataOutputStream()
+-{
+-	WriteBits(0,7);
+-	FlushBitsBufsFullBytes();
+-	FlushBlockBuf();
+-	rStream << (BYTE)0;
+-	delete[] pBlockBuf;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFImageDataOutputStream::FlushBlockBuf()
+-{
+-	if( nBlockBufSize )
+-	{
+-		rStream << (BYTE) nBlockBufSize;
+-		rStream.Write( pBlockBuf,nBlockBufSize );
+-		nBlockBufSize = 0;
+-	}
+-}
+-
+-// -------------------
+-// - GIFLZWCTreeNode -
+-// -------------------
+-
+-struct GIFLZWCTreeNode
+-{
+-
+-	GIFLZWCTreeNode*	pBrother;		// naechster Knoten, der den selben Vater hat
+-	GIFLZWCTreeNode*	pFirstChild;	// erster Sohn
+-	USHORT				nCode;			// Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
+-	USHORT				nValue;			// Der Pixelwert
+-};
+-
+-// --------------------
+-// - GIFLZWCompressor -
+-// --------------------
+-
+-GIFLZWCompressor::GIFLZWCompressor()
+-{
+-	pIDOS=NULL;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFLZWCompressor::~GIFLZWCompressor()
+-{
+-	if (pIDOS!=NULL) EndCompression();
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
+-{
+-	if( !pIDOS )
+-	{
+-		USHORT i;
+-
+-		nDataSize = nPixelSize;
+-
+-		if( nDataSize < 2 )
+-			nDataSize=2;
+-
+-		nClearCode=1<<nDataSize;
+-		nEOICode=nClearCode+1;
+-		nTableSize=nEOICode+1;
+-		nCodeSize=nDataSize+1;
+-
+-		pIDOS=new GIFImageDataOutputStream(rGIF,(BYTE)nDataSize);
+-		pTable=new GIFLZWCTreeNode[4096];
+-
+-		for (i=0; i<4096; i++)
+-		{
+-			pTable[i].pBrother = pTable[i].pFirstChild = NULL;
+-			pTable[i].nValue = (BYTE) ( pTable[i].nCode = i );
+-		}
+-
+-		pPrefix = NULL;
+-		pIDOS->WriteBits( nClearCode,nCodeSize );
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
+-{
+-	if( pIDOS )
+-	{
+-		GIFLZWCTreeNode*	p;
+-		USHORT				i;
+-		BYTE				nV;
+-
+-		if( !pPrefix && nSize )
+-		{
+-			pPrefix=pTable+(*pSrc++);
+-			nSize--;
+-		}
+-
+-		while( nSize )
+-		{
+-			nSize--;
+-			nV=*pSrc++;
+-			for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother )
+-			{
+-				if (p->nValue==nV)
+-					break;
+-			}
+-
+-			if( p)
+-				pPrefix=p;
+-			else
+-			{
+-				pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-				if (nTableSize==4096)
+-				{
+-					pIDOS->WriteBits(nClearCode,nCodeSize);
+-
+-					for (i=0; i<nClearCode; i++)
+-						pTable[i].pFirstChild=NULL;
+-
+-					nCodeSize=nDataSize+1;
+-					nTableSize=nEOICode+1;
+-				}
+-				else
+-				{
+-					if(nTableSize==(USHORT)(1<<nCodeSize))
+-						nCodeSize++;
+-
+-					p=pTable+(nTableSize++);
+-					p->pBrother=pPrefix->pFirstChild;
+-					pPrefix->pFirstChild=p;
+-					p->nValue=nV;
+-					p->pFirstChild=NULL;
+-				}
+-
+-				pPrefix=pTable+nV;
+-			}
+-		}
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::EndCompression()
+-{
+-	if( pIDOS )
+-	{
+-		if( pPrefix )
+-			pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-		pIDOS->WriteBits( nEOICode,nCodeSize );
+-		delete[] pTable;
+-		delete pIDOS;
+-		pIDOS=NULL;
+-	}
+-}
diff --git a/editors/openoffice.org-2.0-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx b/editors/openoffice.org-2.0-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
new file mode 100644
index 000000000000..223277a5cd7e
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
@@ -0,0 +1,45 @@
+--- /dev/null	1970-01-01 01:00:00.000000000 +0100
++++ ../goodies/source/filter.vcl/egif/giflzwc_disabled.cxx	2002-08-15 15:09:47.000000000 +0200
+@@ -0,0 +1,42 @@
++/**********************************
++ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed.
++ **********************************/ 
++
++//#include <tools/stream.hxx>
++#include "giflzwc.hxx"
++
++// --------------------
++// - GIFLZWCompressor -
++// --------------------
++
++GIFLZWCompressor::GIFLZWCompressor()
++{
++	pIDOS=NULL;
++}
++
++// ------------------------------------------------------------------------
++
++GIFLZWCompressor::~GIFLZWCompressor()
++{
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::EndCompression()
++{
++	/********************** DISABLED *************************/
++}
diff --git a/editors/openoffice.org-2.0-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk b/editors/openoffice.org-2.0-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
new file mode 100644
index 000000000000..dd9e199acc96
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
@@ -0,0 +1,11 @@
+--- ../goodies/source/filter.vcl/egif/makefile.mk.orig	Tue Aug 14 23:22:54 2001
++++ ../goodies/source/filter.vcl/egif/makefile.mk	Mon Apr 14 06:04:55 2003
+@@ -89,7 +89,7 @@
+ 
+ SLOFILES= 	$(SLO)$/egif.obj		\
+ 		$(SLO)$/dlgegif.obj	\
+-		$(SLO)$/giflzwc.obj
++		$(SLO)$/giflzwc_disabled.obj
+ 
+ 
+ # ==========================================================================
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 5bb04213c156..79351770f737 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -246,6 +246,15 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@${ECHO}
+	@${ECHO} "You may set WITH_GIF_LZW_COMPRESSION=YES"
+	@${ECHO} "If you want to make compressed gif images"
+	@${ECHO}
+	@${ECHO} "If must have license from the Unisys and IBM patents"
+	@${ECHO} "to enable this option to get compressed GIF images."
+	@${ECHO}
+.endif
 .if ${OSVERSION} < 450002
 	@${ECHO}
 	@${ECHO} "OS-VERSION ${OSVERSION} too low"
@@ -358,6 +367,17 @@ post-patch:
 		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
 	fi
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@if [ "`echo ${PATCHDIR}/gifpatch-*`" != "${PATCHDIR}/gifpatch-*" ]; then \
+		${ECHO_MSG} "===>  Removing GIF LZW compression for ${PKGNAME}" ; \
+		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
+			${ECHO_MSG} "===>   Applying GIF LZW compression ${OPSYS} patch" ; \
+		fi; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \
+	fi
+.endif
 .if defined(WITH_DEBUG)
 	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
@@ -502,6 +522,8 @@ pre-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
 	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
 	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
+	@${CP}	${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo
index 0004033ec259..a55458016a47 100644
--- a/editors/openoffice.org-2.0/distinfo
+++ b/editors/openoffice.org-2.0/distinfo
@@ -7,3 +7,4 @@ 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/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
diff --git a/editors/openoffice.org-2.0/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx b/editors/openoffice.org-2.0/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
new file mode 100644
index 000000000000..0fcdf289cca3
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
@@ -0,0 +1,290 @@
+--- ../goodies/source/filter.vcl/egif/giflzwc.cxx	Sun Apr 13 14:33:24 2003
++++ /dev/null	Mon Apr 14 06:10:35 2003
+@@ -1,287 +0,0 @@
+-/*************************************************************************
+- *
+- *  $RCSfile: giflzwc.cxx,v $
+- *
+- *  $Revision: 1.1.1.1 $
+- *
+- *  last change: $Author: hr $ $Date: 2000/09/18 16:30:11 $
+- *
+- *  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 <tools/stream.hxx>
+-#include "giflzwc.hxx"
+-
+-// ----------------------------
+-// - GIFImageDataOutputStream -
+-// ----------------------------
+-
+-class GIFImageDataOutputStream
+-{
+-private:
+-
+-	void		FlushBlockBuf();
+-	inline void	FlushBitsBufsFullBytes();
+-
+-	SvStream&	rStream;
+-	BYTE*		pBlockBuf;
+-	BYTE		nBlockBufSize;
+-	ULONG		nBitsBuf;
+-	USHORT		nBitsBufSize;
+-
+-public:
+-
+-				GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize );
+-				~GIFImageDataOutputStream();
+-
+-	inline void	WriteBits( USHORT nCode, USHORT nCodeLen );
+-};
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
+-{
+-	while (nBitsBufSize>=8)
+-	{
+-		if( nBlockBufSize==255 )
+-			FlushBlockBuf();
+-
+-		pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf;
+-		nBitsBuf >>= 8;
+-		nBitsBufSize -= 8;
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen )
+-{
+-	if( nBitsBufSize+nCodeLen>32 )
+-		FlushBitsBufsFullBytes();
+-
+-	nBitsBuf |= (ULONG) nCode << nBitsBufSize;
+-	nBitsBufSize += nCodeLen;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) :
+-		rStream(rGIF)
+-{
+-	pBlockBuf = new BYTE[ 255 ];
+-	nBlockBufSize = 0;
+-	nBitsBufSize = 0;
+-	nBitsBuf = 0;
+-	rStream << nLZWDataSize;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-
+-GIFImageDataOutputStream::~GIFImageDataOutputStream()
+-{
+-	WriteBits(0,7);
+-	FlushBitsBufsFullBytes();
+-	FlushBlockBuf();
+-	rStream << (BYTE)0;
+-	delete[] pBlockBuf;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFImageDataOutputStream::FlushBlockBuf()
+-{
+-	if( nBlockBufSize )
+-	{
+-		rStream << (BYTE) nBlockBufSize;
+-		rStream.Write( pBlockBuf,nBlockBufSize );
+-		nBlockBufSize = 0;
+-	}
+-}
+-
+-// -------------------
+-// - GIFLZWCTreeNode -
+-// -------------------
+-
+-struct GIFLZWCTreeNode
+-{
+-
+-	GIFLZWCTreeNode*	pBrother;		// naechster Knoten, der den selben Vater hat
+-	GIFLZWCTreeNode*	pFirstChild;	// erster Sohn
+-	USHORT				nCode;			// Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
+-	USHORT				nValue;			// Der Pixelwert
+-};
+-
+-// --------------------
+-// - GIFLZWCompressor -
+-// --------------------
+-
+-GIFLZWCompressor::GIFLZWCompressor()
+-{
+-	pIDOS=NULL;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFLZWCompressor::~GIFLZWCompressor()
+-{
+-	if (pIDOS!=NULL) EndCompression();
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
+-{
+-	if( !pIDOS )
+-	{
+-		USHORT i;
+-
+-		nDataSize = nPixelSize;
+-
+-		if( nDataSize < 2 )
+-			nDataSize=2;
+-
+-		nClearCode=1<<nDataSize;
+-		nEOICode=nClearCode+1;
+-		nTableSize=nEOICode+1;
+-		nCodeSize=nDataSize+1;
+-
+-		pIDOS=new GIFImageDataOutputStream(rGIF,(BYTE)nDataSize);
+-		pTable=new GIFLZWCTreeNode[4096];
+-
+-		for (i=0; i<4096; i++)
+-		{
+-			pTable[i].pBrother = pTable[i].pFirstChild = NULL;
+-			pTable[i].nValue = (BYTE) ( pTable[i].nCode = i );
+-		}
+-
+-		pPrefix = NULL;
+-		pIDOS->WriteBits( nClearCode,nCodeSize );
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
+-{
+-	if( pIDOS )
+-	{
+-		GIFLZWCTreeNode*	p;
+-		USHORT				i;
+-		BYTE				nV;
+-
+-		if( !pPrefix && nSize )
+-		{
+-			pPrefix=pTable+(*pSrc++);
+-			nSize--;
+-		}
+-
+-		while( nSize )
+-		{
+-			nSize--;
+-			nV=*pSrc++;
+-			for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother )
+-			{
+-				if (p->nValue==nV)
+-					break;
+-			}
+-
+-			if( p)
+-				pPrefix=p;
+-			else
+-			{
+-				pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-				if (nTableSize==4096)
+-				{
+-					pIDOS->WriteBits(nClearCode,nCodeSize);
+-
+-					for (i=0; i<nClearCode; i++)
+-						pTable[i].pFirstChild=NULL;
+-
+-					nCodeSize=nDataSize+1;
+-					nTableSize=nEOICode+1;
+-				}
+-				else
+-				{
+-					if(nTableSize==(USHORT)(1<<nCodeSize))
+-						nCodeSize++;
+-
+-					p=pTable+(nTableSize++);
+-					p->pBrother=pPrefix->pFirstChild;
+-					pPrefix->pFirstChild=p;
+-					p->nValue=nV;
+-					p->pFirstChild=NULL;
+-				}
+-
+-				pPrefix=pTable+nV;
+-			}
+-		}
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::EndCompression()
+-{
+-	if( pIDOS )
+-	{
+-		if( pPrefix )
+-			pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-		pIDOS->WriteBits( nEOICode,nCodeSize );
+-		delete[] pTable;
+-		delete pIDOS;
+-		pIDOS=NULL;
+-	}
+-}
diff --git a/editors/openoffice.org-2.0/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx b/editors/openoffice.org-2.0/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
new file mode 100644
index 000000000000..223277a5cd7e
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
@@ -0,0 +1,45 @@
+--- /dev/null	1970-01-01 01:00:00.000000000 +0100
++++ ../goodies/source/filter.vcl/egif/giflzwc_disabled.cxx	2002-08-15 15:09:47.000000000 +0200
+@@ -0,0 +1,42 @@
++/**********************************
++ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed.
++ **********************************/ 
++
++//#include <tools/stream.hxx>
++#include "giflzwc.hxx"
++
++// --------------------
++// - GIFLZWCompressor -
++// --------------------
++
++GIFLZWCompressor::GIFLZWCompressor()
++{
++	pIDOS=NULL;
++}
++
++// ------------------------------------------------------------------------
++
++GIFLZWCompressor::~GIFLZWCompressor()
++{
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::EndCompression()
++{
++	/********************** DISABLED *************************/
++}
diff --git a/editors/openoffice.org-2.0/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk b/editors/openoffice.org-2.0/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
new file mode 100644
index 000000000000..dd9e199acc96
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
@@ -0,0 +1,11 @@
+--- ../goodies/source/filter.vcl/egif/makefile.mk.orig	Tue Aug 14 23:22:54 2001
++++ ../goodies/source/filter.vcl/egif/makefile.mk	Mon Apr 14 06:04:55 2003
+@@ -89,7 +89,7 @@
+ 
+ SLOFILES= 	$(SLO)$/egif.obj		\
+ 		$(SLO)$/dlgegif.obj	\
+-		$(SLO)$/giflzwc.obj
++		$(SLO)$/giflzwc_disabled.obj
+ 
+ 
+ # ==========================================================================
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 5bb04213c156..79351770f737 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -246,6 +246,15 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@${ECHO}
+	@${ECHO} "You may set WITH_GIF_LZW_COMPRESSION=YES"
+	@${ECHO} "If you want to make compressed gif images"
+	@${ECHO}
+	@${ECHO} "If must have license from the Unisys and IBM patents"
+	@${ECHO} "to enable this option to get compressed GIF images."
+	@${ECHO}
+.endif
 .if ${OSVERSION} < 450002
 	@${ECHO}
 	@${ECHO} "OS-VERSION ${OSVERSION} too low"
@@ -358,6 +367,17 @@ post-patch:
 		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
 	fi
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@if [ "`echo ${PATCHDIR}/gifpatch-*`" != "${PATCHDIR}/gifpatch-*" ]; then \
+		${ECHO_MSG} "===>  Removing GIF LZW compression for ${PKGNAME}" ; \
+		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
+			${ECHO_MSG} "===>   Applying GIF LZW compression ${OPSYS} patch" ; \
+		fi; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \
+	fi
+.endif
 .if defined(WITH_DEBUG)
 	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
@@ -502,6 +522,8 @@ pre-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
 	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
 	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
+	@${CP}	${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
index 0004033ec259..a55458016a47 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -7,3 +7,4 @@ 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/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
diff --git a/editors/openoffice.org-2/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx b/editors/openoffice.org-2/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
new file mode 100644
index 000000000000..0fcdf289cca3
--- /dev/null
+++ b/editors/openoffice.org-2/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
@@ -0,0 +1,290 @@
+--- ../goodies/source/filter.vcl/egif/giflzwc.cxx	Sun Apr 13 14:33:24 2003
++++ /dev/null	Mon Apr 14 06:10:35 2003
+@@ -1,287 +0,0 @@
+-/*************************************************************************
+- *
+- *  $RCSfile: giflzwc.cxx,v $
+- *
+- *  $Revision: 1.1.1.1 $
+- *
+- *  last change: $Author: hr $ $Date: 2000/09/18 16:30:11 $
+- *
+- *  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 <tools/stream.hxx>
+-#include "giflzwc.hxx"
+-
+-// ----------------------------
+-// - GIFImageDataOutputStream -
+-// ----------------------------
+-
+-class GIFImageDataOutputStream
+-{
+-private:
+-
+-	void		FlushBlockBuf();
+-	inline void	FlushBitsBufsFullBytes();
+-
+-	SvStream&	rStream;
+-	BYTE*		pBlockBuf;
+-	BYTE		nBlockBufSize;
+-	ULONG		nBitsBuf;
+-	USHORT		nBitsBufSize;
+-
+-public:
+-
+-				GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize );
+-				~GIFImageDataOutputStream();
+-
+-	inline void	WriteBits( USHORT nCode, USHORT nCodeLen );
+-};
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
+-{
+-	while (nBitsBufSize>=8)
+-	{
+-		if( nBlockBufSize==255 )
+-			FlushBlockBuf();
+-
+-		pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf;
+-		nBitsBuf >>= 8;
+-		nBitsBufSize -= 8;
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen )
+-{
+-	if( nBitsBufSize+nCodeLen>32 )
+-		FlushBitsBufsFullBytes();
+-
+-	nBitsBuf |= (ULONG) nCode << nBitsBufSize;
+-	nBitsBufSize += nCodeLen;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) :
+-		rStream(rGIF)
+-{
+-	pBlockBuf = new BYTE[ 255 ];
+-	nBlockBufSize = 0;
+-	nBitsBufSize = 0;
+-	nBitsBuf = 0;
+-	rStream << nLZWDataSize;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-
+-GIFImageDataOutputStream::~GIFImageDataOutputStream()
+-{
+-	WriteBits(0,7);
+-	FlushBitsBufsFullBytes();
+-	FlushBlockBuf();
+-	rStream << (BYTE)0;
+-	delete[] pBlockBuf;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFImageDataOutputStream::FlushBlockBuf()
+-{
+-	if( nBlockBufSize )
+-	{
+-		rStream << (BYTE) nBlockBufSize;
+-		rStream.Write( pBlockBuf,nBlockBufSize );
+-		nBlockBufSize = 0;
+-	}
+-}
+-
+-// -------------------
+-// - GIFLZWCTreeNode -
+-// -------------------
+-
+-struct GIFLZWCTreeNode
+-{
+-
+-	GIFLZWCTreeNode*	pBrother;		// naechster Knoten, der den selben Vater hat
+-	GIFLZWCTreeNode*	pFirstChild;	// erster Sohn
+-	USHORT				nCode;			// Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
+-	USHORT				nValue;			// Der Pixelwert
+-};
+-
+-// --------------------
+-// - GIFLZWCompressor -
+-// --------------------
+-
+-GIFLZWCompressor::GIFLZWCompressor()
+-{
+-	pIDOS=NULL;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFLZWCompressor::~GIFLZWCompressor()
+-{
+-	if (pIDOS!=NULL) EndCompression();
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
+-{
+-	if( !pIDOS )
+-	{
+-		USHORT i;
+-
+-		nDataSize = nPixelSize;
+-
+-		if( nDataSize < 2 )
+-			nDataSize=2;
+-
+-		nClearCode=1<<nDataSize;
+-		nEOICode=nClearCode+1;
+-		nTableSize=nEOICode+1;
+-		nCodeSize=nDataSize+1;
+-
+-		pIDOS=new GIFImageDataOutputStream(rGIF,(BYTE)nDataSize);
+-		pTable=new GIFLZWCTreeNode[4096];
+-
+-		for (i=0; i<4096; i++)
+-		{
+-			pTable[i].pBrother = pTable[i].pFirstChild = NULL;
+-			pTable[i].nValue = (BYTE) ( pTable[i].nCode = i );
+-		}
+-
+-		pPrefix = NULL;
+-		pIDOS->WriteBits( nClearCode,nCodeSize );
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
+-{
+-	if( pIDOS )
+-	{
+-		GIFLZWCTreeNode*	p;
+-		USHORT				i;
+-		BYTE				nV;
+-
+-		if( !pPrefix && nSize )
+-		{
+-			pPrefix=pTable+(*pSrc++);
+-			nSize--;
+-		}
+-
+-		while( nSize )
+-		{
+-			nSize--;
+-			nV=*pSrc++;
+-			for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother )
+-			{
+-				if (p->nValue==nV)
+-					break;
+-			}
+-
+-			if( p)
+-				pPrefix=p;
+-			else
+-			{
+-				pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-				if (nTableSize==4096)
+-				{
+-					pIDOS->WriteBits(nClearCode,nCodeSize);
+-
+-					for (i=0; i<nClearCode; i++)
+-						pTable[i].pFirstChild=NULL;
+-
+-					nCodeSize=nDataSize+1;
+-					nTableSize=nEOICode+1;
+-				}
+-				else
+-				{
+-					if(nTableSize==(USHORT)(1<<nCodeSize))
+-						nCodeSize++;
+-
+-					p=pTable+(nTableSize++);
+-					p->pBrother=pPrefix->pFirstChild;
+-					pPrefix->pFirstChild=p;
+-					p->nValue=nV;
+-					p->pFirstChild=NULL;
+-				}
+-
+-				pPrefix=pTable+nV;
+-			}
+-		}
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::EndCompression()
+-{
+-	if( pIDOS )
+-	{
+-		if( pPrefix )
+-			pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-		pIDOS->WriteBits( nEOICode,nCodeSize );
+-		delete[] pTable;
+-		delete pIDOS;
+-		pIDOS=NULL;
+-	}
+-}
diff --git a/editors/openoffice.org-2/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx b/editors/openoffice.org-2/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
new file mode 100644
index 000000000000..223277a5cd7e
--- /dev/null
+++ b/editors/openoffice.org-2/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
@@ -0,0 +1,45 @@
+--- /dev/null	1970-01-01 01:00:00.000000000 +0100
++++ ../goodies/source/filter.vcl/egif/giflzwc_disabled.cxx	2002-08-15 15:09:47.000000000 +0200
+@@ -0,0 +1,42 @@
++/**********************************
++ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed.
++ **********************************/ 
++
++//#include <tools/stream.hxx>
++#include "giflzwc.hxx"
++
++// --------------------
++// - GIFLZWCompressor -
++// --------------------
++
++GIFLZWCompressor::GIFLZWCompressor()
++{
++	pIDOS=NULL;
++}
++
++// ------------------------------------------------------------------------
++
++GIFLZWCompressor::~GIFLZWCompressor()
++{
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::EndCompression()
++{
++	/********************** DISABLED *************************/
++}
diff --git a/editors/openoffice.org-2/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk b/editors/openoffice.org-2/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
new file mode 100644
index 000000000000..dd9e199acc96
--- /dev/null
+++ b/editors/openoffice.org-2/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
@@ -0,0 +1,11 @@
+--- ../goodies/source/filter.vcl/egif/makefile.mk.orig	Tue Aug 14 23:22:54 2001
++++ ../goodies/source/filter.vcl/egif/makefile.mk	Mon Apr 14 06:04:55 2003
+@@ -89,7 +89,7 @@
+ 
+ SLOFILES= 	$(SLO)$/egif.obj		\
+ 		$(SLO)$/dlgegif.obj	\
+-		$(SLO)$/giflzwc.obj
++		$(SLO)$/giflzwc_disabled.obj
+ 
+ 
+ # ==========================================================================
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 5bb04213c156..79351770f737 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -246,6 +246,15 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@${ECHO}
+	@${ECHO} "You may set WITH_GIF_LZW_COMPRESSION=YES"
+	@${ECHO} "If you want to make compressed gif images"
+	@${ECHO}
+	@${ECHO} "If must have license from the Unisys and IBM patents"
+	@${ECHO} "to enable this option to get compressed GIF images."
+	@${ECHO}
+.endif
 .if ${OSVERSION} < 450002
 	@${ECHO}
 	@${ECHO} "OS-VERSION ${OSVERSION} too low"
@@ -358,6 +367,17 @@ post-patch:
 		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
 	fi
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@if [ "`echo ${PATCHDIR}/gifpatch-*`" != "${PATCHDIR}/gifpatch-*" ]; then \
+		${ECHO_MSG} "===>  Removing GIF LZW compression for ${PKGNAME}" ; \
+		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
+			${ECHO_MSG} "===>   Applying GIF LZW compression ${OPSYS} patch" ; \
+		fi; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \
+	fi
+.endif
 .if defined(WITH_DEBUG)
 	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
@@ -502,6 +522,8 @@ pre-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
 	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
 	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
+	@${CP}	${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index 0004033ec259..a55458016a47 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -7,3 +7,4 @@ 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/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
diff --git a/editors/openoffice.org-3-RC/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx b/editors/openoffice.org-3-RC/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
new file mode 100644
index 000000000000..0fcdf289cca3
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
@@ -0,0 +1,290 @@
+--- ../goodies/source/filter.vcl/egif/giflzwc.cxx	Sun Apr 13 14:33:24 2003
++++ /dev/null	Mon Apr 14 06:10:35 2003
+@@ -1,287 +0,0 @@
+-/*************************************************************************
+- *
+- *  $RCSfile: giflzwc.cxx,v $
+- *
+- *  $Revision: 1.1.1.1 $
+- *
+- *  last change: $Author: hr $ $Date: 2000/09/18 16:30:11 $
+- *
+- *  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 <tools/stream.hxx>
+-#include "giflzwc.hxx"
+-
+-// ----------------------------
+-// - GIFImageDataOutputStream -
+-// ----------------------------
+-
+-class GIFImageDataOutputStream
+-{
+-private:
+-
+-	void		FlushBlockBuf();
+-	inline void	FlushBitsBufsFullBytes();
+-
+-	SvStream&	rStream;
+-	BYTE*		pBlockBuf;
+-	BYTE		nBlockBufSize;
+-	ULONG		nBitsBuf;
+-	USHORT		nBitsBufSize;
+-
+-public:
+-
+-				GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize );
+-				~GIFImageDataOutputStream();
+-
+-	inline void	WriteBits( USHORT nCode, USHORT nCodeLen );
+-};
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
+-{
+-	while (nBitsBufSize>=8)
+-	{
+-		if( nBlockBufSize==255 )
+-			FlushBlockBuf();
+-
+-		pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf;
+-		nBitsBuf >>= 8;
+-		nBitsBufSize -= 8;
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen )
+-{
+-	if( nBitsBufSize+nCodeLen>32 )
+-		FlushBitsBufsFullBytes();
+-
+-	nBitsBuf |= (ULONG) nCode << nBitsBufSize;
+-	nBitsBufSize += nCodeLen;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) :
+-		rStream(rGIF)
+-{
+-	pBlockBuf = new BYTE[ 255 ];
+-	nBlockBufSize = 0;
+-	nBitsBufSize = 0;
+-	nBitsBuf = 0;
+-	rStream << nLZWDataSize;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-
+-GIFImageDataOutputStream::~GIFImageDataOutputStream()
+-{
+-	WriteBits(0,7);
+-	FlushBitsBufsFullBytes();
+-	FlushBlockBuf();
+-	rStream << (BYTE)0;
+-	delete[] pBlockBuf;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFImageDataOutputStream::FlushBlockBuf()
+-{
+-	if( nBlockBufSize )
+-	{
+-		rStream << (BYTE) nBlockBufSize;
+-		rStream.Write( pBlockBuf,nBlockBufSize );
+-		nBlockBufSize = 0;
+-	}
+-}
+-
+-// -------------------
+-// - GIFLZWCTreeNode -
+-// -------------------
+-
+-struct GIFLZWCTreeNode
+-{
+-
+-	GIFLZWCTreeNode*	pBrother;		// naechster Knoten, der den selben Vater hat
+-	GIFLZWCTreeNode*	pFirstChild;	// erster Sohn
+-	USHORT				nCode;			// Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
+-	USHORT				nValue;			// Der Pixelwert
+-};
+-
+-// --------------------
+-// - GIFLZWCompressor -
+-// --------------------
+-
+-GIFLZWCompressor::GIFLZWCompressor()
+-{
+-	pIDOS=NULL;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFLZWCompressor::~GIFLZWCompressor()
+-{
+-	if (pIDOS!=NULL) EndCompression();
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
+-{
+-	if( !pIDOS )
+-	{
+-		USHORT i;
+-
+-		nDataSize = nPixelSize;
+-
+-		if( nDataSize < 2 )
+-			nDataSize=2;
+-
+-		nClearCode=1<<nDataSize;
+-		nEOICode=nClearCode+1;
+-		nTableSize=nEOICode+1;
+-		nCodeSize=nDataSize+1;
+-
+-		pIDOS=new GIFImageDataOutputStream(rGIF,(BYTE)nDataSize);
+-		pTable=new GIFLZWCTreeNode[4096];
+-
+-		for (i=0; i<4096; i++)
+-		{
+-			pTable[i].pBrother = pTable[i].pFirstChild = NULL;
+-			pTable[i].nValue = (BYTE) ( pTable[i].nCode = i );
+-		}
+-
+-		pPrefix = NULL;
+-		pIDOS->WriteBits( nClearCode,nCodeSize );
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
+-{
+-	if( pIDOS )
+-	{
+-		GIFLZWCTreeNode*	p;
+-		USHORT				i;
+-		BYTE				nV;
+-
+-		if( !pPrefix && nSize )
+-		{
+-			pPrefix=pTable+(*pSrc++);
+-			nSize--;
+-		}
+-
+-		while( nSize )
+-		{
+-			nSize--;
+-			nV=*pSrc++;
+-			for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother )
+-			{
+-				if (p->nValue==nV)
+-					break;
+-			}
+-
+-			if( p)
+-				pPrefix=p;
+-			else
+-			{
+-				pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-				if (nTableSize==4096)
+-				{
+-					pIDOS->WriteBits(nClearCode,nCodeSize);
+-
+-					for (i=0; i<nClearCode; i++)
+-						pTable[i].pFirstChild=NULL;
+-
+-					nCodeSize=nDataSize+1;
+-					nTableSize=nEOICode+1;
+-				}
+-				else
+-				{
+-					if(nTableSize==(USHORT)(1<<nCodeSize))
+-						nCodeSize++;
+-
+-					p=pTable+(nTableSize++);
+-					p->pBrother=pPrefix->pFirstChild;
+-					pPrefix->pFirstChild=p;
+-					p->nValue=nV;
+-					p->pFirstChild=NULL;
+-				}
+-
+-				pPrefix=pTable+nV;
+-			}
+-		}
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::EndCompression()
+-{
+-	if( pIDOS )
+-	{
+-		if( pPrefix )
+-			pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-		pIDOS->WriteBits( nEOICode,nCodeSize );
+-		delete[] pTable;
+-		delete pIDOS;
+-		pIDOS=NULL;
+-	}
+-}
diff --git a/editors/openoffice.org-3-RC/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx b/editors/openoffice.org-3-RC/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
new file mode 100644
index 000000000000..223277a5cd7e
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
@@ -0,0 +1,45 @@
+--- /dev/null	1970-01-01 01:00:00.000000000 +0100
++++ ../goodies/source/filter.vcl/egif/giflzwc_disabled.cxx	2002-08-15 15:09:47.000000000 +0200
+@@ -0,0 +1,42 @@
++/**********************************
++ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed.
++ **********************************/ 
++
++//#include <tools/stream.hxx>
++#include "giflzwc.hxx"
++
++// --------------------
++// - GIFLZWCompressor -
++// --------------------
++
++GIFLZWCompressor::GIFLZWCompressor()
++{
++	pIDOS=NULL;
++}
++
++// ------------------------------------------------------------------------
++
++GIFLZWCompressor::~GIFLZWCompressor()
++{
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::EndCompression()
++{
++	/********************** DISABLED *************************/
++}
diff --git a/editors/openoffice.org-3-RC/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk b/editors/openoffice.org-3-RC/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
new file mode 100644
index 000000000000..dd9e199acc96
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
@@ -0,0 +1,11 @@
+--- ../goodies/source/filter.vcl/egif/makefile.mk.orig	Tue Aug 14 23:22:54 2001
++++ ../goodies/source/filter.vcl/egif/makefile.mk	Mon Apr 14 06:04:55 2003
+@@ -89,7 +89,7 @@
+ 
+ SLOFILES= 	$(SLO)$/egif.obj		\
+ 		$(SLO)$/dlgegif.obj	\
+-		$(SLO)$/giflzwc.obj
++		$(SLO)$/giflzwc_disabled.obj
+ 
+ 
+ # ==========================================================================
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 5bb04213c156..79351770f737 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -246,6 +246,15 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@${ECHO}
+	@${ECHO} "You may set WITH_GIF_LZW_COMPRESSION=YES"
+	@${ECHO} "If you want to make compressed gif images"
+	@${ECHO}
+	@${ECHO} "If must have license from the Unisys and IBM patents"
+	@${ECHO} "to enable this option to get compressed GIF images."
+	@${ECHO}
+.endif
 .if ${OSVERSION} < 450002
 	@${ECHO}
 	@${ECHO} "OS-VERSION ${OSVERSION} too low"
@@ -358,6 +367,17 @@ post-patch:
 		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
 	fi
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@if [ "`echo ${PATCHDIR}/gifpatch-*`" != "${PATCHDIR}/gifpatch-*" ]; then \
+		${ECHO_MSG} "===>  Removing GIF LZW compression for ${PKGNAME}" ; \
+		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
+			${ECHO_MSG} "===>   Applying GIF LZW compression ${OPSYS} patch" ; \
+		fi; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \
+	fi
+.endif
 .if defined(WITH_DEBUG)
 	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
@@ -502,6 +522,8 @@ pre-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
 	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
 	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
+	@${CP}	${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index 0004033ec259..a55458016a47 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -7,3 +7,4 @@ 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/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
diff --git a/editors/openoffice.org-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx b/editors/openoffice.org-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
new file mode 100644
index 000000000000..0fcdf289cca3
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
@@ -0,0 +1,290 @@
+--- ../goodies/source/filter.vcl/egif/giflzwc.cxx	Sun Apr 13 14:33:24 2003
++++ /dev/null	Mon Apr 14 06:10:35 2003
+@@ -1,287 +0,0 @@
+-/*************************************************************************
+- *
+- *  $RCSfile: giflzwc.cxx,v $
+- *
+- *  $Revision: 1.1.1.1 $
+- *
+- *  last change: $Author: hr $ $Date: 2000/09/18 16:30:11 $
+- *
+- *  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 <tools/stream.hxx>
+-#include "giflzwc.hxx"
+-
+-// ----------------------------
+-// - GIFImageDataOutputStream -
+-// ----------------------------
+-
+-class GIFImageDataOutputStream
+-{
+-private:
+-
+-	void		FlushBlockBuf();
+-	inline void	FlushBitsBufsFullBytes();
+-
+-	SvStream&	rStream;
+-	BYTE*		pBlockBuf;
+-	BYTE		nBlockBufSize;
+-	ULONG		nBitsBuf;
+-	USHORT		nBitsBufSize;
+-
+-public:
+-
+-				GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize );
+-				~GIFImageDataOutputStream();
+-
+-	inline void	WriteBits( USHORT nCode, USHORT nCodeLen );
+-};
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
+-{
+-	while (nBitsBufSize>=8)
+-	{
+-		if( nBlockBufSize==255 )
+-			FlushBlockBuf();
+-
+-		pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf;
+-		nBitsBuf >>= 8;
+-		nBitsBufSize -= 8;
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen )
+-{
+-	if( nBitsBufSize+nCodeLen>32 )
+-		FlushBitsBufsFullBytes();
+-
+-	nBitsBuf |= (ULONG) nCode << nBitsBufSize;
+-	nBitsBufSize += nCodeLen;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) :
+-		rStream(rGIF)
+-{
+-	pBlockBuf = new BYTE[ 255 ];
+-	nBlockBufSize = 0;
+-	nBitsBufSize = 0;
+-	nBitsBuf = 0;
+-	rStream << nLZWDataSize;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-
+-GIFImageDataOutputStream::~GIFImageDataOutputStream()
+-{
+-	WriteBits(0,7);
+-	FlushBitsBufsFullBytes();
+-	FlushBlockBuf();
+-	rStream << (BYTE)0;
+-	delete[] pBlockBuf;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFImageDataOutputStream::FlushBlockBuf()
+-{
+-	if( nBlockBufSize )
+-	{
+-		rStream << (BYTE) nBlockBufSize;
+-		rStream.Write( pBlockBuf,nBlockBufSize );
+-		nBlockBufSize = 0;
+-	}
+-}
+-
+-// -------------------
+-// - GIFLZWCTreeNode -
+-// -------------------
+-
+-struct GIFLZWCTreeNode
+-{
+-
+-	GIFLZWCTreeNode*	pBrother;		// naechster Knoten, der den selben Vater hat
+-	GIFLZWCTreeNode*	pFirstChild;	// erster Sohn
+-	USHORT				nCode;			// Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
+-	USHORT				nValue;			// Der Pixelwert
+-};
+-
+-// --------------------
+-// - GIFLZWCompressor -
+-// --------------------
+-
+-GIFLZWCompressor::GIFLZWCompressor()
+-{
+-	pIDOS=NULL;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFLZWCompressor::~GIFLZWCompressor()
+-{
+-	if (pIDOS!=NULL) EndCompression();
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
+-{
+-	if( !pIDOS )
+-	{
+-		USHORT i;
+-
+-		nDataSize = nPixelSize;
+-
+-		if( nDataSize < 2 )
+-			nDataSize=2;
+-
+-		nClearCode=1<<nDataSize;
+-		nEOICode=nClearCode+1;
+-		nTableSize=nEOICode+1;
+-		nCodeSize=nDataSize+1;
+-
+-		pIDOS=new GIFImageDataOutputStream(rGIF,(BYTE)nDataSize);
+-		pTable=new GIFLZWCTreeNode[4096];
+-
+-		for (i=0; i<4096; i++)
+-		{
+-			pTable[i].pBrother = pTable[i].pFirstChild = NULL;
+-			pTable[i].nValue = (BYTE) ( pTable[i].nCode = i );
+-		}
+-
+-		pPrefix = NULL;
+-		pIDOS->WriteBits( nClearCode,nCodeSize );
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
+-{
+-	if( pIDOS )
+-	{
+-		GIFLZWCTreeNode*	p;
+-		USHORT				i;
+-		BYTE				nV;
+-
+-		if( !pPrefix && nSize )
+-		{
+-			pPrefix=pTable+(*pSrc++);
+-			nSize--;
+-		}
+-
+-		while( nSize )
+-		{
+-			nSize--;
+-			nV=*pSrc++;
+-			for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother )
+-			{
+-				if (p->nValue==nV)
+-					break;
+-			}
+-
+-			if( p)
+-				pPrefix=p;
+-			else
+-			{
+-				pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-				if (nTableSize==4096)
+-				{
+-					pIDOS->WriteBits(nClearCode,nCodeSize);
+-
+-					for (i=0; i<nClearCode; i++)
+-						pTable[i].pFirstChild=NULL;
+-
+-					nCodeSize=nDataSize+1;
+-					nTableSize=nEOICode+1;
+-				}
+-				else
+-				{
+-					if(nTableSize==(USHORT)(1<<nCodeSize))
+-						nCodeSize++;
+-
+-					p=pTable+(nTableSize++);
+-					p->pBrother=pPrefix->pFirstChild;
+-					pPrefix->pFirstChild=p;
+-					p->nValue=nV;
+-					p->pFirstChild=NULL;
+-				}
+-
+-				pPrefix=pTable+nV;
+-			}
+-		}
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::EndCompression()
+-{
+-	if( pIDOS )
+-	{
+-		if( pPrefix )
+-			pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-		pIDOS->WriteBits( nEOICode,nCodeSize );
+-		delete[] pTable;
+-		delete pIDOS;
+-		pIDOS=NULL;
+-	}
+-}
diff --git a/editors/openoffice.org-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx b/editors/openoffice.org-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
new file mode 100644
index 000000000000..223277a5cd7e
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
@@ -0,0 +1,45 @@
+--- /dev/null	1970-01-01 01:00:00.000000000 +0100
++++ ../goodies/source/filter.vcl/egif/giflzwc_disabled.cxx	2002-08-15 15:09:47.000000000 +0200
+@@ -0,0 +1,42 @@
++/**********************************
++ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed.
++ **********************************/ 
++
++//#include <tools/stream.hxx>
++#include "giflzwc.hxx"
++
++// --------------------
++// - GIFLZWCompressor -
++// --------------------
++
++GIFLZWCompressor::GIFLZWCompressor()
++{
++	pIDOS=NULL;
++}
++
++// ------------------------------------------------------------------------
++
++GIFLZWCompressor::~GIFLZWCompressor()
++{
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::EndCompression()
++{
++	/********************** DISABLED *************************/
++}
diff --git a/editors/openoffice.org-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk b/editors/openoffice.org-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
new file mode 100644
index 000000000000..dd9e199acc96
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
@@ -0,0 +1,11 @@
+--- ../goodies/source/filter.vcl/egif/makefile.mk.orig	Tue Aug 14 23:22:54 2001
++++ ../goodies/source/filter.vcl/egif/makefile.mk	Mon Apr 14 06:04:55 2003
+@@ -89,7 +89,7 @@
+ 
+ SLOFILES= 	$(SLO)$/egif.obj		\
+ 		$(SLO)$/dlgegif.obj	\
+-		$(SLO)$/giflzwc.obj
++		$(SLO)$/giflzwc_disabled.obj
+ 
+ 
+ # ==========================================================================
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 5bb04213c156..79351770f737 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -246,6 +246,15 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@${ECHO}
+	@${ECHO} "You may set WITH_GIF_LZW_COMPRESSION=YES"
+	@${ECHO} "If you want to make compressed gif images"
+	@${ECHO}
+	@${ECHO} "If must have license from the Unisys and IBM patents"
+	@${ECHO} "to enable this option to get compressed GIF images."
+	@${ECHO}
+.endif
 .if ${OSVERSION} < 450002
 	@${ECHO}
 	@${ECHO} "OS-VERSION ${OSVERSION} too low"
@@ -358,6 +367,17 @@ post-patch:
 		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
 	fi
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@if [ "`echo ${PATCHDIR}/gifpatch-*`" != "${PATCHDIR}/gifpatch-*" ]; then \
+		${ECHO_MSG} "===>  Removing GIF LZW compression for ${PKGNAME}" ; \
+		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
+			${ECHO_MSG} "===>   Applying GIF LZW compression ${OPSYS} patch" ; \
+		fi; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \
+	fi
+.endif
 .if defined(WITH_DEBUG)
 	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
@@ -502,6 +522,8 @@ pre-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
 	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
 	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
+	@${CP}	${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index 0004033ec259..a55458016a47 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -7,3 +7,4 @@ 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/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
diff --git a/editors/openoffice.org-3/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx b/editors/openoffice.org-3/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
new file mode 100644
index 000000000000..0fcdf289cca3
--- /dev/null
+++ b/editors/openoffice.org-3/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
@@ -0,0 +1,290 @@
+--- ../goodies/source/filter.vcl/egif/giflzwc.cxx	Sun Apr 13 14:33:24 2003
++++ /dev/null	Mon Apr 14 06:10:35 2003
+@@ -1,287 +0,0 @@
+-/*************************************************************************
+- *
+- *  $RCSfile: giflzwc.cxx,v $
+- *
+- *  $Revision: 1.1.1.1 $
+- *
+- *  last change: $Author: hr $ $Date: 2000/09/18 16:30:11 $
+- *
+- *  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 <tools/stream.hxx>
+-#include "giflzwc.hxx"
+-
+-// ----------------------------
+-// - GIFImageDataOutputStream -
+-// ----------------------------
+-
+-class GIFImageDataOutputStream
+-{
+-private:
+-
+-	void		FlushBlockBuf();
+-	inline void	FlushBitsBufsFullBytes();
+-
+-	SvStream&	rStream;
+-	BYTE*		pBlockBuf;
+-	BYTE		nBlockBufSize;
+-	ULONG		nBitsBuf;
+-	USHORT		nBitsBufSize;
+-
+-public:
+-
+-				GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize );
+-				~GIFImageDataOutputStream();
+-
+-	inline void	WriteBits( USHORT nCode, USHORT nCodeLen );
+-};
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
+-{
+-	while (nBitsBufSize>=8)
+-	{
+-		if( nBlockBufSize==255 )
+-			FlushBlockBuf();
+-
+-		pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf;
+-		nBitsBuf >>= 8;
+-		nBitsBufSize -= 8;
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen )
+-{
+-	if( nBitsBufSize+nCodeLen>32 )
+-		FlushBitsBufsFullBytes();
+-
+-	nBitsBuf |= (ULONG) nCode << nBitsBufSize;
+-	nBitsBufSize += nCodeLen;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) :
+-		rStream(rGIF)
+-{
+-	pBlockBuf = new BYTE[ 255 ];
+-	nBlockBufSize = 0;
+-	nBitsBufSize = 0;
+-	nBitsBuf = 0;
+-	rStream << nLZWDataSize;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-
+-GIFImageDataOutputStream::~GIFImageDataOutputStream()
+-{
+-	WriteBits(0,7);
+-	FlushBitsBufsFullBytes();
+-	FlushBlockBuf();
+-	rStream << (BYTE)0;
+-	delete[] pBlockBuf;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFImageDataOutputStream::FlushBlockBuf()
+-{
+-	if( nBlockBufSize )
+-	{
+-		rStream << (BYTE) nBlockBufSize;
+-		rStream.Write( pBlockBuf,nBlockBufSize );
+-		nBlockBufSize = 0;
+-	}
+-}
+-
+-// -------------------
+-// - GIFLZWCTreeNode -
+-// -------------------
+-
+-struct GIFLZWCTreeNode
+-{
+-
+-	GIFLZWCTreeNode*	pBrother;		// naechster Knoten, der den selben Vater hat
+-	GIFLZWCTreeNode*	pFirstChild;	// erster Sohn
+-	USHORT				nCode;			// Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
+-	USHORT				nValue;			// Der Pixelwert
+-};
+-
+-// --------------------
+-// - GIFLZWCompressor -
+-// --------------------
+-
+-GIFLZWCompressor::GIFLZWCompressor()
+-{
+-	pIDOS=NULL;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFLZWCompressor::~GIFLZWCompressor()
+-{
+-	if (pIDOS!=NULL) EndCompression();
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
+-{
+-	if( !pIDOS )
+-	{
+-		USHORT i;
+-
+-		nDataSize = nPixelSize;
+-
+-		if( nDataSize < 2 )
+-			nDataSize=2;
+-
+-		nClearCode=1<<nDataSize;
+-		nEOICode=nClearCode+1;
+-		nTableSize=nEOICode+1;
+-		nCodeSize=nDataSize+1;
+-
+-		pIDOS=new GIFImageDataOutputStream(rGIF,(BYTE)nDataSize);
+-		pTable=new GIFLZWCTreeNode[4096];
+-
+-		for (i=0; i<4096; i++)
+-		{
+-			pTable[i].pBrother = pTable[i].pFirstChild = NULL;
+-			pTable[i].nValue = (BYTE) ( pTable[i].nCode = i );
+-		}
+-
+-		pPrefix = NULL;
+-		pIDOS->WriteBits( nClearCode,nCodeSize );
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
+-{
+-	if( pIDOS )
+-	{
+-		GIFLZWCTreeNode*	p;
+-		USHORT				i;
+-		BYTE				nV;
+-
+-		if( !pPrefix && nSize )
+-		{
+-			pPrefix=pTable+(*pSrc++);
+-			nSize--;
+-		}
+-
+-		while( nSize )
+-		{
+-			nSize--;
+-			nV=*pSrc++;
+-			for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother )
+-			{
+-				if (p->nValue==nV)
+-					break;
+-			}
+-
+-			if( p)
+-				pPrefix=p;
+-			else
+-			{
+-				pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-				if (nTableSize==4096)
+-				{
+-					pIDOS->WriteBits(nClearCode,nCodeSize);
+-
+-					for (i=0; i<nClearCode; i++)
+-						pTable[i].pFirstChild=NULL;
+-
+-					nCodeSize=nDataSize+1;
+-					nTableSize=nEOICode+1;
+-				}
+-				else
+-				{
+-					if(nTableSize==(USHORT)(1<<nCodeSize))
+-						nCodeSize++;
+-
+-					p=pTable+(nTableSize++);
+-					p->pBrother=pPrefix->pFirstChild;
+-					pPrefix->pFirstChild=p;
+-					p->nValue=nV;
+-					p->pFirstChild=NULL;
+-				}
+-
+-				pPrefix=pTable+nV;
+-			}
+-		}
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::EndCompression()
+-{
+-	if( pIDOS )
+-	{
+-		if( pPrefix )
+-			pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-		pIDOS->WriteBits( nEOICode,nCodeSize );
+-		delete[] pTable;
+-		delete pIDOS;
+-		pIDOS=NULL;
+-	}
+-}
diff --git a/editors/openoffice.org-3/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx b/editors/openoffice.org-3/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
new file mode 100644
index 000000000000..223277a5cd7e
--- /dev/null
+++ b/editors/openoffice.org-3/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
@@ -0,0 +1,45 @@
+--- /dev/null	1970-01-01 01:00:00.000000000 +0100
++++ ../goodies/source/filter.vcl/egif/giflzwc_disabled.cxx	2002-08-15 15:09:47.000000000 +0200
+@@ -0,0 +1,42 @@
++/**********************************
++ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed.
++ **********************************/ 
++
++//#include <tools/stream.hxx>
++#include "giflzwc.hxx"
++
++// --------------------
++// - GIFLZWCompressor -
++// --------------------
++
++GIFLZWCompressor::GIFLZWCompressor()
++{
++	pIDOS=NULL;
++}
++
++// ------------------------------------------------------------------------
++
++GIFLZWCompressor::~GIFLZWCompressor()
++{
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::EndCompression()
++{
++	/********************** DISABLED *************************/
++}
diff --git a/editors/openoffice.org-3/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk b/editors/openoffice.org-3/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
new file mode 100644
index 000000000000..dd9e199acc96
--- /dev/null
+++ b/editors/openoffice.org-3/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
@@ -0,0 +1,11 @@
+--- ../goodies/source/filter.vcl/egif/makefile.mk.orig	Tue Aug 14 23:22:54 2001
++++ ../goodies/source/filter.vcl/egif/makefile.mk	Mon Apr 14 06:04:55 2003
+@@ -89,7 +89,7 @@
+ 
+ SLOFILES= 	$(SLO)$/egif.obj		\
+ 		$(SLO)$/dlgegif.obj	\
+-		$(SLO)$/giflzwc.obj
++		$(SLO)$/giflzwc_disabled.obj
+ 
+ 
+ # ==========================================================================
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 5bb04213c156..79351770f737 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -246,6 +246,15 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@${ECHO}
+	@${ECHO} "You may set WITH_GIF_LZW_COMPRESSION=YES"
+	@${ECHO} "If you want to make compressed gif images"
+	@${ECHO}
+	@${ECHO} "If must have license from the Unisys and IBM patents"
+	@${ECHO} "to enable this option to get compressed GIF images."
+	@${ECHO}
+.endif
 .if ${OSVERSION} < 450002
 	@${ECHO}
 	@${ECHO} "OS-VERSION ${OSVERSION} too low"
@@ -358,6 +367,17 @@ post-patch:
 		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
 	fi
 .endif
+.if !defined(WITH_GIF_LZW_COMPRESSION)
+	@if [ "`echo ${PATCHDIR}/gifpatch-*`" != "${PATCHDIR}/gifpatch-*" ]; then \
+		${ECHO_MSG} "===>  Removing GIF LZW compression for ${PKGNAME}" ; \
+		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
+			${ECHO_MSG} "===>   Applying GIF LZW compression ${OPSYS} patch" ; \
+		fi; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx ; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \
+	fi
+.endif
 .if defined(WITH_DEBUG)
 	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
@@ -502,6 +522,8 @@ pre-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
 	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
 	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
+	@${CP}	${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index 0004033ec259..a55458016a47 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -7,3 +7,4 @@ 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/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
diff --git a/editors/openoffice.org-vcltesttool/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx b/editors/openoffice.org-vcltesttool/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
new file mode 100644
index 000000000000..0fcdf289cca3
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
@@ -0,0 +1,290 @@
+--- ../goodies/source/filter.vcl/egif/giflzwc.cxx	Sun Apr 13 14:33:24 2003
++++ /dev/null	Mon Apr 14 06:10:35 2003
+@@ -1,287 +0,0 @@
+-/*************************************************************************
+- *
+- *  $RCSfile: giflzwc.cxx,v $
+- *
+- *  $Revision: 1.1.1.1 $
+- *
+- *  last change: $Author: hr $ $Date: 2000/09/18 16:30:11 $
+- *
+- *  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 <tools/stream.hxx>
+-#include "giflzwc.hxx"
+-
+-// ----------------------------
+-// - GIFImageDataOutputStream -
+-// ----------------------------
+-
+-class GIFImageDataOutputStream
+-{
+-private:
+-
+-	void		FlushBlockBuf();
+-	inline void	FlushBitsBufsFullBytes();
+-
+-	SvStream&	rStream;
+-	BYTE*		pBlockBuf;
+-	BYTE		nBlockBufSize;
+-	ULONG		nBitsBuf;
+-	USHORT		nBitsBufSize;
+-
+-public:
+-
+-				GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize );
+-				~GIFImageDataOutputStream();
+-
+-	inline void	WriteBits( USHORT nCode, USHORT nCodeLen );
+-};
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
+-{
+-	while (nBitsBufSize>=8)
+-	{
+-		if( nBlockBufSize==255 )
+-			FlushBlockBuf();
+-
+-		pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf;
+-		nBitsBuf >>= 8;
+-		nBitsBufSize -= 8;
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen )
+-{
+-	if( nBitsBufSize+nCodeLen>32 )
+-		FlushBitsBufsFullBytes();
+-
+-	nBitsBuf |= (ULONG) nCode << nBitsBufSize;
+-	nBitsBufSize += nCodeLen;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) :
+-		rStream(rGIF)
+-{
+-	pBlockBuf = new BYTE[ 255 ];
+-	nBlockBufSize = 0;
+-	nBitsBufSize = 0;
+-	nBitsBuf = 0;
+-	rStream << nLZWDataSize;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-
+-GIFImageDataOutputStream::~GIFImageDataOutputStream()
+-{
+-	WriteBits(0,7);
+-	FlushBitsBufsFullBytes();
+-	FlushBlockBuf();
+-	rStream << (BYTE)0;
+-	delete[] pBlockBuf;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFImageDataOutputStream::FlushBlockBuf()
+-{
+-	if( nBlockBufSize )
+-	{
+-		rStream << (BYTE) nBlockBufSize;
+-		rStream.Write( pBlockBuf,nBlockBufSize );
+-		nBlockBufSize = 0;
+-	}
+-}
+-
+-// -------------------
+-// - GIFLZWCTreeNode -
+-// -------------------
+-
+-struct GIFLZWCTreeNode
+-{
+-
+-	GIFLZWCTreeNode*	pBrother;		// naechster Knoten, der den selben Vater hat
+-	GIFLZWCTreeNode*	pFirstChild;	// erster Sohn
+-	USHORT				nCode;			// Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
+-	USHORT				nValue;			// Der Pixelwert
+-};
+-
+-// --------------------
+-// - GIFLZWCompressor -
+-// --------------------
+-
+-GIFLZWCompressor::GIFLZWCompressor()
+-{
+-	pIDOS=NULL;
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-GIFLZWCompressor::~GIFLZWCompressor()
+-{
+-	if (pIDOS!=NULL) EndCompression();
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
+-{
+-	if( !pIDOS )
+-	{
+-		USHORT i;
+-
+-		nDataSize = nPixelSize;
+-
+-		if( nDataSize < 2 )
+-			nDataSize=2;
+-
+-		nClearCode=1<<nDataSize;
+-		nEOICode=nClearCode+1;
+-		nTableSize=nEOICode+1;
+-		nCodeSize=nDataSize+1;
+-
+-		pIDOS=new GIFImageDataOutputStream(rGIF,(BYTE)nDataSize);
+-		pTable=new GIFLZWCTreeNode[4096];
+-
+-		for (i=0; i<4096; i++)
+-		{
+-			pTable[i].pBrother = pTable[i].pFirstChild = NULL;
+-			pTable[i].nValue = (BYTE) ( pTable[i].nCode = i );
+-		}
+-
+-		pPrefix = NULL;
+-		pIDOS->WriteBits( nClearCode,nCodeSize );
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
+-{
+-	if( pIDOS )
+-	{
+-		GIFLZWCTreeNode*	p;
+-		USHORT				i;
+-		BYTE				nV;
+-
+-		if( !pPrefix && nSize )
+-		{
+-			pPrefix=pTable+(*pSrc++);
+-			nSize--;
+-		}
+-
+-		while( nSize )
+-		{
+-			nSize--;
+-			nV=*pSrc++;
+-			for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother )
+-			{
+-				if (p->nValue==nV)
+-					break;
+-			}
+-
+-			if( p)
+-				pPrefix=p;
+-			else
+-			{
+-				pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-				if (nTableSize==4096)
+-				{
+-					pIDOS->WriteBits(nClearCode,nCodeSize);
+-
+-					for (i=0; i<nClearCode; i++)
+-						pTable[i].pFirstChild=NULL;
+-
+-					nCodeSize=nDataSize+1;
+-					nTableSize=nEOICode+1;
+-				}
+-				else
+-				{
+-					if(nTableSize==(USHORT)(1<<nCodeSize))
+-						nCodeSize++;
+-
+-					p=pTable+(nTableSize++);
+-					p->pBrother=pPrefix->pFirstChild;
+-					pPrefix->pFirstChild=p;
+-					p->nValue=nV;
+-					p->pFirstChild=NULL;
+-				}
+-
+-				pPrefix=pTable+nV;
+-			}
+-		}
+-	}
+-}
+-
+-// ------------------------------------------------------------------------
+-
+-void GIFLZWCompressor::EndCompression()
+-{
+-	if( pIDOS )
+-	{
+-		if( pPrefix )
+-			pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
+-
+-		pIDOS->WriteBits( nEOICode,nCodeSize );
+-		delete[] pTable;
+-		delete pIDOS;
+-		pIDOS=NULL;
+-	}
+-}
diff --git a/editors/openoffice.org-vcltesttool/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx b/editors/openoffice.org-vcltesttool/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
new file mode 100644
index 000000000000..223277a5cd7e
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
@@ -0,0 +1,45 @@
+--- /dev/null	1970-01-01 01:00:00.000000000 +0100
++++ ../goodies/source/filter.vcl/egif/giflzwc_disabled.cxx	2002-08-15 15:09:47.000000000 +0200
+@@ -0,0 +1,42 @@
++/**********************************
++ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed.
++ **********************************/ 
++
++//#include <tools/stream.hxx>
++#include "giflzwc.hxx"
++
++// --------------------
++// - GIFLZWCompressor -
++// --------------------
++
++GIFLZWCompressor::GIFLZWCompressor()
++{
++	pIDOS=NULL;
++}
++
++// ------------------------------------------------------------------------
++
++GIFLZWCompressor::~GIFLZWCompressor()
++{
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
++{
++	/********************** DISABLED *************************/
++}
++
++// ------------------------------------------------------------------------
++
++void GIFLZWCompressor::EndCompression()
++{
++	/********************** DISABLED *************************/
++}
diff --git a/editors/openoffice.org-vcltesttool/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk b/editors/openoffice.org-vcltesttool/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
new file mode 100644
index 000000000000..dd9e199acc96
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
@@ -0,0 +1,11 @@
+--- ../goodies/source/filter.vcl/egif/makefile.mk.orig	Tue Aug 14 23:22:54 2001
++++ ../goodies/source/filter.vcl/egif/makefile.mk	Mon Apr 14 06:04:55 2003
+@@ -89,7 +89,7 @@
+ 
+ SLOFILES= 	$(SLO)$/egif.obj		\
+ 		$(SLO)$/dlgegif.obj	\
+-		$(SLO)$/giflzwc.obj
++		$(SLO)$/giflzwc_disabled.obj
+ 
+ 
+ # ==========================================================================