46 files changed, 78 insertions, 48 deletions

diff --git a/devel/p5-CPAN-Meta-YAML/Makefile b/devel/p5-CPAN-Meta-YAML/Makefile
index 2e798763580e..673c1a310b16 100644
--- a/devel/p5-CPAN-Meta-YAML/Makefile
+++ b/devel/p5-CPAN-Meta-YAML/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	CPAN-Meta-YAML
 PORTVERSION=	0.003
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/D/DA/DAGOLDEN/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-Config-Auto/Makefile b/devel/p5-Config-Auto/Makefile
index e5835ab49ff1..578786058e72 100644
--- a/devel/p5-Config-Auto/Makefile
+++ b/devel/p5-Config-Auto/Makefile
@@ -7,7 +7,8 @@
 PORTNAME=	Config-Auto
 PORTVERSION=	0.34
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/B/BI/BINGOS
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:BINGOS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/devel/p5-Config-GitLike/Makefile b/devel/p5-Config-GitLike/Makefile
index bcdd5a519538..b986b2f26585 100644
--- a/devel/p5-Config-GitLike/Makefile
+++ b/devel/p5-Config-GitLike/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Config-GitLike
 PORTVERSION=	1.05
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/S/SP/SPANG/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:SPANG
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bapt@FreeBSD.org
diff --git a/devel/p5-Config-JFDI/Makefile b/devel/p5-Config-JFDI/Makefile
index 3cca3323737b..ff5c93ef8bc8 100644
--- a/devel/p5-Config-JFDI/Makefile
+++ b/devel/p5-Config-JFDI/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Config-JFDI
 PORTVERSION=	0.065
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/R/RO/ROKR
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:ROKR
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-Dancer-Debug/Makefile b/devel/p5-Dancer-Debug/Makefile
index 8bccd3b1a61c..482abf56794f 100644
--- a/devel/p5-Dancer-Debug/Makefile
+++ b/devel/p5-Dancer-Debug/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Dancer-Debug
 PORTVERSION=	0.03
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/F/FR/FRANCKC/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:FRANCKC
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	geistteufel@yahoo.fr
diff --git a/devel/p5-Data-Compare/Makefile b/devel/p5-Data-Compare/Makefile
index 1c02874ed08f..f79e778cb9ad 100644
--- a/devel/p5-Data-Compare/Makefile
+++ b/devel/p5-Data-Compare/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Data-Compare
 PORTVERSION=	1.2200
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/D/DC/DCANTRELL
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:DCANTRELL
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/0*$//}
 
diff --git a/devel/p5-Data-Compare/distinfo b/devel/p5-Data-Compare/distinfo
index 76b0b6beee6c..f838cd8e8d30 100644
--- a/devel/p5-Data-Compare/distinfo
+++ b/devel/p5-Data-Compare/distinfo
@@ -1,3 +1,2 @@
-MD5 (Data-Compare-1.22.tar.gz) = 7d471ce482b3a4bcc3f3d29dd23b92ce
 SHA256 (Data-Compare-1.22.tar.gz) = ce8f2c7cd8e7aad8bfa381824f43c0d2ae0ed8a21450817bbeb1d971b5c2e8af
 SIZE (Data-Compare-1.22.tar.gz) = 23483
