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

10 files changed, 10 insertions, 19 deletions

diff --git a/net-im/p5-DJabberd/Makefile b/net-im/p5-DJabberd/Makefile
index 1c9e1a7305b8..ccdf176ccbf1 100644
--- a/net-im/p5-DJabberd/Makefile
+++ b/net-im/p5-DJabberd/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	DJabberd
 PORTVERSION=	0.83
 CATEGORIES=	net-im perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/B/BR/BRADFITZ
 PKGNAMEPREFIX=	p5-
 
diff --git a/net-im/p5-Jabber-SimpleSend/Makefile b/net-im/p5-Jabber-SimpleSend/Makefile
index 79a20f89fbdc..b3f3c0eaeed5 100644
--- a/net-im/p5-Jabber-SimpleSend/Makefile
+++ b/net-im/p5-Jabber-SimpleSend/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Jabber-SimpleSend
 PORTVERSION=	0.02
 CATEGORIES=	net-im perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Jabber
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
diff --git a/net-im/p5-Net-AIM/Makefile b/net-im/p5-Net-AIM/Makefile
index 65f4932fbf28..162681cd5418 100644
--- a/net-im/p5-Net-AIM/Makefile
+++ b/net-im/p5-Net-AIM/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-AIM
 PORTVERSION=	1.22
 CATEGORIES=	net-im perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net-im/p5-Net-AOLIM/Makefile b/net-im/p5-Net-AOLIM/Makefile
index 20362bcd00e4..80eea7d5dc7e 100644
--- a/net-im/p5-Net-AOLIM/Makefile
+++ b/net-im/p5-Net-AOLIM/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-AOLIM
 PORTVERSION=	1.61
 CATEGORIES=	net-im perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/net-im/p5-Net-Jabber/Makefile b/net-im/p5-Net-Jabber/Makefile
index 33c905578950..53cf62163253 100644
--- a/net-im/p5-Net-Jabber/Makefile
+++ b/net-im/p5-Net-Jabber/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Jabber
 PORTVERSION=	2.0
 CATEGORIES=	net-im perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DIST_SUBDIR=	jabber
 
diff --git a/net-im/p5-Net-MSN/Makefile b/net-im/p5-Net-MSN/Makefile
index fad5e7dd998c..f50f426acd79 100644
--- a/net-im/p5-Net-MSN/Makefile
+++ b/net-im/p5-Net-MSN/Makefile
@@ -6,8 +6,7 @@
 PORTNAME=	Net-MSN
 PORTVERSION=	1.022
 CATEGORIES=	net-im perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net-im/p5-Net-NetSend/Makefile b/net-im/p5-Net-NetSend/Makefile
index 9cd04891877f..0c691249b4bb 100644
--- a/net-im/p5-Net-NetSend/Makefile
+++ b/net-im/p5-Net-NetSend/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-NetSend
 PORTVERSION=	0.12
 CATEGORIES=	net-im perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	snowfly@yuntech.edu.tw
diff --git a/net-im/p5-Net-OSCAR/Makefile b/net-im/p5-Net-OSCAR/Makefile
index 57711a5b0306..ca17c68da648 100644
--- a/net-im/p5-Net-OSCAR/Makefile
+++ b/net-im/p5-Net-OSCAR/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-OSCAR
 PORTVERSION=	1.925
 CATEGORIES=	net-im perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/net-im/p5-Net-Stomp/Makefile b/net-im/p5-Net-Stomp/Makefile
index 6ea39b0a7e6f..36121021808d 100644
--- a/net-im/p5-Net-Stomp/Makefile
+++ b/net-im/p5-Net-Stomp/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Stomp
 PORTVERSION=	0.32
 CATEGORIES=	net-im perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/net-im/p5-POE-Component-Client-MSN/Makefile b/net-im/p5-POE-Component-Client-MSN/Makefile
index e6ba37280dda..17af3926afc5 100644
--- a/net-im/p5-POE-Component-Client-MSN/Makefile
+++ b/net-im/p5-POE-Component-Client-MSN/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	POE-Component-Client-MSN
 PORTVERSION=	0.03
 CATEGORIES=	net-im perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chinsan@FreeBSD.org