30 files changed, 1530 insertions, 1665 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 25f564ec734d..60cb35c94423 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -73,9 +73,9 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE?=		172
+MILESTONE?=		173
 OOOTAG?=		SRC680_m${MILESTONE}
-SNAPDATE=		20060605
+SNAPDATE=		20060626
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index cdbd633f3a51..28332915c0c5 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,12 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m172_source.tar.bz2) = 5274ce3d9fd419903786849e826a34da
-SHA256 (openoffice.org2.0/OOo_SRC680_m172_source.tar.bz2) = 5a124921ac87ffe5d3f138564014a242c952d5c562c163a4eee4213bc1e0cc86
-SIZE (openoffice.org2.0/OOo_SRC680_m172_source.tar.bz2) = 249726628
+MD5 (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = b8922278010673990b2d51b3a0b7aa3c
+SHA256 (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = b8d456b942d918088a3506051edf1c8c596d59586ebb78a95a566a53893c4d92
+SIZE (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = 248052856
+MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
+SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
+MD5 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 26031ee1a2fd248ad0cc2e7f17c44c39
+SHA256 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = d463b8259cb199cd26799c817756c73e4e7808b0cf915f86841ac9779e0f9936
+SIZE (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 6743024
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
 SHA256 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
 SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366
diff --git a/editors/openoffice-3-devel/files/patch-i64442 b/editors/openoffice-3-devel/files/patch-i64442
deleted file mode 100644
index 6c7313582b85..000000000000
--- a/editors/openoffice-3-devel/files/patch-i64442
+++ /dev/null
@@ -1,50 +0,0 @@
-cws maho02
-Index: jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
-===================================================================
-RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v
-retrieving revision 1.7
-diff -u -r1.7 gnujre.cxx
---- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	16 Mar 2006 13:13:00 -0000	1.7
-+++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	18 Apr 2006 21:50:36 -0000
-@@ -67,8 +67,8 @@
-           "/lib64/libgcj.so.7",
-           "/lib64/libgcj.so.6"
- #else
--          "/lib/libgcj.so.7",
--          "/lib/libgcj.so.6"
-+          "/libgcj.so.7",
-+          "/libgcj.so.6"
- #endif
-     };
-     *size = sizeof(ar) / sizeof (char*);
-@@ -87,7 +87,7 @@
-     OUString sVersionProperty(
-         RTL_CONSTASCII_USTRINGPARAM("java.version"));
-     OUString sHomeProperty(
--        RTL_CONSTASCII_USTRINGPARAM("java.home"));
-+        RTL_CONSTASCII_USTRINGPARAM("gnu.classpath.home.url"));
-     OUString sAccessProperty(
-         RTL_CONSTASCII_USTRINGPARAM("javax.accessibility.assistive_technologies"));
- 
-@@ -111,19 +111,8 @@
-         }
-         else if (!bHome && sHomeProperty.equals(i->first))
-         {
--           OUString fileURL;
--           if (osl_getFileURLFromSystemPath(i->second.pData,& fileURL.pData) ==
--               osl_File_E_None)
--           {
--               //make sure that the drive letter have all the same case
--               //otherwise file:///c:/jre and file:///C:/jre produce two
--               //different objects!!!
--               if (makeDriveLetterSame( & fileURL))
--               {
--                   m_sHome = fileURL;
--                   bHome = true;
--               }
--           }
-+          m_sHome = i->second;
-+          bHome = true;
-         }
-         else if (!bAccess && sAccessProperty.equals(i->first))
-         {
diff --git a/editors/openoffice-3-devel/files/patch-i64762 b/editors/openoffice-3-devel/files/patch-i64762
deleted file mode 100644
index 70b535dd070c..000000000000
--- a/editors/openoffice-3-devel/files/patch-i64762
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: sal/osl/unx/security.c
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/security.c,v
-retrieving revision 1.18
-diff -u -r1.18 security.c
---- sal/osl/unx/security.c	20 Apr 2006 16:24:05 -0000	1.18
-+++ sal/osl/unx/security.c	25 Apr 2006 21:35:23 -0000
-@@ -57,6 +57,11 @@
- #define PAM_BINARY_MSG 6
- #endif
- 
-+#include <stdint.h> //C99 contains SIZE_MAX
-+#ifndef SIZE_MAX 
-+#define SIZE_MAX (sizeof (size_t) -1)
-+#endif
-+
- extern oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32 nRtldMode);
- extern void* SAL_CALL osl_psz_getSymbol(oslModule hModule, const sal_Char* pszSymbolName);
- static oslSecurityError SAL_CALL 
diff --git a/editors/openoffice-3-devel/files/patch-i65513 b/editors/openoffice-3-devel/files/patch-i65513
index 146731b44885..ff0735045953 100644
--- a/editors/openoffice-3-devel/files/patch-i65513
+++ b/editors/openoffice-3-devel/files/patch-i65513
@@ -80,9 +80,15 @@
     		}
     		elsif ($platform =~ m/netbsd/)
     		{  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
---- solenv/inc/unx.mk	Fri May 19 13:55:04 2006
-+++ solenv/inc/unx.mk	Fri May 19 13:38:42 2006
-@@ -155,10 +155,9 @@
+
+Index: solenv/inc/unx.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/unx.mk,v
+retrieving revision 1.32
+diff -u -r1.32 unx.mk
+--- solenv/inc/unx.mk	3 Feb 2006 17:33:26 -0000	1.32
++++ solenv/inc/unx.mk	27 Jun 2006 01:52:09 -0000
+@@ -155,11 +155,10 @@
  .INCLUDE : unxbsds.mk
  .ENDIF
  
@@ -91,246 +97,28 @@
 +.IF "$(COM)$(OS)" == "GCCFREEBSD"
 +.INCLUDE : unxfbsd.mk
  .ENDIF
--
  
+-
  .IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"
  .INCLUDE : unxirxm3.mk
---- solenv/inc/unxfbsd.mk	Fri May 19 13:13:25 2006
-+++ solenv/inc/unxfbsd.mk	Fri May 19 13:52:02 2006
-@@ -0,0 +1,220 @@
-+#*************************************************************************
-+#
-+#   OpenOffice.org - a multi-platform office productivity suite
-+#
-+#   $RCSfile$
-+#
-+#   $Revision$
-+#
-+#   last change: $Author$ $Date$
-+#
-+#   The Contents of this file are made available subject to
-+#   the terms of GNU Lesser General Public License Version 2.1.
-+#
-+#
-+#     GNU Lesser General Public License Version 2.1
-+#     =============================================
-+#     Copyright 2005 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
-+#
-+#*************************************************************************
-+
-+# Makefile for FreeBSD.
-+
-+ASM=
-+AFLAGS=
-+
-+SOLAR_JAVA*=TRUE
-+JAVAFLAGSDEBUG=-g
-+
-+# Include arch specific makefile.
-+.IF "$(CPUNAME)" == "INTEL"
-+.INCLUDE : unxfbsdi.mk
-+.ENDIF
-+.IF "$(CPUNAME)" == "X86_64"
-+.INCLUDE : unxfbsdx.mk
-+.ENDIF
-+
-+# filter for supressing verbose messages from linker
-+#not needed at the moment
-+#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
-+
-+# _PTHREADS is needed for the stl
-+CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
-+
-+# enable visibility define in "sal/types.h"
-+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+
-+# this is a platform with JAVA support
-+.IF "$(SOLAR_JAVA)"!=""
-+JAVADEF=-DSOLAR_JAVA
-+.IF "$(debug)"==""
-+JAVA_RUNTIME=-ljava
-+.ELSE
-+JAVA_RUNTIME=-ljava_g
-+.ENDIF
-+.ENDIF
-+
-+# name of C++ Compiler
-+CXX*=g++
-+# name of C Compiler
-+CC*=gcc
-+.IF "$(SYSBASE)"!=""
-+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
-+CXX+:=$(CFLAGS_SYSBASE)
-+CC+:=$(CFLAGS_SYSBASE)
-+.ENDIF          # "$(SYSBASE)"!=""
-+CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
-+
-+# flags to enable build with symbols; required for crashdump feature
-+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-+CFLAGSENABLESYMBOLS=-g1
-+.ELSE
-+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-+
-+.ENDIF
-+
-+# flags for the C++ Compiler
-+CFLAGSCC= -pipe $(ARCH_FLAGS)
-+# Flags for enabling exception handling
-+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-+# Flags for disabling exception handling
-+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-+
-+# -fpermissive should be removed as soon as possible
-+CFLAGSCXX= -pipe $(ARCH_FLAGS)
-+CFLAGSCXX+= -Wno-ctor-dtor-privacy
-+PICSWITCH:=-fpic
-+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+CFLAGSCXX += -fvisibility-inlines-hidden
-+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+
-+# Compiler flags for compiling static object in single threaded environment with graphical user interface
-+CFLAGSOBJGUIST=
-+# Compiler flags for compiling static object in single threaded environment with character user interface
-+CFLAGSOBJCUIST=
-+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-+CFLAGSOBJGUIMT=
-+# Compiler flags for compiling static object in multi threaded environment with character user interface
-+CFLAGSOBJCUIMT=
-+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-+CFLAGSSLOGUIMT=$(PICSWITCH)
-+# Compiler flags for compiling shared object in multi threaded environment with character user interface
-+CFLAGSSLOCUIMT=$(PICSWITCH)
-+# Compiler flags for profiling
-+CFLAGSPROF=
-+# Compiler flags for debugging
-+CFLAGSDEBUG=-g
-+CFLAGSDBGUTIL=
-+# Compiler flags for disabling optimizations
-+CFLAGSNOOPT=-O0
-+# Compiler flags for describing the output path
-+CFLAGSOUTOBJ=-o
-+# Enable all warnings
-+CFLAGSWALL=-Wall
-+# Set default warn level
-+CFLAGSDFLTWARN=
-+
-+# switches for dynamic and static linking
-+STATIC		= -Wl,-Bstatic
-+DYNAMIC		= -Wl,-Bdynamic
-+
-+# name of linker
-+LINK*=$(CXX)
-+LINKC*=$(CC)
-+
-+# default linker flags
-+LINKFLAGSDEFS*=#-Wl,-z,defs
-+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
-+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+
-+# linker flags for linking shared libraries
-+LINKFLAGSSHLGUI= -shared
-+LINKFLAGSSHLCUI= -shared
-+
-+LINKFLAGSTACK=
-+LINKFLAGSPROF=
-+LINKFLAGSDEBUG=-g
-+LINKFLAGSOPT=
-+
-+# linker flags for optimization (symbol hashtable)
-+# for now, applied to symbol scoped libraries, only
-+LINKFLAGSOPTIMIZE*=-Wl,-O1
-+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-+
-+SONAME_SWITCH=-Wl,-h
-+
-+# Sequence of libs does matter !
-+
-+STDLIBCPP=-lstdc++
-+
-+# default objectfilenames to link
-+STDOBJVCL=$(L)$/salmain.o
-+STDOBJGUI=
-+STDSLOGUI=
-+STDOBJCUI=
-+STDSLOCUI=
-+
-+# libraries for linking applications
-+STDLIBCUIST=-lm
-+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
-+STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-+STDLIBGUIST=-lX11 -lm
-+# libraries for linking shared libraries
-+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
-+STDSHLCUIMT=$(PTHREAD_LIBS) -lm
-+STDSHLGUIST=-lX11 -lXext -lm
-+STDSHLCUIST=-lm
-+
-+LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-+
-+.IF "$(USE_STLP_DEBUG)" != ""
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
-+.ELSE # "$(USE_STLP_DEBUG)" != ""
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-+.ENDIF # "$(USE_STLP_DEBUG)" != ""
-+
-+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-+
-+# name of library manager
-+LIBMGR=ar
-+LIBFLAGS=-r
-+
-+# tool for generating import libraries
-+IMPLIB=
-+IMPLIBFLAGS=
-+
-+MAPSYM=
-+MAPSYMFLAGS=
-+
-+RC=irc
-+RCFLAGS=-fo$@ $(RCFILES)
-+RCLINK=
-+RCLINKFLAGS=
-+RCSETVERSION=
-+
-+# platform specific identifier for shared libs
-+DLLPRE=lib
-+DLLPOST=.so
---- solenv/inc/unxfbsdi.mk	Tue Jan 31 13:24:38 2006
-+++ solenv/inc/unxfbsdi.mk	Fri May 19 13:52:19 2006
-@@ -33,192 +33,23 @@
+ .ENDIF
+
+
+Index: solenv/inc/unxfbsdi.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
+retrieving revision 1.21
+diff -u -r1.21 unxfbsdi.mk
+--- solenv/inc/unxfbsdi.mk	19 Jun 2006 17:13:50 -0000	1.21
++++ solenv/inc/unxfbsdi.mk	27 Jun 2006 01:52:35 -0000
+@@ -33,196 +33,23 @@
  #
  #*************************************************************************
  
 -# mk file for unxfbsdi
 -ASM=
 -AFLAGS=
-+#
-+# FreBSD/i386 specific defines
-+#
- 
+-
 -SOLAR_JAVA*=TRUE
 -JAVAFLAGSDEBUG=-g
 -
@@ -355,10 +143,15 @@
 -JAVA_RUNTIME=-ljava_g
 -.ENDIF
 -.ENDIF
++#
++# FreBSD/i386 specific defines
++#
++
 +CDEFS+=-DX86
  
  # architecture dependent flags for the C and C++ compiler that can be changed by
  # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
++
  ARCH_FLAGS*=-mtune=pentiumpro
  
 -# name of C++ Compiler
@@ -370,7 +163,7 @@
 -CXX+:=$(CFLAGS_SYSBASE)
 -CC+:=$(CFLAGS_SYSBASE)
 -.ENDIF          # "$(SYSBASE)"!=""
--CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
+-CFLAGS+=-fmessage-length=0 -c $(INCLUDE)
 -
 -# flags to enable build with symbols; required for crashdump feature
 -.IF "$(ENABLE_SYMBOLS)"=="SMALL"
@@ -389,7 +182,6 @@
 -
 -# -fpermissive should be removed as soon as possible
 -CFLAGSCXX= -pipe $(ARCH_FLAGS)
--CFLAGSCXX+= -Wno-ctor-dtor-privacy
 -PICSWITCH:=-fpic
 -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
 -CFLAGSCXX += -fvisibility-inlines-hidden
@@ -415,20 +207,23 @@
  # Compiler flags for enabling optimizations
  .IF "$(PRODUCT)"!=""
  CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
--CFLAGSOPT+=-Wuninitialized				# not supported without optimization
-+CFLAGSOPT+=-Wuninitialized			# not supported without optimization
  .ELSE 	# "$(PRODUCT)"!=""
--CFLAGSOPT=   							# no optimizing for non products
-+CFLAGSOPT=   					# no optimizing for non products
+ CFLAGSOPT=   							# no optimizing for non products
  .ENDIF	# "$(PRODUCT)"!=""
 -# Compiler flags for disabling optimizations
 -CFLAGSNOOPT=-O0
 -# Compiler flags for describing the output path
 -CFLAGSOUTOBJ=-o
--# Enable all warnings
--CFLAGSWALL=-Wall
--# Set default warn level
--CFLAGSDFLTWARN=
+-
+-CFLAGSWARNCC=-Wreturn-type
+-.IF "$(PRODUCT)"!=""
+-CFLAGSWARNCC+=-Wuninitialized # not supported without optimization
+-.ENDIF
+-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
+-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
+-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
+-CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
+-CFLAGSWERRCC=-Werror
 -
 -# switches for dynamic and static linking
 -STATIC		= -Wl,-Bstatic
@@ -514,14 +309,15 @@
 -RCLINKFLAGS=
 -RCSETVERSION=
  
- # platform specific identifier for shared libs
+-# platform specific identifier for shared libs
  DLLPOSTFIX=fi
 -DLLPRE=lib
 -DLLPOST=.so
--
---- solenv/inc/unxfbsdx.mk	Fri May 19 13:13:25 2006
-+++ solenv/inc/unxfbsdx.mk	Fri May 19 13:52:38 2006
-@@ -0,0 +1,57 @@
+ 
+
+--- /dev/null	Wed Jun 28 21:44:00 2006
++++ solenv/inc/unxfbsdx.mk	Wed Jun 28 21:38:06 2006
+@@ -0,0 +1,56 @@
 +#*************************************************************************
 +#
 +#   OpenOffice.org - a multi-platform office productivity suite
@@ -572,10 +368,251 @@
 +# Compiler flags for enabling optimizations
 +.IF "$(PRODUCT)"!=""
 +CFLAGSOPT=-O2 -fno-strict-aliasing		# optimizing for products
-+CFLAGSOPT+=-Wuninitialized			# not supported without optimization
 +.ELSE 	# "$(PRODUCT)"!=""
 +CFLAGSOPT=   					# no optimizing for non products
 +.ENDIF	# "$(PRODUCT)"!=""
 +
 +# platform specific identifier for shared libs
 +DLLPOSTFIX=fx
+
+--- /dev/null	Wed Jun 28 21:44:00 2006
++++ solenv/inc/unxfbsd.mk	Wed Jun 28 21:50:16 2006
+@@ -0,0 +1,238 @@
++#*************************************************************************
++#
++#   OpenOffice.org - a multi-platform office productivity suite
++#
++#   $RCSfile$
++#
++#   $Revision$
++#
++#   last change: $Author$ $Date$
++#
++#   The Contents of this file are made available subject to
++#   the terms of GNU Lesser General Public License Version 2.1.
++#
++#
++#     GNU Lesser General Public License Version 2.1
++#     =============================================
++#     Copyright 2005 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
++#
++#*************************************************************************
++
++# Makefile for FreeBSD.
++
++ASM=
++AFLAGS=
++
++SOLAR_JAVA*=
++JAVAFLAGSDEBUG=-g
++
++# Include arch specific makefile.
++.IF "$(CPUNAME)" == "INTEL"
++.INCLUDE : unxfbsdi.mk
++.ENDIF
++.IF "$(CPUNAME)" == "X86_64"
++.INCLUDE : unxfbsdx.mk
++.ENDIF
++
++# filter for supressing verbose messages from linker
++#not needed at the moment
++#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
++
++# _PTHREADS is needed for the stl
++CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
++
++# enable visibility define in "sal/types.h"
++.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
++.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++
++# this is a platform with JAVA support
++.IF "$(SOLAR_JAVA)"!=""
++JAVADEF=-DSOLAR_JAVA
++.IF "$(debug)"==""
++JAVA_RUNTIME=-ljava
++.ELSE
++JAVA_RUNTIME=-ljava_g
++.ENDIF
++.ENDIF
++
++# architecture dependent flags for the C and C++ compiler that can be changed by
++# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
++ARCH_FLAGS*=-mtune=pentiumpro
++
++# name of C++ Compiler
++CXX*=g++
++# name of C Compiler
++CC*=gcc
++.IF "$(SYSBASE)"!=""
++CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
++CXX+:=$(CFLAGS_SYSBASE)
++CC+:=$(CFLAGS_SYSBASE)
++.ENDIF          # "$(SYSBASE)"!=""
++CFLAGS+=-fmessage-length=0 -c $(INCLUDE)
++
++# flags to enable build with symbols; required for crashdump feature
++.IF "$(ENABLE_SYMBOLS)"=="SMALL"
++CFLAGSENABLESYMBOLS=-g1
++.ELSE
++CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
++
++.ENDIF
++
++# flags for the C++ Compiler
++CFLAGSCC= -pipe $(ARCH_FLAGS)
++# Flags for enabling exception handling
++CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
++# Flags for disabling exception handling
++CFLAGS_NO_EXCEPTIONS=-fno-exceptions
++
++# -fpermissive should be removed as soon as possible
++CFLAGSCXX= -pipe $(ARCH_FLAGS)
++PICSWITCH:=-fpic
++.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++CFLAGSCXX += -fvisibility-inlines-hidden
++.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++
++# Compiler flags for compiling static object in single threaded environment with graphical user interface
++CFLAGSOBJGUIST=
++# Compiler flags for compiling static object in single threaded environment with character user interface
++CFLAGSOBJCUIST=
++# Compiler flags for compiling static object in multi threaded environment with graphical user interface
++CFLAGSOBJGUIMT=
++# Compiler flags for compiling static object in multi threaded environment with character user interface
++CFLAGSOBJCUIMT=
++# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
++CFLAGSSLOGUIMT=$(PICSWITCH)
++# Compiler flags for compiling shared object in multi threaded environment with character user interface
++CFLAGSSLOCUIMT=$(PICSWITCH)
++# Compiler flags for profiling
++CFLAGSPROF=
++# Compiler flags for debugging
++CFLAGSDEBUG=-g
++CFLAGSDBGUTIL=
++# Compiler flags for enabling optimizations
++.IF "$(PRODUCT)"!=""
++CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
++.ELSE 	# "$(PRODUCT)"!=""
++CFLAGSOPT=   							# no optimizing for non products
++.ENDIF	# "$(PRODUCT)"!=""
++# Compiler flags for disabling optimizations
++CFLAGSNOOPT=-O0
++# Compiler flags for describing the output path
++CFLAGSOUTOBJ=-o
++
++# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
++CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
++CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
++    -Wno-non-virtual-dtor
++CFLAGSWALLCC=$(CFLAGSWARNCC)
++CFLAGSWALLCXX=$(CFLAGSWARNCXX)
++CFLAGSWERRCC=-Werror
++
++# Once all modules on this platform compile without warnings, set
++# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
++# settings.mk): Currently this is not tested on FreeBSD
++#MODULES_WITH_WARNINGS :=
++
++# switches for dynamic and static linking
++STATIC		= -Wl,-Bstatic
++DYNAMIC		= -Wl,-Bdynamic
++
++# name of linker
++LINK*=$(CXX)
++LINKC*=$(CC)
++
++# default linker flags
++LINKFLAGSDEFS*=#-Wl,-z,defs
++LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
++LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
++
++# linker flags for linking applications
++LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++
++# linker flags for linking shared libraries
++LINKFLAGSSHLGUI= -shared
++LINKFLAGSSHLCUI= -shared
++
++LINKFLAGSTACK=
++LINKFLAGSPROF=
++LINKFLAGSDEBUG=-g
++LINKFLAGSOPT=
++
++# linker flags for optimization (symbol hashtable)
++# for now, applied to symbol scoped libraries, only
++LINKFLAGSOPTIMIZE*=-Wl,-O1
++LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
++
++SONAME_SWITCH=-Wl,-h
++
++# Sequence of libs does matter !
++
++STDLIBCPP=-lstdc++
++
++# default objectfilenames to link
++STDOBJVCL=$(L)$/salmain.o
++STDOBJGUI=
++STDSLOGUI=
++STDOBJCUI=
++STDSLOCUI=
++
++# libraries for linking applications
++STDLIBCUIST=-lm
++STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
++STDLIBCUIMT=$(PTHREAD_LIBS) -lm
++STDLIBGUIST=-lX11 -lm
++# libraries for linking shared libraries
++STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
++STDSHLCUIMT=$(PTHREAD_LIBS) -lm
++STDSHLGUIST=-lX11 -lXext -lm
++STDSHLCUIST=-lm
++
++LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
++
++.IF "$(USE_STLP_DEBUG)" != ""
++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
++LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
++.ELSE # "$(USE_STLP_DEBUG)" != ""
++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
++LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
++.ENDIF # "$(USE_STLP_DEBUG)" != ""
++
++#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
++
++# name of library manager
++LIBMGR=ar
++LIBFLAGS=-r
++
++# tool for generating import libraries
++IMPLIB=
++IMPLIBFLAGS=
++
++MAPSYM=
++MAPSYMFLAGS=
++
++RC=irc
++RCFLAGS=-fo$@ $(RCFILES)
++RCLINK=
++RCLINKFLAGS=
++RCSETVERSION=
++
++# platform specific identifier for shared libs
++DLLPRE=lib
++DLLPOST=.so
diff --git a/editors/openoffice-3-devel/files/patch-i66667 b/editors/openoffice-3-devel/files/patch-i66667
index 6e3a697c4bf0..26c0b1b4a88c 100644
--- a/editors/openoffice-3-devel/files/patch-i66667
+++ b/editors/openoffice-3-devel/files/patch-i66667
@@ -1,10 +1,10 @@
-Index: gtkinst.cxx
+Index: vcl/unx/gtk/app/gtkinst.cxx
 ===================================================================
 RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
-retrieving revision 1.13
-diff -u -r1.13 gtkinst.cxx
---- vcl/unx/gtk/app/gtkinst.cxx	11 May 2006 13:32:35 -0000	1.13
-+++ vcl/unx/gtk/app/gtkinst.cxx	16 Jun 2006 20:48:58 -0000
+retrieving revision 1.14
+diff -u -r1.14 gtkinst.cxx
+--- vcl/unx/gtk/app/gtkinst.cxx	19 Jun 2006 19:44:33 -0000	1.14
++++ vcl/unx/gtk/app/gtkinst.cxx	27 Jun 2006 02:11:09 -0000
 @@ -43,6 +43,7 @@
  #include <plugins/gtk/atkbridge.hxx>
  
@@ -13,7 +13,7 @@ diff -u -r1.13 gtkinst.cxx
  
  #if OSL_DEBUG_LEVEL > 1
  #include <stdio.h>
-@@ -111,13 +112,28 @@
+@@ -111,13 +112,27 @@
  		GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
  		pYieldMutex->ThreadsLeave();
  	}
