From 4ec433d559d78ae2106976ca9d9bb2e01d0c527f Mon Sep 17 00:00:00 2001
From: Martin Wilke <miwi@FreeBSD.org>
Date: Mon, 26 May 2014 12:06:10 +0000
Subject: [PATCH] - Convert gmake,xz,bzip to USES

Approved by:	portmgr
---
 multimedia/dvbsnoop/Makefile      | 2 +-
 multimedia/gstreamermm/Makefile   | 4 +---
 multimedia/iriverter/Makefile     | 3 +--
 multimedia/kaffeine/Makefile      | 3 +--
 multimedia/mpeg4ip/Makefile       | 2 +-
 multimedia/nxtvepg/Makefile       | 2 +-
 multimedia/openquicktime/Makefile | 2 +-
 7 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/multimedia/dvbsnoop/Makefile b/multimedia/dvbsnoop/Makefile
index 6f23aad2338f..17200697e2cf 100644
--- a/multimedia/dvbsnoop/Makefile
+++ b/multimedia/dvbsnoop/Makefile
@@ -13,7 +13,7 @@ DVB_HEADERS=	dmx.h frontend.h
 
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${WRKSRC}
-USE_GMAKE=	yes
+USES=		gmake
 
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/dvbsnoop.1.gz
diff --git a/multimedia/gstreamermm/Makefile b/multimedia/gstreamermm/Makefile
index 2d2dbadb3806..ed4a325787d3 100644
--- a/multimedia/gstreamermm/Makefile
+++ b/multimedia/gstreamermm/Makefile
@@ -12,9 +12,7 @@ COMMENT=	C++ wrapper library for the multimedia library GStreamer
 
 LICENSE=	LGPL21
 
-USES=		pkgconfig
-USE_XZ=		yes
-USE_GMAKE=	yes
+USES=		pkgconfig tar:xz gmake
 USE_GSTREAMER=	theora vorbis cdparanoia gio pango
 USE_GNOME=	gnomeprefix gnomehack gtkmm24
 GNU_CONFIGURE=	yes
diff --git a/multimedia/iriverter/Makefile b/multimedia/iriverter/Makefile
index 0fea022f4a79..858cd7385a2a 100644
--- a/multimedia/iriverter/Makefile
+++ b/multimedia/iriverter/Makefile
@@ -13,9 +13,8 @@ COMMENT=	Cross-platform frontend to mencoder
 RUN_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mencoder
 
 USE_JAVA=	yes
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake tar:bzip2
 
 OPTIONS_DEFINE=	SWTDEVEL
 SWTDEVEL_DESC=	Use SWT Development port
diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index 860e826f391e..ea93b21c04d9 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -17,11 +17,10 @@ LIB_DEPENDS=	xine.2:${PORTSDIR}/multimedia/libxine
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_GMAKE=		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
-USES=		cmake gettext
+USES=		cmake gettext gmake
 USE_LDCONFIG=		yes
 USE_XORG=	xscrnsaver
 
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index d0bb74c86957..930552059c0e 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS=	mp4v2>=1.9.1:${PORTSDIR}/multimedia/mp4v2
 
 USE_GNOME=	gtk20
 USE_SDL=	sdl
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include/SDL -I${LOCALBASE}/include/ffmpeg0 -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
diff --git a/multimedia/nxtvepg/Makefile b/multimedia/nxtvepg/Makefile
index d954b8218aa3..8cde7e12abda 100644
--- a/multimedia/nxtvepg/Makefile
+++ b/multimedia/nxtvepg/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Viewer for Nextview Electronic TV Programme Guide (needs bktr driver)
 LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
 
 NOT_FOR_ARCHS=	sparc64
-USE_GMAKE=	yes
+USES=	gmake
 USE_XORG=	x11 xmu
 MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS} WRKSRC=${WRKSRC} X11BASE=${LOCALBASE}
 
diff --git a/multimedia/openquicktime/Makefile b/multimedia/openquicktime/Makefile
index db8e007111be..a2962fb96713 100644
--- a/multimedia/openquicktime/Makefile
+++ b/multimedia/openquicktime/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk12
-USE_GMAKE=	yes
+USES=		gmake
 USE_LDCONFIG=	yes
 PKGDEINSTALL=	${PKGINSTALL}