Convert USE_PKGCONFIG -> USES=pkgconf for audio category

57 files changed, 71 insertions, 133 deletions

diff --git a/audio/abraca/Makefile b/audio/abraca/Makefile
index fcf349a..0fe993a 100644
--- a/audio/abraca/Makefile
+++ b/audio/abraca/Makefile
@@ -13,9 +13,9 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/valac:${PORTSDIR}/lang/vala
 LIB_DEPENDS=	xmmsclient:${PORTSDIR}/audio/xmms2 \
 		gee:${PORTSDIR}/devel/libgee06
 
+USES=		pkgconfig
 USE_SCONS=	yes
 USE_GNOME=	gtk30
-USE_PKGCONFIG=	build
 
 SCONS_ARGS=	MANDIR=${MANPREFIX}/man
 
diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile
index 791c066..deb1752 100644
--- a/audio/aqualung/Makefile
+++ b/audio/aqualung/Makefile
@@ -32,9 +32,9 @@ LIB_DEPENDS=	samplerate:${PORTSDIR}/audio/libsamplerate \
 		cddb:${PORTSDIR}/audio/libcddb \
 		strfunc:${PORTSDIR}/devel/libstrfunc
 
+USES=		pkgconfig
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20 libxml2
-USE_PKGCONFIG=	build
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-transform-name="" --with-alsa=no --with-ifp=no \
diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index 0178ca5..46cf7da 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -35,6 +35,7 @@ EXPIRATION_DATE=	2013-07-01
 
 PREFIX=		${KDE_PREFIX}
 WANT_GNOME=	yes
+USES=		pkgconfig
 USE_QT_VER=	3
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
@@ -44,7 +45,6 @@ USE_ICONV=	yes
 USE_XORG=	ice sm x11 xau xcursor xdmcp xext xfixes xft xi \
 		xinerama xrandr xrender xt
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 QTCPPFLAGS+=	-L${LOCALBASE}/lib
 DO_NOT_COMPILE+=gmcop
 _NO_KDE_FINAL=	yes
diff --git a/audio/aubio/Makefile b/audio/aubio/Makefile
index 571a686..e486198 100644
--- a/audio/aubio/Makefile
+++ b/audio/aubio/Makefile
@@ -21,9 +21,8 @@ GNU_CONFIGURE=	yes
 # --disable-complex: does not compile due to missing carg(3) et al.
 CONFIGURE_ARGS=	--disable-complex
 USE_GMAKE=	yes
-USES=	pathfix
+USES=	pathfix pkgconfig
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 
diff --git a/audio/ccaudio2/Makefile b/audio/ccaudio2/Makefile
index 3493e5d..7ad0f6a 100644
--- a/audio/ccaudio2/Makefile
+++ b/audio/ccaudio2/Makefile
@@ -17,8 +17,7 @@ LIB_DEPENDS=	ccgnu2:${PORTSDIR}/devel/commoncpp \
 
 CONFLICTS=	ccaudio-[0-9]*
 
-USE_PKGCONFIG=	build
-USES=		pathfix cmake:outsource
+USES=		pathfix cmake:outsource pkgconfig
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS+=	-DWITH_INCLUDES:PATH=${LOCALBASE}/include \
diff --git a/audio/cheesetracker/Makefile b/audio/cheesetracker/Makefile
index 86dcdfa..386eb0a 100644
--- a/audio/cheesetracker/Makefile
+++ b/audio/cheesetracker/Makefile
@@ -19,10 +19,10 @@ LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack \
 DEPRECATED=	Depends on Qt3; unmaintained
 EXPIRATION_DATE=	2013-07-01
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_QT_VER=	3
 USE_SCONS=	yes
-USE_PKGCONFIG=	build
 SCONS_BUILDENV=	CXX="${CXX}" QTDIR="${QT_PREFIX}"
 
 PORTEXAMPLES=	beek-dolphinisland.it ll-globule.it reduz-maschizo.it \
diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index 9f91f4f..d9199ce 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -10,11 +10,11 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	h.skuhra@gmail.com
 COMMENT=	Console-based music player with really cool features
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_NCURSES=	yes
-USE_PKGCONFIG=	build
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV+=	HOSTCC=${CC}
 CONFIGURE_ARGS+=prefix=${PREFIX} mandir=${MANPREFIX}/man \
diff --git a/audio/deadbeef/Makefile b/audio/deadbeef/Makefile
index 7839909..7f6efc5 100644
--- a/audio/deadbeef/Makefile
+++ b/audio/deadbeef/Makefile
@@ -18,12 +18,12 @@ LIB_DEPENDS=	samplerate:${PORTSDIR}/audio/libsamplerate \
 		execinfo:${PORTSDIR}/devel/libexecinfo
 
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_ICONV=	yes
-USE_PKGCONFIG=	build
 CONFIGURE_ARGS=	--disable-alsa --disable-nullout \
 		CPPFLAGS="-I../dumb/dumb-kode54/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lexecinfo -lintl"
diff --git a/audio/deforaos-mixer/Makefile b/audio/deforaos-mixer/Makefile
index a7bd00c..61cd916 100644
--- a/audio/deforaos-mixer/Makefile
+++ b/audio/deforaos-mixer/Makefile
@@ -16,8 +16,8 @@ LICENSE=	GPLv3
 LIB_DEPENDS=	Desktop:${PORTSDIR}/x11/deforaos-libdesktop
 
 MAKE_ARGS=	PREFIX=${PREFIX}
+USES=		pkgconfig
 USE_GNOME=	gtk20 desktopfileutils
-USE_PKGCONFIG=	build
 USE_GETTEXT=	yes
 PLIST_FILES=	bin/mixer \
 		share/applications/mixer.desktop \
diff --git a/audio/dssi/Makefile b/audio/dssi/Makefile
index 235e202..bb37f63 100644
--- a/audio/dssi/Makefile
+++ b/audio/dssi/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	dssi
-# Date created:		2007-01-12
-# Whom:			trasz <trasz@pin.if.uz.zgora.pl>
-#
+# Created by: trasz <trasz@pin.if.uz.zgora.pl>
 # $FreeBSD$
-#
 
 PORTNAME=	dssi
 PORTVERSION=	1.1.1
@@ -26,9 +22,8 @@ RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
 
 OPTIONS_DEFINE=	QT4
 
-USES=	pathfix
+USES=	pathfix pkgconfig
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index 4e02dfa..2ec3e12 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -16,8 +16,7 @@ LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile
 
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
-USES=	pathfix
-USE_PKGCONFIG=	build
+USES=	pathfix pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=  yes
 CONFIGURE_ENV=	JW=false
diff --git a/audio/festalon/Makefile b/audio/festalon/Makefile
index 5267798..cc6c981 100644
--- a/audio/festalon/Makefile
+++ b/audio/festalon/Makefile
@@ -16,9 +16,9 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS+=	samplerate:${PORTSDIR}/audio/libsamplerate
 
+USES=		pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
-USE_PKGCONFIG=	build
 
 MAKE_JOBS_SAFE=	yes
 
diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile
index e33f55f..fb84430 100644
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@@ -16,8 +16,7 @@ OPTIONS_DEFAULT=	JACK
 
 USE_BZIP2=	yes
 USE_GNOME=	glib20
-USE_PKGCONFIG=	build
-USES=		cmake
+USES=		cmake pkgconfig
 CMAKE_ARGS=	-Denable-ladcca:BOOL=FALSE \
 		-Denable-midishare:BOOL=FALSE
 USE_LDCONFIG=	yes
diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index bf1104b..7d28508 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -15,7 +15,8 @@ LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
 		curl.6:${PORTSDIR}/ftp/curl
 
 USE_XORG=	x11
-USE_GNOME=	gnomehack gnomeprefix libgnomeui vte
+USES=		pathfix pkgconfig
+USE_GNOME=	gnomeprefix libgnomeui vte
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/gvolwheel/Makefile b/audio/gvolwheel/Makefile
index f818907..85c3511 100644
--- a/audio/gvolwheel/Makefile
+++ b/audio/gvolwheel/Makefile
@@ -15,10 +15,10 @@ BUILD_DEPENDS=	intltoolize:${PORTSDIR}/textproc/intltool
 
 CONFIGURE_ARGS+=--enable-oss
 GNU_CONFIGURE=	yes
+USEs=		pkgconfig pathfix
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gtk30
+USE_GNOME=	gtk30
 USE_ICONV=	yes
-USE_PKGCONFIG=	yes
 
 OPTIONS_DEFINE=	NLS
 NLS_DESC=	Native language support
diff --git a/audio/ices/Makefile b/audio/ices/Makefile
index 43aaa5d..617adab 100644
--- a/audio/ices/Makefile
+++ b/audio/ices/Makefile
@@ -21,13 +21,13 @@ LIB_DEPENDS=	ogg:${PORTSDIR}/audio/libogg \
 
 OPTIONS_DEFINE=	ALSA
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_GNOME=	libxml2
 USE_GMAKE=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-roaraudio --disable-sun-audio
-USE_PKGCONFIG=	build
 MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
diff --git a/audio/libadplug/Makefile b/audio/libadplug/Makefile
index b2ada24..ea62340 100644
--- a/audio/libadplug/Makefile
+++ b/audio/libadplug/Makefile
@@ -14,10 +14,10 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	binio:${PORTSDIR}/devel/libbinio
 
+USES=		pkgconfig
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 USE_CSTD=	gnu89
 
 MAKE_JOBS_SAFE=	yes
diff --git a/audio/libbs2b/Makefile b/audio/libbs2b/Makefile
index 38a13f5..d70aaea 100644
--- a/audio/libbs2b/Makefile
+++ b/audio/libbs2b/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libbs2b
-# Date created:				22 May 2010
-# Whom:					SimaMoto,RyoTa <liangtai.s4@gmail.com>
-#
+# Created by: SimaMoto,RyoTa <liangtai.s4@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	libbs2b
 PORTVERSION=	3.1.0
@@ -19,10 +15,10 @@ LIB_DEPENDS+=	sndfile:${PORTSDIR}/audio/libsndfile \
 		FLAC:${PORTSDIR}/audio/flac \
 		vorbis:${PORTSDIR}/audio/libvorbis
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	CFLAGS=`pkg-config --cflags sndfile` \
 	LDFLAGS=`pkg-config --libs-only-L sndfile`
diff --git a/audio/libcddb/Makefile b/audio/libcddb/Makefile
index e0014e1..0148fd2 100644
--- a/audio/libcddb/Makefile
+++ b/audio/libcddb/Makefile
@@ -12,8 +12,7 @@ COMMENT=	A library to access data on a CDDB server
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=	pathfix
-USE_PKGCONFIG=	build
+USES=	pathfix pkgconfig
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--without-cdio
diff --git a/audio/libconvolve/Makefile b/audio/libconvolve/Makefile
index 88b3bb4..ed4baac 100644
--- a/audio/libconvolve/Makefile
+++ b/audio/libconvolve/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3 \
 		samplerate.1:${PORTSDIR}/audio/libsamplerate \
 		sndfile.1:${PORTSDIR}/audio/libsndfile
 
+USES=		pkgconfig
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 
 .include <bsd.port.mk>
diff --git a/audio/libechonest/Makefile b/audio/libechonest/Makefile
index e85426e4..ffc9bc5 100644
--- a/audio/libechonest/Makefile
+++ b/audio/libechonest/Makefile
@@ -18,8 +18,7 @@ GH_PROJECT=	${PORTNAME}
 GH_TAGNAME=	master
 GH_COMMIT=	f9a55d1
 
-USES=		cmake
-USE_PKGCONFIG=	build
+USES=		cmake pkgconfig
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
diff --git a/audio/liblastfm/Makefile b/audio/liblastfm/Makefile
index db59455..15eef2f 100644
--- a/audio/liblastfm/Makefile
+++ b/audio/liblastfm/Makefile
@@ -27,10 +27,9 @@ FINGERPRINT_DESC=	Build the lastfm-fingerprint library
 TESTS_DESC=		Build liblastfm tests
 OPTIONS_DEFAULT=	FINGERPRINT
 
-USES=		cmake
+USES=		cmake pkgconfig
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 USE_QT4=	dbus moc_build rcc_build network qmake_build qtestlib sql xml
 
 .include <bsd.port.options.mk>
