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

26 files changed, 26 insertions, 51 deletions

diff --git a/finance/p5-Business-CreditCard/Makefile b/finance/p5-Business-CreditCard/Makefile
index f5fa34452e5a..a741ad2fecdb 100644
--- a/finance/p5-Business-CreditCard/Makefile
+++ b/finance/p5-Business-CreditCard/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Business-CreditCard
 PORTVERSION=	0.30
 CATEGORIES=	finance perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Business
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/finance/p5-Business-OCV/Makefile b/finance/p5-Business-OCV/Makefile
index 831bfbd0b4d8..5366d5f0f151 100644
--- a/finance/p5-Business-OCV/Makefile
+++ b/finance/p5-Business-OCV/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Business-OCV
 PORTVERSION=	0.1
 CATEGORIES=	finance perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/B/BE/BENL
 PKGNAMEPREFIX=	p5-
 
diff --git a/finance/p5-Business-OnlinePayment-2CheckOut/Makefile b/finance/p5-Business-OnlinePayment-2CheckOut/Makefile
index f5e9d93724ca..911d399dbb82 100644
--- a/finance/p5-Business-OnlinePayment-2CheckOut/Makefile
+++ b/finance/p5-Business-OnlinePayment-2CheckOut/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Business-OnlinePayment-2CheckOut
 PORTVERSION=	0.02
 PORTREVISION=	1
 CATEGORIES=	finance perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Business
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-AuthorizeNet/Makefile b/finance/p5-Business-OnlinePayment-AuthorizeNet/Makefile
index c12fc9b01c59..185c8599d016 100644
--- a/finance/p5-Business-OnlinePayment-AuthorizeNet/Makefile
+++ b/finance/p5-Business-OnlinePayment-AuthorizeNet/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Business-OnlinePayment-AuthorizeNet
 PORTVERSION=	3.17
 CATEGORIES=	finance perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Business
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-BankOfAmerica/Makefile b/finance/p5-Business-OnlinePayment-BankOfAmerica/Makefile
index 8b91c1616612..e2867149d288 100644
--- a/finance/p5-Business-OnlinePayment-BankOfAmerica/Makefile
+++ b/finance/p5-Business-OnlinePayment-BankOfAmerica/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Business-OnlinePayment-BankOfAmerica
 PORTVERSION=	1.02
 PORTREVISION=	1
 CATEGORIES=	finance perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Business
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-Beanstream/Makefile b/finance/p5-Business-OnlinePayment-Beanstream/Makefile
index 3fea1ce771db..8cc4b34a79c3 100644
--- a/finance/p5-Business-OnlinePayment-Beanstream/Makefile
+++ b/finance/p5-Business-OnlinePayment-Beanstream/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Business-OnlinePayment-Beanstream
 PORTVERSION=	0.01
 PORTREVISION=	2
 CATEGORIES=	finance perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Business
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-Cardstream/Makefile b/finance/p5-Business-OnlinePayment-Cardstream/Makefile
index 9c93f64a1272..3b1a7b68f8ba 100644
--- a/finance/p5-Business-OnlinePayment-Cardstream/Makefile
+++ b/finance/p5-Business-OnlinePayment-Cardstream/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Business-OnlinePayment-Cardstream
 PORTVERSION=	1.0
 PORTREVISION=	2
 CATEGORIES=	finance perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Business
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-Jettis/Makefile b/finance/p5-Business-OnlinePayment-Jettis/Makefile
index 969223ba99d0..f0a54be05178 100644
--- a/finance/p5-Business-OnlinePayment-Jettis/Makefile
+++ b/finance/p5-Business-OnlinePayment-Jettis/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Business-OnlinePayment-Jettis
 PORTVERSION=	0.01
 PORTREVISION=	2
 CATEGORIES=	finance perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Business
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-LinkPoint/Makefile b/finance/p5-Business-OnlinePayment-LinkPoint/Makefile
index a99cdd25b030..1cdf96f865f8 100644
--- a/finance/p5-Business-OnlinePayment-LinkPoint/Makefile
+++ b/finance/p5-Business-OnlinePayment-LinkPoint/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Business-OnlinePayment-LinkPoint
 PORTVERSION=	0.09
 CATEGORIES=	finance perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Business
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-MerchantCommerce/Makefile b/finance/p5-Business-OnlinePayment-MerchantCommerce/Makefile
index 68e812dace76..d53ce2b83e45 100644
--- a/finance/p5-Business-OnlinePayment-MerchantCommerce/Makefile
+++ b/finance/p5-Business-OnlinePayment-MerchantCommerce/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Business-OnlinePayment-MerchantCommerce
 PORTVERSION=	0.01
 PORTREVISION=	1
 CATEGORIES=	finance perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Business
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-Network1Financial/Makefile b/finance/p5-Business-OnlinePayment-Network1Financial/Makefile
index 436263f023cf..b2fa27841f37 100644
--- a/finance/p5-Business-OnlinePayment-Network1Financial/Makefile
+++ b/finance/p5-Business-OnlinePayment-Network1Financial/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Business-OnlinePayment-Network1Financial
 PORTVERSION=	0.02
 PORTREVISION=	2
 CATEGORIES=	finance perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Business
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-OCV/Makefile b/finance/p5-Business-OnlinePayment-OCV/Makefile
index 1e270e12848f..066686ebdb12 100644
--- a/finance/p5-Business-OnlinePayment-OCV/Makefile
+++ b/finance/p5-Business-OnlinePayment-OCV/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Business-OnlinePayment-OCV
 PORTVERSION=	0.01
 PORTREVISION=	1
 CATEGORIES=	finance perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Business
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-PayConnect/Makefile b/finance/p5-Business-OnlinePayment-PayConnect/Makefile
index d09da33ef8e3..037b31fa31ba 100644
--- a/finance/p5-Business-OnlinePayment-PayConnect/Makefile
+++ b/finance/p5-Business-OnlinePayment-PayConnect/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Business-OnlinePayment-PayConnect
 PORTVERSION=	0.02
 PORTREVISION=	2
 CATEGORIES=	finance perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Business
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-PayflowPro/Makefile b/finance/p5-Business-OnlinePayment-PayflowPro/Makefile
index a3ffc48b7afe..f9802cd03efa 100644
--- a/finance/p5-Business-OnlinePayment-PayflowPro/Makefile
+++ b/finance/p5-Business-OnlinePayment-PayflowPro/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Business-OnlinePayment-PayflowPro
 PORTVERSION=	0.03
 CATEGORIES=	finance perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Business
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	never@nevermind.kiev.ua
diff --git a/finance/p5-Business-OnlinePayment-PaymentsGateway/Makefile b/finance/p5-Business-OnlinePayment-PaymentsGateway/Makefile
index 8ae1d1adf948..100074d94ffb 100644
--- a/finance/p5-Business-OnlinePayment-PaymentsGateway/Makefile
+++ b/finance/p5-Business-OnlinePayment-PaymentsGateway/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Business-OnlinePayment-PaymentsGateway
 PORTVERSION=	0.02
 PORTREVISION=	1
 CATEGORIES=	finance perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Business
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-SurePay/Makefile b/finance/p5-Business-OnlinePayment-SurePay/Makefile
index e4a306bef3d4..7dbe3855cabf 100644
--- a/finance/p5-Business-OnlinePayment-SurePay/Makefile
+++ b/finance/p5-Business-OnlinePayment-SurePay/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Business-OnlinePayment-SurePay
 PORTVERSION=	0.01
 CATEGORIES=	finance perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Business
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-TCLink/Makefile b/finance/p5-Business-OnlinePayment-TCLink/Makefile
index ac83083d6ead..c1fb201989ab 100644
--- a/finance/p5-Business-OnlinePayment-TCLink/Makefile
+++ b/finance/p5-Business-OnlinePayment-TCLink/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Business-OnlinePayment-TCLink
 PORTVERSION=	1.03
 PORTREVISION=	1
 CATEGORIES=	finance perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Business
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-VirtualNet/Makefile b/finance/p5-Business-OnlinePayment-VirtualNet/Makefile
index aacf460bd752..47aa10d1bbab 100644
--- a/finance/p5-Business-OnlinePayment-VirtualNet/Makefile
+++ b/finance/p5-Business-OnlinePayment-VirtualNet/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Business-OnlinePayment-VirtualNet
 PORTVERSION=	0.02
 PORTREVISION=	2
 CATEGORIES=	finance perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Business
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-eSec/Makefile b/finance/p5-Business-OnlinePayment-eSec/Makefile
index ba2882593610..e9efd6bf260c 100644
--- a/finance/p5-Business-OnlinePayment-eSec/Makefile
+++ b/finance/p5-Business-OnlinePayment-eSec/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Business-OnlinePayment-eSec
 PORTVERSION=	0.02
 PORTREVISION=	2
 CATEGORIES=	finance perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Business
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment-iAuthorizer/Makefile b/finance/p5-Business-OnlinePayment-iAuthorizer/Makefile
index 72888c95de57..d460f60493fd 100644
--- a/finance/p5-Business-OnlinePayment-iAuthorizer/Makefile
+++ b/finance/p5-Business-OnlinePayment-iAuthorizer/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Business-OnlinePayment-iAuthorizer
 PORTVERSION=	0.2.1
 PORTREVISION=	1
 CATEGORIES=	finance perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Business
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/finance/p5-Business-PayPal-IPN/Makefile b/finance/p5-Business-PayPal-IPN/Makefile
index 4db4f261dfb3..8628af259048 100644
--- a/finance/p5-Business-PayPal-IPN/Makefile
+++ b/finance/p5-Business-PayPal-IPN/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Business-PayPal-IPN
 PORTVERSION=	1.94
 CATEGORIES=	finance perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Business
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	coryking@mozimedia.com
diff --git a/finance/p5-Business-WorldPay-Junior/Makefile b/finance/p5-Business-WorldPay-Junior/Makefile
index 40693b709ff1..b9a8ae145c45 100644
--- a/finance/p5-Business-WorldPay-Junior/Makefile
+++ b/finance/p5-Business-WorldPay-Junior/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Business-WorldPay-Junior
 PORTVERSION=	1.07
 CATEGORIES=	finance perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Business
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile b/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile
index bb01f2e7c657..372874c554a8 100644
--- a/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile
+++ b/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Finance-Currency-Convert-WebserviceX
 PORTVERSION=	0.06002
 CATEGORIES=	finance perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Finance
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hideo@lastamericanempire.com
diff --git a/finance/p5-Finance-Quote/Makefile b/finance/p5-Finance-Quote/Makefile
index 8e2460f04f09..cb7b2e6ba6a2 100644
--- a/finance/p5-Finance-Quote/Makefile
+++ b/finance/p5-Finance-Quote/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Finance-Quote
 PORTVERSION=	1.13
 CATEGORIES=	finance perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Finance
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/finance/p5-Finance-QuoteHist/Makefile b/finance/p5-Finance-QuoteHist/Makefile
index 9e5a7cec1647..b34d2d1153c3 100644
--- a/finance/p5-Finance-QuoteHist/Makefile
+++ b/finance/p5-Finance-QuoteHist/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Finance-QuoteHist
 PORTVERSION=	1.11
 CATEGORIES=	finance perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Finance
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/finance/p5-Math-Financial/Makefile b/finance/p5-Math-Financial/Makefile
index 2c25cc74437a..a32d93bd032d 100644
--- a/finance/p5-Math-Financial/Makefile
+++ b/finance/p5-Math-Financial/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Financial
 PORTVERSION=	0.76
 CATEGORIES=	finance math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org