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
author: Baptiste Daroussin <bapt@FreeBSD.org> 2013-03-08 11:32:11 +0000
committer: Baptiste Daroussin <bapt@FreeBSD.org> 2013-03-08 11:32:11 +0000
commit: 9250d94365048cf854570d93b5196aa250eba8f0 (patch)
tree: 9c130b083139cc77280c7e96cc9cea75a84d2d4c
parent: Update to 0.48.4. (diff)
209 files changed, 412 insertions, 879 deletions
diff --git a/Mk/Uses/bison.mk b/Mk/Uses/bison.mk
new file mode 100644
index 000000000000..a11b76e63b62
--- /dev/null
+++ 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
diff --git a/audio/csound/Makefile b/audio/csound/Makefile
index fb21590f3576..3a056c112c27 100644
--- 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
diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile
index 43e844752811..a54252b40cdf 100644
--- 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 \
diff --git a/audio/rezound/Makefile b/audio/rezound/Makefile
index 342a57512975..b326a93d0947 100644
--- 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
diff --git a/audio/sfront/Makefile b/audio/sfront/Makefile
index 04f1262ddcdc..668bf1c42199 100644
--- 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}"
diff --git a/biology/chemeq/Makefile b/biology/chemeq/Makefile
index 5494b92a0161..e773ebf6918f 100644
--- 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
 
diff --git a/cad/alliance/Makefile b/cad/alliance/Makefile
index 7c372d46faf1..9d11db4774f9 100644
--- 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
 
diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile
index 0ae1599b30e3..5818bd19fb46 100644
--- 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
diff --git a/cad/iverilog/Makefile b/cad/iverilog/Makefile
index 434e12e917b3..cda7640bd86e 100644
--- 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
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index 9154c5b5a545..9614e3e1af74 100644
--- 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+
diff --git a/cad/p5-Verilog-Perl/Makefile b/cad/p5-Verilog-Perl/Makefile
index 12cd351b9e15..7d278e74d71f 100644
--- 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
 
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 37e5a08739bc..43dde05a793c 100644
--- 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
diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile
index d35263384bf9..f9bc95109d02 100644
--- 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
diff --git a/databases/firebird21-server/Makefile b/databases/firebird21-server/Makefile
index cbe053185b6c..a60db54819ce 100644
--- 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
diff --git a/databases/firebird25-server/Makefile b/databases/firebird25-server/Makefile
index c28ccbf8bad0..280ee40a8bca 100644
--- 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
diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile
index 3f49b686dc32..c38e28881a82 100644
--- 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
 
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 2b552abc3253..467c2e6221eb 100644
--- 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=""
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 5cfbd3d0253c..b46d35ff1617 100644
--- 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
diff --git a/databases/postgis/Makefile b/databases/postgis/Makefile
index fa213749e5d8..82e727e21443 100644
--- 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
diff --git a/databases/postgresql-plproxy/Makefile b/databases/postgresql-plproxy/Makefile
index 313c3973b2a0..57f73bc3fdf2 100644
--- 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
 
diff --git a/databases/postgresql83-contrib/Makefile b/databases/postgresql83-contrib/Makefile
index 9c8b643926af..9f03b7537929 100644
--- 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
diff --git a/databases/postgresql84-contrib/Makefile b/databases/postgresql84-contrib/Makefile
index 9277089768cf..87156b749591 100644
--- 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
diff --git a/databases/postgresql90-contrib/Makefile b/databases/postgresql90-contrib/Makefile
index c97a7286f132..412a2214a2f1 100644
--- 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
diff --git a/databases/postgresql91-contrib/Makefile b/databases/postgresql91-contrib/Makefile
index 28268fc4c6e9..b5652164c505 100644
--- 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
diff --git a/databases/postgresql92-contrib/Makefile b/databases/postgresql92-contrib/Makefile
index 8a14b4b226b2..0ca307991141 100644
--- 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
diff --git a/databases/slony1/Makefile b/databases/slony1/Makefile
index c6db1fa31317..d76dc5104504 100644
--- 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
diff --git a/databases/slony1v2/Makefile b/databases/slony1v2/Makefile
index 438618470446..34deaa3fe7f8 100644
--- 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
diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index 061f7b9ec051..aface6d343f0 100644
--- 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
diff --git a/deskutils/tpb/Makefile b/deskutils/tpb/Makefile
index 28efeee77544..0f7a61a55af3 100644
--- 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}
 
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:
diff --git a/editors/lfhex/Makefile b/editors/lfhex/Makefile
index a12498ee811e..1034dbdc9702 100644
--- 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
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 319cbfbed5d7..1e9ded209250 100644
--- 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
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 7c11156b2cea..075f7017232a 100644
--- 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
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 0ab70437a1c1..e01ed55f49ea 100644
--- 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
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 678c2f1839e4..e5d208a17977 100644
--- 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
diff --git a/editors/xmleditor/Makefile b/editors/xmleditor/Makefile
index 2274036a2696..80d8ae83ff52 100644
--- 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
diff --git a/emulators/nonpareil/Makefile b/emulators/nonpareil/Makefile
index 36b40c1acb8f..d3ff425761d8 100644
--- 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
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index e0a050747224..a080c6d50844 100644
--- 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
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index ffa8a3b7dbf4..0a4766438971 100644
--- 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
diff --git a/french/aster/Makefile b/french/aster/Makefile
index a6e6b92e1a12..2c728b0d02b4 100644
--- 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 ""
diff --git a/games/flobopuyo/Makefile b/games/flobopuyo/Makefile
index 11c85b6ef205..55e666878a11 100644
--- 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
diff --git a/games/kaid/Makefile b/games/kaid/Makefile
index fa1bdc590848..de954e919a9a 100644
--- 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++
diff --git a/games/noegnud-littlehack/Makefile b/games/noegnud-littlehack/Makefile
index d2a2e3138435..09c4922be8f1 100644
--- 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
diff --git a/games/noegnud-nethack-deet/Makefile b/games/noegnud-nethack-deet/Makefile
index 94f3e3396e13..bd7ba2aa99f0 100644
--- 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
diff --git a/games/noegnud-nethack/Makefile b/games/noegnud-nethack/Makefile
index 3c62f8e34845..5a81abe811b3 100644
--- 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
diff --git a/games/noegnud-slashem/Makefile b/games/noegnud-slashem/Makefile
index 28220b0e36ee..238e7768b193 100644
--- 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
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index ccbe61001acc..6e8534fa8c34 100644
--- 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>
diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile
index 8ecc8d94e250..fa8c30f742fc 100644
--- 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
diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile
index 6d4de6481c7b..44445ec8720b 100644
--- 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
diff --git a/games/windstille/Makefile b/games/windstille/Makefile
index a625481e8f5c..1cc4dccb49e4 100644
--- 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:
diff --git a/graphics/ender/Makefile b/graphics/ender/Makefile
index 82c9dba9ad74..2767a0f24f87 100644
--- 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
diff --git a/graphics/flasm/Makefile b/graphics/flasm/Makefile
index 665750e073e7..bc885547cdcf 100644
--- 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}"
 
diff --git a/graphics/fractorama/Makefile b/graphics/fractorama/Makefile
index 8acef739d9fc..9169c529b6be 100644
--- 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
 
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 04f239e40a57..a6952a6586c4 100644
--- 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
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 9999e830929b..93ca7927abca 100644
--- 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
diff --git a/graphics/luxrender/Makefile b/graphics/luxrender/Makefile
index 002a03a63dee..57d44cee6f7d 100644
--- 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>
diff --git a/graphics/ming/Makefile b/graphics/ming/Makefile
index 4b7b197c81ef..09eb8be2f7f9 100644
--- 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
diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index 519996367535..ce8e5f2eae54 100644
--- 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
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index 24f93e587f1f..b3e0fc3c658a 100644
--- 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
diff --git a/graphics/openshadinglanguage/Makefile b/graphics/openshadinglanguage/Makefile
index 0e27d2768540..e3a36ac3e3be 100644
--- 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>
diff --git a/graphics/picviz/Makefile b/graphics/picviz/Makefile
index 2cabef7996ff..9d6da1728234 100644
--- 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
 
diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile
index 74b10fb322a2..8fa5fced693a 100644
--- 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 \
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 081735b9ede4..6e4bf32c49a0 100644
--- 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 \
diff --git a/graphics/sswf/Makefile b/graphics/sswf/Makefile
index acd1337ca6a6..b3a0aa0f84f7 100644
--- 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
diff --git a/graphics/tumble/Makefile b/graphics/tumble/Makefile
index d738d4a78fd4..120b87f1ff55 100644
--- 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
diff --git a/japanese/ming/Makefile b/japanese/ming/Makefile
index 32e326dfa05b..342e235fba29 100644
--- 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 \
diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile
index 3eb178402f9b..a2c120a3ffe0 100644
--- 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}" \
diff --git a/japanese/xjtext/Makefile b/japanese/xjtext/Makefile
index ab5bfd1054f3..0b949c99f050 100644
--- 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
 
diff --git a/lang/basic256/Makefile b/lang/basic256/Makefile
index 9d6c7c53993f..86b3682d613b 100644
--- 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
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 8b13cad3d0c9..c0cdeead5088 100644
--- 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
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index e06390a18e3f..a5eca33842fd 100644
--- 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
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index bc9aba3e005f..2cf116f14949 100644
--- 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
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index d18a514d568a..212ee36613d1 100644
--- 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
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 680840415cb7..7e393d920048 100644
--- 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
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index c9b407a1cb7a..16f35d211c21 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -29,7 +29,7 @@ SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 LATEST_LINK=	gcc${SUFFIX}${PKGNAMESUFFIX}
 ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 sparc64
 USE_BINUTILS=	yes
