remove OO2 which has been unlinked from builds since april

ok sthen, msf
2009-11-12 15:26:26 +00:00 · 2009-11-12 15:26:26 +00:00 · 9d83aaa47b
commit 9d83aaa47b
parent 67617128d4
175 changed files with 0 additions and 16818 deletions
--- a/editors/openoffice/Makefile
+++ b/editors/openoffice/Makefile
@ -1,229 +0,0 @@
-# $OpenBSD: Makefile,v 1.86 2009/08/10 06:31:08 kili Exp $
-
-ONLY_FOR_ARCHS= amd64 i386
-
-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.4.2
-DISTNAME=	OOo_${VERSION}
-WRKDIST=	${WRKDIR}/OOH680_m18
-PKGNAME=	openoffice-${VERSION}
-PKGNAME-main=	openoffice-${VERSION}p3
-PKGNAME-kde=	openoffice-kde-${VERSION}p0
-PKGNAME-java=	openoffice-java-${VERSION}p2
-CATEGORIES=	editors productivity
-
-SHARED_LIBS=	stlport_gcc	4.5
-
-MAINTAINER=	Robert Nagy <robert@openbsd.org>
-
-HOMEPAGE=	http://www.openoffice.org/
-MASTER_SITES=	http://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/Sources/ \
-		http://humppa.hu/ooo/ \
-		ftp://ftp.ussg.iu.edu/pub/openoffice/stable/${VERSION}/ \
-		ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/OpenOffice/stable/${VERSION}/ \
-		ftp://ftp.tu-chemnitz.de/pub/openoffice/stable/${VERSION}/ \
-		ftp://ftp.nluug.nl/pub/office/openoffice/stable/${VERSION}/ \
-		http://vlaai.snt.utwente.nl/pub/software/openoffice/stable/${VERSION}/ \
-		ftp://openoffice.mirror.cygnal.ca/openoffice/stable/${VERSION}/
-MASTER_SITES0=	http://www.bsd.hu/~robert/ooo/ \
-		http://humppa.hu/ooo/
-
-DISTFILES=	ooo-desktop-0.1.tar.gz:0
-.for dfile in binfilter core l10n sdk system
-DISTFILES+=	${DISTNAME}_src_${dfile}.tar.bz2
-.endfor
-
-DIST_SUBDIR=	openoffice
-
-# See http://www.openoffice.org/about.html#licenses
-# and http://www.openoffice.org/license.html
-# and http://www.openoffice.org/FAQs/faq-licensing.html 
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
-PERMIT_DISTFILES_FTP=	Yes
-
-MULTI_PACKAGES=		-main -kde -java
-
-PSEUDO_FLAVORS=	normal_build no_lang
-FLAVORS=	debug
-FLAVOR?=
-
-.if !${FLAVOR:L:Mno_lang}
-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:L}
-MULTI_PACKAGES+=	-i18n-$l
-PKGNAME-i18n-$l=	openoffice-i18n-$l-${VERSION}
-COMMENT-i18n-$l=	$l language pack for OpenOffice.Org
-RUN_DEPENDS-i18n-$l=	::editors/openoffice
-WANTLIB-i18n-$l=
-LIB_DEPENDS-i18n-$l=
-.endfor
-.endif
-
-BUILD_DEPENDS=	:zip-*:archivers/zip \
-		:unzip-*:archivers/unzip \
-		:bison-*:devel/bison \
-		:tcsh-*:shells/tcsh \
-		:p5-Archive-Zip-*:archivers/p5-Archive-Zip \
-		::print/cups \
-		::devel/apache-ant \
-		:db-java->=4,<5:databases/db/v4,-java,java \
-		::devel/boost
-
-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,<5:databases/db/v4 \
-		xslt.>=3::textproc/libxslt \
-		curl.>=7::net/curl \
-		neon.>=24::net/neon \
-		wpd.>=8::textproc/libwpd \
-		icuuc.>=0::textproc/icu4c
-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 jpeg m pango-1.0 pangocairo-1.0 \
-		pangoft2-1.0 png pthread stdc++ ssl util xml2 z icui18n icule \
-		pthread-stubs xcb
-RUN_DEPENDS-main=	::java/javaPathHelper \
-			:desktop-file-utils-*:devel/desktop-file-utils
-
-MODULES+=		x11/qt3
-RUN_DEPENDS-kde=	::editors/openoffice
-LIB_DEPENDS-kde=	${MODQT_LIB_DEPENDS} \
-			kabc,kdecore,kdeui,kio::x11/kde/libs3
-WANTLIB-kde=		X11 Xext m pthread-stubs xcb
-
-MODULES+=		java
-MODJAVA_VER=		1.4+
-MODJAVA_JRERUN=		Yes
-LIB_DEPENDS-java=
-RUN_DEPENDS-java=	${MODJAVA_RUN_DEPENDS} \
-			::editors/openoffice \
-			:db-java->=4,<5:databases/db/v4,-java,java
-WANTLIB-java=		c m pthread stdc++
-
-
-USE_X11=	Yes
-USE_GMAKE=	Yes
-NO_REGRESS=	Yes
-VMEM_WARNING=	Yes
-
-PATCHFILES=	build-java-target-2.4.0.diff:0
-
-PATCHORIG=	.orig.port
-WRKCONF=	${WRKSRC}/config_office
-
-CONFIGURE_STYLE=	autoconf no-autoheader
-AUTOCONF_VERSION=	2.59
-AUTOCONF_DIR=		${WRKCONF}
-
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
-		QTINC="${MODQT_INCDIR}" QTDIR="${MODQT_LIBDIR}"
-
-CONFIGURE_ARGS=	--disable-gnome-vfs \
-		--disable-mozilla \
-		--disable-odk \
-		--disable-pasf \
-		--enable-cairo \
-		--enable-kde \
-		--with-system-jpeg \
-		--with-system-python \
-		--with-system-libxml \
-		--with-system-stdlibs \
-		--with-system-freetype \
-		--with-system-curl \
-		--with-system-zlib \
-		--with-system-expat \
-		--with-system-neon \
-		--with-system-db \
-		--with-system-boost \
-		--with-system-libwpd \
-		--with-system-openssl \
-		--with-system-icu \
-		--with-epm=internal \
-		--with-alloc=system \
-		--with-java \
-		--with-java-target-version=1.4 \
-		--with-jdk-home=${JAVA_HOME} \
-		--with-ant-home=${LOCALBASE}/ant/lib \
-		--with-db-jar=${LOCALBASE}/lib/db4/db.jar \
-		--with-lang="en-US ${LANGS}"
-
-.if ${FLAVOR:L:Mdebug}
-CONFIGURE_ARGS+=	--enable-symbols \
-			--enable-debug
-.endif
-
-MAKE_ENV+=	envcflags="${CFLAGS}"
-
-# kludge
-TCSH=		${LOCALBASE}/bin/tcsh
-
-.if ${FLAVOR:L:Mnormal_build}
-BUILD_CMD=	dmake && cd instsetoo_native/util && dmake ooolanguagepack
-.else
-BUILD_CMD=	cd instsetoo_native && build.pl --all --dlv_switch -link && \
-		cd util && dmake ooolanguagepack
-.endif
-
-pre-patch:
-.for arch in intel x86-64
-	@cd ${WRKSRC}/bridges/source/cpp_uno && \
-		cp -R gcc3_freebsd_${arch} gcc3_openbsd_${arch} && \
-		perl -pi -e "s,FREEBSD,OPENBSD,g" gcc3_openbsd_${arch}/makefile.mk
-.endfor
-
-do-build:
-	@cd ${WRKBUILD} && \
-		./bootstrap && \
-		${SETENV} ${MAKE_ENV} ${TCSH} -c 'limit descriptors 256 && source OpenBSDEnv.Set && ${BUILD_CMD}' 
-
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/applications/openoffice
-	${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/48x48/apps
-
-	cd ${WRKDIR}/ooo-desktop && \
-		for DFILE in `ls -1 *.desktop`; do \
-			${INSTALL_DATA} $$DFILE \
-				${PREFIX}/share/applications/openoffice; \
-		done && \
-		for ICONS in `ls -1 *.png`; do \
-			${INSTALL_DATA} $$ICONS ${PREFIX}/share/icons/hicolor/48x48/apps; \
-		done
-
-	cd ${WRKSRC}/instsetoo_native/unxobsd.pro/OpenOffice/portable/install/en-US*/openbsd-* && \
-		for SW in `ls -1 *.sw`; do \
-			${TAR} xf $$SW -C ${PREFIX}; \
-		done
-
-.for l in ${LANGS}
-	cd ${WRKSRC}/instsetoo_native/unxobsd.pro/OpenOffice_languagepack/portable/install/$l/openbsd-* && \
-		for SW in `ls -1 *.sw`; do \
-			${TAR} xf $$SW -C ${PREFIX}; \
-		done
-.endfor
-
-	cd ${WRKSRC}/bridges/unxobsd.pro/lib && \
-		for UNOLIB in `ls -1 *.so`; do \
-			${INSTALL_DATA} $$UNOLIB \
-				${PREFIX}/openoffice/program; \
-		done
-
-	${INSTALL_SCRIPT} ${FILESDIR}/soffice.sh ${PREFIX}/bin/soffice
-	perl -pi -e "s,%%LOCALBASE%%,${LOCALBASE},g; \
-		s,%%X11BASE%%,${X11BASE},g" \
-                ${PREFIX}/bin/soffice \
-
-	cd ${PREFIX}/bin && \
-	for app in sbase scalc sdraw simpress smath setofficelang spadmin swriter; do \
-		ln -sf soffice $$app ; done
-
-.include <bsd.port.mk>
--- a/editors/openoffice/distinfo
+++ b/editors/openoffice/distinfo
@ -1,35 +0,0 @@
-MD5 (openoffice/OOo_2.4.2_src_binfilter.tar.bz2) = UJyZjrJI0iB+JkAEbTJB2g==
-MD5 (openoffice/OOo_2.4.2_src_core.tar.bz2) = R4vH7NNpr7ctnLCbSMOZpA==
-MD5 (openoffice/OOo_2.4.2_src_l10n.tar.bz2) = oi/YDsW3sSlMnA+5sZXPdw==
-MD5 (openoffice/OOo_2.4.2_src_sdk.tar.bz2) = 5g21OLl9/zEfX0vK3L9FdA==
-MD5 (openoffice/OOo_2.4.2_src_system.tar.bz2) = 02qfEBFYhsXB9g7e+3QRRA==
-MD5 (openoffice/build-java-target-2.4.0.diff) = TA2oGby24F2ohDLinth12w==
-MD5 (openoffice/ooo-desktop-0.1.tar.gz) = dU5VRZxt8d6nfJdZccw6Og==
-RMD160 (openoffice/OOo_2.4.2_src_binfilter.tar.bz2) = CWYkRPNZ+Gu37uwMA1rik2DpieU=
-RMD160 (openoffice/OOo_2.4.2_src_core.tar.bz2) = 0p7X0jp2FrBdhVwXLm8UiusPS2k=
-RMD160 (openoffice/OOo_2.4.2_src_l10n.tar.bz2) = eiv3y+QEt/6MthxnBxf1QEbhyrk=
-RMD160 (openoffice/OOo_2.4.2_src_sdk.tar.bz2) = bxM0tGCaNylwwDsz2di5/hpYLWk=
-RMD160 (openoffice/OOo_2.4.2_src_system.tar.bz2) = Fy/N4Ab16B875SarUNuxCmfSd7M=
-RMD160 (openoffice/build-java-target-2.4.0.diff) = YtyP6lI7FQnrikAIe3nF4O9r8S8=
-RMD160 (openoffice/ooo-desktop-0.1.tar.gz) = tjUkIQpF0kNW/sN0jvoXxo8tEuc=
-SHA1 (openoffice/OOo_2.4.2_src_binfilter.tar.bz2) = HH9lLHGtM2SpjXnU9nUdsAx9qpk=
-SHA1 (openoffice/OOo_2.4.2_src_core.tar.bz2) = +EeCiHBiAR80xcjwJ5xA0VkFGjQ=
-SHA1 (openoffice/OOo_2.4.2_src_l10n.tar.bz2) = xZ/vr59+M3L76yoeRoJwYTt7H6Y=
-SHA1 (openoffice/OOo_2.4.2_src_sdk.tar.bz2) = USnj69TKGLB3L5kWqUxSkziWxo8=
-SHA1 (openoffice/OOo_2.4.2_src_system.tar.bz2) = Z90q9MJaMRwug6fc06gik3juFiU=
-SHA1 (openoffice/build-java-target-2.4.0.diff) = wHQuUcsUfUO5XzOcsDsFZ+QfKpA=
-SHA1 (openoffice/ooo-desktop-0.1.tar.gz) = LDMrm/uS6lyQEwk/DzyN3LqSdoU=
-SHA256 (openoffice/OOo_2.4.2_src_binfilter.tar.bz2) = tqUEAEs1W0hddk670vZ+fWDXOtG/SL12JwT6kdnLVZc=
-SHA256 (openoffice/OOo_2.4.2_src_core.tar.bz2) = 0Ja/43iec9bPCA2noRieHy+5zPJsxcltn5Ob0c/zPfI=
-SHA256 (openoffice/OOo_2.4.2_src_l10n.tar.bz2) = Cxhp+Mn8Vu58aDC9hE8hL26Fh9nesMfDEFwazyLaY+g=
-SHA256 (openoffice/OOo_2.4.2_src_sdk.tar.bz2) = RvP4MjhN0X3VA71gkCd/iTdIPHSFDdayZm/rgjYbtlM=
-SHA256 (openoffice/OOo_2.4.2_src_system.tar.bz2) = KOsMP1O+lNAek4IWacllKhNfYfrr93uKEx6WMtHgkOQ=
-SHA256 (openoffice/build-java-target-2.4.0.diff) = gNcBW3mUEK1YmHUHcaCtxPN0ktIDCAhl02H7vjO1jpc=
-SHA256 (openoffice/ooo-desktop-0.1.tar.gz) = /0rJ4ehtHlbspPN2RxpAoTpetfsrNG0tYSeHTLPar30=
-SIZE (openoffice/OOo_2.4.2_src_binfilter.tar.bz2) = 6674731
-SIZE (openoffice/OOo_2.4.2_src_core.tar.bz2) = 153673147
-SIZE (openoffice/OOo_2.4.2_src_l10n.tar.bz2) = 81193726
-SIZE (openoffice/OOo_2.4.2_src_sdk.tar.bz2) = 38354
-SIZE (openoffice/OOo_2.4.2_src_system.tar.bz2) = 44071903
-SIZE (openoffice/build-java-target-2.4.0.diff) = 51925
-SIZE (openoffice/ooo-desktop-0.1.tar.gz) = 43484
--- a/editors/openoffice/files/soffice.sh
+++ b/editors/openoffice/files/soffice.sh
@ -1,48 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: soffice.sh,v 1.8 2008/04/14 14:28:35 jasper Exp $
-#
-
-# Since the openoffice-java package may not exist
-# suppress any javaPathHelper errors.
-JAVA_HOME=$(javaPathHelper -h openoffice-java 2> /dev/null)
-
-if [ -n "${JAVA_HOME}" ]; then
-	export JAVA_HOME
-fi
-
-# This is needed for OpenOffice.org to be able to open files with
-# special character(s) in their name
-if [ ! "${LC_CTYPE}" ]; then
-	export LC_CTYPE="en_US.ISO8859-15"
-fi
-
-case "$0"
-in
-	*swriter)
-		exec %%LOCALBASE%%/openoffice/program/soffice -writer "$@"
-		;;
-	*scalc)
-		exec %%LOCALBASE%%/openoffice/program/soffice -calc "$@"
-		;;
-	*sdraw)
-		exec %%LOCALBASE%%/openoffice/program/soffice -draw "$@"
-		;;
-	*simpress)
-		exec %%LOCALBASE%%/openoffice/program/soffice -impress "$@"
-		;;
-	*sbase)
-		exec %%LOCALBASE%%/openoffice/program/soffice -base "$@"
-		;;
-	*smath)
-		exec %%LOCALBASE%%/openoffice/program/soffice -math "$@"
-		;;
-	*spadmin)
-		exec %%LOCALBASE%%/openoffice/program/spadmin "$@"
-		;;
-	*setofficelang)
-		exec %%LOCALBASE%%/openoffice/program/setofficelang "$@"
-		;;
-	*)
-		exec %%LOCALBASE%%/openoffice/program/soffice "$@"
-esac
--- a/editors/openoffice/patches/patch-autodoc_source_mkinc_fullcpp_mk
+++ b/editors/openoffice/patches/patch-autodoc_source_mkinc_fullcpp_mk
@ -1,11 +0,0 @@
--- 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" || $(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,11 +0,0 @@
--- 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( "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,12 +0,0 @@
-$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
- 
-#if defined (SOLARIS) || defined (FREEBSD)
-+#if defined (SOLARIS) || defined (FREEBSD) || defined (OPENBSD)
- #include <ieeefp.h>
- #elif ( defined ( LINUX ) && ( GLIBC < 2 ) )
- #include <i386/ieeefp.h>
--- a/editors/openoffice/patches/patch-bridges_prj_build_lst
+++ b/editors/openoffice/patches/patch-bridges_prj_build_lst
@ -1,12 +0,0 @@
--- 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
-br  bridges\source\cpp_uno\shared           nmake   -   all br_cppuno_shared br_unotypes br_inc NULL
-+br	bridges\source\cpp_uno\gcc3_openbsd_intel       nmake   -       u       br_gcc3oi br_cppuno_shared br_unotypes br_inc NULL
-+br	bridges\source\cpp_uno\gcc3_openbsd_x86-64      nmake   -       u       br_gcc3ox br_cppuno_shared br_unotypes br_inc NULL
-+br	bridges\source\cpp_uno\shared           nmake   -   all br_cppuno_shared br_unotypes br_inc NULL
- br	bridges\source\jni_uno					nmake	-	all	br_jni_uno br_unotypes br_inc NULL
- br	bridges\source\jni_uno\java\com\sun\star\bridges\jni_uno				nmake	-	all	br_jni_uno_java br_unotypes br_inc NULL
--- a/editors/openoffice/patches/patch-config_office_configure_in
+++ b/editors/openoffice/patches/patch-config_office_configure_in
@ -1,183 +0,0 @@
--- config_office/configure.in.orig.port	Thu Jun 12 11:08:28 2008
-+++ config_office/configure.in	Thu Jun 12 11:08:29 2008
-@@ -931,6 +931,16 @@ case "$build_os" in
- 		echo "AIX is an alpha port --- Use at own risk" >> warn
- 		_os=AIX
- 		;;
-+	openbsd*)
-+		test_x=yes
-+		test_gtk=yes
-+		build_cairo=yes
-+		test_kde=yes
-+		test_cups=yes
-+		PTHREAD_CFLAGS="-pthread -D_THREAD_SAFE"
-+		PTHREAD_LIBS="-pthread"
-+		_os=OpenBSD
-+		;;
-    *)
-    AC_MSG_ERROR([$_os operating system is not suitable to build OpenOffice.org!])
-    ;;
-@@ -2978,6 +2988,9 @@ if test "$_os" != "WINNT" -a \( "z$enable_epm" = "z" -
- 	AIX)
- 		PKGFORMAT=aix
- 		;;
-+	OpenBSD)
-+		PKGFORMAT=portable
-+		;;
- 	*BSD)
- 		PKGFORMAT=bsd
- 		;;
-@@ -3306,7 +3319,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
-    PKG_CHECK_MODULES( LIBWPD, libwpd-0.8 )
-+    PKG_CHECK_MODULES( LIBWPD, libwpd )
- else
-     AC_MSG_RESULT([internal])
-     SYSTEM_LIBWPD=NO
-@@ -3417,12 +3430,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
-       PYTHON_LIBS="-framework Python"
-    else
-      PYTHON_LIBS="-lpython$python_version"
-+      PYTHON_LIBS="-lpython$python_version $python_libs"
-    fi
-    
-    dnl check if the headers really work:
-@@ -3460,15 +3475,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])
-    AC_CHECK_HEADER(db.h, [ DB_INCLUDES=/usr/include ],
-        [
-             CFLAGS=-I/usr/include/db4
-             AC_CHECK_HEADER(db4/db.h,
-             [ DB_INCLUDES=/usr/include/db4 ],
-             [ 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_CHECKING([whether db is at least 4.1])
-+    save_CXXFLAGS=$CXXFLAGS
-+    CXXFLAGS=-I$DB_INCLUDES
-     for v in 1 2 3 4 5 6; do
-        AC_TRY_RUN([
- #include <db.h>
-@@ -3479,6 +3491,7 @@ int main(int argc, char **argv) {
- }
-        ], [DB_VERSION_MINOR=$v], [])
-     done
-+    CXXFLAGS=$save_CXXFLAGS
-     if test "$DB_VERSION_MINOR" -gt "1"; then
-        AC_MSG_RESULT([OK])
-        DB_VERSION=4.$DB_VERSION_MINOR
-@@ -4065,11 +4078,11 @@ if test -n "$with_system_icu" -o -n "$with_system_libs
-    if test -z "$SYSTEM_GENBRK"; then
-       AC_MSG_ERROR([\"genbrk\" not found in \$PATH, install the icu development tool \"genbrk"\])
-    fi
-   AC_PATH_PROG(SYSTEM_GENCCODE, genccode, [], [$PATH:/usr/sbin:/sbin])
-+   AC_PATH_PROG(SYSTEM_GENCCODE, genccode, [], [$PATH:/usr/sbin:/sbin:/usr/local/sbin])
-    if test -z "$SYSTEM_GENCCODE"; then
-       AC_MSG_ERROR([\"genccode\" not found in \$PATH, install the icu development tool \"genccode"\])
-    fi
-   AC_PATH_PROG(SYSTEM_GENCMN, gencmn, [], [$PATH:/usr/sbin:/sbin])
-+   AC_PATH_PROG(SYSTEM_GENCMN, gencmn, [], [$PATH:/usr/sbin:/sbin:/usr/local/sbin])
-    if test -z "$SYSTEM_GENCMN"; then
-       AC_MSG_ERROR([\"gencmn\" not found in \$PATH, install the icu development tool \"gencmn"\])
-    fi
-@@ -4162,7 +4175,7 @@ elif test "$_os" != "WINNT" ; then
-       AC_MSG_ERROR([No X includes found]) # Exit
-    fi
-    CFLAGS=$X_CFLAGS
-   LDFLAGS="$X_LDFLAGS $X_LIBS"
-+   LDFLAGS="$LDFLAGS $X_LDFLAGS $X_LIBS"
-    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", [])
-@@ -4379,7 +4392,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
-@@ -5261,42 +5274,23 @@ KDE_LIBS=""
- MOC="moc"
- if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
-     dnl Search paths for Qt and KDE
-    if test "$build_cpu" != "x86_64" ; then
-        qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include $x_includes"
-        qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib $x_libraries"
-    else
-        qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib64/qt3/include /usr/lib64/qt/include /usr/share/qt3/include /usr/lib/qt3/include /usr/lib/qt/include $x_includes"
-        qt_libdirs="$QTLIB /usr/local/qt/lib64 /usr/lib64/qt /usr/lib64 /usr/X11R6/lib64/X11/qt /usr/X11R6/lib64/qt /usr/lib64/qt3/lib64 /usr/lib64/qt/lib64 /usr/share/qt3/lib64 /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib $x_libraries"
-    fi
-+    qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include /usr/lib/qt3/include /usr/lib/qt/include $x_includes"
-+    qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib $x_libraries"
-     if test -n "$QTDIR" ; then
-         qt_incdirs="$QTDIR/include $qt_incdirs"
-        if test "$build_cpu" != "x86_64" ; then
-            qt_libdirs="$QTDIR/lib $qt_libdirs"
-        else
-            qt_libdirs="$QTDIR/lib64 $QTDIR/lib $qt_libdirs"
-        fi
-+        qt_libdirs="$QTDIR/lib $qt_libdirs"
-     fi
-    if test "$build_cpu" != "x86_64" ; then
-        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/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib $x_libraries"
-    else
-        kde_incdirs="/usr/lib64/kde/include /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/lib64/kde/lib64 /usr/local/kde/lib64 /usr/kde/lib64 /usr/lib64/kde /usr/lib64/kde3 /usr/lib64 /usr/X11R6/lib64 /usr/local/lib64 /opt/kde3/lib64 /opt/kde/lib64 /usr/X11R6/kde/lib64 /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib $x_libraries"
-    fi
-+    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"
-        if test "$build_cpu" != "x86_64" ; then
-            kde_libdirs="$KDEDIR/lib $kde_libdirs"
-        else
-            kde_libdirs="$KDEDIR/lib64 $KDEDIR/lib $kde_libdirs"
-        fi
-+        kde_libdirs="$KDEDIR/lib $kde_libdirs"
-     fi
- 
-     dnl What to test
-     qt_test_include="qstyle.h"
-    qt_test_library="libqt-mt.so"
-+    qt_test_library="libqt-mt.so*"
-     kde_test_include="ksharedptr.h"
-    kde_test_library="libkdeui.so"
-+    kde_test_library="libkdeui.so*"
- 
-     dnl Check for Qt headers
-     AC_MSG_CHECKING([for Qt headers])
-@@ -5317,7 +5311,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
-             qt_libdir="$qt_check"
-             break
-         fi
-@@ -5353,7 +5347,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
-             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,162 +0,0 @@
--- 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";
-+      $BIG_SVX        = "TRUE";
-+      $COM            = "GCC";
-+      $COMPATH        = '@COMPATH@';
-+      if ( $platform =~ m/^i386/ )
-+      {
-+         $CPU            = "I";
-+         $CPUNAME        = "INTEL";
-+         $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
-+         $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
-+         $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
-+         $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
-+      }
-+      elsif ( $platform =~ m/^x86_64/ )
-+      {
-+         $CPU            = "X";
-+         $CPUNAME        = "X86_64";
-+         $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
-+         $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
-+         $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
-+         $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."xawt";
-+      }
-+      $CVER           = "C300";
-+      $GUI            = "UNX";
-+      $GUIBASE        = "unx";
-+      $GUIENV         = "sal";
-+      $GVER           = "VCL";
-+      $OUTPATH        = "unxobsd";
-+      $INPATH         = $OUTPATH.$PROEXT;
-+      $GVERDIR        = $INPATH;
-+      $OS             = "OPENBSD";
-+      $PATH_SEPERATOR = $ps;
-+      $XPVERSION      = "3";
-+      $OSVERSION      = '@OSVERSION@';
-+      if( @GCCVER@ >= 30401 ) {
-+         $CVER        = "C341";
-+      }
-+}
- elsif ( $platform =~ m/linux-gnu/ ) 
- {
- # General Linux settings:
-@@ -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|aix|openbsd/)
- {  $LD_LIBRARY_PATH   = $cur_dir.
-                         $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
-                         $ps.$JRELIBDIR.
-@@ -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|aix|openbsd/)
- {
-    $SOLAREXTRALIB     = $L.$par_dir.$LIB64;
- }
-@@ -1200,7 +1240,7 @@ if ($platform =~ m/cygwin|os2/)
- }
-      
- # The general environment path.
-if ($platform =~ m/linux-gnu|netbsd|odf1|irix|freebsd|aix|solaris/)
-+if ($platform =~ m/linux-gnu|netbsd|odf1|irix|freebsd|aix|solaris|openbsd/)
- {  $PATH              = $cur_dir.
-                         $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
-                         $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
-@@ -1389,11 +1429,12 @@ if ($platform =~ m/solaris/) 
-                         $L_STLPORT_LIB.
-                         $L.$XLIB;
- }
-elsif ($platform =~ m/linux-gnu|netbasd|osf1|irix|aix|freebsd/)
-+elsif ($platform =~ m/linux-gnu|netbasd|osf1|irix|aix|freebsd|openbsd/)
- {  $SOLARLIB          = $L.$par_dir.$LIB.
-                         $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
-                         $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
-                         $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
-+			$L.$USR_LOCAL.$LIB.
-                         $L.'$JAVA_HOME'.$LIB64.
-                         $L.$JRELIBDIR.
-                         $L.$JRETOOLKITDIR.
-@@ -1417,7 +1458,19 @@ elsif ($platform =~ m/darwin/) 
-     }
- 
- }
-
-+elsif ($platform =~ m/openbsd/)
-+{  $SOLARLIB          = $L.$par_dir.$LIB.
-+                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
-+                        $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
-+                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
-+                        $L.$USR_LOCAL.$LIB.
-+                        $L.'$JAVA_HOME'.$LIB64.
-+                        $L.$JRELIBDIR.
-+                        $L.$JRETOOLKITDIR.
-+                        $L.$JRETHREADDIR.
-+                        $L_STLPORT_LIB.
-+                        $L.$XLIB;
-+}
- 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|irix|openbsd/)
- {
- $SOLARINC	     .= $STLPORT_stlport;
-if ($platform =~ m/linux|freebsd|netbsd/)
-+if ($platform =~ m/linux|freebsd|netbsd|openbsd/)
- {
- # This simply adds an include path, so even cases that break the FHS work
- $SOLARINC            .= $STLPORT_inc_stlport;
-@@ -1457,9 +1510,15 @@ if ($platform =~ m/linux-gnu/)
- }
- 
- 
-   	$SOLARINC      .= $I.'$SOLARENV'.$INC.$ds."Xp31".
-                     $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"))
- 	{
-@@ -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";
-+		}
- 
-    		#java threads include path
- 
-    		$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include";
- 	}
-     #The tail, if needed
-    if ($platform =~ m/linux-gnu|freebsd|netbsd/)
-+    if ($platform =~ m/linux-gnu|freebsd|netbsd|openbsd/)
-     {  $SOLARINC  .= $I.$XINC;
-     }
-     elsif ($platform =~ m/osf1/)
--- a/editors/openoffice/patches/patch-cppu_source_uno_data_cxx
+++ b/editors/openoffice/patches/patch-cppu_source_uno_data_cxx
@ -1,11 +0,0 @@
--- 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(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-cppu_test_alignment_diagnose_h
+++ b/editors/openoffice/patches/patch-cppu_test_alignment_diagnose_h
@ -1,12 +0,0 @@
-$OpenBSD: patch-cppu_test_alignment_diagnose_h,v 1.1 2006/10/25 22:49:50 kurt Exp $
--- cppu/test/alignment/diagnose.h.orig.port	Thu Sep  8 05:00:29 2005
-+++ cppu/test/alignment/diagnose.h	Tue Oct 24 16:53:06 2006
-@@ -38,7 +38,7 @@
- #include <sal/types.h>
- #include <stdio.h>
- 
-#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && defined(INTEL)
-+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) || defined(OPENBSD)) && defined(INTEL)
- #define ALIGNMENT(s, n) __alignof__ (s)
- #else
- #define ALIGNMENT(s, n) n
--- a/editors/openoffice/patches/patch-cppu_util_makefile_mk
+++ b/editors/openoffice/patches/patch-cppu_util_makefile_mk
@ -1,13 +0,0 @@
-$OpenBSD: patch-cppu_util_makefile_mk,v 1.3 2007/11/13 09:46:28 robert Exp $
--- cppu/util/makefile.mk.orig.port	Wed Jul 18 14:34:25 2007
-+++ cppu/util/makefile.mk	Thu Oct 25 16:23:46 2007
-@@ -69,7 +69,9 @@ SHL1STDLIBS = $(SALLIB) $(SALHELPERLIB)
- SHL1DEPN=
- SHL1IMPLIB=i$(TARGET)
- .IF "$(OS)"!="FREEBSD"
-+.IF "$(OS)"!="OPENBSD"
- SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+.ENDIF
- .ENDIF
- 
- SHL1VERSIONMAP=$(TARGET).map
--- a/editors/openoffice/patches/patch-crashrep_source_unx_main_cxx
+++ b/editors/openoffice/patches/patch-crashrep_source_unx_main_cxx
@ -1,12 +0,0 @@
-$OpenBSD: patch-crashrep_source_unx_main_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- crashrep/source/unx/main.cxx.orig.port	Mon Jun 19 10:31:28 2006
-+++ crashrep/source/unx/main.cxx	Fri Aug 18 15:47:42 2006
-@@ -50,7 +50,7 @@
- #include <vector>
- #include <string>
- 
-#if defined (LINUX) || (FREEBSD)
-+#if defined (LINUX) || (FREEBSD) || (OPENBSD)
- #include <netinet/in.h>
- #endif
- 
--- a/editors/openoffice/patches/patch-crashrep_source_unx_makefile_mk
+++ b/editors/openoffice/patches/patch-crashrep_source_unx_makefile_mk
@ -1,12 +0,0 @@
-$OpenBSD: patch-crashrep_source_unx_makefile_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- crashrep/source/unx/makefile.mk.orig.port	Thu Sep  8 05:42:39 2005
-+++ crashrep/source/unx/makefile.mk	Fri Aug 18 15:47:42 2006
-@@ -71,7 +71,7 @@ APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- 
- APP1STDLIBS=$(DYNAMIC) -lXext -lX11
-.IF "$(OS)" != "FREEBSD"
-+.IF "$(OS)" != "FREEBSD" && "$(OS)" != "OPENBSD"
- APP1STDLIBS+=-ldl -lnsl
- .ENDIF
- .IF "$(OS)" == "SOLARIS"
--- a/editors/openoffice/patches/patch-dbaccess_source_ui_uno_copytablewizard_cxx
+++ b/editors/openoffice/patches/patch-dbaccess_source_ui_uno_copytablewizard_cxx
@ -1,12 +0,0 @@
-$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,49 +0,0 @@
-$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
- 
-+if [ -z $SAL_USE_VCLPLUGIN ]; then
-+	export SAL_USE_VCLPLUGIN=gtk
-+fi
-+export SAL_ENABLE_NATIVE_XFONTS=0
-+ 
- sd_platform=`uname -s`
- 
- # the following test is needed on Linux PPC with IBM j2sdk142
-@@ -211,33 +216,6 @@ unset XENVIRONMENT
- 
- # uncomment line below to disable anti aliasing of fonts
- # SAL_ANTIALIAS_DISABLE=true; export SAL_ANTIALIAS_DISABLE
-
-# pagein
-for sd_arg in ${1+"$@"} ; do
-    case ${sd_arg} in
-    -calc)
-        sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-calc"
-        break;
-        ;;
-    -draw)
-        sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-draw"
-        break;
-        ;;
-    -impress)
-        sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-impress"
-        break;
-        ;;
-    -writer)
-        sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-writer"
-        break;
-        ;;
-    *)
-        ;;
-    esac
-done
-
-sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-common"
-"${sd_prog}"/pagein -L"${sd_prog}" ${sd_pagein_args}
- 
- # set path so that other apps can be started from soffice just by name
- if [ "$PATH" ]; then
--- a/editors/openoffice/patches/patch-desktop_source_migration_wizard_cxx
+++ b/editors/openoffice/patches/patch-desktop_source_migration_wizard_cxx
@ -1,20 +0,0 @@
-$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);
-@@ -384,7 +385,7 @@ void FirstStartWizard::overrideCheck(sal_Bool bOverrid
- 
- short FirstStartWizard::Execute()
- {
-    return svt::RoadmapWizard::Execute();
-+    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,12 +0,0 @@
-$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
- 
-#.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" || "$(OS)" == "NETBSD"
-+#.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" || "$(OS)" == "NETBSD" || "$(OS)" == "OPENBSD"
- ## #74158# linux needs sal/vos/tools at end of link list, solaris needs it first,
- ## winXX is handled like solaris for now
- #APP1_STDPRE=
--- a/editors/openoffice/patches/patch-dtrans_source_X11_X11_selection_cxx
+++ b/editors/openoffice/patches/patch-dtrans_source_X11_X11_selection_cxx
@ -1,12 +0,0 @@
-$OpenBSD: patch-dtrans_source_X11_X11_selection_cxx,v 1.3 2006/12/13 10:25:14 robert Exp $
--- dtrans/source/X11/X11_selection.cxx.orig.port	Fri Dec  1 18:53:09 2006
-+++ dtrans/source/X11/X11_selection.cxx	Mon Dec 11 22:27:37 2006
-@@ -45,7 +45,7 @@
- #include <X11/Xlib.h>
- #include <X11/X.h>
- #include <X11/Xutil.h>
-#if defined(LINUX) || defined(NETBSD) || defined (FREEBSD)
-+#if defined(LINUX) || defined(NETBSD) || defined (FREEBSD) || defined (OPENBSD)
- #include <sys/poll.h>
- #else
- #include <poll.h>
--- a/editors/openoffice/patches/patch-epm_epm-3_7_patch
+++ b/editors/openoffice/patches/patch-epm_epm-3_7_patch
@ -1,246 +0,0 @@
--- epm/epm-3.7.patch.orig.port	Sat Oct 27 12:05:58 2007
-+++ epm/epm-3.7.patch	Sat Oct 27 12:08:11 2007
-@@ -1,5 +1,5 @@
- *** misc/epm-3.7/bsd.c	Tue Jan 14 18:05:01 2003
---- misc/build/epm-3.7/bsd.c	Mon Nov 20 14:54:51 2006
-+--- misc/build/epm-3.7/bsd.c	Sat Oct 27 12:06:20 2007
- ***************
- *** 26,31 ****
- --- 26,38 ----
-@@ -96,7 +96,7 @@
-    /*
-     * Remove temporary files...
- *** misc/epm-3.7/configure	Thu Jul 24 03:20:54 2003
---- misc/build/epm-3.7/configure	Mon Nov 20 15:01:11 2006
-+--- misc/build/epm-3.7/configure	Sat Oct 27 12:07:58 2007
- ***************
- *** 1238,1244 ****
- --- 1238,1249 ----
-@@ -202,8 +202,64 @@
-   else
-   	CXXFLAGS="`$FLTKCONFIG --cflags` ${CXXFLAGS}"
-   	GUIS="setup uninst"
-+***************
-+*** 5007,5059 ****
-+  
-+  	CXX="$CC"
-+  	OPTIM="-Wall -Wno-return-type $OPTIM"
-+- 
-+- 	# See if GCC supports -fno-rtti...
-+- 	echo "$as_me:$LINENO: checking if GCC supports -fno-rtti" >&5
-+- echo $ECHO_N "checking if GCC supports -fno-rtti... $ECHO_C" >&6
-+- 	OLDCFLAGS="$CFLAGS"
-+- 	CFLAGS="$CFLAGS -fno-rtti"
-+- 	cat >conftest.$ac_ext <<_ACEOF
-+- #line $LINENO "configure"
-+- #include "confdefs.h"
-+- 
-+- #ifdef F77_DUMMY_MAIN
-+- #  ifdef __cplusplus
-+-      extern "C"
-+- #  endif
-+-    int F77_DUMMY_MAIN() { return 1; }
-+- #endif
-+- int
-+- main ()
-+- {
-+- 
-+-   ;
-+-   return 0;
-+- }
-+- _ACEOF
-+- rm -f conftest.$ac_objext
-+- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+-   (eval $ac_compile) 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } &&
-+-          { ac_try='test -s conftest.$ac_objext'
-+-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+-   (eval $ac_try) 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; }; then
-+-   OPTIM="$OPTIM -fno-rtti"
-+- 		echo "$as_me:$LINENO: result: yes" >&5
-+- echo "${ECHO_T}yes" >&6
-+- else
-+-   echo "$as_me: failed program was:" >&5
-+- cat conftest.$ac_ext >&5
-+- echo "$as_me:$LINENO: result: no" >&5
-+- echo "${ECHO_T}no" >&6
-+- fi
-+- rm -f conftest.$ac_objext conftest.$ac_ext
-+- 	CFLAGS="$OLDCFLAGS"
-+  
-+  	# See if GCC supports -fno-exceptions...
-+  	echo "$as_me:$LINENO: checking if GCC supports -fno-exceptions" >&5
-+--- 5016,5021 ----
- *** misc/epm-3.7/deb.c	Wed Jan 15 15:29:24 2003
---- misc/build/epm-3.7/deb.c	Mon Nov 20 14:54:51 2006
-+--- misc/build/epm-3.7/deb.c	Sat Oct 27 12:06:20 2007
- ***************
- *** 26,31 ****
- --- 26,53 ----
-@@ -330,11 +386,12 @@
-     * Write the preinst file for DPKG...
-     */
- ***************
-*** 417,422 ****
---- 454,480 ----
-+*** 416,421 ****
-+--- 453,479 ----
-+            break;
-       }
-     }
-  
-++ 
- +   
- +   /* 
- +    * Calculate and append Installed-Size to DEBIAN/control
-@@ -355,12 +412,11 @@
- +   add_size(fp, filename);
- +   fclose(fp);
- +  
-+ 
-+  
-    /*
-     * Build the distribution from the spec file...
-    */
- *** misc/epm-3.7/dist.c	Thu Aug  7 16:14:40 2003
---- misc/build/epm-3.7/dist.c	Mon Nov 20 14:54:51 2006
-+--- misc/build/epm-3.7/dist.c	Sat Oct 27 12:06:20 2007
- ***************
- *** 394,401 ****
-     strcpy(platform->machine, "mips");
-@@ -408,7 +464,7 @@
-       strcpy(platform->machine, "sparc");
-   #endif /* __sgi */
- *** misc/epm-3.7/epm.c	Tue Oct 28 15:48:30 2003
---- misc/build/epm-3.7/epm.c	Mon Nov 20 14:54:51 2006
-+--- misc/build/epm-3.7/epm.c	Sat Oct 27 12:06:20 2007
- ***************
- *** 547,552 ****
- --- 547,553 ----
-@@ -420,7 +476,7 @@
-     puts("EPM is free software and comes with ABSOLUTELY NO WARRANTY; for details");
-     puts("see the GNU General Public License in the file COPYING or at");
- *** misc/epm-3.7/file.c	Wed Jul 23 23:41:08 2003
---- misc/build/epm-3.7/file.c	Mon Nov 20 14:54:51 2006
-+--- misc/build/epm-3.7/file.c	Sat Oct 27 12:06:20 2007
- ***************
- *** 108,114 ****
-     fclose(dstfile);
-@@ -452,7 +508,7 @@
-     return (0);
- --- 149,154 ----
- *** misc/epm-3.7/osx.c	Wed Jul 23 23:41:08 2003
---- misc/build/epm-3.7/osx.c	Mon Nov 20 14:54:51 2006
-+--- misc/build/epm-3.7/osx.c	Sat Oct 27 12:06:20 2007
- ***************
- *** 373,379 ****
-     else
-@@ -471,7 +527,7 @@
-   		    "-p %s/%s.pkg -f %s/Package -r %s/Resources -d %s/%s-desc.plist -i %s/%s-info.plist",
-   	      filename, prodname, filename, filename, filename, prodname, filename, prodname);
- *** misc/epm-3.7/pkg.c	Tue Dec 17 19:57:56 2002
---- misc/build/epm-3.7/pkg.c	Mon Nov 20 14:54:51 2006
-+--- misc/build/epm-3.7/pkg.c	Sat Oct 27 12:06:20 2007
- ***************
- *** 429,503 ****
-   
-@@ -550,8 +606,21 @@
-   }
-   
- --- 429,434 ----
-+*** misc/epm-3.7/portable.c	Wed Jul 23 23:41:08 2003
-+--- misc/build/epm-3.7/portable.c	Sat Oct 27 12:06:20 2007
-+***************
-+*** 1515,1520 ****
-+--- 1515,1522 ----
-+    fputs("# Determine correct extract options for the tar command...\n", fp);
-+    fputs("if test `uname` = Darwin; then\n", fp);
-+    fputs("	ac_tar=\"tar -xpPf\"\n", fp);
-++   fputs("else if test `uname` = OpenBSD; then\n", fp);
-++   fputs("    ac_tar=\"tar -xpPf\"\n", fp);
-+    fputs("else if test \"`tar --help 2>&1 | grep GNU`\" = \"\"; then\n", fp);
-+    fputs("	ac_tar=\"tar -xpf\"\n", fp);
-+    fputs("else\n", fp);
- *** misc/epm-3.7/qprintf.c	Mon Jan 27 22:48:03 2003
---- misc/build/epm-3.7/qprintf.c	Mon Nov 20 14:54:51 2006
-+--- misc/build/epm-3.7/qprintf.c	Sat Oct 27 12:06:20 2007
- ***************
- *** 181,192 ****
-   
-@@ -587,7 +656,7 @@
-   	    }
-   
- *** misc/epm-3.7/rpm.c	Wed Oct  1 21:27:15 2003
---- misc/build/epm-3.7/rpm.c	Mon Nov 20 14:54:51 2006
-+--- misc/build/epm-3.7/rpm.c	Sat Oct 27 12:06:20 2007
- ***************
- *** 38,44 ****
-            dist_t         *dist,		/* I - Distribution information */
-@@ -679,7 +748,7 @@
-       fputs("	echo Setting up init scripts...\n", fp);
-   
- ***************
-*** 259,265 ****
-+*** 259,271 ****
-       fputs("fi\n", fp);
-     }
-   
-@@ -687,7 +756,13 @@
-     for (i = dist->num_files, file = dist->files; i > 0; i --, file ++)
-       if (tolower(file->type) == 'i')
-         break;
---- 281,290 ----
-+  
-+    if (i)
-+    {
-+      fputs("if test \"x$1\" = x0; then\n", fp);
-+      fputs("	echo Cleaning up init scripts...\n", fp);
-+  
-+--- 281,297 ----
-       fputs("fi\n", fp);
-     }
-   
-@@ -698,9 +773,6 @@
-     for (i = dist->num_files, file = dist->files; i > 0; i --, file ++)
-       if (tolower(file->type) == 'i')
-         break;
-***************
-*** 266,271 ****
---- 291,297 ----
-   
-     if (i)
-     {
-@@ -754,10 +826,12 @@
-     fputs("%files\n", fp);
-     for (i = dist->num_files, file = dist->files; i > 0; i --, file ++)
- ***************
-*** 415,467 ****
-+*** 413,465 ****
-+            make_link(filename, file->src);
-+            break;
-       }
-    }
-  
-+-   }
-+- 
- -  /*
- -   * Build the distribution from the spec file...
- -   */
-@@ -803,9 +877,7 @@
- -     run_command(NULL, "/bin/rm -rf %s/buildroot", directory);
- - 
- -     unlink(specname);
--   }
-- 
-    return (0);
-  }
-+    }
-   
---- 457,462 ----
-+    return (0);
-+--- 455,460 ----
--- a/editors/openoffice/patches/patch-extensions_source_nsplugin_source_makefile_mk
+++ b/editors/openoffice/patches/patch-extensions_source_nsplugin_source_makefile_mk
@ -1,30 +0,0 @@
-$OpenBSD: patch-extensions_source_nsplugin_source_makefile_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- extensions/source/nsplugin/source/makefile.mk.orig.port	Fri Feb 17 11:03:55 2006
-+++ extensions/source/nsplugin/source/makefile.mk	Fri Aug 18 15:47:42 2006
-@@ -57,7 +57,7 @@ dummy:
- 	@echo GTK disabled - nothing to build
- 
- .ELSE           # "$(ENABLE_GTK)"==""
-.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
-+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="OPENBSD"
- INC+= -DNP_LINUX
- .ENDIF
- PKGCONFIG_MODULES=gtk+-2.0
-@@ -80,7 +80,7 @@ SHL1OBJS=	$(SLO)$/npshell.obj \
- .IF "$(GUI)"=="UNX"
- STDLIBS+=$(SOLARLIBDIR)$/npunix.o
- SHL1STDLIBS+=$(SOLARLIBDIR)$/npunix.o
-#.IF "$(OS)"!="FREEBSD"
-+#.IF "$(OS)"!="FREEBSD" || "$(OS)"!="OPENBSD"
- #SHL1STDLIBS+= -ldl -lnsl
- #.ENDIF #FREEBSD
- .ENDIF #UNX
-@@ -115,7 +115,7 @@ APP1STDLIBS=\
- 			$(TOOLSLIB)
- 
- .IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX" || "$(OS)"=="OPENBSD"
- .ELSE
- APP1STDLIBS+= -ldl -lnsl -lnls -lsocket
- .ENDIF
--- a/editors/openoffice/patches/patch-extensions_source_plugin_unx_makefile_mk
+++ b/editors/openoffice/patches/patch-extensions_source_plugin_unx_makefile_mk
@ -1,11 +0,0 @@
--- extensions/source/plugin/unx/makefile.mk.orig.port	Thu Jul  5 10:52:09 2007
-+++ extensions/source/plugin/unx/makefile.mk	Thu Oct 25 16:23:46 2007
-@@ -86,7 +86,7 @@ APP1STDLIBS+=-lXm -lXt -lXext -lX11 -ldl
- .IF "$(DISABLE_XAW)" != "TRUE"
- APP1STDLIBS+=-lXaw 
- .ENDIF
-.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="OPENBSD"
- APP1STDLIBS+= -lXt -lXext -lX11
- .ELSE
- APP1STDLIBS+= -lXt -lXext -lX11 -ldl
--- a/editors/openoffice/patches/patch-extensions_source_scanner_makefile_mk
+++ b/editors/openoffice/patches/patch-extensions_source_scanner_makefile_mk
@ -1,13 +0,0 @@
-$OpenBSD: patch-extensions_source_scanner_makefile_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- extensions/source/scanner/makefile.mk.orig.port	Thu Sep  8 16:36:35 2005
-+++ extensions/source/scanner/makefile.mk	Fri Aug 18 15:47:42 2006
-@@ -89,7 +89,9 @@ SHL1STDLIBS=\
- .IF "$(GUI)"=="UNX"
- .IF "$(OS)"!="FREEBSD"
- .IF "$(OS)"!="NETBSD"
-+.IF "$(OS)"!="OPENBSD"
- SHL1STDLIBS+=$(SVTOOLLIB) -ldl
-+.ENDIF
- .ENDIF
- .ENDIF
- .ENDIF
--- a/editors/openoffice/patches/patch-external_gcc3_specific_makefile_mk
+++ b/editors/openoffice/patches/patch-external_gcc3_specific_makefile_mk
@ -1,19 +0,0 @@
-$OpenBSD: patch-external_gcc3_specific_makefile_mk,v 1.3 2006/12/13 10:25:14 robert Exp $
--- external/gcc3_specific/makefile.mk.orig.port	Fri Dec  1 18:53:14 2006
-+++ external/gcc3_specific/makefile.mk	Mon Dec 11 22:27:37 2006
-@@ -13,6 +13,7 @@ TARGET=gcc3_specific
- .IF "$(OS)"!="MACOSX"
- .IF "$(OS)"!="IRIX"
- .IF "$(OS)"!="FREEBSD"
-+.IF "$(OS)"!="OPENBSD"
- 
- .EXPORT : CC
- 
-@@ -25,6 +26,7 @@ $(LB)$/libstdc++.so.$(SHORTSTDCPP3) :
- $(LB)$/libgcc_s.so.1 :
-        $(GCCINSTLIB) libgcc_s.so.1 $(LB)
- 
-+.ENDIF
- .ENDIF
- .ENDIF 
- .ENDIF 
--- a/editors/openoffice/patches/patch-freetype_makefile_mk
+++ b/editors/openoffice/patches/patch-freetype_makefile_mk
@ -1,12 +0,0 @@
-$OpenBSD: patch-freetype_makefile_mk,v 1.3 2006/10/19 15:16:50 kurt Exp $
--- freetype/makefile.mk.orig.port	Fri Aug 11 07:46:40 2006
-+++ freetype/makefile.mk	Thu Oct 19 10:47:52 2006
-@@ -75,7 +75,7 @@ OUT2LIB= \
- 	objs$/.libs$/libfreetype.a
- .IF "$(OS)"=="MACOSX"
- OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
-.ELIF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
-+.ELIF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="OPENBSD"
- OUT2LIB+=objs$/.libs$/libfreetype.so.9*
- .ELSE
- OUT2LIB+=objs$/.libs$/libfreetype.so.6*
--- a/editors/openoffice/patches/patch-icc_SampleICC-1_3_2-bendian_patch
+++ b/editors/openoffice/patches/patch-icc_SampleICC-1_3_2-bendian_patch
@ -1,12 +0,0 @@
-$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
@ -1,12 +0,0 @@
-$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-idlc_source_idlccompile_cxx
+++ b/editors/openoffice/patches/patch-idlc_source_idlccompile_cxx
@ -1,12 +0,0 @@
-$OpenBSD: patch-idlc_source_idlccompile_cxx,v 1.3 2006/12/13 10:25:14 robert Exp $
--- idlc/source/idlccompile.cxx.orig.port	Fri Dec  1 18:55:07 2006
-+++ idlc/source/idlccompile.cxx	Mon Dec 11 22:27:37 2006
-@@ -64,7 +64,7 @@
- 
- #ifdef	SAL_UNX
- #include <unistd.h>
-#if defined(MACOSX) || defined(FREEBSD) || defined(NETBSD)
-+#if defined(MACOSX) || defined(FREEBSD) || defined(NETBSD) || defined (OPENBSD)
- #include <sys/wait.h>
- #else
- #include <wait.h>
--- a/editors/openoffice/patches/patch-instsetoo_native_util_makefile_mk
+++ b/editors/openoffice/patches/patch-instsetoo_native_util_makefile_mk
@ -1,52 +0,0 @@
--- 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
- 
-+.IF "$(OS)"!="OPENBSD"
- .IF "$(CWS_WORK_STAMP)=="" || "$(UPDATER)!=""
- ENABLE_DOWNLOADSETS*=TRUE
- .ENDIF			# "$(CWS_WORK_STAMP)=="" || "$(UPDATER)!=""
- .IF "$(FORCE_DOWNLOADSETS)"!=""
- ENABLE_DOWNLOADSETS=TRUE
- .ENDIF			# "$(FORCE_DOWNLOADSETS)"!=""
-+.ENDIF
- 
- .EXPORT: ENABLE_DOWNLOADSETS
- .EXPORT: LAST_MINOR
-@@ -131,7 +133,7 @@ updatepack:
- 
- .IF "$(alllangiso)"!=""
- 
-openoffice: $(foreach,i,$(alllangiso) openoffice_$i)
-+openoffice: openoffice_en-US
- 
- openofficedev: $(foreach,i,$(alllangiso) openofficedev_$i)
- 
-@@ -236,7 +238,7 @@ openoffice_%{$(PKGFORMAT:^".")} :
- .ELSE			# "$(PKGFORMAT)"!=""
- openoffice_% :
- .ENDIF			# "$(PKGFORMAT)"!=""
-	$(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)
-	$(GNUCOPY) -ua $(MSIOFFICETEMPLATESOURCE) $(MSIOFFICETEMPLATEDIR:d:d)
-	$(GNUCOPY) -ua $(MSILANGPACKTEMPLATESOURCE) $(MSILANGPACKTEMPLATEDIR:d:d)
-	$(GNUCOPY) -ua $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d)
-	$(GNUCOPY) -ua $(MSISDKOOTEMPLATESOURCE) $(MSISDKOOTEMPLATEDIR:d:d)
-	$(GNUCOPY) -ua $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d)
-+	$(GNUCOPY) -R $(MSIOFFICETEMPLATESOURCE) $(MSIOFFICETEMPLATEDIR:d:d)
-+	$(GNUCOPY) -R $(MSILANGPACKTEMPLATESOURCE) $(MSILANGPACKTEMPLATEDIR:d:d)
-+	$(GNUCOPY) -R $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d)
-+	$(GNUCOPY) -R $(MSISDKOOTEMPLATESOURCE) $(MSISDKOOTEMPLATEDIR:d:d)
-+	$(GNUCOPY) -R $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d)
- 	$(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
- 	$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
- 	$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
--- a/editors/openoffice/patches/patch-jvmaccess_util_makefile_mk
+++ b/editors/openoffice/patches/patch-jvmaccess_util_makefile_mk
@ -1,12 +0,0 @@
-$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
-+.ELIF "$(GUI)$(COM)" == "OPENBSDIgcc3"
-+SHL1VERSIONMAP = gcc3_linux_intel.map
- .ENDIF
- 
- DEF1NAME = $(SHL1TARGET)
--- a/editors/openoffice/patches/patch-jvmfwk_distributions_OpenOfficeorg_makefile_mk
+++ b/editors/openoffice/patches/patch-jvmfwk_distributions_OpenOfficeorg_makefile_mk
@ -1,12 +0,0 @@
-$OpenBSD: patch-jvmfwk_distributions_OpenOfficeorg_makefile_mk,v 1.4 2007/11/13 09:46:28 robert Exp $
--- jvmfwk/distributions/OpenOfficeorg/makefile.mk.orig.port	Thu Oct 25 12:13:37 2007
-+++ jvmfwk/distributions/OpenOfficeorg/makefile.mk	Thu Oct 25 12:13:47 2007
-@@ -49,7 +49,7 @@ $(BIN)$/javavendors_ooo.xml: javavendors_unx.xml javav
- .IF "$(GUI)"=="UNX"
- .IF "$(OS)"=="MACOSX"
- 	-$(COPY) javavendors_macosx.xml $(BIN)$/javavendors_ooo.xml
-.ELIF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
-+.ELIF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="OPENBSD"
- 	-$(COPY) javavendors_linux.xml $(BIN)$/javavendors_ooo.xml
- .ELSE
- 	-$(COPY) javavendors_unx.xml $(BIN)$/javavendors_ooo.xml
--- a/editors/openoffice/patches/patch-jvmfwk_plugins_sunmajor_pluginlib_sunversion_cxx
+++ b/editors/openoffice/patches/patch-jvmfwk_plugins_sunmajor_pluginlib_sunversion_cxx
@ -1,21 +0,0 @@
-$OpenBSD: patch-jvmfwk_plugins_sunmajor_pluginlib_sunversion_cxx,v 1.4 2007/04/18 13:20:48 kurt Exp $
--- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx.orig.port	Sat Sep 16 13:46:33 2006
-+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx	Wed Apr 18 03:46:25 2007
-@@ -208,7 +208,7 @@ bool SunVersion::init(const char *szVersion)
-         m_preRelease = getPreRelease(pCur);
-         if (m_preRelease == Rel_NONE)
-             return false;
-#if defined(FREEBSD)        
-+#if defined(FREEBSD) || defined(OPENBSD)
-       if (m_preRelease == Rel_FreeBSD)
-       {
-           pCur++; //elemnate `p'
-@@ -259,7 +259,7 @@ SunVersion::PreRelease SunVersion::getPreRelease(const
-         return Rel_RC2;
-     else if (! strcmp(szRelease, "rc3"))
-         return Rel_RC3;
-#if defined (FREEBSD)
-+#if defined (FREEBSD) || defined (OPENBSD)
-     else if (! strncmp(szRelease, "p", 1))
-         return Rel_FreeBSD;
- #endif    
--- a/editors/openoffice/patches/patch-jvmfwk_plugins_sunmajor_pluginlib_sunversion_hxx
+++ b/editors/openoffice/patches/patch-jvmfwk_plugins_sunmajor_pluginlib_sunversion_hxx
@ -1,12 +0,0 @@
-$OpenBSD: patch-jvmfwk_plugins_sunmajor_pluginlib_sunversion_hxx,v 1.3 2007/04/18 13:20:48 kurt Exp $
--- jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx.orig.port	Wed Sep  7 15:31:59 2005
-+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx	Wed Apr 18 03:46:25 2007
-@@ -84,7 +84,7 @@ class SunVersion (protected)
-         Rel_RC1,
-         Rel_RC2,
-         Rel_RC3
-#if defined(FREEBSD)
-+#if defined(FREEBSD) || defined(OPENBSD)
- 	,
-         Rel_FreeBSD
- #endif
--- a/editors/openoffice/patches/patch-jvmfwk_sunmajor_pluginlib_sunjre_cxx
+++ b/editors/openoffice/patches/patch-jvmfwk_sunmajor_pluginlib_sunjre_cxx
@ -1,11 +0,0 @@
-$OpenBSD: patch-jvmfwk_sunmajor_pluginlib_sunjre_cxx,v 1.4 2007/04/18 13:20:48 kurt Exp $
--- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx.orig.port	Sat Sep 16 13:46:13 2006
-+++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx	Wed Apr 18 03:46:25 2007
-@@ -94,6 +94,7 @@ char const* const* SunInfo::getLibraryPaths(int* size)
-     static char const * ar[] = {
- 
-         "/lib/" JFW_PLUGIN_ARCH "/client",
-+	"/lib/" JFW_PLUGIN_ARCH "/server",
-         "/lib/" JFW_PLUGIN_ARCH "/native_threads", 
-         "/lib/" JFW_PLUGIN_ARCH
- 
--- a/editors/openoffice/patches/patch-nas_nas-1_6_patch
+++ b/editors/openoffice/patches/patch-nas_nas-1_6_patch
@ -1,121 +0,0 @@
-$OpenBSD: patch-nas_nas-1_6_patch,v 1.4 2007/11/13 09:46:28 robert Exp $
--- nas/nas-1.6.patch.orig.port	Tue Jul  3 16:01:47 2007
-+++ nas/nas-1.6.patch	Thu Oct 25 16:23:46 2007
-@@ -109,7 +109,7 @@
-    */
-   
-   #ifndef WIN32
-! # if defined(__NetBSD__) || defined(__FreeBSD__)
-+! # if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-   #  include <limits.h>
-   #  define MAXSHORT SHRT_MAX
-   #  define MINSHORT SHRT_MIN
-@@ -497,7 +497,7 @@
-   #include <sys/param.h>
-   #include <assert.h>
-   
-! #ifdef __NetBSD__
-+! #if defined(__NetBSD__) || defined(__OpenBSD__)
- ! # include <sys/ioctl.h>
- ! # include <soundcard.h>
-   #else
-@@ -619,6 +619,23 @@
- *** misc/nas-1.6/server/Imakefile	2002-07-24 03:49:33.000000000 +0200
- --- misc/build/nas-1.6/server/Imakefile	2004-09-03 12:50:52.883257512 +0200
- ***************
-+*** 60,66 ****
-+          SYSLIBS =
-+  #endif
-+  
-+! #ifdef NetBSDArchitecture
-+          SYSLIBS = -lossaudio
-+  #endif
-+  
-+--- 60,66 ----
-+          SYSLIBS =
-+  #endif
-+  
-+! #if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture)
-+          SYSLIBS = -lossaudio
-+  #endif
-+  
-+***************
- *** 105,110 ****
- --- 105,113 ----
-   # if defined(LinuxArchitecture)
-@@ -763,6 +780,75 @@
-       XtAppAddActions(appContext, actions, XtNumber(actions));
-   
-       if (argc == 3)
-+*** misc/nas-1.6/doc/Imakefile	Sat May  8 20:47:19 1999
-+--- misc/build/nas-1.6/doc/Imakefile	Sat Apr 15 14:51:40 2006
-+***************
-+*** 27,33 ****
-+  #define IHaveSubdirs
-+  #define PassCDebugFlags AuPassCDebugFlags
-+  
-+- SUBDIRS = man
-+- 
-+  MakeSubdirs($(SUBDIRS))
-+  DependSubdirs($(SUBDIRS))
-+--- 27,31 ----
-+*** misc/nas-1.6/lib/audio/ConnSvr.c	Sat Feb 23 17:06:29 2002
-+--- misc/build/nas-1.6/lib/audio/ConnSvr.c	Mon Oct 16 23:09:28 2006
-+***************
-+*** 54,60 ****
-+  #define FIOSNBIO	FIONBIO
-+  #endif /* WIN32 */
-+  
-+! #if defined(__FreeBSD__) || defined(__NetBSD__)
-+  #include <sys/param.h>
-+  #endif /* __FreeBSD__ */
-+  #include <ctype.h>
-+--- 54,60 ----
-+  #define FIOSNBIO	FIONBIO
-+  #endif /* WIN32 */
-+  
-+! #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+  #include <sys/param.h>
-+  #endif /* __FreeBSD__ */
-+  #include <ctype.h>
-+*** misc/nas-1.6/server/dia/auevents.c	Sat Oct  6 17:19:46 2001
-+--- misc/build/nas-1.6/server/dia/auevents.c	Mon Oct 16 23:10:40 2006
-+***************
-+*** 29,35 ****
-+  # define		_BSD_SIGNALS
-+  #endif
-+  
-+! #ifdef __NetBSD__
-+  # include       <sys/types.h>
-+  #endif
-+  
-+--- 29,35 ----
-+  # define		_BSD_SIGNALS
-+  #endif
-+  
-+! #if defined(__NetBSD__) || defined(__OpenBSD__)
-+  # include       <sys/types.h>
-+  #endif
-+  
-+*** misc/nas-1.6/server/dia/auservertype.h	Wed Jul 24 20:42:28 2002
-+--- misc/build/nas-1.6/server/dia/auservertype.h	Mon Oct 16 23:10:20 2006
-+***************
-+*** 14,20 ****
-+  # define SGI_SERVER
-+  #endif						/* sgi */
-+  
-+! #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(linux) || (defined(SVR4) && (defined(SYSV386) || defined(i386))) || defined(__CYGWIN__)
-+  # define VOXWARE_SERVER
-+  #endif                                          /* voxware */
-+  
-+--- 14,20 ----
-+  # define SGI_SERVER
-+  #endif						/* sgi */
-+  
-+! #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(linux) || (defined(SVR4) && (defined(SYSV386) || defined(i386))) || defined(__CYGWIN__)
-+  # define VOXWARE_SERVER
-+  #endif                                          /* voxware */
-+  
- *** misc/nas-1.6/clients/audio/auedit/auedit.c.old	2007-01-15 18:34:12.000000000 +0100
- --- misc/build/nas-1.6/clients/audio/auedit/auedit.c	2007-01-22 13:17:43.000000000 +0100
- ***************
--- a/editors/openoffice/patches/patch-odk_configure_pl
+++ b/editors/openoffice/patches/patch-odk_configure_pl
@ -1,14 +0,0 @@
-$OpenBSD: patch-odk_configure_pl,v 1.3 2007/04/18 13:20:48 kurt Exp $
--- odk/configure.pl.orig.port	Wed Nov  9 04:28:37 2005
-+++ odk/configure.pl	Wed Apr 18 03:46:25 2007
-@@ -28,6 +28,10 @@ if ( $main::operatingSystem =~ /freebsd/ )
- {
-     $main::makeName = "gmake";
- }
-+if ( $main::operatingSystem =~ /openbsd/ )
-+{
-+    $main::makeName = "gmake";
-+}
- $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog($main::makeName);
- $main::makeVersion = "3.79.1";
- $main::correctVersion = 0;
--- a/editors/openoffice/patches/patch-odk_setsdkenv_unix_csh_in
+++ b/editors/openoffice/patches/patch-odk_setsdkenv_unix_csh_in
@ -1,35 +0,0 @@
-$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
-+    
-+  case "openbsd*":
-+    if ( $?OO_SDK_CPP_HOME == 0) then
-+        set sdk_gxx_include_path=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
-+        setenv SDK_GXX_INCLUDE_PATH ${sdk_gxx_include_path}
-+    endif
-+
-+    set directoryname=openbsd   
-+    set comid=gcc3
-+    set pltfrm=gcc
-+    set soext=so
-+    set exampleout=OPENBSDexample.out
-+    set platform=OpenBSD
-+
-+    # set LD_LIBRARY_PATH
-+    if ( $?LD_LIBARY_PATH == 0) then
-+        setenv LD_LIBRARY_PATH ${OO_SDK_HOME}/${directoryname}/lib:${OO_EXAMPLE_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.
-+    else
-+        setenv LD_LIBRARY_PATH ${OO_SDK_HOME}/${directoryname}/lib:${OO_EXAMPLE_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH}
-+    endif
-+
-+    setenv PTHREAD_CFLAGS "-pthread -D_THREAD_SAFE"
-+    setenv PTHREAD_LIBS -pthread
-+    
-+    endif
-   breaksw
- endsw
- 
--- a/editors/openoffice/patches/patch-odk_setsdkenv_unix_sh_in
+++ b/editors/openoffice/patches/patch-odk_setsdkenv_unix_sh_in
@ -1,32 +0,0 @@
-$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
-     ;;
-+  openbsd*)
-+    if [ -n "$OO_SDK_CPP_HOME" ]
-+    then
-+        SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | $OO_SDK_CPP_HOME/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
-+        export SDK_GXX_INCLUDE_PATH   
-+    fi
-+
-+    directoryname=openbsd
-+    comid=gcc3
-+    pltfrm=gcc
-+    soext=so
-+    exampleout=OPENBSDexample.out
-+    platform=OpenBSD
-+    LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_EXAMPLE_OUT/$exampleout/lib:${OO_SDK_URE_LIB_DIR}:.:$LD_LIBRARY_PATH
-+    export LD_LIBRARY_PATH
-+
-+    PTHREAD_CFLAGS="-pthread -D_THREAD_SAFE"
-+    PTHREAD_LIBS=-pthread
-+    export PTHREAD_CFLAGS
-+    export PTHREAD_LIBS 
-+    fi
-+    ;;
- esac
- 
- # Add directory of the SDK tools to the path.
--- a/editors/openoffice/patches/patch-odk_settings_settings_mk
+++ b/editors/openoffice/patches/patch-odk_settings_settings_mk
@ -1,101 +0,0 @@
-$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
-+
-+###########################################################################
-+#
-+# OpenBSD specific settings
-+#
-+###########################################################################
-+ifneq (,$(findstring openbsd,$(PLATFORM)))
-+# Settings for OpenBSD using gcc compiler
-+
-+PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)
-+
-+# Default is openbsd on a intel machine    
-+PLATFORM=openbsd
-+PACKAGE_LIB_DIR=openbsd_x86.plt
-+UNOPKG_PLATFORM=OpenBSD_x86
-+JAVA_PROC_TYPE=i386
-+
-+OS=OPENBSD
-+PS=/
-+CC=gcc
-+LINK=g++
-+LIB=g++
-+ECHO=@echo
-+MKDIR=mkdir -p
-+CAT=cat
-+OBJ_EXT=o
-+SHAREDLIB_EXT=so
-+SHAREDLIB_PRE=lib
-+SHAREDLIB_OUT=$(OUT_LIB)
-+
-+GCC_VERSION=$(shell $(CC) -dumpversion)
-+
-+ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3"
-+COMID=gcc3
-+CPPU_ENV=gcc3
-+else
-+COMID=GCC
-+CPPU_ENV=gcc2
-+endif
-+
-+OSEP=\<
-+CSEP=\>
-+QUOTE=$(subst S,\,S)
-+QM=\"
-+SQM='
-+ECHOLINE=@echo
-+P2BG=&
-+
-+DEL=rm -f
-+DELRECURSIVE=rm -rf
-+COPY=cp
-+URLPREFIX=file://
-+
-+# Include UDK version numbers
-+include $(PRJ)/include/udkversion.mk
-+
-+SALLIB=-luno_sal
-+CPPULIB=-luno_cppu
-+CPPUHELPERLIB=-luno_cppuhelper$(COMID)
-+SALHELPERLIB=-luno_salhelper$(COMID)
-+REGLIB=-lreg
-+STORELIB=-lstore
-+STLPORTLIB=-lstlport_gcc
-+
-+EMPTYSTRING=
-+PATH_SEPARATOR=:
-+
-+# -O is necessary for inlining (see gcc documentation)
-+ifeq "$(DEBUG)" "yes"
-+CC_FLAGS=-c -g -fPIC -DPIC $(PTHREAD_CFLAGS)
-+else
-+CC_FLAGS=-c -O -fPIC -DPIC $(PTHREAD_CFLAGS)
-+endif
-+
-+SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/include/openbsd"
-+CC_INCLUDES=-I. -I$(OUT)/inc/examples -I$(PRJ)/include
-+STL_INCLUDES=-I"$(OO_SDK_HOME)/include/stl"
-+CC_DEFINES=-DUNX -DGCC -DOPENBSD -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH)
-+
-+CC_OUTPUT_SWITCH=-o
-+
-+LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN'
-+COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -Wl,--version-script,$(PRJ)/settings/component.uno.map
-+
-+EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined 
-+#EXE_LINK_FLAGS+=-Wl,-export-dynamic -Wl,-z,defs
-+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L"$(OFFICE_PROGRAM_PATH)" $(PTHREAD_LIBS)
-+LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)"
-+
-+ifneq "$(OO_SDK_URE_HOME)" ""
-+URE_MISC=$(OO_SDK_URE_HOME)/share/misc
-+endif
-+
-+endif
--- a/editors/openoffice/patches/patch-odk_source_unoapploader_unx_makefile_mk
+++ b/editors/openoffice/patches/patch-odk_source_unoapploader_unx_makefile_mk
@ -1,12 +0,0 @@
-$OpenBSD: patch-odk_source_unoapploader_unx_makefile_mk,v 1.2 2006/10/19 15:16:50 kurt Exp $
--- odk/source/unoapploader/unx/makefile.mk.orig.port	Wed Mar 15 04:30:14 2006
-+++ odk/source/unoapploader/unx/makefile.mk	Thu Oct 19 10:47:53 2006
-@@ -51,7 +51,7 @@ LIBSALCPPRT=
- LINK=$(CC)
- .ENDIF
- 
-.IF "$(OS)"!="FREEBSD"
-+.IF "$(OS)"!="FREEBSD" && "$(OS)"!="OPENBSD"
- STDLIB= -ldl
- .ENDIF
- 
--- a/editors/openoffice/patches/patch-odk_util_makefile_pmk
+++ b/editors/openoffice/patches/patch-odk_util_makefile_pmk
@ -1,25 +0,0 @@
-$OpenBSD: patch-odk_util_makefile_pmk,v 1.3 2007/11/13 09:46:28 robert Exp $
--- odk/util/makefile.pmk.orig.port	Mon Mar 26 15:28:38 2007
-+++ odk/util/makefile.pmk	Thu Oct 25 16:23:47 2007
-@@ -65,7 +65,7 @@ IDLOUT=$(SOLARIDLDIR)
- XMLOUT=$(SOLARXMLDIR)
- LIBOUT=$(SOLARLIBDIR)
- 
-.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="OPENBSD"
- MY_COPY=$(GNUCOPY)
- MY_COPY_RECURSIVE=$(GNUCOPY) -r
- .ELSE
-@@ -147,6 +147,12 @@ DESTPLATFROM=netbsd
- # FREEBSD
- ###########
- DESTPLATFROM=freebsd
-+
-+.ELIF "$(OS)"=="OPENBSD"
-+###########
-+# OPENBSD
-+###########
-+DESTPLATFROM=openbsd
- 
- .ELIF "$(OS)"=="IRIX"
- ###########
--- a/editors/openoffice/patches/patch-portaudio_portaudio_v18_1_patch
+++ b/editors/openoffice/patches/patch-portaudio_portaudio_v18_1_patch
@ -1,256 +0,0 @@
-$OpenBSD: patch-portaudio_portaudio_v18_1_patch,v 1.2 2006/10/27 16:02:02 kurt Exp $
--- portaudio/portaudio_v18_1.patch.orig.port	Wed Mar  8 09:03:33 2006
-+++ portaudio/portaudio_v18_1.patch	Thu Oct 26 23:34:46 2006
-@@ -12,7 +12,7 @@
-   	;;
-   
-     mingw* )
---- 1883,1921 ----
-+--- 1883,1931 ----
-   case "${host_os}" in
-     darwin* )
-   
-@@ -49,6 +49,16 @@
- ! 	PADLL="libportaudio.so";
- ! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
- ! 	CFLAGS="-O2 -fPIC ${PTHREAD_CFLAGS} ${ARCH_FLAGS}"
-+! 	;;
-+! 
-+!   openbsd* )
-+! 
-+! 	OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
-+! 	LIBS="-lm -lpthread";
-+! 	PADLL="libportaudio.so";
-+! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
-+! 	CFLAGS="${CFLAGS} -fPIC -pthread ${ARCH_FLAGS}"
-+! 	DLL_LIBS="-lossaudio";
-   	;;
-   
-     mingw* )
-@@ -90,29 +100,216 @@
-   LIBINST = /usr/local/lib
-   
-   TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
-*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	2003-06-30 17:05:50.000000000 +0200
---- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	2006-01-31 20:10:00.363708000 +0100
-+*** misc/portaudio_v18_1/pa_tests/patest_buffer.c.old	2003-02-11 19:41:32.000000000 +0100
-+--- misc/build/portaudio_v18_1/pa_tests/patest_buffer.c	2005-08-15 11:46:53.000000000 +0200
- ***************
-+*** 125,130 ****
-+--- 125,131 ----
-+          if( err < 0 ) return 0;
-+  
-+      }
-++     return 0;
-+  }
-+  
-+  
-+*** misc/portaudio_v18_1/pa_unix_oss/pa_unix.c	Mon Jun 30 11:05:50 2003
-+--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix.c	Thu Oct 26 11:50:21 2006
-+***************
-+*** 401,406 ****
-+--- 401,407 ----
-+      return result;
-+  }
-+  
-++ #ifndef __OpenBSD__
-+  /*******************************************************************************************
-+   * Monitor audio thread and lower its it if it hogs the CPU.
-+   * To prevent getting killed, the audio thread must update a
-+***************
-+*** 600,605 ****
-+--- 601,607 ----
-+  
-+      return result;
-+  }
-++ #endif  /* Watchdog */
-+  
-+  /*******************************************************************************************/
-+  static PaError Pa_AudioThreadProc( internalPortAudioStream   *past )
-+***************
-+*** 615,622 ****
-+--- 617,626 ----
-+      GSRegisterCurrentThread(); /* SB20010904 */
-+  #endif
-+  
-++ #ifndef __OpenBSD__
-+      result = PaHost_BoostPriority( past );
-+      if( result < 0 ) goto error;
-++ #endif
-+  
-+      past->past_IsActive = 1;
-+      DBUG(("entering thread.\n"));
-+***************
-+*** 682,688 ****
-+--- 686,694 ----
-+      DBUG(("Pa_AudioThreadProc: left audio loop.\n"));
-+  
-+      past->past_IsActive = 0;
-++ #ifndef __OpenBSD__
-+      PaHost_StopWatchDog( pahsc );
-++ #endif
-+  
-+  error:
-+      DBUG(("leaving audio thread.\n"));
-+***************
-+*** 812,818 ****
-+                             past->past_NumUserBuffers, past->past_FramesPerUserBuffer,
-+                             past->past_NumOutputChannels );
-+              result = Pa_SetupDeviceFormat( pahsc->pahsc_OutputHandle,
-+!                                            past->past_NumOutputChannels, (int)past->past_SampleRate );
-+          }
-+      }
-+      else
-+--- 818,824 ----
-+                             past->past_NumUserBuffers, past->past_FramesPerUserBuffer,
-+                             past->past_NumOutputChannels );
-+              result = Pa_SetupDeviceFormat( pahsc->pahsc_OutputHandle,
-+!                                            past->past_NumOutputChannels, (int)past->past_SampleRate, 2 );
-+          }
-+      }
-+      else
-+*** misc/portaudio_v18_1/pa_unix_oss/pa_unix.h	Thu Apr 10 17:42:34 2003
-+--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix.h	Thu Oct 26 11:50:03 2006
-+***************
-+*** 133,139 ****
-+  internalPortAudioDevice *Pa_GetInternalDevice( PaDeviceID id );
-+  PaError Pa_QueryDevices( void );
-+  PaError Pa_QueryDevice( const char *deviceName, internalPortAudioDevice *pad );
-+! PaError Pa_SetupDeviceFormat( int devHandle, int numChannels, int sampleRate );
-+  PaError Pa_SetupInputDeviceFormat( int devHandle, int numChannels, int sampleRate );
-+  PaError Pa_SetupOutputDeviceFormat( int devHandle, int numChannels, int sampleRate );
-+  void Pa_SetLatency( int devHandle, int numBuffers, int framesPerBuffer, int channelsPerFrame  );
-+--- 133,139 ----
-+  internalPortAudioDevice *Pa_GetInternalDevice( PaDeviceID id );
-+  PaError Pa_QueryDevices( void );
-+  PaError Pa_QueryDevice( const char *deviceName, internalPortAudioDevice *pad );
-+! PaError Pa_SetupDeviceFormat( int devHandle, int numChannels, int sampleRate, int input );
-+  PaError Pa_SetupInputDeviceFormat( int devHandle, int numChannels, int sampleRate );
-+  PaError Pa_SetupOutputDeviceFormat( int devHandle, int numChannels, int sampleRate );
-+  void Pa_SetLatency( int devHandle, int numBuffers, int framesPerBuffer, int channelsPerFrame  );
-+*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Mon Jun 30 11:05:50 2003
-+--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Thu Oct 26 11:49:47 2006
-+***************
- *** 43,48 ****
---- 43,50 ----
-+--- 43,53 ----
-   
-   #ifdef __linux__
-   #include <linux/soundcard.h>
- + #elif defined (__FreeBSD__)
- + #include <sys/soundcard.h>
-++ #elif defined (__OpenBSD__)
-++ #include <soundcard.h>
-++ #include <sys/audioio.h>
-   #else
-   #include <machine/soundcard.h> /* JH20010905 */
-   #endif
-
-*** misc/portaudio_v18_1/pa_tests/patest_buffer.c.old	2003-02-11 19:41:32.000000000 +0100
---- misc/build/portaudio_v18_1/pa_tests/patest_buffer.c	2005-08-15 11:46:53.000000000 +0200
- ***************
-*** 125,130 ****
---- 125,131 ----
-          if( err < 0 ) return 0;
-+*** 218,228 ****
-+  }
-   
-+  /*******************************************************************************************/
-+! PaError Pa_SetupDeviceFormat( int devHandle, int numChannels, int sampleRate )
-+  {
-+      PaError result = paNoError;
-+      int     tmp;
-+  
-+      /* Set format, channels, and rate in this order to keep OSS happy. */
-+      /* Set data format. FIXME - handle more native formats. */
-+      tmp = AFMT_S16_NE;
-+--- 223,237 ----
-+  }
-+  
-+  /*******************************************************************************************/
-+! PaError Pa_SetupDeviceFormat( int devHandle, int numChannels, int sampleRate, int input )
-+  {
-+      PaError result = paNoError;
-+      int     tmp;
-+  
-++ #ifdef __OpenBSD__
-++     audio_info_t audio_if;
-++ #endif
-++ 
-+      /* Set format, channels, and rate in this order to keep OSS happy. */
-+      /* Set data format. FIXME - handle more native formats. */
-+      tmp = AFMT_S16_NE;
-+***************
-+*** 272,289 ****
-+             return paHostError;
-+          }
-       }
-+     return 0;
-+!     
-+      return result;
-+  }
-+  
-+  PaError Pa_SetupOutputDeviceFormat( int devHandle, int numChannels, int sampleRate )
-+  {
-+!   return Pa_SetupDeviceFormat(devHandle, numChannels, sampleRate);
-+  }
-+  
-+  PaError Pa_SetupInputDeviceFormat( int devHandle, int numChannels, int sampleRate )
-+  {
-+!   return Pa_SetupDeviceFormat(devHandle, numChannels, sampleRate);
-+  }
-+  
-+  
-+--- 281,332 ----
-+             return paHostError;
-+          }
-+      }
-+! 
-+! #ifdef __OpenBSD__
-+! 
-+!     AUDIO_INITINFO(&audio_if);
-+! 
-+!     switch(input) {
-+!     case 2:
-+!         audio_if.record.open = 1;
-+!         audio_if.record.pause = 0;
-+!         audio_if.play.open = 1;
-+!         audio_if.play.pause = 0;
-+!         break;
-+! 
-+!     case 1:
-+!         audio_if.record.open = 1;
-+!         audio_if.record.pause = 0;
-+!         break;
-+! 
-+!     case 0:
-+!         audio_if.play.open = 1;
-+!         audio_if.play.pause = 0;
-+!         break;
-+! 
-+!     default:
-+!        break;
-+!     }
-+! 
-+!     if (ioctl(devHandle, AUDIO_SETINFO, &audio_if) == -1)
-+!     {
-+!         ERR_RPT(("Pa_SetupDeviceFormat: could not AUDIO_SETINFO for recording on OpenBSD\n" ));
-+!         return paHostError;
-+!     }
-+! 
-+! #endif
-+! 
-+      return result;
-+  }
-+  
-+  PaError Pa_SetupOutputDeviceFormat( int devHandle, int numChannels, int sampleRate )
-+  {
-+!   return Pa_SetupDeviceFormat(devHandle, numChannels, sampleRate, 0);
-+  }
-+  
-+  PaError Pa_SetupInputDeviceFormat( int devHandle, int numChannels, int sampleRate )
-+  {
-+!   return Pa_SetupDeviceFormat(devHandle, numChannels, sampleRate, 1);
-   }
-   
-   
--- a/editors/openoffice/patches/patch-postprocess_prj_build_lst
+++ b/editors/openoffice/patches/patch-postprocess_prj_build_lst
@ -1,11 +0,0 @@
-$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_cupsmgr_cxx
+++ b/editors/openoffice/patches/patch-psprint_source_printer_cupsmgr_cxx
@ -1,12 +0,0 @@
-$OpenBSD: patch-psprint_source_printer_cupsmgr_cxx,v 1.2 2006/12/13 10:25:14 robert Exp $
--- psprint/source/printer/cupsmgr.cxx.orig.port	Fri Dec  1 18:55:41 2006
-+++ psprint/source/printer/cupsmgr.cxx	Mon Dec 11 22:27:39 2006
-@@ -60,7 +60,7 @@ typedef void cups_option_t;
- #ifdef MACOSX
- #define CUPS_LIB_NAME "libcups.2.dylib"
- #else
-#define CUPS_LIB_NAME "libcups.so.2"
-+#define CUPS_LIB_NAME "libcups.so"
- #endif
- 
- namespace psp
--- a/editors/openoffice/patches/patch-psprint_source_printer_printerinfomanager_cxx
+++ b/editors/openoffice/patches/patch-psprint_source_printer_printerinfomanager_cxx
@ -1,20 +0,0 @@
--- 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;
- };
- 
-#if ! (defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(MACOSX)) 
-+#if ! (defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD)) 
- static void lpgetSysQueueTokenHandler(
-     const std::list< rtl::OString >& i_rLines,
-     std::list< PrinterInfoManager::SystemPrintQueue >& o_rQueues,
-@@ -1385,7 +1385,7 @@ static void standardSysQueueTokenHandler(
- 
- static const struct SystemCommandParameters aParms[] =
- {
-    #if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(MACOSX) 
-+    #if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD)
-     { "/usr/sbin/lpc status", "lpr -P \"(PRINTER)\"", "", ":", 0, standardSysQueueTokenHandler },
-     { "lpc status", "lpr -P \"(PRINTER)\"", "", ":", 0, standardSysQueueTokenHandler },
-     { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d \"(PRINTER)\"", "system for ", ": ", 1, standardSysQueueTokenHandler }
--- a/editors/openoffice/patches/patch-psprint_source_printergfx_printerjob_cxx
+++ b/editors/openoffice/patches/patch-psprint_source_printergfx_printerjob_cxx
@ -1,12 +0,0 @@
-$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;
- 
-#ifdef FREEBSD
-+#if defined (FREEBSD) || defined (OPENBSD)
-         pPWEntry = getpwuid( getuid());
- #else
-     if (getpwuid_r(getuid(), &aPWEntry, pPWBuffer, sizeof(pPWBuffer), &pPWEntry) != 0)
--- a/editors/openoffice/patches/patch-pyuno_source_module_makefile_mk
+++ b/editors/openoffice/patches/patch-pyuno_source_module_makefile_mk
@ -1,11 +0,0 @@
--- 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 $(EXTRA_LINKFLAGS) $(EXTRA_FRAMEWORK_FLAG) > $(MISC)$/$(@:b).cmd
-+.ELIF "$(OS)" == "OPENBSD"
-+	@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 +0,0 @@
--- 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(MACOSX) && !defined(FREEBSD)
-+	!defined(MACOSX) && !defined(FREEBSD) && \
-+	!defined(OPENBSD)
- #	error "Target platform not specified !"
- #endif
- 
--- a/editors/openoffice/patches/patch-sal_inc_rtl_uuid_h
+++ b/editors/openoffice/patches/patch-sal_inc_rtl_uuid_h
@ -1,12 +0,0 @@
-$OpenBSD: patch-sal_inc_rtl_uuid_h,v 1.3 2007/03/17 15:27:45 robert Exp $
--- sal/inc/rtl/uuid.h.orig.port	Wed Jan 17 09:35:34 2007
-+++ sal/inc/rtl/uuid.h	Tue Feb  6 23:13:34 2007
-@@ -208,6 +208,8 @@ void SAL_CALL rtl_createNamedUuid(
- #define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 100000
- #elif IRIX
- #define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 10
-+#elif OPENBSD
-+#define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 10
- #else
- #error "System time resolution must be calculated!"
- #endif
--- a/editors/openoffice/patches/patch-sal_inc_sal_alloca_h
+++ b/editors/openoffice/patches/patch-sal_inc_sal_alloca_h
@ -1,12 +0,0 @@
-$OpenBSD: patch-sal_inc_sal_alloca_h,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- sal/inc/sal/alloca.h.orig.port	Thu Sep  8 10:46:27 2005
-+++ sal/inc/sal/alloca.h	Fri Aug 18 15:47:43 2006
-@@ -43,7 +43,7 @@
- #define INCLUDED_ALLOCA_H
- #endif
- 
-#elif defined (FREEBSD) || defined(NETBSD)
-+#elif defined (FREEBSD) || defined(NETBSD) || defined (OPENBSD)
- 
- #ifndef INCLUDED_STDLIB_H
- #include <stdlib.h>
--- a/editors/openoffice/patches/patch-sal_inc_sal_config_h
+++ b/editors/openoffice/patches/patch-sal_inc_sal_config_h
@ -1,12 +0,0 @@
-$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)
-+#if defined(SOLARIS) || defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(SCO) || defined(IRIX) || defined(OPENBSD)
- #define SAL_UNX
- #define SAL_DLLEXTENSION ".so"
- #define SAL_DLLPREFIX "lib"
--- a/editors/openoffice/patches/patch-sal_inc_sal_types_h
+++ b/editors/openoffice/patches/patch-sal_inc_sal_types_h
@ -1,11 +0,0 @@
--- 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 || 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_backtrace_c
+++ b/editors/openoffice/patches/patch-sal_osl_unx_backtrace_c
@ -1,12 +0,0 @@
-$OpenBSD: patch-sal_osl_unx_backtrace_c,v 1.4 2007/04/18 13:20:48 kurt Exp $
--- sal/osl/unx/backtrace.c.orig.port	Wed Nov 15 07:33:07 2006
-+++ sal/osl/unx/backtrace.c	Wed Apr 18 03:46:26 2007
-@@ -142,7 +142,7 @@ void backtrace_symbols_fd( void **buffer, int size, in
- #endif /* defined SOLARIS */
- 
- 
-#if defined FREEBSD || defined NETBSD
-+#if defined FREEBSD || defined NETBSD || defined OPENBSD
- #include <dlfcn.h>
- #include <pthread.h>
- #include <setjmp.h>
--- a/editors/openoffice/patches/patch-sal_osl_unx_backtrace_h
+++ b/editors/openoffice/patches/patch-sal_osl_unx_backtrace_h
@ -1,21 +0,0 @@
-$OpenBSD: patch-sal_osl_unx_backtrace_h,v 1.3 2007/04/18 13:20:48 kurt Exp $
--- sal/osl/unx/backtrace.h.orig.port	Thu Feb  9 12:05:59 2006
-+++ sal/osl/unx/backtrace.h	Wed Apr 18 03:46:26 2007
-@@ -34,7 +34,7 @@
-  ************************************************************************/
- 
- 
-#if defined (SOLARIS) || (FREEBSD) 
-+#if defined (SOLARIS) || (FREEBSD) || (OPENBSD)
- 
- #ifdef __cplusplus
- extern "C" {
-@@ -47,7 +47,7 @@ int backtrace( void **buffer, int max_frames );
- void backtrace_symbols_fd( void **buffer, int size, int fd );
- 
- /* no frame.h on FreeBSD */
-#if defined FREEBSD
-+#if defined FREEBSD || defined OPENBSD
- struct frame {
- 	long	arg0[8];
- 	long	arg1[6];
--- a/editors/openoffice/patches/patch-sal_osl_unx_file_cxx
+++ b/editors/openoffice/patches/patch-sal_osl_unx_file_cxx
@ -1,111 +0,0 @@
--- sal/osl/unx/file.cxx.orig.port	Fri Jan 19 06:43:14 2007
-+++ sal/osl/unx/file.cxx	Wed Apr 18 03:46:26 2007
-@@ -118,7 +118,7 @@ static const sal_Char* MOUNTTAB="/etc/mnttab";
- #include <ctype.h>
- static const sal_Char* MOUNTTAB="/etc/mtab";
- 
-#elif defined(NETBSD) || defined(FREEBSD)
-+#elif defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD)
- #include <sys/param.h>
- #include <sys/ucred.h>
- #include <sys/mount.h>
-@@ -1424,12 +1424,11 @@ oslFileError SAL_CALL osl_syncFile(oslFileHandle Handl
- 
- #ifdef HAVE_STATFS_H
- 
-#if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX)
-+#if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX) || defined(OPENBSD)
- #   define __OSL_STATFS_STRUCT      			struct statfs
- #   define __OSL_STATFS(dir, sfs)   			statfs((dir), (sfs))
- #   define __OSL_STATFS_BLKSIZ(a)   			((sal_uInt64)((a).f_bsize))
- #   define __OSL_STATFS_TYPENAME(a) 			((a).f_fstypename)
-#   define __OSL_STATFS_ISREMOTE(a) 			(((a).f_type & MNT_LOCAL) == 0)
- 
- /* always return true if queried for the properties of
-    the file system. If you think this is wrong under any
-@@ -1448,7 +1447,6 @@ oslFileError SAL_CALL osl_syncFile(oslFileHandle Handl
- #   define __OSL_STATFS_BLKSIZ(a)    			 ((sal_uInt64)((a).f_bsize))
- #   define __OSL_STATFS_IS_NFS(a)     			 (__OSL_NFS_SUPER_MAGIC == (a).f_type) 
- #   define __OSL_STATFS_IS_SMB(a)     			 (__OSL_SMB_SUPER_MAGIC == (a).f_type) 
-#   define __OSL_STATFS_ISREMOTE(a)  			 (__OSL_STATFS_IS_NFS((a)) || __OSL_STATFS_IS_SMB((a)))
- #	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  ((__OSL_MSDOS_SUPER_MAGIC != (a).f_type) && (__OSL_NTFS_SUPER_MAGIC != (a).f_type))
- #	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) ((__OSL_MSDOS_SUPER_MAGIC != (a).f_type))
- #endif /* LINUX */
-@@ -1474,7 +1472,6 @@ oslFileError SAL_CALL osl_syncFile(oslFileHandle Handl
- #   define __OSL_STATFS_STRUCT        			 struct dummy {int i;}
- #   define __OSL_STATFS_INIT(a)       			 ((void)0)
- #   define __OSL_STATFS(dir, sfs)     		     (1)
-#   define __OSL_STATFS_ISREMOTE(sfs) 			 (0)
- #	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)	 (1)
- #	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
- #endif /* HAVE_STATFS_H */
-@@ -1502,10 +1499,6 @@ static oslFileError osl_psz_getVolumeInformation (
-     /* FIXME: how to detect the kind of storage (fixed, cdrom, ...) */
- 	if (uFieldMask & osl_VolumeInfo_Mask_Attributes)
- 	{	
-	    if (__OSL_STATFS_ISREMOTE(sfs))
-			pInfo->uAttributes  |= osl_Volume_Attribute_Remote;
-						
-		pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;	
- 	}
- 
- 	if (uFieldMask & osl_VolumeInfo_Mask_FileSystemCaseHandling)
-@@ -2224,7 +2217,7 @@ int UnicodeToText( char * buffer, size_t bufLen, const
- 
-     if( nInfo & RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL )
-     {
-        errno = EOVERFLOW;
-+        errno = ENOMEM;
-         return 0;
-     }
- 
-@@ -2276,7 +2269,7 @@ int TextToUnicode(
- 
-     if (nInfo & RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL)
-     {
-        errno = EOVERFLOW;
-+        errno = ENOMEM;
-         return 0;
-     }
- 
-@@ -3404,35 +3397,35 @@ static sal_Bool osl_isFloppyMounted(oslVolumeDeviceHan
-  *
-  *****************************************************************************/
- 
-#if (defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
-+#if (defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD))
- static oslVolumeDeviceHandle osl_isFloppyDrive(const sal_Char* pszPath)
- {
-     return NULL;
- }
- #endif /* MACOSX */
- 
-#if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
-+#if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD))
- static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy)
- {
-     return osl_File_E_BUSY;
- }
- #endif /* MACOSX */
- 
-#if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
-+#if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD))
- static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy)
- {
-     return osl_File_E_BUSY;
- }
- #endif /* MACOSX */
- 
-#if ( defined(NETBSD) || defined(FREEBSD) )
-+#if ( defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD) )
- static sal_Bool osl_getFloppyMountEntry(const sal_Char* pszPath, oslVolumeDeviceHandleImpl* pItem)
- {
-     return sal_False;
- }
- #endif /* NETBSD || FREEBSD */
- 
-#if ( defined(NETBSD) || defined(FREEBSD) )
-+#if ( defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD) )
- static sal_Bool osl_isFloppyMounted(oslVolumeDeviceHandleImpl* pDevice)
- {
-     return sal_False;
--- a/editors/openoffice/patches/patch-sal_osl_unx_file_error_transl_cxx
+++ b/editors/openoffice/patches/patch-sal_osl_unx_file_error_transl_cxx
@ -1,38 +0,0 @@
-$OpenBSD: patch-sal_osl_unx_file_error_transl_cxx,v 1.4 2007/04/18 13:20:48 kurt Exp $
--- sal/osl/unx/file_error_transl.cxx.orig.port	Sun Sep 17 04:45:42 2006
-+++ sal/osl/unx/file_error_transl.cxx	Wed Apr 18 03:46:26 2007
-@@ -222,19 +222,19 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, 
-             osl_error = osl_File_E_LOOP;
-             break;
- 
-#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
-+#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD)) 
-         case EILSEQ:
-             osl_error = osl_File_E_ILSEQ;
-             break;
- #endif /* MACOSX */
-             
-#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
-+#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD))
-         case ENOLINK:
-             osl_error = osl_File_E_NOLINK;
-             break;
- #endif /* MACOSX */
-             
-#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
-+#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD))
-         case EMULTIHOP:
-             osl_error = osl_File_E_MULTIHOP;
-             break;
-@@ -244,9 +244,11 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, 
-             osl_error = osl_File_E_USERS;
-             break;
- 
-+#if !defined (OPENBSD)
-         case EOVERFLOW:
-             osl_error = osl_File_E_OVERFLOW;
-             break;
-+#endif
-         
-         case ETIMEDOUT:
-             osl_error = osl_File_E_TIMEDOUT;
--- a/editors/openoffice/patches/patch-sal_osl_unx_makefile_mk
+++ b/editors/openoffice/patches/patch-sal_osl_unx_makefile_mk
@ -1,12 +0,0 @@
-$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
- 
-.IF "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)$(CPU)"=="LINUXS"
-+.IF "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)$(CPU)"=="LINUXS" || "$(OS)"=="OPENBSD"
- SLOFILES += $(SLO)$/backtrace.obj
- OBJFILES += $(OBJ)$/backtrace.obj
- .ENDIF
--- a/editors/openoffice/patches/patch-sal_osl_unx_nlsupport_c
+++ b/editors/openoffice/patches/patch-sal_osl_unx_nlsupport_c
@ -1,84 +0,0 @@
-$OpenBSD: patch-sal_osl_unx_nlsupport_c,v 1.5 2007/11/13 09:46:28 robert Exp $
--- sal/osl/unx/nlsupport.c.orig.port	Tue Jul  3 14:48:57 2007
-+++ sal/osl/unx/nlsupport.c	Thu Oct 25 16:23:47 2007
-@@ -38,7 +38,7 @@
- #include <osl/process.h>
- #include <rtl/memory.h>
- 
-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(MACOSX)
-+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD)
- #include <pthread.h>
- #ifndef MACOSX
-  #include <locale.h>
-@@ -234,7 +234,7 @@ static rtl_Locale * _parse_locale( const char * locale
-     return NULL;
- }
-         
-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD)
-+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD)
- 
- /*
-  * This implementation of osl_getTextEncodingFromLocale maps
-@@ -557,6 +557,35 @@ const _pair _nl_language_list[] = {
-     { "UTF-8",         RTL_TEXTENCODING_UTF8           }  /* ISO-10646/UTF-8 */
- };
- 
-+#elif defined(OPENBSD)
-+    
-+const _pair _nl_language_list[] = {
-+    { "646",           RTL_TEXTENCODING_ASCII_US       },  /* fake: ASCII_US */
-+    { "ASCII",         RTL_TEXTENCODING_ASCII_US       }, /* US-ASCII */
-+    { "BIG5",          RTL_TEXTENCODING_BIG5           }, /* China - Traditional Chinese */   
-+    { "CP1251",        RTL_TEXTENCODING_MS_1251        }, /* MS-CYRL */
-+    { "CP866",         RTL_TEXTENCODING_IBM_866        }, /* CP866 866 */
-+    { "CTEXT",         RTL_TEXTENCODING_ASCII_US       }, /* US-ASCII */
-+    { "EUCCN",         RTL_TEXTENCODING_EUC_CN         }, /* China - Simplified Chinese */
-+    { "EUCJP",         RTL_TEXTENCODING_EUC_JP         }, /* Japan */
-+    { "EUCKR",         RTL_TEXTENCODING_EUC_KR         }, /* Korea */
-+    { "EUCTW",         RTL_TEXTENCODING_EUC_TW         }, /* China - Traditional Chinese */
-+    { "ISO-2022-JP",   RTL_TEXTENCODING_DONTKNOW       }, /* */
-+    { "ISO-2022-JP-2", RTL_TEXTENCODING_DONTKNOW       }, /* */
-+    { "ISO8859-1",     RTL_TEXTENCODING_ISO_8859_1     }, /* Western */
-+    { "ISO8859-15",    RTL_TEXTENCODING_ISO_8859_15    }, /* Western Updated (w/Euro sign) */
-+    { "ISO8859-2",     RTL_TEXTENCODING_ISO_8859_2     }, /* Central European */
-+    { "ISO8859-4",     RTL_TEXTENCODING_ISO_8859_4     }, /* LATIN4 L4 */
-+    { "ISO8859-5",     RTL_TEXTENCODING_ISO_8859_5     }, /* Cyrillic */
-+    { "ISO8859-7",     RTL_TEXTENCODING_ISO_8859_7     }, /* Greek */
-+    { "ISO8859-9",     RTL_TEXTENCODING_ISO_8859_9     }, /* Turkish */
-+    { "KOI8-R",        RTL_TEXTENCODING_KOI8_R         }, /* KOI8-R */
-+    { "KOI8-U",        RTL_TEXTENCODING_KOI8_U         }, /* KOI8-U */
-+    { "SJIS",          RTL_TEXTENCODING_SHIFT_JIS      }, /* Japan */
-+    { "US-ASCII",      RTL_TEXTENCODING_ASCII_US       }, /* US-ASCII */
-+    { "UTF-8",         RTL_TEXTENCODING_UTF8           }  /* ISO-10646/UTF-8 */
-+};
-+
- #endif /* ifdef SOLARIS IRIX LINUX FREEBSD NETBSD */
- 
- static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -946,7 +975,7 @@ int _imp_setProcessLocale( rtl_Locale * pLocale )
-             snprintf(env_buf, sizeof(env_buf), "LC_ALL=%s", locale_buf);
-             env_buf[sizeof(env_buf)] = '\0';
-             putenv(env_buf);
-#elif defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX )
-+#elif defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX ) || defined( OPENBSD )
-             setenv( "LC_ALL", locale_buf, 1);
- #else
-             setenv( "LC_ALL", locale_buf );
-@@ -958,7 +987,7 @@ int _imp_setProcessLocale( rtl_Locale * pLocale )
-             snprintf(env_buf, sizeof(env_buf), "LC_CTYPE=%s", locale_buf);
-             env_buf[sizeof(env_buf)] = '\0';
-             putenv(env_buf);
-#elif defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX )
-+#elif defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX  || defined( OPENBSD )
-             setenv("LC_CTYPE", locale_buf, 1 );
- #else
-             setenv( "LC_CTYPE", locale_buf );
-@@ -970,7 +999,7 @@ int _imp_setProcessLocale( rtl_Locale * pLocale )
-             snprintf(env_buf, sizeof(env_buf), "LANG=%s", locale_buf);
-             env_buf[sizeof(env_buf)] = '\0';
-             putenv(env_buf);
-#elif defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX )
-+#elif defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX ) || defined( OPENBSD )
-             setenv("LC_CTYPE", locale_buf, 1 );
- #else
-             setenv( "LANG", locale_buf );
--- a/editors/openoffice/patches/patch-sal_osl_unx_process_c
+++ b/editors/openoffice/patches/patch-sal_osl_unx_process_c
@ -1,12 +0,0 @@
-$OpenBSD: patch-sal_osl_unx_process_c,v 1.4 2007/11/13 09:46:28 robert Exp $
--- sal/osl/unx/process.c.orig.port	Wed Mar 14 14:17:17 2007
-+++ sal/osl/unx/process.c	Thu Oct 25 16:23:47 2007
-@@ -497,7 +497,7 @@ static void ChildStatusProc(void *pData)
- 
- 			if (! INIT_GROUPS(data.m_name, data.m_gid) || (setuid(data.m_uid) != 0))
- 				OSL_TRACE("Failed to change uid and guid, errno=%d (%s)\n", errno, strerror(errno));
-#if defined(LINUX) || defined (FREEBSD)
-+#if defined(LINUX) || defined (FREEBSD) || defined (OPENBSD)
- 			unsetenv("HOME");
- #else
- 			putenv("HOME=");
--- a/editors/openoffice/patches/patch-sal_osl_unx_security_c
+++ b/editors/openoffice/patches/patch-sal_osl_unx_security_c
@ -1,11 +0,0 @@
--- sal/osl/unx/security.c.orig.port	Tue Jun 19 18:17:07 2007
-+++ sal/osl/unx/security.c	Thu Oct 25 16:23:47 2007
-@@ -503,7 +503,7 @@ osl_psz_loginUser(const sal_Char* pszUserName, const s
- 			   oslSecurity* pSecurity)
- {
- #if defined NETBSD || defined SCO || defined AIX || defined FREEBSD || \
-	defined MACOSX
-+	defined MACOSX || defined OPENBSD
- 
- 	return osl_Security_E_None;
- 
--- a/editors/openoffice/patches/patch-sal_osl_unx_socket_c
+++ b/editors/openoffice/patches/patch-sal_osl_unx_socket_c
@ -1,12 +0,0 @@
-$OpenBSD: patch-sal_osl_unx_socket_c,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- sal/osl/unx/socket.c.orig.port	Wed Jul 19 05:39:22 2006
-+++ sal/osl/unx/socket.c	Fri Aug 18 15:47:44 2006
-@@ -56,7 +56,7 @@
- #undef HAVE_POLL_H
- #endif
- 
-#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD )
-+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD ) || defined ( OPENBSD )
- #include <sys/poll.h>
- #define HAVE_POLL_H
- #endif /* HAVE_POLL_H */
--- a/editors/openoffice/patches/patch-sal_osl_unx_system_h
+++ b/editors/openoffice/patches/patch-sal_osl_unx_system_h
@ -1,44 +0,0 @@
--- 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
- 
-+#ifdef OPENBSD
-+#   define  ETIME ETIMEDOUT
-+#   define _POSIX_THREAD_SYSCALL_SOFT 1
-+#   include <pthread.h>
-+#   include <sys/sem.h>
-+#   include <semaphore.h>
-+#   include <dlfcn.h>
-+#   include <sys/filio.h>
-+#   include <sys/ioctl.h>
-+#   include <sys/param.h>
-+#   include <sys/time.h>
-+#   include <sys/uio.h>
-+#   include <sys/exec.h>
-+#       include <sys/un.h>
-+#   include <netinet/tcp.h>
-+#       define  IORESOURCE_TRANSFER_BSD
-+#   include <machine/endian.h>
-+#      define  PTR_SIZE_T(s)   ((size_t *)&(s))
-+#       define  IORESOURCE_TRANSFER_BSD
-+#       define  IOCHANNEL_TRANSFER_BSD_RENO
-+#       define  pthread_testcancel()
-+#       define  NO_PTHREAD_PRIORITY
-+#       define  NO_PTHREAD_RTL
-+#       define  PTHREAD_SIGACTION                       pthread_sigaction
-+#endif
-+
- #ifdef SCO
- #   define AF_IPX -1
- #	include <strings.h>
-@@ -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(MACOSX)
-+	!defined(MACOSX) && !defined(OPENBSD)
- #	error "Target platform not specified!"
- #endif
- 
--- a/editors/openoffice/patches/patch-sal_osl_unx_tempfile_c
+++ b/editors/openoffice/patches/patch-sal_osl_unx_tempfile_c
@ -1,12 +0,0 @@
-$OpenBSD: patch-sal_osl_unx_tempfile_c,v 1.3 2007/04/18 13:20:48 kurt Exp $
--- sal/osl/unx/tempfile.c.orig.port	Thu May  4 04:48:55 2006
-+++ sal/osl/unx/tempfile.c	Wed Apr 18 03:46:26 2007
-@@ -88,7 +88,7 @@ oslFileError SAL_CALL osl_getTempDirURL( rtl_uString**
-     if ( !pValue )
- 	{
-         pValue = getenv( "TMP" );
-#if defined(SOLARIS) || defined (LINUX) || defined (FREEBSD)
-+#if defined(SOLARIS) || defined (LINUX) || defined (FREEBSD) || defined (OPENBSD)
- 		if ( !pValue )
- 			pValue = P_tmpdir;
- #endif
--- a/editors/openoffice/patches/patch-sal_osl_unx_thread_c
+++ b/editors/openoffice/patches/patch-sal_osl_unx_thread_c
@ -1,51 +0,0 @@
-$OpenBSD: patch-sal_osl_unx_thread_c,v 1.4 2007/04/18 13:20:48 kurt Exp $
--- sal/osl/unx/thread.c.orig.port	Thu Jul  6 10:42:32 2006
-+++ sal/osl/unx/thread.c	Wed Apr 18 03:46:26 2007
-@@ -35,6 +35,7 @@
- 
- #include "system.h"
- #include <string.h>
-+#include <sched.h>
- 
- #ifndef _OSL_DIAGNOSE_H_
- #include <osl/diagnose.h>
-@@ -294,6 +295,7 @@ static oslThread osl_thread_create_Impl (
- {
- 	Thread_Impl* pImpl;
-     int nRet=0;
-+    pthread_attr_t attr;
- 
- 	pImpl = osl_thread_construct_Impl();
-     if (!pImpl)
-@@ -305,9 +307,17 @@ static oslThread osl_thread_create_Impl (
- 
-     pthread_mutex_lock (&(pImpl->m_Lock));
- 
-+	if (pthread_attr_init(&attr) != 0)
-+		return (0);
-+
-+	if (pthread_attr_setstacksize(&attr, 262144) != 0) {
-+		pthread_attr_destroy(&attr);
-+		return(0);
-+	}
-+
- 	if ((nRet = pthread_create (
- 		&(pImpl->m_hThread),
-		PTHREAD_ATTR_DEFAULT,
-+		&attr,
- 		osl_thread_start_Impl,
- 		(void*)(pImpl))) != 0)
- 	{
-@@ -316,9 +326,11 @@ static oslThread osl_thread_create_Impl (
- 
- 		pthread_mutex_unlock (&(pImpl->m_Lock));
- 		osl_thread_destruct_Impl (&pImpl);
-
-+		pthread_attr_destroy(&attr);
- 		return (0);
- 	}
-+
-+	pthread_attr_destroy(&attr);
- 
- 	/* wait for change from STARTUP to ACTIVE state */
- 	while (pImpl->m_Flags & THREADIMPL_FLAGS_STARTUP)
--- a/editors/openoffice/patches/patch-sal_osl_unx_time_c
+++ b/editors/openoffice/patches/patch-sal_osl_unx_time_c
@ -1,12 +0,0 @@
-$OpenBSD: patch-sal_osl_unx_time_c,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- sal/osl/unx/time.c.orig.port	Thu Sep  8 11:02:55 2005
-+++ sal/osl/unx/time.c	Fri Aug 18 15:47:44 2006
-@@ -40,7 +40,7 @@
- #include <osl/time.h>
- 
- /* FIXME: detection should be done in configure script */
-#if defined(MACOSX) || defined(FREEBSD) || defined(NETBSD) || defined(LINUX)
-+#if defined(MACOSX) || defined(FREEBSD) || defined(NETBSD) || defined(LINUX) || defined(OPENBSD)
- #define STRUCT_TM_HAS_GMTOFF 1
- 
- #elif defined(SOLARIS)
--- a/editors/openoffice/patches/patch-sal_rtl_source_alloc_c
+++ b/editors/openoffice/patches/patch-sal_rtl_source_alloc_c
@ -1,12 +0,0 @@
-$OpenBSD: patch-sal_rtl_source_alloc_c,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- sal/rtl/source/alloc.c.orig.port	Tue Jun 20 00:28:13 2006
-+++ sal/rtl/source/alloc.c	Fri Aug 18 15:47:44 2006
-@@ -85,7 +85,7 @@ typedef pthread_mutex_t mutex_type;
- #define RTL_MUTEX_ACQUIRE(a)  pthread_mutex_lock((a))
- #define RTL_MUTEX_RELEASE(a)  pthread_mutex_unlock((a))
- 
-#if   defined(FREEBSD) || defined(NETBSD) || defined(MACOSX)
-+#if   defined(FREEBSD) || defined(NETBSD) || defined(MACOSX) || defined (OPENBSD)
- static sal_Size __rtl_memory_vmpagesize (void)
- {
- 	/* xBSD */
--- a/editors/openoffice/patches/patch-sal_rtl_source_macro_hxx
+++ b/editors/openoffice/patches/patch-sal_rtl_source_macro_hxx
@ -1,12 +0,0 @@
-$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"
-+#elif defined OPENBSD
-+#define THIS_OS "OpenBSD"
- #endif
- 
- #if ! defined THIS_OS
--- a/editors/openoffice/patches/patch-sal_typesconfig_typesconfig_c
+++ b/editors/openoffice/patches/patch-sal_typesconfig_typesconfig_c
@ -1,20 +0,0 @@
-$OpenBSD: patch-sal_typesconfig_typesconfig_c,v 1.1 2006/10/25 22:49:50 kurt Exp $
--- sal/typesconfig/typesconfig.c.orig.port	Thu Sep  8 12:49:50 2005
-+++ sal/typesconfig/typesconfig.c	Tue Oct 24 17:12:30 2006
-@@ -167,6 +167,16 @@ void SignalHdl( int sig )
- int check( TestFunc func, Type eT, void* p )
- {
- #ifdef USE_FORK_TO_CHECK
-+
-+#ifdef OPENBSD
-+  /* avoid generating a core file (probably for other OS too?! */
-+#include <sys/types.h>
-+#include <sys/time.h>
-+#include <sys/resource.h>
-+  struct rlimit rl;
-+  memset(&rl, 0, sizeof(rl));
-+  setrlimit(RLIMIT_CORE, &rl);
-+#endif
-   pid_t nChild = fork();
-   if ( nChild )
-   {
--- a/editors/openoffice/patches/patch-sal_workben_makefile_mk
+++ b/editors/openoffice/patches/patch-sal_workben_makefile_mk
@ -1,12 +0,0 @@
-$OpenBSD: patch-sal_workben_makefile_mk,v 1.3 2007/11/13 09:46:28 robert Exp $
--- sal/workben/makefile.mk.orig.port	Mon Mar 26 16:27:56 2007
-+++ sal/workben/makefile.mk	Thu Oct 25 16:23:47 2007
-@@ -355,7 +355,7 @@ APP4DEPN=	$(SLB)$/sal.lib
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
-.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" || "$(OS)"=="OPENBSD"
- 
- CXXFILES=	tgetpwnam.cxx
- OBJFILES=	$(OBJ)$/tgetpwnam.obj
--- 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,48 +0,0 @@
-$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";
-+  #elif defined (OPENBSD)
-+    Name = "libfreetype.so";
-   #else
-     Name = "libfreetype.so.6";
-   #endif
-@@ -979,7 +981,7 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Fwl , fwl)
- 
- STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Fwm , fwm)
- 
-#if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT))
-+#if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT) || defined(OPENBSD))
- #if defined( _gcc3 )
- 
- File gid_File_Lib_Gcc
-@@ -993,7 +995,7 @@ End
- 
- #endif
- 
-#if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT))
-+#if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT) || defined(OPENBSD))
- #if defined( _gcc3 )
- 
- File gid_File_Lib_Stdc
-@@ -2066,7 +2068,7 @@ File gid_File_Lib_Stlport
-   #ifdef _STLP_DEBUG
-   #ifdef UNX
-   #if defined(_gcc3) || defined(_GCC)
-  #ifdef IRIX
-+  #if defined(IRIX) || defined(OPENBSD)
-     Name = STRING(CONCAT3(libstlport_,gcc_stldebug,.so.4.5));
-   #else
-     Name = STRING(CONCAT3(libstlport_,gcc_stldebug,UNXSUFFIX));
-@@ -2090,7 +2092,7 @@ File gid_File_Lib_Stlport
-   #else
-   #ifdef UNX
-   #if defined(_gcc3) || defined(_GCC)
-  #ifdef IRIX
-+  #if defined(IRIX) || defined(OPENBSD)
-     Name = STRING(CONCAT3(libstlport_,gcc,.so.4.5));
-   #else
-     Name = STRING(CONCAT3(libstlport_,gcc,UNXSUFFIX));
--- a/editors/openoffice/patches/patch-scp2_source_ure_ure_scp
+++ b/editors/openoffice/patches/patch-scp2_source_ure_ure_scp
@ -1,20 +0,0 @@
--- 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 MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(OPENBSD))
- File gid_File_Dl_GccS
-     TXT_FILE_BODY;
-     Dir = SCP2_URE_DL_DIR;
-@@ -586,7 +586,7 @@ End
- #endif
- 
- #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
-     Dir = SCP2_URE_DL_DIR;
-     TXT_FILE_BODY;
--- a/editors/openoffice/patches/patch-sdk_oo_util_makefile_pmk
+++ b/editors/openoffice/patches/patch-sdk_oo_util_makefile_pmk
@ -1,26 +0,0 @@
-$OpenBSD: patch-sdk_oo_util_makefile_pmk,v 1.5 2007/03/17 15:27:45 robert Exp $
--- sdk_oo/util/makefile.pmk.orig.port	Wed Jan 17 07:49:34 2007
-+++ sdk_oo/util/makefile.pmk	Tue Feb  6 23:13:34 2007
-@@ -56,8 +56,8 @@ ODKZIPPATH=$(SOLARBINDIR)
- BINOUT=$(SOLARBINDIR)
- IDLOUT=$(SOLARIDLDIR)
- 
-MY_COPY=$(GNUCOPY) -u
-MY_COPY_RECURSIVE=$(GNUCOPY) -urf
-+MY_COPY=$(GNUCOPY)
-+MY_COPY_RECURSIVE=$(GNUCOPY) -rf
- 
- CONVERTTAGSCRIPT=$(SOLARENV)$/bin$/converttags.pl
- 
-@@ -131,6 +131,11 @@ DESTPLATFROM=irix
- # MACOSX
- ###########
- DESTPLATFROM=macosx
-+.ELIF "$(OS)"=="OPENBSD"
-+###################
-+# OPENBSD
-+###################
-+DESTPLATFROM=openbsd
- .ENDIF
- 
- DESTDIRBIN=$(DESTDIR)$/$(DESTPLATFROM)$/bin
--- a/editors/openoffice/patches/patch-setup_native_source_packinfo_packinfo_office_lang_txt
+++ b/editors/openoffice/patches/patch-setup_native_source_packinfo_packinfo_office_lang_txt
@ -1,37 +0,0 @@
-$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"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -43,7 +43,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Language fonts module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -58,7 +58,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Language resource module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -73,5 +73,5 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Language help module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
--- a/editors/openoffice/patches/patch-setup_native_source_packinfo_packinfo_office_txt
+++ b/editors/openoffice/patches/patch-setup_native_source_packinfo_packinfo_office_txt
@ -1,262 +0,0 @@
-$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"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -44,7 +44,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "KDE integration module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -59,7 +59,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -75,7 +75,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Writer module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -91,7 +91,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Calc module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -107,7 +107,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Draw module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -123,7 +123,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Impress module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -139,7 +139,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Base module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -155,7 +155,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Math module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -170,7 +170,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Graphic filter module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -185,7 +185,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Testtool module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -200,7 +200,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "English spellchecker module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -215,7 +215,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "XSLT filter samples module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -230,7 +230,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Java filter module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -245,7 +245,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "ActiveX control for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -258,7 +258,7 @@ copyright = "1999-2005 by Sun Microsystems"
- solariscopyright = "solariscopyrightfile"
- vendor = "Sun Microsystems, Inc."
- description = "Online update modul for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -273,7 +273,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Pyuno module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -288,7 +288,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Email mailmerge module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -303,7 +303,7 @@ copyright = "1999-2007 by OpenOffice.org"
- solariscopyright = "solariscopyrightfile"
- vendor = "OpenOffice.org"
- description = "Headless display module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -318,7 +318,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Mailcap module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -334,7 +334,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -349,7 +349,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -364,7 +364,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -379,7 +379,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -394,7 +394,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -409,7 +409,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -424,7 +424,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -439,7 +439,7 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
- 
- Start
-@@ -455,5 +455,5 @@ copyright = "1999-2007 by %PRODUCTNAME"
- solariscopyright = "solariscopyrightfile"
- vendor = "%PRODUCTNAME"
- description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+destpath = "openoffice"
- End
--- a/editors/openoffice/patches/patch-shell_source_backends_localebe_localebackend_cxx
+++ b/editors/openoffice/patches/patch-shell_source_backends_localebe_localebackend_cxx
@ -1,29 +0,0 @@
--- 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) || defined(OS2)
-+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OS2) || defined(OPENBSD)
- 
- #include <rtl/ustrbuf.hxx>
- #include <locale.h>
-@@ -270,7 +270,7 @@ LocaleBackend* LocaleBackend::createInstance(
- 
- rtl::OUString LocaleBackend::getLocale(void)
- {
-#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");
-@@ -283,7 +283,7 @@ rtl::OUString LocaleBackend::getLocale(void)
- 
- rtl::OUString LocaleBackend::getUILocale(void)
- {
-#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_misc_gnome-open-url_c
+++ b/editors/openoffice/patches/patch-shell_source_unix_misc_gnome-open-url_c
@ -1,21 +0,0 @@
-$OpenBSD: patch-shell_source_unix_misc_gnome-open-url_c,v 1.2 2007/04/18 13:20:48 kurt Exp $
--- shell/source/unix/misc/gnome-open-url.c.orig.port	Mon Jun 19 10:19:56 2006
-+++ shell/source/unix/misc/gnome-open-url.c	Wed Apr 18 03:46:27 2007
-@@ -61,7 +61,7 @@ typedef enum {
-  
- gchar* gnome_gconf_get_gnome_libs_settings_relative (const gchar *subkey)
- {
-    void* handle = dlopen("libglib-2.0.so.0", RTLD_LAZY);
-+    void* handle = dlopen("libglib-2.0.so", RTLD_LAZY);
-     
-     (void)subkey; /* avoid warning due to unused parameter */
- 
-@@ -82,7 +82,7 @@ gchar* gnome_gconf_get_gnome_libs_settings_relative (c
- 
- gboolean gnome_url_show (const char *url, GError **error)
- {
-    void* handle = dlopen("libgnomevfs-2.so.0", RTLD_LAZY);
-+    void* handle = dlopen("libgnomevfs-2.so", RTLD_LAZY);
-     gboolean ret = 0;
- 
-     (void)error; /* avoid warning due to unused parameter */
--- a/editors/openoffice/patches/patch-shell_source_unix_misc_makefile_mk
+++ b/editors/openoffice/patches/patch-shell_source_unix_misc_makefile_mk
@ -1,12 +0,0 @@
-$OpenBSD: patch-shell_source_unix_misc_makefile_mk,v 1.3 2006/10/19 15:16:50 kurt Exp $
--- shell/source/unix/misc/makefile.mk.orig.port	Tue Aug  1 07:26:32 2006
-+++ shell/source/unix/misc/makefile.mk	Thu Oct 19 10:47:54 2006
-@@ -59,7 +59,7 @@ APP1TARGET = gnome-open-url.bin
- APP1OBJS = \
- 	$(OBJ)$/gnome-open-url.obj
- APP1LIBS =
-.IF "$(OS)"!="FREEBSD"
-+.IF "$(OS)"!="OPENBSD"
- APP1STDLIBS=-ldl
- .ENDIF
- 
--- a/editors/openoffice/patches/patch-shell_source_unix_sysshell_makefile_mk
+++ b/editors/openoffice/patches/patch-shell_source_unix_sysshell_makefile_mk
@ -1,23 +0,0 @@
-$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
- 
-+.IF "$(ENABLE_GTK)" != ""
-+PKGCONFIG_MODULES=gtk+-2.0
-+.INCLUDE: pkg_config.mk
-+.ENDIF
-+
- # --- Files --------------------------------------------------------
- 
- LIB1OBJFILES=$(SLO)$/systemshell.obj
-@@ -80,6 +85,7 @@ SHL1STDLIBS=$(EXPATASCII3RDLIB)\
- 	$(CPPULIB)\
- 	$(CPPUHELPERLIB)\
- 	$(COMPHELPERLIB)
-+SHL1STDLIBS+=$(PKGCONFIG_LIBS:s/ -lpangoxft-1.0//)
- .ENDIF # MACOSX
- 
- SHL1LIBS=$(SLB)$/xmlparser.lib
--- a/editors/openoffice/patches/patch-shell_source_unix_sysshell_recently_used_file_handler_cxx
+++ b/editors/openoffice/patches/patch-shell_source_unix_sysshell_recently_used_file_handler_cxx
@ -1,517 +0,0 @@
-$OpenBSD: patch-shell_source_unix_sysshell_recently_used_file_handler_cxx,v 1.2 2007/11/13 09:46:28 robert Exp $
--- shell/source/unix/sysshell/recently_used_file_handler.cxx.orig.port	Tue Jun 19 18:12:29 2007
-+++ shell/source/unix/sysshell/recently_used_file_handler.cxx	Fri Oct 26 15:51:03 2007
-@@ -69,508 +69,12 @@
- #include <vector>
- #include <algorithm>
- #include <functional>
-+#include <gtk/gtk.h>
- 
-namespace /* private */ {
-    
-    const rtl::OUString ENVV_UPDATE_RECENTLY_USED = 
-        rtl::OUString::createFromAscii("ENABLE_UPDATE_RECENTLY_USED");
-    
-    //########################################   
-    inline rtl::OString get_file_extension(const rtl::OString& file_url)
-    {
-        sal_Int32 index = file_url.lastIndexOf('.');
-        OSL_ENSURE((index != -1) && ((index + 1) < file_url.getLength()), "Invalid file url");
-        return file_url.copy(index + 1);        
-    }
-        
-    //########################################   
-    typedef std::vector<string_t> string_container_t;
-	
-    #define TAG_RECENT_FILES "RecentFiles"
-    #define TAG_RECENT_ITEM  "RecentItem"
-    #define TAG_URI          "URI"
-    #define TAG_MIME_TYPE    "Mime-Type"
-    #define TAG_TIMESTAMP    "Timestamp"
-    #define TAG_PRIVATE      "Private"
-    #define TAG_GROUPS       "Groups"
-    #define TAG_GROUP        "Group"
-    
-    //------------------------------------------------    
-    // compare two string_t's case insensitive, may also be done
-    // by specifying special traits for the string type but in this
-    // case it's easier to do it this way
-    struct str_icase_cmp : 
-        public std::binary_function<string_t, string_t, bool>
-    {
-        bool operator() (const string_t& s1, const string_t& s2) const
-        { return (0 == strcasecmp(s1.c_str(), s2.c_str())); }
-    };
-    
-    //------------------------------------------------    
-    struct recently_used_item
-    {
-        recently_used_item() :
-            is_private_(false)
-        {}
-	
-        recently_used_item(
-            const string_t& uri,
-            const string_t& mime_type,            
-            const string_container_t& groups,
-            bool is_private = false) :
-            uri_(uri),
-            mime_type_(mime_type),
-            is_private_(is_private),
-            groups_(groups)
-        {
-            timestamp_ = time(NULL);
-        }
-    
-        void set_uri(const string_t& character)
-        { uri_ = character; }
-    
-        void set_mime_type(const string_t& character)
-        { mime_type_ = character; }
-    
-        void set_timestamp(const string_t& character)
-        { 
-            time_t t;
-            if (sscanf(character.c_str(), "%ld", &t) != 1)
-                timestamp_ = -1; 
-            else
-                timestamp_ = t;
-        }
-    
-        void set_is_private(const string_t& /*character*/)
-        { is_private_ = true; }
-    
-        void set_groups(const string_t& character)
-        { groups_.push_back(character); }
-+#include <stdio.h>
- 
-        void set_nothing(const string_t& /*character*/)
-        {}
-		
-        bool has_groups() const
-        {
-            return !groups_.empty();
-        }
-        
-        bool has_group(const string_t& name) const 
-        {
-            string_container_t::const_iterator iter_end = groups_.end();
-            return (has_groups() && 
-                    iter_end != std::find_if(
-                        groups_.begin(), iter_end, 
-                        std::bind2nd(str_icase_cmp(), name)));
-        }
-        
-        void write_xml(const recently_used_file& file) const
-        {
-            write_xml_start_tag(TAG_RECENT_ITEM, file, true);
-            write_xml_tag(TAG_URI, uri_, file);
-            write_xml_tag(TAG_MIME_TYPE, mime_type_, file);
-                                
-            rtl::OString ts = rtl::OString::valueOf((sal_sSize)timestamp_);            
-            write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-                        
-            if (is_private_)            
-                write_xml_tag(TAG_PRIVATE, file);                               
-            
-            if (has_groups())
-            {
-                write_xml_start_tag(TAG_GROUPS, file, true);
-                                
-                string_container_t::const_iterator iter = groups_.begin();
-                string_container_t::const_iterator iter_end = groups_.end();
-                
-                for ( ; iter != iter_end; ++iter)                
-                    write_xml_tag(TAG_GROUP, (*iter), file);                    
-                
-                write_xml_end_tag(TAG_GROUPS, file);                
-            }            
-            write_xml_end_tag(TAG_RECENT_ITEM, file);            
-        }
-        
-        static rtl::OString escape_content(const string_t &text)
-        {
-            rtl::OStringBuffer aBuf;
-            for (sal_uInt32 i = 0; i < text.length(); i++)
-            {
-#               define MAP(a,b) case a: aBuf.append(b); break
-                switch (text[i])
-                {
-                    MAP ('&',  "&amp;");
-                    MAP ('<',  "&lt;");
-                    MAP ('>',  "&gt;");
-                    MAP ('\'', "&apos;");
-                    MAP ('"',  "&quot;");
-                default:
-                    aBuf.append(text[i]);
-                    break;
-                }
-#               undef MAP
-            }
-            return aBuf.makeStringAndClear();
-        }
-        
-        void write_xml_tag(const string_t& name, const string_t& value, const recently_used_file& file) const
-        {            
-            write_xml_start_tag(name, file);
-            rtl::OString escaped = escape_content (value);
-            file.write(escaped.getStr(), escaped.getLength());
-            write_xml_end_tag(name, file);
-        }
-        
-        void write_xml_tag(const string_t& name, const recently_used_file& file) const 
-        {            
-            file.write("<", 1);
-            file.write(name.c_str(), name.length());
-            file.write("/>\n", 3);            
-        }
-        
-        void write_xml_start_tag(const string_t& name, const recently_used_file& file, bool linefeed = false) const 
-        {
-            file.write("<", 1);
-            file.write(name.c_str(), name.length());
-            if (linefeed) 
-                file.write(">\n", 2);
-            else
-                file.write(">", 1);
-        }
-        
-        void write_xml_end_tag(const string_t& name, const recently_used_file& file) const 
-        {
-            file.write("</", 2);
-            file.write(name.c_str(), name.length());
-            file.write(">\n", 2);         
-        }
-        
-        string_t uri_;
-        string_t mime_type_;
-        time_t timestamp_;
-        bool is_private_;
-        string_container_t groups_;
-    };
-	
-    typedef std::vector<recently_used_item*> recently_used_item_list_t;    
-    typedef void (recently_used_item::* SET_COMMAND)(const string_t&);
-
-    //########################################   
-    // thrown if we encounter xml tags that we do not know
-    class unknown_xml_format_exception {};
-    // thrown if we encounter an end tag without matching start tag
-    class end_tag_without_start_tag_exception {};
-
-    //########################################   
-    class recently_used_file_filter : public i_xml_parser_event_handler
-    {
-    public:	
-        recently_used_file_filter(recently_used_item_list_t& item_list) : 
-            item_(NULL),
-            item_list_(item_list)
-        {
-            named_command_map_[TAG_RECENT_FILES] = &recently_used_item::set_nothing;
-            named_command_map_[TAG_RECENT_ITEM]  = &recently_used_item::set_nothing;
-            named_command_map_[TAG_URI]          = &recently_used_item::set_uri;
-            named_command_map_[TAG_MIME_TYPE]    = &recently_used_item::set_mime_type;
-            named_command_map_[TAG_TIMESTAMP]    = &recently_used_item::set_timestamp;
-            named_command_map_[TAG_PRIVATE]      = &recently_used_item::set_is_private;
-            named_command_map_[TAG_GROUPS]       = &recently_used_item::set_nothing;
-            named_command_map_[TAG_GROUP]        = &recently_used_item::set_groups;
-        }
-            
-        virtual void start_element(
-            const string_t& /*raw_name*/, 
-            const string_t& local_name, 
-            const xml_tag_attribute_container_t& /*attributes*/)
-        {
-            if ((local_name == TAG_RECENT_ITEM) && (NULL == item_))                            
-                item_ = new recently_used_item;            
-        }
-
-        virtual void end_element(const string_t& /*raw_name*/, const string_t& local_name)
-        {
-            if( local_name != TAG_RECENT_FILES && NULL == item_ )
-                throw end_tag_without_start_tag_exception();
-            
-            if (named_command_map_.find(local_name) != named_command_map_.end())
-                (item_->*named_command_map_[local_name])(current_element_);
-            else
-            {
-                delete item_;
-                throw unknown_xml_format_exception();
-            }
-        
-            if (local_name == TAG_RECENT_ITEM)
-            {
-                item_list_.push_back(item_);
-                item_ = NULL;
-            }
-            current_element_.clear();
-        }
-
-        virtual void characters(const string_t& character)
-        {
-            if (character != "\n")
-                current_element_ += character;        
-        }
-    
-        virtual void start_document() {}        
-        virtual void end_document()   {}
- 
-        virtual void ignore_whitespace(const string_t& /*whitespaces*/)
-        {}  
-        
-        virtual void processing_instruction(
-            const string_t& /*target*/, const string_t& /*data*/)
-        {}
-        
-        virtual void comment(const string_t& /*comment*/)
-        {}        
-    private:
-        recently_used_item* item_;
-        std::map<string_t, SET_COMMAND> named_command_map_;
-        string_t current_element_;
-        recently_used_item_list_t& item_list_;
-    private:
-        recently_used_file_filter(const recently_used_file_filter&);
-        recently_used_file_filter& operator=(const recently_used_file_filter&);
-    };
-
-    //------------------------------------------------        
-    void read_recently_used_items(
-        recently_used_file& file, 
-        recently_used_item_list_t& item_list)
-    {
-        xml_parser xparser;	
-        recently_used_file_filter ruff(item_list);
-        
-        xparser.set_document_handler(&ruff);
-		                
-        char buff[16384];			
-		while (!file.eof())
-		{
-        	if (size_t length = file.read(buff, sizeof(buff)))            
-                xparser.parse(buff, length, file.eof());                
-		}
-    }
-    
-    //------------------------------------------------    
-    // The file ~/.recently_used shall not contain more than 500
-    // entries (see www.freedesktop.org)
-    const int MAX_RECENTLY_USED_ITEMS = 500;
-        
-    class recent_item_writer
-    {
-    public:
-        recent_item_writer(
-            recently_used_file& file, 
-            int max_items_to_write = MAX_RECENTLY_USED_ITEMS) :
-            file_(file),
-            max_items_to_write_(max_items_to_write),
-            items_written_(0)
-        {}
-        
-        void operator() (const recently_used_item* item)
-        {
-            if (items_written_++ < max_items_to_write_)
-                item->write_xml(file_);
-        }
-    private:
-        recently_used_file& file_;
-        int max_items_to_write_;
-        int items_written_;
-    };
-    
-    //------------------------------------------------    
-    const char* XML_HEADER = "<?xml version=\"1.0\"?>\n<RecentFiles>\n";
-    const char* XML_FOOTER = "</RecentFiles>";
-    
-    //------------------------------------------------    
-    // assumes that the list is ordered decreasing
-    void write_recently_used_items(
-        recently_used_file& file,
-        recently_used_item_list_t& item_list)
-    {        
-        if (!item_list.empty())
-        {
-            file.truncate();
-            file.reset();
-        
-            file.write(XML_HEADER, strlen(XML_HEADER));
-                
-            std::for_each(
-                item_list.begin(), 
-                item_list.end(), 
-                recent_item_writer(file));
-        
-            file.write(XML_FOOTER, strlen(XML_FOOTER));
-        }
-    }
-    
-    //------------------------------------------------    
-    struct delete_recently_used_item
-	{	
-		void operator() (const recently_used_item* item) const
-		{ delete item; }
-	};
-    
-    //------------------------------------------------    
-    void recently_used_item_list_clear(recently_used_item_list_t& item_list)
-    {
-        std::for_each(
-            item_list.begin(), 
-			item_list.end(), 
-			delete_recently_used_item());            
-		item_list.clear();
-    }
-        
-    //------------------------------------------------    
-    class find_item_predicate
-    {
-    public:
-        find_item_predicate(const string_t& uri) :
-            uri_(uri) 
-        {}
-            
-        bool operator() (const recently_used_item* item)
-        { return (item->uri_ == uri_); }        
-    private:
-        string_t uri_;
-    };
-    
-    //------------------------------------------------    
-    struct greater_recently_used_item
-    {
-        bool operator ()(const recently_used_item* lhs, const recently_used_item* rhs) const
-        { return (lhs->timestamp_ > rhs->timestamp_); }
-    };
-    
-    //------------------------------------------------
-    const char* GROUP_OOO         = "openoffice.org";
-    const char* GROUP_STAR_OFFICE = "staroffice";
-    const char* GROUP_STAR_SUITE  = "starsuite";
-    
-    //------------------------------------------------    
-    void recently_used_item_list_add(
-        recently_used_item_list_t& item_list, const rtl::OUString& file_url, const rtl::OUString& mime_type)
-    {
-        rtl::OString f = rtl::OUStringToOString(file_url, RTL_TEXTENCODING_UTF8);
-        
-        recently_used_item_list_t::iterator iter = 
-            std::find_if(
-                item_list.begin(), 
-                item_list.end(), 
-                find_item_predicate(f.getStr()));    
-        
-        if (iter != item_list.end())
-        {           
-            (*iter)->timestamp_ = time(NULL);
-            
-            if (!(*iter)->has_group(GROUP_OOO)) 
-                (*iter)->groups_.push_back(GROUP_OOO);
-            if (!(*iter)->has_group(GROUP_STAR_OFFICE))
-                (*iter)->groups_.push_back(GROUP_STAR_OFFICE);
-            if (!(*iter)->has_group(GROUP_STAR_SUITE))
-                (*iter)->groups_.push_back(GROUP_STAR_SUITE);
-        }
-        else
-        {
-            string_container_t groups;
-            groups.push_back(GROUP_OOO);
-            groups.push_back(GROUP_STAR_OFFICE);
-            groups.push_back(GROUP_STAR_SUITE);
-            
-            string_t uri(f.getStr());
-            string_t mimetype(rtl::OUStringToOString(mime_type, osl_getThreadTextEncoding()).getStr());                                    
-            
-            if (mimetype.length() == 0)
-                mimetype = "application/octet-stream";
-            
-            item_list.push_back(new recently_used_item(uri, mimetype, groups));
-        }
-        
-        // sort decreasing after the timestamp 
-        // so that the newest items appear first
-        std::sort(
-            item_list.begin(), 
-            item_list.end(), 
-            greater_recently_used_item());
-    }
-    
-    //##############################
-    bool update_recently_used_enabled()
-    {
-        rtl::OUString tmp;        
-        osl_getEnvironment(ENVV_UPDATE_RECENTLY_USED.pData, &tmp.pData);
-		return (tmp.getLength() > 0);
-    }
-
-    //------------------------------------------------
-    struct cleanup_guard
-    {    
-        cleanup_guard(recently_used_item_list_t& item_list) :
-            item_list_(item_list)
-        {}
-        ~cleanup_guard()
-        { recently_used_item_list_clear(item_list_); }
-    
-        recently_used_item_list_t& item_list_;
-    };
-        
-} // namespace private
-
-//###########################################
-/*
-   example (see http::www.freedesktop.org):
-    <?xml version="1.0"?>
-                <RecentFiles>
-                     <RecentItem>
-                        <URI>file:///home/federico/gedit.txt</URI>
-                        <Mime-Type>text/plain</Mime-Type>
-                        <Timestamp>1046485966</Timestamp>
-                        <Groups>
-                            <Group>gedit</Group>
-                        </Groups>
-                    </RecentItem>
-                    <RecentItem>
-                        <URI>file:///home/federico/gedit-2.2.0.tar.bz2</URI>
-                        <Mime-Type>application/x-bzip</Mime-Type>
-                        <Timestamp>1046209851</Timestamp>
-                        <Private/>
-                        <Groups>
-                        </Groups>
-                    </RecentItem>
-                </RecentFiles>
-*/
-
-extern "C" void add_to_recently_used_file_list(const rtl::OUString& file_url, const rtl::OUString& mime_type)
-+extern "C" void add_to_recently_used_file_list(const rtl::OUString& file_url, const rtl::OUString& )
- {
-    try
-    {
-        recently_used_file ruf;			
-        recently_used_item_list_t item_list;
-        cleanup_guard guard(item_list);	
-	
-        read_recently_used_items(ruf, item_list);	
-        recently_used_item_list_add(item_list, file_url, mime_type);
-        write_recently_used_items(ruf, item_list);                                
-    }
-    catch(const char* ex)
-    {
-        OSL_ENSURE(false, ex);
-    }
-    catch(const xml_parser_exception&)
-	{
-        OSL_ENSURE(false, "XML parser error");
-    }		            
-    catch(const unknown_xml_format_exception&)
-    {
-        OSL_ENSURE(false, "XML format unknown");
-    }        
-    catch(const end_tag_without_start_tag_exception&)
-    {
-        OSL_ENSURE(false, "XML file damaged");
-    }
-+	GtkRecentManager* recentmanager = gtk_recent_manager_get_default();
-+	gtk_recent_manager_add_item(recentmanager, rtl::OUStringToOString(file_url, RTL_TEXTENCODING_UTF8).getStr());
- }
-    
--- a/editors/openoffice/patches/patch-solenv_bin_mapgen_pl
+++ b/editors/openoffice/patches/patch-solenv_bin_mapgen_pl
@ -1,13 +0,0 @@
-$OpenBSD: patch-solenv_bin_mapgen_pl,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- solenv/bin/mapgen.pl.orig.port	Wed Sep  7 18:10:44 2005
-+++ solenv/bin/mapgen.pl	Fri Aug 18 15:47:45 2006
-@@ -143,7 +143,8 @@ sub filter_symbols {
- 		$env_section = '1' and next if ((/^# SOLARIS #$/) && ($ENV{OS} eq 'SOLARIS'));
- 		$env_section = '1' and next if ((/^# LINUX #$/) && ($ENV{OS} eq 'LINUX'));
- 		$env_section = '1' and next if ((/^# FREEBSD #$/) && ($ENV{OS} eq 'FREEBSD'));
-		last if ($env_section && ((/^# SOLARIS #$/) || (/^# FREEBSD #$/) || (/^# LINUX #$/)));
-+		$env_section = '1' and next if ((/^# OPENBSD #$/) && ($ENV{OS} eq 'OPENBSD'));
-+		last if ($env_section && ((/^# SOLARIS #$/) || (/^# FREEBSD #$/) || (/^# OPENBSD #$/) || (/^# LINUX #$/)));
- 		next if (!$_ || /^#/);
- 		push(@filters, $_);
- 	};
--- a/editors/openoffice/patches/patch-solenv_bin_modules_installer_download_pm
+++ b/editors/openoffice/patches/patch-solenv_bin_modules_installer_download_pm
@ -1,27 +0,0 @@
-$OpenBSD: patch-solenv_bin_modules_installer_download_pm,v 1.1 2006/10/25 22:49:50 kurt Exp $
--- solenv/bin/modules/installer/download.pm.orig.port	Wed Oct 25 15:22:15 2006
-+++ solenv/bin/modules/installer/download.pm	Wed Oct 25 15:25:19 2006
-@@ -145,7 +145,7 @@ sub put_checksum_and_size_into_script
- 	}
- 	else
- 	{
-		installer::exiter::exit_program("ERROR: Incorrect return value from /usr/bin/sum: $sumout", "put_checksum_and_size_into_script");
-+		installer::exiter::exit_program("ERROR: Incorrect return value from sum: $sumout", "put_checksum_and_size_into_script");
- 	}
- 
- 	my $infoline = "Adding checksum $checksum and size $size into download shell script\n";
-@@ -233,12 +233,12 @@ sub call_sum
- 
- #	my $ownerstring = "";
- #	if ( $installer::globals::islinuxrpmbuild ) { $ownerstring = "--owner=0"; }
-#	my $systemcall = "cd $installdir; tar $ownerstring -cf - * | /usr/bin/sum |";
-+#	my $systemcall = "cd $installdir; tar $ownerstring -cf - * | sum |";
- 
- 	my $ldpreloadstring = "";
- 	if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" . $getuidlibrary; }
- 
-	my $systemcall = "cd $installdir; $ldpreloadstring tar -cf - * | /usr/bin/sum |";
-+	my $systemcall = "cd $installdir; $ldpreloadstring tar -cf - * | sum |";
- 	
- 	my $sumoutput = "";
- 
--- a/editors/openoffice/patches/patch-solenv_bin_modules_installer_globals_pm
+++ b/editors/openoffice/patches/patch-solenv_bin_modules_installer_globals_pm
@ -1,12 +0,0 @@
-$OpenBSD: patch-solenv_bin_modules_installer_globals_pm,v 1.7 2008/06/13 17:04:57 robert Exp $
--- solenv/bin/modules/installer/globals.pm.orig.port	Mon May 19 09:03:46 2008
-+++ solenv/bin/modules/installer/globals.pm	Thu Jun 12 11:08:30 2008
-@@ -162,7 +162,7 @@ BEGIN
- 	$jdklib = "";
- 	$jrepath = "";
- 	
-	$globallogging = 0;
-+	$globallogging = 1;
- 	$logfilename = "logfile.log";	# the default logfile name for global errors
- 	@logfileinfo = ();
- 	@errorlogfileinfo = ();
--- a/editors/openoffice/patches/patch-solenv_bin_modules_installer_regmerge_pm
+++ b/editors/openoffice/patches/patch-solenv_bin_modules_installer_regmerge_pm
@ -1,17 +0,0 @@
-$OpenBSD: patch-solenv_bin_modules_installer_regmerge_pm,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- solenv/bin/modules/installer/regmerge.pm.orig.port	Thu Sep  8 05:09:09 2005
-+++ solenv/bin/modules/installer/regmerge.pm	Fri Aug 18 15:47:45 2006
-@@ -219,7 +219,13 @@ sub merge_files
- 	my $databasename = $databasefile->{'Name'};
- 	my $databasedest = $databasedir . $installer::globals::separator . $databasename;
- 
-+	my $logline = "copy_one_file $databasesource $databasedest\n";
-+	push( @installer::globals::logfileinfo, $logline);
-+
- 	installer::systemactions::copy_one_file($databasesource, $databasedest);	
-+	$logline = "copy_one_file done\n";
-+	push( @installer::globals::logfileinfo, $logline);
-+
- 	$databasefile->{'sourcepath'} = $databasedest;	# new sourcepath for the StarRegistry file
- 
- 	# One call for every merge particle. This is only possible, if there are only a few merge particles.
--- a/editors/openoffice/patches/patch-solenv_bin_modules_installer_worker_pm
+++ b/editors/openoffice/patches/patch-solenv_bin_modules_installer_worker_pm
@ -1,12 +0,0 @@
-$OpenBSD: patch-solenv_bin_modules_installer_worker_pm,v 1.4 2007/11/13 09:46:28 robert Exp $
--- solenv/bin/modules/installer/worker.pm.orig.port	Fri Aug 17 19:50:21 2007
-+++ solenv/bin/modules/installer/worker.pm	Thu Oct 25 16:23:47 2007
-@@ -522,7 +522,7 @@ sub clean_output_tree
- 		if ( -d $installer::globals::removedirs[$i] )
- 		{
- 			installer::logger::print_message( "... removing directory $installer::globals::removedirs[$i] ...\n" );
-			installer::systemactions::remove_complete_directory($installer::globals::removedirs[$i], 1);			
-+#			installer::systemactions::remove_complete_directory($installer::globals::removedirs[$i], 1);			
- 		}
- 	}
- 
--- a/editors/openoffice/patches/patch-solenv_bin_modules_osarch_pm
+++ b/editors/openoffice/patches/patch-solenv_bin_modules_osarch_pm
@ -1,27 +0,0 @@
-$OpenBSD: patch-solenv_bin_modules_osarch_pm,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- solenv/bin/modules/osarch.pm.orig.port	Thu Mar 27 06:47:56 2003
-+++ solenv/bin/modules/osarch.pm	Fri Aug 18 15:47:45 2006
-@@ -22,6 +22,7 @@ chop( $m_str, $s_str );
- 			   "Linux",		"linux",
- 			   "FreeBSD",	"freebsd",
- 			   "NetBSD",	"netbsd",
-+			   "OpenBSD",	"openbsd",
- 			   "OSF1",		"decunix",
- 			   "SCO_SV",	"scoosr5",
- #			   "SCO_SV",	"scouw21",
-@@ -37,6 +38,7 @@ chop( $m_str, $s_str );
- 			   "Linux",		"-DLINUX",
- 			   "FreeBSD",	"-DFREEBSD",
- 			   "NetBSD",	"-DNETBSD",
-+			   "OpenBSD",	"-DOPENBSD",
- 			   "OSF1",		"-DSYSV -DDECUNIX",
- 			   "SCO_SV",	"-DSYSV -DSCO -DSCO_OSR5",
- #			   "SCO_SV",	"-DSYSV -DSCO -DSCO_UW21",
-@@ -53,6 +55,7 @@ chop( $m_str, $s_str );
- 			   "Linux",	"lng",
- 			   "FreeBSD",	"fbsd",
- 			   "NetBSD",	"bsd",
-+			   "OpenBSD",	"obsd",
- 			   "SCO_SV",	"sco",
- 			   "Darwin",    "macx",
- 			   "Mac OS",    "macx",
--- a/editors/openoffice/patches/patch-solenv_config_ssolar_cmn
+++ b/editors/openoffice/patches/patch-solenv_config_ssolar_cmn
@ -1,12 +0,0 @@
-$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
- {
- }
- 
-unxfbsdi
-+unxobsdi
- {
- }
- 
--- a/editors/openoffice/patches/patch-solenv_inc_libs_mk
+++ b/editors/openoffice/patches/patch-solenv_inc_libs_mk
@ -1,12 +0,0 @@
-$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"
-.IF "$(SOLAR_JAVA)" != "" && "$(JDK)" != "gcj" && "$(OS)" != "MACOSX"
-+.IF "$(SOLAR_JAVA)" != "" && "$(JDK)" != "gcj" && "$(OS)" != "MACOSX" && "$(OS)" != "OPENBSD"
- #i34482# Blackdown/Sun jdk is in the libsearch patch and has a libjpeg :-(
- .IF "$(OS)" == "FREEBSD"
- JPEG3RDLIB=/usr/local/lib/libjpeg.so
--- a/editors/openoffice/patches/patch-solenv_inc_settings_mk
+++ b/editors/openoffice/patches/patch-solenv_inc_settings_mk
@ -1,21 +0,0 @@
-$OpenBSD: patch-solenv_inc_settings_mk,v 1.9 2008/05/05 15:18:29 robert Exp $
--- solenv/inc/settings.mk.orig.port	Thu May  1 13:10:51 2008
-+++ solenv/inc/settings.mk	Thu May  1 13:10:53 2008
-@@ -1070,6 +1070,8 @@ CDEFS+=-DOSL_DEBUG_LEVEL=$(DBG_LEVEL)
- RSCDEFS+=-DOSL_DEBUG_LEVEL=$(DBG_LEVEL)
- .ENDIF
- 
-+CFLAGS+= $(ENVCFLAGS)
-+
- .IF "$(optimize)"!=""
- CDEFS+=$(CDEFSOPT)
- CFLAGS+=$(CFLAGSOPT)
-@@ -1202,7 +1204,7 @@ CFLAGSAPPEND+=$(ENVWARNFLAGS)
- 
- CDEFS+= $(ADDCDEFS)
- CDEFS+= $(ENVCDEFS)
-CFLAGS+= $(CFLAGSCALL) $(ENVCFLAGS)
-+CFLAGS+= $(CFLAGSCALL)
- CFLAGSCXX+= $(ENVCFLAGSCXX)
- # andersrum wg. -TPxxxx
- CFLAGSINCXX+:=$(ENVCFLAGSINCXX)
--- a/editors/openoffice/patches/patch-solenv_inc_startup_OPENBSD_macros_mk
+++ b/editors/openoffice/patches/patch-solenv_inc_startup_OPENBSD_macros_mk
@ -1,6 +0,0 @@
-$OpenBSD: patch-solenv_inc_startup_OPENBSD_macros_mk,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- solenv/inc/startup/OPENBSD/macros.mk.orig.port	Fri Aug 18 15:47:45 2006
-+++ solenv/inc/startup/OPENBSD/macros.mk	Fri Aug 18 15:47:45 2006
-@@ -0,0 +1,2 @@
-+
-+.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk
--- a/editors/openoffice/patches/patch-solenv_inc_tg_ext_mk
+++ b/editors/openoffice/patches/patch-solenv_inc_tg_ext_mk
@ -1,13 +0,0 @@
-$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"
-+.IF "$(OS)"!="OPENBSD"
- PATCHFLAGS=-b
-+.ENDIF
- .ENDIF			# "$(OS)"=="FREEBSD"
- .ENDIF			# "$(OS)"=="NETBSD"
- 
--- a/editors/openoffice/patches/patch-solenv_inc_unx_mk
+++ b/editors/openoffice/patches/patch-solenv_inc_unx_mk
@ -1,13 +0,0 @@
-$OpenBSD: patch-solenv_inc_unx_mk,v 1.3 2006/11/08 09:34:03 robert Exp $
--- solenv/inc/unx.mk.orig.port	Wed Jul 19 05:26:37 2006
-+++ solenv/inc/unx.mk	Fri Aug 18 15:47:45 2006
-@@ -36,6 +36,9 @@
- # --- Unix-Environment ---------------------------------------
- # Used if "$(GUI)" == "UNX"
- 
-+.IF "$(COM)$(OS)" == "GCCOPENBSD"
-+.INCLUDE : unxobsd.mk
-+.ENDIF
- 
- # Dieses Define gilt fuer alle  WNT- Plattformen
- # fuer Compiler, wo kein Java unterstuetzt wird, muss dies ge'undeft werden
--- a/editors/openoffice/patches/patch-solenv_inc_unxobsd_mk
+++ b/editors/openoffice/patches/patch-solenv_inc_unxobsd_mk
@ -1,241 +0,0 @@
-$OpenBSD: patch-solenv_inc_unxobsd_mk,v 1.4 2007/11/13 09:46:28 robert Exp $
--- solenv/inc/unxobsd.mk.orig.port	Sat Oct 27 12:50:07 2007
-+++ solenv/inc/unxobsd.mk	Sat Oct 27 15:12:51 2007
-@@ -0,0 +1,237 @@
-+#*************************************************************************
-+#
-+#   OpenOffice.org - a multi-platform office productivity suite
-+#
-+#   $RCSfile: patch-solenv_inc_unxobsd_mk,v $
-+#
-+#   $Revision: 1.4 $
-+#
-+#   last change: $Author: robert $ $Date: 2007/11/13 09:46:28 $
-+#
-+#   The Contents of this file are made available subject to
-+#   the terms of GNU Lesser General Public License Version 2.1.
-+#
-+#
-+#     GNU Lesser General Public License Version 2.1
-+#     =============================================
-+#     Copyright 2005 by Sun Microsystems, Inc.
-+#     901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#     This library is free software; you can redistribute it and/or
-+#     modify it under the terms of the GNU Lesser General Public
-+#     License version 2.1, as published by the Free Software Foundation.
-+#
-+#     This library is distributed in the hope that it will be useful,
-+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#     Lesser General Public License for more details.
-+#
-+#     You should have received a copy of the GNU Lesser General Public
-+#     License along with this library; if not, write to the Free Software
-+#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#     MA  02111-1307  USA
-+#
-+#*************************************************************************
-+
-+# Makefile for OpenBSD.
-+
-+ASM=
-+AFLAGS=
-+
-+SOLAR_JAVA*=
-+JAVAFLAGSDEBUG=-g
-+
-+# filter for supressing verbose messages from linker
-+#not needed at the moment
-+#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
-+
-+# _PTHREADS is needed for the stl
-+CDEFS+=-D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
-+
-+# enable visibility define in "sal/types.h"
-+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+
-+# this is a platform with JAVA support
-+.IF "$(SOLAR_JAVA)"!=""
-+JAVADEF=-DSOLAR_JAVA
-+.IF "$(debug)"==""
-+JAVA_RUNTIME=-ljava
-+.ELSE
-+JAVA_RUNTIME=-ljava_g
-+.ENDIF
-+.ENDIF
-+
-+# name of C++ Compiler
-+CXX*=g++
-+# name of C Compiler
-+CC*=gcc
-+.IF "$(SYSBASE)"!=""
-+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
-+CXX+:=$(CFLAGS_SYSBASE)
-+CC+:=$(CFLAGS_SYSBASE)
-+.ENDIF          # "$(SYSBASE)"!=""
-+CFLAGS+=-fmessage-length=0 -c
-+
-+# flags to enable build with symbols; required for crashdump feature
-+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-+CFLAGSENABLESYMBOLS=-g1
-+.ELSE
-+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-+
-+.ENDIF
-+
-+INCPOST=$(LOCALBASE)/include
-+
-+# flags for the C++ Compiler
-+CFLAGSCC=$(ARCH_FLAGS) $(PTHREAD_CFLAGS)
-+# Flags for enabling exception handling
-+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-+# Flags for disabling exception handling
-+CFLAGS_NO_EXCEPTIONS=-fno-exceptions -DBOOST_NO_EXCEPTIONS
-+
-+# -fpermissive should be removed as soon as possible
-+CFLAGSCXX=$(ARCH_FLAGS) $(PTHREAD_CFLAGS)
-+
-+.IF "$(CPUNAME)" == "X86_64"
-+PICSWITCH:=-fpic -fPIC
-+LINKFLAGSOPTIMIZE*=-Wl,-O1 -fPIC
-+.ENDIF
-+.IF "$(CPUNAME)" == "INTEL"
-+PICSWITCH:=-fpic
-+LINKFLAGSOPTIMIZE*=-Wl,-O1
-+.ENDIF
-+
-+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+CFLAGSCXX += -fvisibility-inlines-hidden
-+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+
-+# Compiler flags for compiling static object in single threaded environment with graphical user interface
-+CFLAGSOBJGUIST=
-+# Compiler flags for compiling static object in single threaded environment with character user interface
-+CFLAGSOBJCUIST=
-+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-+CFLAGSOBJGUIMT=
-+# Compiler flags for compiling static object in multi threaded environment with character user interface
-+CFLAGSOBJCUIMT=
-+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-+CFLAGSSLOGUIMT=$(PICSWITCH)
-+# Compiler flags for compiling shared object in multi threaded environment with character user interface
-+CFLAGSSLOCUIMT=$(PICSWITCH)
-+# Compiler flags for profiling
-+CFLAGSPROF=
-+# Compiler flags for debugging
-+CFLAGSDEBUG=-g
-+CFLAGSDBGUTIL=
-+# Compiler flags for enabling optimizations
-+.IF "$(PRODUCT)"!=""
-+CFLAGSOPT=-O2 -fno-strict-aliasing		# optimizing for products
-+.ELSE 	# "$(PRODUCT)"!=""
-+CFLAGSOPT=   							# no optimizing for non products
-+.ENDIF	# "$(PRODUCT)"!=""
-+# Compiler flags for disabling optimizations
-+CFLAGSNOOPT=-O0
-+# Compiler flags for describing the output path
-+CFLAGSOUTOBJ=-o
-+
-+# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-+CFLAGSWARNCC=-Wall -Wendif-labels
-+CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
-+    -Wno-non-virtual-dtor
-+CFLAGSWALLCC=$(CFLAGSWARNCC)
-+CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-+CFLAGSWERRCC=-Werror
-+
-+# Once all modules on this platform compile without warnings, set
-+# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
-+# settings.mk): Currently this is not tested on FreeBSD
-+#MODULES_WITH_WARNINGS :=
-+
-+# switches for dynamic and static linking
-+STATIC		= -Wl,-Bstatic
-+DYNAMIC		= -Wl,-Bdynamic
-+
-+# name of linker
-+LINK*=$(CXX)
-+LINKC*=$(CC)
-+
-+# default linker flags
-+#LINKFLAGSDEFS*=#-Wl,-z,defs
-+#LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
-+#LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-+LINKFLAGS=-Wl,-z,combreloc $(PTHREAD_LIBS)
-+SOLARLIB+=-L$(LOCALBASE)/lib
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+
-+# linker flags for linking shared libraries
-+LINKFLAGSSHLGUI= -shared
-+LINKFLAGSSHLCUI= -shared
-+
-+LINKFLAGSTACK=
-+LINKFLAGSPROF=
-+LINKFLAGSDEBUG=-g
-+LINKFLAGSOPT=
-+
-+# linker flags for optimization (symbol hashtable)
-+# for now, applied to symbol scoped libraries, only
-+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-+
-+SONAME_SWITCH=-Wl,-h
-+
-+# Sequence of libs does matter !
-+
-+STDLIBCPP=-lstdc++
-+
-+# default objectfilenames to link
-+STDOBJVCL=$(L)$/salmain.o
-+STDOBJGUI=
-+STDSLOGUI=
-+STDOBJCUI=
-+STDSLOCUI=
-+
-+# libraries for linking applications
-+STDLIBCUIST=-lm
-+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
-+STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-+STDLIBGUIST=-lX11 -lm
-+# libraries for linking shared libraries
-+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
-+STDSHLCUIMT=$(PTHREAD_LIBS) -lm
-+STDSHLGUIST=-lX11 -lXext -lm
-+STDSHLCUIST=-lm
-+
-+LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-+
-+.IF "$(USE_STLP_DEBUG)" != ""
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
-+.ELSE # "$(USE_STLP_DEBUG)" != ""
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-+.ENDIF # "$(USE_STLP_DEBUG)" != ""
-+
-+# name of library manager
-+LIBMGR=ar
-+LIBFLAGS=-r
-+
-+# tool for generating import libraries
-+IMPLIB=
-+IMPLIBFLAGS=
-+
-+MAPSYM=
-+MAPSYMFLAGS=
-+
-+RC=irc
-+RCFLAGS=-fo$@ $(RCFILES)
-+RCLINK=
-+RCLINKFLAGS=
-+RCSETVERSION=
-+
-+# platform specific identifier for shared libs
-+DLLPRE=lib
-+DLLPOST=.so
-+DLLPOSTFIX=
--- a/editors/openoffice/patches/patch-soltools_checkdll_makefile_mk
+++ b/editors/openoffice/patches/patch-soltools_checkdll_makefile_mk
@ -1,12 +0,0 @@
-$OpenBSD: patch-soltools_checkdll_makefile_mk,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- soltools/checkdll/makefile.mk.orig.port	Thu Sep  8 03:23:19 2005
-+++ soltools/checkdll/makefile.mk	Fri Aug 18 15:47:45 2006
-@@ -53,7 +53,7 @@ LIBSALCPPRT=$(0)
- APP1TARGET	= 	checkdll
- APP1OBJS	=	$(OBJ)$/checkdll.obj
- DEPOBJFILES	=	$(APP1OBJS) 
-.IF "$(OS)"!="FREEBSD" && "$(OS)"!="MACOSX" && "$(OS)"!="NETBSD"
-+.IF "$(OS)"!="FREEBSD" && "$(OS)"!="MACOSX" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD"
- STDLIB += -ldl
- .ENDIF
- .IF "$(OS)"=="NETBSD"
--- a/editors/openoffice/patches/patch-soltools_mkdepend_def_h
+++ b/editors/openoffice/patches/patch-soltools_mkdepend_def_h
@ -1,11 +0,0 @@
-$OpenBSD: patch-soltools_mkdepend_def_h,v 1.3 2007/04/18 13:20:48 kurt Exp $
--- soltools/mkdepend/def.h.orig.port	Fri Sep 22 04:56:47 2006
-+++ soltools/mkdepend/def.h	Wed Apr 18 03:46:27 2007
-@@ -27,6 +27,7 @@ in this Software without prior written authorization f
- */
- 
- #ifndef NO_X11
-+#include <string.h>
- #include <X11/Xosdefs.h>
- #ifdef WIN32
- #include <X11/Xw32defs.h>
--- a/editors/openoffice/patches/patch-soltools_mkdepend_ifparser_c
+++ b/editors/openoffice/patches/patch-soltools_mkdepend_ifparser_c
@ -1,12 +0,0 @@
-$OpenBSD: patch-soltools_mkdepend_ifparser_c,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- soltools/mkdepend/ifparser.c.orig.port	Thu Apr 22 06:06:37 2004
-+++ soltools/mkdepend/ifparser.c	Fri Aug 18 15:47:45 2006
-@@ -58,6 +58,8 @@
-  */
- 
- #include "ifparser.h"
-+#include <stdlib.h>
-+#include <string.h>
- #include <ctype.h>
- 
- /****************************************************************************
--- a/editors/openoffice/patches/patch-soltools_mkdepend_main_c
+++ b/editors/openoffice/patches/patch-soltools_mkdepend_main_c
@ -1,15 +0,0 @@
-$OpenBSD: patch-soltools_mkdepend_main_c,v 1.3 2007/04/18 13:20:48 kurt Exp $
--- soltools/mkdepend/main.c.orig.port	Thu Nov  2 04:10:51 2006
-+++ soltools/mkdepend/main.c	Wed Apr 18 03:46:27 2007
-@@ -32,6 +32,11 @@ in this Software without prior written authorization f
- #include <sys/stat.h>
- #endif
- 
-+#if defined(OPENBSD)
-+#include <sys/types.h>
-+#include <unistd.h>
-+#endif
-+
- #ifdef _MSC_VER	    /* Define ssize_t */
- 
- #if !defined(_W64)
--- a/editors/openoffice/patches/patch-stlport_STLport-4_5_patch
+++ b/editors/openoffice/patches/patch-stlport_STLport-4_5_patch
@ -1,570 +0,0 @@
--- stlport/STLport-4.5.patch.orig.port	Thu Jul 26 12:20:40 2007
-+++ stlport/STLport-4.5.patch	Sat Oct 27 12:50:07 2007
-@@ -1,5 +1,5 @@
- *** misc/STLport-4.5/src/common_percent_rules.mak	Sat May 19 05:04:20 2001
---- misc/build/STLport-4.5/src/common_percent_rules.mak	Thu Jul 26 12:13:02 2007
-+--- misc/build/STLport-4.5/src/common_percent_rules.mak	Thu Oct 25 20:44:51 2007
- ***************
- *** 1,45 ****
-   
-@@ -101,7 +101,7 @@
-   	$(CXX) $(CXXFLAGS_STLDEBUG_dynamic) $< -E  $@
-   
- *** misc/STLport-4.5/src/dll_main.cpp	Sat Aug 25 03:14:19 2001
---- misc/build/STLport-4.5/src/dll_main.cpp	Thu Jul 26 12:13:02 2007
-+--- misc/build/STLport-4.5/src/dll_main.cpp	Thu Oct 25 20:44:51 2007
- ***************
- *** 147,152 ****
- --- 147,156 ----
-@@ -115,8 +115,8 @@
-   template class _STLP_CLASS_DECLSPEC __node_alloc<false,0>;
-   template class _STLP_CLASS_DECLSPEC __node_alloc<true,0>;
-   template class _STLP_CLASS_DECLSPEC __debug_alloc< __node_alloc<true,0> >;
-*** misc/STLport-4.5/src/gcc-3.0-freebsd.mak	Thu Jul 26 12:15:53 2007
---- misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak	Thu Jul 26 12:13:02 2007
-+*** misc/STLport-4.5/src/gcc-3.0-freebsd.mak	Thu Oct 25 21:08:00 2007
-+--- misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak	Thu Oct 25 20:44:51 2007
- ***************
- *** 1 ****
- ! dummy
-@@ -190,8 +190,8 @@
- ! #	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
- ! 
- ! 
-*** misc/STLport-4.5/src/gcc-3.0-macosx.mak	Thu Jul 26 12:15:53 2007
---- misc/build/STLport-4.5/src/gcc-3.0-macosx.mak	Thu Jul 26 12:13:02 2007
-+*** misc/STLport-4.5/src/gcc-3.0-macosx.mak	Thu Oct 25 21:08:00 2007
-+--- misc/build/STLport-4.5/src/gcc-3.0-macosx.mak	Thu Oct 25 20:44:51 2007
- ***************
- *** 1 ****
- ! dummy
-@@ -261,8 +261,8 @@
- ! #	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
- ! 
- ! 
-*** misc/STLport-4.5/src/gcc-3.0-mingw.mak	Thu Jul 26 12:15:53 2007
---- misc/build/STLport-4.5/src/gcc-3.0-mingw.mak	Thu Jul 26 12:13:02 2007
-+*** misc/STLport-4.5/src/gcc-3.0-mingw.mak	Thu Oct 25 21:08:00 2007
-+--- misc/build/STLport-4.5/src/gcc-3.0-mingw.mak	Thu Oct 25 20:44:51 2007
- ***************
- *** 1 ****
- ! dummy
-@@ -373,11 +373,76 @@
- ! #	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
- ! 
- !  
-*** misc/STLport-4.5/src/gcc-3.0.mak	Thu Jul 26 12:15:53 2007
---- misc/build/STLport-4.5/src/gcc-3.0.mak	Thu Jul 26 12:13:02 2007
-+*** misc/STLport-4.5/src/gcc-3.0-openbsd.mak	Thu Oct 25 21:08:00 2007
-+--- misc/build/STLport-4.5/src/gcc-3.0-openbsd.mak	Thu Oct 25 20:44:51 2007
- ***************
- *** 1 ****
- ! dummy
-+--- 1,59 ----
-+! #
-+! # Note : this makefile is for gcc-3 !
-+! #
-+! 
-+! #
-+! # compiler
-+! # take these from the OOo build environment
-+! CC*= gcc 
-+! CXX*= g++
-+! 
-+! #
-+! # Basename for libraries
-+! #
-+! LIB_BASENAME = libstlport_gcc
-+! 
-+! #
-+! # guts for common stuff
-+! #
-+! LINK=ar cr
-+! DYN_LINK=${CXX} ${PTHREAD_LIBS} -fPIC -lstdc++ --fexceptions -shared -o
-+! 
-+! OBJEXT=o
-+! DYNEXT=so
-+! STEXT=a
-+! RM=rm -rf
-+! PATH_SEP=/
-+! MKDIR=mkdir -p
-+! COMP=GCC$(ARCH)
-+! INSTALL_STEP = install_unix 
-+! 
-+! all:  all_dynamic all_static symbolic_links 
-+! 
-+! include common_macros.mak
-+! 
-+! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized
-+! 
-+! CXXFLAGS_COMMON = ${PTHREAD_CFLAGS} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -ftemplate-depth-32 -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+! CFLAGS_COMMON = ${PTHREAD_CFLAGS} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+! 
-+! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC
-+! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-+! 
-+! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
-+! CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+! 
-+! CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+! CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-+! 
-+! CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC
-+! CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC
-+! 
-+! CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC
-+! CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC
-+! 
-+! CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_STLP_DEBUG
-+! CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-+! 
-+! include common_percent_rules.mak
-+! include common_rules.mak
-+*** misc/STLport-4.5/src/gcc-3.0.mak	Thu Oct 25 21:08:00 2007
-+--- misc/build/STLport-4.5/src/gcc-3.0.mak	Thu Oct 25 20:44:51 2007
-+***************
-+*** 1 ****
-+! dummy
- --- 1,69 ----
- ! #
- ! # Note : this makefile is for gcc-3 !
-@@ -449,7 +514,7 @@
- ! 
- ! 
- *** misc/STLport-4.5/src/gcc-freebsd.mak	Sun Jul 29 05:36:25 2001
---- misc/build/STLport-4.5/src/gcc-freebsd.mak	Thu Jul 26 12:13:03 2007
-+--- misc/build/STLport-4.5/src/gcc-freebsd.mak	Thu Oct 25 20:44:51 2007
- ***************
- *** 5,12 ****
-   #
-@@ -509,8 +574,61 @@
-   
-   CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-   CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+*** misc/STLport-4.5/src/num_put_float.cpp	Tue Sep  4 19:10:12 2001
-+--- misc/build/STLport-4.5/src/num_put_float.cpp	Thu Oct 25 21:07:28 2007
-+***************
-+*** 47,53 ****
-+  #  include <floatingpoint.h>
-+  # endif
-+  
-+! //# if !(defined(_STLP_USE_GLIBC) || defined(__FreeBSD__) || defined(__NetBSD__) || defined (_AIX) || defined(__MVS__) || defined (__OS400__) || defined (__QNXNTO__) || defined (__APPLE__) || defined (__DJGPP))
-+  # if defined (__sun) || defined (__digital__) || defined (__sgi)
-+  // DEC, SGI & Solaris need this
-+  #  include <values.h>
-+--- 47,53 ----
-+  #  include <floatingpoint.h>
-+  # endif
-+  
-+! //# if !(defined(_STLP_USE_GLIBC) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined (_AIX) || defined(__MVS__) || defined (__OS400__) || defined (__QNXNTO__) || defined (__APPLE__) || defined (__DJGPP))
-+  # if defined (__sun) || defined (__digital__) || defined (__sgi)
-+  // DEC, SGI & Solaris need this
-+  #  include <values.h>
-+***************
-+*** 220,226 ****
-+  // inline bool _Stl_is_neg_inf(double x)    { return isinf(x) < 0; }  
-+  inline bool _Stl_is_neg_inf(double x)    { return isinf(x) && x < 0; }
-+  #elif defined(__unix) && !defined(__FreeBSD__)  && !defined(__NetBSD__) \
-+!       && !defined(__APPLE__)  && !defined(__DJGPP) && !defined(__osf__)
-+  inline bool _Stl_is_nan_or_inf(double x) { return IsNANorINF(x); }
-+  inline bool _Stl_is_inf(double x)        { return IsNANorINF(x) && IsINF(x); }
-+  inline bool _Stl_is_neg_inf(double x)    { return (IsINF(x)) && (x < 0.0); }
-+--- 220,226 ----
-+  // inline bool _Stl_is_neg_inf(double x)    { return isinf(x) < 0; }  
-+  inline bool _Stl_is_neg_inf(double x)    { return isinf(x) && x < 0; }
-+  #elif defined(__unix) && !defined(__FreeBSD__)  && !defined(__NetBSD__) \
-+!       && !defined(__OpenBSD__) && !defined(__APPLE__)  && !defined(__DJGPP) && !defined(__osf__)
-+  inline bool _Stl_is_nan_or_inf(double x) { return IsNANorINF(x); }
-+  inline bool _Stl_is_inf(double x)        { return IsNANorINF(x) && IsINF(x); }
-+  inline bool _Stl_is_neg_inf(double x)    { return (IsINF(x)) && (x < 0.0); }
-+***************
-+*** 343,349 ****
-+    inline char* _Stl_qfcvtR(long double x, int n, int* pt, int* sign, char* buf)
-+      { LOCK_CVT RETURN_CVT(fcvt, x, n, pt, sign, buf) }
-+  # endif
-+! #elif defined (__unix)  && !defined(__FreeBSD__)  && !defined(__NetBSD__) && !defined(__APPLE__)
-+    inline char* _Stl_ecvtR(double x, int n, int* pt, int* sign, char* buf)
-+      { return ecvt_r(x, n, pt, sign, buf); }
-+    inline char* _Stl_fcvtR(double x, int n, int* pt, int* sign, char* buf)
-+--- 343,349 ----
-+    inline char* _Stl_qfcvtR(long double x, int n, int* pt, int* sign, char* buf)
-+      { LOCK_CVT RETURN_CVT(fcvt, x, n, pt, sign, buf) }
-+  # endif
-+! #elif defined (__unix)  && !defined(__FreeBSD__)  && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__APPLE__)
-+    inline char* _Stl_ecvtR(double x, int n, int* pt, int* sign, char* buf)
-+      { return ecvt_r(x, n, pt, sign, buf); }
-+    inline char* _Stl_fcvtR(double x, int n, int* pt, int* sign, char* buf)
- *** misc/STLport-4.5/stlport/config/stl_gcc.h	Tue Sep  4 19:10:16 2001
---- misc/build/STLport-4.5/stlport/config/stl_gcc.h	Thu Jul 26 12:13:03 2007
-+--- misc/build/STLport-4.5/stlport/config/stl_gcc.h	Thu Oct 25 20:44:51 2007
- ***************
- *** 7,13 ****
- --- 7,15 ----
-@@ -524,7 +642,7 @@
-   # if defined(__FreeBSD__) || defined (__hpux)
-   #  define _STLP_NO_WCHAR_T
- ***************
-*** 51,60 ****
-+*** 51,61 ****
-   #  define _STLP_CLASS_EXPORT_DECLSPEC __attribute__((dllexport))
-   #  define _STLP_CALL
-   
-@@ -535,30 +653,32 @@
-   
-   # endif
-   
---- 53,75 ----
-+  #if (defined(__linux__) /* && ! defined (_GNU_SOURCE) */ ) || \
-+--- 53,76 ----
-   #  define _STLP_CLASS_EXPORT_DECLSPEC __attribute__((dllexport))
-   #  define _STLP_CALL
-   
- ! #  if !defined (_STLP_NO_OWN_IOSTREAMS)
-! 
-! #    if ( defined (__DLL) || defined (_DLL) || defined (_WINDLL) || defined (_RTLDLL) \
-!      || defined(_AFXDLL) || defined (_STLP_USE_DYNAMIC_LIB) ) \
-!        && ! defined (_STLP_USE_STATIC_LIB)
-! #      undef  _STLP_USE_DECLSPEC
-! #      define _STLP_USE_DECLSPEC 1
-! /*     Using dynamic library in MinGW requires _STLP_NO_CUSTOM_IO */
-! #      define _STLP_NO_CUSTOM_IO
-! #    endif
-! 
-! #    ifndef _STLP_IMPORT_TEMPLATE_KEYWORD
-! #     define _STLP_IMPORT_TEMPLATE_KEYWORD  extern
-! #    endif
-! #    define _STLP_EXPORT_TEMPLATE_KEYWORD
-! 
-! #  endif /* _STLP_OWN_IOSTREAMS */
-   
-++ #    if ( defined (__DLL) || defined (_DLL) || defined (_WINDLL) || defined (_RTLDLL) \
-++      || defined(_AFXDLL) || defined (_STLP_USE_DYNAMIC_LIB) ) \
-++        && ! defined (_STLP_USE_STATIC_LIB)
-++ #      undef  _STLP_USE_DECLSPEC
-++ #      define _STLP_USE_DECLSPEC 1
-++ /*     Using dynamic library in MinGW requires _STLP_NO_CUSTOM_IO */
-++ #      define _STLP_NO_CUSTOM_IO
-++ #    endif
-++ 
-++ #    ifndef _STLP_IMPORT_TEMPLATE_KEYWORD
-++ #     define _STLP_IMPORT_TEMPLATE_KEYWORD  extern
-++ #    endif
-++ #    define _STLP_EXPORT_TEMPLATE_KEYWORD
-++ 
-++ #  endif /* _STLP_OWN_IOSTREAMS */
-++ 
-   # endif
-   
-+  #if (defined(__linux__) /* && ! defined (_GNU_SOURCE) */ ) || \
- ***************
- *** 75,80 ****
- --- 90,97 ----
-@@ -571,40 +691,44 @@
-     * members in template classes. Only one source file in an executable or
-     * library can declare instances for such data members, otherwise duplicate
- ***************
-*** 97,103 ****
-+*** 97,105 ****
-   #  define _STLP_NATIVE_CPP_C_HEADER(header) <../g++/##header##>
-   #  define _STLP_NATIVE_OLD_STREAMS_HEADER(header) <../g++/##header##>
-   #  define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <../g++/##header##>
-! # endif
-+- # endif
-   
-   
-   # if defined(__BEOS__) && defined(__INTEL__)
---- 114,136 ----
-+  #  define _STLP_NATIVE_HEADER(header) <../stlport/beos/##header##>
-+  #  define _STLP_NATIVE_C_HEADER(header) <../stlport/beos/##header##>
-+--- 114,138 ----
-   #  define _STLP_NATIVE_CPP_C_HEADER(header) <../g++/##header##>
-   #  define _STLP_NATIVE_OLD_STREAMS_HEADER(header) <../g++/##header##>
-   #  define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <../g++/##header##>
-! 
-! # else
-! /* Mac OS X using gcc 3.3 handles all well */
-! #   undef  _STLP_NO_STATIC_TEMPLATE_DATA
-! #   define _STLP_STATIC_TEMPLATE_DATA 1
-! #   define _STLP_WEAK_ATTRIBUTE 1
-! #   undef _STLP_NO_LONG_DOUBLE
-! 
-! #if 0
-!  /* Mac OS X needs all "::" scope references to be "std::" */
-!  #  define _STLP_NO_CSTD_FUNCTION_IMPORTS
-!  #  undef _STLP_VENDOR_GLOBAL_STD
-!  #  undef _STLP_VENDOR_GLOBAL_CSTD
-! #endif
-! 
-! # endif   /* __GNUC__ < 3 */
-! # endif   /* __APPLE__ */
-   
-++ # else
-++ /* Mac OS X using gcc 3.3 handles all well */
-++ #   undef  _STLP_NO_STATIC_TEMPLATE_DATA
-++ #   define _STLP_STATIC_TEMPLATE_DATA 1
-++ #   define _STLP_WEAK_ATTRIBUTE 1
-++ #   undef _STLP_NO_LONG_DOUBLE
-   
-++ #if 0
-++  /* Mac OS X needs all "::" scope references to be "std::" */
-++  #  define _STLP_NO_CSTD_FUNCTION_IMPORTS
-++  #  undef _STLP_VENDOR_GLOBAL_STD
-++  #  undef _STLP_VENDOR_GLOBAL_CSTD
-++ #endif
-++ 
-++ # endif   /* __GNUC__ < 3 */
-++ # endif   /* __APPLE__ */
-++ 
-++ 
-   # if defined(__BEOS__) && defined(__INTEL__)
-+  #  define _STLP_NATIVE_HEADER(header) <../stlport/beos/##header##>
-+  #  define _STLP_NATIVE_C_HEADER(header) <../stlport/beos/##header##>
- ***************
-*** 226,233 ****
-+*** 226,234 ****
-   
-   # if (__GNUC__ >= 3)
-   
-@@ -613,7 +737,8 @@
-   
-   # elif (__GNUC_MINOR__ < 8)
-   
---- 259,303 ----
-+  #  define _STLP_NO_OWN_IOSTREAMS 1
-+--- 259,304 ----
-   
-   # if (__GNUC__ >= 3)
-   
-@@ -622,43 +747,44 @@
- ! #undef i386
- ! #define i386 i386
- ! #endif
-! 
-! #ifdef linux
-! #undef linux
-! #define linux linux
-! #endif
-! 
-! #ifdef mips
-! #undef mips
-! #define mips mips
-! #endif
-! 
-! #ifdef sgi
-! #undef sgi
-! #define sgi sgi
-! #endif
-! 
-! #ifdef sun
-! #undef sun
-! #define sun sun
-! #endif
-! 
-! #ifdef sparc
-! #undef sparc
-! #define sparc sparc
-! #endif
-! 
-! #ifdef powerpc
-! #undef powerpc
-! #define powerpc powerpc
-! #endif
-! 
-! #  define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
-! #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
-!           GXX_INCLUDE_PATH/backward
-   
-++ #ifdef linux
-++ #undef linux
-++ #define linux linux
-++ #endif
-++ 
-++ #ifdef mips
-++ #undef mips
-++ #define mips mips
-++ #endif
-++ 
-++ #ifdef sgi
-++ #undef sgi
-++ #define sgi sgi
-++ #endif
-++ 
-++ #ifdef sun
-++ #undef sun
-++ #define sun sun
-++ #endif
-++ 
-++ #ifdef sparc
-++ #undef sparc
-++ #define sparc sparc
-++ #endif
-++ 
-++ #ifdef powerpc
-++ #undef powerpc
-++ #define powerpc powerpc
-++ #endif
-++ 
-++ #  define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
-++ #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
-++           GXX_INCLUDE_PATH/backward
-++ 
-   # elif (__GNUC_MINOR__ < 8)
-   
-+  #  define _STLP_NO_OWN_IOSTREAMS 1
- ***************
- *** 312,317 ****
-   #   define _STLP_STATIC_TEMPLATE_DATA 1
-@@ -676,7 +802,7 @@
- ! #    define _STLP_VENDOR_GLOBAL_CSTD       1
- ! #endif
- *** misc/STLport-4.5/stlport/cwchar	Sat Jan 27 02:39:42 2001
---- misc/build/STLport-4.5/stlport/cwchar	Thu Jul 26 12:13:03 2007
-+--- misc/build/STLport-4.5/stlport/cwchar	Thu Oct 25 20:44:51 2007
- ***************
- *** 21,26 ****
- --- 21,29 ----
-@@ -690,7 +816,7 @@
-   
-   # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
- *** misc/STLport-4.5/stlport/stdexcept	Tue May 22 02:50:21 2001
---- misc/build/STLport-4.5/stlport/stdexcept	Thu Jul 26 12:13:03 2007
-+--- misc/build/STLport-4.5/stlport/stdexcept	Thu Oct 25 20:44:51 2007
- ***************
- *** 49,54 ****
- --- 49,61 ----
-@@ -708,7 +834,7 @@
-   public:
-     __Named_exception(const string& __str) 
- *** misc/STLport-4.5/stlport/stl/_bvector.h	Wed May 30 05:45:41 2001
---- misc/build/STLport-4.5/stlport/stl/_bvector.h	Thu Jul 26 12:13:03 2007
-+--- misc/build/STLport-4.5/stlport/stl/_bvector.h	Thu Oct 25 20:44:51 2007
- ***************
- *** 34,40 ****
-   # include <stl/_vector.h>
-@@ -963,7 +1089,7 @@
-   #endif /* _STLP_INTERNAL_BVECTOR_H */
-   
- *** misc/STLport-4.5/stlport/stl/_complex.h	Fri Jul  6 06:16:17 2001
---- misc/build/STLport-4.5/stlport/stl/_complex.h	Thu Jul 26 12:13:03 2007
-+--- misc/build/STLport-4.5/stlport/stl/_complex.h	Thu Oct 25 20:44:51 2007
- ***************
- *** 18,23 ****
- --- 18,27 ----
-@@ -977,8 +1103,46 @@
-   // This header declares the template class complex, as described in 
-   // in the draft C++ standard.  Single-precision complex numbers
-   // are complex<float>, double-precision are complex<double>, and
-+*** misc/STLport-4.5/stlport/stl/_config.h	Tue Sep  4 19:10:18 2001
-+--- misc/build/STLport-4.5/stlport/stl/_config.h	Thu Oct 25 20:45:55 2007
-+***************
-+*** 162,168 ****
-+  # endif
-+  
-+  /* Operating system recognition (basic) */
-+! # if defined (__unix) || defined (__linux__) || defined (__QNX__) || defined (_AIX)  || defined (__NetBSD__)
-+  #  define _STLP_UNIX 1
-+  #  if defined (__linux__) && ! defined (_STLP_USE_GLIBC)
-+  #   define _STLP_USE_GLIBC 1
-+--- 162,168 ----
-+  # endif
-+  
-+  /* Operating system recognition (basic) */
-+! # if defined (__unix) || defined (__linux__) || defined (__QNX__) || defined (_AIX)  || defined (__NetBSD__) || defined(__OpenBSD__)
-+  #  define _STLP_UNIX 1
-+  #  if defined (__linux__) && ! defined (_STLP_USE_GLIBC)
-+  #   define _STLP_USE_GLIBC 1
-+*** misc/STLport-4.5/stlport/stl/_cwchar.h	Tue Sep  4 19:10:18 2001
-+--- misc/build/STLport-4.5/stlport/stl/_cwchar.h	Thu Oct 25 21:05:59 2007
-+***************
-+*** 30,36 ****
-+  # if !  defined (_STLP_NO_CWCHAR) && defined  (_STLP_USE_NEW_C_HEADERS)
-+  #  include _STLP_NATIVE_CPP_C_HEADER(cwchar)
-+  
-+! # elif defined (__MRC__) || defined (__SC__) || defined (__BORLANDC__) || defined(__FreeBSD__) || (defined (__GNUC__) && defined (__APPLE__\
-+  )) || defined (_STLP_NO_WCHAR_T)
-+  
-+  #  include _STLP_NATIVE_C_HEADER(stddef.h)
-+--- 30,36 ----
-+  # if !  defined (_STLP_NO_CWCHAR) && defined  (_STLP_USE_NEW_C_HEADERS)
-+  #  include _STLP_NATIVE_CPP_C_HEADER(cwchar)
-+  
-+! # elif defined (__MRC__) || defined (__SC__) || defined (__BORLANDC__) || defined(__FreeBSD__) || defined (__OpenBSD__) || (defined (__GNUC__) && defined (__APPLE__\
-+  )) || defined (_STLP_NO_WCHAR_T)
-+  
-+  #  include _STLP_NATIVE_C_HEADER(stddef.h)
- *** misc/STLport-4.5/stlport/stl/_ios_base.h	Tue Sep  4 19:10:18 2001
---- misc/build/STLport-4.5/stlport/stl/_ios_base.h	Thu Jul 26 12:13:03 2007
-+--- misc/build/STLport-4.5/stlport/stl/_ios_base.h	Thu Oct 25 20:44:51 2007
- ***************
- *** 291,297 ****
-   template <class Facet>
-@@ -997,7 +1161,7 @@
-   
-   // ----------------------------------------------------------------------
- *** misc/STLport-4.5/stlport/stl/_rope.h	Mon Aug  6 04:21:25 2001
---- misc/build/STLport-4.5/stlport/stl/_rope.h	Thu Jul 26 12:13:03 2007
-+--- misc/build/STLport-4.5/stlport/stl/_rope.h	Thu Oct 25 20:44:51 2007
- ***************
- *** 1470,1476 ****
-       rope<_CharT,_Alloc> __remainder_rope;
-@@ -1032,8 +1196,27 @@
-         }
-         if (0 != __remainder) {
-   		__result += __remainder_rope;
-+*** misc/STLport-4.5/stlport/stl/_stdio_file.h	Mon Mar 19 08:01:09 2001
-+--- misc/build/STLport-4.5/stlport/stl/_stdio_file.h	Thu Oct 25 21:06:21 2007
-+***************
-+*** 154,160 ****
-+  
-+  # define _STLP_FILE_I_O_IDENTICAL
-+  
-+! #elif defined (__CYGWIN__) || defined(__FreeBSD__)  || defined(__NetBSD__) || ( defined(__GNUC__) && defined(__APPLE__) )
-+  
-+  # if 0
-+  inline int   _FILE_fd(const FILE& __f) { return __f._file; }
-+--- 154,160 ----
-+  
-+  # define _STLP_FILE_I_O_IDENTICAL
-+  
-+! #elif defined (__CYGWIN__) || defined(__FreeBSD__)  || defined(__NetBSD__) || defined(__OpenBSD__) || ( defined(__GNUC__) && defined(__APPLE__) )
-+  
-+  # if 0
-+  inline int   _FILE_fd(const FILE& __f) { return __f._file; }
- *** misc/STLport-4.5/stlport/stl/_threads.h	Tue Sep  4 19:10:20 2001
---- misc/build/STLport-4.5/stlport/stl/_threads.h	Thu Jul 26 12:13:03 2007
-+--- misc/build/STLport-4.5/stlport/stl/_threads.h	Thu Oct 25 20:44:51 2007
- ***************
- *** 42,49 ****
-   #  include <cstdlib>
-@@ -1054,7 +1237,7 @@
-   # endif
-   
- *** misc/STLport-4.5/stlport/stl/_valarray.h	Wed May 30 05:45:42 2001
---- misc/build/STLport-4.5/stlport/stl/_valarray.h	Thu Jul 26 12:15:24 2007
-+--- misc/build/STLport-4.5/stlport/stl/_valarray.h	Thu Oct 25 20:44:51 2007
- ***************
- *** 19,24 ****
- --- 19,28 ----
-@@ -1068,3 +1251,22 @@
-   #ifndef _STLP_CMATH
-   #include <cmath>
-   #endif
-+*** misc/STLport-4.5/stlport/stl/c_locale.h	Thu May 31 05:24:41 2001
-+--- misc/build/STLport-4.5/stlport/stl/c_locale.h	Thu Oct 25 21:06:37 2007
-+***************
-+*** 179,185 ****
-+  # define _Locale_PRINT _CTYPE_R
-+  # define _Locale_ALPHA _CTYPE_A
-+  
-+! # elif defined (__NetBSD__)
-+   
-+  # define _Locale_CNTRL _C
-+  # define _Locale_UPPER _U
-+--- 179,185 ----
-+  # define _Locale_PRINT _CTYPE_R
-+  # define _Locale_ALPHA _CTYPE_A
-+  
-+! # elif defined (__NetBSD__) || defined (__OpenBSD__)
-+   
-+  # define _Locale_CNTRL _C
-+  # define _Locale_UPPER _U
--- a/editors/openoffice/patches/patch-stlport_makefile_mk
+++ b/editors/openoffice/patches/patch-stlport_makefile_mk
@ -1,23 +0,0 @@
-$OpenBSD: patch-stlport_makefile_mk,v 1.4 2007/11/13 09:46:28 robert Exp $
--- stlport/makefile.mk.orig.port	Tue Jul 31 15:10:28 2007
-+++ stlport/makefile.mk	Thu Oct 25 20:37:22 2007
-@@ -111,9 +111,8 @@ $(INCCOM)$/stlport$/hash_map : systemstl/hash_map
- TAR_EXCLUDES=*/SC5/*
- .ENDIF          # "$(USE_SHELL)"=="4nt"
- 
-ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak src$/gcc-3.0-freebsd.mak src$/sunpro8.mak src$/sunpro11.mak src$/gcc-3.0-mingw.mak
-+ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak src$/gcc-3.0-freebsd.mak src$/sunpro8.mak src$/sunpro11.mak src$/gcc-3.0-mingw.mak src$/gcc-3.0-openbsd.mak
- 
-
- CONFIGURE_ACTION=none
- CONFIGURE_FLAGS=
- 
-@@ -137,6 +136,8 @@ BUILD_FLAGS=-f vc7.mak EXFLAGS="/EHa /Zc:wchar_t-" CCN
- 			BUILD_FLAGS=-f gcc-3.0-macosx.mak
- 		.ELIF "$(GUI)"=="WNT"
- 			BUILD_FLAGS=-f gcc-3.0-mingw.mak
-+		.ELIF "$(OS)"=="OPENBSD"
-+			BUILD_FLAGS=-f gcc-3.0-openbsd.mak
- 		.ELSE
- 			BUILD_FLAGS=-f gcc-3.0.mak
- 		.ENDIF
--- a/editors/openoffice/patches/patch-store_source_fileunx_hxx
+++ b/editors/openoffice/patches/patch-store_source_fileunx_hxx
@ -1,21 +0,0 @@
-$OpenBSD: patch-store_source_fileunx_hxx,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- store/source/fileunx.hxx.orig.port	Mon Jun 19 20:32:01 2006
-+++ store/source/fileunx.hxx	Fri Aug 18 15:47:45 2006
-@@ -46,7 +46,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- 
-#if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX)
-+#if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX) || defined(OPENBSD)
- #define EDEADLOCK EDEADLK
- #endif /* FREEBSD || NETBSD || MACOSX */
- 
-@@ -86,7 +86,7 @@ inline sal_Int32 __store_errno (void)
- /*
-  * __store_malign.
-  */
-#if   defined(FREEBSD) || defined(LINUX) || defined(MACOSX)
-+#if   defined(FREEBSD) || defined(LINUX) || defined(MACOSX) || defined (OPENBSD)
- inline sal_uInt32 __store_malign (void)
- {
- 	return (sal_uInt32)::getpagesize();
--- a/editors/openoffice/patches/patch-store_util_makefile_mk
+++ b/editors/openoffice/patches/patch-store_util_makefile_mk
@ -1,12 +0,0 @@
-$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
-.IF "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="NETBSD" || "$(OS)"=="OPENBSD"
- SHL1STDLIBS+= 	-lsupc++
- .ELIF "$(OS)"=="MACOSX"
- .IF "$(CCNUMVER)"<="000399999999"
--- a/Show More
+++ b/Show More