diff --git a/devel/p5-Data-GUID/Makefile b/devel/p5-Data-GUID/Makefile
index 96a892d26334..8893231a3b31 100644
--- a/devel/p5-Data-GUID/Makefile
+++ b/devel/p5-Data-GUID/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Data-GUID
 PORTVERSION=	0.046
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/R/RJ/RJBS
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:RJBS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/devel/p5-Data-Grouper/Makefile b/devel/p5-Data-Grouper/Makefile
index a07210ea20e1..3a73b68fc0c8 100644
--- a/devel/p5-Data-Grouper/Makefile
+++ b/devel/p5-Data-Grouper/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Data-Grouper
 PORTVERSION=	0.06
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/F/FE/FERRANCE
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:FERRANCE
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-Data-Inspect/Makefile b/devel/p5-Data-Inspect/Makefile
index 6ab17256625f..cde703af8321 100644
--- a/devel/p5-Data-Inspect/Makefile
+++ b/devel/p5-Data-Inspect/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Data-Inspect
 PORTVERSION=	0.04
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/O/OW/OWL
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:OWL
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kurt.lidl@cello.com
diff --git a/devel/p5-EV/Makefile b/devel/p5-EV/Makefile
index 95b6f81af016..68db676cb4f0 100644
--- a/devel/p5-EV/Makefile
+++ b/devel/p5-EV/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	EV
 PORTVERSION=	4.03
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/M/ML/MLEHMANN
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:MLEHMANN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vovkasm@gmail.com
diff --git a/devel/p5-Every/Makefile b/devel/p5-Every/Makefile
index 4b49d5fcd0d5..684b5c980fda 100644
--- a/devel/p5-Every/Makefile
+++ b/devel/p5-Every/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Every
 PORTVERSION=	0.08
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../by-authors/id/T/TE/TEODOR
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:TEODOR
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/devel/p5-Every/distinfo b/devel/p5-Every/distinfo
index 23d3d8cd45e2..7d250f267a12 100644
--- a/devel/p5-Every/distinfo
+++ b/devel/p5-Every/distinfo
@@ -1,3 +1,2 @@
-MD5 (Every-0.08.tar.gz) = a2208f493a139c38e899bf7af0916895
 SHA256 (Every-0.08.tar.gz) = 4521c58537ab43f3d640c6f2f527227f63d718ca9b41eeba8967f90a1c21a9bc
 SIZE (Every-0.08.tar.gz) = 2615
diff --git a/devel/p5-Hash-Case/Makefile b/devel/p5-Hash-Case/Makefile
index 2e2d86496a01..75d6909ae7f7 100644
--- a/devel/p5-Hash-Case/Makefile
+++ b/devel/p5-Hash-Case/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Hash-Case
 PORTVERSION=	1.010
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/M/MA/MARKOV
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:MARKOV
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/0*$//}
 
diff --git a/devel/p5-IO-Toolkit/Makefile b/devel/p5-IO-Toolkit/Makefile
index f6b71f2f1967..62cb4c9633cd 100644
--- a/devel/p5-IO-Toolkit/Makefile
+++ b/devel/p5-IO-Toolkit/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	IO-Toolkit
 PORTVERSION=	1.008
 PORTREVISION=	1
 CATEGORIES=	devel perl5