@@ -38,14 +38,13 @@ diff -u -r1.13 gtkinst.cxx
 +#endif
 +			return false;
 +		}
-+
  		GdkLockFn gdk_threads_set_lock_functions =
--				(GdkLockFn) osl_getSymbol( pModule, aSymbolName.pData );
+-				(GdkLockFn) osl_getFunctionSymbol( pModule, aSymbolName.pData );
 +				(GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
  		if ( !gdk_threads_set_lock_functions )
  		{
  #if OSL_DEBUG_LEVEL > 1
-@@ -150,7 +166,7 @@
+@@ -150,7 +165,7 @@
  		if ( !g_thread_supported() )
  			g_thread_init( NULL );
  
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 25f564ec734d..60cb35c94423 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -73,9 +73,9 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE?=		172
+MILESTONE?=		173
 OOOTAG?=		SRC680_m${MILESTONE}
-SNAPDATE=		20060605
+SNAPDATE=		20060626
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index cdbd633f3a51..28332915c0c5 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,6 +1,12 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m172_source.tar.bz2) = 5274ce3d9fd419903786849e826a34da
-SHA256 (openoffice.org2.0/OOo_SRC680_m172_source.tar.bz2) = 5a124921ac87ffe5d3f138564014a242c952d5c562c163a4eee4213bc1e0cc86
-SIZE (openoffice.org2.0/OOo_SRC680_m172_source.tar.bz2) = 249726628
+MD5 (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = b8922278010673990b2d51b3a0b7aa3c
+SHA256 (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = b8d456b942d918088a3506051edf1c8c596d59586ebb78a95a566a53893c4d92
+SIZE (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = 248052856
+MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
+SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
+MD5 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 26031ee1a2fd248ad0cc2e7f17c44c39
+SHA256 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = d463b8259cb199cd26799c817756c73e4e7808b0cf915f86841ac9779e0f9936
+SIZE (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 6743024
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
 SHA256 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
 SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366
diff --git a/editors/openoffice.org-2-devel/files/patch-i64442 b/editors/openoffice.org-2-devel/files/patch-i64442
deleted file mode 100644
index 6c7313582b85..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i64442
+++ /dev/null
@@ -1,50 +0,0 @@
-cws maho02
-Index: jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
-===================================================================
-RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v
-retrieving revision 1.7
-diff -u -r1.7 gnujre.cxx
---- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	16 Mar 2006 13:13:00 -0000	1.7
-+++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	18 Apr 2006 21:50:36 -0000
-@@ -67,8 +67,8 @@
-           "/lib64/libgcj.so.7",
-           "/lib64/libgcj.so.6"
- #else
--          "/lib/libgcj.so.7",
--          "/lib/libgcj.so.6"
-+          "/libgcj.so.7",
-+          "/libgcj.so.6"
- #endif
-     };
-     *size = sizeof(ar) / sizeof (char*);
-@@ -87,7 +87,7 @@
-     OUString sVersionProperty(
-         RTL_CONSTASCII_USTRINGPARAM("java.version"));
-     OUString sHomeProperty(
--        RTL_CONSTASCII_USTRINGPARAM("java.home"));
-+        RTL_CONSTASCII_USTRINGPARAM("gnu.classpath.home.url"));
-     OUString sAccessProperty(
-         RTL_CONSTASCII_USTRINGPARAM("javax.accessibility.assistive_technologies"));
- 
-@@ -111,19 +111,8 @@
-         }
-         else if (!bHome && sHomeProperty.equals(i->first))
-         {
--           OUString fileURL;
--           if (osl_getFileURLFromSystemPath(i->second.pData,& fileURL.pData) ==
--               osl_File_E_None)
--           {
--               //make sure that the drive letter have all the same case
--               //otherwise file:///c:/jre and file:///C:/jre produce two
--               //different objects!!!
--               if (makeDriveLetterSame( & fileURL))
--               {
--                   m_sHome = fileURL;
--                   bHome = true;
--               }
--           }
-+          m_sHome = i->second;
-+          bHome = true;
-         }
-         else if (!bAccess && sAccessProperty.equals(i->first))
-         {
diff --git a/editors/openoffice.org-2-devel/files/patch-i64762 b/editors/openoffice.org-2-devel/files/patch-i64762
deleted file mode 100644
index 70b535dd070c..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i64762
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: sal/osl/unx/security.c
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/security.c,v
-retrieving revision 1.18
-diff -u -r1.18 security.c
---- sal/osl/unx/security.c	20 Apr 2006 16:24:05 -0000	1.18
-+++ sal/osl/unx/security.c	25 Apr 2006 21:35:23 -0000
-@@ -57,6 +57,11 @@
- #define PAM_BINARY_MSG 6
- #endif
- 
-+#include <stdint.h> //C99 contains SIZE_MAX
-+#ifndef SIZE_MAX 
-+#define SIZE_MAX (sizeof (size_t) -1)
-+#endif
-+
- extern oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32 nRtldMode);
- extern void* SAL_CALL osl_psz_getSymbol(oslModule hModule, const sal_Char* pszSymbolName);
- static oslSecurityError SAL_CALL 
diff --git a/editors/openoffice.org-2-devel/files/patch-i65513 b/editors/openoffice.org-2-devel/files/patch-i65513
index 146731b44885..ff0735045953 100644
--- a/editors/openoffice.org-2-devel/files/patch-i65513
+++ b/editors/openoffice.org-2-devel/files/patch-i65513
@@ -80,9 +80,15 @@
     		}
     		elsif ($platform =~ m/netbsd/)
     		{  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
---- solenv/inc/unx.mk	Fri May 19 13:55:04 2006
-+++ solenv/inc/unx.mk	Fri May 19 13:38:42 2006
-@@ -155,10 +155,9 @@
+
+Index: solenv/inc/unx.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/unx.mk,v
+retrieving revision 1.32
+diff -u -r1.32 unx.mk
+--- solenv/inc/unx.mk	3 Feb 2006 17:33:26 -0000	1.32
++++ solenv/inc/unx.mk	27 Jun 2006 01:52:09 -0000
+@@ -155,11 +155,10 @@
  .INCLUDE : unxbsds.mk
  .ENDIF
  
@@ -91,246 +97,28 @@
 +.IF "$(COM)$(OS)" == "GCCFREEBSD"
 +.INCLUDE : unxfbsd.mk
  .ENDIF
--
  
+-
  .IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"
  .INCLUDE : unxirxm3.mk
---- solenv/inc/unxfbsd.mk	Fri May 19 13:13:25 2006
-+++ solenv/inc/unxfbsd.mk	Fri May 19 13:52:02 2006
-@@ -0,0 +1,220 @@
-+#*************************************************************************
-+#
-+#   OpenOffice.org - a multi-platform office productivity suite
-+#
-+#   $RCSfile$
-+#
-+#   $Revision$
-+#
-+#   last change: $Author$ $Date$
-+#
-+#   The Contents of this file are made available subject to
-+#   the terms of GNU Lesser General Public License Version 2.1.
-+#
-+#
-+#     GNU Lesser General Public License Version 2.1
-+#     =============================================
-+#     Copyright 2005 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
-+#
-+#*************************************************************************
-+
-+# Makefile for FreeBSD.
-+
-+ASM=
-+AFLAGS=
-+
-+SOLAR_JAVA*=TRUE
-+JAVAFLAGSDEBUG=-g
-+
-+# Include arch specific makefile.
-+.IF "$(CPUNAME)" == "INTEL"
-+.INCLUDE : unxfbsdi.mk
-+.ENDIF
-+.IF "$(CPUNAME)" == "X86_64"
-+.INCLUDE : unxfbsdx.mk
-+.ENDIF
-+
-+# filter for supressing verbose messages from linker
-+#not needed at the moment
-+#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
-+
-+# _PTHREADS is needed for the stl
-+CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
-+
-+# enable visibility define in "sal/types.h"
-+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+
-+# this is a platform with JAVA support
-+.IF "$(SOLAR_JAVA)"!=""
-+JAVADEF=-DSOLAR_JAVA
-+.IF "$(debug)"==""
-+JAVA_RUNTIME=-ljava
-+.ELSE
-+JAVA_RUNTIME=-ljava_g
-+.ENDIF
-+.ENDIF
-+
-+# name of C++ Compiler
-+CXX*=g++
-+# name of C Compiler
-+CC*=gcc
-+.IF "$(SYSBASE)"!=""
-+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
-+CXX+:=$(CFLAGS_SYSBASE)
-+CC+:=$(CFLAGS_SYSBASE)
-+.ENDIF          # "$(SYSBASE)"!=""
-+CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
-+
-+# flags to enable build with symbols; required for crashdump feature
-+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-+CFLAGSENABLESYMBOLS=-g1
-+.ELSE
-+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-+
-+.ENDIF
-+
-+# flags for the C++ Compiler
-+CFLAGSCC= -pipe $(ARCH_FLAGS)
-+# Flags for enabling exception handling
-+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-+# Flags for disabling exception handling
-+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-+
-+# -fpermissive should be removed as soon as possible
-+CFLAGSCXX= -pipe $(ARCH_FLAGS)
-+CFLAGSCXX+= -Wno-ctor-dtor-privacy
-+PICSWITCH:=-fpic
-+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+CFLAGSCXX += -fvisibility-inlines-hidden
-+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+
-+# Compiler flags for compiling static object in single threaded environment with graphical user interface
-+CFLAGSOBJGUIST=
-+# Compiler flags for compiling static object in single threaded environment with character user interface
-+CFLAGSOBJCUIST=
-+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-+CFLAGSOBJGUIMT=
-+# Compiler flags for compiling static object in multi threaded environment with character user interface
-+CFLAGSOBJCUIMT=
-+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-+CFLAGSSLOGUIMT=$(PICSWITCH)
-+# Compiler flags for compiling shared object in multi threaded environment with character user interface
-+CFLAGSSLOCUIMT=$(PICSWITCH)
-+# Compiler flags for profiling
-+CFLAGSPROF=
-+# Compiler flags for debugging
-+CFLAGSDEBUG=-g
-+CFLAGSDBGUTIL=
-+# Compiler flags for disabling optimizations
-+CFLAGSNOOPT=-O0
-+# Compiler flags for describing the output path
-+CFLAGSOUTOBJ=-o
-+# Enable all warnings
-+CFLAGSWALL=-Wall
-+# Set default warn level
-+CFLAGSDFLTWARN=
-+
-+# switches for dynamic and static linking
-+STATIC		= -Wl,-Bstatic
-+DYNAMIC		= -Wl,-Bdynamic
-+
-+# name of linker
-+LINK*=$(CXX)
-+LINKC*=$(CC)
-+
-+# default linker flags
-+LINKFLAGSDEFS*=#-Wl,-z,defs
-+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
-+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+
-+# linker flags for linking shared libraries
-+LINKFLAGSSHLGUI= -shared
-+LINKFLAGSSHLCUI= -shared
-+
-+LINKFLAGSTACK=
-+LINKFLAGSPROF=
-+LINKFLAGSDEBUG=-g
-+LINKFLAGSOPT=
-+
-+# linker flags for optimization (symbol hashtable)
-+# for now, applied to symbol scoped libraries, only
-+LINKFLAGSOPTIMIZE*=-Wl,-O1
-+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-+
-+SONAME_SWITCH=-Wl,-h
-+
-+# Sequence of libs does matter !
-+
-+STDLIBCPP=-lstdc++
-+
-+# default objectfilenames to link
-+STDOBJVCL=$(L)$/salmain.o
-+STDOBJGUI=
-+STDSLOGUI=
-+STDOBJCUI=
-+STDSLOCUI=
-+
-+# libraries for linking applications
-+STDLIBCUIST=-lm
-+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
-+STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-+STDLIBGUIST=-lX11 -lm
-+# libraries for linking shared libraries
-+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
-+STDSHLCUIMT=$(PTHREAD_LIBS) -lm
-+STDSHLGUIST=-lX11 -lXext -lm
-+STDSHLCUIST=-lm
-+
-+LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-+
-+.IF "$(USE_STLP_DEBUG)" != ""
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
-+.ELSE # "$(USE_STLP_DEBUG)" != ""
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-+.ENDIF # "$(USE_STLP_DEBUG)" != ""
-+
-+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-+
-+# name of library manager
-+LIBMGR=ar
-+LIBFLAGS=-r
-+
-+# tool for generating import libraries
-+IMPLIB=
-+IMPLIBFLAGS=
-+
-+MAPSYM=
-+MAPSYMFLAGS=
-+
-+RC=irc
-+RCFLAGS=-fo$@ $(RCFILES)
-+RCLINK=
-+RCLINKFLAGS=
-+RCSETVERSION=
-+
-+# platform specific identifier for shared libs
-+DLLPRE=lib
-+DLLPOST=.so
---- solenv/inc/unxfbsdi.mk	Tue Jan 31 13:24:38 2006
-+++ solenv/inc/unxfbsdi.mk	Fri May 19 13:52:19 2006
-@@ -33,192 +33,23 @@
+ .ENDIF
+
+
+Index: solenv/inc/unxfbsdi.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
+retrieving revision 1.21
+diff -u -r1.21 unxfbsdi.mk
+--- solenv/inc/unxfbsdi.mk	19 Jun 2006 17:13:50 -0000	1.21
++++ solenv/inc/unxfbsdi.mk	27 Jun 2006 01:52:35 -0000
+@@ -33,196 +33,23 @@
  #
  #*************************************************************************
  
 -# mk file for unxfbsdi
 -ASM=
 -AFLAGS=
-+#
-+# FreBSD/i386 specific defines
-+#
- 
+-
 -SOLAR_JAVA*=TRUE
 -JAVAFLAGSDEBUG=-g
 -
@@ -355,10 +143,15 @@
 -JAVA_RUNTIME=-ljava_g
 -.ENDIF
 -.ENDIF
++#
++# FreBSD/i386 specific defines
++#
++
 +CDEFS+=-DX86
  
  # architecture dependent flags for the C and C++ compiler that can be changed by
  # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
++
  ARCH_FLAGS*=-mtune=pentiumpro
  
 -# name of C++ Compiler
@@ -370,7 +163,7 @@
 -CXX+:=$(CFLAGS_SYSBASE)
 -CC+:=$(CFLAGS_SYSBASE)
 -.ENDIF          # "$(SYSBASE)"!=""
--CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
+-CFLAGS+=-fmessage-length=0 -c $(INCLUDE)
 -
 -# flags to enable build with symbols; required for crashdump feature
 -.IF "$(ENABLE_SYMBOLS)"=="SMALL"
@@ -389,7 +182,6 @@
 -
 -# -fpermissive should be removed as soon as possible
 -CFLAGSCXX= -pipe $(ARCH_FLAGS)
--CFLAGSCXX+= -Wno-ctor-dtor-privacy
 -PICSWITCH:=-fpic
 -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
 -CFLAGSCXX += -fvisibility-inlines-hidden
@@ -415,20 +207,23 @@
  # Compiler flags for enabling optimizations
  .IF "$(PRODUCT)"!=""
  CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
--CFLAGSOPT+=-Wuninitialized				# not supported without optimization
-+CFLAGSOPT+=-Wuninitialized			# not supported without optimization
  .ELSE 	# "$(PRODUCT)"!=""
--CFLAGSOPT=   							# no optimizing for non products
-+CFLAGSOPT=   					# no optimizing for non products
+ CFLAGSOPT=   							# no optimizing for non products
  .ENDIF	# "$(PRODUCT)"!=""
 -# Compiler flags for disabling optimizations
 -CFLAGSNOOPT=-O0
 -# Compiler flags for describing the output path
 -CFLAGSOUTOBJ=-o
--# Enable all warnings
--CFLAGSWALL=-Wall
--# Set default warn level
--CFLAGSDFLTWARN=
+-
+-CFLAGSWARNCC=-Wreturn-type
+-.IF "$(PRODUCT)"!=""
+-CFLAGSWARNCC+=-Wuninitialized # not supported without optimization
+-.ENDIF
+-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
+-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
+-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
+-CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
+-CFLAGSWERRCC=-Werror
 -
 -# switches for dynamic and static linking
 -STATIC		= -Wl,-Bstatic
@@ -514,14 +309,15 @@
 -RCLINKFLAGS=
 -RCSETVERSION=
  
- # platform specific identifier for shared libs
+-# platform specific identifier for shared libs
  DLLPOSTFIX=fi
 -DLLPRE=lib
 -DLLPOST=.so
--
---- solenv/inc/unxfbsdx.mk	Fri May 19 13:13:25 2006
-+++ solenv/inc/unxfbsdx.mk	Fri May 19 13:52:38 2006
-@@ -0,0 +1,57 @@
+ 
+
+--- /dev/null	Wed Jun 28 21:44:00 2006
++++ solenv/inc/unxfbsdx.mk	Wed Jun 28 21:38:06 2006
+@@ -0,0 +1,56 @@
 +#*************************************************************************
 +#
 +#   OpenOffice.org - a multi-platform office productivity suite
@@ -572,10 +368,251 @@
 +# Compiler flags for enabling optimizations
 +.IF "$(PRODUCT)"!=""
 +CFLAGSOPT=-O2 -fno-strict-aliasing		# optimizing for products
-+CFLAGSOPT+=-Wuninitialized			# not supported without optimization
 +.ELSE 	# "$(PRODUCT)"!=""
 +CFLAGSOPT=   					# no optimizing for non products
 +.ENDIF	# "$(PRODUCT)"!=""
 +
 +# platform specific identifier for shared libs
 +DLLPOSTFIX=fx
+
+--- /dev/null	Wed Jun 28 21:44:00 2006
++++ solenv/inc/unxfbsd.mk	Wed Jun 28 21:50:16 2006
+@@ -0,0 +1,238 @@
++#*************************************************************************
++#
++#   OpenOffice.org - a multi-platform office productivity suite
++#
++#   $RCSfile$
++#
++#   $Revision$
++#
++#   last change: $Author$ $Date$
++#
++#   The Contents of this file are made available subject to
++#   the terms of GNU Lesser General Public License Version 2.1.
++#
++#
++#     GNU Lesser General Public License Version 2.1
++#     =============================================
++#     Copyright 2005 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
++#
++#*************************************************************************
++
++# Makefile for FreeBSD.
++
++ASM=
++AFLAGS=
++
++SOLAR_JAVA*=
++JAVAFLAGSDEBUG=-g
++
++# Include arch specific makefile.
++.IF "$(CPUNAME)" == "INTEL"
++.INCLUDE : unxfbsdi.mk
++.ENDIF
++.IF "$(CPUNAME)" == "X86_64"
++.INCLUDE : unxfbsdx.mk
++.ENDIF
++
++# filter for supressing verbose messages from linker
++#not needed at the moment
++#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
++
++# _PTHREADS is needed for the stl
++CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
++
++# enable visibility define in "sal/types.h"
++.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
++.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++
++# this is a platform with JAVA support
++.IF "$(SOLAR_JAVA)"!=""
++JAVADEF=-DSOLAR_JAVA
++.IF "$(debug)"==""
++JAVA_RUNTIME=-ljava
++.ELSE
++JAVA_RUNTIME=-ljava_g
++.ENDIF
++.ENDIF
++
++# architecture dependent flags for the C and C++ compiler that can be changed by
++# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
++ARCH_FLAGS*=-mtune=pentiumpro
++
++# name of C++ Compiler
++CXX*=g++
++# name of C Compiler
++CC*=gcc
++.IF "$(SYSBASE)"!=""
++CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
++CXX+:=$(CFLAGS_SYSBASE)
++CC+:=$(CFLAGS_SYSBASE)
++.ENDIF          # "$(SYSBASE)"!=""
++CFLAGS+=-fmessage-length=0 -c $(INCLUDE)
++
++# flags to enable build with symbols; required for crashdump feature
++.IF "$(ENABLE_SYMBOLS)"=="SMALL"
++CFLAGSENABLESYMBOLS=-g1
++.ELSE
++CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
++
++.ENDIF
++
++# flags for the C++ Compiler
++CFLAGSCC= -pipe $(ARCH_FLAGS)
++# Flags for enabling exception handling
++CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
++# Flags for disabling exception handling
++CFLAGS_NO_EXCEPTIONS=-fno-exceptions
++
++# -fpermissive should be removed as soon as possible
++CFLAGSCXX= -pipe $(ARCH_FLAGS)
++PICSWITCH:=-fpic
++.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++CFLAGSCXX += -fvisibility-inlines-hidden
++.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++
++# Compiler flags for compiling static object in single threaded environment with graphical user interface
++CFLAGSOBJGUIST=
++# Compiler flags for compiling static object in single threaded environment with character user interface
++CFLAGSOBJCUIST=
++# Compiler flags for compiling static object in multi threaded environment with graphical user interface
++CFLAGSOBJGUIMT=
++# Compiler flags for compiling static object in multi threaded environment with character user interface
++CFLAGSOBJCUIMT=
++# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
++CFLAGSSLOGUIMT=$(PICSWITCH)
++# Compiler flags for compiling shared object in multi threaded environment with character user interface
++CFLAGSSLOCUIMT=$(PICSWITCH)
++# Compiler flags for profiling
++CFLAGSPROF=
++# Compiler flags for debugging
++CFLAGSDEBUG=-g
++CFLAGSDBGUTIL=
++# Compiler flags for enabling optimizations
++.IF "$(PRODUCT)"!=""
++CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
++.ELSE 	# "$(PRODUCT)"!=""
++CFLAGSOPT=   							# no optimizing for non products
++.ENDIF	# "$(PRODUCT)"!=""
++# Compiler flags for disabling optimizations
++CFLAGSNOOPT=-O0
++# Compiler flags for describing the output path
++CFLAGSOUTOBJ=-o
++
++# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
++CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
++CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
++    -Wno-non-virtual-dtor
++CFLAGSWALLCC=$(CFLAGSWARNCC)
++CFLAGSWALLCXX=$(CFLAGSWARNCXX)
++CFLAGSWERRCC=-Werror
++
++# Once all modules on this platform compile without warnings, set
++# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
++# settings.mk): Currently this is not tested on FreeBSD
++#MODULES_WITH_WARNINGS :=
++
++# switches for dynamic and static linking
++STATIC		= -Wl,-Bstatic
++DYNAMIC		= -Wl,-Bdynamic
++
++# name of linker
++LINK*=$(CXX)
++LINKC*=$(CC)
++
++# default linker flags
++LINKFLAGSDEFS*=#-Wl,-z,defs
++LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
++LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
++
++# linker flags for linking applications
++LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++
++# linker flags for linking shared libraries
++LINKFLAGSSHLGUI= -shared
++LINKFLAGSSHLCUI= -shared
++
++LINKFLAGSTACK=
++LINKFLAGSPROF=
++LINKFLAGSDEBUG=-g
++LINKFLAGSOPT=
++
++# linker flags for optimization (symbol hashtable)
++# for now, applied to symbol scoped libraries, only
++LINKFLAGSOPTIMIZE*=-Wl,-O1
++LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
++
++SONAME_SWITCH=-Wl,-h
++
++# Sequence of libs does matter !
++
++STDLIBCPP=-lstdc++
++
++# default objectfilenames to link
++STDOBJVCL=$(L)$/salmain.o
++STDOBJGUI=
++STDSLOGUI=
++STDOBJCUI=
++STDSLOCUI=
++
++# libraries for linking applications
++STDLIBCUIST=-lm
++STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
++STDLIBCUIMT=$(PTHREAD_LIBS) -lm
++STDLIBGUIST=-lX11 -lm
++# libraries for linking shared libraries
++STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
++STDSHLCUIMT=$(PTHREAD_LIBS) -lm
++STDSHLGUIST=-lX11 -lXext -lm
++STDSHLCUIST=-lm
++
++LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
++
++.IF "$(USE_STLP_DEBUG)" != ""
++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
++LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
++.ELSE # "$(USE_STLP_DEBUG)" != ""
++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
++LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
++.ENDIF # "$(USE_STLP_DEBUG)" != ""
++
++#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
++
++# name of library manager
++LIBMGR=ar
++LIBFLAGS=-r
++
++# tool for generating import libraries
++IMPLIB=
++IMPLIBFLAGS=
++
++MAPSYM=
++MAPSYMFLAGS=
++
++RC=irc
++RCFLAGS=-fo$@ $(RCFILES)
++RCLINK=
++RCLINKFLAGS=
++RCSETVERSION=
++
++# platform specific identifier for shared libs
++DLLPRE=lib
++DLLPOST=.so
diff --git a/editors/openoffice.org-2-devel/files/patch-i66667 b/editors/openoffice.org-2-devel/files/patch-i66667
index 6e3a697c4bf0..26c0b1b4a88c 100644
--- a/editors/openoffice.org-2-devel/files/patch-i66667
+++ b/editors/openoffice.org-2-devel/files/patch-i66667
@@ -1,10 +1,10 @@
-Index: gtkinst.cxx
+Index: vcl/unx/gtk/app/gtkinst.cxx
 ===================================================================
 RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
-retrieving revision 1.13
-diff -u -r1.13 gtkinst.cxx
---- vcl/unx/gtk/app/gtkinst.cxx	11 May 2006 13:32:35 -0000	1.13
-+++ vcl/unx/gtk/app/gtkinst.cxx	16 Jun 2006 20:48:58 -0000
+retrieving revision 1.14
+diff -u -r1.14 gtkinst.cxx
+--- vcl/unx/gtk/app/gtkinst.cxx	19 Jun 2006 19:44:33 -0000	1.14
++++ vcl/unx/gtk/app/gtkinst.cxx	27 Jun 2006 02:11:09 -0000
 @@ -43,6 +43,7 @@
  #include <plugins/gtk/atkbridge.hxx>
  
@@ -13,7 +13,7 @@ diff -u -r1.13 gtkinst.cxx
  
  #if OSL_DEBUG_LEVEL > 1
  #include <stdio.h>
-@@ -111,13 +112,28 @@
+@@ -111,13 +112,27 @@
  		GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
  		pYieldMutex->ThreadsLeave();
  	}
@@ -38,14 +38,13 @@ diff -u -r1.13 gtkinst.cxx
 +#endif
 +			return false;
 +		}
