Fix installation.

PR:		122096
Submitted by:	Jens Schweikhardt

8 files changed, 70 insertions, 14 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 6f794fb00bb1..c0a3d15c332e 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -73,6 +73,7 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 MILESTONE?=		4
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
+OOODIR=			openoffice.org3.0
 SNAPDATE=		20080321
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
@@ -229,7 +230,7 @@ do-install:
 		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}
+	@cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 .endif
 
 post-install:
@@ -237,6 +238,7 @@ post-install:
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%OOOTAG%%#${OOOTAG}#g' \
+			-e 's#%%OOODIR%%#${OOODIR}#g' \
 			-e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
@@ -256,13 +258,13 @@ post-install:
 	@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
+			${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/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 ; \
+		${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/$${app}.desktop ; \
 	done
-	@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak
+	@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak
 	@${RM} -f ${DESKTOPDIR}/${EXECBASE}
 	@${MKDIR} ${DESKTOPDIR}
 	@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
diff --git a/editors/openoffice-3-devel/files/openoffice.org-wrapper b/editors/openoffice-3-devel/files/openoffice.org-wrapper
index 8c741007682a..48039400580f 100644
--- a/editors/openoffice-3-devel/files/openoffice.org-wrapper
+++ b/editors/openoffice-3-devel/files/openoffice.org-wrapper
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3-devel/files/Attic/openoffice.org-wrapper,v 1.3 2006-11-12 22:11:35 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3-devel/files/Attic/openoffice.org-wrapper,v 1.4 2008-03-29 10:22:26 maho Exp $
 
-oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/
+oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/%%OOODIR%%/program/
 program=`echo $0 | sed -e 's|.*-%%OOOTAG%%-||'`
 
 case $program in
diff --git a/editors/openoffice-3-devel/files/patch-i87583 b/editors/openoffice-3-devel/files/patch-i87583
new file mode 100644
index 000000000000..6a7f7b39edee
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i87583
@@ -0,0 +1,26 @@
+--- work/DEV300_m4/desktop/scripts/soffice.sh	2008-03-18 22:44:45.000000000 +0900
++++ /usr/local/openoffice.org-DEV300_m4/openoffice.org3.0/program/soffice	2008-03-29 19:17:49.000000000 +0900
+@@ -68,6 +68,23 @@
+ 
+ sd_binary=`basename "$0"`.bin
+ 
++# this is a temporary hack until we can live with the default search paths
++case "`uname -s`" in
++    FreeBSD)
++        sd_prog1="$sd_prog/../basis-link/program"
++	sd_prog2="$sd_prog/../basis-link/ure-link/lib"
++	if [ $LD_LIBRARY_PATH ]; then
++    	    SYSTEM_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
++   	    export SYSTEM_LD_LIBRARY_PATH
++    	    LD_LIBRARY_PATH="$sd_prog1:$sd_prog2":$LD_LIBRARY_PATH
++	else
++    	    LD_LIBRARY_PATH="$sd_prog1:$sd_prog2"
++	fi
++	export LD_LIBRARY_PATH
++	;;
++
++esac
++
+ #collect all bootstrap variables specified on the command line
+ #so that they can be passed as arguments to javaldx later on
+ for arg in $@
diff --git a/editors/openoffice-3-devel/files/pkg-message.in b/editors/openoffice-3-devel/files/pkg-message.in
index 03a7ca76151e..5ecc967ffa04 100644
--- a/editors/openoffice-3-devel/files/pkg-message.in
+++ b/editors/openoffice-3-devel/files/pkg-message.in
@@ -38,5 +38,5 @@ 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
+".openoffice.org3" dir in your homedir. Redo the user
 installation and the problems should go away.
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 6f794fb00bb1..c0a3d15c332e 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -73,6 +73,7 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 MILESTONE?=		4
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
+OOODIR=			openoffice.org3.0
 SNAPDATE=		20080321
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
@@ -229,7 +230,7 @@ do-install:
 		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}
+	@cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 .endif
 
 post-install:
@@ -237,6 +238,7 @@ post-install:
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%OOOTAG%%#${OOOTAG}#g' \
+			-e 's#%%OOODIR%%#${OOODIR}#g' \
 			-e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
@@ -256,13 +258,13 @@ post-install:
 	@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
+			${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/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 ; \
+		${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/$${app}.desktop ; \
 	done
-	@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak
+	@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak
 	@${RM} -f ${DESKTOPDIR}/${EXECBASE}
 	@${MKDIR} ${DESKTOPDIR}
 	@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
diff --git a/editors/openoffice.org-3-devel/files/openoffice.org-wrapper b/editors/openoffice.org-3-devel/files/openoffice.org-wrapper
index 10c99eae36a1..bd2b5f4c70c6 100644
--- a/editors/openoffice.org-3-devel/files/openoffice.org-wrapper
+++ b/editors/openoffice.org-3-devel/files/openoffice.org-wrapper
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-devel/files/Attic/openoffice.org-wrapper,v 1.3 2006-11-12 22:11:35 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-devel/files/Attic/openoffice.org-wrapper,v 1.4 2008-03-29 10:22:26 maho Exp $
 
-oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/
+oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/%%OOODIR%%/program/
 program=`echo $0 | sed -e 's|.*-%%OOOTAG%%-||'`
 
 case $program in
diff --git a/editors/openoffice.org-3-devel/files/patch-i87583 b/editors/openoffice.org-3-devel/files/patch-i87583
new file mode 100644
index 000000000000..6a7f7b39edee
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-i87583
@@ -0,0 +1,26 @@
+--- work/DEV300_m4/desktop/scripts/soffice.sh	2008-03-18 22:44:45.000000000 +0900
++++ /usr/local/openoffice.org-DEV300_m4/openoffice.org3.0/program/soffice	2008-03-29 19:17:49.000000000 +0900
+@@ -68,6 +68,23 @@
+ 
+ sd_binary=`basename "$0"`.bin
+ 
++# this is a temporary hack until we can live with the default search paths
++case "`uname -s`" in
++    FreeBSD)
++        sd_prog1="$sd_prog/../basis-link/program"
++	sd_prog2="$sd_prog/../basis-link/ure-link/lib"
++	if [ $LD_LIBRARY_PATH ]; then
++    	    SYSTEM_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
++   	    export SYSTEM_LD_LIBRARY_PATH
++    	    LD_LIBRARY_PATH="$sd_prog1:$sd_prog2":$LD_LIBRARY_PATH
++	else
++    	    LD_LIBRARY_PATH="$sd_prog1:$sd_prog2"
++	fi
++	export LD_LIBRARY_PATH
++	;;
++
++esac
++
+ #collect all bootstrap variables specified on the command line
+ #so that they can be passed as arguments to javaldx later on
+ for arg in $@
diff --git a/editors/openoffice.org-3-devel/files/pkg-message.in b/editors/openoffice.org-3-devel/files/pkg-message.in
index 03a7ca76151e..5ecc967ffa04 100644
--- a/editors/openoffice.org-3-devel/files/pkg-message.in
+++ b/editors/openoffice.org-3-devel/files/pkg-message.in
@@ -38,5 +38,5 @@ 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
+".openoffice.org3" dir in your homedir. Redo the user
 installation and the problems should go away.