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
svn path=/head/; revision=313635
2013-03-08 11:32:11 +00:00 · 2013-03-08 11:32:11 +00:00 · 9250d94365 · 2021-03-31 03:12:20 +00:00
commit 9250d94365
parent 09fa4f3713
209 changed files with 412 additions and 879 deletions
--- a/Mk/Uses/bison.mk
+++ b/Mk/Uses/bison.mk
@ -0,0 +1,27 @@
+# $FreeBSD$
+#
+# handle dependency on the bison port
+#
+# MAINTAINER: portmgr@FreeBSD.org
+#
+.if !defined(_INCLUDE_BISON_MK)
+_INCLUDE_BISON_MK=	yes
+
+_BISON_DEPENDS=	bison:${PORTSDIR}/devel/bison
+
+.if !defined(bison_ARGS)
+BUILD_DEPENDS+=	${_BISON_DEPENDS}
+.else
+.if ${bison_ARGS} == "build"
+BUILD_DEPENDS+=	${_BUILD_DEPENDS}
+.elif ${bison_ARGS} == "run"
+RUN_DEPENDS+=	${_BUILD_DEPENDS}
+.elif ${bison_ARGS} == "both"
+BUILD_DEPENDS+=	${_BISON_DEPENDS}
+RUN_DEPENDS+=	${_BUILD_DEPENDS}
+.else
+IGNORE=	Bad usage of USES= bison
+.endif
+.endif
+
+.endif
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@ -36,7 +36,7 @@ FLTK_DESC=	Build FLTK plugin and GUI
 CONFLICTS_INSTALL=	outguess-*

 USE_PYTHON=	2.6+
-USE_BISON=	build
+USES=		bison
 USE_GETTEXT=	yes
 USE_SCONS=	yes
 SCONS_BUILDENV=	PATH=${LOCALBASE}/bin:$$PATH
--- a/audio/denemo/Makefile
+++ b/audio/denemo/Makefile
@ -26,7 +26,7 @@ OPTIONS_DEFINE=	LILYPOND DOCS EXAMPLES
 LILYPOND_DESC=	Install LilyPond (Printing)

 USE_GNOME=	gtk20 gtksourceview2 librsvg2 libxml2
-USE_BISON=	build
+USES=		bison
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-jack \
 		--disable-portmidi \
--- a/audio/rezound/Makefile
+++ b/audio/rezound/Makefile
@ -14,7 +14,7 @@ LICENSE=	GPLv2

 LIB_DEPENDS=	FOX-1.4:${PORTSDIR}/x11-toolkits/fox14

-USE_BISON=	build
+USES=		bison
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
--- a/audio/sfront/Makefile
+++ b/audio/sfront/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	sfront
-# Date created:				Nov 4, 2001
-# Whom:					ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#

 PORTNAME=	sfront
 PORTVERSION=	0.99
@ -15,7 +11,7 @@ COMMENT=	A translator that converts MP4-SA files into efficient C programs

 LICENSE=	BSD

-USE_BISON=	build
+USES=		bison
 MAKE_JOBS_SAFE=	yes

 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
--- a/biology/chemeq/Makefile
+++ b/biology/chemeq/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	Chemeq
-# Date created:				31 May 2000
-# Whom:					Ryo MIYAMOTO <rmiya@cc.hirosaki-u.ac.jp>
-#
+# Created by: Ryo MIYAMOTO <rmiya@cc.hirosaki-u.ac.jp>
 # $FreeBSD$
-#

 PORTNAME=	chemeq
 PORTVERSION=	1.50
@ -19,7 +15,7 @@ COMMENT=	Outputs LaTeX code for chemical reaction
 MAKE_ARGS=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
 WRKSRC=		${WRKDIR}/${PORTNAME}-1.5

-USE_BISON=	build
+USES=		bison

 MAN1=		chemeq.1

--- a/cad/alliance/Makefile
+++ b/cad/alliance/Makefile
@ -1,7 +1,4 @@
-# New ports collection makefile for:	alliance
-# Date created:		6 May 2004
-# Whom:			hrs
-#
+# Created by: hrs
 # $FreeBSD$

 PORTNAME=	alliance
@ -23,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-5.0
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message

-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 USE_MOTIF=	yes

--- a/cad/brlcad/Makefile
+++ b/cad/brlcad/Makefile
@ -26,7 +26,7 @@ USE_GL=		gl glu
 USE_XORG=	ice inputproto sm x11 xau xdamage xdmcp xext xfixes xft xi \
 		xproto xrender xscrnsaver xt xxf86vm
 USE_GMAKE=	yes
-USE_BISON=	build
+USES=		bison
 USE_TCL=	85
 USE_TK=		85
 USE_LDCONFIG=	yes
--- a/cad/iverilog/Makefile
+++ b/cad/iverilog/Makefile
@ -1,10 +1,5 @@
-# ex:ts=8
-# New ports collection makefile for:	iverilog
-# Date created:		Feb 13, 2001
-# Whom:			Ying-Chieh Liao <ijliao@FreeBSD.org>
-#
+# Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
 # $FreeBSD$
-#

 PORTNAME=	iverilog
 PORTVERSION=	0.9.6
@ -19,7 +14,7 @@ COMMENT=	A Verilog simulation and synthesis tool
 LICENSE=	GPLv2

 GNU_CONFIGURE=	yes
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes

 CONFIGURE_ARGS=	--disable-suffix
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@ -22,7 +22,7 @@ LIB_DEPENDS=	itcl.${ITCL_VER}:${PORTSDIR}/lang/itcl		\
 		dps.0:${PORTSDIR}/x11/dgs

 USE_BZIP2=	yes
-USE_BISON=	build
+USES=		bison
 USE_TK=		84+
 USE_TCL_BUILD=	84+
 USE_TCL_RUN=	84+