-+
  		GdkLockFn gdk_threads_set_lock_functions =
--				(GdkLockFn) osl_getSymbol( pModule, aSymbolName.pData );
+-				(GdkLockFn) osl_getFunctionSymbol( pModule, aSymbolName.pData );
 +				(GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
  		if ( !gdk_threads_set_lock_functions )
  		{
  #if OSL_DEBUG_LEVEL > 1
-@@ -150,7 +166,7 @@
+@@ -150,7 +165,7 @@
  		if ( !g_thread_supported() )
  			g_thread_init( NULL );
  
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 25f564ec734d..60cb35c94423 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -73,9 +73,9 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE?=		172
+MILESTONE?=		173
 OOOTAG?=		SRC680_m${MILESTONE}
-SNAPDATE=		20060605
+SNAPDATE=		20060626
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index cdbd633f3a51..28332915c0c5 100644
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ b/editors/openoffice.org-2.0-devel/distinfo
@@ -1,6 +1,12 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m172_source.tar.bz2) = 5274ce3d9fd419903786849e826a34da
-SHA256 (openoffice.org2.0/OOo_SRC680_m172_source.tar.bz2) = 5a124921ac87ffe5d3f138564014a242c952d5c562c163a4eee4213bc1e0cc86
-SIZE (openoffice.org2.0/OOo_SRC680_m172_source.tar.bz2) = 249726628
+MD5 (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = b8922278010673990b2d51b3a0b7aa3c
+SHA256 (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = b8d456b942d918088a3506051edf1c8c596d59586ebb78a95a566a53893c4d92
+SIZE (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = 248052856
+MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
+SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
+MD5 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 26031ee1a2fd248ad0cc2e7f17c44c39
+SHA256 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = d463b8259cb199cd26799c817756c73e4e7808b0cf915f86841ac9779e0f9936
+SIZE (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 6743024
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
 SHA256 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
 SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i64442 b/editors/openoffice.org-2.0-devel/files/patch-i64442
deleted file mode 100644
index 6c7313582b85..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-i64442
+++ /dev/null
@@ -1,50 +0,0 @@
-cws maho02
-Index: jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
-===================================================================
-RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v
-retrieving revision 1.7
-diff -u -r1.7 gnujre.cxx
---- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	16 Mar 2006 13:13:00 -0000	1.7
-+++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	18 Apr 2006 21:50:36 -0000
-@@ -67,8 +67,8 @@
-           "/lib64/libgcj.so.7",
-           "/lib64/libgcj.so.6"
- #else
--          "/lib/libgcj.so.7",
--          "/lib/libgcj.so.6"
-+          "/libgcj.so.7",
-+          "/libgcj.so.6"
- #endif
-     };
-     *size = sizeof(ar) / sizeof (char*);
-@@ -87,7 +87,7 @@
-     OUString sVersionProperty(
-         RTL_CONSTASCII_USTRINGPARAM("java.version"));
-     OUString sHomeProperty(
--        RTL_CONSTASCII_USTRINGPARAM("java.home"));
-+        RTL_CONSTASCII_USTRINGPARAM("gnu.classpath.home.url"));
-     OUString sAccessProperty(
-         RTL_CONSTASCII_USTRINGPARAM("javax.accessibility.assistive_technologies"));
- 
-@@ -111,19 +111,8 @@
-         }
-         else if (!bHome && sHomeProperty.equals(i->first))
-         {
--           OUString fileURL;
--           if (osl_getFileURLFromSystemPath(i->second.pData,& fileURL.pData) ==
--               osl_File_E_None)
--           {
--               //make sure that the drive letter have all the same case
--               //otherwise file:///c:/jre and file:///C:/jre produce two
--               //different objects!!!
--               if (makeDriveLetterSame( & fileURL))
--               {
--                   m_sHome = fileURL;
--                   bHome = true;
--               }
--           }
-+          m_sHome = i->second;
-+          bHome = true;
-         }
-         else if (!bAccess && sAccessProperty.equals(i->first))
-         {
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i64762 b/editors/openoffice.org-2.0-devel/files/patch-i64762
deleted file mode 100644
index 70b535dd070c..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-i64762
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: sal/osl/unx/security.c
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/security.c,v
-retrieving revision 1.18
-diff -u -r1.18 security.c
---- sal/osl/unx/security.c	20 Apr 2006 16:24:05 -0000	1.18
-+++ sal/osl/unx/security.c	25 Apr 2006 21:35:23 -0000
-@@ -57,6 +57,11 @@
- #define PAM_BINARY_MSG 6
- #endif
- 
-+#include <stdint.h> //C99 contains SIZE_MAX
-+#ifndef SIZE_MAX 
-+#define SIZE_MAX (sizeof (size_t) -1)
-+#endif
-+
- extern oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32 nRtldMode);
- extern void* SAL_CALL osl_psz_getSymbol(oslModule hModule, const sal_Char* pszSymbolName);
- static oslSecurityError SAL_CALL 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i65513 b/editors/openoffice.org-2.0-devel/files/patch-i65513
index 146731b44885..ff0735045953 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-i65513
+++ b/editors/openoffice.org-2.0-devel/files/patch-i65513
@@ -80,9 +80,15 @@
     		}
     		elsif ($platform =~ m/netbsd/)
     		{  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
---- solenv/inc/unx.mk	Fri May 19 13:55:04 2006
-+++ solenv/inc/unx.mk	Fri May 19 13:38:42 2006
-@@ -155,10 +155,9 @@
+
+Index: solenv/inc/unx.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/unx.mk,v
+retrieving revision 1.32
+diff -u -r1.32 unx.mk
+--- solenv/inc/unx.mk	3 Feb 2006 17:33:26 -0000	1.32
++++ solenv/inc/unx.mk	27 Jun 2006 01:52:09 -0000
+@@ -155,11 +155,10 @@
  .INCLUDE : unxbsds.mk
  .ENDIF
  
@@ -91,246 +97,28 @@
 +.IF "$(COM)$(OS)" == "GCCFREEBSD"
 +.INCLUDE : unxfbsd.mk
  .ENDIF
--
  
+-
  .IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"
  .INCLUDE : unxirxm3.mk
---- solenv/inc/unxfbsd.mk	Fri May 19 13:13:25 2006
-+++ solenv/inc/unxfbsd.mk	Fri May 19 13:52:02 2006
-@@ -0,0 +1,220 @@
-+#*************************************************************************
-+#
-+#   OpenOffice.org - a multi-platform office productivity suite
-+#
-+#   $RCSfile$
-+#
-+#   $Revision$
-+#
-+#   last change: $Author$ $Date$
-+#
-+#   The Contents of this file are made available subject to
-+#   the terms of GNU Lesser General Public License Version 2.1.
-+#
-+#
-+#     GNU Lesser General Public License Version 2.1
-+#     =============================================
-+#     Copyright 2005 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
-+#
-+#*************************************************************************
-+
-+# Makefile for FreeBSD.
-+
-+ASM=
-+AFLAGS=
-+
-+SOLAR_JAVA*=TRUE
-+JAVAFLAGSDEBUG=-g
-+
-+# Include arch specific makefile.
-+.IF "$(CPUNAME)" == "INTEL"
-+.INCLUDE : unxfbsdi.mk
-+.ENDIF
-+.IF "$(CPUNAME)" == "X86_64"
-+.INCLUDE : unxfbsdx.mk
-+.ENDIF
-+
-+# filter for supressing verbose messages from linker
-+#not needed at the moment
-+#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
-+
-+# _PTHREADS is needed for the stl
-+CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
-+
-+# enable visibility define in "sal/types.h"
-+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+
-+# this is a platform with JAVA support
-+.IF "$(SOLAR_JAVA)"!=""
-+JAVADEF=-DSOLAR_JAVA
-+.IF "$(debug)"==""
-+JAVA_RUNTIME=-ljava
-+.ELSE
-+JAVA_RUNTIME=-ljava_g
-+.ENDIF
-+.ENDIF
-+
-+# name of C++ Compiler
-+CXX*=g++
-+# name of C Compiler
-+CC*=gcc
-+.IF "$(SYSBASE)"!=""
-+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
-+CXX+:=$(CFLAGS_SYSBASE)
-+CC+:=$(CFLAGS_SYSBASE)
-+.ENDIF          # "$(SYSBASE)"!=""
-+CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
-+
-+# flags to enable build with symbols; required for crashdump feature
-+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-+CFLAGSENABLESYMBOLS=-g1
-+.ELSE
-+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-+
-+.ENDIF
-+
-+# flags for the C++ Compiler
-+CFLAGSCC= -pipe $(ARCH_FLAGS)
-+# Flags for enabling exception handling
-+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-+# Flags for disabling exception handling
-+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-+
-+# -fpermissive should be removed as soon as possible
-+CFLAGSCXX= -pipe $(ARCH_FLAGS)
-+CFLAGSCXX+= -Wno-ctor-dtor-privacy
-+PICSWITCH:=-fpic
-+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+CFLAGSCXX += -fvisibility-inlines-hidden
-+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+
-+# Compiler flags for compiling static object in single threaded environment with graphical user interface
-+CFLAGSOBJGUIST=
-+# Compiler flags for compiling static object in single threaded environment with character user interface
-+CFLAGSOBJCUIST=
-+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-+CFLAGSOBJGUIMT=
-+# Compiler flags for compiling static object in multi threaded environment with character user interface
-+CFLAGSOBJCUIMT=
-+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-+CFLAGSSLOGUIMT=$(PICSWITCH)
-+# Compiler flags for compiling shared object in multi threaded environment with character user interface
-+CFLAGSSLOCUIMT=$(PICSWITCH)
-+# Compiler flags for profiling
-+CFLAGSPROF=
-+# Compiler flags for debugging
-+CFLAGSDEBUG=-g
-+CFLAGSDBGUTIL=
-+# Compiler flags for disabling optimizations
-+CFLAGSNOOPT=-O0
-+# Compiler flags for describing the output path
-+CFLAGSOUTOBJ=-o
-+# Enable all warnings
-+CFLAGSWALL=-Wall
-+# Set default warn level
-+CFLAGSDFLTWARN=
-+
-+# switches for dynamic and static linking
-+STATIC		= -Wl,-Bstatic
-+DYNAMIC		= -Wl,-Bdynamic
-+
-+# name of linker
-+LINK*=$(CXX)
-+LINKC*=$(CC)
-+
-+# default linker flags
-+LINKFLAGSDEFS*=#-Wl,-z,defs
-+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
-+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+
-+# linker flags for linking shared libraries
-+LINKFLAGSSHLGUI= -shared
-+LINKFLAGSSHLCUI= -shared
-+
-+LINKFLAGSTACK=
-+LINKFLAGSPROF=
-+LINKFLAGSDEBUG=-g
-+LINKFLAGSOPT=
-+
-+# linker flags for optimization (symbol hashtable)
-+# for now, applied to symbol scoped libraries, only
-+LINKFLAGSOPTIMIZE*=-Wl,-O1
-+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-+
-+SONAME_SWITCH=-Wl,-h
-+
-+# Sequence of libs does matter !
-+
-+STDLIBCPP=-lstdc++
-+
-+# default objectfilenames to link
-+STDOBJVCL=$(L)$/salmain.o
-+STDOBJGUI=
-+STDSLOGUI=
-+STDOBJCUI=
-+STDSLOCUI=
-+
-+# libraries for linking applications
-+STDLIBCUIST=-lm
-+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
-+STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-+STDLIBGUIST=-lX11 -lm
-+# libraries for linking shared libraries
-+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
-+STDSHLCUIMT=$(PTHREAD_LIBS) -lm
-+STDSHLGUIST=-lX11 -lXext -lm
-+STDSHLCUIST=-lm
-+
-+LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-+
-+.IF "$(USE_STLP_DEBUG)" != ""
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
-+.ELSE # "$(USE_STLP_DEBUG)" != ""
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-+.ENDIF # "$(USE_STLP_DEBUG)" != ""
-+
-+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-+
-+# name of library manager
-+LIBMGR=ar
-+LIBFLAGS=-r
-+
-+# tool for generating import libraries
-+IMPLIB=
-+IMPLIBFLAGS=
-+
-+MAPSYM=
-+MAPSYMFLAGS=
-+
-+RC=irc
-+RCFLAGS=-fo$@ $(RCFILES)
-+RCLINK=
-+RCLINKFLAGS=
-+RCSETVERSION=
-+
-+# platform specific identifier for shared libs
-+DLLPRE=lib
-+DLLPOST=.so
---- solenv/inc/unxfbsdi.mk	Tue Jan 31 13:24:38 2006
-+++ solenv/inc/unxfbsdi.mk	Fri May 19 13:52:19 2006
-@@ -33,192 +33,23 @@
+ .ENDIF
+
+
+Index: solenv/inc/unxfbsdi.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
+retrieving revision 1.21
+diff -u -r1.21 unxfbsdi.mk
+--- solenv/inc/unxfbsdi.mk	19 Jun 2006 17:13:50 -0000	1.21
++++ solenv/inc/unxfbsdi.mk	27 Jun 2006 01:52:35 -0000
+@@ -33,196 +33,23 @@
  #
  #*************************************************************************
  
 -# mk file for unxfbsdi
 -ASM=
 -AFLAGS=
-+#
-+# FreBSD/i386 specific defines
-+#
- 
+-
 -SOLAR_JAVA*=TRUE
 -JAVAFLAGSDEBUG=-g
 -
@@ -355,10 +143,15 @@
 -JAVA_RUNTIME=-ljava_g
 -.ENDIF
 -.ENDIF
++#
++# FreBSD/i386 specific defines
++#
++
 +CDEFS+=-DX86
  
  # architecture dependent flags for the C and C++ compiler that can be changed by
  # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
++
  ARCH_FLAGS*=-mtune=pentiumpro
  
 -# name of C++ Compiler
@@ -370,7 +163,7 @@
 -CXX+:=$(CFLAGS_SYSBASE)
 -CC+:=$(CFLAGS_SYSBASE)
 -.ENDIF          # "$(SYSBASE)"!=""
--CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
+-CFLAGS+=-fmessage-length=0 -c $(INCLUDE)
 -
 -# flags to enable build with symbols; required for crashdump feature
 -.IF "$(ENABLE_SYMBOLS)"=="SMALL"
@@ -389,7 +182,6 @@
 -
 -# -fpermissive should be removed as soon as possible
 -CFLAGSCXX= -pipe $(ARCH_FLAGS)
--CFLAGSCXX+= -Wno-ctor-dtor-privacy
 -PICSWITCH:=-fpic
 -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
 -CFLAGSCXX += -fvisibility-inlines-hidden
@@ -415,20 +207,23 @@
  # Compiler flags for enabling optimizations
  .IF "$(PRODUCT)"!=""
  CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
--CFLAGSOPT+=-Wuninitialized				# not supported without optimization
-+CFLAGSOPT+=-Wuninitialized			# not supported without optimization
  .ELSE 	# "$(PRODUCT)"!=""
--CFLAGSOPT=   							# no optimizing for non products
-+CFLAGSOPT=   					# no optimizing for non products
+ CFLAGSOPT=   							# no optimizing for non products
  .ENDIF	# "$(PRODUCT)"!=""
 -# Compiler flags for disabling optimizations
 -CFLAGSNOOPT=-O0
 -# Compiler flags for describing the output path
 -CFLAGSOUTOBJ=-o
--# Enable all warnings
--CFLAGSWALL=-Wall
--# Set default warn level
--CFLAGSDFLTWARN=
+-
+-CFLAGSWARNCC=-Wreturn-type
+-.IF "$(PRODUCT)"!=""
+-CFLAGSWARNCC+=-Wuninitialized # not supported without optimization
+-.ENDIF
+-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
+-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
+-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
+-CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
+-CFLAGSWERRCC=-Werror
 -
 -# switches for dynamic and static linking
 -STATIC		= -Wl,-Bstatic
@@ -514,14 +309,15 @@
 -RCLINKFLAGS=
 -RCSETVERSION=
  
- # platform specific identifier for shared libs
+-# platform specific identifier for shared libs
  DLLPOSTFIX=fi
 -DLLPRE=lib
 -DLLPOST=.so
--
---- solenv/inc/unxfbsdx.mk	Fri May 19 13:13:25 2006
-+++ solenv/inc/unxfbsdx.mk	Fri May 19 13:52:38 2006
-@@ -0,0 +1,57 @@
+ 
+
+--- /dev/null	Wed Jun 28 21:44:00 2006
++++ solenv/inc/unxfbsdx.mk	Wed Jun 28 21:38:06 2006
+@@ -0,0 +1,56 @@
 +#*************************************************************************
 +#
 +#   OpenOffice.org - a multi-platform office productivity suite
@@ -572,10 +368,251 @@
 +# Compiler flags for enabling optimizations
 +.IF "$(PRODUCT)"!=""
 +CFLAGSOPT=-O2 -fno-strict-aliasing		# optimizing for products
-+CFLAGSOPT+=-Wuninitialized			# not supported without optimization
 +.ELSE 	# "$(PRODUCT)"!=""
 +CFLAGSOPT=   					# no optimizing for non products
 +.ENDIF	# "$(PRODUCT)"!=""
 +
 +# platform specific identifier for shared libs
 +DLLPOSTFIX=fx
+
+--- /dev/null	Wed Jun 28 21:44:00 2006
++++ solenv/inc/unxfbsd.mk	Wed Jun 28 21:50:16 2006
+@@ -0,0 +1,238 @@
++#*************************************************************************
++#
++#   OpenOffice.org - a multi-platform office productivity suite
++#
++#   $RCSfile$
++#
++#   $Revision$
++#
++#   last change: $Author$ $Date$
++#
++#   The Contents of this file are made available subject to
++#   the terms of GNU Lesser General Public License Version 2.1.
++#
++#
++#     GNU Lesser General Public License Version 2.1
++#     =============================================
++#     Copyright 2005 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
++#
++#*************************************************************************
++
++# Makefile for FreeBSD.
++
++ASM=
++AFLAGS=
++
++SOLAR_JAVA*=
++JAVAFLAGSDEBUG=-g
++
++# Include arch specific makefile.
++.IF "$(CPUNAME)" == "INTEL"
++.INCLUDE : unxfbsdi.mk
++.ENDIF
++.IF "$(CPUNAME)" == "X86_64"
++.INCLUDE : unxfbsdx.mk
++.ENDIF
++
++# filter for supressing verbose messages from linker
++#not needed at the moment
++#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
++
++# _PTHREADS is needed for the stl
++CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
++
++# enable visibility define in "sal/types.h"
++.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
++.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++
++# this is a platform with JAVA support
++.IF "$(SOLAR_JAVA)"!=""
++JAVADEF=-DSOLAR_JAVA
++.IF "$(debug)"==""
++JAVA_RUNTIME=-ljava
++.ELSE
++JAVA_RUNTIME=-ljava_g
++.ENDIF
++.ENDIF
++
++# architecture dependent flags for the C and C++ compiler that can be changed by
++# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
++ARCH_FLAGS*=-mtune=pentiumpro
++
++# name of C++ Compiler
++CXX*=g++
++# name of C Compiler
++CC*=gcc
++.IF "$(SYSBASE)"!=""
++CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
++CXX+:=$(CFLAGS_SYSBASE)
++CC+:=$(CFLAGS_SYSBASE)
++.ENDIF          # "$(SYSBASE)"!=""
++CFLAGS+=-fmessage-length=0 -c $(INCLUDE)
++
++# flags to enable build with symbols; required for crashdump feature
++.IF "$(ENABLE_SYMBOLS)"=="SMALL"
++CFLAGSENABLESYMBOLS=-g1
++.ELSE
++CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
++
++.ENDIF
++
++# flags for the C++ Compiler
++CFLAGSCC= -pipe $(ARCH_FLAGS)
++# Flags for enabling exception handling
++CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
++# Flags for disabling exception handling
++CFLAGS_NO_EXCEPTIONS=-fno-exceptions
++
++# -fpermissive should be removed as soon as possible
++CFLAGSCXX= -pipe $(ARCH_FLAGS)
++PICSWITCH:=-fpic
++.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++CFLAGSCXX += -fvisibility-inlines-hidden
++.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++
++# Compiler flags for compiling static object in single threaded environment with graphical user interface
++CFLAGSOBJGUIST=
++# Compiler flags for compiling static object in single threaded environment with character user interface
++CFLAGSOBJCUIST=
++# Compiler flags for compiling static object in multi threaded environment with graphical user interface
++CFLAGSOBJGUIMT=
++# Compiler flags for compiling static object in multi threaded environment with character user interface
++CFLAGSOBJCUIMT=
++# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
++CFLAGSSLOGUIMT=$(PICSWITCH)
++# Compiler flags for compiling shared object in multi threaded environment with character user interface
++CFLAGSSLOCUIMT=$(PICSWITCH)
++# Compiler flags for profiling
++CFLAGSPROF=
++# Compiler flags for debugging
++CFLAGSDEBUG=-g
++CFLAGSDBGUTIL=
++# Compiler flags for enabling optimizations
++.IF "$(PRODUCT)"!=""
++CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
++.ELSE 	# "$(PRODUCT)"!=""
++CFLAGSOPT=   							# no optimizing for non products
++.ENDIF	# "$(PRODUCT)"!=""
++# Compiler flags for disabling optimizations
++CFLAGSNOOPT=-O0
++# Compiler flags for describing the output path
++CFLAGSOUTOBJ=-o
++
++# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
++CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
++CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
++    -Wno-non-virtual-dtor
++CFLAGSWALLCC=$(CFLAGSWARNCC)
++CFLAGSWALLCXX=$(CFLAGSWARNCXX)
++CFLAGSWERRCC=-Werror
++
++# Once all modules on this platform compile without warnings, set
++# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
++# settings.mk): Currently this is not tested on FreeBSD
++#MODULES_WITH_WARNINGS :=
++
++# switches for dynamic and static linking
++STATIC		= -Wl,-Bstatic
++DYNAMIC		= -Wl,-Bdynamic
++
++# name of linker
++LINK*=$(CXX)
++LINKC*=$(CC)
++
++# default linker flags
++LINKFLAGSDEFS*=#-Wl,-z,defs
++LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
++LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
++
++# linker flags for linking applications
++LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++
++# linker flags for linking shared libraries
++LINKFLAGSSHLGUI= -shared
++LINKFLAGSSHLCUI= -shared
++
++LINKFLAGSTACK=
++LINKFLAGSPROF=
++LINKFLAGSDEBUG=-g
++LINKFLAGSOPT=
++
++# linker flags for optimization (symbol hashtable)
++# for now, applied to symbol scoped libraries, only
++LINKFLAGSOPTIMIZE*=-Wl,-O1
++LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
++
++SONAME_SWITCH=-Wl,-h
++
++# Sequence of libs does matter !
++
++STDLIBCPP=-lstdc++
++
++# default objectfilenames to link
++STDOBJVCL=$(L)$/salmain.o
++STDOBJGUI=
++STDSLOGUI=
++STDOBJCUI=
++STDSLOCUI=
++
++# libraries for linking applications
++STDLIBCUIST=-lm
++STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
++STDLIBCUIMT=$(PTHREAD_LIBS) -lm
++STDLIBGUIST=-lX11 -lm
++# libraries for linking shared libraries
++STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
++STDSHLCUIMT=$(PTHREAD_LIBS) -lm
++STDSHLGUIST=-lX11 -lXext -lm
++STDSHLCUIST=-lm
++
++LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
++
++.IF "$(USE_STLP_DEBUG)" != ""
++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
++LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
++.ELSE # "$(USE_STLP_DEBUG)" != ""
++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
++LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
++.ENDIF # "$(USE_STLP_DEBUG)" != ""
++
++#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
++
++# name of library manager
++LIBMGR=ar
++LIBFLAGS=-r
++
++# tool for generating import libraries
++IMPLIB=
++IMPLIBFLAGS=
++
++MAPSYM=
++MAPSYMFLAGS=
++
++RC=irc
++RCFLAGS=-fo$@ $(RCFILES)
++RCLINK=
++RCLINKFLAGS=
++RCSETVERSION=
++
++# platform specific identifier for shared libs
++DLLPRE=lib
++DLLPOST=.so
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i66667 b/editors/openoffice.org-2.0-devel/files/patch-i66667
index 6e3a697c4bf0..26c0b1b4a88c 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-i66667
+++ b/editors/openoffice.org-2.0-devel/files/patch-i66667
@@ -1,10 +1,10 @@
-Index: gtkinst.cxx
+Index: vcl/unx/gtk/app/gtkinst.cxx
 ===================================================================
 RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
-retrieving revision 1.13
-diff -u -r1.13 gtkinst.cxx
---- vcl/unx/gtk/app/gtkinst.cxx	11 May 2006 13:32:35 -0000	1.13
-+++ vcl/unx/gtk/app/gtkinst.cxx	16 Jun 2006 20:48:58 -0000
+retrieving revision 1.14
+diff -u -r1.14 gtkinst.cxx
+--- vcl/unx/gtk/app/gtkinst.cxx	19 Jun 2006 19:44:33 -0000	1.14
++++ vcl/unx/gtk/app/gtkinst.cxx	27 Jun 2006 02:11:09 -0000
 @@ -43,6 +43,7 @@
  #include <plugins/gtk/atkbridge.hxx>
  
@@ -13,7 +13,7 @@ diff -u -r1.13 gtkinst.cxx
  
  #if OSL_DEBUG_LEVEL > 1
  #include <stdio.h>
-@@ -111,13 +112,28 @@
+@@ -111,13 +112,27 @@
  		GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
  		pYieldMutex->ThreadsLeave();
  	}
@@ -38,14 +38,13 @@ diff -u -r1.13 gtkinst.cxx
 +#endif
 +			return false;
 +		}
