16 files changed, 16 insertions, 19 deletions

diff --git a/databases/akonadi-google/Makefile b/databases/akonadi-google/Makefile
index 35d19c678297..aa40e4f99a16 100644
--- a/databases/akonadi-google/Makefile
+++ b/databases/akonadi-google/Makefile
@@ -24,7 +24,7 @@ BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
 USE_KDE4=	kdehier kdelibs kdeprefix pimlibs automoc4
 USE_QT4=	dbus gui network webkit xml \
 		moc_build qmake_build rcc_build uic_build
-USE_CMAKE=	yes
+USES=		cmake
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/databases/akonadi-googledata/Makefile b/databases/akonadi-googledata/Makefile
index 7f0c083aa1bc..960500b59a1c 100644
--- a/databases/akonadi-googledata/Makefile
+++ b/databases/akonadi-googledata/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Akonadi Resources for Google Contacts and Calendar
 LIB_DEPENDS=	gcal:${PORTSDIR}/deskutils/libgcal
 
 USE_BZIP2=	yes
-USE_CMAKE=	yes
+USES=		cmake
 USE_GETTEXT=	yes
 USE_QT4=	qmake_build rcc_build moc_build uic_build dbus
 USE_KDE4=	kdelibs kdeprefix pimlibs automoc4 akonadi
diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile
index e4aac3d0d218..5abd998d0298 100644
--- a/databases/kbibtex/Makefile
+++ b/databases/kbibtex/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Bibliography editor for KDE
 LIB_DEPENDS=	poppler-qt4:${PORTSDIR}/graphics/poppler-qt4
 
 USE_BZIP2=	yes
-USE_CMAKE=	yes
+USES=		cmake
 USE_GNOME=	libxml2 libxslt
 USE_KDE4=	kdelibs kdeprefix automoc4 sharedmime
 USE_QT4=	qmake_build moc_build uic_build rcc_build \
diff --git a/databases/mariadb55-server/Makefile b/databases/mariadb55-server/Makefile
index a2d9061a8e95..13d2b520cb74 100644
--- a/databases/mariadb55-server/Makefile
+++ b/databases/mariadb55-server/Makefile
@@ -19,7 +19,7 @@ MAINTAINER=	never@nevermind.kiev.ua
 COMMENT?=	Multithreaded SQL database (server)
 
 SLAVEDIRS=	databases/mariadb55-client
-USE_CMAKE=	yes
+USES=		cmake
 MAKE_JOBS_SAFE=	yes
 NO_OPTIONS_SORT=yes
 
diff --git a/databases/mydumper/Makefile b/databases/mydumper/Makefile
index edc7167ac680..c4428b0cb80e 100644
--- a/databases/mydumper/Makefile
+++ b/databases/mydumper/Makefile
@@ -21,7 +21,7 @@ PLIST_FILES=	sbin/mydumper sbin/myloader
 USE_GNOME=	glib20
 USE_PKGCONFIG=	build
 USE_MYSQL=	yes
-USE_CMAKE=	yes
+USES=		cmake
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Werror||' ${WRKSRC}/CMakeLists.txt
diff --git a/databases/mysql-connector-c++/Makefile b/databases/mysql-connector-c++/Makefile
index a400105a702b..235a7a0c5dba 100644
--- a/databases/mysql-connector-c++/Makefile
+++ b/databases/mysql-connector-c++/Makefile
@@ -16,8 +16,7 @@ LIB_DEPENDS=	boost_regex:${PORTSDIR}/devel/boost-libs
 
 USE_MYSQL=	51+
 USE_LDCONFIG=	yes
-USE_CMAKE=	yes
-CMAKE_OUTSOURCE=yes
+USES=		cmake:outsource
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
diff --git a/databases/mysql-connector-c/Makefile b/databases/mysql-connector-c/Makefile
index d2ccaccd98a3..a8ca545885d7 100644
--- a/databases/mysql-connector-c/Makefile
+++ b/databases/mysql-connector-c/Makefile
@@ -13,7 +13,7 @@ COMMENT=	MySQL database connector for C
 LICENSE=	GPLv2
 
 USE_MYSQL=	51+
