Remove openoffice-3 all user should be considering using OpenOffice 4

With hat:	office@
Approved by:	maho

29 files changed, 0 insertions, 1974 deletions

diff --git a/editors/Makefile b/editors/Makefile
index b4e4267d49d1..90ea2803857d 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -228,7 +228,6 @@
     SUBDIR += nvi-m17n
     SUBDIR += nxml
     SUBDIR += omegaT
-    SUBDIR += openoffice-3
     SUBDIR += openoffice-4
     SUBDIR += openoffice-devel
     SUBDIR += p5-Padre
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
deleted file mode 100644
index 67942156060d..000000000000
--- a/editors/openoffice-3/Makefile
+++ /dev/null
@@ -1,342 +0,0 @@
-# Created by: Martin Blapp <mb@imp.ch>
-# $FreeBSD$
-
-PORTNAME=	apache-openoffice
-PORTVERSION=	3.4.1
-PORTREVISION=	4
-CATEGORIES=	editors java
-MASTER_SITES=	ftp://ftp.riken.jp/net/apache/incubator/ooo/3.4.1/source/ \
-		${MASTER_SITE_LOCAL:S@%SUBDIR%@maho/openoffice@}:extsrc
-DISTFILES+=	${OOOSRC} unowinreg.dll ${EXTSRC}:extsrc
-EXTRACT_ONLY=	${OOOSRC} ${EXTSRC}
-
-# De facto maintainer is maho@FreeBSD.org
-# Frequent patch submitters should optionally sign Apache iCLA
-MAINTAINER=	office@FreeBSD.org
-COMMENT=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
-
-LICENSE=	APACHE20
-
-PKGNAMESUFFIX=	3
-
-USES=		bison perl5 pkgconfig gmake
-USE_AUTOTOOLS=	autoconf
-USE_GNOME=	desktopfileutils gtk20 libxslt libidl 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=	yes
-USE_PYTHON=	yes
-USE_PERL5=	build
-USE_BZIP2=	yes
-GNU_CONFIGURE=	yes
-WITHOUT_CPU_CFLAGS=	true
-
-OPTIONS_DEFINE=	GCONF GNOMEVFS
-OPTIONS_DEFAULT=GCONF GNOMEVFS
-GNOMEVFS_DESC=	Enable GNOME Virtual File System
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-USE_JAVA=	yes
-JAVA_BUILD=	jdk
-JAVA_VENDOR=	openjdk
-JAVA_VERSION=	1.6+
-
-.if !defined(WITHOUT_GCONF)
-USE_GNOME+=	gconf2
-.else
-CONFIGURE_ARGS+=--disable-gconf
-.endif
-
-.if !defined(WITHOUT_GNOMEVFS)
-USE_GNOME+=	gnomevfs2
-.else
-CONFIGURE_ARGS+=--disable-gnome-vfs
-.endif
-
-.include <${FILESDIR}/Makefile.localized>
-
-ONLY_FOR_ARCHS=	i386 amd64
-
-.if ${ARCH} == amd64
-FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
-.else
-FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
-.endif
-
-OOOSRC=			aoo-${PORTVERSION}-incubating-src${EXTRACT_SUFX}
-EXTSRC=			ApacheOpenOffice.ext_sources.${PORTVERSION}.r${SVNREVISION}${EXTRACT_SUFX}
-OOODIR=			openoffice.org3
-SVNREVISION=		1372282
-INSTALLATION_BASEDIR?=	openoffice-${PORTVERSION}
-EXECBASE?=		openoffice-${PORTVERSION}
-DIST_SUBDIR=		openoffice
-SIMPLEOSVER=		${OSREL:C/\.//g}
-
-PACKAGE_PREFIX=		Apache_OpenOffice_incubating
-.if ${ARCH} == amd64
-PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86-64
-.else
-PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86
-.endif
-
-LOCALIZED_LANG?=	en-US
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=		${LANG_PKGNAME}-
-.endif
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=		-${LANG_SUFFIX}
-.endif
-
-RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
-		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
-		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
-		${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
-		${LOCALBASE}/lib/X11/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf
-
-.if defined(WITH_CCACHE)
-BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
-CCACHE_PREFIX=	ccache
-OOOCC=		${CCACHE_PREFIX} ${CC}
-OOOCXX=		${CCACHE_PREFIX} ${CXX}
-.else
-OOOCC=		${CC}
-OOOCXX=		${CXX}
-.endif
-
-CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}" \
-		PATH=${WRKSRC}/solenv/bin:$$PATH \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
-		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \
-		librdf.so:${PORTSDIR}/textproc/redland \
-		libtextcat.so:${PORTSDIR}/textproc/libtextcat \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libapr-1.so:${PORTSDIR}/devel/apr1 \
-		libCoinMP.so:${PORTSDIR}/math/coinmp \
-		libserf-1.so:${PORTSDIR}/www/serf
-
-BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
-		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
-		gpatch:${PORTSDIR}/devel/patch \
-		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
-		bash:${PORTSDIR}/shells/bash \
-		imake:${PORTSDIR}/devel/imake \
-		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
-		ant:${PORTSDIR}/devel/apache-ant \
-		${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 \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
-
-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=	4
-.endif
-
-CONFIGURE_ARGS+=--enable-verbose \
-		--enable-symbols=small \
-		--enable-crashdump \
-		--with-vendor="FreeBSD ports system" \
-		--with-epm=${LOCALBASE}/bin/epm \
-		--with-gnu-patch=${LOCALBASE}/bin/gpatch \
-		--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-system-apr \
-		--with-system-apr-util \
-		--with-system-coinmp \
-		--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 \
-		--without-fonts
-#		--with-system-jpeg
-#		--with-system-serf \
-
-OOOEXTENSIONS+=		minimizer/presentation-minimizer.oxt
-OOOEXTENSIONS+=		presenter/presenter-screen.oxt
-#OOOEXTENSIONS+=		pdfimport/pdfimport.oxt
-OOOEXTENSIONS+=		swext/wiki-publisher.oxt
-
-ICONS=	${WRKSRC}/sysui/desktop/icons
-
-.include <${FILESDIR}/Makefile.knobs>
-
-pre-everything::
-# really tweak, extremely useful when you build all localized language versions
-# needed after when you build with ALL_LOCALIZED_LANGS.
-.if defined(TWEAK_L10N)
-	@${RM} -f ${WRKDIR}/.PLIST*
-	@${RM} -f ${WRKDIR}/.install_done.*
-	@${RM} -f ${WRKDIR}/.package_done.*
-	@${RM} -f ${WRKDIR}/.extract_done.*
-	@${RM} -f ${WRKDIR}/.patch_done.*
-	@${RM} -f ${WRKDIR}/.configure_done.*
-	@${RM} -f ${WRKDIR}/.build_done.*
-	@${MKDIR} ${WRKDIR}
-	@${TOUCH} ${EXTRACT_COOKIE}
-	@${TOUCH} ${PATCH_COOKIE}
-	@${TOUCH} ${CONFIGURE_COOKIE}
-	@${TOUCH} ${BUILD_COOKIE}
-.endif
-
-post-extract:
-	@${CP} -p ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll \
-		${WRKSRC}/external/unowinreg/
-	@${MKDIR} ${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:
-	@${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
-
-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" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; build.pl --all -P${MAKE_JOBS_NUMBER} -- -P${MAKE_JOBS_NUMBER}"
-
-do-install:
-	@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/archive/install/${LOCALIZED_LANG}/$$i ; \
-	done
-	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
-	@cd ${WRKDIR}/tmp/*/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
-	@${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${PREFIX}/${INSTALLATION_BASEDIR}/openoffice.org3/program/bootstraprc
-	@${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org\/3/' ${PREFIX}/${INSTALLATION_BASEDIR}/openoffice.org3/program/bootstraprc
-	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
-	@cd ${WRKSRC}/solver/3??/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
-
-post-install:
-	@${FIND} ${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
-	@${ECHO_MSG} "===>  Add wrapper scripts";
-	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
-	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%SVNREVISION%%#${SVNREVISION}#g' \
-			-e 's#%%OOODIR%%#${OOODIR}#g' \
-			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
-			${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
-	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
-	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setofficelang
-	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
-	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
-	@${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}/APACHE20"   >> ${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 | \
-		${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
-	@for app in base calc draw impress math writer; do \
-		${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \
-			-e "s/^Icon.*/Icon=${EXECBASE}-$${app}.png/" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/$${app}.desktop ; \
-	done
-	@${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE}-spadmin %U/" \
-		-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/startcenter.desktop
-	@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak
-	@${RM} -f ${DESKTOPDIR}/${EXECBASE}
-	@${MKDIR} ${DESKTOPDIR}
-	@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg \
-			${DESKTOPDIR}/${EXECBASE}
-	@${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST}
-	@${PREFIX}/bin/update-desktop-database 2>/dev/null || ${TRUE}
-	@${ECHO_CMD} "@exec ${PREFIX}/bin/update-desktop-database 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
-	@for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \
-		for app in base calc draw impress math printeradmin writer; do \
-			if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
-				${INSTALL_DATA} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \
-				    ${PREFIX}/share/icons/hicolor/$${dir}/apps/${EXECBASE}-$${app}.png ; \
-				${ECHO_CMD} "share/icons/hicolor/$${dir}/apps/${EXECBASE}-$${app}.png" >> ${TMPPLIST} ; \
-			fi \
-		done ; \
-		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/$${iconfile}" >> ${TMPPLIST} ; \
-		done ; \
-	done
-	@${PREFIX}/bin/gtk-update-icon-cache -q -f ${PREFIX}/share/icons/hicolor 2>/dev/null || ${TRUE}
-	@${ECHO_CMD} "@unexec ${RM} %D/share/icons/hicolor/icon-theme.cache 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
-	@${ECHO_CMD}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
-
-.include <${FILESDIR}/Makefile.others>
-.include <bsd.port.post.mk>
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
deleted file mode 100644
index f13ef4a0f361..000000000000
--- a/editors/openoffice-3/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-SHA256 (openoffice/aoo-3.4.1-incubating-src.tar.bz2) = 56ac24cb4c59e013e623b386d5dfc3c0c61d3352f15e5dce6cb3d3105209835a
-SIZE (openoffice/aoo-3.4.1-incubating-src.tar.bz2) = 252312783
-SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-SIZE (openoffice/unowinreg.dll) = 6144
-SHA256 (openoffice/ApacheOpenOffice.ext_sources.3.4.1.r1372282.tar.bz2) = 1334f853e66a74ef13919898658063750deb3ccfcb23d4888112b33e38874fc3
-SIZE (openoffice/ApacheOpenOffice.ext_sources.3.4.1.r1372282.tar.bz2) = 216072913
diff --git a/editors/openoffice-3/files/Makefile.knobs b/editors/openoffice-3/files/Makefile.knobs
deleted file mode 100644
index be63c1e0bba6..000000000000
--- a/editors/openoffice-3/files/Makefile.knobs
+++ /dev/null
@@ -1,30 +0,0 @@
-# Created by: Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD$
-#
-# Makefile for knobs (?)
-
-CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant"
-CONFIGURE_ARGS+=	--with-lang=${LOCALIZED_LANG}
-
-pre-fetch:
-	@${ECHO} "OPTIONS:"
-	@${ECHO}
-	@${ECHO} "You can select the language for OOo by making it with:"
-	@${ECHO} "make LOCALIZED_LANG=xx"
-	@${ECHO} "while xx can be one of the following"
-	@${ECHO} "af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da"
-	@${ECHO} "de dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gl"
-	@${ECHO} "gu-IN he hi-IN hr hu it ja ka km kn ko ku lo lt lv mk"
-	@${ECHO} "ms ml-IN mr-IN ne nb nl nn nr ns oc or-IN pa-IN pl pt"
-	@${ECHO} "pt-BR ru rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER"
-	@${ECHO} "ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW"
-	@${ECHO} "zu"
-	@${ECHO} "Current setting: ${LOCALIZED_LANG}"
-	@${ECHO}
-	@${ECHO} "NOTICE:"
-	@${ECHO}
-	@${ECHO} "To build OOo, you should have a lot of free diskspace"
-	@${ECHO} "(~ 11GB) and memory (~ 2GB)."
-	@${ECHO} 'If you want SDK and/or solver, please type "make sdk"
-	@${ECHO} 'and/or "make solver", respectively.'
-	@${ECHO}
diff --git a/editors/openoffice-3/files/Makefile.localized b/editors/openoffice-3/files/Makefile.localized
deleted file mode 100644
index 0ea12e428efb..000000000000
--- a/editors/openoffice-3/files/Makefile.localized
+++ /dev/null
@@ -1,402 +0,0 @@
-# Created by: Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD$
-#
-# Localized makefile
-
-################################################################
-# See solenv/inc/postset.mk for details
-################################################################
-.if defined(LOCALIZED_LANG)
-.if ${LOCALIZED_LANG} == "af"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ar"
-CATEGORIES+=	arabic
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "as-IN"
-LANG_PKGNAME=	as
-LANG_SUFFIX=	IN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "be-BY"
-LANG_PKGNAME=	be
-LANG_SUFFIX=	BY
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "bg"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "bn-BD"
-LANG_PKGNAME=	be
-LANG_SUFFIX=	BD
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "bn-IN"
-LANG_PKGNAME=	bn
-LANG_SUFFIX=	IN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "bn"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "br"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "bs"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ca"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "cs"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "cy"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "da"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "de"
-CATEGORIES+=	german
-LANG_PKGNAME=	${LOCALIZED_LANG}
-COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "dz"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "el"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "en-GB"
-LANG_PKGNAME=	en
-LANG_SUFFIX=	GB
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "en-US"
-LANG_PKGNAME=	en
-LANG_SUFFIX=	US
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "en-ZA"
-LANG_PKGNAME=	en
-LANG_SUFFIX=	ZA
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "eo"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "es"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "et"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "eu"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "fa"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "fi"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "fr"
-CATEGORIES+=	french
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ga"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "gl"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "gu-IN"
-LANG_PKGNAME=	gu
-LANG_SUFFIX=	IN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "he"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "hi-IN"
-LANG_PKGNAME=	hi
-LANG_SUFFIX=	IN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "hr"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "hu"
-CATEGORIES+=	hungarian
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "it"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ja"
-CATEGORIES+=	japanese
-LANG_PKGNAME=	${LOCALIZED_LANG}
-RUN_DEPENDS+=	${LOCALBASE}/share/fonts/std.ja_JP/Ryumin-Light:${PORTSDIR}/japanese/font-std
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ka"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "km"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "kn"
-LANG_PKGNAME=	kn
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ko"
-CATEGORIES+=	korean
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ku"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "lo"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "lt"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "lv"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "mk"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ml-IN"
-LANG_PKGNAME=	ml
-LANG_SUFFIX=	IN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "mr-IN"
-LANG_PKGNAME=	mr
-LANG_SUFFIX=	IN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ms"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "nb"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ne"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "nl"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "nn"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "nr"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ns"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "oc"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "or-IN"
-LANG_PKGNAME=	or
-LANG_SUFFIX=	IN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "pa-IN"
-LANG_PKGNAME=	pa
-LANG_SUFFIX=	IN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "pl"
-CATEGORIES+=	polish
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "pt"
-COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
-CATEGORIES+=	portuguese
-LANG_PKGNAME=	${LOCALIZED_LANG}
-LANG_CONFIGURE_ARG=	PORT
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "pt-BR"
-COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
-CATEGORIES+=	portuguese
-LANG_PKGNAME=	pt
-LANG_SUFFIX=	BR
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ru"
-CATEGORIES+=	russian
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "rw"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sh"
-LANG_PKGNAME=	sh
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sk"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sl"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sr"
-LANG_PKGNAME=	sr
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ss"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "st"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sv"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sw-TZ"
-LANG_PKGNAME=	sw
-LANG_SUFFIX=	TZ
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sw"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ta-IN"
-LANG_PKGNAME=	ta
-LANG_SUFFIX=	IN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "te-IN"
-LANG_PKGNAME=	te
-LANG_SUFFIX=	IN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "tg"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "th"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ti-ER"
-LANG_PKGNAME=	ti
-LANG_SUFFIX=	ER
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "tn"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "tr"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ts"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "uk"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ur-IN"
-LANG_PKGNAME=	ur
-LANG_SUFFIX=	IN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "uz"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ve"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "vi"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "xh"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "zh-CN"
-CATEGORIES+=	chinese
-LANG_PKGNAME=	zh
-LANG_SUFFIX=	CN
-BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "zh-TW"
-CATEGORIES+=	chinese
-LANG_PKGNAME=	zh
-LANG_SUFFIX=	TW
-BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "zu"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.endif
diff --git a/editors/openoffice-3/files/Makefile.others b/editors/openoffice-3/files/Makefile.others
deleted file mode 100644
index 2be564726b4c..000000000000
--- a/editors/openoffice-3/files/Makefile.others
+++ /dev/null
@@ -1,71 +0,0 @@
-# Created by: Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD$
-#
-# Makefile for other stuff
-
-# Other stuff which is not directly related to making ports
-# package-rename: rename package for uploading
-# package-canonical: making official packages (WIP)
-# ure: URE (Uno Runtime Environment) packages (WIP)
-# solver: solver
-# languagepack: language pack
-
-package-rename:
-	@${ECHO_MSG} "===>   Rename package for Apache OpenOffice mirror upload";
-	@${LN} ${PKGFILE} \
-		${WRKDIR}/../${PACKAGE_PREFIX}_${PACKAGE_MIDDLE}_install_${LOCALIZED_LANG}${PKG_SUFX}
-
-package-canonical:
-	@${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 Apache OpenOffice"
-	@${RM} -fr ${WRKDIR}/sdk_tmp
-	@${MKDIR} ${WRKDIR}/sdk_tmp
-	@cd ${WRKDIR}/sdk_tmp ; \
-		${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}/../${PACKAGE_PREFIX}-SDK_${PACKAGE_MIDDLE}_install_en-US.tbz ${INSTALLATION_BASEDIR}_sdk
-
-ure:
-	@${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/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}/../${PACKAGE_PREFIX}-URE_${PACKAGE_MIDDLE}_install_en-US.tbz ${INSTALLATION_BASEDIR}
-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 Apache OpenOffice"
-.if defined (ALL_LOCALIZED_LANGS)
-	@cd ${WRKSRC} ; ${BASH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack'
-.else
-	@cd ${WRKSRC} ; ${BASH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
-.endif
-
-.if !defined (ALL_LOCALIZED_LANGS)
-	@${RM} -fr ${WRKDIR}/langpack_tmp
-	@${MKDIR} ${WRKDIR}/langpack_tmp
-.if defined (LOCALIZED_LANG)
-	@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/archive/install/${LOCALIZED_LANG}/$$i ; \
-	done
-	@cd ${WRKDIR}/langpack_tmp/Apache_OpenOffice*/ ; \
-		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
-		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
-		${TAR} cfj ${WRKDIR}/../${PACKAGE_PREFIX}_${PACKAGE_MIDDLE}_langpack_${LOCALIZED_LANG}.tbz ${INSTALLATION_BASEDIR}
-.endif
-.endif
diff --git a/editors/openoffice-3/files/extra-patch-libexttextcat-lingucomponent b/editors/openoffice-3/files/extra-patch-libexttextcat-lingucomponent
deleted file mode 100644
index 0aec5c2f9b6b..000000000000
--- a/editors/openoffice-3/files/extra-patch-libexttextcat-lingucomponent
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- lingucomponent/source/languageguessing/simpleguesser.cxx.orig	2012-01-10 19:42:30.000000000 +0900
-+++ lingucomponent/source/languageguessing/simpleguesser.cxx	2012-08-07 11:14:45.000000000 +0900
-@@ -114,7 +114,7 @@
-         if(!h){return guesses;}
- 
-         //calculate le number of unicode charcters (symbols)
--        int len = utfstrlen(text);
-+        int len = strlen(text);
- 
- 	if( len > MAX_STRING_LENGTH_TO_ANALYSE ){len = MAX_STRING_LENGTH_TO_ANALYSE ;}
- 
diff --git a/editors/openoffice-3/files/generate.pl b/editors/openoffice-3/files/generate.pl
deleted file mode 100644
index d5871e7b2550..000000000000
--- a/editors/openoffice-3/files/generate.pl
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/perl
-# 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.15 2012-05-09 03:48:16 maho Exp $
-
-print "#!/bin/csh\n";
-print "make deinstall clean\n";
-print "/usr/bin/time -h make WITH_CCACHE=yes install package package-rename solver sdk ure languagepack deinstall >& log.en\n";
-print "bzip2 log.en\n";
-#print "rm work/.configure* work/.build* \n";
-#workaround for breakage at odk sdk_oo
-print "make deinstall clean\n";
-
-print "/usr/bin/time -h make ALL_LOCALIZED_LANGS=yes >& log.all\n";
-print "bzip2 log.all\n";
-
-open ( FILE,  "< Makefile.localized") ;
-while(<FILE>){
-@tmp=split (' ',$_);
-@tmp2=split ('"',$tmp[3]);
-if ( $tmp[0] eq ".if" && $tmp[1] eq "\${LOCALIZED_LANG}" ) { $LANG=$tmp2[1]; 
-	print "make TWEAK_L10N=yes LOCALIZED_LANG=$LANG pre-everything\n";
-	print "/usr/bin/time -h make LOCALIZED_LANG=$LANG WITH_CCACHE=yes languagepack package package-rename deinstall >& log.$LANG\n";
-	print "bzip2 log.$LANG\n";
-	}
-}
-close FILE;
-$oootag= `cd ..; make -V OOOTAG2`;
-chomp($oootag);
-$md5sumname = "$oootag" . "_md5sums.txt";
-print "md5 OOo* > $md5sumname\n";
-
-$arc= `uname -m`;
-if ($arc == "amd64" ) {
-print "sudo -u `who am i | awk '{print \$1}'` ssh build.good-day.net mkdir -p /home/ftp/pub/OpenOffice.org/contrib/freebsdx86-64/\n";
-print "sudo -u `who am i | awk '{print \$1}'` scp OOo* $md5sumname build.good-day.net:/home/ftp/pub/OpenOffice.org/contrib/freebsdx86-64/\n";
-} else { 
-print "sudo -u `who am i | awk '{print \$1}'` ssh build.good-day.net mkdir -p /home/ftp/pub/OpenOffice.org/contrib/freebsdx86/\n";
-print "sudo -u `who am i | awk '{print \$1}'` scp OOo* $md5sumname build.good-day.net:/home/ftp/pub/OpenOffice.org/contrib/freebsdx86/\n";
-}
diff --git a/editors/openoffice-3/files/ooo.sh b/editors/openoffice-3/files/ooo.sh
deleted file mode 100644
index 8f0ffbde843f..000000000000
--- a/editors/openoffice-3/files/ooo.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-# Openoffice.org build and uploader for FreeBSD.
-# Nakata Maho (maho@FreeBSD.org) 2010/2/13.
-# this file is public domain.
-# $Id$
-
-MILESTONE=`make -V OOOTAG`
-fbsdmajor=`uname -r | sed 's/\..*$//g'`
-fbsdarch=`uname -m`
-OOODIR=/home/ftp/pub/OpenOffice.org/FreeBSD/packages-$fbsdmajor-$fbsdarch
-SITE=build.good-day.net
-USER=maho
-
-#build
-/usr/bin/time -h sudo -u $USER make WITH_CCACHE=yes >log.en.$MILESTONE 2>&1
-/usr/bin/time -h make deinstall package package-rename >> log.en.$MILESTONE 2>&1
-/usr/bin/time -h make sdk ure >> log.en.$MILESTONE 2>&1
-/usr/bin/time -h make deinstall >> log.en.$MILESTONE 2>&1
-
-/usr/bin/time -h make clean >log.ja.$MILESTONE 2>&1
-/usr/bin/time -h sudo -u $USER make LOCALIZED_LANG=ja WITH_CCACHE=yes >log.ja.$MILESTONE 2>&1
-/usr/bin/time -h make LOCALIZED_LANG=ja deinstall package package-rename languagepack >> log.ja.$MILESTONE 2>&1
-/usr/bin/time -h make LOCALIZED_LANG=ja deinstall >> log.ja.$MILESTONE 2>&1
-
-OOOENUSPACKAGE1=`ls openoffice.org*tbz`
-OOOENUSPACKAGE2=`ls OOo*install_en-US.tbz`
-OOOJAPACKAGE1=`ls ja-openoffice.org*tbz`
-OOOJAPACKAGE2=`ls OOo*install_ja.tbz`
-
-#upload
-bzip2 log.en.$MILESTONE log.ja.$MILESTONE
-sudo -u $USER ssh $SITE mkdir $OOODIR
-sudo -u $USER scp *openoffice*.tbz *SDK* *URE* log.* $SITE:$OOODIR 
-
-if [ x$OOOENUSPACKAGE1 != x"" ]; then
-sudo -u $USER ssh $SITE "ln -sf $OOODIR/$OOOENUSPACKAGE1 $OOODIR/$OOOENUSPACKAGE2"
-fi
-if [ x$OOOJAPACKAGE1 != x"" ]; then
-sudo -u $USER ssh $SITE "ln -sf $OOODIR/$OOOJAPACKAGE1   $OOODIR/$OOOJAPACKAGE2"
-fi
-
-
-
diff --git a/editors/openoffice-3/files/openoffice-wrapper b/editors/openoffice-3/files/openoffice-wrapper
deleted file mode 100644
index 70bf6241f18b..000000000000
--- a/editors/openoffice-3/files/openoffice-wrapper
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# $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%%-||'`
-
-case $program in
-$0)
-	$oopath/program/soffice "$@"
-	;;
-setofficelang)
-	$oopath/basis-link/program/$program "$@"
-	;;
-*)
-	$oopath/program/$program "$@"
-	;;
-esac
diff --git a/editors/openoffice-3/files/patch-bridges b/editors/openoffice-3/files/patch-bridges
deleted file mode 100644
index 9fe7a8c2772a..000000000000
--- a/editors/openoffice-3/files/patch-bridges
+++ /dev/null
@@ -1,12 +0,0 @@
-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-configure b/editors/openoffice-3/files/patch-configure
deleted file mode 100644
index 5b83e717e028..000000000000
--- a/editors/openoffice-3/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in~	2012-07-03 22:57:24.000000000 +0900
-+++ configure.in	2012-07-05 11:37:45.000000000 +0900
-@@ -6856,7 +6856,7 @@
- dnl ===================================================================
- WITH_CATB_FONTS=
- AC_MSG_CHECKING([whether to include category B fonts])
--if test "x$enable_category_b_fonts" = "xyes"; then
-+if test "x$enable_category_b_fonts" = "xyes" && test "x$with_fonts" != "xno"; then
-    AC_MSG_RESULT([yes])
-    BUILD_TYPE="$BUILD_TYPE CATB_FONTS"
-    WITH_CATB_FONTS=YES
diff --git a/editors/openoffice-3/files/patch-freebsd.mk b/editors/openoffice-3/files/patch-freebsd.mk
deleted file mode 100644
index 81ad7207f48a..000000000000
--- a/editors/openoffice-3/files/patch-freebsd.mk
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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
deleted file mode 100644
index 0454c88f6ffc..000000000000
--- a/editors/openoffice-3/files/patch-gperf
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index c087ebebf3e4..000000000000
--- a/editors/openoffice-3/files/patch-graphite
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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-i118574 b/editors/openoffice-3/files/patch-i118574
deleted file mode 100644
index 4f3c6467c22d..000000000000
--- a/editors/openoffice-3/files/patch-i118574
+++ /dev/null
@@ -1,323 +0,0 @@
---- 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-jdk7-hsqldb-debian b/editors/openoffice-3/files/patch-jdk7-hsqldb-debian
deleted file mode 100644
index b42d966286fb..000000000000
--- a/editors/openoffice-3/files/patch-jdk7-hsqldb-debian
+++ /dev/null
@@ -1,282 +0,0 @@
---- codemaker/source/javamaker/classfile.cxx
-+++ codemaker/source/javamaker/classfile.cxx
-@@ -693,7 +693,7 @@ void ClassFile::addMethod(
- void ClassFile::write(FileStream & file) const {
-     writeU4(file, 0xCAFEBABE);
-     writeU2(file, 0);
--    writeU2(file, 46);
-+    writeU2(file, 49); // class file version of JRE 1.5
-     writeU2(file, m_constantPoolCount);
-     writeStream(file, m_constantPool);
-     writeU2(file, static_cast< sal_uInt16 >(m_accessFlags));
---
---- hsqldb/patches/jdbc-4.1.patch
-+++ hsqldb/patches/jdbc-4.1.patch
-@@ -0,0 +1,267 @@
-+--- misc/hsqldb/build/build.xml	2012-02-08 15:14:42.827123541 +0000
-++++ misc/build/hsqldb/build/build.xml	2012-02-08 15:21:43.827722388 +0000
-+@@ -98,7 +98,11 @@
-+       <echo message="ant.java.hasjsse=${ant.java.hasjsse}" />
-+    </target>
-+ 
-+-   <target name="javaversion6">
-++   <target name="javaversion7">
-++      <available classname="java.util.Objects" property="ant.java.iscjava17"/>
-++   </target>
-++
-++   <target name="javaversion6" depends="javaversion7" unless="ant.java.iscjava17">
-+       <available classname="java.net.IDN" property="ant.java.iscjava16"/>
-+    </target>
-+ 
-+@@ -210,6 +214,7 @@
-+         <arg value="+JAVA2FULL"/>
-+         <arg value="-JAVA4"/>
-+         <arg value="-JAVA6"/>
-++        <arg value="-JAVA7"/>
-+        </java>
-+     </target>
-+ 
-+@@ -244,6 +249,7 @@
-+         <arg value="+JAVA2FULL"/>
-+         <arg value="+JAVA4"/>
-+         <arg value="-JAVA6"/>
-++        <arg value="-JAVA7"/>
-+        </java>
-+     </target>
-+ 
-+@@ -279,10 +285,47 @@
-+         <arg value="+JAVA2FULL"/>
-+         <arg value="+JAVA4"/>
-+         <arg value="+JAVA6"/>
-++        <arg value="+JAVA7"/>
-++      </java>
-++    </target>
-++
-++    <target name="switchtojdk17" depends="switchtojdk16"
-++            description="self explanatory" if="ant.java.iscjava17">
-++      <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" >
-++        <arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/>
-++        <arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/>
-++        <arg file="${src}/org/hsqldb/jdbcDriver.java"/>
-++        <arg file="${src}/org/hsqldb/jdbc/jdbcBlob.java"/>
-++        <arg file="${src}/org/hsqldb/jdbc/jdbcDatabaseMetaData.java"/>
-++        <arg file="${src}/org/hsqldb/jdbc/jdbcDataSource.java"/>
-++        <arg file="${src}/org/hsqldb/jdbc/jdbcCallableStatement.java"/>
-++        <arg file="${src}/org/hsqldb/jdbc/jdbcClob.java"/>
-++        <arg file="${src}/org/hsqldb/jdbc/jdbcConnection.java"/>
-++        <arg file="${src}/org/hsqldb/jdbc/jdbcParameterMetaData.java"/>
-++        <arg file="${src}/org/hsqldb/jdbc/jdbcPreparedStatement.java"/>
-++        <arg file="${src}/org/hsqldb/jdbc/jdbcResultSet.java"/>
-++        <arg file="${src}/org/hsqldb/jdbc/jdbcResultSetMetaData.java"/>
-++        <arg file="${src}/org/hsqldb/jdbc/jdbcStatement.java"/>
-++        <arg file="${src}/org/hsqldb/persist/LockFile.java"/>
-++        <arg file="${src}/org/hsqldb/persist/Logger.java"/>
-++        <arg file="${src}/org/hsqldb/persist/ScaledRAFile.java"/>
-++        <arg file="${src}/org/hsqldb/rowio/RowInputTextLog.java"/>
-++        <arg file="${src}/org/hsqldb/util/DatabaseManager.java"/>
-++        <arg file="${src}/org/hsqldb/util/ConnectionDialogCommon.java"/>
-++        <arg file="${src}/org/hsqldb/lib/SimpleLog.java"/>
-++        <arg file="${src}/org/hsqldb/rowio/RowInputTextLog.java"/>
-++        <arg file="${src}/org/hsqldb/lib/SimpleLog.java"/>
-++        <arg file="${src}/org/hsqldb/rowio/RowInputTextLog.java"/>
-++        <arg file="${src}/org/hsqldb/HsqlDateTime.java"/>
-++        <arg value="+JAVA2"/>
-++        <arg value="+JAVA2FULL"/>
-++        <arg value="+JAVA4"/>
-++        <arg value="+JAVA6"/>
-++        <arg value="+JAVA7"/>
-+       </java>
-+     </target>
-+ 
-+-    <target name="store" depends="switchtojdk16"
-++    <target name="store" depends="switchtojdk17"
-+             description="compiles the /store folder">
-+       <javac srcdir="${src}"
-+              destdir="classes"
-+--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java	2012-02-08 15:14:42.802123563 +0000
-++++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java	2012-02-08 15:47:35.842635642 +0000
-+@@ -3375,4 +3375,18 @@
-+     }
-+ 
-+ //#endif JAVA6
-++
-++//#ifdef JAVA7
-++    public <T> T getObject(String columnLabel, Class<T> type) throws SQLException
-++    {
-++        throw new UnsupportedOperationException("Not supported yet.");
-++    }
-++
-++    public <T> T getObject(int ColumnIndex, Class<T> type) throws SQLException
-++    {
-++        throw new UnsupportedOperationException("Not supported yet.");
-++    }
-++
-++
-++//#endif JAVA7
-+ }
-+--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java	2012-02-08 15:14:42.802123563 +0000
-++++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java	2012-02-08 15:47:35.851635628 +0000
-+@@ -48,6 +48,12 @@
-+ import java.sql.SQLXML;
-+ 
-+ //#endif JAVA6
-++
-++//#ifdef JAVA7
-++import java.util.concurrent.Executor;
-++
-++//#endif JAVA7
-++
-+ import java.sql.PreparedStatement;
-+ import java.sql.SQLException;
-+ import java.sql.SQLWarning;
-+@@ -2793,4 +2799,31 @@
-+     }
-+ 
-+ //#endif JAVA6
-++
-++//#ifdef JAVA7
-++    public int getNetworkTimeout() throws SQLException
-++    {
-++        throw new UnsupportedOperationException("Not supported yet.");
-++    }
-++
-++    public void setNetworkTimeout(Executor executor, int millis) throws SQLException
-++    {
-++        throw new UnsupportedOperationException("Not supported yet.");
-++    }
-++
-++    public void abort(Executor executor) throws SQLException
-++    {
-++        throw new UnsupportedOperationException("Not supported yet.");
-++    }
-++    
-++    public String getSchema() throws SQLException
-++    {
-++        throw new UnsupportedOperationException("Not supported yet.");
-++    }
-++
-++    public void setSchema(String schema) throws SQLException
-++    {
-++        throw new UnsupportedOperationException("Not supported yet.");
-++    }
-++//#endif JAVA7
-+ }
-+--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java	2012-02-08 15:14:42.802123563 +0000
-++++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java	2012-02-08 15:47:35.835635654 +0000
-+@@ -5693,4 +5693,21 @@
-+     }
-+ 
-+ //#endif JAVA6
-++
-++
-++//#ifdef JAVA7
-++    public boolean generatedKeyAlwaysReturned() throws SQLException
-++    {
-++        throw new UnsupportedOperationException("Not supported yet.");
-++    }
-++
-++    public ResultSet getPseudoColumns(String catalog, String schemaPattern,
-++                                      String tableNamePattern, String columnNamePattern) throws SQLException
-++    {
-++        throw new UnsupportedOperationException("Not supported yet.");
-++    }
-++
-++
-++//#endif JAVA7
-++
-+ }
-+--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcDataSource.java	2012-02-08 15:14:42.802123563 +0000
-++++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcDataSource.java	2012-02-08 15:47:35.836635653 +0000
-+@@ -47,6 +47,11 @@
-+ //#endif JAVA4
-+ import org.hsqldb.jdbcDriver;
-+ 
-++//#ifdef JAVA7
-++import java.sql.SQLFeatureNotSupportedException;
-++import java.util.logging.Logger;
-++//#endif JAVA7
-++
-+ // boucherb@users 20040411 - doc 1.7.2 - javadoc updates toward 1.7.2 final
-+ 
-+ /**
-+@@ -323,4 +328,12 @@
-+     }
-+ 
-+ //#endif JAVA6
-++
-++//#ifdef JAVA7
-++    public Logger getParentLogger() throws SQLFeatureNotSupportedException
-++    {
-++        throw new SQLFeatureNotSupportedException("Not supported yet.");
-++    }
-++
-++//#endif JAVA7
-+ }
-+--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcResultSet.java	2012-02-08 15:14:42.802123563 +0000
-++++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcResultSet.java	2012-02-08 15:47:35.866635606 +0000
-+@@ -5324,4 +5324,19 @@
-+     }
-+ 
-+ //#endif JAVA6
-++
-++//#ifdef JAVA7
-++
-++    public <T> T getObject(String columnLabel, Class<T> type) throws SQLException
-++    {
-++        throw new UnsupportedOperationException("Not supported yet.");
-++    }
-++
-++    public <T> T getObject(int columnNum, Class<T> type) throws SQLException
-++    {
-++        throw new UnsupportedOperationException("Not supported yet.");
-++    }
-++
-++//#endif JAVA7
-++
-+ }
-+--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java	2012-02-08 15:14:42.802123563 +0000
-++++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java	2012-02-08 15:47:35.872635595 +0000
-+@@ -1608,4 +1608,16 @@
-+         throw new UnsupportedOperationException("Not supported yet.");
-+     }
-+ //#endif JAVA6
-++
-++//#ifdef JAVA7
-++    public boolean isCloseOnCompletion() throws SQLException
-++    {
-++        throw new UnsupportedOperationException("Not supported yet.");
-++    }
-++
-++    public void closeOnCompletion() throws SQLException
-++    {
-++        throw new UnsupportedOperationException("Not supported yet.");
-++    }
-++//#endif JAVA7
-+ }
-+--- misc/hsqldb/src/org/hsqldb/jdbcDriver.java	2012-02-08 15:14:42.800123566 +0000
-++++ misc/build/hsqldb/src/org/hsqldb/jdbcDriver.java	2012-02-08 15:47:35.826635667 +0000
-+@@ -42,6 +42,11 @@
-+ import org.hsqldb.persist.HsqlDatabaseProperties;
-+ import org.hsqldb.persist.HsqlProperties;
-+ 
-++//#ifdef JAVA7
-++import java.sql.SQLFeatureNotSupportedException;
-++import java.util.logging.Logger;
-++//#endif JAVA7
-++
-+ // fredt@users 20011220 - patch 1.7.0 by fredt
-+ // new version numbering scheme
-+ // fredt@users 20020320 - patch 1.7.0 - JDBC 2 support and error trapping
-+@@ -321,4 +326,12 @@
-+             DriverManager.registerDriver(new jdbcDriver());
-+         } catch (Exception e) {}
-+     }
-++
-++//#ifdef JAVA7
-++    public Logger getParentLogger() throws SQLFeatureNotSupportedException
-++    {
-++        throw new SQLFeatureNotSupportedException("Not supported yet.");
-++    }
-++
-++//#endif JAVA7
-+ }
diff --git a/editors/openoffice-3/files/patch-jdk7-hsqldb-debian-x b/editors/openoffice-3/files/patch-jdk7-hsqldb-debian-x
deleted file mode 100644
index 0b3ead629058..000000000000
--- a/editors/openoffice-3/files/patch-jdk7-hsqldb-debian-x
+++ /dev/null
@@ -1,12 +0,0 @@
---- hsqldb/makefile.mk.orig	2012-02-17 08:46:16.000000000 +0000
-+++ hsqldb/makefile.mk	2012-09-15 18:00:27.000000000 +0000
-@@ -52,7 +52,8 @@
- PATCH_FILES=patches$/i96823.patch \
- 			patches$/i97032.patch \
- 			patches$/i103528.patch \
--			patches$/i104901.patch
-+			patches$/i104901.patch \
-+			patches$/jdbc-4.1.patch
- 
- .IF "$(JAVACISGCJ)"=="yes"
- JAVA_HOME=
diff --git a/editors/openoffice-3/files/patch-jdk7-httpclient-apache-pfg b/editors/openoffice-3/files/patch-jdk7-httpclient-apache-pfg
deleted file mode 100644
index 570e3efd30ba..000000000000
--- a/editors/openoffice-3/files/patch-jdk7-httpclient-apache-pfg
+++ /dev/null
@@ -1,145 +0,0 @@
---- apache-commons/patches/httpclient.patch.orig	2012-09-15 20:01:46.000000000 +0000
-+++ apache-commons/patches/httpclient.patch	2012-09-15 21:26:34.000000000 +0000
-@@ -0,0 +1,142 @@
-+diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/ConnectMethod.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/ConnectMethod.java
-+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/ConnectMethod.java	2012-05-07 12:34:01.000000000 -0500
-++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/ConnectMethod.java	2012-05-07 12:37:50.000000000 -0500
-+@@ -38,7 +38,7 @@
-+ /**
-+  * Establishes a tunneled HTTP connection via the CONNECT method.
-+  *
-+- * @author Ortwin Gl???ck
-++ * @author Ortwin Glueck
-+  * @author dIon Gillard
-+  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
-+  * @author <a href="mailto:oleg@ural.ru">Oleg Kalnichevski</a>
-+diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpClient.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClient.java
-+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpClient.java	2012-05-07 12:34:01.000000000 -0500
-++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClient.java	2012-05-07 12:37:50.000000000 -0500
-+@@ -48,7 +48,7 @@
-+  * @author <a href="mailto:rwaldhoff@apache.org">Rodney Waldhoff</a>
-+  * @author Sean C. Sullivan
-+  * @author <a href="mailto:dion@apache.org">dIon Gillard</a>
-+- * @author Ortwin Gl?ck
-++ * @author Ortwin Glueck
-+  * @author <a href="mailto:becke@u.washington.edu">Michael Becke</a>
-+  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
-+  * @author Sam Maloney
-+diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpClientError.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClientError.java
-+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpClientError.java	2012-05-07 12:34:01.000000000 -0500
-++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClientError.java	2012-05-07 12:37:50.000000000 -0500
-+@@ -33,7 +33,7 @@
-+ /**
-+  * Signals that an error has occurred.
-+  * 
-+- * @author Ortwin Gl?ck
-++ * @author Ortwin Glueck
-+  * @version $Revision: 480424 $ $Date: 2006-11-29 06:56:49 +0100 (Wed, 29 Nov 2006) $
-+  * @since 3.0
-+  */
-+diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpContentTooLargeException.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpContentTooLargeException.java
-+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpContentTooLargeException.java	2012-05-07 12:34:01.000000000 -0500
-++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpContentTooLargeException.java	2012-05-07 12:37:50.000000000 -0500
-+@@ -3,7 +3,7 @@
-+ /**
-+  * Signals that the response content was larger than anticipated. 
-+  * 
-+- * @author Ortwin Glück
-++ * @author Ortwin Glueck
-+  */
-+ public class HttpContentTooLargeException extends HttpException {
-+     private int maxlen;
-+diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/WireLogInputStream.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/WireLogInputStream.java
-+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/WireLogInputStream.java	2012-05-07 12:34:01.000000000 -0500
-++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/WireLogInputStream.java	2012-05-07 12:37:50.000000000 -0500
-+@@ -37,7 +37,7 @@
-+ /**
-+  * Logs all data read to the wire LOG.
-+  *
-+- * @author Ortwin Gl�ck
-++ * @author Ortwin Glueck
-+  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
-+  * @author <a href="mailto:oleg@ural.ru">Oleg Kalnichevski</a>
-+  * 
-+diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/BasicScheme.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/BasicScheme.java
-+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/BasicScheme.java	2012-05-07 12:34:01.000000000 -0500
-++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/BasicScheme.java	2012-05-07 12:37:50.000000000 -0500
-+@@ -46,7 +46,7 @@
-+  * @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
-+  * @author Rodney Waldhoff
-+  * @author <a href="mailto:jsdever@apache.org">Jeff Dever</a>
-+- * @author Ortwin Gl?ck
-++ * @author Ortwin Glueck
-+  * @author Sean C. Sullivan
-+  * @author <a href="mailto:adrian@ephox.com">Adrian Sutton</a>
-+  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
-+diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/DigestScheme.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/DigestScheme.java
-+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/DigestScheme.java	2012-05-07 12:34:01.000000000 -0500
-++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/DigestScheme.java	2012-05-07 12:37:50.000000000 -0500
-+@@ -67,7 +67,7 @@
-+  * @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
-+  * @author Rodney Waldhoff
-+  * @author <a href="mailto:jsdever@apache.org">Jeff Dever</a>
-+- * @author Ortwin Gl?ck
-++ * @author Ortwin Glueck
-+  * @author Sean C. Sullivan
-+  * @author <a href="mailto:adrian@ephox.com">Adrian Sutton</a>
-+  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
-+diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/HttpAuthenticator.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/HttpAuthenticator.java
-+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/HttpAuthenticator.java	2012-05-07 12:34:01.000000000 -0500
-++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/HttpAuthenticator.java	2012-05-07 12:37:50.000000000 -0500
-+@@ -62,7 +62,7 @@
-+  * @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
-+  * @author Rodney Waldhoff
-+  * @author <a href="mailto:jsdever@apache.org">Jeff Dever</a>
-+- * @author Ortwin Gl�ck
-++ * @author Ortwin Glueck
-+  * @author Sean C. Sullivan
-+  * @author <a href="mailto:adrian@ephox.com">Adrian Sutton</a>
-+  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
-+diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/NTLMScheme.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/NTLMScheme.java
-+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/NTLMScheme.java	2012-05-07 12:34:01.000000000 -0500
-++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/NTLMScheme.java	2012-05-07 12:37:50.000000000 -0500
-+@@ -43,7 +43,7 @@
-+  * @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
-+  * @author Rodney Waldhoff
-+  * @author <a href="mailto:jsdever@apache.org">Jeff Dever</a>
-+- * @author Ortwin Gl???ck
-++ * @author Ortwin Glueck
-+  * @author Sean C. Sullivan
-+  * @author <a href="mailto:adrian@ephox.com">Adrian Sutton</a>
-+  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
-+diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/methods/PostMethod.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/methods/PostMethod.java
-+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/methods/PostMethod.java	2012-05-07 12:34:01.000000000 -0500
-++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/methods/PostMethod.java	2012-05-07 12:37:50.000000000 -0500
-+@@ -62,7 +62,7 @@
-+  * @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
-+  * @author <a href="mailto:dsale@us.britannica.com">Doug Sale</a>
-+  * @author <a href="mailto:jsdever@apache.org">Jeff Dever</a>
-+- * @author Ortwin Gl???ck
-++ * @author Ortwin Glueck
-+  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
-+  * @author <a href="mailto:oleg@ural.ru">Oleg Kalnichevski</a>
-+  *
-+--- misc/build/commons-httpclient-3.1/src/examples/TrivialApp.java	2007-08-18 09:02:14.000000000 +0000
-++++ misc/build/commons-httpclient-3.1/src/examples/TrivialApp.java	2012-09-15 21:21:52.000000000 +0000
-+@@ -47,7 +47,7 @@
-+  * how to use the Jakarta HttpClient API.
-+  *
-+  * @author <a href="mailto:jsdever@apache.org">Jeff Dever</a>
-+- * @author Ortwin Glück
-++ * @author Ortwin Glueck
-+  */
-+ public class TrivialApp
-+ {
-+--- misc/build/commons-httpclient-3.1/src/examples/ClientApp.java	2007-08-18 09:02:14.000000000 +0000
-++++ misc/build/commons-httpclient-3.1/src/examples/ClientApp.java	2012-09-15 21:22:11.000000000 +0000
-+@@ -61,7 +61,7 @@
-+  * content as text and as rendered HTML.
-+  *
-+  * @author Sean C. Sullivan
-+- * @author Ortwin Glück
-++ * @author Ortwin Glueck
-+  * @author Michael Becke
-+  */
-+ public class ClientApp {
diff --git a/editors/openoffice-3/files/patch-jdk7-httpclient-r1358967 b/editors/openoffice-3/files/patch-jdk7-httpclient-r1358967
deleted file mode 100644
index c1e4211439ab..000000000000
--- a/editors/openoffice-3/files/patch-jdk7-httpclient-r1358967
+++ /dev/null
@@ -1,13 +0,0 @@
---- apache-commons/java/httpclient/makefile.mk	2012-01-16 09:13:38.000000000 +0000
-+++ apache-commons/java/httpclient/makefile.mk	2012-09-15 19:45:11.000000000 +0000
-@@ -45,7 +45,9 @@
- 
- TARFILE_ROOTDIR=commons-httpclient-3.1
- 
--#PATCH_FILES=$(PRJ)$/patches$/httpclient.patch
-+PATCH_FILES=	\
-+	$(PRJ)$/patches$/httpclient.patch	\
-+	$(PRJ)$/patches$/httpclient_no_javadoc.patch
- 
- #CONVERTFILES=build.xml
- 				
diff --git a/editors/openoffice-3/files/patch-jdk7-httpclient-r1359681 b/editors/openoffice-3/files/patch-jdk7-httpclient-r1359681
deleted file mode 100644
index 7cca30900098..000000000000
--- a/editors/openoffice-3/files/patch-jdk7-httpclient-r1359681
+++ /dev/null
@@ -1,17 +0,0 @@
---- apache-commons/patches/httpclient_no_javadoc.patch (added)
-+++ apache-commons/patches/httpclient_no_javadoc.patch Tue Jul 10 14:06:59 2012
-@@ -0,0 +1,11 @@
-+--- misc/commons-httpclient-3.1/build.xml	2007-08-18 11:02:14.000000000 +0200
-++++ misc/build/commons-httpclient-3.1/build.xml	2012-07-09 09:59:21.364830700 +0200
-+@@ -142,7 +142,7 @@
-+ 
-+ <!-- ========== Targets: "External" Targets =============================== -->
-+ 
-+-  <target name="dist" depends="compile,doc"
-++  <target name="dist" depends="compile"
-+           description="Create binary distribution">
-+     <mkdir dir="${dist.home}"/>
-+     <copy file="LICENSE.txt" todir="${dist.home}"/> 
-
-
-
diff --git a/editors/openoffice-3/files/patch-main_avmedia_source_gstreamer_gstplayer.hxx b/editors/openoffice-3/files/patch-main_avmedia_source_gstreamer_gstplayer.hxx
deleted file mode 100644
index aac1ed8859aa..000000000000
--- a/editors/openoffice-3/files/patch-main_avmedia_source_gstreamer_gstplayer.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- avmedia/source/gstreamer/gstplayer.hxx.ORIG	2013-03-09 04:35:46.000000000 +0000
-+++ avmedia/source/gstreamer/gstplayer.hxx	2013-03-09 11:57:13.000000000 +0000
-@@ -28,7 +28,7 @@
- 
- #include "gstcommon.hxx"
- #include <glib.h>
--#include <glib/gatomic.h>
-+//#include <glib/gatomic.h>
- 
- // necessary for mixed environments with GStreamer-0.10 and GLib versions < 2.8
- #ifndef G_GNUC_NULL_TERMINATED
diff --git a/editors/openoffice-3/files/patch-main_ucb_source_ucp_gvfs_gvfs_content.hxx b/editors/openoffice-3/files/patch-main_ucb_source_ucp_gvfs_gvfs_content.hxx
deleted file mode 100644
index 915f695bd205..000000000000
--- a/editors/openoffice-3/files/patch-main_ucb_source_ucp_gvfs_gvfs_content.hxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ucb/source/ucp/gvfs/gvfs_content.hxx.ORIG	2011-11-07 16:59:40.000000000 +0000
-+++ ucb/source/ucp/gvfs/gvfs_content.hxx	2013-03-09 13:53:52.000000000 +0000
-@@ -30,7 +30,8 @@
- #include <com/sun/star/ucb/XContentCreator.hpp>
- #include <ucbhelper/contenthelper.hxx>
- 
--#include <glib/gthread.h>
-+#include <glib.h>
-+//#include <glib/gthread.h>
- #include <libgnomevfs/gnome-vfs-ops.h>
- #include <libgnomevfs/gnome-vfs-directory.h>
- 
diff --git a/editors/openoffice-3/files/patch-moz b/editors/openoffice-3/files/patch-moz
deleted file mode 100644
index aea881c67d54..000000000000
--- a/editors/openoffice-3/files/patch-moz
+++ /dev/null
@@ -1,12 +0,0 @@
---- moz/zipped/makefile.mk	2012-01-11 21:19:49.000000000 +0900
-+++ moz/zipped/makefile.mk	2012-09-20 15:35:23.000000000 +0900
-@@ -72,7 +72,8 @@
- .ENDIF
- 
- $(BIN)$/mozruntime%zip : $(OS)$(COM)$(CPU)runtime.zip
--	$(COPY) $(OS)$(COM)$(CPU)runtime.zip $(BIN)$/mozruntime.zip
-+	$(COPY) $(OS)$(COM)$(CPU)runtime.zip $(BIN)$/mozruntime.zip && \
-+	chmod u+w $(BIN)$/mozruntime.zip
- 
- # add alternative rules for universal binary moz-zips
- .IF "$(GUIBASE)" == "aqua"
diff --git a/editors/openoffice-3/files/patch-unxfbsd.mk b/editors/openoffice-3/files/patch-unxfbsd.mk
deleted file mode 100644
index 76b9d3969704..000000000000
--- a/editors/openoffice-3/files/patch-unxfbsd.mk
+++ /dev/null
@@ -1,43 +0,0 @@
---- 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
deleted file mode 100644
index c9987e635319..000000000000
--- a/editors/openoffice-3/files/patch-vcl
+++ /dev/null
@@ -1,10 +0,0 @@
---- vcl/Library_vclplug_gen.mk.orig	2012-06-08 22:53:54.000000000 +0900
-+++ vcl/Library_vclplug_gen.mk	2012-08-26 12:36:24.000000000 +0900
-@@ -150,6 +150,7 @@
- ifeq ($(XINERAMA_LINK),dynamic)
- $(eval $(call gb_Library_set_ldflags,vclplug_gen,\
-     $$(LDFLAGS) \
-+    -lXinerama \
- ))
- 
- else
diff --git a/editors/openoffice-3/files/pkg-message.in b/editors/openoffice-3/files/pkg-message.in
deleted file mode 100644
index 5d4f68bb1a37..000000000000
--- a/editors/openoffice-3/files/pkg-message.in
+++ /dev/null
@@ -1,39 +0,0 @@
-Apache OpenOffice Build %%OOOTAG%% Personal Install How-To
-
-Written by:	Martin Blapp <mbr@freebsd.org>
-		and Maho Nakata <maho@FreeBSD.org>
-
-Apache OpenOffice %%OOOTAG%% will soon been installed in
-%%PREFIX%%/%%EXECBASE%%
-
-1. User installation
---------------------
-
-Just type "%%EXECBASE%%" after you have successfully
-installed the package. If there is no installed OO.org dir
-in your homedir, the setup installs ".%%OOODIR%%" folder.
-
-2. Starting OO.org
-------------------
-
-There are some wrappers installed for faster startup.
-Add "%%PREFIX%%/bin/" to your PATH and you will be able
-to use them.
-
-%%PREFIX%%/bin/%%EXECBASE%%
-%%PREFIX%%/bin/%%EXECBASE%%-sbase
-%%PREFIX%%/bin/%%EXECBASE%%-scalc
-%%PREFIX%%/bin/%%EXECBASE%%-sdraw
-%%PREFIX%%/bin/%%EXECBASE%%-setofficelang
-%%PREFIX%%/bin/%%EXECBASE%%-smath
-%%PREFIX%%/bin/%%EXECBASE%%-simpress
-%%PREFIX%%/bin/%%EXECBASE%%-spadmin
-%%PREFIX%%/bin/%%EXECBASE%%-swriter
-
-OO.org does need $LANG to be set to a suitable value.
-
-3. If you run into problems
---------------------------------------------------
-If you somehow run into problems, please remove the already
-installed ".%%OOODIR%%" dir in your homedir. Redo the user
-installation and the problems should go away.
diff --git a/editors/openoffice-3/pkg-descr b/editors/openoffice-3/pkg-descr
deleted file mode 100644
index 1e923488924d..000000000000
--- a/editors/openoffice-3/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-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
-    letters, extensive text documents, professional layouts, and HTML
-    documents.
-  * A sophisticated application for performing advanced spreadsheet
-    functions, such as analyzing figures, creating lists, and viewing data.
-  * A tool for creating effective eye-catching presentations.
-  * A vector-oriented draw module that enables the creation of 3D
-    illustrations
-
-WWW: http://openoffice.apache.org/
-
diff --git a/editors/openoffice-3/pkg-plist b/editors/openoffice-3/pkg-plist
deleted file mode 100644
index 28bd78453b52..000000000000
--- a/editors/openoffice-3/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, do not delete. Package list is generated automatically.