Fetch the sunsolve patch for inofficial distsites, we have the

md5 checksums to be sure it's really the correct file.

Add wrappers like the ones openoffice port has. While we are here,
remove the install-user target, we don't need it anymore.

Fix the patch installation, it does not need to check if the path
"/compat/linux/$PREFIX/staroffice60" does exist.

Pointed out by:		rwatson

4 files changed, 50 insertions, 26 deletions

diff --git a/editors/staroffice60/Makefile b/editors/staroffice60/Makefile
index 003ef3e..9589c61 100644
--- a/editors/staroffice60/Makefile
+++ b/editors/staroffice60/Makefile
@@ -7,12 +7,15 @@
 
 PORTNAME=	staroffice
 PORTVERSION=	6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors linux
-MASTER_SITES=
+MASTER_SITES=	ftp://ftp.sunsite.auc.dk/disk6/sun-patches/:patch \
+		ftp://ftp.math.ohio-state.edu/private/sun/.../:patch \
+		ftp://ftp.uga.edu/pub/unix/sun/patches/:patch \
+		ftp://ftp.cs.tu-berlin.de/pub/sun/sun-fixes/.../:patch
 DISTNAME=	so-6_0-ga-bin-linux-en.bin
 .if !defined(USE_CDROM)
-DISTFILES=      so-6_0-ga-bin-linux-en.bin 112887-03.tar
+DISTFILES=      so-6_0-ga-bin-linux-en.bin 112887-03.tar:patch
 .endif
 .if defined(WITH_ADABAS)
 DISTFILES+=	soa-6_0-ga-bin-linux-en.bin
@@ -23,7 +26,7 @@ EXTRACT_ONLY=	112887-03.tar
 MAINTAINER=	mbr@FreeBSD.org
 
 ONLY_FOR_ARCHS=	i386
-NO_CDROM=	'Must be downloaded direct from Sun via www interface'
+NO_CDROM=	'Must be bought and downloaded direct from Sun via www interface'
 
 USE_LINUX=	yes
 IS_INTERACTIVE=	yes
@@ -182,7 +185,6 @@ do-install:
 .endif
 	@${SED} -i .orig -e 's%DefaultDestPath = "${PREFIX}/staroffice%DefaultDestPath = "staroffice%' \
 	${INSTDB.INS}
-	@make install-user
 .endif
 .if defined(WITH_ADABAS)
 	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
@@ -194,17 +196,27 @@ do-install:
 	@make install-patch
 	@${CAT} ${PKGMESSAGE}
 
-install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" ${LINUXBASE}/bin/sh -c \
-		${PREFIX}/${SOVERSION}/program/setup
+post-install:
+	@${ECHO_MSG} "===>  Add wrapper scripts";
+	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/wrapper \
+	   > ${WRKDIR}/staroffice6
+	 @${INSTALL_SCRIPT} ${WRKDIR}/staroffice6 ${PREFIX}/bin/staroffice6
+	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-sagenda
+	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-scalc
+	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-sdraw
+	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-setup
+	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-sfax
+	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-simpress
+	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-spadmin
+	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-sweb
+	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-swriter
 
 install-patch:
 	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${TMPDIR} ${LINUXBASE}/bin/sh -c '${WRKSRC}/../112887-03/so-6_0-pp1-bin-linux.bin'
+		TEMP=${TMPDIR} ${LINUXBASE}/bin/sh -c '${WRKSRC}/../112887-03/so-6_0-pp2-bin-linux.bin -patch:${PREFIX}/staroffice6.0'
 
 install-update:
 	@make extract
-	@make install-user
 	@make install-patch
 
 .include <bsd.port.post.mk>
diff --git a/editors/staroffice60/pkg-message b/editors/staroffice60/pkg-message
index 2dde5d3..d17004b 100644
--- a/editors/staroffice60/pkg-message
+++ b/editors/staroffice60/pkg-message
@@ -15,9 +15,9 @@ your $HOME/.sversionrc and restart the installation.
 
 You will very shortly have finished  a network install of
 StarOffice 6.0. Once that is done exit X11 and run it again as
