- Replace ../../authors in MASTER_SITE_SUBDIR with CPAN:CPANID macro.

  See http://wiki.freebsd.org/Perl for details.
- Change maintainership from ports@ to perl@ for ports in this changeset.
- Remove MD5 checksum
- Utilize CPAN macro

134 files changed, 236 insertions, 152 deletions

diff --git a/audio/pm3umpdl/Makefile b/audio/pm3umpdl/Makefile
index 2c154d40b7cc..a9f903fbd802 100644
--- a/audio/pm3umpdl/Makefile
+++ b/audio/pm3umpdl/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	pm3umpdl
 PORTVERSION=	1.0.0
 CATEGORIES=	audio deskutils
-MASTER_SITES=	http://cpan.org/authors/id/V/VV/VVELOX/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:VVELOX
 EXTRACT_SUFX=
 EXTRACT_ONLY=
 
diff --git a/converters/p5-Encode-Locale/Makefile b/converters/p5-Encode-Locale/Makefile
index 83cb073c56fb..d7cd0d937e8d 100644
--- a/converters/p5-Encode-Locale/Makefile
+++ b/converters/p5-Encode-Locale/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Encode-Locale
 PORTVERSION=	1.02
 CATEGORIES=	converters perl5
-MASTER_SITES=	CPAN/../../authors/id/G/GA/GAAS
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:GAAS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	amdmi3@FreeBSD.org
diff --git a/converters/p5-Encoding-FixLatin/Makefile b/converters/p5-Encoding-FixLatin/Makefile
index f0feb1fbf4ac..1689b2b52b24 100644
--- a/converters/p5-Encoding-FixLatin/Makefile
+++ b/converters/p5-Encoding-FixLatin/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Encoding-FixLatin
 PORTVERSION=	1.02
 CATEGORIES=	converters perl5
-MASTER_SITES=	CPAN/../../authors/id/G/GR/GRANTM
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:GRANTM
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/converters/p5-String-Multibyte/Makefile b/converters/p5-String-Multibyte/Makefile
index 33eb5c164bfd..ede2edf6d909 100644
--- a/converters/p5-String-Multibyte/Makefile
+++ b/converters/p5-String-Multibyte/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	String-Multibyte
 PORTVERSION=	1.06
 CATEGORIES=	converters perl5
-MASTER_SITES=	CPAN/../../authors/id/S/SA/SADAHIRO
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:SADAHIRO
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/databases/p5-AnyEvent-Redis/Makefile b/databases/p5-AnyEvent-Redis/Makefile
index bb03ef3cb8fd..6bf9126f8b06 100644
--- a/databases/p5-AnyEvent-Redis/Makefile
+++ b/databases/p5-AnyEvent-Redis/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	AnyEvent-Redis
 PORTVERSION=	0.23
 CATEGORIES=	databases perl5
-MASTER_SITES=	CPAN/../../authors/id/D/DG/DGL
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:DGL
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/databases/p5-DBICx-TestDatabase/Makefile b/databases/p5-DBICx-TestDatabase/Makefile
index a60eda516bb1..4758bc7aaff3 100644
--- a/databases/p5-DBICx-TestDatabase/Makefile
+++ b/databases/p5-DBICx-TestDatabase/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	DBICx-TestDatabase
 PORTVERSION=	0.04
 CATEGORIES=	databases perl5
-MASTER_SITES=	CPAN/../../authors/id/J/JR/JROCKWAY/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:JROCKWAY
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	miwi@FreeBSD.org
diff --git a/databases/p5-GraphViz-DBI/Makefile b/databases/p5-GraphViz-DBI/Makefile
index 4c2d0ea12d6c..fac46f9d0431 100644
--- a/databases/p5-GraphViz-DBI/Makefile
+++ b/databases/p5-GraphViz-DBI/Makefile
@@ -8,9 +8,11 @@
 PORTNAME=	GraphViz-DBI
 PORTVERSION=	1.100860
 CATEGORIES=	databases perl5
-MASTER_SITES=	CPAN/../../authors/id/M/MA/MARCEL
+MASTER_SITES=	CPAN
+MASTER_SITES_SUBDIR=	CPAN:MARCEL
 PKGNAMEPREFIX=	p5-
 
+# Note: DEPRECATION candidate.
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	GraphViz::DBI - graph database tables and relations
 
diff --git a/databases/p5-PostgreSQL-PLPerl-Call/Makefile b/databases/p5-PostgreSQL-PLPerl-Call/Makefile
index a00389af2ca6..f3f0562b3b53 100644
--- a/databases/p5-PostgreSQL-PLPerl-Call/Makefile
+++ b/databases/p5-PostgreSQL-PLPerl-Call/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	PostgreSQL-PLPerl-Call
 PORTVERSION=	1.006
 CATEGORIES=	databases perl5
-MASTER_SITES=	CPAN/../../authors/id/T/TI/TIMB/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:TIMB
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/databases/p5-PostgreSQL-PLPerl-Trace/Makefile b/databases/p5-PostgreSQL-PLPerl-Trace/Makefile
index a833499814d3..a79bd2ca7b91 100644
--- a/databases/p5-PostgreSQL-PLPerl-Trace/Makefile
+++ b/databases/p5-PostgreSQL-PLPerl-Trace/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	PostgreSQL-PLPerl-Trace
 PORTVERSION=	1.001
 CATEGORIES=	databases perl5
-MASTER_SITES=	CPAN/../../authors/id/T/TI/TIMB/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:TIMB
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/databases/p5-Redis-hiredis/Makefile b/databases/p5-Redis-hiredis/Makefile
index 6630e4a29a53..c99fa656313e 100644
--- a/databases/p5-Redis-hiredis/Makefile
+++ b/databases/p5-Redis-hiredis/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Redis-hiredis
 PORTVERSION=	0.9.2.5
 CATEGORIES=	databases perl5
-MASTER_SITES=	CPAN/../../authors/id/N/NE/NEOPHENIX
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:NEOPHENIX
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	magik@roorback.net
diff --git a/databases/p5-Redis/Makefile b/databases/p5-Redis/Makefile
index 47d9ee5d2480..c55123118eb5 100644
--- a/databases/p5-Redis/Makefile
+++ b/databases/p5-Redis/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Redis
 PORTVERSION=	1.9030
 CATEGORIES=	databases perl5
