Update to SRC680_m168

30 files changed, 115 insertions, 615 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 51140f2432b7..28150364a0b7 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -15,14 +15,16 @@ MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+#DISTFILES+=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+DISTFILES+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+#EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+EXTRACT_ONLY+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@@ -42,7 +44,7 @@ USE_KDELIBS_VER=        3
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_BZIP2=	yes
+#USE_BZIP2=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
@@ -63,9 +65,9 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE?=		164
+MILESTONE?=		168
 OOOTAG?=		SRC680_m${MILESTONE}
-SNAPDATE=		20060424
+SNAPDATE=		20060510
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
@@ -134,7 +136,7 @@ LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
-WRKSRC?=		${WRKDIR}
+WRKSRC?=		${WRKDIR}/SRC680_m${MILESTONE}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -246,7 +248,6 @@ post-install:
 	@ln -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
 			${PREFIX}/share/applnk/${EXECBASE}
 	@${PRINTF} "share/applnk/${EXECBASE}\n" >> ${TMPPLIST}
-.endif
 	@for dir in `ls ${ICONS}/hicolor | grep -v CVS`; do \
 		for app in base calc draw impress math printeradmin writer; do \
 			if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
@@ -261,6 +262,7 @@ post-install:
 			${PRINTF} "share/icons/hiclor/$${dir}/mimetypes/$${file}\n" >> ${TMPPLIST} ; \
 		done ; \
 	done
