Convert USE_BISON to USES= bison

It brings bison as a build dependency in case it is set the following way:
USES= bison or USES= bison:build

it brings bison as a run dependency in case it is set the following way:
USES= bison:run

it brings bison both as a run and build dependency in case it the set the following way:
USES= bison:both

While here trim some headers
Convert some USE_GNOME= gnomehack to USES= pathfix

27 files changed, 43 insertions, 96 deletions

diff --git a/devel/as31/Makefile b/devel/as31/Makefile
index b46b2a2e5022..525557a006fa 100644
--- a/devel/as31/Makefile
+++ b/devel/as31/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	as31
-# Date created:			Nov 21, 2003
-# Whom:				Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
-#
+# Created by: Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
 # $FreeBSD$
-#
 
 PORTNAME=	as31
 PORTVERSION=	2.0.b3
@@ -22,7 +18,7 @@ PLIST_SUB+=	X11=""
 ALL_TARGET=	as31
 PLIST_SUB+=	X11="@comment "
 .endif
-USE_BISON=	build
+USES=		bison
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
diff --git a/devel/avr-gcc-3/Makefile b/devel/avr-gcc-3/Makefile
index d759df29f5a9..e19fbc6d678e 100644
--- a/devel/avr-gcc-3/Makefile
+++ b/devel/avr-gcc-3/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	avr-gcc
-# Date created:		29 Nov 2000
-# Whom:			Joerg Wunsch <joerg@freebsd.org>
-#
+# Created by: Joerg Wunsch <joerg@freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	gcc-3
 PORTVERSION=	3.4.6
@@ -33,7 +29,7 @@ USE_AUTOTOOLS=	autoheader213
 USE_PERL5_BUILD=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_BISON=	build
+USES=		bison
 GNU_CONFIGURE=	yes
 
 CONFLICTS=	avr-gcc-4*
diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile
index 0a9090eb0a18..01b612581b34 100644
--- a/devel/avr-gcc/Makefile
+++ b/devel/avr-gcc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	avr-gcc-devel
-# Date created:		22 Mar 2006
-# Whom:			Joerg Wunsch <joerg@freebsd.org>
-#
+# Created by: Joerg Wunsch <joerg@freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	gcc
 PORTVERSION=	4.5.1
@@ -39,7 +35,7 @@ CONFIGURE_SCRIPT=	../gcc-${PORTVERSION}/configure
 USE_PERL5_BUILD=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_BISON=	build
+USES=		bison
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index fddeade9ede6..29580eda2f6d 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -23,7 +23,7 @@ OPTIONS_DEFINE=	NLS
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING3
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING3.LIB
 
-USE_BISON=	build
+USES=		bison
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/cross-gcc/Makefile b/devel/cross-gcc/Makefile
index fd40b60ada42..bdbd729450fb 100644
--- a/devel/cross-gcc/Makefile
+++ b/devel/cross-gcc/Makefile
@@ -37,7 +37,7 @@ RUN_DEPENDS=	${OURTARGET}-as:${PORTSDIR}/devel/cross-binutils
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_BISON=	build
+USES=		bison
 STRIP=		#empty
 GNU_CONFIGURE=	yes
 ALL_TARGET=	all info
diff --git a/devel/datadraw/Makefile b/devel/datadraw/Makefile
index 21741a8b025e..6d05db853ff6 100644
--- a/devel/datadraw/Makefile
+++ b/devel/datadraw/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	datadraw
-# Date created:			Aug 31, 2007
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	datadraw
 PORTVERSION=	3.1.1
@@ -15,7 +10,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A feature rich persistent database generator
 
-USE_BISON=	build
+USES=		bison
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 ALL_TARGET=	# empty
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 8910813dba1f..c9b1b282b889 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -18,7 +18,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	tmake:${PORTSDIR}/devel/tmake
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
-USE_BISON=	build
+USES=		bison
 USE_ICONV=	yes
 ALL_TARGET=	all
 USE_PERL5=	yes
diff --git a/devel/gecode/Makefile b/devel/gecode/Makefile
index ea866fe2f8c9..9fed535b28d0 100644
--- a/devel/gecode/Makefile
+++ b/devel/gecode/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gecode
-# Date created:				24 January 2011
-# Whom:					roam@FreeBSD.org
-#
+# Created by: roam@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	gecode
 PORTVERSION=	3.7.3
@@ -19,7 +15,7 @@ OPTIONS_DEFINE=	GIST
 GIST_DESC=	Interactive Search Tool (requires Qt)
 
 USE_PERL5_BUILD=yes
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static \
diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index 2015f253a605..a2353d02a333 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -15,13 +15,13 @@ COMMENT=	Generate interface introspection data for GObject libraries
 BUILD_DEPENDS=	cairo-trace:${PORTSDIR}/graphics/cairo
 LIB_DEPENDS=	ffi:${PORTSDIR}/devel/libffi
 