--- a/cad/p5-Verilog-Perl/Makefile
+++ b/cad/p5-Verilog-Perl/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	Verilog-Perl
-# Date created:		11 Apr 2009
-# Whom:			Otacilio de Araujo Ramos Neto <otacilio.neto@ee.ufcg.edu.br>
-#
+# Created by: Otacilio de Araujo Ramos Neto <otacilio.neto@ee.ufcg.edu.br>
 # $FreeBSD$
-#

 PORTNAME=	Verilog-Perl
 PORTVERSION=	3.316
@ -18,7 +14,7 @@ BUILD_DEPENDS=	flex>=2.5.35:${PORTSDIR}/textproc/flex

 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_BISON=	build
+USES=		bison

 PERL_CONFIGURE=	yes

--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@ -23,9 +23,9 @@ LIB_DEPENDS=	soup-2.4:${PORTSDIR}/devel/libsoup \

 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_BISON=	build
+USES=		bison pathfix
 USE_GETTEXT=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack ltverhack ltasneededhack gconf2 \
+USE_GNOME=	gnomeprefix intlhack ltverhack ltasneededhack gconf2 \
 		libxml2
 USE_OPENLDAP=	yes
 USE_AUTOTOOLS=	libtool
--- a/databases/firebird20-server/Makefile
+++ b/databases/firebird20-server/Makefile
@ -17,7 +17,7 @@ LIB_DEPENDS=	icuuc:${PORTSDIR}/devel/icu

 LATEST_LINK=	${PORTNAME}20${PKGNAMESUFFIX}

-USE_BISON=	build
+USES=		bison
 USE_BZIP2=	yes
 USE_GCC=	any
 USE_GMAKE=	yes
--- a/databases/firebird21-server/Makefile
+++ b/databases/firebird21-server/Makefile
@ -17,7 +17,7 @@ LIB_DEPENDS=	icuuc:${PORTSDIR}/devel/icu

 LATEST_LINK=	${PORTNAME}21${PKGNAMESUFFIX}

-USE_BISON=	build
+USES=		bison
 USE_BZIP2=	yes
 USE_GCC=	any
 USE_GMAKE=	yes
--- a/databases/firebird25-server/Makefile
+++ b/databases/firebird25-server/Makefile
@ -17,7 +17,7 @@ LIB_DEPENDS=	icuuc:${PORTSDIR}/devel/icu

 LATEST_LINK=	${PORTNAME}25${PKGNAMESUFFIX}

-USE_BISON=	build
+USES=		bison
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
--- a/databases/mdbtools/Makefile
+++ b/databases/mdbtools/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	mdbtools
-# Date created:				25 April 2001
-# Whom:	      				Anders Nordby <anders@fix.no>
-#
+# Created by: Anders Nordby <anders@fix.no>
 # $FreeBSD$
-#

 PORTNAME=	mdbtools
 PORTVERSION=	0.5
@ -32,7 +28,8 @@ MAN1=		mdb-ver.1 mdb-tables.1 mdb-schema.1 mdb-sql.1 mdb-export.1

 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 USE_XORG=	x11
-USE_GNOME+=	gnomeprefix gnomehack libgnomeui
+USES+=		pathfix
+USE_GNOME+=	gnomeprefix libgnomeui
 PKGNAMESUFFIX=	-gnome
 .endif

--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	MySQL-server
-# Date created:				Fri Apr 11 10:06:26 CET 2003
-# Whom:					Alex Dupre <sysadmin@alexdupre.com>
-#
+# Created by: Alex Dupre <sysadmin@alexdupre.com>
 # $FreeBSD$
-#

 PORTNAME?=	mysql
 PORTVERSION=	4.1.25
@ -105,7 +101,7 @@ USE_RC_SUBR=	mysql-server
 USERS=		mysql
 GROUPS=		mysql

-USE_BISON=	build
+USES+=		bison

 .if defined(WITH_NDB)
 PLIST_SUB+=	NDB=""
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@ -14,7 +14,7 @@ COMMENT?=	Multithreaded SQL database (server)

 SLAVEDIRS=	databases/percona55-client
 USE_CMAKE=	yes
-USE_BISON=	build
+USES=		bison
 MAKE_JOBS_SAFE=	yes

 OPTIONS_DEFINE=	OPENSSL FASTMTX
--- a/databases/postgis/Makefile
+++ b/databases/postgis/Makefile
@ -17,7 +17,7 @@ RUN_DEPENDS=	postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server

 CONFLICTS=	postgis-2.*

-USE_BISON=	build
+USES=		bison
 USE_GNOME=	libxml2
 USE_PGSQL=	yes
 USE_GMAKE=	yes
--- a/databases/postgresql-plproxy/Makefile
+++ b/databases/postgresql-plproxy/Makefile
@ -1,9 +1,5 @@
-# Ports collection makefile for:  postgresql-plproxy
-# Date created:    27 July 2007
-# Whom:            Sergey Skvortsov <skv@protey.ru>
-#
+# Created by: Sergey Skvortsov <skv@protey.ru>
 # $FreeBSD$
-#

 PORTNAME=	plproxy
 PORTVERSION=	2.4
@ -16,7 +12,7 @@ COMMENT=	PL/Proxy is database partitioning system

 USE_PGSQL=	yes
 USE_GMAKE=	yes
-USE_BISON=	build
+USES=		bison

 PORTSCOUT=	site:http://pgfoundry.org/frs/?group_id=1000207

--- a/databases/postgresql83-contrib/Makefile
+++ b/databases/postgresql83-contrib/Makefile
@ -1,7 +1,5 @@
 # Created by:	Palle Girgensohn <girgen@pingpong.net>
-#
 # $FreeBSD$
-#

 PORTNAME=	postgresql
 PKGNAMESUFFIX=	-contrib
