28 files changed, 28 insertions, 29 deletions

diff --git a/deskutils/basket/Makefile b/deskutils/basket/Makefile
index d143d79ca4b2..13f04803f000 100644
--- a/deskutils/basket/Makefile
+++ b/deskutils/basket/Makefile
@@ -17,7 +17,7 @@ USE_BZIP2=	yes
 USE_XORG=	xft xpm
 USE_KDE4=	automoc4 kdeprefix pimlibs qimageblitz
 USE_QT4=	moc_build qmake_build rcc_build uic_build
-USE_CMAKE=	yes
+USES=		cmake
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/deskutils/cairo-dock-plugins/Makefile b/deskutils/cairo-dock-plugins/Makefile
index 982aebfc6c80..8a60f69d90f8 100644
--- a/deskutils/cairo-dock-plugins/Makefile
+++ b/deskutils/cairo-dock-plugins/Makefile
@@ -27,7 +27,7 @@ USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 USE_XORG=	xrender
 USE_DOS2UNIX=	YES
-USE_CMAKE=	yes
+USES=		cmake
 USE_GCC=	4.6+
 MAKE_JOBS_SAFE=	YES
 PLIST_SUB+=	PYVER="${PYTHON_VERSION:S/thon//}"
diff --git a/deskutils/cairo-dock/Makefile b/deskutils/cairo-dock/Makefile
index 105a72a62181..b2d8c0b8017a 100644
--- a/deskutils/cairo-dock/Makefile
+++ b/deskutils/cairo-dock/Makefile
@@ -21,7 +21,7 @@ USE_GETTEXT=	yes
 USE_GNOME=	gnomehack pkgconfig glib20 gtk20 librsvg2 libxml2
 USE_LDCONFIG=	yes
 USE_XORG=	xrender xtst
-USE_CMAKE=	yes
+USES=		cmake
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		cairo-dock.1
diff --git a/deskutils/charmtimetracker/Makefile b/deskutils/charmtimetracker/Makefile
index ba4454c9d2a4..4f12b93af6f7 100644
--- a/deskutils/charmtimetracker/Makefile
+++ b/deskutils/charmtimetracker/Makefile
@@ -21,7 +21,7 @@ LICENSE_FILE=	${WRKSRC}/License.txt
 
 WRKSRC=		${WRKDIR}/KDAB-Charm-3151d25
 
-USE_CMAKE=	yes
+USES=		cmake
 CMAKE_ARGS+=	-DCharm_VERSION:STRING=${PORTVERSION}
 USE_KDE4=	kdehier kdeprefix
 USE_QT4=	qmake_build moc_build rcc_build uic_build corelib gui network \
diff --git a/deskutils/chmsee/Makefile b/deskutils/chmsee/Makefile
index a047e53dd639..9607d18f604f 100644
--- a/deskutils/chmsee/Makefile
+++ b/deskutils/chmsee/Makefile
@@ -22,7 +22,7 @@ LICENSE=	GPLv2
 USE_GNOME=	gnomehier libglade2
 USE_GECKO=	libxul19
 USE_GETTEXT=	yes
-USE_CMAKE=	yes
+USES=		cmake
 CMAKE_ARGS=	-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=TRUE
 INSTALLS_ICONS=	yes
 
diff --git a/deskutils/kchmviewer-kde4/Makefile b/deskutils/kchmviewer-kde4/Makefile
index e97e0e20b849..9d2b21066702 100644
--- a/deskutils/kchmviewer-kde4/Makefile
+++ b/deskutils/kchmviewer-kde4/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	chm.0:${PORTSDIR}/misc/chmlib
 
 LATEST_LINK=	${PORTNAME}-kde4
 
-USE_CMAKE=	yes
+USES=		cmake
 USE_KDE4=	kdeprefix kdelibs automoc4
 USE_QT4=	webkit qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
diff --git a/deskutils/ksshaskpass/Makefile b/deskutils/ksshaskpass/Makefile
index ff20abb24950..a047d4f9a993 100644
--- a/deskutils/ksshaskpass/Makefile
+++ b/deskutils/ksshaskpass/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	swills@FreeBSD.org
 COMMENT=	A KDE 4 version of ssh-askpass with KWallet support
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_CMAKE=	yes
+USES=		cmake
 USE_KDE4=	kdelibs automoc4
 USE_QT4=	moc_build uic_build qmake_build rcc_build
 
diff --git a/deskutils/libgcal/Makefile b/deskutils/libgcal/Makefile
index d4827b07b537..3f35c80c20d6 100644
--- a/deskutils/libgcal/Makefile
+++ b/deskutils/libgcal/Makefile
@@ -17,7 +17,7 @@ LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_BZIP2=	yes
-USE_CMAKE=	yes
+USES=		cmake
 CMAKE_ARGS=	-DLIB_INSTALL_DIR="${LOCALBASE}/lib" \
 		-DENABLE_TESTS=OFF
 USE_LDCONFIG=	yes
diff --git a/deskutils/libopensync-plugin-evolution2-devel/Makefile b/deskutils/libopensync-plugin-evolution2-devel/Makefile
index d2dda5ffbb27..25c82ed3aec9 100644
--- a/deskutils/libopensync-plugin-evolution2-devel/Makefile
+++ b/deskutils/libopensync-plugin-evolution2-devel/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	vconvert:${PORTSDIR}/deskutils/libopensync-plugin-vformat-devel
 CONFLICTS=	libopensync-plugin-evolution2-0.2*
 
 USE_BZIP2=	yes
-USE_CMAKE=	yes
+USES=		cmake
 USE_GNOME=	evolutiondataserver gconf2
 
 CMAKE_ARGS+=	-Wno-dev
diff --git a/deskutils/libopensync-plugin-python-devel/Makefile b/deskutils/libopensync-plugin-python-devel/Makefile
index aa0fc7d31539..636b107678b6 100644
--- a/deskutils/libopensync-plugin-python-devel/Makefile
+++ b/deskutils/libopensync-plugin-python-devel/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	opensync.1:${PORTSDIR}/devel/libopensync
 CONFLICTS=	libopensync-plugin-python-0.2*
 
 USE_BZIP2=	yes
-USE_CMAKE=	yes
+USES=		cmake
 USE_PYTHON=	yes
 USE_GNOME=	pkgconfig
 CMAKE_ARGS+=	-Wno-dev  \
diff --git a/deskutils/libopensync-plugin-vformat-devel/Makefile b/deskutils/libopensync-plugin-vformat-devel/Makefile
index 707f9291f001..360cbad26d38 100644
--- a/deskutils/libopensync-plugin-vformat-devel/Makefile
+++ b/deskutils/libopensync-plugin-vformat-devel/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	opensync.1:${PORTSDIR}/devel/libopensync
 
 USE_BZIP2=	yes
 USE_ICONV=	yes
-USE_CMAKE=	yes
+USES=		cmake
 CMAKE_ARGS+=	-Wno-dev
 CFLAGS+=	"-I${LOCALBASE}/include"
 
diff --git a/deskutils/msynctool-devel/Makefile b/deskutils/msynctool-devel/Makefile
index bea5454fd1ff..c7e2bd948183 100644
--- a/deskutils/msynctool-devel/Makefile
+++ b/deskutils/msynctool-devel/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	opensync.1:${PORTSDIR}/devel/libopensync
 CONFLICTS=	msynctool-0.2*
 
 USE_BZIP2=	yes
-USE_CMAKE=	yes
+USES=		cmake
 
 PLIST_FILES=	bin/${PORTNAME}
 
diff --git a/deskutils/plasma-applet-cwp/Makefile b/deskutils/plasma-applet-cwp/Makefile
index 05f45a80199b..027034003d76 100644
--- a/deskutils/plasma-applet-cwp/Makefile
+++ b/deskutils/plasma-applet-cwp/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv3
 
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
-USE_CMAKE=	yes
+USES=		cmake
 USE_KDE4=	automoc4 kdeprefix kdelibs
 USE_QT4=	gui dbus network opengl svg phonon webkit xml \
 		qmake_build moc_build rcc_build uic_build
diff --git a/deskutils/plasma-applet-daisy/Makefile b/deskutils/plasma-applet-daisy/Makefile
index eb0f52b74a53..99ab022fcd50 100644
--- a/deskutils/plasma-applet-daisy/Makefile
+++ b/deskutils/plasma-applet-daisy/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Simple launcher plasma applet for KDE4
 
 LICENSE=	GPLv3
 
-USE_CMAKE=	yes
+USES=		cmake
 USE_KDE4=	automoc4 kdeprefix kdelibs workspace
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 USE_GETTEXT=	yes
diff --git a/deskutils/plasma-applet-fancytasks/Makefile b/deskutils/plasma-applet-fancytasks/Makefile
index 688b02c23a1d..7aaf8deaccb5 100644
--- a/deskutils/plasma-applet-fancytasks/Makefile
+++ b/deskutils/plasma-applet-fancytasks/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Plasmoid fancy representation of your tasks and launchers
 LICENSE=	GPLv2
 
 USE_BZIP2=	yes