-MASTER_SITES=	CPAN/../../authors/id/M/ME/MELO
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:MELO
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/0$//}
 
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
diff --git a/dns/p5-BIND-Config-Parser/Makefile b/dns/p5-BIND-Config-Parser/Makefile
index 11195c2f512d..c529d0db6c09 100644
--- a/dns/p5-BIND-Config-Parser/Makefile
+++ b/dns/p5-BIND-Config-Parser/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	BIND-Config-Parser
 PORTVERSION=	0.01
 CATEGORIES=	dns perl5
-MASTER_SITES=	CPAN/../../authors/id/M/MA/MATTD
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:MATTD
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/dns/p5-Data-Validate-Domain/Makefile b/dns/p5-Data-Validate-Domain/Makefile
index 6bebd3f7be45..57c03d5fd649 100644
--- a/dns/p5-Data-Validate-Domain/Makefile
+++ b/dns/p5-Data-Validate-Domain/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Data-Validate-Domain
 PORTVERSION=	0.10
 CATEGORIES=	dns perl5
-MASTER_SITES=	CPAN/../../authors/id/N/NE/NEELY
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:NEELY
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/dns/p5-Net-DNS-TestNS/Makefile b/dns/p5-Net-DNS-TestNS/Makefile
index d253703a7efb..e76cc0b26113 100644
--- a/dns/p5-Net-DNS-TestNS/Makefile
+++ b/dns/p5-Net-DNS-TestNS/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Net-DNS-TestNS
 PORTVERSION=	1.10
 CATEGORIES=	dns perl5
-MASTER_SITES=	CPAN/../../authors/id/O/OL/OLAF/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:OLAF
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/finance/p5-Business-OnlinePayment/Makefile b/finance/p5-Business-OnlinePayment/Makefile
index d16d38612b61..a086c728fb72 100644
--- a/finance/p5-Business-OnlinePayment/Makefile
+++ b/finance/p5-Business-OnlinePayment/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	Business-OnlinePayment
 PORTVERSION=	3.00
 PORTREVISION=	1
 CATEGORIES=	finance perl5
-MASTER_SITES=	CPAN/../by-authors/id/I/IV/IVAN/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:IVAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION}_08
 
diff --git a/graphics/eps2png/Makefile b/graphics/eps2png/Makefile
index 819cf1b3e516..c5ca44798ec6 100644
--- a/graphics/eps2png/Makefile
+++ b/graphics/eps2png/Makefile
@@ -9,9 +9,10 @@ PORTNAME=	eps2png
 PORTVERSION=	2.7
 PORTREVISION=	3
 CATEGORIES=	graphics
-MASTER_SITES=	CPAN/../../authors/id/J/JV/JV
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:JV
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Converts EPS images to PNG
 
 USE_GHOSTSCRIPT=	yes
diff --git a/graphics/eps2png/distinfo b/graphics/eps2png/distinfo
index 3c18a2271f36..f75b79f8fd7f 100644
--- a/graphics/eps2png/distinfo
+++ b/graphics/eps2png/distinfo
@@ -1,3 +1,2 @@
-MD5 (eps2png-2.7.tar.gz) = e5360a8a5c1ac59f78cb7a2295ee84d4
 SHA256 (eps2png-2.7.tar.gz) = 42210eaf10892addd02171a9d9c22c34af73c1a4564dfb8d125adc2c2a517cd8
 SIZE (eps2png-2.7.tar.gz) = 18768
diff --git a/graphics/p5-Captcha-reCAPTCHA/Makefile b/graphics/p5-Captcha-reCAPTCHA/Makefile
index aa8143d04886..5af1d58a115d 100644
--- a/graphics/p5-Captcha-reCAPTCHA/Makefile
+++ b/graphics/p5-Captcha-reCAPTCHA/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Captcha-reCAPTCHA
 PORTVERSION=	0.94
 CATEGORIES=	graphics perl5
-MASTER_SITES=	CPAN/../by-authors/id/A/AN/ANDYA
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:ANDYA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/graphics/p5-Graphics-Primitive/Makefile b/graphics/p5-Graphics-Primitive/Makefile
index db48411283b2..37c1d7c6f334 100644
--- a/graphics/p5-Graphics-Primitive/Makefile
+++ b/graphics/p5-Graphics-Primitive/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Graphics-Primitive
 PORTVERSION=	0.61
 CATEGORIES=	graphics perl5
-MASTER_SITES=	CPAN/../by-authors/id/G/GP/GPHAT
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:GPHAT
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/lang/p5-Tcl/Makefile b/lang/p5-Tcl/Makefile
index f404627c5161..dd40bc129119 100644
--- a/lang/p5-Tcl/Makefile
+++ b/lang/p5-Tcl/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Tcl
 PORTVERSION=	1.02
 CATEGORIES=	lang perl5
-MASTER_SITES=	CPAN/../../authors/id/V/VK/VKON/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:VKON
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/lang/p5-Try-Tiny/Makefile b/lang/p5-Try-Tiny/Makefile
index 33178a60d953..a0e017ba143f 100644
--- a/lang/p5-Try-Tiny/Makefile
+++ b/lang/p5-Try-Tiny/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Try-Tiny
 PORTVERSION=	0.09
 CATEGORIES=	lang 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/mail/p5-CGP-CLI/Makefile b/mail/p5-CGP-CLI/Makefile
index 3c323cc786da..67feb9b0343c 100644
--- a/mail/p5-CGP-CLI/Makefile
+++ b/mail/p5-CGP-CLI/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	CGP-CLI
 PORTVERSION=	2.7.5
 CATEGORIES=	mail perl5
-MASTER_SITES=	http://ftp.spbu.ru/CPAN/authors/id/J/JB/JBUHACOFF/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:JBUHACOFF
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	avk@vl.ru
diff --git a/mail/p5-CGP-CLI/distinfo b/mail/p5-CGP-CLI/distinfo
index b4309e6cd412..959647191376 100644
--- a/mail/p5-CGP-CLI/distinfo
+++ b/mail/p5-CGP-CLI/distinfo
@@ -1,3 +1,2 @@
-MD5 (CGP-CLI-2.7.5.tar.gz) = f70f259a27df5f422a0575ff31b25df9
 SHA256 (CGP-CLI-2.7.5.tar.gz) = 83607b8c193d26eb2d0a2c1671f030ce2b48520c7f6ac381a98116c220f2249a
 SIZE (CGP-CLI-2.7.5.tar.gz) = 14111