-USE_CMAKE=	yes
+USES=		cmake
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
diff --git a/databases/mysql-connector-odbc/Makefile b/databases/mysql-connector-odbc/Makefile
index d2e24ed38e88..a5e202644747 100644
--- a/databases/mysql-connector-odbc/Makefile
+++ b/databases/mysql-connector-odbc/Makefile
@@ -18,7 +18,7 @@ COMMENT=	ODBC driver for MySQL${MYSQL_VER} / ${DRIVER_MANAGER}
 USE_LDCONFIG=	yes
 USE_MYSQL=	yes
 DEFAULT_MYSQL_VER=	51
-USE_CMAKE=	yes
+USES=		cmake
 
 PLIST_SUB=	VER=${PORTVERSION}
 
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 03bb57a84c03..1e4acfd63204 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 SLAVEDIRS=	databases/mysql55-client
-USE_CMAKE=	yes
+USES=		cmake
 MAKE_JOBS_SAFE=	yes
 NO_OPTIONS_SORT=yes
 
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
index 435362b72133..0fa447b7f5d7 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 SLAVEDIRS=	databases/mysql56-client
-USE_CMAKE=	yes
+USES=		cmake
 MAKE_JOBS_SAFE=	yes
 
 CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 2f8803f64aab..9d9a3f4e6dfe 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -13,8 +13,7 @@ MAINTAINER=	flo@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 SLAVEDIRS=	databases/percona55-client
-USE_CMAKE=	yes
-USES=		bison
+USES=		bison cmake
 MAKE_JOBS_SAFE=	yes
 
 OPTIONS_DEFINE=	OPENSSL FASTMTX
diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile
index 03b8d1759f03..87a4d4d87418 100644
--- a/databases/percona56-server/Makefile
+++ b/databases/percona56-server/Makefile
@@ -13,8 +13,7 @@ MAINTAINER=	flo@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 SLAVEDIRS=	databases/percona56-client
-USE_CMAKE=	yes
-USES=		bison
+USES=		bison cmake
 MAKE_JOBS_SAFE=	yes
 
 OPTIONS_DEFINE=	OPENSSL FASTMTX
diff --git a/databases/pgagent/Makefile b/databases/pgagent/Makefile
index f3d9ab9ea93c..8788a9048dd8 100644
--- a/databases/pgagent/Makefile
+++ b/databases/pgagent/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	Job scheduler for PostgreSQL
 
 MAKE_JOBS_SAFE=	yes
-USE_CMAKE=	yes
+USES=		cmake
 CMAKE_ARGS=	-DSTATIC_BUILD:BOOL=NO -DWX_CONFIG_PATH:FILEPATH="${WX_CONFIG}"
 USE_WX=		2.8
 WX_UNICODE=	yes
diff --git a/databases/soci/Makefile b/databases/soci/Makefile
index 3c412da69b48..c9cbd1555a6a 100644
--- a/databases/soci/Makefile
+++ b/databases/soci/Makefile
@@ -14,7 +14,7 @@ LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE_1_0.txt
 
 USE_ZIP=	yes
-USE_CMAKE=	yes
+USES=		cmake
 CMAKE_ARGS+=	-DWITH_ORACLE:BOOL=OFF
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
diff --git a/databases/sqliteman/Makefile b/databases/sqliteman/Makefile
index 007bde3f29f8..9bbf93525aa2 100644
--- a/databases/sqliteman/Makefile
+++ b/databases/sqliteman/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Admin's GUI tool for Sqlite3
 
 LIB_DEPENDS=	qscintilla2:${PORTSDIR}/devel/qscintilla2
 
-USE_CMAKE=	yes
+USES=		cmake
 USE_SQLITE=	yes
 CMAKE_ENV+=	QMAKESPEC=${QMAKESPEC}
 USE_QT4=	qmake_build gui moc_build rcc_build uic_build xml sql
diff --git a/databases/tarantool/Makefile b/databases/tarantool/Makefile
index d208a458118d..d90ab963a5a5 100644
--- a/databases/tarantool/Makefile
+++ b/databases/tarantool/Makefile
@@ -14,7 +14,7 @@ COMMENT=	High performance key/value storage server
 LICENSE=	BSD
 
 TR_REV=		31-g9ca7fda
-USE_CMAKE=	yes
+USES=		cmake
 USE_GCC=	4.6+
 USE_GETTEXT=	build
 USE_GMAKE=	yes