-USE_BISON=	build
+USES=		bison
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index d97c6b2cb26b..7a0bde304297 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -29,7 +29,7 @@ SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 LATEST_LINK=	gcc${SUFFIX}${PKGNAMESUFFIX}
 ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 sparc64
 USE_BINUTILS=	yes
-USE_BISON=	build
+USES=		bison
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
diff --git a/lang/gdc/Makefile b/lang/gdc/Makefile
index ce742a21fd41..01cb808a03bb 100644
--- a/lang/gdc/Makefile
+++ b/lang/gdc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	D Front End for GCC
-# Date created:		18 November 2004
-# Whom:			Masanori OZAWA (ozawa@ongs.co.jp)
-#
+# Created by: Masanori OZAWA (ozawa@ongs.co.jp)
 # $FreeBSD$
-#
 
 PORTNAME=	gdc
 PORTVERSION=	0.24
@@ -23,7 +19,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 BROKEN=		fails to build
 
-USE_BISON=	build
+USES=		bison
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
diff --git a/lang/gnat/Makefile b/lang/gnat/Makefile
index 8fae7e2e37f4..77e549c2b4db 100644
--- a/lang/gnat/Makefile
+++ b/lang/gnat/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	GNU Ada gnat
-# Date created:		Sat Mar 18 02:16:45 1995
-# Whom:			hsu
-# Porter (original):	nils@guru.ims.uni-stuttgart.de
-# Porter (version 3):	maurice@serc.rmit.edu.au
-#
+# Created by: hsu, nils@guru.ims.uni-stuttgart.de, maurice@serc.rmit.edu.au
 # $FreeBSD$
 #
 # Note:
@@ -12,7 +7,6 @@
 #   conflict with other gcc based products. Standard names can be provided
 #   using symbolic links.
 
-PORTNAME=		gnat
 PORTVERSION=		2010
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_LOCAL:S/$/:boot/}
@@ -31,7 +25,7 @@ LICENSE=	GPLv3 LGPL3
 ONLY_FOR_ARCHS=		i386
 
 USE_GMAKE=		yes
-USE_BISON=		build
+USES=			bison
 USE_ICONV=		yes
 USE_PERL5_BUILD=	yes
 
diff --git a/lang/harbour/Makefile b/lang/harbour/Makefile
index 8ef0def70813..0af4fbf796a6 100644
--- a/lang/harbour/Makefile
+++ b/lang/harbour/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Harbour
-# Date created:				9 May 2003
-# Whom:					David G. Holm <harbour@netfang.net>
-#
+# Created by: David G. Holm <harbour@netfang.net>
 # $FreeBSD$
-#
 
 PORTNAME=	harbour
 PORTVERSION=	3.0.0
@@ -32,7 +28,7 @@ PORTDOCS=	*.txt *.hbd NEWS INSTALL TODO COPYING ChangeLog
 
 MAKE_JOBS_SAFE=	yes
 
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 USE_LDCONFIG=	${LOCALBASE}/lib/harbour
diff --git a/lang/hla/Makefile b/lang/hla/Makefile
index feb7c6d928dd..c81bd8e3a8c3 100644
--- a/lang/hla/Makefile
+++ b/lang/hla/Makefile
@@ -1,10 +1,5 @@
-# vim: ts=8
-# New ports collection Makefile for:	hla
-# Date created:				29 May 2008
-# Whom:					gahr
-#
+# Created by: gahr
 # $FreeBSD$
-#
 
 PORTNAME=	hla
 PORTVERSION=	1.103
@@ -24,7 +19,7 @@ MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	High Level Assembly
 
 USE_ZIP=	yes
-USE_BISON=	build
+USES=		bison
 
 WRKSRC=		${WRKDIR}/hlasrc/trunk/trunk
 MAKEFILE=	makefile.bsd
diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile
index a90439edaa3b..06af0d33487e 100644
--- a/lang/hugs/Makefile
+++ b/lang/hugs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	hugs
-# Date created:		22 September 1997
-# Whom:			Torsten Teg Grust (Torsten.Grust@uni-konstanz.de)
-#
+# Created by: Torsten Teg Grust (Torsten.Grust@uni-konstanz.de)
 # $FreeBSD$
-#
 
 PORTNAME=	hugs98
 PORTVERSION=	200609
@@ -21,7 +17,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 
 #OPTIONS=	HUGS_OPENGL "OpenGL/GLUT support" off
 HUGS_DATE=	Sep2006
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 #CONFIGURE_ARGS+=	--prefix=${PREFIX} --enable-ffi
diff --git a/lang/maude/Makefile b/lang/maude/Makefile
index 36bad1e56576..4f5d599fe3b2 100644
--- a/lang/maude/Makefile
+++ b/lang/maude/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	maude
-# Date created:				25 Mar 2005
-# Whom:				Rick van der Zwet <rick@wzoeterwoude.net>
-#
+# Created by: Rick van der Zwet <rick@wzoeterwoude.net>
 # $FreeBSD$
-#
 
 PORTNAME=	maude
 PORTVERSION=	2.6
@@ -19,7 +15,7 @@ LIB_DEPENDS=	bdd:${PORTSDIR}/science/buddy \
 		gmp:${PORTSDIR}/math/gmp \
 		sigsegv:${PORTSDIR}/devel/libsigsegv
 
-USE_BISON=	build
+USES=		bison
 USE_AUTOTOOLS=	aclocal autoheader automake
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 22e906c0e516..1d3ecb63db6c 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -14,8 +14,8 @@ BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
     		bash:${PORTSDIR}/shells/bash
 
 USE_BZIP2=	yes
-USE_BISON=	build
-USE_GNOME=	gnomehack glib20
+USES=		bison pathfix
+USE_GNOME=	glib20
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
diff --git a/lang/ohugs/Makefile b/lang/ohugs/Makefile
index 325b71436181..ea1642c7e0b1 100644
--- a/lang/ohugs/Makefile
+++ b/lang/ohugs/Makefile
@@ -1,8 +1,5 @@
-# New ports collection makefile for:	ohugs
-# Date created:				03.03.03
-# Whom:					Steffen Mazanek <steffen.mazanek@unibw-muenchen.de>
+# Created by: Steffen Mazanek <steffen.mazanek@unibw-muenchen.de>
 # $FreeBSD$
-#
 
 PORTNAME=	ohugs
 PORTVERSION=	0.5
@@ -25,7 +22,7 @@ LIB_DEPENDS=	Tix8.4.3.0:${PORTSDIR}/x11-toolkits/tix
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/.src//}
 BUILD_WRKSRC=	${WRKSRC}/src
-USE_BISON=	build
+USES=		bison
 LDFLAGS+=	-lm -lreadline -ltermcap
 .if empty(PORT_OPTIONS:MX11)
 USE_TK=		84+
diff --git a/lang/parrot/Makefile b/lang/parrot/Makefile
index 732b332019c3..b38c1f070250 100644
--- a/lang/parrot/Makefile
+++ b/lang/parrot/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	gmp:${PORTSDIR}/math/gmp \
 MAKE_JOBS_UNSAFE=	yes
 
 USE_BZIP2=	yes
-USE_BISON=	build
+USES=		bison
 USE_PERL5=	yes
 USE_GMAKE=	yes
 
diff --git a/lang/pike76/Makefile b/lang/pike76/Makefile
index abe5c41e236f..5ae1c9d9dd68 100644
--- a/lang/pike76/Makefile
+++ b/lang/pike76/Makefile
@@ -84,7 +84,7 @@ CONFIGURE_ARGS+=	--without-debug \
 MAKE_ARGS=	CONFIGUREARGS="${CONFIGURE_ARGS}"
 
 USE_GETTEXT=	yes
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 
 # Allow building Embedded Perl
diff --git a/lang/pike78/Makefile b/lang/pike78/Makefile
index c383e1fec7de..29727e669f52 100644
--- a/lang/pike78/Makefile
+++ b/lang/pike78/Makefile
@@ -75,7 +75,7 @@ MAKE_ARGS=	"CONFIGUREARGS=${CONFIGURE_ARGS}"
 MAKE_ENV=	"ac_cv_lib_nettle_nettle_md5_init=no"
 
 USE_GETTEXT=	yes
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 
 # Allow building Embedded Perl
diff --git a/lang/ptoc/Makefile b/lang/ptoc/Makefile
index e98804be1587..188f61f74740 100644
--- a/lang/ptoc/Makefile
+++ b/lang/ptoc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ptoc
-# Date created:				10 December 1997
-# Whom:					Andrey Zakhvatov
-#
+# Created by: Andrey Zakhvatov
 # $FreeBSD$
-#
 
 PORTNAME=	ptoc
 PORTVERSION=	3.58
@@ -16,7 +12,7 @@ COMMENT=	ANSI/Turbo Pascal to C/C++ converter
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_XORG=	x11
-USE_BISON=	build
+USES=		bison
 
 EXAMPLES=	arr.pas bgidemo.pas ccall.pas coord.txt dos.h dos.pas \
 		func.pas hello.pas impact.pas lister.pas makefile.bsd \
diff --git a/lang/q/Makefile b/lang/q/Makefile
index b7f8bf71836f..a6c33321bac5 100644
--- a/lang/q/Makefile
+++ b/lang/q/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	MagickWand:${PORTSDIR}/graphics/ImageMagick \
 		xslt.2:${PORTSDIR}/textproc/libxslt \
 		ggi.2:${PORTSDIR}/graphics/libggi
 
-USE_BISON=	build
+USES=		bison
 USE_GCC=	any
 USE_ICONV=	yes
 USE_TK=		84+
diff --git a/lang/rakudo/Makefile b/lang/rakudo/Makefile
index 10fa5dd3436a..be2f95d408ad 100644
--- a/lang/rakudo/Makefile
+++ b/lang/rakudo/Makefile
@@ -41,7 +41,7 @@ CONFIGURE_ARGS=	--with-parrot=${PREFIX}/bin/parrot \
 BROKEN=		Does not compile on ia64, powerpc, or sparc64
 .endif
 
