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

75 files changed, 75 insertions, 147 deletions

diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
index 03af3a37e071..0a01484fcc38 100644
--- a/mail/mailagent/Makefile
+++ b/mail/mailagent/Makefile
@@ -9,7 +9,7 @@ PORTNAME=		mailagent
 PORTVERSION=		3.0.73
 PORTREVISION=		1
 CATEGORIES=		mail
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=		CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/RAM
 
 MAINTAINER=	max@FreeBSD.org
diff --git a/mail/p5-Email-Filter/Makefile b/mail/p5-Email-Filter/Makefile
index c6dc94b01522..3081ce5538e3 100644
--- a/mail/p5-Email-Filter/Makefile
+++ b/mail/p5-Email-Filter/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Email-Filter
 PORTVERSION=	1.03.1
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Email
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
diff --git a/mail/p5-Email-Find/Makefile b/mail/p5-Email-Find/Makefile
index 5c920e3e67e2..0b4e643b7543 100644
--- a/mail/p5-Email-Find/Makefile
+++ b/mail/p5-Email-Find/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Email-Find
 PORTVERSION=	0.10
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Email
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/mail/p5-Email-LocalDelivery-Ezmlm/Makefile b/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
index d83c6a52822e..c92e2cc8b59f 100644
--- a/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
+++ b/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Email-LocalDelivery-Ezmlm
 PORTVERSION=	0.10
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Email
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/mail/p5-Email-LocalDelivery/Makefile b/mail/p5-Email-LocalDelivery/Makefile
index 015f319426b0..b1230ebb4e81 100644
--- a/mail/p5-Email-LocalDelivery/Makefile
+++ b/mail/p5-Email-LocalDelivery/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Email-LocalDelivery
 PORTVERSION=	0.21.7
 DISTVERSION=	${PORTVERSION:C/\.(.)$/\1/}
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Email
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/mail/p5-Email-MessageID/Makefile b/mail/p5-Email-MessageID/Makefile
index 5682ea4640df..b2110edf0091 100644
--- a/mail/p5-Email-MessageID/Makefile
+++ b/mail/p5-Email-MessageID/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Email-MessageID
 PORTVERSION=	1.351
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Email
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/mail/p5-Email-Reply/Makefile b/mail/p5-Email-Reply/Makefile
index fb6331b1a6c0..8d275bb426c4 100644
--- a/mail/p5-Email-Reply/Makefile
+++ b/mail/p5-Email-Reply/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Email-Reply
 PORTVERSION=	1.202
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=Email
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kay.abendroth@raxion.net
diff --git a/mail/p5-Email-Send/Makefile b/mail/p5-Email-Send/Makefile
index ce0198c0ee1c..4e967bb66714 100644
--- a/mail/p5-Email-Send/Makefile
+++ b/mail/p5-Email-Send/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Email-Send
 PORTVERSION=	2.192
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Email
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/mail/p5-Email-Simple-Creator/Makefile b/mail/p5-Email-Simple-Creator/Makefile
index df09e5f2375d..f5c70410f432 100644
--- a/mail/p5-Email-Simple-Creator/Makefile
+++ b/mail/p5-Email-Simple-Creator/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Email-Simple-Creator
 PORTVERSION=	1.424
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Email
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/mail/p5-Email-Simple/Makefile b/mail/p5-Email-Simple/Makefile
index 1b1854cb34be..dcc910e4cba4 100644
--- a/mail/p5-Email-Simple/Makefile
+++ b/mail/p5-Email-Simple/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Email-Simple
 PORTVERSION=	2.00.3
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Email
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C|\.([0-9])$|\1|}
 
