diff options
| author | wiz <wiz@pkgsrc.org> | 2002-02-13 18:50:52 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2002-02-13 18:50:52 +0000 |
| commit | 5386d9fadc77934c3cf2c8ddbca0126581b3ef31 (patch) | |
| tree | 052599ff53db6a2d4659ac385c17bc7311c9e7af /misc | |
| parent | 8197f567cb3f339f2856a750bdd9bfd8c4a109a3 (diff) | |
| download | pkgsrc-5386d9fadc77934c3cf2c8ddbca0126581b3ef31.tar.gz | |
Fix path to sun-jdk pkgsrc directory, and remove some trailing spaces.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/openoffice/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile index 6c8c4181baf..4469a1cc296 100644 --- a/misc/openoffice/Makefile +++ b/misc/openoffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/02/13 18:09:21 mrauch Exp $ +# $NetBSD: Makefile,v 1.2 2002/02/13 18:50:52 wiz Exp $ DISTNAME= openoffice-0.0.0.641 WRKSRC= ${WRKDIR}/oo_641_src/config_office @@ -13,7 +13,7 @@ HOMEPAGE= http://www.openoffice.org/ COMMENT= Integrated office productivity suite # OpenOffice requires gcc 2.95.2 or better, -# so for NetBSD<=1.5 we need the package lang/gcc. +# so for NetBSD<=1.5 we need the package lang/gcc. GCC_VERSION!= ${CC} --version .if ${GCC_VERSION}!="2.95.2" && ${GCC_VERSION}!="2.95.3" .include "../../lang/gcc/Makefile.gcc" @@ -23,7 +23,7 @@ BUILD_DEPENDS+= gmake-[0-9]*:../../devel/gmake BUILD_DEPENDS+= tcsh-[0-9]*:../../shells/tcsh BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip BUILD_DEPENDS+= stlport>=4.0nb1:../../devel/stlport -BUILD_DEPENDS+= sun-jdk>=1.3.0:../../lang/sun-jdk +BUILD_DEPENDS+= sun-jdk>=1.3.0:../../lang/sun-jdk13 .include "../../lang/perl5/buildlink.mk" .include "../../devel/pth/buildlink.mk" BUILD_DEPENDS+= pth>=1.4.0nb1:../../devel/pth @@ -35,7 +35,7 @@ ONLY_FOR_PLATFORM= NetBSD-1.5.3*-i386 NetBSD-1.5Z?-i386 \ NetBSD-1.[6-9]*-i386 NetBSD-[2-9]*-i386 GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} +CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} CONFIGURE_ARGS+= --with-jdk-home=${PREFIX}/java TEMP?= ${WRKSRC} @@ -54,14 +54,14 @@ post-extract: ${MV} ${WRKSRC}/../nas/download/nas-1.4.1.tar.gz \ ${WRKSRC}/../nas/download/nas-1.4.1.tar.gz.orig tar -xzf ${WRKSRC}/../nas/download/nas-1.4.1.tar.gz.orig \ - -C ${WRKDIR} + -C ${WRKDIR} tar -czf ${WRKSRC}/../nas/download/nas-1.4.1.tar.gz \ -C ${WRKDIR} nas-1.4.1 DISPLAY?= #empty, if unset checkforx: .if ${DISPLAY}=="" -.if exists(${X11BASE}/bin/Xvfb) +.if exists(${X11BASE}/bin/Xvfb) -${X11BASE}/bin/Xvfb :2 & DISPLAY= ':2' .else @@ -91,7 +91,7 @@ do-install: if ${TEST} -e ${PREFIX}/OpenOffice.org641/setup; \ then ${TRUE}; \ else ${FALSE}; \ - fi" + fi" ${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \ <${FILESDIR}/soffice >${PREFIX}/bin/soffice ${CHMOD} +x ${PREFIX}/bin/soffice |