update to OpenOffice.org 2.4.0;

- rename the br-pt subpackage to pt-br because of an i18n change in openoffice - regen some patches - fix WANTLIB and LIB_DEPENDS
2008-04-28 11:18:46 +00:00 · 2008-04-28 11:18:46 +00:00 · 1dc03f4175
commit 1dc03f4175
parent a344f90a86
86 changed files with 1148 additions and 1340 deletions
--- a/editors/openoffice/Makefile
+++ b/editors/openoffice/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.70 2008/04/14 14:28:34 jasper Exp $
+# $OpenBSD: Makefile,v 1.71 2008/04/28 11:18:46 robert Exp $

 ONLY_FOR_ARCHS= amd64 i386

@ -6,13 +6,13 @@ COMMENT-main=	multi-platform productivity suite
 COMMENT-kde=	optional integration of OpenOffice to the KDE environment
 COMMENT-java=	optional integration of OpenOffice java features

-VERSION=	2.3.1
+VERSION=	2.4.0
 DISTNAME=	OOo_${VERSION}
-WRKDIST=	${WRKDIR}/OOG680_m9
+WRKDIST=	${WRKDIR}/OOH680_m12
 PKGNAME=	openoffice-${VERSION}
-PKGNAME-main=	openoffice-${VERSION}p1
+PKGNAME-main=	openoffice-${VERSION}
 PKGNAME-kde=	openoffice-kde-${VERSION}
-PKGNAME-java=	openoffice-java-${VERSION}p0
+PKGNAME-java=	openoffice-java-${VERSION}
 CATEGORIES=	editors productivity

 SHARED_LIBS=	icudata		36.0 \
@ -58,10 +58,10 @@ FLAVORS=	debug
 FLAVOR?=

 .if !${FLAVOR:L:Mno_lang}
-LANGS=			bg br-pt ca de es fa fi fr hu it ja ko \
-			lt lv nl pl ru sl sv
+LANGS=			bg ca de es fa fi fr hu it ja ko \
+			lt lv nl pl pt-BR ru sl sv

-.for l in ${LANGS}
+.for l in ${LANGS:L}
 MULTI_PACKAGES+=	-i18n-$l
 PKGNAME-i18n-$l=	openoffice-i18n-$l-${VERSION}
 COMMENT-i18n-$l=	$l language pack for OpenOffice.Org
@ -76,7 +76,6 @@ BUILD_DEPENDS=	:zip-*:archivers/zip \
 		:bison-*:devel/bison \
 		:tcsh-*:shells/tcsh \
 		:p5-Archive-Zip-*:archivers/p5-Archive-Zip \
-		::textproc/libxslt \
 		::print/cups \
 		::devel/apache-ant \
 		:db-java-4.*:databases/db/v4,-java,java \
@ -86,15 +85,17 @@ MODULES+=	lang/python
 LIB_DEPENDS-main=gdk-x11-2.0.>=400.14,gdk_pixbuf-2.0.>=400.14,gtk-x11-2.0.>=400.14::x11/gtk+2 \
 		${MODPY_LIB_DEPENDS} \
 		db.>=4:db-4.*:databases/db/v4 \
+		xslt.>=3::textproc/libxslt \
 		curl.>=7::net/curl \
 		neon.>=24::net/neon \
 		wpd.>=8::textproc/libwpd
-WANTLIB-main=	ICE SM X11 Xau Xdmcp Xext Xrender Xcursor Xfixes Xi Xinerama \
-		Xrandr atk-1.0 c cairo expat \
+WANTLIB-main=	ICE SM X11 Xau Xcomposite Xdamage Xdmcp Xext Xrender Xcursor \
+		Xfixes Xi Xinerama Xrandr atk-1.0 c cairo crypto expat \
 		fontconfig freetype glib-2.0 glitz gmodule-2.0 gobject-2.0 \
-		gthread-2.0 iconv intl ossaudio jpeg m pango-1.0 \
-		pangocairo-1.0 pangoft2-1.0 png pthread stdc++ util xml2 z
-RUN_DEPENDS-main=::java/javaPathHelper
+		gthread-2.0 iconv intl jpeg m ossaudio pango-1.0 pangocairo-1.0 \
+		pangoft2-1.0 png pthread stdc++ ssl util xml2 z
+RUN_DEPENDS-main=	::java/javaPathHelper \
+			:desktop-file-utils-*:devel/desktop-file-utils

 MODULES+=		x11/qt3
 RUN_DEPENDS-kde=	::editors/openoffice
@ -117,7 +118,7 @@ USE_GMAKE=	Yes
 NO_REGRESS=	Yes
 VMEM_WARNING=	Yes

-PATCHFILES=	build-java-target-2.2.0.diff:0
+PATCHFILES=	build-java-target-2.4.0.diff:0

 PATCHORIG=	.orig.port
 WRKCONF=	${WRKSRC}/config_office
@ -149,6 +150,7 @@ CONFIGURE_ARGS=	--disable-gnome-vfs \
 		--with-system-db \
 		--with-system-boost \
 		--with-system-libwpd \
+		--with-system-openssl \
 		--with-epm=internal \
 		--with-alloc=system \
 		--with-java \
--- a/editors/openoffice/distinfo
+++ b/editors/openoffice/distinfo
@ -1,35 +1,35 @@
-MD5 (openoffice/OOo_2.3.1_src_binfilter.tar.bz2) = pWz27ZvZdZ+uxXYLrLhIzQ==
-MD5 (openoffice/OOo_2.3.1_src_core.tar.bz2) = lVWi1frpolx4jMcykh71eg==
-MD5 (openoffice/OOo_2.3.1_src_l10n.tar.bz2) = O7gKLJbjNjGGN396rp98Ew==
-MD5 (openoffice/OOo_2.3.1_src_sdk.tar.bz2) = nPDdu1XwtDtJxZxpYupWfA==
-MD5 (openoffice/OOo_2.3.1_src_system.tar.bz2) = HiC+/i/bZcAL4R8fXZ69yg==
-MD5 (openoffice/build-java-target-2.2.0.diff) = 75jJnc/BjWIjVjSMTjSrIw==
+MD5 (openoffice/OOo_2.4.0_src_binfilter.tar.bz2) = KDMuPVuxTyBOkZnR2m1COg==
+MD5 (openoffice/OOo_2.4.0_src_core.tar.bz2) = kcPzLrawx6P6LZxnZEmwBA==
+MD5 (openoffice/OOo_2.4.0_src_l10n.tar.bz2) = u8Npg905ddqZ8SsV4ulEjg==
+MD5 (openoffice/OOo_2.4.0_src_sdk.tar.bz2) = W9hbWCAJOfk7AYOFQzGXQw==
+MD5 (openoffice/OOo_2.4.0_src_system.tar.bz2) = Lf34xVlyS99RHQ5q9sfjHQ==
+MD5 (openoffice/build-java-target-2.4.0.diff) = TA2oGby24F2ohDLinth12w==
 MD5 (openoffice/ooo-desktop.tar.gz) = 4fAWie5YsaKqfYL65jd4aw==
-RMD160 (openoffice/OOo_2.3.1_src_binfilter.tar.bz2) = SXrsHeSeqUGrgwUzGp/J6OBKUWI=
-RMD160 (openoffice/OOo_2.3.1_src_core.tar.bz2) = q3XAItAO1iaeuUN/nAIuRBgcbTo=
-RMD160 (openoffice/OOo_2.3.1_src_l10n.tar.bz2) = vBCx4FV0rO15Uy++8xbmbcuBD78=
-RMD160 (openoffice/OOo_2.3.1_src_sdk.tar.bz2) = WbJFyB6cxtQ8YAcP1dx4w42AbbY=
-RMD160 (openoffice/OOo_2.3.1_src_system.tar.bz2) = +TsPxSOjnSnnNGa+TVktWp/N5o4=
-RMD160 (openoffice/build-java-target-2.2.0.diff) = E6z5l9W1NFqterrBSZM/uadbzaw=
+RMD160 (openoffice/OOo_2.4.0_src_binfilter.tar.bz2) = //egphsZiBVZ5PIN3TYDFWX2NeE=
+RMD160 (openoffice/OOo_2.4.0_src_core.tar.bz2) = +L6HQiWk+KkL8g1WPbF18zgeIk4=
+RMD160 (openoffice/OOo_2.4.0_src_l10n.tar.bz2) = pS7Z56dRGtEs9s75jmSj7zhN04M=
+RMD160 (openoffice/OOo_2.4.0_src_sdk.tar.bz2) = p75tJeUcJAreTmxgRc+i7nN/n9E=
+RMD160 (openoffice/OOo_2.4.0_src_system.tar.bz2) = rSXLM09ZFU2zbag0bEeAUBPw9v4=
+RMD160 (openoffice/build-java-target-2.4.0.diff) = YtyP6lI7FQnrikAIe3nF4O9r8S8=
 RMD160 (openoffice/ooo-desktop.tar.gz) = oqo1JvA0o2pFs3Bctw+P/MM6zyY=
-SHA1 (openoffice/OOo_2.3.1_src_binfilter.tar.bz2) = BkPFLaOFChZJKDQudlGJe3p2yh8=
-SHA1 (openoffice/OOo_2.3.1_src_core.tar.bz2) = 3hieA6MpzdM0gjpSuAD60MAzq00=
-SHA1 (openoffice/OOo_2.3.1_src_l10n.tar.bz2) = AE3vrhSWz0uVOiM6uyD9TH4WJCM=
-SHA1 (openoffice/OOo_2.3.1_src_sdk.tar.bz2) = ZQk9yCJNW5dxxYZR9a5sbfGlh0g=
-SHA1 (openoffice/OOo_2.3.1_src_system.tar.bz2) = 68g1+cAO9gudjaEASo8x+KiK728=
-SHA1 (openoffice/build-java-target-2.2.0.diff) = tFDyynA/OMNn1nYB3HBk0iEsPgA=
+SHA1 (openoffice/OOo_2.4.0_src_binfilter.tar.bz2) = YZb9LStbN2Ndmgijb1R21XsU4Ng=
+SHA1 (openoffice/OOo_2.4.0_src_core.tar.bz2) = H3daDyt1WtHEy30U35PYaUhCTn8=
+SHA1 (openoffice/OOo_2.4.0_src_l10n.tar.bz2) = PvE/uqbEGrkgupqfRJT2xPgFwo4=
+SHA1 (openoffice/OOo_2.4.0_src_sdk.tar.bz2) = dMapLdtmlIUKquEPoOfEhegIOn4=
+SHA1 (openoffice/OOo_2.4.0_src_system.tar.bz2) = y++0ZVmH+3C5KbaSLCsnvrHl2xg=
+SHA1 (openoffice/build-java-target-2.4.0.diff) = wHQuUcsUfUO5XzOcsDsFZ+QfKpA=
 SHA1 (openoffice/ooo-desktop.tar.gz) = 4WYmsMz8xRSY9raC3IsdH5IJmQo=
-SHA256 (openoffice/OOo_2.3.1_src_binfilter.tar.bz2) = mnb46uPdVG9C24g8EvjyGCPg4o7W1D6Dhx3RweB//1c=
-SHA256 (openoffice/OOo_2.3.1_src_core.tar.bz2) = TIB90mLrcUOX3p540kTVh5aKkhQqkX27R/UYDEDbZ1M=
-SHA256 (openoffice/OOo_2.3.1_src_l10n.tar.bz2) = xINAdLl8ObFLidNb+Hzwa/1pDNv11Ec9ThX4oj6722Q=
-SHA256 (openoffice/OOo_2.3.1_src_sdk.tar.bz2) = Ef7YMrWjI5CIWjh8v5zi0xtlKvje3ryESrlagLWqUGY=
-SHA256 (openoffice/OOo_2.3.1_src_system.tar.bz2) = YkYDT2/zzRl23rg6BpR4DnO458MBxEIBP34/Lc0X+24=
-SHA256 (openoffice/build-java-target-2.2.0.diff) = ndLsTYPhU1uyWRELZ+K7jISioJw1bbFUZ5me1Er70ms=
+SHA256 (openoffice/OOo_2.4.0_src_binfilter.tar.bz2) = 6cpfWnRNw5pnhbxUlkEZxOfq+iA1xMIVETh0nl4cxyM=
+SHA256 (openoffice/OOo_2.4.0_src_core.tar.bz2) = d8kj/5P7Ei6p/v6iGlePW+gluuf356s6iP+f7ocEeSE=
+SHA256 (openoffice/OOo_2.4.0_src_l10n.tar.bz2) = mq5azXfiGmo0LpV3E2szbZA6iDtnB2hEmPwYY8BhztI=
+SHA256 (openoffice/OOo_2.4.0_src_sdk.tar.bz2) = EXuKLQrU4xdF814Glfom45/MBLB8Qvdd3zcVtAlY82g=
+SHA256 (openoffice/OOo_2.4.0_src_system.tar.bz2) = dD6LUAXthhfn1/at1wkM96yCwIfMpX8LS3rbPXmQhpc=
+SHA256 (openoffice/build-java-target-2.4.0.diff) = gNcBW3mUEK1YmHUHcaCtxPN0ktIDCAhl02H7vjO1jpc=
 SHA256 (openoffice/ooo-desktop.tar.gz) = r9RdGYqZDebbPNNGvG2dH86U6J7+PQWrc8Z4pEPQ7KE=
-SIZE (openoffice/OOo_2.3.1_src_binfilter.tar.bz2) = 6476673
-SIZE (openoffice/OOo_2.3.1_src_core.tar.bz2) = 144156134
-SIZE (openoffice/OOo_2.3.1_src_l10n.tar.bz2) = 79077332
-SIZE (openoffice/OOo_2.3.1_src_sdk.tar.bz2) = 24032680
-SIZE (openoffice/OOo_2.3.1_src_system.tar.bz2) = 36879908
-SIZE (openoffice/build-java-target-2.2.0.diff) = 40685
+SIZE (openoffice/OOo_2.4.0_src_binfilter.tar.bz2) = 6675120
+SIZE (openoffice/OOo_2.4.0_src_core.tar.bz2) = 153590855
+SIZE (openoffice/OOo_2.4.0_src_l10n.tar.bz2) = 81193819
+SIZE (openoffice/OOo_2.4.0_src_sdk.tar.bz2) = 38429
+SIZE (openoffice/OOo_2.4.0_src_system.tar.bz2) = 44072779
+SIZE (openoffice/build-java-target-2.4.0.diff) = 51925
 SIZE (openoffice/ooo-desktop.tar.gz) = 43479
--- a/editors/openoffice/patches/patch-autodoc_source_display_idl_hi_ary_cxx
+++ b/editors/openoffice/patches/patch-autodoc_source_display_idl_hi_ary_cxx
@ -1,21 +0,0 @@
-$OpenBSD: patch-autodoc_source_display_idl_hi_ary_cxx,v 1.3 2007/04/18 13:20:48 kurt Exp $
--- autodoc/source/display/idl/hi_ary.cxx.orig.port	Sat Sep 16 12:49:58 2006
-+++ autodoc/source/display/idl/hi_ary.cxx	Wed Apr 18 03:46:24 2007
-@@ -180,7 +180,7 @@ AryAccess::Search_Ce( StringVector &            o_modu
-     o_mainEntity = sNextName;
- 
-     // Find member:
-    if ( *pNext == 0 )
-+    if ( *pNext == '\0' )
-         return true; 
- 	nextName(pNext, o_memberEntity);
-     if (strchr(o_memberEntity,':') != 0)
-@@ -188,7 +188,7 @@ AryAccess::Search_Ce( StringVector &            o_modu
-                    
-     int nMemberLen = o_memberEntity.length();
-     if ( nMemberLen > 2
-            ?   *(pNext + nMemberLen - 2) == '('
-+            ?  (*pNext && *(pNext + nMemberLen - 2) == '(')
-             : false )
-     {
-         o_memberEntity.assign(o_memberEntity,nMemberLen-2);
--- a/editors/openoffice/patches/patch-autodoc_source_mkinc_fullcpp_mk
+++ b/editors/openoffice/patches/patch-autodoc_source_mkinc_fullcpp_mk
@ -1,12 +1,11 @@
-$OpenBSD: patch-autodoc_source_mkinc_fullcpp_mk,v 1.3 2007/04/18 13:20:48 kurt Exp $
--- autodoc/source/mkinc/fullcpp.mk.orig.port	Wed Sep  7 14:10:59 2005
-+++ autodoc/source/mkinc/fullcpp.mk	Wed Apr 18 03:46:24 2007
-@@ -59,7 +59,7 @@ CFLAGS+= -YX"precomp.h" -Fp$(PRJ)$/$(INPATH)$/misc$/$(
- 
+--- autodoc/source/mkinc/fullcpp.mk.orig.port	Tue Sep 18 16:06:38 2007
+++ autodoc/source/mkinc/fullcpp.mk	Tue Apr  1 14:01:47 2008
+@@ -43,7 +43,7 @@
+ .IF "$(GUI)"=="WNT"
+ CFLAGS+= -GR
 .ENDIF
- 
-.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="OPENBSD"
+-.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || $(COM) == "GCC"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="OPENBSD" || $(COM) == "GCC"
 CFLAGSCXX+= -frtti
 .ENDIF
 
--- a/editors/openoffice/patches/patch-automation_source_testtool_objtest_cxx
+++ b/editors/openoffice/patches/patch-automation_source_testtool_objtest_cxx
@ -1,12 +1,11 @@
-$OpenBSD: patch-automation_source_testtool_objtest_cxx,v 1.5 2007/11/13 09:46:27 robert Exp $
--- automation/source/testtool/objtest.cxx.orig.port	Thu Oct 25 11:54:44 2007
-+++ automation/source/testtool/objtest.cxx	Thu Oct 25 11:55:08 2007
-@@ -538,6 +538,8 @@ void TestToolObj::LoadIniFile()				// Laden der IniEin
-     abGP.Append( "16" );  // Linux SPARC
- #elif defined OS2
-     abGP.Append( "17" );
+--- automation/source/testtool/objtest.cxx.orig.port	Mon Nov 26 18:59:36 2007
+++ automation/source/testtool/objtest.cxx	Tue Apr  1 14:03:38 2008
+@@ -542,6 +542,8 @@ void TestToolObj::LoadIniFile()				// Laden der IniEin
+     abGP.Append( "18" );  // Linux MIPS
+ #elif defined LINUX && defined ARM
+     abGP.Append( "19" );  // Linux ARM
 +#elif defined OPENBSD
-+    abGP.Append( "18" );
+    abGP.Append( "20" );
 #else
 #error ("unknown platform. please request an ID for your platform on qa/dev")
 #endif
--- a/editors/openoffice/patches/patch-binfilter_bf_sc_source_core_data_sc_cell_cxx
+++ b/editors/openoffice/patches/patch-binfilter_bf_sc_source_core_data_sc_cell_cxx
@ -1,7 +1,7 @@
-$OpenBSD: patch-binfilter_bf_sc_source_core_data_sc_cell_cxx,v 1.3 2007/03/17 15:27:45 robert Exp $
--- binfilter/bf_sc/source/core/data/sc_cell.cxx.orig.port	Wed Jan 17 07:42:06 2007
-+++ binfilter/bf_sc/source/core/data/sc_cell.cxx	Tue Feb  6 23:13:33 2007
-@@ -48,7 +48,7 @@
+$OpenBSD: patch-binfilter_bf_sc_source_core_data_sc_cell_cxx,v 1.4 2008/04/28 11:18:46 robert Exp $
+--- binfilter/bf_sc/source/core/data/sc_cell.cxx.orig.port	Thu Sep  6 12:31:14 2007
+++ binfilter/bf_sc/source/core/data/sc_cell.cxx	Wed Apr 23 15:24:05 2008
+@@ -50,7 +50,7 @@
 #include <mac_end.h>
 #endif
 
--- a/editors/openoffice/patches/patch-binfilter_inc_bf_starmath_rect_hxx
+++ b/editors/openoffice/patches/patch-binfilter_inc_bf_starmath_rect_hxx
@ -1,12 +0,0 @@
-$OpenBSD: patch-binfilter_inc_bf_starmath_rect_hxx,v 1.1 2006/10/25 22:49:50 kurt Exp $
--- binfilter/inc/bf_starmath/rect.hxx.orig.port	Tue Oct 24 16:47:40 2006
-+++ binfilter/inc/bf_starmath/rect.hxx	Tue Oct 24 16:47:49 2006
-@@ -36,7 +36,7 @@
- #ifndef RECT_HXX
- #define RECT_HXX
- 
-#include <new.h>
-+#include <new>
- 
- 
- #ifndef _GEN_HXX //autogen
--- a/editors/openoffice/patches/patch-bridges_prj_build_lst
+++ b/editors/openoffice/patches/patch-bridges_prj_build_lst
@ -1,6 +1,6 @@
--- bridges/prj/build.lst.orig.port	Mon Jun 18 18:34:33 2007
-+++ bridges/prj/build.lst	Mon Nov 12 13:25:25 2007
-@@ -22,6 +22,8 @@ br	bridges\source\cpp_uno\cc50_solaris_intel			nmake	-
+--- bridges/prj/build.lst.orig.port	Mon Nov 26 19:01:08 2007
+++ bridges/prj/build.lst	Wed Apr 23 15:24:05 2008
+@@ -25,6 +25,8 @@ br	bridges\source\cpp_uno\cc50_solaris_intel			nmake	-
 br	bridges\source\cpp_uno\gcc3_solaris_sparc			nmake	-	u	br_gcc3sogs br_cppuno_shared br_unotypes br_inc NULL
 br	bridges\source\cpp_uno\gcc3_solaris_intel			nmake	-	u	br_gcc3sogi br_cppuno_shared br_unotypes br_inc NULL
 br	bridges\source\cpp_uno\gcc3_netbsd_intel	nmake	-	u	br_gccni br_unotypes br_inc NULL
--- a/editors/openoffice/patches/patch-config_office_configure_in
+++ b/editors/openoffice/patches/patch-config_office_configure_in
@ -1,9 +1,8 @@
-$OpenBSD: patch-config_office_configure_in,v 1.15 2007/12/07 11:30:55 robert Exp $
--- config_office/configure.in.orig.port	Thu Dec  6 16:36:06 2007
-+++ config_office/configure.in	Thu Dec  6 16:36:08 2007
-@@ -831,6 +831,16 @@ case "$build_os" in
- 		AC_MSG_RESULT([$PTHREAD_LIBS])
- 		_os=FreeBSD
+--- config_office/configure.in.orig.port	Thu Jan 31 12:45:01 2008
+++ config_office/configure.in	Wed Apr 23 15:47:49 2008
+@@ -920,6 +920,16 @@ case "$build_os" in
+ 		echo "AIX is an alpha port --- Use at own risk" >> warn
+ 		_os=AIX
 		;;
 +	openbsd*)
 +		test_x=yes
@ -15,24 +14,10 @@ $OpenBSD: patch-config_office_configure_in,v 1.15 2007/12/07 11:30:55 robert Exp
 +		PTHREAD_LIBS="-pthread"
 +		_os=OpenBSD
 +		;;
- 	osf)
- 		test_cups=no
- 		_os=OSF1
-@@ -2585,11 +2595,11 @@ dnl ==================================================
- dnl Checks for programs.
- dnl ===================================================================
- dnl Check whether there's a C pre-processor.
-if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
-+if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" ; then
-    AC_PROG_CPP
- fi
- dnl Check whether there's a C++ pre-processor.
-if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
-+if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" ; then
-    AC_PROG_CXXCPP
- fi
- 
-@@ -2719,6 +2729,9 @@ if test "$_os" != "WINNT" -a \( "z$enable_epm" = "z" -
+    *)
+    AC_MSG_ERROR([$_os operating system is not suitable to build OpenOffice.org!])
+    ;;
+@@ -2916,6 +2926,9 @@ if test "$_os" != "WINNT" -a \( "z$enable_epm" = "z" -
 	AIX)
 		PKGFORMAT=aix
 		;;
@ -42,7 +27,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.15 2007/12/07 11:30:55 robert Exp
 	*BSD)
 		PKGFORMAT=bsd
 		;;
-@@ -3048,7 +3061,7 @@ if test -n "$with_system_libwpd" -o -n "$with_system_l
+@@ -3244,7 +3257,7 @@ if test -n "$with_system_libwpd" -o -n "$with_system_l
         test "$with_system_libwpd" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_LIBWPD=YES
@ -51,11 +36,12 @@ $OpenBSD: patch-config_office_configure_in,v 1.15 2007/12/07 11:30:55 robert Exp
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBWPD=NO
-@@ -3159,12 +3172,13 @@ if test -n "$with_system_python" && test "$with_system
+@@ -3355,12 +3368,14 @@ if test -n "$with_system_python" && test "$with_system
 
    python_include=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('INCLUDEPY');"`
    python_version=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('VERSION');"`
 +   python_libs=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBS');"`
+
    PYTHON_CFLAGS="-I$python_include"
 
    if test "$_os" = "Darwin"; then
@ -66,7 +52,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.15 2007/12/07 11:30:55 robert Exp
    fi
    
    dnl check if the headers really work:
-@@ -3195,15 +3209,12 @@ if test -n "$with_system_db" -o -n "$with_system_libs"
+@@ -3398,15 +3413,12 @@ if test -n "$with_system_db" -o -n "$with_system_libs"
 	test "$with_system_db" != "no"; then
     SYSTEM_DB=YES
     AC_MSG_RESULT([external])
@ -78,15 +64,15 @@ $OpenBSD: patch-config_office_configure_in,v 1.15 2007/12/07 11:30:55 robert Exp
 -             [ AC_MSG_ERROR(no. install the db4 libraries) ], []+             )
 -        ], []
 +    AC_CHECK_HEADER(db4/db.h, [ DB_INCLUDES=${prefix}/include/db4 ],
-+	     [ AC_MSG_ERROR(no. install the db4 libraries) ], []
+            [ AC_MSG_ERROR(no. install the db4 libraries) ], []
     )
     AC_MSG_CHECKING([whether db is at least 4.1])
 +    save_CXXFLAGS=$CXXFLAGS
 +    CXXFLAGS=-I$DB_INCLUDES
-     for v in 1 2 3 4 5; do
+     for v in 1 2 3 4 5 6; do
        AC_TRY_RUN([
 #include <db.h>
-@@ -3214,6 +3225,7 @@ int main(int argc, char **argv) {
+@@ -3417,6 +3429,7 @@ int main(int argc, char **argv) {
 }
        ], [DB_VERSION_MINOR=$v], [])
     done
@ -94,7 +80,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.15 2007/12/07 11:30:55 robert Exp
     if test "$DB_VERSION_MINOR" -gt "1"; then
        AC_MSG_RESULT([OK])
        DB_VERSION=4.$DB_VERSION_MINOR
-@@ -3908,7 +3920,7 @@ elif test "$_os" != "WINNT" ; then
+@@ -4114,7 +4127,7 @@ elif test "$_os" != "WINNT" ; then
       AC_MSG_ERROR([No X includes found]) # Exit
    fi
    CFLAGS=$X_CFLAGS
@ -103,15 +89,16 @@ $OpenBSD: patch-config_office_configure_in,v 1.15 2007/12/07 11:30:55 robert Exp
    AC_CHECK_LIB(X11, XOpenDisplay, x_libs="-lX11 $X_EXTRA_LIBS", [AC_MSG_ERROR([X Development libraries not found])])
    dnl Check if the XauDisposeAuth symbol is provided by libXau.
    AC_CHECK_LIB(Xau, XauDisposeAuth, XAU_LIBS="-lXau", [])
-@@ -4103,7 +4115,6 @@ if test -n "$with_system_neon" -o -n "$with_system_lib
- 	test "$with_system_neon" != "no"; then
-         AC_MSG_RESULT([external])
-         PKG_CHECK_MODULES(NEON, neon >= 0.26.0)
-        PKG_CHECK_MODULES(NEON, neon < 0.27.0, , AC_MSG_ERROR([you need neon 0.26.x for system-neon]))
-         NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
-         NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
-         SYSTEM_NEON=YES
-@@ -4852,42 +4863,24 @@ KDE_LIBS=""
+@@ -4331,7 +4344,7 @@ if test -n "$with_system_openssl" -o -n "$with_system_
+     AC_MSG_RESULT([external])
+     # Mac OS builds should get out without extra stuff is the Mac porters'
+     # wish. And pkg-config is although Xcode ships a .pc for openssl
+-    if test "$_os" = "Darwin"; then
+    if test "$_os" = "Darwin" || test "$_os" = "OpenBSD"; then
+         OPENSSL_CFLAGS=
+         OPENSSL_LIBS="-lssl -lcrypto"
+     else
+@@ -5213,42 +5226,23 @@ KDE_LIBS=""
 MOC="moc"
 if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
     dnl Search paths for Qt and KDE
@ -143,7 +130,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.15 2007/12/07 11:30:55 robert Exp
 +    kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes"
 +    kde_libdirs="/usr/local/lib /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib $x_libraries"
     if test -n "$KDEDIR" ; then
-         kde_incdirs="$KDEDIR/include $kde_incdirs"
+-        kde_incdirs="$KDEDIR/include $kde_incdirs"
 -        if test "$build_cpu" != "x86_64" ; then
 -            kde_libdirs="$KDEDIR/lib $kde_libdirs"
 -        else
@ -162,21 +149,21 @@ $OpenBSD: patch-config_office_configure_in,v 1.15 2007/12/07 11:30:55 robert Exp
 
     dnl Check for Qt headers
     AC_MSG_CHECKING([for Qt headers])
-@@ -4908,7 +4901,7 @@ your Qt installation by exporting QTDIR before running
+@@ -5269,7 +5263,7 @@ your Qt installation by exporting QTDIR before running
     AC_MSG_CHECKING([for Qt libraries])
     qt_libdir="no"
     for qt_check in $qt_libdirs ; do
 -        if test -r "$qt_check/$qt_test_library" ; then
-+	if test -r "`ls $qt_check/$qt_test_library | head -1`" ; then
+        if test -r "`ls $qt_check/$qt_test_library | head -1`" ; then
             qt_libdir="$qt_check"
             break
         fi
-@@ -4944,7 +4937,7 @@ your KDE installation by exporting KDEDIR before runni
+@@ -5305,7 +5299,7 @@ your KDE installation by exporting KDEDIR before runni
     AC_MSG_CHECKING([for KDE libraries])
     kde_libdir="no"
     for kde_check in $kde_libdirs ; do
 -        if test -r "$kde_check/$kde_test_library" ; then
-+	if test -r "`ls $kde_check/$kde_test_library | head -1`" ; then
+        if test -r "`ls $kde_check/$kde_test_library | head -1`" ; then
             kde_libdir="$kde_check"
             break
         fi
--- a/editors/openoffice/patches/patch-config_office_set_soenv_in
+++ b/editors/openoffice/patches/patch-config_office_set_soenv_in
@ -1,9 +1,11 @@
--- config_office/set_soenv.in.orig.port	Thu Dec  6 16:36:06 2007
-+++ config_office/set_soenv.in	Thu Dec  6 16:36:08 2007
-@@ -368,6 +368,46 @@ elsif ( $platform =~ m/freebsd/ ) 
+--- config_office/set_soenv.in.orig.port	Wed Jan 23 18:07:28 2008
+++ config_office/set_soenv.in	Wed Apr 23 15:24:05 2008
+@@ -380,7 +380,47 @@ elsif ( $platform =~ m/freebsd/ ) 
+    }
       $INPATH         = $OUTPATH.$PROEXT;
       $GVERDIR        = $INPATH;