@ -14,7 +12,7 @@ USE_PGSQL=	yes
 DEFAULT_PGSQL_VER=83
 MASTERDIR=	${.CURDIR}/../postgresql${DEFAULT_PGSQL_VER}-server

-USE_BISON=	build
+USES=		bison

 BUILD_DIRS=	src/port contrib
 INSTALL_DIRS=	contrib
--- a/databases/postgresql84-contrib/Makefile
+++ b/databases/postgresql84-contrib/Makefile
@ -1,7 +1,5 @@
 # Created by:	Palle Girgensohn <girgen@pingpong.net>
-#
 # $FreeBSD$
-#

 PORTNAME=	postgresql
 PKGNAMESUFFIX=	-contrib
@ -14,7 +12,7 @@ USE_PGSQL=	yes
 DEFAULT_PGSQL_VER=84
 MASTERDIR=	${.CURDIR}/../postgresql${DEFAULT_PGSQL_VER}-server

-USE_BISON=	build
+USES=		bison

 BUILD_DIRS=	src/port contrib
 INSTALL_DIRS=	contrib
--- a/databases/postgresql90-contrib/Makefile
+++ b/databases/postgresql90-contrib/Makefile
@ -1,7 +1,5 @@
 # Created by:	Palle Girgensohn <girgen@pingpong.net>
-#
 # $FreeBSD$
-#

 PORTNAME=	postgresql
 PORTREVISION=	0
@ -18,7 +16,7 @@ USE_PGSQL=	yes
 DEFAULT_PGSQL_VER=90
 MASTERDIR=	${.CURDIR}/../postgresql${DEFAULT_PGSQL_VER}-server

-USE_BISON=	build
+USES=		bison

 BUILD_DIRS=	src/port contrib
 INSTALL_DIRS=	contrib
--- a/databases/postgresql91-contrib/Makefile
+++ b/databases/postgresql91-contrib/Makefile
@ -1,5 +1,4 @@
 # Created by:	Palle Girgensohn <girgen@pingpong.net>
-#
 # $FreeBSD$

 PORTNAME=	postgresql
@ -16,7 +15,7 @@ USE_PGSQL=	yes
 DEFAULT_PGSQL_VER=91
 MASTERDIR=	${.CURDIR}/../postgresql${DEFAULT_PGSQL_VER}-server

-USE_BISON=	build
+USES=		bison

 BUILD_DIRS=	src/port contrib
 INSTALL_DIRS=	contrib
--- a/databases/postgresql92-contrib/Makefile
+++ b/databases/postgresql92-contrib/Makefile
@ -1,5 +1,4 @@
 # Created by:			Palle Girgensohn <girgen@pingpong.net>
-#
 # $FreeBSD$

 PORTNAME=	postgresql
@ -16,7 +15,7 @@ USE_PGSQL=	yes
 DEFAULT_PGSQL_VER=92
 MASTERDIR=	${.CURDIR}/../postgresql${DEFAULT_PGSQL_VER}-server

-USE_BISON=	build
+USES=		bison

 BUILD_DIRS=	src/port contrib
 INSTALL_DIRS=	contrib
--- a/databases/slony1/Makefile
+++ b/databases/slony1/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	slony1
-# Date created:		20 Jun 2004
-# Whom:			Radim Kolar
-#
+# Created by: Radim Kolar
 # $FreeBSD$
-#

 PORTNAME=	slony1
 PORTVERSION=	1.2.23
@ -18,7 +14,7 @@ COMMENT=	PostgreSQL master to multiple replicas replication system
 BUILD_DEPENDS=	${LOCALBASE}/bin/postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server

 GNU_CONFIGURE=	yes
-USE_BISON=	build
+USES=		bison
 USE_PGSQL=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
--- a/databases/slony1v2/Makefile
+++ b/databases/slony1v2/Makefile
@ -16,7 +16,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
 		${LOCALBASE}/bin/postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server

 GNU_CONFIGURE=	yes
-USE_BISON=	build
+USES=		bison
 USE_PGSQL=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	KDE PIM
-# Date created:				2 March 2001
-# Whom:					Dmitry Sivachenko <demon@FreeBSD.org>
-#
+# Created by: Dmitry Sivachenko <demon@FreeBSD.org>
 # $FreeBSD$
-#

 PORTNAME=	kdepim
 PORTVERSION=	${KDE_VERSION}
@ -30,7 +26,7 @@ PREFIX=		${KDE_PREFIX}
 _NO_KDE_FINAL=	yes

 USE_BZIP2=	yes
-USE_BISON=	build
+USES=		bison
 USE_OPENSSL=	yes
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
--- a/deskutils/tpb/Makefile
+++ b/deskutils/tpb/Makefile
@ -1,7 +1,4 @@
-# New ports collection makefile for:	tpb
-# Date created:				Fri Jun 10 00:38:03 CEST 2005
-# Whom:					Markus Brueffer <markus@FreeBSD.org>
-#
+# Created by: Markus Brueffer <markus@FreeBSD.org>
 # $FreeBSD$

 PORTNAME=	tpb
@ -21,7 +18,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_ICONV=	yes
-USE_BISON=	build
+USES=		bison

 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE}

--- 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}"
--- 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*
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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 \
--- 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
--- 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}"

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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:
--- a/editors/lfhex/Makefile
+++ b/editors/lfhex/Makefile
@ -1,10 +1,5 @@
-# ex:ts=8
-# New ports collection makefile for:	lfhex
-# Date created:			Jul 6, 2001
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#

 PORTNAME=	lfhex
 PORTVERSION=	0.42
@ -18,7 +13,7 @@ COMMENT=	Large file hex editor
 LICENSE=	GPLv2

 USE_QT4=	corelib gui moc_build qmake_build rcc_build
-USE_BISON=	build
+USES=		bison
 MAKE_JOBS_SAFE=	yes

 WRKSRC=		${WRKDIR}/${DISTNAME}/src
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@ -81,7 +81,7 @@ USE_BDB=	yes
 USE_PERL5_BUILD=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_BISON=	build
+USES=		bison
 WANT_GNOME=	yes

 USE_XORG=	xaw xrandr
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@ -144,7 +144,7 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww

 USE_AUTOTOOLS=	autoconf
-USE_BISON=	build
+USES=		bison
 GNU_CONFIGURE=	yes
 WRKSRC?=	${WRKDIR}/ooo/main
 BASH?=		${PREFIX}/bin/bash
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@ -140,7 +140,7 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww

 USE_AUTOTOOLS=	autoconf
-USE_BISON=	build
+USES=		bison
 GNU_CONFIGURE=	yes
 WRKSRC?=	${WRKDIR}/aoo-${PORTVERSION}/main
 BASH?=		${PREFIX}/bin/bash
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@ -83,7 +83,7 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-client

-USE_BISON=	build
+USES+=		bison
 GNU_CONFIGURE=	yes
 WRKSRC?=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
--- a/editors/xmleditor/Makefile
+++ b/editors/xmleditor/Makefile
@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	xmleditor
-# Date created:			Jan 18, 2003
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#

 PORTNAME=	xmleditor
 PORTVERSION=	0.5.3
@ -17,8 +12,8 @@ COMMENT=	XML editor

 WRKSRC=		${WRKDIR}/${PORTNAME}

-USE_BISON=	build
-USE_GNOME=	gnomehack libglade
+USES=		bison pathfix
+USE_GNOME=	libglade
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/emulators/nonpareil/Makefile
+++ b/emulators/nonpareil/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:   nonpareil
-# Date created:                        24 Jul 2006
-# Whom:                                trasz <trasz@pin.if.uz.zgora.pl>
-#
+# Created by: trasz <trasz@pin.if.uz.zgora.pl>
 # $FreeBSD$
-#

 PORTNAME=	nonpareil
 PORTVERSION=	0.79
@ -19,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING

 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png

-USE_BISON=	build
+USES=		bison
 USE_GNOME=	gtk20 libxml2
 USE_SDL=	sdl
 USE_SCONS=	yes
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@ -51,7 +51,7 @@ MAN1=		msiexec.1 notepad.1 regedit.1 regsvr32.1 widl.1 wine.1 \
 MLINKS=		winegcc.1 winecpp.1 \
 		winegcc.1 wineg++.1
 ONLY_FOR_ARCHS=	i386
-USE_BISON=	build
+USES=		bison
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GL=		glu
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@ -49,7 +49,7 @@ MAN1=		msiexec.1 notepad.1 regedit.1 regsvr32.1 widl.1 wine.1 \
 MLINKS=		winegcc.1 winecpp.1 \
 		winegcc.1 wineg++.1
 ONLY_FOR_ARCHS=	i386
-USE_BISON=	build
+USES=		bison
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GL=		glu
--- a/french/aster/Makefile
+++ b/french/aster/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	aster
-# Date created:		Thu Jun 26 2003
-# Whom:			thierry@pompo.net
-#
+# Created by: thierry@pompo.net
 # $FreeBSD$
-#

 PORTNAME=		aster
 DISTVERSION=		${ASTER_DISTVERSION}
@ -50,7 +46,7 @@ MANUAL_PACKAGE_BUILD=	runaway python on pointyhat

 LICENSE=	GPLv2

-USE_BISON=	build
+USES=		bison
 USE_PYTHON=	2.6-2.7	# >2.5 and <3.0
 HAS_CONFIGURE=	yes
 REINPLACE_ARGS=	-i ""
--- a/games/flobopuyo/Makefile
+++ b/games/flobopuyo/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	flobopuyo
-# Date created:		24 Feb 2006
-# Whom:			Dmitry Marakasov <amdmi3@amdmi3.ru>
-#
+# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru>
 # $FreeBSD$
-#

 PORTNAME=	flobopuyo
 PORTVERSION=	0.20
@ -16,7 +12,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Clone of the famous PuyoPuyo

-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 USE_SDL=	sdl mixer image
 MAKE_JOBS_SAFE=	yes
--- a/games/kaid/Makefile
+++ b/games/kaid/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	kaid
-# Date created:				18 Feb 2005
-# Whom:					Sebastiaan van Erk
-#
+# Created by: Sebastiaan van Erk
 # $FreeBSD$
-#

 PORTNAME=		kaid
 PORTVERSION=		7.0.0.4b
@ -19,7 +15,7 @@ COMMENT=		XLink Kai tunneling server

 NO_WRKSUBDIR=		yes
 USE_GMAKE=		yes
-USE_BISON=		build
+USES=			bison
 USE_ZIP=		yes
 CC=			gcc
 CPP=			g++
--- a/games/noegnud-littlehack/Makefile
+++ b/games/noegnud-littlehack/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	noegnud-littlehack
-# Date created:				7 April 2004
-# Whom:					Leland Wang <llwang@infor.org>
-#
+# Created by: Leland Wang <llwang@infor.org>
 # $FreeBSD$
-#

 PORTNAME=	noegnud
 PORTVERSION=	0.8.3
@ -22,7 +18,7 @@ COMMENT=	The noeGNUd UI for the LittleHack variation of Nethack
 RUN_DEPENDS=	${LOCALBASE}/share/${NOEGNUDVERSION}/data/gui:${PORTSDIR}/games/noegnud-data

 NOEGNUDVERSION=	${PORTNAME}-0.8.0
-USE_BISON=	build
+USES=		bison
 USE_GL=		yes
 WANT_SDL=	yes
 USE_SDL=	sdl image mixer