diff --git a/audio/libmtp/Makefile b/audio/libmtp/Makefile
index ff9b503..dc97b54 100644
--- a/audio/libmtp/Makefile
+++ b/audio/libmtp/Makefile
@@ -15,11 +15,10 @@ OPTIONS_DEFINE=	MTPZ
 OPTIONS_DEFAULT=	MTPZ
 MTPZ_DESC=	Enable functionality to connect to MTPZ devices
 
-USES=		pathfix
+USES=		pathfix pkgconfig
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/libsamplerate/Makefile b/audio/libsamplerate/Makefile
index 629ae9f..bde87a8 100644
--- a/audio/libsamplerate/Makefile
+++ b/audio/libsamplerate/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Secret Rabbit Code: a Sample Rate Converter for audio
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=	pathfix
-USE_PKGCONFIG=	build
+USES=	pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
diff --git a/audio/libsidplay2/Makefile b/audio/libsidplay2/Makefile
index bcf6e17..8ec8115 100644
--- a/audio/libsidplay2/Makefile
+++ b/audio/libsidplay2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libsidplay2
-# Date created:				6 October 2002
-# Whom:					Anders Nordby <anders@FreeBSD.org>
-#
+# Created by: Anders Nordby <anders@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libsidplay2
 PORTVERSION=	2.1.1
@@ -15,10 +11,9 @@ DISTNAME=	sidplay-libs-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library to play Commodore 64 SID-tunes cycle accurate
 
-USES=	pathfix
+USES=	pathfix pkgconfig
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USE_PKGCONFIG=	yes
 LIBTOOLFILES=	builders/hardsid-builder/configure \
 		builders/resid-builder/configure \
 		libsidplay/configure \
diff --git a/audio/libsmf/Makefile b/audio/libsmf/Makefile
index 1de5fc4..13c1493 100644
--- a/audio/libsmf/Makefile
+++ b/audio/libsmf/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libsmf
-# Date created:		2010-03-29
-# Whom:			Edward Tomasz Napierala <trasz@FreeBSD.org>
-#
+# Created by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libsmf
 PORTVERSION=	1.3
@@ -15,8 +11,8 @@ COMMENT=	Standard MIDI File format library
 
 LIB_DEPENDS+=	readline.6:${PORTSDIR}/devel/readline
 
-USE_GNOME=	glib20 gnomehack
-USE_PKGCONFIG=	build
+USES=	pathfix pkgconfig
+USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 MAN1=		smfsh.1
diff --git a/audio/linnya/Makefile b/audio/linnya/Makefile
index d5d5269..09985cd 100644
--- a/audio/linnya/Makefile
+++ b/audio/linnya/Makefile
@@ -15,10 +15,10 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	herenvarno
 GH_COMMIT=	90cf6b8
 
+USES=		pkgconfig
 USE_AUTOTOOLS=	libtoolize libtool
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
 USE_GNOME=	gtk30
 USE_SQLITE=	3
 USE_GSTREAMER=	good mp3
diff --git a/audio/linuxsampler/Makefile b/audio/linuxsampler/Makefile
index 931a91d..67decba 100644
--- a/audio/linuxsampler/Makefile
+++ b/audio/linuxsampler/Makefile
@@ -23,9 +23,8 @@ DSSI_DESC=	Enable DSSI support
 LV2CORE_DESC=	Enable LV2 support
 
 USE_BZIP2=	yes
-USES=	pathfix
+USES=	pathfix pkgconfig
 USE_SQLITE=	3
-USE_PKGCONFIG=	build
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	HAVE_UNIX98=1
diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
index ecad5b3..5700048 100644
--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@@ -30,12 +30,11 @@ RUN_DEPENDS=	${LOCALBASE}/share/ladspa/rdf/caps.rdf:${PORTSDIR}/audio/caps-plugi
 OPTIONS_DEFINE=	JACK PULSEAUDIO SDL
 
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 USE_BZIP2=	yes
 USE_XORG=	xft
 USE_QT4=	corelib gui xml moc_build uic_build rcc_build \
 		qmake_build
-USES=		cmake
+USES=		cmake pkgconfig
 CMAKE_ARGS=	-DWANT_ALSA:BOOL=OFF \
 		-DWANT_CALF:BOOL=OFF \
 		-DWANT_CAPS:BOOL=OFF \