diff --git a/mail/p5-Mail-Box/Makefile b/mail/p5-Mail-Box/Makefile
index baf780de5540..050e4807d586 100644
--- a/mail/p5-Mail-Box/Makefile
+++ b/mail/p5-Mail-Box/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Mail-Box
 PORTVERSION=	2.097
 CATEGORIES=	mail perl5
-MASTER_SITES=	CPAN/../../authors/id/M/MA/MARKOV
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:MARKOV
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/mail/p5-Net-IMAP-Simple/Makefile b/mail/p5-Net-IMAP-Simple/Makefile
index 976b0b719c7d..1e8a7f5222d8 100644
--- a/mail/p5-Net-IMAP-Simple/Makefile
+++ b/mail/p5-Net-IMAP-Simple/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Net-IMAP-Simple
 PORTVERSION=	1.2022
 CATEGORIES=	mail perl5
-MASTER_SITES=	CPAN/../by-authors/id/J/JE/JETTERO
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:JETTERO
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/mail/p5-Net-Server-Mail/Makefile b/mail/p5-Net-Server-Mail/Makefile
index 42f15d0b70ac..beeb75fef176 100644
--- a/mail/p5-Net-Server-Mail/Makefile
+++ b/mail/p5-Net-Server-Mail/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Net-Server-Mail
 PORTVERSION=	0.17
 CATEGORIES=	mail perl5
-MASTER_SITES=	http://cpan.org/authors/id/G/GU/GUIMARD/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:GUIMARD
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vvelox@vvelox.net
diff --git a/mail/p5-Net-Server-Mail/distinfo b/mail/p5-Net-Server-Mail/distinfo
index cc549a3147f8..33cd4aa2cb6b 100644
--- a/mail/p5-Net-Server-Mail/distinfo
+++ b/mail/p5-Net-Server-Mail/distinfo
@@ -1,3 +1,2 @@
-MD5 (Net-Server-Mail-0.17.tar.gz) = 5d3b559f48e764bfd26d5af3643ed651
 SHA256 (Net-Server-Mail-0.17.tar.gz) = 3ed151e4f3f67f6dabec287753b08edb85f26476c9f6e607b3784fdd5a981015
 SIZE (Net-Server-Mail-0.17.tar.gz) = 16017
diff --git a/mail/p5-vpopmail/Makefile b/mail/p5-vpopmail/Makefile
index c8706ae9d8ca..735eae15bb53 100644
--- a/mail/p5-vpopmail/Makefile
+++ b/mail/p5-vpopmail/Makefile
@@ -8,9 +8,8 @@
 PORTNAME=	vpopmail
 PORTVERSION=	0.08
 CATEGORIES=	mail perl5
-MASTER_SITES=	http://www.cpan.dk/CPAN/modules/by-authors/id/S/SS/SSCANLON/ \
-		ftp://ftp.funet.fi/pub/languages/perl/CPAN/modules/by-authors/id/S/SS/SSCANLON/ \
-		ftp://ftp.cpan.org/pub/CPAN/modules/by-authors/id/S/SS/SSCANLON/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:SSCANLON
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	james@now.ie
diff --git a/mail/p5-vpopmail/distinfo b/mail/p5-vpopmail/distinfo
index 63958be81fca..b46bee184a1a 100644
--- a/mail/p5-vpopmail/distinfo
+++ b/mail/p5-vpopmail/distinfo
@@ -1,3 +1,2 @@
-MD5 (vpopmail-0.08.tar.gz) = dba795cffc27eb9be4b7bc9cc7ac5471
 SHA256 (vpopmail-0.08.tar.gz) = c616487ebeb7ebf47207bdd66e0bc4fcd01a88092ddb68936d0a1a335329247d
 SIZE (vpopmail-0.08.tar.gz) = 13798
diff --git a/mail/qar-bufo/Makefile b/mail/qar-bufo/Makefile
index 7e59f25f2c8d..eaf58208a51b 100644
--- a/mail/qar-bufo/Makefile
+++ b/mail/qar-bufo/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	qar-bufo
 PORTVERSION=	1.3.1
 CATEGORIES=	mail
-MASTER_SITES=	http://cpan.org/authors/id/M/MW/MWCZANECB/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:MWCZANECB
 EXTRACT_SUFX=
 EXTRACT_ONLY=
 
diff --git a/mail/qar-bufo/distinfo b/mail/qar-bufo/distinfo
index 313dde41feb1..6d38145998b5 100644
--- a/mail/qar-bufo/distinfo
+++ b/mail/qar-bufo/distinfo
@@ -1,3 +1,2 @@
-MD5 (qar-bufo-1.3.1) = a68cb5a72a026033fdce9fe2e983e483
 SHA256 (qar-bufo-1.3.1) = 6fa008ab90beef8342978e667a834d0856e750a4fa930495ae9e5041f511c7e0
 SIZE (qar-bufo-1.3.1) = 16079
diff --git a/mail/zms/Makefile b/mail/zms/Makefile
index 3bf5424ef4fd..377be4aa5890 100644
--- a/mail/zms/Makefile
+++ b/mail/zms/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	zms
 PORTVERSION=	1.7.0
 PORTREVISION=	1
 CATEGORIES=	mail
-MASTER_SITES=	http://cpan.org/authors/id/V/VV/VVELOX/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:VVELOX
 DISTNAME=	${PORTNAME}-${PORTVERSION}.pl
 EXTRACT_SUFX=
 EXTRACT_ONLY=
diff --git a/mail/zms/distinfo b/mail/zms/distinfo
index 9e6e8d3dc11a..06aada197878 100644
--- a/mail/zms/distinfo
+++ b/mail/zms/distinfo
@@ -1,3 +1,2 @@
-MD5 (zms-1.7.0.pl) = d9b5bde27d4d50f2b8398ea9fc3426e1
 SHA256 (zms-1.7.0.pl) = be53f4df4ea50fdb6b396fefe7a36d8a4592bdfe25eae4a54dfd5c5c15bcd275
 SIZE (zms-1.7.0.pl) = 57505
