[pkgsrc/trunk]: pkgsrc/mk/tools Revert back to avoiding the system bison. Wh...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cafc96437152
branches:  trunk
changeset: 621722:cafc96437152
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Mon Jul 15 08:51:21 2013 +0000

description:
Revert back to avoiding the system bison.  Whilst it is new enough to
satisfy the BISON_REQD check, it does not function correctly in the tools
environment when not called as /usr/bin/bison, as it is unable to find its
m4sugar.m4 without BISON_PKGDATADIR being set.

Whilst we could work around that in bison.mk I feel that's something of a
hack, and it is simpler and cleaner to just use the pkgsrc tool instead.

diffstat:

 mk/tools/tools.Darwin.mk |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (23 lines):

diff -r 6e30d7db67ec -r cafc96437152 mk/tools/tools.Darwin.mk
--- a/mk/tools/tools.Darwin.mk  Mon Jul 15 08:19:55 2013 +0000
+++ b/mk/tools/tools.Darwin.mk  Mon Jul 15 08:51:21 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.47 2013/07/09 15:22:31 jperkin Exp $
+# $NetBSD: tools.Darwin.mk,v 1.48 2013/07/15 08:51:21 jperkin Exp $
 #
 # System-supplied tools for the Darwin (Mac OS X) operating system.
 
@@ -6,8 +6,11 @@
 TOOLS_PLATFORM.awk?=           /usr/bin/awk
 TOOLS_PLATFORM.basename?=      /usr/bin/basename
 TOOLS_PLATFORM.bash?=          /bin/bash
-TOOLS_PLATFORM.bison?=         /usr/bin/bison
-TOOLS_PLATFORM.bison-yacc?=    /usr/bin/bison -y
+# Native bison (at least up to version 2.3 in OSX Lion) does not work
+# well in the tools environment and cannot locate m4sugar.m4 without
+# BISON_PKGDATADIR being set.  For now just pull in the pkgsrc tool.
+#TOOLS_PLATFORM.bison?=                /usr/bin/bison
+#TOOLS_PLATFORM.bison-yacc?=   /usr/bin/bison -y
 .if exists(/usr/bin/bsdtar)
 TOOLS_PLATFORM.bsdtar?=                /usr/bin/bsdtar
 .endif