20 files changed, 20 insertions, 25 deletions

diff --git a/multimedia/assimp/Makefile b/multimedia/assimp/Makefile
index 5dac001f9323..35aff40d23bd 100644
--- a/multimedia/assimp/Makefile
+++ b/multimedia/assimp/Makefile
@@ -17,7 +17,7 @@ LICENSE=	BSD
 LIB_DEPENDS=	boost_filesystem:${PORTSDIR}/devel/boost-libs
 
 USE_ZIP=	yes
-USE_CMAKE=	yes
+USES=		cmake
 USE_PKGCONFIG=	build
 USE_GCC=	4.6+ # 4.2+ causes compiler warnings
 USE_LDCONFIG=	yes
diff --git a/multimedia/avidemux2/Makefile.common b/multimedia/avidemux2/Makefile.common
index b24af8724605..6de9f5f718b0 100644
--- a/multimedia/avidemux2/Makefile.common
+++ b/multimedia/avidemux2/Makefile.common
@@ -26,10 +26,9 @@ USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_PKGCONFIG=	build
 WANT_SDL=	yes
-USE_CMAKE=	yes
+USES=		cmake:outsource
 CMAKE_USE_PTHREAD=yes
 CMAKE_ARGS+=	-DTHREADS_HAVE_PTHREAD_ARG:STRING="${PTHREAD_LIBS}"
-CMAKE_OUTSOURCE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
diff --git a/multimedia/bangarang/Makefile b/multimedia/bangarang/Makefile
index b4fa5061453b..d369a938af73 100644
--- a/multimedia/bangarang/Makefile
+++ b/multimedia/bangarang/Makefile
@@ -18,7 +18,7 @@ LICENSE=	GPLv3
 LIB_DEPENDS=	tag.1:${PORTSDIR}/audio/taglib
 
 PROJECTHOST=	bangarangissuetracking
-USE_CMAKE=	yes
+USES=		cmake
 USE_GETTEXT=	yes
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 USE_KDE4=	automoc4 kdelibs kdeprefix
diff --git a/multimedia/dvbcut/Makefile b/multimedia/dvbcut/Makefile
index b9ce62cb8561..72856fc43138 100644
--- a/multimedia/dvbcut/Makefile
+++ b/multimedia/dvbcut/Makefile
@@ -46,7 +46,7 @@ MAKEFILE=	makefile
 QTCPPFLAGS+=	${PTHREAD_CFLAGS}
 QTCFGLIBS+=	${PTHREAD_LIBS}
 .else
-USE_CMAKE=	yes
+USES=		cmake
 USE_QT4=  gui qt3support xml  moc_build qmake_build rcc_build uic_build
 CXXFLAGS+=	-I${PREFIX}/include \
 		-I${PREFIX}/include/libavcodec \
diff --git a/multimedia/gstreamer-qt4/Makefile b/multimedia/gstreamer-qt4/Makefile
index 8bb8d4c5e1be..6d9316e6f66d 100644
--- a/multimedia/gstreamer-qt4/Makefile
+++ b/multimedia/gstreamer-qt4/Makefile
@@ -16,9 +16,8 @@ LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
 
 LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs
 
-USES=		bison
+USES=		bison cmake
 USE_BZIP2=	yes
-USE_CMAKE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_GSTREAMER=	yes
diff --git a/multimedia/k9copy-kde4/Makefile b/multimedia/k9copy-kde4/Makefile
index 547d129d4a69..abc30b486fdb 100644
--- a/multimedia/k9copy-kde4/Makefile
+++ b/multimedia/k9copy-kde4/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	xine:${PORTSDIR}/multimedia/libxine \
 		mpeg2:${PORTSDIR}/multimedia/libmpeg2 \
 		avcodec:${PORTSDIR}/multimedia/ffmpeg
 
-USE_CMAKE=	yes
+USES=		cmake
 USE_KDE4=	kdeprefix kdelibs automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index 0c398d2cfbb0..0a855bc268c5 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -25,8 +25,7 @@ USE_GETTEXT=		yes
 USE_KDE4=	kdehier kdeprefix automoc4 kdelibs
 USE_QT4=	corelib gui phonon svg network dbus xml sql \
 		qmake_build moc_build rcc_build uic_build
-USE_CMAKE=	yes
-CMAKE_VERBOSE=	yes
+USES=		cmake
 USE_LDCONFIG=		yes
 USE_XORG=	xscrnsaver
 