diff --git a/mail/p5-Email-Valid-Loose/Makefile b/mail/p5-Email-Valid-Loose/Makefile
index 914f9fbe0f2d..1d554e8e1a34 100644
--- a/mail/p5-Email-Valid-Loose/Makefile
+++ b/mail/p5-Email-Valid-Loose/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Email-Valid-Loose
 PORTVERSION=	0.05
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Email
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/mail/p5-Email-Valid/Makefile b/mail/p5-Email-Valid/Makefile
index dc735c70aef3..9c147d6c4bcf 100644
--- a/mail/p5-Email-Valid/Makefile
+++ b/mail/p5-Email-Valid/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Email-Valid
 PORTVERSION=	0.179
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Email
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/mail/p5-GMail-IMAPD/Makefile b/mail/p5-GMail-IMAPD/Makefile
index fcae6204e1ba..7ad37036ecc1 100644
--- a/mail/p5-GMail-IMAPD/Makefile
+++ b/mail/p5-GMail-IMAPD/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	GMail-IMAPD
 PORTVERSION=	0.94
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	GMail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mashtizadeh@gmail.com
diff --git a/mail/p5-IMAP-Admin/Makefile b/mail/p5-IMAP-Admin/Makefile
index 1aee494361e7..1447fa131daf 100644
--- a/mail/p5-IMAP-Admin/Makefile
+++ b/mail/p5-IMAP-Admin/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	IMAP-Admin
 PORTVERSION=	1.6.4
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	IMAP
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/mail/p5-IMAP-Client/Makefile b/mail/p5-IMAP-Client/Makefile
index 48fa68791752..a2bd353efdd4 100644
--- a/mail/p5-IMAP-Client/Makefile
+++ b/mail/p5-IMAP-Client/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	IMAP-Client
 PORTVERSION=	0.13
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	IMAP
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/mail/p5-MIME-Charset/Makefile b/mail/p5-MIME-Charset/Makefile
index 4705f7779fbb..ea09687a3272 100644
--- a/mail/p5-MIME-Charset/Makefile
+++ b/mail/p5-MIME-Charset/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	MIME-Charset
 PORTVERSION=	0.044
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	MIME
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	Olivier.Girard@univ-angers.fr
diff --git a/mail/p5-MIME-EncWords/Makefile b/mail/p5-MIME-EncWords/Makefile
index a718300c685a..f85c42859145 100644
--- a/mail/p5-MIME-EncWords/Makefile
+++ b/mail/p5-MIME-EncWords/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	MIME-EncWords
 PORTVERSION=	0.040
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	MIME
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	Olivier.Girard@univ-angers.fr
diff --git a/mail/p5-MIME-Explode/Makefile b/mail/p5-MIME-Explode/Makefile
index 59a9002f8548..91826767966b 100644
--- a/mail/p5-MIME-Explode/Makefile
+++ b/mail/p5-MIME-Explode/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	MIME-Explode
 PORTVERSION=	0.38
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	MIME
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chinsan@FreeBSD.org
diff --git a/mail/p5-MIME-Fast/Makefile b/mail/p5-MIME-Fast/Makefile
index d3a063e7f99f..2c46c3f47ffd 100644
--- a/mail/p5-MIME-Fast/Makefile
+++ b/mail/p5-MIME-Fast/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	MIME-Fast
 PORTVERSION=	1.6
 PORTREVISION=	4
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	MIME
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/mail/p5-MIME-Lite-HTML/Makefile b/mail/p5-MIME-Lite-HTML/Makefile
index 156c891ee115..b75023c8aa37 100644
--- a/mail/p5-MIME-Lite-HTML/Makefile
+++ b/mail/p5-MIME-Lite-HTML/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	MIME-Lite-HTML
 PORTVERSION=	1.22
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	MIME
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jb.quenot@caraldi.com
diff --git a/mail/p5-MIME-Types/Makefile b/mail/p5-MIME-Types/Makefile
index 0f345157daca..7aa0a58d535a 100644
--- a/mail/p5-MIME-Types/Makefile
+++ b/mail/p5-MIME-Types/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=		MIME-Types
 PORTVERSION=		1.23
 CATEGORIES=		mail perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	MIME
+MASTER_SITES=		CPAN
 PKGNAMEPREFIX=		p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/mail/p5-Mail-Address-MobileJp/Makefile b/mail/p5-Mail-Address-MobileJp/Makefile
index cb15a5d8d5d0..c35ac8101b8f 100644
--- a/mail/p5-Mail-Address-MobileJp/Makefile
+++ b/mail/p5-Mail-Address-MobileJp/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-Address-MobileJp
 PORTVERSION=	0.08
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/mail/p5-Mail-Alias/Makefile b/mail/p5-Mail-Alias/Makefile
index 9594e5e3be09..0bf61ba64291 100644
--- a/mail/p5-Mail-Alias/Makefile
+++ b/mail/p5-Mail-Alias/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-Alias
 PORTVERSION=	1.12
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/mail/p5-Mail-Audit-Attach/Makefile b/mail/p5-Mail-Audit-Attach/Makefile
index f56f9228367d..b835b2ff34bc 100644
--- a/mail/p5-Mail-Audit-Attach/Makefile
+++ b/mail/p5-Mail-Audit-Attach/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-Audit-Attach
 PORTVERSION=	0.94
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/mail/p5-Mail-Box-Parser-C/Makefile b/mail/p5-Mail-Box-Parser-C/Makefile
index dbbaf7a8a6dd..463a9efc1f13 100644
--- a/mail/p5-Mail-Box-Parser-C/Makefile
+++ b/mail/p5-Mail-Box-Parser-C/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-Box-Parser-C
 PORTVERSION=	3.006
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/mail/p5-Mail-Box/Makefile b/mail/p5-Mail-Box/Makefile
index e4c6c43cbed0..d624c31b17d8 100644
--- a/mail/p5-Mail-Box/Makefile
+++ b/mail/p5-Mail-Box/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-Box
 PORTVERSION=	2.080
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/mail/p5-Mail-Bulkmail/Makefile b/mail/p5-Mail-Bulkmail/Makefile
index 266d5a25ac4a..1b9376b410c3 100644
--- a/mail/p5-Mail-Bulkmail/Makefile
+++ b/mail/p5-Mail-Bulkmail/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-Bulkmail
 PORTVERSION=	3.12
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/mail/p5-Mail-CClient/Makefile b/mail/p5-Mail-CClient/Makefile
index b4896ccf2a31..b21d20d4a876 100644
--- a/mail/p5-Mail-CClient/Makefile
+++ b/mail/p5-Mail-CClient/Makefile
@@ -9,8 +9,7 @@ PORTNAME=		CClient
 PORTVERSION=		1.12
 PORTREVISION=		1
 CATEGORIES=		mail perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail/HDIAS
+MASTER_SITES=		CPAN
 PKGNAMEPREFIX=		p5-
 DISTNAME=		Mail-Cclient-${PORTVERSION}
 
diff --git a/mail/p5-Mail-CheckUser/Makefile b/mail/p5-Mail-CheckUser/Makefile
index 027260656a91..2908c3d7946b 100644
--- a/mail/p5-Mail-CheckUser/Makefile
+++ b/mail/p5-Mail-CheckUser/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-CheckUser
 PORTVERSION=	1.21
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bra@fsn.hu
diff --git a/mail/p5-Mail-ClamAV/Makefile b/mail/p5-Mail-ClamAV/Makefile
index 35ffaedd0170..3f45548f1372 100644
--- a/mail/p5-Mail-ClamAV/Makefile
+++ b/mail/p5-Mail-ClamAV/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Mail-ClamAV
 PORTVERSION=	0.20
 PORTREVISION=	2
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	j.koopmann@seceidos.de
diff --git a/mail/p5-Mail-DKIM/Makefile b/mail/p5-Mail-DKIM/Makefile
index 04745f2a4488..9abfd2fad0d9 100644
--- a/mail/p5-Mail-DKIM/Makefile
+++ b/mail/p5-Mail-DKIM/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-DKIM
 PORTVERSION=	0.30.1
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	yanagisawa@csg.is.titech.ac.jp
diff --git a/mail/p5-Mail-DomainKeys/Makefile b/mail/p5-Mail-DomainKeys/Makefile
index 855fdc72efd0..c0affec5af6a 100644
--- a/mail/p5-Mail-DomainKeys/Makefile
+++ b/mail/p5-Mail-DomainKeys/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-DomainKeys
 PORTVERSION=	1.0
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/mail/p5-Mail-Ezmlm/Makefile b/mail/p5-Mail-Ezmlm/Makefile
index 8f6311c758d3..ec7662928467 100644
--- a/mail/p5-Mail-Ezmlm/Makefile
+++ b/mail/p5-Mail-Ezmlm/Makefile
@@ -8,9 +8,8 @@
 PORTNAME=	Mail-Ezmlm
 PORTVERSION=	0.07.2
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES=	CPAN \
 		ftp://ftp.rucus.ru.ac.za/users/guy/ezmlm/
-MASTER_SITE_SUBDIR=	Mail
 PKGNAMEPREFIX=	p5-
 DISTNAME=	Ezmlm-${PORTVERSION}
 
diff --git a/mail/p5-Mail-Field-Received/Makefile b/mail/p5-Mail-Field-Received/Makefile
index fdf0a0950945..fd724f72d1e2 100644
--- a/mail/p5-Mail-Field-Received/Makefile
+++ b/mail/p5-Mail-Field-Received/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-Field-Received
 PORTVERSION=	0.24
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	freebsd@netfence.it
diff --git a/mail/p5-Mail-FilterXML/Makefile b/mail/p5-Mail-FilterXML/Makefile
index 805168e46579..28d107b91ac8 100644
--- a/mail/p5-Mail-FilterXML/Makefile
+++ b/mail/p5-Mail-FilterXML/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-FilterXML
 PORTVERSION=	0.3
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/mail/p5-Mail-Folder/Makefile b/mail/p5-Mail-Folder/Makefile
index a99a62983ae4..76b8b3d6a2e9 100644
--- a/mail/p5-Mail-Folder/Makefile
+++ b/mail/p5-Mail-Folder/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-Folder
 PORTVERSION=	0.07
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	MailFolder-${PORTVERSION}
 
diff --git a/mail/p5-Mail-Freshmeat/Makefile b/mail/p5-Mail-Freshmeat/Makefile
index 606af9cedd2b..25e06f06a6a8 100644
--- a/mail/p5-Mail-Freshmeat/Makefile
+++ b/mail/p5-Mail-Freshmeat/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-Freshmeat
 PORTVERSION=	1.20
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/mail/p5-Mail-Graph/Makefile b/mail/p5-Mail-Graph/Makefile
index 67cf15909391..e6d97b1da2a6 100644
--- a/mail/p5-Mail-Graph/Makefile
+++ b/mail/p5-Mail-Graph/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Mail-Graph
 PORTVERSION=	0.14
 PORTREVISION=	1
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/mail/p5-Mail-IMAPTalk/Makefile b/mail/p5-Mail-IMAPTalk/Makefile
index 5d927f2f8dd8..c8b408b2086d 100644
--- a/mail/p5-Mail-IMAPTalk/Makefile
+++ b/mail/p5-Mail-IMAPTalk/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-IMAPTalk
 PORTVERSION=	1.03
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/mail/p5-Mail-ListDetector/Makefile b/mail/p5-Mail-ListDetector/Makefile
index 7cf8c0807e3d..704d622e4083 100644
--- a/mail/p5-Mail-ListDetector/Makefile
+++ b/mail/p5-Mail-ListDetector/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-ListDetector
 PORTVERSION=	1.01
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/mail/p5-Mail-MailStats/Makefile b/mail/p5-Mail-MailStats/Makefile
index 2cc2139348e6..be3b4f95085f 100644
--- a/mail/p5-Mail-MailStats/Makefile
+++ b/mail/p5-Mail-MailStats/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	MailStats
 PORTVERSION=	0.02
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/mail/p5-Mail-Mbox-MessageParser/Makefile b/mail/p5-Mail-Mbox-MessageParser/Makefile
index 210d0b1fa75c..d39e5c5bfc2a 100644
--- a/mail/p5-Mail-Mbox-MessageParser/Makefile
+++ b/mail/p5-Mail-Mbox-MessageParser/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-Mbox-MessageParser
 PORTVERSION=	1.5000
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/mail/p5-Mail-MboxParser/Makefile b/mail/p5-Mail-MboxParser/Makefile
index 9c952166ea46..f2abe093fbc0 100644
--- a/mail/p5-Mail-MboxParser/Makefile
+++ b/mail/p5-Mail-MboxParser/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-MboxParser
 PORTVERSION=	0.55
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
diff --git a/mail/p5-Mail-OpenRelay-Simple/Makefile b/mail/p5-Mail-OpenRelay-Simple/Makefile
index 3d8eb9b7ff1f..74300f44a547 100644
--- a/mail/p5-Mail-OpenRelay-Simple/Makefile
+++ b/mail/p5-Mail-OpenRelay-Simple/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-OpenRelay-Simple
 PORTVERSION=	0.02
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tjs@cdpa.nsysu.edu.tw
diff --git a/mail/p5-Mail-POP3Client/Makefile b/mail/p5-Mail-POP3Client/Makefile
index b5860a285bda..1800e1979949 100644
--- a/mail/p5-Mail-POP3Client/Makefile
+++ b/mail/p5-Mail-POP3Client/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-POP3Client
 PORTVERSION=	2.17
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
diff --git a/mail/p5-Mail-Procmailrc/Makefile b/mail/p5-Mail-Procmailrc/Makefile
index bacbc8991572..46c23d50e5b2 100644
--- a/mail/p5-Mail-Procmailrc/Makefile
+++ b/mail/p5-Mail-Procmailrc/Makefile
@@ -9,9 +9,8 @@
 PORTNAME=	Mail-Procmailrc
 PORTVERSION=	1.09
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES=	CPAN \
 		http://scott.wiersdorf.org/perl/