-USE_CMAKE=	yes
+USES=		cmake
 USE_KDE4=	automoc4 kdeprefix kdelibs workspace qimageblitz
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 
diff --git a/deskutils/plasma-applet-panelspacer/Makefile b/deskutils/plasma-applet-panelspacer/Makefile
index a0560592f846..e00f369342dd 100644
--- a/deskutils/plasma-applet-panelspacer/Makefile
+++ b/deskutils/plasma-applet-panelspacer/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}-plasmoid-${PORTVERSION}
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Panel spacer plasma applet for KDE4
 
-USE_CMAKE=	yes
+USES=		cmake
 USE_KDE4=	automoc4 kdeprefix workspace
 USE_QT4=	gui dbus network opengl svg webkit xml \
 		qmake_build moc_build rcc_build uic_build
diff --git a/deskutils/plasma-applet-playwolf/Makefile b/deskutils/plasma-applet-playwolf/Makefile
index 7b2b7569f661..d894f77c2a41 100644
--- a/deskutils/plasma-applet-playwolf/Makefile
+++ b/deskutils/plasma-applet-playwolf/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Amarok 2.x plasma applet for KDE4
 
 USE_BZIP2=	yes
-USE_CMAKE=	yes
+USES=		cmake
 USE_KDE4=	automoc4 kdeprefix kdelibs
 USE_QT4=	gui dbus network opengl phonon svg webkit xml xmlpatterns \
 		qmake_build moc_build rcc_build uic_build
diff --git a/deskutils/plasma-applet-qstardict/Makefile b/deskutils/plasma-applet-qstardict/Makefile
index a3c35a1df76b..14094fd18184 100644
--- a/deskutils/plasma-applet-qstardict/Makefile
+++ b/deskutils/plasma-applet-qstardict/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Dictionary plasma applet for KDE
 RUN_DEPENDS=	${QSTARDICT_PLUGIN_PATH}/libstardict.so:${PORTSDIR}/textproc/qstardict
 
 USE_BZIP2=	yes
-USE_CMAKE=	yes
+USES=		cmake
 USE_QT4=	qmake_build uic_build moc_build rcc_build
 USE_KDE4=	automoc4 kdeprefix kdelibs
 CMAKE_SOURCE_PATH=	${WRKSRC}/kdeplasma
diff --git a/deskutils/plasma-applet-serverstatuswidget/Makefile b/deskutils/plasma-applet-serverstatuswidget/Makefile
index e058fd77bd62..399ed6c78671 100644
--- a/deskutils/plasma-applet-serverstatuswidget/Makefile
+++ b/deskutils/plasma-applet-serverstatuswidget/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Server monitoring plasma applet for KDE4
 
 USE_BZIP2=	yes
-USE_CMAKE=	yes
+USES=		cmake
 USE_GETTEXT=	yes
 USE_KDE4=	automoc4 kdeprefix workspace
 USE_QT4=	qmake_build moc_build rcc_build uic_build
diff --git a/deskutils/plasma-applet-simpleweatherforecast/Makefile b/deskutils/plasma-applet-simpleweatherforecast/Makefile
index d5cf52ace200..fcf111db2763 100644
--- a/deskutils/plasma-applet-simpleweatherforecast/Makefile
+++ b/deskutils/plasma-applet-simpleweatherforecast/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Weather plasma applet for KDE4
 
 RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 
-USE_CMAKE=	yes
+USES=		cmake
 USE_KDE4=	automoc4 kdeprefix kdelibs
 USE_QT4=	gui dbus network opengl svg webkit xml \
 		qmake_build moc_build rcc_build uic_build
diff --git a/deskutils/plasma-applet-teacooker/Makefile b/deskutils/plasma-applet-teacooker/Makefile
index 42369a9efbfa..d201b0ec21a6 100644
--- a/deskutils/plasma-applet-teacooker/Makefile
+++ b/deskutils/plasma-applet-teacooker/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	85564-TeaCooker
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Tea cooker plasma applet for KDE4
 
-USE_CMAKE=	yes
+USES=		cmake
 USE_KDE4=	automoc4 kdeprefix kdelibs
 USE_QT4=	gui dbus network opengl svg webkit xml \
 		qmake_build moc_build rcc_build uic_build
