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

8 files changed, 8 insertions, 14 deletions

diff --git a/comms/o2sms/Makefile b/comms/o2sms/Makefile
index 8e05f2f82201..27517642c28a 100644
--- a/comms/o2sms/Makefile
+++ b/comms/o2sms/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	o2sms
 PORTVERSION=	3.27
 CATEGORIES=	comms perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES=	CPAN \
 		http://www.mackers.com/projects/o2sms/releases/
 MASTER_SITE_SUBDIR=	WWW/MACKERS
 
diff --git a/comms/p5-Device-Gsm/Makefile b/comms/p5-Device-Gsm/Makefile
index f5de22c87559..655f8ed024fe 100644
--- a/comms/p5-Device-Gsm/Makefile
+++ b/comms/p5-Device-Gsm/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Device-Gsm
 PORTVERSION=	1.48
 PORTREVISION=	1
 CATEGORIES=	comms perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Device
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	anders@FreeBSD.org
diff --git a/comms/p5-Device-Modem/Makefile b/comms/p5-Device-Modem/Makefile
index f95dc506e4da..04df2d5e7278 100644
--- a/comms/p5-Device-Modem/Makefile
+++ b/comms/p5-Device-Modem/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Device-Modem
 PORTVERSION=	1.48
 CATEGORIES=	comms perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Device
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/comms/p5-Device-SerialPort/Makefile b/comms/p5-Device-SerialPort/Makefile
index 9021b2cc1515..c702e21ac429 100644
--- a/comms/p5-Device-SerialPort/Makefile
+++ b/comms/p5-Device-SerialPort/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Device-SerialPort
 PORTVERSION=	1.003001
 CATEGORIES=	comms perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Device
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/comms/p5-Fax-Hylafax-Client/Makefile b/comms/p5-Fax-Hylafax-Client/Makefile
index 4b378f8c8781..ef9cb594674f 100644
--- a/comms/p5-Fax-Hylafax-Client/Makefile
+++ b/comms/p5-Fax-Hylafax-Client/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Fax-Hylafax-Client
 PORTVERSION=	1.02
 CATEGORIES=	comms perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Fax
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/comms/p5-SMS-Send-DeviceGsm/Makefile b/comms/p5-SMS-Send-DeviceGsm/Makefile
index 2559754f073e..375190b68bf3 100644
--- a/comms/p5-SMS-Send-DeviceGsm/Makefile
+++ b/comms/p5-SMS-Send-DeviceGsm/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	SMS-Send-DeviceGsm
 PORTVERSION=	1.00
 CATEGORIES=	comms perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	SMS
 PKGNAMEPREFIX=	p5-
 
diff --git a/comms/p5-SMS-Send-TW-PChome/Makefile b/comms/p5-SMS-Send-TW-PChome/Makefile
index a03cb3892b4a..9e5706388c2a 100644
--- a/comms/p5-SMS-Send-TW-PChome/Makefile
+++ b/comms/p5-SMS-Send-TW-PChome/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	SMS-Send-TW-PChome
 PORTVERSION=	0.02
 CATEGORIES=	comms perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	SMS
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	 p5-
 
 MAINTAINER=	snowfly@yuntech.edu.tw
diff --git a/comms/p5-SMS-Send-TW-emome/Makefile b/comms/p5-SMS-Send-TW-emome/Makefile
index dd8f458ee935..6e26b4877e71 100644
--- a/comms/p5-SMS-Send-TW-emome/Makefile
+++ b/comms/p5-SMS-Send-TW-emome/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	SMS-Send-TW-emome
 PORTVERSION=	0.01
 CATEGORIES=	comms perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	SMS
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	snowfly@yuntech.edu.tw