-USE_BISON=	build
+USES+=		bison
 USE_PERL5_BUILD=	yes
 USE_GMAKE=	yes
 
diff --git a/lang/spl/Makefile b/lang/spl/Makefile
index 8a53234c2a13..07577e56fb32 100644
--- a/lang/spl/Makefile
+++ b/lang/spl/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	spl
-# Date created:		6 September 2001
-# Whom:			Hye-Shik Chang <perky@fallin.lv>
-#
+# Created by: Hye-Shik Chang <perky@fallin.lv>
 # $FreeBSD$
-#
 
 PORTNAME=	spl
 PORTVERSION=	1.2.1
@@ -14,7 +10,7 @@ MASTER_SITES=	http://shakespearelang.sourceforge.net/download/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Shakespeare programming language
 
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 
 ALL_EXAMPLES=	Makefile fibonacci.spl fibonacci2.spl guess.spl hello.spl \
diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index d85c5f683980..05fcf6ea6f76 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Programming language and compiler that converts Vala code into C code
 
 LICENSE=	LGPL21
 
+USES=		bison pathfix
 USE_XZ=		yes
-USE_GNOME=	gnomehack glib20 gnomeprefix libxslt
+USE_GNOME=	glib20 gnomeprefix libxslt
 USE_GMAKE=	yes
 USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USE_BISON=	build
 USE_LDCONFIG=	yes
 
 MAN1?=		valac.1 valac-${VALA_VER}.1
diff --git a/lang/yabasic/Makefile b/lang/yabasic/Makefile
index cb4c2347a88a..7753e9cd25fc 100644
--- a/lang/yabasic/Makefile
+++ b/lang/yabasic/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	yabasic
-# Date created:		11 Nov 1999
-# Whom:			Frank Gruender
-#
+# Created by: Frank Gruender
 # $FreeBSD$
-#
 
 PORTNAME=	yabasic
 PORTVERSION=	2.763
@@ -15,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Yet another Basic for Unix and Windows
 
 USE_XORG=	x11 ice sm xt
-USE_BISON=	build
+USES=		bison
 GNU_CONFIGURE=	yes
 
 MAN1=		yabasic.1
diff --git a/mail/esmtp/Makefile b/mail/esmtp/Makefile
index ae0a44d9e6a6..1a29da48ad50 100644
--- a/mail/esmtp/Makefile
+++ b/mail/esmtp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:  		esmtp
-# Date created:        				12.07.2003
-# Whom:               				Kirill Ponomarew <ponomarew@oberon.net>
-#
+# Created by: Kirill Ponomarew <ponomarew@oberon.net>
 # $FreeBSD$
-#
 
 PORTNAME=	esmtp
 PORTVERSION=	1.2
@@ -20,7 +16,7 @@ LICENSE=	GPLv2
 
 USE_BZIP2=	yes
 USE_OPENSSL=	yes
-USE_BISON=	build
+USES=		bison
 GNU_CONFIGURE=	yes
 
 MAN1=		esmtp.1
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 873d8437ccae..baaaa9ffe876 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -21,9 +21,9 @@ CONFLICTS=	evolution-3.[0-9]*
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_BISON=	build
+USES=		bison pathfix
 USE_GETTEXT=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack evolutiondataserver gtkhtml3 \
+USE_GNOME=	gnomeprefix intlhack evolutiondataserver gtkhtml3 \
 		desktopfileutils gnomedocutils ltasneededhack gnomedesktop
 USE_AUTOTOOLS=	libtool
 USE_GSTREAMER=	yes
diff --git a/mail/filtermail/Makefile b/mail/filtermail/Makefile
index 33ccd5f4ab3d..b1dc0764e204 100644
--- a/mail/filtermail/Makefile
+++ b/mail/filtermail/Makefile
@@ -1,6 +1,4 @@
-# New ports collection makefile for: 	filtermail
-# Date created:				8 V 2002
-# Whom:					Harry Newton
+# Created by: Harry Newton
 #
 # Called this port 'filtermail' because there is already a 'mailfilter'
 #  in the ports tree.
@@ -30,7 +28,7 @@ EXTRACT_AFTER_ARGS=	| ${SED} 's/[mM][aA][iI][lL][fF][iI][lL][tT][eE][rR]/filterm
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/mail/libsieve/Makefile b/mail/libsieve/Makefile
index 225564655eee..d1673cf2366d 100644
--- a/mail/libsieve/Makefile
+++ b/mail/libsieve/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libsieve
-# Date created:				4 August 2006
-# Whom:					Mark Starovoytov <mark_sf@kikg.ifmo.ru>
-#
+# Created by: Mark Starovoytov <mark_sf@kikg.ifmo.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	libsieve
 PORTVERSION=	2.3.1
@@ -18,6 +14,7 @@ LICENSE=LGPL21
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--prefix=${PREFIX}
 USE_GMAKE=	yes
+USES=		bison
 USE_BISON=	build
 USE_LDCONFIG=	yes
 
diff --git a/mail/mairix/Makefile b/mail/mairix/Makefile
index 228769db5f16..1e6cb5cbf8a0 100644
--- a/mail/mairix/Makefile
+++ b/mail/mairix/Makefile
@@ -1,9 +1,5 @@
-# New ports collection Makefile for:	mairix
-# Date created:				2003-03-27
-# Whom:					Oliver Braun <obraun@FreeBSD.org>
-#
+# Created by: Oliver Braun <obraun@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	mairix
 PORTVERSION=	0.22
@@ -15,7 +11,7 @@ COMMENT=	Indexing and searching in Maildir, MH, or mbox folders
 
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
-USE_BISON=	build
+USES=		bison
 
 MAN1=	mairix.1
 MAN5=	mairixrc.5
diff --git a/math/abakus/Makefile b/math/abakus/Makefile
index bddc908ec39e..8435e65996db 100644
--- a/math/abakus/Makefile
+++ b/math/abakus/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	mpfr:${PORTSDIR}/math/mpfr
 USE_BZIP2=	yes
 USE_KDE4=	automoc4 kdehier kdelibs kdeprefix
 USE_QT4=	moc_build qmake_build rcc_build uic_build
-USE_BISON=	build
+USES=		bison
 USE_CMAKE=	yes
 CMAKE_ARGS=	-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" \
 		-DCMAKE_REQUIRED_FLAGS:STRING="${LDFLAGS}" \
diff --git a/math/cvc3/Makefile b/math/cvc3/Makefile
index 5983d9972d4f..2b4dd659a13f 100644
--- a/math/cvc3/Makefile
+++ b/math/cvc3/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cvc3
-# Date created:		Mar. 24, 2007
-# Whom:			Li-Wen Hsu <lwhsu@lwhsu.org>
-#
+# Created by: Li-Wen Hsu <lwhsu@lwhsu.org>
 # $FreeBSD$
-#
 
 PORTNAME=	cvc3
 PORTVERSION=	2.4.1
@@ -22,7 +18,7 @@ CONFIGURE_ARGS=	--enable-dynamic \
 		--with-extra-libs=${LOCALBASE}/lib
 CXXFLAGS+=	-fPIC
 GNU_CONFIGURE=	yes
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_PERL5=	yes
diff --git a/math/eukleides/Makefile b/math/eukleides/Makefile
index 059ddb80847b..3eb0e9ba31c5 100644
--- a/math/eukleides/Makefile
+++ b/math/eukleides/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	eukleides
-# Date created:			Jun 4, 2002
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	eukleides
 PORTVERSION=	1.5.3
@@ -20,7 +15,7 @@ RUN_DEPENDS=	pstoedit:${PORTSDIR}/graphics/pstoedit \
 		epstopdf:${PORTSDIR}/print/teTeX-base
 
 USE_BZIP2=	yes
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index d5c2c098a634..5bdd273f1ec1 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gcalctool
-# Date created:				12 Jun 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/math/gcalctool/Makefile,v 1.140 2010/11/15 22:06:10 kwm Exp $
-#
 
 PORTNAME=	gcalctool
 PORTVERSION=	5.32.2
@@ -20,7 +16,7 @@ COMMENT=	A GNOME 2 calculator tool based on the old calctool for OpenWindows
 CONFLICTS=	gcalctool-2.31.*
 
 USE_BZIP2=	yes
-USE_BISON=	build
+USES=		bison
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/math/graphthing/Makefile b/math/graphthing/Makefile
index bcbc274d4ddb..3c7ae98b0f23 100644
--- a/math/graphthing/Makefile
+++ b/math/graphthing/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	GraphThing
-# Date created:			Feb 10, 2002
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	graphthing
 PORTVERSION=	1.3.2
@@ -20,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
-USE_BISON=	build
+USES=		bison
 USE_WX=		2.6+
 WX_CONF_ARGS=	absolute
 USE_GMAKE=	yes
diff --git a/math/jags/Makefile b/math/jags/Makefile
index 0c49a6da1c9f..f730e556fa22 100644
--- a/math/jags/Makefile
+++ b/math/jags/Makefile
@@ -1,10 +1,5 @@
-# vim: tabstop=8 softtabstop=0 noexpandtab
-# Ports collection Makefile for:	jags
-# Date created:		21 April 2004
-# Whom:			Eric van Gyzen <vangyzen@stat.duke.edu>
-#
+# Created by: Eric van Gyzen <vangyzen@stat.duke.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	mcmc-jags
 PORTVERSION=	3.3.0
@@ -23,7 +18,7 @@ COMMENT=	Just Another Gibbs Sampler
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
-USE_BISON=	build
+USES=		bison
 USE_FORTRAN=	yes
 USE_LDCONFIG=	yes
 
diff --git a/math/oleo/Makefile b/math/oleo/Makefile
index b53ee32ba89a..e8320576e310 100644
--- a/math/oleo/Makefile
+++ b/math/oleo/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	The GNU spreadsheet for X11 and terminals
 
 USE_PERL5_BUILD=	yes
