summaryrefslogtreecommitdiff
path: root/editors/openoffice.org-2
diff options
context:
space:
mode:
Diffstat (limited to 'editors/openoffice.org-2')
-rw-r--r--editors/openoffice.org-2/Makefile231
-rw-r--r--editors/openoffice.org-2/distinfo6
-rw-r--r--editors/openoffice.org-2/files/Makefile.knobs111
-rw-r--r--editors/openoffice.org-2/files/Makefile.localized200
-rw-r--r--editors/openoffice.org-2/files/generate.pl22
-rw-r--r--editors/openoffice.org-2/files/openoffice-wrapper15
-rw-r--r--editors/openoffice.org-2/files/optpatch-freetype98
-rw-r--r--editors/openoffice.org-2/files/patch-config_office+configure.in14
-rw-r--r--editors/openoffice.org-2/files/patch-curl-7.12.2.patch86
-rw-r--r--editors/openoffice.org-2/files/patch-extensions+source+config+ldap+makefile.mk20
-rw-r--r--editors/openoffice.org-2/files/patch-instsetoo_native+util+makefile.mk25
-rw-r--r--editors/openoffice.org-2/files/patch-libxml261
-rw-r--r--editors/openoffice.org-2/files/patch-odk+configure.pl64
-rw-r--r--editors/openoffice.org-2/files/patch-odk+util+odk_rules.pmk532
-rw-r--r--editors/openoffice.org-2/files/patch-project-xmlsecurity45
-rw-r--r--editors/openoffice.org-2/files/pkg-message.in53
-rw-r--r--editors/openoffice.org-2/pkg-descr17
-rw-r--r--editors/openoffice.org-2/pkg-plist1
18 files changed, 0 insertions, 1601 deletions
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
deleted file mode 100644
index ad6dc4fa8749..000000000000
--- a/editors/openoffice.org-2/Makefile
+++ /dev/null
@@ -1,231 +0,0 @@
-# New ports collection makefile for: OpenOffice.org
-# Date created: 28 February 2002
-# Whom: Martin Blapp
-#
-# $FreeBSD$
-#
-
-PORTNAME= openoffice
-PORTVERSION= 2.0.${SNAPDATE}
-CATEGORIES+= editors
-MASTER_SITES+= ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
- ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
- ${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
-DISTFILES+= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
-EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
-
-MAINTAINER= openoffice@FreeBSD.org
-COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
-
-SNAPDATE= 20050310
-NO_LATEST_LINK= yes
-USE_GNOME= gtk20
-MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz
-MOZILLA_VERSION= 1.7.5
-.if !defined(WITHOUT_MOZILLA)
-DISTFILES+= ${MOZILLA_SOURCE}:mozsrc
-USE_GNOME+= orbit gtk12
-.endif
-
-USE_BZIP2= yes
-USE_GMAKE= yes
-USE_PERL5= yes
-USE_REINPLACE= yes
-
-.if !defined(WITHOUT_JAVA)
-USE_JAVA= yes
-JAVA_VERSION= 1.4+
-JAVA_BUILD= jdk
-.endif
-
-.include <bsd.port.pre.mk>
-.include <${FILESDIR}/Makefile.localized>
-
-.if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} <= 492000)
-BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade your rtld"
-.endif
-
-CODELINE= 680
-RELEASE_NR= 1.9
-MILESTONE= 85
-INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
-EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
-DIST_SUBDIR= openoffice.org2.0
-SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//'
-PACKAGE_BASENAME= OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
-
-LOCALIZED_LANG?= en-US
-# FIXME (Somehow INDEX build fails)
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX= ${LANG_PKGNAME}-
-.endif
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX?= -${LANG_SUFFIX}
-.endif
-
-BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo
-# FIXME (correctly add ccache before gcc and g++)
-.if defined(WITH_CCACHE)
-BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
-CC= ccache gcc-ooo
-CXX= ccache g++-ooo
-.else
-CC= gcc-ooo
-CXX= g++-ooo
-.endif
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
- unzip:${PORTSDIR}/archivers/unzip \
- gcp:${PORTSDIR}/sysutils/coreutils \
- epm:${PORTSDIR}/devel/epm \
- gpatch:${PORTSDIR}/devel/patch \
- xmkmf:${X_IMAKE_PORT} \
- ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
- ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
- bison-devel:${PORTSDIR}/devel/bison-devel
-LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.5:${PORTSDIR}/graphics/png \
- mng.1:${PORTSDIR}/graphics/libmng \
- freetype.9:${PORTSDIR}/print/freetype2 \
- IDL-2.0:${PORTSDIR}/devel/libIDL
-.if defined(WITHOUT_JAVA)
-LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc/libxslt
-.else
-BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant
-.endif
-GNU_CONFIGURE= yes
-USE_AUTOCONF_VER= 259
-WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC= ${WRKDIR}
-CONFIGURE_WRKSRC= ${WRKSRC}/config_office
-ANT?= ${LOCALBASE}/bin/ant
-TCSH?= /bin/tcsh
-ZIP?= ${PREFIX}/bin/zip
-UNZIP?= ${PREFIX}/bin/unzip
-PKGMESSAGE= ${WRKDIR}/pkg-message
-NUMOFPROCESSES?= 4
-
-CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch
-
-.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.*
- @${TOUCH} ${EXTRACT_COOKIE}
- @${TOUCH} ${PATCH_COOKIE}
- @${TOUCH} ${CONFIGURE_COOKIE}
- @${TOUCH} ${BUILD_COOKIE}
-.endif
-
-post-extract:
-.if defined(WITH_TTF_BYTECODE_ENABLED)
- @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype
-.endif
- @cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
- @${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
- @${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
-.if !defined(WITHOUT_MOZILLA)
- @${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
-.endif
-
-do-build:
- @cd ${WRKSRC} ; ./bootstrap
-.if !defined(WITHOUT_MOZILLA)
- @cd ${WRKSRC}/moz ; ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; deliver.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped
-.endif
-#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
- cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
-
-do-install:
- @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
- @${RM} -Rf ${WRKDIR}/tmp
- @${MKDIR} ${WRKDIR}/tmp
- @for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
- ${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
- cd ${WRKDIR}/tmp ; ${TAR} xf ${WRKDIR}/tmp/$$i ; \
- done
- @${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
- @cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
-
-post-install:
- @${ECHO_MSG} "===> Add wrapper scripts";
- @${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
- @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
- -e 's#%%RELEASE_NR%%#${RELEASE_NR}#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/openoffice.org
- @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sagenda
- @${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}-setup
- @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sfax
- @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
- @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
- @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
- @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
- @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
- @${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
- @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
- @cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
- @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
- @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
- @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
- @${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
- @${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
- @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
- -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
- -e 's#%%EXECBASE%%#${EXECBASE}#g' \
- -e 's#%%MILESTONE%%#${MILESTONE}#g' \
- -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
- ${PKGMESSAGE}
- @${ECHO_CMD}
- @${CAT} ${PKGMESSAGE}
- @${ECHO_CMD}
-
-package-rename:
- @${ECHO_MSG} "===> Rename package for OpenOffice.org mirror upload";
- @${MV} ${PKGFILE} \
- ${WRKDIR}/../${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX}
-
-sdk:
- @${ECHO_MSG} "===> Make SDK of OpenOffice.org"
- @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl'
- @${MV} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/bin/OpenOffice.org${RELEASE_NR}.m${MILESTONE}_SDK.tar.gz ${WRKDIR}/../${PACKAGE_BASENAME}_sdk.tar.gz
-
-solver:
- @${ECHO_MSG} "===> Make Solver of OpenOffice.org"
- @cd ${WRKSRC} ; ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_solver.tar.bz2 solver
-
-languagepack:
- @${ECHO_MSG} "===> Make languagepack of OpenOffice.org"
-.if defined (ALL_LOCALIZED_LANGS)
- @cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack'
-.else
- @cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.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 ${WRKDIR}/langpack_tmp ; \
- ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.sw
- @cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \
- ${MKDIR} ../${INSTALLATION_BASEDIR} ; \
- ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
- ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_langpack_${LOCALIZED_LANG}.tar.bz2 ${INSTALLATION_BASEDIR}
-.endif
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
deleted file mode 100644
index 5831691b8684..000000000000
--- a/editors/openoffice.org-2/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (openoffice.org2.0/OOo_1.9m85_source.tar.bz2) = 044e96faae97761f3343bff2d123531a
-SIZE (openoffice.org2.0/OOo_1.9m85_source.tar.bz2) = 243497173
-MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
-MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
-SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366
diff --git a/editors/openoffice.org-2/files/Makefile.knobs b/editors/openoffice.org-2/files/Makefile.knobs
deleted file mode 100644
index df7cc8c5e058..000000000000
--- a/editors/openoffice.org-2/files/Makefile.knobs
+++ /dev/null
@@ -1,111 +0,0 @@
-# Makefile for knobs
-# Whom: Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD$
-
-.if defined(WITHOUT_JAVA)
-CONFIGURE_ARGS+= --without-java
-.else
-CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
-.endif
-
-.if defined(WITH_GTK)
-CONFIGURE_ARGS+= --enable-gtk
-.endif
-
-.if defined(WITH_KDE)
-CONFIGURE_ARGS+= --enable-kde
-.endif
-
-.if defined(WITHOUT_MOZILLA)
-CONFIGURE_ARGS+= --disable-mozilla
-.else
-CONFIGURE_ARGS+= --enable-build-mozilla
-.endif
-
-.if defined(WITH_CUPS)
-LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base
-CONFIGURE_ARGS+= --enable-cups
-.endif
-
-.if defined(ALL_LOCALIZED_LANGS)
-CONFIGURE_ARGS+= --with-lang=ALL
-.else
-CONFIGURE_ARGS+= --with-lang=${LOCALIZED_LANG}
-.endif
-
-.if defined(WITH_DEBUG)
-.if ${WITH_DEBUG} == 2
-CONFIGURE_ARGS+= --enable-debug
-.else
-CONFIGURE_ARGS+= --enable-symbols
-.endif
-.endif
-
-pre-fetch:
-.if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
- @${ECHO}
- @${ECHO} "WARNING"
- @${ECHO} "Your rtld seems to be old."
- @${ECHO} "Please remake your rtld by:"
- @${ECHO} "[1] if you use 4-series:"
- @${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
- @${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
- @${ECHO} "# make ; make depend ; make install"
- @${ECHO} "[2] if you use 5-series:"
- @${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
- @${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
- @${ECHO} "# make ; make depend ; make install"
- @${ECHO} "AT YOUR OWN RISK!"
-.endif
- @${ECHO} "OPTIONS:"
-.if !defined(WITH_DEBUG)
- @${ECHO}
- @${ECHO} "You can compile OOo with debug symbols with WITH_DEBUG=1"
- @${ECHO}
- @${ECHO} "If you set WITH_DEBUG=2, you add internal"
- @${ECHO} "OOo debug support."
-.endif
-.if !defined(WITHOUT_MOZILLA)
- @${ECHO}
- @${ECHO} "You can compile OOo without Mozilla connectivity by"
- @${ECHO} "make -DWITHOUT_MOZILLA"
-.endif
-.if !defined(WITH_TTF_BYTECODE_ENABLED)
- @${ECHO}
- @${ECHO} "You may get better quality of glyphs"
- @${ECHO} "at small bitmap sizes, If you have"
- @${ECHO} "licensed the Apple patents"
- @${ECHO} "US05155805 US05159668 and US05325479, by"
- @${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
- @${ECHO} "See http://www.freetype.org/patents.html for details"
-.endif
-.if !defined(WITHOUT_JAVA)
- @${ECHO}
- @${ECHO} "You can compile OOo without Java support by"
- @${ECHO} "make -DWITHOUT_JAVA"
-.endif
-.if !defined(WITH_CUPS)
- @${ECHO}
- @${ECHO} "You can compile OOo with CUPS support by"
- @${ECHO} "make -DWITH_CUPS"
-.endif
-.if !defined(WITH_GTK)
- @${ECHO}
- @${ECHO} "You can compile OOo to use Gtk+ vclplug"
- @${ECHO} "make -DWITH_GTK"
-.endif
-.if !defined(WITH_KDE)
- @${ECHO}
- @${ECHO} "You can compile OOo to use Qt/KDE vclplug"
- @${ECHO} "make -DWITH_KDE"
-.endif
- @${ECHO}
- @${ECHO} "NOTICE:"
- @${ECHO}
- @${ECHO} "To build OOo, you should have a lot"
-.if defined(WITH_DEBUG)
- @${ECHO} "of free diskspace (~ 8GB)."
-.else
- @${ECHO} "of free diskspace (~ 4GB)."
-.endif
- @${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
diff --git a/editors/openoffice.org-2/files/Makefile.localized b/editors/openoffice.org-2/files/Makefile.localized
deleted file mode 100644
index bba097a108d1..000000000000
--- a/editors/openoffice.org-2/files/Makefile.localized
+++ /dev/null
@@ -1,200 +0,0 @@
-# localized makefile
-# Whom: Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD$
-################################################################
-#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} == "bg"
-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} == "el"
-LANG_PKGNAME= ${LOCALIZED_LANG}
-.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} == "fi"
-LANG_PKGNAME= ${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "fr"
-CATEGORIES= french
-LANG_PKGNAME= ${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "gl"
-LANG_PKGNAME= ${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "he"
-LANG_PKGNAME= ${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "hi-IN"
-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+= ${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "kn-IN"
-LANG_PKGNAME= kn
-LANG_SUFFIX= IN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ko"
-CATEGORIES= korean
-LANG_PKGNAME= ${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "lt"
-LANG_PKGNAME= ${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ms"
-LANG_PKGNAME= ${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "nb"
-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} == "ns"
-LANG_PKGNAME= ${LOCALIZED_LANG}
-.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_EXT= 03
-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} == "sk"
-LANG_PKGNAME= ${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sl"
-LANG_PKGNAME= ${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sv"
-LANG_PKGNAME= ${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "th"
-LANG_PKGNAME= ${LOCALIZED_LANG}
-.endif
-################################################################
-#.if ${LOCALIZED_LANG} == "tn"
-#LANG_PKGNAME= ${LOCALIZED_LANG}
-#.endif
-################################################################
-.if ${LOCALIZED_LANG} == "tr"
-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.org-2/files/generate.pl b/editors/openoffice.org-2/files/generate.pl
deleted file mode 100644
index e63257a02983..000000000000
--- a/editors/openoffice.org-2/files/generate.pl
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/perl
-
-# generate full build shell script for OpenOffice.org
-# Whom: Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2/files/Attic/generate.pl,v 1.3 2005-02-20 04:38:57 maho Exp $
-
-print "#!/bin/csh\n";
-print "/usr/bin/time -h make WITH_CCACHE=yes package package-rename solver sdk deinstall languagepack >& log.en\n";
-print "rm work/.configure* work/.build* \n";
-print "/usr/bin/time -h make ALL_LOCALIZED_LANGS=yes >& 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";
- }
-}
-close FILE;
-
diff --git a/editors/openoffice.org-2/files/openoffice-wrapper b/editors/openoffice.org-2/files/openoffice-wrapper
deleted file mode 100644
index dac41f5ecf86..000000000000
--- a/editors/openoffice.org-2/files/openoffice-wrapper
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2/files/Attic/openoffice-wrapper,v 1.14 2005-01-10 12:28:19 maho Exp $
-
-oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/
-program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'`
-
-case $program in
-$0)
- $oopath/soffice "$@"
- ;;
- *)
- $oopath/$program "$@"
- ;;
-esac
diff --git a/editors/openoffice.org-2/files/optpatch-freetype b/editors/openoffice.org-2/files/optpatch-freetype
deleted file mode 100644
index b47f412488ec..000000000000
--- a/editors/openoffice.org-2/files/optpatch-freetype
+++ /dev/null
@@ -1,98 +0,0 @@
-Index: freetype/freetype-2.1.4.patch
-===================================================================
-RCS file: /cvs/external/freetype/freetype-2.1.4.patch,v
-retrieving revision 1.3
-diff -u -r1.3 freetype-2.1.4.patch
---- freetype/freetype-2.1.4.patch 16 Dec 2003 11:47:32 -0000 1.3
-+++ freetype/freetype-2.1.4.patch 16 Jan 2005 09:01:28 -0000
-@@ -1,5 +1,5 @@
--*** misc/freetype-2.1.4/builds/compiler/visualc.mk 2000-12-14 00:44:33.000000000 +0100
----- misc/build/freetype-2.1.4/builds/compiler/visualc.mk 2003-08-14 17:55:53.000000000 +0200
-+*** misc/freetype-2.1.4/builds/compiler/visualc.mk Thu Dec 14 08:44:33 2000
-+--- misc/build/freetype-2.1.4/builds/compiler/visualc.mk Mon Jan 10 11:32:16 2005
- ***************
- *** 63,69 ****
- # ANSI compliance.
-@@ -17,8 +17,8 @@
- endif
-
- # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
--*** misc/freetype-2.1.4/builds/unix/freetype-config.in 2002-12-16 22:51:23.000000000 +0100
----- misc/build/freetype-2.1.4/builds/unix/freetype-config.in 2003-08-14 20:07:20.000000000 +0200
-+*** misc/freetype-2.1.4/builds/unix/freetype-config.in Tue Dec 17 06:51:23 2002
-+--- misc/build/freetype-2.1.4/builds/unix/freetype-config.in Mon Jan 10 11:32:16 2005
- ***************
- *** 92,98 ****
- if test "@libdir@" != "/usr/lib" ; then
-@@ -36,8 +36,8 @@
- fi
- fi
-
--*** misc/freetype-2.1.4/builds/unix/ltmain.sh 2003-01-18 17:39:18.000000000 +0100
----- misc/build/freetype-2.1.4/builds/unix/ltmain.sh 2003-08-14 17:55:53.000000000 +0200
-+*** misc/freetype-2.1.4/builds/unix/ltmain.sh Sun Jan 19 01:39:18 2003
-+--- misc/build/freetype-2.1.4/builds/unix/ltmain.sh Mon Jan 10 11:32:16 2005
- ***************
- *** 2296,2302 ****
- ;;
-@@ -55,8 +55,8 @@
-
- case $version_type in
- nonstopux) verstring_prefix=nonstopux ;;
--*** misc/freetype-2.1.4/builds/win32/visualc/freetype.dsp 2003-01-31 00:24:18.000000000 +0100
----- misc/build/freetype-2.1.4/builds/win32/visualc/freetype.dsp 2003-08-14 17:55:53.000000000 +0200
-+*** misc/freetype-2.1.4/builds/win32/visualc/freetype.dsp Fri Jan 31 08:24:18 2003
-+--- misc/build/freetype-2.1.4/builds/win32/visualc/freetype.dsp Mon Jan 10 11:32:16 2005
- ***************
- *** 44,51 ****
- # PROP Output_Dir "..\..\..\objs\release"
-@@ -76,8 +76,8 @@
- # SUBTRACT CPP /nologo /YX
- # ADD BASE RSC /l 0x409 /d "NDEBUG"
- # ADD RSC /l 0x409 /d "NDEBUG"
--*** misc/freetype-2.1.4/include/freetype/config/ftmodule.h 2002-10-31 09:29:31.000000000 +0100
----- misc/build/freetype-2.1.4/include/freetype/config/ftmodule.h 2003-08-14 17:55:53.000000000 +0200
-+*** misc/freetype-2.1.4/include/freetype/config/ftmodule.h Thu Oct 31 17:29:31 2002
-+--- misc/build/freetype-2.1.4/include/freetype/config/ftmodule.h Mon Jan 10 11:32:16 2005
- ***************
- *** 1,8 ****
- FT_USE_MODULE(autohint_module_class)
-@@ -111,8 +111,8 @@
- FT_USE_MODULE(winfnt_driver_class)
- + #endif
-
--*** misc/freetype-2.1.4/include/freetype/config/ftoption.h 2003-01-31 00:24:18.000000000 +0100
----- misc/build/freetype-2.1.4/include/freetype/config/ftoption.h 2003-08-14 17:55:53.000000000 +0200
-+*** misc/freetype-2.1.4/include/freetype/config/ftoption.h Fri Jan 31 08:24:18 2003
-+--- misc/build/freetype-2.1.4/include/freetype/config/ftoption.h Sun Jan 16 18:00:10 2005
- ***************
- *** 108,114 ****
- /* this will however force you to link the zlib to any program that */
-@@ -130,8 +130,25 @@
-
-
- /*************************************************************************/
--*** misc/freetype-2.1.4/src/base/ftobjs.c 2003-03-27 22:35:43.000000000 +0100
----- misc/build/freetype-2.1.4/src/base/ftobjs.c 2003-08-14 17:55:53.000000000 +0200
-+***************
-+*** 378,384 ****
-+ /* do not #undef this macro here, since the build system might */
-+ /* define for certain configurations */
-+ /* */
-+! /* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
-+
-+
-+ /*************************************************************************/
-+--- 378,384 ----
-+ /* do not #undef this macro here, since the build system might */
-+ /* define for certain configurations */
-+ /* */
-+! #define TT_CONFIG_OPTION_BYTECODEpwd_INTERPRETER
-+
-+
-+ /*************************************************************************/
-+*** misc/freetype-2.1.4/src/base/ftobjs.c Fri Mar 28 06:35:43 2003
-+--- misc/build/freetype-2.1.4/src/base/ftobjs.c Mon Jan 10 11:32:16 2005
- ***************
- *** 804,810 ****
- {
diff --git a/editors/openoffice.org-2/files/patch-config_office+configure.in b/editors/openoffice.org-2/files/patch-config_office+configure.in
deleted file mode 100644
index 20602d3402a6..000000000000
--- a/editors/openoffice.org-2/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,14 +0,0 @@
-o http://www.openoffice.org/issues/show_bug.cgi?id=44913
-o configure7
-
---- config_office/configure.in~ Wed Mar 9 01:31:52 2005
-+++ config_office/configure.in Sun Mar 13 15:53:13 2005
-@@ -565,7 +565,7 @@
- test_cups=no
- _os=Darwin
- ;;
-- freebsd)
-+ freebsd*)
- test_x=yes
- test_gtk=yes
- test_kde=yes
diff --git a/editors/openoffice.org-2/files/patch-curl-7.12.2.patch b/editors/openoffice.org-2/files/patch-curl-7.12.2.patch
deleted file mode 100644
index f1597ef75e84..000000000000
--- a/editors/openoffice.org-2/files/patch-curl-7.12.2.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-#i 43986#
-
-version number of curl for FreeBSD is somewhat odd.
-we need libcurl.so.3.0.0 not libcurl.so.3
-# ls unxfbsd.pro/lib/
-libcurl.so* libcurl.so.3*
-after applying this pach
-# ls unxfbsd.pro/lib/
-libcurl.so* libcurl.so.3.0.0*
-
-Index: curl-7.12.2.patch
-===================================================================
-RCS file: /cvs/external/curl/curl-7.12.2.patch,v
-retrieving revision 1.4
-diff -u -r1.4 curl-7.12.2.patch
---- curl/curl-7.12.2.patch 27 Jan 2005 11:11:50 -0000 1.4
-+++ curl/curl-7.12.2.patch 3 Mar 2005 11:57:27 -0000
-@@ -304,3 +304,68 @@
- * Check the current list of connections to see if we can
- * re-use an already existing one or if we have to create a
- * new one.
-+*** misc/curl-7.12.2/ltmain.sh Mon Aug 9 20:12:17 2004
-+--- misc/build/curl-7.12.2/ltmain.sh Thu Mar 3 20:52:09 2005
-+***************
-+*** 2915,2926 ****
-+ # which has an extra 1 added just for fun
-+ #
-+ case $version_type in
-+! darwin|linux|osf|windows)
-+ current=`expr $number_major + $number_minor`
-+ age="$number_minor"
-+ revision="$number_revision"
-+ ;;
-+! freebsd-aout|freebsd-elf|sunos)
-+ current="$number_major"
-+ revision="$number_minor"
-+ age="0"
-+--- 2915,2926 ----
-+ # which has an extra 1 added just for fun
-+ #
-+ case $version_type in
-+! darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
-+ current=`expr $number_major + $number_minor`
-+ age="$number_minor"
-+ revision="$number_revision"
-+ ;;
-+! sunos)
-+ current="$number_major"
-+ revision="$number_minor"
-+ age="0"
-+***************
-+*** 2990,3005 ****
-+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+ ;;
-+
-+- freebsd-aout)
-+- major=".$current"
-+- versuffix=".$current.$revision";
-+- ;;
-+-
-+- freebsd-elf)
-+- major=".$current"
-+- versuffix=".$current";
-+- ;;
-+-
-+ irix | nonstopux)
-+ major=`expr $current - $age + 1`
-+
-+--- 2990,2995 ----
-+***************
-+*** 3022,3028 ****
-+ versuffix="$major.$revision"
-+ ;;
-+
-+! linux)
-+ major=.`expr $current - $age`
-+ versuffix="$major.$age.$revision"
-+ ;;
-+--- 3012,3018 ----
-+ versuffix="$major.$revision"
-+ ;;
-+
-+! linux|freebsd-aout|freebsd-elf)
-+ major=.`expr $current - $age`
-+ versuffix="$major.$age.$revision"
-+ ;;
diff --git a/editors/openoffice.org-2/files/patch-extensions+source+config+ldap+makefile.mk b/editors/openoffice.org-2/files/patch-extensions+source+config+ldap+makefile.mk
deleted file mode 100644
index fb5f8b09a7ef..000000000000
--- a/editors/openoffice.org-2/files/patch-extensions+source+config+ldap+makefile.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-o llber50 is missing
-o http://www.openoffice.org/issues/show_bug.cgi?id=43037
-
-Index: makefile.mk
-===================================================================
-RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
-retrieving revision 1.4.24.2
-diff -u -u -r1.4.24.2 makefile.mk
---- extensions/source/config/ldap/makefile.mk 27 Jan 2005 19:26:59 -0000 1.4.24.2
-+++ extensions/source/config/ldap/makefile.mk 18 Feb 2005 08:21:16 -0000
-@@ -114,6 +114,9 @@
- $(SALLIB)
- .IF "$(OS)"=="FREEBSD"
- SHL1STDLIBS+=-lcompat
-+.IF "$(WITH_OPENLDAP)" != "YES"
-+SHL1STDLIBS+=-llber50
-+.ENDIF
- .ENDIF
-
- DEF1NAME=$(SHL1TARGET)
diff --git a/editors/openoffice.org-2/files/patch-instsetoo_native+util+makefile.mk b/editors/openoffice.org-2/files/patch-instsetoo_native+util+makefile.mk
deleted file mode 100644
index 4837e39a6a2b..000000000000
--- a/editors/openoffice.org-2/files/patch-instsetoo_native+util+makefile.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-For instsetoo_native project, we should use FORMAT*=-format bsd.
-However, for FreeBSD, we cannot write script towards multiple line,
-so -format bsd break builds. We temporary set -format portable at
-the moment so that we can treat as we want.
-
-Index: instsetoo_native/util/makefile.mk
-===================================================================
-RCS file: /cvs/installation/instsetoo_native/util/makefile.mk,v
-retrieving revision 1.13
-diff -u -r1.13 makefile.mk
---- instsetoo_native/util/makefile.mk 10 Dec 2004 17:03:50 -0000 1.13
-+++ instsetoo_native/util/makefile.mk 20 Dec 2004 11:32:33 -0000
-@@ -82,6 +82,12 @@
- FORMAT*=-format pkg
- .ENDIF
-
-+.IF "$(OS)" == "FREEBSD"
-+#bsd is preffered but epm does not produce valid packages atm
-+#FORMAT*=-format bsd
-+FORMAT*=-format portable
-+.ENDIF
-+
- # epm supports the following formats:
- # aix - AIX software distribution
- # bsd - FreeBSD, NetBSD, or OpenBSD software distribution
diff --git a/editors/openoffice.org-2/files/patch-libxml2 b/editors/openoffice.org-2/files/patch-libxml2
deleted file mode 100644
index b4d2aca8b1c5..000000000000
--- a/editors/openoffice.org-2/files/patch-libxml2
+++ /dev/null
@@ -1,61 +0,0 @@
-o version number of libxml2
-o http://www.openoffice.org/issues/show_bug.cgi?id=42393
-
-Index: libxml2-2.6.17.patch
-===================================================================
-RCS file: /cvs/external/libxml2/libxml2-2.6.17.patch,v
-retrieving revision 1.2
-diff -u -r1.2 libxml2-2.6.17.patch
---- libxml2/libxml2-2.6.17.patch.orig 4 Feb 2005 11:29:07 -0000 1.2
-+++ libxml2/libxml2-2.6.17.patch 12 Feb 2005 13:11:40 -0000
-@@ -1,5 +1,5 @@
--*** misc/libxml2-2.6.17/configure 2005-01-16 20:24:22.000000000 +0100
----- misc/build/libxml2-2.6.17/configure 2005-02-02 17:41:10.751412243 +0100
-+*** misc/libxml2-2.6.17/configure Mon Jan 17 04:24:22 2005
-+--- misc/build/libxml2-2.6.17/configure Sat Feb 12 22:08:54 2005
- ***************
- *** 26339,26347 ****
-
-@@ -38,8 +38,8 @@
- echo "$as_me:$LINENO: result: $ac_cv_func_setsockopt" >&5
- echo "${ECHO_T}$ac_cv_func_setsockopt" >&6
- if test $ac_cv_func_setsockopt = yes; then
--*** misc/libxml2-2.6.17/include/libxml/xmlversion.h 2005-01-16 21:02:54.000000000 +0100
----- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h 2005-02-02 17:39:50.923232015 +0100
-+*** misc/libxml2-2.6.17/include/libxml/xmlversion.h Mon Jan 17 05:02:54 2005
-+--- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h Sat Feb 12 22:08:54 2005
- ***************
- *** 263,269 ****
- *
-@@ -91,8 +91,29 @@
- #define DEBUG_MEMORY_LOCATION
- #endif
-
--*** misc/libxml2-2.6.17/nanohttp.c 2005-01-04 15:49:47.000000000 +0100
----- misc/build/libxml2-2.6.17/nanohttp.c 2005-02-02 17:39:50.924231930 +0100
-+*** misc/libxml2-2.6.17/ltmain.sh Mon Jan 17 05:02:25 2005
-+--- misc/build/libxml2-2.6.17/ltmain.sh Sat Feb 12 22:10:00 2005
-+***************
-+*** 2999,3006 ****
-+ ;;
-+
-+ freebsd-elf)
-+! major=".$current"
-+! versuffix=".$current";
-+ ;;
-+
-+ irix | nonstopux)
-+--- 2999,3006 ----
-+ ;;
-+
-+ freebsd-elf)
-+! major=.`expr $current - $age`
-+! versuffix="$major.$age.$revision"
-+ ;;
-+
-+ irix | nonstopux)
-+*** misc/libxml2-2.6.17/nanohttp.c Tue Jan 4 23:49:47 2005
-+--- misc/build/libxml2-2.6.17/nanohttp.c Sat Feb 12 22:08:54 2005
- ***************
- *** 248,254 ****
- void
diff --git a/editors/openoffice.org-2/files/patch-odk+configure.pl b/editors/openoffice.org-2/files/patch-odk+configure.pl
deleted file mode 100644
index db196e368e6d..000000000000
--- a/editors/openoffice.org-2/files/patch-odk+configure.pl
+++ /dev/null
@@ -1,64 +0,0 @@
-o gmake support
-o suggestion from Juegen Schmidt <Juergen.Schmidt@Sun.COM>
-
-http://www.openoffice.org/issues/show_bug.cgi?id=41142
-
-Index: odk/configure.pl
-===================================================================
-RCS file: /cvs/api/odk/configure.pl,v
-retrieving revision 1.8.4.10
-diff -u -r1.8.4.10 configure.pl
---- odk/configure.pl 11 Jan 2005 11:00:15 -0000 1.8.4.10
-+++ odk/configure.pl 23 Jan 2005 09:13:41 -0000
-@@ -43,7 +43,14 @@
- }
-
- $main::OO_SDK_MAKE_HOME = "";
-+$main::OO_MAKE_NAME = "make";
-+if ( $main::operatingSystem eq "FreeBSD" )
-+{
-+ $main::OO_MAKE_NAME = "gmake";
-+ $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("gmake");
-+} else {
- $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("make");
-+}
- $main::makeVersion = "3.79.1";
- $main::correctVersion = 0;
-
-@@ -137,7 +144,7 @@
- # prepare GNU make path
- while ( (!$main::correctVersion) &&
- ((! -d "$main::OO_SDK_MAKE_HOME" ) ||
-- ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make"))) )
-+ ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME" ))) )
- {
- print " Enter GNU make ($main::makeVersion or higher) tools directory [$main::OO_SDK_MAKE_HOME_SUGGESTION]: ";
- $main::OO_SDK_MAKE_HOME = readStdIn();
-@@ -146,15 +153,16 @@
- {
- $main::OO_SDK_MAKE_HOME = $main::OO_SDK_MAKE_HOME_SUGGESTION;
- }
-+
- if ( (! -d "$main::OO_SDK_MAKE_HOME") ||
-- ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make")) )
-+ ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME")) )
- {
- $main::OO_SDK_MAKE_HOME = "";
- print " Error: GNU make is required, please specify a GNU make tools directory.\n";
- } else
- {
- #check version
-- my $testVersion = `$OO_SDK_MAKE_HOME/make --version`;
-+ my $testVersion = `$OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME --version`;
- if ( $testVersion eq "")
- {
- print " Set the environment variable OO_SDK_MAKE_HOME to your GNU build tools directory.\n";
-@@ -165,7 +173,7 @@
- {
- $testVersion = $1;
- }
-- $main::correctVersion = testVersion($main::makeVersion, $testVersion, "$main::OO_SDK_MAKE_HOME/make", 1);
-+ $main::correctVersion = testVersion($main::makeVersion, $testVersion, "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME", 1);
- if ( !$main::correctVersion )
- {
- print " The 'make' command found at '$main::OO_SDK_MAKE_HOME' has a wrong version\n";
diff --git a/editors/openoffice.org-2/files/patch-odk+util+odk_rules.pmk b/editors/openoffice.org-2/files/patch-odk+util+odk_rules.pmk
deleted file mode 100644
index d390a8af9b5f..000000000000
--- a/editors/openoffice.org-2/files/patch-odk+util+odk_rules.pmk
+++ /dev/null
@@ -1,532 +0,0 @@
-o http://www.openoffice.org/issues/show_bug.cgi?id=43561
-o sdkbugfix02
-
-Index: odk/util/odk_rules.pmk
-===================================================================
-RCS file: /cvs/api/odk/util/odk_rules.pmk,v
-retrieving revision 1.13
-diff -u -r1.13 odk_rules.pmk
---- odk/util/odk_rules.pmk 7 Mar 2005 17:31:28 -0000 1.13
-+++ odk/util/odk_rules.pmk 28 Mar 2005 03:09:30 -0000
-@@ -62,354 +62,355 @@
-
-
- $(DESTDIR)$/index.html : $(PRJ)$/index.html
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/index.html $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/index.html $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/examples.html : $(PRJ)$/docs$/examples.html
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/docs$/examples.html $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/docs$/examples.html $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIRDOCU)$/%.html : $(PRJ)$/docs$/%.html
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIRDOCU)$/%.css : $(PRJ)$/docs$/%.css
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIRDOCUIMAGES)$/% : $(PRJ)$/docs$/images$/%
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_COPY) $< $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_COPY) $< "$@"
-
- $(DESTDIRDOCU)$/DevStudioWizards$/images$/% : $(PRJ)$/docs$/DevStudioWizards$/images$/%
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_COPY) $< $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_COPY) $< "$@"
-
- $(DESTDIR)$/configure : $(PRJ)$/configure
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/configure $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/configure $(MY_TEXTCOPY_TARGETPRE) "$@"
- .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-- +-chmod 755 $@
-+ +-chmod 755 "$@"
- .ENDIF
-
- $(DESTDIR)$/configure.pl : $(PRJ)$/configure.pl
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/configure.pl $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/configure.pl $(MY_TEXTCOPY_TARGETPRE) "$@"
- .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-- +-chmod 755 $@
-+ +-chmod 755 "$@"
- .ENDIF
-
- $(DESTDIR)$/config.guess : $(SOLARENV)$/bin$/config.guess
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(SOLARENV)$/bin$/config.guess $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(SOLARENV)$/bin$/config.guess $(MY_TEXTCOPY_TARGETPRE) "$@"
- .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-- +-chmod 755 $@
-+ +-chmod 755 "$@"
- .ENDIF
-
- $(DESTDIR)$/config.sub : $(SOLARENV)$/bin$/config.sub
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(SOLARENV)$/bin$/config.sub $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(SOLARENV)$/bin$/config.sub $(MY_TEXTCOPY_TARGETPRE) "$@"
- .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-- +-chmod 755 $@
-+ +-chmod 755 "$@"
- .ENDIF
-
- $(DESTDIR)$/setsdkenv_unix : $(PRJ)$/setsdkenv_unix
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
- .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-- +-chmod 755 $@
-+ +-chmod 755 "$@"
- .ENDIF
-
- $(DESTDIR)$/setsdkenv_unix.%.in : $(PRJ)$/setsdkenv_unix.%.in
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
- .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-- +-chmod 644 $@
-+ +-chmod 644 "$@"
- .ENDIF
-
- $(DESTDIR)$/configureWindows.bat : $(PRJ)$/configureWindows.bat
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/configureWindows.bat $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/configureWindows.bat $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIR)$/setsdkenv_windows.bat : $(PRJ)$/setsdkenv_windows.bat
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/setsdkenv_windows.bat $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/setsdkenv_windows.bat $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIR)$/cfgWin.js : $(PRJ)$/cfgWin.js
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/cfgWin.js $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/cfgWin.js $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.sxw : $(PRJ)$/examples$/%.sxw
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_COPY) $< $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_COPY) $< "$@"
-
- $(DESTDIREXAMPLES)$/%.odt : $(PRJ)$/examples$/%.odt
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_COPY) $< $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_COPY) $< "$@"
-
- $(DESTDIREXAMPLES)$/%.ods : $(PRJ)$/examples$/%.ods
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_COPY) $< $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_COPY) $< "$@"
-
- $(DESTDIREXAMPLES)$/%.odg : $(PRJ)$/examples$/%.odg
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_COPY) $< $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_COPY) $< "$@"
-
- $(DESTDIREXAMPLES)$/%.odp : $(PRJ)$/examples$/%.odp
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_COPY) $< $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_COPY) $< "$@"
-
- $(DESTDIREXAMPLES)$/%.xlb : $(PRJ)$/examples$/%.xlb
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_COPY) $< $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_COPY) $< "$@"
-
- $(DESTDIREXAMPLES)$/%.xdl : $(PRJ)$/examples$/%.xdl
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_COPY) $< $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_COPY) $< "$@"
-
- $(DESTDIREXAMPLES)$/%.gif : $(PRJ)$/examples$/%.gif
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_COPY) $< $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_COPY) $< "$@"
-
- $(DESTDIREXAMPLES)$/%.jpg : $(PRJ)$/examples$/%.jpg
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_COPY) $< $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_COPY) $< "$@"
-
- $(DESTDIREXAMPLES)$/%.wmf : $(PRJ)$/examples$/%.wmf
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_COPY) $< $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_COPY) $< "$@"
-
- $(DESTDIREXAMPLES)$/%.nsf : $(PRJ)$/examples$/%.nsf
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_COPY) $< $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_COPY) $< "$@"
-
- $(DESTDIREXAMPLES)$/%.pdf : $(PRJ)$/examples$/%.pdf
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_COPY) $< $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_COPY) $< "$@"
-
- $(DESTDIREXAMPLES)$/%.xba : $(PRJ)$/examples$/%.xba
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.cxx : $(PRJ)$/examples$/%.cxx
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.c : $(PRJ)$/examples$/%.c
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.hxx : $(PRJ)$/examples$/%.hxx
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.java : $(PRJ)$/examples$/%.java
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.idl : $(PRJ)$/examples$/%.idl
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.dxp : $(PRJ)$/examples$/%.dxp
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.xml : $(PRJ)$/examples$/%.xml
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.xcu : $(PRJ)$/examples$/%.xcu
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.html : $(PRJ)$/examples$/%.html
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.txt : $(PRJ)$/examples$/%.txt
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%$/Makefile : $(PRJ)$/examples$/%$/Makefile
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%$/README : $(PRJ)$/examples$/%$/README
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.cpp : $(PRJ)$/examples$/%.cpp
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.h : $(PRJ)$/examples$/%.h
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.def : $(PRJ)$/examples$/%.def
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.rc : $(PRJ)$/examples$/%.rc
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.rgs : $(PRJ)$/examples$/%.rgs
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.dpr : $(PRJ)$/examples$/%.dpr
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.res : $(PRJ)$/examples$/%.res
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.pas : $(PRJ)$/examples$/%.pas
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.dfm : $(PRJ)$/examples$/%.dfm
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.vbs : $(PRJ)$/examples$/%.vbs
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.vb : $(PRJ)$/examples$/%.vb
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.cs : $(PRJ)$/examples$/%.cs
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.mk : $(PRJ)$/examples$/%.mk
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.ini : $(PRJ)$/examples$/%.ini
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.bas : $(PRJ)$/examples$/%.bas
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIREXAMPLES)$/%.mf : $(PRJ)$/examples$/%.mf
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIRCLASSES)$/oosupport.nbm : $(OUT)$/class$/oosupport.nbm
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_COPY) $< $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_COPY) $< "$@"
-
- $(DESTDIRSETTINGS)$/%.mk : $(PRJ)$/settings$/%.mk
-- +-rm -f $@ >& $(NULLDEV)
-+ +-rm -f "$@" >& $(NULLDEV)
- .IF "$(COMEX)"=="7"
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< | $(SED) -e 's/stlport_vc7/stlport_vc6/' $(MY_TEXTCOPY_TARGETPRE) $@
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< | $(SED) -e 's/stlport_vc7/stlport_vc6/' $(MY_TEXTCOPY_TARGETPRE) "$@"
- .ELSE
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
- .ENDIF
-
- $(DESTDIRCOMMONDOCU)$/spec$/xml_format$/xml_specification.pdf : xml_specification.pdf
-- +-rm -f $@ >& $(NULLDEV)
-- $(GNUCOPY) xml_specification.pdf $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(GNUCOPY) xml_specification.pdf "$@"
-
- $(DESTDIRXML)$/module-description.dtd : $(XMLOUT)$/module-description.dtd
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(XMLOUT)$/module-description.dtd $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(XMLOUT)$/module-description.dtd $(MY_TEXTCOPY_TARGETPRE) "$@"
- $(DESTDIRXML)$/%.xml : $(XMLOUT)$/%.xml
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIRBIN)$/%$(EXEPOSTFIX) : $(BINOUT)$/%$(EXEPOSTFIX)
-- +-rm -f $@ >& $(NULLDEV)
-- $(GNUCOPY) $(BINOUT)$/$(@:f) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(GNUCOPY) $(BINOUT)$/$(@:f) "$@"
- .IF "$(GUI)"=="UNX"
-- +-strip $@
-+ +-strip "$@"
- .ENDIF
-
- $(DESTDIRBIN)$/%.bin : $(BINOUT)$/%.bin
-- +-rm -f $@ >& $(NULLDEV)
-- $(GNUCOPY) $(BINOUT)$/$(@:f) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(GNUCOPY) $(BINOUT)$/$(@:f) "$@"
- .IF "$(GUI)"=="UNX"
-- +-strip $@
-+ +-strip "$@"
- .ENDIF
-
- $(DESTDIRBIN)$/regcomp : $(BINOUT)$/regcomp
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
- .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-- +-chmod 755 $@
-+ +-chmod 755 "$@"
- .ENDIF
-
- $(DESTDIRBIN)$/unoapploader$(EXEPOSTFIX) : $(BIN)$/unoapploader$(EXEPOSTFIX)
-- +-rm -f $@ >& $(NULLDEV)
-- $(GNUCOPY) $(BIN)$/$(@:f) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(GNUCOPY) $(BIN)$/$(@:f) "$@"
- .IF "$(GUI)"=="UNX"
-- +-strip $@
-+ +-strip "$@"
- .ENDIF
-
- # special rule for special Java UNO native library
- # (used for all platforms but built only under windows)
- $(DESTDIRJAR)$/win$/unowinreg.dll : $(PRJ)$/bin$/win$/unowinreg.dll
-- +-rm -f $@ >& $(NULLDEV)
-- $(GNUCOPY) $< $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(GNUCOPY) $< "$@"
-
- $(DESTDIRDLL)$/%$(MY_DLLPOSTFIX) : $(DLLOUT)$/%$(MY_DLLPOSTFIX)
-- +-rm -f $@ >& $(NULLDEV)
-- $(GNUCOPY) $(DLLOUT)$/$(@:f) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(GNUCOPY) $(DLLOUT)$/$(@:f) "$@"
-
- $(DESTDIRJAR)$/com$/sun$/star$/lib$/loader$/%.class : $(CLASSDIR)$/com$/sun$/star$/lib$/loader$/%.class
- +-$(RM) $(@:db)*.class >& $(NULLDEV)
- +$(COPY) $(<:db)*.class $(@:d)
-
- $(DESTDIRIDL)$/% : $(IDLOUT)$/%
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIRINC)$/udkversion.mk :
-- +-rm -f $@ >& $(NULLDEV)
-- @echo #UDK version number > $@
-- @echo #major >> $@
-- @echo UDK_MAJOR=$(UDK_MAJOR) >> $@
-- @echo #minor >> $@
-- @echo UDK_MINOR=$(UDK_MINOR) >> $@
-- @echo #micro >> $@
-- @echo UDK_MICRO=$(UDK_MICRO) >> $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ @echo #UDK version number > "$@"
-+ @echo #major >> "$@"
-+ @echo UDK_MAJOR=$(UDK_MAJOR) >> "$@"
-+ @echo #minor >> "$@"
-+ @echo UDK_MINOR=$(UDK_MINOR) >> "$@"
-+ @echo #micro >> "$@"
-+ @echo UDK_MICRO=$(UDK_MICRO) >> "$@"
-
- $(DESTDIRINC)$/% : $(INCOUT)$/%
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIRLIB)$/%.lib : $(LIBOUT)$/%.lib
-- +-rm -f $@ >& $(NULLDEV)
-- $(GNUCOPY) $(LIBOUT)$/$(@:f) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(GNUCOPY) $(LIBOUT)$/$(@:f) "$@"
-
- $(DIR_CREATE_FLAG) :
- .IF "$(USE_SHELL)" != "4nt"
-- +$(TYPE) $(mktmp $(DIR_DIRECTORY_LIST)) | xargs -n 20 $(MKDIRHIER) && echo "dirs created" > $@ && touch $@
-+ +$(TYPE) $(mktmp $(DIR_DIRECTORY_LIST)) | xargs -n 20 $(MKDIRHIER) && echo "dirs created" > "$@" && touch "$@"
- .ELSE
-- +$(TYPE) $(mktmp $(DIR_DIRECTORY_LIST:s/\/\\/)) | xargs -n 10 $(COMSPEC) -c $(PERL) $(SOLARENV)$/bin/mkdir.pl && echo "dirs created" > $@ && touch $@
-+ +$(TYPE) $(mktmp $(DIR_DIRECTORY_LIST:s/\/\\/)) | xargs -n 10 $(COMSPEC) -c $(PERL) $(SOLARENV)$/bin/mkdir.pl && echo "dirs created" > "$@" && touch "$@"
- .ENDIF
-
- $(DIR_FILE_LIST) : $(DIR_CREATE_FLAG)
-
- $(DIR_FILE_FLAG) : $(DIR_FILE_LIST)
-- @echo "must be zipped" > $@
-+ @echo "must be zipped" > "$@"
-
-
- $(DESTDIRSETTINGS)$/component.uno.def : $(PRJ)$/settings$/component.uno.def
-- +-rm -f $@ >& $(NULLDEV)
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-+ +-rm -f "$@" >& $(NULLDEV)
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) "$@"
-
- $(DESTDIRSETTINGS)$/component.uno.map : $(SOLARENV)$/bin$/addsym.awk $(SOLARENV)$/src$/component.map
-- @+-$(RM) -f $@ >& $(NULLDEV)
-+ @+-$(RM) -f "$@" >& $(NULLDEV)
- .IF "$(COMID)"=="gcc3"
-- +tr -d "\015" < $(SOLARENV)$/src$/component.map | sed -e 's/component_getDescriptionFunc;//' | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
-+ +tr -d "\015" < $(SOLARENV)$/src$/component.map | sed -e 's/component_getDescriptionFunc;//' | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > "$@"
- .ELSE # "$(COMID)"=="gcc3"
-- +tr -d "\015" < $(SOLARENV)$/src$/component.map | sed -e 's/component_getDescriptionFunc;//' > $@
-+ +tr -d "\015" < $(SOLARENV)$/src$/component.map | sed -e 's/component_getDescriptionFunc;//' > "$@"
- .ENDIF # "$(COMID)"=="gcc3"
-- @+chmod a+w $@
-+ @+chmod a+w "$@"
-+
diff --git a/editors/openoffice.org-2/files/patch-project-xmlsecurity b/editors/openoffice.org-2/files/patch-project-xmlsecurity
deleted file mode 100644
index b8dfc459e784..000000000000
--- a/editors/openoffice.org-2/files/patch-project-xmlsecurity
+++ /dev/null
@@ -1,45 +0,0 @@
-#iZ and CWS
-o http://www.openoffice.org/issues/show_bug.cgi?id=39958
-o http://www.openoffice.org/issues/show_bug.cgi?id=38417
-o xmlsec08
-
-Description
-o Not for integration, we should provide configure based one
- Note: malloc.h is deprecated for FreeBSD.
-o use configure to produce config.h
-
-Index: libxmlsec/xmlsec1-1.2.4.patch
-===================================================================
-RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.4.patch,v
-retrieving revision 1.7
-diff -u -r1.7 xmlsec1-1.2.4.patch
---- libxmlsec/xmlsec1-1.2.4.patch 9 Sep 2004 08:31:29 -0000 1.7
-+++ libxmlsec/xmlsec1-1.2.4.patch 3 Oct 2004 05:52:20 -0000
-@@ -83,7 +83,7 @@
- ! #undef HAVE_MACH_O_DYLD_H
- !
- ! /* Define to 1 if you have the <malloc.h> header file. */
--! #define HAVE_MALLOC_H 1
-+! #define HAVE_MALLOC_H 0
- !
- ! /* Define to 1 if you have the `memcpy' function. */
- ! #undef HAVE_MEMCPY
-
-
-Index: xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
-===================================================================
-RCS file: /cvs/xml/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 xmldocumentwrapper_xmlsecimpl.cxx
---- xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx 12 Jul 2004 13:15:21 -0000 1.1.1.1
-+++ xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx 4 Oct 2004 22:04:08 -0000
-@@ -68,7 +68,9 @@
- #include <xmloff/attrlist.hxx>
- #include "xmlelementwrapper_xmlsecimpl.hxx"
-
-+#if !defined (FREEBSD)
- #include <malloc.h>
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/editors/openoffice.org-2/files/pkg-message.in b/editors/openoffice.org-2/files/pkg-message.in
deleted file mode 100644
index 63e3317a1568..000000000000
--- a/editors/openoffice.org-2/files/pkg-message.in
+++ /dev/null
@@ -1,53 +0,0 @@
-OpenOffice.org Build %%RELEASE_NR%%m%%MILESTONE%% Personal Install How-To
-
-Written by: Martin Blapp <mbr@freebsd.org>
- and Maho Nakata <maho@FreeBSD.org>
-
-OpenOffice.org %%RELEASE_NR%%m%%MILESTONE%% 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, you'll be prompted to
-install some files and choose a installed JDK.
-The setup installs a ".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" folder
-in your homedir.
-
-If the setup tells you there is already an installed
-version, you may look at the file ".sversionrc" in
-your homedir. In this file OpenOffice and StarOffice
-have both a line for each version which is installed.
-After removing the problematic line you should be able to
-install again.
-
-2 Start OO.org
---------------
-
-There are some wrappers installed for fast startup.
-Add "%%PREFIX%%/bin/" to your PATH and you will be able
-to use them.
-
-%%PREFIX%%/bin/%%EXECBASE%%
-%%PREFIX%%/bin/%%EXECBASE%%-sagenda
-%%PREFIX%%/bin/%%EXECBASE%%-scalc
-%%PREFIX%%/bin/%%EXECBASE%%-sdraw
-%%PREFIX%%/bin/%%EXECBASE%%-setup
-%%PREFIX%%/bin/%%EXECBASE%%-sfax
-%%PREFIX%%/bin/%%EXECBASE%%-simpress
-%%PREFIX%%/bin/%%EXECBASE%%-spadmin
-%%PREFIX%%/bin/%%EXECBASE%%-sweb
-%%PREFIX%%/bin/%%EXECBASE%%-swriter
-
-OO.org does need $LANG to be set to a suitable value.
-
-3 If you stuck into a trouble
---------------------------------------------------
-Somehow you can stuck into a trouble.
-To solve this issue, please remove the already installed
-".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir and remove the
-appropriate entry from ".sversionrc". After you have done
-this, redo the user installation and the problem will
-go away.
diff --git a/editors/openoffice.org-2/pkg-descr b/editors/openoffice.org-2/pkg-descr
deleted file mode 100644
index bc2ede1b8c2b..000000000000
--- a/editors/openoffice.org-2/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-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.
-
-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://www.openoffice.org/
- http://porting.openoffice.org/freebsd/
diff --git a/editors/openoffice.org-2/pkg-plist b/editors/openoffice.org-2/pkg-plist
deleted file mode 100644
index 28bd78453b52..000000000000
--- a/editors/openoffice.org-2/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, do not delete. Package list is generated automatically.