2 files changed, 24 insertions, 16 deletions
diff --git a/misc/openoffice/files/oo_setup.resp b/misc/openoffice/files/oo_setup.resp
deleted file mode 100644
index 115aef1c845..00000000000
--- a/misc/openoffice/files/oo_setup.resp
+++ /dev/null
@@ -1,8 +0,0 @@
-[Environment]
-InstallationMode = INSTALL_NETWORK
-InstallationType = STANDARD
-DestinationPath = @@PREFIX@@/OpenOffice.org641
-
-[Java]
-JavaSupport = preinstalled_or_none
-
diff --git a/misc/openoffice/files/soffice b/misc/openoffice/files/soffice
index 44b41c319a8..068e6de5350 100755
--- a/misc/openoffice/files/soffice
+++ b/misc/openoffice/files/soffice
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-#	$NetBSD: soffice,v 1.3 2003/05/19 02:59:32 simonb Exp $
+#	$NetBSD: soffice,v 1.4 2004/05/03 20:56:36 mrauch Exp $
 #
-SOINST=@@PREFIX@@/OpenOffice.org641
-[ "$SOFFICE" = "" ] && SOFFICE=$HOME/OpenOffice.org641
+SOINST=@@PREFIX@@/OpenOffice.org1.1.1
+[ "$SOFFICE" = "" ] && SOFFICE=$HOME/OpenOffice.org1.1.1
 
 if [ ! -d "$SOFFICE" ]; then
 	echo ""
@@ -18,12 +18,24 @@ if [ ! -d "$SOFFICE" ]; then
 	echo "-----------------------------------------------------------------"
 	echo ""
 
-# add an eventually existing java directory to $PATH to allow OO to 
-# automatically find it
-	export PATH=$PATH:@@PREFIX@@/java/bin
-
 	cd $SOINST
-	./setup
+	BASENAME=`basename $0`
+	TMPFILE=`mktemp -q /tmp/$BASENAME.XXXXXX`
+	if [ $? -ne 0 ]; then
+		echo "$0: Can't create temp file, exiting..."
+		exit 1
+	fi
+	cat << EOF >> ${TMPFILE} 
+[ENVIRONMENT]
+INSTALLATIONMODE=INSTALL_WORKSTATION
+INSTALLATIONTYPE=WORKSTATION
+DESTINATIONPATH=$SOFFICE
+OUTERPATH=
+LOGFILE=
+
+EOF
+	./setup -nogui -r:${TMPFILE}
+	rm -f ${TMPFILE}
 
 	echo ""
 	echo "Done.  Starting OpenOffice ..."
@@ -33,5 +45,9 @@ fi
 # We've got a large number of shared libraries and other single files which 
 # have to be open for normal operation
 ulimit -n `ulimit -n -H`
+if [ -z $PTHREAD_DIAGASSERT ]; then
+PTHREAD_DIAGASSERT=AEL
+export PTHREAD_DIAGASSERT
+fi
 
 exec ${SOFFICE}/soffice "$@"