Eliminate USE_GNOME=pkgconfig from audio

While here:
- trim headers
- convert USE_GMAKE -> USES=gmake
- convert USE_GNOME=gnomehack -> USES=pathfix
- convert USE_PERL5 -> USES=perl5

25 files changed, 47 insertions, 88 deletions

diff --git a/audio/alsa-plugins/Makefile b/audio/alsa-plugins/Makefile
index 4f09406cdc79..c10127cb75ae 100644
--- a/audio/alsa-plugins/Makefile
+++ b/audio/alsa-plugins/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   alsa-plugins
-# Date created:                June 29, 2009
-# Whom:                        Aragon Gouveia <aragon@phat.za.net>
-#
+# Created by: Aragon Gouveia <aragon@phat.za.net>
 # $FreeBSD$
-#
 
 PORTNAME=	alsa-plugins
 PORTVERSION=	1.0.26
@@ -18,7 +14,7 @@ LIB_DEPENDS=	asound:${PORTSDIR}/audio/alsa-lib
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	pkgconfig
+USES=		pkgconfig
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	${PREFIX}/lib/alsa-lib
 
diff --git a/audio/bmp-htmlplaylist/Makefile b/audio/bmp-htmlplaylist/Makefile
index 25c2e4dc03a7..7b2c22058c41 100644
--- a/audio/bmp-htmlplaylist/Makefile
+++ b/audio/bmp-htmlplaylist/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	bmp-htmlplaylist
-# Date created:		2005-04-30
-# Whom:			Roman Bogorodskiy <novel@FreeBSD.org>
-#
+# Created by: Roman Bogorodskiy <novel@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	bmp-htmlplaylist
 PORTVERSION=	0.2.1
@@ -19,8 +15,8 @@ COMMENT=	Application which saves your current BMP playlist to html or xml file
 BUILD_DEPENDS=	beep-media-player:${PORTSDIR}/multimedia/beep-media-player
 RUN_DEPENDS=	beep-media-player:${PORTSDIR}/multimedia/beep-media-player
 
-MAKE_ARGS=	CC=${CC} LD=${CC}
-USE_GNOME=	pkgconfig
+MAKE_ARGS=	CC="${CC}" LD="${CC}"
+USES=	pkgconfig
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_BZIP2=	yes
 
diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index ad6e5ae8701b..250d81b81807 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Free lossless audio codec
 
 LIB_DEPENDS=	ogg:${PORTSDIR}/audio/libogg
 
-USES=		pathfix
+USES=		pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
diff --git a/audio/freealut/Makefile b/audio/freealut/Makefile
index 85c387bbf997..6a22aec7ad3e 100644
--- a/audio/freealut/Makefile
+++ b/audio/freealut/Makefile
@@ -14,8 +14,7 @@ USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USES=		gmake
-USE_GNOME=	pkgconfig gnomehack
+USES=		gmake pathfix pkgconfig
 USE_OPENAL=	al
 USE_LDCONFIG=	yes
 
diff --git a/audio/gbemol/Makefile b/audio/gbemol/Makefile
index 9328c019ffb0..3f9eba80e58e 100644
--- a/audio/gbemol/Makefile
+++ b/audio/gbemol/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS=	mpd.4:${PORTSDIR}/audio/libmpd \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
 GNU_CONFIGURE=	yes
-USES=		gmake
+USES=		gmake pkgconfig
 USE_GNOME=	gtk20
 
 post-patch:
diff --git a/audio/gimmix/Makefile b/audio/gimmix/Makefile
index f9d6c277265a..8b069a587691 100644
--- a/audio/gimmix/Makefile
+++ b/audio/gimmix/Makefile
@@ -19,18 +19,18 @@ LICENSE=	GPLv2
 
 OPTIONS_DEFINE=	NLS
 
-.include <bsd.port.options.mk>
-
 USE_GNOME=	gtk20 intltool libglade2
 USE_BZIP2=	yes
 
 GNU_CONFIGURE=	yes
-USES=		gmake
+USES=		gmake pkgconfig
 
 MAN1=		gimmix.1
 
 CONFIGURE_ENV=	DATADIRNAME=share
 
+.include <bsd.port.options.mk>
+
 .if ${PORT_OPTIONS:MNLS}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
diff --git a/audio/gmpc-extraplaylist/Makefile b/audio/gmpc-extraplaylist/Makefile
index ef33bd012bf2..36ff32fee2ca 100644
--- a/audio/gmpc-extraplaylist/Makefile
+++ b/audio/gmpc-extraplaylist/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gmpc-extraplaylist
-# Date created:		March 27 2008
-# Whom:			Martin Wilke <miwi@FreeBSD.org>
-#
+# Created by: Martin Wilke <miwi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	gmpc-extraplaylist
 PORTVERSION=	0.20.0
@@ -20,7 +16,8 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
 GNU_CONFIGURE=	yes
-USE_GNOME=	pkgconfig glib20 gtk20 libglade2 libxml2
+USES=		pkgconfig
+USE_GNOME=	glib20 gtk20 libglade2 libxml2
 
 PLIST_FILES=	lib/gmpc/plugins/libextraplaylist.la \
 		lib/gmpc/plugins/libextraplaylist.so
diff --git a/audio/gnomoradio/Makefile b/audio/gnomoradio/Makefile
index d462f44ba019..122815da9f3f 100644
--- a/audio/gnomoradio/Makefile
+++ b/audio/gnomoradio/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gnomoradio
-# Date created:			23 Oct 2004
-# Whom:				Jean-Yves Lefort <jylefort@brutele.be>
-#
+# Created by: Jean-Yves Lefort <jylefort@brutele.be>
 # $FreeBSD$
-#
 
 PORTNAME=		gnomoradio
 PORTVERSION=		0.15.1
@@ -22,7 +18,8 @@ LIB_DEPENDS=		sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
 			vorbis:${PORTSDIR}/audio/libvorbis \
 			ao:${PORTSDIR}/audio/libao
 
-USE_GNOME=		gnomehack gnomeprefix
+USES=			pathfix pkgconfig
+USE_GNOME=		gnomeprefix
 USE_AUTOTOOLS=		libtool
 USE_LDCONFIG=		yes
 LIBTOOLFLAGS=		--tag=CXX
diff --git a/audio/libaacplus/Makefile b/audio/libaacplus/Makefile
index 219f870c9a79..13bfd997224d 100644
--- a/audio/libaacplus/Makefile
+++ b/audio/libaacplus/Makefile
@@ -19,7 +19,7 @@ RESTRICTED=	unclear legal status, probably need licenses from 3GPP, Via Licensin
 CONFLICTS=	aacplusenc-0*
 
 USE_CSTD=	gnu89
-USE_GNOME=	gnomehack pkgconfig
+USES=		pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool libtoolize aclocal autoheader automake
 GNOME_MAKEFILEIN=	Makefile.am
diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index 621f678fa0aa..575ba94c049e 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libao
-# Date created:				18 October 2000
-# Whom:					t.vanklaveren@student.utwente.nl
-#
+# Created by: t.vanklaveren@student.utwente.nl
 # $FreeBSD$
-#
 
 PORTNAME=	libao
 PORTVERSION=	1.1.0
@@ -16,7 +12,7 @@ COMMENT=	Portable audio output library
 
 USE_AUTOTOOLS=	libtool
 WANT_GNOME=	yes
-USE_GNOME=	gnomehack pkgconfig
+USES=		pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-arts
diff --git a/audio/libbpm/Makefile b/audio/libbpm/Makefile
index dbd6f8d33da0..44c02c8ef061 100644
--- a/audio/libbpm/Makefile
+++ b/audio/libbpm/Makefile
@@ -1,6 +1,4 @@
-# New ports collection makefile for:  libbpm
-# Date created:                11 December 2009
-# Whom:                        Mykola Dzham <i@levsha.me>
+# Created by: Mykola Dzham <i@levsha.me>
 #
 # $FreeBSD$
 #
@@ -16,7 +14,7 @@ COMMENT=	C-library contains low level beam position monitor signal processing
 GNU_CONFIGURE=	yes
 
 USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack pkgconfig