--- a/games/noegnud-nethack-deet/Makefile
+++ b/games/noegnud-nethack-deet/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	noegnud-nethack-deet
-# Date created:				7 April 2004
-# Whom:					Leland Wang <llwang@infor.org>
-#
+# Created by: Leland Wang <llwang@infor.org>
 # $FreeBSD$
-#

 PORTNAME=	noegnud
 PORTVERSION=	0.8.3
@ -22,7 +18,7 @@ COMMENT=	The noeGNUd UI for Nethack with DeeT's hack font patch
 RUN_DEPENDS=	${LOCALBASE}/share/${NOEGNUDVERSION}/data/gui:${PORTSDIR}/games/noegnud-data

 NOEGNUDVERSION=	${PORTNAME}-0.8.0
-USE_BISON=	build
+USES=		bison
 USE_GL=		yes
 WANT_SDL=	yes
 USE_SDL=	sdl image mixer
--- a/games/noegnud-nethack/Makefile
+++ b/games/noegnud-nethack/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	noegnud-nethack
-# Date created:				7 April 2004
-# Whom:					Leland Wang <llwang@infor.org>
-#
+# Created by: Leland Wang <llwang@infor.org>
 # $FreeBSD$
-#

 PORTNAME=	noegnud
 PORTVERSION=	0.8.3
@ -22,7 +18,7 @@ COMMENT=	The noeGNUd UI for the vanilla Nethack
 RUN_DEPENDS=	${LOCALBASE}/share/${NOEGNUDVERSION}/data/gui:${PORTSDIR}/games/noegnud-data

 NOEGNUDVERSION=	${PORTNAME}-0.8.0
-USE_BISON=	build
+USES=		bison
 USE_GL=		yes
 WANT_SDL=	yes
 USE_SDL=	sdl image mixer
--- a/games/noegnud-slashem/Makefile
+++ b/games/noegnud-slashem/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	noegnud-slashem
-# Date created:				7 April 2004
-# Whom:					Leland Wang <llwang@infor.org>
-#
+# Created by: Leland Wang <llwang@infor.org>
 # $FreeBSD$
-#

 PORTNAME=	noegnud
 PORTVERSION=	0.8.3
@ -22,7 +18,7 @@ COMMENT=	The noeGNUd UI for the SLASH'EM variant of Nethack
 RUN_DEPENDS=	${LOCALBASE}/share/${NOEGNUDVERSION}/data/gui:${PORTSDIR}/games/noegnud-data

 NOEGNUDVERSION=	${PORTNAME}-0.8.0
-USE_BISON=	build
+USES=		bison
 USE_GL=		yes
 WANT_SDL=	yes
 USE_SDL=	sdl image mixer
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	QuakeForge
-# Date created:		4 January 2000
-# Whom:			darius@dons.net.au
-#
+# Created by: darius@dons.net.au
 # $FreeBSD$
-#

 PORTNAME=	quakeforge
 PORTVERSION=	0.5.5
@ -21,7 +17,7 @@ NOT_FOR_ARCHS=	sparc64
 NOT_FOR_ARCHS_REASON=	generated Quake C compiler (qfcc) does not work
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
@ -31,13 +27,17 @@ CONFIGURE_ARGS+=--with-global-cfg=${PREFIX}/etc/quakeforge.conf \
 		--with-sharepath=${DATADIR} \
 		--disable-optimize

-OPTIONS=	CLIENTS "Build clients" on \
-		OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
-		SDL "Build SDL client" off \
-		SERVERS "Build dedicated servers" on \
-		SKYBOXES "Install skyboxes pak" off \
-		VORBIS "Enable Ogg Vorbis support in clients" off \
-		XMMS "Enable XMMS support in clients" off
+OPTIONS_DEFINE=		CLIENTS OPTIMIZED_CFLAGS SDL SERVERS SKYBOXES VORBIS \
+			XMMS DOCS
+
+OPTIONS_DEFAULT=	CLIENTS OPTIMIZED_CFLAGS SERVERS DOCS
+
+CLIENTS_DESC=		Clients
+SDL_DESC=		SDL client
+SERVERS_DESC=		Dedicated servers
+SKYBOXES_DESC=		Install skyboxes pak
+VORBIS_DESC=		Ogg Vorbis support in clients
+XMMS_DESC=		XMMS support in clients

 MAN1=		pak.1 qfcc.1 qflight.1 qfvis.1 wad.1
 SUB_FILES=	pkg-message
@ -46,14 +46,14 @@ DATADIR=	${Q1DIR}

 .include "${.CURDIR}/../quake-data/Makefile.include"

-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

-.if !defined(WITHOUT_CLIENTS)
+.if ${PORT_OPTIONS:MCLIENTS}
 USE_GL=		yes
 USE_XORG=	x11 xt
 PLIST_SUB+=	CLIENTS=""

-.if defined(WITH_SDL)
+.if ${PORT_OPTIONS:MSDL}
 USE_SDL=	sdl
 CONFIGURE_ARGS+=--with-sdl=${LOCALBASE}
 PLIST_SUB+=	SDL=""
@ -62,7 +62,7 @@ CONFIGURE_ARGS+=--disable-sdl
 PLIST_SUB+=	SDL="@comment "
 .endif

-.if defined(WITH_VORBIS)
+.if ${PORT_OPTIONS:MVORBIS}
 LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
 CONFIGURE_ARGS+=--with-ogg=${LOCALBASE} --with-vorbis=${LOCALBASE}
 PLIST_SUB+=	VORBIS=""
@ -71,7 +71,7 @@ CONFIGURE_ARGS+=--disable-ogg --disable-vorbis
 PLIST_SUB+=	VORBIS="@comment "
 .endif

-.if defined(WITH_XMMS)
+.if ${PORT_OPTIONS:MXMMS}
 LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
 CONFIGURE_ARGS+=--with-xmms-prefix=${LOCALBASE}
 PLIST_SUB+=	XMMS=""