diff --git a/multimedia/kdenlive/Makefile b/multimedia/kdenlive/Makefile
index c62b8ab18fa5..88e62299ef1f 100644
--- a/multimedia/kdenlive/Makefile
+++ b/multimedia/kdenlive/Makefile
@@ -26,7 +26,7 @@ USE_QT4=	dbus gui opengl script svg xml \
 		moc_build qmake_build rcc_build uic_build
 USE_XORG=	x11
 USE_BZIP2=	yes
-USE_CMAKE=	yes
+USES=		cmake
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		kdenlive.1 kdenlive_render.1
diff --git a/multimedia/kmplayer-kde4/Makefile b/multimedia/kmplayer-kde4/Makefile
index 24ca2f7c9a11..c1ff48ab68f9 100644
--- a/multimedia/kmplayer-kde4/Makefile
+++ b/multimedia/kmplayer-kde4/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
 
 USE_GNOME=	gtk20
 USE_BZIP2=	yes
-USE_CMAKE=	yes
+USES=		cmake
 USE_KDE4=	automoc4 kdehier kdeprefix kdelibs
 USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
 
diff --git a/multimedia/kplayer-kde4/Makefile b/multimedia/kplayer-kde4/Makefile
index 68fc5a3ad0ab..d30a63efd62e 100644
--- a/multimedia/kplayer-kde4/Makefile
+++ b/multimedia/kplayer-kde4/Makefile
@@ -20,7 +20,7 @@ LATEST_LINK=	${PORTNAME}-kde4
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_CMAKE=	yes
+USES=		cmake
 USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
 USE_KDE4=	kdehier kdeprefix kdelibs automoc4
 MAKE_JOBS_SAFE=	yes
diff --git a/multimedia/oggvideotools/Makefile b/multimedia/oggvideotools/Makefile
index 293bf4b6dff8..ce83b9992c01 100644
--- a/multimedia/oggvideotools/Makefile
+++ b/multimedia/oggvideotools/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	gd:${PORTSDIR}/graphics/gd \
 
 USE_SDL=	sdl
 USE_PKGCONFIG=	build
-USE_CMAKE=	yes
+USES=		cmake
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/multimedia/phonon-gstreamer/Makefile b/multimedia/phonon-gstreamer/Makefile
index 0928381e21e1..86b55837791f 100644
--- a/multimedia/phonon-gstreamer/Makefile
+++ b/multimedia/phonon-gstreamer/Makefile
@@ -28,7 +28,7 @@ USE_QT4=	gui phonon xml \
 		qmake_build moc_build rcc_build uic_build
 USE_XORG=	x11
 USE_XZ=		yes
-USE_CMAKE=	yes
+USES=		cmake
 MAKE_JOBS_SAFE=	yes
 
 PLIST_SUB+=	QT_PREFIX=${QT_PREFIX}
diff --git a/multimedia/phonon-vlc/Makefile b/multimedia/phonon-vlc/Makefile
index 354dfd98d2fa..d8681d61f4ef 100644
--- a/multimedia/phonon-vlc/Makefile
+++ b/multimedia/phonon-vlc/Makefile
@@ -21,7 +21,7 @@ USE_KDE4=	kdehier kdeprefix automoc4
 USE_QT4=	gui phonon \
 		qmake_build moc_build rcc_build uic_build
 USE_XZ=		yes
-USE_CMAKE=	yes
+USES=		cmake
 MAKE_JOBS_SAFE=	yes
 
 PHONON_BRANCH=	stable
diff --git a/multimedia/phonon-xine/Makefile b/multimedia/phonon-xine/Makefile
index 8fe81cc803ac..a96f045661dd 100644
--- a/multimedia/phonon-xine/Makefile
+++ b/multimedia/phonon-xine/Makefile
@@ -23,7 +23,7 @@ CONFLICTS=	phonon-4.3.0*
 
 PHONON_BRANCH=	stable
 USE_BZIP2=	yes
-USE_CMAKE=	yes
+USES=		cmake
 USE_KDE4=	kdehier automoc4 kdeprefix
 USE_QT4=	gui dbus xml phonon \
 		qmake_build moc_build rcc_build uic_build
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 846001701b3b..f372bb06806f 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -22,7 +22,7 @@ USE_KDE4=	kdehier kdeprefix automoc4
 USE_QT4=	dbus gui \
 		qmake_build moc_build rcc_build uic_build
 USE_XZ=		yes
