Remove openoffice.org-1.0, 1.1, and 1.1-devel ports.

Farewell, arigato (thank you) and sayounara (good-bye).
author: Maho Nakata <maho@FreeBSD.org> 2008-07-02 02:54:31 +0000
committer: Maho Nakata <maho@FreeBSD.org> 2008-07-02 02:54:31 +0000
commit: 0d77ef3b39c5414fffb921b50940fad288014a67 (patch)
tree: 8b30062b32e88c9e6b0966494a5fce349f78f914 /editors/openoffice.org-1.1-devel
parent: (forced commit) (diff)
25 files changed, 0 insertions, 3172 deletions
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
deleted file mode 100644
index ebe205b2a6bf..000000000000
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ /dev/null
@@ -1,264 +0,0 @@
-# New ports collection makefile for: OpenOffice.org
-# Date created:		28 February 2002
-# Whom:                 Martin Blapp
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openoffice.org
-PORTVERSION=	1.1.5.${SNAPDATE}
-PORTREVISION=	4
-CATEGORIES+=	editors
-MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/1.1/ \
-		http://openoffice.lunarshells.com/sources/1.1/ \
-		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc
-DISTFILES+=	OOo_SRX645_m${MILESTONE}_source.tar.bz2
-.if defined(WITH_GPC)
-DISTFILES+=	gpc231.tar.Z:gpc
-.endif
-EXTRACT_ONLY=	OOo_SRX645_m${MILESTONE}_source.tar.bz2
-
-MAINTAINER=	openoffice@FreeBSD.org
-COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
-
-NO_LATEST_LINK=	yes
-
-MOZILLA_PROJECT=	cws_srx645_mozooo.20040203.tar.gz
-MOZILLA_VERSION=	1.0
-MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
-.if !defined(WITHOUT_MOZILLA)
-DISTFILES+=	${MOZILLA_PROJECT} ${MOZILLA_SOURCE}
-USE_GNOME+=	orbit
-.endif
-
-USE_PERL5=	yes
-USE_BISON=	build
-USE_GMAKE=	yes
-USE_BZIP2=	yes
-USE_GNOME+=	gtk20
-WITHOUT_CPU_CFLAGS=	true
-
-ONLY_FOR_ARCHS=	i386
-
-#.if !defined(WITHOUT_JAVA)
-USE_JAVA=	yes
-JAVA_VERSION=	1.4+
-JAVA_BUILD=	jdk
-JAVA_VENDOR=	freebsd bsdjava
-#.endif
-
-.include <bsd.port.pre.mk>
-.include <${FILESDIR}/Makefile.localized>
-.if ${OSVERSION} >= 700042
-BROKEN=		fails to install; consider upgrading to editors/openoffice.org-2
-.endif
-
-LANG_EXT?=	01
-LANG_CONFIGURE_ARG?=	ENUS
-L10NHELP?=     helpcontent_01_unix.tgz
-
-DISTFILES+=	${L10NHELP}
-.if defined(ALL_LOCALIZED_LANGS)
-DISTFILES+=	helpcontent_07_unix.tgz \
-		helpcontent_31_unix.tgz helpcontent_33_unix.tgz \
-		helpcontent_34_unix.tgz helpcontent_39_unix.tgz \
-		helpcontent_42_unix.tgz helpcontent_43_unix.tgz \
-		helpcontent_46_unix.tgz helpcontent_49_unix.tgz \
-		helpcontent_50_unix.tgz helpcontent_55_unix.tgz \
-		helpcontent_81_unix.tgz helpcontent_82_unix.tgz \
-		helpcontent_86_unix.tgz helpcontent_88_unix.tgz \
-		helpcontent_90_unix.tgz
-L10NHELPS=	helpcontent_01_unix.tgz helpcontent_07_unix.tgz \
-		helpcontent_31_unix.tgz helpcontent_33_unix.tgz \
-		helpcontent_34_unix.tgz helpcontent_39_unix.tgz \
-		helpcontent_42_unix.tgz helpcontent_43_unix.tgz \
-		helpcontent_46_unix.tgz helpcontent_49_unix.tgz \
-		helpcontent_50_unix.tgz helpcontent_55_unix.tgz \
-		helpcontent_81_unix.tgz helpcontent_82_unix.tgz \
-		helpcontent_86_unix.tgz helpcontent_88_unix.tgz \
-		helpcontent_90_unix.tgz
-.endif
-
-CODELINE=		645
-RELEASE_NR=		1.1.5
-MILESTONE=		67
-SNAPDATE=		20070906
-INSTALLATION_BASEDIR=	OpenOffice.org${RELEASE_NR}
-EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
-DIST_SUBDIR=		openoffice.org1.1
-SIMPLEOSVER=		${OSREL:C/\.//g}
-PACKAGE_BASENAME=       OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
-
-# FIXME (Somehow INDEX build fails)
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=          ${LANG_PKGNAME}-
-.endif
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX?=         -${LANG_SUFFIX}
-.endif
-
-USE_GCC=	3.3 #3.3 is the best
-.if defined(WITH_CCACHE)
-BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
-CCACHE_PREFIX=	ccache
-OOOCC=		${CCACHE_PREFIX} ${CC}
-OOOCXX=		${CCACHE_PREFIX} ${CXX}
-.else
-OOOCC=		${CC}
-OOOCXX=		${CXX}
-.endif
-CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"           \
-		CPPFLAGS="-I${LOCALBASE}/include"       \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
-		unzip:${PORTSDIR}/archivers/unzip \
-		gcp:${PORTSDIR}/sysutils/coreutils \
-		imake:${PORTSDIR}/devel/imake
-#.if defined(WITHOUT_JAVA)
-#LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
-#.endif
-.if !defined(WITH_GPC)
-LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
-.endif
-GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/SRX645_m${MILESTONE}
-CONFIGURE_WRKSRC=	${WRKSRC}/config_office
-TCSH?=		/bin/tcsh
-PKGMESSAGE=	${WRKDIR}/pkg-message
-NUMOFPROCESSES?=	1
-
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --enable-pasf --enable-crashdump --enable-symbols=SMALL #gcc3.2.3 is broken with -g1
-
-.include <${FILESDIR}/Makefile.knobs>
-
-pre-everything::
-# really tweak, extremely useful when you build all localized language versions
-# needed after when you build with ALL_LOCALIZED_LANGS.
-.if defined(TWEAK_L10N)
-	@${RM} -f ${WRKDIR}/.PLIST*
-	@${RM} -f ${WRKDIR}/.install_done.*
-	@${RM} -f ${WRKDIR}/.package_done.*
-	@${RM} -f ${WRKDIR}/.extract_done.*
-	@${RM} -f ${WRKDIR}/.patch_done.*
-	@${RM} -f ${WRKDIR}/.configure_done.*
-	@${RM} -f ${WRKDIR}/.build_done.*
-	@${TOUCH} ${EXTRACT_COOKIE}
-	@${TOUCH} ${PATCH_COOKIE}
-	@${TOUCH} ${CONFIGURE_COOKIE}
-	@${TOUCH} ${BUILD_COOKIE}
-.endif
-
-post-extract:
-.if defined(WITH_TTF_BYTECODE_ENABLED)
-	@cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype
-.endif
-.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
-	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP ; \
-		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
-.if defined(ALL_LOCALIZED_LANGS)
-	@cd ${WRKDIR}/L10NHELP ; \
-	for helpfile in ${L10NHELPS}; do \
-		${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$helpfile | ${GZIP_CMD} -d | ${TAR} xf - ; \
-	done
-.endif
-.if !defined(WITHOUT_MOZILLA)
-	@(cd ${WRKSRC} ; ${MV} moz moz.old ; ${TAR} xfz ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_PROJECT} ; ${PATCH} < ${FILESDIR}/moz-patch)
-	@${MKDIR} ${WRKSRC}/moz/download
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
-	@cd ${WRKSRC} ; ${MV} moz moz.runtime ; ${MV} moz.old moz
-.endif
-
-pre-configure:
-#Workaround for moz project, it uses gcc directly.
-	@${LN} -sf `which ${CC}` ${WRKSRC}/solenv/bin/gcc
-	@${LN} -sf `which ${CC}` ${WRKSRC}/solenv/bin/cc
-	@${LN} -sf `which ${CXX}` ${WRKSRC}/solenv/bin/g++
-	@${LN} -sf `which ${CXX}` ${WRKSRC}/solenv/bin/c++
-
-do-build:
-	@cd ${WRKSRC} ; ./bootstrap
-.if !defined(WITHOUT_MOZILLA)
-	@cd ${WRKSRC}/moz.runtime ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped
-.endif
-	@${MKDIR} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck
-	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck
-# PR:84786
-.if (${NUMOFPROCESSES}>1)
-	@cd ${WRKSRC} ; ${SETENV} "LC_ALL=C" "LANG=C" ${TCSH} -c "source FreeBSDEnv.Set ; setenv TMP ${WRKSRC} ; cd instsetoo ; build.pl -P${NUMOFPROCESSES} --all"
-.else
-	@cd ${WRKSRC} ; ${SETENV} "LC_ALL=C" "LANG=C" ${TCSH} -c "source FreeBSDEnv.Set ; setenv TMP ${WRKSRC} ; dmake"
-.endif
-
-do-install:
-	@cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal/ ; ./install --prefix=${PREFIX}
-
-install-user:
-	@${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
-
-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#%%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}-sagenda
-	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
-	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
-	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setup
-	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sfax
-	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
-	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
-	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
-	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
-	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
-	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
-	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
-	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
-	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
-	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
-	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
-	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
-			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
-			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
-			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			${PKGMESSAGE}
-	@${ECHO_CMD}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
-
-package-rename:
-	@${ECHO_MSG} "===>   Rename package for OOo mirror upload";
-.if defined(LANG_SUFFIX)
-	@${MV} ${PKGFILE} \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}${PKG_SUFX}
-.elif defined(LANG_PKGNAME)
-	@${MV} ${PKGFILE} \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}${PKG_SUFX}
-.else
-	@${MV} ${PKGFILE} \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_install${PKG_SUFX}
-.endif
-
-sdk:
-	@${ECHO_MSG} "===>   Make SDK of OpenOffice.org"
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl'
-	@${MV} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/bin/OpenOffice.org${RELEASE_NR}_SDK.tar.gz ${WRKDIR}/../${PACKAGE_BASENAME}_sdk.tar.gz
-
-solver:
-	@${ECHO_MSG} "===>   Make Solver of OpenOffice.org"
-	@cd ${WRKSRC} ; ${TAR} cfz ${WRKDIR}/../${PACKAGE_BASENAME}_solver.tar.gz solver
-
-.include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-1.1-devel/distinfo b/editors/openoffice.org-1.1-devel/distinfo
deleted file mode 100644
index 3095b743bf9d..000000000000
--- a/editors/openoffice.org-1.1-devel/distinfo
+++ /dev/null
@@ -1,63 +0,0 @@
-MD5 (openoffice.org1.1/OOo_SRX645_m67_source.tar.bz2) = b098bc2855e26bebec93f03cc6eb2b18
-SHA256 (openoffice.org1.1/OOo_SRX645_m67_source.tar.bz2) = c4bd3c2b3b2b1f8016d7c0529bf6d4a0a5511b2e25dd01ba00368f58ca63c2ef
-SIZE (openoffice.org1.1/OOo_SRX645_m67_source.tar.bz2) = 201137427
-MD5 (openoffice.org1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-SHA256 (openoffice.org1.1/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
-SIZE (openoffice.org1.1/gpc231.tar.Z) = 27917
-MD5 (openoffice.org1.1/cws_srx645_mozooo.20040203.tar.gz) = 1239aad43c65d6808b6261ea9d60fb67
-SHA256 (openoffice.org1.1/cws_srx645_mozooo.20040203.tar.gz) = 842984e791f0e674f7daa42ab368e2f32acfedad3b97e99e3ea84309f4cc227f
-SIZE (openoffice.org1.1/cws_srx645_mozooo.20040203.tar.gz) = 39708
-MD5 (openoffice.org1.1/mozilla-source-1.0.tar.gz) = 35a7524c2fbb773e23449179c5cb1f20
-SHA256 (openoffice.org1.1/mozilla-source-1.0.tar.gz) = 9440b80a02ab87d4fb0f7116d43784e45c48782ebefb4ac7c53f5dbadbf92eea
-SIZE (openoffice.org1.1/mozilla-source-1.0.tar.gz) = 39881558
-MD5 (openoffice.org1.1/helpcontent_01_unix.tgz) = 7da2aff674c2c84aba8b21ac2ab16bb6
-SHA256 (openoffice.org1.1/helpcontent_01_unix.tgz) = abc582c2ccb9a66a737c20e15385fb77a79090120168f2f88323dcd04d170884
-SIZE (openoffice.org1.1/helpcontent_01_unix.tgz) = 12052480
-MD5 (openoffice.org1.1/helpcontent_07_unix.tgz) = e3ab37cbf2407d909953f06467b27611
-SHA256 (openoffice.org1.1/helpcontent_07_unix.tgz) = a6ae171dbd159be1e6c2d739e779b9cb88e20e29366909587a361aa0842bd85c
-SIZE (openoffice.org1.1/helpcontent_07_unix.tgz) = 13820401
-MD5 (openoffice.org1.1/helpcontent_31_unix.tgz) = c7e618e2d9b8bd25cae12954ef2548c9
-SHA256 (openoffice.org1.1/helpcontent_31_unix.tgz) = 6372ad8ab1563a9fc92e9f60809d32c841a81854e4f943910a1c413eca6e879f
-SIZE (openoffice.org1.1/helpcontent_31_unix.tgz) = 12073861
-MD5 (openoffice.org1.1/helpcontent_33_unix.tgz) = 68d58bc30b485a77c0a0fba08af3aee3
-SHA256 (openoffice.org1.1/helpcontent_33_unix.tgz) = ffa6fcfc7bf88c06a4685c00bea137fc573c70cdf875e14a6fe7727fc87821d0
-SIZE (openoffice.org1.1/helpcontent_33_unix.tgz) = 12574720
-MD5 (openoffice.org1.1/helpcontent_34_unix.tgz) = 8696bbee3dc4d5b6fd60218123016e29
-SHA256 (openoffice.org1.1/helpcontent_34_unix.tgz) = 4b04d126f0c6a7effad6a6c343d2d64400ce3b9c30c709a7326a6ac05e66f820
-SIZE (openoffice.org1.1/helpcontent_34_unix.tgz) = 12554240
-MD5 (openoffice.org1.1/helpcontent_39_unix.tgz) = c2ae86d02f462d2b663d621190f5ef34
-SHA256 (openoffice.org1.1/helpcontent_39_unix.tgz) = 32d13d5278f521d650c59b4a8b4242700964257001e5112872010bdd444aba09
-SIZE (openoffice.org1.1/helpcontent_39_unix.tgz) = 12482560
-MD5 (openoffice.org1.1/helpcontent_42_unix.tgz) = 1b5f3f30c7939c2244f654bab0a68d91
-SHA256 (openoffice.org1.1/helpcontent_42_unix.tgz) = a75f60f44eb979595a163d172e5c80eb269ac5b0acd08aa2a8bacc964747a2ae
-SIZE (openoffice.org1.1/helpcontent_42_unix.tgz) = 13250743
-MD5 (openoffice.org1.1/helpcontent_43_unix.tgz) = 1869d02ead606229a1fb94ec7abc33d9
-SHA256 (openoffice.org1.1/helpcontent_43_unix.tgz) = 99903a6da10a504ef148e2dc64cd2452f4ef0ba45f1295330975618ba7bdf4e1
-SIZE (openoffice.org1.1/helpcontent_43_unix.tgz) = 9016309
-MD5 (openoffice.org1.1/helpcontent_46_unix.tgz) = 7b013981edce2fabe4a8751ff64a8d58
-SHA256 (openoffice.org1.1/helpcontent_46_unix.tgz) = b47fe8c510b72b35a008e63a95a9693a1353f7dad38148b0f482d42a675a6747
-SIZE (openoffice.org1.1/helpcontent_46_unix.tgz) = 12072960
-MD5 (openoffice.org1.1/helpcontent_49_unix.tgz) = a39f44ec40f452c963a4a187f31d1acb
-SHA256 (openoffice.org1.1/helpcontent_49_unix.tgz) = 1f4c28fc65df26cd538b90c30f7ec57f1101f95766422233e13aae9d5421d31b
-SIZE (openoffice.org1.1/helpcontent_49_unix.tgz) = 13649920
-MD5 (openoffice.org1.1/helpcontent_50_unix.tgz) = 5e0464e3940d589c6358da4f2a3fbfae
-SHA256 (openoffice.org1.1/helpcontent_50_unix.tgz) = 26ce7fed08498bbc3b3008dcaf5d9fcdae7735c01dc92b2f8db83a4a09bcf3f8
-SIZE (openoffice.org1.1/helpcontent_50_unix.tgz) = 15804777
-MD5 (openoffice.org1.1/helpcontent_55_unix.tgz) = 804d3ce61e11335193a410aaf9603f8e
-SHA256 (openoffice.org1.1/helpcontent_55_unix.tgz) = fda279f73155211e00ebb7cbbb5246a98f11bd4e20f9b803987ff5f222f21ead
-SIZE (openoffice.org1.1/helpcontent_55_unix.tgz) = 11549758
-MD5 (openoffice.org1.1/helpcontent_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
-SHA256 (openoffice.org1.1/helpcontent_81_unix.tgz) = 720a260e2fdf21eab6a336773ae560ac49d7f7f157ff1cd15cf4214f24106851
-SIZE (openoffice.org1.1/helpcontent_81_unix.tgz) = 12902400
-MD5 (openoffice.org1.1/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
-SHA256 (openoffice.org1.1/helpcontent_82_unix.tgz) = 9734bc94337252b7dfa7d238c4846403f8052f40da0e307a1f38360c556cf670
-SIZE (openoffice.org1.1/helpcontent_82_unix.tgz) = 12369920
-MD5 (openoffice.org1.1/helpcontent_86_unix.tgz) = aee37935139c5ccd4b6d8abdd2037c66
-SHA256 (openoffice.org1.1/helpcontent_86_unix.tgz) = 1578e0f45c4fc2eeda6f0348df5892c30db11d923b458ec2d07ad3092d141d58
-SIZE (openoffice.org1.1/helpcontent_86_unix.tgz) = 12769280
-MD5 (openoffice.org1.1/helpcontent_88_unix.tgz) = 3b00571318e45965dee0545d86306d65
-SHA256 (openoffice.org1.1/helpcontent_88_unix.tgz) = f31bbc3ab5b25be9b517554e1cb7d2beff11b054dc1774acf7e3430295624ee0
-SIZE (openoffice.org1.1/helpcontent_88_unix.tgz) = 12953600
-MD5 (openoffice.org1.1/helpcontent_90_unix.tgz) = 9521a01c5817e87178f356762f8cdab5
-SHA256 (openoffice.org1.1/helpcontent_90_unix.tgz) = 9b8e26d12afd8d92c4bd370cee2c04a45ea0989052822371a7b53b70ca981688
-SIZE (openoffice.org1.1/helpcontent_90_unix.tgz) = 12495734
diff --git a/editors/openoffice.org-1.1-devel/files/Makefile.knobs b/editors/openoffice.org-1.1-devel/files/Makefile.knobs
deleted file mode 100644
index c6f11485627b..000000000000
--- a/editors/openoffice.org-1.1-devel/files/Makefile.knobs
+++ /dev/null
@@ -1,100 +0,0 @@
-# Makefile for knobs
-# Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1-devel/files/Attic/Makefile.knobs,v 1.5 2006-05-28 10:03:53 maho Exp $
-
-#.if defined(WITHOUT_JAVA)
-#CONFIGURE_ARGS+=	--disable-java
-#.else
-CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}"
-#.endif
-
-.if !defined(WITH_GPC)
-CONFIGURE_ARGS+=	--enable-libart
-.endif
-
-.if defined(WITHOUT_MOZILLA)
-CONFIGURE_ARGS+=	--disable-mozilla
-.endif
-
-.if defined(ALL_LOCALIZED_LANGS)
-CONFIGURE_ARGS+=	--with-lang=ALL
-.else
-CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG}
-.endif
-
-.if defined(WITH_DEBUG)
-.if ${WITH_DEBUG} == 2
-CONFIGURE_ARGS+=	--enable-debug
-.else
-CONFIGURE_ARGS+=	--enable-symbols
-.endif
-.endif
-
-pre-fetch:
-.if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
-	@${ECHO}
-	@${ECHO} "WARNING"
-	@${ECHO} "Your rtld seems to be old."
-	@${ECHO} "Please remake your rtld by:"
-	@${ECHO} "[1] if you use 4-series:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
-	@${ECHO} "# make ; make depend ; make install"
-	@${ECHO} "[2] if you use 5-series:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
-	@${ECHO} "# make ; make depend ; make install"
-	@${ECHO} "AT YOUR OWN RISK!"
-.endif
-	@${ECHO} "OPTIONS:"
-.if !defined(WITH_DEBUG)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with debug symbols with WITH_DEBUG=1"
-	@${ECHO}
-	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OOo debug support."
-.endif
-.if !defined(WITHOUT_MOZILLA)
-	@${ECHO}
-	@${ECHO} "You can compile OOo without Mozilla connectivity by"
-	@${ECHO} "make -DWITHOUT_MOZILLA"
-.endif
-.if !defined(WITH_TTF_BYTECODE_ENABLED)
-	@${ECHO}
-	@${ECHO} "You may get better quality of glyphs"
-	@${ECHO} "at small bitmap sizes, If you have"
-	@${ECHO} "licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479, by"
-	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
-	@${ECHO} "See http://www.freetype.org/patents.html for details"
-.endif
-.if !defined(LOCALIZED_LANG)
-	@${ECHO}
-	@${ECHO} "You can select the language for OOo by making it with 'make LOCALIZED_LANG=xx'"
-	@${ECHO} "while xx can be one of the following:"
-	@${ECHO} "af ar ca cs de dk el es et eu fi fr gl-ES he hi-IN"
-	@${ECHO} "hu it ja kn-IN ko lt nb nl nn ns pl pt pt-BR ru sk"
-	@${ECHO} "sl-SI sv th tn tr we zh-CN zh-TW zu"
-	@${ECHO}
-.endif
-#.if !defined(WITHOUT_JAVA)
-#	@${ECHO}
-#	@${ECHO} "You can compile OOo without Java support by"
-#	@${ECHO} "make -DWITHOUT_JAVA"
-#.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 OpenOffice.org, you should have a lot"
-.if defined(WITH_DEBUG)
-	@${ECHO} "of free diskspace (~ 8GB)."
-.else
-	@${ECHO} "of free diskspace (~ 4GB)."
-.endif
-	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
-
diff --git a/editors/openoffice.org-1.1-devel/files/Makefile.localized b/editors/openoffice.org-1.1-devel/files/Makefile.localized
deleted file mode 100644
index 142de09a2e70..000000000000
--- a/editors/openoffice.org-1.1-devel/files/Makefile.localized
+++ /dev/null
@@ -1,290 +0,0 @@
-# localized makefile
-# Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1-devel/files/Attic/Makefile.localized,v 1.8 2008-04-19 17:48:18 miwi Exp $
-
-################################################################
-# consult config_office/set_soenv.in for available languages
-################################################################
-.if defined(LOCALIZED_LANG)
-.if ${LOCALIZED_LANG} == "af"
-LANG_PKGNAME=   af
-LANG_EXT=       27
-LANG_CONFIGURE_ARG=     AFRIK
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ar"
-CATEGORIES+=     arabic
-LANG_PKGNAME=   ar
-LANG_EXT=       96
-LANG_CONFIGURE_ARG=     ARAB
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "eu"
-LANG_PKGNAME=   eu
-LANG_EXT=       10
-LANG_CONFIGURE_ARG=     BASQUE
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ca"
-LANG_PKGNAME=   ca
-LANG_EXT=       37
-LANG_CONFIGURE_ARG=     CAT
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "zh-CN"
-CATEGORIES+=	chinese
-LANG_PKGNAME=	zh
-LANG_SUFFIX=	CN
-LANG_EXT=       86
-LANG_CONFIGURE_ARG=	CHINSIM
-BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
-L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "zh-TW"
-CATEGORIES+=	chinese
-LANG_PKGNAME=	zh
-LANG_SUFFIX=	TW
-LANG_EXT=	88
-LANG_CONFIGURE_ARG=	CHINTRAD
-BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
-L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "cs"
-LANG_PKGNAME=   cs
-LANG_EXT=       42
-LANG_CONFIGURE_ARG=     CZECH
-L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "dk"
-LANG_PKGNAME=   dk
-LANG_EXT=       45
-LANG_CONFIGURE_ARG=     DAN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "nl"
-LANG_PKGNAME=	nl
-LANG_EXT=	31
-L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
-LANG_CONFIGURE_ARG=	DTCH
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "et"
-LANG_PKGNAME=   et
-LANG_EXT=       77
-LANG_CONFIGURE_ARG=     ESTONIAN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "fi"
-LANG_PKGNAME=   fi
-LANG_EXT=       35
-LANG_CONFIGURE_ARG=     FINN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "fr"
-CATEGORIES+=     french
-LANG_PKGNAME=   fr
-LANG_EXT=       33
-L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
-LANG_CONFIGURE_ARG=     FREN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "gl-ES"
-LANG_PKGNAME=	gl
-LANG_SUFFIX=	ES
-LANG_EXT=       38
-LANG_CONFIGURE_ARG=     GAL
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "de"
-CATEGORIES+=	german
-LANG_PKGNAME=	de
-LANG_EXT=	49
-L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
-LANG_CONFIGURE_ARG=	GER
-COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "el"
-LANG_PKGNAME=   el
-LANG_EXT=       30
-LANG_CONFIGURE_ARG=     GREEK
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "he"
-LANG_PKGNAME=   he
-LANG_EXT=       97
-LANG_CONFIGURE_ARG=     HEBREW
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "hi-IN"
-LANG_PKGNAME=   hi
-LANG_EXT=       91
-LANG_CONFIGURE_ARG=     HINDI
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "hu"
-CATEGORIES+=     hungarian
-LANG_PKGNAME=   hu
-LANG_EXT=       36
-LANG_CONFIGURE_ARG=     HUNG
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "it"
-LANG_PKGNAME=   it
-LANG_EXT=       39
-L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
-LANG_CONFIGURE_ARG=     ITAL
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ja"
-CATEGORIES+=	japanese
-LANG_PKGNAME=   ja
-LANG_EXT=       81
-LANG_CONFIGURE_ARG=     JAPN
-MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,}
-RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf
-L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "kn-IN"
-LANG_PKGNAME=   kn
-LANG_SUFFIX=	IN
-LANG_EXT=       93
-LANG_CONFIGURE_ARG=     KANNADA
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ko"
-CATEGORIES+=     korean
-LANG_PKGNAME=   ko
-LANG_EXT=       82
-LANG_CONFIGURE_ARG=     KOREAN
-L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "lt"
-LANG_PKGNAME=   lt
-LANG_EXT=	58
-LANG_CONFIGURE_ARG=     LITHUANIAN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "nb"
-LANG_PKGNAME=   nb
-LANG_EXT=       47
-LANG_CONFIGURE_ARG=     NORBOK
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "nn"
-LANG_PKGNAME=   nn
-LANG_EXT=       79
-LANG_CONFIGURE_ARG=     NORNYN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ns"
-LANG_PKGNAME=   ns
-LANG_EXT=       26
-LANG_CONFIGURE_ARG=     NSOTHO
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "pl"
-CATEGORIES+=	polish
-LANG_PKGNAME=	pl
-LANG_EXT=	48
-LANG_CONFIGURE_ARG=	POL
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "pt"
-COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
-CATEGORIES+=	portuguese
-LANG_PKGNAME=	pt
-LANG_EXT=	03
-LANG_CONFIGURE_ARG=	PORT
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "pt-BR"
-COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
-CATEGORIES+=     portuguese
-LANG_PKGNAME=	pt
-LANG_SUFFIX=	BR
-L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
-LANG_EXT=	55
-LANG_CONFIGURE_ARG=	PORTBR
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ru"
-CATEGORIES+=	russian
-LANG_PKGNAME=	ru
-LANG_EXT=	07
-LANG_CONFIGURE_ARG=	RUSS
-L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sk"
-LANG_PKGNAME=	sk
-LANG_EXT=	43
-LANG_CONFIGURE_ARG=	SLOVAK
-L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sl-SI"
-LANG_PKGNAME=	sl
-LANG_SUFFIX=	SI
-LANG_EXT=	50
-LANG_CONFIGURE_ARG=	SLOVENIAN
-L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "es"
-LANG_PKGNAME=   es
-LANG_EXT=       34
-L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
-LANG_CONFIGURE_ARG=     SPAN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sv"
-LANG_PKGNAME=	sv
-LANG_EXT=	46
-L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
-LANG_CONFIGURE_ARG=	SWED
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "th"
-LANG_PKGNAME=	th
-LANG_EXT=	66
-LANG_CONFIGURE_ARG=	THAI
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "tn"
-LANG_PKGNAME=	tn
-LANG_EXT=	29
-LANG_CONFIGURE_ARG=	TSWANA
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "tr"
-LANG_PKGNAME=	tr
-LANG_EXT=	90
-LANG_CONFIGURE_ARG=	TURK
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "we"
-LANG_PKGNAME=   cy
-LANG_EXT=       53
-LANG_CONFIGURE_ARG=     WELSH
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "zu"
-LANG_PKGNAME=   zu
-LANG_EXT=       28
-LANG_CONFIGURE_ARG=     ZULU
-.endif
-################################################################
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=		${LANG_PKGNAME}-
-.endif
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX?=		-${LANG_SUFFIX}
-.endif
-.endif
-
diff --git a/editors/openoffice.org-1.1-devel/files/generate.pl b/editors/openoffice.org-1.1-devel/files/generate.pl
deleted file mode 100644
index 2a3cb48b1ea7..000000000000
--- a/editors/openoffice.org-1.1-devel/files/generate.pl
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/perl
-# generate full build shell script for OpenOffice.org
-# Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD$
-
-print "#!/bin/csh\n";
-print "make deinstall clean\n";
-print "/usr/bin/time -h make WITH_CCACHE=yes install package package-rename solver sdk deinstall >& log.en\n";
-print "rm work/.configure* work/.build* \n";
-print "/usr/bin/time -h make ALL_LOCALIZED_LANGS=yes >& log.all\n";
-
-open ( FILE,  "< Makefile.localized") ;
-while(<FILE>){
-@tmp=split (' ',$_);
-@tmp2=split ('"',$tmp[3]);
-if ( $tmp[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 package package-rename deinstall >& log.$LANG\n";
-	}
-}
-close FILE;
diff --git a/editors/openoffice.org-1.1-devel/files/moz-patch b/editors/openoffice.org-1.1-devel/files/moz-patch
deleted file mode 100644
index b37c1cbc1b37..000000000000
--- a/editors/openoffice.org-1.1-devel/files/moz-patch
+++ /dev/null
@@ -1,278 +0,0 @@
-#iZ 28398
-#iZ 11424
-
-http://qa.openoffice.org/issues/show_bug.cgi?id=28398
-http://qa.openoffice.org/issues/show_bug.cgi?id=11424
-
-disable freetype2 support since build broken and
-this functionality is not used at all.
-
-fix build after /usr/bin/objformat removal
-
---- moz/extractfiles.mk.org	Sat Oct 30 22:01:49 2004
-+++ moz/extractfiles.mk	Sat Oct 30 22:00:21 2004
-@@ -269,8 +269,8 @@
- 	+$(COPY) /QSZ $(INCLUDE_PATH)* $(INCLUDE_DIR)
- 	+$(COPY) /QSZ $(PUBLIC_PATH)* $(INCLUDE_DIR)
- .ELSE
--	+$(GNUCOPY) -pr $(INCLUDE_PATH)* $(INCLUDE_DIR)
--	+$(GNUCOPY) -pr $(PUBLIC_PATH)* $(INCLUDE_DIR)
-+	+$(GNUCOPY) -Lr $(INCLUDE_PATH)* $(INCLUDE_DIR)
-+	+$(GNUCOPY) -Lr $(PUBLIC_PATH)* $(INCLUDE_DIR)
- .ENDIF
- 
- .IF "$(GUI)"=="UNX"
-
---- moz/mozilla-source-1.0.patch	Thu May  3 09:11:47 2007
-+++ moz/mozilla-source-1.0.patch	Thu May  3 09:10:12 2007
-@@ -4473,12 +4473,15 @@
- 
- --- misc/build/mozilla/.mozconfig	Tue Jul 22 21:52:27 2003
- +++ misc/build/mozilla/.mozconfig	Mon Jul 28 15:07:20 2003
--@@ -0,0 +1,8 @@
-+@@ -0,0 +1,11 @@
- +ac_add_options --disable-tests
- +ac_add_options --disable-xprint
- +ac_add_options --without-system-zlib
- +ac_add_options --enable-ldap
- +ac_add_options --disable-debug
-++ac_add_options --disable-freetype2
-++ac_add_options --enable-default-toolkit=xlib
-++ac_add_options --disable-pedantic
- +ac_add_options --enable-optimize
- +ac_add_options --enable-crypto
- +ac_add_options --enable-strip
-@@ -4497,3 +4500,233 @@
-  endif
-  
-  # Windows equivalents
-+
-+--- misc/build/mozilla/xpcom/typelib/xpidl/xpidl.h	Wed Apr 10 12:38:31 2002
-++++ misc/build/mozilla/xpcom/typelib/xpidl/xpidl.h	Sat Oct 29 12:34:19 2005
-+@@ -71,10 +71,10 @@
-+  * parens, e.g. XPIDL_WARNING((foo, bar, "sil"))
-+  *
-+  * Probably best removed when we leave 6.5.  */
-+-#define XPIDL_WARNING(x) IDL_tree_warning##x
-++#define XPIDL_WARNING(x) IDL_tree_warning x
-+ #else
-+ extern void xpidl_tree_warning(IDL_tree p, int level, const char *fmt, ...);
-+-#define XPIDL_WARNING(x) xpidl_tree_warning##x
-++#define XPIDL_WARNING(x) xpidl_tree_warning x
-+ #endif
-+ 
-+ /*
-+*** misc/mozilla/configure	Tue May 28 04:29:00 2002
-+--- misc/build/mozilla/configure	Sun Sep 10 11:56:33 2006
-+***************
-+*** 4565,4571 ****
-+      ;;
-+  
-+  *-freebsd*)
-+!     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
-+  	DLL_SUFFIX=".so.1.0"
-+  	DSO_LDOPTS="-shared"
-+      fi
-+--- 4565,4571 ----
-+      ;;
-+  
-+  *-freebsd*)
-+!     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
-+  	DLL_SUFFIX=".so.1.0"
-+  	DSO_LDOPTS="-shared"
-+      fi
-+***************
-+*** 6589,6594 ****
-+--- 6589,6596 ----
-+  case $target in
-+  *-hpux11.*)
-+  	;;
-++ *-freebsd*)
-++ 	;;
-+  *)
-+  	echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6
-+  echo "configure:6595: checking for gethostbyname_r in -lc_r" >&5
-+*** misc/mozilla/configure.in	Tue May 28 04:29:12 2002
-+--- misc/build/mozilla/configure.in	Sun Sep 10 11:56:18 2006
-+***************
-+*** 787,793 ****
-+      ;;
-+  
-+  *-freebsd*)
-+!     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
-+  	DLL_SUFFIX=".so.1.0"
-+  	DSO_LDOPTS="-shared"
-+      fi
-+--- 787,793 ----
-+      ;;
-+  
-+  *-freebsd*)
-+!     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
-+  	DLL_SUFFIX=".so.1.0"
-+  	DSO_LDOPTS="-shared"
-+      fi
-+***************
-+*** 1606,1611 ****
-+--- 1606,1613 ----
-+  case $target in
-+  *-hpux11.*)
-+  	;;
-++ *-freebsd*)
-++ 	;;
-+  *)
-+  	AC_CHECK_LIB(c_r, gethostbyname_r)
-+  	;;
-+*** misc/mozilla/directory/c-sdk/config/FreeBSD.mk	Wed Apr 10 11:31:55 2002
-+--- misc/build/mozilla/directory/c-sdk/config/FreeBSD.mk	Thu May  3 07:55:57 2007
-+***************
-+*** 66,72 ****
-+  
-+  ARCH			= freebsd
-+  
-+! MOZ_OBJFORMAT          := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
-+  
-+  ifeq ($(MOZ_OBJFORMAT),elf)
-+  DLL_SUFFIX		= so
-+--- 66,72 ----
-+  
-+  ARCH			= freebsd
-+  
-+! MOZ_OBJFORMAT          := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
-+  
-+  ifeq ($(MOZ_OBJFORMAT),elf)
-+  DLL_SUFFIX		= so
-+*** misc/mozilla/directory/c-sdk/configure	Wed Apr 10 11:31:53 2002
-+--- misc/build/mozilla/directory/c-sdk/configure	Thu May  3 07:58:33 2007
-+***************
-+*** 3410,3416 ****
-+  EOF
-+  
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+--- 3410,3416 ----
-+  EOF
-+  
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+*** misc/mozilla/directory/c-sdk/configure.in	Wed Apr 10 11:31:54 2002
-+--- misc/build/mozilla/directory/c-sdk/configure.in	Thu May  3 07:58:48 2007
-+***************
-+*** 900,906 ****
-+      AC_DEFINE(FREEBSD)
-+      AC_DEFINE(HAVE_BSD_FLOCK)
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+--- 900,906 ----
-+      AC_DEFINE(FREEBSD)
-+      AC_DEFINE(HAVE_BSD_FLOCK)
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+*** misc/mozilla/nsprpub/configure	Tue Sep 14 17:14:38 2004
-+--- misc/build/mozilla/nsprpub/configure	Wed Apr  4 20:56:33 2007
-+***************
-+*** 3407,3413 ****
-+  EOF
-+  
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+--- 3407,3413 ----
-+  EOF
-+  
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+*** misc/mozilla/nsprpub/configure.in	Tue Sep 14 17:14:38 2004
-+--- misc/build/mozilla/nsprpub/configure.in	Wed Apr  4 20:56:40 2007
-+***************
-+*** 922,928 ****
-+      AC_DEFINE(HAVE_BSD_FLOCK)
-+      AC_DEFINE(HAVE_SOCKLEN_T)
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+--- 922,928 ----
-+      AC_DEFINE(HAVE_BSD_FLOCK)
-+      AC_DEFINE(HAVE_SOCKLEN_T)
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+
-+*** misc/mozilla/security/coreconf/FreeBSD.mk	Wed Mar 26 20:17:25 2003
-+--- misc/build/mozilla/security/coreconf/FreeBSD.mk	Wed Apr  4 20:56:48 2007
-+***************
-+*** 63,69 ****
-+  
-+  ARCH			= freebsd
-+  
-+! MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
-+  
-+  ifeq ($(MOZ_OBJFORMAT),elf)
-+  DLL_SUFFIX		= so
-+--- 63,69 ----
-+  
-+  ARCH			= freebsd
-+  
-+! MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
-+  
-+  ifeq ($(MOZ_OBJFORMAT),elf)
-+  DLL_SUFFIX		= so
-+*** misc/mozilla/nsprpub/config/FreeBSD.mk	Wed Apr 10 12:16:03 2002
-+--- misc/build/mozilla/nsprpub/config/FreeBSD.mk	Thu May  3 08:07:27 2007
-+***************
-+*** 66,72 ****
-+  
-+  ARCH			= freebsd
-+  
-+! MOZ_OBJFORMAT          := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
-+  
-+  ifeq ($(MOZ_OBJFORMAT),elf)
-+  DLL_SUFFIX		= so
-+--- 66,72 ----
-+  
-+  ARCH			= freebsd
-+  
-+! MOZ_OBJFORMAT          := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
-+  
-+  ifeq ($(MOZ_OBJFORMAT),elf)
-+  DLL_SUFFIX		= so
-+*** misc/mozilla/nsprpub/pr/src/misc/prnetdb.c	Wed Apr 10 12:17:35 2002
-+--- misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c	Sun Sep 10 11:55:27 2006
-+***************
-+*** 105,111 ****
-+  #define _PR_HAVE_GETPROTO_R_INT
-+  #endif
-+  
-+! #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
-+  #define _PR_HAVE_GETPROTO_R
-+  #define _PR_HAVE_5_ARG_GETPROTO_R
-+  #endif
-+--- 105,112 ----
-+  #define _PR_HAVE_GETPROTO_R_INT
-+  #endif
-+  
-+! #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) ||  \
-+!     (defined(__FreeBSD__) && __FreeBSD_version > 601103)
-+  #define _PR_HAVE_GETPROTO_R
-+  #define _PR_HAVE_5_ARG_GETPROTO_R
-+  #endif
diff --git a/editors/openoffice.org-1.1-devel/files/openoffice.org-wrapper b/editors/openoffice.org-1.1-devel/files/openoffice.org-wrapper
deleted file mode 100644
index b164e90f03fc..000000000000
--- a/editors/openoffice.org-1.1-devel/files/openoffice.org-wrapper
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1-devel/files/Attic/openoffice.org-wrapper,v 1.1 2005-07-29 01:44:40 maho Exp $
-
-oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/
-program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'`
-
-case $program in
-$0)
-	$oopath/soffice "$@"
-	;;
-	*)
-	$oopath/$program "$@"
-	;;
-esac
diff --git a/editors/openoffice.org-1.1-devel/files/optpatch-freetype b/editors/openoffice.org-1.1-devel/files/optpatch-freetype
deleted file mode 100644
index fb96fb1fadac..000000000000
--- a/editors/openoffice.org-1.1-devel/files/optpatch-freetype
+++ /dev/null
@@ -1,87 +0,0 @@
-Index: freetype/freetype-2.1.4.patch
-===================================================================
-RCS file: /cvs/external/freetype/freetype-2.1.4.patch,v
-retrieving revision 1.2
-diff -u -r1.2 freetype-2.1.4.patch
---- freetype/freetype-2.1.4.patch	17 Apr 2003 15:11:01 -0000	1.2
-+++ freetype/freetype-2.1.4.patch	16 Jan 2005 08:29:56 -0000
-@@ -1,5 +1,5 @@
--*** misc/freetype-2.1.4/builds/compiler/visualc.mk	Thu Dec 14 00:44:33 2000
----- misc/build/freetype-2.1.4/builds/compiler/visualc.mk	Wed Apr  9 16:45:16 2003
-+*** 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	Sun Jan 16 17:01:31 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/ltmain.sh	Sat Jan 18 17:39:18 2003
----- misc/build/freetype-2.1.4/builds/unix/ltmain.sh	Wed Apr  9 16:45:16 2003
-+*** 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	Sun Jan 16 17:01:31 2005
- ***************
- *** 2296,2302 ****
-   	  ;;
-@@ -36,8 +36,8 @@
-   
-   	  case $version_type in
-   	    nonstopux) verstring_prefix=nonstopux ;;
--*** misc/freetype-2.1.4/builds/win32/visualc/freetype.dsp	Fri Jan 31 00:24:18 2003
----- misc/build/freetype-2.1.4/builds/win32/visualc/freetype.dsp	Wed Apr  9 16:45:16 2003
-+*** 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	Sun Jan 16 17:01:32 2005
- ***************
- *** 44,51 ****
-   # PROP Output_Dir "..\..\..\objs\release"
-@@ -57,8 +57,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	Thu Oct 31 09:29:31 2002
----- misc/build/freetype-2.1.4/include/freetype/config/ftmodule.h	Wed Apr  9 16:45:16 2003
-+*** 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	Sun Jan 16 17:01:32 2005
- ***************
- *** 1,8 ****
-   FT_USE_MODULE(autohint_module_class)
-@@ -92,8 +92,8 @@
-   FT_USE_MODULE(winfnt_driver_class)
- + #endif
-   
--*** misc/freetype-2.1.4/include/freetype/config/ftoption.h	Fri Jan 31 00:24:18 2003
----- misc/build/freetype-2.1.4/include/freetype/config/ftoption.h	Wed Apr  9 16:45:16 2003
-+*** 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 17:04:45 2005
- ***************
- *** 108,114 ****
-     /*   this will however force you to link the zlib to any program that    */
-@@ -111,8 +111,25 @@
-   
-   
-     /*************************************************************************/
--*** misc/freetype-2.1.4/src/base/ftobjs.c	Thu Mar 27 22:35:43 2003
----- misc/build/freetype-2.1.4/src/base/ftobjs.c	Sun Apr 13 17:57:51 2003
-+***************
-+*** 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	Sun Jan 16 17:01:32 2005
- ***************
- *** 804,810 ****
-       {
diff --git a/editors/openoffice.org-1.1-devel/files/patch-backtrace b/editors/openoffice.org-1.1-devel/files/patch-backtrace
deleted file mode 100644
index 41daab73dede..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-backtrace
+++ /dev/null
@@ -1,96 +0,0 @@
-Issuetracker : #iXXXXX#
-CWS          : N/A
-Author       : <maho@openoffice.org> (JCA)
-Description  : FreeBSD porting : An implementation of backtrace at sal/osl/unx
-To pass the compilation, we preparing dummy function at sal.
-We implemented this.
-
---- sal/osl/unx/backtrace.c	Tue Jul  6 19:35:44 2004
-+++ sal/osl/unx/backtrace.c	Sun Oct 23 12:07:07 2005
-@@ -155,6 +155,7 @@
- #include <pthread.h>
- #include <setjmp.h>
- #include <stdio.h>
-+#include <stddef.h>
- #include "backtrace.h"
- 
- #define FRAME_PTR_OFFSET 1
-@@ -162,11 +163,55 @@
- 
- int backtrace( void **buffer, int max_frames )
- {
--	return 1;
-+	struct frame *fp;
-+	jmp_buf ctx;
-+	int i;
-+	/* get stack- and framepointer */
-+	setjmp(ctx);
-+	fp = (struct frame*)(((size_t*)(ctx))[FRAME_PTR_OFFSET]);
-+	for ( i=0; (i<FRAME_OFFSET) && (fp!=0); i++)
-+		fp = fp->fr_savfp;
-+	/* iterate through backtrace */
-+	for (i=0; fp && fp->fr_savpc && i<max_frames; i++)
-+	{
-+		/* store frame */
-+		*(buffer++) = (void *)fp->fr_savpc;
-+		/* next frame */
-+		fp=fp->fr_savfp;
-+	}
-+	return i;
- }
- 
- void backtrace_symbols_fd( void **buffer, int size, int fd )
- {
-+	FILE	*fp = fdopen( fd, "w" );
-+
-+	if ( fp )
-+	{
-+		void **pFramePtr;
-+		for ( pFramePtr = buffer; size > 0 && pFramePtr && *pFramePtr; pFramePtr++, size-- )
-+		{
-+			Dl_info		dli;
-+			ptrdiff_t	offset;
-+
-+			if ( 0 != dladdr( *pFramePtr, &dli ) )
-+			{
-+				if ( dli.dli_fname && dli.dli_fbase )
-+				{
-+					offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase;
-+					fprintf( fp, "%s+0x%x", dli.dli_fname, offset );
-+				}
-+				if ( dli.dli_sname && dli.dli_saddr )
-+				{
-+					offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr;
-+					fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
-+				}
-+			}
-+			fprintf( fp, "[0x%x]\n", *pFramePtr );
-+		}
-+		fflush( fp );
-+		fclose( fp );
-+	}
- 
- }
- #endif /* defined FREEBSD */
-Only in sal/osl/unx: backtrace.c.orig
-diff -ur ../../src/OOo_1.1.5/sal/osl/unx/backtrace.h sal/osl/unx/backtrace.h
---- sal/osl/unx/backtrace.h	Tue Jul  6 19:36:01 2004
-+++ sal/osl/unx/backtrace.h	Sun Oct 23 12:07:07 2005
-@@ -72,6 +72,16 @@
- 
- void backtrace_symbols_fd( void **buffer, int size, int fd );
- 
-+/* no frame.h on FreeBSD */
-+#if defined FREEBSD
-+struct frame {
-+	long	arg0[8];
-+	long	arg1[6];
-+	struct frame *fr_savfp;
-+	long	fr_savpc;
-+};
-+#endif
-+
- #ifdef __cplusplus
- } /* extern "C" */
- #endif
-Only in sal/osl/unx: backtrace.h.orig
diff --git a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
deleted file mode 100644
index 5726cb84a6d7..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ /dev/null
@@ -1,120 +0,0 @@
-Index: bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx
-===================================================================
-RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx,v
-retrieving revision 1.3
-diff -u -r1.3 cpp2uno.cxx
---- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	28 Apr 2003 16:28:20 -0000	1.3
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	8 Jan 2007 00:45:53 -0000
-@@ -59,9 +59,9 @@
-  *
-  ************************************************************************/
- 
-+#include <stdlib.h>
- #include <hash_map>
- 
--#include <sal/alloca.h>
- #include <rtl/alloc.h>
- #include <osl/mutex.hxx>
- 
-Index: bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx
-===================================================================
-RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx,v
-retrieving revision 1.4
-diff -u -r1.4 except.cxx
---- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	28 Apr 2003 16:41:25 -0000	1.4
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	8 Jan 2007 00:45:53 -0000
-@@ -63,6 +63,7 @@
- #include <dlfcn.h>
- #include <cxxabi.h>
- #include <hash_map>
-+#include <sys/param.h>
- 
- #include <rtl/strbuf.hxx>
- #include <rtl/ustrbuf.hxx>
-@@ -147,7 +148,11 @@
- };
- //__________________________________________________________________________________________________
- RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 602103 /* #i22253# */
-+    : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
-+#else
-     : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+#endif
- {
- }
- //__________________________________________________________________________________________________
-@@ -182,7 +187,11 @@
-         buf.append( 'E' );
- 
-         OString symName( buf.makeStringAndClear() );
-+#if __FreeBSD_version < 602103 /* #i22253# */
-+        rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
-+#else
-         rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+#endif
- 
-         if (rtti)
-         {
-@@ -253,7 +262,7 @@
- //==================================================================================================
- void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
- {
--#if defined DEBUG
-+#if OSL_DEBUG_LEVEL > 1
-     OString cstr(
-         OUStringToOString(
-             *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-@@ -275,7 +284,7 @@
-             *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-             Reference< XInterface >() );
-     }
--    
-+
- 	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
- 	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
- 
-@@ -321,16 +330,16 @@
-             Reference< XInterface >() );
-         Type const & rType = ::getCppuType( &aRE );
-         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
--#if defined _DEBUG
-+#if OSL_DEBUG_LEVEL > 0
-         OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-         OSL_ENSURE( 0, cstr.getStr() );
- #endif
-         return;
-     }
--    
-+
- 	typelib_TypeDescription * pExcTypeDescr = 0;
-     OUString unoName( toUNOname( header->exceptionType->name() ) );
--#if defined DEBUG
-+#if OSL_DEBUG_LEVEL > 1
-     OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
-     fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
- #endif
-@@ -342,7 +351,7 @@
-             Reference< XInterface >() );
-         Type const & rType = ::getCppuType( &aRE );
-         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
--#if defined _DEBUG
-+#if OSL_DEBUG_LEVEL > 0
-         OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-         OSL_ENSURE( 0, cstr.getStr() );
- #endif
-Index: bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx
-===================================================================
-RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx,v
-retrieving revision 1.4
-diff -u -r1.4 uno2cpp.cxx
---- bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	28 Apr 2003 16:28:35 -0000	1.4
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	8 Jan 2007 00:45:53 -0000
-@@ -59,7 +59,7 @@
-  *
-  ************************************************************************/
- 
--#include <sal/alloca.h>
-+#include <stdlib.h>
- #include <rtl/alloc.h>
- 
- #include <uno/data.h>
diff --git a/editors/openoffice.org-1.1-devel/files/patch-gethostbyname_r b/editors/openoffice.org-1.1-devel/files/patch-gethostbyname_r
deleted file mode 100644
index 63b243e146f9..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-gethostbyname_r
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: sal/osl/unx/socket.c
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/socket.c,v
-retrieving revision 1.22.10.1
-diff -u -r1.22.10.1 socket.c
---- sal/osl/unx/socket.c	18 Aug 2003 15:12:26 -0000	1.22.10.1
-+++ sal/osl/unx/socket.c	10 Sep 2006 03:18:08 -0000
-@@ -836,7 +836,7 @@
- 	const char *name, struct hostent *result,
- 	char *buffer, int buflen, int *h_errnop)
- {
--#ifdef LINUX
-+#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.8
-diff -u -r1.8 system.c
---- sal/osl/unx/system.c	16 Jul 2003 17:21:47 -0000	1.8
-+++ sal/osl/unx/system.c	10 Sep 2006 03:18:08 -0000
-@@ -371,6 +371,8 @@
- 
- extern int h_errno;
- 
-+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
-+
- struct hostent *gethostbyname_r(const char *name, struct hostent *result,
- 								char *buffer, int buflen, int *h_errnop)
- {
-@@ -459,6 +461,8 @@
- 
-   	return res;
- }
-+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
-+
- 
- #if defined(MACOSX)
- /*
- 
---- sal/osl/unx/system.h.orig	Fri Aug 15 20:38:50 2003
-+++ sal/osl/unx/system.h	Sun Sep 10 13:32:43 2006
-@@ -576,8 +576,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 < 601103)
- struct hostent *gethostbyname_r(const char *name, struct hostent *result,
- 								char *buffer, int buflen, int *h_errnop);
-+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
- #endif
- 
- #endif /* __OSL_SYSTEM_H__ */
diff --git a/editors/openoffice.org-1.1-devel/files/patch-icu+icu-2.2.patch b/editors/openoffice.org-1.1-devel/files/patch-icu+icu-2.2.patch
deleted file mode 100644
index 443730140dd5..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-icu+icu-2.2.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Issuetracker : #iXXXXX#
-CWS          : N/A
-Author       : <maho@openoffice.org> (JCA)
-Description  : FreeBSD porting : Passing $ORIGIN to linker at icu project
-We also want to pass -rpath $ORIGIN to linker as GNU/Linux and/or Solaris's case.
-and unbreak the build with 
-ccache gcc33 -O  -Wl,-rpath,'$ORIGIN' -o genrb errmsg.o genrb.o parse.o read.o reslist.o ustr.o util.o wrtjava.o rle.o -L../../i18n -licui18n -L../../tools/toolutil -licutoolutil -L../../common -licuuc -L../../data/out -L../../stubdata -licudata -lpthread -lm
-../../i18n/libicui18n.so: undefined reference to `vtable for __cxxabiv1::__class_type_info@GLIBCPP_3.2'
-../../i18n/libicui18n.so: undefined reference to `vtable for __cxxabiv1::__vmi_class_type_info@GLIBCPP_3.2'
-../../i18n/libicui18n.so: undefined reference to `__gxx_personality_v0@CXXABI_1.2'
-../../i18n/libicui18n.so: undefined reference to `vtable for __cxxabiv1::__si_class_type_info@GLIBCPP_3.2'
-../../i18n/libicui18n.so: undefined reference to `__cxa_pure_virtual@CXXABI_1.2'
-collect2: ld returned 1 exit status
-gmake[2]: *** [genrb] Error 1
-
-Index: icu/icu-2.2.patch
-===================================================================
-RCS file: /cvs/external/icu/Attic/icu-2.2.patch,v
-retrieving revision 1.17.6.2
-diff -u -r1.17.6.2 icu-2.2.patch
---- icu/icu-2.2.patch	6 Jul 2004 10:40:19 -0000	1.17.6.2
-+++ icu/icu-2.2.patch	21 Jun 2006 13:15:33 -0000
-@@ -1127,3 +1127,71 @@
-           return tempGlyphCount;
-       };
-   
-+*** misc/icu/source/config/mh-bsd-gcc	Thu May  2 08:48:10 2002
-+--- misc/build/icu/source/config/mh-bsd-gcc	Mon Oct 24 18:21:04 2005
-+***************
-+*** 10,15 ****
-+--- 10,18 ----
-+  GEN_DEPS.cc=	$(CXX) -E -MM $(DEFS) $(CPPFLAGS)
-+  
-+  ## Flags for position independent code
-++ STATICCFLAGS = -fPIC 
-++ STATICCXXFLAGS = -fPIC 
-++ STATICCPPFLAGS = -DPIC 
-+  SHAREDLIBCFLAGS = -fPIC
-+  SHAREDLIBCXXFLAGS = -fPIC
-+  SHAREDLIBCPPFLAGS = -DPIC
-+***************
-+*** 17,22 ****
-+--- 20,32 ----
-+  ## Compiler switch to embed a runtime search path
-+  LD_RPATH=	
-+  LD_RPATH_PRE=	-Wl,-rpath,
-++ 
-++ ## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH
-++ ENABLE_RPATH=YES
-++ RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN'
-++ 
-++ #SH#	ENABLE_RPATH=YES
-++ #SH#	RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN'"
-+  
-+  ## Compiler switch to embed a library name
-+  LD_SONAME = -Wl,-soname -Wl,$(MIDDLE_SO_TARGET)
-+*** misc/icu/source/common/Makefile.in	Tue Aug 13 05:30:14 2002
-+--- misc/build/icu/source/common/Makefile.in	Wed Jun 21 21:58:59 2006
-+***************
-+*** 142,148 ****
-+  
-+  ifneq ($(ENABLE_SHARED),)
-+  $(FINAL_SO_TARGET): $(OBJECTS)
-+! 	$(SHLIB.cc) $(LD_SONAME) -o $@ $^ $(LIBS)
-+  
-+  ifeq ($(OS390BATCH),1)
-+  $(BATCH_TARGET): $(OBJECTS)
-+--- 142,148 ----
-+  
-+  ifneq ($(ENABLE_SHARED),)
-+  $(FINAL_SO_TARGET): $(OBJECTS)
-+! 	$(SHLIB.c) $(LD_SONAME) -o $@ $^ $(LIBS)
-+  
-+  ifeq ($(OS390BATCH),1)
-+  $(BATCH_TARGET): $(OBJECTS)
-+*** misc/icu/source/i18n/Makefile.in	Wed Aug 14 09:38:40 2002
-+--- misc/build/icu/source/i18n/Makefile.in	Wed Jun 21 22:07:23 2006
-+***************
-+*** 134,140 ****
-+  
-+  ifneq ($(ENABLE_SHARED),)
-+  $(FINAL_SO_TARGET): $(OBJECTS)
-+! 	$(SHLIB.cc) $(LD_SONAME) -o $@ $^ $(LIBS)
-+  
-+  ifeq ($(OS390BATCH),1)
-+  $(BATCH_TARGET):$(OBJECTS)
-+--- 134,140 ----
-+  
-+  ifneq ($(ENABLE_SHARED),)
-+  $(FINAL_SO_TARGET): $(OBJECTS)
-+! 	$(SHLIB.c) $(LD_SONAME) -o $@ $^ $(LIBS)
-+  
-+  ifeq ($(OS390BATCH),1)
-+  $(BATCH_TARGET):$(OBJECTS)
diff --git a/editors/openoffice.org-1.1-devel/files/patch-jdk15 b/editors/openoffice.org-1.1-devel/files/patch-jdk15
deleted file mode 100644
index f39b5414c9fa..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-jdk15
+++ /dev/null
@@ -1,778 +0,0 @@
-Index: jvmaccess/source/javainfoimpl.cxx
-===================================================================
-RCS file: /cvs/udk/jvmaccess/source/Attic/javainfoimpl.cxx,v
-retrieving revision 1.7.12.6
-diff -u -r1.7.12.6 javainfoimpl.cxx
---- jvmaccess/source/javainfoimpl.cxx	2 May 2005 13:30:59 -0000	1.7.12.6
-+++ jvmaccess/source/javainfoimpl.cxx	10 Sep 2006 04:51:58 -0000
-@@ -244,6 +244,8 @@
-                         "jdk1.4.2", \
-                         "diablo-jre1.3.1", \
-                         "diablo-jdk1.3.1", \
-+                        "diablo-jre1.5.0", \
-+                        "diablo-jdk1.5.0", \
-                         "linux-sun-jdk1.3.1", \
-                         "linux-sun-jdk1.4.2", \
-                         "linux-ibm-jdk1.3.1", \
-
-
-taken from http://wiki.linuxfromscratch.org/blfs/browser/trunk/patches/OOo_1.1.5-jdk_1.5.0_fix-1.patch?rev=5150&format=txt
---- XmlSearch/src/com/sun/xmlsearch/db/VectorBtree.java	2000-11-30 12:02:54.000000000 -0600
-+++ XmlSearch/src/com/sun/xmlsearch/db/VectorBtree.java	2005-04-19 01:56:30.289021048 -0500
-@@ -274,10 +274,10 @@
-     return accessBlock(bl.integerAt(index*4));
-   }
- 
--  public static void assert(boolean assertion) {
-+  /*public static void assert(boolean assertion) {
-     if (assertion == false)
-       System.err.println("assertion failed");
--  }
-+  }*/
- 
-   public int getIteratorBufferLength() {
-     return _blockSize + _vecLen*2;
-
---- javaunohelper/com/sun/star/comp/helper/Bootstrap.java	2004-03-30 08:23:53.000000000 -0600
-+++ javaunohelper/com/sun/star/comp/helper/Bootstrap.java	2005-04-19 01:56:30.000000000 -0500
-@@ -220,11 +220,11 @@
-         if (null != bootstrap_parameters)
-         {
-             pairs = new String [ 2 * bootstrap_parameters.size() ];
--            Enumeration enum = bootstrap_parameters.keys();
-+            Enumeration enumer = bootstrap_parameters.keys();
-             int n = 0;
--            while (enum.hasMoreElements())
-+            while (enumer.hasMoreElements())
-             {
--                String name = (String)enum.nextElement();
-+                String name = (String)enumer.nextElement();
-                 pairs[ n++ ] = name;
-                 pairs[ n++ ] = (String)bootstrap_parameters.get( name );
-             }
-
---- javaunohelper/com/sun/star/lib/loader/Loader.java	2004-03-30 08:25:21.000000000 -0600
-+++ javaunohelper/com/sun/star/lib/loader/Loader.java	2005-04-19 01:56:30.000000000 -0500
-@@ -106,9 +106,9 @@
-         ClassLoader loader = clazz.getClassLoader();
-         Vector res = new Vector();
-         try {
--            Enumeration enum = loader.getResources( "META-INF/MANIFEST.MF" );
--            while ( enum.hasMoreElements() ) {
--                res.add( (URL) enum.nextElement() );
-+            Enumeration enumer = loader.getResources( "META-INF/MANIFEST.MF" );
-+            while ( enumer.hasMoreElements() ) {
-+                res.add( (URL) enumer.nextElement() );
-             }
-             // the jarfile with the com/sun/star/lib/loader/Loader.class
-             // per-entry attribute is most probably the last resource in the
-
---- jurt/com/sun/star/comp/servicemanager/ServiceManager.java	2002-10-30 09:28:39.000000000 -0600
-+++ jurt/com/sun/star/comp/servicemanager/ServiceManager.java	2005-04-19 01:56:30.000000000 -0500
-@@ -500,10 +500,10 @@
-         throws com.sun.star.uno.RuntimeException
-     {
-         if (eventListener != null) {
--            java.util.Enumeration enum = eventListener.elements();
-+            java.util.Enumeration enumer = eventListener.elements();
-             
--            while (enum.hasMoreElements()) {
--                XEventListener listener = (XEventListener) enum.nextElement();
-+            while (enumer.hasMoreElements()) {
-+                XEventListener listener = (XEventListener) enumer.nextElement();
-                 listener.disposing(new com.sun.star.lang.EventObject(this));
-             }
-         }
-@@ -732,16 +732,16 @@
-     public XEnumeration createContentEnumeration( String serviceName )
-                 throws com.sun.star.uno.RuntimeException
-     {
--        XEnumeration enum = null;
-+        XEnumeration xenum = null;
-         
-         java.util.Vector serviceList = (java.util.Vector) factoriesByServiceNames.get(serviceName);
-         
-         if (serviceList != null)
--            enum = new ServiceEnumerationImpl( serviceList.elements() );
-+            xenum = new ServiceEnumerationImpl( serviceList.elements() );
-         else 
--            enum = new ServiceEnumerationImpl();
-+            xenum = new ServiceEnumerationImpl();
-             
--        return enum;
-+        return xenum;
- 	}
- 	  
- 	/**
-@@ -809,11 +809,11 @@
- 		/**
- 		 * Constructs a new instance with a given enumeration.
- 		 * <p>
--		 * @param	enum	is the enumeration which should been wrapped.
-+		 * @param	enumer	is the enumeration which should been wrapped.
- 		 * @see		com.sun.star.container.XEnumeration
- 		 */
--        public ServiceEnumerationImpl(java.util.Enumeration enum) {
--            enumeration = enum;
-+        public ServiceEnumerationImpl(java.util.Enumeration enumer) {
-+            enumeration = enumer;
-         }
-             
- 		/**
-
---- jurt/com/sun/star/comp/typedescriptionmanager/EnumTypeDescription.java	2001-12-03 05:00:41.000000000 -0600
-+++ jurt/com/sun/star/comp/typedescriptionmanager/EnumTypeDescription.java	2005-04-19 01:56:30.000000000 -0500
-@@ -136,12 +136,12 @@
- 				Field field = fields[nPos];
- 				int nMod = field.getModifiers();
- 				
--				if (Enum.class.isAssignableFrom( field.getType() ) &&
-+				if (com.sun.star.uno.Enum.class.isAssignableFrom( field.getType() ) &&
- 					Modifier.isPublic( nMod ) && Modifier.isFinal( nMod ) && Modifier.isStatic( nMod ))
- 				{
- 					try
- 					{
--						values[nLen] = ((Enum)field.get( null )).getValue();
-+						values[nLen] = ((com.sun.star.uno.Enum)field.get( null )).getValue();
- 						names[nLen]  = field.getName();
- 						++nLen;
- 					}
-
---- jurt/com/sun/star/comp/typedescriptionmanager/TypeDescriptionManager.java	2000-09-18 10:27:52.000000000 -0500
-+++ jurt/com/sun/star/comp/typedescriptionmanager/TypeDescriptionManager.java	2005-04-19 01:56:30.000000000 -0500
-@@ -236,7 +236,7 @@
- 								ret = new InterfaceTypeDescription( this, c );
- 							else if (c.isArray())
- 								ret = new SequenceTypeDescription( (XTypeDescription)getByClass( c.getComponentType(), bUnsigned, bInterface ) );
--							else if (Enum.class.isAssignableFrom( c ))
-+							else if (com.sun.star.uno.Enum.class.isAssignableFrom( c ))
- 								ret = new EnumTypeDescription( c );
- //  							else if (com.sun.star.uno.Union.class.isAssignableFrom( c ))
- //  								ret = new UnionTypeDescription( c );
-
---- jurt/com/sun/star/lib/uno/protocols/iiop/Marshal.java	2001-01-16 12:01:30.000000000 -0600
-+++ jurt/com/sun/star/lib/uno/protocols/iiop/Marshal.java	2005-04-19 01:56:30.000000000 -0500
-@@ -446,10 +446,10 @@
- 		writeObject(typeDescription, object);
- 	}
- 
--	void writeEnum(Enum enum) throws Exception {
--		if(DEBUG) System.err.println("##### " + getClass().getName() + ".writeEnum:" + enum + " " + enum.getValue());
-+	void writeEnum(Enum writeenum) throws Exception {
-+		if(DEBUG) System.err.println("##### " + getClass().getName() + ".writeEnum:" + writeenum + " " + writeenum.getValue());
- 
--		write_long(enum.getValue());
-+		write_long(writeenum.getValue());
- 	}
- 
- 	void writeThrowable(TypeDescription typeDescription, Throwable throwable) throws Exception {
-
---- jurt/com/sun/star/lib/uno/protocols/iiop/iiop.java	2001-02-02 03:01:03.000000000 -0600
-+++ jurt/com/sun/star/lib/uno/protocols/iiop/iiop.java	2005-04-19 01:56:30.000000000 -0500
-@@ -588,13 +588,13 @@
- 		Enumeration elements = _flushList.elements();
- 		while(elements.hasMoreElements()) {
- 			Object objects[] = (Object[])elements.nextElement();
--			Enum enum = (Enum)objects[0];
-+			Enum enumer = (Enum)objects[0];
- 			Marshal marshal = (Marshal)objects[1];
- 
- 			int size = marshal.getSize();
- 			byte bytes[] = marshal.reset();
- 
--			writeMessageHeader(enum.getValue(), size, dataOutput);
-+			writeMessageHeader(enumer.getValue(), size, dataOutput);
- 			if(DEBUG) System.err.println("##### " + getClass().getName() + ".flush - bytes:" + size);
- 
- 			dataOutput.write(bytes, 0, size);
-
---- jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java	2003-03-26 06:33:00.000000000 -0600
-+++ jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java	2005-04-19 01:56:30.000000000 -0500
-@@ -293,10 +293,10 @@
- 		writedouble(zDouble.doubleValue());
- 	}
- 
--	void writeEnum(Enum enum) {
--		if(DEBUG) System.err.println("##### " + getClass().getName() + ".writeEnum:" + enum + " " + enum.getValue());
-+	void writeEnum(Enum writeenum) {
-+		if(DEBUG) System.err.println("##### " + getClass().getName() + ".writeEnum:" + writeenum + " " + writeenum.getValue());
- 
--		writeint(enum.getValue());
-+		writeint(writeenum.getValue());
- 	}
- 
- 	void writeThrowable(ITypeDescription iTypeDescription, Throwable throwable) {
-
---- odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java	2003-03-26 07:40:24.000000000 -0600
-+++ odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java	2005-04-19 01:56:30.000000000 -0500
-@@ -200,7 +200,7 @@
-         index--;
-     }
-     
--    public org.openide.WizardDescriptor$Panel current() {
-+    public org.openide.WizardDescriptor.Panel current() {
-         return panels[index];
-     }
-     
-
---- odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java	2002-09-03 11:25:06.000000000 -0500
-+++ odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java	2005-04-19 01:56:30.000000000 -0500
-@@ -207,7 +207,7 @@
-    index--;
-   }
- 
--  public org.openide.WizardDescriptor$Panel current()
-+  public org.openide.WizardDescriptor.Panel current()
-    {
-      return panels[index];
-    }
-
---- odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java	2003-03-26 07:40:24.000000000 -0600
-+++ odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java	2005-04-19 01:56:30.000000000 -0500
-@@ -214,7 +214,7 @@
-         index--;
-     }
-     
--    public org.openide.WizardDescriptor$Panel current() {
-+    public org.openide.WizardDescriptor.Panel current() {
-         return panels[index];
-     }
-     
-
---- qadevOOo/runner/base/java_complex.java	2003-06-11 11:24:17.000000000 -0500
-+++ qadevOOo/runner/base/java_complex.java	2005-04-19 01:56:30.000000000 -0500
-@@ -178,9 +178,9 @@
-                 java.io.InputStream in = connection.getInputStream();
-                 Properties props = new Properties();
-                 props.load(in);
--                Enumeration enum = props.keys();
--                while (enum.hasMoreElements()) {
--                    String key = (String)enum.nextElement();
-+                Enumeration enumer = props.keys();
-+                while (enumer.hasMoreElements()) {
-+                    String key = (String)enumer.nextElement();
-                     String value = (String)props.get(key);
-                     param.put(key.trim(), value.trim());
-                 }
-
---- qadevOOo/runner/org/openoffice/RunnerService.java	2003-03-31 11:01:51.000000000 -0600
-+++ qadevOOo/runner/org/openoffice/RunnerService.java	2005-04-19 01:56:30.000000000 -0500
-@@ -252,10 +252,10 @@
-             // get Jar file from connection
-             java.util.jar.JarFile f = con.getJarFile();
-             // Enumerate over all entries
--            java.util.Enumeration enum = f.entries();
-+            java.util.Enumeration enumer = f.entries();
- 
--            while (enum.hasMoreElements()) {
--                String entry = enum.nextElement().toString();
-+            while (enumer.hasMoreElements()) {
-+                String entry = enumer.nextElement().toString();
-                 if (entry.endsWith(".csv")) {
-                     String module = null;
-                     String object = null;
-
---- qadevOOo/runner/util/DBTools.java	2003-01-27 10:27:05.000000000 -0600
-+++ qadevOOo/runner/util/DBTools.java	2005-04-19 01:56:30.000000000 -0500
-@@ -673,12 +673,12 @@
-         XEnumerationAccess dbContEA = (XEnumerationAccess)
-             UnoRuntime.queryInterface(XEnumerationAccess.class, dbContext) ;
- 
--        XEnumeration enum = dbContEA.createEnumeration() ;
-+        XEnumeration enumer = dbContEA.createEnumeration() ;
- 
-         out.println("DatabaseContext registered DataSource's :") ;
--        while (enum.hasMoreElements()) {
-+        while (enumer.hasMoreElements()) {
-             try {
--                DataSourceInfo inf = new DataSourceInfo(enum.nextElement()) ;
-+                DataSourceInfo inf = new DataSourceInfo(enumer.nextElement()) ;
-                 inf.printInfo(out) ;
-             } catch (com.sun.star.container.NoSuchElementException e) {}
-             catch (com.sun.star.lang.WrappedTargetException e) {}
-@@ -849,4 +849,4 @@
-         throws java.sql.SQLException {
-         statement.executeUpdate("drop table if exists " + tbl_name);
-     }
--}
-\ No newline at end of file
-+}
-
---- qadevOOo/tests/java/ifc/reflection/_XTypeDescriptionEnumerationAccess.java	2003-01-27 12:11:20.000000000 -0600
-+++ qadevOOo/tests/java/ifc/reflection/_XTypeDescriptionEnumerationAccess.java	2005-04-19 01:56:30.000000000 -0500
-@@ -94,13 +94,13 @@
-             return;
-         }
-         try {
--            XTypeDescriptionEnumeration enum = 
-+            XTypeDescriptionEnumeration enumer = 
-                         oObj.createTypeDescriptionEnumeration(sString, tClass, 
-                         TypeDescriptionSearchDepth.INFINITE);
-             try {
-                 log.println("Got an enumeration.");
-                 while (true) {
--                    XTypeDescription desc = enum.nextTypeDescription();
-+                    XTypeDescription desc = enumer.nextTypeDescription();
-                     i++;
-                     log.println("\tdesc name: " + desc.getName()); 
-                 }
-
---- qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java	2003-05-27 07:37:57.000000000 -0500
-+++ qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java	2005-04-19 01:56:30.000000000 -0500
-@@ -376,7 +376,7 @@
-             new Object[]{ new Integer(0) }, new Object[]{ new Integer(1) }});
-         tEnv.addObjRelation("Comparer", new Comparator() {
-             public int compare(Object o1, Object o2) {
--                return ((Integer)o1).compareTo(o2);
-+                return compare((Integer) o1, o2);
-             }
-             public boolean equals(Object obj) {
-              return compare(this, obj) == 0;
-
---- qadevOOo/tests/java/mod/_servicemgr.uno/OServiceManager.java	2003-05-27 08:25:05.000000000 -0500
-+++ qadevOOo/tests/java/mod/_servicemgr.uno/OServiceManager.java	2005-04-19 01:56:30.000000000 -0500
-@@ -162,12 +162,12 @@
-                 (XSet.class, oInterface) ;
-             XSet set1 = (XSet) UnoRuntime.queryInterface
-                 (XSet.class, srvMan) ;
--            XEnumeration enum = set1.createEnumeration();
--            Object srv = enum.nextElement();
-+            XEnumeration enumer = set1.createEnumeration();
-+            Object srv = enumer.nextElement();
- 
-             set.insert(srv) ;
- 
--            newElement = enum.nextElement();
-+            newElement = enumer.nextElement();
- 
-             XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(
-                                             XPropertySet.class, oInterface);
-
---- qadevOOo/tests/java/mod/_smgr/OServiceManager.java	2003-05-27 08:28:36.000000000 -0500
-+++ qadevOOo/tests/java/mod/_smgr/OServiceManager.java	2005-04-19 01:56:30.000000000 -0500
-@@ -162,12 +162,12 @@
-                 (XSet.class, oInterface) ;
-             XSet set1 = (XSet) UnoRuntime.queryInterface
-                 (XSet.class, srvMan) ;
--            XEnumeration enum = set1.createEnumeration();
--            Object srv = enum.nextElement();
-+            XEnumeration enumer = set1.createEnumeration();
-+            Object srv = enumer.nextElement();
- 
-             set.insert(srv) ;
- 
--            newElement = enum.nextElement();
-+            newElement = enumer.nextElement();
- 
-             XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(
-                                             XPropertySet.class, oInterface);
-
---- sandbox/com/sun/star/lib/sandbox/ClassContextImpl.java	2002-11-21 10:49:00.000000000 -0600
-+++ sandbox/com/sun/star/lib/sandbox/ClassContextImpl.java	2005-04-19 01:56:30.000000000 -0500
-@@ -304,10 +304,10 @@
-                         m_class_path_jars = class_path_jars;
-                     }
-                     
--                    java.util.Enumeration enum = m_class_path_jars.elements();
--                    while (enum.hasMoreElements())
-+                    java.util.Enumeration enumer = m_class_path_jars.elements();
-+                    while (enumer.hasMoreElements())
-                     {
--                        ClassContext context = (ClassContext)enum.nextElement();
-+                        ClassContext context = (ClassContext)enumer.nextElement();
-                         try
-                         {
-                             xClass = context.loadClass( className );
-
---- sj2/stardiv/app/AppletProps.java	2000-09-18 11:54:03.000000000 -0500
-+++ sj2/stardiv/app/AppletProps.java	2005-04-19 01:56:30.000000000 -0500
-@@ -138,7 +138,7 @@
- 		if (System.getProperty("http.proxyHost") != null) {
- 			proxyHost.setText(System.getProperty("http.proxyHost"));
- 			proxyPort.setText(System.getProperty("http.proxyPort"));
--			HttpClient.proxyPort = Integer.valueOf(System.getProperty("http.proxyPort")).intValue();
-+			//HttpClient.proxyPort = Integer.valueOf(System.getProperty("http.proxyPort")).intValue();
- 		} 
- 		else {
- 			proxyHost.setText("");
-
---- sj2/stardiv/controller/PropertyEditor.java	2000-09-18 11:54:03.000000000 -0500
-+++ sj2/stardiv/controller/PropertyEditor.java	2005-04-19 01:56:30.000000000 -0500
-@@ -197,10 +197,10 @@
- 
- 			m_DefaultList.removeAll();
- 			m_List.removeAll();
--	        java.util.Enumeration enum = m_Properties.propertyNames();
--	        while (enum.hasMoreElements())
-+	        java.util.Enumeration enumer = m_Properties.propertyNames();
-+	        while (enumer.hasMoreElements())
- 	        {
--	            String strKey = (String)enum.nextElement();
-+	            String strKey = (String)enumer.nextElement();
- 
- 	            if (isDefaultKey(strKey))
- 	            	addToList(m_DefaultList, strKey, m_Properties.getProperty(strKey));
-@@ -551,19 +551,19 @@
-     {
-     	int nMax = 0;
- 
--    	java.util.Enumeration enum = props.propertyNames();
--    	while (enum.hasMoreElements())
--    		nMax = Math.max(nMax, ((String)enum.nextElement()).length());
-+    	java.util.Enumeration enumer = props.propertyNames();
-+    	while (enumer.hasMoreElements())
-+    		nMax = Math.max(nMax, ((String)enumer.nextElement()).length());
- 
-     	return nMax+2;
-     }
- 
-     protected static boolean isDefaultKey(String strKey)
-     {
--    	java.util.Enumeration enum = c_DefaultProperties.elements();
--    	while (enum.hasMoreElements())
-+    	java.util.Enumeration enumer = c_DefaultProperties.elements();
-+    	while (enumer.hasMoreElements())
-     	{
--    		if (strKey.equals((String)enum.nextElement()))
-+    		if (strKey.equals((String)enumer.nextElement()))
-     			return true;
-     	}
- 
-@@ -574,10 +574,10 @@
-     {
-     	java.util.Properties saveProps = new java.util.Properties();
- 
--    	java.util.Enumeration enum = m_Properties.propertyNames();
--    	while (enum.hasMoreElements())
-+    	java.util.Enumeration enumer = m_Properties.propertyNames();
-+    	while (enumer.hasMoreElements())
-     	{
--    		String strKey = (String)enum.nextElement();
-+    		String strKey = (String)enumer.nextElement();
- 
-     		if (!isDefaultKey(strKey))
- 	    		saveProps.put(strKey, m_Properties.getProperty(strKey));
-@@ -623,9 +623,9 @@
- 
- 	    	try
- 	    	{
--	    		java.util.Enumeration enum = System.getProperties().propertyNames();
--	    		while (enum.hasMoreElements())
--	    			c_DefaultProperties.addElement(enum.nextElement());
-+	    		java.util.Enumeration enumer = System.getProperties().propertyNames();
-+	    		while (enumer.hasMoreElements())
-+	    			c_DefaultProperties.addElement(enumer.nextElement());
- 	    	}
- 	    	catch (Exception ignore0) {}
- 	    }
-@@ -656,10 +656,10 @@
-     	}
-     	catch (Exception ignore2) {}
- 
--    	java.util.Enumeration enum = props.propertyNames();
--    	while (enum.hasMoreElements())
-+    	java.util.Enumeration enumer = props.propertyNames();
-+    	while (enumer.hasMoreElements())
-     	{
--    		String propKey = (String)enum.nextElement();
-+    		String propKey = (String)enumer.nextElement();
- 
-     		// if the key is not a default put the new property into the table
-     		if (!isDefaultKey(propKey))
-
---- sj2/stardiv/controller/StreamObserver.java	2000-09-18 11:54:04.000000000 -0500
-+++ sj2/stardiv/controller/StreamObserver.java	2005-04-19 01:56:30.000000000 -0500
-@@ -65,8 +65,7 @@
- import java.util.Observable;
- import java.net.URL;
- import java.net.MalformedURLException;
--import sun.net.ProgressData;
--import sun.net.ProgressEntry;
-+import sun.net.ProgressSource;
- 
- 
- /** 
-@@ -79,12 +78,12 @@
- {
- 	public StreamObserver()
- 	{
--		ProgressData.pdata.addObserver( this );
-+		progressSource.beginTracking();
- 	}
- 
- 	public void dispose()
- 	{
--		ProgressData.pdata.deleteObserver( this );
-+		progressSource.finishTracking();
- 	}
- 
- 	static long nLastTime;
-@@ -95,48 +94,47 @@
- 			nLastTime = System.currentTimeMillis();
- 			
- 			String aStatus = null;
--			ProgressEntry pEntry = (ProgressEntry)aArg;
--			switch( pEntry.what )
-+			switch( progressSource.getState() )
- 			{
--				case ProgressData.CONNECTED:
-+				case CONNECTED:
- 					{
- 						try
- 						{
--							URL aURL = new URL( pEntry.label );
-+							URL aURL = progressSource.getURL();
- 							aStatus = "Connect: Host " + aURL.getHost() + " contacted. Waiting for reply...";
- 						}
--						catch( MalformedURLException e )
-+						catch( Exception e )
- 						{
--							aStatus = "Connect: " + pEntry.label;
-+							aStatus = "Connect: " + progressSource.getURL().toString();
- 						}
- 					}
- 				break;
- 
--				case ProgressData.UPDATE:
-+				case UPDATE:
- 					if( System.currentTimeMillis() - nLastTime > 3000 )
- 						// Only 1 update / 3s
- 						return;
--					if( pEntry.need != 0 )
-+					if( progressSource.getExpected() > 0 )
- 					{
- 						// Java kommt mit dem letzten Byte nicht r"uber
--						aStatus = "Transfered: " + pEntry.label + " - ";
--						int nPercent = (int)(((long)pEntry.read * 100) / pEntry.need);
-+						aStatus = "Transfered: " + progressSource.getURL().toString() + " - ";
-+						int nPercent = (int)(((long)progressSource.getProgress() * 100) / progressSource.getExpected());
- 						aStatus += String.valueOf( nPercent ) + "% of ";
--						if( pEntry.need >= 1000 )
--							aStatus += String.valueOf( pEntry.need / 1000 ) + "K ";
-+						if( progressSource.getExpected() >= 1000 )
-+							aStatus += String.valueOf( progressSource.getExpected() / 1000 ) + "K ";
- 						else
--							aStatus += String.valueOf( pEntry.need );
-+							aStatus += String.valueOf( progressSource.getExpected() );
- 						aStatus += "bytes.";
- 					}
- 					else
--						aStatus = "Transfered: " + pEntry.label;
-+						aStatus = "Transfered: " + progressSource.getURL().toString();
- 				break;
- 
--				case ProgressData.NEW:
--					aStatus = "Try: " + pEntry.label;
-+				case NEW:
-+					aStatus = "Try: " + progressSource.getURL().toString();
- 				break;
--				case ProgressData.DELETE:
--					aStatus = "Done: " + pEntry.label;
-+				case DELETE:
-+					aStatus = "Done: " + progressSource.getURL().toString();
- 				break;
- 			}
- 			if( aStatus != null )
-@@ -179,6 +177,7 @@
- 			System.out.println( pStatus );
- 		}
- 	}
-+	private ProgressSource progressSource;
- }
- 
- 
-
---- unoil/makefile.pmk	2002-06-20 11:41:33.000000000 -0500
-+++ unoil/makefile.pmk	2005-04-19 01:56:30.000000000 -0500
-@@ -77,7 +77,7 @@
- GENJAVAFILES	:= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
- GENCLASSFILES	:= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
- 
--JAVAFLAGS		= -target 1.1
-+#JAVAFLAGS		= -target 1.1
- # --- Targets ------------------------------------------------------
- 
- JAVAFILES=$(GENJAVAFILES)
-
---- xmerge/java/org/openoffice/xmerge/ConvertData.java	2002-03-07 10:45:20.000000000 -0600
-+++ xmerge/java/org/openoffice/xmerge/ConvertData.java	2005-04-19 01:56:30.000000000 -0500
-@@ -127,8 +127,8 @@
-      *           <code>Vector</code> of <code>Document</code> objects.
-      */
-     public Enumeration getDocumentEnumeration() {
--        Enumeration enum = v.elements();
--		return (enum);
-+        Enumeration enumer = v.elements();
-+		return (enumer);
- 	}
- 
- 
-
---- xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java	2003-05-29 04:03:38.000000000 -0500
-+++ xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java	2005-04-19 01:56:30.000000000 -0500
-@@ -155,14 +155,14 @@
-      */
-     public Document deserialize() throws ConvertException, IOException {
- 	log("\nFound the XSLT deserializer");
--	Enumeration enum = cd.getDocumentEnumeration();
-+	Enumeration enumer = cd.getDocumentEnumeration();
- 	org.w3c.dom.Document domDoc=null;
- 	DOMDocument docOut=null;
- 	GenericOfficeDocument doc = null;
- 	ByteArrayOutputStream baos =null;
- 	GenericOfficeDocument sxwDoc = new GenericOfficeDocument("output");
--	while (enum.hasMoreElements()) {       
--		 docOut = (DOMDocument) enum.nextElement();
-+	while (enumer.hasMoreElements()) {       
-+		 docOut = (DOMDocument) enumer.nextElement();
- 	}
- 	domDoc = docOut.getContentDOM();	
- 	try{
-
---- xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java	2002-04-09 07:18:44.000000000 -0500
-+++ xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java	2005-04-19 01:56:30.000000000 -0500
-@@ -183,9 +183,9 @@
- 	String ext= ".txt";
- 	String mimeType = null;
- 	ConverterInfo ci = this.getConverterInfo();
--	Enumeration enum = ci.getDeviceMime();
--	while (enum.hasMoreElements()) {       
--	    mimeType= (String) enum.nextElement();
-+	Enumeration enumer = ci.getDeviceMime();
-+	while (enumer.hasMoreElements()) {       
-+	    mimeType= (String) enumer.nextElement();
- 	}
- 	try {
- 	    props.load(is);
-
---- xmlhelp/source/com/sun/star/help/HelpIndexer.java	2004-10-28 06:52:44.000000000 -0500
-+++ xmlhelp/source/com/sun/star/help/HelpIndexer.java	2005-04-19 01:56:30.000000000 -0500
-@@ -197,13 +197,13 @@
-    			table.close( 0 );
- 
- 			System.out.println( "Indexing..." );
--      		Enumeration enum = _hashDocInfo.elements();
-+      		Enumeration enumer = _hashDocInfo.elements();
-         	int cut = 0;
--         	while( enum.hasMoreElements() && cut < 100000000 )
-+         	while( enumer.hasMoreElements() && cut < 100000000 )
-          	{
-           		try
-             	{
--          			DocInfo info = ( DocInfo ) enum.nextElement();
-+          			DocInfo info = ( DocInfo ) enumer.nextElement();
-          			String url = info.getURL();
- 					if( url == null )
-      				{
-@@ -421,12 +421,12 @@
- 
-      	void dump()
-       	{
--			Enumeration enum = _hash.keys();
-+			Enumeration enumer = _hash.keys();
-    			int j = 0;
- 			String[] list = new String[ _hash.size() ];
--   			while( enum.hasMoreElements() )
-+   			while( enumer.hasMoreElements() )
-       		{
--      			list[j++] = ( String ) enum.nextElement();
-+      			list[j++] = ( String ) enumer.nextElement();
-            	}
- 
- 			Db table;
-@@ -462,12 +462,12 @@
- 
-      void dumpHelptext()
-      {
--		Enumeration enum = _hashHelptext.keys();
-+		Enumeration enumer = _hashHelptext.keys();
-    		int j = 0;
- 		String[] list = new String[ _hashHelptext.size() ];
--   		while( enum.hasMoreElements() )
-+   		while( enumer.hasMoreElements() )
-       	{
--      		list[j++] = ( String ) enum.nextElement();
-+      		list[j++] = ( String ) enumer.nextElement();
-         }
- 
- 		Db table;
-
---- xmlhelp/source/com/sun/star/help/HelpTransformer.java	2001-02-07 03:35:47.000000000 -0600
-+++ xmlhelp/source/com/sun/star/help/HelpTransformer.java	2005-04-19 01:56:30.000000000 -0500
-@@ -14,11 +14,11 @@
- 	{
- 		String styleName;
- 		Hashtable styles;
--		Enumeration enum = defs.getTable().keys();
-+		Enumeration enumer = defs.getTable().keys();
- 		
--		while( enum.hasMoreElements() )
-+		while( enumer.hasMoreElements() )
- 		{
--			styleName = ( String ) enum.nextElement();
-+			styleName = ( String ) enumer.nextElement();
- 			styles = defs.getEffectiveStyle( styleName );
- 			
- 			Enumeration styleOptions = styles.keys();
-@@ -112,11 +112,11 @@
- 		while( it.hasNext() )
- 		{
- 			Hashtable curr;
--			Enumeration enum = (curr = ( Hashtable )it.next()).keys();
--			while( enum.hasMoreElements() )
-+			Enumeration enumer = (curr = ( Hashtable )it.next()).keys();
-+			while( enumer.hasMoreElements() )
- 			{
- 				String str;
--				if( result.get( str = ( String ) enum.nextElement() ) == null )
-+				if( result.get( str = ( String ) enumer.nextElement() ) == null )
- 					result.put( str,curr.get( str ) );
- 			}
- 		}
-@@ -129,11 +129,11 @@
- 	{
- 		String str;
- 		Hashtable a = getEffectiveStyle( "p.def1" );
--		Enumeration enum = a.keys();
-+		Enumeration enumer = a.keys();
- 		
--		while( enum.hasMoreElements() )
-+		while( enumer.hasMoreElements() )
- 		{
--			System.out.println( (str = ( String ) enum.nextElement()) + " : " + ((String)a.get(str)) );
-+			System.out.println( (str = ( String ) enumer.nextElement()) + " : " + ((String)a.get(str)) );
- 		}
- 	}
- 	
-Index: config_office/set_soenv.in
-===================================================================
-RCS file: /cvs/tools/config_office/set_soenv.in,v
-retrieving revision 1.10.6.12
-diff -u -r1.10.6.12 set_soenv.in
---- config_office/set_soenv.in	29 Apr 2005 14:58:58 -0000	1.10.6.12
-+++ config_office/set_soenv.in	10 Sep 2006 08:15:16 -0000
-@@ -63,7 +63,7 @@
- my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
-       $GVER, $GVERDIR, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
-       $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR,
--      $JRETOOLKITDIR, $JRETHREADDIR, $EXCEPTIONS, $WRAPCMD );
-+      $JREEXTRALIBDIR, $JRETOOLKITDIR, $JRETHREADDIR, $EXCEPTIONS, $WRAPCMD );
- #
- #-------------------------------------------
- # IIc. Declaring the environment variables.
-@@ -364,6 +364,7 @@
-       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
-       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
-       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
-+      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
- } 
- elsif ( $platform eq "$Linux" ) 
- {
-@@ -901,6 +902,7 @@
-                         $ps.$JRELIBDIR.
-                         $ps.$JRETOOLKITDIR.
-                         $ps.$JRETHREADDIR.
-+			$ps.$JREEXTRALIBDIR.
-                         $ps.$par_dir.$LIB.
-                         $ps_STLPORT_LIB.
-                         $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
diff --git a/editors/openoffice.org-1.1-devel/files/patch-jvmaccess+source+sunversion.cxx b/editors/openoffice.org-1.1-devel/files/patch-jvmaccess+source+sunversion.cxx
deleted file mode 100644
index bbed543f1021..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-jvmaccess+source+sunversion.cxx
+++ /dev/null
@@ -1,72 +0,0 @@
-Issuetracker : #iXXXXX#
-CWS          : N/A
-Author       : <maho@openoffice.org>
-Description  : FreeBSD porting : do not hardcode pXX of Java version and FreeBSD native Java is always superior to Linux's one.
-
-1. we had been hard coding Java's version by p1, p2 ... etc. but apparently
-it is not a good habit. in this patch we eleminate this.
-
-2. we'd better to use FreeBSD's native Java, and not GNU/Linux's ones if both are exist
-in the system. We add 100 as micro version number, so that we treat FreeBSD's version of
-java 1.4.1-p10 for example to 1.4.1_110.
-
-3. Java version of 1.5.0_13-p7 will be treated as 1.5.0_13. -p part will be ignored.
-
---- jvmaccess/source/sunversion.cxx	Thu Jun 16 21:45:26 2005
-+++ jvmaccess/source/sunversion.cxx	Sat Oct 22 16:42:01 2005
-@@ -193,7 +193,7 @@
-                     pCur ++;
-                 //   nPartPos ++;
-             }
--            else if (nUpdatePart == 0 && (pCur == pEnd || isalpha(*pCur)))
-+            else if (nUpdatePart == 0 && (pCur == pEnd || isalpha(*pCur) || (*pCur)=='-' ))
-             {
-                 int len = pCur - pLast;
-                 if (len >= 127) 
-@@ -246,30 +247,22 @@
-             m_preRelease = Rel_RC2;
- #if defined FREEBSD || defined NETBSD
- 	// #i40617# and #i21615#: FreeBSD adds p1-p12 to their JDK port.
--        else if (! strcmp(pCur, "p12"))
--            m_preRelease = Rel_BETA;
--        else if (! strcmp(pCur, "p11"))
--            m_preRelease = Rel_BETA;
--        else if (! strcmp(pCur, "p10"))
--            m_preRelease = Rel_BETA;
--        else if (! strcmp(pCur, "p9"))
--            m_preRelease = Rel_BETA;
--        else if (! strcmp(pCur, "p8"))
--            m_preRelease = Rel_BETA;
--        else if (! strcmp(pCur, "p7"))
--            m_preRelease = Rel_BETA;
--        else if (! strcmp(pCur, "p6"))
--            m_preRelease = Rel_BETA;
--        else if (! strcmp(pCur, "p5"))
--            m_preRelease = Rel_BETA;
--        else if (! strcmp(pCur, "p4"))
--            m_preRelease = Rel_BETA;
--        else if (! strcmp(pCur, "p3"))
--            m_preRelease = Rel_BETA;
--        else if (! strcmp(pCur, "p2"))
--            m_preRelease = Rel_BETA;
--        else if (! strcmp(pCur, "p1"))
--            m_preRelease = Rel_BETA;
-+        else if (!strncmp(pCur,"p",1)) //must be p[1-9]*
-+	  {
-+	    pCur++; //elemnate `p'
-+            if (pCur < pEnd && isdigit(*pCur))
-+            {
-+                if (pCur < pEnd)
-+                    pCur ++;
-+            }
-+                int len = pCur - pLast -1; //elemenate `p'
-+                if (len >= 127) 
-+                    return false;
-+                strncpy(buf, (pLast+1), len); //elemenate `p'
-+                buf[len] = 0;
-+              //temporal hack we should use BSD's JDK...
-+                m_arVersionParts[nPart] = atoi(buf)+100;
-+	  }
- #endif
-         else
-             return false;
diff --git a/editors/openoffice.org-1.1-devel/files/patch-libgcc b/editors/openoffice.org-1.1-devel/files/patch-libgcc
deleted file mode 100644
index a3197c00be66..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-libgcc
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: work/OOo_1.1.5/external/gcc3_specific/makefile.mk
-===================================================================
-RCS file: /cvs/util/external/gcc3_specific/makefile.mk,v
-retrieving revision 1.3
-diff -u -r1.3 makefile.mk
---- external/gcc3_specific/makefile.mk	18 Jun 2003 12:44:10 -0000	1.3
-+++ external/gcc3_specific/makefile.mk	8 Jan 2008 03:22:55 -0000
-@@ -11,7 +11,6 @@
- 
- .IF "$(OS)"!="MACOSX"
- .IF "$(OS)"!="IRIX"
--.IF "$(OS)"!="FREEBSD"
- 
- 
- all : $(SOLARLIBDIR)$/libstdc++.so.$(SHORTSTDCPP3) $(SOLARLIBDIR)$/libgcc_s.so.1 $(SOLARLIBDIR)$/libgcc_s.so 
-@@ -27,7 +26,6 @@
-         -rm -f $@
-         +ln -s libgcc_s.so.1 $@
- 
--.ENDIF
- .ENDIF 
- .ENDIF 
- 
-Index: work/OOo_1.1.5/scp/source/global/udk_base.scp
-===================================================================
-RCS file: /cvs/installation/scp/source/global/Attic/udk_base.scp,v
-retrieving revision 1.7.24.2
-diff -u -r1.7.24.2 udk_base.scp
---- scp/source/global/udk_base.scp	28 Jan 2004 17:18:34 -0000	1.7.24.2
-+++ scp/source/global/udk_base.scp	8 Jan 2008 03:24:54 -0000
-@@ -6,7 +6,7 @@
- // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are
- // needed for unxlngi4 environment (setup is linked against it).
- 
--#if ! (defined (FREEBSD) || defined(MACOSX) || defined(NETBSD) )
-+#if ! (defined(MACOSX) || defined(NETBSD) )
- #if ( defined( _gcc3 ) && ( defined( C300 ) || defined( C322 ) ))
- 
- File gid_File_Lib_gcc
diff --git a/editors/openoffice.org-1.1-devel/files/patch-objformat b/editors/openoffice.org-1.1-devel/files/patch-objformat
deleted file mode 100644
index 53587fc236d8..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-objformat
+++ /dev/null
@@ -1,230 +0,0 @@
---- /dev/null	Thu May  3 10:02:14 2007
-+++ berkeleydb/db-4.2.52.patch	Thu May  3 09:52:51 2007
-@@ -0,0 +1,70 @@
-+*** misc/db-4.2.52.NC/dist/configure	2003-12-03 22:10:02.000000000 +0100
-+--- misc/build/db-4.2.52.NC/dist/configure	2007-02-19 16:12:12.000000000 +0100
-+***************
-+*** 9328,9334 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 9328,9334 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 12872,12878 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 12872,12878 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 15849,15855 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 15849,15855 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 18114,18120 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 18114,18120 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-Index: berkeleydb/makefile.mk
-===================================================================
-RCS file: /cvs/external/berkeleydb/makefile.mk,v
-retrieving revision 1.13.12.2
-diff -u -r1.13.12.2 makefile.mk
---- berkeleydb/makefile.mk	28 Oct 2004 11:54:48 -0000	1.13.12.2
-+++ berkeleydb/makefile.mk	3 May 2007 01:04:40 -0000
-@@ -73,6 +73,8 @@
- 
- TARFILE_NAME=db-4.2.52.NC
- 
-+PATCH_FILE_NAME=db-4.2.52.patch
-+
- # not needed for win32. comment out when causing problems...
- 
- .IF "$(GUI)"=="UNX"
-
-Index: curl/unx1-curl-7.9.8.patch
-===================================================================
-RCS file: /cvs/external/curl/Attic/unx1-curl-7.9.8.patch,v
-retrieving revision 1.2.18.1
-diff -u -r1.2.18.1 unx1-curl-7.9.8.patch
---- curl/unx1-curl-7.9.8.patch	3 May 2004 16:32:05 -0000	1.2.18.1
-+++ curl/unx1-curl-7.9.8.patch	3 May 2007 01:13:15 -0000
-@@ -251,3 +251,22 @@
-     /*************************************************************
-      * No protocol part in URL was used, add it!
-      *************************************************************/
-+*** misc/curl-7.9.8/configure	Wed Jun 12 00:16:54 2002
-+--- misc/build/curl-7.9.8/configure	Thu May  3 10:10:42 2007
-+***************
-+*** 6292,6298 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 6292,6298 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-Index: freetype/freetype-2.1.4.patch
-===================================================================
-RCS file: /cvs/external/freetype/Attic/freetype-2.1.4.patch,v
-retrieving revision 1.2
-diff -u -r1.2 freetype-2.1.4.patch
---- freetype/freetype-2.1.4.patch	17 Apr 2003 15:11:01 -0000	1.2
-+++ freetype/freetype-2.1.4.patch	3 May 2007 01:15:56 -0000
-@@ -131,3 +131,22 @@
-   
-           /* XXX If some new encodings to represent UCS-4 are added,  */
-           /*     they should be added here.                           */
-+*** misc/freetype-2.1.4/builds/unix/configure	Sun Jan 19 01:39:18 2003
-+--- misc/build/freetype-2.1.4/builds/unix/configure	Thu May  3 10:14:26 2007
-+***************
-+*** 7203,7209 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 7203,7209 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-
-Index: sndfile/libsndfile-1.0.9.patch
-===================================================================
-RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v
-retrieving revision 1.2
-diff -u -r1.2 libsndfile-1.0.9.patch
---- sndfile/libsndfile-1.0.9.patch	31 May 2005 16:31:31 -0000	1.2
-+++ sndfile/libsndfile-1.0.9.patch	3 May 2007 01:21:01 -0000
-@@ -83,6 +83,23 @@
-     shlibpath_var=DYLD_LIBRARY_PATH
-     shrext='$(test .$module = .yes && echo .so || echo .dylib)'
- ***************
-+*** 7871,7877 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 7878,7884 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 9111,9120 ****
-         ;;
-       esac
-@@ -143,6 +160,23 @@
-       module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-       hardcode_direct_CXX=no
- ***************
-+*** 11560,11566 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 11567,11573 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 14069,14084 ****
-       	  lt_int_apple_cc_single_mod=yes
-       	fi
-@@ -178,6 +212,23 @@
-             module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-         hardcode_direct_F77=no
- ***************
-+*** 14700,14706 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 14707,14713 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 16414,16429 ****
-       	  lt_int_apple_cc_single_mod=yes
-       	fi
diff --git a/editors/openoffice.org-1.1-devel/files/patch-odk+configure.pl b/editors/openoffice.org-1.1-devel/files/patch-odk+configure.pl
deleted file mode 100644
index 31c4d23cd943..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-odk+configure.pl
+++ /dev/null
@@ -1,47 +0,0 @@
-Issuetracker : #iXXXXX#
-CWS          : N/A
-Author       : NAKATA Maho <maho@openoffice.org> (JCA)
-Description  : most pop name of installated GNU make is gmake, not make for FreeBSD
-
-Index: configure.pl
-===================================================================
-RCS file: /cvs/api/odk/configure.pl,v
-retrieving revision 1.4.12.3
-diff -u -r1.4.12.3 configure.pl
---- odk/configure.pl.orig	18 May 2004 10:02:00 -0000	1.4.12.3
-+++ odk/configure.pl	11 Aug 2004 08:21:04 -0000
-@@ -19,7 +19,7 @@
- chop ($main::OFFICE_HOME_SUGGESTION);
- 
- $main::OO_SDK_MAKE_HOME = "";
--$main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("make");
-+$main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("gmake");
- $main::makeVersion = "3.79.1";
- $main::correctVersion = 0;
- 
-@@ -101,7 +101,7 @@
- # prepare GNU make path
- while ( (!$main::correctVersion) &&
- 		((! -d "$main::OO_SDK_MAKE_HOME" ) ||
--		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make"))) )
-+		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/gmake"))) )
- {
-     print "Enter GNU make ($main::makeVersion or higher) tools directory [$main::OO_SDK_MAKE_HOME_SUGGESTION]: ";
-     $main::OO_SDK_MAKE_HOME = <STDIN>;
-@@ -111,14 +111,14 @@
- 		$main::OO_SDK_MAKE_HOME = $main::OO_SDK_MAKE_HOME_SUGGESTION;
-     }
-     if ( (! -d "$main::OO_SDK_MAKE_HOME") || 
--		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make")) )
-+		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/gmake")) )
-     { 
- 		$main::OO_SDK_MAKE_HOME = "";
- 		print "Error: GNU make is required, please specify a GNU make tools directory.\n";
-     } else 
-     {
- 		#check version
--		my $testVersion = `$OO_SDK_MAKE_HOME/make --version`;
-+		my $testVersion = `$OO_SDK_MAKE_HOME/gmake --version`;
- 		if ( $testVersion eq "")
- 		{
- 			print "The 'make' command found at $main::OO_SDK_MAKE_HOME/make is not GNU Make\n";
diff --git a/editors/openoffice.org-1.1-devel/files/patch-rsc+source+rscpp+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-rsc+source+rscpp+makefile.mk
deleted file mode 100644
index 2959319805b5..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-rsc+source+rscpp+makefile.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-Issuetracker : #i54178#
-CWS          : hr17
-Author:      :
-Description  :
-
-Index: rsc/source/rscpp/makefile.mk
-===================================================================
-RCS file: /cvs/gsl/rsc/source/rscpp/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- rsc/source/rscpp/makefile.mk	8 Sep 2005 14:00:27 -0000	1.5
-+++ rsc/source/rscpp/makefile.mk	21 Sep 2005 10:18:09 -0000
-@@ -36,6 +36,8 @@
- 
- TARGETTYPE=CUI
- TARGETTHREAD=ST
-+# we don't need STL in this project
-+NO_DEFAULT_STL=TRUE
- 
- PRJNAME=rsc
- TARGET=rscpp
diff --git a/editors/openoffice.org-1.1-devel/files/patch-scp+source+office+unxbasic.scp b/editors/openoffice.org-1.1-devel/files/patch-scp+source+office+unxbasic.scp
deleted file mode 100644
index 9a058c27dd9a..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-scp+source+office+unxbasic.scp
+++ /dev/null
@@ -1,25 +0,0 @@
-Issuetracker : #iXXXXX#
-CWS          : N/A
-Author       : NAKATA Maho <maho@openoffice.org> (JCA)
-Description  : Do not make a link as /usr/bin/soffice
-
-Index: scp/source/office/unxbasic.scp
-===================================================================
-RCS file: /cvs/installation/scp/source/office/Attic/unxbasic.scp,v
-retrieving revision 1.49.8.9
-diff -u -r1.49.8.9 unxbasic.scp
---- scp/source/office/unxbasic.scp	27 Aug 2004 11:43:50 -0000	1.49.8.9
-+++ scp/source/office/unxbasic.scp	15 Jan 2005 10:22:08 -0000
-@@ -924,12 +924,6 @@
- 		Dim sofficeFile As String
- 		Dim linkName As String
- 
--		sofficeFile = DirEntry(GetSetupEnv.DestPath, "program", "soffice")
--
--		linkName = "/usr/bin/soffice"
--
--		shell("/bin/sh -c " & "'ln -s " & chr(34) & sofficeFile & chr(34) & " " & linkName & " >/dev/null 2>&1'")
--
- 	End Sub
- 
- };
diff --git a/editors/openoffice.org-1.1-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-1.1-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
deleted file mode 100644
index 08684375eb4a..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
+++ /dev/null
@@ -1,32 +0,0 @@
-Issuetracker : #iXXXXX#
-CWS          : N/A
-Author       : NAKATA Maho <maho@openoffice.org> (JCA)
-Description  : 
-In solver/645/unxfbsd.pro/inc/rtl/string.hxx,
-even though there is a descrioptin like
-static OString valueOf( sal_Int32 i, sal_Int16 radix = 10 ) SAL_THROW(())
-and In /usr/include/machine/_types.h, 
-typedef int                     __int32_t;
-typedef __int32_t       __time_t;               /* time()... */
-and
-/usr/include/time.h:typedef     __time_t        time_t;
-this cast seems to be mandatory. Why??
-
---- shell/source/unix/sysshell/recently_used_file_handler.cxx.orig	Tue Jan 13 00:56:37 2004
-+++ shell/source/unix/sysshell/recently_used_file_handler.cxx	Tue Jan 13 00:57:26 2004
-@@ -188,9 +188,12 @@
-             write_xml_start_tag(TAG_RECENT_ITEM, file, true);
-             write_xml_tag(TAG_URI, uri_, file);
-             write_xml_tag(TAG_MIME_TYPE, mime_type_, file);
--                                
--            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
--            write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-+#if defined FREEBSD
-+            rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_);
-+#else
-+            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
-+#endif
-+	  write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-                         
-             if (is_private_)            
-                 write_xml_tag(TAG_PRIVATE, file);                               
diff --git a/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 275882d765bb..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,248 +0,0 @@
-Issuetracker : #iXXXXX#
-CWS          : N/A
-Author       : <maho@openoffice.org> (JCA)
-Description  : FreeBSD porting : catch up recent version of solenv/inc/unxlngi5.mk
-catch up recent version of solenv/inc/unxlngi5.mk
-
---- solenv/inc/unxfbsdi.mk.orig	Tue May  4 01:27:08 2004
-+++ solenv/inc/unxfbsdi.mk	Mon Oct 24 11:39:05 2005
-@@ -60,16 +60,21 @@
- #
- #*************************************************************************
- 
--# mak file for unxfbsdi
--ASM=$(CC)
--AFLAGS=-x assembler-with-cpp -c $(CDEFS)
-+# ma file for unxfbsdi
-+ASM=
-+AFLAGS=
-+
-+SOLAR_JAVA*=TRUE
-+JAVAFLAGSDEBUG=-g
- 
- # filter for supressing verbose messages from linker
- #not needed at the moment
- #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
- 
-+# _PTHREADS is needed for the stl
-+CDEFS+= -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION) $(PTHREAD_CFLAGS)
-+
- # this is a platform with JAVA support
--SOLAR_JAVA*=TRUE
- .IF "$(SOLAR_JAVA)"!=""
- JAVADEF=-DSOLAR_JAVA
- .IF "$(debug)"==""
-@@ -83,89 +88,81 @@
- CXX*=g++
- # name of C Compiler
- CC*=gcc
-+.IF "$(SYSBASE)"!=""
-+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
-+CXX+:=$(CFLAGS_SYSBASE)
-+CC+:=$(CFLAGS_SYSBASE)
-+.ENDIF          # "$(SYSBASE)"!=""
-+# flags for C and C++ Compiler
-+# do not use standard header search paths
-+# if installed elsewhere
-+.IF "$(BUILD_SOSL)"!=""
-+CFLAGS=
-+.ENDIF
-+CFLAGS+=-fmessage-length=0 -c $(INCLUDE)
- 
--# filter for supressing verbose messages from linker
--# not needed at the moment
--LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
--
--# options for C and C++ Compiler
--CDEFS+=	-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION)
--CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
--
--# flags for C and C++ Compile
--CFLAGS+= -w -c $(INCLUDE)
--CFLAGS+= -I/usr/X11R6/include
-+# flags to enable build with symbols; required for crashdump feature
-+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-+CFLAGSENABLESYMBOLS=-g1
-+.ELSE
-+CFLAGSENABLESYMBOLS=-g
-+.ENDIF
- 
- # flags for the C++ Compiler
--CFLAGSCC= -pipe -fno-rtti
--CFLAGSCXX= -pipe -fno-for-scope -fpermissive -fno-rtti
--
-+CFLAGSCC= -pipe -mcpu=pentiumpro
- # Flags for enabling exception handling
--CFLAGSEXCEPTIONS= -fexceptions
--CFLAGS_NO_EXCEPTIONS= -fno-exceptions
--
--# Compiler flags for compiling static object in single threaded
--# environment with graphical user interface
--CFLAGSOBJGUIST= -fPIC
--
--# Compiler flags for compiling static object in single threaded
--# environment with character user interface
--CFLAGSOBJCUIST= -fPIC
--
--# Compiler flags for compiling static object in multi threaded
--# environment with graphical user interface
--CFLAGSOBJGUIMT= -fPIC
--
--# Compiler flags for compiling static object in multi threaded
--# environment with character user interface
--CFLAGSOBJCUIMT= -fPIC
--
--# Compiler flags for compiling shared object in multi threaded
--# environment with graphical user interface
--CFLAGSSLOGUIMT=	-fPIC
--
--# Compiler flags for compiling shared object in multi threaded
--# environment with character user interface
--CFLAGSSLOCUIMT=	-fPIC
--
--# Compiler flags for profilin
--CFLAGSPROF=     -pg
--
-+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-+# Flags for disabling exception handling
-+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-+
-+# -fpermissive should be removed as soon as possible
-+CFLAGSCXX= -pipe -mcpu=pentiumpro -fno-for-scope -fpermissive -fno-rtti
-+
-+# Compiler flags for compiling static object in single threaded environment with graphical user interface
-+CFLAGSOBJGUIST=
-+# Compiler flags for compiling static object in single threaded environment with character user interface
-+CFLAGSOBJCUIST=
-+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-+CFLAGSOBJGUIMT=
-+# Compiler flags for compiling static object in multi threaded environment with character user interface
-+CFLAGSOBJCUIMT=
-+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-+CFLAGSSLOGUIMT=-fpic
-+# Compiler flags for compiling shared object in multi threaded environment with character user interface
-+CFLAGSSLOCUIMT=-fpic
-+# Compiler flags for profiling
-+CFLAGSPROF=
- # Compiler flags for debugging
--CFLAGSDEBUG=	-g
-+CFLAGSDEBUG=-g
- CFLAGSDBGUTIL=
--
--# Compiler flags to enable optimizations
--# -02 is broken for FreeBSD
--CFLAGSOPT= -O
--
--# Compiler flags to disable optimizations
--# -0 is broken for STLport for FreeBSD
--CFLAGSNOOPT= -O0
--
--# Compiler flags for the output path
--CFLAGSOUTOBJ= -o
--
-+# Compiler flags for enabling optimazations
-+# CFLAGSOPT=-O2
-+# reduce to -O1 to avoid optimisation problems
-+CFLAGSOPT=-O1
-+# Compiler flags for disabling optimazations
-+CFLAGSNOOPT=-O0
-+# Compiler flags for discibing the output path
-+CFLAGSOUTOBJ=-o
- # Enable all warnings
- CFLAGSWALL=-Wall
--
- # Set default warn level
- CFLAGSDFLTWARN=-w
- 
- # switches for dynamic and static linking
--STATIC=	-Wl,-Bstatic
--DYNAMIC= -Wl,-Bdynamic
-+STATIC		= -Wl,-Bstatic
-+DYNAMIC		= -Wl,-Bdynamic
- 
- # name of linker
--LINK=$(CC)
-+LINK*=$(CC)
- 
- # default linker flags
--# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
--LINKFLAGS=$(LINKFLAGSRUNPATH)
-+LINKFLAGSDEFS*=-z defs
-+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
- 
- # linker flags for linking applications
--LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
--LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
- 
- # linker flags for linking shared libraries
- LINKFLAGSSHLGUI= -shared
-@@ -176,21 +173,16 @@
- LINKFLAGSDEBUG=-g
- LINKFLAGSOPT=
- 
--.IF "$(NO_BSYMBOLIC)"==""
--.IF "$(PRJNAME)" != "envtest"
--LINKFLAGSSHLGUI+= -Wl,-Bsymbolic
--LINKFLAGSSHLCUI+= -Wl,-Bsymbolic
--.ENDIF
--.ENDIF
-+# linker flags for optimization (symbol hashtable)
-+# for now, applied to symbol scoped libraries, only
-+LINKFLAGSOPTIMIZE*=-Wl,-O1
-+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
- 
--LINKVERSIONMAPFLAG=-Wl,--version-script
-+SONAME_SWITCH=-Wl,-h
- 
- # Sequence of libs does matter !
--STDLIBCPP=-lstdc++
- 
--# _SYSLIBS= -L/usr/lib -lm
--# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11
--# _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib
-+STDLIBCPP=-lstdc++
- 
- # default objectfilenames to link
- STDOBJGUI=
-@@ -200,24 +192,26 @@
- 
- # libraries for linking applications
- STDLIBCUIST=-lm
--STDLIBGUIST=-lXaw -lXt -lX11 -lm
--STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm
-+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
- STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-+STDLIBGUIST=-lX11 -lm
- 
- # libraries for linking shared libraries
--STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm
-+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
- STDSHLCUIMT=$(PTHREAD_LIBS) -lm
-+STDSHLGUIST=-lX11 -lXext -lm
-+STDSHLCUIST=-lm
- 
- LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
- 
--# STLport always needs pthread.
--LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(STDLIBCPP) $(PTHREAD_LIBS)
--LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-+
-+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
- 
- # name of library manager
- LIBMGR=ar
- LIBFLAGS=-r
--LIBEXT=			.a
- 
- # tool for generating import libraries
- IMPLIB=
-@@ -236,3 +230,4 @@
- DLLPOSTFIX=fi
- DLLPRE=lib
- DLLPOST=.so
-+
diff --git a/editors/openoffice.org-1.1-devel/files/patch-translation_limit_64k b/editors/openoffice.org-1.1-devel/files/patch-translation_limit_64k
deleted file mode 100644
index 612b19dfc575..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-translation_limit_64k
+++ /dev/null
@@ -1,124 +0,0 @@
-Issuetracker : #i33228#, #i34210#
-CWS          : N/A
-Author       :
-Description  : Kannada doesn't build since some resources are
-limited to 64k. it won't fix for 1.1.x officially
-
-Index: inc/sc.hrc
-===================================================================
-RCS file: /cvs/sc/sc/inc/sc.hrc,v
-retrieving revision 1.35
-retrieving revision 1.35.288.2
-diff -u -r1.35 -r1.35.288.2
---- sc/inc/sc.hrc	3 Dec 2002 15:26:06 -0000	1.35
-+++ sc/inc/sc.hrc	17 Sep 2004 14:25:38 -0000	1.35.288.2
-@@ -1141,8 +1141,12 @@
- #define RID_TBXCTL_INSOBJ		(SC_RESOURCE_START+40)
- #define RID_BMP_REFBTN1			(SC_RESOURCE_START+41)
- #define RID_BMP_REFBTN2			(SC_RESOURCE_START+42)
--#define RID_SC_FUNCTION_DESCRIPTIONS1	(SC_RESOURCE_START+43)
--#define RID_SC_FUNCTION_DESCRIPTIONS2	(SC_RESOURCE_START+44)
-+// #i34210# split function resources due to 64k limit, don't reuse old values
-+// to have obviously empty function lists in case some localisation used the
-+// old values for any reason. Don't even reuse the exact name because of the
-+// translation database IDs.
-+//#define RID_SC_FUNCTION_DESCRIPTIONS1	(SC_RESOURCE_START+43)
-+//#define RID_SC_FUNCTION_DESCRIPTIONS2	(SC_RESOURCE_START+44)
- #define RID_POPUP_CONTROL		(SC_RESOURCE_START+45)
- #define RID_POPUP_PAGEBREAK		(SC_RESOURCE_START+46)
- #define RID_OBJECTBAR_DRAWFORM	(SC_RESOURCE_START+47)
-@@ -1158,6 +1162,10 @@
- #define RID_IMAGELIST_H_NAVCONT	(SC_RESOURCE_START+57)
- #define RID_OUTLINEBITMAPS_H    (SC_RESOURCE_START+58)
- #define RID_OBJECTMENU_EDIT     (SC_RESOURCE_START+59)
-+#define RID_SC_FUNCTION_DESCRIPTIONS_1  (SC_RESOURCE_START+60)
-+#define RID_SC_FUNCTION_DESCRIPTIONS_2  (SC_RESOURCE_START+61)
-+#define RID_SC_FUNCTION_DESCRIPTIONS_3  (SC_RESOURCE_START+62)
-+#define RID_SC_FUNCTION_DESCRIPTIONS_4  (SC_RESOURCE_START+63)
- 
- #define STR_START               (SC_RESOURCE_START+100)
- #define STR_ROWHEIGHT			(STR_START)
-Index: source/core/data/global.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/core/data/global.cxx,v
-retrieving revision 1.31
-retrieving revision 1.31.166.2
-diff -u -r1.31 -r1.31.166.2
---- sc/source/core/data/global.cxx	17 Apr 2003 09:54:45 -0000	1.31
-+++ sc/source/core/data/global.cxx	17 Sep 2004 14:25:38 -0000	1.31.166.2
-@@ -1475,10 +1475,12 @@
- 	USHORT i,j;
- 	USHORT nDescBlock[] =
- 	{
--		RID_SC_FUNCTION_DESCRIPTIONS1,
--		RID_SC_FUNCTION_DESCRIPTIONS2
-+		RID_SC_FUNCTION_DESCRIPTIONS_1,
-+		RID_SC_FUNCTION_DESCRIPTIONS_2,
-+		RID_SC_FUNCTION_DESCRIPTIONS_3,
-+		RID_SC_FUNCTION_DESCRIPTIONS_4
- 	};
--	const USHORT nBlocks = sizeof(nDescBlock) / sizeof(USHORT);
-+	const USHORT nBlocks = sizeof(nDescBlock) / sizeof(nDescBlock[0]);
- 
- 	aFunctionList.Clear();
- 
-Index: source/ui/src/scfuncs.src
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/src/scfuncs.src,v
-retrieving revision 1.76.22.8
-retrieving revision 1.76.22.8.4.2
-diff -u -r1.76.22.8 -r1.76.22.8.4.2
---- sc/source/ui/src/scfuncs.src	10 Sep 2004 14:45:52 -0000	1.76.22.8
-+++ sc/source/ui/src/scfuncs.src	17 Sep 2004 14:25:39 -0000	1.76.22.8.4.2
-@@ -93,10 +93,16 @@
-  // RID_SC_FUNCTION_DESCRIPTIONS1
-  // RID_SC_FUNCTION_DESCRIPTIONS2
- 
-+ // #i34210# again splitted resources due to 64k limit
-+ // RID_SC_FUNCTION_DESCRIPTIONS_1
-+ // RID_SC_FUNCTION_DESCRIPTIONS_2
-+ // RID_SC_FUNCTION_DESCRIPTIONS_3
-+ // RID_SC_FUNCTION_DESCRIPTIONS_4
-+
- #include "scfuncs.hrc" // ID_FUNCTION_GRP_XXX, HID_FUNC_XXX
- #include "compiler.hrc" // SC_OPCODE_XXX
- 
--Resource RID_SC_FUNCTION_DESCRIPTIONS1
-+Resource RID_SC_FUNCTION_DESCRIPTIONS_1
- {
- 	 // -=*# Resource for function DBANZAHL #*=-
- 	Resource SC_OPCODE_DB_COUNT
-@@ -15963,6 +15969,11 @@
- 			Text[ galician ] = "Valor 1; Valor 2;... son de 1 a 30 argumentos que representan os pagamentos e ingresos.";
- 		};
- 	};
-+};
-+
-+
-+Resource RID_SC_FUNCTION_DESCRIPTIONS_2
-+{
- 	 // -=*# Resource for function IKV #*=-
- 	Resource SC_OPCODE_IKV
- 	{
-@@ -32174,7 +32185,8 @@
- 	};
- };
- 
--Resource RID_SC_FUNCTION_DESCRIPTIONS2
-+
-+Resource RID_SC_FUNCTION_DESCRIPTIONS_3
- {
- 	 // -=*# Resource for function DBANZAHL2 #*=-
- 	 // -=*# Resource for function H�UFIGKEIT #*=-
-@@ -49230,6 +49242,11 @@
- 			Text[ galician ] = "� o n��ro de graos de liberdade.";
- 		};
- 	};
-+};
-+
-+
-+Resource RID_SC_FUNCTION_DESCRIPTIONS_4
-+{
- 	 // -=*# Resource for function STANDARDISIERUNG #*=-
- 	Resource SC_OPCODE_STANDARD
- 	{
diff --git a/editors/openoffice.org-1.1-devel/files/pkg-message.in b/editors/openoffice.org-1.1-devel/files/pkg-message.in
deleted file mode 100644
index 8b63380621c8..000000000000
--- a/editors/openoffice.org-1.1-devel/files/pkg-message.in
+++ /dev/null
@@ -1,55 +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 a installed JDK.
-The setup installs a "OpenOffice.org%%RELEASE_NR%%" folder
-in your homedir.
-
-If the setup tells you there is already an installed
-version, you may look at the file ".sversionrc" in
-your homedir. In this file OpenOffice and StarOffice
-have both a line for each version which is installed.
-After removing the problematic line you should be able to
-install again.
-
-2 Start OO.org
---------------
-
-There are some wrappers installed for fast startup.
-Add "%%PREFIX%%/bin/" to your PATH and you will be able
-to use them.
-
-%%PREFIX%%/bin/openoffice.org
-%%PREFIX%%/bin/%%EXECBASE%%
-%%PREFIX%%/bin/%%EXECBASE%%-sagenda
-%%PREFIX%%/bin/%%EXECBASE%%-scalc
-%%PREFIX%%/bin/%%EXECBASE%%-sdraw
-%%PREFIX%%/bin/%%EXECBASE%%-setup
-%%PREFIX%%/bin/%%EXECBASE%%-sfax
-%%PREFIX%%/bin/%%EXECBASE%%-simpress
-%%PREFIX%%/bin/%%EXECBASE%%-spadmin
-%%PREFIX%%/bin/%%EXECBASE%%-sweb
-%%PREFIX%%/bin/%%EXECBASE%%-swriter
-
-OO.org does need $LANG to be set to a suitable value.
-If it is not already set, a default value is chosen.
-
-3 If you stuck into a trouble
---------------------------------------------------
-Somehow you can stuck into a trouble. 
-To solve this issue, please remove the already installed
-"OpenOffice.org%%RELEASE_NR%%" dir in your homedir and remove the
-appropriate entry from ".sversionrc". After you have done
-this, redo the user installation and the problem will
-go away.
diff --git a/editors/openoffice.org-1.1-devel/pkg-descr b/editors/openoffice.org-1.1-devel/pkg-descr
deleted file mode 100644
index bc2ede1b8c2b..000000000000
--- a/editors/openoffice.org-1.1-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-1.1-devel/pkg-plist b/editors/openoffice.org-1.1-devel/pkg-plist
deleted file mode 100644
index 28bd78453b52..000000000000
--- a/editors/openoffice.org-1.1-devel/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, do not delete. Package list is generated automatically.
author	Maho Nakata <maho@FreeBSD.org>	2008-07-02 02:54:31 +0000
committer	Maho Nakata <maho@FreeBSD.org>	2008-07-02 02:54:31 +0000
commit	0d77ef3b39c5414fffb921b50940fad288014a67 (patch)
tree	8b30062b32e88c9e6b0966494a5fce349f78f914 /editors/openoffice.org-1.1-devel
parent	(forced commit) (diff)