@ -83,9 +83,9 @@ PLIST_SUB+=	XMMS="@comment "
 .else
 CONFIGURE_ARGS+=--with-clients=""
 PLIST_SUB+=	CLIENTS="@comment "
-.endif	# WITH_CLIENTS
+.endif

-.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CFLAGS+=	-O3 -funroll-loops -fomit-frame-pointer -fno-common \
 		-fexpensive-optimizations -fstrict-aliasing
 .   if ${ARCH} != "alpha"
@ -93,14 +93,14 @@ CFLAGS+=	-ffast-math
 .   endif
 .endif

-.if !defined(WITHOUT_SERVERS)
+.if ${PORT_OPTIONS:MSERVERS}
 PLIST_SUB+=	SERVERS=""
 .else
 CONFIGURE_ARGS+=--with-servers=""
 PLIST_SUB+=	SERVERS="@comment "
 .endif

-.if defined(WITH_SKYBOXES)
+.if ${PORT_OPTIONS:MSKYBOXES}
 MASTER_SITES+=	http://www.quakeforge.net/files/:qf
 DISTFILES+=	skyboxes.pak:qf
 PLIST_SUB+=	SKYBOXES=""
@ -109,10 +109,10 @@ PLIST_SUB+=	SKYBOXES="@comment "
 .endif

 post-install:
-.if defined(WITH_SKYBOXES)
+.if ${PORT_OPTIONS:MSKYBOXES}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/skyboxes.pak ${DATADIR}/QF
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .   for f in *.txt *.q1 *.q2 *.ico *.gif *.fig *.h CodingStyle
 	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
@ -123,4 +123,4 @@ post-install:
 .endif
 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/games/stonesoup/Makefile
+++ b/games/stonesoup/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	dcss
-# Date created:		2008-07-11
-# Whom:			Tobias Rehbein <tobias.rehbein@web.de>
-#
+# Created by: Tobias Rehbein <tobias.rehbein@web.de>
 # $FreeBSD$
-#

 PORTNAME=	stonesoup
 PORTVERSION=	0.11.1
@ -19,7 +15,7 @@ LICENSE_FILE=	${WRKDIR}/stone_soup-${PORTVERSION}/licence.txt

 USE_SQLITE=	yes
 USE_XZ=		yes
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 USE_LUA=	5.1
 USE_PERL5_BUILD=	yes
--- a/games/warzone2100/Makefile
+++ b/games/warzone2100/Makefile
@ -26,7 +26,7 @@ LIB_DEPENDS=	physfs:${PORTSDIR}/devel/physfs \
 RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu

 USE_XZ=		yes
-USE_BISON=	build
+USES=		bison
 GNU_CONFIGURE=	yes
 USE_OPENAL=	al
 USE_GL=		yes
--- a/games/windstille/Makefile
+++ b/games/windstille/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	windstille
-# Date created:		14 Jun 2007
-# Whom:			Dmitry Marakasov <amdmi3@amdmi3.ru>
-#
+# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru>
 # $FreeBSD$
-#

 PORTNAME=	windstille
 PORTVERSION=	0.3.0
@ -27,7 +23,7 @@ USE_SCONS=	yes
 USE_OPENAL=	al
 USE_GL=		glew
 USE_SDL=	sdl image
-USE_BISON=	build
+USES=		bison
 MAKE_JOBS_SAFE=	yes

 post-extract:
--- a/graphics/ender/Makefile
+++ b/graphics/ender/Makefile
@ -16,9 +16,9 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_BISON=	build
+USES=		bison pathfix
 USE_EFL=	eina enesim libtool_hack
-USE_GNOME=	gnomehack pkgconfig
+USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes

 CONFIGURE_ARGS=	--disable-static
--- a/graphics/flasm/Makefile
+++ b/graphics/flasm/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	flasm
-# Date created:		22 January 2002
-# Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
-#
+# Created by: Jun Kuriyama <kuriyama@FreeBSD.org>
 # $FreeBSD$
-#

 PORTNAME=	flasm
 PORTVERSION=	1.62
@ -20,7 +16,7 @@ PLIST_FILES=	bin/flasm
 USE_ZIP=	YES
 USE_GMAKE=	YES
 USE_DOS2UNIX=	YES
-USE_BISON=	build
+USES=		bison
 NO_WRKSUBDIR=	YES
 MAKE_ARGS=	CFLAGS="${CFLAGS}"

--- a/graphics/fractorama/Makefile
+++ b/graphics/fractorama/Makefile
@ -16,7 +16,7 @@ COMMENT=	Fractal generation program
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff

 USE_QT_VER=	3
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 MAKE_JOBS_UNSAFE=	yes

--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@ -17,7 +17,7 @@ LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
 		expat:${PORTSDIR}/textproc/expat2 \
 		gd:${PORTSDIR}/${GD_PORT}

-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libltdl libtool
 WANT_GNOME=	yes
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@ -16,9 +16,9 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTS

 USE_XZ=	yes
 USE_GETTEXT=	yes
-USE_BISON=	build
+USES=		bison pathfix
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomedocutils gconf2
+USE_GNOME=	gnomeprefix intlhack gnomedocutils gconf2
 WANT_GSTREAMER=	yes
 USE_LDCONFIG=	yes
 USE_PKGCONFIG=	build
--- a/graphics/luxrender/Makefile
+++ b/graphics/luxrender/Makefile
@ -15,6 +15,7 @@ COMMENT=	Physically based and unbiased rendering system

 LICENSE=	GPLv3

+ONLY_FOR_ARCHS=	i386 amd64
 BROKEN=		does not build with boost-1.48.0

 BUILD_DEPENDS=	${LOCALBASE}/lib/libfreeimage.a:${PORTSDIR}/graphics/freeimage
@ -25,7 +26,7 @@ LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs \
 HG_NODEID=	9206b3ba7011

 USE_BZIP2=	yes
