Migration from bison 1.x to 2.x

PR:		117086
Tested by:	-exp runs

10 files changed, 21 insertions, 18 deletions

diff --git a/textproc/carthage/Makefile b/textproc/carthage/Makefile
index 6011da35dd19..338067394bce 100644
--- a/textproc/carthage/Makefile
+++ b/textproc/carthage/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	carthage
 PORTVERSION=	1.0 # No version information on WWW
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.tei-c.org/Software/carthage/ \
 		http://www.tei-c.org.uk/Software/carthage/
@@ -16,8 +16,7 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A parser and clean-up tool for SGML DTDs
 
-BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison
-
+USE_BISON=	build
 USE_ZIP=	yes
 USE_GMAKE=	yes
 ALL_TARGET=	carthago
diff --git a/textproc/dict/Makefile b/textproc/dict/Makefile
index c4a03f541273..7709a5d19a2c 100644
--- a/textproc/dict/Makefile
+++ b/textproc/dict/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	dict
 PORTVERSION=	1.10.9
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	dict
@@ -16,7 +17,7 @@ DISTNAME=	${PORTNAME}d-${PORTVERSION}
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Dictionary Server Protocol (RFC2229) client
 
-USE_BISON=	yes
+USE_BISON=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-local-zlib --with-cflags="${CFLAGS}" \
 		--with-etcdir=${PREFIX}/etc
diff --git a/textproc/flex/Makefile b/textproc/flex/Makefile
index 1f0798763e19..19de8ca27b84 100644
--- a/textproc/flex/Makefile
+++ b/textproc/flex/Makefile
@@ -7,16 +7,17 @@
 
 PORTNAME=	flex
 PORTVERSION=	2.5.33
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SF
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Fast lexical analyzer generator
 
-BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison2 \
-		help2man:${PORTSDIR}/misc/help2man \
+BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man \
 		gm4:${PORTSDIR}/devel/m4
 
+USE_BISON=	build
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls
diff --git a/textproc/htmltolatex/Makefile b/textproc/htmltolatex/Makefile
index b4d919a3fc3c..b37d1d740acc 100644
--- a/textproc/htmltolatex/Makefile
+++ b/textproc/htmltolatex/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	htmltolatex
 PORTVERSION=	1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	textproc
 MASTER_SITES=	http://people.FreeBSD.org/~foxfair/distfiles/
 DISTNAME=	${PORTNAME}
@@ -18,7 +18,7 @@ COMMENT=	HTML to LaTeX to PDF Converter
 
 LIB_DEPENDS=	Magick.10:${PORTSDIR}/graphics/ImageMagick
 
-USE_BISON=	yes
+USE_BISON=	build
 USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
 MAKE_ARGS=	CXX="${CXX}" \
diff --git a/textproc/latte/Makefile b/textproc/latte/Makefile
index 08682e2e996e..1b75ac023138 100644
--- a/textproc/latte/Makefile
+++ b/textproc/latte/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	latte
 PORTVERSION=	2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.latte.org/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple language for marking up text in a very expressive way
 
-USE_BISON=	yes
+USE_BISON=	build
 USE_GETOPT_LONG=yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf:213 libtool:15
diff --git a/textproc/libpathan/Makefile b/textproc/libpathan/Makefile
index 38142d49f262..2a904bb973c2 100644
--- a/textproc/libpathan/Makefile
+++ b/textproc/libpathan/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libpathan
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://software.decisionsoft.com/software/pathan-2.0.0/
 DISTNAME=	${PORTNAME}-${PORTVERSION}beta-src
@@ -17,7 +18,7 @@ COMMENT=	Validating XML parser from the Apache XML Project
 LIB_DEPENDS=	xerces-c.27:${PORTSDIR}/textproc/xerces-c2
 BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/textproc/xerces-c2:extract
 
-USE_BISON=	yes
+USE_BISON=	build
 USE_GMAKE=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
diff --git a/textproc/mifluz/Makefile b/textproc/mifluz/Makefile
index c0ff66cff0c7..46d5b01478f1 100644
--- a/textproc/mifluz/Makefile
+++ b/textproc/mifluz/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mifluz
 PORTVERSION=	0.23.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,7 +20,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} --without-unac
 USE_LDCONFIG=	yes
 
-USE_BISON=	yes
+USE_BISON=	build
 USE_GCC=	2.95
 
 MAN1=	htdb_dump.1 htdb_stat.1 htdb_load.1 mifluzdump.1 mifluzload.1 \
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 600d28737596..67e2f99dfee9 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scrollkeeper
 PORTVERSION=	0.3.14
-PORTREVISION=	8
+PORTREVISION=	9
 PORTEPOCH=	1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -32,7 +32,7 @@ USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
-USE_BISON=	yes
+USE_BISON=	build
 USE_GNOME=	gnomehack gnomehier gnometarget libxslt intlhack
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --datadir=${PREFIX}/share/gnome \
diff --git a/textproc/syck/Makefile b/textproc/syck/Makefile
index 846334adf3bb..e94452057d86 100644
--- a/textproc/syck/Makefile
+++ b/textproc/syck/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	syck
 PORTVERSION=	0.55
+PORTREVISION=	1
 CATEGORIES=	textproc devel
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Syck is an extension for reading and writing YAML swiftly
 
 GNU_CONFIGURE=	yes
-USE_BISON=	yes
+USE_BISON=	build
 CFLAGS+=	-fPIC
 
 .include <bsd.port.mk>
diff --git a/textproc/xxdiff/Makefile b/textproc/xxdiff/Makefile
index acce20f0bbc5..0513de87c414 100644
--- a/textproc/xxdiff/Makefile
+++ b/textproc/xxdiff/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xxdiff
 PORTVERSION=	3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	SF
 
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake \
 QMAKE=		${LOCALBASE}/bin/qmake
 SPEC=		${LOCALBASE}/share/qt/mkspecs/freebsd-g++
 USE_BZIP2=	yes
-USE_BISON=	yes
+USE_BISON=	build
 USE_GMAKE=	yes
 USE_QT_VER=	3
 MAKE_ENV+=	QTDIR=${QT_PREFIX}