diff options
| author | jedgar <jedgar@FreeBSD.org> | 2000-09-23 18:32:30 +0800 |
|---|---|---|
| committer | jedgar <jedgar@FreeBSD.org> | 2000-09-23 18:32:30 +0800 |
| commit | fd6fad64e357be4322b333211faae3658163533e (patch) | |
| tree | c664669e99047c7b55645bcd95638e2949d7fdc9 /editors/openoffice.org-3 | |
| parent | 1a0b0d3bc9a9fc33e20a0d83c28ba946eae4e739 (diff) | |
| download | freebsd-ports-graphics-fd6fad64e357be4322b333211faae3658163533e.tar.gz freebsd-ports-graphics-fd6fad64e357be4322b333211faae3658163533e.tar.zst freebsd-ports-graphics-fd6fad64e357be4322b333211faae3658163533e.zip | |
- Fix ${LINUXBASE} for /compat/linux
- Fix some warning text
Submitted by: Maintainer
Diffstat (limited to 'editors/openoffice.org-3')
| -rw-r--r-- | editors/openoffice.org-3/Makefile | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index 6f0d006998c..64a1fc65001 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -26,8 +26,7 @@ EXTRACT_ONLY= MAINTAINER= mb@imp.ch -DEPENDS= ${PORTSDIR}/emulators/linux_base -RUN_DEPENDS= /compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base +FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base ONLY_FOR_ARCHS= i386 NO_CDROM= 'Must be downloaded direct from Sun via www interface' @@ -36,7 +35,7 @@ NO_BUILD= yes DIST_SUBDIR= staroffice52 WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp -LD_PATH= ${TMPDIR}:${WRKSRC}:/compat/linux/lib:/compat/linux/usr/lib +LD_PATH= ${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib .include <bsd.port.pre.mk> @@ -46,8 +45,8 @@ pre-fetch: @${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} /usr/src/sys/i386/linux/linux_sysvec.c + @${ECHO} \(revision 1.55.2.1 or higher\) @${ECHO} @${ECHO} Please upgrade to FreeBSD 4.1 @${ECHO} @@ -99,11 +98,11 @@ do-install: @ ${ECHO} @ ${FALSE} .else -.if exists(/compat/linux/${PREFIX}) - @${LN} -fs /compat/linux/${PREFIX}/office52 ${PREFIX}/office52 +.if exists(${LINUXBASE}/${PREFIX}) + @${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGDIR}/MESSAGE - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} /compat/linux/bin/sh -c '${WRKSRC}/setup /net' + @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ |