- 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)

22 files changed, 23 insertions, 34 deletions

diff --git a/lang/p5-Data-JavaScript/Makefile b/lang/p5-Data-JavaScript/Makefile
index efb6382..0478812 100644
--- a/lang/p5-Data-JavaScript/Makefile
+++ b/lang/p5-Data-JavaScript/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Data-JavaScript
 PORTVERSION=	1.11
 CATEGORIES=	lang www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Data
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}
 EXTRACT_SUFX=	.tgz
diff --git a/lang/p5-ExtUtils-F77/Makefile b/lang/p5-ExtUtils-F77/Makefile
index 7d0e6a2..a6205df 100644
--- a/lang/p5-ExtUtils-F77/Makefile
+++ b/lang/p5-ExtUtils-F77/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	ExtUtils-F77
 PORTVERSION=	1.15
 PORTREVISION=	2
 CATEGORIES=	lang perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	ExtUtils
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jmz@FreeBSD.org
diff --git a/lang/p5-F77/Makefile b/lang/p5-F77/Makefile
index 7d0e6a2..a6205df 100644
--- a/lang/p5-F77/Makefile
+++ b/lang/p5-F77/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	ExtUtils-F77
 PORTVERSION=	1.15
 PORTREVISION=	2
 CATEGORIES=	lang perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	ExtUtils
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jmz@FreeBSD.org
diff --git a/lang/p5-Interpolation/Makefile b/lang/p5-Interpolation/Makefile
index 60d2c7e..e3b26db 100644
--- a/lang/p5-Interpolation/Makefile
+++ b/lang/p5-Interpolation/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Interpolation
 PORTVERSION=	0.71
 CATEGORIES=	lang perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/J/JE/JENDA
 PKGNAMEPREFIX=	p5-
 
diff --git a/lang/p5-JSAN/Makefile b/lang/p5-JSAN/Makefile
index 73a1442..e95a35d 100644
--- a/lang/p5-JSAN/Makefile
+++ b/lang/p5-JSAN/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	JSAN
 PORTVERSION=	0.07
 PORTREVISION=	2
 CATEGORIES=	lang perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/C/CW/CWEST
 PKGNAMEPREFIX=	p5-
 
diff --git a/lang/p5-JavaScript-Squish/Makefile b/lang/p5-JavaScript-Squish/Makefile
index f9d16c2..37e7de2 100644
--- a/lang/p5-JavaScript-Squish/Makefile
+++ b/lang/p5-JavaScript-Squish/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	JavaScript-Squish
 PORTVERSION=	0.07
 CATEGORIES=	lang perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	JavaScript
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/lang/p5-JavaScript/Makefile b/lang/p5-JavaScript/Makefile
index c4612fd..5ece5d0 100644
--- a/lang/p5-JavaScript/Makefile
+++ b/lang/p5-JavaScript/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	JavaScript
 PORTVERSION=	0.55
 PORTREVISION=	1
 CATEGORIES=	lang perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	JavaScript
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/lang/p5-List-MoreUtils/Makefile b/lang/p5-List-MoreUtils/Makefile
index 7a52be6..6915f86 100644
--- a/lang/p5-List-MoreUtils/Makefile
+++ b/lang/p5-List-MoreUtils/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	List-MoreUtils
 PORTVERSION=	0.22
 CATEGORIES=	lang perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/V/VP/VPARSEVAL
 PKGNAMEPREFIX=	p5-
 