diff --git a/math/p5-Algorithm-Combinatorics/Makefile b/math/p5-Algorithm-Combinatorics/Makefile
index 096c7f406dc6..998ad157ec7e 100644
--- a/math/p5-Algorithm-Combinatorics/Makefile
+++ b/math/p5-Algorithm-Combinatorics/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Algorithm-Combinatorics
 PORTVERSION=	0.26
 CATEGORIES=	math perl5
-MASTER_SITES=	CPAN/../../authors/id/F/FX/FXN
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:FXN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/math/p5-Algorithm-KMeans/Makefile b/math/p5-Algorithm-KMeans/Makefile
index be05ac7df3ec..55ca1d0a1eae 100644
--- a/math/p5-Algorithm-KMeans/Makefile
+++ b/math/p5-Algorithm-KMeans/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Algorithm-KMeans
 PORTVERSION=	1.21
 CATEGORIES=	math perl5
-MASTER_SITES=	CPAN/../../authors/id/A/AV/AVIKAK/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:AVIKAK
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/math/p5-GIS-Distance-Fast/Makefile b/math/p5-GIS-Distance-Fast/Makefile
index b4d5ddafd2a0..8f922f30d98d 100644
--- a/math/p5-GIS-Distance-Fast/Makefile
+++ b/math/p5-GIS-Distance-Fast/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	GIS-Distance-Fast
 PORTVERSION=	0.06
 CATEGORIES=	math perl5
-MASTER_SITES=	CPAN/../../authors/id/B/BL/BLUEFEET
-MASTER_SITE_SUBDIR=	GIS
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:BLUEFEET
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/math/p5-Math-ConvexHull/Makefile b/math/p5-Math-ConvexHull/Makefile
index 1d8248cbadcd..665ad3b22f93 100644
--- a/math/p5-Math-ConvexHull/Makefile
+++ b/math/p5-Math-ConvexHull/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Math-ConvexHull
 PORTVERSION=	1.04
 CATEGORIES=	math perl5
-MASTER_SITES=	CPAN/../../authors/id/S/SM/SMUELLER
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:SMUELLER
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/math/p5-Math-Polygon-Tree/Makefile b/math/p5-Math-Polygon-Tree/Makefile
index b6695c99bdff..473a6469e649 100644
--- a/math/p5-Math-Polygon-Tree/Makefile
+++ b/math/p5-Math-Polygon-Tree/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Math-Polygon-Tree
 PORTVERSION=	0.041
 CATEGORIES=	math perl5
-MASTER_SITES=	CPAN/../../authors/id/L/LI/LIOSHA
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:LIOSHA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	amdmi3@FreeBSD.org
diff --git a/math/p5-Math-Random-MT-Auto/Makefile b/math/p5-Math-Random-MT-Auto/Makefile
index eff7ac225fb2..6ea7ecdb2daf 100644
--- a/math/p5-Math-Random-MT-Auto/Makefile
+++ b/math/p5-Math-Random-MT-Auto/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	Math-Random-MT-Auto
 PORTVERSION=	6.16
 CATEGORIES=	math perl5
-MASTER_SITES=	CPAN/../../authors/id/J/JD/JDHEDDEN
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:JDHEDDEN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/math/p5-Math-Symbolic/Makefile b/math/p5-Math-Symbolic/Makefile
index b741dd6b0a78..64acc09bee07 100644
--- a/math/p5-Math-Symbolic/Makefile
+++ b/math/p5-Math-Symbolic/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Math-Symbolic
 PORTVERSION=	0.606
 CATEGORIES=	math perl5
-MASTER_SITES=	CPAN/../../authors/id/S/SM/SMUELLER
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:SMUELLER
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/misc/p5-Geography-NationalGrid-TW/Makefile b/misc/p5-Geography-NationalGrid-TW/Makefile
index 40b6010ab84a..10c7c2a6701e 100644
--- a/misc/p5-Geography-NationalGrid-TW/Makefile
+++ b/misc/p5-Geography-NationalGrid-TW/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Geography-NationalGrid-TW
 PORTVERSION=	0.08
 CATEGORIES=	misc perl5 geography
-MASTER_SITES=	CPAN/../../authors/id/L/LE/LEEYM
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:LEEYM
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/net-mgmt/p5-Nagios-Plugin/Makefile b/net-mgmt/p5-Nagios-Plugin/Makefile
index 2613fb9f250b..6e12ba6b28f6 100644
--- a/net-mgmt/p5-Nagios-Plugin/Makefile
+++ b/net-mgmt/p5-Nagios-Plugin/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Nagios-Plugin
 PORTVERSION=	0.34
 CATEGORIES=	net-mgmt perl5
-MASTER_SITES=	CPAN/../../authors/id/T/TO/TONVOON
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:TONVOON
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gerrit.beine@gmx.de
diff --git a/net-mgmt/p5-Net-SNMP-Util/Makefile b/net-mgmt/p5-Net-SNMP-Util/Makefile
index 22bc4e25d5f6..801c897f82ab 100644
--- a/net-mgmt/p5-Net-SNMP-Util/Makefile
+++ b/net-mgmt/p5-Net-SNMP-Util/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Net-SNMP-Util
 PORTVERSION=	1.04
 CATEGORIES=	net-mgmt perl5
-MASTER_SITES=	CPAN/../../authors/id/T/TO/TONODERA
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:TONODERA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hhyou@cs.nctu.edu.tw
diff --git a/net-mgmt/p5-Net-SNMP/Makefile b/net-mgmt/p5-Net-SNMP/Makefile
index d38e47d24b32..c74b4ea8fdc3 100644
--- a/net-mgmt/p5-Net-SNMP/Makefile
+++ b/net-mgmt/p5-Net-SNMP/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Net-SNMP
 PORTVERSION=	6.0.1
 CATEGORIES=	net-mgmt perl5
-MASTER_SITES=	CPAN/../../authors/id/D/DT/DTOWN
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:DTOWN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
 