-MASTER_SITE_SUBDIR=	Mail
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/mail/p5-Mail-QuoteWrap/Makefile b/mail/p5-Mail-QuoteWrap/Makefile
index 6b13b7a7a016..0236900fda9d 100644
--- a/mail/p5-Mail-QuoteWrap/Makefile
+++ b/mail/p5-Mail-QuoteWrap/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-QuoteWrap
 PORTVERSION=	0.01
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	MailQuoteWrap${PORTVERSION}
 EXTRACT_SUFX=	.tgz
diff --git a/mail/p5-Mail-RBL/Makefile b/mail/p5-Mail-RBL/Makefile
index 561fb787c892..3b997902871f 100644
--- a/mail/p5-Mail-RBL/Makefile
+++ b/mail/p5-Mail-RBL/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-RBL
 PORTVERSION=	1.10
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/mail/p5-Mail-RFC822-Address/Makefile b/mail/p5-Mail-RFC822-Address/Makefile
index 0f2c909a3a1e..baf21736687d 100644
--- a/mail/p5-Mail-RFC822-Address/Makefile
+++ b/mail/p5-Mail-RFC822-Address/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-RFC822-Address
 PORTVERSION=	0.3
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	barner@FreeBSD.org
diff --git a/mail/p5-Mail-SPF-Query/Makefile b/mail/p5-Mail-SPF-Query/Makefile
index de23b9271a4a..d1a066f18385 100644
--- a/mail/p5-Mail-SPF-Query/Makefile
+++ b/mail/p5-Mail-SPF-Query/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-SPF-Query
 PORTVERSION=	1.999.1
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/mail/p5-Mail-SRS/Makefile b/mail/p5-Mail-SRS/Makefile
index af83d5cd84fb..217a4cfaa70b 100644
--- a/mail/p5-Mail-SRS/Makefile
+++ b/mail/p5-Mail-SRS/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-SRS
 PORTVERSION=	0.31
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/mail/p5-Mail-SendEasy/Makefile b/mail/p5-Mail-SendEasy/Makefile
index 5aa8e2414ed5..53c08dfc9ec7 100644
--- a/mail/p5-Mail-SendEasy/Makefile
+++ b/mail/p5-Mail-SendEasy/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-SendEasy
 PORTVERSION=	1.2
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
diff --git a/mail/p5-Mail-Sender/Makefile b/mail/p5-Mail-Sender/Makefile
index 564681296901..15fdc97f4e38 100644
--- a/mail/p5-Mail-Sender/Makefile
+++ b/mail/p5-Mail-Sender/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-Sender
 PORTVERSION=	0.8.13
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/mail/p5-Mail-Sendmail/Makefile b/mail/p5-Mail-Sendmail/Makefile
index 888291efb63f..0c912dace1c4 100644
--- a/mail/p5-Mail-Sendmail/Makefile
+++ b/mail/p5-Mail-Sendmail/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-Sendmail
 PORTVERSION=	0.79
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/mail/p5-Mail-Spool/Makefile b/mail/p5-Mail-Spool/Makefile
index adb12745e4c6..d693bb2e5c3f 100644
--- a/mail/p5-Mail-Spool/Makefile
+++ b/mail/p5-Mail-Spool/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-Spool
 PORTVERSION=	0.50
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/mail/p5-Mail-Transport-Dbx/Makefile b/mail/p5-Mail-Transport-Dbx/Makefile
index 5b212d74d286..27cde1d7c83c 100644
--- a/mail/p5-Mail-Transport-Dbx/Makefile
+++ b/mail/p5-Mail-Transport-Dbx/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-Transport-Dbx
 PORTVERSION=	0.07
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/mail/p5-Mail-Verify/Makefile b/mail/p5-Mail-Verify/Makefile
index 574fe414a88f..ffc790bfb123 100644
--- a/mail/p5-Mail-Verify/Makefile
+++ b/mail/p5-Mail-Verify/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-Verify
 PORTVERSION=	0.02
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/mail/p5-Mail-Webmail-Gmail/Makefile b/mail/p5-Mail-Webmail-Gmail/Makefile
index b0d29d1ad683..d4c1530b473c 100644
--- a/mail/p5-Mail-Webmail-Gmail/Makefile
+++ b/mail/p5-Mail-Webmail-Gmail/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mail-Webmail-Gmail
 PORTVERSION=	1.09
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	farrokhi@FreeBSD.org
diff --git a/mail/p5-Net-IMAP-Simple-SSL/Makefile b/mail/p5-Net-IMAP-Simple-SSL/Makefile
index 767c054d85f7..9ef43c80186b 100644
--- a/mail/p5-Net-IMAP-Simple-SSL/Makefile
+++ b/mail/p5-Net-IMAP-Simple-SSL/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-IMAP-Simple-SSL
 PORTVERSION=	1.3
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/mail/p5-Net-IMAP-Simple/Makefile b/mail/p5-Net-IMAP-Simple/Makefile
index b136aac854b1..d6c0d300bf53 100644
--- a/mail/p5-Net-IMAP-Simple/Makefile
+++ b/mail/p5-Net-IMAP-Simple/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Net-IMAP-Simple
 PORTVERSION=	1.17
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/C/CF/CFABER
 PKGNAMEPREFIX=	p5-
 