+USES=		bison pathfix
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehier gnomehack glib20 ltverhack
+USE_GNOME=	gnomehier glib20 ltverhack
 USE_PKGCONFIG=	build
 USE_PYTHON=	-2.7
-USE_BISON=	build
 USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
diff --git a/devel/hp48cc/Makefile b/devel/hp48cc/Makefile
index b4996691c7c5..13d1c4078ebe 100644
--- a/devel/hp48cc/Makefile
+++ b/devel/hp48cc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	hp48cc
-# Date created:				Sun Aug 12 04:33:37 EDT 2001
-# Whom:					Patrick Li <pat@databits.net>
-#
+# Created by: Patrick Li <pat@databits.net>
 # $FreeBSD$
-#
 
 PORTNAME=	hp48cc
 PORTVERSION=	1.3
@@ -17,7 +13,7 @@ COMMENT=	C-like compiler that translates input code to the HP48 RPL language
 
 LICENSE=	GPLv2
 
-USE_BISON=	build
+USES=		bison
 GNU_CONFIGURE=	yes
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 
diff --git a/devel/kdevelop-pg-qt/Makefile b/devel/kdevelop-pg-qt/Makefile
index 152dc93cd0c4..87ed8629d3ce 100644
--- a/devel/kdevelop-pg-qt/Makefile
+++ b/devel/kdevelop-pg-qt/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 
 USE_GCC=	4.6+
 USE_BZIP2=	yes
-USE_BISON=	build
+USES=		bison
 USE_KDE4=	automoc4 kdehier kdelibs kdeprefix
 KDE4_BUILDENV=	yes
 USE_QT4=	qmake_build moc_build uic_build rcc_build
diff --git a/devel/kscope/Makefile b/devel/kscope/Makefile
index c9fdd91eb0af..b22f69febee6 100644
--- a/devel/kscope/Makefile
+++ b/devel/kscope/Makefile
@@ -20,7 +20,7 @@ EXPIRATION_DATE=	2013-07-01
 
 DOCSDIR=	${PREFIX}/share/doc/HTML/en/${PORTNAME}
 
-USE_BISON=	build
+USES=		bison
 USE_KDEBASE_VER=3
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index bf587de16bcf..cc1d9206ccb7 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -12,11 +12,11 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A library for creating trees of CORBA IDL files
 
+USES=		bison pathfix
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_BISON=	build
-USE_GNOME=	gnomehack glib20
+USE_GNOME=	glib20
 USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index a5967f0ade47..a29de4dc7791 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -18,13 +18,13 @@ USE_BZIP2=	yes
 
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
+USES=		bison pathfix
 USE_GMAKE=	yes
-USE_BISON=	build
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
-USE_GNOME=	gnomehack intlhack libxml2 orbit2 referencehack
+USE_GNOME=	intlhack libxml2 orbit2 referencehack
 USE_PKGCONFIG=	build
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
diff --git a/devel/libexplain/Makefile b/devel/libexplain/Makefile
index 906923eaef80..5593dff52a85 100644
--- a/devel/libexplain/Makefile
+++ b/devel/libexplain/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	pdfopt:${PORTSDIR}/print/ghostscript9 \
 		gsed:${PORTSDIR}/textproc/gsed
 
 USE_AUTOTOOLS=	libtool
-USE_BISON=	build
+USES=		bison
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
diff --git a/devel/libmimedir/Makefile b/devel/libmimedir/Makefile
index eb0ef6724615..90aad09aaffa 100644
--- a/devel/libmimedir/Makefile
+++ b/devel/libmimedir/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: 	libmimedir
-# Date created:                March 2004
-# Whom:                        Sam Lawrance <boris@brooknet.com.au>
-#
+# Created by: Sam Lawrance <boris@brooknet.com.au>
 # $FreeBSD$
 
 PORTNAME=	libmimedir
@@ -12,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for parsing RFC2425 MIME Directory Profile information
 
-USE_BISON=	build
+USES=		bison
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
diff --git a/devel/libvc/Makefile b/devel/libvc/Makefile
index c0ed0f12d1aa..3f3bcc5fbf67 100644
--- a/devel/libvc/Makefile
+++ b/devel/libvc/Makefile
@@ -12,7 +12,7 @@ COMMENT=	vCard library
 
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
-USE_BISON=	build
+USES=		bison
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/devel/mingw32-gcc/Makefile b/devel/mingw32-gcc/Makefile
index d404ac7dfd2d..35c3917ed899 100644
--- a/devel/mingw32-gcc/Makefile
+++ b/devel/mingw32-gcc/Makefile
@@ -22,7 +22,7 @@ GCCVERSION=	4.7.2
 
 ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 sparc64
 USE_LDCONFIG=	yes
-USE_BISON=	build
+USES=		bison
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
diff --git a/devel/msp430-gcc/Makefile b/devel/msp430-gcc/Makefile
index 0a5f72219cd8..c3bdf43eafea 100644
--- a/devel/msp430-gcc/Makefile
+++ b/devel/msp430-gcc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	msp430-gcc
-# Date created:		15 October 2002
-# Whom:			Lev Serebryakov <lev@serebryakov.spb.ru>
-#
+# Created by: Lev Serebryakov <lev@serebryakov.spb.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	gcc
 PORTVERSION=	${GCCVERSION}.${LTSVERSION}
@@ -51,7 +47,7 @@ PATCH_WRKSRC=	${SRCDIR}
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_BISON=	build
+USES=		bison
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 MAKE_JOBS_SAFE=	yes
diff --git a/devel/ptlib/Makefile b/devel/ptlib/Makefile
index 9126acc47aa9..2267e6a22ba2 100644
--- a/devel/ptlib/Makefile
+++ b/devel/ptlib/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
 CONFLICTS=	pwlib-1.* ptlib-2.6.*
 
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	pkgconfig
diff --git a/devel/ptlib26/Makefile b/devel/ptlib26/Makefile
index 7760b5b6926e..08db889050bf 100644
--- a/devel/ptlib26/Makefile
+++ b/devel/ptlib26/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 CONFLICTS=	pwlib-1.* ptlib-2.4.* ptlib-2.8.*
 
 USE_BZIP2=	yes
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 WANT_GNOME=	yes
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index b883096f865b..93344abf1a9c 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	pwlib
-# Date created:		Fri Aug 22 07:11:44 GMT 2003
-# Whom:			Roger Hardiman <roger@freebsd.org>
-#
+# Created by: Roger Hardiman <roger@freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	pwlib
 PORTVERSION=	1.12.0
@@ -23,7 +19,7 @@ CONFLICTS=	ptlib-2.*
 
 WRKSRC=		${WRKDIR}/ptlib_v${PORTVERSION:S/./_/g}
 
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf
 WANT_GNOME=	yes
diff --git a/devel/py-bison/Makefile b/devel/py-bison/Makefile
index 3aaada69fb00..65966ef6cd3b 100644
--- a/devel/py-bison/Makefile
+++ b/devel/py-bison/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	py-bison
-# Date created:			Aug 23, 2004
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	bison
 PORTVERSION=	0.1.8
@@ -23,7 +18,7 @@ BUILD_DEPENDS=	pyrex>=0.9.6.2:${PORTSDIR}/devel/pyrex
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-USE_BISON=	both
+USES=		bison:both
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGVERSION=	0.1
diff --git a/devel/ruby-rbison/Makefile b/devel/ruby-rbison/Makefile
index e1dd6c09c1c0..bdf6fff82bcc 100644
--- a/devel/ruby-rbison/Makefile
+++ b/devel/ruby-rbison/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	rbison
-# Date created:		2 Nov 2000
-# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
-#
+# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
 # $FreeBSD$
-#
 
 PORTNAME=	rbison
 PORTVERSION=	0.0.7
@@ -16,7 +12,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Generates a Ruby parser class from a Bison-like specification file
 
-USE_BISON=	run
+USES=		bison
 USE_RUBY=	yes
 
 RUBY_SHEBANG_FILES=	${WRKSRC}/rbison
diff --git a/devel/sdts++/Makefile b/devel/sdts++/Makefile
index 9ba467ccd7ee..5c988ed9a52a 100644
--- a/devel/sdts++/Makefile
+++ b/devel/sdts++/Makefile
@@ -14,7 +14,7 @@ COMMENT=	C++ library for SDTS related development
 LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs
 
 USE_DOS2UNIX=	sdts++/io/sio_Utils.cpp
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtoolize aclocal automake autoconf
 LIBTOOLIZE_ARGS=--copy --force
diff --git a/devel/sfslite/Makefile b/devel/sfslite/Makefile
index 3f9e4b60c02e..ebab290ce3ad 100644
--- a/devel/sfslite/Makefile
+++ b/devel/sfslite/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	sfslite
-# Date created:				10 September 2005
-# Whom:					max
-#
+# Created by: max
 # $FreeBSD$
-#
 
 PORTNAME=	sfslite
 PORTVERSION=	1.2.7
@@ -23,7 +19,7 @@ USE_GMAKE=	yes
 #
 # rpcc does not work with byacc, so just require BISON
 #
-USE_BISON=	build
+USES=		bison
 
 #
 # Map X.Y.Z.Q => X.Y
diff --git a/devel/tigcc/Makefile b/devel/tigcc/Makefile
index 74d3cab47471..83b3ddd65189 100644
--- a/devel/tigcc/Makefile
+++ b/devel/tigcc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	tigcc
-# Date created:		15 February 2004
-# Whom:			Ben Haga <tuximus@tuximus.mine.nu>
-#
+# Created by: Ben Haga <tuximus@tuximus.mine.nu>
 # $FreeBSD$
-#
 
 PORTNAME=	tigcc
 PORTVERSION=	0.96.b8
@@ -23,7 +19,7 @@ COMMENT=	C compiler for the TI89, 92, and 92+ calculators
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_BISON=	build
+USES=		bison
 NO_WRKSUBDIR=	yes
 
 do-extract: