summaryrefslogtreecommitdiff
path: root/editors/staroffice70
diff options
context:
space:
mode:
authorSheldon Hearn <sheldonh@FreeBSD.org>2000-09-07 14:22:48 +0000
committerSheldon Hearn <sheldonh@FreeBSD.org>2000-09-07 14:22:48 +0000
commit79507948280cacb290417077cbdc3e8420c3f9c1 (patch)
treedb6dc54429a0c3c7d0b74b87470b8ba4b71f47da /editors/staroffice70
parentRemove myself from MAINTAINER (diff)
Fix the error detection routines at the end.
Remove some unused cruft. Get LD_LIBRARY_PATH recognized properly. PREFIX-clean. Submitted by: maintainer
Diffstat (limited to 'editors/staroffice70')
-rw-r--r--editors/staroffice70/Makefile33
1 files changed, 16 insertions, 17 deletions
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 <bsd.port.pre.mk>
@@ -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: