summaryrefslogtreecommitdiff
path: root/misc/openoffice/Makefile
diff options
context:
space:
mode:
authormrauch <mrauch>2002-02-26 21:25:27 +0000
committermrauch <mrauch>2002-02-26 21:25:27 +0000
commit05a904b6236a495fd88e21f9a709cb522f5596bf (patch)
tree407074cd6887d27e8e54cc19d28361fad0321e94 /misc/openoffice/Makefile
parentddd55664c532d3f933d4a36e2326d1e75546d7d8 (diff)
downloadpkgsrc-05a904b6236a495fd88e21f9a709cb522f5596bf.tar.gz
- bugfixes that showed up only under special circumstances:
* restore compatibility with old bison * disable versioned symbols - the -current ld has a problem with them * fix an instance of improper shell quoting * the SIGPIPE hack inside tar needs a sh not csh (fixes PR#15706) - pth>=1.4.0nb1 is a runtime dependency - our csh is sufficient for compilation
Diffstat (limited to 'misc/openoffice/Makefile')
-rw-r--r--misc/openoffice/Makefile16
1 files changed, 4 insertions, 12 deletions
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile
index b36cd311203..c792af4d3d7 100644
--- a/misc/openoffice/Makefile
+++ b/misc/openoffice/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2002/02/14 22:51:41 mrauch Exp $
+# $NetBSD: Makefile,v 1.6 2002/02/26 21:25:27 mrauch Exp $
DISTNAME= openoffice-0.0.0.641
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/oo_641_src/config_office
CATEGORIES= misc
MASTER_SITES= http://sf1.mirror.openoffice.org/641b/
@@ -22,13 +23,12 @@ GCC_VERSION!= ${CC} --version
.endif
BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
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-jdk13
.include "../../lang/perl5/buildlink.mk"
.include "../../devel/pth/buildlink.mk"
-BUILD_DEPENDS+= pth>=1.4.0nb1:../../devel/pth
+DEPENDS+= pth>=1.4.0nb1:../../devel/pth
.include "../../mk/x11.buildlink.mk"
CONFLICTS= staroffice-[0-9]*
@@ -51,14 +51,6 @@ post-extract:
# convert \r\n-lineends in sablot-patch into unix-style \n first
${PERL5} -p -i.save -e 's/\r\n/\n/' \
${WRKSRC}/../sablot/Sablot-0.52.patch
-# The tar process on nas exits with an error code, extraction however is
-# complete. Extract and repackage to make the build happy.
- ${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}
- tar -czf ${WRKSRC}/../nas/download/nas-1.4.1.tar.gz \
- -C ${WRKDIR} nas-1.4.1
DISPLAY?= #empty, if unset
checkforx:
@@ -76,7 +68,7 @@ DISPLAY= ':2'
pre-build: checkforx
do-build:
- tcsh -c "setenv DISPLAY ${DISPLAY}; cd ${WRKSRC}/..&& \
+ csh -c "setenv DISPLAY ${DISPLAY}; cd ${WRKSRC}/..&& \
./bootstrap&& source *.Set&& dmake"
pre-install: checkforx