-USE_BISON=	build
+USES=		bison
 USE_CMAKE=	yes
 CMAKE_VERBOSE=	yes
 WRKSRC=		${WRKDIR}/lux-${HG_NODEID}
@ -35,17 +36,20 @@ DESKTOP_ENTRIES="LuxRender" "${COMMENT}" \
 		"${PREFIX}/share/pixmaps/luxrender.svg" "${PORTNAME}" \
 		"Graphics;3DGraphics;" false

-OPTIONS=	QT4	"Build Qt4 GUI executable"		on \
-		WX	"Build wxWidgets GUI executable"	off
+OPTIONS_DEFINE=		QT4 WX
+OPTIONS_DEFAULT=	QT4
+
+QT4_DESC=		Qt4-enabled GUI executable
+WX_DESC=		wxWidgets-enabled GUI executable

 .include <bsd.port.options.mk>

-.if defined(WITH_QT4)
+.if ${PORT_OPTIONS:MQT4}
 USE_QT4=	moc_build qmake_build rcc_build uic_build corelib gui
 PLIST_FILES+=	bin/luxrender
 .endif

-.if defined(WITH_WX)
+.if ${PORT_OPTIONS:MWX}
 USE_WX=		2.8+
 PLIST_FILES+=	bin/luxrenderwx
 .endif
@ -60,10 +64,4 @@ post-patch:
 		's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
 		-e 's|int_p_NULL|NULL|g' ${WRKSRC}/core/external/cimg.h

-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
-BROKEN=		Does not compile4: uses i386-specific options
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/graphics/ming/Makefile
+++ b/graphics/ming/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	Ming
-# Date created:		14 October 2000
-# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
-#
+# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
 # $FreeBSD$
-#

 PORTNAME=	ming
 PORTVERSION=	0.4.4
@ -26,9 +22,8 @@ CPPFLAGS+=	-I. -I.. -I${LOCALBASE}/include
 LDFLAGS+=	-L. -L.. -L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
-USE_BISON=	build
+USES=		bison pathfix
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes

 DOCS=		HISTORY NEWS README TODO
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	vips
-# Date created:		19 December 2003
-# Whom:			Lev Serebryakov <lev@FreeBSD.org>
-#
+# Created by: Lev Serebryakov <lev@FreeBSD.org>
 # $FreeBSD$
-#

 PORTNAME=	nip2
 PORTVERSION=	7.26.3
@ -18,7 +14,7 @@ LIB_DEPENDS=	vips.3[0-9]:${PORTSDIR}/graphics/vips	\
 		gsl:${PORTSDIR}/math/gsl	\
 		xml2:${PORTSDIR}/textproc/libxml2

-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 USE_GNOME=	gnomemimedata glib20 pkgconfig gtk20
 GNU_CONFIGURE=	yes
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@ -16,7 +16,7 @@ LIB_DEPENDS=	MagickWand:${PORTSDIR}/graphics/ImageMagick	\
 		cdf.0:${PORTSDIR}/science/cdf

 USE_XORG=	xinerama xext xpm xmu sm ice 
-USE_BISON=	build
+USES=		bison
 USE_GCC=	any
 USE_GL=		yes
 USE_MOTIF=	yes
--- a/graphics/openshadinglanguage/Makefile
+++ b/graphics/openshadinglanguage/Makefile
@ -33,7 +33,7 @@ CMAKE_ARGS=	-DFLEX_EXECUTABLE:STRING=${LOCALBASE}/bin/flex \
 		-DUSE_TBB:BOOL=OFF
 CXXFLAGS+=	-I${LOCALBASE}/include/flex
 USE_LDCONFIG=	yes
-USE_BISON=	build
+USES=		bison
 MAKE_JOBS_SAFE=	yes

 .include <bsd.port.pre.mk>
--- a/graphics/picviz/Makefile
+++ b/graphics/picviz/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	picviz
-# Date created:         08 Nov 2008
-# Whom:                 Tim Hemel
-#
+# Created by: Tim Hemel
 # $FreeBSD$
-#

 PORTNAME=	picviz
 PORTVERSION=	0.4
@ -20,7 +16,7 @@ LIB_DEPENDS=	pcre.3:${PORTSDIR}/devel/pcre \

 USE_CMAKE=	yes
 USE_LDCONFIG=	yes
-USE_BISON=	build
+USES=		bison

 MAN1=		pcv.1

--- a/graphics/pixie/Makefile
+++ b/graphics/pixie/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	pixie
-# Date created:		29 Jan 2004
-# Whom:			Igor Pokrovsky <tiamat@comset.net>
-#
+# Created by: Igor Pokrovsky <tiamat@comset.net>
 # $FreeBSD$
-#

 PORTNAME=	pixie
 PORTVERSION=	2.2.6
@ -25,9 +21,8 @@ NOT_FOR_ARCHS=	amd64

 WRKSRC=		${WRKDIR}/Pixie

-USE_GNOME=	gnomehack
 USE_GL=		glu
-USE_BISON=	build
+USES=		bison pathfix
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/pixie \
 		--libdir=${PREFIX}/lib/pixie \
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	qgis
-# Date created:		Apr 2006
-# Whom:			Laurent Courty
-#
+# Created by: Laurent Courty
 # $FreeBSD$
-#

 PORTNAME=	qgis
 PORTVERSION=	1.8.0
@ -24,7 +20,7 @@ LIB_DEPENDS=	geos:${PORTSDIR}/graphics/geos \

 USE_BZIP2=	yes
 USE_PYTHON=	yes
-USE_BISON=	build
+USES=		bison
 USE_CMAKE=	yes
 USE_SQLITE=	yes
 USE_QT4=	gui svg xml network sql designer linguist_build \
