The Apache OpenOffice Project Announces Apache OpenOfficeâ¢ 3

in Tue, 08 May 2012 13:04:48 GMT. * http://mail-archives.apache.org/mod_mbox/incubator-ooo-announce/201205.mbox/%3CCAP-ksohGnmq8bmo50Db5fhZW3NysNdg41RR7Rg2f8F00ueHHww%40mail.gmail.com%3E * http://www.openoffice.org/news/aoo34.html * http://www.youtube.com/watch?v=QQaZwDwf6tc
author: Maho Nakata <maho@FreeBSD.org> 2012-05-09 03:48:16 +0000
committer: Maho Nakata <maho@FreeBSD.org> 2012-05-09 03:48:16 +0000
commit: 269adbc59185605252893f1dfb81da755aa91cf8 (patch)
tree: 1683b31d480403bd9c0151e7fd04a5d5909de84a /editors
parent: The project has been renamed and we renamed (diff)
49 files changed, 859 insertions, 2507 deletions
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index e1d38d4c7df1..d1ead4355318 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -1,53 +1,36 @@
-# New ports collection makefile for: OpenOffice.org
+# New ports collection makefile for: Apache OpenOffice
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
-PORTNAME?=	openoffice.org
-PORTVERSION?=	${OOOVERSION}
-CATEGORIES+=	editors java
-MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
-		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/:extsrc \
-		http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
-DISTFILES+=	${OOOSRC} ${OOOEXTSRC} unowinreg.dll:unowinreg
+PORTNAME=	apache-openoffice
+PORTVERSION=	3.4.0
+CATEGORIES=	editors java
+MASTER_SITES=	http://people.apache.org/~jsc/aoo34-rc/rc1/src/ ${MASTER_SITE_LOCAL}:extsrc
+MASTER_SITE_SUBDIR=	maho/openoffice:extsrc
+DISTFILES+=	${OOOSRC} unowinreg.dll ${EXTSRC}
+EXTRACT_ONLY=	${OOOSRC} ${EXTSRC}
 
 #de facto maintainer is maho@FreeBSD.org
-#patch submitters must sign SCA; see http://porting.openoffice.org/freebsd/#policy
+#Frequent Patch submitters should optionally sign Apache iCLA
 MAINTAINER=	office@FreeBSD.org
-COMMENT=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(release branch)
+COMMENT=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
 
-CONFLICTS=	cppunit*
-
-OOOVERSION=	3.3.0
-EXTRATC_ONLY?=	${OOOSRC} ${OOOEXTSRC}
-
-OOOEXTSRC=	ext_sources.20110129.tar.bz2:extsrc
+LICENSE=	AL2
 
 NO_LATEST_LINK=	yes
 
-.if !defined(WITHOUT_MOZILLA)
-USE_GNOME+=		libidl
-.endif
-
-USE_GNOME=	desktopfileutils gtk20
-
-.if defined(WITH_KDE4) && defined(WITH_KDE)
-.error "Cannot define WITH_KDE and WITH_KDE4 at the same time"
-.endif
-.if defined(WITH_KDE4)
-USE_KDE4=	kdelibs
-USE_QT_VER=	4
-.endif
-
-.if defined(WITH_KDE)
-USE_KDELIBS_VER=	3
-.endif
+USE_GNOME=	desktopfileutils gtk20 libxslt libidl gconf2 gnomevfs2 glib20
 USE_XORG=	x11 ice xaw xau xext xrender xrandr \
 		xi xt xcursor xdamage xcomposite xfixes
+USE_GL=		gl glu
+USE_GSTREAMER=	yes
+#USE_GCC=	4.6+
 USE_GMAKE=	yes
-USE_PERL5=	yes
+USE_PYTHON=	yes
+USE_PERL5_BUILD=	yes
 USE_BZIP2=	yes
 WITHOUT_CPU_CFLAGS=	true
 MAKE_JOBS_SAFE=	yes
@@ -69,23 +52,23 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 .endif
 