diff --git a/audio/lv2core/Makefile b/audio/lv2core/Makefile
index f59d1a4..dbe15e4 100644
--- a/audio/lv2core/Makefile
+++ b/audio/lv2core/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	lv2core
-# Date created:		2008-11-20
-# Whom:			xaimus <xaimus@gmail.com>
-#
+# Created by: xaimus <xaimus@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	lv2core
 PORTVERSION=	6.0
@@ -16,9 +12,9 @@ COMMENT=	LV2 Core Package
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_PYTHON_BUILD=	yes
-USE_PKGCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/audio/milkytracker/Makefile b/audio/milkytracker/Makefile
index de0aa57..e734e0f 100644
--- a/audio/milkytracker/Makefile
+++ b/audio/milkytracker/Makefile
@@ -18,10 +18,10 @@ NOT_FOR_ARCH=	powerpc
 LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack \
 		zzip:${PORTSDIR}/devel/zziplib
 
+USES=		pkgconfig
 GNU_CONFIGURE=	yes
 USE_SDL=	sdl
 MAKE_JOBS_SAFE=	yes
-USE_PKGCONFIG=	build
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index a1a02fe..06bb0d5 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -19,8 +19,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-capture
 USE_GMAKE=	yes
-USES=		pathfix
-USE_PKGCONFIG=	build
+USES=		pathfix pkgconfig
 WANT_SDL=	yes
 USE_LDCONFIG=	yes
 
diff --git a/audio/opus-tools/Makefile b/audio/opus-tools/Makefile
index db91a12..6abf705 100644
--- a/audio/opus-tools/Makefile
+++ b/audio/opus-tools/Makefile
@@ -13,7 +13,7 @@ LIB_DEPENDS=	ogg.8:${PORTSDIR}/audio/libogg \
 		opus:${PORTSDIR}/audio/opus
 
 GNU_CONFIGURE=	yes
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 MAKE_JOBS_SAFE=	yes
 
 PLIST_FILES=	bin/opusdec bin/opusenc bin/opusinfo
diff --git a/audio/pd/Makefile b/audio/pd/Makefile
index 4c835c5..dac1fbd 100644
--- a/audio/pd/Makefile
+++ b/audio/pd/Makefile
@@ -17,6 +17,7 @@ OPTIONS_DEFINE=	ALSA FFTW JACK DOCS
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S,${DISTVERSIONSUFFIX},,}
 
+USES=		pkgconfig
 USE_TK_WRAPPER=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
@@ -24,7 +25,6 @@ USE_AUTOTOOLS=	aclocal libtoolize autoconf automake
 ACLOCAL_ARGS=	-I m4/generated -I m4
 LIBTOOLIZE_ARGS=--install --force
 AUTOMAKE_ARGS=	--add-missing --copy --force-missing
-USE_PKGCONFIG=	build
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/audio/pms/Makefile b/audio/pms/Makefile
index 37d2d73..210be64 100644
--- a/audio/pms/Makefile
+++ b/audio/pms/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	pms
-# Date created:		2010-05-13
-# Whom:			Ashish SHUKLA <wahjava@gmail.com>
-#
+# Created by: Ashish SHUKLA <wahjava@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	pms
 PORTVERSION=	0.42
@@ -16,10 +12,10 @@ COMMENT=	A ncurses-based client for the Music Player Daemon
 
 LIB_DEPENDS=	boost_regex:${PORTSDIR}/devel/boost-libs
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
-USE_PKGCONFIG=	build
 
 MAN1=	${PORTNAME}.1
 PLIST_FILES=	bin/${PORTNAME}
diff --git a/audio/pocketsphinx/Makefile b/audio/pocketsphinx/Makefile
index f3f5d8c..a05e52a 100644
--- a/audio/pocketsphinx/Makefile
+++ b/audio/pocketsphinx/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Speech recognition system
 
 LIB_DEPENDS=	sphinxad:${PORTSDIR}/audio/sphinxbase
 
+USES=		pkgconfig
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USE_PKGCONFIG=	build
 
 CONFIGURE_ARGS+=	--without-python
 CONFIGURE_ENV+=	HAVE_DOXYGEN=no