-USE_BISON=	build
+USES=		bison
 USE_AUTOTOOLS=	autoconf213
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/math/stp/Makefile b/math/stp/Makefile
index 5132b2c7248d..35377a839c57 100644
--- a/math/stp/Makefile
+++ b/math/stp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	stp
-# Date created:		2008-06-18
-# Whom:			Li-Wen Hsu <lwhsu@FreeBSD.org>
-#
+# Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	stp
 PORTVERSION=	1407
@@ -16,7 +12,7 @@ COMMENT=	A Decision Procedure for Bitvectors and Arrays
 
 LICENSE=	MIT
 
-USE_BISON=	build
+USES=		bison
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=	yes
diff --git a/misc/boxes/Makefile b/misc/boxes/Makefile
index 2762a3c053bb..8a625904c3e9 100644
--- a/misc/boxes/Makefile
+++ b/misc/boxes/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Draws ASCII-art configurable boxes around text or code
 LICENSE=	GPLv2
 
 USE_GMAKE=	yes
-USE_BISON=	build
+USES=		bison
 ALL_TARGET=	boxes
 MAKE_ARGS=	CC="${CC}" GLOBALCONF=${GLOBALCONF} CFLAGS="${CFLAGS} -ansi -I. -Iregexp"
 
diff --git a/misc/lifelines/Makefile b/misc/lifelines/Makefile
index 9e8b5b587ea9..7dd5967140a9 100644
--- a/misc/lifelines/Makefile
+++ b/misc/lifelines/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	lifelines
-# Date created:		10 August 2000
-# Whom:			Matt Emmerton <matt@gsicomp.on.ca>
-#
+# Created by: Matt Emmerton <matt@gsicomp.on.ca>
 # $FreeBSD$
-#
 
 PORTNAME=	lifelines
 PORTVERSION=	3.0.51
@@ -17,7 +13,7 @@ COMMENT=	An advanced genealogical system
 GNU_CONFIGURE=	yes
 USE_ICONV=	yes
 USE_BZIP2=	yes
-USE_BISON=	build
+USES=		bison
 
 MAN1=		btedit.1 dbverify.1 llines.1
 
diff --git a/multimedia/avinfo/Makefile b/multimedia/avinfo/Makefile
index ac5a06ce61dc..00d0b401339f 100644
--- a/multimedia/avinfo/Makefile
+++ b/multimedia/avinfo/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection Makefile for:	avinfo
-# Date created:			Feb 7, 2003
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	avinfo
 PORTVERSION=	1.0.a15
@@ -17,7 +12,7 @@ MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	A utility for displaying AVI header information
 
 USE_GMAKE=	yes
-USE_BISON=	build
+USES=		bison
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/multimedia/gstreamer-qt4/Makefile b/multimedia/gstreamer-qt4/Makefile
index d0fc923886af..8bb8d4c5e1be 100644
--- a/multimedia/gstreamer-qt4/Makefile
+++ b/multimedia/gstreamer-qt4/Makefile
@@ -16,7 +16,7 @@ LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
 
 LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs
 