diff --git a/net-p2p/p5-pdonkey/Makefile b/net-p2p/p5-pdonkey/Makefile
index 77a357b1b2ea..c07415246f61 100644
--- a/net-p2p/p5-pdonkey/Makefile
+++ b/net-p2p/p5-pdonkey/Makefile
@@ -9,8 +9,8 @@
 PORTNAME=	pdonkey
 PORTVERSION=	0.05
 CATEGORIES=	net-p2p perl5
-MASTER_SITES=	CPAN/../../authors/id/K/KL/KLIMKIN \
-		SF
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:KLIMKIN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	P2P-pDonkey-${PORTVERSION}
 
diff --git a/net-p2p/p5-pdonkey/distinfo b/net-p2p/p5-pdonkey/distinfo
index 80f7b07e0572..bc530753ce1c 100644
--- a/net-p2p/p5-pdonkey/distinfo
+++ b/net-p2p/p5-pdonkey/distinfo
@@ -1,3 +1,2 @@
-MD5 (P2P-pDonkey-0.05.tar.gz) = cb45283097d3c7102d966d3b3cb9d9c2
-SHA256 (P2P-pDonkey-0.05.tar.gz) = 01a547e48137b5bf01bc13203363889d1b1d471c84ec6856ba835c481125d1ca
-SIZE (P2P-pDonkey-0.05.tar.gz) = 82230
+SHA256 (P2P-pDonkey-0.05.tar.gz) = 61b818fdd947a9cb3bda77de27dbca92184af95695089a1a23754742ef41549b
+SIZE (P2P-pDonkey-0.05.tar.gz) = 82232
diff --git a/net/p5-Amazon-SQS-Simple/Makefile b/net/p5-Amazon-SQS-Simple/Makefile
index 274de06d0a30..2decc4c632d1 100644
--- a/net/p5-Amazon-SQS-Simple/Makefile
+++ b/net/p5-Amazon-SQS-Simple/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Amazon-SQS-Simple
 PORTVERSION=	1.06
 CATEGORIES=	net perl5
-MASTER_SITES=	CPAN/../../authors/id/S/SW/SWHITAKER
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:SWHITAKER
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	glarkin@FreeBSD.org
diff --git a/net/p5-Beanstalk-Client/Makefile b/net/p5-Beanstalk-Client/Makefile
index 1a96e342ce0c..6580c3248be5 100644
--- a/net/p5-Beanstalk-Client/Makefile
+++ b/net/p5-Beanstalk-Client/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Beanstalk-Client
 PORTVERSION=	1.06
 CATEGORIES=	net perl5
-MASTER_SITES=	CPAN/../../authors/id/G/GB/GBARR/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:GBARR
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vsevolod@FreeBSD.org
diff --git a/net/p5-Net-OpenID-Consumer/Makefile b/net/p5-Net-OpenID-Consumer/Makefile
index 36247d3eebd3..3e5c5da1ac5a 100644
--- a/net/p5-Net-OpenID-Consumer/Makefile
+++ b/net/p5-Net-OpenID-Consumer/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Net-OpenID-Consumer
 PORTVERSION=	1.06
 CATEGORIES=	net security perl5
-MASTER_SITES=	CPAN/../../authors/id/G/GU/GUGU
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:GUGU
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/net/p5-Net-Subnets/Makefile b/net/p5-Net-Subnets/Makefile
index 27cb6d629a5b..3ced28ac51c2 100644
--- a/net/p5-Net-Subnets/Makefile
+++ b/net/p5-Net-Subnets/Makefile
@@ -8,9 +8,8 @@
 PORTNAME=	Net-Subnets
 PORTVERSION=	1.02
 CATEGORIES=	net perl5
-MASTER_SITES=	http://backpan.perl.org/authors/id/K/KR/KRAIH/ \
-		http://backpan.cpan.org/authors/id/K/KR/KRAIH/
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:KRAIH
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/net/p5-Net-Whois-RIPE/Makefile b/net/p5-Net-Whois-RIPE/Makefile
index 630c9b042d20..4dc33b3a8cd2 100644
--- a/net/p5-Net-Whois-RIPE/Makefile
+++ b/net/p5-Net-Whois-RIPE/Makefile
@@ -9,7 +9,8 @@
 PORTNAME=	Net-Whois-RIPE
 PORTVERSION=	2.00003
 CATEGORIES=	net perl5
-MASTER_SITES=	CPAN/../../authors/id/L/LM/LMC/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:LMC
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mich@FreeBSD.org
diff --git a/net/p5-Phone-Info/Makefile b/net/p5-Phone-Info/Makefile
index e8b1ff9aafc4..3687656e805e 100644
--- a/net/p5-Phone-Info/Makefile
+++ b/net/p5-Phone-Info/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Phone-Info
 PORTVERSION=	0.0.1
 CATEGORIES=	net perl5
-MASTER_SITES=	CPAN/../../authors/id/V/VV/VVELOX/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:VVELOX
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vvelox@vvelox.net
diff --git a/security/p5-Crypt-SaltedHash/Makefile b/security/p5-Crypt-SaltedHash/Makefile
index b1848d9ce8b5..44fceb69bd83 100644
--- a/security/p5-Crypt-SaltedHash/Makefile
+++ b/security/p5-Crypt-SaltedHash/Makefile
@@ -6,7 +6,8 @@
 PORTNAME=	Crypt-SaltedHash
 PORTVERSION=	0.06
 CATEGORIES=	security perl5
-MASTER_SITES=	CPAN/../../authors/id/E/ES/ESSKAR/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:ESSKAR
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skreuzer@FreeBSD.org
diff --git a/security/p5-Crypt-SaltedHash/distinfo b/security/p5-Crypt-SaltedHash/distinfo
index 2477d02edcd6..5cbe5ab09ea8 100644
--- a/security/p5-Crypt-SaltedHash/distinfo
+++ b/security/p5-Crypt-SaltedHash/distinfo
@@ -1,3 +1,2 @@
-MD5 (Crypt-SaltedHash-0.06.tar.gz) = f5e24957e755014825bcd9df974ea568
 SHA256 (Crypt-SaltedHash-0.06.tar.gz) = 5201bd735f920ac8a57454ddc3f8510191bd3a5ab939051efdf7034fde5aa428
 SIZE (Crypt-SaltedHash-0.06.tar.gz) = 9423