diff --git a/audio/portaudio2/Makefile b/audio/portaudio2/Makefile
index 879c54e..e278677 100644
--- a/audio/portaudio2/Makefile
+++ b/audio/portaudio2/Makefile
@@ -23,9 +23,9 @@ CONFIGURE_ARGS+=PKG_CONFIG_LIBDIR=${PREFIX}/libdata/pkgconfig \
 			--libdir=${PREFIX}/lib/${PORTNAME}2 \
 			--includedir=${PREFIX}/include/${PORTNAME}2
 
+USES=		pkgconfig
 USE_GMAKE=	yes
 USE_DOS2UNIX=	yes
-USE_PKGCONFIG=	build
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}2
 
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
diff --git a/audio/q-audio/Makefile b/audio/q-audio/Makefile
index e140b66..cdd09d4 100644
--- a/audio/q-audio/Makefile
+++ b/audio/q-audio/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	q-audio
-# Date created:		14 August 2003
-# Whom:			ag@muwiinfa.geschichte.uni-mainz.de Albert Graef
-#
+# Created by: ag@muwiinfa.geschichte.uni-mainz.de Albert Graef
 # $FreeBSD$
-#
 
 PORTNAME=	audio
 PORTVERSION=	2.7
@@ -23,7 +19,7 @@ LIB_DEPENDS=	q.8:${PORTSDIR}/lang/q \
 BUILD_DEPENDS=	${LOCALBASE}/lib/portaudio2/libportaudio.so.2:${PORTSDIR}/audio/portaudio2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 DATADIR=	${PREFIX}/share/q
 
diff --git a/audio/raul/Makefile b/audio/raul/Makefile
index e0d4fd4..e918297 100644
--- a/audio/raul/Makefile
+++ b/audio/raul/Makefile
@@ -15,9 +15,9 @@ LICENSE_COMB=	dual
 
 LIB_DEPENDS=	boost_date_time:${PORTSDIR}/devel/boost-libs
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_GNOME=	glib20
-USE_PKGCONFIG=	build
 USE_PYTHON_BUILD=yes
 USE_LDCONFIG=	yes
 
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index 0446f53..c633c7d 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -21,10 +21,10 @@ LIB_DEPENDS=	asound:${PORTSDIR}/audio/alsa-lib \
 RUN_DEPENDS=	dssi_osc_update:${PORTSDIR}/audio/dssi \
 		lilypond:${PORTSDIR}/print/lilypond
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	QTLIBDIR=${QT_LIBDIR}
-USE_PKGCONFIG=	build
 USE_GMAKE=	yes
 USE_QT4=	gui network xml rcc_build moc_build uic_build linguist_build
 MAKE_JOBS_SAFE=	yes
diff --git a/audio/rubberband/Makefile b/audio/rubberband/Makefile
index 09c78f5..a8b8685 100644
--- a/audio/rubberband/Makefile
+++ b/audio/rubberband/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile \
 		fftw3.6:${PORTSDIR}/math/fftw3
 RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -28,6 +29,4 @@ CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-USE_PKGCONFIG=	build
-
 .include <bsd.port.mk>
diff --git a/audio/ruby-esound/Makefile b/audio/ruby-esound/Makefile
index 8c30cf3..a5b1663 100644
--- a/audio/ruby-esound/Makefile
+++ b/audio/ruby-esound/Makefile
@@ -15,7 +15,7 @@ COMMENT=	A Ruby binding to the EsounD library
 
 LIB_DEPENDS=	esd:${PORTSDIR}/audio/esound
 
-USE_PKGCONFIG=      build
+USES=		pkgconfig
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile
index 39622ee..8bb16bd 100644
--- a/audio/sdl_mixer/Makefile
+++ b/audio/sdl_mixer/Makefile
@@ -15,8 +15,7 @@ LICENSE=	ZLIB
 
 USE_AUTOTOOLS=	libtool
 USE_SDL=	sdl
-USE_PKGCONFIG=	yes
-USES=	pathfix
+USES=	pathfix pkgconfig
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/audio/sidplay2/Makefile b/audio/sidplay2/Makefile
index 8c0d9db..b20110e 100644
--- a/audio/sidplay2/Makefile
+++ b/audio/sidplay2/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Commodore SID music player using libsidplay2
 LIB_DEPENDS=	sidplay2:${PORTSDIR}/audio/libsidplay2
 
 GNU_CONFIGURE=	yes
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 
 MAN1=		sidplay2.1
 PLIST_FILES=	bin/sidplay2
