Finish converting the whole ports tree to USES=pkgconfig

45 files changed, 54 insertions, 110 deletions

diff --git a/multimedia/aegisub/Makefile b/multimedia/aegisub/Makefile
index 1fd91e6d59fc..ac7cf0383196 100644
--- a/multimedia/aegisub/Makefile
+++ b/multimedia/aegisub/Makefile
@@ -28,9 +28,9 @@ EFENCE_DESC=	Electric Fence (require profiling)
 ASS_DESC=	libASS subtitle provider
 HUNSPELL_DESC=	Spell checking via Hunspell
 
+USES=		pkgconfig
 USE_GNOME=	intltool
 USE_WX=		2.8
-USE_PKGCONFIG=	yes
 WX_COMPS=	wx contrib
 WX_UNICODE=	yes
 WX_CONF_ARGS=	absolute
diff --git a/multimedia/assimp/Makefile b/multimedia/assimp/Makefile
index 35aff40d23bd..92120d26c7c2 100644
--- a/multimedia/assimp/Makefile
+++ b/multimedia/assimp/Makefile
@@ -17,8 +17,7 @@ LICENSE=	BSD
 LIB_DEPENDS=	boost_filesystem:${PORTSDIR}/devel/boost-libs
 
 USE_ZIP=	yes
-USES=		cmake
-USE_PKGCONFIG=	build
+USES=		cmake pkgconfig
 USE_GCC=	4.6+ # 4.2+ causes compiler warnings
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/multimedia/avidemux2/Makefile.common b/multimedia/avidemux2/Makefile.common
index 6de9f5f718b0..04898dcbee69 100644
--- a/multimedia/avidemux2/Makefile.common
+++ b/multimedia/avidemux2/Makefile.common
@@ -24,9 +24,8 @@ USE_QT4=	# empty
 
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_PKGCONFIG=	build
 WANT_SDL=	yes
-USES=		cmake:outsource
+USES=		cmake:outsource pkgconfig
 CMAKE_USE_PTHREAD=yes
 CMAKE_ARGS+=	-DTHREADS_HAVE_PTHREAD_ARG:STRING="${PTHREAD_LIBS}"
 MAKE_JOBS_UNSAFE=	yes
diff --git a/multimedia/beep-media-player/Makefile b/multimedia/beep-media-player/Makefile
index 2d117c05e307..683a0993ce3d 100644
--- a/multimedia/beep-media-player/Makefile
+++ b/multimedia/beep-media-player/Makefile
@@ -14,7 +14,7 @@ COMMENT=	GTK2 multimedia player
 
 LIB_DEPENDS=	id3-3.8:${PORTSDIR}/audio/id3lib
 
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_GNOME=	gnomehack gtk20 libglade2 desktopfileutils
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
diff --git a/multimedia/bino/Makefile b/multimedia/bino/Makefile
index c75137a11397..45a22c3a932c 100644
--- a/multimedia/bino/Makefile
+++ b/multimedia/bino/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	bino
-# Date created:		2012-03-12
-# Whom:			Mykola Dzham <i@levsha.me>
-#
+# Created by: Mykola Dzham <i@levsha.me>
 # $FreeBSD$
-#
 
 PORTNAME=	bino
 PORTVERSION=	1.2.1
@@ -17,10 +13,10 @@ COMMENT=	3D video player with multi-display support
 LICENSE=	GPLv3
 
 FETCH_ARGS=	-Fpr
+USES=		pkgconfig
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
 INSTALLS_ICONS=	yes
 USE_QT4=	moc_build opengl rcc_build
 
diff --git a/multimedia/bombono/Makefile b/multimedia/bombono/Makefile
index 233b5b4d3d91..4a71ee9ef495 100644
--- a/multimedia/bombono/Makefile
+++ b/multimedia/bombono/Makefile
@@ -23,9 +23,9 @@ RUN_DEPENDS=	GraphicsMagick>=1.1.7:${PORTSDIR}/graphics/GraphicsMagick \
 		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
 		toolame:${PORTSDIR}/audio/toolame
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_SCONS=	yes
-USE_PKGCONFIG=	build
 USE_GCC=	4.2+
 USE_GETTEXT=	yes
 INSTALLS_ICONS=	yes
