From 79507948280cacb290417077cbdc3e8420c3f9c1 Mon Sep 17 00:00:00 2001 From: Sheldon Hearn Date: Thu, 7 Sep 2000 14:22:48 +0000 Subject: Fix the error detection routines at the end. Remove some unused cruft. Get LD_LIBRARY_PATH recognized properly. PREFIX-clean. Submitted by: maintainer --- editors/openoffice-1.0/Makefile | 33 ++++++++++++++--------------- editors/openoffice-1.1-devel/Makefile | 33 ++++++++++++++--------------- editors/openoffice-1.1/Makefile | 33 ++++++++++++++--------------- editors/openoffice-2.0-devel/Makefile | 33 ++++++++++++++--------------- editors/openoffice-3-devel/Makefile | 33 ++++++++++++++--------------- editors/openoffice-3/Makefile | 33 ++++++++++++++--------------- editors/openoffice-devel/Makefile | 33 ++++++++++++++--------------- editors/openoffice.org-1.0/Makefile | 33 ++++++++++++++--------------- editors/openoffice.org-1.1-devel/Makefile | 33 ++++++++++++++--------------- editors/openoffice.org-1.1/Makefile | 33 ++++++++++++++--------------- editors/openoffice.org-2-RC/Makefile | 33 ++++++++++++++--------------- editors/openoffice.org-2-devel/Makefile | 33 ++++++++++++++--------------- editors/openoffice.org-2.0-devel/Makefile | 33 ++++++++++++++--------------- editors/openoffice.org-2.0/Makefile | 33 ++++++++++++++--------------- editors/openoffice.org-2/Makefile | 33 ++++++++++++++--------------- editors/openoffice.org-3-RC/Makefile | 33 ++++++++++++++--------------- editors/openoffice.org-3-devel/Makefile | 33 ++++++++++++++--------------- editors/openoffice.org-3/Makefile | 33 ++++++++++++++--------------- editors/openoffice.org-vcltesttool/Makefile | 33 ++++++++++++++--------------- editors/openoffice/Makefile | 33 ++++++++++++++--------------- editors/staroffice52/Makefile | 33 ++++++++++++++--------------- editors/staroffice60/Makefile | 33 ++++++++++++++--------------- editors/staroffice70/Makefile | 33 ++++++++++++++--------------- 23 files changed, 368 insertions(+), 391 deletions(-) (limited to 'editors') diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index ff4ca8cc1b08..58ad83f539fa 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -35,7 +35,7 @@ NO_BUILD= yes DIST_SUBDIR= staroffice52 WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp -ADEBAS= soa-5_2-ga-bin-linux-en.bin +LD_PATH= ${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib .include @@ -96,24 +96,23 @@ do-install: @ ${ECHO} @ ${FALSE} .else -.if exists(/compat/linux/usr/local) - @${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52 +.if exists(/compat/linux/${PREFIX}) + @${LN} -fs /compat/linux/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGDIR}/MESSAGE - @LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' -.if exists(/usr/local/office52/program/setup) - @ ${ECHO} - @ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed - @ ${ECHO} successfully on your system. - @ ${ECHO} -.else - @ ${ECHO} - @ ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and - @ ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. - @ ${ECHO} - @ ${FALSE} -.endif + @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' + @if [ -f ${PREFIX}/office52/program/setup ]; then \ + ${ECHO} ; \ + ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ + ${ECHO} successfully on your system. ; \ + ${ECHO} ; \ + else \ + ${ECHO} ; \ + ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and ; \ + ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. ; \ + ${ECHO} ; \ + ${FALSE} ; \ + fi .endif post-install: diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile index ff4ca8cc1b08..58ad83f539fa 100644 --- a/editors/openoffice-1.1-devel/Makefile +++ b/editors/openoffice-1.1-devel/Makefile @@ -35,7 +35,7 @@ NO_BUILD= yes DIST_SUBDIR= staroffice52 WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp -ADEBAS= soa-5_2-ga-bin-linux-en.bin +LD_PATH= ${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib .include @@ -96,24 +96,23 @@ do-install: @ ${ECHO} @ ${FALSE} .else -.if exists(/compat/linux/usr/local) - @${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52 +.if exists(/compat/linux/${PREFIX}) + @${LN} -fs /compat/linux/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGDIR}/MESSAGE - @LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' -.if exists(/usr/local/office52/program/setup) - @ ${ECHO} - @ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed - @ ${ECHO} successfully on your system. - @ ${ECHO} -.else - @ ${ECHO} - @ ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and - @ ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. - @ ${ECHO} - @ ${FALSE} -.endif + @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' + @if [ -f ${PREFIX}/office52/program/setup ]; then \ + ${ECHO} ; \ + ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ + ${ECHO} successfully on your system. ; \ + ${ECHO} ; \ + else \ + ${ECHO} ; \ + ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and ; \ + ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. ; \ + ${ECHO} ; \ + ${FALSE} ; \ + fi .endif post-install: diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile index ff4ca8cc1b08..58ad83f539fa 100644 --- a/editors/openoffice-1.1/Makefile +++ b/editors/openoffice-1.1/Makefile @@ -35,7 +35,7 @@ NO_BUILD= yes DIST_SUBDIR= staroffice52 WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp -ADEBAS= soa-5_2-ga-bin-linux-en.bin +LD_PATH= ${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib .include @@ -96,24 +96,23 @@ do-install: @ ${ECHO} @ ${FALSE} .else -.if exists(/compat/linux/usr/local) - @${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52 +.if exists(/compat/linux/${PREFIX}) + @${LN} -fs /compat/linux/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGDIR}/MESSAGE - @LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' -.if exists(/usr/local/office52/program/setup) - @ ${ECHO} - @ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed - @ ${ECHO} successfully on your system. - @ ${ECHO} -.else - @ ${ECHO} - @ ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and - @ ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. - @ ${ECHO} - @ ${FALSE} -.endif + @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' + @if [ -f ${PREFIX}/office52/program/setup ]; then \ + ${ECHO} ; \ + ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ + ${ECHO} successfully on your system. ; \ + ${ECHO} ; \ + else \ + ${ECHO} ; \ + ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and ; \ + ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. ; \ + ${ECHO} ; \ + ${FALSE} ; \ + fi .endif post-install: diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile index ff4ca8cc1b08..58ad83f539fa 100644 --- a/editors/openoffice-2.0-devel/Makefile +++ b/editors/openoffice-2.0-devel/Makefile @@ -35,7 +35,7 @@ NO_BUILD= yes DIST_SUBDIR= staroffice52 WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp -ADEBAS= soa-5_2-ga-bin-linux-en.bin +LD_PATH= ${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib .include @@ -96,24 +96,23 @@ do-install: @ ${ECHO} @ ${FALSE} .else -.if exists(/compat/linux/usr/local) - @${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52 +.if exists(/compat/linux/${PREFIX}) + @${LN} -fs /compat/linux/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGDIR}/MESSAGE - @LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' -.if exists(/usr/local/office52/program/setup) - @ ${ECHO} - @ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed - @ ${ECHO} successfully on your system. - @ ${ECHO} -.else - @ ${ECHO} - @ ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and - @ ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. - @ ${ECHO} - @ ${FALSE} -.endif + @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' + @if [ -f ${PREFIX}/office52/program/setup ]; then \ + ${ECHO} ; \ + ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ + ${ECHO} successfully on your system. ; \ + ${ECHO} ; \ + else \ + ${ECHO} ; \ + ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and ; \ + ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. ; \ + ${ECHO} ; \ + ${FALSE} ; \ + fi .endif post-install: diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index ff4ca8cc1b08..58ad83f539fa 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -35,7 +35,7 @@ NO_BUILD= yes DIST_SUBDIR= staroffice52 WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp -ADEBAS= soa-5_2-ga-bin-linux-en.bin +LD_PATH= ${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib .include @@ -96,24 +96,23 @@ do-install: @ ${ECHO} @ ${FALSE} .else -.if exists(/compat/linux/usr/local) - @${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52 +.if exists(/compat/linux/${PREFIX}) + @${LN} -fs /compat/linux/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGDIR}/MESSAGE - @LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' -.if exists(/usr/local/office52/program/setup) - @ ${ECHO} - @ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed - @ ${ECHO} successfully on your system. - @ ${ECHO} -.else - @ ${ECHO} - @ ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and - @ ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. - @ ${ECHO} - @ ${FALSE} -.endif + @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' + @if [ -f ${PREFIX}/office52/program/setup ]; then \ + ${ECHO} ; \ + ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ + ${ECHO} successfully on your system. ; \ + ${ECHO} ; \ + else \ + ${ECHO} ; \ + ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and ; \ + ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. ; \ + ${ECHO} ; \ + ${FALSE} ; \ + fi .endif post-install: diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index ff4ca8cc1b08..58ad83f539fa 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -35,7 +35,7 @@ NO_BUILD= yes DIST_SUBDIR= staroffice52 WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp -ADEBAS= soa-5_2-ga-bin-linux-en.bin +LD_PATH= ${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib .include @@ -96,24 +96,23 @@ do-install: @ ${ECHO} @ ${FALSE} .else -.if exists(/compat/linux/usr/local) - @${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52 +.if exists(/compat/linux/${PREFIX}) + @${LN} -fs /compat/linux/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGDIR}/MESSAGE - @LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' -.if exists(/usr/local/office52/program/setup) - @ ${ECHO} - @ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed - @ ${ECHO} successfully on your system. - @ ${ECHO} -.else - @ ${ECHO} - @ ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and - @ ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. - @ ${ECHO} - @ ${FALSE} -.endif + @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' + @if [ -f ${PREFIX}/office52/program/setup ]; then \ + ${ECHO} ; \ + ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ + ${ECHO} successfully on your system. ; \ + ${ECHO} ; \ + else \ + ${ECHO} ; \ + ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and ; \ + ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. ; \ + ${ECHO} ; \ + ${FALSE} ; \ + fi .endif post-install: diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index ff4ca8cc1b08..58ad83f539fa 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -35,7 +35,7 @@ NO_BUILD= yes DIST_SUBDIR= staroffice52 WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp -ADEBAS= soa-5_2-ga-bin-linux-en.bin +LD_PATH= ${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib .include @@ -96,24 +96,23 @@ do-install: @ ${ECHO} @ ${FALSE} .else -.if exists(/compat/linux/usr/local) - @${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52 +.if exists(/compat/linux/${PREFIX}) + @${LN} -fs /compat/linux/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGDIR}/MESSAGE - @LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' -.if exists(/usr/local/office52/program/setup) - @ ${ECHO} - @ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed - @ ${ECHO} successfully on your system. - @ ${ECHO} -.else - @ ${ECHO} - @ ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and - @ ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. - @ ${ECHO} - @ ${FALSE} -.endif + @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' + @if [ -f ${PREFIX}/office52/program/setup ]; then \ + ${ECHO} ; \ + ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ + ${ECHO} successfully on your system. ; \ + ${ECHO} ; \ + else \ + ${ECHO} ; \ + ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and ; \ + ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. ; \ + ${ECHO} ; \ + ${FALSE} ; \ + fi .endif post-install: diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile index ff4ca8cc1b08..58ad83f539fa 100644 --- a/editors/openoffice.org-1.0/Makefile +++ b/editors/openoffice.org-1.0/Makefile @@ -35,7 +35,7 @@ NO_BUILD= yes DIST_SUBDIR= staroffice52 WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp -ADEBAS= soa-5_2-ga-bin-linux-en.bin +LD_PATH= ${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib .include @@ -96,24 +96,23 @@ do-install: @ ${ECHO} @ ${FALSE} .else -.if exists(/compat/linux/usr/local) - @${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52 +.if exists(/compat/linux/${PREFIX}) + @${LN} -fs /compat/linux/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGDIR}/MESSAGE - @LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' -.if exists(/usr/local/office52/program/setup) - @ ${ECHO} - @ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed - @ ${ECHO} successfully on your system. - @ ${ECHO} -.else - @ ${ECHO} - @ ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and - @ ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. - @ ${ECHO} - @ ${FALSE} -.endif + @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' + @if [ -f ${PREFIX}/office52/program/setup ]; then \ + ${ECHO} ; \ + ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ + ${ECHO} successfully on your system. ; \ + ${ECHO} ; \ + else \ + ${ECHO} ; \ + ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and ; \ + ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. ; \ + ${ECHO} ; \ + ${FALSE} ; \ + fi .endif post-install: diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile index ff4ca8cc1b08..58ad83f539fa 100644 --- a/editors/openoffice.org-1.1-devel/Makefile +++ b/editors/openoffice.org-1.1-devel/Makefile @@ -35,7 +35,7 @@ NO_BUILD= yes DIST_SUBDIR= staroffice52 WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp -ADEBAS= soa-5_2-ga-bin-linux-en.bin +LD_PATH= ${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib .include @@ -96,24 +96,23 @@ do-install: @ ${ECHO} @ ${FALSE} .else -.if exists(/compat/linux/usr/local) - @${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52 +.if exists(/compat/linux/${PREFIX}) + @${LN} -fs /compat/linux/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGDIR}/MESSAGE - @LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' -.if exists(/usr/local/office52/program/setup) - @ ${ECHO} - @ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed - @ ${ECHO} successfully on your system. - @ ${ECHO} -.else - @ ${ECHO} - @ ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and - @ ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. - @ ${ECHO} - @ ${FALSE} -.endif + @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' + @if [ -f ${PREFIX}/office52/program/setup ]; then \ + ${ECHO} ; \ + ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ + ${ECHO} successfully on your system. ; \ + ${ECHO} ; \ + else \ + ${ECHO} ; \ + ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and ; \ + ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. ; \ + ${ECHO} ; \ + ${FALSE} ; \ + fi .endif post-install: diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile index ff4ca8cc1b08..58ad83f539fa 100644 --- a/editors/openoffice.org-1.1/Makefile +++ b/editors/openoffice.org-1.1/Makefile @@ -35,7 +35,7 @@ NO_BUILD= yes DIST_SUBDIR= staroffice52 WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp -ADEBAS= soa-5_2-ga-bin-linux-en.bin +LD_PATH= ${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib .include @@ -96,24 +96,23 @@ do-install: @ ${ECHO} @ ${FALSE} .else -.if exists(/compat/linux/usr/local) - @${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52 +.if exists(/compat/linux/${PREFIX}) + @${LN} -fs /compat/linux/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGDIR}/MESSAGE - @LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' -.if exists(/usr/local/office52/program/setup) - @ ${ECHO} - @ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed - @ ${ECHO} successfully on your system. - @ ${ECHO} -.else - @ ${ECHO} - @ ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and - @ ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. - @ ${ECHO} - @ ${FALSE} -.endif + @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' + @if [ -f ${PREFIX}/office52/program/setup ]; then \ + ${ECHO} ; \ + ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ + ${ECHO} successfully on your system. ; \ + ${ECHO} ; \ + else \ + ${ECHO} ; \ + ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and ; \ + ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. ; \ + ${ECHO} ; \ + ${FALSE} ; \ + fi .endif post-install: diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index ff4ca8cc1b08..58ad83f539fa 100644 --- a/editors/openoffice.org-2-RC/Makefile +++ b/editors/openoffice.org-2-RC/Makefile @@ -35,7 +35,7 @@ NO_BUILD= yes DIST_SUBDIR= staroffice52 WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp -ADEBAS= soa-5_2-ga-bin-linux-en.bin +LD_PATH= ${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib .include @@ -96,24 +96,23 @@ do-install: @ ${ECHO} @ ${FALSE} .else -.if exists(/compat/linux/usr/local) - @${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52 +.if exists(/compat/linux/${PREFIX}) + @${LN} -fs /compat/linux/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGDIR}/MESSAGE - @LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' -.if exists(/usr/local/office52/program/setup) - @ ${ECHO} - @ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed - @ ${ECHO} successfully on your system. - @ ${ECHO} -.else - @ ${ECHO} - @ ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and - @ ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. - @ ${ECHO} - @ ${FALSE} -.endif + @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' + @if [ -f ${PREFIX}/office52/program/setup ]; then \ + ${ECHO} ; \ + ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ + ${ECHO} successfully on your system. ; \ + ${ECHO} ; \ + else \ + ${ECHO} ; \ + ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and ; \ + ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. ; \ + ${ECHO} ; \ + ${FALSE} ; \ + fi .endif post-install: diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index ff4ca8cc1b08..58ad83f539fa 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -35,7 +35,7 @@ NO_BUILD= yes DIST_SUBDIR= staroffice52 WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp -ADEBAS= soa-5_2-ga-bin-linux-en.bin +LD_PATH= ${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib .include @@ -96,24 +96,23 @@ do-install: @ ${ECHO} @ ${FALSE} .else -.if exists(/compat/linux/usr/local) - @${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52 +.if exists(/compat/linux/${PREFIX}) + @${LN} -fs /compat/linux/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGDIR}/MESSAGE - @LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' -.if exists(/usr/local/office52/program/setup) - @ ${ECHO} - @ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed - @ ${ECHO} successfully on your system. - @ ${ECHO} -.else - @ ${ECHO} - @ ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and - @ ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. - @ ${ECHO} - @ ${FALSE} -.endif + @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' + @if [ -f ${PREFIX}/office52/program/setup ]; then \ + ${ECHO} ; \ + ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ + ${ECHO} successfully on your system. ; \ + ${ECHO} ; \ + else \ + ${ECHO} ; \ + ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and ; \ + ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. ; \ + ${ECHO} ; \ + ${FALSE} ; \ + fi .endif post-install: diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile index ff4ca8cc1b08..58ad83f539fa 100644 --- a/editors/openoffice.org-2.0-devel/Makefile +++ b/editors/openoffice.org-2.0-devel/Makefile @@ -35,7 +35,7 @@ NO_BUILD= yes DIST_SUBDIR= staroffice52 WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp -ADEBAS= soa-5_2-ga-bin-linux-en.bin +LD_PATH= ${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib .include @@ -96,24 +96,23 @@ do-install: @ ${ECHO} @ ${FALSE} .else -.if exists(/compat/linux/usr/local) - @${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52 +.if exists(/compat/linux/${PREFIX}) + @${LN} -fs /compat/linux/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGDIR}/MESSAGE - @LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' -.if exists(/usr/local/office52/program/setup) - @ ${ECHO} - @ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed - @ ${ECHO} successfully on your system. - @ ${ECHO} -.else - @ ${ECHO} - @ ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and - @ ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. - @ ${ECHO} - @ ${FALSE} -.endif + @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' + @if [ -f ${PREFIX}/office52/program/setup ]; then \ + ${ECHO} ; \ + ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ + ${ECHO} successfully on your system. ; \ + ${ECHO} ; \ + else \ + ${ECHO} ; \ + ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and ; \ + ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. ; \ + ${ECHO} ; \ + ${FALSE} ; \ + fi .endif post-install: diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile index ff4ca8cc1b08..58ad83f539fa 100644 --- a/editors/openoffice.org-2.0/Makefile +++ b/editors/openoffice.org-2.0/Makefile @@ -35,7 +35,7 @@ NO_BUILD= yes DIST_SUBDIR= staroffice52 WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp -ADEBAS= soa-5_2-ga-bin-linux-en.bin +LD_PATH= ${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib .include @@ -96,24 +96,23 @@ do-install: @ ${ECHO} @ ${FALSE} .else -.if exists(/compat/linux/usr/local) - @${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52 +.if exists(/compat/linux/${PREFIX}) + @${LN} -fs /compat/linux/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGDIR}/MESSAGE - @LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' -.if exists(/usr/local/office52/program/setup) - @ ${ECHO} - @ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed - @ ${ECHO} successfully on your system. - @ ${ECHO} -.else - @ ${ECHO} - @ ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and - @ ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. - @ ${ECHO} - @ ${FALSE} -.endif + @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' + @if [ -f ${PREFIX}/office52/program/setup ]; then \ + ${ECHO} ; \ + ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ + ${ECHO} successfully on your system. ; \ + ${ECHO} ; \ + else \ + ${ECHO} ; \ + ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and ; \ + ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. ; \ + ${ECHO} ; \ + ${FALSE} ; \ + fi .endif post-install: diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile index ff4ca8cc1b08..58ad83f539fa 100644 --- a/editors/openoffice.org-2/Makefile +++ b/editors/openoffice.org-2/Makefile @@ -35,7 +35,7 @@ NO_BUILD= yes DIST_SUBDIR= staroffice52 WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp -ADEBAS= soa-5_2-ga-bin-linux-en.bin +LD_PATH= ${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib .include @@ -96,24 +96,23 @@ do-install: @ ${ECHO} @ ${FALSE} .else -.if exists(/compat/linux/usr/local) - @${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52 +.if exists(/compat/linux/${PREFIX}) + @${LN} -fs /compat/linux/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGDIR}/MESSAGE - @LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' -.if exists(/usr/local/office52/program/setup) - @ ${ECHO} - @ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed - @ ${ECHO} successfully on your system. - @ ${ECHO} -.else - @ ${ECHO} - @ ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and - @ ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. - @ ${ECHO} - @ ${FALSE} -.endif + @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' + @if [ -f ${PREFIX}/office52/program/setup ]; then \ + ${ECHO} ; \ + ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ + ${ECHO} successfully on your system. ; \ + ${ECHO} ; \ + else \ + ${ECHO} ; \ + ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and ; \ + ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. ; \ + ${ECHO} ; \ + ${FALSE} ; \ + fi .endif post-install: diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index ff4ca8cc1b08..58ad83f539fa 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -35,7 +35,7 @@ NO_BUILD= yes DIST_SUBDIR= staroffice52 WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp -ADEBAS= soa-5_2-ga-bin-linux-en.bin +LD_PATH= ${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib .include @@ -96,24 +96,23 @@ do-install: @ ${ECHO} @ ${FALSE} .else -.if exists(/compat/linux/usr/local) - @${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52 +.if exists(/compat/linux/${PREFIX}) + @${LN} -fs /compat/linux/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGDIR}/MESSAGE - @LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' -.if exists(/usr/local/office52/program/setup) - @ ${ECHO} - @ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed - @ ${ECHO} successfully on your system. - @ ${ECHO} -.else - @ ${ECHO} - @ ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and - @ ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. - @ ${ECHO} - @ ${FALSE} -.endif + @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' + @if [ -f ${PREFIX}/office52/program/setup ]; then \ + ${ECHO} ; \ + ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ + ${ECHO} successfully on your system. ; \ + ${ECHO} ; \ + else \ + ${ECHO} ; \ + ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and ; \ + ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. ; \ + ${ECHO} ; \ + ${FALSE} ; \ + fi .endif post-install: diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index ff4ca8cc1b08..58ad83f539fa 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -35,7 +35,7 @@ NO_BUILD= yes DIST_SUBDIR= staroffice52 WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp -ADEBAS= soa-5_2-ga-bin-linux-en.bin +LD_PATH= ${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib .include @@ -96,24 +96,23 @@ do-install: @ ${ECHO} @ ${FALSE} .else -.if exists(/compat/linux/usr/local) - @${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52 +.if exists(/compat/linux/${PREFIX}) + @${LN} -fs /compat/linux/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGDIR}/MESSAGE - @LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' -.if exists(/usr/local/office52/program/setup) - @ ${ECHO} - @ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed - @ ${ECHO} successfully on your system. - @ ${ECHO} -.else - @ ${ECHO} - @ ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and - @ ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. - @ ${ECHO} - @ ${FALSE} -.endif + @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' + @if [ -f ${PREFIX}/office52/program/setup ]; then \ + ${ECHO} ; \ + ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ + ${ECHO} successfully on your system. ; \ + ${ECHO} ; \ + else \ + ${ECHO} ; \ + ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and ; \ + ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. ; \ + ${ECHO} ; \ + ${FALSE} ; \ + fi .endif post-install: diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index ff4ca8cc1b08..58ad83f539fa 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -35,7 +35,7 @@ NO_BUILD= yes DIST_SUBDIR= staroffice52 WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp -ADEBAS= soa-5_2-ga-bin-linux-en.bin +LD_PATH= ${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib .include @@ -96,24 +96,23 @@ do-install: @ ${ECHO} @ ${FALSE} .else -.if exists(/compat/linux/usr/local) - @${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52 +.if exists(/compat/linux/${PREFIX}) + @${LN} -fs /compat/linux/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGDIR}/MESSAGE - @LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' -.if exists(/usr/local/office52/program/setup) - @ ${ECHO} - @ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed - @ ${ECHO} successfully on your system. - @ ${ECHO} -.else - @ ${ECHO} - @ ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and - @ ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. - @ ${ECHO} - @ ${FALSE} -.endif + @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' + @if [ -f ${PREFIX}/office52/program/setup ]; then \ + ${ECHO} ; \ + ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ + ${ECHO} successfully on your system. ; \ + ${ECHO} ; \ + else \ + ${ECHO} ; \ + ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and ; \ + ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. ; \ + ${ECHO} ; \ + ${FALSE} ; \ + fi .endif post-install: diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index ff4ca8cc1b08..58ad83f539fa 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -35,7 +35,7 @@ NO_BUILD= yes DIST_SUBDIR= staroffice52 WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp -ADEBAS= soa-5_2-ga-bin-linux-en.bin +LD_PATH= ${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib .include @@ -96,24 +96,23 @@ do-install: @ ${ECHO} @ ${FALSE} .else -.if exists(/compat/linux/usr/local) - @${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52 +.if exists(/compat/linux/${PREFIX}) + @${LN} -fs /compat/linux/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGDIR}/MESSAGE - @LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' -.if exists(/usr/local/office52/program/setup) - @ ${ECHO} - @ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed - @ ${ECHO} successfully on your system. - @ ${ECHO} -.else - @ ${ECHO} - @ ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and - @ ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. - @ ${ECHO} - @ ${FALSE} -.endif + @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' + @if [ -f ${PREFIX}/office52/program/setup ]; then \ + ${ECHO} ; \ + ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ + ${ECHO} successfully on your system. ; \ + ${ECHO} ; \ + else \ + ${ECHO} ; \ + ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and ; \ + ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. ; \ + ${ECHO} ; \ + ${FALSE} ; \ + fi .endif post-install: diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile index ff4ca8cc1b08..58ad83f539fa 100644 --- a/editors/openoffice/Makefile +++ b/editors/openoffice/Makefile @@ -35,7 +35,7 @@ NO_BUILD= yes DIST_SUBDIR= staroffice52 WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp -ADEBAS= soa-5_2-ga-bin-linux-en.bin +LD_PATH= ${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib .include @@ -96,24 +96,23 @@ do-install: @ ${ECHO} @ ${FALSE} .else -.if exists(/compat/linux/usr/local) - @${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52 +.if exists(/compat/linux/${PREFIX}) + @${LN} -fs /compat/linux/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGDIR}/MESSAGE - @LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' -.if exists(/usr/local/office52/program/setup) - @ ${ECHO} - @ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed - @ ${ECHO} successfully on your system. - @ ${ECHO} -.else - @ ${ECHO} - @ ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and - @ ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. - @ ${ECHO} - @ ${FALSE} -.endif + @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' + @if [ -f ${PREFIX}/office52/program/setup ]; then \ + ${ECHO} ; \ + ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ + ${ECHO} successfully on your system. ; \ + ${ECHO} ; \ + else \ + ${ECHO} ; \ + ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and ; \ + ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. ; \ + ${ECHO} ; \ + ${FALSE} ; \ + fi .endif post-install: diff --git a/editors/staroffice52/Makefile b/editors/staroffice52/Makefile index ff4ca8cc1b08..58ad83f539fa 100644 --- a/editors/staroffice52/Makefile +++ b/editors/staroffice52/Makefile @@ -35,7 +35,7 @@ NO_BUILD= yes DIST_SUBDIR= staroffice52 WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp -ADEBAS= soa-5_2-ga-bin-linux-en.bin +LD_PATH= ${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib .include @@ -96,24 +96,23 @@ do-install: @ ${ECHO} @ ${FALSE} .else -.if exists(/compat/linux/usr/local) - @${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52 +.if exists(/compat/linux/${PREFIX}) + @${LN} -fs /compat/linux/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGDIR}/MESSAGE - @LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' -.if exists(/usr/local/office52/program/setup) - @ ${ECHO} - @ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed - @ ${ECHO} successfully on your system. - @ ${ECHO} -.else - @ ${ECHO} - @ ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and - @ ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. - @ ${ECHO} - @ ${FALSE} -.endif + @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' + @if [ -f ${PREFIX}/office52/program/setup ]; then \ + ${ECHO} ; \ + ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ + ${ECHO} successfully on your system. ; \ + ${ECHO} ; \ + else \ + ${ECHO} ; \ + ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and ; \ + ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. ; \ + ${ECHO} ; \ + ${FALSE} ; \ + fi .endif post-install: diff --git a/editors/staroffice60/Makefile b/editors/staroffice60/Makefile index ff4ca8cc1b08..58ad83f539fa 100644 --- a/editors/staroffice60/Makefile +++ b/editors/staroffice60/Makefile @@ -35,7 +35,7 @@ NO_BUILD= yes DIST_SUBDIR= staroffice52 WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp -ADEBAS= soa-5_2-ga-bin-linux-en.bin +LD_PATH= ${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib .include @@ -96,24 +96,23 @@ do-install: @ ${ECHO} @ ${FALSE} .else -.if exists(/compat/linux/usr/local) - @${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52 +.if exists(/compat/linux/${PREFIX}) + @${LN} -fs /compat/linux/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGDIR}/MESSAGE - @LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' -.if exists(/usr/local/office52/program/setup) - @ ${ECHO} - @ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed - @ ${ECHO} successfully on your system. - @ ${ECHO} -.else - @ ${ECHO} - @ ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and - @ ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. - @ ${ECHO} - @ ${FALSE} -.endif + @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' + @if [ -f ${PREFIX}/office52/program/setup ]; then \ + ${ECHO} ; \ + ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ + ${ECHO} successfully on your system. ; \ + ${ECHO} ; \ + else \ + ${ECHO} ; \ + ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and ; \ + ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. ; \ + ${ECHO} ; \ + ${FALSE} ; \ + fi .endif post-install: diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile index ff4ca8cc1b08..58ad83f539fa 100644 --- a/editors/staroffice70/Makefile +++ b/editors/staroffice70/Makefile @@ -35,7 +35,7 @@ NO_BUILD= yes DIST_SUBDIR= staroffice52 WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp -ADEBAS= soa-5_2-ga-bin-linux-en.bin +LD_PATH= ${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib .include @@ -96,24 +96,23 @@ do-install: @ ${ECHO} @ ${FALSE} .else -.if exists(/compat/linux/usr/local) - @${LN} -fs /compat/linux/usr/local/office52 ${PREFIX}/office52 +.if exists(/compat/linux/${PREFIX}) + @${LN} -fs /compat/linux/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGDIR}/MESSAGE - @LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' -.if exists(/usr/local/office52/program/setup) - @ ${ECHO} - @ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed - @ ${ECHO} successfully on your system. - @ ${ECHO} -.else - @ ${ECHO} - @ ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and - @ ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. - @ ${ECHO} - @ ${FALSE} -.endif + @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' + @if [ -f ${PREFIX}/office52/program/setup ]; then \ + ${ECHO} ; \ + ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ + ${ECHO} successfully on your system. ; \ + ${ECHO} ; \ + else \ + ${ECHO} ; \ + ${ECHO} An error occured during StarOffice5.2 install. Please send a mail with debug-output and ; \ + ${ECHO} some information about your FreeBSD-environment to mb@imp.ch. Thanks. ; \ + ${ECHO} ; \ + ${FALSE} ; \ + fi .endif post-install: -- cgit v1.2.3