- } 
+-} 
+}
 +elsif ( $platform =~ m/openbsd/ )
 +{     print "Setting OpenBSD specific values... ";
 +      $outfile        = "OpenBSDEnv.Set";
@ -47,25 +49,25 @@
 elsif ( $platform =~ m/linux-gnu/ ) 
 {
 # General Linux settings:
-@@ -974,7 +1014,7 @@ if ($platform =~ m/solaris/) 
+@@ -1095,7 +1135,7 @@ if ($platform =~ m/solaris/) 
                         $ps.$JRETHREADDIR.
                         $ps.'$SOLARVER'.$ds.'$INPATH'.$LIB;
 }
 -elsif ($platform =~ m/linux-gnu|netbsd|osf1|freebsd|aix/)
-+elsif ($platform =~ m/linux-gnu|netbsd|osf1|freebsd|openbsd|aix/)
+elsif ($platform =~ m/linux-gnu|netbsd|osf1|freebsd|aix|openbsd/)
 {  $LD_LIBRARY_PATH   = $cur_dir.
                         $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
                         $ps.$JRELIBDIR.
-@@ -1016,7 +1056,7 @@ if ($platform =~ m/solaris/) 
+@@ -1137,7 +1177,7 @@ if ($platform =~ m/solaris/) 
                         $L.$USR_DT.$LIB.
                         $L.$USR_OPENWIN.$LIB;
 }
 -elsif ($platform =~ m/linux-gnu|netbsd|osf1|irix|freebsd|aix/)
-+elsif ($platform =~ m/linux-gnu|netbsd|osf1|irix|freebsd|openbsd|aix/)
+elsif ($platform =~ m/linux-gnu|netbsd|osf1|irix|freebsd|aix|openbsd/)
 {
    $SOLAREXTRALIB     = $L.$par_dir.$LIB64;
 }
-@@ -1066,7 +1106,7 @@ if ($platform =~ m/cygwin/)
+@@ -1200,7 +1240,7 @@ if ($platform =~ m/cygwin|os2/)
 }
      
 # The general environment path.
@ -74,7 +76,7 @@
 {  $PATH              = $cur_dir.
                         $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
                         $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
-@@ -1246,11 +1286,12 @@ if ($platform =~ m/solaris/) 
+@@ -1389,11 +1429,12 @@ if ($platform =~ m/solaris/) 
                         $L_STLPORT_LIB.
                         $L.$XLIB;
 }
@ -88,10 +90,11 @@
                         $L.'$JAVA_HOME'.$LIB64.
                         $L.$JRELIBDIR.
                         $L.$JRETOOLKITDIR.
-@@ -1258,6 +1299,19 @@ elsif ($platform =~ m/linux-gnu|netbasd|osf1|irix|aix|
-                         $L_STLPORT_LIB.
-                         $L.$XLIB;
+@@ -1417,7 +1458,19 @@ elsif ($platform =~ m/darwin/) 
+     }
+ 
 }
+-
 +elsif ($platform =~ m/openbsd/)
 +{  $SOLARLIB          = $L.$par_dir.$LIB.
 +                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
@ -105,15 +108,15 @@
 +                        $L_STLPORT_LIB.
 +                        $L.$XLIB;
 +}
- elsif ($platform =~ m/cygwin/)
- {  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
-                         $L.$par_dir.$LIB.
-@@ -1289,10 +1343,10 @@ $SOLARINC             = $I.$cur_dir.
+ if ($SYSTEM_MOZILLA eq "YES")
+ {
+        $SOLARLIB .= $L."@MOZ_LIB@"
+@@ -1432,10 +1485,10 @@ $SOLARINC             = $I.$cur_dir.
                         $I.'$SOLARENV'.$INC.
                         $I.'$SRC_ROOT'.$ds."res";
 
 -if ($platform =~ m/solaris|linux-gnu|osf1|freebsd|netbsd|irix/)
-+if ($platform =~ m/solaris|linux-gnu|osf1|freebsd|netbsd|openbsd|irix/)
+if ($platform =~ m/solaris|linux-gnu|osf1|freebsd|netbsd|irix|openbsd/)
 {
 $SOLARINC	     .= $STLPORT_stlport;
 -if ($platform =~ m/linux|freebsd|netbsd/)
@ -121,35 +124,34 @@
 {
 # This simply adds an include path, so even cases that break the FHS work
 $SOLARINC            .= $STLPORT_inc_stlport;
-@@ -1313,9 +1367,14 @@ if ($platform =~ m/linux-gnu/)
-    $SOLARINC         .= $STLPORT_inc_stlport;
+@@ -1457,9 +1510,15 @@ if ($platform =~ m/linux-gnu/)
 }
 
-+	$SOLARINC      .= $I.'$SOLARENV'.$INC.$ds."Xp31";
 
 -   	$SOLARINC      .= $I.'$SOLARENV'.$INC.$ds."Xp31".
 -                     $I.'$JAVA_HOME'.$INCLUDE;
-+        # pickup system jpeg over java jpeg
-+        if ($platform =~ m/openbsd/)
-+        {  $SOLARINC  .= $I.$USR_LOCAL.$INCLUDE;
-+        }
-+ 
-+        $SOLARINC      .= $I.'$JAVA_HOME'.$INCLUDE;
+	$SOLARINC      .= $I.'$SOLARENV'.$INC.$ds."Xp31";
 
+	# pickup system jpeg over java jpeg
+	if ($platform =~ m/openbsd/)
+	{  $SOLARINC  .= $I.$USR_LOCAL.$INCLUDE;
+	}
+
+        $SOLARINC      .= $I.'$JAVA_HOME'.$INCLUDE;
+
 	#include system dependent Java include directory
 	if (!($JDK eq "gcj"))
-@@ -1332,6 +1391,10 @@ if ($platform =~ m/linux-gnu/)
-       		$SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd";
-       		$SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
+ 	{
+@@ -1481,13 +1540,16 @@ if ($platform =~ m/linux-gnu/)
+    		elsif ($platform =~ m/irix/)
+    		{  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."irix";
    		}
-+                elsif ($platform =~ m/openbsd/)
-+                {
-+                $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."openbsd";
-+                }
-    		elsif ($platform =~ m/netbsd/)
-    		{  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
-    		}
-@@ -1344,7 +1407,7 @@ if ($platform =~ m/linux-gnu/)
+		elsif ($platform =~ m/openbsd/)
+		{  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."openbsd";
+		}
+ 
+    		#java threads include path
+ 
    		$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include";
 	}
     #The tail, if needed
--- a/editors/openoffice/patches/patch-cppu_source_uno_data_cxx
+++ b/editors/openoffice/patches/patch-cppu_source_uno_data_cxx
@ -1,12 +1,11 @@
-$OpenBSD: patch-cppu_source_uno_data_cxx,v 1.4 2007/04/18 13:20:48 kurt Exp $
--- cppu/source/uno/data.cxx.orig.port	Sat Sep 16 20:21:05 2006
-+++ cppu/source/uno/data.cxx	Wed Apr 18 03:46:24 2007
-@@ -367,7 +367,7 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData(
- #endif
+--- cppu/source/uno/data.cxx.orig.port	Fri Nov  2 13:53:59 2007
+++ cppu/source/uno/data.cxx	Tue Apr  1 14:20:54 2008
+@@ -368,7 +368,7 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData(
 
 #if defined(INTEL) \
-    && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) || defined(MACOSX) \
-+    && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) || defined(MACOSX) || defined(OPENBSD) \
-         || defined(__SUNPRO_CC) && defined(SOLARIS))
+     && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) || defined(OS2)) || defined(MACOSX) \
+-        || defined(__SUNPRO_CC) && defined(SOLARIS))
+        || defined(__SUNPRO_CC) && defined(SOLARIS) || defined(OPENBSD))
 #define MAX_ALIGNMENT_4
 #endif
+ 
--- a/editors/openoffice/patches/patch-dbaccess_source_ui_uno_copytablewizard_cxx
+++ b/editors/openoffice/patches/patch-dbaccess_source_ui_uno_copytablewizard_cxx
@ -0,0 +1,12 @@
+$OpenBSD: patch-dbaccess_source_ui_uno_copytablewizard_cxx,v 1.1 2008/04/28 11:18:46 robert Exp $
+--- dbaccess/source/ui/uno/copytablewizard.cxx.orig.port	Wed Apr 23 21:13:50 2008
+++ dbaccess/source/ui/uno/copytablewizard.cxx	Wed Apr 23 21:14:14 2008
+@@ -1272,7 +1272,7 @@ namespace dbaui (private)
+ 
+                         default:
+                         {
+-                            ::rtl::OUString aMessage( String( ModuleRes( STR_CTW_UNSUPPORTED_COLUMN_TYPE ) ) );
+                            ::rtl::OUString aMessage = ::rtl::OUString ( String( ModuleRes( STR_CTW_UNSUPPORTED_COLUMN_TYPE ) ) );
+ 
+                             aMessage.replaceAt( aMessage.indexOfAsciiL( "$type$", 6 ), 6, ::rtl::OUString::valueOf( aSourceColTypes[ nSourceColumn ] ) );
+                             aMessage.replaceAt( aMessage.indexOfAsciiL( "$pos$", 5 ), 5, ::rtl::OUString::valueOf( nSourceColumn ) );
--- a/editors/openoffice/patches/patch-desktop_scripts_soffice_sh
+++ b/editors/openoffice/patches/patch-desktop_scripts_soffice_sh
@ -1,6 +1,6 @@
-$OpenBSD: patch-desktop_scripts_soffice_sh,v 1.2 2007/11/13 09:46:28 robert Exp $
--- desktop/scripts/soffice.sh.orig.port	Wed Jul 18 17:04:16 2007
-+++ desktop/scripts/soffice.sh	Tue Nov 13 10:28:48 2007
+$OpenBSD: patch-desktop_scripts_soffice_sh,v 1.3 2008/04/28 11:18:46 robert Exp $
+--- desktop/scripts/soffice.sh.orig.port	Wed Jan  2 15:47:34 2008
+++ desktop/scripts/soffice.sh	Wed Apr 23 15:24:05 2008
@@ -47,6 +47,11 @@ export SAL_ENABLE_FILE_LOCKING
 # working on your system.
 # SAL_NOOPENGL=true; export SAL_NOOPENGL
@ -13,7 +13,7 @@ $OpenBSD: patch-desktop_scripts_soffice_sh,v 1.2 2007/11/13 09:46:28 robert Exp
 sd_platform=`uname -s`
 
 # the following test is needed on Linux PPC with IBM j2sdk142
-@@ -208,33 +213,6 @@ unset XENVIRONMENT
+@@ -211,33 +216,6 @@ unset XENVIRONMENT
 
 # uncomment line below to disable anti aliasing of fonts
 # SAL_ANTIALIAS_DISABLE=true; export SAL_ANTIALIAS_DISABLE
--- a/editors/openoffice/patches/patch-desktop_source_app_main_cxx
+++ b/editors/openoffice/patches/patch-desktop_source_app_main_cxx
@ -1,12 +0,0 @@
-$OpenBSD: patch-desktop_source_app_main_cxx,v 1.3 2006/12/13 10:25:14 robert Exp $
--- desktop/source/app/main.cxx.orig.port	Fri Dec  1 18:53:04 2006
-+++ desktop/source/app/main.cxx	Mon Dec 11 22:27:36 2006
-@@ -37,7 +37,7 @@
- #include "precompiled_desktop.hxx"
- 
- #if defined(UNX)
-#if defined(MACOSX) || defined(FREEBSD)
-+#if defined(MACOSX) || defined(FREEBSD) || defined(OPENBSD)
- #include <sys/types.h>
- #include <sys/time.h>
- #endif /* MACOSX || FREEBSD */
--- a/editors/openoffice/patches/patch-desktop_source_migration_wizard_cxx
+++ b/editors/openoffice/patches/patch-desktop_source_migration_wizard_cxx
@ -1,15 +1,15 @@
-$OpenBSD: patch-desktop_source_migration_wizard_cxx,v 1.1 2007/11/13 09:46:28 robert Exp $
--- desktop/source/migration/wizard.cxx.orig.port	Mon Nov  5 10:23:43 2007
-+++ desktop/source/migration/wizard.cxx	Mon Nov  5 10:24:23 2007
-@@ -121,6 +121,7 @@ FirstStartWizard::FirstStartWizard(Window* pParent)
-     ,m_bLicenseWasAccepted(sal_False)
+$OpenBSD: patch-desktop_source_migration_wizard_cxx,v 1.2 2008/04/28 11:18:46 robert Exp $
+--- desktop/source/migration/wizard.cxx.orig.port	Thu Jan 24 16:51:48 2008
+++ desktop/source/migration/wizard.cxx	Wed Apr 23 15:24:05 2008
+@@ -122,6 +122,7 @@ FirstStartWizard::FirstStartWizard( Window* pParent, s
     ,m_bAutomaticUpdChk(sal_True)
+     ,m_aLicensePath( rLicensePath )
 {
 +    return;
     // ---
     // FreeResource();
 //	enableState(STATE_USER, sal_False);
-@@ -381,7 +382,7 @@ void FirstStartWizard::overrideCheck(sal_Bool bOverrid
+@@ -384,7 +385,7 @@ void FirstStartWizard::overrideCheck(sal_Bool bOverrid
 
 short FirstStartWizard::Execute()
 {
@ -17,4 +17,4 @@ $OpenBSD: patch-desktop_source_migration_wizard_cxx,v 1.1 2007/11/13 09:46:28 ro
 +    return sal_True || svt::RoadmapWizard::Execute();
 }
 
- 
+ static OUString _makeDateTimeString (const DateTime& aDateTime, sal_Bool bUTC = sal_False)
--- a/editors/openoffice/patches/patch-desktop_util_makefile_mk
+++ b/editors/openoffice/patches/patch-desktop_util_makefile_mk
@ -1,7 +1,7 @@
-$OpenBSD: patch-desktop_util_makefile_mk,v 1.4 2007/11/13 09:46:28 robert Exp $
--- desktop/util/makefile.mk.orig.port	Thu Oct 25 12:08:41 2007
-+++ desktop/util/makefile.mk	Thu Oct 25 12:08:57 2007
-@@ -96,7 +96,7 @@ LIB1OBJFILES += $(OBJ)$/copyright_ascii_sun.obj
+$OpenBSD: patch-desktop_util_makefile_mk,v 1.5 2008/04/28 11:18:46 robert Exp $
+--- desktop/util/makefile.mk.orig.port	Tue Feb 26 19:05:11 2008
+++ desktop/util/makefile.mk	Wed Apr 23 15:24:05 2008
+@@ -102,7 +102,7 @@ LIB1OBJFILES += $(OBJ)$/copyright_ascii_sun.obj
 LINKFLAGSAPPGUI!:=	$(LINKFLAGSAPPGUI:s/-bind_at_load//)
 .ENDIF # MACOSX
 
--- a/editors/openoffice/patches/patch-icc_SampleICC-1_3_2-bendian_patch
+++ b/editors/openoffice/patches/patch-icc_SampleICC-1_3_2-bendian_patch
@ -0,0 +1,12 @@
+$OpenBSD: patch-icc_SampleICC-1_3_2-bendian_patch,v 1.1 2008/04/28 11:18:46 robert Exp $
+--- icc/SampleICC-1.3.2-bendian.patch.orig.port	Wed Apr 23 15:40:35 2008
+++ icc/SampleICC-1.3.2-bendian.patch	Wed Apr 23 15:40:53 2008
+@@ -575,7 +575,7 @@
+ ! using namespace std;
+ ! 
+ ! #ifndef WIN32
+-! #ifdef sun
+! #if defined(sun) || defined(__OpenBSD__)
+ ! #include <errno.h>
+ ! #else
+ ! #include <sys/errno.h>
--- a/editors/openoffice/patches/patch-icc_SampleICC-1_3_2_patch
+++ b/editors/openoffice/patches/patch-icc_SampleICC-1_3_2_patch
@ -0,0 +1,12 @@
+$OpenBSD: patch-icc_SampleICC-1_3_2_patch,v 1.1 2008/04/28 11:18:46 robert Exp $
+--- icc/SampleICC-1.3.2.patch.orig.port	Wed Apr 23 15:39:40 2008
+++ icc/SampleICC-1.3.2.patch	Wed Apr 23 15:39:58 2008
+@@ -575,7 +575,7 @@
+ ! using namespace std;
+ ! 
+ ! #ifndef WIN32
+-! #ifdef sun
+! #if defined(sun) || defined(__OpenBSD__)
+ ! #include <errno.h>
+ ! #else
+ ! #include <sys/errno.h>
--- a/editors/openoffice/patches/patch-icu_icu-3_6_patch
+++ b/editors/openoffice/patches/patch-icu_icu-3_6_patch
@ -1,10 +1,10 @@
-$OpenBSD: patch-icu_icu-3_6_patch,v 1.3 2007/12/07 11:30:55 robert Exp $
--- icu/icu-3.6.patch.orig.port	Thu Dec  6 16:18:35 2007
-+++ icu/icu-3.6.patch	Thu Dec  6 16:20:25 2007
+$OpenBSD: patch-icu_icu-3_6_patch,v 1.4 2008/04/28 11:18:46 robert Exp $
+--- icu/icu-3.6.patch.orig.port	Wed Apr 23 16:44:04 2008
+++ icu/icu-3.6.patch	Wed Apr 23 16:51:35 2008
@@ -1,5 +1,5 @@
 *** misc/icu/source/common/putil.c	Mon Jul 31 20:14:28 2006
---- misc/build/icu/source/common/putil.c	Tue Sep 18 19:30:30 2007
-+--- misc/build/icu/source/common/putil.c	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/common/putil.c	Mon Jan 28 21:31:50 2008
+--- misc/build/icu/source/common/putil.c	Wed Apr 23 16:40:00 2008
 ***************
 *** 48,54 ****
   #endif
@ -12,111 +12,114 @@ $OpenBSD: patch-icu_icu-3_6_patch,v 1.3 2007/12/07 11:30:55 robert Exp $
   #endif
   
 *** misc/icu/source/common/unicode/pwin32.h	Tue Aug 29 23:34:38 2006
---- misc/build/icu/source/common/unicode/pwin32.h	Tue Sep 18 19:30:30 2007
-+--- misc/build/icu/source/common/unicode/pwin32.h	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/common/unicode/pwin32.h	Mon Jan 28 21:31:50 2008
+--- misc/build/icu/source/common/unicode/pwin32.h	Wed Apr 23 16:40:00 2008
 ***************
 *** 266,273 ****
 --- 266,278 ----
-@@ -37,10 +37,10 @@
+@@ -37,7 +37,7 @@
   /*===========================================================================*/
   /* Code alignment and C function inlining                                    */
 *** misc/icu/source/common/unicode/rbbi.h	Fri Aug 11 07:46:40 2006
---- misc/build/icu/source/common/unicode/rbbi.h	Tue Sep 18 19:35:01 2007
-+--- misc/build/icu/source/common/unicode/rbbi.h	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/common/unicode/rbbi.h	Mon Jan 28 21:31:50 2008
+--- misc/build/icu/source/common/unicode/rbbi.h	Wed Apr 23 16:40:00 2008
 ***************
-*** 611,616 ****
---- 611,617 ----
-+*** 611,622 ****
-+--- 611,624 ----
-       virtual int32_t getBreakType() const;
-   #endif
-   
-@@ -48,9 +48,6 @@
-       /**
-         * Set the type of the break iterator.
-         * @internal
-***************
-*** 617,622 ****
---- 618,624 ----
-         */
-       virtual void setBreakType(int32_t type);
-   
-@@ -59,7 +56,7 @@
+ *** 611,622 ****
+ --- 611,624 ----
+@@ -56,7 +56,7 @@
         * Common initialization function, used by constructors and bufferClone.
         *   (Also used by DictionaryBasedBreakIterator::createBufferClone().)
 *** misc/icu/source/common/unicode/umachine.h	Tue Feb  7 02:54:16 2006
---- misc/build/icu/source/common/unicode/umachine.h	Tue Sep 18 19:30:30 2007
-+--- misc/build/icu/source/common/unicode/umachine.h	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/common/unicode/umachine.h	Mon Jan 28 21:31:50 2008
+--- misc/build/icu/source/common/unicode/umachine.h	Wed Apr 23 16:40:00 2008
 ***************
 *** 322,328 ****
    */
-@@ -78,7 +75,7 @@
+@@ -75,7 +75,7 @@
   #else
       typedef uint16_t UChar;
 *** misc/icu/source/common/unicode/unistr.h	Tue Aug 29 23:52:50 2006
---- misc/build/icu/source/common/unicode/unistr.h	Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/common/unicode/unistr.h	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/common/unicode/unistr.h	Mon Jan 28 21:31:50 2008
+--- misc/build/icu/source/common/unicode/unistr.h	Wed Apr 23 16:40:00 2008
 ***************
 *** 3280,3286 ****
   //========================================
-@@ -182,7 +179,7 @@
+@@ -179,7 +179,7 @@
   }
   
 *** misc/icu/source/common/unicode/ustring.h	Tue Aug 29 23:52:50 2006
---- misc/build/icu/source/common/unicode/ustring.h	Tue Sep 18 19:30:30 2007
-+--- misc/build/icu/source/common/unicode/ustring.h	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/common/unicode/ustring.h	Mon Jan 28 21:31:50 2008
+--- misc/build/icu/source/common/unicode/ustring.h	Wed Apr 23 16:40:00 2008
 ***************
 *** 918,924 ****
    * </pre>
-@@ -201,7 +198,7 @@
+@@ -198,7 +198,7 @@
       /**@stable ICU 2.0 */
   #   define U_STRING_INIT(var, cs, length)
+ *** misc/icu/source/common/uvectr32.cpp	Wed Aug 27 03:01:30 2003
+---- misc/build/icu/source/common/uvectr32.cpp	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/common/uvectr32.cpp	Wed Apr 23 16:40:00 2008
+ ***************
+ *** 1,6 ****
+   /*
+@@ -306,7 +306,7 @@
+   }
+   
+ *** misc/icu/source/common/uvectr32.h	Wed Jan 18 04:52:04 2006
+---- misc/build/icu/source/common/uvectr32.h	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/common/uvectr32.h	Wed Apr 23 16:40:00 2008
+ ***************
+ *** 1,6 ****
+   /*
+@@ -370,7 +370,7 @@
+       count += size;
+       return rp;
 *** misc/icu/source/config/mh-darwin	Wed Feb  1 08:52:42 2006
---- misc/build/icu/source/config/mh-darwin	Tue Sep 18 19:30:30 2007
-+--- misc/build/icu/source/config/mh-darwin	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/config/mh-darwin	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/config/mh-darwin	Wed Apr 23 16:40:00 2008
 ***************
 *** 25,31 ****
   SHLIB.cc=	$(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS)
-@@ -220,7 +217,7 @@
+@@ -389,7 +389,7 @@
   ## Compiler switch to embed a runtime search path
   LD_RPATH=
 *** misc/icu/source/config/mh-irix	Thu Mar 23 19:51:52 2006
---- misc/build/icu/source/config/mh-irix	Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/config/mh-irix	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/config/mh-irix	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/config/mh-irix	Wed Apr 23 16:40:00 2008
 ***************
 *** 23,28 ****
 --- 23,31 ----
-@@ -234,7 +231,7 @@
+@@ -403,7 +403,7 @@
   THREADSCPPFLAGS = -D_REENTRANT -D_PTHREADS
   LIBCPPFLAGS =
 *** misc/icu/source/config/mh-linux	Thu Mar 23 19:51:52 2006
---- misc/build/icu/source/config/mh-linux	Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/config/mh-linux	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/config/mh-linux	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/config/mh-linux	Wed Apr 23 16:40:00 2008
 ***************
 *** 20,25 ****
- --- 20,32 ----
-@@ -252,7 +249,7 @@
+ --- 20,33 ----
+@@ -422,7 +422,7 @@
   LDFLAGSICUDT=-nodefaultlibs -nostdlib
   
 *** misc/icu/source/config/mh-mingw	Tue Aug 15 10:24:14 2006
---- misc/build/icu/source/config/mh-mingw	Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/config/mh-mingw	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/config/mh-mingw	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/config/mh-mingw	Wed Apr 23 16:40:00 2008
 ***************
 *** 54,59 ****
 --- 54,62 ----
-@@ -283,9 +280,9 @@
+@@ -453,9 +453,9 @@
   CURR_SRCCODE_FULL_DIR=$(subst /,\\\\,$(shell pwd -W))#M#
   
 *** misc/icu/source/config/mh-solaris	Fri Feb 24 20:31:14 2006
---- misc/build/icu/source/config/mh-solaris	Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/config/mh-solaris	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/config/mh-solaris	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/config/mh-solaris	Wed Apr 23 16:40:00 2008
 ***************
 -*** 18,34 ****
 +*** 18,33 ****
   
   ## Commands to link
   ## For Sun Workshop, use CC to link to bring in C++ runtime
-@@ -302,8 +299,7 @@
+@@ -472,8 +472,7 @@
   
   #LIBRARY_PATH_PREFIX=/usr/lib/lwp:
   
@ -126,7 +129,7 @@ $OpenBSD: patch-icu_icu-3_6_patch,v 1.3 2007/12/07 11:30:55 robert Exp $
   
   ## Commands to link
   ## For Sun Workshop, use CC to link to bring in C++ runtime
-@@ -318,19 +314,37 @@
+@@ -488,19 +487,37 @@
   ## Compiler switch to embed a runtime search path
   LD_RPATH=	-R
   LD_RPATH_PRE=	
@ -144,7 +147,7 @@ $OpenBSD: patch-icu_icu-3_6_patch,v 1.3 2007/12/07 11:30:55 robert Exp $
   
 -  ## Compiler switch to embed a library name
 +*** misc/icu/source/configure	Tue Aug 15 10:24:14 2006
-+--- misc/build/icu/source/configure	Thu Dec  6 16:20:07 2007
+--- misc/build/icu/source/configure	Wed Apr 23 16:41:26 2008
 +***************
 +*** 4400,4406 ****
 +  
@ -163,153 +166,126 @@ $OpenBSD: patch-icu_icu-3_6_patch,v 1.3 2007/12/07 11:30:55 robert Exp $
 +                  GENCCODE_ASSEMBLY="-a gcc"
 +      fi ;;
 *** misc/icu/source/data/Makefile.in	Sat Aug 12 00:22:24 2006
---- misc/build/icu/source/data/Makefile.in	Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/data/Makefile.in	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/data/Makefile.in	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/data/Makefile.in	Wed Apr 23 16:40:00 2008
 ***************
 *** 344,350 ****
   ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES)
-@@ -349,9 +363,9 @@
+@@ -519,7 +536,7 @@
   	@echo "$@" > $@
   endif
+ *** misc/icu/source/i18n/regexcmp.cpp	Thu Feb  2 05:37:14 2006
+---- misc/build/icu/source/i18n/regexcmp.cpp	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/i18n/regexcmp.cpp	Wed Apr 23 16:40:00 2008
+ ***************
+ *** 2,8 ****
+   //
+@@ -572,7 +589,7 @@
+           break;
+   
+ *** misc/icu/source/i18n/rematch.cpp	Thu Aug 25 20:02:20 2005
+---- misc/build/icu/source/i18n/rematch.cpp	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/i18n/rematch.cpp	Wed Apr 23 16:40:00 2008
+ ***************
+ *** 6,12 ****
+   //
+@@ -697,7 +714,7 @@
+           }
+       }
 *** misc/icu/source/i18n/windtfmt.cpp	Tue Aug 15 08:48:02 2006
---- misc/build/icu/source/i18n/windtfmt.cpp	Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/i18n/windtfmt.cpp	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/i18n/windtfmt.cpp	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/i18n/windtfmt.cpp	Wed Apr 23 16:40:00 2008
 ***************
-*** 232,238 ****
-+*** 232,249 ****
+ *** 232,249 ****
       UChar stackBuffer[STACK_BUFFER_SIZE];
-       UChar *buffer = stackBuffer;
-   
-@@ -359,16 +373,6 @@
-   
-       if (result == 0) {
-           if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
---- 232,238 ----
-      UChar stackBuffer[STACK_BUFFER_SIZE];
-      UChar *buffer = stackBuffer;
-  
-!     result = GetDateFormatW(fLCID, dfFlags[fDateStyle - kDateOffset], st, NULL, reinterpret_cast<LPWSTR>(buffer), STACK_BUFFER_SIZE);
-  
-      if (result == 0) {
-          if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
-***************
-*** 239,249 ****
-               int newLength = GetDateFormatW(fLCID, dfFlags[fDateStyle - kDateOffset], st, NULL, NULL, 0);
-   
-               buffer = NEW_ARRAY(UChar, newLength);
-@@ -380,7 +384,14 @@
-   
-       if (buffer != stackBuffer) {
-           DELETE_ARRAY(buffer);
---- 239,249 ----
-+--- 232,249 ----
-+      UChar stackBuffer[STACK_BUFFER_SIZE];
-+      UChar *buffer = stackBuffer;
-+  
-+!     result = GetDateFormatW(fLCID, dfFlags[fDateStyle - kDateOffset], st, NULL, reinterpret_cast<LPWSTR>(buffer), STACK_BUFFER_SIZE);
-+  
-+      if (result == 0) {
-+          if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
-               int newLength = GetDateFormatW(fLCID, dfFlags[fDateStyle - kDateOffset], st, NULL, NULL, 0);
-   
-               buffer = NEW_ARRAY(UChar, newLength);
-@@ -393,7 +404,7 @@
-       if (buffer != stackBuffer) {
-           DELETE_ARRAY(buffer);
- ***************
-*** 258,264 ****
-+*** 258,275 ****
-       UChar stackBuffer[STACK_BUFFER_SIZE];
-       UChar *buffer = stackBuffer;
-   
-@@ -401,16 +412,6 @@
-   
-       if (result == 0) {
-           if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
---- 258,264 ----
-      UChar stackBuffer[STACK_BUFFER_SIZE];
-      UChar *buffer = stackBuffer;
-  
-!     result = GetTimeFormatW(fLCID, tfFlags[fTimeStyle], st, NULL, reinterpret_cast<LPWSTR>(buffer), STACK_BUFFER_SIZE);
-  
-      if (result == 0) {
-          if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
-***************
-*** 265,275 ****
-               int newLength = GetTimeFormatW(fLCID, tfFlags[fTimeStyle], st, NULL, NULL, 0);
-   
-               buffer = NEW_ARRAY(UChar, newLength);
-@@ -422,7 +423,14 @@
-   
-       if (buffer != stackBuffer) {
-           DELETE_ARRAY(buffer);
---- 265,275 ----
-+--- 258,275 ----
-+      UChar stackBuffer[STACK_BUFFER_SIZE];
-+      UChar *buffer = stackBuffer;
-+  
-+!     result = GetTimeFormatW(fLCID, tfFlags[fTimeStyle], st, NULL, reinterpret_cast<LPWSTR>(buffer), STACK_BUFFER_SIZE);
-+  
-+      if (result == 0) {
-+          if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
-               int newLength = GetTimeFormatW(fLCID, tfFlags[fTimeStyle], st, NULL, NULL, 0);
-   
-               buffer = NEW_ARRAY(UChar, newLength);
-@@ -435,7 +443,7 @@
+@@ -777,7 +794,7 @@
       if (buffer != stackBuffer) {
           DELETE_ARRAY(buffer);
 *** misc/icu/source/i18n/winnmfmt.cpp	Thu Aug 17 07:21:06 2006
---- misc/build/icu/source/i18n/winnmfmt.cpp	Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/i18n/winnmfmt.cpp	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/i18n/winnmfmt.cpp	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/i18n/winnmfmt.cpp	Wed Apr 23 16:40:00 2008
 ***************
 *** 86,95 ****
       GetLocaleInfoA(lcid, LOCALE_SGROUPING, buf, 10);
-@@ -573,7 +581,7 @@
+@@ -915,7 +932,7 @@
       if (buffer != stackBuffer) {
           DELETE_ARRAY(buffer);
 *** misc/icu/source/layout/CoverageTables.cpp	Sat May  8 01:28:42 2004
---- misc/build/icu/source/layout/CoverageTables.cpp	Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/layout/CoverageTables.cpp	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/layout/CoverageTables.cpp	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/layout/CoverageTables.cpp	Wed Apr 23 16:40:00 2008
 ***************
 *** 44,49 ****
 --- 44,53 ----
-@@ -588,7 +596,7 @@
+@@ -930,7 +947,7 @@
       le_uint16 probe = power;
       le_uint16 index = 0;
 *** misc/icu/source/layout/DeviceTables.cpp	Fri Jan 14 18:25:12 2005
---- misc/build/icu/source/layout/DeviceTables.cpp	Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/layout/DeviceTables.cpp	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/layout/DeviceTables.cpp	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/layout/DeviceTables.cpp	Wed Apr 23 16:40:00 2008
 ***************
 *** 22,28 ****
       le_uint16 format = SWAPW(deltaFormat) - 1;
-@@ -608,7 +616,7 @@
+@@ -950,7 +967,7 @@
           le_uint16 bits = fieldBits[format];
           le_uint16 count = 16 / bits;
 *** misc/icu/source/layout/GXLayoutEngine.cpp	Fri Sep  2 20:22:10 2005
---- misc/build/icu/source/layout/GXLayoutEngine.cpp	Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/layout/GXLayoutEngine.cpp	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/layout/GXLayoutEngine.cpp	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/layout/GXLayoutEngine.cpp	Wed Apr 23 16:40:00 2008
 ***************
 *** 39,45 ****
           return 0;
-@@ -627,7 +635,7 @@
+@@ -969,7 +986,7 @@
       if (LE_FAILURE(success)) {
           return 0;
 *** misc/icu/source/layout/IndicClassTables.cpp	Wed Aug 23 02:12:40 2006
---- misc/build/icu/source/layout/IndicClassTables.cpp	Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/layout/IndicClassTables.cpp	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/layout/IndicClassTables.cpp	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/layout/IndicClassTables.cpp	Wed Apr 23 16:40:00 2008
 ***************
 *** 94,100 ****
       _dr, _db, _db, _db, _db, _xx, _xx, _l1, _dl, _xx, _xx, _s1, _s2, _vr, _xx, _xx, // 09C0 - 09CF
-@@ -763,7 +771,7 @@
+@@ -988,14 +1005,14 @@
+   
+   static const IndicClassTable::CharClass punjCharClasses[] =
+ ***************
+-*** 120,125 ****
+---- 120,138 ----
+*** 120,127 ****
+--- 120,140 ----
+       _iv, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx  // 0AE0 - 0AEF
+   };
+   
+ + #if 1
+-+ static const IndicClassTable::CharClass oryaCharClasses[] =
+-+ {
+  static const IndicClassTable::CharClass oryaCharClasses[] =
+  {
+ +     _xx, _ma, _mp, _mp, _xx, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _xx, _xx, _iv, /* 0B00 - 0B0F */
+ +     _iv, _xx, _xx, _iv, _iv, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _ct, _bb, /* 0B10 - 0B1F */
+ +     _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _xx, _bb, _bb, _bb, _bb, _bb, _pb, /* 0B20 - 0B2F */
+@@ -1006,9 +1023,11 @@
+ +     _xx, _bb                                                                        /* 0B70 - 0B71 */
+ + };
+ + #else
+-  static const IndicClassTable::CharClass oryaCharClasses[] =
+-  {
++ static const IndicClassTable::CharClass oryaCharClasses[] =
++ {
+       _xx, _ma, _mp, _mp, _xx, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _xx, _xx, _iv, // 0B00 - 0B0F
+      _iv, _xx, _xx, _iv, _iv, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, // 0B10 - 0B1F
+      _ct, _ct, _ct, _ct, _bb, _ct, _ct, _ct, _bb, _xx, _ct, _ct, _bb, _bb, _bb, _pb, // 0B20 - 0B2F
+ ***************
+ *** 131,136 ****
+ --- 144,150 ----
+@@ -1103,7 +1122,7 @@
   //
   // IndicClassTable addresses
 *** misc/icu/source/layout/IndicReordering.cpp	Tue Apr 25 21:08:12 2006
---- misc/build/icu/source/layout/IndicReordering.cpp	Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/layout/IndicReordering.cpp	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/layout/IndicReordering.cpp	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/layout/IndicReordering.cpp	Wed Apr 23 16:40:00 2008
 ***************
 *** 50,55 ****
 --- 50,63 ----
-@@ -845,11 +853,13 @@
+@@ -1185,11 +1204,13 @@
       {-1, -1, -1, -1, -1, -1,  3,  2, -1, -1, -1, -1, -1, -1, -1}, //  7 - consonant virama ZWJ, consonant ZWJ virama
       {-1,  6,  1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,  4, -1}, //  8 - independent vowels that can take a virama
 ***************
@ -327,7 +303,7 @@ $OpenBSD: patch-icu_icu-3_6_patch,v 1.3 2007/12/07 11:30:55 robert Exp $
 +             /* for the special conjuction of Cons+0x0d4d+0x0d31 or Cons+0x0d4d+0x0d30 of Malayalam */
 +             if ((baseConsonant - 2 >= 0) &&
 +                 (chars[baseConsonant - 1] == 0x0d4d) &&
-@@ -862,13 +872,11 @@
+@@ -1202,13 +1223,11 @@
 + 
 + 		if (mpreFixups)
 + 			mpreFixups->reduce();
@ -339,12 +315,12 @@ $OpenBSD: patch-icu_icu-3_6_patch,v 1.3 2007/12/07 11:30:55 robert Exp $
 -                  output.writeMbelow();
 -                  output.writeSMbelow(); // FIXME: there are no SMs in these scripts...
 *** misc/icu/source/layout/LESwaps.h	Thu Jun 23 00:39:36 2005
---- misc/build/icu/source/layout/LESwaps.h	Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/layout/LESwaps.h	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/layout/LESwaps.h	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/layout/LESwaps.h	Wed Apr 23 16:40:00 2008
 ***************
 *** 2,7 ****
 --- 2,8 ----
-@@ -916,11 +924,12 @@
+@@ -1256,11 +1275,12 @@
       #if U_IS_BIG_ENDIAN
           #define SWAPW(value) (value)
 ***************
@ -360,7 +336,7 @@ $OpenBSD: patch-icu_icu-3_6_patch,v 1.3 2007/12/07 11:30:55 robert Exp $
 + #else // ALLOW_UNALIGNED_HACK
 + 
 + #define SWAPW(rValue) loadBigEndianWord(reinterpret_cast<const le_uint16&>(rValue))
-@@ -939,12 +948,11 @@
+@@ -1279,12 +1299,11 @@
 + }
 + 
 + #endif // ALLOW_UNALIGNED_HACK
@ -370,48 +346,35 @@ $OpenBSD: patch-icu_icu-3_6_patch,v 1.3 2007/12/07 11:30:55 robert Exp $
    * This class is used to access data which stored in big endian order
 -   * regardless of the conventions of the platform. It has been designed
 *** misc/icu/source/layout/MPreFixups.cpp	Sat May  8 01:28:44 2004
---- misc/build/icu/source/layout/MPreFixups.cpp	Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/layout/MPreFixups.cpp	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/layout/MPreFixups.cpp	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/layout/MPreFixups.cpp	Wed Apr 23 16:40:00 2008
 ***************
 *** 40,45 ****
 --- 40,51 ----
-@@ -961,7 +969,7 @@
+@@ -1301,7 +1320,7 @@
   {
       for (le_int32 fixup = 0; fixup < fFixupCount; fixup += 1) {
 *** misc/icu/source/layout/MPreFixups.h	Mon Apr 12 20:51:32 2004
---- misc/build/icu/source/layout/MPreFixups.h	Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/layout/MPreFixups.h	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/layout/MPreFixups.h	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/layout/MPreFixups.h	Wed Apr 23 16:40:00 2008
 ***************
 *** 31,36 ****
 --- 31,38 ----
-@@ -974,10 +982,10 @@
+@@ -1314,7 +1333,7 @@
       FixupData *fFixupData;
       le_int32   fFixupCount;
 *** misc/icu/source/stubdata/Makefile.in	Fri Dec  2 11:21:34 2005
---- misc/build/icu/source/stubdata/Makefile.in	Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/stubdata/Makefile.in	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/stubdata/Makefile.in	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/stubdata/Makefile.in	Wed Apr 23 16:40:00 2008
 ***************
-*** 25,31 ****
---- 25,37 ----
-+*** 25,30 ****
-+--- 25,36 ----
-   ## Target information
+ *** 25,30 ****
+ --- 25,36 ----
+@@ -1330,8 +1349,60 @@
   
-   TARGET_STUBNAME=$(DATA_STUBNAME)
-@@ -985,14 +993,65 @@
- + FINAL_SO_TARGET=$(STUBDATA_LIBDIR)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(SO_TARGET_VERSION_MAJOR)$(STUB_SUFFIX).$(SO)
- + %$(STUB_SUFFIX).$(SO): %$(SO_TARGET_VERSION_MAJOR)$(STUB_SUFFIX).$(SO)
- + 	$(RM) $@ && ln $< $@
-  
-+ endif
- + 
-++ endif
-+  
   ifneq ($(ENABLE_STATIC),)
   TARGET = $(STUBDATA_LIBDIR)$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
-  endif
 +*** misc/icu/source/stubdata/stubdata.c	Wed Nov 21 03:28:14 2001
-+--- misc/build/icu/source/stubdata/stubdata.c	Thu Dec  6 16:19:01 2007
+--- misc/build/icu/source/stubdata/stubdata.c	Wed Apr 23 16:43:50 2008
 +***************
 +*** 28,41 ****
 +      UDataInfo info;
@ -435,7 +398,7 @@ $OpenBSD: patch-icu_icu-3_6_patch,v 1.3 2007/12/07 11:30:55 robert Exp $
 +      const struct {
 +      const char *const name; 
 +      const void *const data;
-+!     } toc[537];			/* set to real toc size to avoid symbol size mismatch runtime link errors */
+!     } toc[537];		/* set to real toc size to avoid symbol size mismatch runtime link errors */
 +  } ICU_Data_Header;
 +  
 +  U_EXPORT const ICU_Data_Header U_ICUDATA_ENTRY_POINT = {
@ -455,52 +418,70 @@ $OpenBSD: patch-icu_icu-3_6_patch,v 1.3 2007/12/07 11:30:55 robert Exp $
 +      0,                  /* count        */
 +      0,                  /* Reserved     */
 +      {                   /*  TOC structure */
-+!           {
-+!           { 0 , 0 }  /* name and data entries.  Count says there are none,  */
+!         {
+! 	  { 0 , 0 }	/* name and data entries.  Count says there are none,  */
 +                          /*  but put one in just in case.                       */
-+!           }
+!         }
 +      }
 +  };
 +  
 *** misc/icu/source/test/intltest/loctest.cpp	Thu Jul  6 03:50:04 2006
---- misc/build/icu/source/test/intltest/loctest.cpp	Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/test/intltest/loctest.cpp	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/test/intltest/loctest.cpp	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/test/intltest/loctest.cpp	Wed Apr 23 16:40:00 2008
 ***************
 *** 4,9 ****
 --- 4,10 ----
-@@ -1004,7 +1063,7 @@
+@@ -1343,7 +1414,7 @@
   #include "unicode/decimfmt.h"
   #include "unicode/ucurr.h"
+ *** misc/icu/source/test/intltest/regextst.cpp	Tue Jul  5 20:39:00 2005
+---- misc/build/icu/source/test/intltest/regextst.cpp	Mon Jan 28 23:18:47 2008
+--- misc/build/icu/source/test/intltest/regextst.cpp	Wed Apr 23 16:40:00 2008
+ ***************
+ *** 1,6 ****
+   /********************************************************************
+@@ -1424,7 +1495,7 @@
+   #endif  /* !UCONFIG_NO_REGULAR_EXPRESSIONS  */
+   
+ *** misc/icu/source/test/intltest/regextst.h	Wed Dec  3 07:58:28 2003
+---- misc/build/icu/source/test/intltest/regextst.h	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/test/intltest/regextst.h	Wed Apr 23 16:40:00 2008
+ ***************
+ *** 1,6 ****
+   /********************************************************************
+@@ -1451,7 +1522,7 @@
+       // The following functions are internal to the regexp tests.
+       virtual UBool doRegexLMTest(const char *pat, const char *text, UBool looking, UBool match, int line);
 *** misc/icu/source/test/intltest/tsputil.cpp	Wed Jul 19 00:18:10 2006
---- misc/build/icu/source/test/intltest/tsputil.cpp	Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/test/intltest/tsputil.cpp	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/test/intltest/tsputil.cpp	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/test/intltest/tsputil.cpp	Wed Apr 23 16:40:00 2008
 ***************
 *** 4,9 ****
 --- 4,10 ----
-@@ -1016,7 +1075,7 @@
+@@ -1463,7 +1534,7 @@
   
   #include <float.h> // DBL_MAX, DBL_MIN
 *** misc/icu/source/test/intltest/uobjtest.cpp	Thu Mar 23 01:54:12 2006
---- misc/build/icu/source/test/intltest/uobjtest.cpp	Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/test/intltest/uobjtest.cpp	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/test/intltest/uobjtest.cpp	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/test/intltest/uobjtest.cpp	Wed Apr 23 16:40:00 2008
 ***************
 *** 4,9 ****
 --- 4,10 ----
-@@ -1028,7 +1087,7 @@
+@@ -1475,7 +1546,7 @@
   #include "cmemory.h" // UAlignedMemory
   #include <string.h>
 *** misc/icu/source/test/intltest/ustrtest.cpp	Tue Dec 28 22:13:54 2004
---- misc/build/icu/source/test/intltest/ustrtest.cpp	Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/test/intltest/ustrtest.cpp	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/test/intltest/ustrtest.cpp	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/test/intltest/ustrtest.cpp	Wed Apr 23 16:40:00 2008
 ***************
 *** 4,9 ****
 --- 4,10 ----
-@@ -1040,7 +1099,7 @@
+@@ -1487,7 +1558,7 @@
   #include "unicode/unistr.h"
   #include "unicode/uchar.h"
 *** misc/icu/source/tools/icupkg/icupkg.cpp	Fri Jul 21 23:17:52 2006
---- misc/build/icu/source/tools/icupkg/icupkg.cpp	Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/tools/icupkg/icupkg.cpp	Thu Dec  6 16:19:01 2007
+---- misc/build/icu/source/tools/icupkg/icupkg.cpp	Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/tools/icupkg/icupkg.cpp	Wed Apr 23 16:40:00 2008
 ***************
 *** 332,337 ****
 --- 332,341 ----
--- a/editors/openoffice/patches/patch-instsetoo_native_inc_sdkoo_unix_packagelist_txt
+++ b/editors/openoffice/patches/patch-instsetoo_native_inc_sdkoo_unix_packagelist_txt
@ -1,10 +0,0 @@
-$OpenBSD: patch-instsetoo_native_inc_sdkoo_unix_packagelist_txt,v 1.3 2007/04/18 13:20:48 kurt Exp $
--- instsetoo_native/inc_sdkoo/unix/packagelist.txt.orig.port	Fri Jan 19 09:06:55 2007
-+++ instsetoo_native/inc_sdkoo/unix/packagelist.txt	Wed Apr 18 03:46:25 2007
-@@ -36,5 +36,5 @@ copyright = "2005-2006 by OpenOffice.org"
- solariscopyright = "solariscopyrightfile"
- vendor = "OpenOffice.org"
- description = "OpenOffice.org %PRODUCTVERSION SDK"
-destpath = "/opt/openoffice.org%PRODUCTVERSION_sdk"
-+destpath = "openoffice-sdk"
- End
--- a/editors/openoffice/patches/patch-instsetoo_native_inc_ure_unix_packagelist_txt
+++ b/editors/openoffice/patches/patch-instsetoo_native_inc_ure_unix_packagelist_txt
@ -1,10 +0,0 @@
-$OpenBSD: patch-instsetoo_native_inc_ure_unix_packagelist_txt,v 1.3 2007/04/18 13:20:48 kurt Exp $
--- instsetoo_native/inc_ure/unix/packagelist.txt.orig.port	Fri Jan 19 09:07:43 2007
-+++ instsetoo_native/inc_ure/unix/packagelist.txt	Wed Apr 18 03:46:25 2007
-@@ -41,5 +41,5 @@ copyright = "2005-2006 by OpenOffice.org"
- solariscopyright = "solariscopyrightfile"
- vendor = "OpenOffice.org"
- description = "UNO Runtime Environment"
-destpath = "/opt/openoffice.org/ure"
-+destpath = "openoffice/ure"
- End
--- a/editors/openoffice/patches/patch-instsetoo_native_util_makefile_mk
+++ b/editors/openoffice/patches/patch-instsetoo_native_util_makefile_mk
@ -1,6 +1,5 @@
-$OpenBSD: patch-instsetoo_native_util_makefile_mk,v 1.11 2007/12/07 11:30:55 robert Exp $
--- instsetoo_native/util/makefile.mk.orig.port	Thu Nov  1 12:03:38 2007
-+++ instsetoo_native/util/makefile.mk	Thu Dec  6 16:36:09 2007
+--- instsetoo_native/util/makefile.mk.orig.port	Wed Dec 12 16:38:02 2007
+++ instsetoo_native/util/makefile.mk	Fri Apr 25 10:15:12 2008
@@ -54,12 +54,14 @@ PYTHONPATH:=$(PWD)$/$(BIN):$(SOLARLIBDIR):$(SOLARLIBDI
 .ENDIF			# "$(GUI)"=="WNT"
 .EXPORT: PYTHONPATH
@ -25,16 +24,16 @@ $OpenBSD: patch-instsetoo_native_util_makefile_mk,v 1.11 2007/12/07 11:30:55 rob
 
 openofficedev: $(foreach,i,$(alllangiso) openofficedev_$i)
 
-@@ -226,7 +228,7 @@ openoffice_%{$(PKGFORMAT:^".")} :
+@@ -236,7 +238,7 @@ openoffice_%{$(PKGFORMAT:^".")} :
+ .ELSE			# "$(PKGFORMAT)"!=""
 openoffice_% :
 .ENDIF			# "$(PKGFORMAT)"!=""
- .IF "$(OS)"!="MACOSX" || "$(PKGFORMAT)"!="portable"
-	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -addsystemintegration $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH))
-+	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -addsystemintegration $(subst,xxx,$(@:e:s/.//) -dontstrip $(PKGFORMATSWITCH))
- 	$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH).update.xml
- .ELSE                   # "$(OS)"!="MACOSX" || "$(PKGFORMAT)"!=""
- 	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -destdir $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))_inprogress$/ -simple staging
-@@ -525,11 +527,11 @@ hack_msitemplates .PHONY:
+-	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH))
+	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) -dontstrip $(PKGFORMATSWITCH))
+ 	$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+ 
+ .IF "$(PKGFORMAT)"!=""
+@@ -403,11 +405,11 @@ hack_msitemplates .PHONY:
 	-$(MKDIRHIER) $(MSIURETEMPLATEDIR)
 	-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)
 	-$(MKDIRHIER) $(MSIURETEMPLATEDIR)
--- a/editors/openoffice/patches/patch-jvmaccess_util_makefile_mk
+++ b/editors/openoffice/patches/patch-jvmaccess_util_makefile_mk
@ -1,7 +1,7 @@
-$OpenBSD: patch-jvmaccess_util_makefile_mk,v 1.4 2007/11/13 09:46:28 robert Exp $
--- jvmaccess/util/makefile.mk.orig.port	Thu Oct 25 12:12:49 2007
-+++ jvmaccess/util/makefile.mk	Thu Oct 25 12:13:20 2007
-@@ -72,6 +72,8 @@ SHL1VERSIONMAP = gcc3_linux_intel.map
+$OpenBSD: patch-jvmaccess_util_makefile_mk,v 1.5 2008/04/28 11:18:46 robert Exp $
+--- jvmaccess/util/makefile.mk.orig.port	Fri Nov  2 13:41:23 2007
+++ jvmaccess/util/makefile.mk	Wed Apr 23 15:24:06 2008
+@@ -75,6 +75,8 @@ SHL1VERSIONMAP = gcc3_linux_intel.map
 SHL1VERSIONMAP = gcc3_linux_intel.map
 .ELIF "$(GUI)$(COM)" == "WNTGCC"
 SHL1VERSIONMAP = mingw.map
--- a/editors/openoffice/patches/patch-lingucomponent_source_spellcheck_hunspell_affixmgr_cxx
+++ b/editors/openoffice/patches/patch-lingucomponent_source_spellcheck_hunspell_affixmgr_cxx
@ -1,57 +0,0 @@
-$OpenBSD: patch-lingucomponent_source_spellcheck_hunspell_affixmgr_cxx,v 1.4 2007/04/18 13:20:48 kurt Exp $
--- lingucomponent/source/spellcheck/hunspell/affixmgr.cxx.orig.port	Sat Sep 16 12:08:12 2006
-+++ lingucomponent/source/spellcheck/hunspell/affixmgr.cxx	Wed Apr 18 03:46:25 2007
-@@ -2477,12 +2477,12 @@ char * AffixMgr::suffix_check_twosfx_morph(const char 
-                 result3[0] = '\0';
- #ifdef DEBUG
-                 unsigned short flag = sptr->getFlag();
-                char flagch[2] = &flag;
-                 if (flag_mode == FLAG_NUM) {
-                    sprintf(result3, "%d", sptr->getKey());
-+                    sprintf(result3, "%p", sptr->getKey());
-                 } else if (flag_mode == FLAG_LONG) {
-                    sprintf(result3, "%c%c", flagch[0], flagch[1]);                
-                } else sprintf(result3, "%c", flagch[1]);                
-+                    sprintf(result3, "%c%c", (char)(flag>>8), (char)(flag & 0x00ff));
-+                } else sprintf(result3, "%c", (char)(flag & 0x00ff));
-+
-                 strcat(result3, ":");
- #endif
-                 if (sptr->getMorph()) strcat(result3, sptr->getMorph());
-@@ -2504,10 +2504,17 @@ char * AffixMgr::suffix_check_morph(const char * word,
-        int sfxopts, AffEntry * ppfx, const FLAG cclass, const FLAG needflag, char in_compound)
- {
-     char result[MAXLNLEN];
-    
-+
-+#ifdef DEBUG
-+    char result2[MAXLNLEN];
-+#endif
-+ 
-     struct hentry * rv = NULL;
- 
-     result[0] = '\0';
-+#ifdef DEBUG
-+    result2[0] = '\0';
-+#endif
- 
-     PfxEntry* ep = (PfxEntry *) ppfx;
- 
-@@ -2593,13 +2600,12 @@ char * AffixMgr::suffix_check_morph(const char * word,
-                         !TESTAFF(rv->astr, lemma_present, rv->alen))) strcat(result, rv->word);
-                     if (!complexprefixes && rv->description) strcat(result, rv->description);
- #ifdef DEBUG
-                unsigned short flag = sptr->getKey();
-                char flagch[2] = &flag;
-+		unsigned short flag = sptr->getFlag();
-                 if (flag_mode == FLAG_NUM) {
-                    sprintf(result2, "%d", sptr->getKey());
-+                    sprintf(result2, "%p", sptr->getKey());
-                 } else if (flag_mode == FLAG_LONG) {
-                    sprintf(result2, "%c%c", flagch[0], flagch[1]);                
-                } else sprintf(result2, "%c", flagch[1]);                
-+                    sprintf(result2, "%c%c", (char)(flag>>8), (char)(flag & 0x00FF));
-+                } else sprintf(result2, "%c", (char)(flag & 0x00FF));
-                 strcat(result2, ":");
-                 strcat(result, result2);
- #endif
--- a/editors/openoffice/patches/patch-odk_setsdkenv_unix_csh_in
+++ b/editors/openoffice/patches/patch-odk_setsdkenv_unix_csh_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-odk_setsdkenv_unix_csh_in,v 1.4 2007/04/18 13:20:48 kurt Exp $
--- odk/setsdkenv_unix.csh.in.orig.port	Mon Nov  6 09:58:56 2006
-+++ odk/setsdkenv_unix.csh.in	Wed Apr 18 03:46:25 2007
-@@ -176,6 +176,31 @@ switch (`${sdkdir}/config.guess | cut -d"-" -f3,4`)
+$OpenBSD: patch-odk_setsdkenv_unix_csh_in,v 1.5 2008/04/28 11:18:46 robert Exp $
+--- odk/setsdkenv_unix.csh.in.orig.port	Fri Jan 18 20:10:08 2008
+++ odk/setsdkenv_unix.csh.in	Wed Apr 23 15:24:06 2008
+@@ -178,6 +178,31 @@ switch (`${sdkdir}/config.guess | cut -d"-" -f3,4`)
     else	
 	setenv PTHREAD_LIBS -pthread
     endif
--- a/editors/openoffice/patches/patch-odk_setsdkenv_unix_sh_in
+++ b/editors/openoffice/patches/patch-odk_setsdkenv_unix_sh_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-odk_setsdkenv_unix_sh_in,v 1.4 2007/03/17 15:27:45 robert Exp $
--- odk/setsdkenv_unix.sh.in.orig.port	Wed Jan 17 07:47:27 2007
-+++ odk/setsdkenv_unix.sh.in	Tue Feb  6 23:13:34 2007
-@@ -211,6 +211,28 @@ case $sd_platform in
+$OpenBSD: patch-odk_setsdkenv_unix_sh_in,v 1.5 2008/04/28 11:18:46 robert Exp $
+--- odk/setsdkenv_unix.sh.in.orig.port	Fri Jan 18 20:10:19 2008
+++ odk/setsdkenv_unix.sh.in	Wed Apr 23 15:24:06 2008
+@@ -215,6 +215,28 @@ case $sd_platform in
 	export PTHREAD_LIBS
     fi
     ;;
--- a/editors/openoffice/patches/patch-odk_settings_settings_mk
+++ b/editors/openoffice/patches/patch-odk_settings_settings_mk
@ -1,7 +1,7 @@
-$OpenBSD: patch-odk_settings_settings_mk,v 1.3 2007/03/17 15:27:45 robert Exp $
--- odk/settings/settings.mk.orig.port	Wed Jan 17 07:47:27 2007
-+++ odk/settings/settings.mk	Tue Feb  6 23:13:34 2007
-@@ -515,3 +515,97 @@ URE_MISC=$(OO_SDK_URE_HOME)/share/misc
+$OpenBSD: patch-odk_settings_settings_mk,v 1.4 2008/04/28 11:18:46 robert Exp $
+--- odk/settings/settings.mk.orig.port	Fri Jan 18 20:24:00 2008
+++ odk/settings/settings.mk	Wed Apr 23 15:24:06 2008
+@@ -541,3 +541,97 @@ URE_MISC=$(OO_SDK_URE_HOME)/share/misc
 endif
 
 endif
--- a/editors/openoffice/patches/patch-postprocess_prj_build_lst
+++ b/editors/openoffice/patches/patch-postprocess_prj_build_lst
@ -1,10 +1,11 @@
-$OpenBSD: patch-postprocess_prj_build_lst,v 1.2 2007/11/13 09:46:28 robert Exp $
--- postprocess/prj/build.lst.orig.port	Fri Jul  6 11:29:30 2007
-+++ postprocess/prj/build.lst	Thu Oct 25 16:23:47 2007
-@@ -1,6 +1,5 @@
- po	postprocess	::	accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd ODK:sdk_oo setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools jfreereport reportdesign NULL
+$OpenBSD: patch-postprocess_prj_build_lst,v 1.3 2008/04/28 11:18:46 robert Exp $
+--- postprocess/prj/build.lst.orig.port	Wed Dec 12 14:26:52 2007
+++ postprocess/prj/build.lst	Wed Apr 23 15:24:06 2008
+@@ -1,7 +1,6 @@
+ po	postprocess	::	accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd ODK:sdk_oo setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTDESIGN:reportdesign SDEXT:sdext NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 -po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL
 po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
 po	postprocess\rebase	    	nmake	-	w	po_rebase po_checkdlv NULL
+ po	postprocess\signing	    	nmake	-	w,sign	po_signing po_rebase.w NULL
--- a/editors/openoffice/patches/patch-psprint_source_printer_printerinfomanager_cxx
+++ b/editors/openoffice/patches/patch-psprint_source_printer_printerinfomanager_cxx
@ -1,6 +1,6 @@
--- psprint/source/printer/printerinfomanager.cxx.orig.port	Tue Jul  3 15:59:32 2007
-+++ psprint/source/printer/printerinfomanager.cxx	Thu Oct 25 16:23:47 2007
-@@ -1220,7 +1220,7 @@ struct SystemCommandParameters
+--- psprint/source/printer/printerinfomanager.cxx.orig.port	Wed Dec 12 15:56:19 2007
+++ psprint/source/printer/printerinfomanager.cxx	Wed Apr 23 15:24:06 2008
+@@ -1240,7 +1240,7 @@ struct SystemCommandParameters
     tokenHandler    pHandler;
 };
 
@ -9,7 +9,7 @@
 static void lpgetSysQueueTokenHandler(
     const std::list< rtl::OString >& i_rLines,
     std::list< PrinterInfoManager::SystemPrintQueue >& o_rQueues,
-@@ -1365,7 +1365,7 @@ static void standardSysQueueTokenHandler(
+@@ -1385,7 +1385,7 @@ static void standardSysQueueTokenHandler(
 
 static const struct SystemCommandParameters aParms[] =
 {
--- a/editors/openoffice/patches/patch-psprint_source_printergfx_printerjob_cxx
+++ b/editors/openoffice/patches/patch-psprint_source_printergfx_printerjob_cxx
@ -1,7 +1,7 @@
-$OpenBSD: patch-psprint_source_printergfx_printerjob_cxx,v 1.3 2006/12/13 10:25:14 robert Exp $
--- psprint/source/printergfx/printerjob.cxx.orig.port	Fri Dec  1 18:55:41 2006
-+++ psprint/source/printergfx/printerjob.cxx	Mon Dec 11 22:27:39 2006
-@@ -265,7 +265,7 @@ getUserName (char* pName, int nSize)
+$OpenBSD: patch-psprint_source_printergfx_printerjob_cxx,v 1.4 2008/04/28 11:18:46 robert Exp $
+--- psprint/source/printergfx/printerjob.cxx.orig.port	Wed Dec 12 15:56:41 2007
+++ psprint/source/printergfx/printerjob.cxx	Wed Apr 23 15:24:06 2008
+@@ -266,7 +266,7 @@ getUserName (char* pName, int nSize)
 
     sal_Bool bSuccess = sal_False;
 
--- a/editors/openoffice/patches/patch-pyuno_source_module_makefile_mk
+++ b/editors/openoffice/patches/patch-pyuno_source_module_makefile_mk
@ -1,12 +1,11 @@
-$OpenBSD: patch-pyuno_source_module_makefile_mk,v 1.5 2007/11/13 09:46:28 robert Exp $
--- pyuno/source/module/makefile.mk.orig.port	Thu Oct 25 12:14:00 2007
-+++ pyuno/source/module/makefile.mk	Thu Oct 25 12:14:29 2007
-@@ -130,6 +130,8 @@ $(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwrapper.obj
+--- pyuno/source/module/makefile.mk.orig.port	Wed Jan  2 18:29:28 2008
+++ pyuno/source/module/makefile.mk	Wed Apr 23 15:24:06 2008
+@@ -136,6 +136,8 @@ $(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwrapper.obj
 	@echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
 .ELIF "$(OS)" == "MACOSX"
- 	@echo $(CC) -bundle -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
+ 	@echo $(CC) -bundle -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(EXTRA_LINKFLAGS) $(EXTRA_FRAMEWORK_FLAG) > $(MISC)$/$(@:b).cmd
 +.ELIF "$(OS)" == "OPENBSD"
-+	@+ echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
+	@echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
 .ELSE
 	@echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
 .ENDIF
--- a/editors/openoffice/patches/patch-sal_inc_osl_endian_h
+++ b/editors/openoffice/patches/patch-sal_inc_osl_endian_h
@ -1,12 +1,12 @@
-$OpenBSD: patch-sal_inc_osl_endian_h,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- sal/inc/osl/endian.h.orig.port	Fri Jan 20 09:27:49 2006
-+++ sal/inc/osl/endian.h	Fri Aug 18 15:47:43 2006
-@@ -187,7 +187,7 @@ extern "C" {
+--- sal/inc/osl/endian.h.orig.port	Thu Nov  1 18:14:36 2007
+++ sal/inc/osl/endian.h	Wed Apr 23 15:24:06 2008
+@@ -174,7 +174,8 @@ extern "C" {
     !defined(LINUX)   && !defined(NETBSD) && !defined(SCO)   && \
 	!defined(AIX)     && !defined(HPUX)   && \
- 	!defined(SOLARIS) && !defined(IRIX)   && !defined(MACOS) && \
+ 	!defined(SOLARIS) && !defined(IRIX)   && \
 -	!defined(MACOSX) && !defined(FREEBSD)
-+	!defined(MACOSX) && !defined(FREEBSD) && !defined(OPENBSD)
- #	error "Target plattform not specified !"
+	!defined(MACOSX) && !defined(FREEBSD) && \
+	!defined(OPENBSD)
+ #	error "Target platform not specified !"
 #endif
 
--- a/editors/openoffice/patches/patch-sal_inc_sal_config_h
+++ b/editors/openoffice/patches/patch-sal_inc_sal_config_h
@ -1,8 +1,8 @@
-$OpenBSD: patch-sal_inc_sal_config_h,v 1.4 2007/11/13 09:46:28 robert Exp $
--- sal/inc/sal/config.h.orig.port	Mon Mar 26 16:21:27 2007
-+++ sal/inc/sal/config.h	Thu Oct 25 16:23:47 2007
-@@ -110,7 +110,7 @@ extern "C" {
- /* don't know what to put in here */
+$OpenBSD: patch-sal_inc_sal_config_h,v 1.5 2008/04/28 11:18:46 robert Exp $
+--- sal/inc/sal/config.h.orig.port	Thu Nov  1 18:15:03 2007
+++ sal/inc/sal/config.h	Wed Apr 23 15:24:06 2008
+@@ -107,7 +107,7 @@ extern "C" {
+ #define SAL_SYSCONFIGFILE( name ) name ".ini"
 #endif
 
 -#if defined(SOLARIS) || defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(SCO) || defined(IRIX)
--- a/editors/openoffice/patches/patch-sal_inc_sal_types_h
+++ b/editors/openoffice/patches/patch-sal_inc_sal_types_h
@ -1,12 +1,11 @@
-$OpenBSD: patch-sal_inc_sal_types_h,v 1.3 2007/11/13 09:46:28 robert Exp $
--- sal/inc/sal/types.h.orig.port	Mon Mar 26 16:21:51 2007
-+++ sal/inc/sal/types.h	Thu Oct 25 16:23:47 2007
-@@ -291,7 +291,7 @@ typedef struct _sal_Sequence
+--- sal/inc/sal/types.h.orig.port	Thu Nov 22 13:01:43 2007
+++ sal/inc/sal/types.h	Wed Apr 23 15:24:06 2008
+@@ -330,7 +330,7 @@ typedef struct _sal_Sequence
     lack RTTI support, dynamic_cast is not included here).
  */
 #ifdef __cplusplus
-#if defined SAL_W32 || defined SOLARIS || defined LINUX || defined MACOSX || defined FREEBSD || defined NETBSD || defined AIX
-+#if defined SAL_W32 || defined SOLARIS || defined LINUX || defined MACOSX || defined FREEBSD || defined NETBSD || defined AIX || defined OPENBSD
+-#if defined SAL_W32 || defined SOLARIS || defined LINUX || defined MACOSX || defined FREEBSD || defined NETBSD || defined AIX || defined OS2
+#if defined SAL_W32 || defined SOLARIS || defined LINUX || defined MACOSX || defined FREEBSD || defined NETBSD || defined AIX || defined OS2 || defined OPENBSD
 #define SAL_CONST_CAST(type, expr) (const_cast< type >(expr))
 #define SAL_REINTERPRET_CAST(type, expr) (reinterpret_cast< type >(expr))
 #define SAL_STATIC_CAST(type, expr) (static_cast< type >(expr))
--- a/editors/openoffice/patches/patch-sal_osl_unx_makefile_mk
+++ b/editors/openoffice/patches/patch-sal_osl_unx_makefile_mk
@ -1,7 +1,7 @@
-$OpenBSD: patch-sal_osl_unx_makefile_mk,v 1.3 2007/11/13 09:46:28 robert Exp $
--- sal/osl/unx/makefile.mk.orig.port	Tue Jul  3 14:48:28 2007
-+++ sal/osl/unx/makefile.mk	Thu Oct 25 16:23:47 2007
-@@ -117,7 +117,7 @@ OBJFILES=   $(OBJ)$/conditn.obj  \
+$OpenBSD: patch-sal_osl_unx_makefile_mk,v 1.4 2008/04/28 11:18:46 robert Exp $
+--- sal/osl/unx/makefile.mk.orig.port	Mon Oct 15 14:48:23 2007
+++ sal/osl/unx/makefile.mk	Wed Apr 23 15:24:06 2008
+@@ -120,7 +120,7 @@ OBJFILES=   $(OBJ)$/conditn.obj  \
 SLOFILES += $(SLO)$/osxlocale.obj
 .ENDIF
 
--- a/editors/openoffice/patches/patch-sal_osl_unx_system_h
+++ b/editors/openoffice/patches/patch-sal_osl_unx_system_h
@ -1,7 +1,6 @@
-$OpenBSD: patch-sal_osl_unx_system_h,v 1.7 2007/11/13 09:46:28 robert Exp $
--- sal/osl/unx/system.h.orig.port	Thu Jul  5 11:06:28 2007
-+++ sal/osl/unx/system.h	Thu Oct 25 16:23:47 2007
-@@ -198,6 +198,32 @@
+--- sal/osl/unx/system.h.orig.port	Thu Jan 24 17:30:14 2008
+++ sal/osl/unx/system.h	Wed Apr 23 15:24:06 2008
+@@ -195,6 +195,32 @@
 #	define  NO_PTHREAD_RTL
 #endif
 
@ -22,7 +21,7 @@ $OpenBSD: patch-sal_osl_unx_system_h,v 1.7 2007/11/13 09:46:28 robert Exp $
 +#   include <netinet/tcp.h>
 +#       define  IORESOURCE_TRANSFER_BSD
 +#   include <machine/endian.h>
-+#	define  PTR_SIZE_T(s)	((size_t *)&(s))
+#      define  PTR_SIZE_T(s)   ((size_t *)&(s))
 +#       define  IORESOURCE_TRANSFER_BSD
 +#       define  IOCHANNEL_TRANSFER_BSD_RENO
 +#       define  pthread_testcancel()
@ -34,10 +33,10 @@ $OpenBSD: patch-sal_osl_unx_system_h,v 1.7 2007/11/13 09:46:28 robert Exp $
 #ifdef SCO
 #   define AF_IPX -1
 #	include <strings.h>
-@@ -376,7 +402,7 @@ int macxp_resolveAlias(char *path, int buflen);
+@@ -373,7 +399,7 @@ int macxp_resolveAlias(char *path, int buflen);
     !defined(LINUX)   && !defined(NETBSD) && !defined(FREEBSD) && !defined(SCO)  && \
 	!defined(AIX)     && !defined(HPUX)   && \
- 	!defined(SOLARIS) && !defined(IRIX)   && !defined(MAC) && \
+ 	!defined(SOLARIS) && !defined(IRIX)   && \
 -	!defined(MACOSX)
 +	!defined(MACOSX) && !defined(OPENBSD)
 #	error "Target platform not specified!"
--- a/editors/openoffice/patches/patch-sal_rtl_source_macro_hxx
+++ b/editors/openoffice/patches/patch-sal_rtl_source_macro_hxx
@ -1,7 +1,7 @@
-$OpenBSD: patch-sal_rtl_source_macro_hxx,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- sal/rtl/source/macro.hxx.orig.port	Wed Oct  5 07:40:14 2005
-+++ sal/rtl/source/macro.hxx	Fri Aug 18 15:47:44 2006
-@@ -53,6 +53,8 @@
+$OpenBSD: patch-sal_rtl_source_macro_hxx,v 1.3 2008/04/28 11:18:46 robert Exp $
+--- sal/rtl/source/macro.hxx.orig.port	Mon Nov 26 19:05:15 2007
+++ sal/rtl/source/macro.hxx	Wed Apr 23 15:24:06 2008
+@@ -55,6 +55,8 @@
 #define THIS_OS "FreeBSD"
 #elif defined IRIX
 #define THIS_OS "Irix"
--- a/editors/openoffice/patches/patch-scp2_source_ooo_file_library_ooo_scp
+++ b/editors/openoffice/patches/patch-scp2_source_ooo_file_library_ooo_scp
@ -1,7 +1,7 @@
-$OpenBSD: patch-scp2_source_ooo_file_library_ooo_scp,v 1.8 2007/11/13 09:46:28 robert Exp $
--- scp2/source/ooo/file_library_ooo.scp.orig.port	Fri Jul 27 12:32:48 2007
-+++ scp2/source/ooo/file_library_ooo.scp	Thu Oct 25 23:02:14 2007
-@@ -934,6 +934,8 @@ File gid_File_Lib_Freetype
+$OpenBSD: patch-scp2_source_ooo_file_library_ooo_scp,v 1.9 2008/04/28 11:18:46 robert Exp $
+--- scp2/source/ooo/file_library_ooo.scp.orig.port	Fri Jan 18 14:05:45 2008
+++ scp2/source/ooo/file_library_ooo.scp	Wed Apr 23 15:24:06 2008
+@@ -938,6 +938,8 @@ File gid_File_Lib_Freetype
     Styles = (PACKED);
   #if defined (FREEBSD) || defined (NETBSD)
     Name = "libfreetype.so.9";
@ -10,7 +10,7 @@ $OpenBSD: patch-scp2_source_ooo_file_library_ooo_scp,v 1.8 2007/11/13 09:46:28 r
   #else
     Name = "libfreetype.so.6";
   #endif
-@@ -975,7 +977,7 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Fwl , fwl)
+@@ -979,7 +981,7 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Fwl , fwl)
 
 STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Fwm , fwm)
 
@ -19,7 +19,7 @@ $OpenBSD: patch-scp2_source_ooo_file_library_ooo_scp,v 1.8 2007/11/13 09:46:28 r
 #if defined( _gcc3 )
 
 File gid_File_Lib_Gcc
-@@ -989,7 +991,7 @@ End
+@@ -993,7 +995,7 @@ End
 
 #endif
 
@ -28,7 +28,7 @@ $OpenBSD: patch-scp2_source_ooo_file_library_ooo_scp,v 1.8 2007/11/13 09:46:28 r
 #if defined( _gcc3 )
 
 File gid_File_Lib_Stdc
-@@ -2052,7 +2054,7 @@ File gid_File_Lib_Stlport
+@@ -2066,7 +2068,7 @@ File gid_File_Lib_Stlport
   #ifdef _STLP_DEBUG
   #ifdef UNX
   #if defined(_gcc3) || defined(_GCC)
@ -37,7 +37,7 @@ $OpenBSD: patch-scp2_source_ooo_file_library_ooo_scp,v 1.8 2007/11/13 09:46:28 r
     Name = STRING(CONCAT3(libstlport_,gcc_stldebug,.so.4.5));
   #else
     Name = STRING(CONCAT3(libstlport_,gcc_stldebug,UNXSUFFIX));
-@@ -2076,7 +2078,7 @@ File gid_File_Lib_Stlport
+@@ -2090,7 +2092,7 @@ File gid_File_Lib_Stlport
   #else
   #ifdef UNX
   #if defined(_gcc3) || defined(_GCC)
--- a/editors/openoffice/patches/patch-scp2_source_ure_ure_scp
+++ b/editors/openoffice/patches/patch-scp2_source_ure_ure_scp
@ -1,21 +1,20 @@
-$OpenBSD: patch-scp2_source_ure_ure_scp,v 1.5 2007/11/13 09:46:28 robert Exp $
--- scp2/source/ure/ure.scp.orig.port	Thu Oct 25 12:17:39 2007
-+++ scp2/source/ure/ure.scp	Thu Oct 25 12:18:01 2007
-@@ -644,7 +644,7 @@ End
+--- scp2/source/ure/ure.scp.orig.port	Mon Oct 15 14:57:24 2007
+++ scp2/source/ure/ure.scp	Wed Apr 23 15:24:06 2008
+@@ -576,7 +576,7 @@ End
+ #endif
 
- #if defined _gcc3 && \
-     !(defined FREEBSD || defined NETBSD || defined MACOSX \
-      || defined SYSTEM_STDLIBS || defined(WNT))
-+      || defined SYSTEM_STDLIBS || defined(WNT) || defined (OPENBSD))
+ #if defined _gcc3 && !(defined FREEBSD || defined NETBSD \
+-	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
+	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(OPENBSD))
 File gid_File_Dl_GccS
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
-@@ -655,7 +655,7 @@ End
+@@ -586,7 +586,7 @@ End
+ #endif
 
- #if defined _gcc3 && \
-     !(defined FREEBSD || defined NETBSD || defined MACOSX \
-      || defined SYSTEM_STDLIBS || defined(WNT))
-+      || defined SYSTEM_STDLIBS || defined(WNT) || defined(OPENBSD))
+ #if defined _gcc3 && !(defined FREEBSD || defined NETBSD \
+-	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
+	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(OPENBSD))
 File gid_File_Dl_Stdcpp