diff --git a/multimedia/cclive/Makefile b/multimedia/cclive/Makefile
index 7dd07a0f92d5..874ba6bbc71c 100644
--- a/multimedia/cclive/Makefile
+++ b/multimedia/cclive/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS=	boost_system:${PORTSDIR}/devel/boost-libs \
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-boost=${LOCALBASE}
 MAKE_JOBS_SAFE=	yes
+USES=		pkgconfig
 USE_XZ=		yes
-USE_PKGCONFIG=	build
 
 MAN1=		cclive.1
 PLIST_FILES=	bin/ccl \
diff --git a/multimedia/deforaos-player/Makefile b/multimedia/deforaos-player/Makefile
index a2ade9d0f561..f0bfdb31d944 100644
--- a/multimedia/deforaos-player/Makefile
+++ b/multimedia/deforaos-player/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
 
 MAKE_ARGS+=	PREFIX=${PREFIX}
 USE_GNOME=	gtk20 desktopfileutils
-USE_PKGCONFIG=	build
-USE_GETTEXT=	yes
+USES=		pkgconfig gettext
 
 .include <bsd.port.mk>
diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index 54a44b0af1a1..c9b0e695469f 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -20,10 +20,10 @@ LIB_DEPENDS=	dvdread:${PORTSDIR}/multimedia/libdvdread \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+USES=		pkgconfig
 USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
 USE_ICONV=	yes
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index 99ef0af82f30..6f4fafa5d9b3 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -29,14 +29,13 @@ RUN_DEPENDS=	wxsvg>=1.1.13:${PORTSDIR}/graphics/wxsvg \
 
 OPTIONS_DEFINE=	GNOME DOCS
 
+USES=		pkgconfig gettext
 USE_BZIP2=	yes
 USE_WX=		2.8
 WX_COMPS=	wx svg
 WX_CONF_ARGS=	absolute
 USE_GNOME=	desktopfileutils
-USE_GETTEXT=	yes
 USE_CDRTOOLS=	yes	# dvdstyler needs mkisofs
-USE_PKGCONFIG=	build
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBAV_CFLAGS="${LIBAV_CFLAGS}" LIBAV_LIBS="${LIBAV_LIBS}" \
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index fd6d2b051e9a..7a09be92b9dc 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ffmpeg-devel
-# Date created:		2009-08-12
-# Whom:			Martin Matuska <mm@FreeBSD.org>
-#
+# Created by: Martin Matuska <mm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	ffmpeg
 DISTVERSION=	2012-10-13
@@ -34,11 +30,11 @@ FETCH_URL=	"http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=${GIT_SNAPSHOT};s
 
 HAS_CONFIGURE=	yes
 CONFIGURE_LOG=	config.err
+USES=		pkgconfig
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 WANT_SDL=	yes
 USE_PERL5_BUILD=	yes
-USE_PKGCONFIG=	build
 
 OPTIONS_DEFINE=	AACPLUS ALSA AMR_NB AMR_WB ASS CDIO CELT DEBUG FAAC \
 		FDK_AAC FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS GSM LAME \
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 2310dae21454..6c0f284df7c9 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	ffmpeg cvs
-# Date created:		Sun May  1 20:46:59 UTC 2005
-# Whom:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
-#
+# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	ffmpeg
@@ -24,12 +21,12 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 
 HAS_CONFIGURE=	yes
 CONFIGURE_LOG=	config.err
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 WANT_SDL=	yes
 USE_PERL5_BUILD=	yes
-USE_PKGCONFIG=	build
 
 OPTIONS_DEFINE=	AACPLUS ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \
 		FFSERVER FREETYPE FREI0R GSM LAME OPENCV OPENJPEG \
diff --git a/multimedia/ffmpeg1/Makefile b/multimedia/ffmpeg1/Makefile
index 4a96c9a2d9b8..7e2483d6adcd 100644
--- a/multimedia/ffmpeg1/Makefile
+++ b/multimedia/ffmpeg1/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ffmpeg1
-# Date created:		2012-10-14
-# Whom:			Martin Matuska <mm@FreeBSD.org>
-#
+# Created by: Martin Matuska <mm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	ffmpeg
 PORTVERSION=	1.0.5