-MASTER_SITES=	http://backpan.perl.org/authors/id/L/LI/LINMAR/${PORTNAME:S/-//}/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:LINMAR/${PORTNAME:S/-//}/
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ychsiao@ychsiao.org
diff --git a/devel/p5-IPC-Cmd/Makefile b/devel/p5-IPC-Cmd/Makefile
index e3b53cd68386..c5405eb1159c 100644
--- a/devel/p5-IPC-Cmd/Makefile
+++ b/devel/p5-IPC-Cmd/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	IPC-Cmd
 PORTVERSION=	0.70
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/B/BI/BINGOS
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:BINGOS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/devel/p5-Log-Message/Makefile b/devel/p5-Log-Message/Makefile
index e0a7123f8a01..59119ed4915c 100644
--- a/devel/p5-Log-Message/Makefile
+++ b/devel/p5-Log-Message/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Log-Message
 PORTVERSION=	0.04
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/B/BI/BINGOS
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:BINGOS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-Log-Report/Makefile b/devel/p5-Log-Report/Makefile
index 5924c898c670..f503fd75ae33 100644
--- a/devel/p5-Log-Report/Makefile
+++ b/devel/p5-Log-Report/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Log-Report
 PORTVERSION=	0.92
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/M/MA/MARKOV
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:MARKOV
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/devel/p5-Module-Pluggable-Fast/Makefile b/devel/p5-Module-Pluggable-Fast/Makefile
index e938901b06b8..6e28e92986f5 100644
--- a/devel/p5-Module-Pluggable-Fast/Makefile
+++ b/devel/p5-Module-Pluggable-Fast/Makefile
@@ -9,7 +9,8 @@
 PORTNAME=	Module-Pluggable-Fast
 PORTVERSION=	0.19
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/M/MR/MRAMBERG
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:MRAMBERG
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-MooseX-Aliases/Makefile b/devel/p5-MooseX-Aliases/Makefile
index c3391816cf1f..e1b7ffc3089c 100644
--- a/devel/p5-MooseX-Aliases/Makefile
+++ b/devel/p5-MooseX-Aliases/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	MooseX-Aliases
 PORTVERSION=	0.09
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/D/DO/DOY
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:DOY
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/devel/p5-MooseX-Role-WithOverloading/Makefile b/devel/p5-MooseX-Role-WithOverloading/Makefile
index 964e91243e84..3ed94dde3fe8 100644
--- a/devel/p5-MooseX-Role-WithOverloading/Makefile
+++ b/devel/p5-MooseX-Role-WithOverloading/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	MooseX-Role-WithOverloading
 PORTVERSION=	0.09
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/F/FL/FLORA/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:FLORA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-Parallel-Prefork/Makefile b/devel/p5-Parallel-Prefork/Makefile
index 0ccd42932392..9104aacff692 100644
--- a/devel/p5-Parallel-Prefork/Makefile
+++ b/devel/p5-Parallel-Prefork/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Parallel-Prefork
 PORTVERSION=	0.11
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/K/KA/KAZUHO
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:KAZUHO
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/devel/p5-Parse-CPAN-Meta/Makefile b/devel/p5-Parse-CPAN-Meta/Makefile
index 0b40135497ae..5be67bcb3c24 100644
--- a/devel/p5-Parse-CPAN-Meta/Makefile
+++ b/devel/p5-Parse-CPAN-Meta/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Parse-CPAN-Meta
 PORTVERSION=	1.44.01
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/D/DA/DAGOLDEN/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
diff --git a/devel/p5-Parse-RecDescent/Makefile b/devel/p5-Parse-RecDescent/Makefile
index 7095f5e9f2f3..46c099667949 100644
--- a/devel/p5-Parse-RecDescent/Makefile
+++ b/devel/p5-Parse-RecDescent/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Parse-RecDescent
 PORTVERSION=	1.965.001
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/D/DC/DCONWAY
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:DCONWAY
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(...)$/\1/}
 
diff --git a/devel/p5-Parse-RecDescent/distinfo b/devel/p5-Parse-RecDescent/distinfo
index 1cc3a9858592..ee60e6813b2f 100644
--- a/devel/p5-Parse-RecDescent/distinfo
+++ b/devel/p5-Parse-RecDescent/distinfo
@@ -1,3 +1,2 @@
-MD5 (Parse-RecDescent-1.965001.tar.gz) = e91351ad179a3843fbe8e521b135acaf
 SHA256 (Parse-RecDescent-1.965001.tar.gz) = 00fa63039b062452d675712e58f0311d7323377af3cdd0fdccb1ecfe64b68d64
 SIZE (Parse-RecDescent-1.965001.tar.gz) = 154813
diff --git a/devel/p5-SSN-Validate/Makefile b/devel/p5-SSN-Validate/Makefile
index 961ac393a425..2bfbe3ba2b12 100644
--- a/devel/p5-SSN-Validate/Makefile
+++ b/devel/p5-SSN-Validate/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	SSN-Validate
 PORTVERSION=	0.18
 PORTREVISION=	1
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/K/KM/KMELTZ
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:KMELTZ
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-ShipIt/Makefile b/devel/p5-ShipIt/Makefile
index 8e9b757cfe82..89aff980bb57 100644
--- a/devel/p5-ShipIt/Makefile
+++ b/devel/p5-ShipIt/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	ShipIt
 PORTVERSION=	0.55
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/B/BR/BRADFITZ
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:BRADFITZ
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-Test-Command-Simple/Makefile b/devel/p5-Test-Command-Simple/Makefile
index b792d706c625..77fda59a09e6 100644
--- a/devel/p5-Test-Command-Simple/Makefile
+++ b/devel/p5-Test-Command-Simple/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Test-Command-Simple
 PORTVERSION=	0.03
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/D/DM/DMCBRIDE
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:DMCBRIDE
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/devel/p5-Test-Mini-Unit/Makefile b/devel/p5-Test-Mini-Unit/Makefile
index 201caa2cd106..4b5767f272df 100644
--- a/devel/p5-Test-Mini-Unit/Makefile
+++ b/devel/p5-Test-Mini-Unit/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Test-Mini-Unit
 PORTVERSION=	v1.0.3
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/P/PV/PVANDE
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:PVANDE
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kurt.lidl@cello.com
diff --git a/devel/p5-Test-Mini-Unit/distinfo b/devel/p5-Test-Mini-Unit/distinfo
index e291208f49dd..c4c12be6de7d 100644
--- a/devel/p5-Test-Mini-Unit/distinfo
+++ b/devel/p5-Test-Mini-Unit/distinfo
@@ -1,4 +1,2 @@
-SHA256 (Test-Mini-Unit-v1.0.1.tar.gz) = deceb39636b870a7a101e318636f3e79255f8e3e948456e21505e773a0a35844
-SIZE (Test-Mini-Unit-v1.0.1.tar.gz) = 11141
 SHA256 (Test-Mini-Unit-v1.0.3.tar.gz) = b9011ef48161afdde5bd882a8323e3650ee27bf6ea9fd1492621502088075dac
 SIZE (Test-Mini-Unit-v1.0.3.tar.gz) = 11363
