Convert the remaining few packages that explicitly set DEPENDS or

BUILD_DEPENDS on bison to USE_TOOLS=bison. The minimum bison version
required in mk/tools/bison.mk is good enough for all of them.

8 files changed, 15 insertions, 27 deletions

diff --git a/cad/tkgate/Makefile b/cad/tkgate/Makefile
index 1847e3d10cd..5f0eb4d34a4 100644
--- a/cad/tkgate/Makefile
+++ b/cad/tkgate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2008/06/20 01:09:08 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2012/01/14 00:51:36 hans Exp $
 #
 
 DISTNAME=	tkgate-1.6i
@@ -13,11 +13,10 @@ COMMENT=	Tcl/Tk based digital circuit editor and simulator
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-BUILD_DEPENDS+=		bison>=1.35:../../devel/bison
 BUILD_DEPENDS+=		libiconv-[0-9]*:../../converters/libiconv
 
 USE_IMAKE=		yes
-USE_TOOLS+=		gm4
+USE_TOOLS+=		gm4 bison
 
 TKGATE_SITENAME=	Earth
 
diff --git a/lang/baci/Makefile b/lang/baci/Makefile
index bf2e7adf382..b066293a55d 100644
--- a/lang/baci/Makefile
+++ b/lang/baci/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2011/02/28 14:52:53 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2012/01/14 00:51:36 hans Exp $
 #
 
 DISTNAME=	bacisrc
@@ -12,11 +12,9 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.mines.edu/fs_home/tcamp/baci/
 COMMENT=	Ben-Ari Concurrent Interpreter
 
-DEPENDS+=	bison-[0-9]*:../../devel/bison
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=	flex
+USE_TOOLS+=	flex bison:run
 
 INSTALLATION_DIRS=	bin
 
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 43f81a8cf70..259cf63064e 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2011/12/24 23:46:02 asau Exp $
+# $NetBSD: Makefile,v 1.95 2012/01/14 00:51:36 hans Exp $
 
 DISTNAME=	octave-${OCTAVE_VER}
 CATEGORIES=	math
@@ -11,7 +11,6 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.octave.org/
 COMMENT=	High-level language, intended for numerical computations
 
-BUILD_DEPENDS+=	bison>=1.875:../../devel/bison
 BUILD_DEPENDS+=	gperf>=2.7:../../devel/gperf
 BUILD_DEPENDS+=	teTeX-[0-9]*:../../print/teTeX
 DEPENDS+=	gnuplot>=3.7:../../graphics/gnuplot
@@ -26,7 +25,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_GNU_READLINE=	yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		autoconf gsed gmake makeinfo perl pkg-config
+USE_TOOLS+=		autoconf gsed gmake makeinfo perl pkg-config bison
 GNU_CONFIGURE=		yes
 
 GCC_REQD+=		3.0
diff --git a/math/xmgr/Makefile b/math/xmgr/Makefile
index a1e6101c2fe..da35e294431 100644
--- a/math/xmgr/Makefile
+++ b/math/xmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2011/12/09 14:36:35 drochner Exp $
+# $NetBSD: Makefile,v 1.37 2012/01/14 00:51:36 hans Exp $
 
 DISTNAME=		xmgr-4.1.2
 PKGREVISION=		6
@@ -10,8 +10,6 @@ HOMEPAGE=		http://plasma-gate.weizmann.ac.il/Xmgr/
 COMMENT=		Powerful XY plotting tool for workstations or X-terminals using X
 LICENSE=		modified-bsd
 
-BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_X11BASE=		YES
@@ -23,7 +21,7 @@ BUILD_TARGET=		# empty
 INSTALL_TARGET=		install
 
 REPLACE_PERL+=		auxiliary/fdf2fit
-USE_TOOLS+=		perl:run
+USE_TOOLS+=		perl:run bison
 
 .include "../../devel/netcdf/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff --git a/net/docsis/Makefile b/net/docsis/Makefile
index eec0b17afc7..82d0bcf6e29 100644
--- a/net/docsis/Makefile
+++ b/net/docsis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/06/12 02:14:39 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2012/01/14 00:51:36 hans Exp $
 #
 
 DISTNAME=		docsis-0.9.4
@@ -11,10 +11,8 @@ COMMENT=		Utility for manipulating DOCSIS-compliant cable modems
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-BUILD_DEPENDS+=		bison>=1.25:../../devel/bison
-
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		gm4
+USE_TOOLS+=		gm4 bison
 
 .include "../../net/net-snmp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/bww2tex/Makefile b/print/bww2tex/Makefile
index 7f89c5475c0..9885e778d61 100644
--- a/print/bww2tex/Makefile
+++ b/print/bww2tex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/07/14 12:56:11 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2012/01/14 00:51:37 hans Exp $
 #
 
 DISTNAME=	bww2tex-2.00
@@ -12,7 +12,7 @@ COMMENT=	Bagpipe Music Writer Gold to BagpipeTeX converter
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
+USE_TOOLS+=	bison
 
 WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
diff --git a/security/aide06/Makefile b/security/aide06/Makefile
index 6a05fe81b2f..52e9112c324 100644
--- a/security/aide06/Makefile
+++ b/security/aide06/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/06/12 02:14:44 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2012/01/14 00:51:36 hans Exp $
 #
 
 DISTNAME=	aide-0.6
@@ -12,8 +12,6 @@ COMMENT=	Older intrusion detection system for checking file integrity
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-#BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
-
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	bison flex
 
diff --git a/x11/ssystem/Makefile b/x11/ssystem/Makefile
index fac3073bb0e..9b1f9ab8662 100644
--- a/x11/ssystem/Makefile
+++ b/x11/ssystem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2010/12/23 11:45:02 dsainty Exp $
+# $NetBSD: Makefile,v 1.26 2012/01/14 00:51:37 hans Exp $
 #
 
 DISTNAME=	ssystem-1.6
@@ -14,9 +14,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 MAKE_JOBS_SAFE=		no
 
-BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
-
-USE_TOOLS+=	flex
+USE_TOOLS+=	flex bison
 USE_X11BASE=	yes
 
 MAKE_FILE=	Makefile.FreeBSD