-USE_BISON=	build
+USES=		bison
 USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_GMAKE=	yes
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index d7113454e069..fd5f915a05a6 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -17,11 +17,10 @@ RUN_DEPENDS=	${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-i
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 CFLAGS:=	${CFLAGS} -O2 -Wno-format
-USE_BISON=	build
+USES=		bison pathfix
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-WANT_GNOME=	yes
-USE_GNOME=	gnomehack glib20 libxml2 ltverhack ltasneededhack
+USE_GNOME=	glib20 libxml2 ltverhack ltasneededhack
 USE_PKGCONFIG=	build
 USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/multimedia/libaacs/Makefile b/multimedia/libaacs/Makefile
index 06d454333f82..380a2740cb1e 100644
--- a/multimedia/libaacs/Makefile
+++ b/multimedia/libaacs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libaacs
-# Date created:	19 February 2011
-# Whom:		kamikaze@bsdforen.de
-#
+# Created by: kamikaze@bsdforen.de
 # $FreeBSD$
-#
 
 PORTNAME=	libaacs
 PORTVERSION=	0.3.0
@@ -23,7 +19,7 @@ USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	autoconf aclocal automake libtool
-USE_BISON=	build
+USES=		bison
 
 MAKE_JOBS_SAFE=	yes
 HAS_CONFIGURE=	yes
diff --git a/net-im/gtkyahoo/Makefile b/net-im/gtkyahoo/Makefile
index a34dbf0042f4..e46ad6dd948c 100644
--- a/net-im/gtkyahoo/Makefile
+++ b/net-im/gtkyahoo/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gtkyahoo
-# Date created:			18 August 1999
-# Whom:				dannyman@dannyland.org
-#
+# Created by: dannyman@dannyland.org
 # $FreeBSD$
-#
 
 PORTNAME=	gtkyahoo
 PORTVERSION=	0.18.3
@@ -15,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Yahoo Messenger Client using GTK
 
 USE_GNOME=	gtk12
-USE_BISON=	build
+USES=		bison
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 ONLY_FOR_ARCHS=	i386
diff --git a/net-mgmt/argus3/Makefile b/net-mgmt/argus3/Makefile
index b3fff6aa68e7..049427701be6 100644
--- a/net-mgmt/argus3/Makefile
+++ b/net-mgmt/argus3/Makefile
@@ -21,7 +21,7 @@ USE_RC_SUBR=	argus
 
 .include <bsd.port.options.mk>
 
-USE_BISON=	build
+USES=		bison
 GNU_CONFIGURE=	true
 USE_PERL5=	yes
 
diff --git a/net-mgmt/cflowd/Makefile b/net-mgmt/cflowd/Makefile
index dc5ccb41ee3a..7228ac94ef51 100644
--- a/net-mgmt/cflowd/Makefile
+++ b/net-mgmt/cflowd/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cflowd
-# Date created:		Di   7 Nov 2000 19:48:50 CET
-# Whom:			Andreas Klemm <andreas@klemm.gtn.com>
-#
+# Created by: Andreas Klemm <andreas@klemm.gtn.com>
 # $FreeBSD$
-#
 
 PORTNAME=	cflowd
 PORTVERSION=	2.1.b1
@@ -20,7 +16,7 @@ LIB_DEPENDS=	Arts:${PORTSDIR}/net-mgmt/arts++
 
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
-USE_BISON=	build
+USES=		bison
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--enable-shared --with-artspp=${LOCALBASE}
diff --git a/net-mgmt/docsis/Makefile b/net-mgmt/docsis/Makefile
index 84d263f993a5..ab7d3871028a 100644
--- a/net-mgmt/docsis/Makefile
+++ b/net-mgmt/docsis/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	docsis
-# Date created:				Jul 5, 2002
-# Whom:					James Flemer <jflemer@acm.jhu.edu>
-#
+# Created by: James Flemer <jflemer@acm.jhu.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	docsis
 PORTVERSION=	0.9.5
@@ -19,7 +15,7 @@ LIB_DEPENDS=	netsnmp:${PORTSDIR}/net-mgmt/net-snmp
 
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
-USE_BISON=	build
+USES=		bison
 
 PLIST_SUB=	MIBS=share/snmp/mibs
 
diff --git a/net-mgmt/ettercap/Makefile b/net-mgmt/ettercap/Makefile
index 73e9c667c3bf..873ef27054fd 100644
--- a/net-mgmt/ettercap/Makefile
+++ b/net-mgmt/ettercap/Makefile
@@ -28,7 +28,7 @@ GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
 USE_AUTOTOOLS=	libltdl libtool
-USE_BISON=	build
+USES=		bison
 WANT_GNOME=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/net-mgmt/irrtoolset/Makefile b/net-mgmt/irrtoolset/Makefile
index 28bd895bdc45..9d839ff55df3 100644
--- a/net-mgmt/irrtoolset/Makefile
+++ b/net-mgmt/irrtoolset/Makefile
@@ -10,7 +10,7 @@ COMMENT=	A suite of routing policy tools to interact with the IRR
 
 PLIST_FILES=	bin/rpslcheck bin/peval bin/rtconfig
 
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/net-mgmt/netmond/Makefile b/net-mgmt/netmond/Makefile
index 5fea45c59346..5b4fe82f2664 100644
--- a/net-mgmt/netmond/Makefile
+++ b/net-mgmt/netmond/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	netmond
-# Date created:				2004 Mar 30
-# Whom:					vfom@narod.ru
-#
+# Created by: vfom@narod.ru
 # $FreeBSD$
-#
 
 PORTNAME=	netmond
 PORTVERSION=	2.2b6
@@ -35,7 +31,7 @@ CONFIGURE_ARGS=	--without-ifgraph
 .endif
 
 GNU_CONFIGURE=	yes
-USE_BISON=	build
+USES=		bison
 
 BINOWN=		root
 BINGRP=		netmon
diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index 91cef30d067b..c6382519ce70 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	${FLEX}:${PORTSDIR}/textproc/flex \
 CONFLICTS=	amule-[0-9]*
 
 USE_BZIP2=	yes
-USE_BISON=	build
+USES=		bison
 USE_PKGCONFIG=	yes
 USE_GMAKE=	yes
 USE_WX=		2.8
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index cd04cccc8db2..ef0b1a51d5c7 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	${FLEX}:${PORTSDIR}/textproc/flex \
 CONFLICTS=	amule-devel-[0-9]*
 
 USE_BZIP2=	yes
-USE_BISON=	build
+USES=		bison
 USE_PKGCONFIG=	yes
 USE_GMAKE=	yes
 USE_WX=		2.8
diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile
index 4de35757da8b..ac1f496b014e 100644
--- a/net-p2p/gtk-gnutella/Makefile
+++ b/net-p2p/gtk-gnutella/Makefile
@@ -55,7 +55,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 USE_BZIP2=	yes
 USE_GNOME=	glib20 libxml2
 USE_PERL5=	yes
-USE_BISON=	build
+USES=		bison
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=	-O -Dyacc='bison -y' -Dprefix=${PREFIX} \
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index 125177f53b14..4efa4e8ac083 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -28,7 +28,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
 USE_GCC=	any
 USE_GMAKE=	yes
 USE_GNOME=	libxml2
-USE_BISON=	build
+USES=		bison
 USE_RC_SUBR=	asterisk
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile
index 1d4933c937b8..0f4b10a8b6e8 100644
--- a/net/asterisk10/Makefile
+++ b/net/asterisk10/Makefile
@@ -26,7 +26,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
 USE_GCC=	any
 USE_GMAKE=	yes
 USE_GNOME=	libxml2
-USE_BISON=	build
+USES=		bison
 USE_RC_SUBR=	asterisk
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
diff --git a/net/asterisk11/Makefile b/net/asterisk11/Makefile
index a7d6b1caf7e4..5d9a671287b9 100644
--- a/net/asterisk11/Makefile
+++ b/net/asterisk11/Makefile
@@ -25,7 +25,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
 USE_GCC=	any
 USE_GMAKE=	yes
 USE_GNOME=	libxml2
-USE_BISON=	build
+USES=		bison
 USE_RC_SUBR=	asterisk
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile
index c3a6c47c0d42..6674a712dd3c 100644
--- a/net/asterisk14/Makefile
+++ b/net/asterisk14/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	asterisk
-# Date created:				17 October 2003
-# Whom:					Maxim Sobolev <sobomax@portaone.com>
-#
+# Created by: Maxim Sobolev <sobomax@portaone.com>
 # $FreeBSD$
-#
 
 PORTNAME=	asterisk
 PORTVERSION=	1.4.42
@@ -32,7 +28,7 @@ CONFIGURE_ARGS=	--with-gsm=${LOCALBASE}
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
 USE_GCC=	any
 USE_GMAKE=	yes
-USE_BISON=	build
+USES=		bison
 USE_RC_SUBR=	asterisk
 MAKE_ENV=	MKDIR="${MKDIR}" \
 		PWLIBDIR=${LOCALBASE}/share/pwlib \
diff --git a/net/bird-devel/Makefile b/net/bird-devel/Makefile
index 1d7989752261..8421380086e5 100644
--- a/net/bird-devel/Makefile
+++ b/net/bird-devel/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	bird
-# Date created:				8 November 2011
-# Whom:				Alexander V. Chernikov <melifaro@FreeBSD.org>
-#
+# Created by: Alexander V. Chernikov <melifaro@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	bird
 PORTVERSION=	20130301
@@ -16,7 +12,7 @@ COMMENT=	Dynamic IP routing daemon (devel version)
 
 CONFLICTS=	bird-[0-9]*
 
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --enable-mpls
diff --git a/net/bird/Makefile b/net/bird/Makefile
index d8fe849220a8..0807960ec66c 100644
--- a/net/bird/Makefile
+++ b/net/bird/Makefile
@@ -1,5 +1,4 @@
-# Created by:				Pav Lucistnik <pav@FreeBSD.org>
-#
+# Created by: Pav Lucistnik <pav@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	bird
@@ -14,7 +13,7 @@ COMMENT=	Dynamic IP routing daemon (IPv4 version)
 
 LICENSE=	GPLv2
 
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var
diff --git a/net/bird6/Makefile b/net/bird6/Makefile
index 271a8a6add99..3514b847e82a 100644
--- a/net/bird6/Makefile
+++ b/net/bird6/Makefile
@@ -1,7 +1,5 @@
-# Created by:				Pav Lucistnik <pav@FreeBSD.org>
-#
+# Created by: Pav Lucistnik <pav@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	bird6
 PORTVERSION=	1.3.9
@@ -16,7 +14,7 @@ COMMENT=	Dynamic IP routing daemon (IPv6 version)
 
 LICENSE=	GPLv2
 
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-ipv6 --localstatedir=/var
diff --git a/net/cphone/Makefile b/net/cphone/Makefile
index 4267b040131e..5a034db2e0dc 100644
--- a/net/cphone/Makefile
+++ b/net/cphone/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cphone
-# Date created:		Thu May 24 15:50:00 BST 2000
-# Whom:			Roger Hardiman <roger@FreeBSD.org>
-#
+# Created by: Roger Hardiman <roger@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	cphone
 DISTVERSION=	0.3.2.cvs.20060407
@@ -22,7 +18,7 @@ EXPIRATION_DATE=	2013-07-01
 
 PLIST_FILES=	bin/cphone
 USE_BZIP2=	yes
-USE_BISON=	build
+USES=		bison
 USE_QT_VER=	3
 USE_GMAKE=	yes
 ALL_TARGET=	optshared
diff --git a/net/daq/Makefile b/net/daq/Makefile
index 416fa0946ce1..fd06bcdbb367 100644
--- a/net/daq/Makefile
+++ b/net/daq/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	daq
-# Date created:		13 January 2011
-# Whom:			Dean Freeman (wfreeman@sourcefire.com)
-#
+# Created by: Dean Freeman (wfreeman@sourcefire.com)
 # $FreeBSD$
-#
 
 PORTNAME=	daq
 PORTVERSION=	2.0.0
@@ -24,7 +20,7 @@ BUILD_DEPENDS=	flex:${PORTSDIR}/textproc/flex
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_BISON=	build
+USES=		bison
 USE_AUTOTOOLS=	libtool
 
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/net/dictd/Makefile b/net/dictd/Makefile
index fe3bf29d8112..bf2cadc2253c 100644
--- a/net/dictd/Makefile
+++ b/net/dictd/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# New ports collection makefile for:	dictd
-# Date created:		Jan 23, 2001
-# Whom:			Ying-Chieh Liao <ijliao@FreeBSD.org>
-#
+# Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	dictd
 PORTVERSION=	1.12.0
@@ -21,7 +16,7 @@ MAN1=		dictzip.1
 MAN8=		dictd.8
 
 USE_RC_SUBR=	${PORTNAME}
-USE_BISON=	build
+USES=		bison
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-etcdir=${PREFIX}/etc --with-cflags="${CFLAGS}" \
diff --git a/net/freeswitch-core-devel/Makefile b/net/freeswitch-core-devel/Makefile
index 12a79aaf2c4d..4586ce4035ce 100644
--- a/net/freeswitch-core-devel/Makefile
+++ b/net/freeswitch-core-devel/Makefile
@@ -43,7 +43,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 USE_AUTOTOOLS=	autoconf:env automake:env libtool:env
 
 USE_PERL5_BUILD=yes
-USE_BISON=	both
+USES=		bison:both
 USE_GCC=	any
 USE_PKGCONFIG=	yes
 USE_GMAKE=	yes
diff --git a/net/freeswitch-core/Makefile b/net/freeswitch-core/Makefile
index 5c933f2d6bc5..b36c7dcfd973 100644
--- a/net/freeswitch-core/Makefile
+++ b/net/freeswitch-core/Makefile
@@ -42,7 +42,7 @@ WRKSRC=		${WRKDIR}/${BASE_PORTNAME}-${PORTVERSION}
 USE_AUTOTOOLS=	autoconf:env automake:env libtool:env
 
 USE_PERL5_BUILD=yes
-USE_BISON=	both
+USES=		bison:both
 USE_GCC=	any
 USE_PKGCONFIG=	yes
 USE_GMAKE=	yes
diff --git a/net/lambdamoo/Makefile b/net/lambdamoo/Makefile
index f4aa9812a372..5495afa9c933 100644
--- a/net/lambdamoo/Makefile
+++ b/net/lambdamoo/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	LambdaMOO
-# Date created:		Jul 3 1999
-# Whom:			Seiichirou Hiraoka
-#
+# Created by: Seiichirou Hiraoka
 # $FreeBSD$
-#
 
 PORTNAME=	lambdamoo
 PORTVERSION=	1.8.1
@@ -19,7 +15,7 @@ WRKSRC=		${WRKDIR}/MOO-${PORTVERSION}
 GNU_CONFIGURE=	yes
 ALL_TARGET=
 CONFIGURE_ENV=	YACC=${YACC}
-USE_BISON=	build
+USES=		bison
 
 PLIST_FILES=	sbin/moo
 
diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile
index 31c04a39f178..fda52d524939 100644
--- a/net/libpcap/Makefile
+++ b/net/libpcap/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libpcap
-# Date created:		10 December 2003
-# Whom:			Bruce M Simpson <bms@FreeBSD.org>
-#
+# Created by: Bruce M Simpson <bms@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libpcap
 PORTVERSION=	1.3.0
@@ -16,7 +12,7 @@ COMMENT=	Ubiquitous network traffic capture library
 MAKE_JOBS_SAFE=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_BISON=	build
+USES=		bison
 USE_LDCONFIG=	yes
 
 .if defined(LIBPCAP_OVERWRITE_BASE)
diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile
index 23cd34379f7d..ed45b0630362 100644
--- a/net/mDNSResponder/Makefile
+++ b/net/mDNSResponder/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:  mDNSResponder
-# Date created:		Tues Mar 2, 2004
-# Whom:			Alfred Perlstein <alfred@freebsd.org>
-#
+# Created by: Alfred Perlstein <alfred@freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	mDNSResponder
 PORTVERSION=	333.10
@@ -21,7 +17,7 @@ CONFLICTS=	avahi-libdns-[0-9]*
 BUILD_WRKSRC=	${WRKSRC}/mDNSPosix
 INSTALL_WRKSRC=	${WRKSRC}/mDNSPosix
 MAKE_ARGS=	os=freebsd LOCALBASE=${PREFIX} MANPATH=${MANPREFIX}/man
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	mdnsd
diff --git a/net/ohphone/Makefile b/net/ohphone/Makefile
index 4c34e9a0d616..8d192b9c0c67 100644
--- a/net/ohphone/Makefile
+++ b/net/ohphone/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ohphone
-# Date created:		Fri Aug 18 19:29:00 BST 2000
-# Whom:			Roger Hardiman <roger@FreeBSD.org>
-#
+# Created by: Roger Hardiman <roger@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	ohphone
 PORTVERSION=	1.4.5
@@ -16,7 +12,7 @@ COMMENT=	H323 Video Conferencing Program, compatible with NetMeeting
 
 LIB_DEPENDS=	h323_r.1:${PORTSDIR}/net/openh323
 
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 ALL_TARGET=	optshared
 MAKE_ENV=	PWLIBDIR=${LOCALBASE}/share/pwlib \
diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile
index 70f2d54f0c3b..f3c9bbe23d9e 100644
--- a/net/olsrd/Makefile
+++ b/net/olsrd/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	olsrd
-# Date created:		6 April 2005
-# Whom:			dave@dogwood.com
-#
+# Created by: dave@dogwood.com
 # $FreeBSD$
-#
 
 PORTNAME=	olsrd
 DISTVERSION=	0.6.3
@@ -21,7 +17,7 @@ BUILD_DEPENDS+=	libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
 .endif
 
 USE_BZIP2=	yes
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 
 USE_RC_SUBR=	olsrd
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index 3f63f12071fb..9ee6d09aa3ab 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	openh323
-# Date created:		Thu Feb 17 15:00:48 GMT 2000
-# Whom:			Roger Hardiman <roger@freebsd.org>
-#
+# Created by: Roger Hardiman <roger@freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	openh323
 PORTVERSION=	1.19.0.1
@@ -21,7 +17,7 @@ LIB_DEPENDS=	pt_r.1:${PORTSDIR}/devel/pwlib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_v${PORTVERSION:S/./_/g}
 
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
diff --git a/net/openmcu/Makefile b/net/openmcu/Makefile
index 9ed6727f3765..348a7c42fa8d 100644
--- a/net/openmcu/Makefile
+++ b/net/openmcu/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	openmcu
-# Date created:		Wed Nov 22 08:57:55 GMT 2000
-# Whom:			Roger Hardiman <roger@FreeBSD.org>
-#
+# Created by: Roger Hardiman <roger@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	openmcu
 PORTVERSION=	2.2.1
@@ -19,7 +15,7 @@ LIB_DEPENDS=	h323_r.1:${PORTSDIR}/net/openh323
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_v${PORTVERSION:S/./_/g}
 
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 ALL_TARGET=	optshared
 MAKE_ENV=	PWLIBDIR=${LOCALBASE}/share/pwlib \
diff --git a/net/tac_plus4/Makefile b/net/tac_plus4/Makefile
index 92f4aed57597..a240faf5d688 100644
--- a/net/tac_plus4/Makefile
+++ b/net/tac_plus4/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	tac_plus
-# Date created:		4 Mar 1997
-# Whom:			Igor Vinokurov <igor@zynaps.ru>
-#
+# Created by: Igor Vinokurov <igor@zynaps.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	tac_plus
 PORTVERSION=	F4.0.4.19
@@ -16,7 +12,7 @@ COMMENT=	The Cisco remote authentication/authorization/accounting server
 
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
-USE_BISON=	build
+USES=		bison
 USE_RC_SUBR=	tac_plus
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-groupid=$$(/usr/bin/id -g tacacs 2>/dev/null || echo '559') \
diff --git a/net/tcpview/Makefile b/net/tcpview/Makefile
index 306272c06200..cc008302b6bc 100644
--- a/net/tcpview/Makefile
+++ b/net/tcpview/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   tcpview
-# Date created:        18 Aug 2000
-# Whom:                Chung-Kie Tung <tung@turtle.ee.ncku.edu.tw>
-#
+# Created by: Chung-Kie Tung <tung@turtle.ee.ncku.edu.tw>
 # $FreeBSD$
-#
 
 PORTNAME=	tcpview
 PORTVERSION=	1.0
@@ -15,7 +11,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	A Motif-based TCP/IP protocol analyzer
 
-USE_BISON=	build
+USES=		bison
 USE_MOTIF=	yes
 
 MAN1=		tcpview.1
diff --git a/net/twinkle/Makefile b/net/twinkle/Makefile
index ce424087778d..188589f2d170 100644
--- a/net/twinkle/Makefile
+++ b/net/twinkle/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	ccgnu2:${PORTSDIR}/devel/commoncpp \
 
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
-USE_BISON=	build
+USES=		bison
 USE_XORG=	xext
 USE_GMAKE=	yes
 USE_GNOME=	libxml2
diff --git a/net/unfs3/Makefile b/net/unfs3/Makefile
index c0197898ac9d..dfbe0e97e856 100644
--- a/net/unfs3/Makefile
+++ b/net/unfs3/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	unfs3
-# Date created:				Mon Feb 16
-# Whom:					Clement Laforet <clement@FreeBSD.org>
-#
+# Created by: Clement Laforet <clement@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	unfs3
 PORTVERSION=	0.9.22
@@ -15,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A user-space implementation of the NFSv3 server specification
 
 USE_AUTOTOOLS=	autoconf
-USE_BISON=	build
+USES=		bison
 
 MAN7=		tags.7
 MAN8=		unfsd.8
diff --git a/net/yate/Makefile b/net/yate/Makefile
index 469656a1d095..ea219f1d8f19 100644
--- a/net/yate/Makefile
+++ b/net/yate/Makefile
@@ -17,7 +17,7 @@ ONLY_FOR_ARCHS=	i386 amd64 sparc64
 
 USE_AUTOTOOLS=	autoconf
 USE_GMAKE=	yes
-USE_BISON=	build
+USES=		bison
 USE_LDCONFIG=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/yptransitd/Makefile b/net/yptransitd/Makefile
index f445d468f1c0..d727460eec49 100644
--- a/net/yptransitd/Makefile
+++ b/net/yptransitd/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	yptransitd
-# Date created:				26 September 2002
-# Whom:					Michael Joyner <mjoyner@hq.dyns.cx>
-#
+# Created by: Michael Joyner <mjoyner@hq.dyns.cx>
 # $FreeBSD$
-#
 
 PORTNAME=	yptransitd
 PORTVERSION=	0.5
@@ -15,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A replacement for nss_ldap
 
 USE_OPENLDAP=	yes
-USE_BISON=	build
+USES=		bison
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-ldap-prefix=${LOCALBASE}
diff --git a/news/xrn/Makefile b/news/xrn/Makefile
index 9f85cefd4ca1..a6a57545a06e 100644
--- a/news/xrn/Makefile
+++ b/news/xrn/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xrn
-# Date created:		13 September 2001
-# Whom:			Anders Nordby <anders@fix.no>
-#
+# Created by: Anders Nordby <anders@fix.no>
 # $FreeBSD$
-#
 
 PORTNAME=	xrn
 DISTVERSION=	10.00-beta-3
@@ -18,7 +14,7 @@ MAN1=		xrn.1
 MANCOMPRESSED=	no
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_BISON=	build
+USES=		bison
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 
 DOCS=		COMMON-PROBLMS COPYRIGHT CREDITS ChangeLog
diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile
index c249fe375046..63473165d0b5 100644
--- a/palm/gnome-pilot-conduits/Makefile
+++ b/palm/gnome-pilot-conduits/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gnomepilot-conduits2
-# Date created:		15 April 2003
-# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	gnome-pilot-conduits
 PORTVERSION=	2.0.17
@@ -20,8 +16,8 @@ LIB_DEPENDS=	gpilotd.2:${PORTSDIR}/palm/gnome-pilot
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_BISON=	build
-USE_GNOME=	gnomeprefix gnomehack libgnome
+USES=		bison pathfix
+USE_GNOME=	gnomeprefix libgnome
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 889a56956b03..6f9539942905 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	libgnomeprint
-# Date created:				15 Jan 1999
-# Whom:					Vanilla I. Shu <vanilla@FreeBSD.org>
-#
+# Created by: Vanilla I. Shu <vanilla@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/print/libgnomeprint/Makefile,v 1.77 2010/09/28 16:38:29 kwm Exp $
 #
@@ -24,9 +21,9 @@ USE_BZIP2=	yes
 LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
 		popt.0:${PORTSDIR}/devel/popt
 
-USE_BISON=	build
+USES=		bison pathfix
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack gnomehier glib20 pango libxml2 \
+USE_GNOME=	gnomeprefix intlhack gnomehier glib20 pango libxml2 \
 		libartlgpl2 ltverhack
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 54d3b6feced9..97c0f677b4a6 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -41,7 +41,7 @@ INFO=		lilypond-notation \
 		music-glossary \
 		internals
 
-USE_BISON=	build
+USES=		bison
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GHOSTSCRIPT=9
diff --git a/russian/ircd-hybrid/Makefile b/russian/ircd-hybrid/Makefile
index 7f9164f9db3b..837416909db3 100644
--- a/russian/ircd-hybrid/Makefile
+++ b/russian/ircd-hybrid/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ircd-hybrid-ru
-# Date Created:				2003.12.14
-# Whom:					Evgueni V. Gavrilov <aquatique@rusunix.org>
-#
+# Created by: Evgueni V. Gavrilov <aquatique@rusunix.org>
 # $FreeBSD$
-#
 
 PORTNAME=	ircd
 PORTVERSION=	7.2.4
@@ -24,7 +20,7 @@ CONFLICTS=	ircd-[0-9]*
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-ru
 USE_OPENSSL=	yes
-USE_BISON=	build
+USES=		bison
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/ircd-hybrid-ru
 
diff --git a/security/aide/Makefile b/security/aide/Makefile
index 2a282b7b5551..199607bf9aee 100644
--- a/security/aide/Makefile
+++ b/security/aide/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	aide
-# Date created:				Tue Jan  4 11:45:29 PST 2000
-# Whom:					Cy Schubert (Cy.Schubert@uumail.gov.bc.ca)
-#
+# Created by: Cy Schubert (Cy.Schubert@uumail.gov.bc.ca)
 # $FreeBSD$
-#
 
 PORTNAME=	aide
 PORTVERSION=	0.15.1
@@ -21,7 +17,7 @@ LIB_DEPENDS=	mhash.2:${PORTSDIR}/security/mhash
 .include <bsd.port.pre.mk>
 
 USE_GMAKE=	yes
-USE_BISON=	build
+USES=		bison
 USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-mhash \
diff --git a/security/ike/Makefile b/security/ike/Makefile
index 672e6f91c0a4..290eef91476e 100644
--- a/security/ike/Makefile
+++ b/security/ike/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ike
-# Date created:		24 march 2007
-# Whom:			mgrooms@shrew.net
-#
+# Created by: mgrooms@shrew.net
 # $FreeBSD$
-#
 
 PORTNAME=	ike
 PORTVERSION=	2.1.7
@@ -19,7 +15,7 @@ COMMENT=	Shrew Soft IKE daemon and client tools
 ONLY_FOR_ARCHS=	i386 amd64
 
 USE_RC_SUBR=	iked
-USE_BISON=	build
+USES=		bison
 USE_OPENSSL=	yes
 USE_CMAKE=	yes
 USE_BZIP2=	yes
diff --git a/security/nessus-libnasl/Makefile b/security/nessus-libnasl/Makefile
index ca5e25753205..bdaa7c28fbd4 100644
--- a/security/nessus-libnasl/Makefile
+++ b/security/nessus-libnasl/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:	nessus-libnasl
-# Date created:				07 November 1999
-# Whom:					Anders Nordby <anders@fix.no>
-#
+# Created by: Anders Nordby <anders@fix.no>
 # $FreeBSD$
-#
 
 PORTNAME=	nessus-libnasl
 PORTVERSION=	2.2.9
@@ -25,7 +21,7 @@ DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/libnasl
 
 USE_AUTOTOOLS=	libtool
-USE_BISON=	build
+USES=		bison
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	YES
 
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index f6f649b79de7..f5658abfba7e 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:	nessus-libraries
-# Date created:				07 November 1999
-# Whom:					Anders Nordby <anders@fix.no>
-#
+# Created by: Anders Nordby <anders@fix.no>
 # $FreeBSD$
-#
 
 # Define NESSUS_CLIENT_ONLY if you only want to build this for the nessus
 # client.
@@ -25,7 +21,7 @@ COMMENT=	Libraries for Nessus, the security scanner
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-libraries
 
-USE_BISON=	build
+USES=		bison
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--enable-cipher
 .if defined(WITH_NESSUS_BPF_SHARE)
diff --git a/security/openvas-libnasl/Makefile b/security/openvas-libnasl/Makefile
index e9fd34bce812..7750411d30e4 100644
--- a/security/openvas-libnasl/Makefile
+++ b/security/openvas-libnasl/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	openvas-libnasl
-# Date created:		2008-04-27
-# Whom:			Tomoyuki Sakurai <cherry@trombik.org>
-#
+# Created by: Tomoyuki Sakurai <cherry@trombik.org>
 # $FreeBSD$
-#
 
 PORTNAME=	openvas-libnasl
 PORTVERSION=	2.0.1
@@ -25,7 +21,7 @@ LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt \
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_ICONV=	yes
-USE_BISON=	build
+USES=		bison
 
 MAN1=		openvas-libnasl-config.1 openvas-nasl.1
 
diff --git a/shells/bash-devel/Makefile b/shells/bash-devel/Makefile
index 6ffcb9f26945..8a5914ba1c9a 100644
--- a/shells/bash-devel/Makefile
+++ b/shells/bash-devel/Makefile
@@ -46,7 +46,7 @@ INFO=			bash
 
 MAKE_JOBS_UNSAFE=	yes
 GNU_CONFIGURE=		yes
-USE_BISON=		build
+USES=			bison
 
 .if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=		FAQ INTRO CHANGES COMPAT NEWS POSIX RBASH
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 4e2250945a58..44818ce61f7f 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# New ports collection makefile for:    bash3
-# Date created:				30 Jul 2004
-# Whom:					Oliver Eikemeier
-#
+# Created by: Oliver Eikemeier
 # $FreeBSD$
-#
 
 PORTNAME=		bash
 PATCHLEVEL=		42
@@ -50,7 +45,7 @@ INFO=			bash
 
 MAKE_JOBS_UNSAFE=	yes
 GNU_CONFIGURE=		yes
-USE_BISON=		build
+USES+=			bison
 
 .if !defined(NOPORTDOCS)
 .if !defined(WITH_INCLUDED_FAQ)
diff --git a/sysutils/grub2/Makefile b/sysutils/grub2/Makefile
index 2c9f4a7a13f9..b25bf4e97a54 100644
--- a/sysutils/grub2/Makefile
+++ b/sysutils/grub2/Makefile
@@ -15,7 +15,7 @@ CONFLICTS=	grub-0*
 
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
-USE_BISON=		build
+USES=			bison
 USE_GETTEXT=		yes
 ONLY_FOR_ARCHS=		i386 amd64
 
diff --git a/sysutils/monit/Makefile b/sysutils/monit/Makefile
index 4282a6f46165..b035a592a493 100644
--- a/sysutils/monit/Makefile
+++ b/sysutils/monit/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   monit
-# Date created:        4 January 2005
-# Whom:                Martin Pala <martinp@tildeslash.com>
-#
+# Created by: Martin Pala <martinp@tildeslash.com>
 # $FreeBSD$
-#
 
 PORTNAME=	monit
 PORTVERSION=	5.5
@@ -16,7 +12,7 @@ COMMENT=	Unix system management and proactive monitoring
 MAN1=		monit.1
 
 GNU_CONFIGURE=	yes
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 USE_RC_SUBR=	${PORTNAME}
 
diff --git a/textproc/confetti/Makefile b/textproc/confetti/Makefile
index e57e24e8a03c..5f3aa76bce9c 100644
--- a/textproc/confetti/Makefile
+++ b/textproc/confetti/Makefile
@@ -13,7 +13,7 @@ BUILD_DEPENDS=	flex:${PORTSDIR}/textproc/flex
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_BISON=	build
+USES=		bison
 USE_PERL5=	yes
 DATE=		20120801
 MAKE_ARGS+=	FLEX=${LOCALBASE}/bin/flex
diff --git a/textproc/dict/Makefile b/textproc/dict/Makefile
index 840675e43663..817800aa04aa 100644
--- a/textproc/dict/Makefile
+++ b/textproc/dict/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:  dict
-# Date created:			  19 February 1998
-# Whom:				  Josh Gilliam <josh@quick.net>
-#
+# Created by: Josh Gilliam <josh@quick.net>
 # $FreeBSD$
-#
 
 PORTNAME=	dict
 PORTVERSION=	1.12.0
@@ -18,7 +13,7 @@ COMMENT=	Dictionary Server Protocol (RFC2229) client
 
 LIB_DEPENDS=	maa.3:${PORTSDIR}/devel/libmaa
 
-USE_BISON=	build
+USES=		bison
 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 a4fad3acb1d8..83fae68a7b9a 100644
--- a/textproc/flex/Makefile
+++ b/textproc/flex/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Fast lexical analyzer generator
 BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man \
 		gm4:${PORTSDIR}/devel/m4
 
-USE_BISON=	build
+USES=		bison
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 # install flex header to its own dir to avoid conflict with system flex.
diff --git a/textproc/htmltolatex/Makefile b/textproc/htmltolatex/Makefile
index 8101c27a9235..5c351be22d1e 100644
--- a/textproc/htmltolatex/Makefile
+++ b/textproc/htmltolatex/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# New ports collection makefile for:	htmltolatex
-# Date created:			Jan 19, 2002
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	htmltolatex
 PORTVERSION=	1
@@ -18,7 +13,7 @@ COMMENT=	HTML to LaTeX to PDF Converter
 
 LIB_DEPENDS=	GraphicsMagick++:${PORTSDIR}/graphics/GraphicsMagick
 
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
 MAKE_JOBS_UNSAFE=	yes
diff --git a/textproc/mifluz/Makefile b/textproc/mifluz/Makefile
index 31b05d206724..9e5bc0dffee5 100644
--- a/textproc/mifluz/Makefile
+++ b/textproc/mifluz/Makefile
@@ -12,8 +12,7 @@ COMMENT=	C++ library to build and query a full text inverted index
 LICENSE=	GPLv3
 
 USE_GCC=	any
-USE_GNOME=	gnomehack
-USE_BISON=	build
+USES=		bison pathfix
 USE_ICONV=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--without-unac
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 5fd8b3537657..a913d86037cd 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	scrollkeeper
-# Date created:				6 April 2001
-# Whom:					Rene Hexel <rh@netbsd.org>
-#
+# Created by: Rene Hexel <rh@netbsd.org>
 # $FreeBSD$
 #    $MCom: ports/textproc/scrollkeeper/Makefile,v 1.12 2007/10/17 21:36:13 mezz Exp $
 
@@ -33,8 +30,8 @@ USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USE_BISON=	build
-USE_GNOME=	gnomehack gnomehier libxslt intlhack
+USES=		bison pathfix
+USE_GNOME=	gnomehier libxslt intlhack
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --datadir=${PREFIX}/share \
 		--with-omfdirs=${PREFIX}/share/omf \
diff --git a/textproc/syck/Makefile b/textproc/syck/Makefile
index f9e628df95ba..081c3c70fde6 100644
--- a/textproc/syck/Makefile
+++ b/textproc/syck/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	syck
-# Date created:			2 December 2004
-# Whom:				dd
-#
+# Created by: dd
 # $FreeBSD$
-#
 
 PORTNAME=	syck
 PORTVERSION=	0.70
@@ -14,7 +10,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library for reading and writing YAML 1.0
 
 GNU_CONFIGURE=	yes
-USE_BISON=	build
+USES=		bison
 CFLAGS+=	-fPIC
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/textproc/xxdiff/Makefile b/textproc/xxdiff/Makefile
index fb700fe9dee7..a40e42a4d777 100644
--- a/textproc/xxdiff/Makefile
+++ b/textproc/xxdiff/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xxdiff
-# Date created:				11 August 2001
-# Whom:					Pete Fritchman <petef@databits.net>
-#
+# Created by: Pete Fritchman <petef@databits.net>
 # $FreeBSD$
-#
 
 PORTNAME=	xxdiff
 PORTVERSION=	3.2
@@ -23,7 +19,7 @@ EXPIRATION_DATE=	2013-07-01
 QMAKE=		${LOCALBASE}/bin/qmake
 SPEC=		${LOCALBASE}/share/qt/mkspecs/freebsd-g++
 USE_BZIP2=	yes
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 USE_QT_VER=	3
 MAKE_ENV+=	QTDIR=${QT_PREFIX}
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 7a32bf6dff32..cea6ce0891ca 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -42,7 +42,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/a
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_XZ=		yes
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 USE_PERL5_BUILD=	yes
 USE_PYTHON_BUILD=	2.6+
diff --git a/www/egueb/Makefile b/www/egueb/Makefile
index 343415fbedbb..105151e4b1da 100644
--- a/www/egueb/Makefile
+++ b/www/egueb/Makefile
@@ -17,9 +17,10 @@ DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USES=		bison pathfix
 USE_BISON=	build
 USE_EFL=	eina enesim ender etch libtool_hack
-USE_GNOME=	gnomehack pkgconfig
+USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--disable-static
diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index eeee09258773..54d73b63c9b2 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	links
-# Date created:		21 January 2000
-# Whom:			Michael Vasilenko <acid@stu.cn.ua>
-#
+# Created by: Michael Vasilenko <acid@stu.cn.ua>
 # $FreeBSD$
-#
 
 PORTNAME=	elinks
 DISTVERSION=	0.11.7
@@ -17,7 +13,7 @@ COMMENT=	Elinks - links text WWW browser with enhancements
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
-USE_BISON=	build
+USES=		bison
 USE_OPENSSL=	yes
 
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 58c9a5264acc..14955277e05d 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -24,7 +24,7 @@ USE_GETTEXT=	yes
 USE_GSTREAMER=	yes
 MAKE_JOBS_SAFE=	yes
 USE_XORG=	xt xrender
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gtk20 libxslt ltverhack
diff --git a/x11-clocks/buici-clock/Makefile b/x11-clocks/buici-clock/Makefile
index 964d1315dc6c..a5fa672d2ef1 100644
--- a/x11-clocks/buici-clock/Makefile
+++ b/x11-clocks/buici-clock/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	buici-clock
-# Date created:		22nd Nov 2004
-# Whom:				Hendrik Scholz <hscholz@raisdorf.net>
-#
+# Created by: Hendrik Scholz <hscholz@raisdorf.net>
 # $FreeBSD$
-#
 
 PORTNAME=	buici-clock
 PORTVERSION=	0.4.9.2
@@ -21,7 +17,7 @@ LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_XORG=	x11 xext
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 USE_PKGCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 81bd23bff645..4fa8322ae923 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	libgnomeprintui
-# Date created:				12 April 2002
-# Whom:					Maxim Sobolev <sobomax@FreBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax@FreBSD.org>
 # $FreeBSD$
 #   $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.75 2010/09/28 16:07:36 kwm Exp $
-#
 
 PORTNAME=	libgnomeprintui
 PORTVERSION=	2.18.6
@@ -22,7 +18,8 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc
 USE_BZIP2=	yes
 USE_XORG=	x11 xpm
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack libgnomeprint libgnomecanvas \
+USES=		bison pathfix
+USE_GNOME=	gnomeprefix libgnomeprint libgnomecanvas \
 		intlhack ltverhack
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index a3ad217a65bf..76754a89c7f5 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	libgnomeui
-# Date created:				07 April 2002
-# Whom:					Joe Marcus Clarke <marcus@FreBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreBSD.org>
 # $FreeBSD$
 #   $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.129 2010/09/27 20:16:41 kwm Exp $
-#
 
 PORTNAME=	libgnomeui
 PORTVERSION=	2.24.4
@@ -27,11 +23,12 @@ RUN_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-i
 USE_GETTEXT=	yes
 USE_XORG=	sm
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier libbonoboui ltverhack \
+USES=		bison pathfix
+USE_GNOME=	gnomeprefix gnomehier libbonoboui ltverhack \
 		referencehack gvfs
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-USE_BISON=	build
+
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index 5427129f79a1..a0fb35fe56b1 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	libwnck
-# Date created:				12 April 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.133 2010/11/17 11:38:29 kwm Exp $
-#
 
 PORTNAME=	libwnck
 PORTVERSION=	2.30.6
@@ -26,8 +22,8 @@ RUN_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 USE_GETTEXT=	yes
 USE_XORG=	xres
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gtk20 ltverhack referencehack intlhack
-USE_BISON=	build
+USES=		bison pathfix
+USE_GNOME=	gtk20 ltverhack referencehack intlhack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile
index 94be4964bc4b..0cd5087458a8 100644
--- a/x11-toolkits/libzvt/Makefile
+++ b/x11-toolkits/libzvt/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libzvt
-# Date created:				12 April 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libzvt
 PORTVERSION=	2.0.1
@@ -18,10 +14,10 @@ COMMENT=	Library components for Zed's Virtual Terminal
 USE_BZIP2=	yes
 USE_XORG=	x11
 USE_GMAKE=	yes
-USE_BISON=	build
+USES=		bison pathfix
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomeprefix gnomehack gtk20 libartlgpl2
+USE_GNOME=	gnomeprefix gtk20 libartlgpl2
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
 
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index e649299f74dc..289a0b0e315f 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	vte
-# Date created:				05 October 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/x11-toolkits/vte/Makefile,v 1.117 2010/11/13 13:16:58 kwm Exp $
-#
 
 PORTNAME=	vte
 PORTVERSION=	0.26.2
@@ -21,11 +17,11 @@ USE_BZIP2=	yes
 .if !defined(REFERENCE_PORT)
 
 USE_GMAKE=	yes
-USE_BISON=	build
+USES=		bison pathfix
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_GETTEXT=	yes
-USE_GNOME?=	gnomeprefix gnomehack gtk20 ltverhack referencehack
+USE_GNOME?=	gnomeprefix gtk20 ltverhack referencehack
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 #		BSD_PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/x11-wm/i3/Makefile b/x11-wm/i3/Makefile
index ff2d4f93c75a..016ae679f0da 100644
--- a/x11-wm/i3/Makefile
+++ b/x11-wm/i3/Makefile
@@ -30,7 +30,7 @@ RUN_DEPENDS=	p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run \
 
 USE_PERL5=	yes
 USE_XORG=	x11 xcursor
-USE_BISON=	build
+USES=		bison
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 49049ea98a29..556fa968e4c2 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnomedesktop
-# Date created:				13 April 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/x11/gnome-desktop/Makefile,v 1.190 2010/11/17 12:03:52 kwm Exp $
-#
 
 PORTNAME=	gnome-desktop
 PORTVERSION=	2.32.1
@@ -23,12 +19,12 @@ USE_BZIP2=	yes
 LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 
 USE_XORG=	xpm
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomedocutils gconf2 pygtk2 \
+USES=		bison pathfix
+USE_GNOME=	gnomeprefix intlhack gnomedocutils gconf2 pygtk2 \
 		ltverhack referencehack
 GNOME_DESKTOP_VERSION=2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_BISON=	build
 USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index f22b01f77c9b..c5a1668b25d4 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	libgnome
-# Date created:				17 June 1998
-# Whom:					Yukihiro Nakai <Nakai@technologist.com>
-#
+# Created by: Yukihiro Nakai <Nakai@technologist.com>
 # $FreeBSD$
 #   $MCom: ports/x11/libgnome/Makefile,v 1.135 2010/09/27 20:06:45 kwm Exp $
-#
 
 PORTNAME=	libgnome
 PORTVERSION=	2.32.0
@@ -26,9 +22,9 @@ RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack esound libbonobo \
+USE_GNOME=	gnomeprefix intlhack esound libbonobo \
 		gnomevfs2 ltverhack referencehack
-USE_BISON=	build
+USES=		bison pathfix
 USE_XORG=	xpm
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/x11/xstroke/Makefile b/x11/xstroke/Makefile
index 245e846add6d..140cc46a35f4 100644
--- a/x11/xstroke/Makefile
+++ b/x11/xstroke/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:	xstroke
-# Date created:			May 14, 2002
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	xstroke
 PORTVERSION=	0.5.12
@@ -17,7 +13,7 @@ COMMENT=	Fullscreen gesture recognition
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-USE_BISON=	build
+USES=		bison
 USE_XORG=	xft x11 xext xi xtst
 USE_IMAKE=	yes
author	Baptiste Daroussin <bapt@FreeBSD.org>	2013-03-08 11:32:11 +0000
committer	Baptiste Daroussin <bapt@FreeBSD.org>	2013-03-08 11:32:11 +0000
commit	9250d94365048cf854570d93b5196aa250eba8f0 (patch)
tree	9c130b083139cc77280c7e96cc9cea75a84d2d4c
parent	Update to 0.48.4. (diff)