diff --git a/lang/p5-Perl6-Subs/Makefile b/lang/p5-Perl6-Subs/Makefile
index f2940f4..c404a48 100644
--- a/lang/p5-Perl6-Subs/Makefile
+++ b/lang/p5-Perl6-Subs/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Perl6-Subs
 PORTVERSION=	0.05
 CATEGORIES=	lang perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Perl6
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/lang/p5-Quantum-Superpositions/Makefile b/lang/p5-Quantum-Superpositions/Makefile
index 559abb8..9d2fa28 100644
--- a/lang/p5-Quantum-Superpositions/Makefile
+++ b/lang/p5-Quantum-Superpositions/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Quantum-Superpositions
 PORTVERSION=	2.02
 CATEGORIES=	lang science perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Quantum
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/lang/p5-Scalar-List-Utils/Makefile b/lang/p5-Scalar-List-Utils/Makefile
index 25b6f30..0cdd7e8 100644
--- a/lang/p5-Scalar-List-Utils/Makefile
+++ b/lang/p5-Scalar-List-Utils/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Scalar-List-Utils
 PORTVERSION=	1.19
 PORTEPOCH=	1
 CATEGORIES=	lang perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Scalar
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/lang/p5-Switch/Makefile b/lang/p5-Switch/Makefile
index 9be25af..cac4a068 100644
--- a/lang/p5-Switch/Makefile
+++ b/lang/p5-Switch/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	Switch
 PORTVERSION=	2.13
 CATEGORIES=	lang perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../by-authors/id/R/RG/RGARCIA
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	../../authors/id/R/RG/RGARCIA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/lang/p5-Tcl/Makefile b/lang/p5-Tcl/Makefile
index f87ca77..210ff24 100644
--- a/lang/p5-Tcl/Makefile
+++ b/lang/p5-Tcl/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Tcl
 PORTVERSION=	0.95
 CATEGORIES=	lang perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Tcl
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/lang/parrot/Makefile b/lang/parrot/Makefile
index 24fbd934..f9e732c 100644
--- a/lang/parrot/Makefile
+++ b/lang/parrot/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	parrot
 PORTVERSION=	0.6.0
 CATEGORIES=	lang perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/B/BS/BSCHMAL/
+MASTER_SITES=	CPAN
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Parrot - virtual machine for dynamic languages
diff --git a/lang/perl5.10/Makefile b/lang/perl5.10/Makefile
index 3c607d2a..00fdf85 100644
--- a/lang/perl5.10/Makefile
+++ b/lang/perl5.10/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
 PORTREVISION=	1
 CATEGORIES=	lang devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES=	CPAN \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
 		http://www.tobez.org/download/port-mirrors/lang/perl58/:local
 MASTER_SITE_SUBDIR=	../../src \
diff --git a/lang/perl5.12/Makefile b/lang/perl5.12/Makefile
index 3c607d2a..00fdf85 100644
--- a/lang/perl5.12/Makefile
+++ b/lang/perl5.12/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
 PORTREVISION=	1
 CATEGORIES=	lang devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES=	CPAN \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
 		http://www.tobez.org/download/port-mirrors/lang/perl58/:local
 MASTER_SITE_SUBDIR=	../../src \
diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile
index 3c607d2a..00fdf85 100644
--- a/lang/perl5.14/Makefile
+++ b/lang/perl5.14/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
 PORTREVISION=	1
 CATEGORIES=	lang devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES=	CPAN \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
 		http://www.tobez.org/download/port-mirrors/lang/perl58/:local
 MASTER_SITE_SUBDIR=	../../src \
diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile
index 3c607d2a..00fdf85 100644
--- a/lang/perl5.16/Makefile
+++ b/lang/perl5.16/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
 PORTREVISION=	1
 CATEGORIES=	lang devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES=	CPAN \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
 		http://www.tobez.org/download/port-mirrors/lang/perl58/:local
 MASTER_SITE_SUBDIR=	../../src \
diff --git a/lang/perl5.6/Makefile b/lang/perl5.6/Makefile
index 1c9a50d..539542b 100644
--- a/lang/perl5.6/Makefile
+++ b/lang/perl5.6/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
 PORTREVISION=	2
 CATEGORIES=	lang devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES=	CPAN \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
 		http://www.tobez.org/download/port-mirrors/lang/perl56/:local
 MASTER_SITE_SUBDIR=	../../src \
diff --git a/lang/perl5.8/Makefile b/lang/perl5.8/Makefile
index 3c607d2a..00fdf85 100644
--- a/lang/perl5.8/Makefile
+++ b/lang/perl5.8/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
 PORTREVISION=	1
 CATEGORIES=	lang devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES=	CPAN \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
 		http://www.tobez.org/download/port-mirrors/lang/perl58/:local
 MASTER_SITE_SUBDIR=	../../src \
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 1c9a50d..539542b 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
 PORTREVISION=	2
 CATEGORIES=	lang devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES=	CPAN \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
 		http://www.tobez.org/download/port-mirrors/lang/perl56/:local
 MASTER_SITE_SUBDIR=	../../src \
diff --git a/lang/pugs/Makefile b/lang/pugs/Makefile
index ee7a360..84f3299 100644
--- a/lang/pugs/Makefile
+++ b/lang/pugs/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	pugs
 PORTVERSION=	6.2.13
 PORTREVISION=	1
 CATEGORIES=	lang devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Perl6
+MASTER_SITES=	CPAN
 DISTNAME=	Perl6-Pugs-${PORTVERSION}
 
 MAINTAINER=	clsung@FreeBSD.org