summaryrefslogtreecommitdiff
path: root/misc/openoffice/Makefile
diff options
context:
space:
mode:
authormrauch <mrauch>2002-02-14 22:51:41 +0000
committermrauch <mrauch>2002-02-14 22:51:41 +0000
commit0045cfce758a9653c59bd94224428ff09601bb06 (patch)
tree0437c1409e4553b36956116188c830026a07a69c /misc/openoffice/Makefile
parent568a6fa317dd2b11ed093de156d418505c844791 (diff)
downloadpkgsrc-0045cfce758a9653c59bd94224428ff09601bb06.tar.gz
- make openoffice also work with bison 1.3*
- add the external $PATH to the end of the internally set $PATH to make sure all binaries are found
Diffstat (limited to 'misc/openoffice/Makefile')
-rw-r--r--misc/openoffice/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile
index eb21653adc5..b36cd311203 100644
--- a/misc/openoffice/Makefile
+++ b/misc/openoffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/02/14 14:07:08 mrauch Exp $
+# $NetBSD: Makefile,v 1.5 2002/02/14 22:51:41 mrauch Exp $
DISTNAME= openoffice-0.0.0.641
WRKSRC= ${WRKDIR}/oo_641_src/config_office
@@ -20,8 +20,7 @@ GCC_VERSION!= ${CC} --version
.if ${GCC_VERSION}!="2.95.2" && ${GCC_VERSION}!="2.95.3"
.include "../../lang/gcc/Makefile.gcc"
.endif
-# bison 1.3* won't work: there was an incompatible change in it
-BUILD_DEPENDS+= bison-1.2*:../../devel/bison
+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