5 files changed, 104 insertions, 43 deletions

diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 03c666c48b4a..da292600123e 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	645
+PORTVERSION=	1.1RC4
 SNAPDATE=	20030815
 CATEGORIES+=	editors
 MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
@@ -17,8 +17,8 @@ MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
 		http://people.freebsd.org/~mbr/ooo/:moz
-MASTER_SITE_SUBDIR=	${PORTVERSION}
-DISTFILES+=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \
+MASTER_SITE_SUBDIR=	${BUILD_NR}
+DISTFILES+=	oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 \
 		gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \
 		mozilla-vendor-1.0.2a.tgz:moz
 .if defined(L10NHELP)
@@ -38,10 +38,10 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-BROKEN=			"Does not work yet, installation problems"
-BUILD_NR=		${PORTVERSION}
+BUILD_NR=		645
 RELEASE_NR=		1.1
-INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
+FRELEASE_NR=		1.1.0
+INSTALLATION_BASEDIR=	OpenOffice.org-${FRELEASE_NR}
 DIST_SUBDIR=		openoffice
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
@@ -96,7 +96,7 @@ CC=  gcc33
 CXX= g++33
 .endif
 
-EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
+EXTRACT_ONLY=	oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 .if !defined(COMMENT)
@@ -141,9 +141,9 @@ GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
+WRKSRC=		${WRKDIR}/oo_${BUILD_NR}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/
+LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
 .if defined(WITH_DEBUG)
 CFLAGS+=	-g
 .if ${WITH_DEBUG} == 2
@@ -503,7 +503,7 @@ pre-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
 	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
 	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-	@${MKDIR} -p ${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/bin/${LANG_EXT}/osl/
+	@${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
@@ -533,19 +533,21 @@ post-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sagenda
-	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-scalc
-	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sdraw
-	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup
-	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax
-	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-smath
-	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress
-	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin
-	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb
-	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice_${RELEASE_NR} > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice_${RELEASE_NR} >> ${TMPPLIST}
+	@${SED} -i orig -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' ${WRKDIR}/openoffice
+	@${SED} -i orig -e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' ${WRKDIR}/openoffice
+	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${RELEASE_NR}
+	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda
+	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc
+	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw
+	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-setup
+	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sfax
+	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-smath
+	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-simpress
+	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin
+	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb
+	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter
+	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
+	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${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
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:
+ 		*;
diff --git a/editors/openoffice.org-2-devel/pkg-message b/editors/openoffice.org-2-devel/pkg-message
index 0c50ff9d3143..8d787125606d 100644
--- a/editors/openoffice.org-2-devel/pkg-message
+++ b/editors/openoffice.org-2-devel/pkg-message
@@ -1,9 +1,9 @@
-OpenOffice.org Build 644 Beta Personal Install How-To
+OpenOffice.org Build 1.1RC4 Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 
 OpenOffice.org 1.1Beta will soon been installed in
-${PREFIX}/OpenOffice.org-644
+${PREFIX}/OpenOffice.org-1.1.0
 
 1 User installation
 -------------------
@@ -12,7 +12,7 @@ Just type "openoffice" after you have successfully
 installed the package. If there is no installed
 OO.org dir in hour homedir, you'll be prompted to
 install some files and choose a installed JDK.
-The setup installs a "OpenOffice.org1.1Beta" folder
+The setup installs a "OpenOffice.org1.1.0" folder
 in your homedir.
 
 If the setup tells you there is already an installed
@@ -29,16 +29,16 @@ 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_1.1
-${PREFIX}/bin/openoffice_1.1-sagenda
-${PREFIX}/bin/openoffice_1.1-scalc
-${PREFIX}/bin/openoffice_1.1-sdraw
-${PREFIX}/bin/openoffice_1.1-setup
-${PREFIX}/bin/openoffice_1.1-sfax
-${PREFIX}/bin/openoffice_1.1-simpress
-${PREFIX}/bin/openoffice_1.1-spadmin
-${PREFIX}/bin/openoffice_1.1-sweb
-${PREFIX}/bin/openoffice_1.1-swriter
+${PREFIX}/bin/openoffice-1.1
+${PREFIX}/bin/openoffice-1.1-sagenda
+${PREFIX}/bin/openoffice-1.1-scalc
+${PREFIX}/bin/openoffice-1.1-sdraw
+${PREFIX}/bin/openoffice-1.1-setup
+${PREFIX}/bin/openoffice-1.1-sfax
+${PREFIX}/bin/openoffice-1.1-simpress
+${PREFIX}/bin/openoffice-1.1-spadmin
+${PREFIX}/bin/openoffice-1.1-sweb
+${PREFIX}/bin/openoffice-1.1-swriter
 
 OO.org does need $LANG to be set to a suitable value.
 If it is not already set, a default value is chosen.