diff --git a/security/p5-Net-SAML/Makefile b/security/p5-Net-SAML/Makefile
index 8fcb025716e9..68663da617cc 100644
--- a/security/p5-Net-SAML/Makefile
+++ b/security/p5-Net-SAML/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	Net-SAML
 PORTVERSION=	0.76
 CATEGORIES=	security perl5
-MASTER_SITES=	CPAN/../../authors/id/S/SA/SAMPO/ \
-		http://zxid.org/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:SAMPO
 PKGNAMEPREFIX=	p5-
 DISTNAME=	zxid-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
diff --git a/sysutils/comiccron/Makefile b/sysutils/comiccron/Makefile
index 481019874e68..38845a79289d 100644
--- a/sysutils/comiccron/Makefile
+++ b/sysutils/comiccron/Makefile
@@ -8,6 +8,8 @@
 PORTNAME=	comiccron
 PORTVERSION=	1.0.0
 CATEGORIES=	sysutils deskutils
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:VVELOX
 DISTNAME=	comiccron-${PORTVERSION}.pl
 EXTRACT_SUFX=
 EXTRACT_ONLY=
@@ -23,8 +25,6 @@ USE_PERL5=	yes
 
 NO_WRKSUBDIR=	yes
 
-MASTER_SITES=	http://cpan.org/authors/id/V/VV/VVELOX/
-
 MAN1=		comiccron.1
 
 PLIST_FILES=	bin/comiccron
diff --git a/sysutils/netident/Makefile b/sysutils/netident/Makefile
index 1a58470d2081..ab6e344789f0 100644
--- a/sysutils/netident/Makefile
+++ b/sysutils/netident/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	netident
 PORTVERSION=	0.1.0
 CATEGORIES=	sysutils deskutils
-MASTER_SITES=	http://cpan.org/authors/id/V/VV/VVELOX/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:VVELOX
 DISTNAME=	${PORTNAME}-${PORTVERSION}.pl
 EXTRACT_SUFX=
 EXTRACT_ONLY=
diff --git a/sysutils/p5-Probe-Perl/Makefile b/sysutils/p5-Probe-Perl/Makefile
index bdcd3f34c0b9..3a89081b7248 100644
--- a/sysutils/p5-Probe-Perl/Makefile
+++ b/sysutils/p5-Probe-Perl/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Probe-Perl
 PORTVERSION=	0.01
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	CPAN/../by-authors/id/K/KW/KWILLIAMS/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:KWILLIAMS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lippe@FreeBSD.org
diff --git a/textproc/p5-Geo-Parse-OSM/Makefile b/textproc/p5-Geo-Parse-OSM/Makefile
index a1c287c6e334..d33c294d6e95 100644
--- a/textproc/p5-Geo-Parse-OSM/Makefile
+++ b/textproc/p5-Geo-Parse-OSM/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Geo-Parse-OSM
 PORTVERSION=	0.42
 CATEGORIES=	textproc geography perl5
-MASTER_SITES=	CPAN/../../authors/id/L/LI/LIOSHA
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:LIOSHA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	amdmi3@FreeBSD.org
diff --git a/textproc/p5-Lingua-EN-Sentence/Makefile b/textproc/p5-Lingua-EN-Sentence/Makefile
index 153e2f03740b..701c4d2593d9 100644
--- a/textproc/p5-Lingua-EN-Sentence/Makefile
+++ b/textproc/p5-Lingua-EN-Sentence/Makefile
@@ -8,11 +8,12 @@
 PORTNAME=		Lingua-EN-Sentence
 PORTVERSION=		0.25
 CATEGORIES=		textproc perl5
-MASTER_SITES=		http://www.cpan.org/authors/id/S/SH/SHLOMOY/
+MASTER_SITES=		CPAN
+MASTER_SITE_SUBDIR=	CPAN:SHLOMOY
 PKGNAMEPREFIX=		p5-
 
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=	Module for splitting text into sentences
+MAINTAINER=		perl@FreeBSD.org
+COMMENT=		Module for splitting text into sentences
 
 PERL_CONFIGURE=		yes
 
diff --git a/textproc/p5-Lingua-EN-Sentence/distinfo b/textproc/p5-Lingua-EN-Sentence/distinfo
index 729acecbbbb6..7ca4889d3f7f 100644
--- a/textproc/p5-Lingua-EN-Sentence/distinfo
+++ b/textproc/p5-Lingua-EN-Sentence/distinfo
@@ -1,3 +1,2 @@
-MD5 (Lingua-EN-Sentence-0.25.tar.gz) = 4a846acfcb6eedd1c1557fc7f79f034d
 SHA256 (Lingua-EN-Sentence-0.25.tar.gz) = f886e3e9e2ddab299f80fd9f252eb48930b0bf4e1cbd1e85193d8565727e171d
 SIZE (Lingua-EN-Sentence-0.25.tar.gz) = 6994
diff --git a/textproc/p5-Lingua-Ident/Makefile b/textproc/p5-Lingua-Ident/Makefile
index 9a8714192bf9..21fef7c6e887 100644
--- a/textproc/p5-Lingua-Ident/Makefile
+++ b/textproc/p5-Lingua-Ident/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Lingua-Ident
 PORTVERSION=	1.7
 CATEGORIES=	textproc perl5
-MASTER_SITES=	CPAN/../../authors/id/MPIOTR
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:MPIOTR
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/p5-Lingua-Stem/Makefile b/textproc/p5-Lingua-Stem/Makefile
index 2a31e9eaaf39..5294e68ee8fc 100644
--- a/textproc/p5-Lingua-Stem/Makefile
+++ b/textproc/p5-Lingua-Stem/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=		Lingua-Stem
 PORTVERSION=		0.84
 CATEGORIES=		textproc perl5
-MASTER_SITES=		CPAN/../../authors/id/S/SN/SNOWHARE
+MASTER_SITES=		CPAN
+MASTER_SITE_SUBDIR=	CPAN:SNOWHARE
 PKGNAMEPREFIX=		p5-
 
 MAINTAINER=		perl@FreeBSD.org
diff --git a/textproc/p5-Markapl/Makefile b/textproc/p5-Markapl/Makefile
index c3d1214564ec..86a0616748f2 100644
--- a/textproc/p5-Markapl/Makefile
+++ b/textproc/p5-Markapl/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Markapl
 PORTVERSION=	0.11
 CATEGORIES=	textproc perl5