+USES=		pathfix pkgconfig
 
 post-patch:
 	${SED} -i '' 's/\(-release .*\)/\1 -version-info 0/' ${WRKSRC}/Makefile.in ${WRKSRC}/*/Makefile.in
diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile
index b54e37063b68..da8f381fa2dd 100644
--- a/audio/libcdaudio/Makefile
+++ b/audio/libcdaudio/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libcdaudio
-# Date created:		01 June 1999
-# Whom:			Thomas Gellekum <tg@FreeBSD.org>
-#
+# Created by: Thomas Gellekum <tg@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libcdaudio
 PORTVERSION=	0.99.12p2
@@ -15,7 +11,7 @@ MAINTAINER=	novel@FreeBSD.org
 COMMENT=	A library for playing audio CDs
 
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack pkgconfig
+USES=		pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/audio/libfishsound/Makefile b/audio/libfishsound/Makefile
index efb81942a360..2d54487c0906 100644
--- a/audio/libfishsound/Makefile
+++ b/audio/libfishsound/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	FLAC:${PORTSDIR}/audio/flac \
 OPTIONS_DEFINE=	DOCS DOXYGEN
 
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack pkgconfig
+USES=		pathfix pkgconfig
 USE_LDCONFIG=	yes
 
 .include <bsd.port.options.mk>
diff --git a/audio/libmodplug/Makefile b/audio/libmodplug/Makefile
index f4be1e71ddce..6ea10aa02b82 100644
--- a/audio/libmodplug/Makefile
+++ b/audio/libmodplug/Makefile
@@ -9,15 +9,12 @@ MASTER_SITES=	SF/modplug-xmms/${PORTNAME}/${PORTVERSION} CRITICAL
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	ModPlug mod-like music shared libraries
 
-USES=		gmake
+USES=		gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
-USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^CXXFLAGS=/d' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|' \
-		${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/audio/libmpd/Makefile b/audio/libmpd/Makefile
index 8f1a4e0f11ac..22f29f3363d1 100644
--- a/audio/libmpd/Makefile
+++ b/audio/libmpd/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libmpd
-# Date created:		Apr 4 2006
-# Whom:			Stepan Zastupov [RedChrom] <redchrom@gmail.com>
-#
+# Created by: Stepan Zastupov [RedChrom] <redchrom@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	libmpd
 PORTVERSION=	11.8.17
@@ -15,7 +11,8 @@ COMMENT=	Abstraction around libmpdclient
 
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-USE_GNOME=	pkgconfig glib20 gnomehack
+USES=		pathfix pkgconfig
+USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git a/audio/liboggz/Makefile b/audio/liboggz/Makefile
index 40dc13dc9482..44ad5939f6d0 100644
--- a/audio/liboggz/Makefile
+++ b/audio/liboggz/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	liboggz
-# Date created:		08 October 2006
-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created  by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	liboggz
 DISTVERSION=	1.1.1
@@ -18,7 +14,7 @@ COMMENT=	Simple Ogg API
 LIB_DEPENDS=	ogg:${PORTSDIR}/audio/libogg
 
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	pkgconfig
+USES=		pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ogg=${LOCALBASE} --program-transform-name=""
diff --git a/audio/libshout2/Makefile b/audio/libshout2/Makefile
index 142de33c7d54..9136b168a995 100644
--- a/audio/libshout2/Makefile
+++ b/audio/libshout2/Makefile
@@ -22,9 +22,8 @@ CONFLICTS=	libshout-[0-9]*
 CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
-USE_GNOME=	gnomehack pkgconfig
 USE_LDCONFIG=	yes
-USES=		gmake
+USES=		gmake pathfix pkgconfig
 
 DOCSDIR=	${PREFIX}/share/doc/libshout
 
diff --git a/audio/mpdas/Makefile b/audio/mpdas/Makefile
index 6a7122f653ef..dfa284afca4e 100644
--- a/audio/mpdas/Makefile
+++ b/audio/mpdas/Makefile
@@ -13,7 +13,7 @@ COMMENT=	MPD AudioScrobbler written in C++ supporting the latest protocol
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		mpd.4:${PORTSDIR}/audio/libmpd
 
-USE_GNOME=	pkgconfig
+USES=		pkgconfig
 USE_BZIP2=	yes
 
 USE_RC_SUBR=	mpdas
diff --git a/audio/mpdscribble/Makefile b/audio/mpdscribble/Makefile
index ddcda4e5a7e3..4b3d6e443a41 100644
--- a/audio/mpdscribble/Makefile
+++ b/audio/mpdscribble/Makefile
@@ -15,7 +15,8 @@ LICENSE=	GPLv2
 LIB_DEPENDS+=	mpdclient.2:${PORTSDIR}/audio/libmpdclient
 
 USE_BZIP2=	yes
-USE_GNOME=	glib20 pkgconfig
+USES=		pkgconfig
+USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	mpdscribble
 
diff --git a/audio/p5-Audio/Makefile b/audio/p5-Audio/Makefile
index d04127dd8fb2..fe9a42d3746a 100644
--- a/audio/p5-Audio/Makefile
+++ b/audio/p5-Audio/Makefile
@@ -13,12 +13,13 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dhn@FreeBSD.org
-COMMENT=	An audio manipulation routines for perl
+COMMENT=	Audio manipulation routines for perl
 
 BUILD_DEPENDS=	p5-Math-GSL>=0:${PORTSDIR}/math/p5-Math-GSL
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Audio::Play.3 Audio::Data.3
 
diff --git a/audio/p5-MusicBrainz-DiscID/Makefile b/audio/p5-MusicBrainz-DiscID/Makefile
index 2fcf44f80f5d..ebf6b8c042bc 100644
--- a/audio/p5-MusicBrainz-DiscID/Makefile
+++ b/audio/p5-MusicBrainz-DiscID/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    p5-WebService-MusicBrainz
-# Date created:         2009-12-22
-# Whom:                 Tobias Rehbein <tobias.rehbein@web.de>
-#
+# Created by: Tobias Rehbein <tobias.rehbein@web.de>
 # $FreeBSD$
-#
 
 PORTNAME=	MusicBrainz-DiscID
 PORTVERSION=	0.03
@@ -19,8 +15,8 @@ BUILD_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
 LIB_DEPENDS=	discid.0:${PORTSDIR}/audio/libdiscid
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_GNOME=	pkgconfig
-PERL_MODBUILD=	yes
+USES=		pkgconfig perl5
+USE_PERL5=	modbuild
 
 MAN3=		MusicBrainz::DiscID.3
 
diff --git a/audio/p5-Net-LibLO/Makefile b/audio/p5-Net-LibLO/Makefile
index ebf997470733..9ad25c1079d8 100644
--- a/audio/p5-Net-LibLO/Makefile
+++ b/audio/p5-Net-LibLO/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Net::LibLO
-# Date created:		01 May 2010
-# Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
-#
+# Created by: Jun Kuriyama <kuriyama@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Net-LibLO
 PORTVERSION=	0.06
@@ -17,8 +13,8 @@ COMMENT=	Perl extension for liblo Lightweight OSC library
 
 LIB_DEPENDS=	lo:${PORTSDIR}/audio/liblo
 
-PERL_CONFIGURE=	yes
-USE_GNOME=	pkgconfig
+USES=		pkgconfig perl5
+USE_PERL5=	configure
 
 MAN3=	\
 	Net::LibLO.3 \
diff --git a/audio/pianobar/Makefile b/audio/pianobar/Makefile
index f883939759f3..266e962d052f 100644
--- a/audio/pianobar/Makefile
+++ b/audio/pianobar/Makefile
@@ -23,7 +23,7 @@ MAN_COMPRESSED=	no
 
 PLIST_FILES=	bin/pianobar
 
-USES=		gmake
+USES=		gmake pkgconfig
 USE_BZIP2=	yes
 MAKE_ARGS+=	CC="${CC}"
 
diff --git a/audio/uade/Makefile b/audio/uade/Makefile
index a1547d01abae..740a94440dd2 100644
--- a/audio/uade/Makefile
+++ b/audio/uade/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Unix Amiga Delitracker Emulator
 
 LIB_DEPENDS=	ao:${PORTSDIR}/audio/libao
 
-USES=		gmake
+USES=		gmake pkgconfig
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 72dbfb83bd1d..63caf8d2b84f 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -18,6 +18,7 @@ LIB_DEPENDS=	ao.4:${PORTSDIR}/audio/libao \
 		speex.1:${PORTSDIR}/audio/speex \
 		vorbis.4:${PORTSDIR}/audio/libvorbis
 
+USES=		pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"