Stefan Fiedler:

package/stf/openoffice/config.in

@@ -21,11 +21,10 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 if pkgcheck openoffice X ; then
- 	menu_begin MENU_PKG_OPENOFFICE 'OpenOffice Package Options'
-		# only 01 and 49 language sets are built by default
-		choice ROCKCFG_PKG_OPENOFFICE_LANGUAGE 01 \
-			01 'US English version' \
-			49 'German version'
+	menu_begin MENU_PKG_OPENOFFICE 'OpenOffice Package Options'
+		choice ROCKCFG_PKG_OPENOFFICE_LANGUAGE en_US \
+			en_US 'US English version' \
+			de 'German version'
 	menu_end
 fi
 

package/stf/openoffice/expat-use-dmake.patch

@@ -1,32 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/stf/openoffice/expat-use-dmake.patch
-# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- ./expat/expat.patch.orig	2005-05-23 13:57:24.000000000 +0200
-+++ ./expat/expat.patch	2005-05-23 14:04:34.000000000 +0200
-@@ -66,8 +66,8 @@
- ! #
- ! #*************************************************************************
- ! target:
--! 	+cd xmltok && $(MAKE) $(MFLAGS) $(CALLMACROS)
--! 	+cd xmlparse && $(MAKE) $(MFLAGS) $(CALLMACROS)
-+! 	+cd xmltok && $(DMAKE) $(MFLAGS) $(CALLMACROS)
-+! 	+cd xmlparse && $(DMAKE) $(MFLAGS) $(CALLMACROS)
- *** misc/expat/xmlparse/makefile.mk	Mon Apr 29 18:59:16 2002
- --- misc/build/expat/xmlparse/makefile.mk	Mon Apr 29 17:49:05 2002
- ***************

package/stf/openoffice/idlc_ln.sh

@@ -1,15 +0,0 @@
-#! /bin/bash
-
-dmake > test.txt 2>&1
-LNDIR="`sed -n test.txt -e"s,ERROR: [a-zA-Z0-9 ]* /[^/]*/[^/]*\(.*\),\1,gp"`"
-LN2DIR="`echo $LNDIR | sed -n -e"s,/[^/]*,/..,gp"`"
-IDLC="`grep test.txt -e"idlc: compile"`"
-while [ "$IDLC" != "" ];
-do
-	echo \"$LNDIR\" \"$LN2DIR\" \"$IDLC\"
-	ln -svf ./$LN2DIR/solver/645/unxlngi4.pro/bin/idlcpp ./$LNDIR/idlcpp
-	dmake > test.txt 2>&1
-	LNDIR="`sed -n test.txt -e"s,ERROR: [a-zA-Z0-9 ]* /[^/]*/[^/]*\(.*\),\1,gp"`"
-	LN2DIR="`echo $LNDIR | sed -n -e"s,/[^/]*,/..,gp"`"
-	IDLC="`grep test.txt -e"idlc: compile"`"
-done

package/stf/openoffice/idlcpp_links.txt

@@ -1,89 +0,0 @@
-./setup2/util/idlcpp
-./scaddins/source/analysis/idlcpp
-./scaddins/source/datefunc/idlcpp
-./udkapi/com/sun/star/beans/idlcpp
-./udkapi/com/sun/star/bridge/oleautomation/idlcpp
-./udkapi/com/sun/star/bridge/idlcpp
-./udkapi/com/sun/star/connection/idlcpp
-./udkapi/com/sun/star/container/idlcpp
-./udkapi/com/sun/star/corba/giop/idlcpp
-./udkapi/com/sun/star/corba/iiop/idlcpp
-./udkapi/com/sun/star/corba/iop/idlcpp
-./udkapi/com/sun/star/corba/idlcpp
-./udkapi/com/sun/star/io/idlcpp
-./udkapi/com/sun/star/java/idlcpp
-./udkapi/com/sun/star/lang/idlcpp
-./udkapi/com/sun/star/loader/idlcpp
-./udkapi/com/sun/star/reflection/idlcpp
-./udkapi/com/sun/star/registry/idlcpp
-./udkapi/com/sun/star/script/idlcpp
-./udkapi/com/sun/star/security/idlcpp
-./udkapi/com/sun/star/task/idlcpp
-./udkapi/com/sun/star/test/bridge/idlcpp
-./udkapi/com/sun/star/test/performance/idlcpp
-./udkapi/com/sun/star/test/idlcpp
-./udkapi/com/sun/star/uno/idlcpp
-./udkapi/com/sun/star/util/logging/idlcpp
-./udkapi/com/sun/star/util/idlcpp
-./udkapi/com/sun/star/idlcpp
-./offapi/com/sun/star/accessibility/idlcpp
-./offapi/com/sun/star/auth/idlcpp
-./offapi/com/sun/star/awt/idlcpp
-./offapi/com/sun/star/chart/idlcpp
-./offapi/com/sun/star/configuration/backend/xml/idlcpp
-./offapi/com/sun/star/configuration/backend/idlcpp
-./offapi/com/sun/star/configuration/bootstrap/idlcpp
-./offapi/com/sun/star/configuration/idlcpp
-./offapi/com/sun/star/datatransfer/clipboard/idlcpp
-./offapi/com/sun/star/datatransfer/dnd/idlcpp
-./offapi/com/sun/star/datatransfer/idlcpp
-./offapi/com/sun/star/document/idlcpp
-./offapi/com/sun/star/drawing/idlcpp
-./offapi/com/sun/star/form/component/idlcpp
-./offapi/com/sun/star/form/control/idlcpp
-./offapi/com/sun/star/form/idlcpp
-./offapi/com/sun/star/formula/idlcpp
-./offapi/com/sun/star/frame/idlcpp
-./offapi/com/sun/star/i18n/idlcpp
-./offapi/com/sun/star/image/idlcpp
-./offapi/com/sun/star/installation/idlcpp
-./offapi/com/sun/star/ldap/idlcpp
-./offapi/com/sun/star/linguistic2/idlcpp
-./offapi/com/sun/star/mozilla/idlcpp
-./offapi/com/sun/star/packages/manifest/idlcpp
-./offapi/com/sun/star/packages/zip/idlcpp
-./offapi/com/sun/star/packages/idlcpp
-./offapi/com/sun/star/plugin/idlcpp
-./offapi/com/sun/star/presentation/idlcpp
-./offapi/com/sun/star/resource/idlcpp
-./offapi/com/sun/star/scanner/idlcpp
-./offapi/com/sun/star/sdb/idlcpp
-./offapi/com/sun/star/sdbc/idlcpp
-./offapi/com/sun/star/sdbcx/idlcpp
-./offapi/com/sun/star/setup/idlcpp
-./offapi/com/sun/star/sheet/idlcpp
-./offapi/com/sun/star/style/idlcpp
-./offapi/com/sun/star/svg/idlcpp
-./offapi/com/sun/star/sync/idlcpp
-./offapi/com/sun/star/sync2/idlcpp
-./offapi/com/sun/star/system/idlcpp
-./offapi/com/sun/star/table/idlcpp
-./offapi/com/sun/star/task/idlcpp
-./offapi/com/sun/star/text/fieldmaster/idlcpp
-./offapi/com/sun/star/text/textfield/docinfo/idlcpp
-./offapi/com/sun/star/text/textfield/idlcpp
-./offapi/com/sun/star/text/idlcpp
-./offapi/com/sun/star/ucb/idlcpp
-./offapi/com/sun/star/ui/dialogs/idlcpp
-./offapi/com/sun/star/ui/idlcpp
-./offapi/com/sun/star/util/idlcpp
-./offapi/com/sun/star/view/idlcpp
-./offapi/com/sun/star/xml/sax/idlcpp
-./offapi/com/sun/star/xml/idlcpp
-./offapi/com/sun/star/idlcpp
-./offapi/drafts/com/sun/star/form/component/idlcpp
-./offapi/drafts/com/sun/star/form/idlcpp
-./offapi/drafts/com/sun/star/table/idlcpp
-./xmlscript/unotypes/idlcpp
-./rvpapi/com/sun/star/portal/client/idlcpp
-./rvpapi/com/sun/star/webservices/context/idlcpp

package/stf/openoffice/openoffice.conf

@@ -1,3 +1,4 @@
+#!/bin/bash
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
@@ -20,97 +21,91 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-# OpenOffice 1.1.4 produces build errors with gcc34 and later versions
-CC=no_usable_CC_version_found
-CXX=no_usable_CXX_version_found
-for V in gcc-30 gcc-31 gcc-32 gcc-33 gcc g++-30 g++-31 g++-32 g++-33 g++;
-do
-	[ "`type -p $V`" == "" ] && continue
-	case "`$V --version | grep "(GCC)" | cut -f3 -d" "`" in
-		3.[0-3].*) [ "${V:0:3}" == "gcc" ] && CC=$V || CXX=$V;;
-	esac
-done
+chownsrcdir=0
+nocvsinsrcdir=0
+with_java=0
+var_append extraconfopt " " "--with-package-format=portable --with-system-stdlibs"
+var_append extraconfopt " " "--disable-qadevooo --disable-odk"
+var_append extraconfopt " " "--disable-mozilla"
 
-export CC CXX
- 
-# OpenOffice 1.1.4 produces build errors with JDK 1.5.0
-JAVADIR="`ls /opt/j2sdk1.4* -d | tail -n1`"
+# building with java only works in manual builds for some reason.
+[ "$with_java" == 0 ] && var_append extraconfopt " " " --without-java"
 