-the user that you usually use. Then run "make install-user" and
-do a standard workstation install. Change the install path to
-$HOME/staroffice6.0. Then add $HOME/staroffice6.0/ to your path.
+the user that you usually use. There are some wrappers
+installed in $PREFIX. Run "staroffice6" and begin a standard
+workstation install. 
 
 It will now be ready to use.
 
diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile
index 003ef3e..9589c61 100644
--- a/editors/staroffice70/Makefile
+++ b/editors/staroffice70/Makefile
@@ -7,12 +7,15 @@
 
 PORTNAME=	staroffice
 PORTVERSION=	6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors linux
-MASTER_SITES=
+MASTER_SITES=	ftp://ftp.sunsite.auc.dk/disk6/sun-patches/:patch \
+		ftp://ftp.math.ohio-state.edu/private/sun/.../:patch \
+		ftp://ftp.uga.edu/pub/unix/sun/patches/:patch \
+		ftp://ftp.cs.tu-berlin.de/pub/sun/sun-fixes/.../:patch
 DISTNAME=	so-6_0-ga-bin-linux-en.bin
 .if !defined(USE_CDROM)
-DISTFILES=      so-6_0-ga-bin-linux-en.bin 112887-03.tar
+DISTFILES=      so-6_0-ga-bin-linux-en.bin 112887-03.tar:patch
 .endif
 .if defined(WITH_ADABAS)
 DISTFILES+=	soa-6_0-ga-bin-linux-en.bin
@@ -23,7 +26,7 @@ EXTRACT_ONLY=	112887-03.tar
 MAINTAINER=	mbr@FreeBSD.org
 
 ONLY_FOR_ARCHS=	i386
-NO_CDROM=	'Must be downloaded direct from Sun via www interface'
+NO_CDROM=	'Must be bought and downloaded direct from Sun via www interface'
 
 USE_LINUX=	yes
 IS_INTERACTIVE=	yes
@@ -182,7 +185,6 @@ do-install:
 .endif
 	@${SED} -i .orig -e 's%DefaultDestPath = "${PREFIX}/staroffice%DefaultDestPath = "staroffice%' \
 	${INSTDB.INS}
-	@make install-user
 .endif
 .if defined(WITH_ADABAS)
 	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
@@ -194,17 +196,27 @@ do-install:
 	@make install-patch
 	@${CAT} ${PKGMESSAGE}
 
-install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" ${LINUXBASE}/bin/sh -c \
-		${PREFIX}/${SOVERSION}/program/setup
+post-install:
+	@${ECHO_MSG} "===>  Add wrapper scripts";
+	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/wrapper \
+	   > ${WRKDIR}/staroffice6
+	 @${INSTALL_SCRIPT} ${WRKDIR}/staroffice6 ${PREFIX}/bin/staroffice6
+	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-sagenda
+	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-scalc
+	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-sdraw
+	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-setup
+	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-sfax
+	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-simpress
+	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-spadmin
+	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-sweb
+	@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-swriter
 
 install-patch:
 	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
-		TEMP=${TMPDIR} ${LINUXBASE}/bin/sh -c '${WRKSRC}/../112887-03/so-6_0-pp1-bin-linux.bin'
+		TEMP=${TMPDIR} ${LINUXBASE}/bin/sh -c '${WRKSRC}/../112887-03/so-6_0-pp2-bin-linux.bin -patch:${PREFIX}/staroffice6.0'
 
 install-update:
 	@make extract
-	@make install-user
 	@make install-patch
 
 .include <bsd.port.post.mk>
diff --git a/editors/staroffice70/pkg-message b/editors/staroffice70/pkg-message
index 2dde5d3..d17004b 100644
--- a/editors/staroffice70/pkg-message
+++ b/editors/staroffice70/pkg-message
@@ -15,9 +15,9 @@ your $HOME/.sversionrc and restart the installation.
 
 You will very shortly have finished  a network install of
 StarOffice 6.0. Once that is done exit X11 and run it again as
-the user that you usually use. Then run "make install-user" and
-do a standard workstation install. Change the install path to
-$HOME/staroffice6.0. Then add $HOME/staroffice6.0/ to your path.
+the user that you usually use. There are some wrappers
+installed in $PREFIX. Run "staroffice6" and begin a standard
+workstation install. 
 
 It will now be ready to use.