13 files changed, 32 insertions, 43 deletions

diff --git a/audio/p5-Audio-MPD/Makefile b/audio/p5-Audio-MPD/Makefile
index afd6db401209..1cd546397251 100644
--- a/audio/p5-Audio-MPD/Makefile
+++ b/audio/p5-Audio-MPD/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Audio-MPD
-# Date created:				28 Oct 2008
-# Whom:	      				chinsan
-#
+# Created by: chinsan
 # $FreeBSD$
-#
 
 PORTNAME=	Audio-MPD
 PORTVERSION=	1.120610
@@ -29,7 +25,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 TEST_DEPENDS=	p5-Test-Corpus-Audio-MPD>=1.113282:${PORTSDIR}/audio/p5-Test-Corpus-Audio-MPD
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN1=		mpd-dynamic.1 \
 		mpd-rate.1
diff --git a/audio/p5-Audio-Musepack/Makefile b/audio/p5-Audio-Musepack/Makefile
index 8f185a028124..8beca8642fbf 100644
--- a/audio/p5-Audio-Musepack/Makefile
+++ b/audio/p5-Audio-Musepack/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Audio-Musepack
-# Date created:		21 July 2006
-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Audio-Musepack
 PORTVERSION=	1.0.1
@@ -18,7 +14,8 @@ BUILD_DEPENDS=	p5-MP3-Info>=1.20:${PORTSDIR}/audio/p5-MP3-Info \
 		p5-Audio-Scan>=0.85:${PORTSDIR}/audio/p5-Audio-Scan
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Audio::APE.3 Audio::Musepack.3
 
diff --git a/audio/p5-Audio-Scan/Makefile b/audio/p5-Audio-Scan/Makefile
index 5aa2e16b2998..aed3f555806e 100644
--- a/audio/p5-Audio-Scan/Makefile
+++ b/audio/p5-Audio-Scan/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: 	p5-Audio-Scan
-# Date created:				11 July, 2009
-# Whom:					Wen Heping <wenheping@gmail.com>
-#
+# Created by: Wen Heping <wenheping@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	Audio-Scan
 PORTVERSION=	0.93
@@ -19,7 +15,8 @@ LICENSE=	GPLv2
 
 TEST_DEPENDS=	p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Audio::Scan.3
 
diff --git a/audio/p5-Audio-Wav/Makefile b/audio/p5-Audio-Wav/Makefile
index 0c77cfc117f8..e71f143f060c 100644
--- a/audio/p5-Audio-Wav/Makefile
+++ b/audio/p5-Audio-Wav/Makefile
@@ -13,7 +13,8 @@ COMMENT=	Perl modules for reading and writing Microsoft WAV files
 BUILD_DEPENDS=	p5-Inline>=0:${PORTSDIR}/devel/p5-Inline
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Audio::Wav.3 Audio::Wav::Read.3 Audio::Wav::Write.3
 
diff --git a/audio/p5-CDDB-File/Makefile b/audio/p5-CDDB-File/Makefile
index 9db5a33df601..2ee3fc5309c2 100644
--- a/audio/p5-CDDB-File/Makefile
+++ b/audio/p5-CDDB-File/Makefile
@@ -1,10 +1,6 @@
 # ex:ts=8
-# Ports collection makefile for:	CDDB-File
-# Date created:			Jun 26, 2002
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	CDDB-File
 PORTVERSION=	1.05
@@ -16,7 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parse a CDDB/freedb data file
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		CDDB::File.3
 
diff --git a/audio/p5-CDDB/Makefile b/audio/p5-CDDB/Makefile
index 194f56d26acb..289e504cabba 100644
--- a/audio/p5-CDDB/Makefile
+++ b/audio/p5-CDDB/Makefile
@@ -10,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	High-level interface to the Compact Disc Database
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		CDDB.3
 
