3 files changed, 66 insertions, 7 deletions

diff --git a/editors/openoffice.org-2-devel/files/oo_setup.resp b/editors/openoffice.org-2-devel/files/oo_setup.resp
index b270165b44d6..9218fb9522a6 100644
--- a/editors/openoffice.org-2-devel/files/oo_setup.resp
+++ b/editors/openoffice.org-2-devel/files/oo_setup.resp
@@ -1,7 +1,7 @@
 [Environment]
 InstallationMode = INSTALL_NETWORK
 InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org-645
+DestinationPath = %%PREFIX%%/OpenOffice.org1.1.0
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-2-devel/files/openoffice-wrapper b/editors/openoffice.org-2-devel/files/openoffice-wrapper
index 60b480aae883..e958618268cc 100644
--- a/editors/openoffice.org-2-devel/files/openoffice-wrapper
+++ b/editors/openoffice.org-2-devel/files/openoffice-wrapper
@@ -1,17 +1,66 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-devel/files/Attic/openoffice-wrapper,v 1.8 2003-06-07 22:09:46 mbr Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-devel/files/Attic/openoffice-wrapper,v 1.9 2003-09-14 21:52:25 mbr Exp $
 
-oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/
-program=`echo $0 | sed -e 's|.*-||'`
+oopath=%%PREFIX%%/OpenOffice.org-%%FRELEASE_NR%%/program/
+program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'`
 
 if [ ! $LANG ]; then
 	export LANG=%%LANG%%
 fi
 
-if [ -e $HOME/OpenOffice.org1.1/setup.log ]; then
-	if [ ! -e $HOME/OpenOffice.org1.1/user/config/soffice.cfg ]; then
-		touch $HOME/OpenOffice.org1.1/user/config/soffice.cfg
+save_common_xcu() {
+sed 's/^X//' > tmp/Common.xcu << 'END-of-Common.xcu'
+X<?xml version="1.0" encoding="UTF-8"?>
+X<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Common" oor:package="org.openoffice.Office">
+X <node oor:name="Internal">
+X  <prop oor:name="CurrentTempURL" oor:type="xs:string">
+X   <value/>
+X  </prop>
+X </node>
+X <node oor:name="Misc">
+X  <prop oor:name="FirstRun" oor:type="xs:boolean">
+X   <value>true</value>
+X  </prop>
+X </node>
+X <node oor:name="ExternalApps">
+X  <prop oor:name="file" oor:type="xs:string">
+X   <value/>
+X  </prop>
+X  <prop oor:name="ftp" oor:type="xs:string">
+X   <value/>
+X  </prop>
+X  <prop oor:name="http" oor:type="xs:string">
+X   <value>%%mozilla%%</value>
+X  </prop>
+X  <prop oor:name="https" oor:type="xs:string">
+X   <value/>
+X  </prop>
+X  <prop oor:name="mailto" oor:type="xs:string">
+X   <value/>
+X  </prop>
+X </node>
+X</oor:component-data>
+END-of-Common.xcu
+mozilla=`which mozilla`;
+if [ $? -eq 0 ]; then
+	sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu
+fi
+mozilla=`which linux-mozilla`;
+if [ $? -eq 0 ]; then
+	sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu
+fi
+mv tmp/Common.xcu user/registry/data/org/openoffice/Office
+}
+
+if [ -e $HOME/OpenOffice.org%%FRELEASE_NR%%/setup ]; then
+	cd $HOME/OpenOffice.org%%FRELEASE_NR%%
+	if [ ! -e $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg ]; then
+		touch $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg
+	fi
+	if [ ! -e user/registry/data/org/openoffice/Office/Common.xcu ]; then
+		mkdir -p tmp;
+		save_common_xcu;
 	fi
 fi
 
diff --git a/editors/openoffice.org-2-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice.org-2-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map
new file mode 100644
index 000000000000..da9fd94b39c0
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map
@@ -0,0 +1,10 @@
+--- ../cppuhelper/source/gcc3_linux_intel.map.orig	Sat Sep 13 22:15:22 2003
++++ ../cppuhelper/source/gcc3_linux_intel.map	Sat Sep 13 22:16:01 2003
+@@ -299,6 +299,7 @@
+ _ZNK4cppu6UnoUrl11getProtocolEv;
+ _ZNK4cppu6UnoUrl13getConnectionEv;
+ _ZNK4cppu6UnoUrl13getObjectNameEv;
++_end;
+ 
+ 	local:
+ 		*;