Replace explicit build dependencies on bison and manipulations on the

YACC variable with USE_TOOLS+=bison.

10 files changed, 31 insertions, 58 deletions

diff --git a/cad/pcb-current/Makefile b/cad/pcb-current/Makefile
index e264f58c12c..376e668a320 100644
--- a/cad/pcb-current/Makefile
+++ b/cad/pcb-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/05/22 20:07:41 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:28:47 jlam Exp $
 #
 
 DISTNAME=	pcb-${SNAPDATE}
@@ -10,28 +10,23 @@ MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://pcb.sourceforge.net/
 COMMENT=	Printed circuit board layout system (development snapshot version)
 
-BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
-DEPENDS+=	m4>=1.4:../../devel/m4
 DEPENDS+=	tk>=8.3:../../x11/tk
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 CONFLICTS+=	pcb-[0-9]*
 
-SNAPDATE=	20050315
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake lex
-USE_X11=	yes
+SNAPDATE=		20050315
+GNU_CONFIGURE=		yes
+USE_TOOLS+=		bison gm4 gmake lex
+TOOLS_DEPMETHOD.gm4=	DEPENDS
+USE_X11=		yes
 
 INFO_FILES=	pcb.info
 
 .include "../../mk/bsd.prefs.mk"
 
-EVAL_PREFIX+=   BISONDIR=bison
-EVAL_PREFIX+=   M4DIR=m4
 EVAL_PREFIX+=   TKDIR=tk
-M4=${M4DIR}/bin/${GNU_PROGRAM_PREFIX}m4
-YACC=		${BISONDIR}/bin/bison
 CONFIGURE_ENV+=	WISH=${TKDIR}/bin/wish
 
 .if ${XAW_TYPE} == "xpm"
diff --git a/cad/verilog-current/Makefile b/cad/verilog-current/Makefile
index 7ce1e16b607..d11cc15c710 100644
--- a/cad/verilog-current/Makefile
+++ b/cad/verilog-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2005/05/22 20:07:41 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2005/05/22 20:28:47 jlam Exp $
 #
 
 DISTNAME=	verilog-${SNAPDATE}
@@ -14,15 +14,12 @@ PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
 CONFLICTS+=	verilog-[0-9]*
 
-BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
-
-SNAPDATE=	20041004
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake lex
+SNAPDATE=		20041004
+GNU_CONFIGURE=		yes
+USE_TOOLS+=		bison gmake lex
 CONFIGURE_ARGS+=	--without-ipal
-YACC=		${LOCALBASE}/bin/bison
-TEST_DIRS=	${WRKSRC}
-TEST_TARGET=	check
+TEST_DIRS=		${WRKSRC}
+TEST_TARGET=		check
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
diff --git a/cad/verilog/Makefile b/cad/verilog/Makefile
index 05782e359c7..2155d2aa7aa 100644
--- a/cad/verilog/Makefile
+++ b/cad/verilog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:41 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:28:47 jlam Exp $
 #
 
 DISTNAME=	verilog-0.8.1
@@ -11,16 +11,14 @@ COMMENT=	Verilog simulation and synthesis tool (stable release version)
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
-
 CONFLICTS+=	verilog-current-[0-9]*
 
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake lex
+GNU_CONFIGURE=		yes
+USE_TOOLS+=		bison gmake lex
 CONFIGURE_ARGS+=	--without-ipal
 YACC=			${LOCALBASE}/bin/bison
-TEST_DIRS=	${WRKSRC}
-TEST_TARGET=	check
+TEST_DIRS=		${WRKSRC}
+TEST_TARGET=		check
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
diff --git a/devel/hdf/Makefile b/devel/hdf/Makefile
index dc9e1de0e0b..80767fefb11 100644
--- a/devel/hdf/Makefile
+++ b/devel/hdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:52 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:28:47 jlam Exp $
 
 DISTNAME=	HDF4.2r1
 PKGNAME=	hdf-4.2r1
@@ -9,9 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://hdf.ncsa.uiuc.edu/hdf4.html
 COMMENT=	NCSA Hierarchical Data Format
 
-#BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
-#YACC=		${PREFIX}/bin/bison
-
+#USE_TOOLS+=		bison
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c fortran
 GNU_CONFIGURE=		yes
