Migration from bison 1.x to 2.x

PR:		117086
Tested by:	-exp runs

6 files changed, 13 insertions, 7 deletions

diff --git a/mail/esmtp/Makefile b/mail/esmtp/Makefile
index 508aa47ede37..312a155f86e1 100644
--- a/mail/esmtp/Makefile
+++ b/mail/esmtp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	esmtp
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,7 +19,7 @@ LIB_DEPENDS=	esmtp.6:${PORTSDIR}/mail/libesmtp
 
 USE_BZIP2=	yes
 USE_OPENSSL=	yes
-USE_BISON=	yes
+USE_BISON=	build
 USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index e973873501eb..8b5fdf54b067 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	evolution
 PORTVERSION=	2.10.3
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -21,7 +22,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORT
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_BISON=	yes
+USE_BISON=	build
 USE_GETTEXT=	yes
 USE_XLIB=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack evolutiondataserver \
diff --git a/mail/filtermail/Makefile b/mail/filtermail/Makefile
index 8064448bfb73..755553836d9c 100644
--- a/mail/filtermail/Makefile
+++ b/mail/filtermail/Makefile
@@ -10,7 +10,7 @@
 
 PORTNAME=	filtermail
 PORTVERSION=	0.7.2
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://home.in.tum.de/baueran/%SUBDIR%/
@@ -30,7 +30,7 @@ EXTRACT_AFTER_ARGS=	| ${SED} 's/[mM][aA][iI][lL][fF][iI][lL][tT][eE][rR]/filterm
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_GETOPT_LONG=	yes
-USE_BISON=	yes
+USE_BISON=	build
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/mail/freepops/Makefile b/mail/freepops/Makefile
index fc72a402aa05..2ef45d27b727 100644
--- a/mail/freepops/Makefile
+++ b/mail/freepops/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	freepops
 PORTVERSION=	0.0.99
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	freepops
@@ -16,9 +17,10 @@ COMMENT=	Extensible webmail to pop3 interface
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
 		curl:${PORTSDIR}/ftp/curl
-BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison
 
 MAN1=		freepopsd.1
+
+USE_BISON=	build
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	configure.sh
diff --git a/mail/libsieve/Makefile b/mail/libsieve/Makefile
index 845a542af3d4..8cd229dbef08 100644
--- a/mail/libsieve/Makefile
+++ b/mail/libsieve/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libsieve
 PORTVERSION=	2.2.5
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	libsieve
@@ -21,7 +22,7 @@ CONFIGURE_ARGS+=--prefix=${PREFIX}
 USE_GMAKE=	yes
 BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${WRKSRC}/src
-USE_BISON=	yes
+USE_BISON=	build
 USE_LDCONFIG=	yes
 # get rid of the `size_t' problem in header.y
 USE_GCC=	3.2+
diff --git a/mail/mairix/Makefile b/mail/mairix/Makefile
index 5e8751240358..e672f06173e6 100644
--- a/mail/mairix/Makefile
+++ b/mail/mairix/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mairix
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mairix
@@ -16,7 +17,7 @@ COMMENT=	Indexing and searching in Maildir, MH or mbox folders
 
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
-USE_BISON=	yes
+USE_BISON=	build
 CONFIGURE_ENV=	CC="${CC}" CFLAGS="${CFLAGS}"
 
 MAN1=	mairix.1