-MILESTONE?=		20
-OOOTAG?=		OOO330_m${MILESTONE}
-OOOTAG2=		${OOOTAG:C/_//g}
-OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
+OOOSRC=			aoo-${PORTVERSION}-incubating-src${EXTRACT_SUFX}
+EXTSRC=			ApacheOpenOffice.ext_sources.r${SVNREVISION}${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
-EXECBASE?=		openoffice.org-${OOOVERSION}
-DIST_SUBDIR=		openoffice.org3
+SVNREVISION=		1327774
+INSTALLATION_BASEDIR?=	openoffice-${PORTVERSION}
+EXECBASE?=		openoffice-${PORTVERSION}
+DIST_SUBDIR=		openoffice
 SIMPLEOSVER=		${OSREL:C/\.//g}
+
+PACKAGE_PREFIX=		Apache_OpenOffice_incubating
 .if ${ARCH} == amd64
-PACKAGE_BASENAME=	${OOOVERSION}_${OPSYS}${SIMPLEOSVER}_x86-64
+PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86-64
 .else
-PACKAGE_BASENAME=	${OOOVERSION}_${OPSYS}${SIMPLEOSVER}_x86
+PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86
 .endif
 
 LOCALIZED_LANG?=	en-US
-# FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=		${LANG_PKGNAME}-
 .endif
@@ -93,7 +76,11 @@ PKGNAMEPREFIX=		${LANG_PKGNAME}-
 PKGNAMESUFFIX=		-${LANG_SUFFIX}
 .endif
 
-RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
+		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
+		${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \
+		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
+		${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel
 
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
@@ -105,55 +92,97 @@ OOOCC=		${CC}
 OOOCXX=		${CXX}
 .endif
 CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
-		PATH=${WRKSRC}/solenv/bin:$$PATH
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+		PATH=${WRKSRC}/solenv/bin:$$PATH	\
+		CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+
+LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
+		expat.6:${PORTSDIR}/textproc/expat2 \
+		jpeg.11:${PORTSDIR}/graphics/jpeg \
+		curl.6:${PORTSDIR}/ftp/curl \
+		hunspell-1.3.0:${PORTSDIR}/textproc/hunspell \
+		poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \
+		rdf.0:${PORTSDIR}/textproc/redland \
+		textcat.0:${PORTSDIR}/textproc/libtextcat \
+		freetype.9:${PORTSDIR}/print/freetype2
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
-		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bash:${PORTSDIR}/shells/bash \
 		imake:${PORTSDIR}/devel/imake \
-		gtar:${PORTSDIR}/archivers/gtar \
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
 		ant:${PORTSDIR}/devel/apache-ant \
-		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit
-#see #i85469# for gperf
-
+		${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs \
+		${LOCALBASE}/bin/vigra-config:${PORTSDIR}/graphics/vigra \
+		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \
+		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
+		${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \
+		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
+		${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
+		epm:${PORTSDIR}/devel/epm \
+		dmake:${PORTSDIR}/devel/dmake \
+		${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
+
+USE_AUTOTOOLS=	autoconf
 USE_BISON=	build
 GNU_CONFIGURE=	yes
-WRKSRC?=	${WRKDIR}/${OOOTAG}
+WRKSRC?=	${WRKDIR}/aoo-${PORTVERSION}/main
 BASH?=		${PREFIX}/bin/bash
 SUB_FILES=	pkg-message
 SUB_LIST=	EXECBASE=${EXECBASE} OOOTAG=${OOOTAG} OOODIR=${OOODIR}
 
 .if defined(DISABLE_MAKE_JOBS)
-MAKE_JOBS_NUMBER=	1
+MAKE_JOBS_NUMBER=	4
 .endif
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
+CONFIGURE_ARGS+=	--enable-verbose \
+			--enable-symbols \
+			--enable-crashdump \
+			--with-vendor="FreeBSD ports system"	\
+			--with-epm=${LOCALBASE}/bin/epm \
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
-			--enable-crashdump=yes				\
-			--with-junit=${LOCALBASE}/share/java/classes/junit.jar	\
-			--with-system-zlib				\
-			--with-system-stdlibs				\
-			--with-epm=internal				\
-			--enable-hids					\
-			--enable-minimizer 				\
-			--enable-presenter-console			\
-			--enable-pdfimport				\
-			--enable-wiki-publisher				\
-			--enable-report-builder				\
-			--with-use-shell=bash				\
-			--with-vendor="FreeBSD ports system"
+			--with-gperf=${LOCALBASE}/bin/gperf	\
+			--x-includes=${LOCALBASE}/include	\
+			--x-libraries=${LOCALBASE}lib	\
+			--with-system-libxml 		\
+			--with-system-libxslt 		\
+			--with-system-cairo --enable-cairo \
+			--with-system-boost 		\
+			--with-system-zlib		\
+			--with-system-python		\
+			--with-system-expat		\
+			--with-system-openssl		\
+			--with-system-curl		\
+			--with-system-poppler \
+			--with-system-redland \
+			--with-system-libtextcat \
+			--with-system-libtextcat-data=${LOCALBASE}/share/libtextcat \
+			--with-system-vigra \
+			--with-system-stdlibs \
+			--with-commons-codec-jar=${JAVALIBDIR}/commons-codec.jar \
+			--with-commons-lang-jar=${JAVALIBDIR}/commons-lang.jar	\
+			--with-commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar \
+			--with-commons-logging-jar=${JAVALIBDIR}/commons-logging.jar	\
+			--with-junit=${LOCALBASE}/share/java/classes/junit.jar \
+			--with-package-format="archive" \
+			--enable-gstreamer \
+			--enable-minimizer \
+			--enable-presenter-console \
+			--enable-wiki-publisher \
+			--enable-dbus \
+			--enable-opengl \
+			--enable-category-b \
+			--with-system-hunspell \
+			--with-system-saxon     \
+			--with-saxon-jar=${JAVALIBDIR}/saxon9.jar  \
+			--with-system-beanshell	\
+			--with-beanshell-jar=${JAVALIBDIR}/bsh.jar
 
 OOOEXTENSIONS+=		minimizer/presentation-minimizer.oxt
 OOOEXTENSIONS+=		presenter/presenter-screen.oxt
-OOOEXTENSIONS+=		pdfimport/pdfimport.oxt
+#OOOEXTENSIONS+=		pdfimport/pdfimport.oxt
 OOOEXTENSIONS+=		swext/wiki-publisher.oxt
-OOOEXTENSIONS+=		report-builder.oxt
 
 ICONS=	${WRKSRC}/sysui/desktop/icons
 
@@ -177,71 +206,54 @@ pre-everything::
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
-#issue XXXXXX not raised yet...
-DOS2UNIX_REGEX=curl/curl*patch neon/neon*patch jfreereport/patches/*.patch
 post-extract:
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
+	@${MKDIR} ${WRKSRC}/../ext_sources
+	@${MV} ${WRKDIR}/ooo/ext_sources/* ${WRKSRC}/../ext_sources/
+	@${RM} -rf ${WRKSRC}/l10n
+
+post-patch:
+.if defined (USE_GCC)
+	@${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}+" ${WRKSRC}/solenv/inc/unxfbsd.mk
+	@${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}+" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
+.else
+	@${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/inc/unxfbsd.mk
+	@${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
+.endif
 
 pre-configure:
-#Workaround for gperf. #i85469#
-	@${LN} -sf ${LOCALBASE}/bin/gperf ${WRKSRC}/solenv/bin/gperf
 	@${LN} -sf ${LOCALBASE}/bin/unzip ${WRKSRC}/solenv/bin/unzip
-.if defined(WITH_KDE4)
-	@${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/solenv/bin/moc
-.endif
 
 do-build:
+	@cd ${WRKDIR}/aoo-${PORTVERSION} ; ${PRINTF} "[repositories]\n" > source_config
+	@cd ${WRKDIR}/aoo-${PORTVERSION} ; ${PRINTF} "main=active\n" >> source_config
+	@cd ${WRKDIR}/aoo-${PORTVERSION} ; ${PRINTF} "extras=active\n" >> source_config
 	@cd ${WRKSRC} ; ./bootstrap
-	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "LIBINTL_PREFIX=${PREFIX}" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html"
-
-.if ${LOCALIZED_LANG} == "alllangs"
-	@${MAKE} languagepack
-.endif
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util  ; build.pl --all -P${MAKE_JOBS_NUMBER} -- -P${MAKE_JOBS_NUMBER}"
 
 do-install:
-.if ${LOCALIZED_LANG} == "alllangs"
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/ ; ${LS} */freebsd*/*.t?z > ${WRKDIR}/LANGPACKFILES
-	@${RM} -Rf ${WRKDIR}/tmp
-	@${MKDIR} ${WRKDIR}/tmp
-	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
-		${ECHO_CMD} "extracting $$i" ; \
-		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd/$$i ; \
-	done
-	@for i in `${CAT} ${WRKDIR}/LANGPACKFILES`; do \
-		${ECHO_CMD} "extracting $$i" ; \
-		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/$$i ;\
-	done
-	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
-	@cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
-	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
-	@cd ${WRKSRC}/solver/3?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
-	@${INSTALL_DATA} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/bin/hid.lst ${PREFIX}/${INSTALLATION_BASEDIR}
-.else
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/archive/install/${LOCALIZED_LANG}/ ; ${LS} *.tar.?z > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${ECHO_CMD} "extracting $$i" ; \
-		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd/$$i ; \
+		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/archive/install/${LOCALIZED_LANG}/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
-	@cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
-.endif
+	@cd ${WRKDIR}/tmp/*/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
+
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
 	@cd ${WRKSRC}/solver/3?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
-	@${INSTALL_DATA} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/bin/hid.lst ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
-	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
+	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%OOOTAG%%#${OOOTAG}#g' \
-			-e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
+			-e 's#%%SVNREVISION%%#${SVNREVISION}#g' \
 			-e 's#%%OOODIR%%#${OOODIR}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
-			${WRKDIR}/openoffice.org-wrapper
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
+			${WRKDIR}/openoffice-wrapper
+	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
@@ -252,6 +264,11 @@ post-install:
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${ECHO_CMD} "" > ${TMPPLIST}
+	@${ECHO_CMD} "share/licenses/${PKGNAME}/catalog.mk" >> ${TMPPLIST}
+	@${ECHO_CMD} "share/licenses/${PKGNAME}/LICENSE"    >> ${TMPPLIST}
+	@${ECHO_CMD} "share/licenses/${PKGNAME}/AL2"        >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrm share/licenses/${PKGNAME}"     >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrm share/licenses"                >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d | ${SORT} -r | \
@@ -265,7 +282,7 @@ post-install:
 		-e "s/^Icon.*/Icon=${EXECBASE}-printeradmin.png/" \
 		${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/printeradmin.desktop
 	@${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -quickstart -nologo -nodefault/" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/qstart.desktop
+		${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/startcenter.desktop
 	@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak
 	@${RM} -f ${DESKTOPDIR}/${EXECBASE}
 	@${MKDIR} ${DESKTOPDIR}
@@ -283,10 +300,10 @@ post-install:
 				${ECHO_CMD} "share/icons/hicolor/$${dir}/apps/${EXECBASE}-$${app}.png" >> ${TMPPLIST} ; \
 			fi \
 		done ; \
-		for file in `cd ${ICONS}/hicolor/$${dir}/mimetypes; ls *.png`; do \
-			${INSTALL_DATA} ${ICONS}/hicolor/$${dir}/mimetypes/$${file} \
+		for iconfile in `cd ${ICONS}/hicolor/$${dir}/mimetypes; ls *.png`; do \
+			${INSTALL_DATA} ${ICONS}/hicolor/$${dir}/mimetypes/$${iconfile} \
 			    ${PREFIX}/share/icons/hicolor/$${dir}/mimetypes/ ; \
-			${ECHO_CMD} "share/icons/hicolor/$${dir}/mimetypes/$${file}" >> ${TMPPLIST} ; \
+			${ECHO_CMD} "share/icons/hicolor/$${dir}/mimetypes/$${iconfile}" >> ${TMPPLIST} ; \
 		done ; \
 	done
 	@${PREFIX}/bin/gtk-update-icon-cache -q -f ${PREFIX}/share/icons/hicolor 2>/dev/null || ${TRUE}
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index 06bc93c5e51a..7b33d35534e3 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,6 +1,6 @@
-SHA256 (openoffice.org3/OOo_OOO330_m20_source.tar.bz2) = dca1ca546ca54b678aa1d53ca541add50484a54bcd8dc19061e9932332d489f3
-SIZE (openoffice.org3/OOo_OOO330_m20_source.tar.bz2) = 308995356
-SHA256 (openoffice.org3/ext_sources.20110129.tar.bz2) = cb565693860546d387c141e014e84ddf063ddd9c763c0de9397d6c22ec04af3c
-SIZE (openoffice.org3/ext_sources.20110129.tar.bz2) = 214185488
-SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-SIZE (openoffice.org3/unowinreg.dll) = 6144
+SHA256 (openoffice/aoo-3.4.0-incubating-src.tar.bz2) = e32ca8efd401f152fc40b53c8f39c0b20ef8b8c1d8eaf3af578a34f622763bad
+SIZE (openoffice/aoo-3.4.0-incubating-src.tar.bz2) = 251417094
+SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
+SIZE (openoffice/unowinreg.dll) = 6144
+SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1327774.tar.bz2) = 17bb70c9e16cb1d7452206a7450e3d2649e1865750e3b3776b5d55878b98d785
+SIZE (openoffice/ApacheOpenOffice.ext_sources.r1327774.tar.bz2) = 215141516
diff --git a/editors/openoffice-3/files/Makefile.knobs b/editors/openoffice-3/files/Makefile.knobs
index 990b8c9a623b..d5c399470ad3 100644
--- a/editors/openoffice-3/files/Makefile.knobs
+++ b/editors/openoffice-3/files/Makefile.knobs
@@ -1,140 +1,13 @@
 # Makefile for knobs
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
+# Makefile for knobs
 
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant"
-
-.if defined(WITH_KDE4)
-CONFIGURE_ARGS+=	--enable-kde4 QT4DIR="${QT_PREFIX}" QT4LIB="${QT_LIBDIR}" QT4INC="${QT_INCDIR}" KDE4DIR="${KDE4_PREFIX}"
-QT_COMPONENTS+=		moc_build
-.endif
-
-.if defined(WITH_KDE)
-CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
-.endif
-
-.if defined(WITHOUT_CUPS)
-CONFIGURE_ARGS+=	--enable-cups=no
-.else
-LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-client
-CONFIGURE_ARGS+=	--enable-cups=yes
-.endif
-
-.if defined(WITHOUT_MOZILLA)
-CONFIGURE_ARGS+=	--disable-mozilla
-.else
-CONFIGURE_ARGS+=	--enable-build-mozilla
-.endif
-
-.if defined(WITHOUT_GNOME)
-CONFIGURE_ARGS+=	--disable-gconf --disable-gnome-vfs
-.else
-USE_GNOME+=		gconf2 gnomevfs2
-.endif
-.if defined(WITH_EVOLUTION2)
-CONFIGURE_ARGS+=	--enable-evolution2=yes
-.else
-USE_GNOME+=		glib20
-.endif
-
-LIB_DEPENDS+=		freetype.9:${PORTSDIR}/print/freetype2
-
-.if defined(ALL_LOCALIZED_LANGS)
-CONFIGURE_ARGS+=	--with-lang=ALL
-.else
 CONFIGURE_ARGS+=	--with-lang=${LOCALIZED_LANG}
-.endif
-
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--enable-debug --enable-symbols=TRUE --enable-dbgutil
-.else
-CONFIGURE_ARGS+=	--enable-symbols=SMALL
-.endif
-
-.if defined(WITH_SYSTEM_ICU)
-LIB_DEPENDS+=		icule:${PORTSDIR}/devel/icu
-CONFIGURE_ARGS+=	--with-system-icu=yes
-.else
-CONFIGURE_ARGS+=	--with-system-icu=no
-.endif
-
-.if defined(WITH_GRAPHITE)
-CONFIGURE_ARGS+=	--enable-graphite=yes --without-stlport
-.else
-CONFIGURE_ARGS+=	--enable-graphite=no
-.endif
-
-.if defined(WITH_SYSTEM_GRAPHITE) && defined(WITH_GRAPHITE)
-LIB_DEPENDS+=		graphite.3:${PORTSDIR}/graphics/silgraphite
-CONFIGURE_ARGS+=	--with-system-graphite=yes
-.else
-CONFIGURE_ARGS+=	--with-system-graphite=no
-.endif
 
 pre-fetch:
 	@${ECHO} "OPTIONS:"
-.if !defined(WITH_DEBUG)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with debug symbols/supports with"
-	@${ECHO} "make -DWITH_DEBUG"
-.endif
-.if !defined(WITHOUT_MOZILLA)
-	@${ECHO}
-	@${ECHO} "You can compile OOo without Mozilla/Mozilla NSS-using components"
-	@${ECHO} "make -DWITHOUT_MOZILLA"
-.endif
-.if !defined(WITHOUT_GNOME)
-	@${ECHO}
-	@${ECHO} "You can compile OOo without gnome VFS support with"
-	@${ECHO} "make -DWITHOUT_GNOME"
-.endif
-.if !defined(WITH_SYSTEM_ICU)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with devel/icu from ports with"
-	@${ECHO} "make -DWITH_SYSTEM_ICU"
-.endif
-.if !defined(WITH_GRAPHITE)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with Graphite smart font rendering with"
-	@${ECHO} "make -DWITH_GRAPHITE"
-.else
-	@${ECHO}
-	@${ECHO} "WARNING: Graphite support enabled, --without-stlport added"
-	@${ECHO} "to configure arguments."
-.endif
-.if !defined(WITH_SYSTEM_GRAPHITE)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with graphics/silgraphite from ports with"
-	@${ECHO} "make -DWITH_SYSTEM_GRAPHITE"
-.elif !defined(WITH_GRAPHITE)
-	@${ECHO}
-	@${ECHO} "To use system Graphite, WITH_GRAPHITE must be set as well."
-.endif
-.if !defined(WITHOUT_CUPS)
-	@${ECHO}
-	@${ECHO} "You can compile OOo without CUPS support with"
-	@${ECHO} "make -DWITHOUT_CUPS"
-.endif
-.if !defined(WITH_KDE)
-	@${ECHO}
-	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
-	@${ECHO} "make -DWITH_KDE"
-.endif
-.if !defined(WITH_KDE4)
-	@${ECHO}
-	@${ECHO} "You can compile OOo to use Qt/KDE4 vclplug with"
-	@${ECHO} "make -DWITH_KDE4"
-.endif
-.if !defined(WITH_EVOLUTION2)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with evolution2 support by"
-	@${ECHO} "make -DWITH_EVOLUTION2"
-.endif
-.if ${LOCALIZED_LANG} != "alllangs"
-	@${ECHO}
-	@${ECHO} "You can compile OOo with full localized language support by"
-	@${ECHO} "make LOCALIZED_LANG=alllangs"
-.endif
 	@${ECHO}
 	@${ECHO} "You can select the language for OOo by making it with:"
 	@${ECHO} "make LOCALIZED_LANG=xx" 
@@ -151,11 +24,5 @@ pre-fetch:
 	@${ECHO} "NOTICE:"
 	@${ECHO}
 	@${ECHO} "To build OOo, you should have a lot"
-.if defined(WITH_DEBUG)
-	@${ECHO} "of free diskspace (~ 18GB) and memory (~ 2GB)."
-.elif ${LOCALIZED_LANG} == "alllangs"
-	@${ECHO} "of free diskspace (~ 35GB) and memory (~ 2GB)."
-.else
 	@${ECHO} "of free diskspace (~ 11GB) and memory (~ 2GB)."
-.endif
 	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
diff --git a/editors/openoffice-3/files/Makefile.localized b/editors/openoffice-3/files/Makefile.localized
index 321b84500718..1b6364941f2f 100644
--- a/editors/openoffice-3/files/Makefile.localized
+++ b/editors/openoffice-3/files/Makefile.localized
@@ -1,6 +1,7 @@
 # localized makefile
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
+
 ################################################################
 #See solenv/inc/postset.mk for details	
 ################################################################
@@ -397,9 +398,4 @@ BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "alllangs"
-ALL_LOCALIZED_LANGS=yes
-PKGNAMESUFFIX=	-alllangs
-.endif
-################################################################
 .endif
diff --git a/editors/openoffice-3/files/Makefile.others b/editors/openoffice-3/files/Makefile.others
index 5910bf4babfd..14d039ca28b4 100644
--- a/editors/openoffice-3/files/Makefile.others
+++ b/editors/openoffice-3/files/Makefile.others
@@ -10,43 +10,41 @@
 #languagepack: language pack
 
 package-rename:
-	@${ECHO_MSG} "===>   Rename package for OpenOffice.org mirror upload";
+	@${ECHO_MSG} "===>   Rename package for Apache OpenOffice mirror upload";
 	@${LN} ${PKGFILE} \
-		${WRKDIR}/../OOo_${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX}
+		${WRKDIR}/../${PACKAGE_PREFIX}_${PACKAGE_MIDDLE}_install_${LOCALIZED_LANG}${PKG_SUFX}
 
 package-canonical:
-	@${ECHO_MSG} "===>   Canonical packaging for OpenOffice.org";
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd/ ;\
-	${TAR} cfj ${WRKDIR}/../OOo_${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} .
+	@${ECHO_MSG} "===>   Canonical packaging for Apache OpenOffice";
+	@${CP} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/archive/install/${LOCALIZED_LANG}/${PACKAGE_PREFI}* .
 
 sdk:
-	@${ECHO_MSG} "===>   Make SDK of OpenOffice.org"
+	@${ECHO_MSG} "===>   Make SDK of Apache OpenOffice"
 	@${RM} -fr ${WRKDIR}/sdk_tmp
 	@${MKDIR} ${WRKDIR}/sdk_tmp
 	@cd ${WRKDIR}/sdk_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd/ooobasis*.t?z
-	@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_SDK/archive/install/${LOCALIZED_LANG}/Apache_OpenOffice_*SDK*.tar.gz
+	@cd ${WRKDIR}/sdk_tmp/Apache_*/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \
 		${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \
-		${TAR} cfj ${WRKDIR}/../OOo-SDK_${PACKAGE_BASENAME}_install_en-US.tbz ${INSTALLATION_BASEDIR}_sdk
+		${TAR} cfj ${WRKDIR}/../${PACKAGE_PREFIX}-SDK_${PACKAGE_MIDDLE}_install_en-US.tbz ${INSTALLATION_BASEDIR}_sdk
 
 ure:
-	@${ECHO_MSG} "===>   Make Uno Runtime Environment of OpenOffice.org"
+	@${ECHO_MSG} "===>   Make Uno Runtime Environment of Apache OpenOffice"
 	@${RM} -fr ${WRKDIR}/ure_tmp
 	@${MKDIR} ${WRKDIR}/ure_tmp
 	@cd ${WRKDIR}/ure_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/URE/bsd/install/${LOCALIZED_LANG}/freebsd/openoffice*.t?z
-	@cd ${WRKDIR}/ure_tmp/opt/openoffice* ; \
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/URE/archive/install/${LOCALIZED_LANG}/Apache_OpenOffice_*URE*.tar.gz
+	@cd ${WRKDIR}/ure_tmp/Apache_OpenOffice*URE* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
 		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
-		${TAR} cfj ${WRKDIR}/../OOo-URE_${PACKAGE_BASENAME}_install_en-US.tbz ${INSTALLATION_BASEDIR}
-
+		${TAR} cfj ${WRKDIR}/../${PACKAGE_PREFIX}-URE_${PACKAGE_MIDDLE}_install_en-US.tbz ${INSTALLATION_BASEDIR}
 solver:
-	@${ECHO_MSG} "===>   Make Solver of OpenOffice.org"
-	@cd ${WRKSRC} ; ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_solver.tar.bz2 solver
+	@${ECHO_MSG} "===>   Make Solver of Apache OpenOffice"
+	@cd ${WRKSRC} ; ${TAR} cfj ${WRKDIR}/../${PACKAGE_PREFIX}-solver_${PACKAGE_MIDDLE}.tar.bz2 solver
 
 languagepack:
-	@${ECHO_MSG} "===>   Make languagepack of OpenOffice.org"
+	@${ECHO_MSG} "===>   Make languagepack of Apache OpenOffice"
 .if defined (ALL_LOCALIZED_LANGS)
 	@cd ${WRKSRC} ; ${BASH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack'
 .else
@@ -57,15 +55,15 @@ languagepack:
 	@${RM} -fr ${WRKDIR}/langpack_tmp
 	@${MKDIR} ${WRKDIR}/langpack_tmp
 .if defined (LOCALIZED_LANG)
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd/ ; ls openoffice*.t?z ooobasis*.t?z > ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/archive/install/${LOCALIZED_LANG} ; ls Apache_OpenOffice*tar.* > ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK
 	@cd ${WRKDIR}/langpack_tmp ; \
 	for i in `${CAT} ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK`; do \
                 ${ECHO_CMD} "extracting $$i" ; \
-                cd ${WRKDIR}/langpack_tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd/$$i ; \
+                cd ${WRKDIR}/langpack_tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/archive/install/${LOCALIZED_LANG}/$$i ; \
         done
-	@cd ${WRKDIR}/langpack_tmp/opt/ ; \
+	@cd ${WRKDIR}/langpack_tmp/Apache_OpenOffice*/ ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
 		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
-		${TAR} cfj ${WRKDIR}/../OOo_${PACKAGE_BASENAME}_langpack_${LOCALIZED_LANG}.tbz ${INSTALLATION_BASEDIR}
+		${TAR} cfj ${WRKDIR}/../${PACKAGE_PREFIX}_${PACKAGE_MIDDLE}_langpack_${LOCALIZED_LANG}.tbz ${INSTALLATION_BASEDIR}
 .endif
 .endif
diff --git a/editors/openoffice-3/files/generate.pl b/editors/openoffice-3/files/generate.pl
index 3698de722a46..d5871e7b2550 100644
--- a/editors/openoffice-3/files/generate.pl
+++ b/editors/openoffice-3/files/generate.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
-# generate full build shell script for OpenOffice.org
+# generate full build shell script for Apache OpenOffice
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/generate.pl,v 1.14 2012-05-09 03:27:05 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/generate.pl,v 1.15 2012-05-09 03:48:16 maho Exp $
 
 print "#!/bin/csh\n";
 print "make deinstall clean\n";
diff --git a/editors/openoffice-3/files/openoffice.org-wrapper b/editors/openoffice-3/files/openoffice-wrapper
index 7155c7d69896..70bf6241f18b 100644
--- a/editors/openoffice-3/files/openoffice.org-wrapper
+++ b/editors/openoffice-3/files/openoffice-wrapper
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/Attic/openoffice.org-wrapper,v 1.6 2012-05-09 03:27:05 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/openoffice-wrapper,v 1.17 2012-05-09 03:48:16 maho Exp $
 
 oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/%%OOODIR%%
 program=`echo $0 | sed -e 's|.*-%%OOOVERSION%%-||'`
diff --git a/editors/openoffice-3/files/patch-bridges b/editors/openoffice-3/files/patch-bridges
new file mode 100644
index 000000000000..9fe7a8c2772a
--- /dev/null
+++ b/editors/openoffice-3/files/patch-bridges
@@ -0,0 +1,12 @@
+Build fix for gcc46
+
+--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx~	2012-02-19 18:18:25.000000000 +0900
++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx	2012-02-20 18:03:45.000000000 +0900
+@@ -23,6 +23,7 @@
+ 
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_bridges.hxx"
++#include <exception>
+ 
+ #include <stdio.h>
+ #include <string.h>
diff --git a/editors/openoffice-3/files/patch-connectivity b/editors/openoffice-3/files/patch-connectivity
deleted file mode 100644
index b54ace581f74..000000000000
--- a/editors/openoffice-3/files/patch-connectivity
+++ /dev/null
@@ -1,22 +0,0 @@
---- connectivity/source/parse/sqlbison.y.orig	2011-01-18 05:32:30.000000000 -0800
-+++ connectivity/source/parse/sqlbison.y	2012-02-13 14:03:12.000000000 -0800
-@@ -4334,7 +4334,7 @@
- }
- 
- // -------------------------------------------------------------------------
--void OSQLParser::error(sal_Char *fmt)
-+void OSQLParser::error(const sal_Char *fmt)
- {
- 	if(!m_sErrorMessage.getLength())
- 	{
---- connectivity/inc/connectivity/sqlparse.hxx.orig	2011-01-18 05:32:29.000000000 -0800
-+++ connectivity/inc/connectivity/sqlparse.hxx	2012-02-13 17:06:06.000000000 -0800
-@@ -232,7 +232,7 @@
-         // returns the type for a parameter in a given function name
-         static sal_Int32 getFunctionParameterType(sal_uInt32 _nTokenId,sal_uInt32 _nPos);
- 
--		void error(sal_Char *fmt);
-+		void error(const sal_Char *fmt);
- 		int SQLlex();
- #ifdef YYBISON
- 		void setParseTree(OSQLParseNode * pNewParseTree);
diff --git a/editors/openoffice-3/files/patch-freebsd.mk b/editors/openoffice-3/files/patch-freebsd.mk
new file mode 100644
index 000000000000..81ad7207f48a
--- /dev/null
+++ b/editors/openoffice-3/files/patch-freebsd.mk
@@ -0,0 +1,19 @@
+--- solenv/gbuild/platform/freebsd.mk~	2011-12-24 18:45:27.000000000 +0900
++++ solenv/gbuild/platform/freebsd.mk	2011-12-25 11:01:37.000000000 +0900
+@@ -120,6 +120,7 @@
+ 	-Wl,-z,combreloc \
+ 	-Wl,-z,defs \
+ 	$(subst -L../lib , ,$(SOLARLIB)) \
++	%%RPATH%% \
+ 
+ ifeq ($(HAVE_LD_HASH_STYLE),TRUE)
+ gb_LinkTarget_LDFLAGS += \
+@@ -302,7 +302,7 @@
+ 	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
+ 
+ define gb_Library_get_rpath
+-'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1)))' \
++-Wl,-z,origin '-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1)))' \
+ '-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'
+ endef
+ 
diff --git a/editors/openoffice-3/files/patch-gperf b/editors/openoffice-3/files/patch-gperf
new file mode 100644
index 000000000000..0454c88f6ffc
--- /dev/null
+++ b/editors/openoffice-3/files/patch-gperf
@@ -0,0 +1,11 @@
+--- oox/source/token/makefile.mk~	2011-12-21 09:52:48.000000000 +0900
++++ oox/source/token/makefile.mk	2011-12-25 13:12:55.000000000 +0900
+@@ -48,7 +48,7 @@
+ 
+ .INCLUDE :  target.mk
+ .IF "$(GPERF)" == "" || !DEFINED $(GPERF)
+-GPERF=gperf
++GPERF=/usr/local/bin/gperf
+ .ENDIF
+ 
+ GENHEADERPATH = $(INCCOM)$/oox$/token
diff --git a/editors/openoffice-3/files/patch-graphite b/editors/openoffice-3/files/patch-graphite
new file mode 100644
index 000000000000..c087ebebf3e4
--- /dev/null
+++ b/editors/openoffice-3/files/patch-graphite
@@ -0,0 +1,17 @@
+--- graphite/graphite-2.3.1.patch	2012-02-19 18:21:39.000000000 +0900
++++ graphite/graphite-2.3.1.patch	2012-02-20 08:13:43.000000000 +0900
+@@ -2394,3 +2394,14 @@
+  {
+  	bool fRet = true;
+  
++--- misc/silgraphite-2.3.1/engine/include/graphite/GrFeature.h	2009-01-22 07:36:40.000000000 +0900
+++++ misc/build/silgraphite-2.3.1/engine/include/graphite/GrFeature.h	2012-02-20 08:09:33.000000000 +0900
++@@ -21,6 +21,8 @@
++ 
++ //:End Ignore
++ 
+++#define wstring basic_string<wchar_t> //quick dirty hack for not finding _STL::wstring
+++
++ #include "GrAppData.h"
++ 
++ namespace gr
diff --git a/editors/openoffice-3/files/patch-i102181 b/editors/openoffice-3/files/patch-i102181
deleted file mode 100644
index b649ffcb87c8..000000000000
--- a/editors/openoffice-3/files/patch-i102181
+++ /dev/null
@@ -1,34 +0,0 @@
---- openssl/makefile.mk.orig	2010-07-17 07:41:38.000000000 +0900
-+++ openssl/makefile.mk	2010-07-17 17:23:07.000000000 +0900
-@@ -64,7 +64,7 @@
- 
- UNAME=$(shell uname)
- 
--.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
-+.IF "$(OS)" == "LINUX"
- 	PATCH_FILES=openssllnx.patch
- 	ADDITIONAL_FILES:= \
- 		libcrypto_OOo_0_9_8o.map \
-@@ -110,6 +110,22 @@
- 	.ENDIF
- .ENDIF
- 
-+.IF "$(OS)" == "FREEBSD"
-+	PATCH_FILES=openssllnx.patch
-+	ADDITIONAL_FILES:= \
-+		libcrypto_OOo_0_9_8o.map \
-+		libssl_OOo_0_9_8o.map
-+	.IF "$(CPU)" == "I"
-+		CONFIGURE_ACTION=Configure BSD-x86-elf
-+	.ELIF "$(BUILD64)" == "1"
-+		CONFIGURE_ACTION=Configure BSD-x86_64
-+	.ELSE
-+		CONFIGURE_ACTION=Configure BSD-generic32
-+	.ENDIF
-+	# if you build openssl as shared library you have to patch the Makefile.Shared "LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \"
-+	#BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8e.map'
-+.ENDIF
-+
- .IF "$(OS)" == "WNT"
- 
- .IF "$(COM)"=="GCC"
diff --git a/editors/openoffice-3/files/patch-i102183 b/editors/openoffice-3/files/patch-i102183
deleted file mode 100644
index e5293feef0ce..000000000000
--- a/editors/openoffice-3/files/patch-i102183
+++ /dev/null
@@ -1,36 +0,0 @@
---- redland/raptor/raptor-1.4.18.patch.autotools	2009-07-11 13:49:32.000000000 +0900
-+++ redland/raptor/raptor-1.4.18.patch.autotools	2009-07-11 13:52:31.000000000 +0900
-@@ -40,7 +40,7 @@
- -	  major=".$current"
- -	  versuffix=".$current";
- +	  major=.`expr $current - $age`
--+	  versuffix="$major.$age.$revision"
-++	  versuffix="$major"
-  	  ;;
-  
-  	irix | nonstopux)
-
-
---- redland/rasqal/rasqal-0.9.16.patch.autotools	2009-07-11 13:49:32.000000000 +0900
-+++ redland/rasqal/rasqal-0.9.16.patch.autotools	2009-07-11 13:52:09.000000000 +0900
-@@ -32,7 +32,7 @@
- -	  major=".$current"
- -	  versuffix=".$current";
- +	  major=.`expr $current - $age`
--+	  versuffix="$major.$age.$revision"
-++	  versuffix="$major"
-  	  ;;
-  
-  	irix | nonstopux)
-
---- redlan_/redland/redland-1.0.8.patch.autotools	2009-07-11 13:49:32.000000000 +0900
-+++ redland/redland/redland-1.0.8.patch.autotools	2009-07-11 13:49:54.000000000 +0900
-@@ -52,7 +52,7 @@
- -	  major=".$current"
- -	  versuffix=".$current";
- +	  major=.`expr $current - $age`
--+	  versuffix="$major.$age.$revision"
-++	  versuffix="$major"
-  	  ;;
-  
-  	irix | nonstopux)
diff --git a/editors/openoffice-3/files/patch-i102184 b/editors/openoffice-3/files/patch-i102184
deleted file mode 100644
index b03694aaca31..000000000000
--- a/editors/openoffice-3/files/patch-i102184
+++ /dev/null
@@ -1,11 +0,0 @@
---- libxslt/libxslt-configure.patch.org	2010-06-06 08:21:40.000000000 +0900
-+++ libxslt/libxslt-configure.patch	2010-06-06 08:21:53.000000000 +0900
-@@ -20,7 +20,7 @@
- -	  major=".$current"
- -	  versuffix=".$current"
- +	  major=.`expr $current - $age`
--+	  versuffix="$major.$age.$revision"
-++	  versuffix="$major"
-  	  ;;
-  
-  	irix | nonstopux)
diff --git a/editors/openoffice-3/files/patch-i103628 b/editors/openoffice-3/files/patch-i103628
deleted file mode 100644
index c3846bc27ae2..000000000000
--- a/editors/openoffice-3/files/patch-i103628
+++ /dev/null
@@ -1,26 +0,0 @@
-very strange workaround indeed.
-
---- qadevOOo/runner/makefile.mk	2009-07-04 12:13:19.000000000 +0900
-+++ qadevOOo/runner/makefile.mk	2009-07-19 09:37:44.000000000 +0900
-@@ -42,6 +42,7 @@ SUBDIRS_RUNNER = util share stats lib co
- 
- JARCOMMANDS_TESTS = $(foreach,i,$(SUBDIRS_TESTS) -C $(CLASSDIR) $i)
- JARCOMMANDS_RUNNER = $(foreach,i,$(SUBDIRS_RUNNER) -C $(CLASSDIR) $i)
-+JAR=${JAVA_HOME}/bin/jar
- 
- # --- Targets ------------------------------------------------------
- .IF "$(SOLAR_JAVA)"=="TRUE"
-@@ -52,11 +53,11 @@ OWNJAR: ALLTAR
- 
- # LLA: parameter v is only verbose, need too long!
- OWNJAR: LIGHT
--    jar cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
-+    ${JAR} cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
- 
- # LLA: parameter v is only verbose, need too long!
- LIGHT:
--    jar cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
-+    ${JAR} cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
- 
- .ELSE
- all:
diff --git a/editors/openoffice-3/files/patch-i103792 b/editors/openoffice-3/files/patch-i103792
deleted file mode 100644
index 9fe82f0ea2ce..000000000000
--- a/editors/openoffice-3/files/patch-i103792
+++ /dev/null
@@ -1,194 +0,0 @@
---- moz/seamonkey-source-1.1.14.patch.orig	2009-08-05 06:24:32.000000000 +0900
-+++ moz/seamonkey-source-1.1.14.patch	2009-08-05 12:23:12.000000000 +0900
-@@ -12,6 +12,7 @@
-  do
-    if test -f "$_config"; then
-      echo "$_config";
-+
- --- misc/mozilla/build/cygwin-wrapper	2004-08-19 01:18:55.000000000 +0200
- +++ misc/build/mozilla/build/cygwin-wrapper	2008-08-14 16:22:21.000000000 +0200
- @@ -1,4 +1,4 @@
-@@ -86,7 +87,7 @@
-  PYTHON = @MOZ_PYTHON@
- --- misc/mozilla/config/config.mk	2008-01-29 20:30:22.000000000 +0100
- +++ misc/build/mozilla/config/config.mk	2008-08-14 16:22:21.000000000 +0200
--@@ -758,6 +758,23 @@
-+@@ -758,6 +758,30 @@
-  endif
-  
-  #
-@@ -106,6 +107,13 @@
- +endif # IS_COMPONENT
- +endif # SunOS
- +
-++ifeq ($(OS_ARCH),FreeBSD)
-++EXTRA_DSO_LDOPTS += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
-++ifdef IS_COMPONENT
-++EXTRA_DSO_LDOPTS += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN/..:\$$ORIGIN/../../ure-link/lib
-++endif # IS_COMPONENT
-++endif # FreeBSD
-++
- +#
-  # Include any personal overrides the user might think are needed.
-  #
-@@ -5810,7 +5818,7 @@
-      else
- --- misc/mozilla/nsprpub/lib/ds/Makefile.in	2006-12-22 14:47:17.000000000 +0100
- +++ misc/build/mozilla/nsprpub/lib/ds/Makefile.in	2008-08-14 16:22:21.000000000 +0200
--@@ -79,18 +79,22 @@
-+@@ -79,18 +79,26 @@
-  OS_LIBS = -lc
-  endif
-  
-@@ -5818,6 +5826,10 @@
- +MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
- +endif
- +
-++ifeq ($(OS_ARCH),FreeBSD)
-++MKSHLIB += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
-++endif
-++
-  ifeq ($(OS_ARCH),SunOS)
-  OS_LIBS = -lc
-  MAPFILE = $(OBJDIR)/pldsmap.sun
-@@ -5838,7 +5850,7 @@
-  # dependencies in the same directory where it resides.
- --- misc/mozilla/nsprpub/lib/libc/src/Makefile.in	2006-12-22 14:47:17.000000000 +0100
- +++ misc/build/mozilla/nsprpub/lib/libc/src/Makefile.in	2008-08-14 16:22:21.000000000 +0200
--@@ -89,18 +89,22 @@
-+@@ -89,18 +89,26 @@
-  OS_LIBS = -lc
-  endif
-  
-@@ -5846,6 +5858,10 @@
- +MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
- +endif
- +
-++ifeq ($(OS_ARCH),FreeBSD)
-++MKSHLIB += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
-++endif
-++
-  ifeq ($(OS_ARCH),SunOS)
-  OS_LIBS = -lc
-  MAPFILE = $(OBJDIR)/plcmap.sun
-@@ -6353,3 +6369,120 @@
-  
-  clean clobber::
-  	rm -rf $(DIST)/$(APP_NAME).app
-+
-+--- misc/mozilla/security/coreconf/FreeBSD.mk	2009-06-28 16:28:27.000000000 +0900
-++++ misc/build/mozilla/security/coreconf/FreeBSD.mk	2009-06-28 16:25:10.000000000 +0900
-+@@ -52,6 +52,7 @@
-+ 
-+ DSO_CFLAGS		= -fPIC
-+ DSO_LDOPTS		= -shared -Wl,-soname -Wl,$(notdir $@)
-++DSO_LDOPTS		+= -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
-+ 
-+ #
-+ # The default implementation strategy for FreeBSD is pthreads.
-+--- misc/mozilla/config/mkdepend/imakemdep.h	2009-06-29 02:48:45.000000000 +0900
-++++ misc/build/mozilla/config/mkdepend/imakemdep.h	2009-06-29 02:48:01.000000000 +0900
-+@@ -277,8 +277,8 @@
-+ # ifdef __i386__
-+ 	"-D__i386__",
-+ # endif
-+-# ifdef __x86_64__
-+-	"-D__x86_64__",
-++# if defined(__amd64__) || defined(__x86_64__)
-++       "-D__amd64__ -D__x86_64__",
-+ # endif
-+ # ifdef __GNUC__
-+ 	"-traditional",
-+
-+--- misc/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in	2009-07-02 10:03:28.000000000 +0900
-++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in	2009-07-02 10:14:17.000000000 +0900
-+@@ -249,6 +249,10 @@
-+ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -pthread
-+ endif
-+ 
-++ifeq ($(OS_ARCH), FreeBSD)
-++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
-++endif
-++
-+ ###########################################################################
-+ 
-+ ifeq ($(USE_DLL_EXPORTS_FILE), 1)
-+@@ -306,7 +306,7 @@
-+ ifdef SO_FILES_TO_REMOVE
-+ 	-$(RM) $(SO_FILES_TO_REMOVE)
-+ endif
-+-ifneq (,$(filter AIX Linux HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD, $(OS_ARCH)))
-++ifneq (,$(filter AIX Linux HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD FreeBSD, $(OS_ARCH)))
-+ 	$(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a
-+ else
-+ ifeq ($(OS_ARCH),OS2)
-+
-+########################################
-+following is re_comp issue. FBSD has re_comp in /usr/lib/libcompat.a,
-+but since re_comp, re_exec are deprecated, shared libs are not provided.
-+This causes a problem for amd64 arch at extension project like following:
-+
-+Making: ../../../unxfbsdx.pro/lib/ldapbe2.uno.so
-+ccache c++ -Wl,-z,combreloc -Wl,-rpath,'$ORIGIN:$ORIGIN/../ure-link/lib' -shared -L../../../unxfbsdx.pro/lib -L../lib -L/work/seamonkey/ports/editors/openoffice.org-3-devel/work/moz2seamonkey01/solenv/unxfbsdx/lib -L/work/seamonkey/ports/editors/openoffice.org-3-devel/work/moz2seamonkey01/solver/300/unxfbsdx.pro/lib -L/work/seamonkey/ports/editors/openoffice.org-3-devel/work/moz2seamonkey01/solenv/unxfbsdx/lib -L/usr/local/diablo-jdk1.6.0/lib -L/usr/local/diablo-jdk1.6.0/jre/lib/amd64 -L/usr/local/diablo-jdk1.6.0/jre/lib/amd64/server -L/usr/local/diablo-jdk1.6.0/jre/lib/amd64/native_threads -L/usr/local/lib ../../../unxfbsdx.pro/slo/ldapbe2.uno_version.o -o ../../../unxfbsdx.pro/lib/ldapbe2.uno.so ../../../unxfbsdx.pro/slo/ldapuserprofilebe.o ../../../unxfbsdx.pro/slo/ldapuserprof.o ../../../unxfbsdx.pro/slo/ldapaccess.o ../../../unxfbsdx.pro/slo/ldapuserprofilelayer.o ../../../unxfbsdx.pro/slo/propertysethelper.o ../../../unxfbsdx.pro/slo/componentdef.o -lldap50 -luno_cppuhelpergcc3 -luno_cppu -luno_salhelpergcc3 -luno_sal -lcompat -Wl,-Bstatic -llber50 -pthread -lm -Wl,-Bdynamic -lstlport_gcc
-+/usr/bin/ld: /usr/lib/libcompat.a(regex.o): relocation R_X86_64_32 can not be used when making a shared object; recompile with -fPIC
-+/usr/lib/libcompat.a: could not read symbols: Bad value
-+dmake:  Error code 1, while making '../../../unxfbsdx.pro/lib/ldapbe2.uno.so'
-+.
-+
-+However, simply activating via "#define NEED_BSDREGEX" doesn't work as
-+regex.h in seamonkey and /usr/include/unistd.h conflicts. We cannot
-+stop include unistd.h :-(
-+
-+In file included from getfilter.c:53:
-+../../../ldap/include/regex.h:76: error: conflicting types for 're_comp'
-+/usr/include/unistd.h:516: error: previous declaration of 're_comp' was here
-+../../../ldap/include/regex.h:77: error: conflicting types for 're_exec'
-+/usr/include/unistd.h:517: error: previous declaration of 're_exec' was here
-+
-+--- misc/mozilla/directory/c-sdk/ldap/include/portable.h	2006-02-03 23:44:40.000000000 +0900
-++++ misc/build/mozilla/directory/c-sdk/ldap/include/portable.h	2009-07-02 10:35:23.000000000 +0900
-+@@ -131,7 +131,7 @@
-+  * some systems don't have the BSD re_comp and re_exec routines
-+  */
-+ #ifndef NEED_BSDREGEX
-+-#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
-++#if ( defined( SYSV ) || defined( NETBSD ) || defined( FREEBSD ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
-+ #define NEED_BSDREGEX
-+ #endif
-+ #endif
-+
-+--- misc/mozilla/directory/c-sdk/ldap/libraries/libldap/regex.c	2006-02-03 23:44:42.000000000 +0900
-++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/regex.c	2009-07-02 11:05:54.000000000 +0900
-+@@ -267,7 +267,7 @@
-+  
-+ char *     
-+ LDAP_CALL
-+-re_comp( char *pat )
-++re_comp( const char *pat )
-+ {
-+ 	register REGEXCHAR *p;          /* pattern pointer   */
-+ 	register REGEXCHAR *mp=nfa;     /* nfa pointer       */
-+@@ -513,7 +513,7 @@
-+ 
-+ int
-+ LDAP_CALL
-+-re_exec( char *lp )
-++re_exec( const char *lp )
-+ {
-+ 	register REGEXCHAR c;
-+ 	register REGEXCHAR *ep = 0;
-+--- misc/mozilla/directory/c-sdk/ldap/include/regex.h	2006-02-03 23:44:40.000000000 +0900
-++++ misc/build/mozilla/directory/c-sdk/ldap/include/regex.h	2009-07-02 11:05:24.000000000 +0900
-+@@ -73,8 +73,8 @@
-+ int re_init( void );
-+ void re_lock( void );
-+ int re_unlock( void );
-+-char * LDAP_CALL re_comp( char *pat );
-+-int LDAP_CALL re_exec( char *lp );
-++char * LDAP_CALL re_comp( const char *pat );
-++int LDAP_CALL re_exec( const char *lp );
-+ void LDAP_CALL re_modw( char *s );
-+ int LDAP_CALL re_subs( char *src, char *dst );
-+ #else /* NEEDPROTOS */
-+
-+
diff --git a/editors/openoffice-3/files/patch-i104014 b/editors/openoffice-3/files/patch-i104014
deleted file mode 100644
index 16460e43a476..000000000000
--- a/editors/openoffice-3/files/patch-i104014
+++ /dev/null
@@ -1,243 +0,0 @@
---- solenv/inc/unxfbsd.mk.orig	2009-12-12 18:29:11.000000000 +0900
-+++ solenv/inc/unxfbsd.mk	2009-12-13 12:17:38.000000000 +0900
-@@ -30,27 +30,24 @@
- #*************************************************************************
- 
- # Makefile for FreeBSD.
--
--ASM=
--AFLAGS=
--
-+ASM*=
-+AFLAGS*=
- SOLAR_JAVA*=
-+# default optimization level for product code
-+CDEFAULTOPT*=-O2
-+# architecture dependent flags for the C and C++ compiler that can be changed by
-+# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-+ARCH_FLAGS*=
-+# position independent code switch
-+PICSWITCH*:=-fpic
- JAVAFLAGSDEBUG=-g
- 
--# Include arch specific makefile.
--.IF "$(CPUNAME)" == "INTEL"
--.INCLUDE : unxfbsdi.mk
--.ENDIF
--.IF "$(CPUNAME)" == "X86_64"
--.INCLUDE : unxfbsdx.mk
--.ENDIF
--
- # filter for supressing verbose messages from linker
- #not needed at the moment
- #LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
- 
- # _PTHREADS is needed for the stl
--CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
-+CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
- 
- # enable visibility define in "sal/types.h"
- .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-@@ -72,7 +69,7 @@
- # name of C Compiler
- CC*=gcc
- .IF "$(SYSBASE)"!=""
--CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include
-+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
- CXX+:=$(CFLAGS_SYSBASE)
- CC+:=$(CFLAGS_SYSBASE)
- .ENDIF          # "$(SYSBASE)"!=""
-@@ -95,11 +92,14 @@
- 
- # -fpermissive should be removed as soon as possible
- CFLAGSCXX= -pipe $(ARCH_FLAGS)
--PICSWITCH:=-fpic
- .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
- CFLAGSCXX += -fvisibility-inlines-hidden
- .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
- 
-+CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
-+CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch
-+CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
-+
- # 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
-@@ -113,6 +113,12 @@
- # Compiler flags for debugging
- CFLAGSDEBUG=-g
- CFLAGSDBGUTIL=
-+# Compiler flags for enabling optimizations
-+.IF "$(PRODUCT)"!=""
-+CFLAGSOPT=$(CDEFAULTOPT) -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
-@@ -141,19 +147,25 @@
- 
- # default linker flags
- LINKFLAGSDEFS*=#-Wl,-z,defs
--LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
--LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
-+LINKFLAGSRUNPATH_URELIB=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\'
-+LINKFLAGSRUNPATH_UREBIN=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
-     #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
--LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
--LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
--LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
-+LINKFLAGSRUNPATH_OOO=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-+LINKFLAGSRUNPATH_SDK=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
-+LINKFLAGSRUNPATH_BRAND=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
- LINKFLAGSRUNPATH_OXT=
- LINKFLAGSRUNPATH_NONE=
--LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
-+# flag -Wl,-z,noexecstack sets the NX bit on the stack
-+LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS)
-+.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)"  == "TRUE"
-+LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
-+.ENDIF
- 
- # linker flags for linking applications
--LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
--LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
-+    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
-+    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
- 
- # linker flags for linking shared libraries
- LINKFLAGSSHLGUI= -shared
-@@ -176,18 +188,30 @@
- STDLIBCPP=-lstdc++
- 
- # default objectfilenames to link
--STDOBJVCL=$(L)/salmain.o
-+STDOBJVCL=$(L)$/salmain.o
- STDOBJGUI=
- STDSLOGUI=
- STDOBJCUI=
- STDSLOCUI=
- 
-+.IF "$(ALLOC)" == "TCMALLOC"
-+STDLIBGUIMT+=-ltcmalloc
-+STDLIBCUIMT+=-ltcmalloc
-+STDSHLGUIMT+=-ltcmalloc
-+STDSHLCUIMT+=-ltcmalloc
-+.ENDIF
-+.IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
-+LINKFLAGS += -Wl,--hash-style=both
-+.ELSE
-+LINKFLAGS += -Wl,-zdynsort
-+.ENDIF
-+
- # libraries for linking applications
--STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
--STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-+STDLIBGUIMT+=-Wl,--as-needed -lX11 $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
-+STDLIBCUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
- # libraries for linking shared libraries
--STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
--STDSHLCUIMT=$(PTHREAD_LIBS) -lm
-+STDSHLGUIMT+=-Wl,--as-needed -lX11 -lXext $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
-+STDSHLCUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
- 
- LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
- 
-@@ -212,7 +236,7 @@
- #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
- 
- # name of library manager
--LIBMGR=ar
-+LIBMGR*=ar
- LIBFLAGS=-r
- 
- # tool for generating import libraries
-@@ -231,3 +255,4 @@
- # platform specific identifier for shared libs
- DLLPRE=lib
- DLLPOST=.so
-+PCHPOST=.gch
-
-
---- solenv/inc/unxfbsdi.mk.org	2009-12-13 12:11:43.000000000 +0900
-+++ solenv/inc/unxfbsdi.mk	2009-12-13 12:13:15.000000000 +0900
-@@ -29,22 +29,13 @@
- #
- #*************************************************************************
- 
--#
- # FreBSD/i386 specific defines
--#
-  
--CDEFS+=-DX86
--
- # architecture dependent flags for the C and C++ compiler that can be changed by
- # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-+CDEFAULTOPT=-Os
- ARCH_FLAGS*=-mtune=pentiumpro
--
--# Compiler flags for enabling optimizations
--.IF "$(PRODUCT)"!=""
--CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
--.ELSE 	# "$(PRODUCT)"!=""
--CFLAGSOPT= 					# no optimizing for non products
--.ENDIF	# "$(PRODUCT)"!=""
--
--# platform specific identifier for shared libs
-+.INCLUDE : unxfbsd.mk
-+CDEFS+=-DX86
-+DLLPOST=.so
- DLLPOSTFIX=fi
-
---- solenv/inc/unxfbsdx.mk	2009-12-13 12:16:16.000000000 +0900
-+++ solenv/inc/unxfbsdx.mk	2009-12-13 12:54:57.000000000 +0900
-@@ -29,25 +29,10 @@
- #
- #*************************************************************************
- 
--#
- # FreBSD/amd64 specific defines
--#
--
-+.INCLUDE : unxfbsd.mk
- CDEFS+=-DX86_64
--
--# architecture dependent flags for the C and C++ compiler that can be changed by
--# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
--.IF "$(CPUNAME)" == "X86_64"
--ARCH_FLAGS*=
--.ENDIF
--
--# 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)"!=""
--
--# platform specific identifier for shared libs
-+#MODULES_WITH_WARNINGS+=\
-+#    svx
- DLLPOSTFIX=fx
- BUILD64=1
-
---- solenv/inc/unx.mk	2009-12-12 18:44:35.000000000 +0900
-+++ solenv/inc/unx.mk	2009-12-13 17:15:50.000000000 +0900
-@@ -147,8 +147,12 @@
- .INCLUDE : unxbsds.mk
- .ENDIF
- 
--.IF "$(COM)$(OS)" == "GCCFREEBSD"
--.INCLUDE : unxfbsd.mk
-+.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI"
-+.INCLUDE : unxfbsdi.mk
-+.ENDIF
-+
-+.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDX"
-+.INCLUDE : unxfbsdx.mk
- .ENDIF
- 
- .IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"
diff --git a/editors/openoffice-3/files/patch-i104015 b/editors/openoffice-3/files/patch-i104015
deleted file mode 100644
index 72147bd49e23..000000000000
--- a/editors/openoffice-3/files/patch-i104015
+++ /dev/null
@@ -1,13 +0,0 @@
-origin support
-
---- stlport/STLport-4.5.patch~	2009-07-23 10:00:59.000000000 +0900
-+++ stlport/STLport-4.5.patch	2009-08-03 01:33:01.000000000 +0900
-@@ -137,7 +137,7 @@
- +#
- +#
- +LINK=ar cr
--+DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} --fexceptions -shared -o
-++DYN_LINK=${CXX} -Wl,-z,origin -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} --fexceptions -shared -o
- +
- +OBJEXT=o
- +DYNEXT=so
diff --git a/editors/openoffice-3/files/patch-i105629 b/editors/openoffice-3/files/patch-i105629
deleted file mode 100644
index 76e176897dcf..000000000000
--- a/editors/openoffice-3/files/patch-i105629
+++ /dev/null
@@ -1,615 +0,0 @@
---- python/Python-2.6.1.patch.orig	2009-10-03 22:08:45.000000000 +0200
-+++ python/Python-2.6.1.patch	2009-10-03 23:00:22.000000000 +0200
-@@ -127,7 +127,7 @@
-          # Skip platforms with known problems forking from a worker thread.
-          # See http://bugs.python.org/issue3863.
- -        if sys.platform in ('freebsd4', 'freebsd5', 'freebsd6', 'os2emx'):
--+        if sys.platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'os2emx'):
-++        if sys.platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'os2emx'):
-              print >>sys.stderr, ('Skipping test_3_join_in_forked_from_thread'
-                                   ' due to known OS bugs on'), sys.platform
-              return
-@@ -230,3 +230,603 @@
-  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
-  	  INSTSONAME="$LDLIBRARY".$SOVERSION
-            ;;
-+--- misc/Python-2.6.1/Lib/plat-freebsd9/IN.py	1970-01-01 01:00:00.000000000 +0100
-++++ misc/build/Python-2.6.1/Lib/plat-freebsd9/IN.py	2009-10-03 22:43:13.000000000 +0200
-+@@ -0,0 +1,571 @@
-++# Generated by h2py from /usr/include/netinet/in.h
-++
-++# Included from sys/cdefs.h
-++__GNUCLIKE_ASM = 3
-++__GNUCLIKE_ASM = 2
-++__GNUCLIKE___TYPEOF = 1
-++__GNUCLIKE___OFFSETOF = 1
-++__GNUCLIKE___SECTION = 1
-++__GNUCLIKE_ATTRIBUTE_MODE_DI = 1
-++__GNUCLIKE_CTOR_SECTION_HANDLING = 1
-++__GNUCLIKE_BUILTIN_CONSTANT_P = 1
-++__GNUCLIKE_BUILTIN_VARARGS = 1
-++__GNUCLIKE_BUILTIN_STDARG = 1
-++__GNUCLIKE_BUILTIN_VAALIST = 1
-++__GNUC_VA_LIST_COMPATIBILITY = 1
-++__GNUCLIKE_BUILTIN_NEXT_ARG = 1
-++__GNUCLIKE_BUILTIN_MEMCPY = 1
-++__CC_SUPPORTS_INLINE = 1
-++__CC_SUPPORTS___INLINE = 1
-++__CC_SUPPORTS___INLINE__ = 1
-++__CC_SUPPORTS___FUNC__ = 1
-++__CC_SUPPORTS_WARNING = 1
-++__CC_SUPPORTS_VARADIC_XXX = 1
-++__CC_SUPPORTS_DYNAMIC_ARRAY_INIT = 1
-++__CC_INT_IS_32BIT = 1
-++def __P(protos): return protos
-++
-++def __STRING(x): return #x
-++
-++def __XSTRING(x): return __STRING(x)
-++
-++def __P(protos): return ()
-++
-++def __STRING(x): return "x"
-++
-++def __aligned(x): return __attribute__((__aligned__(x)))
-++
-++def __section(x): return __attribute__((__section__(x)))
-++
-++def __aligned(x): return __attribute__((__aligned__(x)))
-++
-++def __section(x): return __attribute__((__section__(x)))
-++
-++def __nonnull(x): return __attribute__((__nonnull__(x)))
-++
-++def __predict_true(exp): return __builtin_expect((exp), 1)
-++
-++def __predict_false(exp): return __builtin_expect((exp), 0)
-++
-++def __predict_true(exp): return (exp)
-++
-++def __predict_false(exp): return (exp)
-++
-++def __format_arg(fmtarg): return __attribute__((__format_arg__ (fmtarg)))
-++
-++def __FBSDID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s)
-++
-++def __RCSID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s)
-++
-++def __RCSID_SOURCE(s): return __IDSTRING(__CONCAT(__rcsid_source_,__LINE__),s)
-++
-++def __SCCSID(s): return __IDSTRING(__CONCAT(__sccsid_,__LINE__),s)
-++
-++def __COPYRIGHT(s): return __IDSTRING(__CONCAT(__copyright_,__LINE__),s)
-++
-++_POSIX_C_SOURCE = 199009
-++_POSIX_C_SOURCE = 199209
-++__XSI_VISIBLE = 600
-++_POSIX_C_SOURCE = 200112
-++__XSI_VISIBLE = 500
-++_POSIX_C_SOURCE = 199506
-++_POSIX_C_SOURCE = 198808
-++__POSIX_VISIBLE = 200112
-++__ISO_C_VISIBLE = 1999
-++__POSIX_VISIBLE = 199506
-++__ISO_C_VISIBLE = 1990
-++__POSIX_VISIBLE = 199309
-++__ISO_C_VISIBLE = 1990
-++__POSIX_VISIBLE = 199209
-++__ISO_C_VISIBLE = 1990
-++__POSIX_VISIBLE = 199009
-++__ISO_C_VISIBLE = 1990
-++__POSIX_VISIBLE = 198808
-++__ISO_C_VISIBLE = 0
-++__POSIX_VISIBLE = 0
-++__XSI_VISIBLE = 0
-++__BSD_VISIBLE = 0
-++__ISO_C_VISIBLE = 1990
-++__POSIX_VISIBLE = 0
-++__XSI_VISIBLE = 0
-++__BSD_VISIBLE = 0
-++__ISO_C_VISIBLE = 1999
-++__POSIX_VISIBLE = 200112
-++__XSI_VISIBLE = 600
-++__BSD_VISIBLE = 1
-++__ISO_C_VISIBLE = 1999
-++
-++# Included from sys/_types.h
-++
-++# Included from machine/_types.h
-++
-++# Included from machine/endian.h
-++_QUAD_HIGHWORD = 1
-++_QUAD_LOWWORD = 0
-++_LITTLE_ENDIAN = 1234
-++_BIG_ENDIAN = 4321
-++_PDP_ENDIAN = 3412
-++_BYTE_ORDER = _LITTLE_ENDIAN
-++LITTLE_ENDIAN = _LITTLE_ENDIAN
-++BIG_ENDIAN = _BIG_ENDIAN
-++PDP_ENDIAN = _PDP_ENDIAN
-++BYTE_ORDER = _BYTE_ORDER
-++def __word_swap_int_var(x): return \
-++
-++def __word_swap_int_const(x): return \
-++
-++def __word_swap_int(x): return __word_swap_int_var(x)
-++
-++def __byte_swap_int_var(x): return \
-++
-++def __byte_swap_int_const(x): return \
-++
-++def __byte_swap_int(x): return __byte_swap_int_var(x)
-++
-++def __byte_swap_word_var(x): return \
-++
-++def __byte_swap_word_const(x): return \
-++
-++def __byte_swap_word(x): return __byte_swap_word_var(x)
-++
-++def __htonl(x): return __bswap32(x)
-++
-++def __htons(x): return __bswap16(x)
-++
-++def __ntohl(x): return __bswap32(x)
-++
-++def __ntohs(x): return __bswap16(x)
-++
-++IPPROTO_IP = 0
-++IPPROTO_ICMP = 1
-++IPPROTO_TCP = 6
-++IPPROTO_UDP = 17
-++def htonl(x): return __htonl(x)
-++
-++def htons(x): return __htons(x)
-++
-++def ntohl(x): return __ntohl(x)
-++
-++def ntohs(x): return __ntohs(x)
-++
-++IPPROTO_RAW = 255
-++INET_ADDRSTRLEN = 16
-++IPPROTO_HOPOPTS = 0
-++IPPROTO_IGMP = 2
-++IPPROTO_GGP = 3
-++IPPROTO_IPV4 = 4
-++IPPROTO_IPIP = IPPROTO_IPV4
-++IPPROTO_ST = 7
-++IPPROTO_EGP = 8
-++IPPROTO_PIGP = 9
-++IPPROTO_RCCMON = 10
-++IPPROTO_NVPII = 11
-++IPPROTO_PUP = 12
-++IPPROTO_ARGUS = 13
-++IPPROTO_EMCON = 14
-++IPPROTO_XNET = 15
-++IPPROTO_CHAOS = 16
-++IPPROTO_MUX = 18
-++IPPROTO_MEAS = 19
-++IPPROTO_HMP = 20
-++IPPROTO_PRM = 21
-++IPPROTO_IDP = 22
-++IPPROTO_TRUNK1 = 23
-++IPPROTO_TRUNK2 = 24
-++IPPROTO_LEAF1 = 25
-++IPPROTO_LEAF2 = 26
-++IPPROTO_RDP = 27
-++IPPROTO_IRTP = 28
-++IPPROTO_TP = 29
-++IPPROTO_BLT = 30
-++IPPROTO_NSP = 31
-++IPPROTO_INP = 32
-++IPPROTO_SEP = 33
-++IPPROTO_3PC = 34
-++IPPROTO_IDPR = 35
-++IPPROTO_XTP = 36
-++IPPROTO_DDP = 37
-++IPPROTO_CMTP = 38
-++IPPROTO_TPXX = 39
-++IPPROTO_IL = 40
-++IPPROTO_IPV6 = 41
-++IPPROTO_SDRP = 42
-++IPPROTO_ROUTING = 43
-++IPPROTO_FRAGMENT = 44
-++IPPROTO_IDRP = 45
-++IPPROTO_RSVP = 46
-++IPPROTO_GRE = 47
-++IPPROTO_MHRP = 48
-++IPPROTO_BHA = 49
-++IPPROTO_ESP = 50
-++IPPROTO_AH = 51
-++IPPROTO_INLSP = 52
-++IPPROTO_SWIPE = 53
-++IPPROTO_NHRP = 54
-++IPPROTO_MOBILE = 55
-++IPPROTO_TLSP = 56
-++IPPROTO_SKIP = 57
-++IPPROTO_ICMPV6 = 58
-++IPPROTO_NONE = 59
-++IPPROTO_DSTOPTS = 60
-++IPPROTO_AHIP = 61
-++IPPROTO_CFTP = 62
-++IPPROTO_HELLO = 63
-++IPPROTO_SATEXPAK = 64
-++IPPROTO_KRYPTOLAN = 65
-++IPPROTO_RVD = 66
-++IPPROTO_IPPC = 67
-++IPPROTO_ADFS = 68
-++IPPROTO_SATMON = 69
-++IPPROTO_VISA = 70
-++IPPROTO_IPCV = 71
-++IPPROTO_CPNX = 72
-++IPPROTO_CPHB = 73
-++IPPROTO_WSN = 74
-++IPPROTO_PVP = 75
-++IPPROTO_BRSATMON = 76
-++IPPROTO_ND = 77
-++IPPROTO_WBMON = 78
-++IPPROTO_WBEXPAK = 79
-++IPPROTO_EON = 80
-++IPPROTO_VMTP = 81
-++IPPROTO_SVMTP = 82
-++IPPROTO_VINES = 83
-++IPPROTO_TTP = 84
-++IPPROTO_IGP = 85
-++IPPROTO_DGP = 86
-++IPPROTO_TCF = 87
-++IPPROTO_IGRP = 88
-++IPPROTO_OSPFIGP = 89
-++IPPROTO_SRPC = 90
-++IPPROTO_LARP = 91
-++IPPROTO_MTP = 92
-++IPPROTO_AX25 = 93
-++IPPROTO_IPEIP = 94
-++IPPROTO_MICP = 95
-++IPPROTO_SCCSP = 96
-++IPPROTO_ETHERIP = 97
-++IPPROTO_ENCAP = 98
-++IPPROTO_APES = 99
-++IPPROTO_GMTP = 100
-++IPPROTO_IPCOMP = 108
-++IPPROTO_SCTP = 132
-++IPPROTO_PIM = 103
-++IPPROTO_CARP = 112
-++IPPROTO_PGM = 113
-++IPPROTO_PFSYNC = 240
-++IPPROTO_OLD_DIVERT = 254
-++IPPROTO_MAX = 256
-++IPPROTO_DONE = 257
-++IPPROTO_DIVERT = 258
-++IPPROTO_SPACER = 32767
-++IPPORT_RESERVED = 1024
-++IPPORT_HIFIRSTAUTO = 49152
-++IPPORT_HILASTAUTO = 65535
-++IPPORT_RESERVEDSTART = 600
-++IPPORT_MAX = 65535
-++def IN_CLASSA(i): return (((u_int32_t)(i) & (-2147483648)) == 0)
-++
-++IN_CLASSA_NET = (-16777216)
-++IN_CLASSA_NSHIFT = 24
-++IN_CLASSA_HOST = 0x00ffffff
-++IN_CLASSA_MAX = 128
-++def IN_CLASSB(i): return (((u_int32_t)(i) & (-1073741824)) == (-2147483648))
-++
-++IN_CLASSB_NET = (-65536)
-++IN_CLASSB_NSHIFT = 16
-++IN_CLASSB_HOST = 0x0000ffff
-++IN_CLASSB_MAX = 65536
-++def IN_CLASSC(i): return (((u_int32_t)(i) & (-536870912)) == (-1073741824))
-++
-++IN_CLASSC_NET = (-256)
-++IN_CLASSC_NSHIFT = 8
-++IN_CLASSC_HOST = 0x000000ff
-++def IN_CLASSD(i): return (((u_int32_t)(i) & (-268435456)) == (-536870912))
-++
-++IN_CLASSD_NET = (-268435456)
-++IN_CLASSD_NSHIFT = 28
-++IN_CLASSD_HOST = 0x0fffffff
-++def IN_MULTICAST(i): return IN_CLASSD(i)
-++
-++def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456))
-++
-++def IN_BADCLASS(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456))
-++
-++def IN_LINKLOCAL(i): return (((u_int32_t)(i) & (-65536)) == (-1442971648))
-++
-++def IN_LOCAL_GROUP(i): return (((u_int32_t)(i) & (-256)) == (-536870912))
-++
-++INADDR_NONE = (-1)
-++IN_LOOPBACKNET = 127
-++IP_OPTIONS = 1
-++IP_HDRINCL = 2
-++IP_TOS = 3
-++IP_TTL = 4
-++IP_RECVOPTS = 5
-++IP_RECVRETOPTS = 6
-++IP_RECVDSTADDR = 7
-++IP_SENDSRCADDR = IP_RECVDSTADDR
-++IP_RETOPTS = 8
-++IP_MULTICAST_IF = 9
-++IP_MULTICAST_TTL = 10
-++IP_MULTICAST_LOOP = 11
-++IP_ADD_MEMBERSHIP = 12
-++IP_DROP_MEMBERSHIP = 13
-++IP_MULTICAST_VIF = 14
-++IP_RSVP_ON = 15
-++IP_RSVP_OFF = 16
-++IP_RSVP_VIF_ON = 17
-++IP_RSVP_VIF_OFF = 18
-++IP_PORTRANGE = 19
-++IP_RECVIF = 20
-++IP_IPSEC_POLICY = 21
-++IP_FAITH = 22
-++IP_ONESBCAST = 23
-++IP_FW_TABLE_ADD = 40
-++IP_FW_TABLE_DEL = 41
-++IP_FW_TABLE_FLUSH = 42
-++IP_FW_TABLE_GETSIZE = 43
-++IP_FW_TABLE_LIST = 44
-++IP_FW_ADD = 50
-++IP_FW_DEL = 51
-++IP_FW_FLUSH = 52
-++IP_FW_ZERO = 53
-++IP_FW_GET = 54
-++IP_FW_RESETLOG = 55
-++IP_FW_NAT_CFG = 56
-++IP_FW_NAT_DEL = 57
-++IP_FW_NAT_GET_CONFIG = 58
-++IP_FW_NAT_GET_LOG = 59
-++IP_DUMMYNET_CONFIGURE = 60
-++IP_DUMMYNET_DEL = 61
-++IP_DUMMYNET_FLUSH = 62
-++IP_DUMMYNET_GET = 64
-++IP_RECVTTL = 65
-++IP_MINTTL = 66
-++IP_DONTFRAG = 67
-++IP_ADD_SOURCE_MEMBERSHIP = 70
-++IP_DROP_SOURCE_MEMBERSHIP = 71
-++IP_BLOCK_SOURCE = 72
-++IP_UNBLOCK_SOURCE = 73
-++IP_MSFILTER = 74
-++MCAST_JOIN_GROUP = 80
-++MCAST_LEAVE_GROUP = 81
-++MCAST_JOIN_SOURCE_GROUP = 82
-++MCAST_LEAVE_SOURCE_GROUP = 83
-++MCAST_BLOCK_SOURCE = 84
-++MCAST_UNBLOCK_SOURCE = 85
-++IP_DEFAULT_MULTICAST_TTL = 1
-++IP_DEFAULT_MULTICAST_LOOP = 1
-++IP_MIN_MEMBERSHIPS = 31
-++IP_MAX_MEMBERSHIPS = 4095
-++IP_MAX_SOURCE_FILTER = 1024
-++MCAST_INCLUDE = 1
-++MCAST_EXCLUDE = 2
-++IP_PORTRANGE_DEFAULT = 0
-++IP_PORTRANGE_HIGH = 1
-++IP_PORTRANGE_LOW = 2
-++IPPROTO_MAXID = (IPPROTO_AH + 1)
-++IPCTL_FORWARDING = 1
-++IPCTL_SENDREDIRECTS = 2
-++IPCTL_DEFTTL = 3
-++IPCTL_DEFMTU = 4
-++IPCTL_RTEXPIRE = 5
-++IPCTL_RTMINEXPIRE = 6
-++IPCTL_RTMAXCACHE = 7
-++IPCTL_SOURCEROUTE = 8
-++IPCTL_DIRECTEDBROADCAST = 9
-++IPCTL_INTRQMAXLEN = 10
-++IPCTL_INTRQDROPS = 11
-++IPCTL_STATS = 12
-++IPCTL_ACCEPTSOURCEROUTE = 13
-++IPCTL_FASTFORWARDING = 14
-++IPCTL_KEEPFAITH = 15
-++IPCTL_GIF_TTL = 16
-++IPCTL_MAXID = 17
-++def in_nullhost(x): return ((x).s_addr == INADDR_ANY)
-++
-++
-++# Included from netinet6/in6.h
-++__KAME_VERSION = "FreeBSD"
-++IPV6PORT_RESERVED = 1024
-++IPV6PORT_ANONMIN = 49152
-++IPV6PORT_ANONMAX = 65535
-++IPV6PORT_RESERVEDMIN = 600
-++IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1)
-++INET6_ADDRSTRLEN = 46
-++IPV6_ADDR_INT32_ONE = 1
-++IPV6_ADDR_INT32_TWO = 2
-++IPV6_ADDR_INT32_MNL = (-16711680)
-++IPV6_ADDR_INT32_MLL = (-16646144)
-++IPV6_ADDR_INT32_SMP = 0x0000ffff
-++IPV6_ADDR_INT16_ULL = 0xfe80
-++IPV6_ADDR_INT16_USL = 0xfec0
-++IPV6_ADDR_INT16_MLL = 0xff02
-++IPV6_ADDR_INT32_ONE = 0x01000000
-++IPV6_ADDR_INT32_TWO = 0x02000000
-++IPV6_ADDR_INT32_MNL = 0x000001ff
-++IPV6_ADDR_INT32_MLL = 0x000002ff
-++IPV6_ADDR_INT32_SMP = (-65536)
-++IPV6_ADDR_INT16_ULL = 0x80fe
-++IPV6_ADDR_INT16_USL = 0xc0fe
-++IPV6_ADDR_INT16_MLL = 0x02ff
-++def IN6_IS_ADDR_UNSPECIFIED(a): return \
-++
-++def IN6_IS_ADDR_LOOPBACK(a): return \
-++
-++def IN6_IS_ADDR_V4COMPAT(a): return \
-++
-++def IN6_IS_ADDR_V4MAPPED(a): return \
-++
-++IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-++IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01
-++IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-++IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-++IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-++IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-++__IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-++__IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01
-++__IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-++__IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-++__IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-++__IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-++def IN6_IS_ADDR_LINKLOCAL(a): return \
-++
-++def IN6_IS_ADDR_SITELOCAL(a): return \
-++
-++def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-++
-++def IN6_IS_ADDR_MC_INTFACELOCAL(a): return \
-++
-++def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-++
-++def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-++
-++def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-++
-++def IN6_IS_ADDR_MC_GLOBAL(a): return \
-++
-++def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-++
-++def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-++
-++def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-++
-++def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-++
-++def IN6_IS_ADDR_MC_GLOBAL(a): return \
-++
-++def IN6_IS_SCOPE_LINKLOCAL(a): return \
-++
-++def IN6_IS_SCOPE_EMBED(a): return \
-++
-++def IFA6_IS_DEPRECATED(a): return \
-++
-++def IFA6_IS_INVALID(a): return \
-++
-++IPV6_OPTIONS = 1
-++IPV6_RECVOPTS = 5
-++IPV6_RECVRETOPTS = 6
-++IPV6_RECVDSTADDR = 7
-++IPV6_RETOPTS = 8
-++IPV6_SOCKOPT_RESERVED1 = 3
-++IPV6_UNICAST_HOPS = 4
-++IPV6_MULTICAST_IF = 9
-++IPV6_MULTICAST_HOPS = 10
-++IPV6_MULTICAST_LOOP = 11
-++IPV6_JOIN_GROUP = 12
-++IPV6_LEAVE_GROUP = 13
-++IPV6_PORTRANGE = 14
-++ICMP6_FILTER = 18
-++IPV6_2292PKTINFO = 19
-++IPV6_2292HOPLIMIT = 20
-++IPV6_2292NEXTHOP = 21
-++IPV6_2292HOPOPTS = 22
-++IPV6_2292DSTOPTS = 23
-++IPV6_2292RTHDR = 24
-++IPV6_2292PKTOPTIONS = 25
-++IPV6_CHECKSUM = 26
-++IPV6_V6ONLY = 27
-++IPV6_BINDV6ONLY = IPV6_V6ONLY
-++IPV6_IPSEC_POLICY = 28
-++IPV6_FAITH = 29
-++IPV6_FW_ADD = 30
-++IPV6_FW_DEL = 31
-++IPV6_FW_FLUSH = 32
-++IPV6_FW_ZERO = 33
-++IPV6_FW_GET = 34
-++IPV6_RTHDRDSTOPTS = 35
-++IPV6_RECVPKTINFO = 36
-++IPV6_RECVHOPLIMIT = 37
-++IPV6_RECVRTHDR = 38
-++IPV6_RECVHOPOPTS = 39
-++IPV6_RECVDSTOPTS = 40
-++IPV6_RECVRTHDRDSTOPTS = 41
-++IPV6_USE_MIN_MTU = 42
-++IPV6_RECVPATHMTU = 43
-++IPV6_PATHMTU = 44
-++IPV6_REACHCONF = 45
-++IPV6_PKTINFO = 46
-++IPV6_HOPLIMIT = 47
-++IPV6_NEXTHOP = 48
-++IPV6_HOPOPTS = 49
-++IPV6_DSTOPTS = 50
-++IPV6_RTHDR = 51
-++IPV6_PKTOPTIONS = 52
-++IPV6_RECVTCLASS = 57
-++IPV6_AUTOFLOWLABEL = 59
-++IPV6_TCLASS = 61
-++IPV6_DONTFRAG = 62
-++IPV6_PREFER_TEMPADDR = 63
-++IPV6_MSFILTER = 74
-++IPV6_RTHDR_LOOSE = 0
-++IPV6_RTHDR_STRICT = 1
-++IPV6_RTHDR_TYPE_0 = 0
-++IPV6_DEFAULT_MULTICAST_HOPS = 1
-++IPV6_DEFAULT_MULTICAST_LOOP = 1
-++IPV6_PORTRANGE_DEFAULT = 0
-++IPV6_PORTRANGE_HIGH = 1
-++IPV6_PORTRANGE_LOW = 2
-++IPV6PROTO_MAXID = (IPPROTO_PIM + 1)
-++IPV6CTL_FORWARDING = 1
-++IPV6CTL_SENDREDIRECTS = 2
-++IPV6CTL_DEFHLIM = 3
-++IPV6CTL_DEFMTU = 4
-++IPV6CTL_FORWSRCRT = 5
-++IPV6CTL_STATS = 6
-++IPV6CTL_MRTSTATS = 7
-++IPV6CTL_MRTPROTO = 8
-++IPV6CTL_MAXFRAGPACKETS = 9
-++IPV6CTL_SOURCECHECK = 10
-++IPV6CTL_SOURCECHECK_LOGINT = 11
-++IPV6CTL_ACCEPT_RTADV = 12
-++IPV6CTL_KEEPFAITH = 13
-++IPV6CTL_LOG_INTERVAL = 14
-++IPV6CTL_HDRNESTLIMIT = 15
-++IPV6CTL_DAD_COUNT = 16
-++IPV6CTL_AUTO_FLOWLABEL = 17
-++IPV6CTL_DEFMCASTHLIM = 18
-++IPV6CTL_GIF_HLIM = 19
-++IPV6CTL_KAME_VERSION = 20
-++IPV6CTL_USE_DEPRECATED = 21
-++IPV6CTL_RR_PRUNE = 22
-++IPV6CTL_MAPPED_ADDR = 23
-++IPV6CTL_V6ONLY = 24
-++IPV6CTL_RTEXPIRE = 25
-++IPV6CTL_RTMINEXPIRE = 26
-++IPV6CTL_RTMAXCACHE = 27
-++IPV6CTL_USETEMPADDR = 32
-++IPV6CTL_TEMPPLTIME = 33
-++IPV6CTL_TEMPVLTIME = 34
-++IPV6CTL_AUTO_LINKLOCAL = 35
-++IPV6CTL_RIP6STATS = 36
-++IPV6CTL_PREFER_TEMPADDR = 37
-++IPV6CTL_ADDRCTLPOLICY = 38
-++IPV6CTL_USE_DEFAULTZONE = 39
-++IPV6CTL_MAXFRAGS = 41
-++IPV6CTL_IFQ = 42
-++IPV6CTL_ISATAPRTR = 43
-++IPV6CTL_MCAST_PMTU = 44
-++IPV6CTL_STEALTH = 45
-++IPV6CTL_MAXID = 46
-+--- misc/Python-2.6.1/Lib/plat-freebsd9/regen	1970-01-01 01:00:00.000000000 +0100
-++++ misc/build/Python-2.6.1/Lib/plat-freebsd9/regen	2009-10-03 22:43:13.000000000 +0200
-+@@ -0,0 +1,3 @@
-++#! /bin/sh
-++set -v
-++python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
-+--- misc/Python-2.6.1/setup.py	2009-03-31 18:20:48.000000000 +0000
-++++ misc/build/Python-2.6.1/setup.py	2009-09-10 05:27:01.000000000 +0000
-+@@ -1273,7 +1277,7 @@ class PyBuildExt(build_ext):
-+                 )
-+             libraries = []
-+ 
-+-        elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
-++        elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9'):
-+             # FreeBSD's P1003.1b semaphore support is very experimental
-+             # and has many known problems. (as of June 2008)
-+             macros = dict(                  # FreeBSD
-+@@ -1338,7 +1342,7 @@ class PyBuildExt(build_ext):
-+             missing.append('linuxaudiodev')
-+ 
-+         if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
-+-                        'freebsd7', 'freebsd8'):
-++                        'freebsd7', 'freebsd8', 'freebsd9'):
-+             exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
-+         else:
-+             missing.append('ossaudiodev')
diff --git a/editors/openoffice-3/files/patch-i105977 b/editors/openoffice-3/files/patch-i105977
deleted file mode 100644
index 2a64e10e0fb0..000000000000
--- a/editors/openoffice-3/files/patch-i105977
+++ /dev/null
@@ -1,17 +0,0 @@
---- nss/makefile.mk~	2009-10-18 14:50:43.000000000 +0900
-+++ nss/makefile.mk	2009-10-18 14:50:56.000000000 +0900
-@@ -65,6 +65,14 @@
- .ENDIF			# "$(CPU)"=="X"
- .ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
- 
-+.IF "$(OS)$(COM)"=="FREEBSDGCC"
-+.IF "$(CPU)"=="X"
-+# force 64-bit buildmode
-+USE_64:=1
-+.EXPORT : USE_64
-+.ENDIF			# "$(CPU)"=="X"
-+.ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
-+
- 
- .IF "$(OS)"=="MACOSX"
- .IF "$(EXTRA_CFLAGS)"!=""
diff --git a/editors/openoffice-3/files/patch-i108197 b/editors/openoffice-3/files/patch-i108197
deleted file mode 100644
index 92b455532814..000000000000
--- a/editors/openoffice-3/files/patch-i108197
+++ /dev/null
@@ -1,13 +0,0 @@
---- testtools/source/bridgetest/makefile.mk	2010-01-10 19:40:41.000000000 +0900
-+++ testtools/source/bridgetest/makefile.mk	2010-01-10 19:49:30.000000000 +0900
-@@ -143,8 +143,8 @@
- #################################################################
- 
- runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk
--.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
--	@echo "Mac OSX PPC GCC fails this test!, likely broken UNO bridge. Fix me."
-+.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP" || "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI"
-+	@echo "Mac OSX PPC GCC ad FreeBDS/i386 fails this test! likely broken UNO bridge. Fix me."
- .ELSE
-         cd $(DLLDEST) && $(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/uno \
- 		-ro uno_services.rdb -ro uno_types.rdb \
diff --git a/editors/openoffice-3/files/patch-i109429 b/editors/openoffice-3/files/patch-i109429
deleted file mode 100644
index 992094149d99..000000000000
--- a/editors/openoffice-3/files/patch-i109429
+++ /dev/null
@@ -1,11 +0,0 @@
---- extensions/source/config/ldap/makefile.mk~	2010-02-04 02:35:34.000000000 +0900
-+++ extensions/source/config/ldap/makefile.mk	2010-02-19 18:50:59.000000000 +0900
-@@ -90,7 +90,7 @@
- SHL1STDLIBS+=-lcompat
- # workaround for FreeBSD, which needs -llber50, too
- .IF "$(WITH_OPENLDAP)" != "YES"
--SHL1STDLIBS+=-Wl,-Bstatic -llber50
-+SHL1STDLIBS+=-Wl,-Bstatic -llber50 -Wl,-Bdynamic
- .ENDIF
- .ENDIF
- 
diff --git a/editors/openoffice-3/files/patch-i111384 b/editors/openoffice-3/files/patch-i111384
deleted file mode 100644
index 2daf10d99533..000000000000
--- a/editors/openoffice-3/files/patch-i111384
+++ /dev/null
@@ -1,34 +0,0 @@
---- /dev/null	2010-05-05 13:00:20.000000000 +0900
-+++ hunspell/hunspell.patch	2010-05-05 13:03:11.000000000 +0900
-@@ -0,0 +1,8 @@
-+--- misc/hunspell-1.2.9/tests/test.sh	2010-02-23 21:18:50.000000000 +0900
-++++ misc/build/hunspell-1.2.9/tests/test.sh	2010-05-05 13:01:42.000000000 +0900
-+@@ -1,4 +1,4 @@
-+-#!/bin/bash
-++#!/usr/bin/env bash
-+ export LC_ALL="C"
-+ 
-+ function check_valgrind_log () {
---- hunspell/makefile.mk.orig	2010-05-05 12:59:48.000000000 +0900
-+++ hunspell/makefile.mk	2010-05-05 13:02:14.000000000 +0900
-@@ -43,8 +43,9 @@
- PATCH_FILES=\
-     hunspell-wntconfig.patch \
-     hunspell-solaris.patch \
--    hunspell-stacksmash.patch
--
-+    hunspell-stacksmash.patch \
-+    hunspell.patch
-+	
- .IF "$(GUI)"=="UNX"
- 
- #relative to CONFIGURE_DIR
-@@ -60,6 +61,8 @@
- .ENDIF # "$(EXTRA_CFLAGS)"!=""
- .ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!=""
- CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
-+.ELIF "$(OS)"=="FREEBSD" # "$(SYSBASE)"!=""
-+CONFIGURE_FLAGS+=CPPFLAGS="-I$(LIBINTL_PREFIX)/include" --with-libintl-prefix="$(LIBINTL_PREFIX)"
- .ENDIF
- 
- BUILD_ACTION=make && make check
diff --git a/editors/openoffice-3/files/patch-i114323 b/editors/openoffice-3/files/patch-i114323
deleted file mode 100644
index 8c6f167ef478..000000000000
--- a/editors/openoffice-3/files/patch-i114323
+++ /dev/null
@@ -1,28 +0,0 @@
---- moz/makefile.mk.orig	2011-01-18 05:34:25.000000000 -0800
-+++ moz/makefile.mk	2011-04-29 16:04:37.000000000 -0700
-@@ -86,7 +86,8 @@
-     patches/dtoa.patch \
-     patches/respect_disable_pango.patch \
-     patches/arm_build_fix.patch \
--    patches/link_fontconfig.patch
-+    patches/link_fontconfig.patch \
-+    patches/brokenmakefile.patch
- 
- # This file is needed for the W32 build when BUILD_MOZAB is set
- # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)
---- /dev/null	2011-04-29 16:00:00.000000000 -0700
-+++ moz/patches/brokenmakefile.patch	2011-04-29 16:04:55.000000000 -0700
-@@ -0,0 +1,13 @@
-+--- misc/mozilla/mailnews/extensions/smime/build/Makefile.in	2010-09-04 16:00:38.000000000 +0100
-++++ misc/build/mozilla/mailnews/extensions/smime/build/Makefile.in	2010-09-04 16:02:24.000000000 +0100
-+@@ -79,10 +79,6 @@
-+ 		$(DIST)/lib/$(LIB_PREFIX)msgsmime_s.$(LIB_SUFFIX) \
-+ 		$(NULL)
-+ 
-+-ifndef MOZ_STATIC_MAIL_BUILD
-+-SHARED_LIBRARY_LIBS + = $(DIST)/lib/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX)
-+-endif
-+-
-+ EXTRA_DSO_LDOPTS = \
-+ 		$(LIBS_DIR) \
-+ 		$(EXTRA_DSO_LIBS) \
diff --git a/editors/openoffice-3/files/patch-i118574 b/editors/openoffice-3/files/patch-i118574
new file mode 100644
index 000000000000..4f3c6467c22d
--- /dev/null
+++ b/editors/openoffice-3/files/patch-i118574
@@ -0,0 +1,323 @@
+--- unoxml/source/dom/attr.hxx.orig	2011-11-03 21:05:47.000000000 -0500
++++ unoxml/source/dom/attr.hxx	2011-11-03 21:06:26.000000000 -0500
+@@ -30,6 +30,7 @@
+ 
+ #include <memory>
+ 
++#include <cwchar>      // for std::mbstate_t
+ #include <libxml/tree.h>
+ 
+ #include <cppuhelper/implbase1.hxx>
+--- unoxml/source/dom/characterdata.hxx.orig	2011-11-03 21:12:41.000000000 -0500
++++ unoxml/source/dom/characterdata.hxx	2011-11-03 21:13:08.000000000 -0500
+@@ -28,6 +28,7 @@
+ #ifndef DOM_CHARACTERDATA_HXX
+ #define DOM_CHARACTERDATA_HXX
+ 
++#include <cwchar>      // for std::mbstate_t
+ #include <libxml/tree.h>
+ 
+ #include <sal/types.h>
+--- unoxml/source/dom/childlist.cxx.orig	2011-11-03 21:36:22.000000000 -0500
++++ unoxml/source/dom/childlist.cxx	2011-11-03 21:37:22.000000000 -0500
+@@ -27,6 +27,7 @@
+ 
+ #include <childlist.hxx>
+ 
++#include <cwchar>      // for std::mbstate_t
+ #include <libxml/tree.h>
+ 
+ #include <node.hxx>
+--- unoxml/source/dom/document.hxx.orig	2011-11-03 20:59:53.000000000 -0500
++++ unoxml/source/dom/document.hxx	2011-11-03 21:00:40.000000000 -0500
+@@ -31,6 +31,7 @@
+ #include <set>
+ #include <memory>
+ 
++#include <cwchar>      // for std::mbstate_t
+ #include <libxml/tree.h>
+ 
+ #include <sal/types.h>
+--- unoxml/source/dom/documentbuilder.cxx.orig	2011-11-03 21:15:44.000000000 -0500
++++ unoxml/source/dom/documentbuilder.cxx	2011-11-03 21:16:26.000000000 -0500
+@@ -31,6 +31,7 @@
+ #include <stdio.h>
+ #include <stdarg.h>
+ 
++#include <cwchar>      // for std::mbstate_t
+ #include <libxml/xmlerror.h>
+ #include <libxml/tree.h>
+ 
+--- unoxml/source/dom/documenttype.hxx.orig	2011-11-03 21:19:12.000000000 -0500
++++ unoxml/source/dom/documenttype.hxx	2011-11-03 21:19:39.000000000 -0500
+@@ -28,6 +28,7 @@
+ #ifndef DOM_DOCUMENTTYPE_HXX
+ #define DOM_DOCUMENTTYPE_HXX
+ 
++#include <cwchar>      // for std::mbstate_t
+ #include <libxml/tree.h>
+ 
+ #include <sal/types.h>
+--- unoxml/source/dom/element.hxx.orig	2011-11-03 21:02:39.000000000 -0500
++++ unoxml/source/dom/element.hxx	2011-11-03 21:03:48.000000000 -0500
+@@ -28,6 +28,7 @@
+ #ifndef DOM_ELEMENT_HXX
+ #define DOM_ELEMENT_HXX
+ 
++#include <cwchar>      // for std::mbstate_t
+ #include <libxml/tree.h>
+ 
+ #include <com/sun/star/uno/Reference.h>
+--- unoxml/source/dom/elementlist.hxx.orig	2011-11-03 21:33:35.000000000 -0500
++++ unoxml/source/dom/elementlist.hxx	2011-11-03 21:34:07.000000000 -0500
+@@ -32,6 +32,7 @@
+ 
+ #include <boost/scoped_array.hpp>
+ 
++#include <cwchar>      // for std::mbstate_t
+ #include <libxml/tree.h>
+ 
+ #include <sal/types.h>
+--- unoxml/source/dom/entity.hxx.orig	2011-11-03 21:21:42.000000000 -0500
++++ unoxml/source/dom/entity.hxx	2011-11-03 21:22:28.000000000 -0500
+@@ -28,6 +28,7 @@
+ #ifndef DOM_ENTITY_HXX
+ #define DOM_ENTITY_HXX
+ 
++#include <cwchar>      // for std::mbstate_t
+ #include <libxml/tree.h>
+ #include <libxml/entities.h>
+ 
+--- unoxml/source/dom/entityreference.hxx.orig	2011-11-03 21:24:36.000000000 -0500
++++ unoxml/source/dom/entityreference.hxx	2011-11-03 21:25:13.000000000 -0500
+@@ -28,6 +28,7 @@
+ #ifndef DOM_ENTITYREFERENCE_HXX
+ #define DOM_ENTITYREFERENCE_HXX
+ 
++#include <cwchar>      // for std::mbstate_t
+ #include <libxml/tree.h>
+ 
+ #include <com/sun/star/uno/Reference.h>
+--- unoxml/source/dom/node.hxx.orig	2011-11-03 20:54:49.000000000 -0500
++++ unoxml/source/dom/node.hxx	2011-11-03 20:56:47.000000000 -0500
+@@ -30,6 +30,7 @@
+ 
+ #include <hash_map>
+ 
++#include <cwchar>      // for std::mbstate_t
+ #include <libxml/tree.h>
+ 
+ #include <sal/types.h>
+--- unoxml/source/dom/notation.hxx.orig	2011-11-03 21:27:17.000000000 -0500
++++ unoxml/source/dom/notation.hxx	2011-11-03 21:28:12.000000000 -0500
+@@ -28,6 +28,7 @@
+ #ifndef DOM_NOTATION_HXX
+ #define DOM_NOTATION_HXX
+ 
++#include <cwchar>      // for std::mbstate_t
+ #include <libxml/tree.h>
+ 
+ #include <com/sun/star/uno/Reference.h>
+--- unoxml/source/dom/processinginstruction.hxx.orig	2011-11-03 21:30:54.000000000 -0500
++++ unoxml/source/dom/processinginstruction.hxx	2011-11-03 21:31:30.000000000 -0500
+@@ -28,6 +28,7 @@
+ #ifndef DOM_PROCESSINGINSTRUCTION_HXX
+ #define DOM_PROCESSINGINSTRUCTION_HXX
+ 
++#include <cwchar>      // for std::mbstate_t
+ #include <libxml/tree.h>
+ 
+ #include <com/sun/star/uno/Reference.h>
+--- unoxml/source/dom/text.hxx.orig	2011-11-03 21:10:46.000000000 -0500
++++ unoxml/source/dom/text.hxx	2011-11-03 21:11:14.000000000 -0500
+@@ -28,6 +28,7 @@
+ #ifndef DOM_TEXT_HXX
+ #define DOM_TEXT_HXX
+ 
++#include <cwchar>      // for std::mbstate_t
+ #include <libxml/tree.h>
+ 
+ #include <sal/types.h>
+--- unoxml/source/events/eventdispatcher.hxx.orig	2011-11-03 21:51:05.000000000 -0500
++++ unoxml/source/events/eventdispatcher.hxx	2011-11-03 21:55:59.000000000 -0500
+@@ -31,6 +31,7 @@
+ #include <map>
+ #include <vector>
+ 
++#include <cwchar>      // for std::mbstate_t
+ #include <libxml/tree.h>
+ 
+ #include <rtl/ustring.hxx>
+--- jvmfwk/source/elements.hxx.orig	2011-11-03 14:14:18.000000000 -0500
++++ jvmfwk/source/elements.hxx	2011-11-03 14:24:14.000000000 -0500
+@@ -32,6 +32,7 @@
+ #include "fwkutil.hxx"
+ #include "rtl/ustring.hxx"
+ #include "rtl/byteseq.hxx"
++#include <cwchar>      // for std::mbstate_t
+ #include "libxml/parser.h"
+ #include "boost/optional.hpp"
+ 
+--- jvmfwk/source/fwkbase.cxx.orig	2011-11-03 14:31:12.000000000 -0500
++++ jvmfwk/source/fwkbase.cxx	2011-11-03 14:32:34.000000000 -0500
+@@ -32,6 +32,7 @@
+ #include "rtl/uri.hxx"
+ #include "osl/thread.hxx"
+ #include "osl/process.h"
++#include <cwchar>      // for std::mbstate_t
+ #include "libxml/xpathInternals.h"
+ #include "osl/file.hxx"
+ #include "osl/module.hxx"
+--- jvmfwk/source/libxmlutil.hxx.orig	2011-11-03 14:28:02.000000000 -0500
++++ jvmfwk/source/libxmlutil.hxx	2011-11-03 14:28:52.000000000 -0500
+@@ -27,7 +27,7 @@
+ #if !defined INCLUDED_JVMFWK_LIBXMLUTIL_HXX
+ #define INCLUDED_JVMFWK_LIBXMLUTIL_HXX
+ 
+-
++#include <cwchar>      // for std::mbstate_t
+ #include "libxml/parser.h"
+ #include "libxml/xpath.h"
+ //#include "libxml/xpathinternals.h"
+--- xmlhelp/source/cxxhelp/provider/urlparameter.cxx.orig	2011-11-03 23:28:51.000000000 -0500
++++ xmlhelp/source/cxxhelp/provider/urlparameter.cxx	2011-11-03 23:33:15.000000000 -0500
+@@ -46,6 +46,7 @@
+ #include <comphelper/processfactory.hxx>
+ #include <rtl/uri.hxx>
+ #include <rtl/ustrbuf.hxx>
++#include <cwchar>      // for std::mbstate_t
+ #include <libxslt/xslt.h>
+ #include <libxslt/transform.h>
+ #include <libxslt/xsltutils.h>
+--- unoxml/source/xpath/nodelist.hxx.orig	2011-11-03 21:42:28.000000000 -0500
++++ unoxml/source/xpath/nodelist.hxx	2011-11-03 21:43:53.000000000 -0500
+@@ -38,6 +38,7 @@
+ #include <com/sun/star/xml/dom/XNodeList.hpp>
+ #include <com/sun/star/xml/xpath/XXPathObject.hpp>
+ 
++#include <cwchar>      // for std::mbstate_t
+ #include "libxml/tree.h"
+ #include "libxml/xpath.h"
+ 
+--- unoxml/source/xpath/xpathapi.cxx.orig	2011-11-03 21:46:02.000000000 -0500
++++ unoxml/source/xpath/xpathapi.cxx	2011-11-03 21:46:34.000000000 -0500
+@@ -30,6 +30,7 @@
+ #include <stdarg.h>
+ #include <string.h>
+ 
++#include <cwchar>      // for std::mbstate_t
+ #include <libxml/tree.h>
+ #include <libxml/xmlerror.h>
+ #include <libxml/xpath.h>
+Index: main/forms/source/xforms/xpathlib/xpathlib.hxx
+===================================================================
+--- forms/source/xforms/xpathlib/xpathlib.hxx	(revision 1235458)
++++ forms/source/xforms/xpathlib/xpathlib.hxx	(working copy)
+@@ -20,7 +20,7 @@
+  *************************************************************/
+ 
+ 
+-
++#include <cwchar>      // for std::mbstate_t
+ #include <libxml/tree.h>
+ #include <libxml/xpath.h>
+ #include <libxml/xpathInternals.h>
+
+--- avmedia/source/gstreamer/gstplayer.hxx	2012-02-02 07:33:58.000000000 +0900
++++ avmedia/source/gstreamer/gstplayer.hxx	2012-02-02 07:35:03.000000000 +0900
+@@ -24,6 +24,8 @@
+ #ifndef _GSTPLAYER_HXX
+ #define _GSTPLAYER_HXX
+ 
++#include <cwchar>      // for std::mbstate_t
++
+ #include "gstcommon.hxx"
+ #include <glib.h>
+ #include <glib/gatomic.h>
+
+
+--- xmlsecurity/source/xmlsec/biginteger.cxx	2012-02-04 10:36:05.000000000 +0900
++++ xmlsecurity/source/xmlsec/biginteger.cxx	2012-02-01 16:51:40.000000000 +0900
+@@ -19,7 +19,7 @@
+  * 
+  *************************************************************/
+ 
+-
++#include <cwchar>      // for std::mbstate_t
+ 
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_xmlsecurity.hxx"
+
+--- xmlsecurity/source/xmlsec/errorcallback.cxx	2012-02-04 10:37:52.000000000 +0900
++++ xmlsecurity/source/xmlsec/errorcallback.cxx	2012-02-01 16:51:40.000000000 +0900
+@@ -19,7 +19,7 @@
+  * 
+  *************************************************************/
+ 
+-
++#include <cwchar>      // for std::mbstate_t
+
+ 
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_xmlsecurity.hxx"
+
+--- xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx	2012-02-03 13:03:47.000000000 +0900
++++ xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx	2012-02-01 16:51:40.000000000 +0900
+@@ -24,6 +24,8 @@
+ #ifndef _XSECURITYENVIRONMENT_NSSIMPL_HXX_
+ #define _XSECURITYENVIRONMENT_NSSIMPL_HXX_
+ 
++#include <cwchar>      // for std::mbstate_t
++
+ #include <sal/config.h>
+ #include <rtl/ustring.hxx>
+ #include <cppuhelper/factory.hxx>
+
+
+--- xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx	2012-02-04 10:33:01.000000000 +0900
++++ xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx	2012-02-01 16:51:40.000000000 +0900
+@@ -24,6 +24,8 @@
+ #ifndef _SEINITIALIZERIMPL_HXX
+ #define _SEINITIALIZERIMPL_HXX
+ 
++#include <cwchar>      // for std::mbstate_t
++
+ #include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
+ #include <com/sun/star/xml/crypto/XSEInitializer.hpp>
+ 
+
+--- xmlsecurity/source/xmlsec/saxhelper.hxx	2012-02-04 10:34:58.000000000 +0900
++++ xmlsecurity/source/xmlsec/saxhelper.hxx	2012-02-01 16:51:40.000000000 +0900
+@@ -24,6 +24,8 @@
+ #ifndef _SAXHELPER_HXX
+ #define _SAXHELPER_HXX
+ 
++#include <cwchar>      // for std::mbstate_t
++
+ #include "libxml/tree.h"
+ 
+ #include <com/sun/star/xml/sax/SAXException.hpp>
+
+--- xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx	2012-02-04 10:36:45.000000000 +0900
++++ xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx	2012-02-01 16:51:40.000000000 +0900
+@@ -20,6 +20,7 @@
+  *************************************************************/
+ 
+ 
++#include <cwchar>      // for std::mbstate_t
+ 
+ #ifndef _XMLELEMENTWRAPPER_XMLSECIMPL_HXX
+ #define _XMLELEMENTWRAPPER_XMLSECIMPL_HXX
+
+--- xmlsecurity/source/xmlsec/xmlstreamio.hxx	2012-02-04 10:37:09.000000000 +0900
++++ xmlsecurity/source/xmlsec/xmlstreamio.hxx	2012-02-01 16:51:40.000000000 +0900
+@@ -19,7 +19,7 @@
+  * 
+  *************************************************************/
+ 
+-
++#include <cwchar>      // for std::mbstate_t
+
+ 
+ #ifndef _XMLSTREAMIO_XMLSECIMPL_HXX_
+ #define _XMLSTREAMIO_XMLSECIMPL_HXX_
diff --git a/editors/openoffice-3/files/patch-i65514 b/editors/openoffice-3/files/patch-i65514
deleted file mode 100644
index f12266b5fede..000000000000
--- a/editors/openoffice-3/files/patch-i65514
+++ /dev/null
@@ -1,12 +0,0 @@
---- berkeleydb/makefile.mk	2009-09-26 08:52:35.000000000 +0900
-+++ berkeleydb/makefile.mk	2009-09-26 08:54:31.000000000 +0900
-@@ -102,6 +102,9 @@
- CONFIGURE_ACTION= \
- 	..$/dist$/configure
- CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185
-+.IF "$(OS)"==FREEBSD && "$(COM)$(CPU)"=="GCCX"
-+CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly
-+.ENDIF
- .IF "$(OS)"=="MACOSX"
- CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
- .ENDIF
diff --git a/editors/openoffice-3/files/patch-i65974 b/editors/openoffice-3/files/patch-i65974
deleted file mode 100644
index 40de0acde40f..000000000000
--- a/editors/openoffice-3/files/patch-i65974
+++ /dev/null
@@ -1,12 +0,0 @@
---- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx	16 Sep 2006 17:46:13 -0000	1.7
-+++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx	22 Jun 2007 21:36:24 -0000
-@@ -94,6 +94,9 @@
-     static char const * ar[] = {
- 
-         "/lib/" JFW_PLUGIN_ARCH "/client",
-+#if SAL_TYPES_SIZEOFPOINTER == 8
-+        "/lib/" JFW_PLUGIN_ARCH "/server",
-+#endif
-         "/lib/" JFW_PLUGIN_ARCH "/native_threads", 
-         "/lib/" JFW_PLUGIN_ARCH
- 
diff --git a/editors/openoffice-3/files/patch-i73217 b/editors/openoffice-3/files/patch-i73217
deleted file mode 100644
index cea0759cd41c..000000000000
--- a/editors/openoffice-3/files/patch-i73217
+++ /dev/null
@@ -1,63 +0,0 @@
---- epm/epm-3.7.patch.org	2010-06-19 19:51:40.000000000 +0900
-+++ epm/epm-3.7.patch	2010-06-20 08:09:43.000000000 +0900
-@@ -303,6 +303,15 @@
- diff -urN epm-3.7-old//dist.c epm-3.7/dist.c
- --- misc/epm-3.7/dist.c	2003-08-07 14:14:40.000000000 +0000
- +++ misc/build/epm-3.7/dist.c	2010-04-19 22:52:32.000000000 +0000
-+@@ -339,7 +339,7 @@
-+ 	   const char *defval)		/* I - Default value of option */
-+ {
-+   char		*ptr;			/* Pointer to option */
-+-  static char	option[256];		/* Copy of file option */
-++  static char	option[1024];		/* Copy of file option */
-+ 
-+ 
-+  /*
- @@ -394,8 +394,13 @@
-    strcpy(platform->machine, "mips");
-  #elif defined(__hpux)
-@@ -332,6 +341,24 @@
-    else if (strncmp(platform->machine, "sun", 3) == 0)
-      strcpy(platform->machine, "sparc");
-  #endif /* __sgi */
-+@@ -560,13 +560,13 @@
-+   char		line[2048],	/* Expanded line from list file */
-+ 		buf[1024],	/* Original line from list file */
-+ 		type,		/* File type */
-+-		dst[256],	/* Destination path */
-+-		src[256],	/* Source path */
-+-		pattern[256],	/* Pattern for source files */
-++		dst[1024],	/* Destination path */
-++		src[1024],	/* Source path */
-++		pattern[1024],	/* Pattern for source files */
-+ 		user[32],	/* User */
-+ 		group[32],	/* Group */
-+ 		*temp,		/* Temporary pointer */
-+-		options[256];	/* File options */
-++		options[1024];	/* File options */
-+   int		mode,		/* File permissions */
-+ 		skip;		/* 1 = skip files, 0 = archive files */
-+   dist_t	*dist;		/* Distribution data */
- diff -urN epm-3.7-old//epm.c epm-3.7/epm.c
- --- misc/epm-3.7/epm.c	2003-10-28 14:48:30.000000000 +0000
- +++ misc/build/epm-3.7/epm.c	2010-04-19 22:52:32.000000000 +0000
-@@ -655,3 +682,19 @@
-    return (0);
-  }
-  
-+diff -urN epm-3.7-old//rpm.c epm-3.7/epm.h
-+--- misc/epm-3.7/epm.h	2003-10-01 19:27:15.000000000 +0000
-++++ misc/build/epm-3.7/epm.h	2010-04-19 22:52:32.000000000 +0000
-+@@ -167,9 +167,9 @@
-+   int	mode;				/* Permissions of file */
-+   char	user[32],			/* Owner of file */
-+ 	group[32],			/* Group of file */
-+-	src[512],			/* Source path */
-+-	dst[512],			/* Destination path */
-+-	options[256];			/* File options (nostrip, etc.) */
-++	src[1024],			/* Source path */
-++	dst[1024],			/* Destination path */
-++	options[1024];			/* File options (nostrip, etc.) */
-+ } file_t;
-+ 
-+ typedef struct				/**** Install/Patch/Remove Commands ****/
diff --git a/editors/openoffice-3/files/patch-i80129 b/editors/openoffice-3/files/patch-i80129
deleted file mode 100644
index de87f789df9c..000000000000
--- a/editors/openoffice-3/files/patch-i80129
+++ /dev/null
@@ -1,11 +0,0 @@
---- libxml2/libxml2-configure.patch.org	2010-06-06 08:23:29.000000000 +0900
-+++ libxml2/libxml2-configure.patch	2010-06-06 08:23:45.000000000 +0900
-@@ -7,7 +7,7 @@
- -	  major=".$current"
- -	  versuffix=".$current"
- +	  major=.`expr $current - $age`
--+	  versuffix=".$major.$age.$revision";
-++	  versuffix="$major";
-  	  ;;
-  
-  	irix | nonstopux)
diff --git a/editors/openoffice-3/files/patch-i84549 b/editors/openoffice-3/files/patch-i84549
deleted file mode 100644
index 1d7f6517953b..000000000000
--- a/editors/openoffice-3/files/patch-i84549
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: neon/neon.patch
-===================================================================
-RCS file: /cvs/external/neon/neon.patch,v
-retrieving revision 1.25
-diff -u -r1.25 neon.patch
---- neon/neon.patch	22 Jul 2008 17:17:06 -0000	1.25
-+++ neon/neon.patch	10 Aug 2008 04:20:27 -0000
-@@ -266,7 +266,7 @@
- +#define HAVE_SYS_TYPES_H 1
- +
- +/* Define if the timezone global is available */
--+#ifndef MACOSX
-++#if !defined(MACOSX) && !defined(FREEBSD)
- +#define HAVE_TIMEZONE 1
- +#endif
- +
diff --git a/editors/openoffice-3/files/patch-i85027 b/editors/openoffice-3/files/patch-i85027
deleted file mode 100644
index 732c68da8633..000000000000
--- a/editors/openoffice-3/files/patch-i85027
+++ /dev/null
@@ -1,58 +0,0 @@
------------------
-Strange behaviour of stock gcc of FreeBSD 7.
-
-# gcc -print-file-name=libgcc_s.so
-/usr/lib/libgcc_s.so
-# gcc -print-file-name=libgcc_s.so.1
-libgcc_s.so.1
-. This sould be
-# gcc -print-file-name=libgcc_s.so.1
-/lib/libgcc_s.so.1
-
-However gcc42 from ports behaves correctly;
-and
-# gcc42 -print-file-name=libgcc_s.so.1
-/usr/local/lib/gcc-4.2.3/gcc/i386-portbld-freebsd7.0/4.2.3/../../../libgcc_s.so.1
-# gcc42 -print-file-name=libgcc_s.so
-/usr/local/lib/gcc-4.2.3/gcc/i386-portbld-freebsd7.0/4.2.3/../../../libgcc_s.so
-.
---- external/gcc3_specific/makefile.mk	2010-01-08 18:13:15.000000000 +0900
-+++ external/gcc3_specific/makefile.mk	2010-02-07 12:17:43.000000000 +0900
-@@ -43,7 +43,6 @@
- .IF "$(SYSTEM_STDLIBS)" != "YES" && "$(COMID)"=="gcc3"
- 
- .IF "$(OS)"!="MACOSX"
--.IF "$(OS)"!="FREEBSD"
- 
- .EXPORT : CC
- 
-@@ -60,8 +59,6 @@
- .ENDIF 
- 
- .ENDIF
--
--.ENDIF
- .ENDIF			# "$(BUILD_SPECIAL)"==""
- 
-
---- scp2/source/ooo/ure.scp	18 Mar 2008 13:35:26 -0000	1.2
-+++ scp2/source/ooo/ure.scp	21 Mar 2008 09:26:48 -0000
-@@ -728,7 +730,7 @@
- End
- #endif
- 
--#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \
-+#if defined _gcc3 && !(defined NETBSD \
- 	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
- File gid_File_Dl_GccS
-     TXT_FILE_BODY;
-@@ -739,7 +741,7 @@
- End
- #endif
- 
--#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \
-+#if defined _gcc3 && !(defined NETBSD \
- 	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
- File gid_File_Dl_Stdcpp
-     Dir = SCP2_URE_DL_DIR;
-
diff --git a/editors/openoffice-3/files/patch-i85126 b/editors/openoffice-3/files/patch-i85126
deleted file mode 100644
index 26565332843c..000000000000
--- a/editors/openoffice-3/files/patch-i85126
+++ /dev/null
@@ -1,377 +0,0 @@
-catch up to recent bridge also fixes following issues
-for amd64
-http://www.openoffice.org/issues/show_bug.cgi?id=98781
-http://www.openoffice.org/issues/show_bug.cgi?id=82690
-http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
-
-We also need #define USE_DOUBLE_MMAP for FreeBSD as well.
-It's very hard to maintain without it, and performance loss is
-negligible. See also
-http://www.openoffice.org/issues/show_bug.cgi?id=97320
-. Note that i386 also requires the patch for
-"bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx"
-.
-
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx	2009-12-12 18:15:33.000000000 +0900
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx	2009-12-06 13:19:58.000000000 +0900
-@@ -229,6 +229,7 @@
-                 for ( sal_Int32 nMember = 0; nMember < pStruct->nMembers; ++nMember )
-                 {
-                     typelib_TypeDescriptionReference *pTypeInStruct = pStruct->ppTypeRefs[ nMember ];
-+                    rByteOffset = pStruct->pMemberOffsets[ nMember ];
- 
-                     int num = classify_argument( pTypeInStruct, subclasses, rByteOffset );
- 
-@@ -243,9 +244,6 @@
-                         int pos = rByteOffset / 8;
-                         classes[i + pos] = merge_classes( subclasses[i], classes[i + pos] );
-                     }
--
--                    if ( pTypeInStruct->eTypeClass != typelib_TypeClass_STRUCT )
--                        rByteOffset = pStruct->pMemberOffsets[ nMember ];
-                 }
- 
-                 TYPELIB_DANGER_RELEASE( pTypeDescr );
-@@ -332,7 +330,7 @@
-     return examine_argument( pTypeRef, true, g, s ) == 0;
- }
- 
--void x86_64::fill_struct( typelib_TypeDescriptionReference *pTypeRef, void * const *pGPR, void * const *pSSE, void *pStruct )
-+void x86_64::fill_struct( typelib_TypeDescriptionReference *pTypeRef, const sal_uInt64 *pGPR, const double *pSSE, void *pStruct )
- {
-     enum x86_64_reg_class classes[MAX_CLASSES];
-     int offset = 0;
-@@ -346,12 +344,14 @@
-         {
-             case X86_64_INTEGER_CLASS:
-             case X86_64_INTEGERSI_CLASS:
--                *pStructAlign++ = *reinterpret_cast<sal_uInt64 *>( *pGPR++ );
-+                *pStructAlign++ = *pGPR++;
-                 break;
-             case X86_64_SSE_CLASS:
-             case X86_64_SSESF_CLASS:
-             case X86_64_SSEDF_CLASS:
--                *pStructAlign++ = *reinterpret_cast<sal_uInt64 *>( *pSSE++ );
-+                *pStructAlign++ = *reinterpret_cast<const sal_uInt64 *>( pSSE++ );
-+                break;
-+            default:
-                 break;
-         }
- }
-
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.hxx	2009-12-12 18:15:33.000000000 +0900
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.hxx	2009-12-06 13:19:58.000000000 +0900
-@@ -63,7 +63,7 @@
- */
- bool return_in_hidden_param( typelib_TypeDescriptionReference *pTypeRef );
- 
--void fill_struct( typelib_TypeDescriptionReference *pTypeRef, void * const *pGPR, void * const *pSSE, void *pStruct );
-+void fill_struct( typelib_TypeDescriptionReference *pTypeRef, const sal_uInt64* pGPR, const double* pSSE, void *pStruct );
- 
- } // namespace x86_64
- 
-
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/call.s	2009-12-12 18:15:33.000000000 +0900
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/call.s	2009-12-06 13:19:58.000000000 +0900
-@@ -43,6 +43,9 @@
- 	je	.Lfloat
- 
- 	movq	-144(%rbp), %rax		# Return value (int case)
-+	movq	-136(%rbp), %rdx		# Return value (int case)
-+	movq	-144(%rbp), %xmm0		# Return value (int case)
-+	movq	-136(%rbp), %xmm1		# Return value (int case)
- 	jmp	.Lfinish
- .Lfloat:
- 	movlpd	-144(%rbp), %xmm0		# Return value (float/double case)
-
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx	2009-12-12 18:15:33.000000000 +0900
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx	2009-12-06 13:19:58.000000000 +0900
-@@ -77,8 +77,8 @@
- 	void ** gpreg, void ** fpreg, void ** ovrflw,
- 	sal_uInt64 * pRegisterReturn /* space for register return */ )
- {
--	int nr_gpr = 0; //number of gpr registers used 
--	int nr_fpr = 0; //number of fpr regsiters used
-+	unsigned int nr_gpr = 0; //number of gpr registers used
-+	unsigned int nr_fpr = 0; //number of fpr registers used
-        
- 	// return
- 	typelib_TypeDescription * pReturnTypeDescr = 0;
-@@ -126,7 +126,10 @@
- 
- 		int nUsedGPR = 0;
- 		int nUsedSSE = 0;
--		bool bFitsRegisters = x86_64::examine_argument( rParam.pTypeRef, false, nUsedGPR, nUsedSSE );
-+#if OSL_DEBUG_LEVEL > 1
-+		bool bFitsRegisters =
-+#endif
-+			x86_64::examine_argument( rParam.pTypeRef, false, nUsedGPR, nUsedSSE );
- 		if ( !rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ) ) // value
- 		{
- 			// Simple types must fit exactly one register on x86_64
-@@ -159,28 +162,7 @@
- 		else // struct <= 16 bytes || ptr to complex value || ref
- 		{
- 			void *pCppStack;
--			char pTmpStruct[16];
--
--			if ( bFitsRegisters && !rParam.bOut &&
--				 ( pParamTypeDescr->eTypeClass == typelib_TypeClass_STRUCT ||
--				   pParamTypeDescr->eTypeClass == typelib_TypeClass_EXCEPTION ) )
--			{
--				if ( ( nr_gpr + nUsedGPR <= x86_64::MAX_GPR_REGS ) && ( nr_fpr + nUsedSSE <= x86_64::MAX_SSE_REGS ) )
--				{
--					x86_64::fill_struct( rParam.pTypeRef, gpreg, fpreg, pTmpStruct );
--#if OSL_DEBUG_LEVEL > 1
--					fprintf( stderr, "nUsedGPR == %d, nUsedSSE == %d, pTmpStruct[0] == 0x%x, pTmpStruct[1] == 0x%x, **gpreg == 0x%lx\n",
--							nUsedGPR, nUsedSSE, pTmpStruct[0], pTmpStruct[1], *(sal_uInt64*)*gpreg );
--#endif
--
--					pCppArgs[nPos] = pCppStack = reinterpret_cast<void *>( pTmpStruct );
--					gpreg += nUsedGPR;
--					fpreg += nUsedSSE;
--				}
--				else
--					pCppArgs[nPos] = pCppStack = *ovrflw++;
--			}
--			else if ( nr_gpr < x86_64::MAX_GPR_REGS )
-+			if ( nr_gpr < x86_64::MAX_GPR_REGS )
- 			{ 
- 				pCppArgs[nPos] = pCppStack = *gpreg++;
- 				nr_gpr++;
-@@ -489,13 +471,12 @@
- //==================================================================================================
- 
- unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
--	Slot ** slots, unsigned char * code,
-+	Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
- 	typelib_InterfaceTypeDescription const * type, sal_Int32 nFunctionOffset,
- 	sal_Int32 functionCount, sal_Int32 nVtableOffset )
- {
- 	(*slots) -= functionCount;
- 	Slot * s = *slots;
--
- 	for ( sal_Int32 nPos = 0; nPos < type->nMembers; ++nPos )
- 	{
- 		typelib_TypeDescription * pTD = 0;
-@@ -509,14 +490,14 @@
- 				reinterpret_cast<typelib_InterfaceAttributeTypeDescription *>( pTD );
- 
- 			// get method
--			(s++)->fn = code;
-+			(s++)->fn = code + writetoexecdiff;
- 			code = codeSnippet( code, nFunctionOffset++, nVtableOffset,
- 								x86_64::return_in_hidden_param( pAttrTD->pAttributeTypeRef ) );
- 
- 			if ( ! pAttrTD->bReadOnly )
- 			{
- 				// set method
--				(s++)->fn = code;
-+				(s++)->fn = code + writetoexecdiff;
- 				code = codeSnippet( code, nFunctionOffset++, nVtableOffset, false );
- 			}
- 		}
-@@ -525,7 +506,7 @@
- 			typelib_InterfaceMethodTypeDescription *pMethodTD =
- 				reinterpret_cast<typelib_InterfaceMethodTypeDescription *>( pTD );
- 			
--			(s++)->fn = code;
-+			(s++)->fn = code + writetoexecdiff;
- 			code = codeSnippet( code, nFunctionOffset++, nVtableOffset,
- 								x86_64::return_in_hidden_param( pMethodTD->pReturnTypeRef ) );
- 		}
-
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx	2009-12-12 18:15:33.000000000 +0900
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx	2009-12-06 13:19:58.000000000 +0900
-@@ -32,6 +32,7 @@
- #include "precompiled_bridges.hxx"
- 
- #include <stdio.h>
-+#include <string.h>
- #include <dlfcn.h>
- #include <cxxabi.h>
- #include <hash_map>
-@@ -121,7 +121,7 @@
- };
- //__________________________________________________________________________________________________
- RTTI::RTTI() SAL_THROW( () )
--#if __FreeBSD_version < 602103
-+#if __FreeBSD_version < 702104 /* #i22253# */
-     : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
- #else
-     : m_hApp( dlopen( 0, RTLD_LAZY ) )
-@@ -160,7 +160,7 @@
-         buf.append( 'E' );
-         
-         OString symName( buf.makeStringAndClear() );
--#if __FreeBSD_version < 602103  /* #i22253# */
-+#if __FreeBSD_version < 702104 /* #i22253# */
-         rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
- #else
-         rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-@@ -175,8 +167,8 @@
-         else
-         {
-             // try to lookup the symbol in the generated rtti map
--            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
--            if (iFind == m_generatedRttis.end())
-+            t_rtti_map::const_iterator iFind2( m_generatedRttis.find( unoName ) );
-+            if (iFind2 == m_generatedRttis.end())
-             {
-                 // we must generate it !
-                 // symbol and rtti-name is nearly identical,
-@@ -205,7 +197,7 @@
-             }
-             else // taking already generated rtti
-             {
--                rtti = iFind->second;
-+                rtti = iFind2->second;
-             }
-         }
-     }
-
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx	2009-12-12 18:15:33.000000000 +0900
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx	2009-12-06 13:19:58.000000000 +0900
-@@ -53,13 +53,13 @@
- 
- //==================================================================================================
- static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
--                              void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn,
-+                              void * pRegisterReturn, typelib_TypeDescriptionReference * pReturnTypeRef, bool bSimpleReturn,
-                               sal_uInt64 *pStack, sal_uInt32 nStack,
-                               sal_uInt64 *pGPR, sal_uInt32 nGPR,
-                               double *pFPR, sal_uInt32 nFPR) __attribute__((noinline));
- 
- static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
--                              void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn,
-+                              void * pRegisterReturn, typelib_TypeDescriptionReference * pReturnTypeRef, bool bSimpleReturn,
-                               sal_uInt64 *pStack, sal_uInt32 nStack,
-                               sal_uInt64 *pGPR, sal_uInt32 nGPR,
-                               double *pFPR, sal_uInt32 nFPR)
-@@ -68,13 +68,13 @@
-     // Let's figure out what is really going on here
-     {
-         fprintf( stderr, "= callVirtualMethod() =\nGPR's (%d): ", nGPR );
--        for ( int i = 0; i < nGPR; ++i )
-+        for ( unsigned int i = 0; i < nGPR; ++i )
-             fprintf( stderr, "0x%lx, ", pGPR[i] );
-         fprintf( stderr, "\nFPR's (%d): ", nFPR );
--        for ( int i = 0; i < nFPR; ++i )
-+        for ( unsigned int i = 0; i < nFPR; ++i )
-             fprintf( stderr, "%f, ", pFPR[i] );
-         fprintf( stderr, "\nStack (%d): ", nStack );
--        for ( int i = 0; i < nStack; ++i )
-+        for ( unsigned int i = 0; i < nStack; ++i )
-             fprintf( stderr, "0x%lx, ", pStack[i] );
-         fprintf( stderr, "\n" );
-     }
-@@ -113,6 +113,7 @@
-     sal_uInt64 rax;
-     sal_uInt64 rdx;
-     double xmm0;
-+    double xmm1;
- 
-     asm volatile (
-         
-@@ -147,13 +148,14 @@
-         "movq   %%rax, %4\n\t"
-         "movq   %%rdx, %5\n\t"
-         "movsd %%xmm0, %6\n\t"
-+        "movsd %%xmm1, %7\n\t"
-         :
-         : "m" ( pMethod ), "m" ( pGPR ), "m" ( pFPR ), "m" ( nFPR ),
--          "m" ( rax ), "m" ( rdx ), "m" ( xmm0 )
-+          "m" ( rax ), "m" ( rdx ), "m" ( xmm0 ), "m" ( xmm1 )
-         : "rax", "rdi", "rsi", "rdx", "rcx", "r8", "r9", "r11"
-     );
- 
--    switch (pReturnTypeDescr->eTypeClass)
-+    switch (pReturnTypeRef->eTypeClass)
-     {
-     case typelib_TypeClass_HYPER:
-     case typelib_TypeClass_UNSIGNED_HYPER:
-@@ -179,12 +181,17 @@
-         break;
-     default:
-         {
--            sal_Int32 const nRetSize = pReturnTypeDescr->nSize;
-+            sal_Int32 const nRetSize = pReturnTypeRef->pType->nSize;
-             if (bSimpleReturn && nRetSize <= 16 && nRetSize > 0)
-             {
--                if (nRetSize > 8)
--                    static_cast<sal_uInt64 *>(pRegisterReturn)[1] = rdx;
--                static_cast<sal_uInt64 *>(pRegisterReturn)[0] = rax;
-+                sal_uInt64 longs[2];
-+                longs[0] = rax;
-+                longs[1] = rdx;
-+
-+                double doubles[2];
-+                doubles[0] = xmm0;
-+                doubles[1] = xmm1;
-+                x86_64::fill_struct( pReturnTypeRef, &longs[0], &doubles[0], pRegisterReturn);
-             }
-             break;
-         }
-@@ -323,6 +330,8 @@
- 			case typelib_TypeClass_DOUBLE:
- 				INSERT_FLOAT_DOUBLE( pCppArgs[nPos], nFPR, pFPR, pStack );
- 				break;
-+			default:
-+				break;
- 			}
- 
- 			// no longer needed
-@@ -365,7 +374,7 @@
- 	{
- 		callVirtualMethod(
- 			pAdjustedThisPtr, aVtableSlot.index,
--			pCppReturn, pReturnTypeDescr, bSimpleReturn,
-+			pCppReturn, pReturnTypeRef, bSimpleReturn,
- 			pStackStart, ( pStack - pStackStart ),
- 			pGPR, nGPR,
- 			pFPR, nFPR );
-@@ -435,16 +444,19 @@
- 	// is my surrogate
- 	bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
- 		= static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * >(pUnoI);
-+#if OSL_DEBUG_LEVEL > 0
- 	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+#endif
- 	
- 	switch (pMemberDescr->eTypeClass)
- 	{
- 	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
- 	{
-+#if OSL_DEBUG_LEVEL > 0
- 		// determine vtable call index
- 		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
- 		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
--		
-+#endif
- 		VtableSlot aVtableSlot(
- 				getVtableSlot(
- 					reinterpret_cast<
-@@ -489,10 +501,11 @@
- 	}
- 	case typelib_TypeClass_INTERFACE_METHOD:
- 	{
-+#if OSL_DEBUG_LEVEL > 0
- 		// determine vtable call index
- 		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
- 		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
--		
-+#endif
- 		VtableSlot aVtableSlot(
- 				getVtableSlot(
- 					reinterpret_cast<
---- bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx~	2009-06-13 16:41:45.000000000 +0900
-+++ bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx	2009-06-13 16:42:24.000000000 +0900
-@@ -40,7 +40,7 @@
- #include <hash_map>
- 
- /*See: http://people.redhat.com/drepper/selinux-mem.html*/
--#ifdef LINUX
-+#if defined (LINUX) || defined (FREEBSD)
- #define USE_DOUBLE_MMAP
- #endif
- 
diff --git a/editors/openoffice-3/files/patch-i85972 b/editors/openoffice-3/files/patch-i85972
deleted file mode 100644
index 78860836b84e..000000000000
--- a/editors/openoffice-3/files/patch-i85972
+++ /dev/null
@@ -1,61 +0,0 @@
-Index: lpsolve/lp_solve_5.5.patch
-===================================================================
-RCS file: /cvs/external/lpsolve/lp_solve_5.5.patch,v
-retrieving revision 1.4
-diff -u -r1.4 lp_solve_5.5.patch
---- lpsolve/lp_solve_5.5.patch	16 Jun 2008 14:19:46 -0000	1.4
-+++ lpsolve/lp_solve_5.5.patch	3 Jul 2008 00:20:52 -0000
-@@ -72,3 +72,25 @@
- +fi
- +
- +rm *.o 2>/dev/null
-+--- misc/lp_solve_5.5/lpsolve55/ccc.freebsd	Wed May 21 17:45:07 2008
-++++ misc/build/lp_solve_5.5/lpsolve55/ccc.freebsd	Wed May 21 17:44:54 2008
-+@@ -1,1 +1,18 @@
-+-dummy
-++src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-++
-++c=$CC
-++def=
-++so=yes
-++
-++opts='-O3 -DINTEGERTIME'
-++$CC -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-++ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
-++ranlib liblpsolve55.a
-++
-++if [ "$so" != "" ]
-++then
-++  $CC -fPIC -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-++  $CC -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm
-++fi
-++
-++rm *.o 2>/dev/null
-
---- lpsolve/makefile.mk.orig	2008-12-24 09:40:11.000000000 +0900
-+++ lpsolve/makefile.mk	2008-12-24 12:09:06.000000000 +0900
-@@ -46,7 +47,7 @@
- PATCH_FILES=lp_solve_5.5-windows.patch
- .ELSE
- PATCH_FILES=lp_solve_5.5.patch
--ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2
-+ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2 lpsolve55$/ccc.freebsd
- .ENDIF
- 
- CONFIGURE_DIR=
-@@ -73,11 +74,16 @@
- .IF "$(COMNAME)"=="sunpro5"
- BUILD_ACTION=sh ccc.solaris
- .ELSE
-+.IF "$(OS)"=="FREEBSD"
-+BUILD_ACTION=sh -x ccc.freebsd
-+OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
-+.ELSE
- BUILD_ACTION=sh ccc
- .ENDIF
- OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
- .ENDIF
- .ENDIF
-+.ENDIF
- 
- OUT2INC=lp_lib.h lp_types.h lp_utils.h lp_Hash.h lp_matrix.h lp_mipbb.h lp_SOS.h
diff --git a/editors/openoffice-3/files/patch-i87583 b/editors/openoffice-3/files/patch-i87583
deleted file mode 100644
index 750935a3030b..000000000000
--- a/editors/openoffice-3/files/patch-i87583
+++ /dev/null
@@ -1,36 +0,0 @@
---- desktop/scripts/soffice.sh.orig	2008-06-09 08:57:10.000000000 -0400
-+++ desktop/scripts/soffice.sh	2008-06-27 16:12:58.000000000 -0400
-@@ -75,6 +75,15 @@
- 
- # extend the ld_library_path for java: javaldx checks the sofficerc for us
- if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
-+    # this is a temporary hack until we can live with the default search paths
-+    case "`uname -s`" in
-+    FreeBSD)
-+	sd_prog1="$sd_prog/../basis-link/program"
-+	sd_prog2="$sd_prog/../basis-link/ure-link/lib"
-+	LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
-+	export LD_LIBRARY_PATH
-+	;;
-+    esac
-     my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
-         "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
-     if [ -n "$my_path" ] ; then
---- padmin/source/spadmin.sh.orig	2008-06-27 01:18:09.000000000 -0400
-+++ padmin/source/spadmin.sh	2008-06-27 13:31:09.000000000 -0400
-@@ -58,6 +58,15 @@
- 
- # extend the ld_library_path for java: javaldx checks the sofficerc for us
- if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
-+    # this is a temporary hack until we can live with the default search paths
-+    case "`uname -s`" in
-+    FreeBSD)
-+	sd_prog1="$sd_prog/../basis-link/program"
-+	sd_prog2="$sd_prog/../basis-link/ure-link/lib"
-+	LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
-+	export LD_LIBRARY_PATH
-+	;;
-+    esac
-     my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
-         "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
-     if [ -n "$my_path" ] ; then
diff --git a/editors/openoffice-3/files/patch-i88156 b/editors/openoffice-3/files/patch-i88156
deleted file mode 100644
index 7c8b38558433..000000000000
--- a/editors/openoffice-3/files/patch-i88156
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: binfilter/bf_sw/source/filter/w4w/makefile.mk
-===================================================================
-RCS file: /cvs/framework/binfilter/bf_sw/source/filter/w4w/makefile.mk,v
-retrieving revision 1.9
-diff -u -r1.9 makefile.mk
---- binfilter/bf_sw/source/filter/w4w/makefile.mk	20 Nov 2006 12:38:59 -0000	1.9
-+++ binfilter/bf_sw/source/filter/w4w/makefile.mk	12 Apr 2008 00:02:49 -0000
-@@ -58,6 +58,10 @@
- CDEFS=$(CDEFS) -Dmydebug
- .ENDIF
- 
-+.IF "$(OSL_DEBUG_LEVEL)" > 0
-+CDEFS += -DENABLE_BYTESTRING_STREAM_OPERATORS
-+.ENDIF
-+
- # --- Files --------------------------------------------------------
- 
- CXXFILES = \
diff --git a/editors/openoffice-3/files/patch-i91318 b/editors/openoffice-3/files/patch-i91318
deleted file mode 100644
index 4348b75903da..000000000000
--- a/editors/openoffice-3/files/patch-i91318
+++ /dev/null
@@ -1,14 +0,0 @@
---- hyphen/hyphen-2.4.patch	2010-05-05 12:40:53.000000000 +0900
-+++ hyphen/hyphen-2.4.patch	2010-05-05 12:41:25.000000000 +0900
-@@ -167,3 +167,11 @@
- +
- +.INCLUDE : target.mk
- Common subdirectories: misc/hyphen-2.4/tests and misc/build/hyphen-2.4/tests
-+--- misc/hyphen-2.4/tests/test.sh	2010-05-05 12:40:17.000000000 +0900
-++++ misc/build/hyphen-2.4/tests/test.sh	2010-05-05 12:40:31.000000000 +0900
-+@@ -1,4 +1,4 @@
-+-#!/bin/bash
-++#!/usr/bin/env bash
-+ 
-+ function check_valgrind_log () {
-+ if [ "$VALGRIND" != "" ]; then
diff --git a/editors/openoffice-3/files/patch-i91861 b/editors/openoffice-3/files/patch-i91861
deleted file mode 100644
index 85dfde19f963..000000000000
--- a/editors/openoffice-3/files/patch-i91861
+++ /dev/null
@@ -1,14 +0,0 @@
---- vcl/source/glyphs/makefile.mk~	2009-11-18 13:58:31.000000000 +0900
-+++ vcl/source/glyphs/makefile.mk	2009-11-29 20:13:21.000000000 +0900
-@@ -41,7 +41,11 @@
- .INCLUDE :  settings.mk
- .INCLUDE :  $(PRJ)$/util$/makefile2.pmk
- 
-+.IF "$(OS)" != "FREEBSD"
- CFLAGS+= $(FREETYPE_CFLAGS)
-+.ELSE
-+ADDCDEFS+= $(FREETYPE_CFLAGS)
-+.ENDIF
- 
- # --- Files --------------------------------------------------------
- 
diff --git a/editors/openoffice-3/files/patch-i98714 b/editors/openoffice-3/files/patch-i98714
deleted file mode 100644
index 50cecadf6ede..000000000000
--- a/editors/openoffice-3/files/patch-i98714
+++ /dev/null
@@ -1,13 +0,0 @@
---- writerfilter/source/resourcemodel/makefile.mk.orig	2008-07-22 08:53:57.000000000 -0400
-+++ writerfilter/source/resourcemodel/makefile.mk	2008-09-03 12:26:09.000000000 -0400
-@@ -56,8 +56,8 @@
-     $(SLO)$/TagLogger.obj \
- 	$(SLO)$/WW8Analyzer.obj
- 
--# linux 64 bit: compiler (gcc 4.2.3) fails with 'out of memory'
--.IF "$(OUTPATH)"=="unxlngx6"
-+# FreeBSD/Linux 64-bit: compiler (gcc 4.2.x) fails with 'out of memory'
-+.IF "$(OUTPATH)"=="unxfbsdx" || "$(OUTPATH)"=="unxfbsdi" || "$(OUTPATH)"=="unxlngx6"
- NOOPTFILES= \
- 	$(SLO)$/qnametostr.obj
- .ENDIF
diff --git a/editors/openoffice-3/files/patch-i98781 b/editors/openoffice-3/files/patch-i98781
deleted file mode 100644
index d9addab6674a..000000000000
--- a/editors/openoffice-3/files/patch-i98781
+++ /dev/null
@@ -1,112 +0,0 @@
-catch up to recent bridge also fixes following issues
-for i386
-http://www.openoffice.org/issues/show_bug.cgi?id=98781
-http://www.openoffice.org/issues/show_bug.cgi?id=82690
-http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
-
-We also need
-#define USE_DOUBLE_MMAP for FreeBSD as well. The patch was included
-in files/patches-i85126
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	2009-12-12 18:15:33.000000000 +0900
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	2009-12-06 13:19:58.000000000 +0900
-@@ -362,7 +362,7 @@
- int const codeSnippetSize = 16;
- 
- unsigned char * codeSnippet(
--    unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset,
-+    unsigned char * code, sal_PtrDiff writetoexecdiff, sal_Int32 functionIndex, sal_Int32 vtableOffset,
-     typelib_TypeClass returnTypeClass)
- {
-     if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) {
-@@ -408,7 +408,7 @@
-     // jmp privateSnippetExecutor:
-     *p++ = 0xE9;
-     *reinterpret_cast< sal_Int32 * >(p)
--        = ((unsigned char *) exec) - p - sizeof (sal_Int32);
-+        = ((unsigned char *) exec) - p - sizeof (sal_Int32) - writetoexecdiff;
-     p += sizeof (sal_Int32);
-     OSL_ASSERT(p - code <= codeSnippetSize);
-     return code + codeSnippetSize;
-@@ -419,8 +419,7 @@
- struct bridges::cpp_uno::shared::VtableFactory::Slot { void * fn; };
- 
- bridges::cpp_uno::shared::VtableFactory::Slot *
--bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
--{
-+bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block) {
-     return static_cast< Slot * >(block) + 2;
- }
- 
-@@ -441,7 +440,7 @@
- }
- 
- unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
--    Slot ** slots, unsigned char * code,
-+    Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
-     typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
-     sal_Int32 functionCount, sal_Int32 vtableOffset)
- {
-@@ -454,9 +453,9 @@
-         switch (member->eTypeClass) {
-         case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-             // Getter:
--            (s++)->fn = code;
-+            (s++)->fn = code + writetoexecdiff;
-             code = codeSnippet(
--                code, functionOffset++, vtableOffset,
-+                code, writetoexecdiff, functionOffset++, vtableOffset,
-                 reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >(
-                     member)->pAttributeTypeRef->eTypeClass);
-             // Setter:
-@@ -464,17 +463,17 @@
-                 typelib_InterfaceAttributeTypeDescription * >(
-                     member)->bReadOnly)
-             {
--                (s++)->fn = code;
-+                (s++)->fn = code + writetoexecdiff;
-                 code = codeSnippet(
--                    code, functionOffset++, vtableOffset,
-+                    code, writetoexecdiff, functionOffset++, vtableOffset,
-                     typelib_TypeClass_VOID);
-             }
-             break;
- 
-         case typelib_TypeClass_INTERFACE_METHOD:
--            (s++)->fn = code;
-+            (s++)->fn = code + writetoexecdiff;
-             code = codeSnippet(
--                code, functionOffset++, vtableOffset,
-+                code, writetoexecdiff, functionOffset++, vtableOffset,
-                 reinterpret_cast< typelib_InterfaceMethodTypeDescription * >(
-                     member)->pReturnTypeRef->eTypeClass);
-             break;
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	2009-12-12 18:15:33.000000000 +0900
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	2009-12-06 13:19:58.000000000 +0900
-@@ -32,6 +32,7 @@
- #include "precompiled_bridges.hxx"
- 
- #include <stdio.h>
-+#include <string.h>
- #include <dlfcn.h>
- #include <cxxabi.h>
- #include <hash_map>
-@@ -121,7 +122,7 @@
- };
- //__________________________________________________________________________________________________
- RTTI::RTTI() SAL_THROW( () )
--#if __FreeBSD_version < 602103
-+#if __FreeBSD_version < 702104 /* #i22253# */
-     : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
- #else
-     : m_hApp( dlopen( 0, RTLD_LAZY ) )
-@@ -160,7 +161,7 @@
-         buf.append( 'E' );
- 
-         OString symName( buf.makeStringAndClear() );
--#if __FreeBSD_version < 602103 /* #i22253# */
-+#if __FreeBSD_version < 702104 /* #i22253# */
-         rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
- #else
-         rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
diff --git a/editors/openoffice-3/files/patch-java-vendors b/editors/openoffice-3/files/patch-java-vendors
new file mode 100644
index 000000000000..0c3868e4eaef
--- /dev/null
+++ b/editors/openoffice-3/files/patch-java-vendors
@@ -0,0 +1,24 @@
+--- jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml	2012/03/28 11:18:19	1306262
++++ jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml	2012/04/24 04:16:01	1329547
+@@ -23,9 +23,12 @@
+ <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  
+- <updated>2008-08-27</updated>
++ <updated>2011-01-07</updated>
+  
+  <vendorInfos> 
++  <vendor name="Oracle Corporation">
++    <minVersion>1.7.0</minVersion>
++  </vendor>
+   <vendor name="Sun Microsystems Inc.">
+     <minVersion>1.5.0</minVersion>
+   </vendor>
+@@ -38,6 +41,7 @@
+  </vendorInfos>
+ 
+  <plugins>
++  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+   <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+   <library vendor="The FreeBSD Foundation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+   <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
diff --git a/editors/openoffice-3/files/patch-libxslt b/editors/openoffice-3/files/patch-libxslt
deleted file mode 100644
index 9a2824d458c2..000000000000
--- a/editors/openoffice-3/files/patch-libxslt
+++ /dev/null
@@ -1,25 +0,0 @@
---- /dev/null	2012-02-11 16:33:00.000000000 -0800
-+++ libxslt/libxslt-libexslt-date_c.patch	2012-02-11 16:40:50.000000000 -0800
-@@ -0,0 +1,11 @@
-+--- misc/build/libxslt-1.1.26/libexslt/date.c.orig	2009-09-17 07:51:10.000000000 -0700
-++++ misc/build/libxslt-1.1.26/libexslt/date.c	2012-02-11 16:40:48.000000000 -0800
-+@@ -29,7 +29,7 @@
-+ #endif
-+ 
-+ #if HAVE_LOCALTIME_R	/* _POSIX_SOURCE required by gnu libc */
-+-#ifndef _AIX51		/* but on AIX we're not using gnu libc */
-++#if !defined(_AIX51) && !defined(__FreeBSD__) /* but on AIX or FreeBSD we're not using gnu libc */
-+ #define _POSIX_SOURCE
-+ #endif
-+ #endif
---- libxslt/makefile.mk.orig	2011-01-18 05:34:25.000000000 -0800
-+++ libxslt/makefile.mk	2012-02-11 22:25:14.000000000 -0800
-@@ -55,6 +55,7 @@
- PATCH_FILES=libxslt-configure.patch \
-             libxslt-win_manifest.patch \
-             libxslt-mingw.patch \
-+            libxslt-libexslt-date_c.patch \
-             libxslt-internal-symbols.patch
- 
- 
-
diff --git a/editors/openoffice-3/files/patch-moz b/editors/openoffice-3/files/patch-moz
new file mode 100644
index 000000000000..3a15772edb6e
--- /dev/null
+++ b/editors/openoffice-3/files/patch-moz
@@ -0,0 +1,215 @@
+diff -urN moz/zipped/makefile.mk moz/zipped/makefile.mk
+--- moz/zipped/makefile.mk	1970-01-01 09:00:00.000000000 +0900
++++ moz/zipped/makefile.mk	2012-04-25 16:49:07.000000000 +0900
+@@ -0,0 +1,211 @@
++#**************************************************************
++#  
++#  Licensed to the Apache Software Foundation (ASF) under one
++#  or more contributor license agreements.  See the NOTICE file
++#  distributed with this work for additional information
++#  regarding copyright ownership.  The ASF licenses this file
++#  to you under the Apache License, Version 2.0 (the
++#  "License"); you may not use this file except in compliance
++#  with the License.  You may obtain a copy of the License at
++#  
++#    http://www.apache.org/licenses/LICENSE-2.0
++#  
++#  Unless required by applicable law or agreed to in writing,
++#  software distributed under the License is distributed on an
++#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
++#  KIND, either express or implied.  See the License for the
++#  specific language governing permissions and limitations
++#  under the License.
++#  
++#**************************************************************
++
++
++
++PRJ=..
++
++PRJNAME=moz
++TARGET=moz_unzip
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE :  settings.mk
++
++# --- Files --------------------------------------------------------
++
++.IF "$(PREBUILD_MOZAB)" == "" || "$(SYSTEM_MOZILLA)" == "YES" || "$(WITH_MOZILLA)" == "NO"
++
++dummy:
++	@echo "No need to unpack the prebuilt mozab packages"
++
++.ELSE # unpack mozab zips
++.INCLUDE :  target.mk
++
++.IF "$(BUILD_MOZAB)"=="TRUE"
++ALLTAR:
++	@echo "Does not need build mozab zipped!"
++.ELSE
++ALLTAR: \
++	$(MISC)$/unpacked_$(TARGET)_inc \
++	$(MISC)$/unpacked_$(TARGET)_lib \
++	$(BIN)$/mozruntime.zip \
++	$(MISC)$/replace_old_nss_libs
++.ENDIF
++.IF "$(GUI)" == "UNX"
++
++$(MISC)$/unpacked_%_lib : $(OS)$(COM)$(CPU)lib.zip '$(OS)$(COM)$(CPU)runtime.zip'
++	unzip -o -d $(LB) $(OS)$(COM)$(CPU)lib.zip && unzip -o -d $(LB) $(OS)$(COM)$(CPU)runtime.zip && $(TOUCH) $@
++	chmod -R 775 $(LB)
++
++$(MISC)$/unpacked_%_inc : $(OS)$(COM)$(CPU)inc.zip
++	unzip -o -d $(INCCOM) $(OS)$(COM)$(CPU)inc.zip && $(TOUCH)	$@
++	chmod -R 775 $(INCCOM)
++
++.ELSE
++
++$(MISC)$/unpacked_$(TARGET)_lib : $(OS)$(COM)$(CPU)lib.zip
++	unzip -o -d $(LB) $(OS)$(COM)$(CPU)lib.zip && \
++	$(TOUCH) $@
++
++$(MISC)$/unpacked_$(TARGET)_inc : $(OS)$(COM)$(CPU)inc.zip
++	unzip -o -d $(INCCOM) $(OS)$(COM)$(CPU)inc.zip && $(TOUCH)	$@
++
++.ENDIF
++
++$(BIN)$/mozruntime%zip : $(OS)$(COM)$(CPU)runtime.zip
++	$(COPY) $(OS)$(COM)$(CPU)runtime.zip $(BIN)$/mozruntime.zip
++
++# add alternative rules for universal binary moz-zips
++.IF "$(GUIBASE)" == "aqua"
++$(MISC)$/unpacked_%_lib : $(OS)$(COM)UBlib.zip '$(OS)$(COM)UBruntime.zip'
++	unzip -o -d $(LB) $(OS)$(COM)UBlib.zip && unzip -o -d $(LB) $(OS)$(COM)UBruntime.zip && $(TOUCH) $@
++	chmod -R 775 $(LB)
++  
++$(MISC)$/unpacked_%_inc : $(OS)$(COM)UBinc.zip
++	unzip -o -d $(INCCOM) $(OS)$(COM)UBinc.zip && $(TOUCH)	$@
++	chmod -R 775 $(INCCOM)
++
++$(BIN)$/mozruntime%zip : $(OS)$(COM)UBruntime.zip
++	$(COPY) $(OS)$(COM)UBruntime.zip $(BIN)$/mozruntime.zip
++
++.ENDIF # "$(GUIBASE)"=="aqua"
++
++LIBLIST =
++BIN_RUNTIMELIST = 
++NSS_INCLUDE_LIST =
++NSS_MODULE_RUNTIME_LIST =
++.IF "$(ENABLE_NSS_MODULE)"=="YES"
++# The prebuilt moz files include all the old NSS stuff from moz and not the new
++# NSS libs, headers, etc, from the separate nss module. If we use the nss module
++# then we must take care not to deliver the old NSS stuff from the "prebuilts"
++.IF "$(GUI)" == "WNT"
++    FREEBL_LIB_OLD=freebl3
++.ELSE # "$(GUI)" == "WNT"
++    .IF "$(OS)$(CPUNAME)" == "SOLARISSPARC"
++        FREEBL_LIB_OLD=freebl_32fpu_3
++    .ELSE # "$(OS)$(CPUNAME)" == "SOLARISSPARC"
++        FREEBL_LIB_OLD=freebl3
++    .ENDIF # "$(OS)$(CPUNAME)" == "SOLARISSPARC"
++.ENDIF # "$(GUI)" == "WNT"
++
++BIN_RUNTIMELIST= \
++    $(FREEBL_LIB_OLD) \
++    nspr4 \
++    plc4 \
++    plds4 \
++    nss3 \
++    ssl3 \
++    softokn3 \
++    smime3
++
++.IF "$(GUI)"=="WNT"
++.IF "$(COM)"=="GCC"
++LIBLIST= \
++    libnspr4.a \
++    libnss3.a \
++    libsmime3.a \
++    libplc4.a \
++    libplds4.a \
++    libssl3.a
++
++.ELSE
++LIBLIST= \
++    nspr4.lib \
++    plc4.lib \
++    plds4.lib \
++    nss3.lib \
++    ssl3.lib\
++    smime3.lib
++.ENDIF
++.ELSE   #"$(GUI)"=="WNT"
++LIBLIST= \
++    lib$(FREEBL_LIB_OLD)$(DLLPOST) \
++    libnspr4$(DLLPOST) \
++    libsoftokn3$(DLLPOST) \
++    libplc4$(DLLPOST) \
++    libplds4$(DLLPOST) \
++    libnss3$(DLLPOST) \
++    libssl3$(DLLPOST) \
++    libsmime3$(DLLPOST)
++
++.ENDIF # .IF "$(GUI)"=="WNT"
++
++
++# On MacOS no include dirs nspr and nss exists in the prebuilt zip, no need to remove them 
++.IF "$(OS)" != "MACOSX" 
++NSS_INCLUDE_LIST= nspr nss
++.ENDIF
++
++.IF "$(OS)" == "SOLARIS" 
++.IF "$(CPU)" == "S" #32bit
++FREEBL=freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
++.ELIF "$(CPU)" == "U" #64bit unxsolu4
++FREEBL=freebl_64int_3 freebl_64fpu_3
++.ELSE
++FREEBL=freebl3
++.ENDIF #"$(CPU)" == "S"
++
++.ELSE # "$(OS)" == "SOLARIS" 
++FREEBL=freebl3
++.ENDIF # "$(OS)" == "SOLARIS" 
++
++
++#On Linux/Unix sqlite is delivered to $(SOLARLIBDIR)/sqlite/libsqlite3.so
++#See readme.txt  in module nss
++NSS_MODULE_RUNTIME_LIST:= \
++    $(FREEBL) \
++    nspr4 \
++    nss3 \
++    nssckbi \
++    nssdbm3 \
++    nssutil3 \
++    plc4 \
++    plds4 \
++    smime3 \
++    softokn3 \
++    sqlite/sqlite3 \
++    ssl3
++
++
++.ENDIF #.IF "$(ENABLE_NSS_MODULE)"=="YES"
++# Remove the nss libs build in moz and those build in the nss module
++$(MISC)$/replace_old_nss_libs : $(MISC)$/unpacked_$(TARGET)_lib \
++$(MISC)$/unpacked_$(TARGET)_inc $(BIN)$/mozruntime.zip
++    +$(foreach,dir,$(NSS_INCLUDE_LIST) $(RENAME:s/+//) $(INCCOM)$/$(dir) \
++    $(INCCOM)$/$(dir)_remove_me &&)  echo >& $(NULLDEV)
++    $(foreach,dir,$(NSS_INCLUDE_LIST) rm -r -f $(INCCOM)$/$(dir)_remove_me &&) \
++        echo >& $(NULLDEV)
++    $(foreach,lib,$(LIBLIST) rm -f $(LB)$/$(lib) &&) \
++    echo >& $(NULLDEV)
++    $(foreach,lib,$(BIN_RUNTIMELIST) zip -d $(BIN)$/mozruntime.zip $(DLLPRE)$(lib:f)$(DLLPOST) &&) \
++    echo >& $(NULLDEV)
++.IF "$(GUI)"=="WNT"
++    +$(foreach,lib,$(NSS_MODULE_RUNTIME_LIST) zip -g -j $(BIN)$/mozruntime.zip $(SOLARBINDIR)$/$(DLLPRE)$(lib:f)$(DLLPOST) &&) \
++    echo >& $(NULLDEV)
++.ELSE
++    +$(foreach,lib,$(NSS_MODULE_RUNTIME_LIST) zip -g -j $(BIN)$/mozruntime.zip $(SOLARLIBDIR)$/$(lib:d)$(DLLPRE)$(lib:f)$(DLLPOST) &&) \
++    echo >& $(NULLDEV)
++.ENDIF
++    $(TOUCH) $@     
++
++.ENDIF   # unpack mozab zips
++
diff --git a/editors/openoffice-3/files/patch-python-2.6.2-svnversion b/editors/openoffice-3/files/patch-python-2.6.2-svnversion
deleted file mode 100644
index 5006464fe0f3..000000000000
--- a/editors/openoffice-3/files/patch-python-2.6.2-svnversion
+++ /dev/null
@@ -1,53 +0,0 @@
-http://bugs.python.org/file14047
-
---- python/Python-2.6.1.patch~	2011-11-06 00:03:55.000000000 +0900
-+++ python/Python-2.6.1.patch	2011-11-06 07:51:41.000000000 +0900
-@@ -1,3 +1,48 @@
-+--- misc/Python-2.6.1/configure.in	Wed Jun 11 09:41:16 2008
-++++ misc/build/Python-2.6.1/configure.in	Fri Apr 17 09:02:52 2009
-+@@ -767,7 +767,7 @@
-+ then
-+ 	SVNVERSION="svnversion \$(srcdir)"
-+ else
-+-	SVNVERSION="echo exported"
-++	SVNVERSION="echo Unversioned directory"
-+ fi
-+ 
-+ case $MACHDEP in
-+--- misc/Python-2.6.1/Makefile.pre.in	Wed Jun 11 09:41:16 2008
-++++ misc/build/Python-2.6.1/Makefile.pre.in	Fri Apr 17 09:02:52 2009
-+@@ -501,7 +501,7 @@
-+ 		$(SIGNAL_OBJS) \
-+ 		$(MODOBJS) \
-+ 		$(srcdir)/Modules/getbuildinfo.c
-+-	$(CC) -c $(PY_CFLAGS) -DSVNVERSION=\"`LC_ALL=C $(SVNVERSION)`\" -o $@ $(srcdir)/Modules/getbuildinfo.c
-++	$(CC) -c $(PY_CFLAGS) -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\"" -o $@ $(srcdir)/Modules/getbuildinfo.c
-+ 
-+ Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
-+ 	$(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
-+--- misc/Python-2.6.1/Modules/getbuildinfo.c	Wed Jun 11 09:41:16 2008
-++++ misc/build/Python-2.6.1/Modules/getbuildinfo.c Fri Apr 17 09:02:52 2009
-+@@ -48,5 +48,5 @@
-+ 	static const char svnversion[] = SVNVERSION;
-+ 	if (svnversion[0] != '$')
-+ 		return svnversion; /* it was interpolated, or passed on command line */
-+-	return "exported";
-++	return "Unversioned directory";
-+ }
-+--- misc/Python-2.6.1/Python/sysmodule.c	Wed Jun 11 09:41:16 2008
-++++ misc/build/Python-2.6.1/Python/sysmodule.c Fri Apr 17 09:02:52 2009
-+@@ -1161,7 +1161,7 @@
-+ 
-+ 
-+ 	svnversion = _Py_svnversion();
-+-	if (strcmp(svnversion, "exported") != 0)
-++	if (strcmp(svnversion, "Unversioned directory") != 0 && strcmp(svnversion, "exported") != 0)
-+ 		svn_revision = svnversion;
-+ 	else if (istag) {
-+ 		len = strlen(_patchlevel_revision);
-+
-+
-+
- --- misc/Python-2.6.1/Include/pyport.h	Wed Jun 11 09:41:16 2008
- +++ misc/build/Python-2.6.1/Include/pyport.h	Fri Apr 17 09:02:52 2009
- @@ -449,11 +449,6 @@
diff --git a/editors/openoffice-3/files/patch-unxfbsd.mk b/editors/openoffice-3/files/patch-unxfbsd.mk
new file mode 100644
index 000000000000..76b9d3969704
--- /dev/null
+++ b/editors/openoffice-3/files/patch-unxfbsd.mk
@@ -0,0 +1,43 @@
+--- solenv/inc/unxfbsd.mk.orig	2011-12-21 09:47:20.000000000 +0900
++++ solenv/inc/unxfbsd.mk	2011-12-25 20:48:29.000000000 +0900
+@@ -84,14 +84,14 @@
+ .ENDIF
+ 
+ # flags for the C++ Compiler
+-CFLAGSCC= -pipe $(ARCH_FLAGS)
++CFLAGSCC= -pipe $(ARCH_FLAGS) %%RPATH%%
+ # Flags for enabling exception handling
+ CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+ # Flags for disabling exception handling
+ CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+ 
+ # -fpermissive should be removed as soon as possible
+-CFLAGSCXX= -pipe $(ARCH_FLAGS)
++CFLAGSCXX= -pipe $(ARCH_FLAGS) %%RPATH%%
+ .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+ CFLAGSCXX += -fvisibility-inlines-hidden
+ .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+@@ -140,16 +140,16 @@
+ LINKFLAGS_SYSBASE:=-Wl,--sysroot=$(SYSBASE)
+ .ENDIF          # "$(SYSBASE)"!=""
+ LINKFLAGSDEFS*=-Wl,-z,defs
+-LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
+-LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
++LINKFLAGSRUNPATH_URELIB=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\'
++LINKFLAGSRUNPATH_UREBIN=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
+     #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
+-LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
+-LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
+-LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
++LINKFLAGSRUNPATH_OOO=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
++LINKFLAGSRUNPATH_SDK=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
++LINKFLAGSRUNPATH_BRAND=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
+ LINKFLAGSRUNPATH_OXT=
+-LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\'
++LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\'
+ LINKFLAGSRUNPATH_NONE=
+-LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)
++LINKFLAGS=-Wl,-z,combreloc %%RPATH%% $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)
+ 
+ # linker flags for linking applications
+ LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
diff --git a/editors/openoffice-3/files/patch-vcl b/editors/openoffice-3/files/patch-vcl
new file mode 100644
index 000000000000..b5897169e595
--- /dev/null
+++ b/editors/openoffice-3/files/patch-vcl
@@ -0,0 +1,24 @@
+temporary hack. -I/usr/local/include appears too early so that graphite
+catches it thus build fails. 
+
+/workdir &&  mkdir -p $W/CxxObject/vcl/unx/generic/gdi/ && mkdir -p $W/Dep/CxxObject/vcl/unx/generic/gdi/ && c++ -DCPPU_ENV=gcc3 -DCUI -DENABLE_GRAPHITE -DENABLE_GTK -DENABLE_LAYOUT=0 -DENABLE_LAYOUT_EXPERIMENTAL=0 -DFREEBSD -DGCC -DGXX_INCLUDE_PATH=/usr/include/c++/4.2 -DHAVE_GCC_VISIBILITY_FEATURE -DNDEBUG -DOPTIMIZE -DOSL_DEBUG_LEVEL=0 -DPRODUCT -DPRODUCT_FULL -DSOLAR_JAVA -DSTLPORT_VERSION=400 -DSUPD=340 -DUNIX -DUNX -DVCL -DX86_64 -D_PTHREADS -D_REENTRANT   -D_XSALSET_LIBNAME=\"libspa.so\" -DVCLPLUG_GEN_IMPLEMENTATION  -DUSE_RANDR  -DUSE_XINERAMA_XORG  -Wall -Wendif-labels -Wextra -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -Wshadow -fPIC -fmessage-length=0 -fno-common -fno-strict-aliasing -fno-use-cxa-atexit -fvisibility-inlines-hidden -fvisibility=hidden -pipe   -D_THREAD_SAFE -I/usr/local/include    -DEXCEPTIONS_ON -fexceptions -fno-enforce-eh-specs  -Os -c $S/vcl/unx/generic/gdi/pspgraphics.cxx -o $W/CxxObject/vcl/unx/generic/gdi/pspgraphics.o -MMD -MT $W/CxxObject/vcl/unx/generic/gdi/pspgraphics.o -MF $W/Dep/CxxObject/vcl/unx/generic/gdi/pspgraphics.d -I$S/vcl/unx/generic/gdi/ -I$O/inc/stl -I$O/inc/stl -Iaaa -I$O/inc/external -I$O/inc -I$S/solenv/unxfbsdx/inc -I$S/solenv/inc -I$S/res -I$S/solenv/inc/Xp31 -I/usr/local/openjdk6/include -I/usr/local/openjdk6/include/freebsd -I/usr/local/openjdk6/include/bsd -I/usr/local/openjdk6/include/linux -I/usr/local/openjdk6/include/native_threads/include -I/usr/local/include -I$S/vcl/inc -I$S/vcl/inc/pch -I$S/solenv/inc -I$O/inc/offuh -I$O/inc/stl -I$O/inc 
+In file included from /usr/local/include/graphite/GrClient.h:31,
+                 from /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-3-devel/work/ooo/main/vcl/inc/graphite_layout.hxx:40,
+                 from /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-3-devel/work/ooo/main/vcl/unx/generic/gdi/pspgraphics.cxx:52:
+/usr/local/include/graphite/GrFeature.h:110: error: 'wstring' in namespace '_STL' does not name a type
+/usr/local/include/graphite/GrFeature.h:111: error: 'wstring' in namespace '_STL' does not name a type
+/usr/local/include/graphite/GrFeature.h:113: error: 'wstring' in namespace '_STL' does not name a type
+In file included from /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-3-devel/work/ooo/main/vcl/inc/graphite_layout.hxx:41,
+                 from /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-3-devel/work/ooo/main/vcl/unx/generic/gdi/pspgraphics.cxx:52:
+
+
+--- vcl/Library_vclplug_gen.mk	2012-02-20 11:32:20.000000000 +0900
++++ vcl/Library_vclplug_gen.mk	2012-02-20 11:53:47.000000000 +0900
+@@ -125,7 +125,6 @@
+ ifeq ($(XRANDR_DLOPEN),FALSE)
+ $(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
+     $$(CXXFLAGS) \
+-    $$(XRANDR_CFLAGS) \
+ ))
+ $(eval $(call gb_Library_set_ldflags,vclplug_gen,\
+     $$(LDFLAGS) \
diff --git a/editors/openoffice-3/files/patch-vcl-PR161789 b/editors/openoffice-3/files/patch-vcl-PR161789
deleted file mode 100644
index 3ce115c46d94..000000000000
--- a/editors/openoffice-3/files/patch-vcl-PR161789
+++ /dev/null
@@ -1,22 +0,0 @@
---- vcl/unx/inc/xfont.hxx~	2011-01-18 22:35:50.000000000 +0900
-+++ vcl/unx/inc/xfont.hxx	2011-11-06 07:38:40.000000000 +0900
-@@ -27,7 +27,7 @@
- #ifndef EXTENDED_FONTSTRUCT_HXX
- #define EXTENDED_FONTSTRUCT_HXX
- 
--#ifndef _XLIB_H_
-+#ifndef _X11_XLIB_H_
- #include <tools/prex.h>
- #include <X11/Xlib.h>
- #include <tools/postx.h>
---- vcl/unx/inc/dtint.hxx~	2011-01-18 22:35:50.000000000 +0900
-+++ vcl/unx/inc/dtint.hxx	2011-11-06 07:38:23.000000000 +0900
-@@ -36,7 +36,7 @@
- class SalDisplay;
- class AllSettings;
- 
--#ifndef _XLIB_H_
-+#ifndef _X11_XLIB_H_
- // forwards from X
- struct Display;
- struct XEvent;
diff --git a/editors/openoffice-3/files/pkg-message.in b/editors/openoffice-3/files/pkg-message.in
index 7bfa92c74667..5d4f68bb1a37 100644
--- a/editors/openoffice-3/files/pkg-message.in
+++ b/editors/openoffice-3/files/pkg-message.in
@@ -1,9 +1,9 @@
-OpenOffice.org Build %%OOOTAG%% Personal Install How-To
+Apache OpenOffice Build %%OOOTAG%% Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 		and Maho Nakata <maho@FreeBSD.org>
 
-OpenOffice.org %%OOOTAG%% will soon been installed in
+Apache OpenOffice %%OOOTAG%% will soon been installed in
 %%PREFIX%%/%%EXECBASE%%
 
 1. User installation
diff --git a/editors/openoffice-3/pkg-descr b/editors/openoffice-3/pkg-descr
index bc2ede1b8c2b..3dc560a18576 100644
--- a/editors/openoffice-3/pkg-descr
+++ b/editors/openoffice-3/pkg-descr
@@ -1,7 +1,8 @@
-OpenOffice.org is an Open Source, community-developed, multi-platform office
-productivity suite. It includes the key desktop applications, such as a
-word processor, spreadsheet, presentation manager, and drawing program,
-with a user interface and feature set similar to other office suites.
+Apache OpenOffice is an Open Source, community-developed, multi-platform
+office productivity suite. It includes the key desktop applications,
+such as a word processor, spreadsheet, presentation manager, and drawing
+program, with a user interface and feature set similar to other
+office suites.
 
 Components include:
   * A universal word processing application for creating business
@@ -13,5 +14,4 @@ Components include:
   * A vector-oriented draw module that enables the creation of 3D
     illustrations
 
-WWW: http://www.openoffice.org/
-     http://porting.openoffice.org/freebsd/
+WWW: http://incubator.apache.org/openofficeorg/
author	Maho Nakata <maho@FreeBSD.org>	2012-05-09 03:48:16 +0000
committer	Maho Nakata <maho@FreeBSD.org>	2012-05-09 03:48:16 +0000
commit	269adbc59185605252893f1dfb81da755aa91cf8 (patch)
tree	1683b31d480403bd9c0151e7fd04a5d5909de84a /editors
parent	The project has been renamed and we renamed (diff)