@@ -27,12 +23,12 @@ LATEST_LINK=	ffmpeg${PKGNAMESUFFIX}
 
 HAS_CONFIGURE=	yes
 CONFIGURE_LOG=	config.err
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 WANT_SDL=	yes
 USE_PERL5_BUILD=	yes
-USE_PKGCONFIG=	build
 
 OPTIONS_DEFINE=	AACPLUS ALSA AMR_NB AMR_WB ASS CDIO CELT DEBUG FAAC \
 		FDK_AAC FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS GSM LAME \
diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile
index 462915040b80..c37532a33590 100644
--- a/multimedia/ffmpegthumbnailer/Makefile
+++ b/multimedia/ffmpegthumbnailer/Makefile
@@ -19,7 +19,7 @@ LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig --enable-gio
 
 GNU_CONFIGURE=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_GNOME=	gnomehack _glib20
 USE_LDCONFIG=	yes
 
diff --git a/multimedia/freetuxtv/Makefile b/multimedia/freetuxtv/Makefile
index d957fed7aff7..6d306ce6f5b0 100644
--- a/multimedia/freetuxtv/Makefile
+++ b/multimedia/freetuxtv/Makefile
@@ -30,7 +30,7 @@ USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
 		xi xinerama xrandr xrender
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_ICONV=	yes
 INSTALLS_ICONS=	yes
 
diff --git a/multimedia/gavl/Makefile b/multimedia/gavl/Makefile
index 0caed747f4cf..4f7787c1455a 100644
--- a/multimedia/gavl/Makefile
+++ b/multimedia/gavl/Makefile
@@ -12,9 +12,8 @@ COMMENT=	A library for handling uncompressed video and audio data
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=	pathfix
+USES=	pathfix pkgconfig
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 MAKE_JOBS_SAFE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile
index 77e21e6eeb88..c838555b6fd2 100644
--- a/multimedia/gmerlin-avdecoder/Makefile
+++ b/multimedia/gmerlin-avdecoder/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gmerlin-avdecoder
-# Date created:		07 Nov 2008
-# Whom:			Dmitry Marakasov <amdmi3@FreeBSD.org>
-#
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	gmerlin-avdecoder
 PORTVERSION=	1.2.0
@@ -29,12 +25,11 @@ DVDREAD_DESC=	libdvdread support
 GMERLIN_DESC=	gmerlin support
 SAMBA_DESC=	Samba support using libsmbclient
 
-USES=	pathfix
+USES=	pathfix pkgconfig
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-cpuflags=none --without-doxygen
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/multimedia/gmtk/Makefile b/multimedia/gmtk/Makefile
index 1ac3287ecada..432a0a492caa 100644
--- a/multimedia/gmtk/Makefile
+++ b/multimedia/gmtk/Makefile
@@ -17,9 +17,8 @@ USE_GMAKE=	yes
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 USE_PERL5_BUILD=	yes
-USE_PKGCONFIG=	build
 USE_XORG=	x11
-USES=		pathfix
+USES=		pathfix pkgconfig
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README
 
diff --git a/multimedia/gstreamer-plugins-all/Makefile b/multimedia/gstreamer-plugins-all/Makefile
index d6c504c6bcc9..6435ef6b8638 100644
--- a/multimedia/gstreamer-plugins-all/Makefile
+++ b/multimedia/gstreamer-plugins-all/Makefile
@@ -21,7 +21,7 @@ NO_BUILD=	yes
 USE_GSTREAMER=	yes
 .include "${.CURDIR}/../../Mk/bsd.gstreamer.mk"
 
