4 files changed, 22 insertions, 22 deletions

diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile
index ffff7c009307..24af585e5a77 100644
--- a/editors/staroffice70/Makefile
+++ b/editors/staroffice70/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	staroffice
 PORTVERSION=	7.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	editors linux
 MASTER_SITES=	ftp://patches.sun.com/patchroot/all_unsigned/:patch \
 		ftp://ftp.sun.co.uk/pub/patches/:patch \
@@ -17,15 +17,15 @@ MASTER_SITES=	ftp://patches.sun.com/patchroot/all_unsigned/:patch \
 		ftp://ftp.cs.tu-berlin.de/pub/sun/sun-fixes/.../:patch
 DISTNAME=	so-7-ga-bin-linux-en.bin
 .if !defined(USE_CDROM)
-DISTFILES=      so-7-ga-bin-linux-en.bin 116518-06.tar:patch
+DISTFILES=      so-7-ga-bin-linux-en.bin 116518-08.tar:patch
 .else
-DISTFILES=	116518-06.tar:patch
+DISTFILES=	116518-08.tar:patch
 .endif
 .if defined(WITH_ADABAS)
 DISTFILES+=     soa-7-ga-bin-linux-en.bin
 .endif
 
-EXTRACT_ONLY=	116518-06.tar
+EXTRACT_ONLY=	116518-08.tar
 
 MAINTAINER=	mbr@FreeBSD.org
 COMMENT=	Wordprocessor/dbase/spreadheet/drawing/chart