diff --git a/mail/p5-Net-QMTP/Makefile b/mail/p5-Net-QMTP/Makefile
index ebc6d21e0985..eda20cdee0de 100644
--- a/mail/p5-Net-QMTP/Makefile
+++ b/mail/p5-Net-QMTP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-QMTP
 PORTVERSION=	0.06
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	james@now.ie
diff --git a/mail/p5-Net-SMTP-Server/Makefile b/mail/p5-Net-SMTP-Server/Makefile
index 3dc0ef7003da..2588013c57eb 100644
--- a/mail/p5-Net-SMTP-Server/Makefile
+++ b/mail/p5-Net-SMTP-Server/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-SMTP-Server
 PORTVERSION=	1.1
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	SMTP-Server-${PORTVERSION}
 
diff --git a/mail/p5-Net-SMTP-TLS/Makefile b/mail/p5-Net-SMTP-TLS/Makefile
index 02d8b7b4cb5f..fbb977822b1d 100644
--- a/mail/p5-Net-SMTP-TLS/Makefile
+++ b/mail/p5-Net-SMTP-TLS/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-SMTP-TLS
 PORTVERSION=	0.12
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
diff --git a/mail/p5-Net-SMTP_auth/Makefile b/mail/p5-Net-SMTP_auth/Makefile
index 39619279f586..22f82ff44919 100644
--- a/mail/p5-Net-SMTP_auth/Makefile
+++ b/mail/p5-Net-SMTP_auth/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-SMTP_auth
 PORTVERSION=	0.08
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/mail/p5-POE-Component-Client-POP3/Makefile b/mail/p5-POE-Component-Client-POP3/Makefile
index c377a3088e40..5d34d75305b9 100644
--- a/mail/p5-POE-Component-Client-POP3/Makefile
+++ b/mail/p5-POE-Component-Client-POP3/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	POE-Component-Client-POP3
 PORTVERSION=	0.02
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/mail/p5-POE-Component-Client-SMTP/Makefile b/mail/p5-POE-Component-Client-SMTP/Makefile
index a4913bf8a6e7..e8cf22c0dd43 100644
--- a/mail/p5-POE-Component-Client-SMTP/Makefile
+++ b/mail/p5-POE-Component-Client-SMTP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	POE-Component-Client-SMTP
 PORTVERSION=	0.18
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/mail/p5-POE-Component-SMTP/Makefile b/mail/p5-POE-Component-SMTP/Makefile
index ccaf946741c3..1cbb4068ad10 100644
--- a/mail/p5-POE-Component-SMTP/Makefile
+++ b/mail/p5-POE-Component-SMTP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	POE-Component-SMTP
 PORTVERSION=	1.6
 CATEGORIES=	mail devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/mail/p5-Parse-Syslog-Mail/Makefile b/mail/p5-Parse-Syslog-Mail/Makefile