-USE_CMAKE=	yes
+USES=		cmake
 CMAKE_ARGS=	-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=TRUE \
 		-DPHONON_NO_PLATFORMPLUGIN:BOOL=TRUE \
 		-DPHONON_BUILD_DESIGNER_PLUGIN:BOOL=OFF
diff --git a/multimedia/podcastdl/Makefile b/multimedia/podcastdl/Makefile
index 3cec1400d513..8ee9e51a264d 100644
--- a/multimedia/podcastdl/Makefile
+++ b/multimedia/podcastdl/Makefile
@@ -14,7 +14,7 @@ LICENSE=	BSD
 
 LIB_DEPENDS=	mrss:${PORTSDIR}/textproc/libmrss
 
-USE_CMAKE=	yes
+USES=		cmake
 MAKE_JOBS_SAFE=	yes
 
 PLIST_FILES=	bin/podcastdl
diff --git a/multimedia/qmmp-plugin-pack/Makefile b/multimedia/qmmp-plugin-pack/Makefile
index 96bdf4d78400..25ae614b1f50 100644
--- a/multimedia/qmmp-plugin-pack/Makefile
+++ b/multimedia/qmmp-plugin-pack/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	qmmpui:${PORTSDIR}/multimedia/qmmp
 BUILD_DEPENDS=	qmmp>=0.6.0:${PORTSDIR}/multimedia/qmmp
 
 USE_BZIP2=	yes
-USE_CMAKE=	yes
+USES=		cmake:outsource
 USE_QT4=	corelib gui qmake_build rcc_build moc_build linguist_build
 USE_LDCONFIG=	yes
 USE_PKGCONFIG=	build
@@ -79,7 +79,6 @@ USE_QT4+=	uic_build
 
 CMAKE_ARGS+=	${PLUGIN_OPTIONS_CMAKE} \
 	-DCMAKE_REQUIRED_INCLUDES:PATH=${LOCALBASE}/include
-CMAKE_OUTSOURCE=yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/multimedia/qmmp/Makefile b/multimedia/qmmp/Makefile
index 949264cc51d0..e9ce84b39ac0 100644
--- a/multimedia/qmmp/Makefile
+++ b/multimedia/qmmp/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A Qt4-based multimedia player
 LICENSE=	GPLv2
 
 USE_BZIP2=	yes
-USE_CMAKE=	yes
+USES=		cmake:outsource
 USE_QT4=	corelib gui network xml \
 		qmake_build rcc_build uic_build moc_build linguist_build
 USE_LDCONFIG=	yes
@@ -485,7 +485,6 @@ INSTALLS_ICONS=	yes
 
 CMAKE_ARGS+=	${PLUGIN_OPTIONS_CMAKE} \
 	-DCMAKE_REQUIRED_INCLUDES:PATH=${LOCALBASE}/include
-CMAKE_OUTSOURCE=yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/multimedia/subtitlecomposer-kde4/Makefile b/multimedia/subtitlecomposer-kde4/Makefile
index de515fad8524..008d2d43ff3e 100644
--- a/multimedia/subtitlecomposer-kde4/Makefile
+++ b/multimedia/subtitlecomposer-kde4/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Subtitle editor for KDE
 
 USE_BZIP2=	yes
-USE_CMAKE=	yes
+USES=		cmake
 USE_KDE4=	kdeprefix kdelibs automoc4
 USE_QT4=	gui qmake_build moc_build rcc_build uic_build
 
diff --git a/multimedia/vtkmpeg2encode/Makefile b/multimedia/vtkmpeg2encode/Makefile
index 9eccb497592d..3cc70ecf09a2 100644
--- a/multimedia/vtkmpeg2encode/Makefile
+++ b/multimedia/vtkmpeg2encode/Makefile
@@ -14,7 +14,7 @@ COMMENT=	VTK MPEG2 encoding library
 NO_CDROM=	the MPEG2 format and all software that uses it is subject to patent restrictions
 NO_PACKAGE=	${NO_CDROM}
 
-USE_CMAKE=	yes
+USES=		cmake
 USE_LDCONFIG=	yes
 CMAKE_ARGS?=	-DBUILD_SHARED_LIBS:BOOL=ON
 VTK_VERSION=	5.10.1