-     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+     TXT_FILE_BODY;
--- a/editors/openoffice/patches/patch-instsetoo_native_inc_openoffice_unix_packagelist_language_txt
+++ b/editors/openoffice/patches/patch-instsetoo_native_inc_openoffice_unix_packagelist_language_txt
@ -1,6 +1,7 @@
--- instsetoo_native/inc_openoffice/unix/packagelist_language.txt.orig.port	Tue May  8 13:49:46 2007
-+++ instsetoo_native/inc_openoffice/unix/packagelist_language.txt	Fri Jun 15 09:31:34 2007
-@@ -28,7 +28,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+$OpenBSD: patch-setup_native_source_packinfo_packinfo_office_lang_txt,v 1.1 2008/04/28 11:18:46 robert Exp $
+--- setup_native/source/packinfo/packinfo_office_lang.txt.orig.port	Fri Apr 25 10:48:15 2008
+++ setup_native/source/packinfo/packinfo_office_lang.txt	Fri Apr 25 10:49:37 2008
+@@ -28,7 +28,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
@ -9,7 +10,7 @@
 End
 
 Start
-@@ -43,7 +43,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -43,7 +43,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Language fonts module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
@ -18,7 +19,7 @@
 End
 
 Start
-@@ -58,7 +58,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -58,7 +58,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Language resource module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
@ -27,7 +28,7 @@
 End
 
 Start
-@@ -73,5 +73,5 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -73,5 +73,5 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Language help module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
--- a/editors/openoffice/patches/patch-instsetoo_native_inc_openoffice_unix_packagelist_txt
+++ b/editors/openoffice/patches/patch-instsetoo_native_inc_openoffice_unix_packagelist_txt
@ -1,6 +1,7 @@
--- instsetoo_native/inc_openoffice/unix/packagelist.txt.orig.port	Fri May 25 16:35:43 2007
-+++ instsetoo_native/inc_openoffice/unix/packagelist.txt	Sun Oct 28 09:10:30 2007
-@@ -29,7 +29,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+$OpenBSD: patch-setup_native_source_packinfo_packinfo_office_txt,v 1.1 2008/04/28 11:18:46 robert Exp $
+--- setup_native/source/packinfo/packinfo_office.txt.orig.port	Fri Apr 25 10:48:10 2008
+++ setup_native/source/packinfo/packinfo_office.txt	Fri Apr 25 10:49:04 2008
+@@ -29,7 +29,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Gnome integration module for %PRODUCTNAME %PRODUCTVERSION"
@ -9,7 +10,7 @@
 End
 
 Start
-@@ -44,7 +44,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -44,7 +44,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "KDE integration module for %PRODUCTNAME %PRODUCTVERSION"
@ -18,7 +19,7 @@
 End
 
 Start
-@@ -59,7 +59,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -59,7 +59,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Core module for %PRODUCTNAME %PRODUCTVERSION"
@ -27,7 +28,7 @@
 End
 
 Start
-@@ -75,7 +75,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -75,7 +75,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Writer module for %PRODUCTNAME %PRODUCTVERSION"
@ -36,7 +37,7 @@
 End
 
 Start
-@@ -91,7 +91,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -91,7 +91,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Calc module for %PRODUCTNAME %PRODUCTVERSION"
@ -45,7 +46,7 @@
 End
 
 Start
-@@ -107,7 +107,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -107,7 +107,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Draw module for %PRODUCTNAME %PRODUCTVERSION"
@ -54,7 +55,7 @@
 End
 
 Start
-@@ -123,7 +123,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -123,7 +123,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Impress module for %PRODUCTNAME %PRODUCTVERSION"
@ -63,7 +64,7 @@
 End
 
 Start
-@@ -139,7 +139,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -139,7 +139,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Base module for %PRODUCTNAME %PRODUCTVERSION"
@ -72,7 +73,7 @@
 End
 
 Start
-@@ -155,7 +155,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -155,7 +155,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Math module for %PRODUCTNAME %PRODUCTVERSION"
@ -81,7 +82,7 @@
 End
 
 Start
-@@ -170,7 +170,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -170,7 +170,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Graphic filter module for %PRODUCTNAME %PRODUCTVERSION"
@ -90,7 +91,7 @@
 End
 
 Start
-@@ -185,7 +185,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -185,7 +185,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Testtool module for %PRODUCTNAME %PRODUCTVERSION"
@ -99,7 +100,7 @@
 End
 
 Start
-@@ -200,7 +200,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -200,7 +200,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "English spellchecker module for %PRODUCTNAME %PRODUCTVERSION"
@ -108,7 +109,7 @@
 End
 
 Start
-@@ -215,7 +215,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -215,7 +215,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "XSLT filter samples module for %PRODUCTNAME %PRODUCTVERSION"
@ -117,7 +118,7 @@
 End
 
 Start
-@@ -230,7 +230,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -230,7 +230,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Java filter module for %PRODUCTNAME %PRODUCTVERSION"
@ -126,25 +127,7 @@
 End
 
 Start
-@@ -245,7 +245,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Optional gallery for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -260,7 +260,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Language utilities for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -275,7 +275,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -245,7 +245,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "ActiveX control for %PRODUCTNAME %PRODUCTVERSION"
@ -153,7 +136,7 @@
 End
 
 Start
-@@ -288,7 +288,7 @@ copyright = "1999-2005 by Sun Microsystems"
+@@ -258,7 +258,7 @@ copyright = "1999-2005 by Sun Microsystems"
 solariscopyright = "solariscopyrightfile"
 vendor = "Sun Microsystems, Inc."
 description = "Online update modul for %PRODUCTNAME %PRODUCTVERSION"
@ -162,7 +145,7 @@
 End
 
 Start
-@@ -303,7 +303,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -273,7 +273,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Pyuno module for %PRODUCTNAME %PRODUCTVERSION"
@ -171,7 +154,7 @@
 End
 
 Start
-@@ -318,7 +318,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -288,7 +288,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Email mailmerge module for %PRODUCTNAME %PRODUCTVERSION"
@ -180,7 +163,7 @@
 End
 
 Start
-@@ -333,7 +333,7 @@ copyright = "1999-2007 by OpenOffice.org"
+@@ -303,7 +303,7 @@ copyright = "1999-2007 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "OpenOffice.org"
 description = "Headless display module for %PRODUCTNAME %PRODUCTVERSION"
@ -189,7 +172,7 @@
 End
 
 Start
-@@ -348,7 +348,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -318,7 +318,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Mailcap module for %PRODUCTNAME %PRODUCTVERSION"
@ -198,7 +181,7 @@
 End
 
 Start
-@@ -364,7 +364,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -334,7 +334,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@ -207,7 +190,7 @@
 End
 
 Start
-@@ -379,7 +379,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -349,7 +349,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@ -216,7 +199,7 @@
 End
 
 Start
-@@ -394,7 +394,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -364,7 +364,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@ -225,7 +208,7 @@
 End
 
 Start
-@@ -409,7 +409,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -379,7 +379,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@ -234,7 +217,7 @@
 End
 
 Start
-@@ -424,7 +424,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -394,7 +394,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@ -243,7 +226,7 @@
 End
 
 Start
-@@ -439,7 +439,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -409,7 +409,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@ -252,7 +235,7 @@
 End
 
 Start
-@@ -454,7 +454,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -424,7 +424,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@ -261,7 +244,7 @@
 End
 
 Start
-@@ -469,7 +469,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -439,7 +439,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@ -270,7 +253,7 @@
 End
 
 Start
-@@ -485,5 +485,5 @@ copyright = "1999-2006 by %PRODUCTNAME"
+@@ -455,5 +455,5 @@ copyright = "1999-2007 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
--- a/editors/openoffice/patches/patch-shell_source_backends_localebe_localebackend_cxx
+++ b/editors/openoffice/patches/patch-shell_source_backends_localebe_localebackend_cxx
@ -1,12 +1,11 @@
-$OpenBSD: patch-shell_source_backends_localebe_localebackend_cxx,v 1.4 2007/04/18 13:20:48 kurt Exp $
--- shell/source/backends/localebe/localebackend.cxx.orig.port	Sat Sep 16 21:39:02 2006
-+++ shell/source/backends/localebe/localebackend.cxx	Wed Apr 18 03:46:27 2007
+--- shell/source/backends/localebe/localebackend.cxx.orig.port	Thu Sep 20 16:46:57 2007
+++ shell/source/backends/localebe/localebackend.cxx	Wed Apr 23 15:24:06 2008
@@ -53,7 +53,7 @@
 
 #include <stdio.h>
 
-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD)
-+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD)
+-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OS2)
+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OS2) || defined(OPENBSD)
 
 #include <rtl/ustrbuf.hxx>
 #include <locale.h>
@ -14,8 +13,8 @@ $OpenBSD: patch-shell_source_backends_localebe_localebackend_cxx,v 1.4 2007/04/1
 
 rtl::OUString LocaleBackend::getLocale(void)
 {
-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD)
-+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD)
+-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OS2)
+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OS2) || defined(OPENBSD)
     return ImplGetLocale(LC_CTYPE);
 #elif defined (MACOSX)
 	return ImplGetLocale("AppleLocale");
@ -23,8 +22,8 @@ $OpenBSD: patch-shell_source_backends_localebe_localebackend_cxx,v 1.4 2007/04/1
 
 rtl::OUString LocaleBackend::getUILocale(void)
 {
-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD)
-+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD)
+-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OS2)
+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OS2) || defined(OPENBSD)
     return ImplGetLocale(LC_MESSAGES);
 #elif defined(MACOSX)
 	return ImplGetLocale("AppleLanguages");
