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

13 files changed, 13 insertions, 25 deletions

diff --git a/dns/p5-BIND-Conf_Parser/Makefile b/dns/p5-BIND-Conf_Parser/Makefile
index 95ef3ac48113..5547e8086a42 100644
--- a/dns/p5-BIND-Conf_Parser/Makefile
+++ b/dns/p5-BIND-Conf_Parser/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	BIND-Conf_Parser
 PORTVERSION=	0.95
 CATEGORIES=	dns perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/P/PG/PGUEN
 PKGNAMEPREFIX=	p5-
 
diff --git a/dns/p5-DNS-Config/Makefile b/dns/p5-DNS-Config/Makefile
index 11773af7c278..de41ea548f7a 100644
--- a/dns/p5-DNS-Config/Makefile
+++ b/dns/p5-DNS-Config/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	DNS-Config
 PORTVERSION=	0.66
 PORTREVISION=	0
 CATEGORIES=	dns perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DNS
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/dns/p5-DNS-EasyDNS/Makefile b/dns/p5-DNS-EasyDNS/Makefile
index d6b75cc9f7bc..d83f2cf4c781 100644
--- a/dns/p5-DNS-EasyDNS/Makefile
+++ b/dns/p5-DNS-EasyDNS/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DNS-EasyDNS
 PORTVERSION=	0.04
 CATEGORIES=	dns perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DNS
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/dns/p5-DNS-Zone/Makefile b/dns/p5-DNS-Zone/Makefile
index a0e1864bc05c..ff1f25f4f423 100644
--- a/dns/p5-DNS-Zone/Makefile
+++ b/dns/p5-DNS-Zone/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	DNS-Zone
 PORTVERSION=	0.85
 PORTREVISION=	0
 CATEGORIES=	dns perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DNS
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/dns/p5-Data-Validate-Domain/Makefile b/dns/p5-Data-Validate-Domain/Makefile
index a3005e4bdb97..b0c72d7aef98 100644
--- a/dns/p5-Data-Validate-Domain/Makefile
+++ b/dns/p5-Data-Validate-Domain/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Data-Validate-Domain
 PORTVERSION=	0.08
 CATEGORIES=	dns perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Data
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/dns/p5-Net-DNS-Codes/Makefile b/dns/p5-Net-DNS-Codes/Makefile
index 8ebd66f366c7..2ced75c42df2 100644
--- a/dns/p5-Net-DNS-Codes/Makefile
+++ b/dns/p5-Net-DNS-Codes/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-DNS-Codes
 PORTVERSION=	0.09
 CATEGORIES=	dns perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/dns/p5-Net-DNS-Resolver-Programmable/Makefile b/dns/p5-Net-DNS-Resolver-Programmable/Makefile
index 87b3c7f1f943..531a4943d947 100644
--- a/dns/p5-Net-DNS-Resolver-Programmable/Makefile
+++ b/dns/p5-Net-DNS-Resolver-Programmable/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-DNS-Resolver-Programmable
 PORTVERSION=	0.003
 CATEGORIES=	dns net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
 
diff --git a/dns/p5-Net-DNS-SEC/Makefile b/dns/p5-Net-DNS-SEC/Makefile
index e27407fae9bf..beecaf13dbb0 100644
--- a/dns/p5-Net-DNS-SEC/Makefile
+++ b/dns/p5-Net-DNS-SEC/Makefile
@@ -9,9 +9,8 @@ PORTNAME=	Net-DNS-SEC
 PORTVERSION=	0.14
 PORTREVISION=	1
 CATEGORIES=	dns perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES=	CPAN \
 		http://www.ripe.net/ripencc/pub-services/np/DISI/SRC/
-MASTER_SITE_SUBDIR=	Net
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/dns/p5-Net-DNS-ZoneCheck/Makefile b/dns/p5-Net-DNS-ZoneCheck/Makefile
index b64bfa94c353..cc38d0f36418 100644
--- a/dns/p5-Net-DNS-ZoneCheck/Makefile
+++ b/dns/p5-Net-DNS-ZoneCheck/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-DNS-ZoneCheck
 PORTVERSION=	0.01
 CATEGORIES=	dns perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/dns/p5-Net-DNS-ZoneFile/Makefile b/dns/p5-Net-DNS-ZoneFile/Makefile
index a1c90a75b2da..fdc927d1941f 100644
--- a/dns/p5-Net-DNS-ZoneFile/Makefile
+++ b/dns/p5-Net-DNS-ZoneFile/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-DNS-ZoneFile
 PORTVERSION=	1.04
 CATEGORIES=	dns perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/dns/p5-Net-LibIDN/Makefile b/dns/p5-Net-LibIDN/Makefile
index 5c0f2eb8f2ca..3d0df7a8c553 100644
--- a/dns/p5-Net-LibIDN/Makefile
+++ b/dns/p5-Net-LibIDN/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-LibIDN
 PORTVERSION=	0.10
 CATEGORIES=	dns perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	domi@nonsensss.de
diff --git a/dns/p5-Net-RBLClient/Makefile b/dns/p5-Net-RBLClient/Makefile
index 5a3a91a81014..c937f4f8814f 100644
--- a/dns/p5-Net-RBLClient/Makefile
+++ b/dns/p5-Net-RBLClient/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-RBLClient
 PORTVERSION=	0.5
 CATEGORIES=	dns perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
diff --git a/dns/p5-POE-Component-Client-DNS/Makefile b/dns/p5-POE-Component-Client-DNS/Makefile
index f21a89e260cd..78f5ea3bb92d 100644
--- a/dns/p5-POE-Component-Client-DNS/Makefile
+++ b/dns/p5-POE-Component-Client-DNS/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	POE-Component-Client-DNS
 PORTVERSION=	1.0000
 CATEGORIES=	dns perl5 devel
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/00$//}