@@ -42,9 +42,9 @@ WRKSRC=		${WRKDIR}/${SOVERSION}
 TMPDIR=		${WRKDIR}/tmp
 LD_PATH=	${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib
 INSTDB.INS=	${PREFIX}/${SOVERSION}/program/instdb.ins
-SUNSOLVE=	${WRKDIR}/116518-06
+SUNSOLVE=	${WRKDIR}/116518-08
 ADABAS_DIST=	soa-7-ga-bin-linux-en.bin
-PATCH_DIST=	so-7-pp4-bin-linux.bin
+PATCH_DIST=	so-7-pp5-bin-linux.bin
 
 .include <bsd.port.pre.mk>
 
@@ -121,13 +121,13 @@ pre-fetch:
 	@${FALSE}
 .endif
 .if defined(USE_CDROM)
-DLTEST=116518-06.tar
+DLTEST=116518-08.tar
 .else
 .if exists(/cdrom/linux/office7/setup)
 	@${ECHO}
 	@${ECHO} It seems that you have a Sun StarOffice 7.0 CDROM
 	@${ECHO} mounted on ${CD_MOUNTPT}.  If you wish to install from
-	@${ECHO} this CD-ROM, please run 
+	@${ECHO} this CD-ROM, please run
 	@${ECHO}
 	@${ECHO}        make USE_CDROM=YES
 	@${ECHO}
@@ -246,7 +246,7 @@ post-install:
 # XXX: This is missing a "${BRANDELF} -t Linux <executables>".
 	@${ECHO} StarOffice7.0 has been installed successfully.  In order to use
 	@${ECHO} it, execute ${PREFIX}/bin/staroffice7.
-	@${ECHO} 
+	@${ECHO}
 
 install-patch:
 	@${CP} ${FILESDIR}/patchsetup.resp ${WRKSRC}
@@ -255,7 +255,7 @@ install-patch:
                         ${WRKSRC}/patchsetup.resp
 	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
 		TEMP=${TMPDIR} ${LINUXBASE}/bin/sh -c 'umask 022 && \
-		${WRKSRC}/../116518-06/${PATCH_DIST} -patch:${PREFIX}/${SOVERSION}\
+		${WRKSRC}/../116518-08/${PATCH_DIST} -patch:${PREFIX}/${SOVERSION}\
 		-r:${WRKSRC}/patchsetup.resp'
 
 install-update:
diff --git a/editors/staroffice70/distinfo b/editors/staroffice70/distinfo
index 0567e6c84d3d..475c9e635676 100644
--- a/editors/staroffice70/distinfo
+++ b/editors/staroffice70/distinfo
@@ -4,4 +4,4 @@ MD5 (soa-7-ga-bin-linux-en.bin) = fb4cda40ff388f0db4de19403f2f32c7
 MD5 (so-7-ga-en-BASIC_GUIDE.PDF) = 29eea1442a0061ceb349f556b2dba917
 MD5 (so-7-ga-en-MANUAL.PDF) = 478cecf0c08ee7b89cb6ff129aa2af80
 MD5 (so-7-ga-en-SETUP_GUIDE.PDF) = 5bc102fc44abf61226f046ae88d22f45
-MD5 (116518-06.tar) = 92b5d3aa1ef450170964d7b0b6856163
+MD5 (116518-08.tar) = 2683b185239c3d94040627dc7241ae8e
diff --git a/german/staroffice70/Makefile b/german/staroffice70/Makefile
index 79aaa6d698f4..f596db5b7d40 100644
--- a/german/staroffice70/Makefile
+++ b/german/staroffice70/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	staroffice
 PORTVERSION=	7.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	german editors linux
 MASTER_SITES=	ftp://patches.sun.com/patchroot/all_unsigned/:patch \
 		ftp://ftp.sun.co.uk/pub/patches/:patch \
@@ -17,15 +17,15 @@ MASTER_SITES=	ftp://patches.sun.com/patchroot/all_unsigned/:patch \
 		ftp://ftp.cs.tu-berlin.de/pub/sun/sun-fixes/.../:patch
 DISTNAME=	so-7-ga-bin-linux-de.bin
 .if !defined(USE_CDROM)
-DISTFILES=      so-7-ga-bin-linux-de.bin 116518-06.tar:patch
+DISTFILES=      so-7-ga-bin-linux-de.bin 116518-08.tar:patch
 .else
-DISTFILES=	116518-06.tar:patch
+DISTFILES=	116518-08.tar:patch
 .endif
 .if defined(WITH_ADABAS)
 DISTFILES+=     soa-7-ga-bin-linux-de.bin
 .endif
 
-EXTRACT_ONLY=	116518-06.tar
+EXTRACT_ONLY=	116518-08.tar
 
 MAINTAINER=	mbr@FreeBSD.org
 COMMENT=	Wordprocessor/dbase/spreadheet/drawing/chart
@@ -42,9 +42,9 @@ WRKSRC=		${WRKDIR}/${SOVERSION}
 TMPDIR=		${WRKDIR}/tmp
 LD_PATH=	${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib
 INSTDB.INS=	${PREFIX}/${SOVERSION}/program/instdb.ins
-SUNSOLVE=	${WRKDIR}/116518-06
+SUNSOLVE=	${WRKDIR}/116518-08
 ADABAS_DIST=	soa-7-ga-bin-linux-de.bin
-PATCH_DIST=	so-7-pp4-bin-linux.bin
+PATCH_DIST=	so-7-pp5-bin-linux.bin
 
 .include <bsd.port.pre.mk>
 
@@ -121,13 +121,13 @@ pre-fetch:
 	@${FALSE}
 .endif
 .if defined(USE_CDROM)
-DLTEST=116518-06.tar
+DLTEST=116518-08.tar
 .else
 .if exists(/cdrom/linux/office7/setup)
 	@${ECHO}
 	@${ECHO} It seems that you have a Sun StarOffice 7.0 CDROM
 	@${ECHO} mounted on ${CD_MOUNTPT}.  If you wish to install from
-	@${ECHO} this CD-ROM, please run 
+	@${ECHO} this CD-ROM, please run
 	@${ECHO}
 	@${ECHO}        make USE_CDROM=YES
 	@${ECHO}
@@ -245,7 +245,7 @@ post-install:
 	@${LN} -fs ${PREFIX}/bin/staroffice7 ${PREFIX}/bin/staroffice-swriter
 	@${ECHO} StarOffice7.0 has been installed successfully.  In order to use
 	@${ECHO} it, execute ${PREFIX}/bin/staroffice7.
-	@${ECHO} 
+	@${ECHO}
 # XXX: This is missing a "${BRANDELF} -t Linux <executables>".
 
 install-patch:
@@ -255,7 +255,7 @@ install-patch:
                         ${WRKSRC}/patchsetup.resp
 	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
 		TEMP=${TMPDIR} ${LINUXBASE}/bin/sh -c 'umask 022 && \
-		${WRKSRC}/../116518-06/${PATCH_DIST} -patch:${PREFIX}/${SOVERSION}\
+		${WRKSRC}/../116518-08/${PATCH_DIST} -patch:${PREFIX}/${SOVERSION}\
 		-r:${WRKSRC}/patchsetup.resp'
 
 install-update:
diff --git a/german/staroffice70/distinfo b/german/staroffice70/distinfo
index 4431e17efa0a..7afcb5ad1710 100644
--- a/german/staroffice70/distinfo
+++ b/german/staroffice70/distinfo
@@ -1,4 +1,4 @@
 MD5 (so-7-addon-ga-bin-de.zip) = c75d6cd61b35297d8ce3c3697ad1b5ee
 MD5 (so-7-ga-bin-linux-de.bin) = 97a59a15993200c033ae25849bf88f6d
 MD5 (soa-7-ga-bin-linux-de.bin) = fb4cda40ff388f0db4de19403f2f32c7
-MD5 (116518-06.tar) = 92b5d3aa1ef450170964d7b0b6856163
+MD5 (116518-08.tar) = 2683b185239c3d94040627dc7241ae8e