14 files changed, 526 insertions, 929 deletions

diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 9141d8ea24ac..a3551f230737 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -1,42 +1,22 @@
-# New ports collection makefile for: OpenOffice.org
-# Date created:		28 February 2002
-# Whom:                 Martin Blapp
+# New ports collection makefile for: OpenOffice.org VCLTestTool
+# Date created:		2009/7/11
+# Whom:                 NAKATA Maho <maho@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME?=	openoffice.org
-PORTVERSION?=	2.4.${SNAPDATE}
-PORTREVISION?=	7
-PORTEPOCH?=	1
+PORTNAME=	openoffice.org-vcltesttool
+PORTVERSION=	2.4.${SNAPDATE}
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
-		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
 		http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
-MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
 DISTFILES+=	${OOOSRC} unowinreg.dll:unowinreg
-.if defined(WITH_GPC)
-DISTFILES+=	gpc231.tar.Z:gpc
-.endif
 EXTRACT_ONLY=	${OOOSRC}
 
 MAINTAINER=	openoffice@FreeBSD.org
-COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
-IGNORE=		Now development is moved to openoffice.org-3-devel
+COMMENT=	Automated testtool for the openoffice.org
 
-NO_LATEST_LINK=	yes
 USE_GNOME=	desktopfileutils gtk20
-MOZILLA_VERSION=	1.7.5
-MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
-.if !defined(WITHOUT_MOZILLA)
-DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
-USE_GNOME+=	libidl
-.endif
-
-.if defined(WITH_KDE)
-USE_KDELIBS_VER=	3
-.endif
 USE_XORG=	x11 ice xaw xau xext xrender xrandr \
 		xi xt xcursor xdamage xcomposite xfixes
 USE_GMAKE=	yes
@@ -56,8 +36,6 @@ JAVA_VERSION=	1.5 1.6
 JAVA_VERSION=	1.4 1.5 1.6
 .endif
 
-.include <${FILESDIR}/Makefile.localized>
-
 ONLY_FOR_ARCHS=	i386 amd64
 
 .if ${ARCH} == amd64
@@ -66,30 +44,15 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		248
-OOOTAG?=		SRC680_m${MILESTONE}
-OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
+#Linux/Solaris/Windows m226, MacOSX: m243
+MILESTONE=		248
+OOOTAG=			SRC680_m${MILESTONE}
+OOOSRC=			OOo_${OOOTAG}_source${EXTRACT_SUFX}
 SNAPDATE=		20080302
-INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
-EXECBASE?=		openoffice.org-${OOOTAG}
+INSTALLATION_BASEDIR?=	openoffice.org-vcltesttool
+EXECBASE?=		openoffice.org-vcltesttool
 DIST_SUBDIR=		openoffice.org2
 SIMPLEOSVER=		${OSREL:C/\.//g}
-.if ${ARCH} == amd64
-PACKAGE_BASENAME=	OOo_Dev_${OOOTAG}_${OPSYS}${SIMPLEOSVER}X86-64
-.else
-PACKAGE_BASENAME=	OOo_Dev_${OOOTAG}_${OPSYS}${SIMPLEOSVER}Intel
-.endif
-
-LOCALIZED_LANG?=	en-US
-# FIXME (Somehow INDEX build fails)
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=		${LANG_PKGNAME}-
-.endif
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=		-${LANG_SUFFIX}
-.endif
-
-RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
@@ -100,6 +63,7 @@ OOOCXX=		${CCACHE_PREFIX} ${CXX}
 OOOCC=		${CC}
 OOOCXX=		${CXX}
 .endif
+
 CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
 		CPPFLAGS="-I${LOCALBASE}/include"	\
 		LDFLAGS="-L${LOCALBASE}/lib" \
@@ -115,16 +79,13 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
 		ant:${PORTSDIR}/devel/apache-ant
 
-.if !defined(WITH_GPC)
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
-.endif
 
 USE_BISON=	build
 GNU_CONFIGURE=	yes
 WRKSRC?=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
-PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .if defined(DISABLE_MAKE_JOBS)
 MAKE_JOBS_NUMBER=	1
@@ -134,53 +95,23 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
 			--enable-crashdump=yes				\
 			--with-system-zlib				\
+			--disable-mozilla				\
+			--disable-odk					\
+			--without-nas					\
 			--with-system-stdlibs				\
-			--with-epm=internal
+			--with-epm=internal				\
+			--with-jdk-home="${JAVA_HOME}"			\
+			--disable-binfilter
 
 .if ${ARCH} == amd64
 WITHOUT_MOZILLA=	yes
 LIB_DEPENDS+=		boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=	--with-system-boost=yes #i58343#
 .endif
-.if (${OSVERSION} <= 602102)
-EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
-.endif
-.if !defined(WITH_SYSTEM_FREETYPE) && defined(WITH_TTF_BYTECODE_ENABLED)
-EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
-.endif
-
-ICONS=	${WRKSRC}/sysui/desktop/icons
-
-.include <${FILESDIR}/Makefile.knobs>
-
-pre-everything::
-# really tweak, extremely useful when you build all localized language versions
-# needed after when you build with ALL_LOCALIZED_LANGS.
-.if defined(TWEAK_L10N)
-	@${RM} -f ${WRKDIR}/.PLIST*
-	@${RM} -f ${WRKDIR}/.install_done.*
-	@${RM} -f ${WRKDIR}/.package_done.*
-	@${RM} -f ${WRKDIR}/.extract_done.*
-	@${RM} -f ${WRKDIR}/.patch_done.*
-	@${RM} -f ${WRKDIR}/.configure_done.*
-	@${RM} -f ${WRKDIR}/.build_done.*
-	@${MKDIR} ${WRKDIR}
-	@${TOUCH} ${EXTRACT_COOKIE}
-	@${TOUCH} ${PATCH_COOKIE}
-	@${TOUCH} ${CONFIGURE_COOKIE}
-	@${TOUCH} ${BUILD_COOKIE}
-.endif
 
 post-extract:
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
-.if defined(WITH_GPC)
-	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
-	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
-	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
-.endif
-.if !defined(WITHOUT_MOZILLA)
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
-.endif
+
 pre-configure:
 #Workaround for gperf. #i85469#
 	@${LN} -sf ${LOCALBASE}/bin/gperf ${WRKSRC}/solenv/bin/gperf
@@ -189,105 +120,38 @@ do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput -- -P${MAKE_JOBS_NUMBER}"
 
-.if ${LOCALIZED_LANG} == "alllangs"
-	@${MAKE} languagepack
-.endif
-
 do-install:
-.if ${LOCALIZED_LANG} == "alllangs"
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/ ; ${LS} */freebsd*/*.t?z > ${WRKDIR}/LANGPACKFILES
-	@${RM} -Rf ${WRKDIR}/tmp
-	@${MKDIR} ${WRKDIR}/tmp
-	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
+	${RM} -Rf ${WRKDIR}/tmp ${WRKDIR}/${INSTALLATION_BASEDIR}
+	${MKDIR} ${WRKDIR}/tmp ${WRKDIR}/${INSTALLATION_BASEDIR}
+	cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
+	for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${ECHO_CMD} "extracting $$i" ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd-*/$$i ; \
 	done
-	@for i in `${CAT} ${WRKDIR}/LANGPACKFILES`; do \
-		${ECHO_CMD} "extracting $$i" ; \
-		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/$$i ;\
-	done
-	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
-	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
-.else
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
-	@${RM} -Rf ${WRKDIR}/tmp
-	@${MKDIR} ${WRKDIR}/tmp
-	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
-		${ECHO_CMD} "extracting $$i" ; \
-		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ; \
-	done
-	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
-	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
-.endif
+	${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
+	cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
+	${MV} ${PREFIX}/${INSTALLATION_BASEDIR}/program/soffice ${PREFIX}/${INSTALLATION_BASEDIR}/program/testtool
+#following looks like the official process but lacks some files for FBSD.
+#ftp "http://qa.openoffice.org/source/browse/*checkout*/qa/qatesttool/tools/standaloneTestTool/createTestTool.pl?rev=1.7"
+#mv createTestTool.pl\?rev=1.7 createTestTool.pl
+#ftp "http://qa.openoffice.org/source/browse/*checkout*/qa/qatesttool/tools/standaloneTestTool/filelinx.txt?rev=1.10"
+#mv filelinx.txt\?rev=1.10 filefbsd.txt
+#perl createTestTool.pl filefbsd.txt /work/VCLTestTool/openoffice.org-vcltesttool/work/SRC680_m248/solver/680/unxfbsdi.pro/lib/ ./vcl/
+	#cd ${WRKDIR} ; ${PERL} ${FILESDIR}/createTestTool.pl ${FILESDIR}/filefbsd.txt ${WRKSRC}/solver/680/unxfbsd?.pro/lib/ ${INSTALLATION_BASEDIR}/
+	#${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
+	#cd ${WRKDIR} ; ${TAR} xf ${WRKDIR}/tt_680unxfbsd?.pro.tar -C ${PREFIX}/
 
 post-install:
-	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%OOOTAG%%#${OOOTAG}#g' \
-			-e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
 		${PREFIX}/bin/${EXECBASE}
-	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase
-	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
-	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
-	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setofficelang
-	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
-	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
-	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
-	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${ECHO_CMD} "" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d | ${SORT} -r | \
 		${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
-	@${REINPLACE_CMD} -e '/^Exec/s/printeradmin/spadmin/' \
-			${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop
-	@for app in base calc draw impress math printeradmin writer; do \
-		${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \
-			-e "s/^Icon.*/Icon=${EXECBASE}-$${app}.png/" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/$${app}.desktop ; \
-	done
-	@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak
-	@${RM} -f ${DESKTOPDIR}/${EXECBASE}
-	@${MKDIR} ${DESKTOPDIR}
-	@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
-			${DESKTOPDIR}/${EXECBASE}
-	@${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
-	@${PREFIX}/bin/update-desktop-database 2>/dev/null || ${TRUE}
-	@${ECHO_CMD} "@exec ${PREFIX}/bin/update-desktop-database 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
-	@for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \
-		for app in base calc draw impress math printeradmin writer; do \
-			if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
-				${INSTALL_DATA} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \
-				    ${PREFIX}/share/icons/hicolor/$${dir}/apps/${EXECBASE}-$${app}.png ; \
-				${ECHO_CMD} "share/icons/hicolor/$${dir}/apps/${EXECBASE}-$${app}.png" >> ${TMPPLIST} ; \
-			fi \
-		done ; \
-		for file in `cd ${ICONS}/hicolor/$${dir}/mimetypes; ls *.png`; do \
-			${INSTALL_DATA} ${ICONS}/hicolor/$${dir}/mimetypes/$${file} \
-			    ${PREFIX}/share/icons/hicolor/$${dir}/mimetypes/ ; \
-			${ECHO_CMD} "share/icons/hicolor/$${dir}/mimetypes/$${file}" >> ${TMPPLIST} ; \
-		done ; \
-	done
-	@${PREFIX}/bin/gtk-update-icon-cache -q -f ${PREFIX}/share/icons/hicolor 2>/dev/null || ${TRUE}
-	@${ECHO_CMD} "@unexec ${RM} %D/share/icons/hicolor/icon-theme.cache 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
-	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
-	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
-			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
-			-e 's#%%OOOTAG%%#${OOOTAG}#g' \
-			-e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
-			${PKGMESSAGE}
-	@${ECHO_CMD}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
 
-.include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index b03b2deeb1c6..f3bb72cf6054 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -4,9 +4,3 @@ SIZE (openoffice.org2/OOo_SRC680_m248_source.tar.bz2) = 298993416
 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2/unowinreg.dll) = 6144
-MD5 (openoffice.org2/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-SHA256 (openoffice.org2/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
-SIZE (openoffice.org2/gpc231.tar.Z) = 27917
-MD5 (openoffice.org2/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
-SHA256 (openoffice.org2/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
-SIZE (openoffice.org2/mozilla-source-1.7.5.tar.gz) = 38721366
diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.knobs b/editors/openoffice.org-vcltesttool/files/Makefile.knobs
deleted file mode 100644
index 3f9d19ba5f93..000000000000
--- a/editors/openoffice.org-vcltesttool/files/Makefile.knobs
+++ /dev/null
@@ -1,148 +0,0 @@
-# Makefile for knobs
-# Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD$
-
-CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant"
-
-CONFIGURE_ARGS+=	--with-vba-package-format="builtin"
-
-.if defined(WITH_KDE)
-CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
-.endif
-
-.if defined(WITHOUT_CUPS)
-CONFIGURE_ARGS+=	--enable-cups=no
-.else
-LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
-CONFIGURE_ARGS+=	--enable-cups=yes
-.endif
-
-.if defined(WITHOUT_MOZILLA)
-CONFIGURE_ARGS+=	--disable-mozilla
-.else
-CONFIGURE_ARGS+=	--enable-build-mozilla
-.endif
-
-.if defined(WITHOUT_GNOMEVFS)
-CONFIGURE_ARGS+=	--disable-gnome-vfs
-.else
-USE_GNOME+=		gnomevfs2
-.endif
-
-.if defined(WITH_EVOLUTION2)
-CONFIGURE_ARGS+=	--enable-evolution2=yes
-.else
-USE_GNOME+=		glib20
-.endif
-
-.if defined(WITH_SYSTEM_FREETYPE)
-LIB_DEPENDS+=		freetype.9:${PORTSDIR}/print/freetype2
-CONFIGURE_ARGS+=	--with-system-freetype=yes
-.else
-CONFIGURE_ARGS+=	--with-system-freetype=no
-.endif
-
-.if defined(ALL_LOCALIZED_LANGS)
-CONFIGURE_ARGS+=	--with-lang=ALL
-.else
-CONFIGURE_ARGS+=	--with-lang=${LOCALIZED_LANG}
-.endif
-
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--enable-debug --enable-symbols=TRUE --enable-dbgutil
-.else
-CONFIGURE_ARGS+=	--enable-symbols=SMALL
-.endif
-
-.if defined(WITH_SYSTEM_ICU)
-LIB_DEPENDS+=		icule:${PORTSDIR}/devel/icu
-CONFIGURE_ARGS+=	--with-system-icu=yes
-.else
-CONFIGURE_ARGS+=	--with-system-icu=no
-.endif
-
-pre-fetch:
-	@${ECHO} "OPTIONS:"
-.if !defined(WITH_DEBUG)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with debug symbols/supports with"
-	@${ECHO} "make -DWITH_DEBUG"
-.endif
-.if !defined(WITHOUT_MOZILLA)
-	@${ECHO}
-	@${ECHO} "You can compile OOo without Mozilla connectivity with"
-	@${ECHO} "make -DWITHOUT_MOZILLA"
-.endif
-.if !defined(WITHOUT_GNOMEVFS)
-	@${ECHO}
-	@${ECHO} "You can compile OOo without gnome VFS support with"
-	@${ECHO} "make -DWITHOUT_GNOMEVFS"
-.endif
-.if !defined(WITH_SYSTEM_ICU)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with devel/icu from ports with"
-	@${ECHO} "make -DWITH_SYSTEM_ICU"
-.endif
-.if !defined(WITH_SYSTEM_FREETYPE)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with freetype2 from ports with"
-	@${ECHO} "make -DWITH_SYSTEM_FREETYPE"
-.if !defined(WITH_TTF_BYTECODE_ENABLED)
-	@${ECHO}
-	@${ECHO} "You may get better quality of glyphs"
-	@${ECHO} "at small bitmap sizes if you have"
-	@${ECHO} "licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479, with"
-	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
-	@${ECHO} "See http://www.freetype.org/patents.html for details"
-.endif
-.endif
-.if !defined(WITHOUT_CUPS)
-	@${ECHO}
-	@${ECHO} "You can compile OOo without CUPS support with"
-	@${ECHO} "make -DWITHOUT_CUPS"
-.endif
-.if !defined(WITH_KDE)
-	@${ECHO}
-	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
-	@${ECHO} "make -DWITH_KDE"
-.endif
-.if !defined(WITH_GPC)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with gpc instead of libart by"
-	@${ECHO} "make -DWITH_GPC"
-.endif
-.if !defined(WITH_EVOLUTION2)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with evolution2 support by"
-	@${ECHO} "make -DWITH_EVOLUTION2"
-.endif
-.if ${LOCALIZED_LANG} != "alllangs"
-	@${ECHO}
-	@${ECHO} "You can compile OOo with full localized language support by"
-	@${ECHO} "make LOCALIZED_LANG=alllangs"
-.endif
-	@${ECHO}
-	@${ECHO} "You can select the language for OOo by making it with:"
-	@${ECHO} "make LOCALIZED_LANG=xx" 
-	@${ECHO} "while xx can be one of the following"
-	@${ECHO} "af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da"
-	@${ECHO} "de dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gl"
-	@${ECHO} "gu-IN he hi-IN hr hu it ja ka km kn ko ku lo lt lv mk"
-	@${ECHO} "ms ml-IN mr-IN ne nb nl nn nr ns oc or-IN pa-IN pl pt"
-	@${ECHO} "pt-BR ru rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER"
-	@${ECHO} "ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW"
-	@${ECHO} "zu"
-	@${ECHO} "Current setting: ${LOCALIZED_LANG}"
-	@${ECHO}
-	@${ECHO} "NOTICE:"
-	@${ECHO}
-	@${ECHO} "To build OOo, you should have a lot"
-.if defined(WITH_DEBUG)
-	@${ECHO} "of free diskspace (~ 18GB) and memory (~ 2GB)."
-.elif ${LOCALIZED_LANG} == "alllangs"
-	@${ECHO} "of free diskspace (~ 35GB) and memory (~ 2GB)."
-.else
-	@${ECHO} "of free diskspace (~ 11GB) and memory (~ 2GB)."
-.endif
-	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.localized b/editors/openoffice.org-vcltesttool/files/Makefile.localized
deleted file mode 100644
index fa31e9a8937e..000000000000
--- a/editors/openoffice.org-vcltesttool/files/Makefile.localized
+++ /dev/null
@@ -1,401 +0,0 @@
-# localized makefile
-# Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD$
-################################################################
-#See solenv/inc/postset.mk for details	
-################################################################
-.if defined(LOCALIZED_LANG)
-.if ${LOCALIZED_LANG} == "af"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ar"
-CATEGORIES+=	arabic
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "as-IN"
-LANG_PKGNAME=	as
-LANG_SUFFIX=	IN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "be-BY"
-LANG_PKGNAME=	be
-LANG_SUFFIX=	BY
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "bg"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "bn-BD"
-LANG_PKGNAME=	be
-LANG_SUFFIX=	BD
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "bn-IN"
-LANG_PKGNAME=	bn
-LANG_SUFFIX=	IN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "bn"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "br"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "bs"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ca"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "cs"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "cy"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "da"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "de"
-CATEGORIES+=	german
-LANG_PKGNAME=	${LOCALIZED_LANG}
-COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "dz"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "el"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "en-GB"
-LANG_PKGNAME=	en
-LANG_SUFFIX=	GB
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "en-US"
-LANG_PKGNAME=	en
-LANG_SUFFIX=	US
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "en-ZA"
-LANG_PKGNAME=	en
-LANG_SUFFIX=	ZA
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "eo"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "es"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "et"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "eu"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "fa"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "fi"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "fr"
-CATEGORIES+=	french
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ga"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "gl"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "gu-IN"
-LANG_PKGNAME=	gu
-LANG_SUFFIX=	IN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "he"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "hi-IN"
-LANG_PKGNAME=	hi
-LANG_SUFFIX=	IN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "hr"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "hu"
-CATEGORIES+=     hungarian
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "it"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ja"
-CATEGORIES+=	japanese
-LANG_PKGNAME=	${LOCALIZED_LANG}
-RUN_DEPENDS+=	${LOCALBASE}/share/fonts/std.ja_JP/Ryumin-Light:${PORTSDIR}/japanese/font-std
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ka"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "km"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "kn"
-LANG_PKGNAME=	kn
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ko"
-CATEGORIES+=     korean
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ku"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "lo"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "lt"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "lv"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "mk"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ml-IN"
-LANG_PKGNAME=	ml
-LANG_SUFFIX=	IN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "mr-IN"
-LANG_PKGNAME=	mr
-LANG_SUFFIX=	IN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ms"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "nb"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ne"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "nl"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "nn"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "nr"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ns"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "or-IN"
-LANG_PKGNAME=	or
-LANG_SUFFIX=	IN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "pa-IN"
-LANG_PKGNAME=	pa
-LANG_SUFFIX=	IN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "pl"
-CATEGORIES+=	polish
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "pt"
-COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
-CATEGORIES+=	portuguese
-LANG_PKGNAME=	${LOCALIZED_LANG}
-LANG_CONFIGURE_ARG=	PORT
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "pt-BR"
-COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
-CATEGORIES+=	portuguese
-LANG_PKGNAME=	pt
-LANG_SUFFIX=	BR
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ru"
-CATEGORIES+=	russian
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "rw"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sh"
-LANG_PKGNAME=	sh
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sk"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sl"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sr"
-LANG_PKGNAME=	sr
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ss"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "st"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sv"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sw-TZ"
-LANG_PKGNAME=	sw
-LANG_SUFFIX=	TZ
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sw"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ta-IN"
-LANG_PKGNAME=	ta
-LANG_SUFFIX=	IN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "te-IN"
-LANG_PKGNAME=	te
-LANG_SUFFIX=	IN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "tg"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "th"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ti-ER"
-LANG_PKGNAME=	ti
-LANG_SUFFIX=	ER
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "tn"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "tr"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ts"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "uk"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ur-IN"
-LANG_PKGNAME=	ur
-LANG_SUFFIX=	IN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "uz"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ve"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "vi"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "xh"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "zh-CN"
-CATEGORIES+=	chinese
-LANG_PKGNAME=	zh
-LANG_SUFFIX=	CN
-BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "zh-TW"
-CATEGORIES+=	chinese
-LANG_PKGNAME=	zh
-LANG_SUFFIX=	TW
-BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "zu"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "alllangs"
-ALL_LOCALIZED_LANGS=yes
-PKGNAMESUFFIX=	-alllangs
-.endif
-################################################################
-.endif
diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.others b/editors/openoffice.org-vcltesttool/files/Makefile.others
deleted file mode 100644
index 444a91beac69..000000000000
--- a/editors/openoffice.org-vcltesttool/files/Makefile.others
+++ /dev/null
@@ -1,67 +0,0 @@
-# Makefile for other stuffs
-# Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD$
-
-#other stuffs which are not directly related to making ports
-#package-rename: rename package for uploading
-#package-canonical: making official packages (WIP)
-#ure:  URE (Uno Runtime Environment) packages (WIP)
-#solver: solver
-#languagepack: language pack
-
-package-rename:
-	@${ECHO_MSG} "===>   Rename package for OpenOffice.org mirror upload";
-	@${MV} ${PKGFILE} \
-		${WRKDIR}/../${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX}
-
-package-canonical:
-	@${ECHO_MSG} "===>   Canonical packaging for OpenOffice.org";
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ;\
-	${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} .
-
-sdk:
-	@${ECHO_MSG} "===>   Make SDK of OpenOffice.org"
-	@${RM} -fr ${WRKDIR}/sdk_tmp
-	@${MKDIR} ${WRKDIR}/sdk_tmp
-	@cd ${WRKDIR}/sdk_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z
-	@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
-		${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \
-		${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \
-		${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_SDK.tar.bz2 ${INSTALLATION_BASEDIR}_sdk
-
-ure:
-	@${ECHO_MSG} "===>   Make Uno Runtime Environment of OpenOffice.org"
-	@${RM} -fr ${WRKDIR}/ure_tmp
-	@${MKDIR} ${WRKDIR}/ure_tmp
-	@cd ${WRKDIR}/ure_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/URE/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z
-	@cd ${WRKDIR}/ure_tmp/opt/openoffice* ; \
-		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
-		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
-		${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_URE.tar.bz2 ${INSTALLATION_BASEDIR}
-
-solver:
-	@${ECHO_MSG} "===>   Make Solver of OpenOffice.org"
-	@cd ${WRKSRC} ; ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_solver.tar.bz2 solver
-
-languagepack:
-	@${ECHO_MSG} "===>   Make languagepack of OpenOffice.org"
-.if defined (ALL_LOCALIZED_LANGS)
-	@cd ${WRKSRC} ; ${TCSH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack'
-.else
-	@cd ${WRKSRC} ; ${TCSH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
-.endif
-
-.if !defined (ALL_LOCALIZED_LANGS)
-	@${RM} -fr ${WRKDIR}/langpack_tmp
-	@${MKDIR} ${WRKDIR}/langpack_tmp
-.if defined (LOCALIZED_LANG)
-	@cd ${WRKDIR}/langpack_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z
-	@cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \
-		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
-		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
-		${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_langpack_${LOCALIZED_LANG}.tar.bz2 ${INSTALLATION_BASEDIR}
-.endif
-.endif
diff --git a/editors/openoffice.org-vcltesttool/files/createTestTool.pl b/editors/openoffice.org-vcltesttool/files/createTestTool.pl
new file mode 100644
index 000000000000..0c24a702aa8a
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/createTestTool.pl
@@ -0,0 +1,270 @@
+#!/usr/bin/perl
+
+#############################################################
+# creation of a stand-alone-running Testtool for one platform
+#
+# created by thorsten.bosbach@sun.com 03.02.2003
+#
+# has to be called with three parameters
+#
+# 1. the file list that should be processed
+#    that file list is system dependant and exists for 
+#    a. windows
+#    b. linux
+#    c. solaris-sparc
+#    d. solaris-intel
+#    e. macos x
+#
+# 2. the path to the binary libraries in the build environment
+#    at least 3 parts: /SRX644/unxlngi4.pro/lib.r/
+#    works also for: SRX644/unxlngi4/lib/
+#    the last / has to be there!!!!
+#
+# 3. the path to where the files should be copied.
+#    the directory has to exist.
+#    the last / has to be there!!!!
+#
+# example ./createTestTool.pl filelinx.txt /net/jumbo/ws8/SRX644/unxlngi4.pro/lib.u/ /home/autotbo/work/c/
+##############################################################
+
+use File::Basename;
+use File::Copy;
+use Cwd 'abs_path';
+
+   $sScriptSource = dirname(abs_path($0));
+   if ($#ARGV != 2) {
+      die "syntax: createTestTool.pl ListFileName SourceDirectory/LIB/ DestinationDirectory/ \n";
+   }
+   $sFileWithFilenames = $ARGV[0];
+   $sBaseSrcDirectory  = $ARGV[1];
+   $sBaseDestDirectory = $ARGV[2];
+   $sBaseDestDirectoryOrg = $sBaseDestDirectory;
+
+   # get the directory one level higher and set the Minor Version
+   print "$sBaseSrcDirectory \n";
+   $sRootSrcDirectory = dirname($sBaseSrcDirectory),"\n";
+   print $sRootSrcDirectory ,"\n";
+
+   $l2 = length($sRootSrcDirectory);
+   $temp = substr($sBaseSrcDirectory, $l2, length($sBaseSrcDirectory) - $l2);
+   print $temp, "\n";
+   $iLib = index($temp, "lib");
+   if ($iLib < 0) {
+      $iProgram = index($temp, "program");
+      if ($iProgram < 0) {
+         $iProgram = index($temp, "MacOS");
+         if ($iProgram < 0) {
+            die "  Starting not in directory 'lib' nor directory 'program' nor 'MacOS' :-( \n";
+         } else {
+            $bBuildEnvironment = 0;
+         }
+      } else {
+         $bBuildEnvironment = 0;
+      }
+   } else {
+      $bBuildEnvironment = 1;
+   }
+   if ($bBuildEnvironment) {
+      $iMinor = index($temp, ".");
+      if ($iMinor > -1) {
+         $sMinor = substr($temp, $iMinor, length($temp)-($iMinor+1));
+      } else {
+         $sMinor = "";
+      }
+      print $sMinor, "\n";
+      $sMinor2 = substr($sMinor, 1, length($sMinor)-1);
+
+      # get the directory one more level higher and set the Pro/NONPro Version
+      print "$sRootSrcDirectory \n";
+      $sRootDirectory = dirname($sRootSrcDirectory),"\n";
+      print $sRootDirectory ,"\n";
+
+      $l2 = length($sRootDirectory);
+      $temp = substr($sRootSrcDirectory, $l2, length($sRootSrcDirectory) - $l2);
+      print $temp, "\n";
+      $sPlatform = substr($temp, 1, length($temp)-1);
+      $iPro = index($temp, ".");
+      if ($iPro > -1) {
+         $sPro = substr($temp, $iPro, 4);
+      } else {
+         $sPro = "";
+      }
+      print $sPro, "\n";
+
+      # generate version.txt file with the version of the testtool like: Date; Time; this is a (pro/nonpro) TestTool version: 644v
+      if (! -e $sBaseDestDirectory) {
+          mkdir ($sBaseDestDirectory, 0777)                   or die "cannot create directory $sBaseDestDirectory: $!";
+      }
+      if (! -e "$sBaseDestDirectory/resource") {
+          mkdir ("$sBaseDestDirectory/resource", 0777)                   or die "cannot create directory $sBaseDestDirectory: $!";
+      }
+      open(OUT, ">$sBaseDestDirectory/Version.txt")                  or die "cannot write version.txt: $!";
+         if ($sPro eq ".pro") {
+            $sKind = "";
+         } else {
+            $sKind = "NON";
+         }
+         $sTime = localtime;
+         $sVersion = basename($sRootDirectory);
+         print OUT "$sTime; This is a $sKind-Produkt TestTool; Version: $sVersion$sMinor\n";
+      close(OUT);
+   }
+
+   # read filenames from file and put into array, and count them
+   @asFileNames = ();
+   $iFiles = 0;
+   open(DATA, "< $sFileWithFilenames")       or die "Couldn't read from datafile '$sFileWithFilenames': $!\n";
+   while (<DATA>) {
+      chomp;
+      push(@asFileNames, $_);
+      ++$iFiles;
+      #      print "  $iFiles : ", $_, "\n";
+   }
+   #   print "--|$asFileNames[$#asFileNames]|--$#asFileNames \n";
+
+   # generate array with directories to proceed, 3 by now
+   # process the directory with the most files first (lib)(on unixen, for windoze it would be bin :-))
+   @saTempDirectory = ();
+   push (@saTempDirectory, "$sBaseSrcDirectory/");
+   if ($bBuildEnvironment) {
+      # special files in same level bin directory
+      push (@saTempDirectory, "$sRootSrcDirectory/bin$sMinor/");
+      # special files in upper level common bin directory
+      push (@saTempDirectory, "$sRootDirectory/common$sPro/bin$sMinor/");
+   } else {
+      # special files in recource directory
+      push (@saTempDirectory, "$sBaseSrcDirectory/resource/");
+   }
+
+   # find all files in filelist, try in all directories
+   if (! -e "$sBaseDestDirectory") {
+      $temp = mkdir ("$sBaseDestDirectory");
+      if ($temp != 1) {
+         warn "Couldn't create dir -(\n";
+      }
+   }
+  # if MacOS package, create .app
+      if (substr(basename($sFileWithFilenames),0,7) eq 'fileosx') {
+          print "  Starting creating MacOS application package.  \n";
+          mkdir ("$sBaseDestDirectory/tt.app", 0777)                   or die "cannot create directory $sBaseDestDirectory/tt.app: $!";
+          if (-e "$sScriptSource/macos-template.zip") {
+              $temp = system "unzip", "-q", "$sScriptSource/macos-template.zip", "-d$sBaseDestDirectory/tt.app";
+              if ($temp != 0) {
+                  warn "Couldn't unzip mactemplate :-(\n";
+              }
+          }
+          $sBaseDestDirectory = "$sBaseDestDirectory/tt.app/Contents/MacOS/";
+      }
+   if (! -e "$sBaseDestDirectory/resource") {
+      $temp = mkdir ("$sBaseDestDirectory/resource");
+      if ($temp != 1) {
+         warn "Couldn't create dir -(\n";
+      }
+   }
+   @asNotFoundFileNames = @asFileNames;
+   for ($n=0; $n<=$#saTempDirectory; $n++){
+      $sTempDirectory = $saTempDirectory[$n];
+      print " + processing directory '$sTempDirectory' \n";
+      @asTempFileNames = @asNotFoundFileNames;
+      @asNotFoundFileNames = ();
+      for ($i=0; $i <= $#asTempFileNames; $i++) {
+         $name = "$sTempDirectory$asTempFileNames[$i]";
+         if (-e $name) {
+            @a = $name;
+         } else {
+	    @a = <$name*>;
+         }
+
+         if ($#a > -1 ) {
+            foreach $aref (@a) {
+               if (-l "$aref") {
+                   $temp = basename($aref);
+                   symlink(readlink("$aref"), "$sBaseDestDirectory$temp");
+               } else {
+                  # Identify *.res files, to put them into the resource directory; otherwise they are not found :-(
+                   if (substr($aref, -4, 4) eq ".res") {
+                       copy("$aref", "$sBaseDestDirectory/resource/")               or die "copy failed $asTempFileNames[$i] : $! $aref -> resource";
+                   } else {
+                       copy("$aref", "$sBaseDestDirectory")               or die "copy failed $asTempFileNames[$i] : $! $aref";
+                   }
+               }
+           } 
+         } else {
+            push (@asNotFoundFileNames, $asTempFileNames[$i]);
+         }
+      }
+      #   $temp = $#asTempFileNames - $#asNotFoundFileNames;
+      #   print " -               found files count: $temp' \n";
+      #   for ($i=0; $i <= $#asNotFoundFileNames; $i++) {
+      #      print "--- $i: $asNotFoundFileNames[$i] \n";
+      #   }
+   }
+
+   # print all not found files, if any
+   for ($i=0; $i <= $#asNotFoundFileNames; $i++) {
+      print "--- $i: $asNotFoundFileNames[$i] \n";
+   }
+
+   if ($#asNotFoundFileNames == -1) {
+      print " * * * * * * * * * * * * * * * * * * * * * * * *  \n";
+      print "* * * * * * FINISHED all files copied * * * * * * \n";
+      print " * * * * * * * * * * * * * * * * * * * * * * * *  \n";
+   } else {
+      print "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ \n";
+      print "@     ERROR there are files missing!             @\n";
+      print "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ \n";
+   }
+    
+   if (-e "$sBaseDestDirectory/soffice") {
+       copy("$sBaseDestDirectory/soffice", "$sBaseDestDirectory/testtool")               or die "copy failed soffice -> testtool";
+    }
+   $temp = chmod (0555,<$sBaseDestDirectory/testtool*>);
+   if ($temp != 2) {
+      warn "Couldn't change permissions for testool* :-(\n";
+   }
+   $temp = unlink (<$sBaseDestDirectory/*.a>);
+   print $temp;
+ #   if ($temp != 2) {
+ #      warn "Couldn't remove *.a files :-(\n";
+ #   }
+   if (-e "$sBaseDestDirectory/javaldx") {
+      $temp = chmod (0555,<$sBaseDestDirectory/javaldx>);
+      if ($temp != 1) {
+         warn "Couldn't change permissions for types.rdb :-(\n";
+      }
+   }
+   # if images_tt.zip is missing or an image in that file is missing, use images.zip!
+   $images = "images_tt.zip";
+   $path = '';
+   if (-e "$sBaseDestDirectory/$images") {
+       $path = "$sBaseDestDirectory/$images";
+   } else {
+       if (-e "$sScriptSource/$images") {
+           $path = "$sScriptSource/$images";
+       }
+   }
+   if ($path) {
+      print "  Starting unzipping $images file; This may take a while, please standby....  \n";
+      $temp = system "unzip", "-q", "$path", "-d$sBaseDestDirectory";
+      if ($temp != 0) {
+         warn "Couldn't unzip $images :-(\n";
+      }
+      print "  Finished unzipping.  \n";
+      if ($path eq "$sBaseDestDirectory/$images") {
+           unlink ("$sBaseDestDirectory/$images"); 
+      }
+   }
+  # tar the directory to preserve links on moving between filesystems! 
+      print "  Starting creating compressed testtool archive. This may take a while, please standby....  \n";
+      $temp = substr($sBaseDestDirectoryOrg, 0, length($sBaseDestDirectoryOrg) - 1);
+      $sMinor2 = $sMinor2,"_";
+      $temp = system "tar", "cf", "tt_$sVersion$sMinor2$sPlatform.tar", "$temp";
+      if ($temp != 0) {
+         warn "Couldn't tar :-(\n";
+      }
+      print "  Finished taring.  \n";
+  # TODO: print size!
+exit;
+
+#----------------------------------------------------------------------------------------------------------
+
diff --git a/editors/openoffice.org-vcltesttool/files/filefbsd.txt b/editors/openoffice.org-vcltesttool/files/filefbsd.txt
new file mode 100644
index 000000000000..13f62fe119e8
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/filefbsd.txt
@@ -0,0 +1,81 @@
+types.rdb
+javaldx
+configmgr2.uno.so
+libcomphelp*.so
+libcppu*
+libdict_ja.so
+libdict_zh.so
+libdtrans.so
+libdtransX11?????.so
+libfileacc.so
+libfw*??.so
+lib*_uno.so
+libgcc_s.so*
+libicu*
+libj?????_g.so
+libjvmaccess*.so.3
+liblocaledata_*.so
+libmcnttype.so
+libpsp?????.so
+librmcxt*
+libreg*
+libsal*
+libsb?????.so
+libso?????.so
+libsot?????.so
+libstdc++.so.?
+libstlport_*.so
+libstore*
+libsvl?????.so
+libsvt?????.so
+libtk?????.so
+libtl?????.so
+libucb1.so
+libucbhelper*.so
+libucpfile1.so
+libucph*.so
+libutl?????.so
+libuui?????.so
+libvcl?????.so
+libvos3*.so
+libxcr?????.so
+svt*.res
+vcl*.res
+stt*.res
+testtool.bin
+testtoolrc
+javaloader.uno.so
+liburp_uno.so
+sax.uno.so
+textinstream.uno.so
+textoutstream.uno.so
+introspection.uno.so
+reflection.uno.so
+connector.uno.so
+bridgefac.uno.so
+remotebridge.uno.so
+libi18nutil*
+i18npool.uno.so
+libvclplug_g*.so
+libbasegfx?????.so
+libjvmfwk.so*
+libxml2.so*
+images_tt.zip
+libuno_cppuhelper*
+libuno_sal.so*
+libuno_salhelper*
+libuno_cppu.so*
+libsndfile.so*
+libportaudio.so*
+libcommuni*.so*
+libsimplecm*.so*
+libi18nisolang*.so
+libuno_purpenvhelper*.so*
+libunsafe_uno_uno.so
+libaffine_uno_uno.so
+sb*.res
+services.rdb
+unorc
+bootstrap.uno.*
+stocservices.uno.*
+oovbaapi.rdb
diff --git a/editors/openoffice.org-vcltesttool/files/generate.pl b/editors/openoffice.org-vcltesttool/files/generate.pl
deleted file mode 100644
index 88ce945c4e9d..000000000000
--- a/editors/openoffice.org-vcltesttool/files/generate.pl
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/perl
-# generate full build shell script for OpenOffice.org
-# Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-vcltesttool/files/Attic/generate.pl,v 1.11 2008-04-04 10:05:21 maho Exp $
-
-print "#!/bin/csh\n";
-print "make deinstall clean\n";
-print "/usr/bin/time -h make WITH_CCACHE=yes install package package-rename solver sdk ure languagepack deinstall >& log.en\n";
-print "bzip2 log.en\n";
-#print "rm work/.configure* work/.build* \n";
-#workaround for breakage at odk sdk_oo
-print "make deinstall clean\n";
-
-print "/usr/bin/time -h make ALL_LOCALIZED_LANGS=yes >& log.all\n";
-print "bzip2 log.all\n";
-
-open ( FILE,  "< Makefile.localized") ;
-while(<FILE>){
-@tmp=split (' ',$_);
-@tmp2=split ('"',$tmp[3]);
-if ( $tmp[0] eq ".if" && $tmp[1] eq "\${LOCALIZED_LANG}" ) { $LANG=$tmp2[1]; 
-	print "make TWEAK_L10N=yes LOCALIZED_LANG=$LANG pre-everything\n";
-	print "/usr/bin/time -h make LOCALIZED_LANG=$LANG WITH_CCACHE=yes languagepack package package-rename deinstall >& log.$LANG\n";
-	print "bzip2 log.$LANG\n";
-	}
-}
-close FILE;
-print "md5 OOo* > MD5SUMS.log\n";
-print "sudo -u `who am i | awk '{print \$1}'` ssh build.good-day.net mkdir -p /home/ftp/pub/OpenOffice.org/FreeBSD/`make -V OOOTAG`/`uname -r`/`uname -m`\n";
-print "sudo -u `who am i | awk '{print \$1}'` scp OOo* MD5SUMS.log build.good-day.net:/home/ftp/pub/OpenOffice.org/FreeBSD/`make -V OOOTAG`/`uname -r`/`uname -m`\n";
diff --git a/editors/openoffice.org-vcltesttool/files/ooovcltest.pl b/editors/openoffice.org-vcltesttool/files/ooovcltest.pl
new file mode 100644
index 000000000000..320cf4896224
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/ooovcltest.pl
@@ -0,0 +1,117 @@
+#!/usr/bin/perl
+# Copyright 2009 by NAKATA Maho <maho@FreeBSD.org> <maho@openoffice.org>
+# All rights reserved.
+use Cwd;
+use File::HomeDir; #devel/p5-File-HomeDir
+
+sub parse_option {
+        while ($_ = shift) {
+                if (substr($_, 0, 1) eq '-') {
+                        if ($_ eq '-help') {
+                                print "ooovcltest [-tag tag]\n";
+                                exit;
+                        } elsif ($_ eq '-tag') {
+				$ooo_tag_flag=1;
+                                $ooo_tag = shift;
+                        } else {
+                                die "Invalid option: \"$_\"\n";
+                        }
+                }
+        }
+}
+
+#main
+$ooo_tag_flag=0;
+parse_option(@ARGV);
+split('_',$ooo_tag);
+$ooo_codeline=@_[0];
+$ooo_milestone=@_[1];
+$ooo_milestone=~ s/m//; 
+
+$ooo_testautomation_archive_name="OOo_" . "$ooo_tag" . "_testautomation.tar.bz2" ;
+$ooo_testautomation_site="http://ooopackages.good-day.net/pub/OpenOffice.org/qa/testautomation/";
+
+if (!$ooo_tag_flag) {die "please speficy OOo tag\n";}
+print "testing tag: $ooo_tag at ";
+system("date\n");
+print "downloading testautomation environment....\n";
+system ("ftp $ooo_testautomation_site" . "$ooo_testautomation_archive_name" . "\n");
+print "done\n";
+
+print "Downloading category list for scripts at $ooo_tag \n";
+
+$uri="index.php\?option=com_quaste\&task=tests_overview\&workspace=" . "$ooo_codeline" . "\&milestone=" . "m$ooo_milestone";
+$caturi="http://quaste.services.openoffice.org/" . $uri . "\&download=1";
+system ("wget \"$caturi\"\n");
+$catlist=$ooo_codeline . "_m$ooo_milestone" . ".txt" ;
+rename $uri . "\&download=1" , $catlist;
+
+print "Downloading hid list for scripts at $ooo_tag \n";
+$hiduri="http://quaste.services.openoffice.org/" . $uri . "\&download=2";
+system ("wget \"$hiduri\"\n");
+$hidlist="hid.lst";
+rename $uri . "\&download=2" , $hidlist;
+print "Download done...\n";
+
+print "extracting testautomation environment....\n";
+system ("tar xfj $ooo_testautomation_archive_name\n");
+print "done\n";
+
+#download is done....
+
+###########
+#settings...
+#copying hid.lst and test list 
+system ("cp hid.lst $ooo_tag/testautomation/global/hid\n");
+system ("grep bas $catlist >  $ooo_tag/testautomation/tools/run_tests/$catlist\n");
+
+#settings of run_test.sh
+$location=getcwd() . "/$ooo_tag/testautomation/" ;
+system ("mkdir $location/errorlogs\n");
+$location=~ s/\//\\\//g;
+system ("sed -i.bak 's/sLocation=\"\"/sLocation=\"$location\"/\' $ooo_tag/testautomation/tools/run_tests/run_tests.sh\n");
+system ("sed -i.bak 's/sTestTool=\"\"/sTestTool=\"\\/usr\\/local\\/openoffice.org-vcltesttool\\/program\\/testtool\"/' $ooo_tag/testautomation/tools/run_tests/run_tests.sh\n");
+
+#adjust ~/.testtoolrc
+$HOME = File::HomeDir->my_home;
+$location=getcwd() . "/$ooo_tag/testautomation" ;
+
+$testtoolrc="$HOME/.testtoolrc";
+open (TESTTOOLRC,">$testtoolrc") || die "Can't open file $testtoolrc !\n";
+print TESTTOOLRC "[Misc]\n";
+print TESTTOOLRC "CurrentProfile=_profile_Default\n";
+print TESTTOOLRC "ServerTimeout=4500\n";
+print TESTTOOLRC "[OOoProgramDir]\n";
+print TESTTOOLRC "Type=/usr/local/openoffice.org-$ooo_tag/openoffice.org3/program/\n";
+print TESTTOOLRC "Current=/usr/local/openoffice.org-$ooo_tag/openoffice.org3/program\n";
+print TESTTOOLRC "All=.\n";
+print TESTTOOLRC "\n";
+print TESTTOOLRC "[Crashreporter]\n";
+print TESTTOOLRC "UseProxy=false\n";
+print TESTTOOLRC "ProxyServer=none\n";
+print TESTTOOLRC "ProxyPort=8080\n";
+print TESTTOOLRC "AllowContact=false\n";
+print TESTTOOLRC "ReturnAddress=\n";
+print TESTTOOLRC "\n";
+print TESTTOOLRC "[_profile_Default]\n";
+print TESTTOOLRC "BaseDir=$location/\n";
+print TESTTOOLRC "LogBaseDir=$location/errorlogs/\n";
+print TESTTOOLRC "HIDDir=$location/global/hid\n";
+print TESTTOOLRC "StopOnSyntaxError=0\n";
+print TESTTOOLRC "AutoReload=0\n";
+print TESTTOOLRC "AutoSave=0\n";
+print TESTTOOLRC "[GUI Platform]\n";
+print TESTTOOLRC "Current=08\n";
+print TESTTOOLRC "\n";
+print TESTTOOLRC "[Communication]\n";
+print TESTTOOLRC "Host=localhost\n";
+print TESTTOOLRC "TTPort=12479\n";
+print TESTTOOLRC "UnoPort=12480\n";
+print TESTTOOLRC "\n";
+print TESTTOOLRC "[WinGeom]\n";
+print TESTTOOLRC "WinParams=180,74,920,875;1;0,0,0,0;\n";
+print TESTTOOLRC "\n";
+print TESTTOOLRC "[LRU]\n";
+print TESTTOOLRC "MaxLRU=4\n";
+
+close(TESTTOOLRC);
diff --git a/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper b/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper
index 45c88c77163a..3e51965ea80c 100644
--- a/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper
+++ b/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper
@@ -1,15 +1,7 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper,v 1.3 2006-11-12 22:11:35 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper,v 1.4 2009-07-22 09:53:44 maho Exp $
 
 oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/
-program=`echo $0 | sed -e 's|.*-%%OOOTAG%%-||'`
+$oopath/testtool
 
-case $program in
-$0)
-	$oopath/soffice "$@"
-	;;
-	*)
-	$oopath/$program "$@"
-	;;
-esac
diff --git a/editors/openoffice.org-vcltesttool/files/optpatch-freetype b/editors/openoffice.org-vcltesttool/files/optpatch-freetype
deleted file mode 100644
index 59a849064ce7..000000000000
--- a/editors/openoffice.org-vcltesttool/files/optpatch-freetype
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: freetype/freetype-2.2.1.patch
-===================================================================
-RCS file: /cvs/external/freetype/freetype-2.2.1.patch,v
-retrieving revision 1.2
-diff -u -r1.2 freetype-2.2.1.patch
---- freetype/freetype-2.2.1.patch	3 Aug 2006 14:58:26 -0000	1.2
-+++ freetype/freetype-2.2.1.patch	18 Nov 2006 07:15:21 -0000
-@@ -71,5 +71,5 @@
--*** misc/freetype-2.2.1/include/freetype/config/ftmodule.h	Mon Jan 30 11:49:42 2006
----- misc/build/freetype-2.2.1/include/freetype/config/ftmodule.h	Wed Apr  4 20:04:02 2007
-+*** misc/freetype-2.2.1/include/freetype/config/ftmodule.h	Tue Jan 31 01:49:42 2006
-+--- misc/build/freetype-2.2.1/include/freetype/config/ftmodule.h	Sat Nov 18 16:06:09 2006
- ***************
- *** 17,24 ****
- --- 17,26 ----
-@@ -94,3 +94,22 @@
- + #endif
-   
-   /* EOF */
-+*** misc/freetype-2.2.1/include/freetype/config/ftoption.h	Fri May 12 03:05:49 2006
-+--- misc/build/freetype-2.2.1/include/freetype/config/ftoption.h	Sat Nov 18 16:07:55 2006
-+***************
-+*** 436,442 ****
-+    /*   Do not #undef this macro here, since the build system might         */
-+    /*   define it for certain configurations only.                          */
-+    /*                                                                       */
-+! /* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
-+  
-+  
-+    /*************************************************************************/
-+--- 436,442 ----
-+    /*   Do not #undef this macro here, since the build system might         */
-+    /*   define it for certain configurations only.                          */
-+    /*                                                                       */
-+! #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-+  
-+  
-+    /*************************************************************************/
diff --git a/editors/openoffice.org-vcltesttool/files/patch-libxslt b/editors/openoffice.org-vcltesttool/files/patch-libxslt
new file mode 100644
index 000000000000..4bdf4230014f
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-libxslt
@@ -0,0 +1,11 @@
+--- libxslt/libxslt-1.1.16.patch~	2009-07-11 13:38:52.000000000 +0900
++++ libxslt/libxslt-1.1.16.patch	2009-07-11 13:39:11.000000000 +0900
+@@ -30,7 +30,7 @@
+   fi
+   
+   
+-! if test "1" == "1"
++! if test "1" = "1"
+   then
+   	XMLVERS=`$XML_CONFIG --version`
+   	if test `echo $XMLVERS | sed -e 's/libxml //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` -ge `echo $LIBXML_REQUIRED_VERSION | sed -e 's/libxml //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
diff --git a/editors/openoffice.org-vcltesttool/files/pkg-message.in b/editors/openoffice.org-vcltesttool/files/pkg-message.in
deleted file mode 100644
index 03a7ca76151e..000000000000
--- a/editors/openoffice.org-vcltesttool/files/pkg-message.in
+++ /dev/null
@@ -1,42 +0,0 @@
-OpenOffice.org Build %%OOOTAG%% Personal Install How-To
-
-Written by:	Martin Blapp <mbr@freebsd.org>
-		and Maho Nakata <maho@FreeBSD.org>
-
-OpenOffice.org %%OOOTAG%% will soon been installed in
-%%PREFIX%%/%%EXECBASE%%
-
-1. User installation
---------------------
-
-Just type "%%EXECBASE%%" after you have successfully
-installed the package. If there is no installed
-OO.org dir in your homedir, you'll be prompted to
-install some files and choose an installed JDK.
-The setup installs a ".openoffice.org2" folder
-in your homedir.
-
-2. Starting OO.org
-------------------
-
-There are some wrappers installed for faster startup.
-Add "%%PREFIX%%/bin/" to your PATH and you will be able
-to use them.
-
-%%PREFIX%%/bin/%%EXECBASE%%
-%%PREFIX%%/bin/%%EXECBASE%%-sbase
-%%PREFIX%%/bin/%%EXECBASE%%-scalc
-%%PREFIX%%/bin/%%EXECBASE%%-sdraw
-%%PREFIX%%/bin/%%EXECBASE%%-setofficelang
-%%PREFIX%%/bin/%%EXECBASE%%-smath
-%%PREFIX%%/bin/%%EXECBASE%%-simpress
-%%PREFIX%%/bin/%%EXECBASE%%-spadmin
-%%PREFIX%%/bin/%%EXECBASE%%-swriter
-
-OO.org does need $LANG to be set to a suitable value.
-
-3. If you run into problems
---------------------------------------------------
-If you somehow run into problems, please remove the already installed
-".openoffice.org2" dir in your homedir. Redo the user
-installation and the problems should go away.
diff --git a/editors/openoffice.org-vcltesttool/pkg-descr b/editors/openoffice.org-vcltesttool/pkg-descr
index bc2ede1b8c2b..ff81417c1a27 100644
--- a/editors/openoffice.org-vcltesttool/pkg-descr
+++ b/editors/openoffice.org-vcltesttool/pkg-descr
@@ -1,17 +1,11 @@
-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.
+VCLtestTool for OpenOffice.org.
 
-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
+The automated GUI testing provides a test framework with test scripts
+and an application (VCL TestTool) to test almost the whole the OpenOffice.org
+application automatically.
 
-WWW: http://www.openoffice.org/
-     http://porting.openoffice.org/freebsd/
+WWW: http://qa.openoffice.org/ooQAReloaded/AutomationTeamsite/ooQA-TeamAutomation.html
+http://wiki.services.openoffice.org/wiki/VCLTesttool_2.4
+http://wiki.services.openoffice.org/wiki/VCL_TestTool/Standalone_VCL_TestTool
+http://qa.openoffice.org/ooQAReloaded/AutomationTeamsite/ooQA-TeamAutomationBin.html
+http://wiki.services.openoffice.org/wiki/VCLTestToolIssues