--- a/graphics/sswf/Makefile
+++ b/graphics/sswf/Makefile
@ -1,9 +1,5 @@
-# Ports collection makefile for:	sswf
-# Date created:				Oct 17, 2005
-# Whom:					anhot
-#
+# Created by: anhot
 # $FreeBSD$
-#

 PORTNAME=	sswf
 PORTVERSION=	1.8.4
@ -20,7 +16,7 @@ LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \

 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

-USE_BISON=	build
+USES=		bison
 USE_ICONV=	yes
 USE_PKGCONFIG=	yes
 USE_AUTOTOOLS=	libtool
--- a/graphics/tumble/Makefile
+++ b/graphics/tumble/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	lcdtest
-# Date created:				12 Jan 2010
-# Whom:					Rob Farmer <rfarmer@predatorlabs.net>
-#
+# Created by: Rob Farmer <rfarmer@predatorlabs.net>
 # $FreeBSD$
-#

 PORTNAME=	tumble
 PORTVERSION=	0.33
@ -20,6 +16,7 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex

 USE_GMAKE=	yes
+USES=		bison
 USE_BISON=	build

 MAKE_JOBS_SAFE=	yes
--- a/japanese/ming/Makefile
+++ b/japanese/ming/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	ja-Ming
-# Date created:		Aug 6 2002
-# Whom:			kuriyama
-#
+# Created by: kuriyama
 # $FreeBSD$
-#

 PORTNAME=	ming
 PORTVERSION=	0.1.5
@ -26,7 +22,7 @@ CONFLICTS=	ming-*
 WRKSRC=		${WRKDIR}/jaming-${PORTVERSION}/src
 MAKE_ARGS=	NOPROFILE=true
 USE_LDCONFIG=	yes
-USE_BISON=	build
+USES=		bison

 UTILS=		gif2dbl \
 		gif2mask \
--- a/japanese/nethack34/Makefile
+++ b/japanese/nethack34/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	JNetHack 3.4.x
-# Date created:		16 June 2002
-# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
-#
+# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
 # $FreeBSD$
-#

 PORTNAME=	nethack
 PORTVERSION=	3.4.3
@ -23,7 +19,7 @@ COMMENT=	Japanized NetHack

 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 MAKE_ENV=	GRAPHICS="${GRAPHICS}"
 PLIST_SUB=	HACKNAME="${HACKNAME}" \
--- a/japanese/xjtext/Makefile
+++ b/japanese/xjtext/Makefile
@ -11,7 +11,7 @@ DISTNAME=	XJTEXT-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A text viewer for Japanese vertical writings

-USE_BISON=	build
+USES=		bison
 USE_GNOME=	imlib
 MAKE_JOBS_SAFE=	yes

--- a/lang/basic256/Makefile
+++ b/lang/basic256/Makefile
@ -18,7 +18,7 @@ BUILD_DEPENDS=	espeak:${PORTSDIR}/audio/espeak \

 WRKSRC=		${WRKDIR}

-USE_BISON=	build
+USES=		bison
 USE_SDL=	sdl mixer
 USE_QT4=	corelib gui network xml webkit moc_build qmake_build rcc_build uic_build
 USE_DOS2UNIX=	yes
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@ -30,7 +30,7 @@ GCC_VERSION=	${PORTVERSION:C/(.+)\.[0-9]{8}/\1/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 ONLY_FOR_ARCHS=	amd64 i386 ia64 powerpc sparc64
 USE_BINUTILS=	yes
-USE_BISON=	build
+USES=		bison
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	egcs
-# Date created:				9 Jan 1998
-# Whom:					John Polstra <jdp@polstra.com>
-#
+# Created by: John Polstra <jdp@polstra.com>
 # $FreeBSD$
-#

 PORTNAME=	gcc
 PORTVERSION=	3.4.6
@ -23,7 +18,7 @@ COMMENT=	GNU Compiler Collection 3.4

 SUFFIX=		34
 LATEST_LINK=	gcc${SUFFIX}${PKGNAMESUFFIX}
-USE_BISON=	build
+USES=		bison
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	gcc42
-# Date created:				2005-12-11
-# Whom:					Gerald Pfeifer <gerald@FreeBSD.org>
-#
+# Created by: Gerald Pfeifer <gerald@FreeBSD.org>
 # $FreeBSD$
-#

 PORTNAME=	gcc
 PORTVERSION=	4.2.5.20090325
@ -28,7 +23,7 @@ VERSIONSTRING=	${PORTVERSION:C/([0-9]+\.[0-9]+).*\.([0-9]+)/\1-\2/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 LATEST_LINK=	gcc${SUFFIX}${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	arm powerpc
-USE_BISON=	build
+USES=		bison
 USE_BZIP2=	yes
 USE_GCC=	any
 USE_GMAKE=	yes
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	gcc44
-# Date created:				2008-03-01
-# Whom:					Gerald Pfeifer <gerald@FreeBSD.org>
-#
+# Created by: Gerald Pfeifer <gerald@FreeBSD.org>
 # $FreeBSD$
-#

 PORTNAME=	gcc
 PORTVERSION=	4.4.7
@ -27,7 +22,7 @@ SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 LATEST_LINK=	gcc${SUFFIX}${PKGNAMESUFFIX}
 ONLY_FOR_ARCHS=	amd64 i386 sparc64
 USE_BINUTILS=	yes
-USE_BISON=	build
+USES=		bison
 USE_BZIP2=	yes
 USE_GCC=	any
 USE_GMAKE=	yes
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@ -31,7 +31,7 @@ SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 LATEST_LINK=	gcc${SUFFIX}${PKGNAMESUFFIX}
 ONLY_FOR_ARCHS=	amd64 i386 ia64 powerpc sparc64
 USE_BINUTILS=	yes
-USE_BISON=	build
+USES=		bison
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
--- a/Show more
+++ b/Show more