diff --git a/audio/p5-CDDB_get/Makefile b/audio/p5-CDDB_get/Makefile
index 0bd9b7256723..d86a367030e9 100644
--- a/audio/p5-CDDB_get/Makefile
+++ b/audio/p5-CDDB_get/Makefile
@@ -12,7 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	High-level interface to the Compact Disc Database
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		CDDB_get.3
 
diff --git a/audio/p5-MIDI/Makefile b/audio/p5-MIDI/Makefile
index ffec35b64bce..6e3461b2f763 100644
--- a/audio/p5-MIDI/Makefile
+++ b/audio/p5-MIDI/Makefile
@@ -13,7 +13,8 @@ COMMENT=	Perl5 module for handling MIDI files
 
 OPTIONS_DEFINE=	GD
 
-PERL_CONFIGURE=	YES
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		MIDI.3 MIDI::Event.3 MIDI::Filespec.3 MIDI::Opus.3 MIDI::Score.3 \
 		MIDI::Simple.3 MIDI::Track.3
diff --git a/audio/p5-MPEG-ID3v2Tag/Makefile b/audio/p5-MPEG-ID3v2Tag/Makefile
index 71e17c3e7699..cc267de63242 100644
--- a/audio/p5-MPEG-ID3v2Tag/Makefile
+++ b/audio/p5-MPEG-ID3v2Tag/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	MPEG-ID3v2Tag
-# Date created:				Wed Jan  3 08:38:34 2001
-# Whom:					will
-#
+# Created by: will
 # $FreeBSD$
-#
 
 PORTNAME=	MPEG-ID3v2Tag
 PORTVERSION=	0.39
@@ -14,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module that provides a way to write/read ID3 v2.3 tags
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		MPEG::ID3v2Tag.3
 
diff --git a/audio/p5-Shout/Makefile b/audio/p5-Shout/Makefile
index 09e9c61da460..c4a08bedfe25 100644
--- a/audio/p5-Shout/Makefile
+++ b/audio/p5-Shout/Makefile
@@ -12,7 +12,8 @@ COMMENT=	Perl glue for libshout MP3 streaming source library
 
 LIB_DEPENDS=	shout.5:${PORTSDIR}/audio/libshout2
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Shout.3
 
diff --git a/audio/p5-Test-Corpus-Audio-MPD/Makefile b/audio/p5-Test-Corpus-Audio-MPD/Makefile
index 287107022cb7..d7a861cf264b 100644
--- a/audio/p5-Test-Corpus-Audio-MPD/Makefile
+++ b/audio/p5-Test-Corpus-Audio-MPD/Makefile
@@ -15,7 +15,8 @@ BUILD_DEPENDS=	p5-File-ShareDir-PathClass>0:${PORTSDIR}/devel/p5-File-ShareDir-P
 		p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN3=		Test::Corpus::Audio::MPD.3
 
diff --git a/audio/p5-libvorbis/Makefile b/audio/p5-libvorbis/Makefile
index 76778d3a1c14..6f2f01820009 100644
--- a/audio/p5-libvorbis/Makefile
+++ b/audio/p5-libvorbis/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-libvorbis
-# Date created:		30 Jul 2002
-# Whom:			Dominic Mitchell <dom@happygiraffe.net>
-#
+# Created by: Dominic Mitchell <dom@happygiraffe.net>
 # $FreeBSD$
-#
 
 PORTNAME=	libvorbis
 PORTVERSION=	0.05
@@ -20,7 +16,8 @@ COMMENT=	Perl extension for Ogg Vorbis streams
 LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis
 
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Ogg::Vorbis.3
 
diff --git a/audio/p5-tagged/Makefile b/audio/p5-tagged/Makefile
index f4381f3d3869..9685e4fafff8 100644
--- a/audio/p5-tagged/Makefile
+++ b/audio/p5-tagged/Makefile
@@ -11,7 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Read, change, and write different tags of MP3 audio files
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	MP3::Tag::ID3v2.3 MP3::Tag.3 MP3::Tag::File.3 \
 	MP3::Tag::ID3v2-Data.3 MP3::Tag::ID3v1.3