-MASTER_SITES=	CPAN/../../authors/id/G/GU/GUGOD
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:GUGOD
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/textproc/p5-Markapl/distinfo b/textproc/p5-Markapl/distinfo
index 16eb210af769..dc09583439d2 100644
--- a/textproc/p5-Markapl/distinfo
+++ b/textproc/p5-Markapl/distinfo
@@ -1,3 +1,2 @@
-MD5 (Markapl-0.11.tar.gz) = 851a17b0287c80378ae451dc862db994
 SHA256 (Markapl-0.11.tar.gz) = 63637fb0e7bc70b065259aa611169e15124a7d8b4d53b2fd58322fbb4d28c444
 SIZE (Markapl-0.11.tar.gz) = 25827
diff --git a/textproc/p5-String-Flogger/Makefile b/textproc/p5-String-Flogger/Makefile
index 7faecd06e39e..d492dc158544 100644
--- a/textproc/p5-String-Flogger/Makefile
+++ b/textproc/p5-String-Flogger/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	String-Flogger
 PORTVERSION=	1.101241
 CATEGORIES=	textproc perl5
-MASTER_SITES=	CPAN/../../authors/id/R/RJ/RJBS
-MASTER_SITE_SUBDIR=	String
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:RJBS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/textproc/p5-Text-CSV/Makefile b/textproc/p5-Text-CSV/Makefile
index b23f0a8c34cd..ef201e1b861b 100644
--- a/textproc/p5-Text-CSV/Makefile
+++ b/textproc/p5-Text-CSV/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Text-CSV
 PORTVERSION=	1.21
 CATEGORIES=	textproc perl5
-MASTER_SITES=	CPAN/../../authors/id/M/MA/MAKAMAKA
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:MAKAMAKA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/textproc/p5-URI-Find/Makefile b/textproc/p5-URI-Find/Makefile
index fcb0ac71581e..4ed95531e838 100644
--- a/textproc/p5-URI-Find/Makefile
+++ b/textproc/p5-URI-Find/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	URI-Find
 PORTVERSION=	20100505
 CATEGORIES=	textproc net 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/textproc/p5-Vroom/Makefile b/textproc/p5-Vroom/Makefile
index 761ef1d5b849..58f92786d8e1 100644
--- a/textproc/p5-Vroom/Makefile
+++ b/textproc/p5-Vroom/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Vroom
 PORTVERSION=	0.25
 CATEGORIES=	textproc perl5
-MASTER_SITES=	CPAN/../../authors/id/I/IN/INGY
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:INGY
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lwhsu@FreeBSD.org
diff --git a/textproc/p5-Vroom/distinfo b/textproc/p5-Vroom/distinfo
index 0953788cf0f2..e6fe76792900 100644
--- a/textproc/p5-Vroom/distinfo
+++ b/textproc/p5-Vroom/distinfo
@@ -1,3 +1,2 @@
-MD5 (Vroom-0.25.tar.gz) = a3e0f2d7924fbdda805dcfc5313e460c
 SHA256 (Vroom-0.25.tar.gz) = 8df8fad7a8ae0f27d4e09bbf132fcebed50729abc9e226f87124a138925de43a
 SIZE (Vroom-0.25.tar.gz) = 32425
diff --git a/www/p5-AxKit-XSP-Cookie/Makefile b/www/p5-AxKit-XSP-Cookie/Makefile
index ef52df486e69..fe7ffe8c32a1 100644
--- a/www/p5-AxKit-XSP-Cookie/Makefile
+++ b/www/p5-AxKit-XSP-Cookie/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	AxKit-XSP-Cookie
 PORTVERSION=	1.41
 CATEGORIES=	www perl5
-MASTER_SITES=	http://www.cpan.org/authors/id/M/MS/MSERGEANT/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:MSERGEANT
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-AxKit-XSP-ESQL/Makefile b/www/p5-AxKit-XSP-ESQL/Makefile
index fa03a00b6bde..70228b4b8846 100644
--- a/www/p5-AxKit-XSP-ESQL/Makefile
+++ b/www/p5-AxKit-XSP-ESQL/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	AxKit-XSP-ESQL
 PORTVERSION=	1.4
 CATEGORIES=	www perl5
-MASTER_SITES=	http://www.cpan.org/authors/id/M/MS/MSERGEANT/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:MSERGEANT
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-AxKit-XSP-Exception/Makefile b/www/p5-AxKit-XSP-Exception/Makefile
index a913f18b7d87..3b9638030d03 100644
--- a/www/p5-AxKit-XSP-Exception/Makefile
+++ b/www/p5-AxKit-XSP-Exception/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	AxKit-XSP-Exception
 PORTVERSION=	1.6
 CATEGORIES=	www perl5
-MASTER_SITES=	http://www.cpan.org/authors/id/M/MS/MSERGEANT/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:MSERGEANT
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-AxKit-XSP-IfParam/Makefile b/www/p5-AxKit-XSP-IfParam/Makefile
index 0e7038d4541b..d345130b50ed 100644
--- a/www/p5-AxKit-XSP-IfParam/Makefile
+++ b/www/p5-AxKit-XSP-IfParam/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	AxKit-XSP-IfParam
 PORTVERSION=	1.4
 CATEGORIES=	www perl5
-MASTER_SITES=	http://www.cpan.org/authors/id/M/MS/MSERGEANT/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:MSERGEANT
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-AxKit-XSP-Param/Makefile b/www/p5-AxKit-XSP-Param/Makefile
index 291c5cb7f3af..687ab2ecb128 100644
--- a/www/p5-AxKit-XSP-Param/Makefile
+++ b/www/p5-AxKit-XSP-Param/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	AxKit-XSP-Param
 PORTVERSION=	1.4
 CATEGORIES=	www perl5
-MASTER_SITES=	http://www.cpan.org/authors/id/M/MS/MSERGEANT/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:MSERGEANT
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-AxKit-XSP-PerForm/Makefile b/www/p5-AxKit-XSP-PerForm/Makefile
index f047ae49b438..bfaaff8a993f 100644
--- a/www/p5-AxKit-XSP-PerForm/Makefile
+++ b/www/p5-AxKit-XSP-PerForm/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	AxKit-XSP-PerForm
 PORTVERSION=	1.83
 CATEGORIES=	www perl5