diff --git a/audio/slv2/Makefile b/audio/slv2/Makefile
index 73e4728..55c1bb5 100644
--- a/audio/slv2/Makefile
+++ b/audio/slv2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	slv2
-# Date created:		2008-11-25
-# Whom:			xaimus <xaimus@gmail.com>
-#
+# Created by: xaimus <xaimus@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	slv2
 PORTVERSION=	0.6.6
@@ -20,10 +16,10 @@ BUILD_DEPENDS=	${LOCALBASE}/include/lv2.h:${PORTSDIR}/audio/lv2core
 LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack \
 		rdf.0:${PORTSDIR}/textproc/redland
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_PYTHON_BUILD=	yes
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/audio/smasher/Makefile b/audio/smasher/Makefile
index 1c99e2d..91b1a60 100644
--- a/audio/smasher/Makefile
+++ b/audio/smasher/Makefile
@@ -16,8 +16,8 @@ LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile \
 		csound64.5:${PORTSDIR}/audio/csound
 
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
 USE_WX=		yes
 WX_CONF_ARGS=	absolute
 
diff --git a/audio/sooperlooper/Makefile b/audio/sooperlooper/Makefile
index 0e543db..99750dd 100644
--- a/audio/sooperlooper/Makefile
+++ b/audio/sooperlooper/Makefile
@@ -25,17 +25,17 @@ LIB_DEPENDS=	fftw3.6:${PORTSDIR}/math/fftw3 \
 RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
 
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_GMAKE=	yes
 USE_WX=		2.6+
 WX_UNICODE=	yes
 CONFIGURE_ARGS=	-with-wxconfig-path=${WX_CONFIG}
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 
 CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-USE_GNOME=	pkgconfig libxml2
+USE_GNOME=	libxml2
 
 .include <bsd.port.mk>
diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index b0fa1e1..4784dcc 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -20,9 +20,9 @@ MAN3=		libsox.3
 MAN7=		soxformat.7
 MLINKS=		sox.1 play.1 sox.1 rec.1 sox.1 soxeffect.7
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libltdl
-USE_PKGCONFIG=	build
 
 OPTIONS_DEFINE=	ALSA AO AMRNB AMRWB FFMPEG FLAC GSM ID3TAG LADSPA LAME \
 		MAD PNG SNDFILE VORBIS WAVPACK
diff --git a/audio/sphinxbase/Makefile b/audio/sphinxbase/Makefile
index 91db9a2..429a3a5 100644
--- a/audio/sphinxbase/Makefile
+++ b/audio/sphinxbase/Makefile
@@ -33,7 +33,7 @@ THREADS_DESC=	Build with thread safety support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSNDFILE}
-USE_PKGCONFIG=	build
+USES+=		pkgconfig
 LIB_DEPENDS+=	sndfile:${PORTSDIR}/audio/libsndfile
 .else
 CONFIGURE_ENV+=	HAVE_PKGCONFIG=no
diff --git a/audio/swhplugins/Makefile b/audio/swhplugins/Makefile
index 0b85ab6..2a98d02 100644
--- a/audio/swhplugins/Makefile
+++ b/audio/swhplugins/Makefile
@@ -1,6 +1,4 @@
-# New ports collection Makefile for: 	swhplugins
-# Date created:			12 May 2002
-# Whom:				Tilman Linneweh <arved@FreeBSD.org>
+# Created by: Tilman Linneweh <arved@FreeBSD.org>
 #
 # $FreeBSD$
 
@@ -22,7 +20,7 @@ LIB_DEPENDS=	fftw3f:${PORTSDIR}/math/fftw3-float
 # includes assembler code
 ONLY_FOR_ARCHS=	i386 amd64
 
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/audio/taglib-sharp/Makefile b/audio/taglib-sharp/Makefile
index 6cf7613..3420753 100644
--- a/audio/taglib-sharp/Makefile
+++ b/audio/taglib-sharp/Makefile
@@ -1,10 +1,5 @@
-
-# New ports collection makefile for:	taglib-sharp
-# Date Created:				Aug 25 2008
-# Whom:				 	Florent Thoumie <flz@FreeBSD.org>
-#
+# Created by: Florent Thoumie <flz@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	taglib-sharp
 PORTVERSION=	2.0.3.7