diff --git a/devel/p5-Test-Mini/Makefile b/devel/p5-Test-Mini/Makefile
index 4ef42aea577f..37796508a0c0 100644
--- a/devel/p5-Test-Mini/Makefile
+++ b/devel/p5-Test-Mini/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Test-Mini
 PORTVERSION=	v1.1.3
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/P/PV/PVANDE
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:PVANDE
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kurt.lidl@cello.com
diff --git a/devel/p5-Test-Module-Used/Makefile b/devel/p5-Test-Module-Used/Makefile
index 3045318a3c66..639fca4630a8 100644
--- a/devel/p5-Test-Module-Used/Makefile
+++ b/devel/p5-Test-Module-Used/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Test-Module-Used
 PORTVERSION=	0.2.3
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/T/TS/TSUCCHI
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:TSUCCHI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tsucchi@cpan.org
diff --git a/devel/p5-Test-Simple/Makefile b/devel/p5-Test-Simple/Makefile
index 49981e34c3c5..3f29c18eee90 100644
--- a/devel/p5-Test-Simple/Makefile
+++ b/devel/p5-Test-Simple/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Test-Simple
 PORTVERSION=	0.98
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/M/MS/MSCHWERN
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:MSCHWERN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-Test-WWW-Mechanize/Makefile b/devel/p5-Test-WWW-Mechanize/Makefile
index 216916fe571d..0f29c916df3c 100644
--- a/devel/p5-Test-WWW-Mechanize/Makefile
+++ b/devel/p5-Test-WWW-Mechanize/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Test-WWW-Mechanize
 PORTVERSION=	1.30
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/P/PE/PETDANCE
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:PETDANCE
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-Text-Outdent/Makefile b/devel/p5-Text-Outdent/Makefile
index 09a31f1a7504..8cb4b8c24ec5 100644
--- a/devel/p5-Text-Outdent/Makefile
+++ b/devel/p5-Text-Outdent/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Text-Outdent
 PORTVERSION=	0.01
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/L/LO/LODIN
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:LODIN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kurt.lidl@cello.com
diff --git a/devel/p5-TheSchwartz-Simple/Makefile b/devel/p5-TheSchwartz-Simple/Makefile
index 4d5a9f43c7b6..001291cb56d5 100644
--- a/devel/p5-TheSchwartz-Simple/Makefile
+++ b/devel/p5-TheSchwartz-Simple/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	TheSchwartz-Simple
 PORTVERSION=	0.05
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/M/MI/MIYAGAWA
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-TheSchwartz-Worker-SendEmail/Makefile b/devel/p5-TheSchwartz-Worker-SendEmail/Makefile
index 0b6cacf9cbc7..b577909aea76 100644
--- a/devel/p5-TheSchwartz-Worker-SendEmail/Makefile
+++ b/devel/p5-TheSchwartz-Worker-SendEmail/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	TheSchwartz-Worker-SendEmail
 PORTVERSION=	1.00
 PORTREVISION=	2
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/B/BR/BRADFITZ
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:BRADFITZ
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-TheSchwartz/Makefile b/devel/p5-TheSchwartz/Makefile
index 1c7ea5a249d9..7db5c3ec6909 100644
--- a/devel/p5-TheSchwartz/Makefile
+++ b/devel/p5-TheSchwartz/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	TheSchwartz
 PORTVERSION=	1.10
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/S/SI/SIXAPART
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:SIXAPART
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-Tie-iCal/Makefile b/devel/p5-Tie-iCal/Makefile
index f4de4bb3bc21..4aeed1feb261 100644
--- a/devel/p5-Tie-iCal/Makefile
+++ b/devel/p5-Tie-iCal/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Tie-iCal
 PORTVERSION=	0.14
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/B/BS/BSDZ/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:BSDZ
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kaoru@kaisei.org
diff --git a/devel/p5-Tie-iCal/distinfo b/devel/p5-Tie-iCal/distinfo
index 445e99161f5a..cef3ffbbe9fe 100644
--- a/devel/p5-Tie-iCal/distinfo
+++ b/devel/p5-Tie-iCal/distinfo
@@ -1,3 +1,2 @@
-MD5 (Tie-iCal-0.14.tar.gz) = 50651bb626e22b360c17b6366aa7dbf8
 SHA256 (Tie-iCal-0.14.tar.gz) = 97bb81aed07ebee989479392035f58670915f39344dcf6f9e9b95b426794397d
 SIZE (Tie-iCal-0.14.tar.gz) = 14944