+.endif
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index ae2a452e38bb..e8019545437f 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m164_source.tar.bz2) = 413e6f1f019b3ee47bb58773449bca14
-SHA256 (openoffice.org2.0/OOo_SRC680_m164_source.tar.bz2) = 7857f426da4906165250b5e817a143bd4885f6843bf4ee7cdfd73f7fdf093735
-SIZE (openoffice.org2.0/OOo_SRC680_m164_source.tar.bz2) = 241804836
+MD5 (openoffice.org2.0/OOo_2.0.168_src.tar.gz) = 165fea2a9a0aa4b70302284b01fc9508
+SHA256 (openoffice.org2.0/OOo_2.0.168_src.tar.gz) = 91ff9ae9632e21d7af57d9d72a364f378fa8c6fe18867836a728349b62485dba
+SIZE (openoffice.org2.0/OOo_2.0.168_src.tar.gz) = 300659301
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice-3-devel/files/patch-i63069 b/editors/openoffice-3-devel/files/patch-i63069
deleted file mode 100644
index 04b5ee7c717d..000000000000
--- a/editors/openoffice-3-devel/files/patch-i63069
+++ /dev/null
@@ -1,81 +0,0 @@
-cws freebsd06
-Index: stlport/STLport-4.5.patch
-===================================================================
-RCS file: /cvs/external/stlport/STLport-4.5.patch,v
-retrieving revision 1.26
-diff -u -r1.26 STLport-4.5.patch
---- stlport/STLport-4.5.patch	7 Mar 2006 17:11:51 -0000	1.26
-+++ stlport/STLport-4.5.patch	11 Mar 2006 05:16:19 -0000
-@@ -120,16 +120,16 @@
- ***************
- *** 1 ****
- ! dummy
----- 1,59 ----
-+--- 1,69 ----
- ! #
- ! # Note : this makefile is for gcc-3 !
- ! #
- ! 
- ! #
- ! # compiler
--! #
--! CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
--! CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-+! # take these from the OOo build environment
-+! CC*= gcc 
-+! CXX*= g++
- ! 
- ! #
- ! # Basename for libraries
-@@ -141,7 +141,7 @@
- ! #
- ! #
- ! LINK=ar cr
--! DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
-+! DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} --fexceptions -shared -o
- ! 
- ! OBJEXT=o
- ! DYNEXT=so
-@@ -149,26 +149,36 @@
- ! RM=rm -rf
- ! PATH_SEP=/
- ! MKDIR=mkdir -p
--! COMP=GCC-FREEBSD
-+! COMP=GCC$(ARCH)
- ! INSTALL_STEP = install_unix 
- ! 
- ! all:  all_dynamic all_static symbolic_links 
- ! 
- ! include common_macros.mak
- ! 
--! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-+! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized
- ! 
--! CXXFLAGS_COMMON = -I${STLPORT_DIR} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+! CXXFLAGS_COMMON =  -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -ftemplate-depth-32 -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+! CFLAGS_COMMON =  -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
- ! 
--! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
--! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-+! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC
-+! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
- ! 
--! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
- ! CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
- ! 
- ! CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
- ! CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
- ! 
-+! CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC
-+! CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC
-+! 
-+! CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC
-+! CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC
-+! 
-+! CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_STLP_DEBUG
-+! CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-+! 
- ! include common_percent_rules.mak
- ! include common_rules.mak
- ! 
diff --git a/editors/openoffice-3-devel/files/patch-i64412 b/editors/openoffice-3-devel/files/patch-i64412
deleted file mode 100644
index 8fbac02ef0e0..000000000000
--- a/editors/openoffice-3-devel/files/patch-i64412
+++ /dev/null
@@ -1,16 +0,0 @@
-cws freebsd06
-Index: config_office/set_soenv.in
-===================================================================
-RCS file: /cvs/tools/config_office/set_soenv.in,v
-retrieving revision 1.97
-diff -u -r1.97 set_soenv.in
---- config_office/set_soenv.in	7 Apr 2006 08:02:29 -0000	1.97
-+++ config_office/set_soenv.in	14 Apr 2006 21:35:53 -0000
-@@ -342,6 +342,7 @@
-       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
-       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
-       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
-+      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
-       if( @GCCVER@ >= 30401 ) {
-       	 $CVER        = "C341";
-       }
diff --git a/editors/openoffice-3-devel/files/patch-i64526 b/editors/openoffice-3-devel/files/patch-i64526
deleted file mode 100644
index 3734fb70a5cf..000000000000
--- a/editors/openoffice-3-devel/files/patch-i64526
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: sd/source/ui/inc/SdUnoDrawView.hxx
-===================================================================
-RCS file: /cvs/graphics/sd/source/ui/inc/SdUnoDrawView.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 SdUnoDrawView.hxx
---- sd/source/ui/inc/SdUnoDrawView.hxx	21 Mar 2006 17:25:19 -0000	1.13
-+++ sd/source/ui/inc/SdUnoDrawView.hxx	19 Apr 2006 20:34:07 -0000
-@@ -138,7 +138,7 @@
-     DrawViewShell& mrDrawViewShell;
-     sd::View& mrView;
- 
--    SdXImpressDocument* SdUnoDrawView::GetModel (void) const throw();
-+    SdXImpressDocument* GetModel (void) const throw();
- };
- 
- } // end of namespace sd
diff --git a/editors/openoffice-3-devel/files/patch-i64906 b/editors/openoffice-3-devel/files/patch-i64906
new file mode 100644
index 000000000000..fec74c8029ac
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i64906
@@ -0,0 +1,11 @@
+--- sal/osl/unx/security.c~	Wed May 10 20:57:40 2006
++++ sal/osl/unx/security.c	Wed May 10 22:35:43 2006
+@@ -73,7 +73,7 @@
+ static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax);
+ 
+ static oslSecurityImpl * newSecurityImpl(size_t * bufSize) {
+-#ifdef MACOSX
++#if defined (MACOSX) || defined (FREEBSD)
+     /* #i64906#: sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on Mac OS X */
+     size_t n = 1024;
+ #else
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 51140f2432b7..28150364a0b7 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -15,14 +15,16 @@ MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+#DISTFILES+=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+DISTFILES+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+#EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+EXTRACT_ONLY+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@@ -42,7 +44,7 @@ USE_KDELIBS_VER=        3
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_BZIP2=	yes
+#USE_BZIP2=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
@@ -63,9 +65,9 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE?=		164
+MILESTONE?=		168
 OOOTAG?=		SRC680_m${MILESTONE}
-SNAPDATE=		20060424
+SNAPDATE=		20060510
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
@@ -134,7 +136,7 @@ LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
-WRKSRC?=		${WRKDIR}
+WRKSRC?=		${WRKDIR}/SRC680_m${MILESTONE}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -246,7 +248,6 @@ post-install:
 	@ln -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
 			${PREFIX}/share/applnk/${EXECBASE}
 	@${PRINTF} "share/applnk/${EXECBASE}\n" >> ${TMPPLIST}
-.endif
 	@for dir in `ls ${ICONS}/hicolor | grep -v CVS`; do \
 		for app in base calc draw impress math printeradmin writer; do \
 			if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
@@ -261,6 +262,7 @@ post-install:
 			${PRINTF} "share/icons/hiclor/$${dir}/mimetypes/$${file}\n" >> ${TMPPLIST} ; \
 		done ; \
 	done
+.endif
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index ae2a452e38bb..e8019545437f 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m164_source.tar.bz2) = 413e6f1f019b3ee47bb58773449bca14
-SHA256 (openoffice.org2.0/OOo_SRC680_m164_source.tar.bz2) = 7857f426da4906165250b5e817a143bd4885f6843bf4ee7cdfd73f7fdf093735
-SIZE (openoffice.org2.0/OOo_SRC680_m164_source.tar.bz2) = 241804836
+MD5 (openoffice.org2.0/OOo_2.0.168_src.tar.gz) = 165fea2a9a0aa4b70302284b01fc9508
+SHA256 (openoffice.org2.0/OOo_2.0.168_src.tar.gz) = 91ff9ae9632e21d7af57d9d72a364f378fa8c6fe18867836a728349b62485dba
+SIZE (openoffice.org2.0/OOo_2.0.168_src.tar.gz) = 300659301
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-2-devel/files/patch-i63069 b/editors/openoffice.org-2-devel/files/patch-i63069
deleted file mode 100644
index 04b5ee7c717d..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i63069
+++ /dev/null
@@ -1,81 +0,0 @@
-cws freebsd06
-Index: stlport/STLport-4.5.patch
-===================================================================
-RCS file: /cvs/external/stlport/STLport-4.5.patch,v
-retrieving revision 1.26
-diff -u -r1.26 STLport-4.5.patch
---- stlport/STLport-4.5.patch	7 Mar 2006 17:11:51 -0000	1.26
-+++ stlport/STLport-4.5.patch	11 Mar 2006 05:16:19 -0000
-@@ -120,16 +120,16 @@
- ***************
- *** 1 ****
- ! dummy
----- 1,59 ----
-+--- 1,69 ----
- ! #
- ! # Note : this makefile is for gcc-3 !
- ! #
- ! 
- ! #
- ! # compiler
--! #
--! CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
--! CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-+! # take these from the OOo build environment
-+! CC*= gcc 
-+! CXX*= g++
- ! 
- ! #
- ! # Basename for libraries
-@@ -141,7 +141,7 @@
- ! #
- ! #
- ! LINK=ar cr
--! DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
-+! DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} --fexceptions -shared -o
- ! 
- ! OBJEXT=o
- ! DYNEXT=so
-@@ -149,26 +149,36 @@
- ! RM=rm -rf
- ! PATH_SEP=/
- ! MKDIR=mkdir -p
--! COMP=GCC-FREEBSD
-+! COMP=GCC$(ARCH)
- ! INSTALL_STEP = install_unix 
- ! 
- ! all:  all_dynamic all_static symbolic_links 
- ! 
- ! include common_macros.mak
- ! 
--! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-+! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized
- ! 
--! CXXFLAGS_COMMON = -I${STLPORT_DIR} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+! CXXFLAGS_COMMON =  -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -ftemplate-depth-32 -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+! CFLAGS_COMMON =  -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
- ! 
--! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
--! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-+! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC
-+! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
- ! 
--! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
- ! CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
- ! 
- ! CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
- ! CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
- ! 
-+! CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC
-+! CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC
-+! 
-+! CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC
-+! CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC
-+! 
-+! CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_STLP_DEBUG
-+! CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-+! 
- ! include common_percent_rules.mak
- ! include common_rules.mak
- ! 
diff --git a/editors/openoffice.org-2-devel/files/patch-i64412 b/editors/openoffice.org-2-devel/files/patch-i64412
deleted file mode 100644
index 8fbac02ef0e0..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i64412
+++ /dev/null
@@ -1,16 +0,0 @@
-cws freebsd06
-Index: config_office/set_soenv.in
-===================================================================
-RCS file: /cvs/tools/config_office/set_soenv.in,v
-retrieving revision 1.97
-diff -u -r1.97 set_soenv.in
---- config_office/set_soenv.in	7 Apr 2006 08:02:29 -0000	1.97
-+++ config_office/set_soenv.in	14 Apr 2006 21:35:53 -0000
-@@ -342,6 +342,7 @@
-       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
-       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
-       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
-+      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
-       if( @GCCVER@ >= 30401 ) {
-       	 $CVER        = "C341";
-       }
diff --git a/editors/openoffice.org-2-devel/files/patch-i64526 b/editors/openoffice.org-2-devel/files/patch-i64526
deleted file mode 100644
index 3734fb70a5cf..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i64526
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: sd/source/ui/inc/SdUnoDrawView.hxx
-===================================================================
-RCS file: /cvs/graphics/sd/source/ui/inc/SdUnoDrawView.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 SdUnoDrawView.hxx
---- sd/source/ui/inc/SdUnoDrawView.hxx	21 Mar 2006 17:25:19 -0000	1.13
-+++ sd/source/ui/inc/SdUnoDrawView.hxx	19 Apr 2006 20:34:07 -0000
-@@ -138,7 +138,7 @@
-     DrawViewShell& mrDrawViewShell;
-     sd::View& mrView;
- 
--    SdXImpressDocument* SdUnoDrawView::GetModel (void) const throw();
-+    SdXImpressDocument* GetModel (void) const throw();
- };
- 
- } // end of namespace sd
diff --git a/editors/openoffice.org-2-devel/files/patch-i64906 b/editors/openoffice.org-2-devel/files/patch-i64906
new file mode 100644
index 000000000000..fec74c8029ac
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-i64906
@@ -0,0 +1,11 @@
+--- sal/osl/unx/security.c~	Wed May 10 20:57:40 2006
++++ sal/osl/unx/security.c	Wed May 10 22:35:43 2006
+@@ -73,7 +73,7 @@
+ static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax);
+ 
+ static oslSecurityImpl * newSecurityImpl(size_t * bufSize) {
+-#ifdef MACOSX
++#if defined (MACOSX) || defined (FREEBSD)
+     /* #i64906#: sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on Mac OS X */
+     size_t n = 1024;
+ #else
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 51140f2432b7..28150364a0b7 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -15,14 +15,16 @@ MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+#DISTFILES+=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+DISTFILES+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+#EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+EXTRACT_ONLY+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@@ -42,7 +44,7 @@ USE_KDELIBS_VER=        3
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_BZIP2=	yes
+#USE_BZIP2=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
@@ -63,9 +65,9 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE?=		164
+MILESTONE?=		168
 OOOTAG?=		SRC680_m${MILESTONE}
-SNAPDATE=		20060424
+SNAPDATE=		20060510
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
@@ -134,7 +136,7 @@ LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
-WRKSRC?=		${WRKDIR}
+WRKSRC?=		${WRKDIR}/SRC680_m${MILESTONE}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -246,7 +248,6 @@ post-install:
 	@ln -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
 			${PREFIX}/share/applnk/${EXECBASE}
 	@${PRINTF} "share/applnk/${EXECBASE}\n" >> ${TMPPLIST}
-.endif
 	@for dir in `ls ${ICONS}/hicolor | grep -v CVS`; do \
 		for app in base calc draw impress math printeradmin writer; do \
 			if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
@@ -261,6 +262,7 @@ post-install:
 			${PRINTF} "share/icons/hiclor/$${dir}/mimetypes/$${file}\n" >> ${TMPPLIST} ; \
 		done ; \
 	done
+.endif
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index ae2a452e38bb..e8019545437f 100644
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ b/editors/openoffice.org-2.0-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m164_source.tar.bz2) = 413e6f1f019b3ee47bb58773449bca14
-SHA256 (openoffice.org2.0/OOo_SRC680_m164_source.tar.bz2) = 7857f426da4906165250b5e817a143bd4885f6843bf4ee7cdfd73f7fdf093735
-SIZE (openoffice.org2.0/OOo_SRC680_m164_source.tar.bz2) = 241804836
+MD5 (openoffice.org2.0/OOo_2.0.168_src.tar.gz) = 165fea2a9a0aa4b70302284b01fc9508
+SHA256 (openoffice.org2.0/OOo_2.0.168_src.tar.gz) = 91ff9ae9632e21d7af57d9d72a364f378fa8c6fe18867836a728349b62485dba
+SIZE (openoffice.org2.0/OOo_2.0.168_src.tar.gz) = 300659301
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i63069 b/editors/openoffice.org-2.0-devel/files/patch-i63069
deleted file mode 100644
index 04b5ee7c717d..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-i63069
+++ /dev/null
@@ -1,81 +0,0 @@
-cws freebsd06
-Index: stlport/STLport-4.5.patch
-===================================================================
-RCS file: /cvs/external/stlport/STLport-4.5.patch,v
-retrieving revision 1.26
-diff -u -r1.26 STLport-4.5.patch
---- stlport/STLport-4.5.patch	7 Mar 2006 17:11:51 -0000	1.26
-+++ stlport/STLport-4.5.patch	11 Mar 2006 05:16:19 -0000
-@@ -120,16 +120,16 @@
- ***************
- *** 1 ****
- ! dummy
----- 1,59 ----
-+--- 1,69 ----
- ! #
- ! # Note : this makefile is for gcc-3 !
- ! #
- ! 
- ! #
- ! # compiler
--! #
--! CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
--! CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-+! # take these from the OOo build environment
-+! CC*= gcc 
-+! CXX*= g++
- ! 
- ! #
- ! # Basename for libraries
-@@ -141,7 +141,7 @@
- ! #
- ! #
- ! LINK=ar cr
--! DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
-+! DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} --fexceptions -shared -o
- ! 
- ! OBJEXT=o
- ! DYNEXT=so
-@@ -149,26 +149,36 @@
- ! RM=rm -rf
- ! PATH_SEP=/
- ! MKDIR=mkdir -p
--! COMP=GCC-FREEBSD
-+! COMP=GCC$(ARCH)
- ! INSTALL_STEP = install_unix 
- ! 
- ! all:  all_dynamic all_static symbolic_links 
- ! 
- ! include common_macros.mak
- ! 
--! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-+! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized
- ! 
--! CXXFLAGS_COMMON = -I${STLPORT_DIR} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+! CXXFLAGS_COMMON =  -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -ftemplate-depth-32 -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+! CFLAGS_COMMON =  -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
- ! 
--! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
--! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-+! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC
-+! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
- ! 
--! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
- ! CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
- ! 
- ! CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
- ! CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
- ! 
-+! CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC
-+! CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC
-+! 
-+! CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC
-+! CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC
-+! 
-+! CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_STLP_DEBUG
-+! CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-+! 
- ! include common_percent_rules.mak
- ! include common_rules.mak
- ! 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i64412 b/editors/openoffice.org-2.0-devel/files/patch-i64412
deleted file mode 100644
index 8fbac02ef0e0..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-i64412
+++ /dev/null
@@ -1,16 +0,0 @@
-cws freebsd06
-Index: config_office/set_soenv.in
-===================================================================
-RCS file: /cvs/tools/config_office/set_soenv.in,v
-retrieving revision 1.97
-diff -u -r1.97 set_soenv.in
---- config_office/set_soenv.in	7 Apr 2006 08:02:29 -0000	1.97
-+++ config_office/set_soenv.in	14 Apr 2006 21:35:53 -0000
-@@ -342,6 +342,7 @@
-       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
-       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
-       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
-+      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
-       if( @GCCVER@ >= 30401 ) {
-       	 $CVER        = "C341";
-       }
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i64526 b/editors/openoffice.org-2.0-devel/files/patch-i64526
deleted file mode 100644
index 3734fb70a5cf..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-i64526
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: sd/source/ui/inc/SdUnoDrawView.hxx
-===================================================================
-RCS file: /cvs/graphics/sd/source/ui/inc/SdUnoDrawView.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 SdUnoDrawView.hxx
---- sd/source/ui/inc/SdUnoDrawView.hxx	21 Mar 2006 17:25:19 -0000	1.13
-+++ sd/source/ui/inc/SdUnoDrawView.hxx	19 Apr 2006 20:34:07 -0000
-@@ -138,7 +138,7 @@
-     DrawViewShell& mrDrawViewShell;
-     sd::View& mrView;
- 
--    SdXImpressDocument* SdUnoDrawView::GetModel (void) const throw();
-+    SdXImpressDocument* GetModel (void) const throw();
- };
- 
- } // end of namespace sd
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i64906 b/editors/openoffice.org-2.0-devel/files/patch-i64906
new file mode 100644
index 000000000000..fec74c8029ac
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-i64906
@@ -0,0 +1,11 @@
+--- sal/osl/unx/security.c~	Wed May 10 20:57:40 2006
++++ sal/osl/unx/security.c	Wed May 10 22:35:43 2006
+@@ -73,7 +73,7 @@
+ static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax);
+ 
+ static oslSecurityImpl * newSecurityImpl(size_t * bufSize) {
+-#ifdef MACOSX
++#if defined (MACOSX) || defined (FREEBSD)
+     /* #i64906#: sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on Mac OS X */
+     size_t n = 1024;
+ #else
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 51140f2432b7..28150364a0b7 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -15,14 +15,16 @@ MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+#DISTFILES+=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+DISTFILES+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+#EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+EXTRACT_ONLY+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@@ -42,7 +44,7 @@ USE_KDELIBS_VER=        3
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_BZIP2=	yes
+#USE_BZIP2=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
@@ -63,9 +65,9 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE?=		164
+MILESTONE?=		168
 OOOTAG?=		SRC680_m${MILESTONE}
-SNAPDATE=		20060424
+SNAPDATE=		20060510
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
@@ -134,7 +136,7 @@ LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
-WRKSRC?=		${WRKDIR}
+WRKSRC?=		${WRKDIR}/SRC680_m${MILESTONE}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -246,7 +248,6 @@ post-install:
 	@ln -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
 			${PREFIX}/share/applnk/${EXECBASE}
 	@${PRINTF} "share/applnk/${EXECBASE}\n" >> ${TMPPLIST}
-.endif
 	@for dir in `ls ${ICONS}/hicolor | grep -v CVS`; do \
 		for app in base calc draw impress math printeradmin writer; do \
 			if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
@@ -261,6 +262,7 @@ post-install:
 			${PRINTF} "share/icons/hiclor/$${dir}/mimetypes/$${file}\n" >> ${TMPPLIST} ; \
 		done ; \
 	done
+.endif
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index ae2a452e38bb..e8019545437f 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m164_source.tar.bz2) = 413e6f1f019b3ee47bb58773449bca14
-SHA256 (openoffice.org2.0/OOo_SRC680_m164_source.tar.bz2) = 7857f426da4906165250b5e817a143bd4885f6843bf4ee7cdfd73f7fdf093735
-SIZE (openoffice.org2.0/OOo_SRC680_m164_source.tar.bz2) = 241804836
+MD5 (openoffice.org2.0/OOo_2.0.168_src.tar.gz) = 165fea2a9a0aa4b70302284b01fc9508
+SHA256 (openoffice.org2.0/OOo_2.0.168_src.tar.gz) = 91ff9ae9632e21d7af57d9d72a364f378fa8c6fe18867836a728349b62485dba
+SIZE (openoffice.org2.0/OOo_2.0.168_src.tar.gz) = 300659301
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-3-devel/files/patch-i63069 b/editors/openoffice.org-3-devel/files/patch-i63069
deleted file mode 100644
index 04b5ee7c717d..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i63069
+++ /dev/null
@@ -1,81 +0,0 @@
-cws freebsd06
-Index: stlport/STLport-4.5.patch
-===================================================================
-RCS file: /cvs/external/stlport/STLport-4.5.patch,v
-retrieving revision 1.26
-diff -u -r1.26 STLport-4.5.patch
---- stlport/STLport-4.5.patch	7 Mar 2006 17:11:51 -0000	1.26
-+++ stlport/STLport-4.5.patch	11 Mar 2006 05:16:19 -0000
-@@ -120,16 +120,16 @@
- ***************
- *** 1 ****
- ! dummy
----- 1,59 ----
-+--- 1,69 ----
- ! #
- ! # Note : this makefile is for gcc-3 !
- ! #
- ! 
- ! #
- ! # compiler
--! #
--! CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
--! CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-+! # take these from the OOo build environment
-+! CC*= gcc 
-+! CXX*= g++
- ! 
- ! #
- ! # Basename for libraries
-@@ -141,7 +141,7 @@
- ! #
- ! #
- ! LINK=ar cr
--! DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
-+! DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} --fexceptions -shared -o
- ! 
- ! OBJEXT=o
- ! DYNEXT=so
-@@ -149,26 +149,36 @@
- ! RM=rm -rf
- ! PATH_SEP=/
- ! MKDIR=mkdir -p
--! COMP=GCC-FREEBSD
-+! COMP=GCC$(ARCH)
- ! INSTALL_STEP = install_unix 
- ! 
- ! all:  all_dynamic all_static symbolic_links 
- ! 
- ! include common_macros.mak
- ! 
--! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-+! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized
- ! 
--! CXXFLAGS_COMMON = -I${STLPORT_DIR} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+! CXXFLAGS_COMMON =  -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -ftemplate-depth-32 -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+! CFLAGS_COMMON =  -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
- ! 
--! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
--! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-+! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC
-+! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
- ! 
--! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
- ! CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
- ! 
- ! CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
- ! CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
- ! 
-+! CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC
-+! CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC
-+! 
-+! CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC
-+! CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC
-+! 
-+! CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_STLP_DEBUG
-+! CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-+! 
- ! include common_percent_rules.mak
- ! include common_rules.mak
- ! 
diff --git a/editors/openoffice.org-3-devel/files/patch-i64412 b/editors/openoffice.org-3-devel/files/patch-i64412
deleted file mode 100644
index 8fbac02ef0e0..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i64412
+++ /dev/null
@@ -1,16 +0,0 @@
-cws freebsd06
-Index: config_office/set_soenv.in
-===================================================================
-RCS file: /cvs/tools/config_office/set_soenv.in,v
-retrieving revision 1.97
-diff -u -r1.97 set_soenv.in
---- config_office/set_soenv.in	7 Apr 2006 08:02:29 -0000	1.97
-+++ config_office/set_soenv.in	14 Apr 2006 21:35:53 -0000
-@@ -342,6 +342,7 @@
-       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
-       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
-       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
-+      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
-       if( @GCCVER@ >= 30401 ) {
-       	 $CVER        = "C341";
-       }
diff --git a/editors/openoffice.org-3-devel/files/patch-i64526 b/editors/openoffice.org-3-devel/files/patch-i64526
deleted file mode 100644
index 3734fb70a5cf..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i64526
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: sd/source/ui/inc/SdUnoDrawView.hxx
-===================================================================
-RCS file: /cvs/graphics/sd/source/ui/inc/SdUnoDrawView.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 SdUnoDrawView.hxx
---- sd/source/ui/inc/SdUnoDrawView.hxx	21 Mar 2006 17:25:19 -0000	1.13
-+++ sd/source/ui/inc/SdUnoDrawView.hxx	19 Apr 2006 20:34:07 -0000
-@@ -138,7 +138,7 @@
-     DrawViewShell& mrDrawViewShell;
-     sd::View& mrView;
- 
--    SdXImpressDocument* SdUnoDrawView::GetModel (void) const throw();
-+    SdXImpressDocument* GetModel (void) const throw();
- };
- 
- } // end of namespace sd
diff --git a/editors/openoffice.org-3-devel/files/patch-i64906 b/editors/openoffice.org-3-devel/files/patch-i64906
new file mode 100644
index 000000000000..fec74c8029ac
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-i64906
@@ -0,0 +1,11 @@
+--- sal/osl/unx/security.c~	Wed May 10 20:57:40 2006
++++ sal/osl/unx/security.c	Wed May 10 22:35:43 2006
+@@ -73,7 +73,7 @@
+ static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax);
+ 
+ static oslSecurityImpl * newSecurityImpl(size_t * bufSize) {
+-#ifdef MACOSX
++#if defined (MACOSX) || defined (FREEBSD)
+     /* #i64906#: sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on Mac OS X */
+     size_t n = 1024;
+ #else
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 51140f2432b7..28150364a0b7 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -15,14 +15,16 @@ MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+#DISTFILES+=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+DISTFILES+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+#EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+EXTRACT_ONLY+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@@ -42,7 +44,7 @@ USE_KDELIBS_VER=        3
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_BZIP2=	yes
+#USE_BZIP2=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
@@ -63,9 +65,9 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE?=		164
+MILESTONE?=		168
 OOOTAG?=		SRC680_m${MILESTONE}
-SNAPDATE=		20060424
+SNAPDATE=		20060510
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
@@ -134,7 +136,7 @@ LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
-WRKSRC?=		${WRKDIR}
+WRKSRC?=		${WRKDIR}/SRC680_m${MILESTONE}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -246,7 +248,6 @@ post-install:
 	@ln -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
 			${PREFIX}/share/applnk/${EXECBASE}
 	@${PRINTF} "share/applnk/${EXECBASE}\n" >> ${TMPPLIST}
-.endif
 	@for dir in `ls ${ICONS}/hicolor | grep -v CVS`; do \
 		for app in base calc draw impress math printeradmin writer; do \
 			if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
@@ -261,6 +262,7 @@ post-install:
 			${PRINTF} "share/icons/hiclor/$${dir}/mimetypes/$${file}\n" >> ${TMPPLIST} ; \
 		done ; \
 	done
+.endif
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index ae2a452e38bb..e8019545437f 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m164_source.tar.bz2) = 413e6f1f019b3ee47bb58773449bca14
-SHA256 (openoffice.org2.0/OOo_SRC680_m164_source.tar.bz2) = 7857f426da4906165250b5e817a143bd4885f6843bf4ee7cdfd73f7fdf093735
-SIZE (openoffice.org2.0/OOo_SRC680_m164_source.tar.bz2) = 241804836
+MD5 (openoffice.org2.0/OOo_2.0.168_src.tar.gz) = 165fea2a9a0aa4b70302284b01fc9508
+SHA256 (openoffice.org2.0/OOo_2.0.168_src.tar.gz) = 91ff9ae9632e21d7af57d9d72a364f378fa8c6fe18867836a728349b62485dba
+SIZE (openoffice.org2.0/OOo_2.0.168_src.tar.gz) = 300659301
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i63069 b/editors/openoffice.org-vcltesttool/files/patch-i63069
deleted file mode 100644
index 04b5ee7c717d..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i63069
+++ /dev/null
@@ -1,81 +0,0 @@
-cws freebsd06
-Index: stlport/STLport-4.5.patch
-===================================================================
-RCS file: /cvs/external/stlport/STLport-4.5.patch,v
-retrieving revision 1.26
-diff -u -r1.26 STLport-4.5.patch
---- stlport/STLport-4.5.patch	7 Mar 2006 17:11:51 -0000	1.26
-+++ stlport/STLport-4.5.patch	11 Mar 2006 05:16:19 -0000
-@@ -120,16 +120,16 @@
- ***************
- *** 1 ****
- ! dummy
----- 1,59 ----
-+--- 1,69 ----
- ! #
- ! # Note : this makefile is for gcc-3 !
- ! #
- ! 
- ! #
- ! # compiler
--! #
--! CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
--! CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-+! # take these from the OOo build environment
-+! CC*= gcc 
-+! CXX*= g++
- ! 
- ! #
- ! # Basename for libraries
-@@ -141,7 +141,7 @@
- ! #
- ! #
- ! LINK=ar cr
--! DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
-+! DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} --fexceptions -shared -o
- ! 
- ! OBJEXT=o
- ! DYNEXT=so
-@@ -149,26 +149,36 @@
- ! RM=rm -rf
- ! PATH_SEP=/
- ! MKDIR=mkdir -p
--! COMP=GCC-FREEBSD
-+! COMP=GCC$(ARCH)
- ! INSTALL_STEP = install_unix 
- ! 
- ! all:  all_dynamic all_static symbolic_links 
- ! 
- ! include common_macros.mak
- ! 
--! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-+! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized
- ! 
--! CXXFLAGS_COMMON = -I${STLPORT_DIR} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+! CXXFLAGS_COMMON =  -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -ftemplate-depth-32 -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+! CFLAGS_COMMON =  -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
- ! 
--! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
--! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-+! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC
-+! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
- ! 
--! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
- ! CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
- ! 
- ! CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
- ! CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
- ! 
-+! CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC
-+! CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC
-+! 
-+! CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC
-+! CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC
-+! 
-+! CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_STLP_DEBUG
-+! CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-+! 
- ! include common_percent_rules.mak
- ! include common_rules.mak
- ! 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i64412 b/editors/openoffice.org-vcltesttool/files/patch-i64412
deleted file mode 100644
index 8fbac02ef0e0..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i64412
+++ /dev/null
@@ -1,16 +0,0 @@
-cws freebsd06
-Index: config_office/set_soenv.in
-===================================================================
-RCS file: /cvs/tools/config_office/set_soenv.in,v
-retrieving revision 1.97
-diff -u -r1.97 set_soenv.in
---- config_office/set_soenv.in	7 Apr 2006 08:02:29 -0000	1.97
-+++ config_office/set_soenv.in	14 Apr 2006 21:35:53 -0000
-@@ -342,6 +342,7 @@
-       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
-       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
-       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
-+      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
-       if( @GCCVER@ >= 30401 ) {
-       	 $CVER        = "C341";
-       }
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i64526 b/editors/openoffice.org-vcltesttool/files/patch-i64526
deleted file mode 100644
index 3734fb70a5cf..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i64526
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: sd/source/ui/inc/SdUnoDrawView.hxx
-===================================================================
-RCS file: /cvs/graphics/sd/source/ui/inc/SdUnoDrawView.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 SdUnoDrawView.hxx
---- sd/source/ui/inc/SdUnoDrawView.hxx	21 Mar 2006 17:25:19 -0000	1.13
-+++ sd/source/ui/inc/SdUnoDrawView.hxx	19 Apr 2006 20:34:07 -0000
-@@ -138,7 +138,7 @@
-     DrawViewShell& mrDrawViewShell;
-     sd::View& mrView;
- 
--    SdXImpressDocument* SdUnoDrawView::GetModel (void) const throw();
-+    SdXImpressDocument* GetModel (void) const throw();
- };
- 
- } // end of namespace sd
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i64906 b/editors/openoffice.org-vcltesttool/files/patch-i64906
new file mode 100644
index 000000000000..fec74c8029ac
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-i64906
@@ -0,0 +1,11 @@
+--- sal/osl/unx/security.c~	Wed May 10 20:57:40 2006
++++ sal/osl/unx/security.c	Wed May 10 22:35:43 2006
+@@ -73,7 +73,7 @@
+ static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax);
+ 
+ static oslSecurityImpl * newSecurityImpl(size_t * bufSize) {
+-#ifdef MACOSX
++#if defined (MACOSX) || defined (FREEBSD)
+     /* #i64906#: sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on Mac OS X */
+     size_t n = 1024;
+ #else