14 files changed, 25 insertions, 18 deletions

diff --git a/editors/lfhex/Makefile b/editors/lfhex/Makefile
index aa770abcdfc2..ba07b73fe76f 100644
--- a/editors/lfhex/Makefile
+++ b/editors/lfhex/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	lfhex
 PORTVERSION=	0.3.7.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	http://stoopidsimple.com/files/ \
 		http://home.earthlink.net/~eyekode/data/
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Large file hex editor
 
 USE_QT_VER=	3
-USE_BISON=	yes
+USE_BISON=	build
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index cceb9f7bab7e..feb518a5fc5d 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.4.${SNAPDATE}
+PORTREVISION=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://openoffice.lunarshells.com/sources/ \
@@ -119,7 +120,6 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
-		bison2:${PORTSDIR}/devel/bison2 \
 		bash:${PORTSDIR}/shells/bash \
 		imake:${X_IMAKE_PORT}
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
@@ -127,6 +127,7 @@ BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
 
+USE_BISON=	build
 GNU_CONFIGURE=	yes
 WRKSRC?=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 4de2ebb6d233..56064cadc96a 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -120,7 +120,6 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
-		bison2:${PORTSDIR}/devel/bison2 \
 		bash:${PORTSDIR}/shells/bash \
 		imake:${X_IMAKE_PORT}
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
@@ -128,6 +127,7 @@ BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
 
+USE_BISON=	build
 GNU_CONFIGURE=	yes
 WRKSRC?=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index 9ad88398d8fa..db923ddf7071 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openoffice.org
 PORTVERSION=	1.0.3
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/:moz,ru,src,help \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/1.0.3/:moz,ru,src,help \
@@ -35,7 +35,7 @@ DISTFILES+=	${MOZILLA_PROJECT}:moz ${MOZILLA_SOURCE}:mozsrc
 USE_GNOME=	orbit
 USE_XLIB=	yes
 USE_PERL5=	yes
-USE_BISON=	yes
+USE_BISON=	build
 USE_GMAKE=	yes
 USE_JAVA=	yes
 JAVA_VENDOR=	bsdjava
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index 0454c2abc79f..1956372f2689 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openoffice.org
 PORTVERSION=	1.1.5.${SNAPDATE}
+PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/1.1/ \
 		http://openoffice.lunarshells.com/sources/1.1/ \
@@ -32,7 +33,7 @@ USE_GNOME+=	orbit
 
 USE_XLIB=	yes
 USE_PERL5=	yes
-USE_BISON=	yes
+USE_BISON=	build
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_GNOME+=	gtk20
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index 9cc02c4ec472..b6aee0aa77dd 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openoffice.org
 PORTVERSION=	1.1.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/1.1/ \
 		http://openoffice.lunarshells.com/sources/1.1/ \
@@ -31,7 +31,7 @@ USE_GNOME+=	orbit
 
 USE_XLIB=	yes
 USE_PERL5=	yes
-USE_BISON=	yes
+USE_BISON=	build
 USE_GMAKE=	yes
 USE_GNOME+=	gtk20
 WITHOUT_CPU_CFLAGS=	true
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 783889674361..cd778659d59d 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.3.${SNAPDATE}
+PORTREVISION=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://openoffice.lunarshells.com/sources/ \
@@ -119,7 +120,6 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
-		bison2:${PORTSDIR}/devel/bison2 \
 		bash:${PORTSDIR}/shells/bash \
 		imake:${X_IMAKE_PORT}
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
@@ -127,6 +127,7 @@ BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
 
+USE_BISON=	build
 GNU_CONFIGURE=	yes
 WRKSRC?=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index cceb9f7bab7e..feb518a5fc5d 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.4.${SNAPDATE}
+PORTREVISION=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://openoffice.lunarshells.com/sources/ \
@@ -119,7 +120,6 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
-		bison2:${PORTSDIR}/devel/bison2 \
 		bash:${PORTSDIR}/shells/bash \
 		imake:${X_IMAKE_PORT}
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
@@ -127,6 +127,7 @@ BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
 
+USE_BISON=	build
 GNU_CONFIGURE=	yes
 WRKSRC?=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 4de2ebb6d233..56064cadc96a 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -120,7 +120,6 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
-		bison2:${PORTSDIR}/devel/bison2 \
 		bash:${PORTSDIR}/shells/bash \
 		imake:${X_IMAKE_PORT}
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
@@ -128,6 +127,7 @@ BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
 
+USE_BISON=	build
 GNU_CONFIGURE=	yes
 WRKSRC?=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 783889674361..cd778659d59d 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.3.${SNAPDATE}
+PORTREVISION=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://openoffice.lunarshells.com/sources/ \
@@ -119,7 +120,6 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
-		bison2:${PORTSDIR}/devel/bison2 \
 		bash:${PORTSDIR}/shells/bash \
 		imake:${X_IMAKE_PORT}
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
@@ -127,6 +127,7 @@ BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
 
+USE_BISON=	build
 GNU_CONFIGURE=	yes
 WRKSRC?=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index cceb9f7bab7e..feb518a5fc5d 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.4.${SNAPDATE}
+PORTREVISION=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://openoffice.lunarshells.com/sources/ \
@@ -119,7 +120,6 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
-		bison2:${PORTSDIR}/devel/bison2 \
 		bash:${PORTSDIR}/shells/bash \
 		imake:${X_IMAKE_PORT}
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
@@ -127,6 +127,7 @@ BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
 
+USE_BISON=	build
 GNU_CONFIGURE=	yes
 WRKSRC?=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 4de2ebb6d233..56064cadc96a 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -120,7 +120,6 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
-		bison2:${PORTSDIR}/devel/bison2 \
 		bash:${PORTSDIR}/shells/bash \
 		imake:${X_IMAKE_PORT}
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
@@ -128,6 +127,7 @@ BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
 
+USE_BISON=	build
 GNU_CONFIGURE=	yes
 WRKSRC?=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index cceb9f7bab7e..feb518a5fc5d 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.4.${SNAPDATE}
+PORTREVISION=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://openoffice.lunarshells.com/sources/ \
@@ -119,7 +120,6 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
-		bison2:${PORTSDIR}/devel/bison2 \
 		bash:${PORTSDIR}/shells/bash \
 		imake:${X_IMAKE_PORT}
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
@@ -127,6 +127,7 @@ BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
 
+USE_BISON=	build
 GNU_CONFIGURE=	yes
 WRKSRC?=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
diff --git a/editors/xmleditor/Makefile b/editors/xmleditor/Makefile
index e287c677dca4..6f3432df793c 100644
--- a/editors/xmleditor/Makefile
+++ b/editors/xmleditor/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xmleditor
 PORTVERSION=	0.5.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,7 +18,7 @@ COMMENT=	XML editor
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_BISON=	yes
+USE_BISON=	build
 USE_GNOME=	gnomehack libglade
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15