-+
  		GdkLockFn gdk_threads_set_lock_functions =
--				(GdkLockFn) osl_getSymbol( pModule, aSymbolName.pData );
+-				(GdkLockFn) osl_getFunctionSymbol( pModule, aSymbolName.pData );
 +				(GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
  		if ( !gdk_threads_set_lock_functions )
  		{
  #if OSL_DEBUG_LEVEL > 1
-@@ -150,7 +166,7 @@
+@@ -150,7 +165,7 @@
  		if ( !g_thread_supported() )
  			g_thread_init( NULL );
  
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 25f564ec734d..60cb35c94423 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -73,9 +73,9 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE?=		172
+MILESTONE?=		173
 OOOTAG?=		SRC680_m${MILESTONE}
-SNAPDATE=		20060605
+SNAPDATE=		20060626
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index cdbd633f3a51..28332915c0c5 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,12 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m172_source.tar.bz2) = 5274ce3d9fd419903786849e826a34da
-SHA256 (openoffice.org2.0/OOo_SRC680_m172_source.tar.bz2) = 5a124921ac87ffe5d3f138564014a242c952d5c562c163a4eee4213bc1e0cc86
-SIZE (openoffice.org2.0/OOo_SRC680_m172_source.tar.bz2) = 249726628
+MD5 (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = b8922278010673990b2d51b3a0b7aa3c
+SHA256 (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = b8d456b942d918088a3506051edf1c8c596d59586ebb78a95a566a53893c4d92
+SIZE (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = 248052856
+MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
+SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
+MD5 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 26031ee1a2fd248ad0cc2e7f17c44c39
+SHA256 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = d463b8259cb199cd26799c817756c73e4e7808b0cf915f86841ac9779e0f9936
+SIZE (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 6743024
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
 SHA256 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
 SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366
diff --git a/editors/openoffice.org-3-devel/files/patch-i64442 b/editors/openoffice.org-3-devel/files/patch-i64442
deleted file mode 100644
index 6c7313582b85..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i64442
+++ /dev/null
@@ -1,50 +0,0 @@
-cws maho02
-Index: jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
-===================================================================
-RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v
-retrieving revision 1.7
-diff -u -r1.7 gnujre.cxx
---- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	16 Mar 2006 13:13:00 -0000	1.7
-+++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	18 Apr 2006 21:50:36 -0000
-@@ -67,8 +67,8 @@
-           "/lib64/libgcj.so.7",
-           "/lib64/libgcj.so.6"
- #else
--          "/lib/libgcj.so.7",
--          "/lib/libgcj.so.6"
-+          "/libgcj.so.7",
-+          "/libgcj.so.6"
- #endif
-     };
-     *size = sizeof(ar) / sizeof (char*);
-@@ -87,7 +87,7 @@
-     OUString sVersionProperty(
-         RTL_CONSTASCII_USTRINGPARAM("java.version"));
-     OUString sHomeProperty(
--        RTL_CONSTASCII_USTRINGPARAM("java.home"));
-+        RTL_CONSTASCII_USTRINGPARAM("gnu.classpath.home.url"));
-     OUString sAccessProperty(
-         RTL_CONSTASCII_USTRINGPARAM("javax.accessibility.assistive_technologies"));
- 
-@@ -111,19 +111,8 @@
-         }
-         else if (!bHome && sHomeProperty.equals(i->first))
-         {
--           OUString fileURL;
--           if (osl_getFileURLFromSystemPath(i->second.pData,& fileURL.pData) ==
--               osl_File_E_None)
--           {
--               //make sure that the drive letter have all the same case
--               //otherwise file:///c:/jre and file:///C:/jre produce two
--               //different objects!!!
--               if (makeDriveLetterSame( & fileURL))
--               {
--                   m_sHome = fileURL;
--                   bHome = true;
--               }
--           }
-+          m_sHome = i->second;
-+          bHome = true;
-         }
-         else if (!bAccess && sAccessProperty.equals(i->first))
-         {
diff --git a/editors/openoffice.org-3-devel/files/patch-i64762 b/editors/openoffice.org-3-devel/files/patch-i64762
deleted file mode 100644
index 70b535dd070c..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i64762
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: sal/osl/unx/security.c
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/security.c,v
-retrieving revision 1.18
-diff -u -r1.18 security.c
---- sal/osl/unx/security.c	20 Apr 2006 16:24:05 -0000	1.18
-+++ sal/osl/unx/security.c	25 Apr 2006 21:35:23 -0000
-@@ -57,6 +57,11 @@
- #define PAM_BINARY_MSG 6
- #endif
- 
-+#include <stdint.h> //C99 contains SIZE_MAX
-+#ifndef SIZE_MAX 
-+#define SIZE_MAX (sizeof (size_t) -1)
-+#endif
-+
- extern oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32 nRtldMode);
- extern void* SAL_CALL osl_psz_getSymbol(oslModule hModule, const sal_Char* pszSymbolName);
- static oslSecurityError SAL_CALL 
diff --git a/editors/openoffice.org-3-devel/files/patch-i65513 b/editors/openoffice.org-3-devel/files/patch-i65513
index 146731b44885..ff0735045953 100644
--- a/editors/openoffice.org-3-devel/files/patch-i65513
+++ b/editors/openoffice.org-3-devel/files/patch-i65513
@@ -80,9 +80,15 @@
     		}
     		elsif ($platform =~ m/netbsd/)
     		{  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
---- solenv/inc/unx.mk	Fri May 19 13:55:04 2006
-+++ solenv/inc/unx.mk	Fri May 19 13:38:42 2006
-@@ -155,10 +155,9 @@
+
+Index: solenv/inc/unx.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/unx.mk,v
+retrieving revision 1.32
+diff -u -r1.32 unx.mk
+--- solenv/inc/unx.mk	3 Feb 2006 17:33:26 -0000	1.32
++++ solenv/inc/unx.mk	27 Jun 2006 01:52:09 -0000
+@@ -155,11 +155,10 @@
  .INCLUDE : unxbsds.mk
  .ENDIF
  
@@ -91,246 +97,28 @@
 +.IF "$(COM)$(OS)" == "GCCFREEBSD"
 +.INCLUDE : unxfbsd.mk
  .ENDIF
--
  
+-
  .IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"
  .INCLUDE : unxirxm3.mk
---- solenv/inc/unxfbsd.mk	Fri May 19 13:13:25 2006
-+++ solenv/inc/unxfbsd.mk	Fri May 19 13:52:02 2006
-@@ -0,0 +1,220 @@
-+#*************************************************************************
-+#
-+#   OpenOffice.org - a multi-platform office productivity suite
-+#
-+#   $RCSfile$
-+#
-+#   $Revision$
-+#
-+#   last change: $Author$ $Date$
-+#
-+#   The Contents of this file are made available subject to
-+#   the terms of GNU Lesser General Public License Version 2.1.
-+#
-+#
-+#     GNU Lesser General Public License Version 2.1
-+#     =============================================
-+#     Copyright 2005 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
-+#
-+#*************************************************************************
-+
-+# Makefile for FreeBSD.
-+
-+ASM=
-+AFLAGS=
-+
-+SOLAR_JAVA*=TRUE
-+JAVAFLAGSDEBUG=-g
-+
-+# Include arch specific makefile.
-+.IF "$(CPUNAME)" == "INTEL"
-+.INCLUDE : unxfbsdi.mk
-+.ENDIF
-+.IF "$(CPUNAME)" == "X86_64"
-+.INCLUDE : unxfbsdx.mk
-+.ENDIF
-+
-+# filter for supressing verbose messages from linker
-+#not needed at the moment
-+#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
-+
-+# _PTHREADS is needed for the stl
-+CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
-+
-+# enable visibility define in "sal/types.h"
-+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+
-+# this is a platform with JAVA support
-+.IF "$(SOLAR_JAVA)"!=""
-+JAVADEF=-DSOLAR_JAVA
-+.IF "$(debug)"==""
-+JAVA_RUNTIME=-ljava
-+.ELSE
-+JAVA_RUNTIME=-ljava_g
-+.ENDIF
-+.ENDIF
-+
-+# name of C++ Compiler
-+CXX*=g++
-+# name of C Compiler
-+CC*=gcc
-+.IF "$(SYSBASE)"!=""
-+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
-+CXX+:=$(CFLAGS_SYSBASE)
-+CC+:=$(CFLAGS_SYSBASE)
-+.ENDIF          # "$(SYSBASE)"!=""
-+CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
-+
-+# flags to enable build with symbols; required for crashdump feature
-+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-+CFLAGSENABLESYMBOLS=-g1
-+.ELSE
-+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-+
-+.ENDIF
-+
-+# flags for the C++ Compiler
-+CFLAGSCC= -pipe $(ARCH_FLAGS)
-+# Flags for enabling exception handling
-+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-+# Flags for disabling exception handling
-+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-+
-+# -fpermissive should be removed as soon as possible
-+CFLAGSCXX= -pipe $(ARCH_FLAGS)
-+CFLAGSCXX+= -Wno-ctor-dtor-privacy
-+PICSWITCH:=-fpic
-+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+CFLAGSCXX += -fvisibility-inlines-hidden
-+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+
-+# Compiler flags for compiling static object in single threaded environment with graphical user interface
-+CFLAGSOBJGUIST=
-+# Compiler flags for compiling static object in single threaded environment with character user interface
-+CFLAGSOBJCUIST=
-+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-+CFLAGSOBJGUIMT=
-+# Compiler flags for compiling static object in multi threaded environment with character user interface
-+CFLAGSOBJCUIMT=
-+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-+CFLAGSSLOGUIMT=$(PICSWITCH)
-+# Compiler flags for compiling shared object in multi threaded environment with character user interface
-+CFLAGSSLOCUIMT=$(PICSWITCH)
-+# Compiler flags for profiling
-+CFLAGSPROF=
-+# Compiler flags for debugging
-+CFLAGSDEBUG=-g
-+CFLAGSDBGUTIL=
-+# Compiler flags for disabling optimizations
-+CFLAGSNOOPT=-O0
-+# Compiler flags for describing the output path
-+CFLAGSOUTOBJ=-o
-+# Enable all warnings
-+CFLAGSWALL=-Wall
-+# Set default warn level
-+CFLAGSDFLTWARN=
-+
-+# switches for dynamic and static linking
-+STATIC		= -Wl,-Bstatic
-+DYNAMIC		= -Wl,-Bdynamic
-+
-+# name of linker
-+LINK*=$(CXX)
-+LINKC*=$(CC)
-+
-+# default linker flags
-+LINKFLAGSDEFS*=#-Wl,-z,defs
-+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
-+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+
-+# linker flags for linking shared libraries
-+LINKFLAGSSHLGUI= -shared
-+LINKFLAGSSHLCUI= -shared
-+
-+LINKFLAGSTACK=
-+LINKFLAGSPROF=
-+LINKFLAGSDEBUG=-g
-+LINKFLAGSOPT=
-+
-+# linker flags for optimization (symbol hashtable)
-+# for now, applied to symbol scoped libraries, only
-+LINKFLAGSOPTIMIZE*=-Wl,-O1
-+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-+
-+SONAME_SWITCH=-Wl,-h
-+
-+# Sequence of libs does matter !
-+
-+STDLIBCPP=-lstdc++
-+
-+# default objectfilenames to link
-+STDOBJVCL=$(L)$/salmain.o
-+STDOBJGUI=
-+STDSLOGUI=
-+STDOBJCUI=
-+STDSLOCUI=
-+
-+# libraries for linking applications
-+STDLIBCUIST=-lm
-+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
-+STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-+STDLIBGUIST=-lX11 -lm
-+# libraries for linking shared libraries
-+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
-+STDSHLCUIMT=$(PTHREAD_LIBS) -lm
-+STDSHLGUIST=-lX11 -lXext -lm
-+STDSHLCUIST=-lm
-+
-+LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-+
-+.IF "$(USE_STLP_DEBUG)" != ""
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
-+.ELSE # "$(USE_STLP_DEBUG)" != ""
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-+.ENDIF # "$(USE_STLP_DEBUG)" != ""
-+
-+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-+
-+# name of library manager
-+LIBMGR=ar
-+LIBFLAGS=-r
-+
-+# tool for generating import libraries
-+IMPLIB=
-+IMPLIBFLAGS=
-+
-+MAPSYM=
-+MAPSYMFLAGS=
-+
-+RC=irc
-+RCFLAGS=-fo$@ $(RCFILES)
-+RCLINK=
-+RCLINKFLAGS=
-+RCSETVERSION=
-+
-+# platform specific identifier for shared libs
-+DLLPRE=lib
-+DLLPOST=.so
---- solenv/inc/unxfbsdi.mk	Tue Jan 31 13:24:38 2006
-+++ solenv/inc/unxfbsdi.mk	Fri May 19 13:52:19 2006
-@@ -33,192 +33,23 @@
+ .ENDIF
+
+
+Index: solenv/inc/unxfbsdi.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
+retrieving revision 1.21
+diff -u -r1.21 unxfbsdi.mk
+--- solenv/inc/unxfbsdi.mk	19 Jun 2006 17:13:50 -0000	1.21
++++ solenv/inc/unxfbsdi.mk	27 Jun 2006 01:52:35 -0000
+@@ -33,196 +33,23 @@
  #
  #*************************************************************************
  
 -# mk file for unxfbsdi
 -ASM=
 -AFLAGS=
-+#
-+# FreBSD/i386 specific defines
-+#
- 
+-
 -SOLAR_JAVA*=TRUE
 -JAVAFLAGSDEBUG=-g
 -
@@ -355,10 +143,15 @@
 -JAVA_RUNTIME=-ljava_g
 -.ENDIF
 -.ENDIF
++#
++# FreBSD/i386 specific defines
++#
++
 +CDEFS+=-DX86
  
  # architecture dependent flags for the C and C++ compiler that can be changed by
  # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
++
  ARCH_FLAGS*=-mtune=pentiumpro
  
 -# name of C++ Compiler
@@ -370,7 +163,7 @@
 -CXX+:=$(CFLAGS_SYSBASE)
 -CC+:=$(CFLAGS_SYSBASE)
 -.ENDIF          # "$(SYSBASE)"!=""
--CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
+-CFLAGS+=-fmessage-length=0 -c $(INCLUDE)
 -
 -# flags to enable build with symbols; required for crashdump feature
 -.IF "$(ENABLE_SYMBOLS)"=="SMALL"
@@ -389,7 +182,6 @@
 -
 -# -fpermissive should be removed as soon as possible
 -CFLAGSCXX= -pipe $(ARCH_FLAGS)
--CFLAGSCXX+= -Wno-ctor-dtor-privacy
 -PICSWITCH:=-fpic
 -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
 -CFLAGSCXX += -fvisibility-inlines-hidden
@@ -415,20 +207,23 @@
  # Compiler flags for enabling optimizations
  .IF "$(PRODUCT)"!=""
  CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
--CFLAGSOPT+=-Wuninitialized				# not supported without optimization
-+CFLAGSOPT+=-Wuninitialized			# not supported without optimization
  .ELSE 	# "$(PRODUCT)"!=""
--CFLAGSOPT=   							# no optimizing for non products
-+CFLAGSOPT=   					# no optimizing for non products
+ CFLAGSOPT=   							# no optimizing for non products
  .ENDIF	# "$(PRODUCT)"!=""
 -# Compiler flags for disabling optimizations
 -CFLAGSNOOPT=-O0
 -# Compiler flags for describing the output path
 -CFLAGSOUTOBJ=-o
--# Enable all warnings
--CFLAGSWALL=-Wall
--# Set default warn level
--CFLAGSDFLTWARN=
+-
+-CFLAGSWARNCC=-Wreturn-type
+-.IF "$(PRODUCT)"!=""
+-CFLAGSWARNCC+=-Wuninitialized # not supported without optimization
+-.ENDIF
+-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
+-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
+-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
+-CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
+-CFLAGSWERRCC=-Werror
 -
 -# switches for dynamic and static linking
 -STATIC		= -Wl,-Bstatic
@@ -514,14 +309,15 @@
 -RCLINKFLAGS=
 -RCSETVERSION=
  
- # platform specific identifier for shared libs
+-# platform specific identifier for shared libs
  DLLPOSTFIX=fi
 -DLLPRE=lib
 -DLLPOST=.so
--
---- solenv/inc/unxfbsdx.mk	Fri May 19 13:13:25 2006
-+++ solenv/inc/unxfbsdx.mk	Fri May 19 13:52:38 2006
-@@ -0,0 +1,57 @@
+ 
+
+--- /dev/null	Wed Jun 28 21:44:00 2006
++++ solenv/inc/unxfbsdx.mk	Wed Jun 28 21:38:06 2006
+@@ -0,0 +1,56 @@
 +#*************************************************************************
 +#
 +#   OpenOffice.org - a multi-platform office productivity suite
@@ -572,10 +368,251 @@
 +# Compiler flags for enabling optimizations
 +.IF "$(PRODUCT)"!=""
 +CFLAGSOPT=-O2 -fno-strict-aliasing		# optimizing for products
-+CFLAGSOPT+=-Wuninitialized			# not supported without optimization
 +.ELSE 	# "$(PRODUCT)"!=""
 +CFLAGSOPT=   					# no optimizing for non products
 +.ENDIF	# "$(PRODUCT)"!=""
 +
 +# platform specific identifier for shared libs
 +DLLPOSTFIX=fx
+
+--- /dev/null	Wed Jun 28 21:44:00 2006
++++ solenv/inc/unxfbsd.mk	Wed Jun 28 21:50:16 2006
+@@ -0,0 +1,238 @@
++#*************************************************************************
++#
++#   OpenOffice.org - a multi-platform office productivity suite
++#
++#   $RCSfile$
++#
++#   $Revision$
++#
++#   last change: $Author$ $Date$
++#
++#   The Contents of this file are made available subject to
++#   the terms of GNU Lesser General Public License Version 2.1.
++#
++#
++#     GNU Lesser General Public License Version 2.1
++#     =============================================
++#     Copyright 2005 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
++#
++#*************************************************************************
++
++# Makefile for FreeBSD.
++
++ASM=
++AFLAGS=
++
++SOLAR_JAVA*=
++JAVAFLAGSDEBUG=-g
++
++# Include arch specific makefile.
++.IF "$(CPUNAME)" == "INTEL"
++.INCLUDE : unxfbsdi.mk
++.ENDIF
++.IF "$(CPUNAME)" == "X86_64"
++.INCLUDE : unxfbsdx.mk
++.ENDIF
++
++# filter for supressing verbose messages from linker
++#not needed at the moment
++#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
++
++# _PTHREADS is needed for the stl
++CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
++
++# enable visibility define in "sal/types.h"
++.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
++.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++
++# this is a platform with JAVA support
++.IF "$(SOLAR_JAVA)"!=""
++JAVADEF=-DSOLAR_JAVA
++.IF "$(debug)"==""
++JAVA_RUNTIME=-ljava
++.ELSE
++JAVA_RUNTIME=-ljava_g
++.ENDIF
++.ENDIF
++
++# architecture dependent flags for the C and C++ compiler that can be changed by
++# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
++ARCH_FLAGS*=-mtune=pentiumpro
++
++# name of C++ Compiler
++CXX*=g++
++# name of C Compiler
++CC*=gcc
++.IF "$(SYSBASE)"!=""
++CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
++CXX+:=$(CFLAGS_SYSBASE)
++CC+:=$(CFLAGS_SYSBASE)
++.ENDIF          # "$(SYSBASE)"!=""
++CFLAGS+=-fmessage-length=0 -c $(INCLUDE)
++
++# flags to enable build with symbols; required for crashdump feature
++.IF "$(ENABLE_SYMBOLS)"=="SMALL"
++CFLAGSENABLESYMBOLS=-g1
++.ELSE
++CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
++
++.ENDIF
++
++# flags for the C++ Compiler
++CFLAGSCC= -pipe $(ARCH_FLAGS)
++# Flags for enabling exception handling
++CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
++# Flags for disabling exception handling
++CFLAGS_NO_EXCEPTIONS=-fno-exceptions
++
++# -fpermissive should be removed as soon as possible
++CFLAGSCXX= -pipe $(ARCH_FLAGS)
++PICSWITCH:=-fpic
++.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++CFLAGSCXX += -fvisibility-inlines-hidden
++.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++
++# Compiler flags for compiling static object in single threaded environment with graphical user interface
++CFLAGSOBJGUIST=
++# Compiler flags for compiling static object in single threaded environment with character user interface
++CFLAGSOBJCUIST=
++# Compiler flags for compiling static object in multi threaded environment with graphical user interface
++CFLAGSOBJGUIMT=
++# Compiler flags for compiling static object in multi threaded environment with character user interface
++CFLAGSOBJCUIMT=
++# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
++CFLAGSSLOGUIMT=$(PICSWITCH)
++# Compiler flags for compiling shared object in multi threaded environment with character user interface
++CFLAGSSLOCUIMT=$(PICSWITCH)
++# Compiler flags for profiling
++CFLAGSPROF=
++# Compiler flags for debugging
++CFLAGSDEBUG=-g
++CFLAGSDBGUTIL=
++# Compiler flags for enabling optimizations
++.IF "$(PRODUCT)"!=""
++CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
++.ELSE 	# "$(PRODUCT)"!=""
++CFLAGSOPT=   							# no optimizing for non products
++.ENDIF	# "$(PRODUCT)"!=""
++# Compiler flags for disabling optimizations
++CFLAGSNOOPT=-O0
++# Compiler flags for describing the output path
++CFLAGSOUTOBJ=-o
++
++# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
++CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
++CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
++    -Wno-non-virtual-dtor
++CFLAGSWALLCC=$(CFLAGSWARNCC)
++CFLAGSWALLCXX=$(CFLAGSWARNCXX)
++CFLAGSWERRCC=-Werror
++
++# Once all modules on this platform compile without warnings, set
++# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
++# settings.mk): Currently this is not tested on FreeBSD
++#MODULES_WITH_WARNINGS :=
++
++# switches for dynamic and static linking
++STATIC		= -Wl,-Bstatic
++DYNAMIC		= -Wl,-Bdynamic
++
++# name of linker
++LINK*=$(CXX)
++LINKC*=$(CC)
++
++# default linker flags
++LINKFLAGSDEFS*=#-Wl,-z,defs
++LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
++LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
++
++# linker flags for linking applications
++LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++
++# linker flags for linking shared libraries
++LINKFLAGSSHLGUI= -shared
++LINKFLAGSSHLCUI= -shared
++
++LINKFLAGSTACK=
++LINKFLAGSPROF=
++LINKFLAGSDEBUG=-g
++LINKFLAGSOPT=
++
++# linker flags for optimization (symbol hashtable)
++# for now, applied to symbol scoped libraries, only
++LINKFLAGSOPTIMIZE*=-Wl,-O1
++LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
++
++SONAME_SWITCH=-Wl,-h
++
++# Sequence of libs does matter !
++
++STDLIBCPP=-lstdc++
++
++# default objectfilenames to link
++STDOBJVCL=$(L)$/salmain.o
++STDOBJGUI=
++STDSLOGUI=
++STDOBJCUI=
++STDSLOCUI=
++
++# libraries for linking applications
++STDLIBCUIST=-lm
++STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
++STDLIBCUIMT=$(PTHREAD_LIBS) -lm
++STDLIBGUIST=-lX11 -lm
++# libraries for linking shared libraries
++STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
++STDSHLCUIMT=$(PTHREAD_LIBS) -lm
++STDSHLGUIST=-lX11 -lXext -lm
++STDSHLCUIST=-lm
++
++LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
++
++.IF "$(USE_STLP_DEBUG)" != ""
++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
++LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
++.ELSE # "$(USE_STLP_DEBUG)" != ""
++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
++LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
++.ENDIF # "$(USE_STLP_DEBUG)" != ""
++
++#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
++
++# name of library manager
++LIBMGR=ar
++LIBFLAGS=-r
++
++# tool for generating import libraries
++IMPLIB=
++IMPLIBFLAGS=
++
++MAPSYM=
++MAPSYMFLAGS=
++
++RC=irc
++RCFLAGS=-fo$@ $(RCFILES)
++RCLINK=
++RCLINKFLAGS=
++RCSETVERSION=
++
++# platform specific identifier for shared libs
++DLLPRE=lib
++DLLPOST=.so
diff --git a/editors/openoffice.org-3-devel/files/patch-i66667 b/editors/openoffice.org-3-devel/files/patch-i66667
index 6e3a697c4bf0..26c0b1b4a88c 100644
--- a/editors/openoffice.org-3-devel/files/patch-i66667
+++ b/editors/openoffice.org-3-devel/files/patch-i66667
@@ -1,10 +1,10 @@
-Index: gtkinst.cxx
+Index: vcl/unx/gtk/app/gtkinst.cxx
 ===================================================================
 RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
-retrieving revision 1.13
-diff -u -r1.13 gtkinst.cxx
---- vcl/unx/gtk/app/gtkinst.cxx	11 May 2006 13:32:35 -0000	1.13
-+++ vcl/unx/gtk/app/gtkinst.cxx	16 Jun 2006 20:48:58 -0000
+retrieving revision 1.14
+diff -u -r1.14 gtkinst.cxx
+--- vcl/unx/gtk/app/gtkinst.cxx	19 Jun 2006 19:44:33 -0000	1.14
++++ vcl/unx/gtk/app/gtkinst.cxx	27 Jun 2006 02:11:09 -0000
 @@ -43,6 +43,7 @@
  #include <plugins/gtk/atkbridge.hxx>
  
@@ -13,7 +13,7 @@ diff -u -r1.13 gtkinst.cxx
  
  #if OSL_DEBUG_LEVEL > 1
  #include <stdio.h>
-@@ -111,13 +112,28 @@
+@@ -111,13 +112,27 @@
  		GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
  		pYieldMutex->ThreadsLeave();
  	}
@@ -38,14 +38,13 @@ diff -u -r1.13 gtkinst.cxx
 +#endif
 +			return false;
 +		}