diff --git a/deskutils/plasma-applet-yawp/Makefile b/deskutils/plasma-applet-yawp/Makefile
index 6c7713db050e..866624297a08 100644
--- a/deskutils/plasma-applet-yawp/Makefile
+++ b/deskutils/plasma-applet-yawp/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Weather plasma applet for KDE4
 LICENSE=	GPLv2
 
 USE_BZIP2=	yes
-USE_CMAKE=	yes
+USES=		cmake
 USE_KDE4=	automoc4 kdeprefix workspace
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 USE_GETTEXT=	yes
diff --git a/deskutils/q4wine/Makefile b/deskutils/q4wine/Makefile
index a53cfa468224..4abf1b42c438 100644
--- a/deskutils/q4wine/Makefile
+++ b/deskutils/q4wine/Makefile
@@ -28,7 +28,7 @@ ONLY_FOR_ARCHS_REASON=	depends on wine which is only available for i386
 
 MAN1=		q4wine-cli.1 q4wine-helper.1 q4wine.1
 
-USE_CMAKE=	yes
+USES=		cmake
 CMAKE_ARGS+=	-DMANPAGE_ENTRY_PATH=${MANPREFIX}/man/
 
 OPTIONS=	DBUS "Enable DBus notification support" on
diff --git a/deskutils/qtm/Makefile b/deskutils/qtm/Makefile
index ba0ce6886fd4..0ea05d940170 100644
--- a/deskutils/qtm/Makefile
+++ b/deskutils/qtm/Makefile
@@ -17,7 +17,7 @@ USE_BZIP2=	yes
 USE_QT4=	corelib dbus gui network xml \
 		moc_build qmake_build rcc_build uic_build
 USE_OPENSSL=	yes
-USE_CMAKE=	yes
+USES=		cmake
 CMAKE_ARGS=	-DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \
 		-DMANPAGE_DIRECTORY:STRING="${MANPREFIX}/man/man1" \
 		-DMARKDOWN_LOCATION:STRING="${LOCALBASE}/bin/markdown"
diff --git a/deskutils/silence/Makefile b/deskutils/silence/Makefile
index 98438d6503db..be954717136a 100644
--- a/deskutils/silence/Makefile
+++ b/deskutils/silence/Makefile
@@ -17,7 +17,7 @@ COMMENT=	An information management tool
 
 RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/katepart.so:${PORTSDIR}/editors/kate
 
-USE_CMAKE=	yes
+USES=		cmake
 USE_KDE4=	kdelibs kdehier kdeprefix automoc4
 USE_QT4=	qmake_build moc_build rcc_build uic_build linguist_build
 
diff --git a/deskutils/steadyflow/Makefile b/deskutils/steadyflow/Makefile
index bdad3391900a..42f374590177 100644
--- a/deskutils/steadyflow/Makefile
+++ b/deskutils/steadyflow/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		unique-1:${PORTSDIR}/x11-toolkits/unique
 BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
 
-USE_CMAKE=	yes
+USES=		cmake
 GLIB_SCHEMAS=	net.launchpad.steadyflow.gschema.xml
 USE_GNOME=	desktopfileutils glib20 gtk20
 USE_GETTEXT=	yes
diff --git a/deskutils/taskwarrior/Makefile b/deskutils/taskwarrior/Makefile
index bcd7c851d449..094ab000e5b5 100644
--- a/deskutils/taskwarrior/Makefile
+++ b/deskutils/taskwarrior/Makefile
@@ -24,8 +24,7 @@ WRKSRC=		${WRKDIR}/task-${DISTVERSION}
 USE_LUA=	5.1
 .endif
 
-USE_CMAKE=	yes
-CMAKE_OUTSOURCE=yes
+USES=		cmake:outsource
 CMAKE_ARGS+=	-DTASK_DOCDIR:STRING=${DATADIR:S/${PREFIX}\///} \
    		-DTASK_MAN1DIR:STRING=man/man1 \
 		-DTASK_MAN5DIR:STRING=man/man5
diff --git a/deskutils/teapot/Makefile b/deskutils/teapot/Makefile
index 17eb2d82b171..ba007258cf0f 100644
--- a/deskutils/teapot/Makefile
+++ b/deskutils/teapot/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Full-screen curses based spread sheet program
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_CMAKE=	yes
+USES=		cmake
 
 NO_MANCOMPRESS=	no
 MAN1=	teapot.1