diff --git a/devel/sdcc/Makefile b/devel/sdcc/Makefile
index 3c53638a1e3..e71004410af 100644
--- a/devel/sdcc/Makefile
+++ b/devel/sdcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/05/22 20:07:55 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2005/05/22 20:28:47 jlam Exp $
 
 DISTNAME=	sdcc-2.4.0
 PKGNAME=	${DISTNAME:S/-src//}
@@ -10,13 +10,10 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://sdcc.sourceforge.net/
 COMMENT=	Cross compile 8051 code
 
-#
 # XXX - This HACK circumvent a problem with the use of yacc that breaks the
 # XXX - building process of sdcc.  Use of bison fixes this problem for now.
 #
-BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
-
-YACC=		bison
+USE_TOOLS+=	bison
 
 BUILD_TARGET=	dep all
 
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index f21642f8057..f41ee83856e 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2005/05/22 20:07:59 jlam Exp $
+# $NetBSD: Makefile,v 1.84 2005/05/22 20:28:47 jlam Exp $
 
 DISTNAME=	Wine-20050310
 PKGNAME=	${DISTNAME:S/W/w/}
@@ -11,18 +11,15 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.winehq.com/
 COMMENT=	Free implementation of Windows on Unix (still alpha)
 
-BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
 BUILD_DEPENDS+=	fontforge-[0-9]*:../../fonts/fontforge
 
-YACC=		${PREFIX}/bin/bison -y
-
 CONFLICTS=	rewind-[0-9]*
 
 ONLY_FOR_PLATFORM=	NetBSD-1.5Z*-i386 NetBSD-1.6*-i386 NetBSD-[2-9]*-i386
 ONLY_FOR_PLATFORM+=	FreeBSD*-i386 Linux*-i386 SunOS*-i386 Darwin*-i386
 
 WRKSRC=		 	${WRKDIR}/${DISTNAME:S/W/w/}
-USE_TOOLS+=		gmake
+USE_TOOLS+=		bison gmake
 USE_LIBTOOL=		yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 3d6dd179b68..e1a36ddd4d1 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:03 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:28:47 jlam Exp $
 
 DISTNAME=		quakeforge-0.5.5
 PKGREVISION=		2
@@ -9,16 +9,13 @@ MAINTAINER=		snj@NetBSD.org
 HOMEPAGE=		http://www.quakeforge.net/
 COMMENT=		Improved Quake engine
 
-BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
-
 CONFIGURE_ARGS+=	--with-cpp="${CPP} %d %i %o"
 CONFIGURE_ARGS+=	--disable-ogg
 CONFIGURE_ARGS+=	--disable-xmms
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		gmake
+USE_TOOLS+=		bison gmake
 USE_LIBTOOL=		YES
 USE_X11=		YES
-YACC=			${LOCALBASE}/bin/bison
 
 SUBST_CLASSES+=		dsp
 SUBST_STAGE.dsp=	post-patch
diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index 711737e2c83..4cc81446d9f 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:11 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:28:47 jlam Exp $
 #
 
 DISTNAME=	evolution-data-server-1.2.2
@@ -11,7 +11,6 @@ HOMEPAGE=	http://ximian.com/products/evolution/
 COMMENT=	Evolution data server
 
 BUILD_USES_MSGFMT=	yes
-BUILD_DEPENDS+=		bison>=1.875:../../devel/bison
 
 BUILDLINK_DEPENDS.libsoup-devel+=	libsoup-devel>=2.2.3
 
@@ -20,7 +19,6 @@ USE_DIRS+=		xdg-1.1
 USE_TOOLS+=		bison gmake
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
-YACC=			${LOCALBASE}/bin/bison # XXX
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.evolution-data-server
 PKG_SUPPORTED_OPTIONS=	inet6
diff --git a/mail/evolution12/Makefile b/mail/evolution12/Makefile
index d6a322926d7..daa03622094 100644
--- a/mail/evolution12/Makefile
+++ b/mail/evolution12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:11 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:28:47 jlam Exp $
 
 DISTNAME=		evolution-1.2.4
 PKGNAME=		${DISTNAME:S/evolution/evolution12/}
@@ -23,7 +23,6 @@ COMMENT=		GNOME mailer, calendar, contact manager, and communications tool
 
 CONFLICTS+=		evolution<2.0 evolution14-[0-9]*
 
-BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 DEPENDS+=		psmisc-[0-9]*:../../sysutils/psmisc
 BUILD_USES_MSGFMT=	YES
 
@@ -33,12 +32,11 @@ BUILDLINK_DEPENDS.db3=		db3-3.11.2{,nb*}
 BUILDLINK_DEPENDS.libxml=	libxml>=1.8.17
 
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		gmake
+USE_TOOLS+=		bison gmake
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 USE_DIRS+=		gnome1-1.5
 USE_PKGLOCALEDIR=	YES
-YACC=			${PREFIX}/bin/bison -y
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 REPLACE_PERL+=		libical/scripts/mkderivedvalues.pl
diff --git a/textproc/libpathan/Makefile b/textproc/libpathan/Makefile
index 7397d884e1c..93f9bd3bf06 100644
--- a/textproc/libpathan/Makefile
+++ b/textproc/libpathan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:35 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:28:47 jlam Exp $
 
 DISTNAME=	libpathan-1.2-2-src
 PKGNAME=	${DISTNAME:S/-2-src/.2/}
@@ -10,19 +10,17 @@ MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://software.decisionsoft.com/
 COMMENT=	Library to parse and evaluate XPath expressions
 
-BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
-
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=			${WRKDIR}/${DISTNAME:S/-2-src//}
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		gmake
+USE_TOOLS+=		bison gmake
 USE_LIBTOOL=		YES
 USE_PERL5=		build
 USE_LANGUAGES=		c++
 
 CONFIGURE_ARGS+=	XERCESCROOT=${LOCALBASE}
-CONFIGURE_ARGS+=	YACC=${LOCALBASE}/bin/bison
+CONFIGURE_ARGS+=	YACC=${TOOLS_YACC:Q}
 
 .include "../../textproc/xerces-c/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"