Migration from bison 1.x to 2.x

PR:		117086
Tested by:	-exp runs

8 files changed, 18 insertions, 16 deletions

diff --git a/math/abakus/Makefile b/math/abakus/Makefile
index d86f86a310e..2b1164d8b8c 100644
--- a/math/abakus/Makefile
+++ b/math/abakus/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	abakus
 PORTVERSION=	0.91
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math kde
 MASTER_SITES=	http://grammarian.homelinux.net/abakus/ \
 		http://www.athame.co.uk/mirror/
@@ -15,11 +15,11 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	andy@athame.co.uk
 COMMENT=	Michael Pyne's Abakus Calculator
 
-BUILD_DEPENDS=	scons:${PORTSDIR}/devel/scons \
-		bison:${PORTSDIR}/devel/bison2
+BUILD_DEPENDS=	scons:${PORTSDIR}/devel/scons
 LIB_DEPENDS=	gmp:${PORTSDIR}/math/libgmp4
 
-PREFIX=${LOCALBASE}
+USE_BISON=	build
+PREFIX=		${LOCALBASE}
 USE_KDELIBS_VER=3
 _NO_KDE_CONFTARGET_HACK=	yes
 QT_NONSTANDARD=	yes
diff --git a/math/cvc3/Makefile b/math/cvc3/Makefile
index 8f7106993ca..8e51e68174d 100644
--- a/math/cvc3/Makefile
+++ b/math/cvc3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cvc3
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www.cs.nyu.edu/acsys/cvc3/download/${PORTVERSION}/ \
 		http://www.cs.nctu.edu.tw/~lwhsu/ports/distfiles/
@@ -23,7 +24,7 @@ CONFIGURE_ARGS=	--enable-dynamic \
 		--with-extra-libs=${LOCALBASE}/lib
 CXXFLAGS+=	-fPIC
 GNU_CONFIGURE=	yes
-USE_BISON=	yes
+USE_BISON=	build
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_PERL5=	yes
diff --git a/math/eukleides/Makefile b/math/eukleides/Makefile
index b53eb63c9f6..0f44c08ef86 100644
--- a/math/eukleides/Makefile
+++ b/math/eukleides/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	eukleides
 PORTVERSION=	1.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	http://www.eukleides.org/download/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
@@ -19,7 +19,7 @@ COMMENT=	A Euclidean geometry drawing language
 RUN_DEPENDS=	pstoedit:${PORTSDIR}/graphics/pstoedit \
 		epstopdf:${PORTSDIR}/print/teTeX-base
 
-USE_BISON=	yes
+USE_BISON=	build
 USE_GMAKE=	yes
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -c"
 ALL_TARGET=	eukleides info
diff --git a/math/freefem++/Makefile b/math/freefem++/Makefile
index 214fe1f7fae..eeb31589630 100644
--- a/math/freefem++/Makefile
+++ b/math/freefem++/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	freefem++
 PORTVERSION=	2.20
+PORTREVISION=	1
 CATEGORIES=	math science
 MASTER_SITES=	http://www.freefem.org/ff++/ftp/
 
@@ -30,7 +31,7 @@ RESTRICTED=	No resale or commercial use
 USE_FORTRAN=		yes
 FORTRANLIBDIR=		`${DIRNAME} \`gfortran42 -print-libgcc-file-name\``
 FORTRANLIBDIR2=		`${DIRNAME} \`gfortran42 -print-libgcc-file-name\``/../../../
-USE_BISON=		yes
+USE_BISON=		build
 USE_GL=			yes
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 0a7744b34de..cedf6d0deb9 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcalctool
 PORTVERSION=	5.9.14
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -19,7 +19,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNOME 2 calculator tool based on the old calctool for OpenWindows
 
 USE_BZIP2=	yes
-USE_BISON=	yes
+USE_BISON=	build
 INSTALLS_OMF=	yes
 USE_GETTEXT=	yes
 USE_XLIB=	yes
diff --git a/math/graphthing/Makefile b/math/graphthing/Makefile
index 2654581fb8a..a7f081ed816 100644
--- a/math/graphthing/Makefile
+++ b/math/graphthing/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	graphthing
 PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	http://graph.seul.org/
 
@@ -17,7 +17,7 @@ COMMENT=	A tool that allows you to create, manipulate and study graphs
 
 USE_BZIP2=	yes
 USE_GNOME=	gnometarget gtk20
-USE_BISON=	yes
+USE_BISON=	build
 USE_GMAKE=	yes
 USE_WX=		2.6
 WX_CONF_ARGS=	absolute
diff --git a/math/oleo/Makefile b/math/oleo/Makefile
index ae46d4c2223..5f636a8b92c 100644
--- a/math/oleo/Makefile
+++ b/math/oleo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	oleo
 PORTVERSION=	1.99.16
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The GNU spreadsheet for X11 and terminals
 
 USE_PERL5_BUILD=	yes
-USE_BISON=	yes
+USE_BISON=	build
 USE_AUTOTOOLS=	autoconf:213
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/math/rascal/Makefile b/math/rascal/Makefile
index 401ceef0962..b1f67667369 100644
--- a/math/rascal/Makefile
+++ b/math/rascal/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	rascal
 PORTVERSION=	0.3.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,7 +19,7 @@ COMMENT=	The Advanced Scientific CALculator
 WRKSRC=		${WRKDIR}/Rascal-${PORTVERSION}
 
 USE_GETOPT_LONG=	yes
-USE_BISON=	yes
+USE_BISON=	build
 WANT_GNOME=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	CC="${CXX}" CFLAGS="${CXXFLAGS}" \