- Take advantage of CPAN macro from bsd.sites.mk, change ${MASTER_SITE_PERL_CPAN} to CPAN.

PR:		ports/122674
Submitted by:	Philip M. Gollucci <pgollucci@p6m7g8.com>
Reworked by:	araujo (myself)
Approved by:	portmgr (pav)

23 files changed, 24 insertions, 45 deletions

diff --git a/audio/p5-Audio-Beep/Makefile b/audio/p5-Audio-Beep/Makefile
index cec4d3a14bb9..549aeeef01e4 100644
--- a/audio/p5-Audio-Beep/Makefile
+++ b/audio/p5-Audio-Beep/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Audio-Beep
 PORTVERSION=	0.11
 CATEGORIES=	audio perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Audio
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
diff --git a/audio/p5-Audio-CD/Makefile b/audio/p5-Audio-CD/Makefile
index 8f3a767ae6d4..da7caf0f977f 100644
--- a/audio/p5-Audio-CD/Makefile
+++ b/audio/p5-Audio-CD/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Audio-CD
 PORTVERSION=	0.04
 PORTREVISION=	1
 CATEGORIES=	audio perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Audio
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/audio/p5-Audio-Scrobbler/Makefile b/audio/p5-Audio-Scrobbler/Makefile
index 1d13952a83ef..58893ed491b9 100644
--- a/audio/p5-Audio-Scrobbler/Makefile
+++ b/audio/p5-Audio-Scrobbler/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Audio-Scrobbler
 PORTVERSION=	0.01
 CATEGORIES=	audio net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Audio
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	roam@FreeBSD.org
diff --git a/audio/p5-Audio-TagLib/Makefile b/audio/p5-Audio-TagLib/Makefile
index e8fc202cef9d..8823f71d800a 100644
--- a/audio/p5-Audio-TagLib/Makefile
+++ b/audio/p5-Audio-TagLib/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Audio-TagLib
 PORTVERSION=	1.43
 CATEGORIES=	audio perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Audio
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/audio/p5-Audio-WMA/Makefile b/audio/p5-Audio-WMA/Makefile
index 6173c4fc7cf3..fce10f80478f 100644
--- a/audio/p5-Audio-WMA/Makefile
+++ b/audio/p5-Audio-WMA/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Audio-WMA
 PORTVERSION=	1.1
 CATEGORIES=	audio perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Audio
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	barner@FreeBSD.org
diff --git a/audio/p5-Audio-Wav/Makefile b/audio/p5-Audio-Wav/Makefile
index ea389b645202..ec6ce9d17084 100644
--- a/audio/p5-Audio-Wav/Makefile
+++ b/audio/p5-Audio-Wav/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Audio-Wav
 PORTVERSION=	0.06
 CATEGORIES=	audio perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Audio
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/audio/p5-Audio/Makefile b/audio/p5-Audio/Makefile
index fd6462434dea..c89ac50f87ad 100644
--- a/audio/p5-Audio/Makefile
+++ b/audio/p5-Audio/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Audio
 PORTVERSION=	1.029
 CATEGORIES=	audio perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Audio
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/audio/p5-CDDB/Makefile b/audio/p5-CDDB/Makefile
index 08d5a83e16fb..4b6810e07afe 100644
--- a/audio/p5-CDDB/Makefile
+++ b/audio/p5-CDDB/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CDDB
 PORTVERSION=	1.17
 CATEGORIES=	audio perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CDDB
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@freebsd.org
diff --git a/audio/p5-CDDB_get/Makefile b/audio/p5-CDDB_get/Makefile
index a8a977017ff0..80012efe3bf0 100644
--- a/audio/p5-CDDB_get/Makefile
+++ b/audio/p5-CDDB_get/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	CDDB_get
 PORTVERSION=	2.27
 PORTEPOCH=	1
 CATEGORIES=	audio perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/F/FO/FONKIE
 PKGNAMEPREFIX=	p5-
 
diff --git a/audio/p5-Filesys-Virtual-DAAP/Makefile b/audio/p5-Filesys-Virtual-DAAP/Makefile
index f4a075fb6e0c..7a827f9265cd 100644
--- a/audio/p5-Filesys-Virtual-DAAP/Makefile
+++ b/audio/p5-Filesys-Virtual-DAAP/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Filesys-Virtual-DAAP
 PORTVERSION=	0.04
 PORTREVISION=	1
 CATEGORIES=	audio perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Filesys
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/audio/p5-MIDI/Makefile b/audio/p5-MIDI/Makefile
index f711865a711e..a9ed7b89cef6 100644
--- a/audio/p5-MIDI/Makefile
+++ b/audio/p5-MIDI/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	MIDI
 PORTVERSION=	0.81
 CATEGORIES=	audio perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	MIDI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	MIDI-Perl-${PORTVERSION}
 