diff --git a/devel/p5-UDCode/Makefile b/devel/p5-UDCode/Makefile
index 2276a4d3f764..b0c45e6ced37 100644
--- a/devel/p5-UDCode/Makefile
+++ b/devel/p5-UDCode/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	UDCode
 PORTVERSION=	1.03
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/M/MJ/MJD
-MASTER_SITE_SUBDIR=	UDCode
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:MJD
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/devel/p5-UDCode/distinfo b/devel/p5-UDCode/distinfo
index 23aee63887e1..caa91013570c 100644
--- a/devel/p5-UDCode/distinfo
+++ b/devel/p5-UDCode/distinfo
@@ -1,3 +1,2 @@
-MD5 (UDCode-1.03.tar.gz) = d315ac48c15786094bc2e3b65fce40bb
 SHA256 (UDCode-1.03.tar.gz) = 7b3cf541584ac8a6a1af33f1bf9afc9c929582827f263354c6f0f3dfd2f9c05e
 SIZE (UDCode-1.03.tar.gz) = 2968
diff --git a/devel/p5-Uniq/Makefile b/devel/p5-Uniq/Makefile
index 70659346b9fd..4f5513c4c036 100644
--- a/devel/p5-Uniq/Makefile
+++ b/devel/p5-Uniq/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Uniq
 PORTVERSION=	0.01
 CATEGORIES=	devel
-MASTER_SITES=	CPAN/../by-authors/id/S/SY/SYAMAL
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:SYAMAL
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/devel/p5-Uniq/distinfo b/devel/p5-Uniq/distinfo
index b868327b36a6..0bb5c90e6bb2 100644
--- a/devel/p5-Uniq/distinfo
+++ b/devel/p5-Uniq/distinfo
@@ -1,3 +1,2 @@
-MD5 (Uniq-0.01.tar.gz) = 56a8be4e65ed8ab11645c4155c44f4ae
 SHA256 (Uniq-0.01.tar.gz) = 48b62a59c5cd92143ba08df8e69ddfba8ca49c29069587ccbd0b9eaccb5ee38c
 SIZE (Uniq-0.01.tar.gz) = 2449
diff --git a/devel/p5-threads-shared/Makefile b/devel/p5-threads-shared/Makefile
index 8eded6ff8d2e..da32c93942b9 100644
--- a/devel/p5-threads-shared/Makefile
+++ b/devel/p5-threads-shared/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	threads-shared
 PORTVERSION=	1.34
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/J/JD/JDHEDDEN
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:JDHEDDEN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ruben@verweg.com
diff --git a/devel/p5-threads/Makefile b/devel/p5-threads/Makefile
index faf9d5e0b967..b95e25fe0827 100644
--- a/devel/p5-threads/Makefile
+++ b/devel/p5-threads/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	threads
 PORTVERSION=	1.83
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/J/JD/JDHEDDEN
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:JDHEDDEN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org