-.for all in ${_USE_GSTREAMER10_ALL}
+.for all in ${_GSTREAMER_PLUGINS}
 OPTIONS_DEFINE+=	${all:U}
 ${all:U}_DESC=	${all} plugin
 OPTIONS_DEFAULT+=	${all:U}
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index f46fa82d5130..e1a41e6f0e21 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -47,7 +47,7 @@ WANT_GSTREAMER=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME+=	gnomehack ltverhack ltasneededhack
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_AUTOTOOLS=	libtool
 GST_PLUGIN?=	base
 
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index fd5f915a05a6..383aa4991c64 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -17,11 +17,10 @@ RUN_DEPENDS=	${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-i
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 CFLAGS:=	${CFLAGS} -O2 -Wno-format
-USES=		bison pathfix
+USES=		bison pathfix pkgconfig
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	glib20 libxml2 ltverhack ltasneededhack
-USE_PKGCONFIG=	build
 USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--disable-tests \
diff --git a/multimedia/gstreamermm/Makefile b/multimedia/gstreamermm/Makefile
index 02d05b141c5e..63a84b1550c2 100644
--- a/multimedia/gstreamermm/Makefile
+++ b/multimedia/gstreamermm/Makefile
@@ -14,11 +14,11 @@ LICENSE=	LGPL21
 
 LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
 
+USES=		pkgconfig
 USE_XZ=		yes
 USE_GMAKE=	yes
 USE_GSTREAMER=	theora vorbis cdparanoia gio pango
 USE_GNOME=	gnomeprefix gnomehack
-USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-documentation
 USE_LDCONFIG=	yes
diff --git a/multimedia/libcec/Makefile b/multimedia/libcec/Makefile
index 381f47de0914..2d491cb04358 100644
--- a/multimedia/libcec/Makefile
+++ b/multimedia/libcec/Makefile
@@ -16,12 +16,12 @@ GH_ACCOUNT=	Pulse-Eight
 GH_COMMIT=	178d498
 GH_TAGNAME=	${PORTNAME}-${PORTVERSION}
 
+USES=		pkgconfig
 USE_GMAKE=	yes
 USE_AUTORECONF=	yes
 USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtoolize
 ACLOCAL_ARGS=	-I.
 AUTOMAKE_ARGS=	--add-missing
-USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/multimedia/libkate/Makefile b/multimedia/libkate/Makefile
index 50feb132462b..961225555bf2 100644
--- a/multimedia/libkate/Makefile
+++ b/multimedia/libkate/Makefile
@@ -16,9 +16,9 @@ LIB_DEPENDS=	ogg:${PORTSDIR}/audio/libogg \
 		png15:${PORTSDIR}/graphics/png
 
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	yes
 
 CFLAGS+=	"-I${LOCALBASE}/include"
 
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index 3e8d45bda8bc..b12620784169 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -18,10 +18,8 @@ LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack
-USE_PKGCONFIG=	build
+USES=		pathfix pkgconfig gettext
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
 MAKE_JOBS_SAFE=	yes
 USE_AUTOTOOLS=	autoconf
 
diff --git a/multimedia/libquvi/Makefile b/multimedia/libquvi/Makefile
index 081fa3302c30..8153b5c9e6c9 100644
--- a/multimedia/libquvi/Makefile
+++ b/multimedia/libquvi/Makefile
@@ -19,12 +19,11 @@ OPTIONS_DEFINE=	DOCS
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
-USE_PKGCONFIG=	build
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
 USE_LUA=	yes
 USE_XZ=		yes
-USES=		pathfix
+USES=		pathfix pkgconfig
 
 MAN3=		libquvi.3
 
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index f3e28a4d48be..730e0cfa6c9b 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -37,6 +37,7 @@ BUILD_DEPENDS+=	v4l_compat>=1.0.20100321:${PORTSDIR}/multimedia/v4l_compat
 LIB_DEPENDS+=	dvdcss.${DVDCSS_LIBVERSION}:${PORTSDIR}/multimedia/libdvdcss
 .endif
 
+USES=		pkgconfig
 USE_XZ=		yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
@@ -48,7 +49,6 @@ USE_GL=		gl glu
 USE_PERL5_BUILD=yes
 USE_SDL=	sdl
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 CONFIGURE_ENV=	THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		THREAD_LIBS="${PTHREAD_LIBS}" \
 		EXTRA_X_LIBS="-lGL -lGLU -lXext -lX11 -lm"
diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index a805eeb461c8..4d2f2e87a9ad 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -42,9 +42,9 @@ RUN_DEPENDS=	${LOCALBASE}/bin/analyseplugin:${PORTSDIR}/audio/ladspa \
 
 WRKSRC=		${WRKDIR}/${DISTNAME:L}
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_PKGCONFIG=	build
 USE_CSTD=	gnu89
 USE_PYTHON=	yes
 USE_PERL5=	yes
diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile
index 7d6467ab0938..eb619257a8e8 100644
--- a/multimedia/mlt/Makefile
+++ b/multimedia/mlt/Makefile
@@ -19,8 +19,8 @@ SLAVE_PORT?=	no
 # They both install bin/melt.
 CONFLICTS_INSTALL=	freeze-[0-9]*
 
+USES=		pkgconfig
 USE_GNOME=	gnomehack libxml2
-USE_PKGCONFIG=	build
 USE_SDL=	image
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-gpl --enable-gpl3
diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile
index 16ae3703e9f9..7be709272c25 100644
--- a/multimedia/mythtv/Makefile
+++ b/multimedia/mythtv/Makefile
@@ -23,8 +23,8 @@ RUN_DEPENDS=	tv_check:${PORTSDIR}/textproc/p5-xmltv \
 CONFLICTS=	mythtv-frontend-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
+USES=		pkgconfig
 USE_BZIP2=	yes
-USE_PKGCONFIG=	yes
 USE_QT4=	gui sql network script linguist_build l10n sql-mysql_run \
 		moc_build qmake_build rcc_build uic_build imageformats
 QT_NONSTANDARD=	yes
diff --git a/multimedia/oggvideotools/Makefile b/multimedia/oggvideotools/Makefile
index ce83b9992c01..2409910fe496 100644
--- a/multimedia/oggvideotools/Makefile
+++ b/multimedia/oggvideotools/Makefile
@@ -17,8 +17,7 @@ LIB_DEPENDS=	gd:${PORTSDIR}/graphics/gd \
 		vorbis:${PORTSDIR}/audio/libvorbis
 
 USE_SDL=	sdl
-USE_PKGCONFIG=	build
-USES=		cmake
+USES=		cmake pkgconfig
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/multimedia/py-gstreamer/Makefile b/multimedia/py-gstreamer/Makefile
index 52163f6bf91d..dbbd3dca16ab 100644
--- a/multimedia/py-gstreamer/Makefile
+++ b/multimedia/py-gstreamer/Makefile
@@ -19,11 +19,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2
 
+USES=		pkgconfig
 USE_PYTHON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pygobject gnomehack
-USE_PKGCONFIG=	build
 USE_GSTREAMER=	yes
 GNU_CONFIGURE=	yes
 PLIST_SUB=	VERSION="${GST_VERSION}"
diff --git a/multimedia/qmmp-plugin-pack/Makefile b/multimedia/qmmp-plugin-pack/Makefile
index 25ae614b1f50..15119c1c17e8 100644
--- a/multimedia/qmmp-plugin-pack/Makefile
+++ b/multimedia/qmmp-plugin-pack/Makefile
@@ -1,9 +1,5 @@
-# New ports collection Makefile for:	qmmp-plugin-pack
-# Date created:		Fri Jul 01 02:59:13 JST 2012
-# Whom:      SimaMoto,RyoTa <liangtai.s4@gmail.com>
-#
+# Created by: SimaMoto,RyoTa <liangtai.s4@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	qmmp-plugin-pack
 PORTVERSION=	0.6.2
@@ -20,10 +16,9 @@ LIB_DEPENDS=	qmmpui:${PORTSDIR}/multimedia/qmmp
 BUILD_DEPENDS=	qmmp>=0.6.0:${PORTSDIR}/multimedia/qmmp
 
 USE_BZIP2=	yes
-USES=		cmake:outsource
+USES=		cmake:outsource pkgconfig
 USE_QT4=	corelib gui qmake_build rcc_build moc_build linguist_build
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 
 OPTIONS_DEFINE=	FFAP MPG123 QSUI
 OPTIONS_DEFAULT=	FFAP MPG123 QSUI
diff --git a/multimedia/qmmp/Makefile b/multimedia/qmmp/Makefile
index e9ce84b39ac0..afd1cba957a4 100644
--- a/multimedia/qmmp/Makefile
+++ b/multimedia/qmmp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection Makefile for:	qmmp
-# Date created:		Fri Jan 30 01:13:20 JST 2009
-# Whom:      SimaMoto,RyoTa <liangtai.s4@gmail.com>
-#
+# Created by: SimaMoto,RyoTa <liangtai.s4@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	qmmp
 PORTVERSION=	0.6.3
@@ -17,11 +13,10 @@ COMMENT=	A Qt4-based multimedia player
 LICENSE=	GPLv2
 
 USE_BZIP2=	yes
-USES=		cmake:outsource
+USES=		cmake:outsource pkgconfig
 USE_QT4=	corelib gui network xml \
 		qmake_build rcc_build uic_build moc_build linguist_build
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 
 OPTIONS_DEFINE=	SKINNEDUI DIR_ASSOC APIDOC PULSEAUDIO ALSA OSS OSS4 \
 		JACK NULLOUT FLAC MUSEPACK FFMPEG MODPLUG WILDMIDI GME MAD \
diff --git a/multimedia/quvi/Makefile b/multimedia/quvi/Makefile
index 104dd30dfe11..a6f4bdae61f9 100644
--- a/multimedia/quvi/Makefile
+++ b/multimedia/quvi/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	libquvi>=0.4.0:${PORTSDIR}/multimedia/libquvi
 
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_XZ=		yes
-USE_PKGCONFIG=	build
 
 MAN1=		quvi.1
 PLIST_FILES=	bin/quvi
diff --git a/multimedia/sabbu/Makefile b/multimedia/sabbu/Makefile
index b769ad259bd8..65a7ac3364e0 100644
--- a/multimedia/sabbu/Makefile
+++ b/multimedia/sabbu/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Program used to time subtitles
 LIB_DEPENDS=	avcodec:${PORTSDIR}/multimedia/ffmpeg \
 		sndfile:${PORTSDIR}/audio/libsndfile
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-USE_PKGCONFIG=	yes
 
 USE_GNOME=	gtk20
 CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
diff --git a/multimedia/vcdimager/Makefile b/multimedia/vcdimager/Makefile
index 7bd770112626..3a70087b3680 100644
--- a/multimedia/vcdimager/Makefile
+++ b/multimedia/vcdimager/Makefile
@@ -22,7 +22,6 @@ USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
 USE_GNOME=	lthack
 CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/multimedia/vdr-plugin-softdevice/Makefile b/multimedia/vdr-plugin-softdevice/Makefile
index dc6625d511f3..dcfea066f84b 100644
--- a/multimedia/vdr-plugin-softdevice/Makefile
+++ b/multimedia/vdr-plugin-softdevice/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	vdr-plugin-softdevie
-# Date created:		Wed Apr 14 18:11:42 CEST 2010
-# Whom:			Juergen Lock <nox@freebsd.org>
-#
+# Created by: Juergen Lock <nox@freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	vdr-plugin-softdevice
 PORTVERSION=	0.5.0p20100414
@@ -18,8 +14,8 @@ COMMENT=	Video Disk Recorder - softdevice plugin
 
 LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg
 
+USES=		pkgconfig
 USE_BZIP2=	yes
-USE_PKGCONFIG=	build
 USE_XORG+=	xv x11 xinerama
 PATCH_STRIP=	-p1
 HAVE_CONFIGURE=	yes
diff --git a/multimedia/vdr-plugin-softhddevice/Makefile b/multimedia/vdr-plugin-softhddevice/Makefile
index 4ccc43df4061..acc75d229043 100644
--- a/multimedia/vdr-plugin-softhddevice/Makefile
+++ b/multimedia/vdr-plugin-softhddevice/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	vdr-plugin-softhddevie
-# Date created:		Sun Apr 29 17:00:02 CEST 2012
-# Whom:			Juergen Lock <nox@freebsd.org>
-#
+# Created by: Juergen Lock <nox@freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	vdr-plugin-softhddevice
 PORTVERSION=	0.5.1
@@ -22,7 +18,7 @@ LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg \
 		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
 		asound:${PORTSDIR}/audio/alsa-lib
 
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_XORG+=	xv x11 xinerama
 USE_GL+=	gl glu
 PATCH_STRIP=	-p1
diff --git a/multimedia/vdr-plugin-xineliboutput/Makefile b/multimedia/vdr-plugin-xineliboutput/Makefile
index f0920b6697e3..abaa10ac31c3 100644
--- a/multimedia/vdr-plugin-xineliboutput/Makefile
+++ b/multimedia/vdr-plugin-xineliboutput/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	vdr-plugin-xineliboutput
-# Date created:		Wed Apr 14 18:11:42 CEST 2010
-# Whom:			Juergen Lock <nox@freebsd.org>
-#
+# Created by: Juergen Lock <nox@freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	vdr-plugin-xineliboutput
 PORTVERSION=	1.0.90s20120511
@@ -25,7 +21,7 @@ LIB_DEPENDS+=	xine:${PORTSDIR}/multimedia/libxine \
 
 USE_BZIP2=	yes
 PATCH_STRIP=	-p1
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_XORG+=	xrandr xrender
 USE_GL=		gl glu glut
 PORTDOCS=	COPYING README HISTORY
diff --git a/multimedia/vdr/Makefile b/multimedia/vdr/Makefile
index 33625c2d90ba..3ba84d7fc332 100644
--- a/multimedia/vdr/Makefile
+++ b/multimedia/vdr/Makefile
@@ -22,10 +22,10 @@ DVBPATCH_DESC=		DVB audio patch for some countries
 STB0899_SIGNAL_DESC=	STB0899 signal strength patch
 OPTIONS_DEFAULT=	IPTVPATCH TTXPATCH
 
+USES=		pkgconfig
 DIST_SUBDIR=	vdr
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 PORTDOCS=	COPYING INSTALL MANUAL README HISTORY
diff --git a/multimedia/xbmc-pvr/Makefile b/multimedia/xbmc-pvr/Makefile
index b56c74f39468..e6827198181b 100644
--- a/multimedia/xbmc-pvr/Makefile
+++ b/multimedia/xbmc-pvr/Makefile
@@ -63,8 +63,8 @@ RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/a
 GITHASH=	9023e39
 WRKSRC=		${WRKDIR}/opdenkamp-${PORTNAME}-${GITHASH}
 FETCH_ARGS=	-Fpr
+USES=		pkgconfig
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
 USE_AUTOTOOLS=	autoconf libtool automake libltdl
 GNU_CONFIGURE=	yes
 USE_XORG=	xinerama xt xmu xtst
diff --git a/multimedia/xbmc/Makefile b/multimedia/xbmc/Makefile
index 87a599ab0053..f50491e1904b 100644
--- a/multimedia/xbmc/Makefile
+++ b/multimedia/xbmc/Makefile
@@ -52,8 +52,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		xdpyinfo:${PORTSDIR}/x11/xdpyinfo
 
 FETCH_ARGS=	-Fpr
+USES=		pkgconfig
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
 USE_AUTOTOOLS=	autoconf libtool automake libltdl
 GNU_CONFIGURE=	yes
 USE_XORG=	xt xmu xrandr xtst
diff --git a/multimedia/xfce4-media/Makefile b/multimedia/xfce4-media/Makefile
index 1ac1340db288..4905303aeaf5 100644
--- a/multimedia/xfce4-media/Makefile
+++ b/multimedia/xfce4-media/Makefile
@@ -19,11 +19,10 @@ INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USES=        pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	glib20 gtk20 intltool intlhack
 USE_XFCE=	configenv libexo libgui libutil panel
 USE_XORG=	x11 sm
-USE_PKGCONFIG=	build
 
 OPTIONS_DEFINE=	TAGLIB DBUS STARTUP
 OPTIONS_DEFAULT=	DBUS STARTUP
diff --git a/multimedia/xfce4-parole/Makefile b/multimedia/xfce4-parole/Makefile
index f7a016943040..9da1dae47ab0 100644
--- a/multimedia/xfce4-parole/Makefile
+++ b/multimedia/xfce4-parole/Makefile
@@ -1,6 +1,5 @@
 # Created by: Martin Wilke <miwi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	parole
 PORTVERSION=	0.5.0
@@ -33,7 +32,7 @@ USE_GNOME=	gnomehack gtk20 glib20 intltool intlhack desktopfileutils
 USE_XFCE=	configenv libmenu libutil
 USE_XORG=	x11 sm
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 OPTIONS_DEFINE=	CDDA HTTP NLS
 OPTIONS_DEFAULT=	CDDA HTTP NLS