Remove openoffice.org-2.0 and openoffice.org-2.0-devel ports.

openoffice.org-2.0, openoffice.org-2.0-devel ports have been renamed to openoffice.org-2 and openoffice.org-2-devel, respectively. PR: 105195
author: maho <maho@FreeBSD.org> 2006-11-12 14:20:29 +0800
committer: maho <maho@FreeBSD.org> 2006-11-12 14:20:29 +0800
commit: 5a2ac764044ac1c2c3c7fffa39d0199d54a81f3a (patch)
tree: 046a495e0e4540a77a34f6346a4777fb3cf9be80
parent: 0a4fc5e835a4a11c730369711db9dcf626a9eaef (diff)
download: freebsd-ports-gnome-5a2ac764044ac1c2c3c7fffa39d0199d54a81f3a.tar.gz
freebsd-ports-gnome-5a2ac764044ac1c2c3c7fffa39d0199d54a81f3a.tar.zst
freebsd-ports-gnome-5a2ac764044ac1c2c3c7fffa39d0199d54a81f3a.zip
39 files changed, 0 insertions, 3744 deletions
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
deleted file mode 100644
index 73c35c3f9da3..000000000000
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ /dev/null
@@ -1,295 +0,0 @@
-# New ports collection makefile for: OpenOffice.org
-# Date created:		28 February 2002
-# Whom:                 Martin Blapp
-#
-# $FreeBSD$
-#
-
-PORTNAME?=	openoffice.org
-PORTVERSION?=	2.0.${SNAPDATE}
-CATEGORIES+=	editors java
-MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \
-		http://openoffice.lunarshells.com/sources/ \
-		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
-		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
-		${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
-		http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
-MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	${OOOSRC} unowinreg.dll:unowinreg
-.if defined(WITH_GPC)
-DISTFILES+=     gpc231.tar.Z:gpc
-.endif
-.if defined(WITH_GNUGCJ)
-DISTFILES+=     ${ANT_DISTFILE}:antbin
-.endif
-EXTRACT_ONLY=	${OOOSRC}
-
-MAINTAINER=	openoffice@FreeBSD.org
-COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
-
-NO_LATEST_LINK=	yes
-USE_GNOME=	gtk20
-MOZILLA_VERSION=	1.7.5
-MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
-.if !defined(WITHOUT_MOZILLA)
-DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
-USE_GNOME+=	libidl
-.endif
-
-.if defined(WITH_KDE)
-USE_KDELIBS_VER=        3
-.endif
-USE_XLIB=	yes
-USE_GMAKE=	yes
-USE_PERL5=	yes
-USE_BZIP2=	yes
-WITHOUT_CPU_CFLAGS=	true
-
-.if !defined(WITH_GNUGCJ)
-USE_JAVA=	yes
-JAVA_VERSION=	1.4+
-JAVA_BUILD=	jdk
-JAVA_VENDOR=	freebsd bsdjava
-.endif
-
-.include <bsd.port.pre.mk>
-.include <${FILESDIR}/Makefile.localized>
-
-ONLY_FOR_ARCHS=	amd64 i386
-
-.if ${ARCH} == amd64
-GCC_TARGET=		x86_64-portbld-freebsd${OSREL}
-FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
-.else
-GCC_TARGET=		${ARCH}-portbld-freebsd${OSREL}
-FREEBSD_ENV_SET=	FreeBSDIntelEnv.Set
-.endif
-
-.if ${PERL_LEVEL} < 500600
-IGNORE=		install lang/perl5.8 then try again
-.endif
-
-CODELINE=		680
-RELEASE_NR=		2.0
-MILESTONE?=		191
-OOOTAG?=		SRC680_m${MILESTONE}
-OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20061101
-INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
-EXECBASE?=		openoffice.org-${OOOTAG}
-DIST_SUBDIR=		openoffice.org2.0
-SIMPLEOSVER=		${OSREL:C/\.//g}
-.if ${ARCH} == amd64
-PACKAGE_BASENAME=	OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}X86_64
-.else
-PACKAGE_BASENAME=	OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}Intel
-.endif
-
-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
-
-.if defined(WITH_GNUGCJ)
-GCCVER=41
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
-BUILD_DEPEND+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
-RUN_DEPENDS+=	${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
-RUN_DEPEND+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
-.else
-.if ${ARCH} == amd64
-GCCVER=41
-BUILD_DEPENDS+= gcc41:${PORTSDIR}/lang/gcc41
-RUN_DEPENDS+=	gcc41:${PORTSDIR}/lang/gcc41
-.else
-GCCVER=34
-BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo
-.endif
-.endif
-
-.if defined(WITH_CCACHE)
-BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
-CCACHE_PREFIX=	ccache
-.else
-CCACHE_PREFIX=
-.endif
-.if (${GCCVER} == 41)
-CC=     gcc41
-CXX=    g++41
-.endif
-.if (${GCCVER} == 34)
-CC=     gcc-ooo
-CXX=    g++-ooo
-.endif
-CC:=	${CCACHE_PREFIX} ${CC}
-CXX:=	${CCACHE_PREFIX} ${CXX}
-
-BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
-		unzip:${PORTSDIR}/archivers/unzip \
-		gcp:${PORTSDIR}/sysutils/coreutils \
-		gpatch:${PORTSDIR}/devel/patch \
-		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
-		bison2:${PORTSDIR}/devel/bison2 \
-		imake:${X_IMAKE_PORT}
-.if defined(WITH_GNUGCJ)
-LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
-ANT_DISTFILE=   apache-ant-${ANT_VERSION}-bin.tar.bz2
-ANT_VERSION=	1.6.5
-.else
-BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
-.endif
-.if !defined(WITH_GPC)
-LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
-.endif
-
-GNU_CONFIGURE=	yes
-WRKSRC?=		${WRKDIR}/${OOOTAG}
-CONFIGURE_WRKSRC=	${WRKSRC}/config_office
-TCSH?=		/bin/tcsh
-PKGMESSAGE=	${WRKDIR}/pkg-message
-NUMOFPROCESSES?=	1
-.if defined(WITH_GNUGCJ)
-CONFIGURE_ENV+=      PATH="${LOCALBASE}/lib/jvm/java-gcj41/bin:${PATH}"
-.endif
-
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --enable-crashdump=yes --enable-symbols=SMALL
-
-.if ${ARCH} == amd64 || ${GCCVER} == 41
-WITHOUT_MOZILLA=	yes
-.endif
-.if (${GCCVER} == 41)
-LIB_DEPENDS+=   boost_regex:${PORTSDIR}/devel/boost
-CONFIGURE_ARGS+=       --with-system-boost=yes #i58343#
-.endif
-.if (${OSVERSION} <= 492000)
-EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
-.endif
-.if defined(WITH_GNUGCJ)
-EXTRA_PATCHES+=	${FILESDIR}/gcj-fbsdworkaround
-.endif
-
-#.if defined(WITH_TTF_BYTECODE_ENABLED)
-#EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
-#.endif
-
-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.*
-	@${TOUCH} ${EXTRACT_COOKIE}
-	@${TOUCH} ${PATCH_COOKIE}
-	@${TOUCH} ${CONFIGURE_COOKIE}
-	@${TOUCH} ${BUILD_COOKIE}
-.endif
-
-post-extract:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
-.if defined(WITH_GNUGCJ)
-	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-.endif
-.if defined(WITH_GPC)
-	@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/
-.endif
-.if !defined(WITHOUT_MOZILLA)
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
-.endif
-
-do-build:
-	@cd ${WRKSRC} ; ./bootstrap
-# PR:84786 #i53289#
-.if (${NUMOFPROCESSES}>1)
-	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
-.else
-	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; dmake"
-.endif
-
-do-install:
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
-	@${RM} -Rf ${WRKDIR}/tmp
-	@${MKDIR} ${WRKDIR}/tmp
-	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
-		${CP} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
-		cd ${WRKDIR}/tmp ; ${TAR} xfz ${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.org-wrapper ${WRKDIR}/
-	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			-e 's#%%OOOTAG%%#${OOOTAG}#g' \
-			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
-			${WRKDIR}/openoffice.org-wrapper
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
-		${PREFIX}/bin/${EXECBASE}
-	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
-	@${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}-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}-swriter
-	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
-	@${REINPLACE_CMD} -e 's#${RELEASE_NR}#${OOOVERSION}#g' \
-			-e '/^Exec/s/printeradmin/spadmin/' \
-			${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop
-	@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak
-	@{LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
-			${PREFIX}/share/applications/${EXECBASE}
-	@${PRINTF} "share/applications/${EXECBASE}\n" >> ${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 \
-				${CP} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \
-				    ${PREFIX}/share/icons/hicolor/$${dir}/apps/openofficeorg-20-$${app}.png ; \
-				${PRINTF} "share/icons/hicolor/$${dir}/apps/openofficeorg-20-$${app}.png\n" >> ${TMPPLIST} ; \
-			fi \
-		done ; \
-		for file in `cd ${ICONS}/hicolor/$${dir}/mimetypes; ls *.png`; do \
-			${CP} ${ICONS}/hicolor/$${dir}/mimetypes/$${file} \
-			    ${PREFIX}/share/icons/hicolor/$${dir}/mimetypes/ ; \
-			${PRINTF} "share/icons/hicolor/$${dir}/mimetypes/$${file}\n" >> ${TMPPLIST} ; \
-		done ; \
-	done
-	@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#%%OOOTAG%%#${OOOTAG}#g' \
-			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			${PKGMESSAGE}
-	@${ECHO_CMD}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
-
-.include <${FILESDIR}/Makefile.others>
-.include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
deleted file mode 100644
index f8bcb1e7c861..000000000000
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = e67107b02f384165f05e34b92dad3a13
-SHA256 (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = d616def00600a9b2299dea9617f232c1bea1adb192c2820e0d44aa430c6c6753
-SIZE (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = 261869653
-MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
-SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-SIZE (openoffice.org2.0/unowinreg.dll) = 6144
-MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
-SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
-MD5 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 26031ee1a2fd248ad0cc2e7f17c44c39
-SHA256 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = d463b8259cb199cd26799c817756c73e4e7808b0cf915f86841ac9779e0f9936
-SIZE (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 6743024
-MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
-SHA256 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
-SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366
diff --git a/editors/openoffice.org-2.0-devel/files/Makefile.knobs b/editors/openoffice.org-2.0-devel/files/Makefile.knobs
deleted file mode 100644
index 85ab949146a4..000000000000
--- a/editors/openoffice.org-2.0-devel/files/Makefile.knobs
+++ /dev/null
@@ -1,133 +0,0 @@
-# Makefile for knobs
-# Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD$
-
-.if !defined(WITH_GNUGCJ)
-CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant"
-.else
-CONFIGURE_ARGS+=	--with-jdk-home="${LOCALBASE}/lib/jvm/java-gcj41" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
-.endif
-
-.if defined(WITH_KDE)
-CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
-.endif
-
-.if defined(WITH_CUPS)
-LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
-CONFIGURE_ARGS+=	--enable-cups=yes
-.else
-CONFIGURE_ARGS+=	--enable-cups=no
-.endif
-
-.if defined(WITHOUT_MOZILLA)
-CONFIGURE_ARGS+=	--disable-mozilla
-.else
-CONFIGURE_ARGS+=	--enable-build-mozilla
-.endif
-
-.if defined(WITHOUT_GNOMEVFS)
-CONFIGURE_ARGS+=	--disable-gnome-vfs
-.else
-USE_GNOME+=		gnomevfs2
-.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 with"
-	@${ECHO} "make -DWITHOUT_MOZILLA"
-.endif
-.if !defined(WITHOUT_GNOMEVFS)
-	@${ECHO}
-	@${ECHO} "You can compile OOo without gnome VFS support with"
-	@${ECHO} "make -DWITHOUT_GNOMEVFS"
-.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, with"
-#	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
-#	@${ECHO} "See http://www.freetype.org/patents.html for details"
-#.endif
-.if !defined(LOCALIZED_LANG)
-	@${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 be-BY bg br bn bn-BD bn-IN bs ca cs cy da de el"
-	@${ECHO} "en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu-IN he"
-	@${ECHO} "hi-IN hr hu it ja km kn-IN ko lo lt lv mk ms ne nb nl"
-	@${ECHO} "nn nr ns pa-IN pl pt pt-BR ru rw sk sl sh-YU sr-CS ss"
-	@${ECHO} "st sv sw sw-TZ sx ta-IN th tn tr ts ve vi xh zh-CN"
-	@${ECHO} "zh-TW zu"
-	@${ECHO} "Default: en-US"
-.endif
-.if !defined(WITH_GNUGCJ)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
-	@${ECHO} "make -DWITH_GNUGCJ"
-.endif
-.if !defined(WITH_CUPS)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with CUPS support with"
-	@${ECHO} "make -DWITH_CUPS"
-.endif
-.if !defined(WITH_KDE)
-	@${ECHO}
-	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
-	@${ECHO} "make -DWITH_KDE"
-.endif
-.if !defined(WITH_GPC)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with gpc instead of libart by"
-	@${ECHO} "make -DWITH_GPC"
-.endif
-	@${ECHO}
-	@${ECHO} "NOTICE:"
-	@${ECHO}
-	@${ECHO} "To build OOo, you should have a lot"
-.if defined(WITH_DEBUG)
-	@${ECHO} "of free diskspace (~ 18GB) and memory (~ 2GB)."
-.else
-	@${ECHO} "of free diskspace (~ 9GB) and memory (~ 2GB)."
-.endif
-	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
diff --git a/editors/openoffice.org-2.0-devel/files/Makefile.localized b/editors/openoffice.org-2.0-devel/files/Makefile.localized
deleted file mode 100644
index 410647cd4dff..000000000000
--- a/editors/openoffice.org-2.0-devel/files/Makefile.localized
+++ /dev/null
@@ -1,344 +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} == "be-BY"
-LANG_PKGNAME=	be
-LANG_SUFFIX=	BY
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "bg"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "br"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "bn"
-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} == "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} == "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+=   ${X11BASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "km"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.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} == "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} == "ms"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ne"
-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} == "nr"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ns"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.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} == "sk"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sl"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sh-YU"
-LANG_PKGNAME=	sh
-LANG_SUFFIX=	YU
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sr-CS"
-LANG_PKGNAME=	sr
-LANG_SUFFIX=	CS
-.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"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sw-TZ"
-LANG_PKGNAME=	sw
-LANG_SUFFIX=	TZ
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sx"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ta-IN"
-LANG_PKGNAME=	ta
-LANG_SUFFIX=	IN
-.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} == "ts"
-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.org-2.0-devel/files/Makefile.others b/editors/openoffice.org-2.0-devel/files/Makefile.others
deleted file mode 100644
index 444a91beac69..000000000000
--- a/editors/openoffice.org-2.0-devel/files/Makefile.others
+++ /dev/null
@@ -1,67 +0,0 @@
-# Makefile for other stuffs
-# Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD$
-
-#other stuffs which are 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 OpenOffice.org mirror upload";
-	@${MV} ${PKGFILE} \
-		${WRKDIR}/../${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX}
-
-package-canonical:
-	@${ECHO_MSG} "===>   Canonical packaging for OpenOffice.org";
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ;\
-	${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} .
-
-sdk:
-	@${ECHO_MSG} "===>   Make SDK of OpenOffice.org"
-	@${RM} -fr ${WRKDIR}/sdk_tmp
-	@${MKDIR} ${WRKDIR}/sdk_tmp
-	@cd ${WRKDIR}/sdk_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z
-	@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
-		${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \
-		${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \
-		${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_SDK.tar.bz2 ${INSTALLATION_BASEDIR}_sdk
-
-ure:
-	@${ECHO_MSG} "===>   Make Uno Runtime Environment of OpenOffice.org"
-	@${RM} -fr ${WRKDIR}/ure_tmp
-	@${MKDIR} ${WRKDIR}/ure_tmp
-	@cd ${WRKDIR}/ure_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/URE/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z
-	@cd ${WRKDIR}/ure_tmp/opt/openoffice* ; \
-		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
-		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
-		${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_URE.tar.bz2 ${INSTALLATION_BASEDIR}
-
-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} ; ${TCSH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack'
-.else
-	@cd ${WRKSRC} ; ${TCSH} -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 ${WRKDIR}/langpack_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z
-	@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
diff --git a/editors/openoffice.org-2.0-devel/files/fbsd4-workaroundpatch b/editors/openoffice.org-2.0-devel/files/fbsd4-workaroundpatch
deleted file mode 100644
index d69388828582..000000000000
--- a/editors/openoffice.org-2.0-devel/files/fbsd4-workaroundpatch
+++ /dev/null
@@ -1,42 +0,0 @@
-Issutracker : #iXXXXX#
-CWS         : N/A
-Author:     : 
-Description :
-
-making libbf_svx680fi.so fails for FreeBSD 4.11 like:
-
-Making: ../../unxfbsd.pro/lib/libbf_svx680fi.so
-ccache g++-ooo -Wl,-z,combreloc -Wl,-rpath,'$ORIGIN' -shared -L../../unxfbsd.pro/lib -L../lib -L/work/ports/editors/openoffice.org-2.0/work/OOo_2.0beta2/solenv/unxfbsd/lib -L/work/ports/editors/openoffice.org-2.0/work/OOo_2.0beta2/solver/680/unxfbsd.pro/lib -L/work/ports/editors/openoffice.org-2.0/work/OOo_2.0beta2/solenv/unxfbsd/lib -L/usr/local/jdk1.4.2/lib -L/usr/local/jdk1.4.2/jre/lib/i386 -L/usr/local/jdk1.4.2/jre/lib/i386/client -L/usr/local/jdk1.4.2/jre/lib/i386/native_threads -L/usr/X11R6/lib ../../unxfbsd.pro/slo/bf_svx_dflt_version.o ../../unxfbsd.pro/slo/bf_svx_dflt_description.o -o ../../unxfbsd.pro/lib/libbf_svx680fi.so ../../unxfbsd.pro/slo/svx_writingmodeitem.o ../../unxfbsd.pro/slo/svx_frmitems.o ../../unxfbsd.pro/slo/svx_paraitem.o ../../unxfbsd.pro/slo/svx_textitem.o ../../unxfbsd.pro/slo/svx_postattr.o ../../unxfbsd.pro/slo/svx_flditem.o ../../unxfbsd.pro/slo/svx_hlnkitem.o ../../unxfbsd.pro/slo/svx_svxfont.o ../../unxfbsd.pro/slo/svx_pageitem.o ../../unxfbsd.pro/slo/svx_paperinf.o ../../unxfbsd.pro/slo/svx_drawitem.o ../../unxfbsd.pro/slo/svx_algitem.o ../../unxfbsd.pro/slo/svx_itemtype.o ../../unxfbsd.pro/slo/svx_rotmodit.o ../../unxfbsd.pro/slo/svx_numinf.o ../../unxfbsd.pro/slo/svx_svxerr.o ../../unxfbsd.pro/slo/svx_numfmtsh.o ../../unxfbsd.pro/slo/svx_zoomitem.o ../../unxfbsd.pro/slo/svx_chrtitem.o ../../unxfbsd.pro/slo/svx_bulitem.o ../../unxfbsd.pro/slo/svx_e3ditem.o ../../unxfbsd.pro/slo/svx_numitem.o ../../unxfbsd.pro/slo/svx_grfitem.o ../../unxfbsd.pro/slo/svx_clipfmtitem.o ../../unxfbsd.pro/slo/svx_svxempty.o ../../unxfbsd.pro/slo/svx_xmlcnitm.o ../../unxfbsd.pro/slo/svx_linkmgr.o ../../unxfbsd.pro/slo/svx_fileobj.o ../../unxfbsd.pro/slo/svx_txtrange.o ../../unxfbsd.pro/slo/svx_svxacorr.o ../../unxfbsd.pro/slo/svx_SvXMLAutoCorrectImport.o ../../unxfbsd.pro/slo/svx_forbiddencharacterstable.o ../../unxfbsd.pro/slo/svx_swafopt.o ../../unxfbsd.pro/slo/svx_editattr.o ../../unxfbsd.pro/slo/svx_editdbg.o ../../unxfbsd.pro/slo/svx_editdoc.o ../../unxfbsd.pro/slo/svx_editdoc2.o ../../unxfbsd.pro/slo/svx_editeng.o ../../unxfbsd.pro/slo/svx_editobj.o ../../unxfbsd.pro/slo/svx_editsel.o ../../unxfbsd.pro/slo/svx_editundo.o ../../unxfbsd.pro/slo/svx_edtspell.o ../../unxfbsd.pro/slo/svx_editview.o ../../unxfbsd.pro/slo/svx_eerdll.o ../../unxfbsd.pro/slo/svx_impedit.o ../../unxfbsd.pro/slo/svx_impedit2.o ../../unxfbsd.pro/slo/svx_impedit3.o ../../unxfbsd.pro/slo/svx_impedit4.o ../../unxfbsd.pro/slo/svx_impedit5.o ../../unxfbsd.pro/slo/svx_unolingu.o ../../unxfbsd.pro/slo/svx_outliner.o ../../unxfbsd.pro/slo/svx_outlin2.o ../../unxfbsd.pro/slo/svx_paralist.o ../../unxfbsd.pro/slo/svx_outlvw.o ../../unxfbsd.pro/slo/svx_outleeng.o ../../unxfbsd.pro/slo/svx_outlobj.o ../../unxfbsd.pro/slo/svx__bmpmask.o ../../unxfbsd.pro/slo/svx__contdlg.o ../../unxfbsd.pro/slo/svx_charmap.o ../../unxfbsd.pro/slo/svx_hyperdlg.o ../../unxfbsd.pro/slo/svx_imapdlg.o ../../unxfbsd.pro/slo/svx_dlgutil.o ../../unxfbsd.pro/slo/svx_fontwork.o ../../unxfbsd.pro/slo/svx_impgrf.o ../../unxfbsd.pro/slo/svx_rlrcitem.o ../../unxfbsd.pro/slo/svx_rulritem.o ../../unxfbsd.pro/slo/svx_rubydialog.o ../../unxfbsd.pro/slo/svx_srchdlg.o ../../unxfbsd.pro/slo/svx_svxruler.o ../../unxfbsd.pro/slo/svx_txencbox.o ../../unxfbsd.pro/slo/svx_clipboardctl.o ../../unxfbsd.pro/slo/svx_fntctl.o ../../unxfbsd.pro/slo/svx_fntszctl.o ../../unxfbsd.pro/slo/svx_asiancfg.o ../../unxfbsd.pro/slo/svx_adritem.o ../../unxfbsd.pro/slo/svx_optgrid.o ../../unxfbsd.pro/slo/svx_insctrl.o ../../unxfbsd.pro/slo/svx_zoomctrl.o ../../unxfbsd.pro/slo/svx_pszctrl.o ../../unxfbsd.pro/slo/svx_selctrl.o ../../unxfbsd.pro/slo/svx_modctrl.o ../../unxfbsd.pro/slo/svx_colrctrl.o ../../unxfbsd.pro/slo/svx_fillctrl.o ../../unxfbsd.pro/slo/svx_grafctrl.o ../../unxfbsd.pro/slo/svx_itemwin.o ../../unxfbsd.pro/slo/svx_layctrl.o ../../unxfbsd.pro/slo/svx_lboxctrl.o ../../unxfbsd.pro/slo/svx_linectrl.o ../../unxfbsd.pro/slo/svx_tbcontrl.o ../../unxfbsd.pro/slo/svx_tbxalign.o ../../unxfbsd.pro/slo/svx_tbxdraw.o ../../unxfbsd.pro/slo/svx_tbxdrctl.o ../../unxfbsd.pro/slo/svx_verttexttbxctrl.o ../../unxfbsd.pro/slo/svx_UnoForbiddenCharsTable.o ../../unxfbsd.pro/slo/svx_unoedsrc.o ../../unxfbsd.pro/slo/svx_unoedhlp.o ../../unxfbsd.pro/slo/svx_unopracc.o ../../unxfbsd.pro/slo/svx_unoedprx.o ../../unxfbsd.pro/slo/svx_unoviwed.o ../../unxfbsd.pro/slo/svx_unoviwou.o ../../unxfbsd.pro/slo/svx_unofored.o ../../unxfbsd.pro/slo/svx_unoforou.o ../../unxfbsd.pro/slo/svx_unotext.o ../../unxfbsd.pro/slo/svx_unotext2.o ../../unxfbsd.pro/slo/svx_unofield.o ../../unxfbsd.pro/slo/svx_UnoNamespaceMap.o ../../unxfbsd.pro/slo/svx_UnoGraphicExporter.o ../../unxfbsd.pro/slo/svx_unopool.o ../../unxfbsd.pro/slo/svx_XPropertyTable.o ../../unxfbsd.pro/slo/svx_UnoNameItemTable.o ../../unxfbsd.pro/slo/svx_unoshape.o ../../unxfbsd.pro/slo/svx_unoipset.o ../../unxfbsd.pro/slo/svx_unoctabl.o ../../unxfbsd.pro/slo/svx_unoshap2.o ../../unxfbsd.pro/slo/svx_unoshap3.o ../../unxfbsd.pro/slo/svx_unoshap4.o ../../unxfbsd.pro/slo/svx_unopage.o ../../unxfbsd.pro/slo/svx_unoshtxt.o ../../unxfbsd.pro/slo/svx_unoshcol.o ../../unxfbsd.pro/slo/svx_unoprov.o ../../unxfbsd.pro/slo/svx_unomod.o ../../unxfbsd.pro/slo/svx_unonrule.o ../../unxfbsd.pro/slo/svx_unofdesc.o ../../unxfbsd.pro/slo/svx_unomlstr.o ../../unxfbsd.pro/slo/svx_unogtabl.o ../../unxfbsd.pro/slo/svx_unohtabl.o ../../unxfbsd.pro/slo/svx_unobtabl.o ../../unxfbsd.pro/slo/svx_unottabl.o ../../unxfbsd.pro/slo/svx_unomtabl.o ../../unxfbsd.pro/slo/svx_unodtabl.o ../../unxfbsd.pro/slo/svx_gluepts.o ../../unxfbsd.pro/slo/svx_galexpl.o ../../unxfbsd.pro/slo/svx_galdlg.o ../../unxfbsd.pro/slo/svx_galctrl.o ../../unxfbsd.pro/slo/svx_gallery1.o ../../unxfbsd.pro/slo/svx_galtheme.o ../../unxfbsd.pro/slo/svx_galmisc.o ../../unxfbsd.pro/slo/svx_galobj.o ../../unxfbsd.pro/slo/svx_codec.o ../../unxfbsd.pro/slo/svx_galbrws.o ../../unxfbsd.pro/slo/svx_galbrws1.o ../../unxfbsd.pro/slo/svx_galbrws2.o ../../unxfbsd.pro/slo/svx_svdoutlinercache.o ../../unxfbsd.pro/slo/svx_dialdll.o ../../unxfbsd.pro/slo/svx_gradtrns.o ../../unxfbsd.pro/slo/svx_svdattr.o ../../unxfbsd.pro/slo/svx_svdcrtmt.o ../../unxfbsd.pro/slo/svx_svdcrtv.o ../../unxfbsd.pro/slo/svx_svddrag.o ../../unxfbsd.pro/slo/svx_svddrgmt.o ../../unxfbsd.pro/slo/svx_svddrgv.o ../../unxfbsd.pro/slo/svx_svdedtv.o ../../unxfbsd.pro/slo/svx_svdedtv1.o ../../unxfbsd.pro/slo/svx_svdedtv2.o ../../unxfbsd.pro/slo/svx_svdedxv.o ../../unxfbsd.pro/slo/svx_svdetc.o ../../unxfbsd.pro/slo/svx_svdfmtf.o ../../unxfbsd.pro/slo/svx_svdfppt.o ../../unxfbsd.pro/slo/svx_svdglev.o ../../unxfbsd.pro/slo/svx_svdglue.o ../../unxfbsd.pro/slo/svx_svdhdl.o ../../unxfbsd.pro/slo/svx_svdhlpln.o ../../unxfbsd.pro/slo/svx_svdibrow.o ../../unxfbsd.pro/slo/svx_svdio.o ../../unxfbsd.pro/slo/svx_svditer.o ../../unxfbsd.pro/slo/svx_svdlayer.o ../../unxfbsd.pro/slo/svx_svdmark.o ../../unxfbsd.pro/slo/svx_svdmodel.o ../../unxfbsd.pro/slo/svx_svdmrkv.o ../../unxfbsd.pro/slo/svx_svdmrkv1.o ../../unxfbsd.pro/slo/svx_svdoattr.o ../../unxfbsd.pro/slo/svx_svdobj.o ../../unxfbsd.pro/slo/svx_impgrfll.o ../../unxfbsd.pro/slo/svx_svdocapt.o ../../unxfbsd.pro/slo/svx_svdocirc.o ../../unxfbsd.pro/slo/svx_svdoedge.o ../../unxfbsd.pro/slo/svx_svdograf.o ../../unxfbsd.pro/slo/svx_svdogrp.o ../../unxfbsd.pro/slo/svx_svdomeas.o ../../unxfbsd.pro/slo/svx_svdoole2.o ../../unxfbsd.pro/slo/svx_svdopage.o ../../unxfbsd.pro/slo/svx_svdopath.o ../../unxfbsd.pro/slo/svx_svdorect.o ../../unxfbsd.pro/slo/svx_svdotext.o ../../unxfbsd.pro/slo/svx_svdotxat.o ../../unxfbsd.pro/slo/svx_svdotxdr.o ../../unxfbsd.pro/slo/svx_svdotxed.o ../../unxfbsd.pro/slo/svx_svdotxfl.o ../../unxfbsd.pro/slo/svx_svdotxln.o ../../unxfbsd.pro/slo/svx_svdotxtr.o ../../unxfbsd.pro/slo/svx_svdouno.o ../../unxfbsd.pro/slo/svx_svdoutl.o ../../unxfbsd.pro/slo/svx_svdovirt.o ../../unxfbsd.pro/slo/svx_svdpage.o ../../unxfbsd.pro/slo/svx_svdpagv.o ../../unxfbsd.pro/slo/svx_svdpntv.o ../../unxfbsd.pro/slo/svx_svdpoev.o ../../unxfbsd.pro/slo/svx_svdscrol.o ../../unxfbsd.pro/slo/svx_svdsnpv.o ../../unxfbsd.pro/slo/svx_svdsuro.o ../../unxfbsd.pro/slo/svx_svdtouch.o ../../unxfbsd.pro/slo/svx_svdtrans.o ../../unxfbsd.pro/slo/svx_svdtxhdl.o ../../unxfbsd.pro/slo/svx_svdundo.o ../../unxfbsd.pro/slo/svx_svdview.o ../../unxfbsd.pro/slo/svx_svdviter.o ../../unxfbsd.pro/slo/svx_svdvmark.o ../../unxfbsd.pro/slo/svx_svdxcgv.o ../../unxfbsd.pro/slo/svx_clonelist.o ../../unxfbsd.pro/slo/svx_dbcharsethelper.o ../../unxfbsd.pro/slo/svx_ParseContext.o ../../unxfbsd.pro/slo/svx_typeconversionclient.o ../../unxfbsd.pro/slo/svx_confirmdelete.o ../../unxfbsd.pro/slo/svx_dbtoolsclient.o ../../unxfbsd.pro/slo/svx_sqlparserclient.o ../../unxfbsd.pro/slo/svx_dataaccessdescriptor.o ../../unxfbsd.pro/slo/svx_fmpage.o ../../unxfbsd.pro/slo/svx_fmPropBrw.o ../../unxfbsd.pro/slo/svx_fmundo.o ../../unxfbsd.pro/slo/svx_fmprop.o ../../unxfbsd.pro/slo/svx_fmmodel.o ../../unxfbsd.pro/slo/svx_navigatortree.o ../../unxfbsd.pro/slo/svx_navigatortreemodel.o ../../unxfbsd.pro/slo/svx_fmexpl.o ../../unxfbsd.pro/slo/svx_fmctrler.o ../../unxfbsd.pro/slo/svx_fmpgeimp.o ../../unxfbsd.pro/slo/svx_fmvwimp.o ../../unxfbsd.pro/slo/svx_taborder.o ../../unxfbsd.pro/slo/svx_fmdpage.o ../../unxfbsd.pro/slo/svx_fmitems.o ../../unxfbsd.pro/slo/svx_tbxform.o ../../unxfbsd.pro/slo/svx_fmobj.o ../../unxfbsd.pro/slo/svx_fmdmod.o ../../unxfbsd.pro/slo/svx_fmobjfac.o ../../unxfbsd.pro/slo/svx_fmsrccfg.o ../../unxfbsd.pro/slo/svx_fmservs.o ../../unxfbsd.pro/slo/svx_typemap.o ../../unxfbsd.pro/slo/svx_fmexch.o ../../unxfbsd.pro/slo/svx_tabwin.o ../../unxfbsd.pro/slo/svx_multipro.o ../../unxfbsd.pro/slo/svx_fmurl.o ../../unxfbsd.pro/slo/svx_filtnav.o ../../unxfbsd.pro/slo/svx_fmimplids.o ../../unxfbsd.pro/slo/svx_fmtools.o ../../unxfbsd.pro/slo/svx_fmshimp.o ../../unxfbsd.pro/slo/svx_fmshell.o ../../unxfbsd.pro/slo/svx_fmsearch.o ../../unxfbsd.pro/slo/svx_fmsrcimp.o ../../unxfbsd.pro/slo/svx_fmview.o ../../unxfbsd.pro/slo/svx_siimport.o ../../unxfbsd.pro/slo/svx_sdbdatacolumn.o ../../unxfbsd.pro/slo/svx_svx3ditems.o ../../unxfbsd.pro/slo/svx_deflt3d.o ../../unxfbsd.pro/slo/svx_class3d.o ../../unxfbsd.pro/slo/svx_e3dundo.o ../../unxfbsd.pro/slo/svx_volume3d.o ../../unxfbsd.pro/slo/svx_viewpt3d.o ../../unxfbsd.pro/slo/svx_camera3d.o ../../unxfbsd.pro/slo/svx_poly3d.o ../../unxfbsd.pro/slo/svx_polygn3d.o ../../unxfbsd.pro/slo/svx_volmrk3d.o ../../unxfbsd.pro/slo/svx_objfac3d.o ../../unxfbsd.pro/slo/svx_obj3d.o ../../unxfbsd.pro/slo/svx_light3d.o ../../unxfbsd.pro/slo/svx_dlight3d.o ../../unxfbsd.pro/slo/svx_plight3d.o ../../unxfbsd.pro/slo/svx_pntobj3d.o ../../unxfbsd.pro/slo/svx_polyob3d.o ../../unxfbsd.pro/slo/svx_scene3d.o ../../unxfbsd.pro/slo/svx_polysc3d.o ../../unxfbsd.pro/slo/svx_cube3d.o ../../unxfbsd.pro/slo/svx_sphere3d.o ../../unxfbsd.pro/slo/svx_extrud3d.o ../../unxfbsd.pro/slo/svx_lathe3d.o ../../unxfbsd.pro/slo/svx_label3d.o ../../unxfbsd.pro/slo/svx_dragmt3d.o ../../unxfbsd.pro/slo/svx_view3d.o ../../unxfbsd.pro/slo/svx_view3d1.o ../../unxfbsd.pro/slo/svx_e3dcmpt.o ../../unxfbsd.pro/slo/svx_float3d.o ../../unxfbsd.pro/slo/svx_svxmsbas.o ../../unxfbsd.pro/slo/svx_xcpoly.o ../../unxfbsd.pro/slo/svx_xout.o ../../unxfbsd.pro/slo/svx_xout1.o ../../unxfbsd.pro/slo/svx_xattr.o ../../unxfbsd.pro/slo/svx_xattr2.o ../../unxfbsd.pro/slo/svx_xattrbmp.o ../../unxfbsd.pro/slo/svx_xline.o ../../unxfbsd.pro/slo/svx_xpool.o ../../unxfbsd.pro/slo/svx_xtable.o ../../unxfbsd.pro/slo/svx_xtabcolr.o ../../unxfbsd.pro/slo/svx_xtablend.o ../../unxfbsd.pro/slo/svx_xtabdash.o ../../unxfbsd.pro/slo/svx_xtabhtch.o ../../unxfbsd.pro/slo/svx_xtabgrdt.o ../../unxfbsd.pro/slo/svx_xtabbtmp.o ../../unxfbsd.pro/slo/svx_xexch.o ../../unxfbsd.pro/slo/svx_xiocomp.o ../../unxfbsd.pro/slo/svx__xpoly.o ../../unxfbsd.pro/slo/svx__ximp.o ../../unxfbsd.pro/slo/svx__xoutbmp.o ../../unxfbsd.pro/slo/svx__xfont.o ../../unxfbsd.pro/slo/svx_xmlexport.o ../../unxfbsd.pro/slo/svx_xmltxtimp.o ../../unxfbsd.pro/slo/svx_xmltxtexp.o ../../unxfbsd.pro/slo/svx_xmlxtimp.o ../../unxfbsd.pro/slo/svx_xmlxtexp.o ../../unxfbsd.pro/slo/svx_xmlgrhlp.o ../../unxfbsd.pro/slo/svx_xmleohlp.o -lbf_xo680fi -lgo680fi -lsb680fi -lso680fi -lsvt680fi -ltk680fi -lvcl680fi -lsvl680fi -lsot680fi -lutl680fi -ltl680fi -lcomphelp4gcc3 -lucbhelper3gcc3 -luno_cppuhelpergcc3 -luno_cppu -lvos3gcc3 -luno_sal -licuuc -lfwe680fi -llegacy_binfilters680fi -luno_salhelpergcc3 -lxcr680fi -lsysshell -lbf_sfx -lsysshell -pthread -lm -Wl,-Bdynamic -lstlport_gcc -pthread
-/usr/libexec/elf/ld: ../../unxfbsd.pro/lib/libbf_svx680fi.so: undefined versioned symbol name typeinfo for com::sun::star::beans::XFastPropertySet@@UDK_3_0_0
-/usr/libexec/elf/ld: failed to set dynamic section sizes: Bad value
-collect2: ld returned 1 exit status
-dmake:  Error code 1, while making '../../unxfbsd.pro/lib/libbf_svx680fi.so'
-'---* tg_merge.mk *---'
-
-ERROR: Error 65280 occurred while making /work/ports/editors/openoffice.org-2.0/work/OOo_2.0beta2/binfilter/bf_svx/util
-dmake:  Error code 1, while making 'build_instsetoo_native'
-'---* tg_merge.mk *---'
-*** Error code 255
-
-Stop in /work/ports/editors/openoffice.org-2.0.
-
---- /dev/null	Sun Sep  4 19:33:13 2005
-+++ binfilter/bf_svx/util/bf_svx.map	Sun Sep  4 18:41:25 2005
-@@ -0,0 +1 @@
-+UDK_3_0_0 { global: _ZTI*; _ZTS*; };
-
-Index: binfilter/bf_svx/util/makefile.mk
-===================================================================
-RCS file: /cvs/framework/binfilter/bf_svx/util/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- binfilter/bf_svx/util/makefile.mk	5 Dec 2003 15:10:56 -0000	1.5
-+++ binfilter/bf_svx/util/makefile.mk	4 Sep 2005 09:55:49 -0000
-@@ -91,6 +91,7 @@
- SHL1IMPLIB= bf_svx
- SVXLOKAL=	$(LB)$/bf_svx.lib
- SHL1BASE  = 0x1d800000
-+SHL1VERSIONMAP= bf_svx.map
- 
- SHL1STDLIBS= \
- 	$(BFXMLOFFLIB) \
diff --git a/editors/openoffice.org-2.0-devel/files/gcj-fbsdworkaround b/editors/openoffice.org-2.0-devel/files/gcj-fbsdworkaround
deleted file mode 100644
index 471f004db546..000000000000
--- a/editors/openoffice.org-2.0-devel/files/gcj-fbsdworkaround
+++ /dev/null
@@ -1,30 +0,0 @@
---- config_office/configure~	Sat Mar  4 16:12:31 2006
-+++ config_office/configure	Sat Mar  4 16:12:45 2006
-@@ -7544,7 +7544,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgcjawt  $LIBS"
-+LIBS="-lgcjawt  -pthread $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-
-http://qa.openoffice.org/issues/show_bug.cgi?id=63095
-Index: stoc/source/javaloader/makefile.mk
-===================================================================
-RCS file: /cvs/udk/stoc/source/javaloader/makefile.mk,v
-retrieving revision 1.16
-diff -u -r1.16 makefile.mk
---- stoc/source/javaloader/makefile.mk	8 Sep 2005 07:57:58 -0000	1.16
-+++ stoc/source/javaloader/makefile.mk	13 Mar 2006 00:54:46 -0000
-@@ -59,7 +59,8 @@
- 		$(CPPUHELPERLIB) 	\
- 		$(CPPULIB)			\
- 		$(SALLIB) \
--        $(JVMACCESSLIB)
-+        $(JVMACCESSLIB) \
-+        -L/usr/local/lib -liconv
- 
- SHL1VERSIONMAP = javaloader.map
- SHL1DEPN=		
diff --git a/editors/openoffice.org-2.0-devel/files/generate.pl b/editors/openoffice.org-2.0-devel/files/generate.pl
deleted file mode 100644
index 1927fb54c8ec..000000000000
--- a/editors/openoffice.org-2.0-devel/files/generate.pl
+++ /dev/null
@@ -1,24 +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.0-devel/files/Attic/generate.pl,v 1.8 2005-11-25 23:22:20 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 "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";
-
-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.0-devel/files/openoffice.org-wrapper b/editors/openoffice.org-2.0-devel/files/openoffice.org-wrapper
deleted file mode 100644
index b33db74c7163..000000000000
--- a/editors/openoffice.org-2.0-devel/files/openoffice.org-wrapper
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2.0-devel/files/Attic/openoffice.org-wrapper,v 1.2 2005-12-23 03:06:18 maho Exp $
-
-oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/
-program=`echo $0 | sed -e 's|.*-%%OOOTAG%%-||'`
-
-case $program in
-$0)
-	$oopath/soffice "$@"
-	;;
-	*)
-	$oopath/$program "$@"
-	;;
-esac
diff --git a/editors/openoffice.org-2.0-devel/files/optpatch-freetype b/editors/openoffice.org-2.0-devel/files/optpatch-freetype
deleted file mode 100644
index 775caad705c2..000000000000
--- a/editors/openoffice.org-2.0-devel/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_BYTECODE_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.0-devel/files/patch-i65514 b/editors/openoffice.org-2.0-devel/files/patch-i65514
deleted file mode 100644
index 8589161a0290..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-i65514
+++ /dev/null
@@ -1,145 +0,0 @@
-Index: berkeleydb/db-4.2.52.patch
-===================================================================
-RCS file: /cvs/external/berkeleydb/db-4.2.52.patch,v
-retrieving revision 1.13
-diff -u -r1.13 db-4.2.52.patch
---- berkeleydb/db-4.2.52.patch	25 Jul 2006 10:23:22 -0000	1.13
-+++ berkeleydb/db-4.2.52.patch	29 Jul 2006 11:01:12 -0000
-@@ -518,6 +518,20 @@
-   emode=	555
-   fmode=	444
-   
-+*** misc/db-4.2.52.NC/dist/config.hin	Wed Dec  3 16:10:00 2003
-+--- misc/build/db-4.2.52.NC/dist/config.hin	Fri May 19 17:37:41 2006
-+***************
-+*** 193,198 ****
-+--- 193,201 ----
-+  /* Define to 1 to use the GCC compiler and x86 assembly language mutexes. */
-+  #undef HAVE_MUTEX_X86_GCC_ASSEMBLY
-+  
-++ /* Define to 1 to use the GCC compiler and x86-64 assembly language mutexes. */
-++ #undef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
-++ 
-+  /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-+  #undef HAVE_NDIR_H
-+  
- *** misc/db-4.2.52.NC/dist/configure	Wed Dec  3 22:10:02 2003
- --- misc/build/db-4.2.52.NC/dist/configure	Tue Jul 25 09:05:20 2006
- ***************
-@@ -554,6 +568,76 @@
-     fi
-   
-     # Commands to make compiler produce verbose output that lists
-+***************
-+*** 28556,28561 ****
-+--- 28556,28606 ----
-+  rm -f conftest.$ac_objext conftest.$ac_ext
-+  fi
-+  
-++ # x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux
-++ if test "$db_cv_mutex" = no; then
-++ cat >conftest.$ac_ext <<_ACEOF
-++ #line $LINENO "configure"
-++ /* confdefs.h.  */
-++ _ACEOF
-++ cat confdefs.h >>conftest.$ac_ext
-++ cat >>conftest.$ac_ext <<_ACEOF
-++ /* end confdefs.h.  */
-++ 
-++ int
-++ main ()
-++ {
-++ 
-++ #if (defined(__amd64__) || defined(__x86_64__)) && defined(__GNUC__)
-++ 	exit(0);
-++ #else
-++ 	FAIL TO COMPILE/LINK
-++ #endif
-++ 
-++   ;
-++   return 0;
-++ }
-++ _ACEOF
-++ rm -f conftest.$ac_objext
-++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-++   (eval $ac_compile) 2>&5
-++   ac_status=$?
-++   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } &&
-++          { ac_try='test -s conftest.$ac_objext'
-++   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-++   (eval $ac_try) 2>&5
-++   ac_status=$?
-++   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); }; }; then
-++   db_cv_mutex="x86_64/gcc-assembly"
-++ else
-++   echo "$as_me: failed program was:" >&5
-++ sed 's/^/| /' conftest.$ac_ext >&5
-++ 
-++ fi
-++ rm -f conftest.$ac_objext conftest.$ac_ext
-++ fi
-++ 
-+  # S390/cc: IBM OS/390 Unix
-+  if test "$db_cv_mutex" = no; then
-+  cat >conftest.$ac_ext <<_ACEOF
-+***************
-+*** 28971,28976 ****
-+--- 29016,29028 ----
-+  x86/gcc-assembly)	ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
-+  			cat >>confdefs.h <<\_ACEOF
-+  #define HAVE_MUTEX_X86_GCC_ASSEMBLY 1
-++ _ACEOF
-++ 
-++ 
-++ ;;
-++ x86_64/gcc-assembly)	ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
-++ 			cat >>confdefs.h <<\_ACEOF
-++ #define HAVE_MUTEX_X86_64_GCC_ASSEMBLY 1
-+  _ACEOF
-+  
-+  
- *** misc/db-4.2.52.NC/dist/ltmain.sh	Sat Apr 26 19:45:37 2003
- --- misc/build/db-4.2.52.NC/dist/ltmain.sh	Tue Jul 25 09:05:20 2006
- ***************
-@@ -1010,3 +1094,39 @@
- ! 			$(SLO)$/xa_map.obj
- ! 
- ! .INCLUDE :  target.mk
-+*** misc/db-4.2.52.NC/dbinc/mutex.h	Sat Sep 20 17:40:49 2003
-+--- misc/build/db-4.2.52.NC/dbinc/mutex.h	Fri May 19 12:43:58 2006
-+***************
-+*** 781,786 ****
-+--- 781,811 ----
-+  #endif
-+  #endif
-+  
-++ /*********************************************************************
-++  * x86_64/gcc assembly.
-++  *********************************************************************/
-++ #ifdef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
-++ typedef unsigned char tsl_t;
-++ 
-++ #ifdef LOAD_ACTUAL_MUTEX_CODE
-++ /*
-++  * For gcc/x86-64, 0 is clear, 1 is set.
-++  */
-++ #define	MUTEX_SET(tsl) ({						\
-++ 	register tsl_t *__l = (tsl);					\
-++ 	int __r;							\
-++ 	asm volatile("movq $1,%%rax; lock; xchgb %1,%%al; xorq $1,%%rax"\
-++ 	    : "=&a" (__r), "=m" (*__l)					\
-++ 	    : "1" (*__l)						\
-++ 	    );								\
-++ 	__r & 1;							\
-++ })
-++ 
-++ #define	MUTEX_UNSET(tsl)	(*(tsl) = 0)
-++ #define	MUTEX_INIT(tsl)		MUTEX_UNSET(tsl)
-++ #endif
-++ #endif
-++ 
-+  /*
-+   * Mutex alignment defaults to one byte.
-+   *
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i66666 b/editors/openoffice.org-2.0-devel/files/patch-i66666
deleted file mode 100644
index 11b05eaf0815..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-i66666
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: tools/inc/solar.h
-===================================================================
-RCS file: /cvs/util/tools/inc/solar.h,v
-retrieving revision 1.44
-diff -u -r1.44 solar.h
---- tools/inc/solar.h	26 Apr 2006 20:42:59 -0000	1.44
-+++ tools/inc/solar.h	23 Jun 2006 13:32:04 -0000
-@@ -55,9 +55,6 @@
- #define FALSE		0
- #endif
- 
--#undef NULL
--#define NULL		0
--
- #ifdef _SOLAR__PRIVATE
- #undef _SOLAR__PRIVATE
- #endif
-
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i66667 b/editors/openoffice.org-2.0-devel/files/patch-i66667
deleted file mode 100644
index 26c0b1b4a88c..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-i66667
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: vcl/unx/gtk/app/gtkinst.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
-retrieving revision 1.14
-diff -u -r1.14 gtkinst.cxx
---- vcl/unx/gtk/app/gtkinst.cxx	19 Jun 2006 19:44:33 -0000	1.14
-+++ vcl/unx/gtk/app/gtkinst.cxx	27 Jun 2006 02:11:09 -0000
-@@ -43,6 +43,7 @@
- #include <plugins/gtk/atkbridge.hxx>
- 
- #include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
- 
- #if OSL_DEBUG_LEVEL > 1
- #include <stdio.h>
-@@ -111,13 +112,27 @@
- 		GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
- 		pYieldMutex->ThreadsLeave();
- 	}
--	static bool hookLocks( oslModule pModule )
-+	static bool hookLocks( void )
- 	{
--		typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
-+		typedef void (*GdkLockFn) ( GCallback enter_fn, GCallback leave_fn );
- 		rtl::OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM( "gdk_threads_set_lock_functions") );
- 
-+		/* XXX GDK library path should be set by configure. */
-+		OUStringBuffer aModName( 128 );
-+		aModName.appendAscii( SAL_DLLPREFIX"gdk-x11-2.0" );
-+		aModName.appendAscii( SAL_DLLEXTENSION );
-+		OUString aModule = aModName.makeStringAndClear();
-+		oslModule aMod = osl_loadModule( aModule.pData, SAL_LOADMODULE_DEFAULT );
-+
-+		if ( !aMod )
-+		{
-+#if OSL_DEBUG_LEVEL > 1
-+		    fprintf( stderr, "Failed to load "SAL_DLLPREFIX"gdk-x11-2.0"SAL_DLLEXTENSION"\n" );
-+#endif
-+			return false;
-+		}
- 		GdkLockFn gdk_threads_set_lock_functions =
--				(GdkLockFn) osl_getFunctionSymbol( pModule, aSymbolName.pData );
-+				(GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
- 		if ( !gdk_threads_set_lock_functions )
- 		{
- #if OSL_DEBUG_LEVEL > 1
-@@ -150,7 +165,7 @@
- 		if ( !g_thread_supported() )
- 			g_thread_init( NULL );
- 
--		if ( hookLocks( pModule ) )
-+		if ( hookLocks() )
- 			pYieldMutex = new GtkHookedYieldMutex();
- 		else
- 			pYieldMutex = new GtkYieldMutex();
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i67904 b/editors/openoffice.org-2.0-devel/files/patch-i67904
deleted file mode 100644
index d2fb32236151..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-i67904
+++ /dev/null
@@ -1,80 +0,0 @@
-Index: sal/osl/unx/socket.c
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/socket.c,v
-retrieving revision 1.26
-diff -u -r1.26 socket.c
---- sal/osl/unx/socket.c	19 Jul 2006 09:39:22 -0000	1.26
-+++ sal/osl/unx/socket.c	29 Jul 2006 09:53:04 -0000
-@@ -813,7 +813,7 @@
- 	const char *name, struct hostent *result,
- 	char *buffer, int buflen, int *h_errnop)
- {
--#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 700015))
-+#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103))
- 	struct hostent *__result; /* will be the same as result */
- 	int __error;
- 	__error = gethostbyname_r (name, result, buffer, buflen,
-Index: sal/osl/unx/system.c
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/system.c,v
-retrieving revision 1.13
-diff -u -r1.13 system.c
---- sal/osl/unx/system.c	19 Jul 2006 09:39:37 -0000	1.13
-+++ sal/osl/unx/system.c	9 Sep 2006 09:57:26 -0000
-@@ -343,7 +343,7 @@
- }
- #endif /* defined SCO */
- 
--#if !defined(FREEBSD) || (__FreeBSD_version < 700015)
-+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
- 
- extern int h_errno;
- 
-@@ -435,7 +435,7 @@
- 
-   	return res;
- }
--#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
-+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
- 
- #if defined(MACOSX)
- /*
-
-Index: sal/osl/unx/system.h
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/system.h,v
-retrieving revision 1.33
-diff -u -r1.33 system.h
---- sal/osl/unx/system.h	19 Jul 2006 09:39:50 -0000	1.33
-+++ sal/osl/unx/system.h	9 Sep 2006 09:55:55 -0000
-@@ -537,10 +537,10 @@
- struct tm *localtime_r(const time_t *timep, struct tm *buffer);
- struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
- #endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
--#if !defined(FREEBSD) || (__FreeBSD_version < 700015)
-+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
- struct hostent *gethostbyname_r(const char *name, struct hostent *result,
- 								char *buffer, int buflen, int *h_errnop);
--#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
-+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
- #endif
- 
- #endif /* __OSL_SYSTEM_H__ */
-
-Index: moz/mozilla-source-1.7.5.patch
-===================================================================
-RCS file: /cvs/external/moz/mozilla-source-1.7.5.patch,v
-retrieving revision 1.11
-diff -u -r1.11 mozilla-source-1.7.5.patch
---- moz/mozilla-source-1.7.5.patch	19 Jul 2006 09:37:17 -0000	1.11
-+++ moz/mozilla-source-1.7.5.patch	29 Jul 2006 09:53:10 -0000
-@@ -7705,7 +7705,7 @@
-  
- -#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
- +#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \
--+	(defined(__FreeBSD__) && __FreeBSD_version > 700016)
-++	(defined(__FreeBSD__) && __FreeBSD_version > 601103)
-  #define _PR_HAVE_GETPROTO_R
-  #define _PR_HAVE_5_ARG_GETPROTO_R
-  #endif
-
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i69418 b/editors/openoffice.org-2.0-devel/files/patch-i69418
deleted file mode 100644
index dd23c55e4c9b..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-i69418
+++ /dev/null
@@ -1,38 +0,0 @@
---- moz/mozilla-source-1.7.5.patch.org	Sat Sep  9 18:43:45 2006
-+++ moz/mozilla-source-1.7.5.patch	Sat Sep  9 18:42:00 2006
-@@ -151,6 +151,17 @@
-          AR_EXTRACT="$AR x"
-          AR_DELETE="$AR d"
- ***************
-+*** 7504,7509 ****
-+--- 7504,7511 ----
-+  case $target in
-+  *-hpux11.*)
-+  	;;
-++ *-freebsd*)
-++ 	;;
-+  *)
-+  	echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6
-+  echo "configure:7510: checking for gethostbyname_r in -lc_r" >&5
-+***************
- *** 16606,16613 ****
-   
-   case "$host_os" in
-@@ -191,6 +202,17 @@
-          AR_EXTRACT="$AR x"
-          AR_DELETE="$AR d"
- ***************
-+*** 1981,1986 ****
-+--- 1981,1988 ----
-+  case $target in
-+  *-hpux11.*)
-+  	;;
-++ *-freebsd*)
-++ 	;;
-+  *)
-+  	AC_CHECK_LIB(c_r, gethostbyname_r)
-+  	;;
-+***************
- *** 5692,5699 ****
-   dnl ========================================================
-   case "$host_os" in
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i69994 b/editors/openoffice.org-2.0-devel/files/patch-i69994
deleted file mode 100644
index 9d2718b4763c..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-i69994
+++ /dev/null
@@ -1,747 +0,0 @@
-Index: python/Python-2.3.4.patch
-===================================================================
-RCS file: /cvs/external/python/Python-2.3.4.patch,v
-retrieving revision 1.12
-diff -u -r1.12 Python-2.3.4.patch
---- python/Python-2.3.4.patch	25 Sep 2006 13:22:02 -0000	1.12
-+++ python/Python-2.3.4.patch	29 Sep 2006 22:06:08 -0000
-@@ -13463,3 +13463,739 @@
-   	handler = signal(sig, SIG_IGN);
-   	signal(sig, handler);
-   	return handler;
-+*** misc/Python-2.3.4/Lib/plat-freebsd6/IN.py	Tue Aug  9 06:26:23 2005
-+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/IN.py	Tue Aug  9 06:20:25 2005
-+***************
-+*** 0 ****
-+--- 1,355 ----
-++ # Generated by h2py from /usr/include/netinet/in.h
-++ IPPROTO_IP = 0
-++ IPPROTO_HOPOPTS = 0
-++ IPPROTO_ICMP = 1
-++ IPPROTO_IGMP = 2
-++ IPPROTO_GGP = 3
-++ IPPROTO_IPV4 = 4
-++ IPPROTO_IPIP = IPPROTO_IPV4
-++ IPPROTO_TCP = 6
-++ IPPROTO_ST = 7
-++ IPPROTO_EGP = 8
-++ IPPROTO_PIGP = 9
-++ IPPROTO_RCCMON = 10
-++ IPPROTO_NVPII = 11
-++ IPPROTO_PUP = 12
-++ IPPROTO_ARGUS = 13
-++ IPPROTO_EMCON = 14
-++ IPPROTO_XNET = 15
-++ IPPROTO_CHAOS = 16
-++ IPPROTO_UDP = 17
-++ IPPROTO_MUX = 18
-++ IPPROTO_MEAS = 19
-++ IPPROTO_HMP = 20
-++ IPPROTO_PRM = 21
-++ IPPROTO_IDP = 22
-++ IPPROTO_TRUNK1 = 23
-++ IPPROTO_TRUNK2 = 24
-++ IPPROTO_LEAF1 = 25
-++ IPPROTO_LEAF2 = 26
-++ IPPROTO_RDP = 27
-++ IPPROTO_IRTP = 28
-++ IPPROTO_TP = 29
-++ IPPROTO_BLT = 30
-++ IPPROTO_NSP = 31
-++ IPPROTO_INP = 32
-++ IPPROTO_SEP = 33
-++ IPPROTO_3PC = 34
-++ IPPROTO_IDPR = 35
-++ IPPROTO_XTP = 36
-++ IPPROTO_DDP = 37
-++ IPPROTO_CMTP = 38
-++ IPPROTO_TPXX = 39
-++ IPPROTO_IL = 40
-++ IPPROTO_IPV6 = 41
-++ IPPROTO_SDRP = 42
-++ IPPROTO_ROUTING = 43
-++ IPPROTO_FRAGMENT = 44
-++ IPPROTO_IDRP = 45
-++ IPPROTO_RSVP = 46
-++ IPPROTO_GRE = 47
-++ IPPROTO_MHRP = 48
-++ IPPROTO_BHA = 49
-++ IPPROTO_ESP = 50
-++ IPPROTO_AH = 51
-++ IPPROTO_INLSP = 52
-++ IPPROTO_SWIPE = 53
-++ IPPROTO_NHRP = 54
-++ IPPROTO_ICMPV6 = 58
-++ IPPROTO_NONE = 59
-++ IPPROTO_DSTOPTS = 60
-++ IPPROTO_AHIP = 61
-++ IPPROTO_CFTP = 62
-++ IPPROTO_HELLO = 63
-++ IPPROTO_SATEXPAK = 64
-++ IPPROTO_KRYPTOLAN = 65
-++ IPPROTO_RVD = 66
-++ IPPROTO_IPPC = 67
-++ IPPROTO_ADFS = 68
-++ IPPROTO_SATMON = 69
-++ IPPROTO_VISA = 70
-++ IPPROTO_IPCV = 71
-++ IPPROTO_CPNX = 72
-++ IPPROTO_CPHB = 73
-++ IPPROTO_WSN = 74
-++ IPPROTO_PVP = 75
-++ IPPROTO_BRSATMON = 76
-++ IPPROTO_ND = 77
-++ IPPROTO_WBMON = 78
-++ IPPROTO_WBEXPAK = 79
-++ IPPROTO_EON = 80
-++ IPPROTO_VMTP = 81
-++ IPPROTO_SVMTP = 82
-++ IPPROTO_VINES = 83
-++ IPPROTO_TTP = 84
-++ IPPROTO_IGP = 85
-++ IPPROTO_DGP = 86
-++ IPPROTO_TCF = 87
-++ IPPROTO_IGRP = 88
-++ IPPROTO_OSPFIGP = 89
-++ IPPROTO_SRPC = 90
-++ IPPROTO_LARP = 91
-++ IPPROTO_MTP = 92
-++ IPPROTO_AX25 = 93
-++ IPPROTO_IPEIP = 94
-++ IPPROTO_MICP = 95
-++ IPPROTO_SCCSP = 96
-++ IPPROTO_ETHERIP = 97
-++ IPPROTO_ENCAP = 98
-++ IPPROTO_APES = 99
-++ IPPROTO_GMTP = 100
-++ IPPROTO_IPCOMP = 108
-++ IPPROTO_PIM = 103
-++ IPPROTO_PGM = 113
-++ IPPROTO_DIVERT = 254
-++ IPPROTO_RAW = 255
-++ IPPROTO_MAX = 256
-++ IPPROTO_DONE = 257
-++ IPPORT_RESERVED = 1024
-++ IPPORT_USERRESERVED = 5000
-++ IPPORT_HIFIRSTAUTO = 49152
-++ IPPORT_HILASTAUTO = 65535
-++ IPPORT_RESERVEDSTART = 600
-++ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0)
-++ 
-++ IN_CLASSA_NET = 0xff000000
-++ IN_CLASSA_NSHIFT = 24
-++ IN_CLASSA_HOST = 0x00ffffff
-++ IN_CLASSA_MAX = 128
-++ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000)
-++ 
-++ IN_CLASSB_NET = 0xffff0000
-++ IN_CLASSB_NSHIFT = 16
-++ IN_CLASSB_HOST = 0x0000ffff
-++ IN_CLASSB_MAX = 65536
-++ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
-++ 
-++ IN_CLASSC_NET = 0xffffff00
-++ IN_CLASSC_NSHIFT = 8
-++ IN_CLASSC_HOST = 0x000000ff
-++ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
-++ 
-++ IN_CLASSD_NET = 0xf0000000
-++ IN_CLASSD_NSHIFT = 28
-++ IN_CLASSD_HOST = 0x0fffffff
-++ def IN_MULTICAST(i): return IN_CLASSD(i)
-++ 
-++ def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
-++ 
-++ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
-++ 
-++ INADDR_NONE = 0xffffffff
-++ IN_LOOPBACKNET = 127
-++ INET_ADDRSTRLEN = 16
-++ IP_OPTIONS = 1
-++ IP_HDRINCL = 2
-++ IP_TOS = 3
-++ IP_TTL = 4
-++ IP_RECVOPTS = 5
-++ IP_RECVRETOPTS = 6
-++ IP_RECVDSTADDR = 7
-++ IP_RETOPTS = 8
-++ IP_MULTICAST_IF = 9
-++ IP_MULTICAST_TTL = 10
-++ IP_MULTICAST_LOOP = 11
-++ IP_ADD_MEMBERSHIP = 12
-++ IP_DROP_MEMBERSHIP = 13
-++ IP_MULTICAST_VIF = 14
-++ IP_RSVP_ON = 15
-++ IP_RSVP_OFF = 16
-++ IP_RSVP_VIF_ON = 17
-++ IP_RSVP_VIF_OFF = 18
-++ IP_PORTRANGE = 19
-++ IP_RECVIF = 20
-++ IP_IPSEC_POLICY = 21
-++ IP_FAITH = 22
-++ IP_FW_ADD = 50
-++ IP_FW_DEL = 51
-++ IP_FW_FLUSH = 52
-++ IP_FW_ZERO = 53
-++ IP_FW_GET = 54
-++ IP_FW_RESETLOG = 55
-++ IP_DUMMYNET_CONFIGURE = 60
-++ IP_DUMMYNET_DEL = 61
-++ IP_DUMMYNET_FLUSH = 62
-++ IP_DUMMYNET_GET = 64
-++ IP_DEFAULT_MULTICAST_TTL = 1
-++ IP_DEFAULT_MULTICAST_LOOP = 1
-++ IP_MAX_MEMBERSHIPS = 20
-++ IP_PORTRANGE_DEFAULT = 0
-++ IP_PORTRANGE_HIGH = 1
-++ IP_PORTRANGE_LOW = 2
-++ IPPROTO_MAXID = (IPPROTO_AH + 1)
-++ IPCTL_FORWARDING = 1
-++ IPCTL_SENDREDIRECTS = 2
-++ IPCTL_DEFTTL = 3
-++ IPCTL_DEFMTU = 4
-++ IPCTL_RTEXPIRE = 5
-++ IPCTL_RTMINEXPIRE = 6
-++ IPCTL_RTMAXCACHE = 7
-++ IPCTL_SOURCEROUTE = 8
-++ IPCTL_DIRECTEDBROADCAST = 9
-++ IPCTL_INTRQMAXLEN = 10
-++ IPCTL_INTRQDROPS = 11
-++ IPCTL_STATS = 12
-++ IPCTL_ACCEPTSOURCEROUTE = 13
-++ IPCTL_FASTFORWARDING = 14
-++ IPCTL_KEEPFAITH = 15
-++ IPCTL_GIF_TTL = 16
-++ IPCTL_MAXID = 17
-++ 
-++ # Included from netinet6/in6.h
-++ 
-++ # Included from sys/queue.h
-++ def SLIST_HEAD_INITIALIZER(head): return \
-++ 
-++ def SLIST_ENTRY(type): return \
-++ 
-++ def STAILQ_HEAD_INITIALIZER(head): return \
-++ 
-++ def STAILQ_ENTRY(type): return \
-++ 
-++ def LIST_HEAD_INITIALIZER(head): return \
-++ 
-++ def LIST_ENTRY(type): return \
-++ 
-++ def TAILQ_HEAD_INITIALIZER(head): return \
-++ 
-++ def TAILQ_ENTRY(type): return \
-++ 
-++ def CIRCLEQ_ENTRY(type): return \
-++ 
-++ __KAME_VERSION = "20000701/FreeBSD-current"
-++ IPV6PORT_RESERVED = 1024
-++ IPV6PORT_ANONMIN = 49152
-++ IPV6PORT_ANONMAX = 65535
-++ IPV6PORT_RESERVEDMIN = 600
-++ IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1)
-++ INET6_ADDRSTRLEN = 46
-++ IPV6_ADDR_INT32_ONE = 1
-++ IPV6_ADDR_INT32_TWO = 2
-++ IPV6_ADDR_INT32_MNL = 0xff010000
-++ IPV6_ADDR_INT32_MLL = 0xff020000
-++ IPV6_ADDR_INT32_SMP = 0x0000ffff
-++ IPV6_ADDR_INT16_ULL = 0xfe80
-++ IPV6_ADDR_INT16_USL = 0xfec0
-++ IPV6_ADDR_INT16_MLL = 0xff02
-++ IPV6_ADDR_INT32_ONE = 0x01000000
-++ IPV6_ADDR_INT32_TWO = 0x02000000
-++ IPV6_ADDR_INT32_MNL = 0x000001ff
-++ IPV6_ADDR_INT32_MLL = 0x000002ff
-++ IPV6_ADDR_INT32_SMP = 0xffff0000
-++ IPV6_ADDR_INT16_ULL = 0x80fe
-++ IPV6_ADDR_INT16_USL = 0xc0fe
-++ IPV6_ADDR_INT16_MLL = 0x02ff
-++ def IN6_IS_ADDR_UNSPECIFIED(a): return \
-++ 
-++ def IN6_IS_ADDR_LOOPBACK(a): return \
-++ 
-++ def IN6_IS_ADDR_V4COMPAT(a): return \
-++ 
-++ def IN6_IS_ADDR_V4MAPPED(a): return \
-++ 
-++ IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-++ IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-++ IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-++ IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-++ IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-++ __IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-++ __IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-++ __IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-++ __IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-++ __IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-++ def IN6_IS_ADDR_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_GLOBAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_GLOBAL(a): return \
-++ 
-++ def IN6_IS_SCOPE_LINKLOCAL(a): return \
-++ 
-++ IPV6_OPTIONS = 1
-++ IPV6_RECVOPTS = 5
-++ IPV6_RECVRETOPTS = 6
-++ IPV6_RECVDSTADDR = 7
-++ IPV6_RETOPTS = 8
-++ IPV6_SOCKOPT_RESERVED1 = 3
-++ IPV6_UNICAST_HOPS = 4
-++ IPV6_MULTICAST_IF = 9
-++ IPV6_MULTICAST_HOPS = 10
-++ IPV6_MULTICAST_LOOP = 11
-++ IPV6_JOIN_GROUP = 12
-++ IPV6_LEAVE_GROUP = 13
-++ IPV6_PORTRANGE = 14
-++ ICMP6_FILTER = 18
-++ IPV6_PKTINFO = 19
-++ IPV6_HOPLIMIT = 20
-++ IPV6_NEXTHOP = 21
-++ IPV6_HOPOPTS = 22
-++ IPV6_DSTOPTS = 23
-++ IPV6_RTHDR = 24
-++ IPV6_PKTOPTIONS = 25
-++ IPV6_CHECKSUM = 26
-++ IPV6_BINDV6ONLY = 27
-++ IPV6_IPSEC_POLICY = 28
-++ IPV6_FAITH = 29
-++ IPV6_FW_ADD = 30
-++ IPV6_FW_DEL = 31
-++ IPV6_FW_FLUSH = 32
-++ IPV6_FW_ZERO = 33
-++ IPV6_FW_GET = 34
-++ IPV6_RTHDR_LOOSE = 0
-++ IPV6_RTHDR_STRICT = 1
-++ IPV6_RTHDR_TYPE_0 = 0
-++ IPV6_DEFAULT_MULTICAST_HOPS = 1
-++ IPV6_DEFAULT_MULTICAST_LOOP = 1
-++ IPV6_PORTRANGE_DEFAULT = 0
-++ IPV6_PORTRANGE_HIGH = 1
-++ IPV6_PORTRANGE_LOW = 2
-++ IPV6PROTO_MAXID = (IPPROTO_PIM + 1)
-++ IPV6CTL_FORWARDING = 1
-++ IPV6CTL_SENDREDIRECTS = 2
-++ IPV6CTL_DEFHLIM = 3
-++ IPV6CTL_DEFMTU = 4
-++ IPV6CTL_FORWSRCRT = 5
-++ IPV6CTL_STATS = 6
-++ IPV6CTL_MRTSTATS = 7
-++ IPV6CTL_MRTPROTO = 8
-++ IPV6CTL_MAXFRAGPACKETS = 9
-++ IPV6CTL_SOURCECHECK = 10
-++ IPV6CTL_SOURCECHECK_LOGINT = 11
-++ IPV6CTL_ACCEPT_RTADV = 12
-++ IPV6CTL_KEEPFAITH = 13
-++ IPV6CTL_LOG_INTERVAL = 14
-++ IPV6CTL_HDRNESTLIMIT = 15
-++ IPV6CTL_DAD_COUNT = 16
-++ IPV6CTL_AUTO_FLOWLABEL = 17
-++ IPV6CTL_DEFMCASTHLIM = 18
-++ IPV6CTL_GIF_HLIM = 19
-++ IPV6CTL_KAME_VERSION = 20
-++ IPV6CTL_USE_DEPRECATED = 21
-++ IPV6CTL_RR_PRUNE = 22
-++ IPV6CTL_MAPPED_ADDR = 23
-++ IPV6CTL_BINDV6ONLY = 24
-++ IPV6CTL_RTEXPIRE = 25
-++ IPV6CTL_RTMINEXPIRE = 26
-++ IPV6CTL_RTMAXCACHE = 27
-++ IPV6CTL_MAXID = 28
-+*** misc/Python-2.3.4/Lib/plat-freebsd6/regen	Tue Aug  9 06:26:27 2005
-+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/regen	Tue Aug  9 06:19:02 2005
-+***************
-+*** 0 ****
-+--- 1,3 ----
-++ #! /bin/sh
-++ set -v
-++ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
-+*** misc/Python-2.3.4/Lib/plat-freebsd7/IN.py	Tue Aug  9 06:26:23 2005
-+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/IN.py	Tue Aug  9 06:20:25 2005
-+***************
-+*** 0 ****
-+--- 1,355 ----
-++ # Generated by h2py from /usr/include/netinet/in.h
-++ IPPROTO_IP = 0
-++ IPPROTO_HOPOPTS = 0
-++ IPPROTO_ICMP = 1
-++ IPPROTO_IGMP = 2
-++ IPPROTO_GGP = 3
-++ IPPROTO_IPV4 = 4
-++ IPPROTO_IPIP = IPPROTO_IPV4
-++ IPPROTO_TCP = 6
-++ IPPROTO_ST = 7
-++ IPPROTO_EGP = 8
-++ IPPROTO_PIGP = 9
-++ IPPROTO_RCCMON = 10
-++ IPPROTO_NVPII = 11
-++ IPPROTO_PUP = 12
-++ IPPROTO_ARGUS = 13
-++ IPPROTO_EMCON = 14
-++ IPPROTO_XNET = 15
-++ IPPROTO_CHAOS = 16
-++ IPPROTO_UDP = 17
-++ IPPROTO_MUX = 18
-++ IPPROTO_MEAS = 19
-++ IPPROTO_HMP = 20
-++ IPPROTO_PRM = 21
-++ IPPROTO_IDP = 22
-++ IPPROTO_TRUNK1 = 23
-++ IPPROTO_TRUNK2 = 24
-++ IPPROTO_LEAF1 = 25
-++ IPPROTO_LEAF2 = 26
-++ IPPROTO_RDP = 27
-++ IPPROTO_IRTP = 28
-++ IPPROTO_TP = 29
-++ IPPROTO_BLT = 30
-++ IPPROTO_NSP = 31
-++ IPPROTO_INP = 32
-++ IPPROTO_SEP = 33
-++ IPPROTO_3PC = 34
-++ IPPROTO_IDPR = 35
-++ IPPROTO_XTP = 36
-++ IPPROTO_DDP = 37
-++ IPPROTO_CMTP = 38
-++ IPPROTO_TPXX = 39
-++ IPPROTO_IL = 40
-++ IPPROTO_IPV6 = 41
-++ IPPROTO_SDRP = 42
-++ IPPROTO_ROUTING = 43
-++ IPPROTO_FRAGMENT = 44
-++ IPPROTO_IDRP = 45
-++ IPPROTO_RSVP = 46
-++ IPPROTO_GRE = 47
-++ IPPROTO_MHRP = 48
-++ IPPROTO_BHA = 49
-++ IPPROTO_ESP = 50
-++ IPPROTO_AH = 51
-++ IPPROTO_INLSP = 52
-++ IPPROTO_SWIPE = 53
-++ IPPROTO_NHRP = 54
-++ IPPROTO_ICMPV6 = 58
-++ IPPROTO_NONE = 59
-++ IPPROTO_DSTOPTS = 60
-++ IPPROTO_AHIP = 61
-++ IPPROTO_CFTP = 62
-++ IPPROTO_HELLO = 63
-++ IPPROTO_SATEXPAK = 64
-++ IPPROTO_KRYPTOLAN = 65
-++ IPPROTO_RVD = 66
-++ IPPROTO_IPPC = 67
-++ IPPROTO_ADFS = 68
-++ IPPROTO_SATMON = 69
-++ IPPROTO_VISA = 70
-++ IPPROTO_IPCV = 71
-++ IPPROTO_CPNX = 72
-++ IPPROTO_CPHB = 73
-++ IPPROTO_WSN = 74
-++ IPPROTO_PVP = 75
-++ IPPROTO_BRSATMON = 76
-++ IPPROTO_ND = 77
-++ IPPROTO_WBMON = 78
-++ IPPROTO_WBEXPAK = 79
-++ IPPROTO_EON = 80
-++ IPPROTO_VMTP = 81
-++ IPPROTO_SVMTP = 82
-++ IPPROTO_VINES = 83
-++ IPPROTO_TTP = 84
-++ IPPROTO_IGP = 85
-++ IPPROTO_DGP = 86
-++ IPPROTO_TCF = 87
-++ IPPROTO_IGRP = 88
-++ IPPROTO_OSPFIGP = 89
-++ IPPROTO_SRPC = 90
-++ IPPROTO_LARP = 91
-++ IPPROTO_MTP = 92
-++ IPPROTO_AX25 = 93
-++ IPPROTO_IPEIP = 94
-++ IPPROTO_MICP = 95
-++ IPPROTO_SCCSP = 96
-++ IPPROTO_ETHERIP = 97
-++ IPPROTO_ENCAP = 98
-++ IPPROTO_APES = 99
-++ IPPROTO_GMTP = 100
-++ IPPROTO_IPCOMP = 108
-++ IPPROTO_PIM = 103
-++ IPPROTO_PGM = 113
-++ IPPROTO_DIVERT = 254
-++ IPPROTO_RAW = 255
-++ IPPROTO_MAX = 256
-++ IPPROTO_DONE = 257
-++ IPPORT_RESERVED = 1024
-++ IPPORT_USERRESERVED = 5000
-++ IPPORT_HIFIRSTAUTO = 49152
-++ IPPORT_HILASTAUTO = 65535
-++ IPPORT_RESERVEDSTART = 600
-++ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0)
-++ 
-++ IN_CLASSA_NET = 0xff000000
-++ IN_CLASSA_NSHIFT = 24
-++ IN_CLASSA_HOST = 0x00ffffff
-++ IN_CLASSA_MAX = 128
-++ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000)
-++ 
-++ IN_CLASSB_NET = 0xffff0000
-++ IN_CLASSB_NSHIFT = 16
-++ IN_CLASSB_HOST = 0x0000ffff
-++ IN_CLASSB_MAX = 65536
-++ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
-++ 
-++ IN_CLASSC_NET = 0xffffff00
-++ IN_CLASSC_NSHIFT = 8
-++ IN_CLASSC_HOST = 0x000000ff
-++ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
-++ 
-++ IN_CLASSD_NET = 0xf0000000
-++ IN_CLASSD_NSHIFT = 28
-++ IN_CLASSD_HOST = 0x0fffffff
-++ def IN_MULTICAST(i): return IN_CLASSD(i)
-++ 
-++ def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
-++ 
-++ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
-++ 
-++ INADDR_NONE = 0xffffffff
-++ IN_LOOPBACKNET = 127
-++ INET_ADDRSTRLEN = 16
-++ IP_OPTIONS = 1
-++ IP_HDRINCL = 2
-++ IP_TOS = 3
-++ IP_TTL = 4
-++ IP_RECVOPTS = 5
-++ IP_RECVRETOPTS = 6
-++ IP_RECVDSTADDR = 7
-++ IP_RETOPTS = 8
-++ IP_MULTICAST_IF = 9
-++ IP_MULTICAST_TTL = 10
-++ IP_MULTICAST_LOOP = 11
-++ IP_ADD_MEMBERSHIP = 12
-++ IP_DROP_MEMBERSHIP = 13
-++ IP_MULTICAST_VIF = 14
-++ IP_RSVP_ON = 15
-++ IP_RSVP_OFF = 16
-++ IP_RSVP_VIF_ON = 17
-++ IP_RSVP_VIF_OFF = 18
-++ IP_PORTRANGE = 19
-++ IP_RECVIF = 20
-++ IP_IPSEC_POLICY = 21
-++ IP_FAITH = 22
-++ IP_FW_ADD = 50
-++ IP_FW_DEL = 51
-++ IP_FW_FLUSH = 52
-++ IP_FW_ZERO = 53
-++ IP_FW_GET = 54
-++ IP_FW_RESETLOG = 55
-++ IP_DUMMYNET_CONFIGURE = 60
-++ IP_DUMMYNET_DEL = 61
-++ IP_DUMMYNET_FLUSH = 62
-++ IP_DUMMYNET_GET = 64
-++ IP_DEFAULT_MULTICAST_TTL = 1
-++ IP_DEFAULT_MULTICAST_LOOP = 1
-++ IP_MAX_MEMBERSHIPS = 20
-++ IP_PORTRANGE_DEFAULT = 0
-++ IP_PORTRANGE_HIGH = 1
-++ IP_PORTRANGE_LOW = 2
-++ IPPROTO_MAXID = (IPPROTO_AH + 1)
-++ IPCTL_FORWARDING = 1
-++ IPCTL_SENDREDIRECTS = 2
-++ IPCTL_DEFTTL = 3
-++ IPCTL_DEFMTU = 4
-++ IPCTL_RTEXPIRE = 5
-++ IPCTL_RTMINEXPIRE = 6
-++ IPCTL_RTMAXCACHE = 7
-++ IPCTL_SOURCEROUTE = 8
-++ IPCTL_DIRECTEDBROADCAST = 9
-++ IPCTL_INTRQMAXLEN = 10
-++ IPCTL_INTRQDROPS = 11
-++ IPCTL_STATS = 12
-++ IPCTL_ACCEPTSOURCEROUTE = 13
-++ IPCTL_FASTFORWARDING = 14
-++ IPCTL_KEEPFAITH = 15
-++ IPCTL_GIF_TTL = 16
-++ IPCTL_MAXID = 17
-++ 
-++ # Included from netinet6/in6.h
-++ 
-++ # Included from sys/queue.h
-++ def SLIST_HEAD_INITIALIZER(head): return \
-++ 
-++ def SLIST_ENTRY(type): return \
-++ 
-++ def STAILQ_HEAD_INITIALIZER(head): return \
-++ 
-++ def STAILQ_ENTRY(type): return \
-++ 
-++ def LIST_HEAD_INITIALIZER(head): return \
-++ 
-++ def LIST_ENTRY(type): return \
-++ 
-++ def TAILQ_HEAD_INITIALIZER(head): return \
-++ 
-++ def TAILQ_ENTRY(type): return \
-++ 
-++ def CIRCLEQ_ENTRY(type): return \
-++ 
-++ __KAME_VERSION = "20000701/FreeBSD-current"
-++ IPV6PORT_RESERVED = 1024
-++ IPV6PORT_ANONMIN = 49152
-++ IPV6PORT_ANONMAX = 65535
-++ IPV6PORT_RESERVEDMIN = 600
-++ IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1)
-++ INET6_ADDRSTRLEN = 46
-++ IPV6_ADDR_INT32_ONE = 1
-++ IPV6_ADDR_INT32_TWO = 2
-++ IPV6_ADDR_INT32_MNL = 0xff010000
-++ IPV6_ADDR_INT32_MLL = 0xff020000
-++ IPV6_ADDR_INT32_SMP = 0x0000ffff
-++ IPV6_ADDR_INT16_ULL = 0xfe80
-++ IPV6_ADDR_INT16_USL = 0xfec0
-++ IPV6_ADDR_INT16_MLL = 0xff02
-++ IPV6_ADDR_INT32_ONE = 0x01000000
-++ IPV6_ADDR_INT32_TWO = 0x02000000
-++ IPV6_ADDR_INT32_MNL = 0x000001ff
-++ IPV6_ADDR_INT32_MLL = 0x000002ff
-++ IPV6_ADDR_INT32_SMP = 0xffff0000
-++ IPV6_ADDR_INT16_ULL = 0x80fe
-++ IPV6_ADDR_INT16_USL = 0xc0fe
-++ IPV6_ADDR_INT16_MLL = 0x02ff
-++ def IN6_IS_ADDR_UNSPECIFIED(a): return \
-++ 
-++ def IN6_IS_ADDR_LOOPBACK(a): return \
-++ 
-++ def IN6_IS_ADDR_V4COMPAT(a): return \
-++ 
-++ def IN6_IS_ADDR_V4MAPPED(a): return \
-++ 
-++ IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-++ IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-++ IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-++ IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-++ IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-++ __IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-++ __IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-++ __IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-++ __IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-++ __IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-++ def IN6_IS_ADDR_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_GLOBAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_GLOBAL(a): return \
-++ 
-++ def IN6_IS_SCOPE_LINKLOCAL(a): return \
-++ 
-++ IPV6_OPTIONS = 1
-++ IPV6_RECVOPTS = 5
-++ IPV6_RECVRETOPTS = 6
-++ IPV6_RECVDSTADDR = 7
-++ IPV6_RETOPTS = 8
-++ IPV6_SOCKOPT_RESERVED1 = 3
-++ IPV6_UNICAST_HOPS = 4
-++ IPV6_MULTICAST_IF = 9
-++ IPV6_MULTICAST_HOPS = 10
-++ IPV6_MULTICAST_LOOP = 11
-++ IPV6_JOIN_GROUP = 12
-++ IPV6_LEAVE_GROUP = 13
-++ IPV6_PORTRANGE = 14
-++ ICMP6_FILTER = 18
-++ IPV6_PKTINFO = 19
-++ IPV6_HOPLIMIT = 20
-++ IPV6_NEXTHOP = 21
-++ IPV6_HOPOPTS = 22
-++ IPV6_DSTOPTS = 23
-++ IPV6_RTHDR = 24
-++ IPV6_PKTOPTIONS = 25
-++ IPV6_CHECKSUM = 26
-++ IPV6_BINDV6ONLY = 27
-++ IPV6_IPSEC_POLICY = 28
-++ IPV6_FAITH = 29
-++ IPV6_FW_ADD = 30
-++ IPV6_FW_DEL = 31
-++ IPV6_FW_FLUSH = 32
-++ IPV6_FW_ZERO = 33
-++ IPV6_FW_GET = 34
-++ IPV6_RTHDR_LOOSE = 0
-++ IPV6_RTHDR_STRICT = 1
-++ IPV6_RTHDR_TYPE_0 = 0
-++ IPV6_DEFAULT_MULTICAST_HOPS = 1
-++ IPV6_DEFAULT_MULTICAST_LOOP = 1
-++ IPV6_PORTRANGE_DEFAULT = 0
-++ IPV6_PORTRANGE_HIGH = 1
-++ IPV6_PORTRANGE_LOW = 2
-++ IPV6PROTO_MAXID = (IPPROTO_PIM + 1)
-++ IPV6CTL_FORWARDING = 1
-++ IPV6CTL_SENDREDIRECTS = 2
-++ IPV6CTL_DEFHLIM = 3
-++ IPV6CTL_DEFMTU = 4
-++ IPV6CTL_FORWSRCRT = 5
-++ IPV6CTL_STATS = 6
-++ IPV6CTL_MRTSTATS = 7
-++ IPV6CTL_MRTPROTO = 8
-++ IPV6CTL_MAXFRAGPACKETS = 9
-++ IPV6CTL_SOURCECHECK = 10
-++ IPV6CTL_SOURCECHECK_LOGINT = 11
-++ IPV6CTL_ACCEPT_RTADV = 12
-++ IPV6CTL_KEEPFAITH = 13
-++ IPV6CTL_LOG_INTERVAL = 14
-++ IPV6CTL_HDRNESTLIMIT = 15
-++ IPV6CTL_DAD_COUNT = 16
-++ IPV6CTL_AUTO_FLOWLABEL = 17
-++ IPV6CTL_DEFMCASTHLIM = 18
-++ IPV6CTL_GIF_HLIM = 19
-++ IPV6CTL_KAME_VERSION = 20
-++ IPV6CTL_USE_DEPRECATED = 21
-++ IPV6CTL_RR_PRUNE = 22
-++ IPV6CTL_MAPPED_ADDR = 23
-++ IPV6CTL_BINDV6ONLY = 24
-++ IPV6CTL_RTEXPIRE = 25
-++ IPV6CTL_RTMINEXPIRE = 26
-++ IPV6CTL_RTMAXCACHE = 27
-++ IPV6CTL_MAXID = 28
-+*** misc/Python-2.3.4/Lib/plat-freebsd7/regen	Tue Aug  9 06:26:27 2005
-+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/regen	Tue Aug  9 06:19:02 2005
-+***************
-+*** 0 ****
-+--- 1,3 ----
-++ #! /bin/sh
-++ set -v
-++ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i71039 b/editors/openoffice.org-2.0-devel/files/patch-i71039
deleted file mode 100644
index 8f0897bc862b..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-i71039
+++ /dev/null
@@ -1,34 +0,0 @@
---- binfilter/inc/bf_svx/svdobj.hxx.orig	Mon Oct 23 13:47:55 2006
-+++ binfilter/inc/bf_svx/svdobj.hxx	Mon Oct 23 13:48:08 2006
-@@ -265,7 +265,7 @@
- 	{}
- 	virtual ~SdrObjUserData();
- 
--	virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL;
-+	virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0;
- 	UINT32  GetInventor() const { return nInventor; }
- 	UINT16  GetId() const { return nIdentifier; }
- 	virtual void WriteData(SvStream& rOut);
-
---- svx/inc/svdobj.hxx.orig	Mon Oct 23 12:56:33 2006
-+++ svx/inc/svdobj.hxx	Mon Oct 23 12:56:50 2006
-@@ -323,7 +323,7 @@
- 	{}
- 	virtual ~SdrObjUserData();
- 
--	virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL;
-+	virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0;
- 	UINT32  GetInventor() const { return nInventor; }
- 	UINT16  GetId() const { return nIdentifier; }
- 	//BFS01virtual void WriteData(SvStream& rOut);
---- sc/source/ui/inc/csvcontrol.hxx~	Fri Sep  9 06:17:47 2005
-+++ sc/source/ui/inc/csvcontrol.hxx	Sat Nov  4 08:46:16 2006
-@@ -444,7 +444,7 @@
- 
- protected:
-     /** Derived classes create a new accessible object here. */
--    virtual ScAccessibleCsvControl* ImplCreateAccessible() = NULL;
-+    virtual ScAccessibleCsvControl* ImplCreateAccessible() = 0;
- };
- 
- 
diff --git a/editors/openoffice.org-2.0-devel/files/pkg-message.in b/editors/openoffice.org-2.0-devel/files/pkg-message.in
deleted file mode 100644
index 03a7ca76151e..000000000000
--- a/editors/openoffice.org-2.0-devel/files/pkg-message.in
+++ /dev/null
@@ -1,42 +0,0 @@
-OpenOffice.org Build %%OOOTAG%% Personal Install How-To
-
-Written by:	Martin Blapp <mbr@freebsd.org>
-		and Maho Nakata <maho@FreeBSD.org>
-
-OpenOffice.org %%OOOTAG%% will soon been installed in
-%%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 an installed JDK.
-The setup installs a ".openoffice.org2" folder
-in your homedir.
-
-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
-".openoffice.org2" dir in your homedir. Redo the user
-installation and the problems should go away.
diff --git a/editors/openoffice.org-2.0-devel/pkg-descr b/editors/openoffice.org-2.0-devel/pkg-descr
deleted file mode 100644
index bc2ede1b8c2b..000000000000
--- a/editors/openoffice.org-2.0-devel/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.0-devel/pkg-plist b/editors/openoffice.org-2.0-devel/pkg-plist
deleted file mode 100644
index 28bd78453b52..000000000000
--- a/editors/openoffice.org-2.0-devel/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, do not delete. Package list is generated automatically.
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
deleted file mode 100644
index 6a344450ba04..000000000000
--- a/editors/openoffice.org-2.0/Makefile
+++ /dev/null
@@ -1,292 +0,0 @@
-# New ports collection makefile for: OpenOffice.org
-# Date created:		28 February 2002
-# Whom:                 Martin Blapp
-#
-# $FreeBSD$
-#
-
-PORTNAME?=	openoffice.org
-PORTVERSION?=	${OOOVERSION}
-CATEGORIES+=	editors java
-MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${OOOVERSION}/&,} \
-		http://openoffice.lunarshells.com/sources/ \
-		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
-		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
-		${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
-		http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
-MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	${OOOSRC} unowinreg.dll:unowinreg
-.if defined(WITH_GPC)
-DISTFILES+=     gpc231.tar.Z:gpc
-.endif
-.if defined(WITH_GNUGCJ)
-DISTFILES+=     ${ANT_DISTFILE}:antbin
-.endif
-EXTRACT_ONLY=	${OOOSRC}
-
-MAINTAINER=	openoffice@FreeBSD.org
-COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
-
-OOOVERSION=	2.0.4
-NO_LATEST_LINK=	yes
-USE_GNOME=	gtk20
-MOZILLA_VERSION=	1.7.5
-MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
-.if !defined(WITHOUT_MOZILLA)
-DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
-USE_GNOME+=	libidl
-.endif
-
-.if defined(WITH_KDE)
-USE_KDELIBS_VER=        3
-.endif
-USE_XLIB=	yes
-USE_GMAKE=	yes
-USE_PERL5=	yes
-WITHOUT_CPU_CFLAGS=	true
-
-.if !defined(WITH_GNUGCJ)
-USE_JAVA=	yes
-JAVA_VERSION=	1.4+
-JAVA_BUILD=	jdk
-JAVA_VENDOR=	freebsd bsdjava
-.endif
-
-.include <bsd.port.pre.mk>
-.include <${FILESDIR}/Makefile.localized>
-
-ONLY_FOR_ARCHS=	i386 amd64
-
-.if ${ARCH} == amd64
-GCC_TARGET=		x86_64-portbld-freebsd${OSREL}
-FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
-.else
-GCC_TARGET=		${ARCH}-portbld-freebsd${OSREL}
-FREEBSD_ENV_SET=	FreeBSDIntelEnv.Set
-.endif
-
-.if ${PERL_LEVEL} < 500600
-IGNORE=		install lang/perl5.8 then try again
-.endif
-
-CODELINE=		680
-RELEASE_NR=		2.0
-OOOTAG?=		OOD680_m5
-OOOSRC?=		OOo_2.0.4_src.tar.gz
-INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
-EXECBASE?=		openoffice.org-${OOOVERSION}
-DIST_SUBDIR=		openoffice.org2.0
-SIMPLEOSVER=		${OSREL:C/\.//g}
-.if ${ARCH} == amd64
-PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86_64
-.else
-PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel
-.endif
-
-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
-
-.if defined(WITH_GNUGCJ)
-GCCVER=41
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
-BUILD_DEPENDS+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
-RUN_DEPENDS+=	${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
-RUN_DEPENDS+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
-.else
-.if ${ARCH} == amd64
-GCCVER=41
-BUILD_DEPENDS+= gcc41:${PORTSDIR}/lang/gcc41
-RUN_DEPENDS+=	gcc41:${PORTSDIR}/lang/gcc41
-.else
-GCCVER=34
-BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo
-.endif
-.endif
-
-.if defined(WITH_CCACHE)
-BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
-CCACHE_PREFIX=	ccache
-.else
-CCACHE_PREFIX=
-.endif
-.if (${GCCVER} == 41)
-CC=     gcc41
-CXX=    g++41
-.endif
-.if (${GCCVER} == 34)
-CC=     gcc-ooo
-CXX=    g++-ooo
-.endif
-CC:=	${CCACHE_PREFIX} ${CC}
-CXX:=	${CCACHE_PREFIX} ${CXX}
-
-BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
-		unzip:${PORTSDIR}/archivers/unzip \
-		gcp:${PORTSDIR}/sysutils/coreutils \
-		gpatch:${PORTSDIR}/devel/patch \
-		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
-		bison2:${PORTSDIR}/devel/bison2 \
-		imake:${X_IMAKE_PORT}
-.if defined(WITH_GNUGCJ)
-LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
-ANT_DISTFILE=   apache-ant-${ANT_VERSION}-bin.tar.bz2
-ANT_VERSION=	1.6.5
-.else
-BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
-.endif
-.if !defined(WITH_GPC)
-LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
-.endif
-
-GNU_CONFIGURE=	yes
-WRKSRC?=		${WRKDIR}/${OOOTAG}
-CONFIGURE_WRKSRC=	${WRKSRC}/config_office
-TCSH?=		/bin/tcsh
-PKGMESSAGE=	${WRKDIR}/pkg-message
-NUMOFPROCESSES?=	1
-.if defined(WITH_GNUGCJ)
-CONFIGURE_ENV+=      PATH="${LOCALBASE}/lib/jvm/java-gcj41/bin:${PATH}"
-.endif
-
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --enable-crashdump=yes --enable-symbols=SMALL
-
-.if ${ARCH} == amd64 || ${GCCVER} == 41
-WITHOUT_MOZILLA=	yes
-.endif
-.if (${GCCVER} == 41)
-LIB_DEPENDS+=   boost_regex:${PORTSDIR}/devel/boost
-CONFIGURE_ARGS+=       --with-system-boost=yes #i58343#
-.endif
-.if (${OSVERSION} <= 492000)
-EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
-.endif
-.if defined(WITH_GNUGCJ)
-EXTRA_PATCHES+=	${FILESDIR}/gcj-fbsdworkaround
-.endif
-
-#.if defined(WITH_TTF_BYTECODE_ENABLED)
-#EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
-#.endif
-
-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.*
-	@${TOUCH} ${EXTRACT_COOKIE}
-	@${TOUCH} ${PATCH_COOKIE}
-	@${TOUCH} ${CONFIGURE_COOKIE}
-	@${TOUCH} ${BUILD_COOKIE}
-.endif
-
-post-extract:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
-.if defined(WITH_GNUGCJ)
-	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-.endif
-.if defined(WITH_GPC)
-	@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/
-.endif
-.if !defined(WITHOUT_MOZILLA)
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
-.endif
-
-do-build:
-	@cd ${WRKSRC} ; ./bootstrap
-# PR:84786 #i53289#
-.if (${NUMOFPROCESSES}>1)
-	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
-.else
-	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; dmake"
-.endif
-
-do-install:
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
-	@${RM} -Rf ${WRKDIR}/tmp
-	@${MKDIR} ${WRKDIR}/tmp
-	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
-		${CP} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
-		cd ${WRKDIR}/tmp ; ${TAR} xfz ${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.org-wrapper ${WRKDIR}/
-	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			-e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
-			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
-			${WRKDIR}/openoffice.org-wrapper
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
-		${PREFIX}/bin/${EXECBASE}
-	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
-	@${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}-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}-swriter
-	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
-	@${REINPLACE_CMD} -e 's#${RELEASE_NR}#${OOOVERSION}#g' \
-			-e '/^Exec/s/printeradmin/spadmin/' \
-			${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop
-	@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak
-	@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
-			${PREFIX}/share/applications/${EXECBASE}
-	@${PRINTF} "share/applications/${EXECBASE}\n" >> ${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 \
-				${CP} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \
-				    ${PREFIX}/share/icons/hicolor/$${dir}/apps/openofficeorg-20-$${app}.png ; \
-				${PRINTF} "share/icons/hicolor/$${dir}/apps/openofficeorg-20-$${app}.png\n" >> ${TMPPLIST} ; \
-			fi \
-		done ; \
-		for file in `cd ${ICONS}/hicolor/$${dir}/mimetypes; ls *.png`; do \
-			${CP} ${ICONS}/hicolor/$${dir}/mimetypes/$${file} \
-			    ${PREFIX}/share/icons/hicolor/$${dir}/mimetypes/ ; \
-			${PRINTF} "share/icons/hicolor/$${dir}/mimetypes/$${file}\n" >> ${TMPPLIST} ; \
-		done ; \
-	done
-	@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#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			${PKGMESSAGE}
-	@${ECHO_CMD}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
-
-.include <${FILESDIR}/Makefile.others>
-.include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo
deleted file mode 100644
index b928e8ace134..000000000000
--- a/editors/openoffice.org-2.0/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 (openoffice.org2.0/OOo_2.0.4_src.tar.gz) = df4bb26645e974a2358bc17f8381a197
-SHA256 (openoffice.org2.0/OOo_2.0.4_src.tar.gz) = 98551d4574586c5a9e26635be758cf05a0315ee9eb44ad7c5ac7c7b983933ea6
-SIZE (openoffice.org2.0/OOo_2.0.4_src.tar.gz) = 333861883
-MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
-SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-SIZE (openoffice.org2.0/unowinreg.dll) = 6144
-MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
-SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
-MD5 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 26031ee1a2fd248ad0cc2e7f17c44c39
-SHA256 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = d463b8259cb199cd26799c817756c73e4e7808b0cf915f86841ac9779e0f9936
-SIZE (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 6743024
-MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
-SHA256 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
-SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366
diff --git a/editors/openoffice.org-2.0/files/Makefile.knobs b/editors/openoffice.org-2.0/files/Makefile.knobs
deleted file mode 100644
index 9ce1258cdf1c..000000000000
--- a/editors/openoffice.org-2.0/files/Makefile.knobs
+++ /dev/null
@@ -1,144 +0,0 @@
-# Makefile for knobs
-# Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD$
-
-.if !defined(WITH_GNUGCJ)
-CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant"
-.else
-CONFIGURE_ARGS+=	--with-jdk-home="${LOCALBASE}/lib/jvm/java-gcj41" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
-.endif
-
-.if defined(WITH_KDE)
-CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
-.endif
-
-.if defined(WITH_CUPS)
-LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
-CONFIGURE_ARGS+=	--enable-cups=yes
-.else
-CONFIGURE_ARGS+=	--enable-cups=no
-.endif
-
-.if defined(WITHOUT_MOZILLA)
-CONFIGURE_ARGS+=	--disable-mozilla
-.else
-CONFIGURE_ARGS+=	--enable-build-mozilla
-.endif
-
-.if defined(WITHOUT_GNOMEVFS)
-CONFIGURE_ARGS+=	--disable-gnome-vfs
-.else
-USE_GNOME+=		gnomevfs2
-.endif
-
-.if defined(WITH_EVOLUTION2)
-CONFIGURE_ARGS+=	--enable-evolution2=yes
-.else
-USE_GNOME+=		glib20
-.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 with"
-	@${ECHO} "make -DWITHOUT_MOZILLA"
-.endif
-.if !defined(WITHOUT_GNOMEVFS)
-	@${ECHO}
-	@${ECHO} "You can compile OOo without gnome VFS support with"
-	@${ECHO} "make -DWITHOUT_GNOMEVFS"
-.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, with"
-#	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
-#	@${ECHO} "See http://www.freetype.org/patents.html for details"
-#.endif
-.if !defined(LOCALIZED_LANG)
-	@${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 be-BY bg br bn bn-BD bn-IN bs ca cs cy da de el"
-	@${ECHO} "en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu-IN he"
-	@${ECHO} "hi-IN hr hu it ja km kn-IN ko lo lt lv mk ms ne nb nl"
-	@${ECHO} "nn nr ns pa-IN pl pt pt-BR ru rw sk sl sh-YU sr-CS ss"
-	@${ECHO} "st sv sw sw-TZ sx ta-IN th tn tr ts ve vi xh zh-CN"
-	@${ECHO} "zh-TW zu"
-	@${ECHO} "Default: en-US"
-.endif
-.if !defined(WITH_GNUGCJ)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
-	@${ECHO} "make -DWITH_GNUGCJ"
-.endif
-.if !defined(WITH_CUPS)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with CUPS support with"
-	@${ECHO} "make -DWITH_CUPS"
-.endif
-.if !defined(WITH_KDE)
-	@${ECHO}
-	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
-	@${ECHO} "make -DWITH_KDE"
-.endif
-.if !defined(WITH_GPC)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with gpc instead of libart by"
-	@${ECHO} "make -DWITH_GPC"
-.endif
-.if !defined(WITH_EVOLUTION2)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with evolution2 support by"
-	@${ECHO} "make -DWITH_EVOLUTION2"
-.endif
-	@${ECHO}
-	@${ECHO} "NOTICE:"
-	@${ECHO}
-	@${ECHO} "To build OOo, you should have a lot"
-.if defined(WITH_DEBUG)
-	@${ECHO} "of free diskspace (~ 18GB) and memory (~ 2GB)."
-.else
-	@${ECHO} "of free diskspace (~ 9GB) and memory (~ 2GB)."
-.endif
-	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
diff --git a/editors/openoffice.org-2.0/files/Makefile.localized b/editors/openoffice.org-2.0/files/Makefile.localized
deleted file mode 100644
index 410647cd4dff..000000000000
--- a/editors/openoffice.org-2.0/files/Makefile.localized
+++ /dev/null
@@ -1,344 +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} == "be-BY"
-LANG_PKGNAME=	be
-LANG_SUFFIX=	BY
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "bg"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "br"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "bn"
-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} == "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} == "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+=   ${X11BASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "km"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.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} == "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} == "ms"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ne"
-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} == "nr"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ns"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.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} == "sk"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sl"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sh-YU"
-LANG_PKGNAME=	sh
-LANG_SUFFIX=	YU
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sr-CS"
-LANG_PKGNAME=	sr
-LANG_SUFFIX=	CS
-.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"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sw-TZ"
-LANG_PKGNAME=	sw
-LANG_SUFFIX=	TZ
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sx"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ta-IN"
-LANG_PKGNAME=	ta
-LANG_SUFFIX=	IN
-.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} == "ts"
-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.org-2.0/files/Makefile.others b/editors/openoffice.org-2.0/files/Makefile.others
deleted file mode 100644
index 444a91beac69..000000000000
--- a/editors/openoffice.org-2.0/files/Makefile.others
+++ /dev/null
@@ -1,67 +0,0 @@
-# Makefile for other stuffs
-# Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD$
-
-#other stuffs which are 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 OpenOffice.org mirror upload";
-	@${MV} ${PKGFILE} \
-		${WRKDIR}/../${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX}
-
-package-canonical:
-	@${ECHO_MSG} "===>   Canonical packaging for OpenOffice.org";
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ;\
-	${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} .
-
-sdk:
-	@${ECHO_MSG} "===>   Make SDK of OpenOffice.org"
-	@${RM} -fr ${WRKDIR}/sdk_tmp
-	@${MKDIR} ${WRKDIR}/sdk_tmp
-	@cd ${WRKDIR}/sdk_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z
-	@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
-		${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \
-		${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \
-		${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_SDK.tar.bz2 ${INSTALLATION_BASEDIR}_sdk
-
-ure:
-	@${ECHO_MSG} "===>   Make Uno Runtime Environment of OpenOffice.org"
-	@${RM} -fr ${WRKDIR}/ure_tmp
-	@${MKDIR} ${WRKDIR}/ure_tmp
-	@cd ${WRKDIR}/ure_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/URE/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z
-	@cd ${WRKDIR}/ure_tmp/opt/openoffice* ; \
-		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
-		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
-		${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_URE.tar.bz2 ${INSTALLATION_BASEDIR}
-
-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} ; ${TCSH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack'
-.else
-	@cd ${WRKSRC} ; ${TCSH} -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 ${WRKDIR}/langpack_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z
-	@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
diff --git a/editors/openoffice.org-2.0/files/fbsd4-workaroundpatch b/editors/openoffice.org-2.0/files/fbsd4-workaroundpatch
deleted file mode 100644
index d69388828582..000000000000
--- a/editors/openoffice.org-2.0/files/fbsd4-workaroundpatch
+++ /dev/null
@@ -1,42 +0,0 @@
-Issutracker : #iXXXXX#
-CWS         : N/A
-Author:     : 
-Description :
-
-making libbf_svx680fi.so fails for FreeBSD 4.11 like:
-
-Making: ../../unxfbsd.pro/lib/libbf_svx680fi.so
-ccache g++-ooo -Wl,-z,combreloc -Wl,-rpath,'$ORIGIN' -shared -L../../unxfbsd.pro/lib -L../lib -L/work/ports/editors/openoffice.org-2.0/work/OOo_2.0beta2/solenv/unxfbsd/lib -L/work/ports/editors/openoffice.org-2.0/work/OOo_2.0beta2/solver/680/unxfbsd.pro/lib -L/work/ports/editors/openoffice.org-2.0/work/OOo_2.0beta2/solenv/unxfbsd/lib -L/usr/local/jdk1.4.2/lib -L/usr/local/jdk1.4.2/jre/lib/i386 -L/usr/local/jdk1.4.2/jre/lib/i386/client -L/usr/local/jdk1.4.2/jre/lib/i386/native_threads -L/usr/X11R6/lib ../../unxfbsd.pro/slo/bf_svx_dflt_version.o ../../unxfbsd.pro/slo/bf_svx_dflt_description.o -o ../../unxfbsd.pro/lib/libbf_svx680fi.so ../../unxfbsd.pro/slo/svx_writingmodeitem.o ../../unxfbsd.pro/slo/svx_frmitems.o ../../unxfbsd.pro/slo/svx_paraitem.o ../../unxfbsd.pro/slo/svx_textitem.o ../../unxfbsd.pro/slo/svx_postattr.o ../../unxfbsd.pro/slo/svx_flditem.o ../../unxfbsd.pro/slo/svx_hlnkitem.o ../../unxfbsd.pro/slo/svx_svxfont.o ../../unxfbsd.pro/slo/svx_pageitem.o ../../unxfbsd.pro/slo/svx_paperinf.o ../../unxfbsd.pro/slo/svx_drawitem.o ../../unxfbsd.pro/slo/svx_algitem.o ../../unxfbsd.pro/slo/svx_itemtype.o ../../unxfbsd.pro/slo/svx_rotmodit.o ../../unxfbsd.pro/slo/svx_numinf.o ../../unxfbsd.pro/slo/svx_svxerr.o ../../unxfbsd.pro/slo/svx_numfmtsh.o ../../unxfbsd.pro/slo/svx_zoomitem.o ../../unxfbsd.pro/slo/svx_chrtitem.o ../../unxfbsd.pro/slo/svx_bulitem.o ../../unxfbsd.pro/slo/svx_e3ditem.o ../../unxfbsd.pro/slo/svx_numitem.o ../../unxfbsd.pro/slo/svx_grfitem.o ../../unxfbsd.pro/slo/svx_clipfmtitem.o ../../unxfbsd.pro/slo/svx_svxempty.o ../../unxfbsd.pro/slo/svx_xmlcnitm.o ../../unxfbsd.pro/slo/svx_linkmgr.o ../../unxfbsd.pro/slo/svx_fileobj.o ../../unxfbsd.pro/slo/svx_txtrange.o ../../unxfbsd.pro/slo/svx_svxacorr.o ../../unxfbsd.pro/slo/svx_SvXMLAutoCorrectImport.o ../../unxfbsd.pro/slo/svx_forbiddencharacterstable.o ../../unxfbsd.pro/slo/svx_swafopt.o ../../unxfbsd.pro/slo/svx_editattr.o ../../unxfbsd.pro/slo/svx_editdbg.o ../../unxfbsd.pro/slo/svx_editdoc.o ../../unxfbsd.pro/slo/svx_editdoc2.o ../../unxfbsd.pro/slo/svx_editeng.o ../../unxfbsd.pro/slo/svx_editobj.o ../../unxfbsd.pro/slo/svx_editsel.o ../../unxfbsd.pro/slo/svx_editundo.o ../../unxfbsd.pro/slo/svx_edtspell.o ../../unxfbsd.pro/slo/svx_editview.o ../../unxfbsd.pro/slo/svx_eerdll.o ../../unxfbsd.pro/slo/svx_impedit.o ../../unxfbsd.pro/slo/svx_impedit2.o ../../unxfbsd.pro/slo/svx_impedit3.o ../../unxfbsd.pro/slo/svx_impedit4.o ../../unxfbsd.pro/slo/svx_impedit5.o ../../unxfbsd.pro/slo/svx_unolingu.o ../../unxfbsd.pro/slo/svx_outliner.o ../../unxfbsd.pro/slo/svx_outlin2.o ../../unxfbsd.pro/slo/svx_paralist.o ../../unxfbsd.pro/slo/svx_outlvw.o ../../unxfbsd.pro/slo/svx_outleeng.o ../../unxfbsd.pro/slo/svx_outlobj.o ../../unxfbsd.pro/slo/svx__bmpmask.o ../../unxfbsd.pro/slo/svx__contdlg.o ../../unxfbsd.pro/slo/svx_charmap.o ../../unxfbsd.pro/slo/svx_hyperdlg.o ../../unxfbsd.pro/slo/svx_imapdlg.o ../../unxfbsd.pro/slo/svx_dlgutil.o ../../unxfbsd.pro/slo/svx_fontwork.o ../../unxfbsd.pro/slo/svx_impgrf.o ../../unxfbsd.pro/slo/svx_rlrcitem.o ../../unxfbsd.pro/slo/svx_rulritem.o ../../unxfbsd.pro/slo/svx_rubydialog.o ../../unxfbsd.pro/slo/svx_srchdlg.o ../../unxfbsd.pro/slo/svx_svxruler.o ../../unxfbsd.pro/slo/svx_txencbox.o ../../unxfbsd.pro/slo/svx_clipboardctl.o ../../unxfbsd.pro/slo/svx_fntctl.o ../../unxfbsd.pro/slo/svx_fntszctl.o ../../unxfbsd.pro/slo/svx_asiancfg.o ../../unxfbsd.pro/slo/svx_adritem.o ../../unxfbsd.pro/slo/svx_optgrid.o ../../unxfbsd.pro/slo/svx_insctrl.o ../../unxfbsd.pro/slo/svx_zoomctrl.o ../../unxfbsd.pro/slo/svx_pszctrl.o ../../unxfbsd.pro/slo/svx_selctrl.o ../../unxfbsd.pro/slo/svx_modctrl.o ../../unxfbsd.pro/slo/svx_colrctrl.o ../../unxfbsd.pro/slo/svx_fillctrl.o ../../unxfbsd.pro/slo/svx_grafctrl.o ../../unxfbsd.pro/slo/svx_itemwin.o ../../unxfbsd.pro/slo/svx_layctrl.o ../../unxfbsd.pro/slo/svx_lboxctrl.o ../../unxfbsd.pro/slo/svx_linectrl.o ../../unxfbsd.pro/slo/svx_tbcontrl.o ../../unxfbsd.pro/slo/svx_tbxalign.o ../../unxfbsd.pro/slo/svx_tbxdraw.o ../../unxfbsd.pro/slo/svx_tbxdrctl.o ../../unxfbsd.pro/slo/svx_verttexttbxctrl.o ../../unxfbsd.pro/slo/svx_UnoForbiddenCharsTable.o ../../unxfbsd.pro/slo/svx_unoedsrc.o ../../unxfbsd.pro/slo/svx_unoedhlp.o ../../unxfbsd.pro/slo/svx_unopracc.o ../../unxfbsd.pro/slo/svx_unoedprx.o ../../unxfbsd.pro/slo/svx_unoviwed.o ../../unxfbsd.pro/slo/svx_unoviwou.o ../../unxfbsd.pro/slo/svx_unofored.o ../../unxfbsd.pro/slo/svx_unoforou.o ../../unxfbsd.pro/slo/svx_unotext.o ../../unxfbsd.pro/slo/svx_unotext2.o ../../unxfbsd.pro/slo/svx_unofield.o ../../unxfbsd.pro/slo/svx_UnoNamespaceMap.o ../../unxfbsd.pro/slo/svx_UnoGraphicExporter.o ../../unxfbsd.pro/slo/svx_unopool.o ../../unxfbsd.pro/slo/svx_XPropertyTable.o ../../unxfbsd.pro/slo/svx_UnoNameItemTable.o ../../unxfbsd.pro/slo/svx_unoshape.o ../../unxfbsd.pro/slo/svx_unoipset.o ../../unxfbsd.pro/slo/svx_unoctabl.o ../../unxfbsd.pro/slo/svx_unoshap2.o ../../unxfbsd.pro/slo/svx_unoshap3.o ../../unxfbsd.pro/slo/svx_unoshap4.o ../../unxfbsd.pro/slo/svx_unopage.o ../../unxfbsd.pro/slo/svx_unoshtxt.o ../../unxfbsd.pro/slo/svx_unoshcol.o ../../unxfbsd.pro/slo/svx_unoprov.o ../../unxfbsd.pro/slo/svx_unomod.o ../../unxfbsd.pro/slo/svx_unonrule.o ../../unxfbsd.pro/slo/svx_unofdesc.o ../../unxfbsd.pro/slo/svx_unomlstr.o ../../unxfbsd.pro/slo/svx_unogtabl.o ../../unxfbsd.pro/slo/svx_unohtabl.o ../../unxfbsd.pro/slo/svx_unobtabl.o ../../unxfbsd.pro/slo/svx_unottabl.o ../../unxfbsd.pro/slo/svx_unomtabl.o ../../unxfbsd.pro/slo/svx_unodtabl.o ../../unxfbsd.pro/slo/svx_gluepts.o ../../unxfbsd.pro/slo/svx_galexpl.o ../../unxfbsd.pro/slo/svx_galdlg.o ../../unxfbsd.pro/slo/svx_galctrl.o ../../unxfbsd.pro/slo/svx_gallery1.o ../../unxfbsd.pro/slo/svx_galtheme.o ../../unxfbsd.pro/slo/svx_galmisc.o ../../unxfbsd.pro/slo/svx_galobj.o ../../unxfbsd.pro/slo/svx_codec.o ../../unxfbsd.pro/slo/svx_galbrws.o ../../unxfbsd.pro/slo/svx_galbrws1.o ../../unxfbsd.pro/slo/svx_galbrws2.o ../../unxfbsd.pro/slo/svx_svdoutlinercache.o ../../unxfbsd.pro/slo/svx_dialdll.o ../../unxfbsd.pro/slo/svx_gradtrns.o ../../unxfbsd.pro/slo/svx_svdattr.o ../../unxfbsd.pro/slo/svx_svdcrtmt.o ../../unxfbsd.pro/slo/svx_svdcrtv.o ../../unxfbsd.pro/slo/svx_svddrag.o ../../unxfbsd.pro/slo/svx_svddrgmt.o ../../unxfbsd.pro/slo/svx_svddrgv.o ../../unxfbsd.pro/slo/svx_svdedtv.o ../../unxfbsd.pro/slo/svx_svdedtv1.o ../../unxfbsd.pro/slo/svx_svdedtv2.o ../../unxfbsd.pro/slo/svx_svdedxv.o ../../unxfbsd.pro/slo/svx_svdetc.o ../../unxfbsd.pro/slo/svx_svdfmtf.o ../../unxfbsd.pro/slo/svx_svdfppt.o ../../unxfbsd.pro/slo/svx_svdglev.o ../../unxfbsd.pro/slo/svx_svdglue.o ../../unxfbsd.pro/slo/svx_svdhdl.o ../../unxfbsd.pro/slo/svx_svdhlpln.o ../../unxfbsd.pro/slo/svx_svdibrow.o ../../unxfbsd.pro/slo/svx_svdio.o ../../unxfbsd.pro/slo/svx_svditer.o ../../unxfbsd.pro/slo/svx_svdlayer.o ../../unxfbsd.pro/slo/svx_svdmark.o ../../unxfbsd.pro/slo/svx_svdmodel.o ../../unxfbsd.pro/slo/svx_svdmrkv.o ../../unxfbsd.pro/slo/svx_svdmrkv1.o ../../unxfbsd.pro/slo/svx_svdoattr.o ../../unxfbsd.pro/slo/svx_svdobj.o ../../unxfbsd.pro/slo/svx_impgrfll.o ../../unxfbsd.pro/slo/svx_svdocapt.o ../../unxfbsd.pro/slo/svx_svdocirc.o ../../unxfbsd.pro/slo/svx_svdoedge.o ../../unxfbsd.pro/slo/svx_svdograf.o ../../unxfbsd.pro/slo/svx_svdogrp.o ../../unxfbsd.pro/slo/svx_svdomeas.o ../../unxfbsd.pro/slo/svx_svdoole2.o ../../unxfbsd.pro/slo/svx_svdopage.o ../../unxfbsd.pro/slo/svx_svdopath.o ../../unxfbsd.pro/slo/svx_svdorect.o ../../unxfbsd.pro/slo/svx_svdotext.o ../../unxfbsd.pro/slo/svx_svdotxat.o ../../unxfbsd.pro/slo/svx_svdotxdr.o ../../unxfbsd.pro/slo/svx_svdotxed.o ../../unxfbsd.pro/slo/svx_svdotxfl.o ../../unxfbsd.pro/slo/svx_svdotxln.o ../../unxfbsd.pro/slo/svx_svdotxtr.o ../../unxfbsd.pro/slo/svx_svdouno.o ../../unxfbsd.pro/slo/svx_svdoutl.o ../../unxfbsd.pro/slo/svx_svdovirt.o ../../unxfbsd.pro/slo/svx_svdpage.o ../../unxfbsd.pro/slo/svx_svdpagv.o ../../unxfbsd.pro/slo/svx_svdpntv.o ../../unxfbsd.pro/slo/svx_svdpoev.o ../../unxfbsd.pro/slo/svx_svdscrol.o ../../unxfbsd.pro/slo/svx_svdsnpv.o ../../unxfbsd.pro/slo/svx_svdsuro.o ../../unxfbsd.pro/slo/svx_svdtouch.o ../../unxfbsd.pro/slo/svx_svdtrans.o ../../unxfbsd.pro/slo/svx_svdtxhdl.o ../../unxfbsd.pro/slo/svx_svdundo.o ../../unxfbsd.pro/slo/svx_svdview.o ../../unxfbsd.pro/slo/svx_svdviter.o ../../unxfbsd.pro/slo/svx_svdvmark.o ../../unxfbsd.pro/slo/svx_svdxcgv.o ../../unxfbsd.pro/slo/svx_clonelist.o ../../unxfbsd.pro/slo/svx_dbcharsethelper.o ../../unxfbsd.pro/slo/svx_ParseContext.o ../../unxfbsd.pro/slo/svx_typeconversionclient.o ../../unxfbsd.pro/slo/svx_confirmdelete.o ../../unxfbsd.pro/slo/svx_dbtoolsclient.o ../../unxfbsd.pro/slo/svx_sqlparserclient.o ../../unxfbsd.pro/slo/svx_dataaccessdescriptor.o ../../unxfbsd.pro/slo/svx_fmpage.o ../../unxfbsd.pro/slo/svx_fmPropBrw.o ../../unxfbsd.pro/slo/svx_fmundo.o ../../unxfbsd.pro/slo/svx_fmprop.o ../../unxfbsd.pro/slo/svx_fmmodel.o ../../unxfbsd.pro/slo/svx_navigatortree.o ../../unxfbsd.pro/slo/svx_navigatortreemodel.o ../../unxfbsd.pro/slo/svx_fmexpl.o ../../unxfbsd.pro/slo/svx_fmctrler.o ../../unxfbsd.pro/slo/svx_fmpgeimp.o ../../unxfbsd.pro/slo/svx_fmvwimp.o ../../unxfbsd.pro/slo/svx_taborder.o ../../unxfbsd.pro/slo/svx_fmdpage.o ../../unxfbsd.pro/slo/svx_fmitems.o ../../unxfbsd.pro/slo/svx_tbxform.o ../../unxfbsd.pro/slo/svx_fmobj.o ../../unxfbsd.pro/slo/svx_fmdmod.o ../../unxfbsd.pro/slo/svx_fmobjfac.o ../../unxfbsd.pro/slo/svx_fmsrccfg.o ../../unxfbsd.pro/slo/svx_fmservs.o ../../unxfbsd.pro/slo/svx_typemap.o ../../unxfbsd.pro/slo/svx_fmexch.o ../../unxfbsd.pro/slo/svx_tabwin.o ../../unxfbsd.pro/slo/svx_multipro.o ../../unxfbsd.pro/slo/svx_fmurl.o ../../unxfbsd.pro/slo/svx_filtnav.o ../../unxfbsd.pro/slo/svx_fmimplids.o ../../unxfbsd.pro/slo/svx_fmtools.o ../../unxfbsd.pro/slo/svx_fmshimp.o ../../unxfbsd.pro/slo/svx_fmshell.o ../../unxfbsd.pro/slo/svx_fmsearch.o ../../unxfbsd.pro/slo/svx_fmsrcimp.o ../../unxfbsd.pro/slo/svx_fmview.o ../../unxfbsd.pro/slo/svx_siimport.o ../../unxfbsd.pro/slo/svx_sdbdatacolumn.o ../../unxfbsd.pro/slo/svx_svx3ditems.o ../../unxfbsd.pro/slo/svx_deflt3d.o ../../unxfbsd.pro/slo/svx_class3d.o ../../unxfbsd.pro/slo/svx_e3dundo.o ../../unxfbsd.pro/slo/svx_volume3d.o ../../unxfbsd.pro/slo/svx_viewpt3d.o ../../unxfbsd.pro/slo/svx_camera3d.o ../../unxfbsd.pro/slo/svx_poly3d.o ../../unxfbsd.pro/slo/svx_polygn3d.o ../../unxfbsd.pro/slo/svx_volmrk3d.o ../../unxfbsd.pro/slo/svx_objfac3d.o ../../unxfbsd.pro/slo/svx_obj3d.o ../../unxfbsd.pro/slo/svx_light3d.o ../../unxfbsd.pro/slo/svx_dlight3d.o ../../unxfbsd.pro/slo/svx_plight3d.o ../../unxfbsd.pro/slo/svx_pntobj3d.o ../../unxfbsd.pro/slo/svx_polyob3d.o ../../unxfbsd.pro/slo/svx_scene3d.o ../../unxfbsd.pro/slo/svx_polysc3d.o ../../unxfbsd.pro/slo/svx_cube3d.o ../../unxfbsd.pro/slo/svx_sphere3d.o ../../unxfbsd.pro/slo/svx_extrud3d.o ../../unxfbsd.pro/slo/svx_lathe3d.o ../../unxfbsd.pro/slo/svx_label3d.o ../../unxfbsd.pro/slo/svx_dragmt3d.o ../../unxfbsd.pro/slo/svx_view3d.o ../../unxfbsd.pro/slo/svx_view3d1.o ../../unxfbsd.pro/slo/svx_e3dcmpt.o ../../unxfbsd.pro/slo/svx_float3d.o ../../unxfbsd.pro/slo/svx_svxmsbas.o ../../unxfbsd.pro/slo/svx_xcpoly.o ../../unxfbsd.pro/slo/svx_xout.o ../../unxfbsd.pro/slo/svx_xout1.o ../../unxfbsd.pro/slo/svx_xattr.o ../../unxfbsd.pro/slo/svx_xattr2.o ../../unxfbsd.pro/slo/svx_xattrbmp.o ../../unxfbsd.pro/slo/svx_xline.o ../../unxfbsd.pro/slo/svx_xpool.o ../../unxfbsd.pro/slo/svx_xtable.o ../../unxfbsd.pro/slo/svx_xtabcolr.o ../../unxfbsd.pro/slo/svx_xtablend.o ../../unxfbsd.pro/slo/svx_xtabdash.o ../../unxfbsd.pro/slo/svx_xtabhtch.o ../../unxfbsd.pro/slo/svx_xtabgrdt.o ../../unxfbsd.pro/slo/svx_xtabbtmp.o ../../unxfbsd.pro/slo/svx_xexch.o ../../unxfbsd.pro/slo/svx_xiocomp.o ../../unxfbsd.pro/slo/svx__xpoly.o ../../unxfbsd.pro/slo/svx__ximp.o ../../unxfbsd.pro/slo/svx__xoutbmp.o ../../unxfbsd.pro/slo/svx__xfont.o ../../unxfbsd.pro/slo/svx_xmlexport.o ../../unxfbsd.pro/slo/svx_xmltxtimp.o ../../unxfbsd.pro/slo/svx_xmltxtexp.o ../../unxfbsd.pro/slo/svx_xmlxtimp.o ../../unxfbsd.pro/slo/svx_xmlxtexp.o ../../unxfbsd.pro/slo/svx_xmlgrhlp.o ../../unxfbsd.pro/slo/svx_xmleohlp.o -lbf_xo680fi -lgo680fi -lsb680fi -lso680fi -lsvt680fi -ltk680fi -lvcl680fi -lsvl680fi -lsot680fi -lutl680fi -ltl680fi -lcomphelp4gcc3 -lucbhelper3gcc3 -luno_cppuhelpergcc3 -luno_cppu -lvos3gcc3 -luno_sal -licuuc -lfwe680fi -llegacy_binfilters680fi -luno_salhelpergcc3 -lxcr680fi -lsysshell -lbf_sfx -lsysshell -pthread -lm -Wl,-Bdynamic -lstlport_gcc -pthread
-/usr/libexec/elf/ld: ../../unxfbsd.pro/lib/libbf_svx680fi.so: undefined versioned symbol name typeinfo for com::sun::star::beans::XFastPropertySet@@UDK_3_0_0
-/usr/libexec/elf/ld: failed to set dynamic section sizes: Bad value
-collect2: ld returned 1 exit status
-dmake:  Error code 1, while making '../../unxfbsd.pro/lib/libbf_svx680fi.so'
-'---* tg_merge.mk *---'
-
-ERROR: Error 65280 occurred while making /work/ports/editors/openoffice.org-2.0/work/OOo_2.0beta2/binfilter/bf_svx/util
-dmake:  Error code 1, while making 'build_instsetoo_native'
-'---* tg_merge.mk *---'
-*** Error code 255
-
-Stop in /work/ports/editors/openoffice.org-2.0.
-
---- /dev/null	Sun Sep  4 19:33:13 2005
-+++ binfilter/bf_svx/util/bf_svx.map	Sun Sep  4 18:41:25 2005
-@@ -0,0 +1 @@
-+UDK_3_0_0 { global: _ZTI*; _ZTS*; };
-
-Index: binfilter/bf_svx/util/makefile.mk
-===================================================================
-RCS file: /cvs/framework/binfilter/bf_svx/util/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- binfilter/bf_svx/util/makefile.mk	5 Dec 2003 15:10:56 -0000	1.5
-+++ binfilter/bf_svx/util/makefile.mk	4 Sep 2005 09:55:49 -0000
-@@ -91,6 +91,7 @@
- SHL1IMPLIB= bf_svx
- SVXLOKAL=	$(LB)$/bf_svx.lib
- SHL1BASE  = 0x1d800000
-+SHL1VERSIONMAP= bf_svx.map
- 
- SHL1STDLIBS= \
- 	$(BFXMLOFFLIB) \
diff --git a/editors/openoffice.org-2.0/files/gcj-fbsdworkaround b/editors/openoffice.org-2.0/files/gcj-fbsdworkaround
deleted file mode 100644
index ee41bf0f6839..000000000000
--- a/editors/openoffice.org-2.0/files/gcj-fbsdworkaround
+++ /dev/null
@@ -1,30 +0,0 @@
---- config_office/configure~	Sat Mar  4 16:12:31 2006
-+++ config_office/configure	Sat Mar  4 16:12:45 2006
-@@ -7544,7 +7544,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgcjawt  $LIBS"
-+LIBS="-lgcjawt  -pthread $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-
-http://qa.openoffice.org/issues/show_bug.cgi?id=63095
-Index: stoc/source/javaloader/makefile.mk
-===================================================================
-RCS file: /cvs/udk/stoc/source/javaloader/makefile.mk,v
-retrieving revision 1.16
-diff -u -r1.16 makefile.mk
---- stoc/source/javaloader/makefile.mk	8 Sep 2005 07:57:58 -0000	1.16
-+++ stoc/source/javaloader/makefile.mk	13 Mar 2006 00:53:41 -0000
-@@ -59,7 +59,8 @@
- 		$(CPPUHELPERLIB) 	\
- 		$(CPPULIB)			\
- 		$(SALLIB) \
--        $(JVMACCESSLIB)
-+        $(JVMACCESSLIB) \
-+        -L/usr/local/lib -liconv
- 
- SHL1VERSIONMAP = javaloader.map
- SHL1DEPN=		
diff --git a/editors/openoffice.org-2.0/files/generate.pl b/editors/openoffice.org-2.0/files/generate.pl
deleted file mode 100644
index 36355363e866..000000000000
--- a/editors/openoffice.org-2.0/files/generate.pl
+++ /dev/null
@@ -1,24 +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.0/files/Attic/generate.pl,v 1.7 2005-12-23 04:14:28 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 "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";
-
-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.0/files/openoffice.org-wrapper b/editors/openoffice.org-2.0/files/openoffice.org-wrapper
deleted file mode 100644
index 79cf583df82d..000000000000
--- a/editors/openoffice.org-2.0/files/openoffice.org-wrapper
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2.0/files/Attic/openoffice.org-wrapper,v 1.3 2006-04-20 21:56:12 maho Exp $
-
-oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/
-program=`echo $0 | sed -e 's|.*-%%OOOVERSION%%-||'`
-
-case $program in
-$0)
-	$oopath/soffice "$@"
-	;;
-	*)
-	$oopath/$program "$@"
-	;;
-esac
diff --git a/editors/openoffice.org-2.0/files/optpatch-freetype b/editors/openoffice.org-2.0/files/optpatch-freetype
deleted file mode 100644
index 775caad705c2..000000000000
--- a/editors/openoffice.org-2.0/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_BYTECODE_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.0/files/patch-i65514 b/editors/openoffice.org-2.0/files/patch-i65514
deleted file mode 100644
index 1b80adbcb7c0..000000000000
--- a/editors/openoffice.org-2.0/files/patch-i65514
+++ /dev/null
@@ -1,145 +0,0 @@
-Index: berkeleydb/db-4.2.52.patch
-===================================================================
-RCS file: /cvs/external/berkeleydb/db-4.2.52.patch,v
-retrieving revision 1.13
-diff -u -r1.13 db-4.2.52.patch
---- berkeleydb/db-4.2.52.patch	25 Jul 2006 10:23:22 -0000	1.13
-+++ berkeleydb/db-4.2.52.patch	23 Aug 2006 02:24:30 -0000
-@@ -313,6 +313,20 @@
- ! 			$(SLO)$/btree_auto.obj
- ! 
- ! .INCLUDE :  target.mk
-+*** misc/db-4.2.52.NC/dist/config.hin	Wed Dec  3 16:10:00 2003
-+--- misc/build/db-4.2.52.NC/dist/config.hin	Fri May 19 17:37:41 2006
-+***************
-+*** 193,198 ****
-+--- 193,201 ----
-+  /* Define to 1 to use the GCC compiler and x86 assembly language mutexes. */
-+  #undef HAVE_MUTEX_X86_GCC_ASSEMBLY
-+  
-++ /* Define to 1 to use the GCC compiler and x86-64 assembly language mutexes. */
-++ #undef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
-++ 
-+  /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-+  #undef HAVE_NDIR_H
-+
- *** misc/db-4.2.52.NC/clib/makefile.mk	Tue Jul 25 09:33:00 2006
- --- misc/build/db-4.2.52.NC/clib/makefile.mk	Tue Jul 25 09:05:20 2006
- ***************
-@@ -554,6 +568,76 @@
-     fi
-   
-     # Commands to make compiler produce verbose output that lists
-+***************
-+*** 28556,28561 ****
-+--- 28556,28606 ----
-+  rm -f conftest.$ac_objext conftest.$ac_ext
-+  fi
-+  
-++ # x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux
-++ if test "$db_cv_mutex" = no; then
-++ cat >conftest.$ac_ext <<_ACEOF
-++ #line $LINENO "configure"
-++ /* confdefs.h.  */
-++ _ACEOF
-++ cat confdefs.h >>conftest.$ac_ext
-++ cat >>conftest.$ac_ext <<_ACEOF
-++ /* end confdefs.h.  */
-++ 
-++ int
-++ main ()
-++ {
-++ 
-++ #if (defined(__amd64__) || defined(__x86_64__)) && defined(__GNUC__)
-++ 	exit(0);
-++ #else
-++ 	FAIL TO COMPILE/LINK
-++ #endif
-++ 
-++   ;
-++   return 0;
-++ }
-++ _ACEOF
-++ rm -f conftest.$ac_objext
-++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-++   (eval $ac_compile) 2>&5
-++   ac_status=$?
-++   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } &&
-++          { ac_try='test -s conftest.$ac_objext'
-++   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-++   (eval $ac_try) 2>&5
-++   ac_status=$?
-++   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); }; }; then
-++   db_cv_mutex="x86_64/gcc-assembly"
-++ else
-++   echo "$as_me: failed program was:" >&5
-++ sed 's/^/| /' conftest.$ac_ext >&5
-++ 
-++ fi
-++ rm -f conftest.$ac_objext conftest.$ac_ext
-++ fi
-++ 
-+  # S390/cc: IBM OS/390 Unix
-+  if test "$db_cv_mutex" = no; then
-+  cat >conftest.$ac_ext <<_ACEOF
-+***************
-+*** 28971,28976 ****
-+--- 29016,29028 ----
-+  x86/gcc-assembly)	ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
-+  			cat >>confdefs.h <<\_ACEOF
-+  #define HAVE_MUTEX_X86_GCC_ASSEMBLY 1
-++ _ACEOF
-++ 
-++ 
-++ ;;
-++ x86_64/gcc-assembly)	ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
-++ 			cat >>confdefs.h <<\_ACEOF
-++ #define HAVE_MUTEX_X86_64_GCC_ASSEMBLY 1
-+  _ACEOF
-+
-+  
- *** misc/db-4.2.52.NC/dist/ltmain.sh	Sat Apr 26 19:45:37 2003
- --- misc/build/db-4.2.52.NC/dist/ltmain.sh	Tue Jul 25 09:05:20 2006
- ***************
-@@ -1010,3 +1094,39 @@
- ! 			$(SLO)$/xa_map.obj
- ! 
- ! .INCLUDE :  target.mk
-+*** misc/db-4.2.52.NC/dbinc/mutex.h	Sat Sep 20 17:40:49 2003
-+--- misc/build/db-4.2.52.NC/dbinc/mutex.h	Fri May 19 12:43:58 2006
-+***************
-+*** 781,786 ****
-+--- 781,811 ----
-+  #endif
-+  #endif
-+  
-++ /*********************************************************************
-++  * x86_64/gcc assembly.
-++  *********************************************************************/
-++ #ifdef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
-++ typedef unsigned char tsl_t;
-++ 
-++ #ifdef LOAD_ACTUAL_MUTEX_CODE
-++ /*
-++  * For gcc/x86-64, 0 is clear, 1 is set.
-++  */
-++ #define	MUTEX_SET(tsl) ({						\
-++ 	register tsl_t *__l = (tsl);					\
-++ 	int __r;							\
-++ 	asm volatile("movq $1,%%rax; lock; xchgb %1,%%al; xorq $1,%%rax"\
-++ 	    : "=&a" (__r), "=m" (*__l)					\
-++ 	    : "1" (*__l)						\
-++ 	    );								\
-++ 	__r & 1;							\
-++ })
-++ 
-++ #define	MUTEX_UNSET(tsl)	(*(tsl) = 0)
-++ #define	MUTEX_INIT(tsl)		MUTEX_UNSET(tsl)
-++ #endif
-++ #endif
-++ 
-+  /*
-+   * Mutex alignment defaults to one byte.
-+   *
diff --git a/editors/openoffice.org-2.0/files/patch-i66666 b/editors/openoffice.org-2.0/files/patch-i66666
deleted file mode 100644
index 68f8018ead53..000000000000
--- a/editors/openoffice.org-2.0/files/patch-i66666
+++ /dev/null
@@ -1,21 +0,0 @@
-it also includes the following patch
-http://www.go-oo.org/patches/64bit/sixtyfour-warnings-fpicker.diff
-from i66686 (dupe of i66666)
-Index: tools/inc/solar.h
-===================================================================
-RCS file: /cvs/util/tools/inc/solar.h,v
-retrieving revision 1.44
-diff -u -r1.44 solar.h
---- tools/inc/solar.h	26 Apr 2006 20:42:59 -0000	1.44
-+++ tools/inc/solar.h	23 Jun 2006 13:32:04 -0000
-@@ -55,9 +55,6 @@
- #define FALSE		0
- #endif
- 
--#undef NULL
--#define NULL		0
--
- #ifdef _SOLAR__PRIVATE
- #undef _SOLAR__PRIVATE
- #endif
-
diff --git a/editors/openoffice.org-2.0/files/patch-i66667 b/editors/openoffice.org-2.0/files/patch-i66667
deleted file mode 100644
index b73949eee465..000000000000
--- a/editors/openoffice.org-2.0/files/patch-i66667
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: vcl/unx/gtk/app/gtkinst.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
-retrieving revision 1.14.88.1
-diff -u -r1.14.88.1 gtkinst.cxx
---- vcl/unx/gtk/app/gtkinst.cxx	10 Aug 2006 14:53:08 -0000	1.14.88.1
-+++ vcl/unx/gtk/app/gtkinst.cxx	21 Aug 2006 05:38:21 -0000
-@@ -43,6 +43,7 @@
- #include <plugins/gtk/atkbridge.hxx>
- 
- #include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
- 
- #if OSL_DEBUG_LEVEL > 1
- #include <stdio.h>
-@@ -111,13 +112,28 @@
- 		GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
- 		pYieldMutex->ThreadsLeave();
- 	}
--	static bool hookLocks( oslModule pModule )
-+	static bool hookLocks( void )
- 	{
- 		typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
- 		rtl::OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM( "gdk_threads_set_lock_functions") );
- 
-+		/* XXX GDK library path should be set by configure. */
-+		OUStringBuffer aModName( 128 );
-+		aModName.appendAscii( SAL_DLLPREFIX"gdk-x11-2.0" );
-+		aModName.appendAscii( SAL_DLLEXTENSION );
-+		OUString aModule = aModName.makeStringAndClear();
-+		oslModule aMod = osl_loadModule( aModule.pData, SAL_LOADMODULE_DEFAULT );
-+
-+		if ( !aMod )
-+		{
-+#if OSL_DEBUG_LEVEL > 1
-+		    fprintf( stderr, "Failed to load "SAL_DLLPREFIX"gdk-x11-2.0"SAL_DLLEXTENSION"\n" );
-+#endif
-+			return false;
-+		}
-+
- 		GdkLockFn gdk_threads_set_lock_functions =
--				(GdkLockFn) osl_getFunctionSymbol( pModule, aSymbolName.pData );
-+				(GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
- 		if ( !gdk_threads_set_lock_functions )
- 		{
- #if OSL_DEBUG_LEVEL > 1
-@@ -150,7 +166,7 @@
- 		if ( !g_thread_supported() )
- 			g_thread_init( NULL );
- 
--		if ( hookLocks( pModule ) )
-+		if ( hookLocks() )
- 			pYieldMutex = new GtkHookedYieldMutex();
- 		else
- 			pYieldMutex = new GtkYieldMutex();
diff --git a/editors/openoffice.org-2.0/files/patch-i67904 b/editors/openoffice.org-2.0/files/patch-i67904
deleted file mode 100644
index d2fb32236151..000000000000
--- a/editors/openoffice.org-2.0/files/patch-i67904
+++ /dev/null
@@ -1,80 +0,0 @@
-Index: sal/osl/unx/socket.c
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/socket.c,v
-retrieving revision 1.26
-diff -u -r1.26 socket.c
---- sal/osl/unx/socket.c	19 Jul 2006 09:39:22 -0000	1.26
-+++ sal/osl/unx/socket.c	29 Jul 2006 09:53:04 -0000
-@@ -813,7 +813,7 @@
- 	const char *name, struct hostent *result,
- 	char *buffer, int buflen, int *h_errnop)
- {
--#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 700015))
-+#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103))
- 	struct hostent *__result; /* will be the same as result */
- 	int __error;
- 	__error = gethostbyname_r (name, result, buffer, buflen,
-Index: sal/osl/unx/system.c
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/system.c,v
-retrieving revision 1.13
-diff -u -r1.13 system.c
---- sal/osl/unx/system.c	19 Jul 2006 09:39:37 -0000	1.13
-+++ sal/osl/unx/system.c	9 Sep 2006 09:57:26 -0000
-@@ -343,7 +343,7 @@
- }
- #endif /* defined SCO */
- 
--#if !defined(FREEBSD) || (__FreeBSD_version < 700015)
-+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
- 
- extern int h_errno;
- 
-@@ -435,7 +435,7 @@
- 
-   	return res;
- }
--#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
-+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
- 
- #if defined(MACOSX)
- /*
-
-Index: sal/osl/unx/system.h
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/system.h,v
-retrieving revision 1.33
-diff -u -r1.33 system.h
---- sal/osl/unx/system.h	19 Jul 2006 09:39:50 -0000	1.33
-+++ sal/osl/unx/system.h	9 Sep 2006 09:55:55 -0000
-@@ -537,10 +537,10 @@
- struct tm *localtime_r(const time_t *timep, struct tm *buffer);
- struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
- #endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
--#if !defined(FREEBSD) || (__FreeBSD_version < 700015)
-+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
- struct hostent *gethostbyname_r(const char *name, struct hostent *result,
- 								char *buffer, int buflen, int *h_errnop);
--#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
-+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
- #endif
- 
- #endif /* __OSL_SYSTEM_H__ */
-
-Index: moz/mozilla-source-1.7.5.patch
-===================================================================
-RCS file: /cvs/external/moz/mozilla-source-1.7.5.patch,v
-retrieving revision 1.11
-diff -u -r1.11 mozilla-source-1.7.5.patch
---- moz/mozilla-source-1.7.5.patch	19 Jul 2006 09:37:17 -0000	1.11
-+++ moz/mozilla-source-1.7.5.patch	29 Jul 2006 09:53:10 -0000
-@@ -7705,7 +7705,7 @@
-  
- -#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
- +#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \
--+	(defined(__FreeBSD__) && __FreeBSD_version > 700016)
-++	(defined(__FreeBSD__) && __FreeBSD_version > 601103)
-  #define _PR_HAVE_GETPROTO_R
-  #define _PR_HAVE_5_ARG_GETPROTO_R
-  #endif
-
diff --git a/editors/openoffice.org-2.0/files/patch-i69418 b/editors/openoffice.org-2.0/files/patch-i69418
deleted file mode 100644
index dd23c55e4c9b..000000000000
--- a/editors/openoffice.org-2.0/files/patch-i69418
+++ /dev/null
@@ -1,38 +0,0 @@
---- moz/mozilla-source-1.7.5.patch.org	Sat Sep  9 18:43:45 2006
-+++ moz/mozilla-source-1.7.5.patch	Sat Sep  9 18:42:00 2006
-@@ -151,6 +151,17 @@
-          AR_EXTRACT="$AR x"
-          AR_DELETE="$AR d"
- ***************
-+*** 7504,7509 ****
-+--- 7504,7511 ----
-+  case $target in
-+  *-hpux11.*)
-+  	;;
-++ *-freebsd*)
-++ 	;;
-+  *)
-+  	echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6
-+  echo "configure:7510: checking for gethostbyname_r in -lc_r" >&5
-+***************
- *** 16606,16613 ****
-   
-   case "$host_os" in
-@@ -191,6 +202,17 @@
-          AR_EXTRACT="$AR x"
-          AR_DELETE="$AR d"
- ***************
-+*** 1981,1986 ****
-+--- 1981,1988 ----
-+  case $target in
-+  *-hpux11.*)
-+  	;;
-++ *-freebsd*)
-++ 	;;
-+  *)
-+  	AC_CHECK_LIB(c_r, gethostbyname_r)
-+  	;;
-+***************
- *** 5692,5699 ****
-   dnl ========================================================
-   case "$host_os" in
diff --git a/editors/openoffice.org-2.0/files/patch-i71039 b/editors/openoffice.org-2.0/files/patch-i71039
deleted file mode 100644
index 8f0897bc862b..000000000000
--- a/editors/openoffice.org-2.0/files/patch-i71039
+++ /dev/null
@@ -1,34 +0,0 @@
---- binfilter/inc/bf_svx/svdobj.hxx.orig	Mon Oct 23 13:47:55 2006
-+++ binfilter/inc/bf_svx/svdobj.hxx	Mon Oct 23 13:48:08 2006
-@@ -265,7 +265,7 @@
- 	{}
- 	virtual ~SdrObjUserData();
- 
--	virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL;
-+	virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0;
- 	UINT32  GetInventor() const { return nInventor; }
- 	UINT16  GetId() const { return nIdentifier; }
- 	virtual void WriteData(SvStream& rOut);
-
---- svx/inc/svdobj.hxx.orig	Mon Oct 23 12:56:33 2006
-+++ svx/inc/svdobj.hxx	Mon Oct 23 12:56:50 2006
-@@ -323,7 +323,7 @@
- 	{}
- 	virtual ~SdrObjUserData();
- 
--	virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL;
-+	virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0;
- 	UINT32  GetInventor() const { return nInventor; }
- 	UINT16  GetId() const { return nIdentifier; }
- 	//BFS01virtual void WriteData(SvStream& rOut);
---- sc/source/ui/inc/csvcontrol.hxx~	Fri Sep  9 06:17:47 2005
-+++ sc/source/ui/inc/csvcontrol.hxx	Sat Nov  4 08:46:16 2006
-@@ -444,7 +444,7 @@
- 
- protected:
-     /** Derived classes create a new accessible object here. */
--    virtual ScAccessibleCsvControl* ImplCreateAccessible() = NULL;
-+    virtual ScAccessibleCsvControl* ImplCreateAccessible() = 0;
- };
- 
- 
diff --git a/editors/openoffice.org-2.0/files/pkg-message.in b/editors/openoffice.org-2.0/files/pkg-message.in
deleted file mode 100644
index 48e87f301db7..000000000000
--- a/editors/openoffice.org-2.0/files/pkg-message.in
+++ /dev/null
@@ -1,42 +0,0 @@
-OpenOffice.org Build %%RELEASE_NR%% Personal Install How-To
-
-Written by:	Martin Blapp <mbr@freebsd.org>
-		and Maho Nakata <maho@FreeBSD.org>
-
-OpenOffice.org %%RELEASE_NR%% 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 an installed JDK.
-The setup installs a ".openoffice.org2" folder
-in your homedir.
-
-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
-".openoffice.org2" dir in your homedir. Redo the user
-installation and the problems should go away.
diff --git a/editors/openoffice.org-2.0/pkg-descr b/editors/openoffice.org-2.0/pkg-descr
deleted file mode 100644
index bc2ede1b8c2b..000000000000
--- a/editors/openoffice.org-2.0/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.0/pkg-plist b/editors/openoffice.org-2.0/pkg-plist
deleted file mode 100644
index 28bd78453b52..000000000000
--- a/editors/openoffice.org-2.0/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, do not delete. Package list is generated automatically.
author	maho <maho@FreeBSD.org>	2006-11-12 14:20:29 +0800
committer	maho <maho@FreeBSD.org>	2006-11-12 14:20:29 +0800
commit	5a2ac764044ac1c2c3c7fffa39d0199d54a81f3a (patch)
tree	046a495e0e4540a77a34f6346a4777fb3cf9be80
parent	0a4fc5e835a4a11c730369711db9dcf626a9eaef (diff)
download	freebsd-ports-gnome-5a2ac764044ac1c2c3c7fffa39d0199d54a81f3a.tar.gz freebsd-ports-gnome-5a2ac764044ac1c2c3c7fffa39d0199d54a81f3a.tar.zst freebsd-ports-gnome-5a2ac764044ac1c2c3c7fffa39d0199d54a81f3a.zip