-build_openoffice() {
-	unzip $archdir/gpc${GPCVER//./}.zip
-	mv gpc*/* external/gpc
+pkginstalled evolution	&& var_append extraconfopt " " "--enable-evolution2"
+#pkginstalled firefox	&& var_append extraconfopt " " "--with-firefox"
+pkginstalled openldap	&& var_append extraconfopt " " "--with-openldap"
+pkginstalled bitstream-vera-fonts \
+	&& var_append extraconfopt " " "--without-fonts"
+pkginstalled cups	&& var_append extraconfopt " " "--without-ppds"
 
-	# set LD_LIBRARY_PATH so libstdc++.so.5 is found
-	CCVER="`$CC --version | grep "(GCC)" | cut -f3 -d" "`"
-	CXXVER="`$CXX --version | grep "(GCC)" | cut -f3 -d" "`"
-	CCMACHINE="`$CC -dumpmachine`"
-	CXXMACHINE="`$CXX -dumpmachine`"
-	LD_LIBRARY_PATH="/usr/lib/gcc-lib/$CCMACHINE/$CCVER:/usr/lib/gcc-lib/$CXXMACHINE/$CXXVER:$LD_LIBRARY_PATH"
-	export LD_LIBRARY_PATH
+# if pkginstalled mozilla || pkginstalled firefox ; then
+# 	var_append extraconfopt " " "--with-system-mozilla"
+# fi
 
-	cd config_office
-	# --prefix=<prefix> is ignored!?
-	eval ./configure --prefix=/opt/OpenOffice --with-jdk-home=$JAVADIR
- 
-	cd ..
-	./bootstrap
- 
-	# OpenOffice 1.1.4 searches in /usr/lib/gcc-lib/*-*-1-* 
-	# instead of /usr/lib/gcc-lib/*-*-linux-*
-	for N in /usr/lib/gcc-lib/*-*-*-*;
-	do
-		L="${N//-linux-/-1-}"
-		if [[ -e "$N" && ! -e "$L" ]]; then
-	 		tempLinks="$tempLinks $L"
- 			ln -svf "${N##*/}" "$L"
-		fi
-	done
+if pkginstalled "bdb[0-9]*" ; then
+	if [ "$with_java" == 0 ] ; then
+		var_append extraconfopt " " "--with-system-db"
+	else
+		# bdb4[12] with java bindings required; bdb 4.3 and above
+		# miss a class Dbt.
+		pkginstalled "bdb4[12]" && [ -e $root/usr/lib/db.jar ] && \
+		var_append extraconfopt " " "--with-system-db --with-db-jar=/usr/lib/db.jar"
+	fi
+fi
+# var_append extraconfopt " " "--with-system-dict"
+
+pkginstalled boost	&& var_append extraconfopt " " "--with-system-boost"
+pkginstalled curl	&& var_append extraconfopt " " "--with-system-curl"
+pkginstalled expat	&& var_append extraconfopt " " "--with-system-expat"
+pkginstalled freetype	&& var_append extraconfopt " " "--with-system-freetype"
+pkginstalled libjpeg	&& var_append extraconfopt " " "--with-system-jpeg"
+pkginstalled libicu	&& var_append extraconfopt " " "--with-system-icu"
+pkginstalled libmspack	&& var_append extraconfopt " " "--with-system-mspack"
+pkginstalled libxml2	&& var_append extraconfopt " " "--with-system-libxml"
+pkginstalled nas	&& var_append extraconfopt " " "--with-system-nas"
+#pkginstalled neon	&& var_append extraconfopt " " "--with-system-neon"
+pkginstalled portaudio	&& var_append extraconfopt " " "--with-system-portaudio"
+pkginstalled python	&& var_append extraconfopt " " "--with-system-python"
+pkginstalled sndfile	&& var_append extraconfopt " " "--with-system-sndfile"
+pkginstalled startup-notification \
+			&& var_append extraconfopt " " "--with-system-libsn"
+pkginstalled zlib	&& var_append extraconfopt " " "--with-system-zlib"
+
+pkginstalled sane	&& var_append extraconfopt " " "--with-system-sane-headers"
+pkginstalled libxrender	&& var_append extraconfopt " " "--with-system-xrender-headers"
 
-	# the idl compiler needs a symlink to the idl preprocessor in every
-	# directory an .idl file is compiled in even if idlcpp is in the PATH. o_O
-	# run idlc_ln.sh in the src.openoffice*/debug.sh environment to 
-	# automatically create additional symlinks as required. Then use
-	# 'find -type l -name idlcpp > idlcpp_links.txt' to get all symlinks.
-	while read N;
-	do
-		M="`echo ${N%/*} | sed -e's,/[^/]*,/..,g'`";
-		ln -svf "$M/solver/6*/unxlngi4.pro/bin/idlcpp" "$N"
-	done < $confdir/idlcpp_links.txt
+openoffice_custmain() {
+	# extract
+	for x in system ; do
+		tar $taropt $archdir/OOo_${ver}_src_${x}.tar.bz2 -C ../
+	done
 
-	# in expat/.../{xmltok,xmlparse} $MAKE is used but dmake is appropriate
-	DMAKE=dmake
+	unzip $archdir/gpc${GPCVER//./}.zip
+	mv gpc*/* external/gpc
 
-	# start build with bash
-	. LinuxIntelEnv.Set.sh
-	
-	# set LD_LIBRARY_PATH so libstdc++.so.5 is found
-	CCVER="`$CC --version | grep "(GCC)" | cut -f3 -d" "`"
-	CXXVER="`$CXX --version | grep "(GCC)" | cut -f3 -d" "`"
-	CCMACHINE="`$CC -dumpmachine`"
-	CXXMACHINE="`$CXX -dumpmachine`"
-	LD_LIBRARY_PATH="/usr/lib/gcc-lib/$CCMACHINE/$CCVER:/usr/lib/gcc-lib/$CXXMACHINE/$CXXVER:$LD_LIBRARY_PATH"
+	cp -a $archdir/unowinreg.dll external/unowinreg
+#	cp -a $archdir/mozilla-source-$MOZVER.tar.bz2 moz/download
 
-	export DMAKE LD_LIBRARY_PATH
+	cd config_office
+	eval $configprefix ./configure $confopt
+	echo $configprefix ./configure $confopt
 
+	# build
+	cd ..
+	. Linux*Env.Set.sh
+	./bootstrap
 	dmake
- 
-	# start build with tcsh
-	# echo "source LinuxIntelEnv.Set;"\
-	#  " setenv LD_LIBRARY_PATH \"$LD_LIBRARY_PATH\";"\
-	# " setenv DMAKE $DMAKE;"\
-	#  " rehash;"\
-	# " dmake; echo $LD_LIBRARY_PATH;" | tcsh -s
 
-	rm -f $tempLinks 
- 
-	cd instsetoo/unxlngi4.pro/$ROCKCFG_PKG_OPENOFFICE_LANGUAGE/normal/
-	
-	# this will create an OpenOffice.org1.1.4 dir below prefix;
-	# --single means no network install, the installation
-	# will be ready to use without the need to run setup
-	./install --prefix=/opt --single
+	# install
+	cd instsetoo_native/unxlngi6.pro/OpenOffice/portable/install
+	for x in ./*/*/openoffice.org-*.sw ; do
+		[ -f "$x" ] && tar xf "$x" -C ${root:-/}
+	done
 }
 
-custmain=build_openoffice
-hook_add prepare 3 "mkdir OpenOffice-$ver; cd OpenOffice-$ver"
-nocvsinsrcdir=0
+custmain=openoffice_custmain
+
+# cpan-archive-zip
+# sun-jdk15
+# orbit2 gconf gnome-mime-data gnome-vfs
+# ant

package/stf/openoffice/openoffice.desc

@@ -41,9 +41,15 @@
 
 [L] LGPL
 [S] Stable
-[V] 1.1.4
+[V] 2.2.0
 [O] GPCVER=2.3.2
-[P] O -?---5---9 240.400
-
-[D] 1168009070 OOo_1.1.4_source.tar.gz http://gd.tuwien.ac.at/office/openoffice/stable/1.1.4/
+[O] MOZVER=1.7.5
+[P] X -?---5---9 502.000
+
+[D] 4245943557 OOo_2.2.0_src_core.tar.bz2 http://ftp.tu-chemnitz.de/pub/openoffice-extended/stable/2.2.0/
+[D] 3654448238 OOo_2.2.0_src_system.tar.bz2 http://ftp.tu-chemnitz.de/pub/openoffice-extended/stable/2.2.0/
+[D] 3046779689 OOo_2.2.0_src_sdk.tar.bz2 http://ftp.tu-chemnitz.de/pub/openoffice-extended/stable/2.2.0/
+[D] 659785994 OOo_2.2.0_src_binfilter.tar.bz2 http://ftp.tu-chemnitz.de/pub/openoffice-extended/stable/2.2.0/
+[D] 625354301 unowinreg.dll http://tools.openoffice.org/unowinreg_prebuild/680/
 [D] 1392464539 gpc232.zip ftp://ftp.cs.man.ac.uk/pub/toby/gpc/
+[D] 1580560757 mozilla-source-1.7.5.tar.bz2 http://releases.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.7.5/source/