--- a/editors/openoffice/patches/patch-shell_source_unix_sysshell_makefile_mk
+++ b/editors/openoffice/patches/patch-shell_source_unix_sysshell_makefile_mk
@ -1,6 +1,6 @@
-$OpenBSD: patch-shell_source_unix_sysshell_makefile_mk,v 1.1 2007/06/09 10:42:56 steven Exp $
--- shell/source/unix/sysshell/makefile.mk.orig.port	Fri Jan 19 14:08:02 2007
-+++ shell/source/unix/sysshell/makefile.mk	Thu Jun  7 07:26:10 2007
+$OpenBSD: patch-shell_source_unix_sysshell_makefile_mk,v 1.2 2008/04/28 11:18:46 robert Exp $
+--- shell/source/unix/sysshell/makefile.mk.orig.port	Thu Sep 20 16:47:22 2007
+++ shell/source/unix/sysshell/makefile.mk	Wed Apr 23 15:24:06 2008
@@ -48,6 +48,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+=-DSYSTEM_EXPAT
 .ENDIF
@ -13,7 +13,7 @@ $OpenBSD: patch-shell_source_unix_sysshell_makefile_mk,v 1.1 2007/06/09 10:42:56
 # --- Files --------------------------------------------------------
 
 LIB1OBJFILES=$(SLO)$/systemshell.obj
-@@ -72,6 +77,7 @@ SHL1STDLIBS=$(EXPATASCII3RDLIB)\
+@@ -80,6 +85,7 @@ SHL1STDLIBS=$(EXPATASCII3RDLIB)\
 	$(CPPULIB)\
 	$(CPPUHELPERLIB)\
 	$(COMPHELPERLIB)
--- a/editors/openoffice/patches/patch-solenv_bin_modules_installer_globals_pm
+++ b/editors/openoffice/patches/patch-solenv_bin_modules_installer_globals_pm
@ -1,7 +1,7 @@
-$OpenBSD: patch-solenv_bin_modules_installer_globals_pm,v 1.5 2007/11/13 09:46:28 robert Exp $
--- solenv/bin/modules/installer/globals.pm.orig.port	Wed Jul 11 16:40:26 2007
-+++ solenv/bin/modules/installer/globals.pm	Thu Oct 25 16:23:47 2007
-@@ -155,7 +155,7 @@ BEGIN
+$OpenBSD: patch-solenv_bin_modules_installer_globals_pm,v 1.6 2008/04/28 11:18:46 robert Exp $
+--- solenv/bin/modules/installer/globals.pm.orig.port	Mon Jan 14 20:07:35 2008
+++ solenv/bin/modules/installer/globals.pm	Wed Apr 23 15:24:06 2008
+@@ -161,7 +161,7 @@ BEGIN
 	$jdklib = "";
 	$jrepath = "";
 	
--- a/editors/openoffice/patches/patch-solenv_config_ssolar_cmn
+++ b/editors/openoffice/patches/patch-solenv_config_ssolar_cmn
@ -1,7 +1,7 @@
-$OpenBSD: patch-solenv_config_ssolar_cmn,v 1.6 2007/11/13 09:46:28 robert Exp $
--- solenv/config/ssolar.cmn.orig.port	Tue Jul 31 15:05:38 2007
-+++ solenv/config/ssolar.cmn	Thu Oct 25 16:23:47 2007
-@@ -239,7 +239,7 @@ unxsogs
+$OpenBSD: patch-solenv_config_ssolar_cmn,v 1.7 2008/04/28 11:18:46 robert Exp $
+--- solenv/config/ssolar.cmn.orig.port	Thu Jan 17 16:07:49 2008
+++ solenv/config/ssolar.cmn	Wed Apr 23 15:24:06 2008
+@@ -260,7 +260,7 @@ unxsogs
 {
 }
 
--- a/editors/openoffice/patches/patch-solenv_inc_libs_mk
+++ b/editors/openoffice/patches/patch-solenv_inc_libs_mk
@ -1,7 +1,7 @@
-$OpenBSD: patch-solenv_inc_libs_mk,v 1.6 2007/11/13 09:46:28 robert Exp $
--- solenv/inc/libs.mk.orig.port	Tue Jul 31 15:06:06 2007
-+++ solenv/inc/libs.mk	Thu Oct 25 16:23:47 2007
-@@ -199,7 +199,7 @@ ZLIB3RDLIB=-lz
+$OpenBSD: patch-solenv_inc_libs_mk,v 1.7 2008/04/28 11:18:46 robert Exp $
+--- solenv/inc/libs.mk.orig.port	Wed Dec 12 14:15:14 2007
+++ solenv/inc/libs.mk	Wed Apr 23 15:24:06 2008
+@@ -210,7 +210,7 @@ ZLIB3RDLIB=-lz
 ZLIB3RDLIB=-lzlib
 .ENDIF
 .IF "$(SYSTEM_JPEG)"=="YES"
--- a/editors/openoffice/patches/patch-solenv_inc_settings_mk
+++ b/editors/openoffice/patches/patch-solenv_inc_settings_mk
@ -1,7 +1,7 @@
-$OpenBSD: patch-solenv_inc_settings_mk,v 1.7 2007/11/13 09:46:28 robert Exp $
--- solenv/inc/settings.mk.orig.port	Thu Oct 25 16:21:59 2007
-+++ solenv/inc/settings.mk	Thu Oct 25 16:23:47 2007
-@@ -1063,6 +1063,8 @@ CDEFS+=-DOSL_DEBUG_LEVEL=$(DBG_LEVEL)
+$OpenBSD: patch-solenv_inc_settings_mk,v 1.8 2008/04/28 11:18:46 robert Exp $
+--- solenv/inc/settings.mk.orig.port	Thu Jan 17 17:04:51 2008
+++ solenv/inc/settings.mk	Wed Apr 23 15:24:06 2008
+@@ -1067,6 +1067,8 @@ CDEFS+=-DOSL_DEBUG_LEVEL=$(DBG_LEVEL)
 RSCDEFS+=-DOSL_DEBUG_LEVEL=$(DBG_LEVEL)
 .ENDIF
 
@ -10,7 +10,7 @@ $OpenBSD: patch-solenv_inc_settings_mk,v 1.7 2007/11/13 09:46:28 robert Exp $
 .IF "$(optimize)"!=""
 CDEFS+=$(CDEFSOPT)
 CFLAGS+=$(CFLAGSOPT)
-@@ -1195,7 +1197,7 @@ CFLAGSAPPEND+=$(ENVWARNFLAGS)
+@@ -1199,7 +1201,7 @@ CFLAGSAPPEND+=$(ENVWARNFLAGS)
 
 CDEFS+= $(ADDCDEFS)
 CDEFS+= $(ENVCDEFS)
--- a/editors/openoffice/patches/patch-solenv_inc_tg_ext_mk
+++ b/editors/openoffice/patches/patch-solenv_inc_tg_ext_mk
@ -1,7 +1,7 @@
-$OpenBSD: patch-solenv_inc_tg_ext_mk,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- solenv/inc/tg_ext.mk.orig.port	Wed Jul  5 17:58:11 2006
-+++ solenv/inc/tg_ext.mk	Fri Aug 18 15:47:45 2006
-@@ -48,7 +48,9 @@ INCLUDE!:=$(INCLUDE:s/ -I/;/)
+$OpenBSD: patch-solenv_inc_tg_ext_mk,v 1.3 2008/04/28 11:18:46 robert Exp $
+--- solenv/inc/tg_ext.mk.orig.port	Wed Jan  2 18:32:52 2008
+++ solenv/inc/tg_ext.mk	Wed Apr 23 15:24:06 2008
+@@ -56,7 +56,9 @@ INCLUDE!:=$(INCLUDE:s/ -I/;/)
 
 .IF "$(OS)"!="NETBSD"
 .IF "$(OS)"!="FREEBSD"
--- a/editors/openoffice/patches/patch-store_util_makefile_mk
+++ b/editors/openoffice/patches/patch-store_util_makefile_mk
@ -1,7 +1,7 @@
-$OpenBSD: patch-store_util_makefile_mk,v 1.4 2007/11/13 09:46:28 robert Exp $
--- store/util/makefile.mk.orig.port	Thu Oct 25 12:28:11 2007
-+++ store/util/makefile.mk	Thu Oct 25 12:28:34 2007
-@@ -79,7 +79,7 @@ SHL1STDLIBS+=$(LIBSTLPORT)
+$OpenBSD: patch-store_util_makefile_mk,v 1.5 2008/04/28 11:18:46 robert Exp $
+--- store/util/makefile.mk.orig.port	Wed Dec 12 14:23:13 2007
+++ store/util/makefile.mk	Wed Apr 23 15:24:06 2008
+@@ -80,7 +80,7 @@ SHL1STDLIBS+=$(LIBSTLPORT)
 .IF "$(GUI)"=="WNT"
 SHL1STDLIBS+= 	-lsupc++
 .ELSE
