16 files changed, 22 insertions, 45 deletions

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