diff --git a/audio/p5-MP3-ID3v1Tag/Makefile b/audio/p5-MP3-ID3v1Tag/Makefile
index 876e1d1d4834..c41982f8e67b 100644
--- a/audio/p5-MP3-ID3v1Tag/Makefile
+++ b/audio/p5-MP3-ID3v1Tag/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	MP3-ID3v1Tag
 PORTVERSION=	1.11
 CATEGORIES=	audio perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=MP3
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/audio/p5-MP3-Info/Makefile b/audio/p5-MP3-Info/Makefile
index 1bf4d1f9a5fe..8b97a34894c6 100644
--- a/audio/p5-MP3-Info/Makefile
+++ b/audio/p5-MP3-Info/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	MP3-Info
 PORTVERSION=	1.23
 CATEGORIES=	audio perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=MP3
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
diff --git a/audio/p5-MP3-Tag/Makefile b/audio/p5-MP3-Tag/Makefile
index 5d1a0d7cc13c..61e7359484b0 100644
--- a/audio/p5-MP3-Tag/Makefile
+++ b/audio/p5-MP3-Tag/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	MP3-Tag
 PORTVERSION=	0.9710
 CATEGORIES=	audio perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=MP3
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	novel@FreeBSD.org
diff --git a/audio/p5-MusicBrainz-Client/Makefile b/audio/p5-MusicBrainz-Client/Makefile
index d9ce205ca0ae..3c270c1bfd3e 100644
--- a/audio/p5-MusicBrainz-Client/Makefile
+++ b/audio/p5-MusicBrainz-Client/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	MusicBrainz-Client
 PORTVERSION=	0.11
 CATEGORIES=	audio perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/S/SV/SVANZOEST
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/audio/p5-MusicBrainz-Queries/Makefile b/audio/p5-MusicBrainz-Queries/Makefile
index eeb723820064..372310477bd0 100644
--- a/audio/p5-MusicBrainz-Queries/Makefile
+++ b/audio/p5-MusicBrainz-Queries/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	MusicBrainz-Queries
 PORTVERSION=	0.11
 CATEGORIES=	audio perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/S/SV/SVANZOEST
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/audio/p5-MusicBrainz-TRM/Makefile b/audio/p5-MusicBrainz-TRM/Makefile
index d154de53155b..8a1e7fadcfcb 100644
--- a/audio/p5-MusicBrainz-TRM/Makefile
+++ b/audio/p5-MusicBrainz-TRM/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	MusicBrainz-TRM
 PORTVERSION=	0.02
 PORTREVISION=	0
 CATEGORIES=	audio perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/S/SV/SVANZOEST
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/audio/p5-Net-DAAP-Client/Makefile b/audio/p5-Net-DAAP-Client/Makefile
index 4894e3030794..288d075158aa 100644
--- a/audio/p5-Net-DAAP-Client/Makefile
+++ b/audio/p5-Net-DAAP-Client/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Net-DAAP-Client
 PORTVERSION=	0.42
 PORTREVISION=	1
 CATEGORIES=	audio perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/audio/p5-Net-DAAP-DMAP/Makefile b/audio/p5-Net-DAAP-DMAP/Makefile
index b30ae30ca711..7093171d1389 100644
--- a/audio/p5-Net-DAAP-DMAP/Makefile
+++ b/audio/p5-Net-DAAP-DMAP/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Net-DAAP-DMAP
 PORTVERSION=	1.26
 PORTREVISION=	1
 CATEGORIES=	audio perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/audio/p5-Net-FreeDB/Makefile b/audio/p5-Net-FreeDB/Makefile
index 3a9f40be0ba2..b9dd570f1822 100644
--- a/audio/p5-Net-FreeDB/Makefile
+++ b/audio/p5-Net-FreeDB/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-FreeDB
 PORTVERSION=	0.08
 CATEGORIES=	audio perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/R/RO/ROAM
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	roam@FreeBSD.org
diff --git a/audio/p5-Ogg-Vorbis-Header/Makefile b/audio/p5-Ogg-Vorbis-Header/Makefile
index ce7d9be26868..b224baf5c29a 100644
--- a/audio/p5-Ogg-Vorbis-Header/Makefile
+++ b/audio/p5-Ogg-Vorbis-Header/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Ogg-Vorbis-Header
 PORTVERSION=	0.03
 PORTREVISION=	1
 CATEGORIES=	audio perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=Ogg
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	barner@FreeBSD.org
diff --git a/audio/p5-Xmms/Makefile b/audio/p5-Xmms/Makefile
index 88199eda0ffe..3b067314001e 100644
--- a/audio/p5-Xmms/Makefile
+++ b/audio/p5-Xmms/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	Xmms
 PORTVERSION=	0.12
 PORTREVISION=	3
 CATEGORIES=	audio perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Xmms
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-Perl-${PORTVERSION}
 
diff --git a/audio/p5-libvorbis/Makefile b/audio/p5-libvorbis/Makefile
index 6baca42aed72..088d2c0df920 100644
--- a/audio/p5-libvorbis/Makefile
+++ b/audio/p5-libvorbis/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	libvorbis
 PORTVERSION=	0.05
 PORTREVISION=	1
 CATEGORIES=	audio perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=../by-authors/id/F/FO/FOOF
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	../by-authors/id/F/FO/FOOF
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-perl-${PORTVERSION}