aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--editors/openoffice-1.0/Makefile44
-rw-r--r--editors/openoffice-1.1-devel/Makefile44
-rw-r--r--editors/openoffice-1.1/Makefile44
-rw-r--r--editors/openoffice-2.0-devel/Makefile44
-rw-r--r--editors/openoffice-3-devel/Makefile44
-rw-r--r--editors/openoffice-3/Makefile44
-rw-r--r--editors/openoffice-devel/Makefile44
-rw-r--r--editors/openoffice.org-1.0/Makefile44
-rw-r--r--editors/openoffice.org-1.1-devel/Makefile44
-rw-r--r--editors/openoffice.org-1.1/Makefile44
-rw-r--r--editors/openoffice.org-2-RC/Makefile44
-rw-r--r--editors/openoffice.org-2-devel/Makefile44
-rw-r--r--editors/openoffice.org-2.0-devel/Makefile44
-rw-r--r--editors/openoffice.org-2.0/Makefile44
-rw-r--r--editors/openoffice.org-2/Makefile44
-rw-r--r--editors/openoffice.org-3-RC/Makefile44
-rw-r--r--editors/openoffice.org-3-devel/Makefile44
-rw-r--r--editors/openoffice.org-3/Makefile44
-rw-r--r--editors/openoffice.org-vcltesttool/Makefile44
-rw-r--r--editors/openoffice/Makefile44
-rw-r--r--editors/staroffice52/Makefile44
-rw-r--r--editors/staroffice52/files/setup.patch12
-rw-r--r--editors/staroffice52/files/soffice.patch12
-rw-r--r--editors/staroffice60/Makefile44
-rw-r--r--editors/staroffice60/files/setup.patch12
-rw-r--r--editors/staroffice60/files/soffice.patch12
-rw-r--r--editors/staroffice70/Makefile44
-rw-r--r--editors/staroffice70/files/setup.patch12
-rw-r--r--editors/staroffice70/files/soffice.patch12
-rw-r--r--german/staroffice52/Makefile47
-rw-r--r--german/staroffice52/files/setup.patch14
-rw-r--r--german/staroffice52/files/soffice.patch14
-rw-r--r--german/staroffice70/Makefile44
-rw-r--r--german/staroffice70/files/setup.patch12
-rw-r--r--german/staroffice70/files/soffice.patch12
35 files changed, 875 insertions, 352 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile
index 1bc196999aa6..415da7fe386b 100644
--- a/editors/openoffice-1.0/Makefile
+++ b/editors/openoffice-1.0/Makefile
@@ -23,24 +23,42 @@ NO_BUILD= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
+ADEBAS= soa-5_2-ga-bin-linux-en.bin
.include <bsd.port.pre.mk>
-#
-# Staroffice depends on a scripting fix for
-# src/sys/i386/linux/linux_sysvec. It should
-# be revision 1.55.2.1 or higher. Please upgrade
-# to FreeBSD 4.1
-#
+pre-fetch:
.if ${OSVERSION} < 410000
-BROKEN= YES
+ @${ECHO}
+ @${ECHO} OS-VERSION ${OSVERSION}
+ @${ECHO}
+ @${ECHO} Staroffice depends on a scripting fix for
+ @${ECHO} src/sys/i386/linux/linux_sysvec. It should
+ @${ECHO} be revision 1.55.2.1 or higher.
+ @${ECHO}
+ @${ECHO} Please upgrade to FreeBSD 4.1
+ @${ECHO}
+ @${FALSE}
.endif
-
.if defined(WITH_CDROM)
-IGNORE= "Please mount the Sun StarOffice 5.2 CDROM onto /cdrom and run make again."
-.else # FTP/web download
+ @${ECHO}
+ @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
+ @${ECHO} onto /cdrom and run make again.
+ @${ECHO}
+ @${FALSE}
+.else
.if !exists(${_DISTDIR}/${DISTNAME})
-IGNORE="Please manually download ${DISTNAME} from http://www.sun.com/staroffice. Put ${DISTNAME} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.2 CDROM, please run 'make USE_CDROM=yes'"
+ @${ECHO} Please manually download ${DISTFILES}
+ @${ECHO} from http://www.sun.com/staroffice.
+ @${ECHO}
+ @${ECHO} ${ADEBAS} is the database part of Staroffice.
+ @${ECHO}
+ @${ECHO} Put ${DISTFILES} into the directory
+ @${ECHO} ${_DISTDIR} and run make again.
+ @${ECHO} Or, if you have the Sun StarOffice 5.2 CDROM,
+ @${ECHO} please run 'make USE_CDROM=yes'
+ @${ECHO}
+ @${FALSE}
.endif
.endif
@@ -65,7 +83,7 @@ do-extract:
@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
@${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
@cd ${WRKSRC}
- @${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
+ @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
@cd ../../
.endif
@@ -84,7 +102,7 @@ do-install:
@${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52
.endif
@${CAT} ${PKGDIR}/MESSAGE
- @-TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
+ @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
@ ${ECHO}
@ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed
@ ${ECHO} successfully on your system.
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index 1bc196999aa6..415da7fe386b 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -23,24 +23,42 @@ NO_BUILD= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
+ADEBAS= soa-5_2-ga-bin-linux-en.bin
.include <bsd.port.pre.mk>
-#
-# Staroffice depends on a scripting fix for
-# src/sys/i386/linux/linux_sysvec. It should
-# be revision 1.55.2.1 or higher. Please upgrade
-# to FreeBSD 4.1
-#
+pre-fetch:
.if ${OSVERSION} < 410000
-BROKEN= YES
+ @${ECHO}
+ @${ECHO} OS-VERSION ${OSVERSION}
+ @${ECHO}
+ @${ECHO} Staroffice depends on a scripting fix for
+ @${ECHO} src/sys/i386/linux/linux_sysvec. It should
+ @${ECHO} be revision 1.55.2.1 or higher.
+ @${ECHO}
+ @${ECHO} Please upgrade to FreeBSD 4.1
+ @${ECHO}
+ @${FALSE}
.endif
-
.if defined(WITH_CDROM)
-IGNORE= "Please mount the Sun StarOffice 5.2 CDROM onto /cdrom and run make again."
-.else # FTP/web download
+ @${ECHO}
+ @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
+ @${ECHO} onto /cdrom and run make again.
+ @${ECHO}
+ @${FALSE}
+.else
.if !exists(${_DISTDIR}/${DISTNAME})
-IGNORE="Please manually download ${DISTNAME} from http://www.sun.com/staroffice. Put ${DISTNAME} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.2 CDROM, please run 'make USE_CDROM=yes'"
+ @${ECHO} Please manually download ${DISTFILES}
+ @${ECHO} from http://www.sun.com/staroffice.
+ @${ECHO}
+ @${ECHO} ${ADEBAS} is the database part of Staroffice.
+ @${ECHO}
+ @${ECHO} Put ${DISTFILES} into the directory
+ @${ECHO} ${_DISTDIR} and run make again.
+ @${ECHO} Or, if you have the Sun StarOffice 5.2 CDROM,
+ @${ECHO} please run 'make USE_CDROM=yes'
+ @${ECHO}
+ @${FALSE}
.endif
.endif
@@ -65,7 +83,7 @@ do-extract:
@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
@${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
@cd ${WRKSRC}
- @${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
+ @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
@cd ../../
.endif
@@ -84,7 +102,7 @@ do-install:
@${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52
.endif
@${CAT} ${PKGDIR}/MESSAGE
- @-TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
+ @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
@ ${ECHO}
@ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed
@ ${ECHO} successfully on your system.
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index 1bc196999aa6..415da7fe386b 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -23,24 +23,42 @@ NO_BUILD= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
+ADEBAS= soa-5_2-ga-bin-linux-en.bin
.include <bsd.port.pre.mk>
-#
-# Staroffice depends on a scripting fix for
-# src/sys/i386/linux/linux_sysvec. It should
-# be revision 1.55.2.1 or higher. Please upgrade
-# to FreeBSD 4.1
-#
+pre-fetch:
.if ${OSVERSION} < 410000
-BROKEN= YES
+ @${ECHO}
+ @${ECHO} OS-VERSION ${OSVERSION}
+ @${ECHO}
+ @${ECHO} Staroffice depends on a scripting fix for
+ @${ECHO} src/sys/i386/linux/linux_sysvec. It should
+ @${ECHO} be revision 1.55.2.1 or higher.
+ @${ECHO}
+ @${ECHO} Please upgrade to FreeBSD 4.1
+ @${ECHO}
+ @${FALSE}
.endif
-
.if defined(WITH_CDROM)
-IGNORE= "Please mount the Sun StarOffice 5.2 CDROM onto /cdrom and run make again."
-.else # FTP/web download
+ @${ECHO}
+ @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
+ @${ECHO} onto /cdrom and run make again.
+ @${ECHO}
+ @${FALSE}
+.else
.if !exists(${_DISTDIR}/${DISTNAME})
-IGNORE="Please manually download ${DISTNAME} from http://www.sun.com/staroffice. Put ${DISTNAME} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.2 CDROM, please run 'make USE_CDROM=yes'"
+ @${ECHO} Please manually download ${DISTFILES}
+ @${ECHO} from http://www.sun.com/staroffice.
+ @${ECHO}
+ @${ECHO} ${ADEBAS} is the database part of Staroffice.
+ @${ECHO}
+ @${ECHO} Put ${DISTFILES} into the directory
+ @${ECHO} ${_DISTDIR} and run make again.
+ @${ECHO} Or, if you have the Sun StarOffice 5.2 CDROM,
+ @${ECHO} please run 'make USE_CDROM=yes'
+ @${ECHO}
+ @${FALSE}
.endif
.endif
@@ -65,7 +83,7 @@ do-extract:
@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
@${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
@cd ${WRKSRC}
- @${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
+ @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
@cd ../../
.endif
@@ -84,7 +102,7 @@ do-install:
@${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52
.endif
@${CAT} ${PKGDIR}/MESSAGE
- @-TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
+ @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
@ ${ECHO}
@ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed
@ ${ECHO} successfully on your system.
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index 1bc196999aa6..415da7fe386b 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -23,24 +23,42 @@ NO_BUILD= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
+ADEBAS= soa-5_2-ga-bin-linux-en.bin
.include <bsd.port.pre.mk>
-#
-# Staroffice depends on a scripting fix for
-# src/sys/i386/linux/linux_sysvec. It should
-# be revision 1.55.2.1 or higher. Please upgrade
-# to FreeBSD 4.1
-#
+pre-fetch:
.if ${OSVERSION} < 410000
-BROKEN= YES
+ @${ECHO}
+ @${ECHO} OS-VERSION ${OSVERSION}
+ @${ECHO}
+ @${ECHO} Staroffice depends on a scripting fix for
+ @${ECHO} src/sys/i386/linux/linux_sysvec. It should
+ @${ECHO} be revision 1.55.2.1 or higher.
+ @${ECHO}
+ @${ECHO} Please upgrade to FreeBSD 4.1
+ @${ECHO}
+ @${FALSE}
.endif
-
.if defined(WITH_CDROM)
-IGNORE= "Please mount the Sun StarOffice 5.2 CDROM onto /cdrom and run make again."
-.else # FTP/web download
+ @${ECHO}
+ @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
+ @${ECHO} onto /cdrom and run make again.
+ @${ECHO}
+ @${FALSE}
+.else
.if !exists(${_DISTDIR}/${DISTNAME})
-IGNORE="Please manually download ${DISTNAME} from http://www.sun.com/staroffice. Put ${DISTNAME} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.2 CDROM, please run 'make USE_CDROM=yes'"
+ @${ECHO} Please manually download ${DISTFILES}
+ @${ECHO} from http://www.sun.com/staroffice.
+ @${ECHO}
+ @${ECHO} ${ADEBAS} is the database part of Staroffice.
+ @${ECHO}
+ @${ECHO} Put ${DISTFILES} into the directory
+ @${ECHO} ${_DISTDIR} and run make again.
+ @${ECHO} Or, if you have the Sun StarOffice 5.2 CDROM,
+ @${ECHO} please run 'make USE_CDROM=yes'
+ @${ECHO}
+ @${FALSE}
.endif
.endif
@@ -65,7 +83,7 @@ do-extract:
@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
@${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
@cd ${WRKSRC}
- @${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
+ @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
@cd ../../
.endif
@@ -84,7 +102,7 @@ do-install:
@${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52
.endif
@${CAT} ${PKGDIR}/MESSAGE
- @-TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
+ @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
@ ${ECHO}
@ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed
@ ${ECHO} successfully on your system.
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 1bc196999aa6..415da7fe386b 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -23,24 +23,42 @@ NO_BUILD= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
+ADEBAS= soa-5_2-ga-bin-linux-en.bin
.include <bsd.port.pre.mk>
-#
-# Staroffice depends on a scripting fix for
-# src/sys/i386/linux/linux_sysvec. It should
-# be revision 1.55.2.1 or higher. Please upgrade
-# to FreeBSD 4.1
-#
+pre-fetch:
.if ${OSVERSION} < 410000
-BROKEN= YES
+ @${ECHO}
+ @${ECHO} OS-VERSION ${OSVERSION}
+ @${ECHO}
+ @${ECHO} Staroffice depends on a scripting fix for
+ @${ECHO} src/sys/i386/linux/linux_sysvec. It should
+ @${ECHO} be revision 1.55.2.1 or higher.
+ @${ECHO}
+ @${ECHO} Please upgrade to FreeBSD 4.1
+ @${ECHO}
+ @${FALSE}
.endif
-
.if defined(WITH_CDROM)
-IGNORE= "Please mount the Sun StarOffice 5.2 CDROM onto /cdrom and run make again."
-.else # FTP/web download
+ @${ECHO}
+ @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
+ @${ECHO} onto /cdrom and run make again.
+ @${ECHO}
+ @${FALSE}
+.else
.if !exists(${_DISTDIR}/${DISTNAME})
-IGNORE="Please manually download ${DISTNAME} from http://www.sun.com/staroffice. Put ${DISTNAME} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.2 CDROM, please run 'make USE_CDROM=yes'"
+ @${ECHO} Please manually download ${DISTFILES}
+ @${ECHO} from http://www.sun.com/staroffice.
+ @${ECHO}
+ @${ECHO} ${ADEBAS} is the database part of Staroffice.
+ @${ECHO}
+ @${ECHO} Put ${DISTFILES} into the directory
+ @${ECHO} ${_DISTDIR} and run make again.
+ @${ECHO} Or, if you have the Sun StarOffice 5.2 CDROM,
+ @${ECHO} please run 'make USE_CDROM=yes'
+ @${ECHO}
+ @${FALSE}
.endif
.endif
@@ -65,7 +83,7 @@ do-extract:
@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
@${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
@cd ${WRKSRC}
- @${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
+ @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
@cd ../../
.endif
@@ -84,7 +102,7 @@ do-install:
@${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52
.endif
@${CAT} ${PKGDIR}/MESSAGE
- @-TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
+ @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
@ ${ECHO}
@ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed
@ ${ECHO} successfully on your system.
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 1bc196999aa6..415da7fe386b 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -23,24 +23,42 @@ NO_BUILD= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
+ADEBAS= soa-5_2-ga-bin-linux-en.bin
.include <bsd.port.pre.mk>
-#
-# Staroffice depends on a scripting fix for
-# src/sys/i386/linux/linux_sysvec. It should
-# be revision 1.55.2.1 or higher. Please upgrade
-# to FreeBSD 4.1
-#
+pre-fetch:
.if ${OSVERSION} < 410000
-BROKEN= YES
+ @${ECHO}
+ @${ECHO} OS-VERSION ${OSVERSION}
+ @${ECHO}
+ @${ECHO} Staroffice depends on a scripting fix for
+ @${ECHO} src/sys/i386/linux/linux_sysvec. It should
+ @${ECHO} be revision 1.55.2.1 or higher.
+ @${ECHO}
+ @${ECHO} Please upgrade to FreeBSD 4.1
+ @${ECHO}
+ @${FALSE}
.endif
-
.if defined(WITH_CDROM)
-IGNORE= "Please mount the Sun StarOffice 5.2 CDROM onto /cdrom and run make again."
-.else # FTP/web download
+ @${ECHO}
+ @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
+ @${ECHO} onto /cdrom and run make again.
+ @${ECHO}
+ @${FALSE}
+.else
.if !exists(${_DISTDIR}/${DISTNAME})
-IGNORE="Please manually download ${DISTNAME} from http://www.sun.com/staroffice. Put ${DISTNAME} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.2 CDROM, please run 'make USE_CDROM=yes'"
+ @${ECHO} Please manually download ${DISTFILES}
+ @${ECHO} from http://www.sun.com/staroffice.
+ @${ECHO}
+ @${ECHO} ${ADEBAS} is the database part of Staroffice.
+ @${ECHO}
+ @${ECHO} Put ${DISTFILES} into the directory
+ @${ECHO} ${_DISTDIR} and run make again.
+ @${ECHO} Or, if you have the Sun StarOffice 5.2 CDROM,
+ @${ECHO} please run 'make USE_CDROM=yes'
+ @${ECHO}
+ @${FALSE}
.endif
.endif
@@ -65,7 +83,7 @@ do-extract:
@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
@${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
@cd ${WRKSRC}
- @${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
+ @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
@cd ../../
.endif
@@ -84,7 +102,7 @@ do-install:
@${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52
.endif
@${CAT} ${PKGDIR}/MESSAGE
- @-TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
+ @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
@ ${ECHO}
@ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed
@ ${ECHO} successfully on your system.
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 1bc196999aa6..415da7fe386b 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -23,24 +23,42 @@ NO_BUILD= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
+ADEBAS= soa-5_2-ga-bin-linux-en.bin
.include <bsd.port.pre.mk>
-#
-# Staroffice depends on a scripting fix for
-# src/sys/i386/linux/linux_sysvec. It should
-# be revision 1.55.2.1 or higher. Please upgrade
-# to FreeBSD 4.1
-#
+pre-fetch:
.if ${OSVERSION} < 410000
-BROKEN= YES
+ @${ECHO}
+ @${ECHO} OS-VERSION ${OSVERSION}
+ @${ECHO}
+ @${ECHO} Staroffice depends on a scripting fix for
+ @${ECHO} src/sys/i386/linux/linux_sysvec. It should
+ @${ECHO} be revision 1.55.2.1 or higher.
+ @${ECHO}
+ @${ECHO} Please upgrade to FreeBSD 4.1
+ @${ECHO}
+ @${FALSE}
.endif
-
.if defined(WITH_CDROM)
-IGNORE= "Please mount the Sun StarOffice 5.2 CDROM onto /cdrom and run make again."
-.else # FTP/web download
+ @${ECHO}
+ @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
+ @${ECHO} onto /cdrom and run make again.
+ @${ECHO}
+ @${FALSE}
+.else
.if !exists(${_DISTDIR}/${DISTNAME})
-IGNORE="Please manually download ${DISTNAME} from http://www.sun.com/staroffice. Put ${DISTNAME} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.2 CDROM, please run 'make USE_CDROM=yes'"
+ @${ECHO} Please manually download ${DISTFILES}
+ @${ECHO} from http://www.sun.com/staroffice.
+ @${ECHO}
+ @${ECHO} ${ADEBAS} is the database part of Staroffice.
+ @${ECHO}
+ @${ECHO} Put ${DISTFILES} into the directory
+ @${ECHO} ${_DISTDIR} and run make again.
+ @${ECHO} Or, if you have the Sun StarOffice 5.2 CDROM,
+ @${ECHO} please run 'make USE_CDROM=yes'
+ @${ECHO}
+ @${FALSE}
.endif
.endif
@@ -65,7 +83,7 @@ do-extract:
@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
@${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
@cd ${WRKSRC}
- @${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
+ @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
@cd ../../
.endif
@@ -84,7 +102,7 @@ do-install:
@${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52
.endif
@${CAT} ${PKGDIR}/MESSAGE
- @-TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
+ @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
@ ${ECHO}
@ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed
@ ${ECHO} successfully on your system.
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index 1bc196999aa6..415da7fe386b 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -23,24 +23,42 @@ NO_BUILD= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
+ADEBAS= soa-5_2-ga-bin-linux-en.bin
.include <bsd.port.pre.mk>
-#
-# Staroffice depends on a scripting fix for
-# src/sys/i386/linux/linux_sysvec. It should
-# be revision 1.55.2.1 or higher. Please upgrade
-# to FreeBSD 4.1
-#
+pre-fetch:
.if ${OSVERSION} < 410000
-BROKEN= YES
+ @${ECHO}
+ @${ECHO} OS-VERSION ${OSVERSION}
+ @${ECHO}
+ @${ECHO} Staroffice depends on a scripting fix for
+ @${ECHO} src/sys/i386/linux/linux_sysvec. It should
+ @${ECHO} be revision 1.55.2.1 or higher.
+ @${ECHO}
+ @${ECHO} Please upgrade to FreeBSD 4.1
+ @${ECHO}
+ @${FALSE}
.endif
-
.if defined(WITH_CDROM)
-IGNORE= "Please mount the Sun StarOffice 5.2 CDROM onto /cdrom and run make again."
-.else # FTP/web download
+ @${ECHO}
+ @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
+ @${ECHO} onto /cdrom and run make again.
+ @${ECHO}
+ @${FALSE}
+.else
.if !exists(${_DISTDIR}/${DISTNAME})
-IGNORE="Please manually download ${DISTNAME} from http://www.sun.com/staroffice. Put ${DISTNAME} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.2 CDROM, please run 'make USE_CDROM=yes'"
+ @${ECHO} Please manually download ${DISTFILES}
+ @${ECHO} from http://www.sun.com/staroffice.
+ @${ECHO}
+ @${ECHO} ${ADEBAS} is the database part of Staroffice.
+ @${ECHO}
+ @${ECHO} Put ${DISTFILES} into the directory
+ @${ECHO} ${_DISTDIR} and run make again.
+ @${ECHO} Or, if you have the Sun StarOffice 5.2 CDROM,
+ @${ECHO} please run 'make USE_CDROM=yes'
+ @${ECHO}
+ @${FALSE}
.endif
.endif
@@ -65,7 +83,7 @@ do-extract:
@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
@${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
@cd ${WRKSRC}
- @${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
+ @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
@cd ../../
.endif
@@ -84,7 +102,7 @@ do-install:
@${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52
.endif
@${CAT} ${PKGDIR}/MESSAGE
- @-TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
+ @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
@ ${ECHO}
@ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed
@ ${ECHO} successfully on your system.
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index 1bc196999aa6..415da7fe386b 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -23,24 +23,42 @@ NO_BUILD= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
+ADEBAS= soa-5_2-ga-bin-linux-en.bin
.include <bsd.port.pre.mk>
-#
-# Staroffice depends on a scripting fix for
-# src/sys/i386/linux/linux_sysvec. It should
-# be revision 1.55.2.1 or higher. Please upgrade
-# to FreeBSD 4.1
-#
+pre-fetch:
.if ${OSVERSION} < 410000
-BROKEN= YES
+ @${ECHO}
+ @${ECHO} OS-VERSION ${OSVERSION}
+ @${ECHO}
+ @${ECHO} Staroffice depends on a scripting fix for
+ @${ECHO} src/sys/i386/linux/linux_sysvec. It should
+ @${ECHO} be revision 1.55.2.1 or higher.
+ @${ECHO}
+ @${ECHO} Please upgrade to FreeBSD 4.1
+ @${ECHO}
+ @${FALSE}
.endif
-
.if defined(WITH_CDROM)
-IGNORE= "Please mount the Sun StarOffice 5.2 CDROM onto /cdrom and run make again."
-.else # FTP/web download
+ @${ECHO}
+ @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
+ @${ECHO} onto /cdrom and run make again.
+ @${ECHO}
+ @${FALSE}
+.else
.if !exists(${_DISTDIR}/${DISTNAME})
-IGNORE="Please manually download ${DISTNAME} from http://www.sun.com/staroffice. Put ${DISTNAME} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.2 CDROM, please run 'make USE_CDROM=yes'"
+ @${ECHO} Please manually download ${DISTFILES}
+ @${ECHO} from http://www.sun.com/staroffice.
+ @${ECHO}
+ @${ECHO} ${ADEBAS} is the database part of Staroffice.
+ @${ECHO}
+ @${ECHO} Put ${DISTFILES} into the directory
+ @${ECHO} ${_DISTDIR} and run make again.
+ @${ECHO} Or, if you have the Sun StarOffice 5.2 CDROM,
+ @${ECHO} please run 'make USE_CDROM=yes'
+ @${ECHO}
+ @${FALSE}
.endif
.endif
@@ -65,7 +83,7 @@ do-extract:
@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
@${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
@cd ${WRKSRC}
- @${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
+ @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
@cd ../../
.endif
@@ -84,7 +102,7 @@ do-install:
@${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52
.endif
@${CAT} ${PKGDIR}/MESSAGE
- @-TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
+ @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
@ ${ECHO}
@ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed
@ ${ECHO} successfully on your system.
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index 1bc196999aa6..415da7fe386b 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -23,24 +23,42 @@ NO_BUILD= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
+ADEBAS= soa-5_2-ga-bin-linux-en.bin
.include <bsd.port.pre.mk>
-#
-# Staroffice depends on a scripting fix for
-# src/sys/i386/linux/linux_sysvec. It should
-# be revision 1.55.2.1 or higher. Please upgrade
-# to FreeBSD 4.1
-#
+pre-fetch:
.if ${OSVERSION} < 410000
-BROKEN= YES
+ @${ECHO}
+ @${ECHO} OS-VERSION ${OSVERSION}
+ @${ECHO}
+ @${ECHO} Staroffice depends on a scripting fix for
+ @${ECHO} src/sys/i386/linux/linux_sysvec. It should
+ @${ECHO} be revision 1.55.2.1 or higher.
+ @${ECHO}
+ @${ECHO} Please upgrade to FreeBSD 4.1
+ @${ECHO}
+ @${FALSE}
.endif
-
.if defined(WITH_CDROM)
-IGNORE= "Please mount the Sun StarOffice 5.2 CDROM onto /cdrom and run make again."
-.else # FTP/web download
+ @${ECHO}
+ @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
+ @${ECHO} onto /cdrom and run make again.
+ @${ECHO}
+ @${FALSE}
+.else
.if !exists(${_DISTDIR}/${DISTNAME})
-IGNORE="Please manually download ${DISTNAME} from http://www.sun.com/staroffice. Put ${DISTNAME} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.2 CDROM, please run 'make USE_CDROM=yes'"
+ @${ECHO} Please manually download ${DISTFILES}
+ @${ECHO} from http://www.sun.com/staroffice.
+ @${ECHO}
+ @${ECHO} ${ADEBAS} is the database part of Staroffice.
+ @${ECHO}
+ @${ECHO} Put ${DISTFILES} into the directory
+ @${ECHO} ${_DISTDIR} and run make again.
+ @${ECHO} Or, if you have the Sun StarOffice 5.2 CDROM,
+ @${ECHO} please run 'make USE_CDROM=yes'
+ @${ECHO}
+ @${FALSE}
.endif
.endif
@@ -65,7 +83,7 @@ do-extract:
@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
@${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
@cd ${WRKSRC}
- @${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
+ @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
@cd ../../
.endif
@@ -84,7 +102,7 @@ do-install:
@${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52
.endif
@${CAT} ${PKGDIR}/MESSAGE
- @-TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
+ @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
@ ${ECHO}
@ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed
@ ${ECHO} successfully on your system.
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 1bc196999aa6..415da7fe386b 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -23,24 +23,42 @@ NO_BUILD= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
+ADEBAS= soa-5_2-ga-bin-linux-en.bin
.include <bsd.port.pre.mk>
-#
-# Staroffice depends on a scripting fix for
-# src/sys/i386/linux/linux_sysvec. It should
-# be revision 1.55.2.1 or higher. Please upgrade
-# to FreeBSD 4.1
-#
+pre-fetch:
.if ${OSVERSION} < 410000
-BROKEN= YES
+ @${ECHO}
+ @${ECHO} OS-VERSION ${OSVERSION}
+ @${ECHO}
+ @${ECHO} Staroffice depends on a scripting fix for
+ @${ECHO} src/sys/i386/linux/linux_sysvec. It should
+ @${ECHO} be revision 1.55.2.1 or higher.
+ @${ECHO}
+ @${ECHO} Please upgrade to FreeBSD 4.1
+ @${ECHO}
+ @${FALSE}
.endif
-
.if defined(WITH_CDROM)
-IGNORE= "Please mount the Sun StarOffice 5.2 CDROM onto /cdrom and run make again."
-.else # FTP/web download
+ @${ECHO}
+ @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
+ @${ECHO} onto /cdrom and run make again.
+ @${ECHO}
+ @${FALSE}
+.else
.if !exists(${_DISTDIR}/${DISTNAME})
-IGNORE="Please manually download ${DISTNAME} from http://www.sun.com/staroffice. Put ${DISTNAME} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.2 CDROM, please run 'make USE_CDROM=yes'"
+ @${ECHO} Please manually download ${DISTFILES}
+ @${ECHO} from http://www.sun.com/staroffice.
+ @${ECHO}
+ @${ECHO} ${ADEBAS} is the database part of Staroffice.
+ @${ECHO}
+ @${ECHO} Put ${DISTFILES} into the directory
+ @${ECHO} ${_DISTDIR} and run make again.
+ @${ECHO} Or, if you have the Sun StarOffice 5.2 CDROM,
+ @${ECHO} please run 'make USE_CDROM=yes'
+ @${ECHO}
+ @${FALSE}
.endif
.endif
@@ -65,7 +83,7 @@ do-extract:
@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
@${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
@cd ${WRKSRC}
- @${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
+ @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
@cd ../../
.endif
@@ -84,7 +102,7 @@ do-install:
@${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52
.endif
@${CAT} ${PKGDIR}/MESSAGE
- @-TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
+ @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
@ ${ECHO}
@ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed
@ ${ECHO} successfully on your system.
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 1bc196999aa6..415da7fe386b 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -23,24 +23,42 @@ NO_BUILD= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
+ADEBAS= soa-5_2-ga-bin-linux-en.bin
.include <bsd.port.pre.mk>
-#
-# Staroffice depends on a scripting fix for
-# src/sys/i386/linux/linux_sysvec. It should
-# be revision 1.55.2.1 or higher. Please upgrade
-# to FreeBSD 4.1
-#
+pre-fetch:
.if ${OSVERSION} < 410000
-BROKEN= YES
+ @${ECHO}
+ @${ECHO} OS-VERSION ${OSVERSION}
+ @${ECHO}
+ @${ECHO} Staroffice depends on a scripting fix for
+ @${ECHO} src/sys/i386/linux/linux_sysvec. It should
+ @${ECHO} be revision 1.55.2.1 or higher.
+ @${ECHO}
+ @${ECHO} Please upgrade to FreeBSD 4.1
+ @${ECHO}
+ @${FALSE}
.endif
-
.if defined(WITH_CDROM)
-IGNORE= "Please mount the Sun StarOffice 5.2 CDROM onto /cdrom and run make again."
-.else # FTP/web download
+ @${ECHO}
+ @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
+ @${ECHO} onto /cdrom and run make again.
+ @${ECHO}
+ @${FALSE}
+.else
.if !exists(${_DISTDIR}/${DISTNAME})
-IGNORE="Please manually download ${DISTNAME} from http://www.sun.com/staroffice. Put ${DISTNAME} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.2 CDROM, please run 'make USE_CDROM=yes'"
+ @${ECHO} Please manually download ${DISTFILES}
+ @${ECHO} from http://www.sun.com/staroffice.
+ @${ECHO}
+ @${ECHO} ${ADEBAS} is the database part of Staroffice.
+ @${ECHO}
+ @${ECHO} Put ${DISTFILES} into the directory
+ @${ECHO} ${_DISTDIR} and run make again.
+ @${ECHO} Or, if you have the Sun StarOffice 5.2 CDROM,
+ @${ECHO} please run 'make USE_CDROM=yes'
+ @${ECHO}
+ @${FALSE}
.endif
.endif
@@ -65,7 +83,7 @@ do-extract:
@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
@${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
@cd ${WRKSRC}
- @${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
+ @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
@cd ../../
.endif
@@ -84,7 +102,7 @@ do-install:
@${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52
.endif
@${CAT} ${PKGDIR}/MESSAGE
- @-TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
+ @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
@ ${ECHO}
@ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed
@ ${ECHO} successfully on your system.
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 1bc196999aa6..415da7fe386b 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -23,24 +23,42 @@ NO_BUILD= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
+ADEBAS= soa-5_2-ga-bin-linux-en.bin
.include <bsd.port.pre.mk>
-#
-# Staroffice depends on a scripting fix for
-# src/sys/i386/linux/linux_sysvec. It should
-# be revision 1.55.2.1 or higher. Please upgrade
-# to FreeBSD 4.1
-#
+pre-fetch:
.if ${OSVERSION} < 410000
-BROKEN= YES
+ @${ECHO}
+ @${ECHO} OS-VERSION ${OSVERSION}
+ @${ECHO}
+ @${ECHO} Staroffice depends on a scripting fix for
+ @${ECHO} src/sys/i386/linux/linux_sysvec. It should
+ @${ECHO} be revision 1.55.2.1 or higher.
+ @${ECHO}
+ @${ECHO} Please upgrade to FreeBSD 4.1
+ @${ECHO}
+ @${FALSE}
.endif
-
.if defined(WITH_CDROM)
-IGNORE= "Please mount the Sun StarOffice 5.2 CDROM onto /cdrom and run make again."
-.else # FTP/web download
+ @${ECHO}
+ @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
+ @${ECHO} onto /cdrom and run make again.
+ @${ECHO}
+ @${FALSE}
+.else
.if !exists(${_DISTDIR}/${DISTNAME})
-IGNORE="Please manually download ${DISTNAME} from http://www.sun.com/staroffice. Put ${DISTNAME} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.2 CDROM, please run 'make USE_CDROM=yes'"
+ @${ECHO} Please manually download ${DISTFILES}
+ @${ECHO} from http://www.sun.com/staroffice.
+ @${ECHO}
+ @${ECHO} ${ADEBAS} is the database part of Staroffice.
+ @${ECHO}
+ @${ECHO} Put ${DISTFILES} into the directory
+ @${ECHO} ${_DISTDIR} and run make again.
+ @${ECHO} Or, if you have the Sun StarOffice 5.2 CDROM,
+ @${ECHO} please run 'make USE_CDROM=yes'
+ @${ECHO}
+ @${FALSE}
.endif
.endif
@@ -65,7 +83,7 @@ do-extract:
@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
@${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
@cd ${WRKSRC}
- @${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
+ @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
@cd ../../
.endif
@@ -84,7 +102,7 @@ do-install:
@${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52
.endif
@${CAT} ${PKGDIR}/MESSAGE
- @-TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
+ @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
@ ${ECHO}
@ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed
@ ${ECHO} successfully on your system.
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 1bc196999aa6..415da7fe386b 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -23,24 +23,42 @@ NO_BUILD= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
+ADEBAS= soa-5_2-ga-bin-linux-en.bin
.include <bsd.port.pre.mk>
-#
-# Staroffice depends on a scripting fix for
-# src/sys/i386/linux/linux_sysvec. It should
-# be revision 1.55.2.1 or higher. Please upgrade
-# to FreeBSD 4.1
-#
+pre-fetch:
.if ${OSVERSION} < 410000
-BROKEN= YES
+ @${ECHO}
+ @${ECHO} OS-VERSION ${OSVERSION}
+ @${ECHO}
+ @${ECHO} Staroffice depends on a scripting fix for
+ @${ECHO} src/sys/i386/linux/linux_sysvec. It should
+ @${ECHO} be revision 1.55.2.1 or higher.
+ @${ECHO}
+ @${ECHO} Please upgrade to FreeBSD 4.1
+ @${ECHO}
+ @${FALSE}
.endif
-
.if defined(WITH_CDROM)
-IGNORE= "Please mount the Sun StarOffice 5.2 CDROM onto /cdrom and run make again."
-.else # FTP/web download
+ @${ECHO}
+ @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
+ @${ECHO} onto /cdrom and run make again.
+ @${ECHO}
+ @${FALSE}
+.else
.if !exists(${_DISTDIR}/${DISTNAME})
-IGNORE="Please manually download ${DISTNAME} from http://www.sun.com/staroffice. Put ${DISTNAME} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.2 CDROM, please run 'make USE_CDROM=yes'"
+ @${ECHO} Please manually download ${DISTFILES}
+ @${ECHO} from http://www.sun.com/staroffice.
+ @${ECHO}
+ @${ECHO} ${ADEBAS} is the database part of Staroffice.
+ @${ECHO}
+ @${ECHO} Put ${DISTFILES} into the directory
+ @${ECHO} ${_DISTDIR} and run make again.
+ @${ECHO} Or, if you have the Sun StarOffice 5.2 CDROM,
+ @${ECHO} please run 'make USE_CDROM=yes'
+ @${ECHO}
+ @${FALSE}
.endif
.endif
@@ -65,7 +83,7 @@ do-extract:
@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
@${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
@cd ${WRKSRC}
- @${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
+ @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
@cd ../../
.endif
@@ -84,7 +102,7 @@ do-install:
@${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52
.endif
@${CAT} ${PKGDIR}/MESSAGE
- @-TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
+ @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
@ ${ECHO}
@ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed
@ ${ECHO} successfully on your system.
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 1bc196999aa6..415da7fe386b 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -23,24 +23,42 @@ NO_BUILD= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
+ADEBAS= soa-5_2-ga-bin-linux-en.bin
.include <bsd.port.pre.mk>
-#
-# Staroffice depends on a scripting fix for
-# src/sys/i386/linux/linux_sysvec. It should
-# be revision 1.55.2.1 or higher. Please upgrade
-# to FreeBSD 4.1
-#
+pre-fetch:
.if ${OSVERSION} < 410000
-BROKEN= YES
+ @${ECHO}
+ @${ECHO} OS-VERSION ${OSVERSION}
+ @${ECHO}
+ @${ECHO} Staroffice depends on a scripting fix for
+ @${ECHO} src/sys/i386/linux/linux_sysvec. It should
+ @${ECHO} be revision 1.55.2.1 or higher.
+ @${ECHO}
+ @${ECHO} Please upgrade to FreeBSD 4.1
+ @${ECHO}
+ @${FALSE}
.endif
-
.if defined(WITH_CDROM)
-IGNORE= "Please mount the Sun StarOffice 5.2 CDROM onto /cdrom and run make again."
-.else # FTP/web download
+ @${ECHO}
+ @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
+ @${ECHO} onto /cdrom and run make again.
+ @${ECHO}
+ @${FALSE}
+.else
.if !exists(${_DISTDIR}/${DISTNAME})
-IGNORE="Please manually download ${DISTNAME} from http://www.sun.com/staroffice. Put ${DISTNAME} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.2 CDROM, please run 'make USE_CDROM=yes'"
+ @${ECHO} Please manually download ${DISTFILES}
+ @${ECHO} from http://www.sun.com/staroffice.
+ @${ECHO}
+ @${ECHO} ${ADEBAS} is the database part of Staroffice.
+ @${ECHO}
+ @${ECHO} Put ${DISTFILES} into the directory
+ @${ECHO} ${_DISTDIR} and run make again.
+ @${ECHO} Or, if you have the Sun StarOffice 5.2 CDROM,
+ @${ECHO} please run 'make USE_CDROM=yes'
+ @${ECHO}
+ @${FALSE}
.endif
.endif
@@ -65,7 +83,7 @@ do-extract:
@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
@${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
@cd ${WRKSRC}
- @${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
+ @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
@cd ../../
.endif
@@ -84,7 +102,7 @@ do-install:
@${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52
.endif
@${CAT} ${PKGDIR}/MESSAGE
- @-TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
+ @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
@ ${ECHO}
@ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed
@ ${ECHO} successfully on your system.
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 1bc196999aa6..415da7fe386b 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -23,24 +23,42 @@ NO_BUILD= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
+ADEBAS= soa-5_2-ga-bin-linux-en.bin
.include <bsd.port.pre.mk>
-#
-# Staroffice depends on a scripting fix for
-# src/sys/i386/linux/linux_sysvec. It should
-# be revision 1.55.2.1 or higher. Please upgrade
-# to FreeBSD 4.1
-#
+pre-fetch:
.if ${OSVERSION} < 410000
-BROKEN= YES
+ @${ECHO}
+ @${ECHO} OS-VERSION ${OSVERSION}
+ @${ECHO}
+ @${ECHO} Staroffice depends on a scripting fix for
+ @${ECHO} src/sys/i386/linux/linux_sysvec. It should
+ @${ECHO} be revision 1.55.2.1 or higher.
+ @${ECHO}
+ @${ECHO} Please upgrade to FreeBSD 4.1
+ @${ECHO}
+ @${FALSE}
.endif
-
.if defined(WITH_CDROM)
-IGNORE= "Please mount the Sun StarOffice 5.2 CDROM onto /cdrom and run make again."
-.else # FTP/web download
+ @${ECHO}
+ @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
+ @${ECHO} onto /cdrom and run make again.
+ @${ECHO}
+ @${FALSE}
+.else
.if !exists(${_DISTDIR}/${DISTNAME})
-IGNORE="Please manually download ${DISTNAME} from http://www.sun.com/staroffice. Put ${DISTNAME} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.2 CDROM, please run 'make USE_CDROM=yes'"
+ @${ECHO} Please manually download ${DISTFILES}
+ @${ECHO} from http://www.sun.com/staroffice.
+ @${ECHO}
+ @${ECHO} ${ADEBAS} is the database part of Staroffice.
+ @${ECHO}
+ @${ECHO} Put ${DISTFILES} into the directory
+ @${ECHO} ${_DISTDIR} and run make again.
+ @${ECHO} Or, if you have the Sun StarOffice 5.2 CDROM,
+ @${ECHO} please run 'make USE_CDROM=yes'
+ @${ECHO}
+ @${FALSE}
.endif
.endif
@@ -65,7 +83,7 @@ do-extract:
@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
@${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
@cd ${WRKSRC}
- @${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
+ @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
@cd ../../
.endif
@@ -84,7 +102,7 @@ do-install:
@${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52
.endif
@${CAT} ${PKGDIR}/MESSAGE
- @-TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
+ @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
@ ${ECHO}
@ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed
@ ${ECHO} successfully on your system.
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 1bc196999aa6..415da7fe386b 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -23,24 +23,42 @@ NO_BUILD= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
+ADEBAS= soa-5_2-ga-bin-linux-en.bin
.include <bsd.port.pre.mk>
-#
-# Staroffice depends on a scripting fix for
-# src/sys/i386/linux/linux_sysvec. It should
-# be revision 1.55.2.1 or higher. Please upgrade
-# to FreeBSD 4.1
-#
+pre-fetch:
.if ${OSVERSION} < 410000
-BROKEN= YES
+ @${ECHO}
+ @${ECHO} OS-VERSION ${OSVERSION}
+ @${ECHO}
+ @${ECHO} Staroffice depends on a scripting fix for
+ @${ECHO} src/sys/i386/linux/linux_sysvec. It should
+ @${ECHO} be revision 1.55.2.1 or higher.
+ @${ECHO}
+ @${ECHO} Please upgrade to FreeBSD 4.1
+ @${ECHO}
+ @${FALSE}
.endif
-
.if defined(WITH_CDROM)
-IGNORE= "Please mount the Sun StarOffice 5.2 CDROM onto /cdrom and run make again."
-.else # FTP/web download
+ @${ECHO}
+ @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
+ @${ECHO} onto /cdrom and run make again.
+ @${ECHO}
+ @${FALSE}
+.else
.if !exists(${_DISTDIR}/${DISTNAME})
-IGNORE="Please manually download ${DISTNAME} from http://www.sun.com/staroffice. Put ${DISTNAME} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.2 CDROM, please run 'make USE_CDROM=yes'"
+ @${ECHO} Please manually download ${DISTFILES}
+ @${ECHO} from http://www.sun.com/staroffice.
+ @${ECHO}
+ @${ECHO} ${ADEBAS} is the database part of Staroffice.
+ @${ECHO}
+ @${ECHO} Put ${DISTFILES} into the directory
+ @${ECHO} ${_DISTDIR} and run make again.
+ @${ECHO} Or, if you have the Sun StarOffice 5.2 CDROM,
+ @${ECHO} please run 'make USE_CDROM=yes'
+ @${ECHO}
+ @${FALSE}
.endif
.endif
@@ -65,7 +83,7 @@ do-extract:
@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
@${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
@cd ${WRKSRC}
- @${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
+ @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
@cd ../../
.endif
@@ -84,7 +102,7 @@ do-install:
@${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52
.endif
@${CAT} ${PKGDIR}/MESSAGE
- @-TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
+ @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
@ ${ECHO}
@ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed
@ ${ECHO} successfully on your system.
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 1bc196999aa6..415da7fe386b 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -23,24 +23,42 @@ NO_BUILD= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
+ADEBAS= soa-5_2-ga-bin-linux-en.bin
.include <bsd.port.pre.mk>
-#
-# Staroffice depends on a scripting fix for
-# src/sys/i386/linux/linux_sysvec. It should
-# be revision 1.55.2.1 or higher. Please upgrade
-# to FreeBSD 4.1
-#
+pre-fetch:
.if ${OSVERSION} < 410000
-BROKEN= YES
+ @${ECHO}
+ @${ECHO} OS-VERSION ${OSVERSION}
+ @${ECHO}
+ @${ECHO} Staroffice depends on a scripting fix for
+ @${ECHO} src/sys/i386/linux/linux_sysvec. It should
+ @${ECHO} be revision 1.55.2.1 or higher.
+ @${ECHO}
+ @${ECHO} Please upgrade to FreeBSD 4.1
+ @${ECHO}
+ @${FALSE}
.endif
-
.if defined(WITH_CDROM)
-IGNORE= "Please mount the Sun StarOffice 5.2 CDROM onto /cdrom and run make again."
-.else # FTP/web download
+ @${ECHO}
+ @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
+ @${ECHO} onto /cdrom and run make again.
+ @${ECHO}
+ @${FALSE}
+.else
.if !exists(${_DISTDIR}/${DISTNAME})
-IGNORE="Please manually download ${DISTNAME} from http://www.sun.com/staroffice. Put ${DISTNAME} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.2 CDROM, please run 'make USE_CDROM=yes'"
+ @${ECHO} Please manually download ${DISTFILES}
+ @${ECHO} from http://www.sun.com/staroffice.
+ @${ECHO}
+ @${ECHO} ${ADEBAS} is the database part of Staroffice.
+ @${ECHO}
+ @${ECHO} Put ${DISTFILES} into the directory
+ @${ECHO} ${_DISTDIR} and run make again.
+ @${ECHO} Or, if you have the Sun StarOffice 5.2 CDROM,
+ @${ECHO} please run 'make USE_CDROM=yes'
+ @${ECHO}
+ @${FALSE}
.endif
.endif
@@ -65,7 +83,7 @@ do-extract:
@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
@${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
@cd ${WRKSRC}
- @${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
+ @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
@cd ../../
.endif
@@ -84,7 +102,7 @@ do-install:
@${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52
.endif
@${CAT} ${PKGDIR}/MESSAGE
- @-TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
+ @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
@ ${ECHO}
@ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed
@ ${ECHO} successfully on your system.
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 1bc196999aa6..415da7fe386b 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -23,24 +23,42 @@ NO_BUILD= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
+ADEBAS= soa-5_2-ga-bin-linux-en.bin
.include <bsd.port.pre.mk>
-#
-# Staroffice depends on a scripting fix for
-# src/sys/i386/linux/linux_sysvec. It should
-# be revision 1.55.2.1 or higher. Please upgrade
-# to FreeBSD 4.1
-#
+pre-fetch:
.if ${OSVERSION} < 410000
-BROKEN= YES
+ @${ECHO}
+ @${ECHO} OS-VERSION ${OSVERSION}
+ @${ECHO}
+ @${ECHO} Staroffice depends on a scripting fix for
+ @${ECHO} src/sys/i386/linux/linux_sysvec. It should
+ @${ECHO} be revision 1.55.2.1 or higher.
+ @${ECHO}
+ @${ECHO} Please upgrade to FreeBSD 4.1
+ @${ECHO}
+ @${FALSE}
.endif
-
.if defined(WITH_CDROM)
-IGNORE= "Please mount the Sun StarOffice 5.2 CDROM onto /cdrom and run make again."
-.else # FTP/web download
+ @${ECHO}
+ @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
+ @${ECHO} onto /cdrom and run make again.
+ @${ECHO}
+ @${FALSE}
+.else
.if !exists(${_DISTDIR}/${DISTNAME})
-IGNORE="Please manually download ${DISTNAME} from http://www.sun.com/staroffice. Put ${DISTNAME} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.2 CDROM, please run 'make USE_CDROM=yes'"
+ @${ECHO} Please manually download ${DISTFILES}
+ @${ECHO} from http://www.sun.com/staroffice.
+ @${ECHO}
+ @${ECHO} ${ADEBAS} is the database part of Staroffice.
+ @${ECHO}
+ @${ECHO} Put ${DISTFILES} into the directory
+ @${ECHO} ${_DISTDIR} and run make again.
+ @${ECHO} Or, if you have the Sun StarOffice 5.2 CDROM,
+ @${ECHO} please run 'make USE_CDROM=yes'
+ @${ECHO}
+ @${FALSE}
.endif
.endif
@@ -65,7 +83,7 @@ do-extract:
@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
@${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
@cd ${WRKSRC}
- @${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
+ @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
@cd ../../
.endif
@@ -84,7 +102,7 @@ do-install:
@${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52
.endif
@${CAT} ${PKGDIR}/MESSAGE
- @-TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
+ @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
@ ${ECHO}
@ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed
@ ${ECHO} successfully on your system.
diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile
index 1bc196999aa6..415da7fe386b 100644
--- a/editors/openoffice/Makefile
+++ b/editors/openoffice/Makefile
@@ -23,24 +23,42 @@ NO_BUILD= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
+ADEBAS= soa-5_2-ga-bin-linux-en.bin
.include <bsd.port.pre.mk>
-#
-# Staroffice depends on a scripting fix for
-# src/sys/i386/linux/linux_sysvec. It should
-# be revision 1.55.2.1 or higher. Please upgrade
-# to FreeBSD 4.1
-#
+pre-fetch:
.if ${OSVERSION} < 410000
-BROKEN= YES
+ @${ECHO}
+ @${ECHO} OS-VERSION ${OSVERSION}
+ @${ECHO}
+ @${ECHO} Staroffice depends on a scripting fix for
+ @${ECHO} src/sys/i386/linux/linux_sysvec. It should
+ @${ECHO} be revision 1.55.2.1 or higher.
+ @${ECHO}
+ @${ECHO} Please upgrade to FreeBSD 4.1
+ @${ECHO}
+ @${FALSE}
.endif
-
.if defined(WITH_CDROM)
-IGNORE= "Please mount the Sun StarOffice 5.2 CDROM onto /cdrom and run make again."
-.else # FTP/web download
+ @${ECHO}
+ @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
+ @${ECHO} onto /cdrom and run make again.
+ @${ECHO}
+ @${FALSE}
+.else
.if !exists(${_DISTDIR}/${DISTNAME})
-IGNORE="Please manually download ${DISTNAME} from http://www.sun.com/staroffice. Put ${DISTNAME} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.2 CDROM, please run 'make USE_CDROM=yes'"
+ @${ECHO} Please manually download ${DISTFILES}
+ @${ECHO} from http://www.sun.com/staroffice.
+ @${ECHO}
+ @${ECHO} ${ADEBAS} is the database part of Staroffice.
+ @${ECHO}
+ @${ECHO} Put ${DISTFILES} into the directory
+ @${ECHO} ${_DISTDIR} and run make again.
+ @${ECHO} Or, if you have the Sun StarOffice 5.2 CDROM,
+ @${ECHO} please run 'make USE_CDROM=yes'
+ @${ECHO}
+ @${FALSE}
.endif
.endif
@@ -65,7 +83,7 @@ do-extract:
@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
@${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
@cd ${WRKSRC}
- @${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
+ @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
@cd ../../
.endif
@@ -84,7 +102,7 @@ do-install:
@${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52
.endif
@${CAT} ${PKGDIR}/MESSAGE
- @-TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
+ @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
@ ${ECHO}
@ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed
@ ${ECHO} successfully on your system.
diff --git a/editors/staroffice52/Makefile b/editors/staroffice52/Makefile
index 1bc196999aa6..415da7fe386b 100644
--- a/editors/staroffice52/Makefile
+++ b/editors/staroffice52/Makefile
@@ -23,24 +23,42 @@ NO_BUILD= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
+ADEBAS= soa-5_2-ga-bin-linux-en.bin
.include <bsd.port.pre.mk>
-#
-# Staroffice depends on a scripting fix for
-# src/sys/i386/linux/linux_sysvec. It should
-# be revision 1.55.2.1 or higher. Please upgrade
-# to FreeBSD 4.1
-#
+pre-fetch:
.if ${OSVERSION} < 410000
-BROKEN= YES
+ @${ECHO}
+ @${ECHO} OS-VERSION ${OSVERSION}
+ @${ECHO}
+ @${ECHO} Staroffice depends on a scripting fix for
+ @${ECHO} src/sys/i386/linux/linux_sysvec. It should
+ @${ECHO} be revision 1.55.2.1 or higher.
+ @${ECHO}
+ @${ECHO} Please upgrade to FreeBSD 4.1
+ @${ECHO}
+ @${FALSE}
.endif
-
.if defined(WITH_CDROM)
-IGNORE= "Please mount the Sun StarOffice 5.2 CDROM onto /cdrom and run make again."
-.else # FTP/web download
+ @${ECHO}
+ @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
+ @${ECHO} onto /cdrom and run make again.
+ @${ECHO}
+ @${FALSE}
+.else
.if !exists(${_DISTDIR}/${DISTNAME})
-IGNORE="Please manually download ${DISTNAME} from http://www.sun.com/staroffice. Put ${DISTNAME} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.2 CDROM, please run 'make USE_CDROM=yes'"
+ @${ECHO} Please manually download ${DISTFILES}
+ @${ECHO} from http://www.sun.com/staroffice.
+ @${ECHO}
+ @${ECHO} ${ADEBAS} is the database part of Staroffice.
+ @${ECHO}
+ @${ECHO} Put ${DISTFILES} into the directory
+ @${ECHO} ${_DISTDIR} and run make again.
+ @${ECHO} Or, if you have the Sun StarOffice 5.2 CDROM,
+ @${ECHO} please run 'make USE_CDROM=yes'
+ @${ECHO}
+ @${FALSE}
.endif
.endif
@@ -65,7 +83,7 @@ do-extract:
@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
@${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
@cd ${WRKSRC}
- @${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
+ @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
@cd ../../
.endif
@@ -84,7 +102,7 @@ do-install:
@${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52
.endif
@${CAT} ${PKGDIR}/MESSAGE
- @-TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
+ @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
@ ${ECHO}
@ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed
@ ${ECHO} successfully on your system.
diff --git a/editors/staroffice52/files/setup.patch b/editors/staroffice52/files/setup.patch
index 5f6b0b69a7e7..0316f6476df3 100644
--- a/editors/staroffice52/files/setup.patch
+++ b/editors/staroffice52/files/setup.patch
@@ -1,8 +1,14 @@
---- setup.orig Wed Aug 23 00:02:57 2000
-+++ setup Wed Aug 23 00:03:11 2000
-@@ -1,4 +1,4 @@
+--- setup.orig Mon May 8 08:20:00 2000
++++ setup.new Fri Aug 25 15:16:12 2000
+@@ -1,7 +1,10 @@
-#!/bin/sh
+#!/compat/linux/bin/sh
#
# StarOffice patch checking script
# (c) 2000, Sun Microsystems Inc.
++
++# fix coredump on remote DISPLAY (IRIX)
++export SAL_IGNOREXERRORS=1
+
+ # resolve installation directory
+ sd_platform=`uname -s`
diff --git a/editors/staroffice52/files/soffice.patch b/editors/staroffice52/files/soffice.patch
index 62dc300be297..f65b9ed73ffa 100644
--- a/editors/staroffice52/files/soffice.patch
+++ b/editors/staroffice52/files/soffice.patch
@@ -1,8 +1,14 @@
---- new Wed Aug 23 00:09:46 2000
-+++ soffice Tue Aug 22 23:58:14 2000
-@@ -1,4 +1,4 @@
+--- soffice Mon May 8 08:20:00 2000
++++ soffice.new Fri Aug 25 15:19:40 2000
+@@ -1,7 +1,10 @@
-#!/bin/sh
+#!/compat/linux/bin/sh
#
# StarOffice startup script
# (c) 1999 Sun Microsystems, Inc.
++
++# fix coredump on remote DISPLAY (IRIX)
++export SAL_IGNOREXERRORS=1
+
+ #
+ # STAR_PROFILE_LOCKING_DISABLED=1
diff --git a/editors/staroffice60/Makefile b/editors/staroffice60/Makefile
index 1bc196999aa6..415da7fe386b 100644
--- a/editors/staroffice60/Makefile
+++ b/editors/staroffice60/Makefile
@@ -23,24 +23,42 @@ NO_BUILD= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
+ADEBAS= soa-5_2-ga-bin-linux-en.bin
.include <bsd.port.pre.mk>
-#
-# Staroffice depends on a scripting fix for
-# src/sys/i386/linux/linux_sysvec. It should
-# be revision 1.55.2.1 or higher. Please upgrade
-# to FreeBSD 4.1
-#
+pre-fetch:
.if ${OSVERSION} < 410000
-BROKEN= YES
+ @${ECHO}
+ @${ECHO} OS-VERSION ${OSVERSION}
+ @${ECHO}
+ @${ECHO} Staroffice depends on a scripting fix for
+ @${ECHO} src/sys/i386/linux/linux_sysvec. It should
+ @${ECHO} be revision 1.55.2.1 or higher.
+ @${ECHO}
+ @${ECHO} Please upgrade to FreeBSD 4.1
+ @${ECHO}
+ @${FALSE}
.endif
-
.if defined(WITH_CDROM)
-IGNORE= "Please mount the Sun StarOffice 5.2 CDROM onto /cdrom and run make again."
-.else # FTP/web download
+ @${ECHO}
+ @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
+ @${ECHO} onto /cdrom and run make again.
+ @${ECHO}
+ @${FALSE}
+.else
.if !exists(${_DISTDIR}/${DISTNAME})
-IGNORE="Please manually download ${DISTNAME} from http://www.sun.com/staroffice. Put ${DISTNAME} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.2 CDROM, please run 'make USE_CDROM=yes'"
+ @${ECHO} Please manually download ${DISTFILES}
+ @${ECHO} from http://www.sun.com/staroffice.
+ @${ECHO}
+ @${ECHO} ${ADEBAS} is the database part of Staroffice.
+ @${ECHO}
+ @${ECHO} Put ${DISTFILES} into the directory
+ @${ECHO} ${_DISTDIR} and run make again.
+ @${ECHO} Or, if you have the Sun StarOffice 5.2 CDROM,
+ @${ECHO} please run 'make USE_CDROM=yes'
+ @${ECHO}
+ @${FALSE}
.endif
.endif
@@ -65,7 +83,7 @@ do-extract:
@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
@${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
@cd ${WRKSRC}
- @${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
+ @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
@cd ../../
.endif
@@ -84,7 +102,7 @@ do-install:
@${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52
.endif
@${CAT} ${PKGDIR}/MESSAGE
- @-TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
+ @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
@ ${ECHO}
@ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed
@ ${ECHO} successfully on your system.
diff --git a/editors/staroffice60/files/setup.patch b/editors/staroffice60/files/setup.patch
index 5f6b0b69a7e7..0316f6476df3 100644
--- a/editors/staroffice60/files/setup.patch
+++ b/editors/staroffice60/files/setup.patch
@@ -1,8 +1,14 @@
---- setup.orig Wed Aug 23 00:02:57 2000
-+++ setup Wed Aug 23 00:03:11 2000
-@@ -1,4 +1,4 @@
+--- setup.orig Mon May 8 08:20:00 2000
++++ setup.new Fri Aug 25 15:16:12 2000
+@@ -1,7 +1,10 @@
-#!/bin/sh
+#!/compat/linux/bin/sh
#
# StarOffice patch checking script
# (c) 2000, Sun Microsystems Inc.
++
++# fix coredump on remote DISPLAY (IRIX)
++export SAL_IGNOREXERRORS=1
+
+ # resolve installation directory
+ sd_platform=`uname -s`
diff --git a/editors/staroffice60/files/soffice.patch b/editors/staroffice60/files/soffice.patch
index 62dc300be297..f65b9ed73ffa 100644
--- a/editors/staroffice60/files/soffice.patch
+++ b/editors/staroffice60/files/soffice.patch
@@ -1,8 +1,14 @@
---- new Wed Aug 23 00:09:46 2000
-+++ soffice Tue Aug 22 23:58:14 2000
-@@ -1,4 +1,4 @@
+--- soffice Mon May 8 08:20:00 2000
++++ soffice.new Fri Aug 25 15:19:40 2000
+@@ -1,7 +1,10 @@
-#!/bin/sh
+#!/compat/linux/bin/sh
#
# StarOffice startup script
# (c) 1999 Sun Microsystems, Inc.
++
++# fix coredump on remote DISPLAY (IRIX)
++export SAL_IGNOREXERRORS=1
+
+ #
+ # STAR_PROFILE_LOCKING_DISABLED=1
diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile
index 1bc196999aa6..415da7fe386b 100644
--- a/editors/staroffice70/Makefile
+++ b/editors/staroffice70/Makefile
@@ -23,24 +23,42 @@ NO_BUILD= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
+ADEBAS= soa-5_2-ga-bin-linux-en.bin
.include <bsd.port.pre.mk>
-#
-# Staroffice depends on a scripting fix for
-# src/sys/i386/linux/linux_sysvec. It should
-# be revision 1.55.2.1 or higher. Please upgrade
-# to FreeBSD 4.1
-#
+pre-fetch:
.if ${OSVERSION} < 410000
-BROKEN= YES
+ @${ECHO}
+ @${ECHO} OS-VERSION ${OSVERSION}
+ @${ECHO}
+ @${ECHO} Staroffice depends on a scripting fix for
+ @${ECHO} src/sys/i386/linux/linux_sysvec. It should
+ @${ECHO} be revision 1.55.2.1 or higher.
+ @${ECHO}
+ @${ECHO} Please upgrade to FreeBSD 4.1
+ @${ECHO}
+ @${FALSE}
.endif
-
.if defined(WITH_CDROM)
-IGNORE= "Please mount the Sun StarOffice 5.2 CDROM onto /cdrom and run make again."
-.else # FTP/web download
+ @${ECHO}
+ @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
+ @${ECHO} onto /cdrom and run make again.
+ @${ECHO}
+ @${FALSE}
+.else
.if !exists(${_DISTDIR}/${DISTNAME})
-IGNORE="Please manually download ${DISTNAME} from http://www.sun.com/staroffice. Put ${DISTNAME} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.2 CDROM, please run 'make USE_CDROM=yes'"
+ @${ECHO} Please manually download ${DISTFILES}
+ @${ECHO} from http://www.sun.com/staroffice.
+ @${ECHO}
+ @${ECHO} ${ADEBAS} is the database part of Staroffice.
+ @${ECHO}
+ @${ECHO} Put ${DISTFILES} into the directory
+ @${ECHO} ${_DISTDIR} and run make again.
+ @${ECHO} Or, if you have the Sun StarOffice 5.2 CDROM,
+ @${ECHO} please run 'make USE_CDROM=yes'
+ @${ECHO}
+ @${FALSE}
.endif
.endif
@@ -65,7 +83,7 @@ do-extract:
@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
@${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
@cd ${WRKSRC}
- @${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
+ @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
@cd ../../
.endif
@@ -84,7 +102,7 @@ do-install:
@${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52
.endif
@${CAT} ${PKGDIR}/MESSAGE
- @-TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
+ @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
@ ${ECHO}
@ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed
@ ${ECHO} successfully on your system.
diff --git a/editors/staroffice70/files/setup.patch b/editors/staroffice70/files/setup.patch
index 5f6b0b69a7e7..0316f6476df3 100644
--- a/editors/staroffice70/files/setup.patch
+++ b/editors/staroffice70/files/setup.patch
@@ -1,8 +1,14 @@
---- setup.orig Wed Aug 23 00:02:57 2000
-+++ setup Wed Aug 23 00:03:11 2000
-@@ -1,4 +1,4 @@
+--- setup.orig Mon May 8 08:20:00 2000
++++ setup.new Fri Aug 25 15:16:12 2000
+@@ -1,7 +1,10 @@
-#!/bin/sh
+#!/compat/linux/bin/sh
#
# StarOffice patch checking script
# (c) 2000, Sun Microsystems Inc.
++
++# fix coredump on remote DISPLAY (IRIX)
++export SAL_IGNOREXERRORS=1
+
+ # resolve installation directory
+ sd_platform=`uname -s`
diff --git a/editors/staroffice70/files/soffice.patch b/editors/staroffice70/files/soffice.patch
index 62dc300be297..f65b9ed73ffa 100644
--- a/editors/staroffice70/files/soffice.patch
+++ b/editors/staroffice70/files/soffice.patch
@@ -1,8 +1,14 @@
---- new Wed Aug 23 00:09:46 2000
-+++ soffice Tue Aug 22 23:58:14 2000
-@@ -1,4 +1,4 @@
+--- soffice Mon May 8 08:20:00 2000
++++ soffice.new Fri Aug 25 15:19:40 2000
+@@ -1,7 +1,10 @@
-#!/bin/sh
+#!/compat/linux/bin/sh
#
# StarOffice startup script
# (c) 1999 Sun Microsystems, Inc.
++
++# fix coredump on remote DISPLAY (IRIX)
++export SAL_IGNOREXERRORS=1
+
+ #
+ # STAR_PROFILE_LOCKING_DISABLED=1
diff --git a/german/staroffice52/Makefile b/german/staroffice52/Makefile
index f0bafbcd1c57..5976a73b4900 100644
--- a/german/staroffice52/Makefile
+++ b/german/staroffice52/Makefile
@@ -23,23 +23,46 @@ NO_BUILD= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
+ADEBAS= soa-5_2-ga-bin-linux-de.bin
.include <bsd.port.pre.mk>
-#
-# Staroffice benötigt einen System-Patch der erst
-# in FreeBSD 4.1 verfügbar ist. Bitte bringen Sie ihr
-# System auf den neuesten Stand.
-#
+pre-fetch:
.if ${OSVERSION} < 410000
-BROKEN= YES
+ @${ECHO}
+ @${ECHO} OS-VERSION ${OSVERSION}
+ @${ECHO}
+ @${ECHO} Staroffice benötigt einen System-Patch der erst
+ @${ECHO} seit FreeBSD 4.1 verfügbar ist. Bitte bringen Sie ihr
+ @${ECHO} System auf den neuesten Stand.
+ @${ECHO}
+ @${FALSE}
.endif
-
.if defined(WITH_CDROM)
-IGNORE= "Bitte mounten Sie die Sun StarOffice 5.2 CDROM nach /cdrom and starten Sie make erneut."
-.else # FTP/web download
+ @${ECHO}
+ @${ECHO} Bitte mounten Sie die Sun StarOffice 5.2 CDROM
+ @${ECHO} nach /cdrom and starten Sie make erneut.
+ @${ECHO}
+ @${FALSE}
+.else
+.if !exists(${_DISTDIR})
+ @${MKDIR} ${_DISTDIR}
+.endif
.if !exists(${_DISTDIR}/${DISTNAME})
-IGNORE="Bitte laden Sie ${DISTNAME} manuell von http://www.sun.com/staroffice herunter. Kopieren Sie ${DISTNAME} in das Verzeichnis ${_DISTDIR} und starten Sie make erneut. Wenn Sie die StarOffice 5.2 CDROM besitzen, koennen Sie auch 'make WITH_CDROM=yes' ausfuehren."
+ @${ECHO}
+ @${ECHO} Bitte laden Sie ${DISTFILES} manuell
+ @${ECHO} von http://www.sun.com/staroffice herunter.
+ @${ECHO}
+ @${ECHO} ${ADEBAS} ist das Datenbank-Modul für Staroffice.
+ @${ECHO}
+ @${ECHO} Kopieren Sie ${DISTFILES}
+ @${ECHO} in das bereits erstellte Verzeichnis ${_DISTDIR}
+ @${ECHO} und starten Sie make erneut.
+ @${ECHO}
+ @${ECHO} Wenn Sie die StarOffice 5.2 CDROM besitzen,
+ @${ECHO} koennen Sie auch 'make WITH_CDROM=yes' ausfuehren.
+ @${ECHO}
+ @${FALSE}
.endif
.endif
@@ -65,7 +88,7 @@ do-extract:
@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
@${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-de.bin
@cd ${WRKSRC}
- @${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
+ @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
@cd ../../
.endif
@@ -85,7 +108,7 @@ do-install:
@${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52
.endif
@${CAT} ${PKGDIR}/MESSAGE
- @-TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
+ @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
@ ${ECHO}
@ ${ECHO} Ignorieren Sie die Fehlermeldung. StarOffice5.2 wurde erfolgreich
@ ${ECHO} auf Ihrem System installiert.
diff --git a/german/staroffice52/files/setup.patch b/german/staroffice52/files/setup.patch
index 5f6b0b69a7e7..fa3641b6a7e2 100644
--- a/german/staroffice52/files/setup.patch
+++ b/german/staroffice52/files/setup.patch
@@ -1,8 +1,18 @@
---- setup.orig Wed Aug 23 00:02:57 2000
-+++ setup Wed Aug 23 00:03:11 2000
+--- setup.orig Fri Aug 25 12:04:52 2000
++++ setup Fri Aug 25 12:00:21 2000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/compat/linux/bin/sh
#
# StarOffice patch checking script
# (c) 2000, Sun Microsystems Inc.
+@@ -9,6 +9,9 @@
+ SCO_SV) test=/bin/test ;;
+ *) test=/usr/bin/test ;;
+ esac
++
++# fix coredump on remote DISPLAY (IRIX)
++export SAL_IGNOREXERRORS=1
+
+ sd_cwd="`pwd`"
+ if $test -L "$0" ; then
diff --git a/german/staroffice52/files/soffice.patch b/german/staroffice52/files/soffice.patch
index 62dc300be297..a96b1eedcb79 100644
--- a/german/staroffice52/files/soffice.patch
+++ b/german/staroffice52/files/soffice.patch
@@ -1,8 +1,18 @@
---- new Wed Aug 23 00:09:46 2000
-+++ soffice Tue Aug 22 23:58:14 2000
+--- soffice.orig Fri Aug 25 12:05:30 2000
++++ soffice Fri Aug 25 12:00:54 2000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/compat/linux/bin/sh
#
# StarOffice startup script
# (c) 1999 Sun Microsystems, Inc.
+@@ -7,6 +7,9 @@
+ # STAR_PROFILE_LOCKING_DISABLED=1
+ # export STAR_PROFILE_LOCKING_DISABLED
+ #
++
++# fix coredump on remote DISPLAY (IRIX)
++export SAL_IGNOREXERRORS=1
+
+ # uncomment this to remote start soffice on hostname
+ # SO_REMOTE_START=rsh
diff --git a/german/staroffice70/Makefile b/german/staroffice70/Makefile
index 1bc196999aa6..415da7fe386b 100644
--- a/german/staroffice70/Makefile
+++ b/german/staroffice70/Makefile
@@ -23,24 +23,42 @@ NO_BUILD= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
+ADEBAS= soa-5_2-ga-bin-linux-en.bin
.include <bsd.port.pre.mk>
-#
-# Staroffice depends on a scripting fix for
-# src/sys/i386/linux/linux_sysvec. It should
-# be revision 1.55.2.1 or higher. Please upgrade
-# to FreeBSD 4.1
-#
+pre-fetch:
.if ${OSVERSION} < 410000
-BROKEN= YES
+ @${ECHO}
+ @${ECHO} OS-VERSION ${OSVERSION}
+ @${ECHO}
+ @${ECHO} Staroffice depends on a scripting fix for
+ @${ECHO} src/sys/i386/linux/linux_sysvec. It should
+ @${ECHO} be revision 1.55.2.1 or higher.
+ @${ECHO}
+ @${ECHO} Please upgrade to FreeBSD 4.1
+ @${ECHO}
+ @${FALSE}
.endif
-
.if defined(WITH_CDROM)
-IGNORE= "Please mount the Sun StarOffice 5.2 CDROM onto /cdrom and run make again."
-.else # FTP/web download
+ @${ECHO}
+ @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
+ @${ECHO} onto /cdrom and run make again.
+ @${ECHO}
+ @${FALSE}
+.else
.if !exists(${_DISTDIR}/${DISTNAME})
-IGNORE="Please manually download ${DISTNAME} from http://www.sun.com/staroffice. Put ${DISTNAME} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.2 CDROM, please run 'make USE_CDROM=yes'"
+ @${ECHO} Please manually download ${DISTFILES}
+ @${ECHO} from http://www.sun.com/staroffice.
+ @${ECHO}
+ @${ECHO} ${ADEBAS} is the database part of Staroffice.
+ @${ECHO}
+ @${ECHO} Put ${DISTFILES} into the directory
+ @${ECHO} ${_DISTDIR} and run make again.
+ @${ECHO} Or, if you have the Sun StarOffice 5.2 CDROM,
+ @${ECHO} please run 'make USE_CDROM=yes'
+ @${ECHO}
+ @${FALSE}
.endif
.endif
@@ -65,7 +83,7 @@ do-extract:
@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
@${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
@cd ${WRKSRC}
- @${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
+ @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
@cd ../../
.endif
@@ -84,7 +102,7 @@ do-install:
@${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52
.endif
@${CAT} ${PKGDIR}/MESSAGE
- @-TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
+ @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net'
@ ${ECHO}
@ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed
@ ${ECHO} successfully on your system.
diff --git a/german/staroffice70/files/setup.patch b/german/staroffice70/files/setup.patch
index 5f6b0b69a7e7..0316f6476df3 100644
--- a/german/staroffice70/files/setup.patch
+++ b/german/staroffice70/files/setup.patch
@@ -1,8 +1,14 @@
---- setup.orig Wed Aug 23 00:02:57 2000
-+++ setup Wed Aug 23 00:03:11 2000
-@@ -1,4 +1,4 @@
+--- setup.orig Mon May 8 08:20:00 2000
++++ setup.new Fri Aug 25 15:16:12 2000
+@@ -1,7 +1,10 @@
-#!/bin/sh
+#!/compat/linux/bin/sh
#
# StarOffice patch checking script
# (c) 2000, Sun Microsystems Inc.
++
++# fix coredump on remote DISPLAY (IRIX)
++export SAL_IGNOREXERRORS=1
+
+ # resolve installation directory
+ sd_platform=`uname -s`
diff --git a/german/staroffice70/files/soffice.patch b/german/staroffice70/files/soffice.patch
index 62dc300be297..f65b9ed73ffa 100644
--- a/german/staroffice70/files/soffice.patch
+++ b/german/staroffice70/files/soffice.patch
@@ -1,8 +1,14 @@
---- new Wed Aug 23 00:09:46 2000
-+++ soffice Tue Aug 22 23:58:14 2000
-@@ -1,4 +1,4 @@
+--- soffice Mon May 8 08:20:00 2000
++++ soffice.new Fri Aug 25 15:19:40 2000
+@@ -1,7 +1,10 @@
-#!/bin/sh
+#!/compat/linux/bin/sh
#
# StarOffice startup script
# (c) 1999 Sun Microsystems, Inc.
++
++# fix coredump on remote DISPLAY (IRIX)
++export SAL_IGNOREXERRORS=1
+
+ #
+ # STAR_PROFILE_LOCKING_DISABLED=1