-+
  		GdkLockFn gdk_threads_set_lock_functions =
--				(GdkLockFn) osl_getSymbol( pModule, aSymbolName.pData );
+-				(GdkLockFn) osl_getFunctionSymbol( pModule, aSymbolName.pData );
 +				(GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
  		if ( !gdk_threads_set_lock_functions )
  		{
  #if OSL_DEBUG_LEVEL > 1
-@@ -150,7 +166,7 @@
+@@ -150,7 +165,7 @@
  		if ( !g_thread_supported() )
  			g_thread_init( NULL );
  
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 25f564ec734d..60cb35c94423 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -73,9 +73,9 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE?=		172
+MILESTONE?=		173
 OOOTAG?=		SRC680_m${MILESTONE}
-SNAPDATE=		20060605
+SNAPDATE=		20060626
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index cdbd633f3a51..28332915c0c5 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,6 +1,12 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m172_source.tar.bz2) = 5274ce3d9fd419903786849e826a34da
-SHA256 (openoffice.org2.0/OOo_SRC680_m172_source.tar.bz2) = 5a124921ac87ffe5d3f138564014a242c952d5c562c163a4eee4213bc1e0cc86
-SIZE (openoffice.org2.0/OOo_SRC680_m172_source.tar.bz2) = 249726628
+MD5 (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = b8922278010673990b2d51b3a0b7aa3c
+SHA256 (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = b8d456b942d918088a3506051edf1c8c596d59586ebb78a95a566a53893c4d92
+SIZE (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = 248052856
+MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
+SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
+MD5 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 26031ee1a2fd248ad0cc2e7f17c44c39
+SHA256 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = d463b8259cb199cd26799c817756c73e4e7808b0cf915f86841ac9779e0f9936
+SIZE (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 6743024
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
 SHA256 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
 SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i64442 b/editors/openoffice.org-vcltesttool/files/patch-i64442
deleted file mode 100644
index 6c7313582b85..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i64442
+++ /dev/null
@@ -1,50 +0,0 @@
-cws maho02
-Index: jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
-===================================================================
-RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v
-retrieving revision 1.7
-diff -u -r1.7 gnujre.cxx
---- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	16 Mar 2006 13:13:00 -0000	1.7
-+++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	18 Apr 2006 21:50:36 -0000
-@@ -67,8 +67,8 @@
-           "/lib64/libgcj.so.7",
-           "/lib64/libgcj.so.6"
- #else
--          "/lib/libgcj.so.7",
--          "/lib/libgcj.so.6"
-+          "/libgcj.so.7",
-+          "/libgcj.so.6"
- #endif
-     };
-     *size = sizeof(ar) / sizeof (char*);
-@@ -87,7 +87,7 @@
-     OUString sVersionProperty(
-         RTL_CONSTASCII_USTRINGPARAM("java.version"));
-     OUString sHomeProperty(
--        RTL_CONSTASCII_USTRINGPARAM("java.home"));
-+        RTL_CONSTASCII_USTRINGPARAM("gnu.classpath.home.url"));
-     OUString sAccessProperty(
-         RTL_CONSTASCII_USTRINGPARAM("javax.accessibility.assistive_technologies"));
- 
-@@ -111,19 +111,8 @@
-         }
-         else if (!bHome && sHomeProperty.equals(i->first))
-         {
--           OUString fileURL;
--           if (osl_getFileURLFromSystemPath(i->second.pData,& fileURL.pData) ==
--               osl_File_E_None)
--           {
--               //make sure that the drive letter have all the same case
--               //otherwise file:///c:/jre and file:///C:/jre produce two
--               //different objects!!!
--               if (makeDriveLetterSame( & fileURL))
--               {
--                   m_sHome = fileURL;
--                   bHome = true;
--               }
--           }
-+          m_sHome = i->second;
-+          bHome = true;
-         }
-         else if (!bAccess && sAccessProperty.equals(i->first))
-         {
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i64762 b/editors/openoffice.org-vcltesttool/files/patch-i64762
deleted file mode 100644
index 70b535dd070c..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i64762
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: sal/osl/unx/security.c
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/security.c,v
-retrieving revision 1.18
-diff -u -r1.18 security.c
---- sal/osl/unx/security.c	20 Apr 2006 16:24:05 -0000	1.18
-+++ sal/osl/unx/security.c	25 Apr 2006 21:35:23 -0000
-@@ -57,6 +57,11 @@
- #define PAM_BINARY_MSG 6
- #endif
- 
-+#include <stdint.h> //C99 contains SIZE_MAX
-+#ifndef SIZE_MAX 
-+#define SIZE_MAX (sizeof (size_t) -1)
-+#endif
-+
- extern oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32 nRtldMode);
- extern void* SAL_CALL osl_psz_getSymbol(oslModule hModule, const sal_Char* pszSymbolName);
- static oslSecurityError SAL_CALL 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i65513 b/editors/openoffice.org-vcltesttool/files/patch-i65513
index 146731b44885..ff0735045953 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-i65513
+++ b/editors/openoffice.org-vcltesttool/files/patch-i65513
@@ -80,9 +80,15 @@
     		}
     		elsif ($platform =~ m/netbsd/)
     		{  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
---- solenv/inc/unx.mk	Fri May 19 13:55:04 2006
-+++ solenv/inc/unx.mk	Fri May 19 13:38:42 2006
-@@ -155,10 +155,9 @@
+
+Index: solenv/inc/unx.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/unx.mk,v
+retrieving revision 1.32
+diff -u -r1.32 unx.mk
+--- solenv/inc/unx.mk	3 Feb 2006 17:33:26 -0000	1.32
++++ solenv/inc/unx.mk	27 Jun 2006 01:52:09 -0000
+@@ -155,11 +155,10 @@
  .INCLUDE : unxbsds.mk
  .ENDIF
  
@@ -91,246 +97,28 @@
 +.IF "$(COM)$(OS)" == "GCCFREEBSD"
 +.INCLUDE : unxfbsd.mk
  .ENDIF
--
  
+-
  .IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"
  .INCLUDE : unxirxm3.mk
---- solenv/inc/unxfbsd.mk	Fri May 19 13:13:25 2006
-+++ solenv/inc/unxfbsd.mk	Fri May 19 13:52:02 2006
-@@ -0,0 +1,220 @@
-+#*************************************************************************
-+#
-+#   OpenOffice.org - a multi-platform office productivity suite
-+#
-+#   $RCSfile$
-+#
-+#   $Revision$
-+#
-+#   last change: $Author$ $Date$
-+#
-+#   The Contents of this file are made available subject to
-+#   the terms of GNU Lesser General Public License Version 2.1.
-+#
-+#
-+#     GNU Lesser General Public License Version 2.1
-+#     =============================================
-+#     Copyright 2005 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
-+#
-+#*************************************************************************
-+
-+# Makefile for FreeBSD.
-+
-+ASM=
-+AFLAGS=
-+
-+SOLAR_JAVA*=TRUE
-+JAVAFLAGSDEBUG=-g
-+
-+# Include arch specific makefile.
-+.IF "$(CPUNAME)" == "INTEL"
-+.INCLUDE : unxfbsdi.mk
-+.ENDIF
-+.IF "$(CPUNAME)" == "X86_64"
-+.INCLUDE : unxfbsdx.mk
-+.ENDIF
-+
-+# filter for supressing verbose messages from linker
-+#not needed at the moment
-+#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
-+
-+# _PTHREADS is needed for the stl
-+CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
-+
-+# enable visibility define in "sal/types.h"
-+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+
-+# this is a platform with JAVA support
-+.IF "$(SOLAR_JAVA)"!=""
-+JAVADEF=-DSOLAR_JAVA
-+.IF "$(debug)"==""
-+JAVA_RUNTIME=-ljava
-+.ELSE
-+JAVA_RUNTIME=-ljava_g
-+.ENDIF
-+.ENDIF
-+
-+# name of C++ Compiler
-+CXX*=g++
-+# name of C Compiler
-+CC*=gcc
-+.IF "$(SYSBASE)"!=""
-+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
-+CXX+:=$(CFLAGS_SYSBASE)
-+CC+:=$(CFLAGS_SYSBASE)
-+.ENDIF          # "$(SYSBASE)"!=""
-+CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
-+
-+# flags to enable build with symbols; required for crashdump feature
-+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-+CFLAGSENABLESYMBOLS=-g1
-+.ELSE
-+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-+
-+.ENDIF
-+
-+# flags for the C++ Compiler
-+CFLAGSCC= -pipe $(ARCH_FLAGS)
-+# Flags for enabling exception handling
-+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-+# Flags for disabling exception handling
-+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-+
-+# -fpermissive should be removed as soon as possible
-+CFLAGSCXX= -pipe $(ARCH_FLAGS)
-+CFLAGSCXX+= -Wno-ctor-dtor-privacy
-+PICSWITCH:=-fpic
-+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+CFLAGSCXX += -fvisibility-inlines-hidden
-+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+
-+# Compiler flags for compiling static object in single threaded environment with graphical user interface
-+CFLAGSOBJGUIST=
-+# Compiler flags for compiling static object in single threaded environment with character user interface
-+CFLAGSOBJCUIST=
-+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-+CFLAGSOBJGUIMT=
-+# Compiler flags for compiling static object in multi threaded environment with character user interface
-+CFLAGSOBJCUIMT=
-+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-+CFLAGSSLOGUIMT=$(PICSWITCH)
-+# Compiler flags for compiling shared object in multi threaded environment with character user interface
-+CFLAGSSLOCUIMT=$(PICSWITCH)
-+# Compiler flags for profiling
-+CFLAGSPROF=
-+# Compiler flags for debugging
-+CFLAGSDEBUG=-g
-+CFLAGSDBGUTIL=
-+# Compiler flags for disabling optimizations
-+CFLAGSNOOPT=-O0
-+# Compiler flags for describing the output path
-+CFLAGSOUTOBJ=-o
-+# Enable all warnings
-+CFLAGSWALL=-Wall
-+# Set default warn level
-+CFLAGSDFLTWARN=
-+
-+# switches for dynamic and static linking
-+STATIC		= -Wl,-Bstatic
-+DYNAMIC		= -Wl,-Bdynamic
-+
-+# name of linker
-+LINK*=$(CXX)
-+LINKC*=$(CC)
-+
-+# default linker flags
-+LINKFLAGSDEFS*=#-Wl,-z,defs
-+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
-+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+
-+# linker flags for linking shared libraries
-+LINKFLAGSSHLGUI= -shared
-+LINKFLAGSSHLCUI= -shared
-+
-+LINKFLAGSTACK=
-+LINKFLAGSPROF=
-+LINKFLAGSDEBUG=-g
-+LINKFLAGSOPT=
-+
-+# linker flags for optimization (symbol hashtable)
-+# for now, applied to symbol scoped libraries, only
-+LINKFLAGSOPTIMIZE*=-Wl,-O1
-+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-+
-+SONAME_SWITCH=-Wl,-h
-+
-+# Sequence of libs does matter !
-+
-+STDLIBCPP=-lstdc++
-+
-+# default objectfilenames to link
-+STDOBJVCL=$(L)$/salmain.o
-+STDOBJGUI=
-+STDSLOGUI=
-+STDOBJCUI=
-+STDSLOCUI=
-+
-+# libraries for linking applications
-+STDLIBCUIST=-lm
-+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
-+STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-+STDLIBGUIST=-lX11 -lm
-+# libraries for linking shared libraries
-+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
-+STDSHLCUIMT=$(PTHREAD_LIBS) -lm
-+STDSHLGUIST=-lX11 -lXext -lm
-+STDSHLCUIST=-lm
-+
-+LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-+
-+.IF "$(USE_STLP_DEBUG)" != ""
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
-+.ELSE # "$(USE_STLP_DEBUG)" != ""
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-+.ENDIF # "$(USE_STLP_DEBUG)" != ""
-+
-+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-+
-+# name of library manager
-+LIBMGR=ar
-+LIBFLAGS=-r
-+
-+# tool for generating import libraries
-+IMPLIB=
-+IMPLIBFLAGS=
-+
-+MAPSYM=
-+MAPSYMFLAGS=
-+
-+RC=irc
-+RCFLAGS=-fo$@ $(RCFILES)
-+RCLINK=
-+RCLINKFLAGS=
-+RCSETVERSION=
-+
-+# platform specific identifier for shared libs
-+DLLPRE=lib
-+DLLPOST=.so
---- solenv/inc/unxfbsdi.mk	Tue Jan 31 13:24:38 2006
-+++ solenv/inc/unxfbsdi.mk	Fri May 19 13:52:19 2006
-@@ -33,192 +33,23 @@
+ .ENDIF
+
+
+Index: solenv/inc/unxfbsdi.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
+retrieving revision 1.21
+diff -u -r1.21 unxfbsdi.mk
+--- solenv/inc/unxfbsdi.mk	19 Jun 2006 17:13:50 -0000	1.21
++++ solenv/inc/unxfbsdi.mk	27 Jun 2006 01:52:35 -0000
+@@ -33,196 +33,23 @@
  #
  #*************************************************************************
  
 -# mk file for unxfbsdi
 -ASM=
 -AFLAGS=
-+#
-+# FreBSD/i386 specific defines
-+#
- 
+-
 -SOLAR_JAVA*=TRUE
 -JAVAFLAGSDEBUG=-g
 -
@@ -355,10 +143,15 @@
 -JAVA_RUNTIME=-ljava_g
 -.ENDIF
 -.ENDIF
++#
++# FreBSD/i386 specific defines
++#
++
 +CDEFS+=-DX86
  
  # architecture dependent flags for the C and C++ compiler that can be changed by
  # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
++
  ARCH_FLAGS*=-mtune=pentiumpro
  
 -# name of C++ Compiler
@@ -370,7 +163,7 @@
 -CXX+:=$(CFLAGS_SYSBASE)
 -CC+:=$(CFLAGS_SYSBASE)
 -.ENDIF          # "$(SYSBASE)"!=""
--CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
+-CFLAGS+=-fmessage-length=0 -c $(INCLUDE)
 -
 -# flags to enable build with symbols; required for crashdump feature
 -.IF "$(ENABLE_SYMBOLS)"=="SMALL"
@@ -389,7 +182,6 @@
 -
 -# -fpermissive should be removed as soon as possible
 -CFLAGSCXX= -pipe $(ARCH_FLAGS)
--CFLAGSCXX+= -Wno-ctor-dtor-privacy
 -PICSWITCH:=-fpic
 -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
 -CFLAGSCXX += -fvisibility-inlines-hidden
@@ -415,20 +207,23 @@
  # Compiler flags for enabling optimizations
  .IF "$(PRODUCT)"!=""
  CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
--CFLAGSOPT+=-Wuninitialized				# not supported without optimization
-+CFLAGSOPT+=-Wuninitialized			# not supported without optimization
  .ELSE 	# "$(PRODUCT)"!=""
--CFLAGSOPT=   							# no optimizing for non products
-+CFLAGSOPT=   					# no optimizing for non products
+ CFLAGSOPT=   							# no optimizing for non products
  .ENDIF	# "$(PRODUCT)"!=""
 -# Compiler flags for disabling optimizations
 -CFLAGSNOOPT=-O0
 -# Compiler flags for describing the output path
 -CFLAGSOUTOBJ=-o
--# Enable all warnings
--CFLAGSWALL=-Wall
--# Set default warn level
--CFLAGSDFLTWARN=
+-
+-CFLAGSWARNCC=-Wreturn-type
+-.IF "$(PRODUCT)"!=""
+-CFLAGSWARNCC+=-Wuninitialized # not supported without optimization
+-.ENDIF
+-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
+-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
+-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
+-CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
+-CFLAGSWERRCC=-Werror
 -
 -# switches for dynamic and static linking
 -STATIC		= -Wl,-Bstatic
@@ -514,14 +309,15 @@
 -RCLINKFLAGS=
 -RCSETVERSION=
  
- # platform specific identifier for shared libs
+-# platform specific identifier for shared libs
  DLLPOSTFIX=fi
 -DLLPRE=lib
 -DLLPOST=.so
--
---- solenv/inc/unxfbsdx.mk	Fri May 19 13:13:25 2006
-+++ solenv/inc/unxfbsdx.mk	Fri May 19 13:52:38 2006
-@@ -0,0 +1,57 @@
+ 
+
+--- /dev/null	Wed Jun 28 21:44:00 2006
++++ solenv/inc/unxfbsdx.mk	Wed Jun 28 21:38:06 2006
+@@ -0,0 +1,56 @@
 +#*************************************************************************
 +#
 +#   OpenOffice.org - a multi-platform office productivity suite
@@ -572,10 +368,251 @@
 +# Compiler flags for enabling optimizations
 +.IF "$(PRODUCT)"!=""
 +CFLAGSOPT=-O2 -fno-strict-aliasing		# optimizing for products
-+CFLAGSOPT+=-Wuninitialized			# not supported without optimization
 +.ELSE 	# "$(PRODUCT)"!=""
 +CFLAGSOPT=   					# no optimizing for non products
 +.ENDIF	# "$(PRODUCT)"!=""
 +
 +# platform specific identifier for shared libs
 +DLLPOSTFIX=fx
+
+--- /dev/null	Wed Jun 28 21:44:00 2006
++++ solenv/inc/unxfbsd.mk	Wed Jun 28 21:50:16 2006
+@@ -0,0 +1,238 @@
++#*************************************************************************
++#
++#   OpenOffice.org - a multi-platform office productivity suite
++#
++#   $RCSfile$
++#
++#   $Revision$
++#
++#   last change: $Author$ $Date$
++#
++#   The Contents of this file are made available subject to
++#   the terms of GNU Lesser General Public License Version 2.1.
++#
++#
++#     GNU Lesser General Public License Version 2.1
++#     =============================================
++#     Copyright 2005 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
++#
++#*************************************************************************
++
++# Makefile for FreeBSD.
++
++ASM=
++AFLAGS=
++
++SOLAR_JAVA*=
++JAVAFLAGSDEBUG=-g
++
++# Include arch specific makefile.
++.IF "$(CPUNAME)" == "INTEL"
++.INCLUDE : unxfbsdi.mk
++.ENDIF
++.IF "$(CPUNAME)" == "X86_64"
++.INCLUDE : unxfbsdx.mk
++.ENDIF
++
++# filter for supressing verbose messages from linker
++#not needed at the moment
++#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
++
++# _PTHREADS is needed for the stl
++CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
++
++# enable visibility define in "sal/types.h"
++.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
++.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++
++# this is a platform with JAVA support
++.IF "$(SOLAR_JAVA)"!=""
++JAVADEF=-DSOLAR_JAVA
++.IF "$(debug)"==""
++JAVA_RUNTIME=-ljava
++.ELSE
++JAVA_RUNTIME=-ljava_g
++.ENDIF
++.ENDIF
++
++# architecture dependent flags for the C and C++ compiler that can be changed by
++# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
++ARCH_FLAGS*=-mtune=pentiumpro
++
++# name of C++ Compiler
++CXX*=g++
++# name of C Compiler
++CC*=gcc
++.IF "$(SYSBASE)"!=""
++CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
++CXX+:=$(CFLAGS_SYSBASE)
++CC+:=$(CFLAGS_SYSBASE)
++.ENDIF          # "$(SYSBASE)"!=""
++CFLAGS+=-fmessage-length=0 -c $(INCLUDE)
++
++# flags to enable build with symbols; required for crashdump feature
++.IF "$(ENABLE_SYMBOLS)"=="SMALL"
++CFLAGSENABLESYMBOLS=-g1
++.ELSE
++CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
++
++.ENDIF
++
++# flags for the C++ Compiler
++CFLAGSCC= -pipe $(ARCH_FLAGS)
++# Flags for enabling exception handling
++CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
++# Flags for disabling exception handling
++CFLAGS_NO_EXCEPTIONS=-fno-exceptions
++
++# -fpermissive should be removed as soon as possible
++CFLAGSCXX= -pipe $(ARCH_FLAGS)
++PICSWITCH:=-fpic
++.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++CFLAGSCXX += -fvisibility-inlines-hidden
++.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++
++# Compiler flags for compiling static object in single threaded environment with graphical user interface
++CFLAGSOBJGUIST=
++# Compiler flags for compiling static object in single threaded environment with character user interface
++CFLAGSOBJCUIST=
++# Compiler flags for compiling static object in multi threaded environment with graphical user interface
++CFLAGSOBJGUIMT=
++# Compiler flags for compiling static object in multi threaded environment with character user interface
++CFLAGSOBJCUIMT=
++# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
++CFLAGSSLOGUIMT=$(PICSWITCH)
++# Compiler flags for compiling shared object in multi threaded environment with character user interface
++CFLAGSSLOCUIMT=$(PICSWITCH)
++# Compiler flags for profiling
++CFLAGSPROF=
++# Compiler flags for debugging
++CFLAGSDEBUG=-g
++CFLAGSDBGUTIL=
++# Compiler flags for enabling optimizations
++.IF "$(PRODUCT)"!=""
++CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
++.ELSE 	# "$(PRODUCT)"!=""
++CFLAGSOPT=   							# no optimizing for non products
++.ENDIF	# "$(PRODUCT)"!=""
++# Compiler flags for disabling optimizations
++CFLAGSNOOPT=-O0
++# Compiler flags for describing the output path
++CFLAGSOUTOBJ=-o
++
++# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
++CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
++CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
++    -Wno-non-virtual-dtor
++CFLAGSWALLCC=$(CFLAGSWARNCC)
++CFLAGSWALLCXX=$(CFLAGSWARNCXX)
++CFLAGSWERRCC=-Werror
++
++# Once all modules on this platform compile without warnings, set
++# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
++# settings.mk): Currently this is not tested on FreeBSD
++#MODULES_WITH_WARNINGS :=
++
++# switches for dynamic and static linking
++STATIC		= -Wl,-Bstatic
++DYNAMIC		= -Wl,-Bdynamic
++
++# name of linker
++LINK*=$(CXX)
++LINKC*=$(CC)
++
++# default linker flags
++LINKFLAGSDEFS*=#-Wl,-z,defs
++LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
++LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
++
++# linker flags for linking applications
++LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++
++# linker flags for linking shared libraries
++LINKFLAGSSHLGUI= -shared
++LINKFLAGSSHLCUI= -shared
++
++LINKFLAGSTACK=
++LINKFLAGSPROF=
++LINKFLAGSDEBUG=-g
++LINKFLAGSOPT=
++
++# linker flags for optimization (symbol hashtable)
++# for now, applied to symbol scoped libraries, only
++LINKFLAGSOPTIMIZE*=-Wl,-O1
++LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
++
++SONAME_SWITCH=-Wl,-h
++
++# Sequence of libs does matter !
++
++STDLIBCPP=-lstdc++
++
++# default objectfilenames to link
++STDOBJVCL=$(L)$/salmain.o
++STDOBJGUI=
++STDSLOGUI=
++STDOBJCUI=
++STDSLOCUI=
++
++# libraries for linking applications
++STDLIBCUIST=-lm
++STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
++STDLIBCUIMT=$(PTHREAD_LIBS) -lm
++STDLIBGUIST=-lX11 -lm
++# libraries for linking shared libraries
++STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
++STDSHLCUIMT=$(PTHREAD_LIBS) -lm
++STDSHLGUIST=-lX11 -lXext -lm
++STDSHLCUIST=-lm
++
++LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
++
++.IF "$(USE_STLP_DEBUG)" != ""
++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
++LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
++.ELSE # "$(USE_STLP_DEBUG)" != ""
++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
++LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
++.ENDIF # "$(USE_STLP_DEBUG)" != ""
++
++#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
++
++# name of library manager
++LIBMGR=ar
++LIBFLAGS=-r
++
++# tool for generating import libraries
++IMPLIB=
++IMPLIBFLAGS=
++
++MAPSYM=
++MAPSYMFLAGS=
++
++RC=irc
++RCFLAGS=-fo$@ $(RCFILES)
++RCLINK=
++RCLINKFLAGS=
++RCSETVERSION=
++
++# platform specific identifier for shared libs
++DLLPRE=lib
++DLLPOST=.so
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i66667 b/editors/openoffice.org-vcltesttool/files/patch-i66667
index 6e3a697c4bf0..26c0b1b4a88c 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-i66667
+++ b/editors/openoffice.org-vcltesttool/files/patch-i66667
@@ -1,10 +1,10 @@
-Index: gtkinst.cxx
+Index: vcl/unx/gtk/app/gtkinst.cxx
 ===================================================================
 RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
-retrieving revision 1.13
-diff -u -r1.13 gtkinst.cxx
---- vcl/unx/gtk/app/gtkinst.cxx	11 May 2006 13:32:35 -0000	1.13
-+++ vcl/unx/gtk/app/gtkinst.cxx	16 Jun 2006 20:48:58 -0000
+retrieving revision 1.14
+diff -u -r1.14 gtkinst.cxx
+--- vcl/unx/gtk/app/gtkinst.cxx	19 Jun 2006 19:44:33 -0000	1.14
++++ vcl/unx/gtk/app/gtkinst.cxx	27 Jun 2006 02:11:09 -0000
 @@ -43,6 +43,7 @@
  #include <plugins/gtk/atkbridge.hxx>
  
@@ -13,7 +13,7 @@ diff -u -r1.13 gtkinst.cxx
  
  #if OSL_DEBUG_LEVEL > 1
  #include <stdio.h>
-@@ -111,13 +112,28 @@
+@@ -111,13 +112,27 @@
  		GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
  		pYieldMutex->ThreadsLeave();
  	}
@@ -38,14 +38,13 @@ diff -u -r1.13 gtkinst.cxx
 +#endif
 +			return false;
 +		}
-+
  		GdkLockFn gdk_threads_set_lock_functions =
--				(GdkLockFn) osl_getSymbol( pModule, aSymbolName.pData );
+-				(GdkLockFn) osl_getFunctionSymbol( pModule, aSymbolName.pData );
 +				(GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
  		if ( !gdk_threads_set_lock_functions )
  		{
  #if OSL_DEBUG_LEVEL > 1
-@@ -150,7 +166,7 @@
+@@ -150,7 +165,7 @@
  		if ( !g_thread_supported() )
  			g_thread_init( NULL );