index 9d687d593d63..ea11d0760ee9 100644
--- a/mail/p5-Parse-Syslog-Mail/Makefile
+++ b/mail/p5-Parse-Syslog-Mail/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Parse-Syslog-Mail
 PORTVERSION=	0.14
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Parse
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/mail/p5-Qmail-Envelope/Makefile b/mail/p5-Qmail-Envelope/Makefile
index e520afd87fc8..5c37c3b9fa70 100644
--- a/mail/p5-Qmail-Envelope/Makefile
+++ b/mail/p5-Qmail-Envelope/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Qmail-Envelope
 PORTVERSION=	0.53
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/M/MJ/MJA
 PKGNAMEPREFIX=	p5-
 
diff --git a/mail/p5-Sendmail-AccessDB/Makefile b/mail/p5-Sendmail-AccessDB/Makefile
index fd4a7a79d29e..012dfd344fe7 100644
--- a/mail/p5-Sendmail-AccessDB/Makefile
+++ b/mail/p5-Sendmail-AccessDB/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Sendmail-AccessDB
 PORTVERSION=	0.09
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Sendmail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/mail/p5-Sendmail-Milter/Makefile b/mail/p5-Sendmail-Milter/Makefile
index 35e6c04b8dd2..15f2e3c15e0d 100644
--- a/mail/p5-Sendmail-Milter/Makefile
+++ b/mail/p5-Sendmail-Milter/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Sendmail-Milter
 PORTVERSION=	0.18
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Sendmail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	marc@pilgerer.org
diff --git a/mail/p5-URI-imap/Makefile b/mail/p5-URI-imap/Makefile
index 870746dcea07..4bffa4b5836e 100644
--- a/mail/p5-URI-imap/Makefile
+++ b/mail/p5-URI-imap/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	URI-imap
 PORTVERSION=	1.01
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	URI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/mail/p5-URI-imaps/Makefile b/mail/p5-URI-imaps/Makefile
index c6df028766bf..3ce4a82ad854 100644
--- a/mail/p5-URI-imaps/Makefile
+++ b/mail/p5-URI-imaps/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	URI-imaps
 PORTVERSION=	1.01
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	URI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/mail/p5-WWW-GMail/Makefile b/mail/p5-WWW-GMail/Makefile
index ef1be894091e..6d13904f4ee8 100644
--- a/mail/p5-WWW-GMail/Makefile
+++ b/mail/p5-WWW-GMail/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-GMail
 PORTVERSION=	0.07
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	snowfly@yuntech.edu.tw
diff --git a/mail/p5-WWW-Hotmail/Makefile b/mail/p5-WWW-Hotmail/Makefile
index 3b92681bb6df..6e1a5a012837 100644
--- a/mail/p5-WWW-Hotmail/Makefile
+++ b/mail/p5-WWW-Hotmail/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-Hotmail
 PORTVERSION=	0.10
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skreuzer@exit2shell.com