-MASTER_SITES=	http://www.cpan.org/authors/id/M/MS/MSERGEANT/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:MSERGEANT
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-AxKit-XSP-Util/Makefile b/www/p5-AxKit-XSP-Util/Makefile
index 3b34ec926305..0b816e82f81f 100644
--- a/www/p5-AxKit-XSP-Util/Makefile
+++ b/www/p5-AxKit-XSP-Util/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	AxKit-XSP-Util
 PORTVERSION=	1.6
 CATEGORIES=	www perl5
-MASTER_SITES=	http://www.cpan.org/authors/id/M/MS/MSERGEANT/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:MSERGEANT
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-AxKit-XSP-WebUtils/Makefile b/www/p5-AxKit-XSP-WebUtils/Makefile
index 68493338c09d..89316fb72e77 100644
--- a/www/p5-AxKit-XSP-WebUtils/Makefile
+++ b/www/p5-AxKit-XSP-WebUtils/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	AxKit-XSP-WebUtils
 PORTVERSION=	1.6
 CATEGORIES=	www perl5
-MASTER_SITES=	http://www.cpan.org/authors/id/M/MS/MSERGEANT/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:MSERGEANT
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-Catalyst-Model-Xapian/Makefile b/www/p5-Catalyst-Model-Xapian/Makefile
index d41a3f4bec24..ed31c05d856c 100644
--- a/www/p5-Catalyst-Model-Xapian/Makefile
+++ b/www/p5-Catalyst-Model-Xapian/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	Catalyst-Model-Xapian
 PORTVERSION=	0.06
 PORTREVISION=	1
 CATEGORIES=	www perl5
-MASTER_SITES=	CPAN/../by-authors/id/M/MR/MRAMBERG
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:MRAMBERG
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-IMDB-Film/Makefile b/www/p5-IMDB-Film/Makefile
index 3b65a534212a..832762cb14ec 100644
--- a/www/p5-IMDB-Film/Makefile
+++ b/www/p5-IMDB-Film/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	IMDB-Film
 PORTVERSION=	0.49
 CATEGORIES=	www perl5
-MASTER_SITES=	CPAN/../../authors/id/S/ST/STEPANOV
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:STEPANOV
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-JE/Makefile b/www/p5-JE/Makefile
index a92ce6180842..628a6fbd6482 100644
--- a/www/p5-JE/Makefile
+++ b/www/p5-JE/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	JE
 PORTVERSION=	0.055
 CATEGORIES=	www perl5
-MASTER_SITES=	CPAN/../../authors/id/S/SP/SPROUT
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:SPROUT
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/www/p5-MediaWiki/Makefile b/www/p5-MediaWiki/Makefile
index bd485510e357..c046e0abb14d 100644
--- a/www/p5-MediaWiki/Makefile
+++ b/www/p5-MediaWiki/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	MediaWiki
 PORTVERSION=	1.13
 CATEGORIES=	www perl5
-MASTER_SITES=	http://backpan.perl.org/authors/id/S/SP/SPECTRUM/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:SPECTRUM
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-Scrappy/Makefile b/www/p5-Scrappy/Makefile
index 342ee7461c00..1a1de8de9987 100644
--- a/www/p5-Scrappy/Makefile
+++ b/www/p5-Scrappy/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Scrappy
 PORTVERSION=	0.62
 CATEGORIES=	www perl5
-MASTER_SITES=	CPAN/../../authors/id/A/AW/AWNCORP
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:AWNCORP
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/www/p5-Template-Alloy/Makefile b/www/p5-Template-Alloy/Makefile
index 195151954ef5..0b11be5ff4c4 100644
--- a/www/p5-Template-Alloy/Makefile
+++ b/www/p5-Template-Alloy/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Template-Alloy
 PORTVERSION=	1.016
 CATEGORIES=	www perl5
-MASTER_SITES=	CPAN/../../authors/id/R/RH/RHANDOM
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:RHANDOM
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-Template-Mustache/Makefile b/www/p5-Template-Mustache/Makefile
index 8dd0f6a28d4d..5a739b7ff139 100644
--- a/www/p5-Template-Mustache/Makefile
+++ b/www/p5-Template-Mustache/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	Template-Mustache
 PORTVERSION=	v0.5.1
 CATEGORIES=	www 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/www/p5-Template-Mustache/distinfo b/www/p5-Template-Mustache/distinfo
index cd6ec328b975..549c6af7428d 100644
--- a/www/p5-Template-Mustache/distinfo
+++ b/www/p5-Template-Mustache/distinfo
@@ -1,4 +1,2 @@
-SHA256 (Template-Mustache-v0.5.0.tar.gz) = bcca1b070fe49b339f415c740bf55e4e820dcfa1a145026e2e8c8617ec6debec
-SIZE (Template-Mustache-v0.5.0.tar.gz) = 16645
 SHA256 (Template-Mustache-v0.5.1.tar.gz) = 359997312222cd66405cec89a1d50065b78ed551eb9ee1ae9188004445cf55cf
 SIZE (Template-Mustache-v0.5.1.tar.gz) = 17340
diff --git a/www/p5-WWW-Mechanize-Shell/Makefile b/www/p5-WWW-Mechanize-Shell/Makefile
index 561a3efe11d1..c2fca4b2ab8f 100644
--- a/www/p5-WWW-Mechanize-Shell/Makefile
+++ b/www/p5-WWW-Mechanize-Shell/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	WWW-Mechanize-Shell
 PORTVERSION=	0.52
 CATEGORIES=	www perl5
-MASTER_SITES=	CPAN/../../authors/id/C/CO/CORION
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:CORION
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-pQuery/Makefile b/www/p5-pQuery/Makefile
index 5e4e1ea01ca9..2367b030a4e3 100644
--- a/www/p5-pQuery/Makefile
+++ b/www/p5-pQuery/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	pQuery
 PORTVERSION=	0.07
 CATEGORIES=	www perl5
-MASTER_SITES=	CPAN/../../authors/id/I/IN/INGY/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:INGY
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org