@@ -21,8 +16,7 @@ RUN_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|}
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USES=	pathfix
-USE_PKGCONFIG=	build
+USES=	pathfix pkgconfig
 
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}" \
 		VERSIONSUFX="db62eba44689b5b0"
diff --git a/audio/taglookup/Makefile b/audio/taglookup/Makefile
index 5534192..8a8ede8 100644
--- a/audio/taglookup/Makefile
+++ b/audio/taglookup/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	taglookup
-# Date created:				21 Oct 2007
-# Whom:					Alex Allan <alex@kamaz.org.uk>
-#
+# Created by: Alex Allan <alex@kamaz.org.uk>
 # $FreeBSD$
-#
 
 PORTNAME=	taglookup
 PORTVERSION=	0.2
@@ -18,7 +14,7 @@ COMMENT=	Utility for tagging groups of audio files using CDDB
 LIB_DEPENDS=	cddb.4:${PORTSDIR}/audio/libcddb \
 		tag.1:${PORTSDIR}/audio/taglib
 
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 MAN1=		taglookup.1
 PLIST_FILES=	bin/taglookup
diff --git a/audio/thunar-media-tags-plugin/Makefile b/audio/thunar-media-tags-plugin/Makefile
index bb60915..92fc684 100644
--- a/audio/thunar-media-tags-plugin/Makefile
+++ b/audio/thunar-media-tags-plugin/Makefile
@@ -1,6 +1,5 @@
 # Created by: Martin Wilke (miwi@FreeBSD.org)
 # $FreeBSD$
-#
 
 PORTNAME=	thunar-media-tags-plugin
 PORTVERSION=	0.2.0
@@ -15,6 +14,7 @@ COMMENT=	A Media Tags Plugin
 
 LIB_DEPENDS=	tag:${PORTSDIR}/audio/taglib
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
@@ -22,6 +22,5 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack gtk20 intltool intlhack
 USE_XFCE=	configenv libexo thunar
 USE_AUTOTOOLS=	libtool
-USE_PKGCONFIG=	build
 
 .include <bsd.port.mk>
diff --git a/audio/tomahawk/Makefile b/audio/tomahawk/Makefile
index eb03591..927ff13 100644
--- a/audio/tomahawk/Makefile
+++ b/audio/tomahawk/Makefile
@@ -40,10 +40,9 @@ OPTIONS_DEFINE=	QTWEETLIB
 OPTIONS_DEFAULT=	QTWEETLIB
 QTWEETLIB_DESC=	Enable Twitter SIP plugin
 
-USES=		cmake
+USES=		cmake pkgconfig
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 
 USE_QT4=	dbus designer gui linguist_build moc_build \
 		network phonon qmake_build qtestlib rcc_build \
diff --git a/audio/tuxguitar/Makefile b/audio/tuxguitar/Makefile
index 888bd28..5465f4d 100644
--- a/audio/tuxguitar/Makefile
+++ b/audio/tuxguitar/Makefile
@@ -26,12 +26,12 @@ LIB_DEPENDS=	fluidsynth.1:${PORTSDIR}/audio/fluidsynth \
 MAKE_ENV+=	PREFIX=${PREFIX} INSTALL_DOC_DIR=${DOCSDIR} \
 		INSTALL_SHARE_DIR=${DATADIR}
 
+USES=		pkgconfig
 USE_JAVA=	yes
 USE_ANT=	yes
 USE_GECKO=	libxul19
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 JAVA_VERSION=	1.6+
 NOCCACHE=	yes
 
diff --git a/audio/vagalume/Makefile b/audio/vagalume/Makefile
index a7fba68..64a22a0 100644
--- a/audio/vagalume/Makefile
+++ b/audio/vagalume/Makefile
@@ -16,9 +16,9 @@ LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2 \
 		curl.6:${PORTSDIR}/ftp/curl
 
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
-USE_PKGCONFIG=	build
 USE_GSTREAMER=	good mad gconf
 INSTALLS_ICONS=	yes
 
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 0558221..d4e21e5 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -1,6 +1,5 @@
 # Created by: James Earl <jdearl@telus.net>
 # $FreeBSD$
-#
 
 PORTNAME=	xfce4-mixer
 PORTVERSION=	4.10.0