--- a/editors/openoffice/patches/patch-sw_source_core_unocore_unochart_cxx
+++ b/editors/openoffice/patches/patch-sw_source_core_unocore_unochart_cxx
@ -1,39 +0,0 @@
-$OpenBSD: patch-sw_source_core_unocore_unochart_cxx,v 1.2 2007/12/07 11:30:55 robert Exp $
--- sw/source/core/unocore/unochart.cxx.orig.port	Fri Oct 26 16:59:49 2007
-+++ sw/source/core/unocore/unochart.cxx	Thu Dec  6 16:36:13 2007
-@@ -1640,7 +1640,7 @@ void SwChartDataProvider::InvalidateTable( const SwTab
-         Set_DataSequenceRef_t::iterator aIt( rSet.begin() );
-         while (aIt != rSet.end())
-         {
-            uno::Reference< util::XModifiable > xRef( uno::Reference< chart2::data::XDataSequence >(*aIt), uno::UNO_QUERY );
-+            uno::Reference< util::XModifiable > xRef = uno::Reference< util::XModifiable>( uno::Reference< chart2::data::XDataSequence >(*aIt), uno::UNO_QUERY );
-             if (xRef.is())
-             {
-                 // mark the sequence as 'dirty' and notify listeners
-@@ -1673,7 +1673,7 @@ sal_Bool SwChartDataProvider::DeleteBox( const SwTable
-             sal_Bool bNowEmpty = sal_False;
- 
-             // check if weak reference is still valid...
-            uno::Reference< chart2::data::XDataSequence > xRef( uno::Reference< chart2::data::XDataSequence>(*aIt), uno::UNO_QUERY );
-+            uno::Reference< chart2::data::XDataSequence > xRef = uno::Reference< chart2::data::XDataSequence >( uno::Reference< chart2::data::XDataSequence>(*aIt), uno::UNO_QUERY );
-             if (xRef.is())
-             {
-                 // then delete that table box (check if implementation cursor needs to be adjusted)
-@@ -1715,7 +1715,7 @@ void SwChartDataProvider::DisposeAllDataSequences( con
-         Set_DataSequenceRef_t::iterator aEndIt( rSet.end() );
-         while (aIt != aEndIt)
-         {
-            uno::Reference< lang::XComponent > xRef( uno::Reference< chart2::data::XDataSequence >(*aIt), uno::UNO_QUERY );
-+            uno::Reference< lang::XComponent > xRef = uno::Reference< lang::XComponent>( uno::Reference< chart2::data::XDataSequence >(*aIt), uno::UNO_QUERY );
-             if (xRef.is())
-             {
-                 xRef->dispose();
-@@ -1794,7 +1794,7 @@ void SwChartDataProvider::AddRowCols(
- 			Set_DataSequenceRef_t::iterator aIt( rSet.begin() );
- 			while (aIt != rSet.end())
- 			{
-				uno::Reference< chart2::data::XTextualDataSequence > xRef( uno::Reference< chart2::data::XDataSequence >(*aIt), uno::UNO_QUERY );
-+				uno::Reference< chart2::data::XTextualDataSequence > xRef = uno::Reference< chart2::data::XTextualDataSequence>( uno::Reference< chart2::data::XDataSequence >(*aIt), uno::UNO_QUERY );
- 				if (xRef.is())
- 				{
- 					const sal_Int32 nLen = xRef->getTextualData().getLength();
--- a/editors/openoffice/patches/patch-sw_source_core_view_viewsh_cxx
+++ b/editors/openoffice/patches/patch-sw_source_core_view_viewsh_cxx
@ -1,12 +0,0 @@
-$OpenBSD: patch-sw_source_core_view_viewsh_cxx,v 1.1 2007/11/13 09:46:28 robert Exp $
--- sw/source/core/view/viewsh.cxx.orig.port	Sat Oct 27 10:58:07 2007
-+++ sw/source/core/view/viewsh.cxx	Sat Oct 27 11:01:47 2007
-@@ -1442,7 +1442,7 @@ BOOL ViewShell::SmoothScroll( long lXDiff, long lYDiff
- 					const bool bMapModeWasEnabledVDev(pVout->IsMapModeEnabled());
- 					pVout->EnableMapMode(false);
- 					const Bitmap aBitmap(pVout->GetBitmap(Point(), pVout->GetOutputSizePixel()));
-					SvFileStream aNew(String(ByteString( "c:\\test.bmp" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC);
-+					SvFileStream aNew = SvFileStream(String(ByteString( "c:\\test.bmp" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC);
- 					aNew << aBitmap;
- 					pVout->EnableMapMode(bMapModeWasEnabledVDev);
- 				}
--- a/editors/openoffice/patches/patch-sw_source_filter_ww8_wrtw8nds_cxx
+++ b/editors/openoffice/patches/patch-sw_source_filter_ww8_wrtw8nds_cxx
@ -1,12 +0,0 @@
-$OpenBSD: patch-sw_source_filter_ww8_wrtw8nds_cxx,v 1.1 2007/11/13 09:46:28 robert Exp $
--- sw/source/filter/ww8/wrtw8nds.cxx.orig.port	Sat Oct 27 11:12:27 2007
-+++ sw/source/filter/ww8/wrtw8nds.cxx	Sat Oct 27 11:12:38 2007
-@@ -1420,7 +1420,7 @@ SvxBrushItem SwWW8Writer::TrueFrameBgBrush(const SwFrm
-     if (!pRet)
-         pRet = GetCurrentPageBgBrush();
- 
-    SvxBrushItem aRet( Color(COL_WHITE), RES_BACKGROUND );
-+    SvxBrushItem aRet = SvxBrushItem( Color(COL_WHITE), RES_BACKGROUND );
-     if (pRet && (pRet->GetGraphic() ||( pRet->GetColor() != COL_TRANSPARENT)))
-         aRet = *pRet;
- 
--- a/editors/openoffice/patches/patch-tools_bootstrp_command_cxx
+++ b/editors/openoffice/patches/patch-tools_bootstrp_command_cxx
@ -1,7 +1,7 @@
-$OpenBSD: patch-tools_bootstrp_command_cxx,v 1.3 2006/12/13 10:25:14 robert Exp $
--- tools/bootstrp/command.cxx.orig.port	Fri Dec  1 18:57:50 2006
-+++ tools/bootstrp/command.cxx	Mon Dec 11 22:27:43 2006
-@@ -76,7 +76,7 @@
+$OpenBSD: patch-tools_bootstrp_command_cxx,v 1.4 2008/04/28 11:18:46 robert Exp $
+--- tools/bootstrp/command.cxx.orig.port	Fri Nov  2 13:58:24 2007
+++ tools/bootstrp/command.cxx	Wed Apr 23 15:24:06 2008
+@@ -80,7 +80,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #if ( defined NETBSD ) || defined (FREEBSD) || defined (AIX) \
--- a/editors/openoffice/patches/patch-tools_inc_tools_inetdef_hxx
+++ b/editors/openoffice/patches/patch-tools_inc_tools_inetdef_hxx
@ -1,7 +1,7 @@
-$OpenBSD: patch-tools_inc_tools_inetdef_hxx,v 1.1 2007/11/13 09:46:28 robert Exp $
--- tools/inc/tools/inetdef.hxx.orig.port	Sat Oct 27 12:11:20 2007
-+++ tools/inc/tools/inetdef.hxx	Sat Oct 27 12:11:34 2007
-@@ -62,6 +62,8 @@
+$OpenBSD: patch-tools_inc_tools_inetdef_hxx,v 1.2 2008/04/28 11:18:46 robert Exp $
+--- tools/inc/tools/inetdef.hxx.orig.port	Fri Nov  2 13:59:54 2007
+++ tools/inc/tools/inetdef.hxx	Wed Apr 23 15:24:06 2008
+@@ -64,6 +64,8 @@
 #define TOOLS_INETDEF_OS "FreeBSD/i386"
 #elif defined FREEBSD && defined X86_64
 #define TOOLS_INETDEF_OS "FreeBSD/amd64"
--- a/editors/openoffice/patches/patch-tools_inc_tools_solar_h
+++ b/editors/openoffice/patches/patch-tools_inc_tools_solar_h
@ -1,15 +1,14 @@
-$OpenBSD: patch-tools_inc_tools_solar_h,v 1.1 2007/11/13 09:46:28 robert Exp $
--- tools/inc/tools/solar.h.orig.port	Fri May 25 13:08:02 2007
-+++ tools/inc/tools/solar.h	Sun Nov  4 22:38:56 2007
-@@ -342,6 +342,7 @@ template<typename T> inline T Abs(T a) { return (a>=0?
- #define SYSTEM_UNXSOGS		31
+--- tools/inc/tools/solar.h.orig.port	Fri Nov  2 14:00:07 2007
+++ tools/inc/tools/solar.h	Wed Apr 23 15:24:06 2008
+@@ -343,6 +343,7 @@ template<typename T> inline T Abs(T a) { return (a>=0?
 #define SYSTEM_UNXSOGI		32
 #define SYSTEM_UNXMACXI		33
-+#define SYSTEM_UNXOBSD		34
+ #define SYSTEM_OS2GCCI		34
+#define SYSTEM_UNXOBSD		35
 #define SYSTEM_WNTGCCI  	99
 
 #if defined WNT
-@@ -395,6 +396,8 @@ template<typename T> inline T Abs(T a) { return (a>=0?
+@@ -398,6 +399,8 @@ template<typename T> inline T Abs(T a) { return (a>=0?
   #define __DLLEXTENSION "mxp.dylib"
 #elif defined MACOSX && defined X86
   #define __DLLEXTENSION "mxi.dylib"
--- a/editors/openoffice/patches/patch-vcl_source_control_combobox_cxx
+++ b/editors/openoffice/patches/patch-vcl_source_control_combobox_cxx
@ -1,12 +0,0 @@
-$OpenBSD: patch-vcl_source_control_combobox_cxx,v 1.1 2007/11/13 09:46:28 robert Exp $
--- vcl/source/control/combobox.cxx.orig.port	Fri Oct 26 10:46:04 2007
-+++ vcl/source/control/combobox.cxx	Fri Oct 26 10:46:45 2007
-@@ -176,7 +176,7 @@ void ComboBox::ImplCalcEditHeight()
-     // FIXME: currently only on aqua; see if we can use this on other platforms
-     if( ImplGetSVData()->maNWFData.mbNoFocusRects && ! IsDropDownBox() )
-     {
-        Region aCtrlRegion( Rectangle( Point(), Size( 10, 10 ) ) );
-+        Region aCtrlRegion = Region ( Rectangle( Point(), Size( 10, 10 ) ) );
-         Region aBoundRegion, aContentRegion;
-         ImplControlValue aControlValue;
-         if( GetNativeControlRegion( CTRL_EDITBOX, PART_ENTIRE_CONTROL,
--- a/editors/openoffice/patches/patch-vcl_source_control_tabctrl_cxx
+++ b/editors/openoffice/patches/patch-vcl_source_control_tabctrl_cxx
@ -1,12 +0,0 @@
-$OpenBSD: patch-vcl_source_control_tabctrl_cxx,v 1.1 2007/11/13 09:46:28 robert Exp $
--- vcl/source/control/tabctrl.cxx.orig.port	Fri Oct 26 10:49:05 2007
-+++ vcl/source/control/tabctrl.cxx	Fri Oct 26 10:49:16 2007
-@@ -420,7 +420,7 @@ Size TabControl::ImplGetItemSize( ImplTabItem* pItem, 
-     pItem->maFormatText = pItem->maText;
-     Size aSize( GetCtrlTextWidth( pItem->maFormatText ), GetTextHeight() );
-     
-    Region aCtrlRegion(  Rectangle( Point( 0, 0 ), aSize ) );
-+    Region aCtrlRegion = Region (  Rectangle( Point( 0, 0 ), aSize ) );
-     Region aBoundingRgn, aContentRgn;
-     const ImplControlValue aControlValue( BUTTONVALUE_DONTKNOW, rtl::OUString(), 0 );
-     if(GetNativeControlRegion( CTRL_TAB_ITEM, PART_ENTIRE_CONTROL, aCtrlRegion,
--- a/editors/openoffice/patches/patch-vcl_source_window_brdwin_cxx
+++ b/editors/openoffice/patches/patch-vcl_source_window_brdwin_cxx
@ -1,12 +0,0 @@
-$OpenBSD: patch-vcl_source_window_brdwin_cxx,v 1.1 2007/11/13 09:46:28 robert Exp $
--- vcl/source/window/brdwin.cxx.orig.port	Fri Oct 26 10:54:16 2007
-+++ vcl/source/window/brdwin.cxx	Fri Oct 26 10:54:30 2007
-@@ -1181,7 +1181,7 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pD
-             if( mbNWFBorder )
-             {
-                 ImplControlValue aControlValue;
-                Region aCtrlRegion( Rectangle( Point(), Size( mnWidth < 10 ? 10 : mnWidth, mnHeight < 10 ? 10 : mnHeight ) ) );
-+                Region aCtrlRegion = Region ( Rectangle( Point(), Size( mnWidth < 10 ? 10 : mnWidth, mnHeight < 10 ? 10 : mnHeight ) ) );
-                 Region aBoundingRgn( aCtrlRegion );
-                 Region aContentRgn( aCtrlRegion );
-                 if( pWin->GetNativeControlRegion( aCtrlType, PART_ENTIRE_CONTROL, aCtrlRegion,
--- a/editors/openoffice/patches/patch-vcl_source_window_status_cxx
+++ b/editors/openoffice/patches/patch-vcl_source_window_status_cxx
@ -1,21 +0,0 @@
-$OpenBSD: patch-vcl_source_window_status_cxx,v 1.1 2007/11/13 09:46:28 robert Exp $
--- vcl/source/window/status.cxx.orig.port	Fri Oct 26 10:56:17 2007
-+++ vcl/source/window/status.cxx	Fri Oct 26 10:56:52 2007
-@@ -694,7 +694,7 @@ void StatusBar::ImplCalcProgressRect()
-     if( IsNativeControlSupported( CTRL_PROGRESS, PART_ENTIRE_CONTROL ) )
-     {
-         ImplControlValue aValue;
-        Region aControlRegion( Rectangle( Point(), maPrgsFrameRect.GetSize() ) );
-+        Region aControlRegion = Region ( Rectangle( Point(), maPrgsFrameRect.GetSize() ) );
-         Region aNativeControlRegion, aNativeContentRegion;
-         if( (bNativeOK = GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion,
-                                                  CTRL_STATE_ENABLED, aValue, rtl::OUString(),
-@@ -1689,7 +1689,7 @@ Size StatusBar::CalcWindowSizePixel() const
-     if( pThis->IsNativeControlSupported( CTRL_PROGRESS, PART_ENTIRE_CONTROL ) )
-     {
-         ImplControlValue aValue;
-        Region aControlRegion( Rectangle( Point(), Size( nCalcWidth, nMinHeight ) ) );
-+        Region aControlRegion = Region ( Rectangle( Point(), Size( nCalcWidth, nMinHeight ) ) );
-         Region aNativeControlRegion, aNativeContentRegion;
-         if( pThis->GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion,
-                                            CTRL_STATE_ENABLED, aValue, rtl::OUString(),
--- a/editors/openoffice/patches/patch-vcl_source_window_window_cxx
+++ b/editors/openoffice/patches/patch-vcl_source_window_window_cxx
@ -0,0 +1,12 @@
+$OpenBSD: patch-vcl_source_window_window_cxx,v 1.1 2008/04/28 11:18:46 robert Exp $
+--- vcl/source/window/window.cxx.orig.port	Wed Apr 23 18:09:35 2008
+++ vcl/source/window/window.cxx	Wed Apr 23 18:11:26 2008
+@@ -346,7 +346,7 @@ void Window::ImplInitAppFontData( Window* pWindow )
+         // of control sizes, if yes, make app font scalings larger
+         // so dialog positioning is not completely off
+         ImplControlValue aControlValue;
+-        Region aCtrlRegion( Rectangle( Point(), Size( nTextWidth < 10 ? 10 : nTextWidth, nTextHeight < 10 ? 10 : nTextHeight ) ) );
+        Region aCtrlRegion = Region ( Rectangle( Point(), Size( nTextWidth < 10 ? 10 : nTextWidth, nTextHeight < 10 ? 10 : nTextHeight ) ) );
+         Region aBoundingRgn( aCtrlRegion );
+         Region aContentRgn( aCtrlRegion );
+         if( pWindow->GetNativeControlRegion( CTRL_EDITBOX, PART_ENTIRE_CONTROL, aCtrlRegion,
--- a/editors/openoffice/patches/patch-vcl_unx_source_app_saldisp_cxx
+++ b/editors/openoffice/patches/patch-vcl_unx_source_app_saldisp_cxx
@ -1,7 +1,7 @@
-$OpenBSD: patch-vcl_unx_source_app_saldisp_cxx,v 1.5 2007/03/17 15:27:45 robert Exp $
--- vcl/unx/source/app/saldisp.cxx.orig.port	Wed Jan 17 07:50:56 2007
-+++ vcl/unx/source/app/saldisp.cxx	Tue Feb  6 23:13:34 2007
-@@ -972,7 +972,7 @@ bHandleStartupNotification
+$OpenBSD: patch-vcl_unx_source_app_saldisp_cxx,v 1.6 2008/04/28 11:18:46 robert Exp $
+--- vcl/unx/source/app/saldisp.cxx.orig.port	Wed Jan 23 18:18:18 2008
+++ vcl/unx/source/app/saldisp.cxx	Wed Apr 23 15:24:06 2008
+@@ -927,7 +927,7 @@ void SalDisplay::Init()
         sscanf( pProperties, "%li", &nProperties_ );
     else
     {
--- a/editors/openoffice/patches/patch-vcl_unx_source_plugadapt_salmain_cxx
+++ b/editors/openoffice/patches/patch-vcl_unx_source_plugadapt_salmain_cxx
@ -1,12 +0,0 @@
-$OpenBSD: patch-vcl_unx_source_plugadapt_salmain_cxx,v 1.3 2006/12/13 10:25:14 robert Exp $
--- vcl/unx/source/plugadapt/salmain.cxx.orig.port	Fri Dec  1 18:58:04 2006
-+++ vcl/unx/source/plugadapt/salmain.cxx	Mon Dec 11 22:27:45 2006
-@@ -36,7 +36,7 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_vcl.hxx"
- 
-#if defined(MACOSX) || defined(FREEBSD)
-+#if defined(MACOSX) || defined(FREEBSD) || defined(OPENBSD)
- // rlimit needs sys/types.h
- #include <sys/types.h>
- #include <sys/time.h>
--- a/editors/openoffice/patches/patch-vcl_util_makefile_mk
+++ b/editors/openoffice/patches/patch-vcl_util_makefile_mk
@ -1,7 +1,7 @@
--- vcl/util/makefile.mk.orig.port	Thu Aug  2 17:00:59 2007
-+++ vcl/util/makefile.mk	Thu Oct 25 16:23:48 2007
-@@ -322,7 +322,7 @@ SHL2STDLIBS+=$(LIBSN_LIBS)
- .ENDIF
+--- vcl/util/makefile.mk.orig.port	Wed Jan 23 18:19:40 2008
+++ vcl/util/makefile.mk	Wed Apr 23 15:24:06 2008
+@@ -324,7 +324,7 @@ SHL2STDLIBS += -ldl -lnsl -lsocket
+ .IF "$(GUIBASE)"=="unx"
 
 SHL2STDLIBS += -lXext -lSM -lICE -lX11
 -.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD"
--- a/editors/openoffice/pkg/DESCR-i18n-pt-br
+++ b/editors/openoffice/pkg/DESCR-i18n-pt-br
--- a/editors/openoffice/pkg/PFRAG.shared-main
+++ b/editors/openoffice/pkg/PFRAG.shared-main
@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared-main,v 1.5 2008/01/04 14:52:31 robert Exp $
+@comment $OpenBSD: PFRAG.shared-main,v 1.6 2008/04/28 11:18:46 robert Exp $
 openoffice/program/acceptor.uno.so
 openoffice/program/basprov680.uno.so
 openoffice/program/behelper.uno.so
@ -19,7 +19,6 @@ openoffice/program/fsstorage.uno.so
 openoffice/program/hatchwindowfactory.uno.so
 openoffice/program/i18npool.uno.so
 openoffice/program/i18nsearch.uno.so
-openoffice/program/implreg.uno.so
 openoffice/program/introspection.uno.so
 openoffice/program/invocadapt.uno.so
 openoffice/program/invocation.uno.so
@ -178,7 +177,6 @@ openoffice/program/libsfx680.so
 openoffice/program/libsimplecm680.so
 openoffice/program/libsm680.so
 openoffice/program/libsmd680.so
-openoffice/program/libso680.so
 openoffice/program/libsot680.so
 openoffice/program/libspa680.so
 openoffice/program/libspell680.so
@ -237,21 +235,15 @@ openoffice/program/libxstor.so
 openoffice/program/localebe1.uno.so
 openoffice/program/migrationoo2.uno.so
 openoffice/program/namingservice.uno.so
-openoffice/program/nestedreg.uno.so
 openoffice/program/passwordcontainer.uno.so
 openoffice/program/productregistration.uno.so
 openoffice/program/proxyfac.uno.so
 openoffice/program/pythonloader.uno.so
 openoffice/program/pyuno.so
 openoffice/program/reflection.uno.so
-openoffice/program/regtypeprov.uno.so
 openoffice/program/remotebridge.uno.so
 openoffice/program/sax.uno.so
-openoffice/program/security.uno.so
-openoffice/program/servicemgr.uno.so
-openoffice/program/shlibloader.uno.so
 openoffice/program/simplecanvas.uno.so
-openoffice/program/simplereg.uno.so
 openoffice/program/slideshow.uno.so
 openoffice/program/streams.uno.so
 openoffice/program/stringresource680.uno.so
@ -260,11 +252,8 @@ openoffice/program/sysmgr1.uno.so
 openoffice/program/syssh.uno.so
 openoffice/program/textinstream.uno.so
 openoffice/program/textoutstream.uno.so
-openoffice/program/typeconverter.uno.so
-openoffice/program/typemgr.uno.so
 openoffice/program/ucpexpand1.uno.so
 openoffice/program/ucptdoc1.uno.so
 openoffice/program/updatefeed.uno.so
-openoffice/program/uriproc.uno.so
 openoffice/program/uuresolver.uno.so
 openoffice/program/vclcanvas.uno.so
--- a/editors/openoffice/pkg/PLIST-i18n-bg
+++ b/editors/openoffice/pkg/PLIST-i18n-bg
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-i18n-bg,v 1.4 2007/11/27 14:19:52 robert Exp $
+@comment $OpenBSD: PLIST-i18n-bg,v 1.5 2008/04/28 11:18:46 robert Exp $
 openoffice/help/bg/
 openoffice/help/bg/default.css
 openoffice/help/bg/err.html
@ -196,6 +196,7 @@ openoffice/program/resource/sb680bg.res
 openoffice/program/resource/sc680bg.res
 openoffice/program/resource/sd680bg.res
 openoffice/program/resource/sdbcl680bg.res
+openoffice/program/resource/sdberr680bg.res
 openoffice/program/resource/sdbt680bg.res
 openoffice/program/resource/sfx680bg.res
 openoffice/program/resource/sm680bg.res
--- a/editors/openoffice/pkg/PLIST-i18n-br-pt
+++ b/editors/openoffice/pkg/PLIST-i18n-br-pt
@ -1,432 +0,0 @@
-@comment $OpenBSD: PLIST-i18n-br-pt,v 1.2 2007/11/13 09:46:28 robert Exp $
-openoffice/help/br-pt/
-openoffice/help/br-pt/default.css
-openoffice/help/br-pt/err.html
-openoffice/help/br-pt/highcontrast1.css
-openoffice/help/br-pt/highcontrast2.css
-openoffice/help/br-pt/highcontrastblack.css
-openoffice/help/br-pt/highcontrastwhite.css
-openoffice/help/br-pt/sbasic.cfg
-openoffice/help/br-pt/sbasic.db
-openoffice/help/br-pt/sbasic.ht
-openoffice/help/br-pt/sbasic.idx/
-openoffice/help/br-pt/sbasic.idx/CONTEXTS
-openoffice/help/br-pt/sbasic.idx/DICTIONARY
-openoffice/help/br-pt/sbasic.idx/DOCS
-openoffice/help/br-pt/sbasic.idx/DOCS.TAB
-openoffice/help/br-pt/sbasic.idx/EDGE
-openoffice/help/br-pt/sbasic.idx/LINKNAMES
-openoffice/help/br-pt/sbasic.idx/OFFSETS
-openoffice/help/br-pt/sbasic.idx/POSITIONS
-openoffice/help/br-pt/sbasic.idx/SCHEMA
-openoffice/help/br-pt/sbasic.jar
-openoffice/help/br-pt/sbasic.key
-openoffice/help/br-pt/sbasic.tree
-openoffice/help/br-pt/scalc.cfg
-openoffice/help/br-pt/scalc.db
-openoffice/help/br-pt/scalc.ht
-openoffice/help/br-pt/scalc.idx/
-openoffice/help/br-pt/scalc.idx/CONTEXTS
-openoffice/help/br-pt/scalc.idx/DICTIONARY
-openoffice/help/br-pt/scalc.idx/DOCS
-openoffice/help/br-pt/scalc.idx/DOCS.TAB
-openoffice/help/br-pt/scalc.idx/EDGE
-openoffice/help/br-pt/scalc.idx/LINKNAMES
-openoffice/help/br-pt/scalc.idx/OFFSETS
-openoffice/help/br-pt/scalc.idx/POSITIONS
-openoffice/help/br-pt/scalc.idx/SCHEMA
-openoffice/help/br-pt/scalc.jar
-openoffice/help/br-pt/scalc.key
-openoffice/help/br-pt/scalc.tree
-openoffice/help/br-pt/schart.cfg
-openoffice/help/br-pt/schart.db
-openoffice/help/br-pt/schart.ht
-openoffice/help/br-pt/schart.idx/
-openoffice/help/br-pt/schart.idx/CONTEXTS
-openoffice/help/br-pt/schart.idx/DICTIONARY
-openoffice/help/br-pt/schart.idx/DOCS
-openoffice/help/br-pt/schart.idx/DOCS.TAB
-openoffice/help/br-pt/schart.idx/EDGE
-openoffice/help/br-pt/schart.idx/LINKNAMES
-openoffice/help/br-pt/schart.idx/OFFSETS
-openoffice/help/br-pt/schart.idx/POSITIONS
-openoffice/help/br-pt/schart.idx/SCHEMA
-openoffice/help/br-pt/schart.jar
-openoffice/help/br-pt/schart.key
-openoffice/help/br-pt/schart.tree
-openoffice/help/br-pt/sdatabase.cfg
-openoffice/help/br-pt/sdatabase.db
-openoffice/help/br-pt/sdatabase.ht
-openoffice/help/br-pt/sdatabase.idx/
-openoffice/help/br-pt/sdatabase.idx/CONTEXTS
-openoffice/help/br-pt/sdatabase.idx/DICTIONARY
-openoffice/help/br-pt/sdatabase.idx/DOCS
-openoffice/help/br-pt/sdatabase.idx/DOCS.TAB
-openoffice/help/br-pt/sdatabase.idx/EDGE
-openoffice/help/br-pt/sdatabase.idx/LINKNAMES
-openoffice/help/br-pt/sdatabase.idx/OFFSETS
-openoffice/help/br-pt/sdatabase.idx/POSITIONS
-openoffice/help/br-pt/sdatabase.idx/SCHEMA
-openoffice/help/br-pt/sdatabase.jar
-openoffice/help/br-pt/sdatabase.key
-openoffice/help/br-pt/sdraw.cfg
-openoffice/help/br-pt/sdraw.db
-openoffice/help/br-pt/sdraw.ht
-openoffice/help/br-pt/sdraw.idx/
-openoffice/help/br-pt/sdraw.idx/CONTEXTS
-openoffice/help/br-pt/sdraw.idx/DICTIONARY
-openoffice/help/br-pt/sdraw.idx/DOCS
-openoffice/help/br-pt/sdraw.idx/DOCS.TAB
-openoffice/help/br-pt/sdraw.idx/EDGE
-openoffice/help/br-pt/sdraw.idx/LINKNAMES
-openoffice/help/br-pt/sdraw.idx/OFFSETS
-openoffice/help/br-pt/sdraw.idx/POSITIONS
-openoffice/help/br-pt/sdraw.idx/SCHEMA
-openoffice/help/br-pt/sdraw.jar
-openoffice/help/br-pt/sdraw.key
-openoffice/help/br-pt/shared.db
-openoffice/help/br-pt/shared.ht
-openoffice/help/br-pt/shared.jar
-openoffice/help/br-pt/shared.key
-openoffice/help/br-pt/shared.tree
-openoffice/help/br-pt/simpress.cfg
-openoffice/help/br-pt/simpress.db
-openoffice/help/br-pt/simpress.ht
-openoffice/help/br-pt/simpress.idx/
-openoffice/help/br-pt/simpress.idx/CONTEXTS
-openoffice/help/br-pt/simpress.idx/DICTIONARY
-openoffice/help/br-pt/simpress.idx/DOCS
-openoffice/help/br-pt/simpress.idx/DOCS.TAB
-openoffice/help/br-pt/simpress.idx/EDGE
-openoffice/help/br-pt/simpress.idx/LINKNAMES
-openoffice/help/br-pt/simpress.idx/OFFSETS
-openoffice/help/br-pt/simpress.idx/POSITIONS
-openoffice/help/br-pt/simpress.idx/SCHEMA
-openoffice/help/br-pt/simpress.jar
-openoffice/help/br-pt/simpress.key
-openoffice/help/br-pt/simpress.tree
-openoffice/help/br-pt/smath.cfg
-openoffice/help/br-pt/smath.db
-openoffice/help/br-pt/smath.ht
-openoffice/help/br-pt/smath.idx/
-openoffice/help/br-pt/smath.idx/CONTEXTS
-openoffice/help/br-pt/smath.idx/DICTIONARY
-openoffice/help/br-pt/smath.idx/DOCS
-openoffice/help/br-pt/smath.idx/DOCS.TAB
-openoffice/help/br-pt/smath.idx/EDGE
-openoffice/help/br-pt/smath.idx/LINKNAMES
-openoffice/help/br-pt/smath.idx/OFFSETS
-openoffice/help/br-pt/smath.idx/POSITIONS
-openoffice/help/br-pt/smath.idx/SCHEMA
-openoffice/help/br-pt/smath.jar
-openoffice/help/br-pt/smath.key
-openoffice/help/br-pt/smath.tree
-openoffice/help/br-pt/swriter.cfg
-openoffice/help/br-pt/swriter.db
-openoffice/help/br-pt/swriter.ht
-openoffice/help/br-pt/swriter.idx/
-openoffice/help/br-pt/swriter.idx/CONTEXTS
-openoffice/help/br-pt/swriter.idx/DICTIONARY
-openoffice/help/br-pt/swriter.idx/DOCS
-openoffice/help/br-pt/swriter.idx/DOCS.TAB
-openoffice/help/br-pt/swriter.idx/EDGE
-openoffice/help/br-pt/swriter.idx/LINKNAMES
-openoffice/help/br-pt/swriter.idx/OFFSETS
-openoffice/help/br-pt/swriter.idx/POSITIONS
-openoffice/help/br-pt/swriter.idx/SCHEMA
-openoffice/help/br-pt/swriter.jar
-openoffice/help/br-pt/swriter.key
-openoffice/help/br-pt/swriter.tree
-openoffice/licenses/LICENSE_br-pt
-openoffice/licenses/LICENSE_br-pt.html
-openoffice/presets/config/arrowhd_en-US_br-pt.soe
-openoffice/presets/config/classic_en-US_br-pt.sog
-openoffice/presets/config/hatching_en-US_br-pt.soh
-openoffice/presets/config/modern_en-US_br-pt.sog
-openoffice/presets/config/palette_en-US_br-pt.soc
-openoffice/presets/config/styles_en-US_br-pt.sod
-openoffice/program/resource/abp680br-pt.res
-openoffice/program/resource/acc680br-pt.res
-openoffice/program/resource/analysis680br-pt.res
-openoffice/program/resource/avmedia680br-pt.res
-openoffice/program/resource/basctl680br-pt.res
-openoffice/program/resource/bf_frm680br-pt.res
-openoffice/program/resource/bf_ofa680br-pt.res
-openoffice/program/resource/bf_sc680br-pt.res
-openoffice/program/resource/bf_sch680br-pt.res
-openoffice/program/resource/bf_sd680br-pt.res
-openoffice/program/resource/bf_sm680br-pt.res
-openoffice/program/resource/bf_svx680br-pt.res
-openoffice/program/resource/bf_sw680br-pt.res
-openoffice/program/resource/bib680br-pt.res
-openoffice/program/resource/cal680br-pt.res
-openoffice/program/resource/chartcontroller680br-pt.res
-openoffice/program/resource/cnr680br-pt.res
-openoffice/program/resource/date680br-pt.res
-openoffice/program/resource/dba680br-pt.res
-openoffice/program/resource/dbp680br-pt.res
-openoffice/program/resource/dbu680br-pt.res
-openoffice/program/resource/dbw680br-pt.res
-openoffice/program/resource/deployment680br-pt.res
-openoffice/program/resource/deploymentgui680br-pt.res
-openoffice/program/resource/dkt680br-pt.res
-openoffice/program/resource/egi680br-pt.res
-openoffice/program/resource/eme680br-pt.res
-openoffice/program/resource/epb680br-pt.res
-openoffice/program/resource/epg680br-pt.res
-openoffice/program/resource/epp680br-pt.res
-openoffice/program/resource/eps680br-pt.res
-openoffice/program/resource/ept680br-pt.res
-openoffice/program/resource/eur680br-pt.res
-openoffice/program/resource/fps_office680br-pt.res
-openoffice/program/resource/frm680br-pt.res
-openoffice/program/resource/fwe680br-pt.res
-openoffice/program/resource/gal680br-pt.res
-openoffice/program/resource/imp680br-pt.res
-openoffice/program/resource/ofa680br-pt.res
-openoffice/program/resource/ooo680br-pt.res
-openoffice/program/resource/pcr680br-pt.res
-openoffice/program/resource/pdffilter680br-pt.res
-openoffice/program/resource/preload680br-pt.res
-openoffice/program/resource/productregistration680br-pt.res
-openoffice/program/resource/rpt680br-pt.res
-openoffice/program/resource/rptui680br-pt.res
-openoffice/program/resource/san680br-pt.res
-openoffice/program/resource/sb680br-pt.res
-openoffice/program/resource/sc680br-pt.res
-openoffice/program/resource/sd680br-pt.res
-openoffice/program/resource/sdbcl680br-pt.res
-openoffice/program/resource/sdbt680br-pt.res
-openoffice/program/resource/sfx680br-pt.res
-openoffice/program/resource/sm680br-pt.res
-openoffice/program/resource/spa680br-pt.res
-openoffice/program/resource/stt680br-pt.res
-openoffice/program/resource/svs680br-pt.res
-openoffice/program/resource/svt680br-pt.res
-openoffice/program/resource/svx680br-pt.res
-openoffice/program/resource/sw680br-pt.res
-openoffice/program/resource/textconversiondlgs680br-pt.res
-openoffice/program/resource/tfu680br-pt.res
-openoffice/program/resource/tk680br-pt.res
-openoffice/program/resource/tpl680br-pt.res
-openoffice/program/resource/updchk680br-pt.res
-openoffice/program/resource/uui680br-pt.res
-openoffice/program/resource/vcl680br-pt.res
-openoffice/program/resource/wzi680br-pt.res
-openoffice/program/resource/xsltdlg680br-pt.res
-openoffice/readmes/README_br-pt
-openoffice/readmes/README_br-pt.html
-openoffice/share/autotext/br-pt/
-openoffice/share/autotext/br-pt/crdbus50.bau
-openoffice/share/autotext/br-pt/standard.bau
-openoffice/share/autotext/br-pt/template.bau
-openoffice/share/readme/LICENSE_br-pt
-openoffice/share/readme/LICENSE_br-pt.html
-openoffice/share/readme/README_br-pt
-openoffice/share/readme/README_br-pt.html
-openoffice/share/registry/modules/org/openoffice/Setup/Langpack-br-pt.xcu
-openoffice/share/registry/res/br-pt/
-openoffice/share/registry/res/br-pt/org/
-openoffice/share/registry/res/br-pt/org/openoffice/
-openoffice/share/registry/res/br-pt/org/openoffice/Office/
-openoffice/share/registry/res/br-pt/org/openoffice/Office/Common.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/DataAccess.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/Embedding.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/ExtendedColorScheme.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/FormWizard.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/SFX.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/TableWizard.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/BaseWindowState.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/BasicIDECommands.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/BasicIDEWindowState.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/BibliographyCommands.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/CalcCommands.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/CalcWindowState.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/ChartCommands.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/ChartWindowState.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/DbBrowserWindowState.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/DbQueryWindowState.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/DbRelationWindowState.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/DbReportWindowState.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/DbTableWindowState.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/DbuCommands.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/DrawImpressCommands.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/DrawWindowState.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/Effects.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/GenericCategories.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/GenericCommands.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/ImpressWindowState.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/MathCommands.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/MathWindowState.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/ReportCommands.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/StartModuleCommands.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/StartModuleWindowState.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/WriterCommands.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/WriterFormWindowState.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/WriterReportWindowState.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/WriterWebWindowState.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/WriterWindowState.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/UI/XFormsWindowState.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/WebWizard.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Office/Writer.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/Setup.xcu
-openoffice/share/registry/res/br-pt/org/openoffice/TypeDetection/
-openoffice/share/registry/res/br-pt/org/openoffice/TypeDetection/Filter.xcu
-openoffice/share/template/br-pt/
-openoffice/share/template/br-pt/internal/
-openoffice/share/template/br-pt/internal/html.stw
-openoffice/share/template/br-pt/internal/idxexample.odt
-openoffice/share/template/br-pt/internal/url_transfer.htm
-openoffice/share/template/br-pt/layout/
-openoffice/share/template/br-pt/layout/lyt-cool.otp
-openoffice/share/template/br-pt/layout/lyt-darkblue.otp
-openoffice/share/template/br-pt/presnt/
-openoffice/share/template/br-pt/presnt/prs-novelty.otp
-openoffice/share/template/br-pt/presnt/prs-strategy.otp
-openoffice/share/template/br-pt/wizard/
-openoffice/share/template/br-pt/wizard/agenda/
-openoffice/share/template/br-pt/wizard/agenda/10grey.ott
-openoffice/share/template/br-pt/wizard/agenda/1simple.ott
-openoffice/share/template/br-pt/wizard/agenda/2elegant.ott
-openoffice/share/template/br-pt/wizard/agenda/3modern.ott
-openoffice/share/template/br-pt/wizard/agenda/4classic.ott
-openoffice/share/template/br-pt/wizard/agenda/5blue.ott
-openoffice/share/template/br-pt/wizard/agenda/6orange.ott
-openoffice/share/template/br-pt/wizard/agenda/7red.ott
-openoffice/share/template/br-pt/wizard/agenda/8green.ott
-openoffice/share/template/br-pt/wizard/agenda/9colorful.ott
-openoffice/share/template/br-pt/wizard/agenda/aw-10grey.ott
-openoffice/share/template/br-pt/wizard/agenda/aw-1simple.ott
-openoffice/share/template/br-pt/wizard/agenda/aw-2elegant.ott
-openoffice/share/template/br-pt/wizard/agenda/aw-3modern.ott
-openoffice/share/template/br-pt/wizard/agenda/aw-4classic.ott
-openoffice/share/template/br-pt/wizard/agenda/aw-5blue.ott
-openoffice/share/template/br-pt/wizard/agenda/aw-6orange.ott
-openoffice/share/template/br-pt/wizard/agenda/aw-7red.ott
-openoffice/share/template/br-pt/wizard/agenda/aw-8green.ott
-openoffice/share/template/br-pt/wizard/agenda/aw-9colorful.ott
-openoffice/share/template/br-pt/wizard/bitmap/
-openoffice/share/template/br-pt/wizard/bitmap/Import_1.bmp
-openoffice/share/template/br-pt/wizard/bitmap/Import_3.bmp
-openoffice/share/template/br-pt/wizard/bitmap/Import_4.bmp
-openoffice/share/template/br-pt/wizard/bitmap/MS-Import_2-1.bmp
-openoffice/share/template/br-pt/wizard/bitmap/MS-Import_2-2.bmp
-openoffice/share/template/br-pt/wizard/bitmap/MS-Import_2-3.bmp
-openoffice/share/template/br-pt/wizard/bitmap/XML-Import_2-1.bmp
-openoffice/share/template/br-pt/wizard/bitmap/XML-Import_2-2.bmp
-openoffice/share/template/br-pt/wizard/bitmap/XML-Import_2-3.bmp
-openoffice/share/template/br-pt/wizard/bitmap/XML-Import_2-4.bmp
-openoffice/share/template/br-pt/wizard/bitmap/brasil.gif
-openoffice/share/template/br-pt/wizard/bitmap/cancel_down.bmp
-openoffice/share/template/br-pt/wizard/bitmap/cancel_up.bmp
-openoffice/share/template/br-pt/wizard/bitmap/china.gif
-openoffice/share/template/br-pt/wizard/bitmap/denmark.gif
-openoffice/share/template/br-pt/wizard/bitmap/down.bmp
-openoffice/share/template/br-pt/wizard/bitmap/end.bmp
-openoffice/share/template/br-pt/wizard/bitmap/euro_1.bmp
-openoffice/share/template/br-pt/wizard/bitmap/euro_2.bmp
-openoffice/share/template/br-pt/wizard/bitmap/euro_3.bmp
-openoffice/share/template/br-pt/wizard/bitmap/finland.gif
-openoffice/share/template/br-pt/wizard/bitmap/france.gif
-openoffice/share/template/br-pt/wizard/bitmap/ftpconnected.gif
-openoffice/share/template/br-pt/wizard/bitmap/ftpconnecting.gif
-openoffice/share/template/br-pt/wizard/bitmap/ftperror.gif
-openoffice/share/template/br-pt/wizard/bitmap/ftpunknown.gif
-openoffice/share/template/br-pt/wizard/bitmap/germany.wmf
-openoffice/share/template/br-pt/wizard/bitmap/greece.gif
-openoffice/share/template/br-pt/wizard/bitmap/italia.gif
-openoffice/share/template/br-pt/wizard/bitmap/japan.gif
-openoffice/share/template/br-pt/wizard/bitmap/maximize.bmp
-openoffice/share/template/br-pt/wizard/bitmap/minimize.bmp
-openoffice/share/template/br-pt/wizard/bitmap/netherlands.gif
-openoffice/share/template/br-pt/wizard/bitmap/okay_down.bmp
-openoffice/share/template/br-pt/wizard/bitmap/okay_up.bmp
-openoffice/share/template/br-pt/wizard/bitmap/polska.gif
-openoffice/share/template/br-pt/wizard/bitmap/portugal.gif
-openoffice/share/template/br-pt/wizard/bitmap/report.bmp
-openoffice/share/template/br-pt/wizard/bitmap/russia.gif
-openoffice/share/template/br-pt/wizard/bitmap/spain.gif
-openoffice/share/template/br-pt/wizard/bitmap/sweden.gif
-openoffice/share/template/br-pt/wizard/bitmap/taiwan.gif
-openoffice/share/template/br-pt/wizard/bitmap/turkey.gif
-openoffice/share/template/br-pt/wizard/bitmap/tutorial_background.gif
-openoffice/share/template/br-pt/wizard/bitmap/up.bmp
-openoffice/share/template/br-pt/wizard/bitmap/usa.gif
-openoffice/share/template/br-pt/wizard/fax/
-openoffice/share/template/br-pt/wizard/fax/bus-classic-pri_f.ott
-openoffice/share/template/br-pt/wizard/fax/bus-classic_f.ott
-openoffice/share/template/br-pt/wizard/fax/bus-modern-pri_f.ott
-openoffice/share/template/br-pt/wizard/fax/bus-modern_f.ott
-openoffice/share/template/br-pt/wizard/fax/pri-bottle_f.ott
-openoffice/share/template/br-pt/wizard/fax/pri-fax_f.ott
-openoffice/share/template/br-pt/wizard/fax/pri-lines_f.ott
-openoffice/share/template/br-pt/wizard/fax/pri-marine_f.ott
-openoffice/share/template/br-pt/wizard/letter/
-openoffice/share/template/br-pt/wizard/letter/en-US/
-openoffice/share/template/br-pt/wizard/letter/en-US/bus-elegant_l.ott
-openoffice/share/template/br-pt/wizard/letter/en-US/bus-modern_l.ott
-openoffice/share/template/br-pt/wizard/letter/en-US/bus-office_l.ott
-openoffice/share/template/br-pt/wizard/letter/en-US/off-elegant_l.ott
-openoffice/share/template/br-pt/wizard/letter/en-US/off-modern_l.ott
-openoffice/share/template/br-pt/wizard/letter/en-US/off-office_l.ott
-openoffice/share/template/br-pt/wizard/letter/en-US/pri-bottle_l.ott
-openoffice/share/template/br-pt/wizard/letter/en-US/pri-mail_l.ott
-openoffice/share/template/br-pt/wizard/letter/en-US/pri-marine_l.ott
-openoffice/share/template/br-pt/wizard/letter/en-US/pri-redline_l.ott
-openoffice/share/template/br-pt/wizard/report/
-openoffice/share/template/br-pt/wizard/report/cnt-01.ott
-openoffice/share/template/br-pt/wizard/report/cnt-011.ott
-openoffice/share/template/br-pt/wizard/report/cnt-012.ott
-openoffice/share/template/br-pt/wizard/report/cnt-02.ott
-openoffice/share/template/br-pt/wizard/report/cnt-021.ott
-openoffice/share/template/br-pt/wizard/report/cnt-022.ott
-openoffice/share/template/br-pt/wizard/report/cnt-03.ott
-openoffice/share/template/br-pt/wizard/report/cnt-031.ott
-openoffice/share/template/br-pt/wizard/report/cnt-032.ott
-openoffice/share/template/br-pt/wizard/report/cnt-04.ott
-openoffice/share/template/br-pt/wizard/report/cnt-041.ott
-openoffice/share/template/br-pt/wizard/report/cnt-042.ott
-openoffice/share/template/br-pt/wizard/report/cnt-05.ott
-openoffice/share/template/br-pt/wizard/report/cnt-051.ott
-openoffice/share/template/br-pt/wizard/report/cnt-052.ott
-openoffice/share/template/br-pt/wizard/report/cnt-06.ott
-openoffice/share/template/br-pt/wizard/report/cnt-061.ott
-openoffice/share/template/br-pt/wizard/report/cnt-062.ott
-openoffice/share/template/br-pt/wizard/report/cnt-default.ott
-openoffice/share/template/br-pt/wizard/report/stl-01.ott
-openoffice/share/template/br-pt/wizard/report/stl-02.ott
-openoffice/share/template/br-pt/wizard/report/stl-03.ott
-openoffice/share/template/br-pt/wizard/report/stl-04.ott
-openoffice/share/template/br-pt/wizard/report/stl-05.ott
-openoffice/share/template/br-pt/wizard/report/stl-06.ott
-openoffice/share/template/br-pt/wizard/report/stl-07.ott
-openoffice/share/template/br-pt/wizard/report/stl-08.ott
-openoffice/share/template/br-pt/wizard/report/stl-09.ott
-openoffice/share/template/br-pt/wizard/report/stl-10.ott
-openoffice/share/template/br-pt/wizard/report/stl-default.ott
-openoffice/share/template/br-pt/wizard/styles/
-openoffice/share/template/br-pt/wizard/styles/black_white.ots
-openoffice/share/template/br-pt/wizard/styles/blackberry.ots
-openoffice/share/template/br-pt/wizard/styles/default.ots
-openoffice/share/template/br-pt/wizard/styles/diner.ots
-openoffice/share/template/br-pt/wizard/styles/fall.ots
-openoffice/share/template/br-pt/wizard/styles/glacier.ots
-openoffice/share/template/br-pt/wizard/styles/green_grapes.ots
-openoffice/share/template/br-pt/wizard/styles/jeans.ots
-openoffice/share/template/br-pt/wizard/styles/marine.ots
-openoffice/share/template/br-pt/wizard/styles/millennium.ots
-openoffice/share/template/br-pt/wizard/styles/nature.ots
-openoffice/share/template/br-pt/wizard/styles/neon.ots
-openoffice/share/template/br-pt/wizard/styles/night.ots
-openoffice/share/template/br-pt/wizard/styles/nostalgic.ots
-openoffice/share/template/br-pt/wizard/styles/pastell.ots
-openoffice/share/template/br-pt/wizard/styles/pool.ots
-openoffice/share/template/br-pt/wizard/styles/pumpkin.ots
-openoffice/share/template/br-pt/wizard/styles/sunstyle.ots
-openoffice/share/template/br-pt/wizard/styles/xos.ots
-openoffice/share/wordbook/br-pt/
-openoffice/share/wordbook/br-pt/soffice.dic
-openoffice/share/wordbook/br-pt/sun.dic
--- a/editors/openoffice/pkg/PLIST-i18n-ca
+++ b/editors/openoffice/pkg/PLIST-i18n-ca
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-i18n-ca,v 1.2 2007/11/13 09:46:28 robert Exp $
+@comment $OpenBSD: PLIST-i18n-ca,v 1.3 2008/04/28 11:18:46 robert Exp $
 openoffice/help/ca/
 openoffice/help/ca/default.css
 openoffice/help/ca/err.html
@ -196,6 +196,7 @@ openoffice/program/resource/sb680ca.res
 openoffice/program/resource/sc680ca.res
 openoffice/program/resource/sd680ca.res
 openoffice/program/resource/sdbcl680ca.res
+openoffice/program/resource/sdberr680ca.res
 openoffice/program/resource/sdbt680ca.res
 openoffice/program/resource/sfx680ca.res
 openoffice/program/resource/sm680ca.res
--- a/editors/openoffice/pkg/PLIST-i18n-de
+++ b/editors/openoffice/pkg/PLIST-i18n-de
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-i18n-de,v 1.4 2007/11/27 14:19:52 robert Exp $
+@comment $OpenBSD: PLIST-i18n-de,v 1.5 2008/04/28 11:18:46 robert Exp $
 openoffice/help/de/
 openoffice/help/de/default.css
 openoffice/help/de/err.html
@ -196,6 +196,7 @@ openoffice/program/resource/sb680de.res
 openoffice/program/resource/sc680de.res
 openoffice/program/resource/sd680de.res
 openoffice/program/resource/sdbcl680de.res
+openoffice/program/resource/sdberr680de.res
 openoffice/program/resource/sdbt680de.res
 openoffice/program/resource/sfx680de.res
 openoffice/program/resource/sm680de.res
--- a/editors/openoffice/pkg/PLIST-i18n-es
+++ b/editors/openoffice/pkg/PLIST-i18n-es
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-i18n-es,v 1.4 2007/11/27 14:19:52 robert Exp $
+@comment $OpenBSD: PLIST-i18n-es,v 1.5 2008/04/28 11:18:46 robert Exp $
 openoffice/help/es/
 openoffice/help/es/default.css
 openoffice/help/es/err.html
@ -196,6 +196,7 @@ openoffice/program/resource/sb680es.res
 openoffice/program/resource/sc680es.res
 openoffice/program/resource/sd680es.res
 openoffice/program/resource/sdbcl680es.res
+openoffice/program/resource/sdberr680es.res
 openoffice/program/resource/sdbt680es.res
 openoffice/program/resource/sfx680es.res
 openoffice/program/resource/sm680es.res
--- a/editors/openoffice/pkg/PLIST-i18n-fa
+++ b/editors/openoffice/pkg/PLIST-i18n-fa
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-i18n-fa,v 1.2 2007/11/13 09:46:28 robert Exp $
+@comment $OpenBSD: PLIST-i18n-fa,v 1.3 2008/04/28 11:18:46 robert Exp $
 openoffice/help/fa/
 openoffice/help/fa/default.css
 openoffice/help/fa/err.html
@ -196,6 +196,7 @@ openoffice/program/resource/sb680fa.res
 openoffice/program/resource/sc680fa.res
 openoffice/program/resource/sd680fa.res
 openoffice/program/resource/sdbcl680fa.res
+openoffice/program/resource/sdberr680fa.res
 openoffice/program/resource/sdbt680fa.res
 openoffice/program/resource/sfx680fa.res
 openoffice/program/resource/sm680fa.res
--- a/editors/openoffice/pkg/PLIST-i18n-fi
+++ b/editors/openoffice/pkg/PLIST-i18n-fi
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-i18n-fi,v 1.5 2007/11/27 14:19:52 robert Exp $
+@comment $OpenBSD: PLIST-i18n-fi,v 1.6 2008/04/28 11:18:46 robert Exp $
 openoffice/help/fi/
 openoffice/help/fi/default.css
 openoffice/help/fi/err.html
@ -196,6 +196,7 @@ openoffice/program/resource/sb680fi.res
 openoffice/program/resource/sc680fi.res
 openoffice/program/resource/sd680fi.res
 openoffice/program/resource/sdbcl680fi.res
+openoffice/program/resource/sdberr680fi.res
 openoffice/program/resource/sdbt680fi.res
 openoffice/program/resource/sfx680fi.res
 openoffice/program/resource/sm680fi.res
--- a/editors/openoffice/pkg/PLIST-i18n-fr
+++ b/editors/openoffice/pkg/PLIST-i18n-fr
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-i18n-fr,v 1.3 2007/11/27 14:19:52 robert Exp $
+@comment $OpenBSD: PLIST-i18n-fr,v 1.4 2008/04/28 11:18:46 robert Exp $
 openoffice/help/fr/
 openoffice/help/fr/default.css
 openoffice/help/fr/err.html
@ -196,6 +196,7 @@ openoffice/program/resource/sb680fr.res
 openoffice/program/resource/sc680fr.res
 openoffice/program/resource/sd680fr.res
 openoffice/program/resource/sdbcl680fr.res
+openoffice/program/resource/sdberr680fr.res
 openoffice/program/resource/sdbt680fr.res
 openoffice/program/resource/sfx680fr.res
 openoffice/program/resource/sm680fr.res
--- a/editors/openoffice/pkg/PLIST-i18n-hu
+++ b/editors/openoffice/pkg/PLIST-i18n-hu
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-i18n-hu,v 1.3 2007/11/27 14:19:52 robert Exp $
+@comment $OpenBSD: PLIST-i18n-hu,v 1.4 2008/04/28 11:18:46 robert Exp $
 openoffice/help/hu/
 openoffice/help/hu/default.css
 openoffice/help/hu/err.html
@ -196,6 +196,7 @@ openoffice/program/resource/sb680hu.res
 openoffice/program/resource/sc680hu.res
 openoffice/program/resource/sd680hu.res
 openoffice/program/resource/sdbcl680hu.res
+openoffice/program/resource/sdberr680hu.res
 openoffice/program/resource/sdbt680hu.res
 openoffice/program/resource/sfx680hu.res
 openoffice/program/resource/sm680hu.res
--- a/editors/openoffice/pkg/PLIST-i18n-it
+++ b/editors/openoffice/pkg/PLIST-i18n-it
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-i18n-it,v 1.3 2007/11/27 14:19:52 robert Exp $
+@comment $OpenBSD: PLIST-i18n-it,v 1.4 2008/04/28 11:18:46 robert Exp $
 openoffice/help/it/
 openoffice/help/it/default.css
 openoffice/help/it/err.html
@ -196,6 +196,7 @@ openoffice/program/resource/sb680it.res
 openoffice/program/resource/sc680it.res
 openoffice/program/resource/sd680it.res
 openoffice/program/resource/sdbcl680it.res
+openoffice/program/resource/sdberr680it.res
 openoffice/program/resource/sdbt680it.res
 openoffice/program/resource/sfx680it.res
 openoffice/program/resource/sm680it.res
--- a/editors/openoffice/pkg/PLIST-i18n-ja
+++ b/editors/openoffice/pkg/PLIST-i18n-ja
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-i18n-ja,v 1.3 2007/11/27 14:19:52 robert Exp $
+@comment $OpenBSD: PLIST-i18n-ja,v 1.4 2008/04/28 11:18:46 robert Exp $
 openoffice/help/ja/
 openoffice/help/ja/default.css
 openoffice/help/ja/err.html
@ -196,6 +196,7 @@ openoffice/program/resource/sb680ja.res
 openoffice/program/resource/sc680ja.res
 openoffice/program/resource/sd680ja.res
 openoffice/program/resource/sdbcl680ja.res
+openoffice/program/resource/sdberr680ja.res
 openoffice/program/resource/sdbt680ja.res
 openoffice/program/resource/sfx680ja.res
 openoffice/program/resource/sm680ja.res
--- a/editors/openoffice/pkg/PLIST-i18n-ko
+++ b/editors/openoffice/pkg/PLIST-i18n-ko
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-i18n-ko,v 1.3 2007/11/27 14:19:52 robert Exp $
+@comment $OpenBSD: PLIST-i18n-ko,v 1.4 2008/04/28 11:18:46 robert Exp $
 openoffice/help/ko/
 openoffice/help/ko/default.css
 openoffice/help/ko/err.html
@ -196,6 +196,7 @@ openoffice/program/resource/sb680ko.res
 openoffice/program/resource/sc680ko.res
 openoffice/program/resource/sd680ko.res
 openoffice/program/resource/sdbcl680ko.res
+openoffice/program/resource/sdberr680ko.res
 openoffice/program/resource/sdbt680ko.res
 openoffice/program/resource/sfx680ko.res
 openoffice/program/resource/sm680ko.res
--- a/editors/openoffice/pkg/PLIST-i18n-lt
+++ b/editors/openoffice/pkg/PLIST-i18n-lt
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-i18n-lt,v 1.2 2007/11/13 09:46:28 robert Exp $
+@comment $OpenBSD: PLIST-i18n-lt,v 1.3 2008/04/28 11:18:46 robert Exp $
 openoffice/help/lt/
 openoffice/help/lt/default.css
 openoffice/help/lt/err.html
@ -196,6 +196,7 @@ openoffice/program/resource/sb680lt.res
 openoffice/program/resource/sc680lt.res
 openoffice/program/resource/sd680lt.res
 openoffice/program/resource/sdbcl680lt.res
+openoffice/program/resource/sdberr680lt.res
 openoffice/program/resource/sdbt680lt.res
 openoffice/program/resource/sfx680lt.res
 openoffice/program/resource/sm680lt.res
--- a/editors/openoffice/pkg/PLIST-i18n-lv
+++ b/editors/openoffice/pkg/PLIST-i18n-lv
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-i18n-lv,v 1.2 2007/11/13 09:46:28 robert Exp $
+@comment $OpenBSD: PLIST-i18n-lv,v 1.3 2008/04/28 11:18:46 robert Exp $
 openoffice/help/lv/
 openoffice/help/lv/default.css
 openoffice/help/lv/err.html
@ -196,6 +196,7 @@ openoffice/program/resource/sb680lv.res
 openoffice/program/resource/sc680lv.res
 openoffice/program/resource/sd680lv.res
 openoffice/program/resource/sdbcl680lv.res
+openoffice/program/resource/sdberr680lv.res
 openoffice/program/resource/sdbt680lv.res
 openoffice/program/resource/sfx680lv.res
 openoffice/program/resource/sm680lv.res
--- a/editors/openoffice/pkg/PLIST-i18n-nl
+++ b/editors/openoffice/pkg/PLIST-i18n-nl
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-i18n-nl,v 1.2 2007/11/13 09:46:28 robert Exp $
+@comment $OpenBSD: PLIST-i18n-nl,v 1.3 2008/04/28 11:18:46 robert Exp $
 openoffice/help/nl/
 openoffice/help/nl/default.css
 openoffice/help/nl/err.html
@ -196,6 +196,7 @@ openoffice/program/resource/sb680nl.res
 openoffice/program/resource/sc680nl.res
 openoffice/program/resource/sd680nl.res
 openoffice/program/resource/sdbcl680nl.res
+openoffice/program/resource/sdberr680nl.res
 openoffice/program/resource/sdbt680nl.res
 openoffice/program/resource/sfx680nl.res
 openoffice/program/resource/sm680nl.res
--- a/editors/openoffice/pkg/PLIST-i18n-pl
+++ b/editors/openoffice/pkg/PLIST-i18n-pl
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-i18n-pl,v 1.3 2007/11/27 14:19:52 robert Exp $
+@comment $OpenBSD: PLIST-i18n-pl,v 1.4 2008/04/28 11:18:46 robert Exp $
 openoffice/help/pl/
 openoffice/help/pl/default.css
 openoffice/help/pl/err.html
@ -196,6 +196,7 @@ openoffice/program/resource/sb680pl.res
 openoffice/program/resource/sc680pl.res
 openoffice/program/resource/sd680pl.res
 openoffice/program/resource/sdbcl680pl.res
+openoffice/program/resource/sdberr680pl.res
 openoffice/program/resource/sdbt680pl.res
 openoffice/program/resource/sfx680pl.res
 openoffice/program/resource/sm680pl.res
--- a/editors/openoffice/pkg/PLIST-i18n-pt-br
+++ b/editors/openoffice/pkg/PLIST-i18n-pt-br
@ -0,0 +1,446 @@
+@comment $OpenBSD: PLIST-i18n-pt-br,v 1.1 2008/04/28 11:18:46 robert Exp $
+@pkgpath editors/openoffice,-i18n-br-pt
+openoffice/help/pt-BR/
+openoffice/help/pt-BR/default.css
+openoffice/help/pt-BR/err.html
+openoffice/help/pt-BR/highcontrast1.css
+openoffice/help/pt-BR/highcontrast2.css
+openoffice/help/pt-BR/highcontrastblack.css
+openoffice/help/pt-BR/highcontrastwhite.css
+openoffice/help/pt-BR/sbasic.cfg
+openoffice/help/pt-BR/sbasic.db
+openoffice/help/pt-BR/sbasic.ht
+openoffice/help/pt-BR/sbasic.idx/
+openoffice/help/pt-BR/sbasic.idx/CONTEXTS
+openoffice/help/pt-BR/sbasic.idx/DICTIONARY
+openoffice/help/pt-BR/sbasic.idx/DOCS
+openoffice/help/pt-BR/sbasic.idx/DOCS.TAB
+openoffice/help/pt-BR/sbasic.idx/EDGE
+openoffice/help/pt-BR/sbasic.idx/LINKNAMES
+openoffice/help/pt-BR/sbasic.idx/OFFSETS
+openoffice/help/pt-BR/sbasic.idx/POSITIONS
+openoffice/help/pt-BR/sbasic.idx/SCHEMA
+openoffice/help/pt-BR/sbasic.jar
+openoffice/help/pt-BR/sbasic.key
+openoffice/help/pt-BR/sbasic.tree
+openoffice/help/pt-BR/scalc.cfg
+openoffice/help/pt-BR/scalc.db
+openoffice/help/pt-BR/scalc.ht
+openoffice/help/pt-BR/scalc.idx/
+openoffice/help/pt-BR/scalc.idx/CONTEXTS
+openoffice/help/pt-BR/scalc.idx/DICTIONARY
+openoffice/help/pt-BR/scalc.idx/DOCS
+openoffice/help/pt-BR/scalc.idx/DOCS.TAB
+openoffice/help/pt-BR/scalc.idx/EDGE
+openoffice/help/pt-BR/scalc.idx/LINKNAMES
+openoffice/help/pt-BR/scalc.idx/OFFSETS
+openoffice/help/pt-BR/scalc.idx/POSITIONS
+openoffice/help/pt-BR/scalc.idx/SCHEMA
+openoffice/help/pt-BR/scalc.jar
+openoffice/help/pt-BR/scalc.key
+openoffice/help/pt-BR/scalc.tree
+openoffice/help/pt-BR/schart.cfg
+openoffice/help/pt-BR/schart.db
+openoffice/help/pt-BR/schart.ht
+openoffice/help/pt-BR/schart.idx/
+openoffice/help/pt-BR/schart.idx/CONTEXTS
+openoffice/help/pt-BR/schart.idx/DICTIONARY
+openoffice/help/pt-BR/schart.idx/DOCS
+openoffice/help/pt-BR/schart.idx/DOCS.TAB
+openoffice/help/pt-BR/schart.idx/EDGE
+openoffice/help/pt-BR/schart.idx/LINKNAMES
+openoffice/help/pt-BR/schart.idx/OFFSETS
+openoffice/help/pt-BR/schart.idx/POSITIONS
+openoffice/help/pt-BR/schart.idx/SCHEMA
+openoffice/help/pt-BR/schart.jar
+openoffice/help/pt-BR/schart.key
+openoffice/help/pt-BR/schart.tree
+openoffice/help/pt-BR/sdatabase.cfg
+openoffice/help/pt-BR/sdatabase.db
+openoffice/help/pt-BR/sdatabase.ht
+openoffice/help/pt-BR/sdatabase.idx/
+openoffice/help/pt-BR/sdatabase.idx/CONTEXTS
+openoffice/help/pt-BR/sdatabase.idx/DICTIONARY
+openoffice/help/pt-BR/sdatabase.idx/DOCS
+openoffice/help/pt-BR/sdatabase.idx/DOCS.TAB
+openoffice/help/pt-BR/sdatabase.idx/EDGE
+openoffice/help/pt-BR/sdatabase.idx/LINKNAMES
+openoffice/help/pt-BR/sdatabase.idx/OFFSETS
+openoffice/help/pt-BR/sdatabase.idx/POSITIONS
+openoffice/help/pt-BR/sdatabase.idx/SCHEMA
+openoffice/help/pt-BR/sdatabase.jar
+openoffice/help/pt-BR/sdatabase.key
+openoffice/help/pt-BR/sdraw.cfg
+openoffice/help/pt-BR/sdraw.db
+openoffice/help/pt-BR/sdraw.ht
+openoffice/help/pt-BR/sdraw.idx/
+openoffice/help/pt-BR/sdraw.idx/CONTEXTS
+openoffice/help/pt-BR/sdraw.idx/DICTIONARY
+openoffice/help/pt-BR/sdraw.idx/DOCS
+openoffice/help/pt-BR/sdraw.idx/DOCS.TAB
+openoffice/help/pt-BR/sdraw.idx/EDGE
+openoffice/help/pt-BR/sdraw.idx/LINKNAMES
+openoffice/help/pt-BR/sdraw.idx/OFFSETS
+openoffice/help/pt-BR/sdraw.idx/POSITIONS
+openoffice/help/pt-BR/sdraw.idx/SCHEMA
+openoffice/help/pt-BR/sdraw.jar
+openoffice/help/pt-BR/sdraw.key
+openoffice/help/pt-BR/shared.db
+openoffice/help/pt-BR/shared.ht
+openoffice/help/pt-BR/shared.jar
+openoffice/help/pt-BR/shared.key
+openoffice/help/pt-BR/shared.tree
+openoffice/help/pt-BR/simpress.cfg
+openoffice/help/pt-BR/simpress.db
+openoffice/help/pt-BR/simpress.ht
+openoffice/help/pt-BR/simpress.idx/
+openoffice/help/pt-BR/simpress.idx/CONTEXTS
+openoffice/help/pt-BR/simpress.idx/DICTIONARY
+openoffice/help/pt-BR/simpress.idx/DOCS
+openoffice/help/pt-BR/simpress.idx/DOCS.TAB
+openoffice/help/pt-BR/simpress.idx/EDGE
+openoffice/help/pt-BR/simpress.idx/LINKNAMES
+openoffice/help/pt-BR/simpress.idx/OFFSETS
+openoffice/help/pt-BR/simpress.idx/POSITIONS
+openoffice/help/pt-BR/simpress.idx/SCHEMA
+openoffice/help/pt-BR/simpress.jar
+openoffice/help/pt-BR/simpress.key
+openoffice/help/pt-BR/simpress.tree
+openoffice/help/pt-BR/smath.cfg
+openoffice/help/pt-BR/smath.db
+openoffice/help/pt-BR/smath.ht
+openoffice/help/pt-BR/smath.idx/
+openoffice/help/pt-BR/smath.idx/CONTEXTS
+openoffice/help/pt-BR/smath.idx/DICTIONARY
+openoffice/help/pt-BR/smath.idx/DOCS
+openoffice/help/pt-BR/smath.idx/DOCS.TAB
+openoffice/help/pt-BR/smath.idx/EDGE
+openoffice/help/pt-BR/smath.idx/LINKNAMES
+openoffice/help/pt-BR/smath.idx/OFFSETS
+openoffice/help/pt-BR/smath.idx/POSITIONS
+openoffice/help/pt-BR/smath.idx/SCHEMA
+openoffice/help/pt-BR/smath.jar
+openoffice/help/pt-BR/smath.key
+openoffice/help/pt-BR/smath.tree
+openoffice/help/pt-BR/swriter.cfg
+openoffice/help/pt-BR/swriter.db
+openoffice/help/pt-BR/swriter.ht
+openoffice/help/pt-BR/swriter.idx/
+openoffice/help/pt-BR/swriter.idx/CONTEXTS
+openoffice/help/pt-BR/swriter.idx/DICTIONARY
+openoffice/help/pt-BR/swriter.idx/DOCS
+openoffice/help/pt-BR/swriter.idx/DOCS.TAB
+openoffice/help/pt-BR/swriter.idx/EDGE
+openoffice/help/pt-BR/swriter.idx/LINKNAMES
+openoffice/help/pt-BR/swriter.idx/OFFSETS
+openoffice/help/pt-BR/swriter.idx/POSITIONS
+openoffice/help/pt-BR/swriter.idx/SCHEMA
+openoffice/help/pt-BR/swriter.jar
+openoffice/help/pt-BR/swriter.key
+openoffice/help/pt-BR/swriter.tree
+openoffice/licenses/LICENSE_pt-BR
+openoffice/licenses/LICENSE_pt-BR.html
+openoffice/presets/config/arrowhd_pt-BR.soe
+openoffice/presets/config/classic_pt-BR.sog
+openoffice/presets/config/hatching_pt-BR.soh
+openoffice/presets/config/modern_pt-BR.sog
+openoffice/presets/config/palette_pt-BR.soc
+openoffice/presets/config/styles_pt-BR.sod
+openoffice/program/resource/abp680pt-BR.res
+openoffice/program/resource/acc680pt-BR.res
+openoffice/program/resource/analysis680pt-BR.res
+openoffice/program/resource/avmedia680pt-BR.res
+openoffice/program/resource/basctl680pt-BR.res
+openoffice/program/resource/bf_frm680pt-BR.res
+openoffice/program/resource/bf_ofa680pt-BR.res
+openoffice/program/resource/bf_sc680pt-BR.res
+openoffice/program/resource/bf_sch680pt-BR.res
+openoffice/program/resource/bf_sd680pt-BR.res
+openoffice/program/resource/bf_sm680pt-BR.res
+openoffice/program/resource/bf_svx680pt-BR.res
+openoffice/program/resource/bf_sw680pt-BR.res
+openoffice/program/resource/bib680pt-BR.res
+openoffice/program/resource/cal680pt-BR.res
+openoffice/program/resource/chartcontroller680pt-BR.res
+openoffice/program/resource/cnr680pt-BR.res
+openoffice/program/resource/date680pt-BR.res
+openoffice/program/resource/dba680pt-BR.res
+openoffice/program/resource/dbp680pt-BR.res
+openoffice/program/resource/dbu680pt-BR.res
+openoffice/program/resource/dbw680pt-BR.res
+openoffice/program/resource/deployment680pt-BR.res
+openoffice/program/resource/deploymentgui680pt-BR.res
+openoffice/program/resource/dkt680pt-BR.res
+openoffice/program/resource/egi680pt-BR.res
+openoffice/program/resource/eme680pt-BR.res
+openoffice/program/resource/epb680pt-BR.res
+openoffice/program/resource/epg680pt-BR.res
+openoffice/program/resource/epp680pt-BR.res
+openoffice/program/resource/eps680pt-BR.res
+openoffice/program/resource/ept680pt-BR.res
+openoffice/program/resource/eur680pt-BR.res
+openoffice/program/resource/fps_office680pt-BR.res
+openoffice/program/resource/frm680pt-BR.res
+openoffice/program/resource/fwe680pt-BR.res
+openoffice/program/resource/gal680pt-BR.res
+openoffice/program/resource/imp680pt-BR.res
+openoffice/program/resource/ofa680pt-BR.res
+openoffice/program/resource/ooo680pt-BR.res
+openoffice/program/resource/pcr680pt-BR.res
+openoffice/program/resource/pdffilter680pt-BR.res
+openoffice/program/resource/preload680pt-BR.res
+openoffice/program/resource/productregistration680pt-BR.res
+openoffice/program/resource/rpt680pt-BR.res
+openoffice/program/resource/rptui680pt-BR.res
+openoffice/program/resource/san680pt-BR.res
+openoffice/program/resource/sb680pt-BR.res
+openoffice/program/resource/sc680pt-BR.res
+openoffice/program/resource/sd680pt-BR.res
+openoffice/program/resource/sdbcl680pt-BR.res
+openoffice/program/resource/sdberr680pt-BR.res
+openoffice/program/resource/sdbt680pt-BR.res
+openoffice/program/resource/sfx680pt-BR.res
+openoffice/program/resource/sm680pt-BR.res
+openoffice/program/resource/spa680pt-BR.res
+openoffice/program/resource/stt680pt-BR.res
+openoffice/program/resource/svs680pt-BR.res
+openoffice/program/resource/svt680pt-BR.res
+openoffice/program/resource/svx680pt-BR.res
+openoffice/program/resource/sw680pt-BR.res
+openoffice/program/resource/textconversiondlgs680pt-BR.res
+openoffice/program/resource/tfu680pt-BR.res
+openoffice/program/resource/tk680pt-BR.res
+openoffice/program/resource/tpl680pt-BR.res
+openoffice/program/resource/updchk680pt-BR.res
+openoffice/program/resource/uui680pt-BR.res
+openoffice/program/resource/vcl680pt-BR.res
+openoffice/program/resource/wzi680pt-BR.res
+openoffice/program/resource/xsltdlg680pt-BR.res
+openoffice/readmes/README_pt-BR
+openoffice/readmes/README_pt-BR.html
+openoffice/share/autocorr/acor_pt-BR.dat
+openoffice/share/autotext/pt-BR/
+openoffice/share/autotext/pt-BR/crdbus50.bau
+openoffice/share/autotext/pt-BR/standard.bau
+openoffice/share/autotext/pt-BR/template.bau
+openoffice/share/readme/LICENSE_pt-BR
+openoffice/share/readme/LICENSE_pt-BR.html
+openoffice/share/readme/README_pt-BR
+openoffice/share/readme/README_pt-BR.html
+openoffice/share/registry/modules/org/openoffice/Setup/Langpack-pt-BR.xcu
+openoffice/share/registry/res/pt-BR/
+openoffice/share/registry/res/pt-BR/org/
+openoffice/share/registry/res/pt-BR/org/openoffice/
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/Common.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/DataAccess.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/Embedding.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/ExtendedColorScheme.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/FormWizard.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/SFX.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/TableWizard.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/BaseWindowState.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/BasicIDECommands.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/BasicIDEWindowState.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/BibliographyCommands.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/CalcCommands.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/CalcWindowState.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/ChartCommands.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/ChartWindowState.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/DbBrowserWindowState.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/DbQueryWindowState.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/DbRelationWindowState.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/DbReportWindowState.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/DbTableWindowState.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/DbuCommands.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/DrawImpressCommands.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/DrawWindowState.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/Effects.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/GenericCategories.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/GenericCommands.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/ImpressWindowState.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/MathCommands.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/MathWindowState.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/ReportCommands.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/StartModuleCommands.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/StartModuleWindowState.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/WriterCommands.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/WriterFormWindowState.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/WriterReportWindowState.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/WriterWebWindowState.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/WriterWindowState.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/UI/XFormsWindowState.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/WebWizard.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Office/Writer.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/Setup.xcu
+openoffice/share/registry/res/pt-BR/org/openoffice/TypeDetection/
+openoffice/share/registry/res/pt-BR/org/openoffice/TypeDetection/Filter.xcu
+openoffice/share/template/pt-BR/
+openoffice/share/template/pt-BR/internal/
+openoffice/share/template/pt-BR/internal/html.stw
+openoffice/share/template/pt-BR/internal/idxexample.odt
+openoffice/share/template/pt-BR/internal/url_transfer.htm
+openoffice/share/template/pt-BR/layout/
+openoffice/share/template/pt-BR/layout/lyt-cool.otp
+openoffice/share/template/pt-BR/layout/lyt-darkblue.otp
+openoffice/share/template/pt-BR/presnt/
+openoffice/share/template/pt-BR/presnt/prs-novelty.otp
+openoffice/share/template/pt-BR/presnt/prs-strategy.otp
+openoffice/share/template/pt-BR/wizard/
+openoffice/share/template/pt-BR/wizard/agenda/
+openoffice/share/template/pt-BR/wizard/agenda/10grey.ott
+openoffice/share/template/pt-BR/wizard/agenda/1simple.ott
+openoffice/share/template/pt-BR/wizard/agenda/2elegant.ott
+openoffice/share/template/pt-BR/wizard/agenda/3modern.ott
+openoffice/share/template/pt-BR/wizard/agenda/4classic.ott
+openoffice/share/template/pt-BR/wizard/agenda/5blue.ott
+openoffice/share/template/pt-BR/wizard/agenda/6orange.ott
+openoffice/share/template/pt-BR/wizard/agenda/7red.ott
+openoffice/share/template/pt-BR/wizard/agenda/8green.ott
+openoffice/share/template/pt-BR/wizard/agenda/9colorful.ott
+openoffice/share/template/pt-BR/wizard/agenda/aw-10grey.ott
+openoffice/share/template/pt-BR/wizard/agenda/aw-1simple.ott
+openoffice/share/template/pt-BR/wizard/agenda/aw-2elegant.ott
+openoffice/share/template/pt-BR/wizard/agenda/aw-3modern.ott
+openoffice/share/template/pt-BR/wizard/agenda/aw-4classic.ott
+openoffice/share/template/pt-BR/wizard/agenda/aw-5blue.ott
+openoffice/share/template/pt-BR/wizard/agenda/aw-6orange.ott
+openoffice/share/template/pt-BR/wizard/agenda/aw-7red.ott
+openoffice/share/template/pt-BR/wizard/agenda/aw-8green.ott
+openoffice/share/template/pt-BR/wizard/agenda/aw-9colorful.ott
+openoffice/share/template/pt-BR/wizard/bitmap/
+openoffice/share/template/pt-BR/wizard/bitmap/Import_1.bmp
+openoffice/share/template/pt-BR/wizard/bitmap/Import_3.bmp
+openoffice/share/template/pt-BR/wizard/bitmap/Import_4.bmp
+openoffice/share/template/pt-BR/wizard/bitmap/MS-Import_2-1.bmp
+openoffice/share/template/pt-BR/wizard/bitmap/MS-Import_2-2.bmp
+openoffice/share/template/pt-BR/wizard/bitmap/MS-Import_2-3.bmp
+openoffice/share/template/pt-BR/wizard/bitmap/XML-Import_2-1.bmp
+openoffice/share/template/pt-BR/wizard/bitmap/XML-Import_2-2.bmp
+openoffice/share/template/pt-BR/wizard/bitmap/XML-Import_2-3.bmp
+openoffice/share/template/pt-BR/wizard/bitmap/XML-Import_2-4.bmp
+openoffice/share/template/pt-BR/wizard/bitmap/brasil.gif
+openoffice/share/template/pt-BR/wizard/bitmap/cancel_down.bmp
+openoffice/share/template/pt-BR/wizard/bitmap/cancel_up.bmp
+openoffice/share/template/pt-BR/wizard/bitmap/china.gif
+openoffice/share/template/pt-BR/wizard/bitmap/denmark.gif
+openoffice/share/template/pt-BR/wizard/bitmap/down.bmp
+openoffice/share/template/pt-BR/wizard/bitmap/end.bmp
+openoffice/share/template/pt-BR/wizard/bitmap/euro_1.bmp
+openoffice/share/template/pt-BR/wizard/bitmap/euro_2.bmp
+openoffice/share/template/pt-BR/wizard/bitmap/euro_3.bmp
+openoffice/share/template/pt-BR/wizard/bitmap/finland.gif
+openoffice/share/template/pt-BR/wizard/bitmap/france.gif
+openoffice/share/template/pt-BR/wizard/bitmap/ftpconnected.gif
+openoffice/share/template/pt-BR/wizard/bitmap/ftpconnecting.gif
+openoffice/share/template/pt-BR/wizard/bitmap/ftperror.gif
+openoffice/share/template/pt-BR/wizard/bitmap/ftpunknown.gif
+openoffice/share/template/pt-BR/wizard/bitmap/germany.wmf
+openoffice/share/template/pt-BR/wizard/bitmap/greece.gif
+openoffice/share/template/pt-BR/wizard/bitmap/italia.gif
+openoffice/share/template/pt-BR/wizard/bitmap/japan.gif
+openoffice/share/template/pt-BR/wizard/bitmap/maximize.bmp
+openoffice/share/template/pt-BR/wizard/bitmap/minimize.bmp
+openoffice/share/template/pt-BR/wizard/bitmap/netherlands.gif
+openoffice/share/template/pt-BR/wizard/bitmap/okay_down.bmp
+openoffice/share/template/pt-BR/wizard/bitmap/okay_up.bmp
+openoffice/share/template/pt-BR/wizard/bitmap/polska.gif
+openoffice/share/template/pt-BR/wizard/bitmap/portugal.gif
+openoffice/share/template/pt-BR/wizard/bitmap/report.bmp
+openoffice/share/template/pt-BR/wizard/bitmap/russia.gif
+openoffice/share/template/pt-BR/wizard/bitmap/spain.gif
+openoffice/share/template/pt-BR/wizard/bitmap/sweden.gif
+openoffice/share/template/pt-BR/wizard/bitmap/taiwan.gif
+openoffice/share/template/pt-BR/wizard/bitmap/turkey.gif
+openoffice/share/template/pt-BR/wizard/bitmap/tutorial_background.gif
+openoffice/share/template/pt-BR/wizard/bitmap/up.bmp
+openoffice/share/template/pt-BR/wizard/bitmap/usa.gif
+openoffice/share/template/pt-BR/wizard/fax/
+openoffice/share/template/pt-BR/wizard/fax/bus-classic-pri_f.ott
+openoffice/share/template/pt-BR/wizard/fax/bus-classic_f.ott
+openoffice/share/template/pt-BR/wizard/fax/bus-modern-pri_f.ott
+openoffice/share/template/pt-BR/wizard/fax/bus-modern_f.ott
+openoffice/share/template/pt-BR/wizard/fax/pri-bottle_f.ott
+openoffice/share/template/pt-BR/wizard/fax/pri-fax_f.ott
+openoffice/share/template/pt-BR/wizard/fax/pri-lines_f.ott
+openoffice/share/template/pt-BR/wizard/fax/pri-marine_f.ott
+openoffice/share/template/pt-BR/wizard/letter/
+openoffice/share/template/pt-BR/wizard/letter/pt-BR/
+openoffice/share/template/pt-BR/wizard/letter/pt-BR/bus-elegant_l.ott
+openoffice/share/template/pt-BR/wizard/letter/pt-BR/bus-modern_l.ott
+openoffice/share/template/pt-BR/wizard/letter/pt-BR/bus-office_l.ott
+openoffice/share/template/pt-BR/wizard/letter/pt-BR/off-elegant_l.ott
+openoffice/share/template/pt-BR/wizard/letter/pt-BR/off-modern_l.ott
+openoffice/share/template/pt-BR/wizard/letter/pt-BR/off-office_l.ott
+openoffice/share/template/pt-BR/wizard/letter/pt-BR/pri-bottle_l.ott
+openoffice/share/template/pt-BR/wizard/letter/pt-BR/pri-mail_l.ott
+openoffice/share/template/pt-BR/wizard/letter/pt-BR/pri-marine_l.ott
+openoffice/share/template/pt-BR/wizard/letter/pt-BR/pri-redline_l.ott
+openoffice/share/template/pt-BR/wizard/report/
+openoffice/share/template/pt-BR/wizard/report/cnt-01.ott
+openoffice/share/template/pt-BR/wizard/report/cnt-011.ott
+openoffice/share/template/pt-BR/wizard/report/cnt-012.ott
+openoffice/share/template/pt-BR/wizard/report/cnt-02.ott
+openoffice/share/template/pt-BR/wizard/report/cnt-021.ott
+openoffice/share/template/pt-BR/wizard/report/cnt-022.ott
+openoffice/share/template/pt-BR/wizard/report/cnt-03.ott
+openoffice/share/template/pt-BR/wizard/report/cnt-031.ott
+openoffice/share/template/pt-BR/wizard/report/cnt-032.ott
+openoffice/share/template/pt-BR/wizard/report/cnt-04.ott
+openoffice/share/template/pt-BR/wizard/report/cnt-041.ott
+openoffice/share/template/pt-BR/wizard/report/cnt-042.ott
+openoffice/share/template/pt-BR/wizard/report/cnt-05.ott
+openoffice/share/template/pt-BR/wizard/report/cnt-051.ott
+openoffice/share/template/pt-BR/wizard/report/cnt-052.ott
+openoffice/share/template/pt-BR/wizard/report/cnt-06.ott
+openoffice/share/template/pt-BR/wizard/report/cnt-061.ott
+openoffice/share/template/pt-BR/wizard/report/cnt-062.ott
+openoffice/share/template/pt-BR/wizard/report/cnt-default.ott
+openoffice/share/template/pt-BR/wizard/report/stl-01.ott
+openoffice/share/template/pt-BR/wizard/report/stl-02.ott
+openoffice/share/template/pt-BR/wizard/report/stl-03.ott
+openoffice/share/template/pt-BR/wizard/report/stl-04.ott
+openoffice/share/template/pt-BR/wizard/report/stl-05.ott
+openoffice/share/template/pt-BR/wizard/report/stl-06.ott
+openoffice/share/template/pt-BR/wizard/report/stl-07.ott
+openoffice/share/template/pt-BR/wizard/report/stl-08.ott
+openoffice/share/template/pt-BR/wizard/report/stl-09.ott
+openoffice/share/template/pt-BR/wizard/report/stl-10.ott
+openoffice/share/template/pt-BR/wizard/report/stl-default.ott
+openoffice/share/template/pt-BR/wizard/styles/
+openoffice/share/template/pt-BR/wizard/styles/black_white.ots
+openoffice/share/template/pt-BR/wizard/styles/blackberry.ots
+openoffice/share/template/pt-BR/wizard/styles/default.ots
+openoffice/share/template/pt-BR/wizard/styles/diner.ots
+openoffice/share/template/pt-BR/wizard/styles/fall.ots
+openoffice/share/template/pt-BR/wizard/styles/glacier.ots
+openoffice/share/template/pt-BR/wizard/styles/green_grapes.ots
+openoffice/share/template/pt-BR/wizard/styles/jeans.ots
+openoffice/share/template/pt-BR/wizard/styles/marine.ots
+openoffice/share/template/pt-BR/wizard/styles/millennium.ots
+openoffice/share/template/pt-BR/wizard/styles/nature.ots
+openoffice/share/template/pt-BR/wizard/styles/neon.ots
+openoffice/share/template/pt-BR/wizard/styles/night.ots
+openoffice/share/template/pt-BR/wizard/styles/nostalgic.ots
+openoffice/share/template/pt-BR/wizard/styles/pastell.ots
+openoffice/share/template/pt-BR/wizard/styles/pool.ots
+openoffice/share/template/pt-BR/wizard/styles/pumpkin.ots
+openoffice/share/template/pt-BR/wizard/styles/sunstyle.ots
+openoffice/share/template/pt-BR/wizard/styles/xos.ots
+openoffice/share/template/wizard/letter/pt-BR/
+openoffice/share/template/wizard/letter/pt-BR/bus-elegant_l.ott
+openoffice/share/template/wizard/letter/pt-BR/bus-modern_l.ott
+openoffice/share/template/wizard/letter/pt-BR/bus-office_l.ott
+openoffice/share/template/wizard/letter/pt-BR/off-elegant_l.ott
+openoffice/share/template/wizard/letter/pt-BR/off-modern_l.ott
+openoffice/share/template/wizard/letter/pt-BR/off-office_l.ott
+openoffice/share/template/wizard/letter/pt-BR/pri-bottle_l.ott
+openoffice/share/template/wizard/letter/pt-BR/pri-mail_l.ott
+openoffice/share/template/wizard/letter/pt-BR/pri-marine_l.ott
+openoffice/share/template/wizard/letter/pt-BR/pri-redline_l.ott
+openoffice/share/wordbook/pt-BR/
+openoffice/share/wordbook/pt-BR/soffice.dic
+openoffice/share/wordbook/pt-BR/sun.dic
--- a/editors/openoffice/pkg/PLIST-i18n-ru
+++ b/editors/openoffice/pkg/PLIST-i18n-ru
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-i18n-ru,v 1.2 2007/11/13 09:46:28 robert Exp $
+@comment $OpenBSD: PLIST-i18n-ru,v 1.3 2008/04/28 11:18:46 robert Exp $
 openoffice/help/ru/
 openoffice/help/ru/default.css
 openoffice/help/ru/err.html
@ -196,6 +196,7 @@ openoffice/program/resource/sb680ru.res
 openoffice/program/resource/sc680ru.res
 openoffice/program/resource/sd680ru.res
 openoffice/program/resource/sdbcl680ru.res
+openoffice/program/resource/sdberr680ru.res
 openoffice/program/resource/sdbt680ru.res
 openoffice/program/resource/sfx680ru.res
 openoffice/program/resource/sm680ru.res
--- a/editors/openoffice/pkg/PLIST-i18n-sl
+++ b/editors/openoffice/pkg/PLIST-i18n-sl
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-i18n-sl,v 1.2 2007/11/13 09:46:28 robert Exp $
+@comment $OpenBSD: PLIST-i18n-sl,v 1.3 2008/04/28 11:18:46 robert Exp $
 openoffice/help/sl/
 openoffice/help/sl/default.css
 openoffice/help/sl/err.html
@ -196,6 +196,7 @@ openoffice/program/resource/sb680sl.res
 openoffice/program/resource/sc680sl.res
 openoffice/program/resource/sd680sl.res
 openoffice/program/resource/sdbcl680sl.res
+openoffice/program/resource/sdberr680sl.res
 openoffice/program/resource/sdbt680sl.res
 openoffice/program/resource/sfx680sl.res
 openoffice/program/resource/sm680sl.res
--- a/editors/openoffice/pkg/PLIST-i18n-sv
+++ b/editors/openoffice/pkg/PLIST-i18n-sv
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-i18n-sv,v 1.2 2007/11/13 09:46:28 robert Exp $
+@comment $OpenBSD: PLIST-i18n-sv,v 1.3 2008/04/28 11:18:46 robert Exp $
 openoffice/help/sv/
 openoffice/help/sv/default.css
 openoffice/help/sv/err.html
@ -196,6 +196,7 @@ openoffice/program/resource/sb680sv.res
 openoffice/program/resource/sc680sv.res
 openoffice/program/resource/sd680sv.res
 openoffice/program/resource/sdbcl680sv.res
+openoffice/program/resource/sdberr680sv.res
 openoffice/program/resource/sdbt680sv.res
 openoffice/program/resource/sfx680sv.res
 openoffice/program/resource/sm680sv.res
--- a/editors/openoffice/pkg/PLIST-main
+++ b/editors/openoffice/pkg/PLIST-main
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.10 2008/01/04 14:52:31 robert Exp $
+@comment $OpenBSD: PLIST-main,v 1.11 2008/04/28 11:18:46 robert Exp $
@pkgpath editors/openoffice
 %%SHARED%%
 bin/sbase
@ -200,6 +200,7 @@ openoffice/presets/gallery/sg30.sdv
 openoffice/presets/gallery/sg30.thm
 openoffice/program/
 openoffice/program/about.bmp
+openoffice/program/bootstrap.uno.so
 openoffice/program/bootstraprc
 openoffice/program/cde-open-url
 openoffice/program/configimport
@ -214,8 +215,10 @@ openoffice/program/intro.bmp
 openoffice/program/jvmfwk3rc
 openoffice/program/kde-open-url
 openoffice/program/legacy_binfilters.rdb
+openoffice/program/libbf_so680.so
 openoffice/program/libcppu.so.3
 openoffice/program/libcppuhelpergcc3.so.3
+openoffice/program/libhelplinker680.so
 openoffice/program/libicudata.so.36
 openoffice/program/libicui18n.so.36
 openoffice/program/libicule.so.36
@ -299,6 +302,7 @@ openoffice/program/resource/sb680en-US.res
 openoffice/program/resource/sc680en-US.res
 openoffice/program/resource/sd680en-US.res
 openoffice/program/resource/sdbcl680en-US.res
+openoffice/program/resource/sdberr680en-US.res
 openoffice/program/resource/sdbt680en-US.res
 openoffice/program/resource/sfx680en-US.res
 openoffice/program/resource/sm680en-US.res
@ -332,6 +336,7 @@ openoffice/program/soffice.bin
 openoffice/program/sofficerc
 openoffice/program/spadmin
 openoffice/program/spadmin.bin
+openoffice/program/stocservices.uno.so
 openoffice/program/swriter
 openoffice/program/testtool.bin
 openoffice/program/testtoolrc
@ -344,6 +349,7 @@ openoffice/program/unopkg
 openoffice/program/unopkg.bin
 openoffice/program/unorc
 openoffice/program/uri-encode
+openoffice/program/vbaapi.oxt
 openoffice/program/versionrc
 openoffice/program/viewdoc
 openoffice/readmes/
@ -395,6 +401,7 @@ openoffice/share/autocorr/acor_en-GB.dat
 openoffice/share/autocorr/acor_en-US.dat
 openoffice/share/autocorr/acor_en-ZA.dat
 openoffice/share/autocorr/acor_es-ES.dat
+openoffice/share/autocorr/acor_fi-FI.dat
 openoffice/share/autocorr/acor_fr-FR.dat
 openoffice/share/autocorr/acor_hu-HU.dat
 openoffice/share/autocorr/acor_it-IT.dat
@ -402,7 +409,6 @@ openoffice/share/autocorr/acor_ja-JP.dat
 openoffice/share/autocorr/acor_ko-KR.dat
 openoffice/share/autocorr/acor_nl-NL.dat
 openoffice/share/autocorr/acor_pl-PL.dat
-openoffice/share/autocorr/acor_pt-BR.dat
 openoffice/share/autocorr/acor_pt-PT.dat
 openoffice/share/autocorr/acor_ru-RU.dat
 openoffice/share/autocorr/acor_sk-SK.dat
@ -650,6 +656,7 @@ openoffice/share/config/soffice.cfg/modules/dbreport/toolbar/alignmentbar.xml
 openoffice/share/config/soffice.cfg/modules/dbreport/toolbar/arrowshapes.xml
 openoffice/share/config/soffice.cfg/modules/dbreport/toolbar/basicshapes.xml
 openoffice/share/config/soffice.cfg/modules/dbreport/toolbar/calloutshapes.xml
+openoffice/share/config/soffice.cfg/modules/dbreport/toolbar/drawbar.xml
 openoffice/share/config/soffice.cfg/modules/dbreport/toolbar/flowchartshapes.xml
 openoffice/share/config/soffice.cfg/modules/dbreport/toolbar/reportcontrols.xml
 openoffice/share/config/soffice.cfg/modules/dbreport/toolbar/resizebar.xml
@ -1090,7 +1097,6 @@ openoffice/share/config/soffice.cfg/modules/swriter/toolbar/fullscreenbar.xml
 openoffice/share/config/soffice.cfg/modules/swriter/toolbar/graffilterbar.xml
 openoffice/share/config/soffice.cfg/modules/swriter/toolbar/graphicobjectbar.xml
 openoffice/share/config/soffice.cfg/modules/swriter/toolbar/insertbar.xml
-openoffice/share/config/soffice.cfg/modules/swriter/toolbar/insertobjectbar.xml
 openoffice/share/config/soffice.cfg/modules/swriter/toolbar/mediaobjectbar.xml
 openoffice/share/config/soffice.cfg/modules/swriter/toolbar/moreformcontrols.xml
 openoffice/share/config/soffice.cfg/modules/swriter/toolbar/numobjectbar.xml
@ -1341,7 +1347,10 @@ openoffice/share/dict/ooo/README_de_AT.txt
 openoffice/share/dict/ooo/README_de_CH.txt
 openoffice/share/dict/ooo/README_de_DE.txt
 openoffice/share/dict/ooo/README_en_GB.txt
+openoffice/share/dict/ooo/README_en_ZA.txt
+openoffice/share/dict/ooo/README_es_ES.txt
 openoffice/share/dict/ooo/README_et_EE.txt
+openoffice/share/dict/ooo/README_fr_FR.txt
 openoffice/share/dict/ooo/README_hu_HU.txt
 openoffice/share/dict/ooo/README_hyph_de_DE.txt
 openoffice/share/dict/ooo/README_hyph_et_EE.txt
@ -1350,7 +1359,9 @@ openoffice/share/dict/ooo/README_hyph_lt_LT.txt
 openoffice/share/dict/ooo/README_hyph_pl_PL.txt
 openoffice/share/dict/ooo/README_hyph_sl_SI.txt
 openoffice/share/dict/ooo/README_it_IT.txt
+openoffice/share/dict/ooo/README_it_IT_thes.txt
 openoffice/share/dict/ooo/README_lt_LT.txt
+openoffice/share/dict/ooo/README_ne_NP.txt
 openoffice/share/dict/ooo/README_nl_NL.txt
 openoffice/share/dict/ooo/README_pl_PL.txt
 openoffice/share/dict/ooo/README_pt_BR.txt
@ -1361,10 +1372,14 @@ openoffice/share/dict/ooo/README_sw_TZ.txt
 openoffice/share/dict/ooo/README_th_TH.txt
 openoffice/share/dict/ooo/README_th_de_CH_v2.txt
 openoffice/share/dict/ooo/README_th_de_DE_v2.txt
+openoffice/share/dict/ooo/README_th_ne_NP_v2.txt
 openoffice/share/dict/ooo/README_th_pl_PL_v2.txt
+openoffice/share/dict/ooo/README_thes_ru_RU.txt
 openoffice/share/dict/ooo/WordNet_license.txt
 openoffice/share/dict/ooo/af_ZA.aff
 openoffice/share/dict/ooo/af_ZA.dic
+openoffice/share/dict/ooo/da_DK.aff
+openoffice/share/dict/ooo/da_DK.dic
 openoffice/share/dict/ooo/de_AT.aff
 openoffice/share/dict/ooo/de_AT.dic
 openoffice/share/dict/ooo/de_CH.aff
@ -1376,8 +1391,14 @@ openoffice/share/dict/ooo/en_GB.aff
 openoffice/share/dict/ooo/en_GB.dic
 openoffice/share/dict/ooo/en_US.aff
 openoffice/share/dict/ooo/en_US.dic
+openoffice/share/dict/ooo/en_ZA.aff
+openoffice/share/dict/ooo/en_ZA.dic
+openoffice/share/dict/ooo/es_ES.aff
+openoffice/share/dict/ooo/es_ES.dic
 openoffice/share/dict/ooo/et_EE.aff
 openoffice/share/dict/ooo/et_EE.dic
+openoffice/share/dict/ooo/fr_FR.aff
+openoffice/share/dict/ooo/fr_FR.dic
 openoffice/share/dict/ooo/hu_HU.aff
 openoffice/share/dict/ooo/hu_HU.dic
 openoffice/share/dict/ooo/hyph_af_ZA.dic
@ -1393,10 +1414,13 @@ openoffice/share/dict/ooo/hyph_nl_NL.dic
 openoffice/share/dict/ooo/hyph_pl_PL.dic
 openoffice/share/dict/ooo/hyph_ru_RU.dic
 openoffice/share/dict/ooo/hyph_sl_SI.dic
+openoffice/share/dict/ooo/hyph_zu_ZA.dic
 openoffice/share/dict/ooo/it_IT.aff
 openoffice/share/dict/ooo/it_IT.dic
 openoffice/share/dict/ooo/lt_LT.aff
 openoffice/share/dict/ooo/lt_LT.dic
+openoffice/share/dict/ooo/ne_NP.aff
+openoffice/share/dict/ooo/ne_NP.dic
 openoffice/share/dict/ooo/nl_NL.aff
 openoffice/share/dict/ooo/nl_NL.dic
 openoffice/share/dict/ooo/pl_PL.aff
@ -1422,8 +1446,14 @@ openoffice/share/dict/ooo/th_de_DE_v2.dat
 openoffice/share/dict/ooo/th_de_DE_v2.idx
 openoffice/share/dict/ooo/th_en_US_v2.dat
 openoffice/share/dict/ooo/th_en_US_v2.idx
+openoffice/share/dict/ooo/th_it_IT_v2.dat
+openoffice/share/dict/ooo/th_it_IT_v2.idx
+openoffice/share/dict/ooo/th_ne_NP_v2.dat
+openoffice/share/dict/ooo/th_ne_NP_v2.idx
 openoffice/share/dict/ooo/th_pl_PL_v2.dat
 openoffice/share/dict/ooo/th_pl_PL_v2.idx
+openoffice/share/dict/ooo/th_ru_RU_v2.dat
+openoffice/share/dict/ooo/th_ru_RU_v2.idx
 openoffice/share/dict/ooo/th_sk_SK_license.txt
 openoffice/share/dict/ooo/th_sk_SK_v2.dat
 openoffice/share/dict/ooo/th_sk_SK_v2.idx
@ -1533,17 +1563,40 @@ openoffice/share/fingerprint/vietnamese.lm
 openoffice/share/fingerprint/welsh.lm
 openoffice/share/fingerprint/yiddish_utf.lm
 openoffice/share/fonts/
-openoffice/share/fonts/truetype/
-openoffice/share/fonts/truetype/Vera.ttf
-openoffice/share/fonts/truetype/VeraBI.ttf
-openoffice/share/fonts/truetype/VeraBd.ttf
-openoffice/share/fonts/truetype/VeraIt.ttf
-openoffice/share/fonts/truetype/VeraMoBI.ttf
-openoffice/share/fonts/truetype/VeraMoBd.ttf
-openoffice/share/fonts/truetype/VeraMoIt.ttf
-openoffice/share/fonts/truetype/VeraMono.ttf
-openoffice/share/fonts/truetype/VeraSe.ttf
-openoffice/share/fonts/truetype/VeraSeBd.ttf
+@fontdir openoffice/share/fonts/truetype/
+openoffice/share/fonts/truetype/DejaVuCondensedSans.ttf
+openoffice/share/fonts/truetype/DejaVuCondensedSansBold.ttf
+openoffice/share/fonts/truetype/DejaVuCondensedSansBoldOblique.ttf
+openoffice/share/fonts/truetype/DejaVuCondensedSansOblique.ttf
+openoffice/share/fonts/truetype/DejaVuCondensedSerif.ttf
+openoffice/share/fonts/truetype/DejaVuCondensedSerifBold.ttf
+openoffice/share/fonts/truetype/DejaVuCondensedSerifBoldItalic.ttf
+openoffice/share/fonts/truetype/DejaVuCondensedSerifItalic.ttf
+openoffice/share/fonts/truetype/DejaVuMonoSans.ttf
+openoffice/share/fonts/truetype/DejaVuMonoSansBold.ttf
+openoffice/share/fonts/truetype/DejaVuMonoSansBoldOblique.ttf
+openoffice/share/fonts/truetype/DejaVuMonoSansOblique.ttf
+openoffice/share/fonts/truetype/DejaVuSans.ttf
+openoffice/share/fonts/truetype/DejaVuSansBold.ttf
+openoffice/share/fonts/truetype/DejaVuSansBoldOblique.ttf
+openoffice/share/fonts/truetype/DejaVuSansExtraLight.ttf
+openoffice/share/fonts/truetype/DejaVuSansOblique.ttf
+openoffice/share/fonts/truetype/DejaVuSerif.ttf
+openoffice/share/fonts/truetype/DejaVuSerifBold.ttf
+openoffice/share/fonts/truetype/DejaVuSerifBoldItalic.ttf
+openoffice/share/fonts/truetype/DejaVuSerifItalic.ttf
+openoffice/share/fonts/truetype/LiberationMono-Bold.ttf
+openoffice/share/fonts/truetype/LiberationMono-BoldItalic.ttf
+openoffice/share/fonts/truetype/LiberationMono-Italic.ttf
+openoffice/share/fonts/truetype/LiberationMono-Regular.ttf
+openoffice/share/fonts/truetype/LiberationSans-Bold.ttf
+openoffice/share/fonts/truetype/LiberationSans-BoldItalic.ttf
+openoffice/share/fonts/truetype/LiberationSans-Italic.ttf
+openoffice/share/fonts/truetype/LiberationSans-Regular.ttf
+openoffice/share/fonts/truetype/LiberationSerif-Bold.ttf
+openoffice/share/fonts/truetype/LiberationSerif-BoldItalic.ttf
+openoffice/share/fonts/truetype/LiberationSerif-Italic.ttf
+openoffice/share/fonts/truetype/LiberationSerif-Regular.ttf
 openoffice/share/fonts/truetype/opens___.ttf
 openoffice/share/gallery/
 openoffice/share/gallery/apples.gif
@ -2132,6 +2185,7 @@ openoffice/share/registry/data/org/openoffice/Inet.xcu
 openoffice/share/registry/data/org/openoffice/LDAP.xcu.sample
 openoffice/share/registry/data/org/openoffice/Office/
 openoffice/share/registry/data/org/openoffice/Office/Calc.xcu
+openoffice/share/registry/data/org/openoffice/Office/Canvas.xcu
 openoffice/share/registry/data/org/openoffice/Office/Common.xcu
 openoffice/share/registry/data/org/openoffice/Office/Compatibility.xcu
 openoffice/share/registry/data/org/openoffice/Office/DataAccess.xcu
@ -2337,6 +2391,7 @@ openoffice/share/registry/schema/org/openoffice/Office/
 openoffice/share/registry/schema/org/openoffice/Office/Addons.xcs
 openoffice/share/registry/schema/org/openoffice/Office/Calc.xcs
 openoffice/share/registry/schema/org/openoffice/Office/CalcAddIns.xcs
+openoffice/share/registry/schema/org/openoffice/Office/Canvas.xcs
 openoffice/share/registry/schema/org/openoffice/Office/Chart.xcs
 openoffice/share/registry/schema/org/openoffice/Office/Commands.xcs
 openoffice/share/registry/schema/org/openoffice/Office/Common.xcs
@ -2747,17 +2802,6 @@ openoffice/share/template/wizard/letter/pl/pri-mail_l.ott
 openoffice/share/template/wizard/letter/pl/pri-marine_l.ott
 openoffice/share/template/wizard/letter/pl/pri-redline_l.ott
 openoffice/share/template/wizard/letter/pt/
-openoffice/share/template/wizard/letter/pt-BR/
-openoffice/share/template/wizard/letter/pt-BR/bus-elegant_l.ott
-openoffice/share/template/wizard/letter/pt-BR/bus-modern_l.ott
-openoffice/share/template/wizard/letter/pt-BR/bus-office_l.ott
-openoffice/share/template/wizard/letter/pt-BR/off-elegant_l.ott
-openoffice/share/template/wizard/letter/pt-BR/off-modern_l.ott
-openoffice/share/template/wizard/letter/pt-BR/off-office_l.ott
-openoffice/share/template/wizard/letter/pt-BR/pri-bottle_l.ott
-openoffice/share/template/wizard/letter/pt-BR/pri-mail_l.ott
-openoffice/share/template/wizard/letter/pt-BR/pri-marine_l.ott
-openoffice/share/template/wizard/letter/pt-BR/pri-redline_l.ott
 openoffice/share/template/wizard/letter/pt/bus-elegant_l.ott
 openoffice/share/template/wizard/letter/pt/bus-modern_l.ott
 openoffice/share/template/wizard/letter/pt/bus-office_l.ott
@ -2928,7 +2972,6 @@ openoffice/share/xslt/import/wordml/wordml2ooo_text.xsl
 openoffice/share/xslt/wiki/
 openoffice/share/xslt/wiki/odt2mediawiki.xsl
 openoffice/share/xslt/wiki/oopedia-style.ott
-share/applications/
 share/applications/openoffice/
 share/applications/openoffice/base.desktop
 share/applications/openoffice/calc.desktop
@ -2936,7 +2979,6 @@ share/applications/openoffice/draw.desktop
 share/applications/openoffice/impress.desktop
 share/applications/openoffice/math.desktop
 share/applications/openoffice/writer.desktop
-share/icons/
 share/icons/openoffice/
 share/icons/openoffice/ooo-base.png
 share/icons/openoffice/ooo-calc.png
@ -2944,3 +2986,7 @@ share/icons/openoffice/ooo-draw.png
 share/icons/openoffice/ooo-impress.png
 share/icons/openoffice/ooo-math.png
 share/icons/openoffice/ooo-writer.png
+@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/openoffice 2> /dev/null || true
+@unexec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/openoffice 2> /dev/null || true
+@exec %D/bin/update-desktop-database
+@unexec %D/bin/update-desktop-database