286 files changed, 235 insertions, 301 deletions
diff --git a/archivers/p5-Archive-Tar/Makefile b/archivers/p5-Archive-Tar/Makefile
index 05abc914e632..ad2b3109055a 100644
--- a/archivers/p5-Archive-Tar/Makefile
+++ b/archivers/p5-Archive-Tar/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Archive-Tar
 PORTVERSION=	1.76
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/B/BI/BINGOS
+MASTER_SITE_SUBDIR=	CPAN:BINGOS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jadawin@FreeBSD.org
diff --git a/archivers/p5-POE-Filter-LZF/Makefile b/archivers/p5-POE-Filter-LZF/Makefile
index 037ba7f87aa1..6915187146d8 100644
--- a/archivers/p5-POE-Filter-LZF/Makefile
+++ b/archivers/p5-POE-Filter-LZF/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	POE-Filter-LZF
 PORTVERSION=	1.6.8
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/B/BI/BINGOS
+MASTER_SITE_SUBDIR=	CPAN:BINGOS
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
diff --git a/archivers/p5-POE-Filter-LZO/Makefile b/archivers/p5-POE-Filter-LZO/Makefile
index bfa622047489..f6de00ea14a3 100644
--- a/archivers/p5-POE-Filter-LZO/Makefile
+++ b/archivers/p5-POE-Filter-LZO/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	POE-Filter-LZO
 PORTVERSION=	1.6.8
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/B/BI/BINGOS
+MASTER_SITE_SUBDIR=	CPAN:BINGOS
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
diff --git a/astro/p5-ZConf-Weather/Makefile b/astro/p5-ZConf-Weather/Makefile
index 218a7ab0846f..8ebe8fd96032 100644
--- a/astro/p5-ZConf-Weather/Makefile
+++ b/astro/p5-ZConf-Weather/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.0.0
 PORTREVISION=	1
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/V/VV/VVELOX
+MASTER_SITE_SUBDIR=	CPAN:VVELOX
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vvelox@vvelox.net
diff --git a/audio/p5-CDDB_get/Makefile b/audio/p5-CDDB_get/Makefile
index 02a595e29f16..ddbb0685f094 100644
--- a/audio/p5-CDDB_get/Makefile
+++ b/audio/p5-CDDB_get/Makefile
@@ -10,10 +10,10 @@ PORTVERSION=	2.27
 PORTEPOCH=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/F/FO/FONKIE
+MASTER_SITE_SUBDIR=	CPAN:FONKIE
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	A high-level interface to the Compact Disc Database
 
 PERL_CONFIGURE=	yes
diff --git a/converters/p5-Encode/Makefile b/converters/p5-Encode/Makefile
index d4b91b4780a4..b8dbc9bc9ed8 100644
--- a/converters/p5-Encode/Makefile
+++ b/converters/p5-Encode/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Encode
 PORTVERSION=	2.42
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/D/DA/DANKOGAI
+MASTER_SITE_SUBDIR=	CPAN:DANKOGAI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	rafan@FreeBSD.org
diff --git a/databases/p5-Amazon-SimpleDB/Makefile b/databases/p5-Amazon-SimpleDB/Makefile
index f64f68b4d360..2ccd2be75f59 100644
--- a/databases/p5-Amazon-SimpleDB/Makefile
+++ b/databases/p5-Amazon-SimpleDB/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Amazon-SimpleDB
 PORTVERSION=	0.03
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/T/TI/TIMA
+MASTER_SITE_SUBDIR=	CPAN:TIMA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
diff --git a/databases/p5-Class-DBI-Loader/Makefile b/databases/p5-Class-DBI-Loader/Makefile
index c64a883ef832..45dc8bffc742 100644
--- a/databases/p5-Class-DBI-Loader/Makefile
+++ b/databases/p5-Class-DBI-Loader/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.34
 PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/D/DM/DMAKI
+MASTER_SITE_SUBDIR=	CPAN:DMAKI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/databases/p5-DBICx-Deploy/Makefile b/databases/p5-DBICx-Deploy/Makefile
index dde97bf28d5b..74cf12c2082d 100644
--- a/databases/p5-DBICx-Deploy/Makefile
+++ b/databases/p5-DBICx-Deploy/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.02
 PORTREVISION=	3
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/J/JR/JROCKWAY/
+MASTER_SITE_SUBDIR=	CPAN:JROCKWAY
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	miwi@FreeBSD.org
diff --git a/databases/p5-DBICx-MapMaker/Makefile b/databases/p5-DBICx-MapMaker/Makefile
index d42e1e965c6b..463ebda47669 100644
--- a/databases/p5-DBICx-MapMaker/Makefile
+++ b/databases/p5-DBICx-MapMaker/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	DBICx-MapMaker
 PORTVERSION=	0.03
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/J/JR/JROCKWAY/
+MASTER_SITE_SUBDIR=	CPAN:JROCKWAY
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	miwi@FreeBSD.org
diff --git a/databases/p5-DBICx-TxnInsert/Makefile b/databases/p5-DBICx-TxnInsert/Makefile
index 5c024328de1b..76dd9e318fba 100644
--- a/databases/p5-DBICx-TxnInsert/Makefile
+++ b/databases/p5-DBICx-TxnInsert/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	DBICx-TxnInsert
 PORTVERSION=	0.02
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/V/VO/VOVKASM
+MASTER_SITE_SUBDIR=	CPAN:VOVKASM
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/databases/p5-DBIx-Skinny-Schema-Loader/Makefile b/databases/p5-DBIx-Skinny-Schema-Loader/Makefile
index 635e5c859126..d674c5bb380e 100644
--- a/databases/p5-DBIx-Skinny-Schema-Loader/Makefile
+++ b/databases/p5-DBIx-Skinny-Schema-Loader/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	DBIx-Skinny-Schema-Loader
 PORTVERSION=	0.22
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/N/NE/NEKOYA
+MASTER_SITE_SUBDIR=	CPAN:NEKOYA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/databases/p5-Dancer-Session-Memcached/Makefile b/databases/p5-Dancer-Session-Memcached/Makefile
index da7296f0bff0..b424377a7425 100644
--- a/databases/p5-Dancer-Session-Memcached/Makefile
+++ b/databases/p5-Dancer-Session-Memcached/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Dancer-Session-Memcached
 PORTVERSION=	0.1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/S/SU/SUKRIA
+MASTER_SITE_SUBDIR=	CPAN:SUKRIA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	magik@roorback.net
diff --git a/databases/p5-Ima-DBI/Makefile b/databases/p5-Ima-DBI/Makefile
index 9816a458ecc0..e2cb5f6da7a5 100644
--- a/databases/p5-Ima-DBI/Makefile
+++ b/databases/p5-Ima-DBI/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Ima-DBI
 PORTVERSION=	0.35
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/P/PE/PERRIN
+MASTER_SITE_SUBDIR=	CPAN:PERRIN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/databases/p5-Memcached-libmemcached/Makefile b/databases/p5-Memcached-libmemcached/Makefile
index 20d38e614c37..31ca92a7f4ec 100644
--- a/databases/p5-Memcached-libmemcached/Makefile
+++ b/databases/p5-Memcached-libmemcached/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Memcached-libmemcached
 PORTVERSION=	0.21.01
 CATEGORIES=	databases devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/T/TI/TIMB
+MASTER_SITE_SUBDIR=	CPAN:TIMB
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
diff --git a/databases/p5-Rose-DB/Makefile b/databases/p5-Rose-DB/Makefile
index cbd31ef3343d..e9179ff888cd 100644
--- a/databases/p5-Rose-DB/Makefile
+++ b/databases/p5-Rose-DB/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.763
 PORTEPOCH=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/J/JS/JSIRACUSA
+MASTER_SITE_SUBDIR=	CPAN:JSIRACUSA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/databases/p5-mysql-genocide/Makefile b/databases/p5-mysql-genocide/Makefile
index 44eb96e25c8c..41fd258de996 100644
--- a/databases/p5-mysql-genocide/Makefile
+++ b/databases/p5-mysql-genocide/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	mysql-genocide
 PORTVERSION=	0.03
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/R/RS/RSOLIV
+MASTER_SITE_SUBDIR=	CPAN:RSOLIV
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/databases/pgtop/Makefile b/databases/pgtop/Makefile
index 408776d2774c..635735f9fca8 100644
--- a/databases/pgtop/Makefile
+++ b/databases/pgtop/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.05
 PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/C/CO/COSIMO
+MASTER_SITE_SUBDIR=	CPAN:COSIMO
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Display PostgreSQL performance info like top(1)
diff --git a/deskutils/p5-ZConf-BGSet/Makefile b/deskutils/p5-ZConf-BGSet/Makefile
index 27509df987e3..9ca6acb1fe83 100644
--- a/deskutils/p5-ZConf-BGSet/Makefile
+++ b/deskutils/p5-ZConf-BGSet/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.0.0
 PORTREVISION=	3
 CATEGORIES=	deskutils perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/V/VV/VVELOX
+MASTER_SITE_SUBDIR=	CPAN:VVELOX
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vvelox@vvelox.net
diff --git a/deskutils/p5-ZConf-Runner-GUI-GTK/Makefile b/deskutils/p5-ZConf-Runner-GUI-GTK/Makefile
index d8fbf7c37337..9a5aa406bdf7 100644
--- a/deskutils/p5-ZConf-Runner-GUI-GTK/Makefile
+++ b/deskutils/p5-ZConf-Runner-GUI-GTK/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	ZConf-Runner-GUI-GTK
 PORTVERSION=	0.0.2
 CATEGORIES=	deskutils perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/V/VV/VVELOX
+MASTER_SITE_SUBDIR=	CPAN:VVELOX
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vvelox@vvelox.net
diff --git a/deskutils/p5-ZConf-Runner/Makefile b/deskutils/p5-ZConf-Runner/Makefile
index 1aaca29a1158..28cdaeefc622 100644
--- a/deskutils/p5-ZConf-Runner/Makefile
+++ b/deskutils/p5-ZConf-Runner/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	ZConf-Runner
 PORTVERSION=	2.1.4
 CATEGORIES=	deskutils perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/V/VV/VVELOX
+MASTER_SITE_SUBDIR=	CPAN:VVELOX
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vvelox@vvelox.net
diff --git a/devel/activitymail/Makefile b/devel/activitymail/Makefile
index 308b701f46bc..e07e7d5cd4ea 100644
--- a/devel/activitymail/Makefile
+++ b/devel/activitymail/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	activitymail
 PORTVERSION=	1.26
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/D/DW/DWHEELER/activitymail
+MASTER_SITE_SUBDIR=	CPAN:DWHEELER/activitymail
 
 MAINTAINER=	joseph@randomnetworks.com
 COMMENT=	A program for sending email messages for CVS repository commits
diff --git a/devel/activitymail/distinfo b/devel/activitymail/distinfo
index 69b045378d3d..72d06e96c7d2 100644
--- a/devel/activitymail/distinfo
+++ b/devel/activitymail/distinfo
@@ -1,3 +1,2 @@
-MD5 (activitymail-1.26.tar.gz) = 44ab4b1f33a0609a983fda6e3b8ded4d
 SHA256 (activitymail-1.26.tar.gz) = 2f469ecbeb86d3f8f526be7dc608835f036ef11cdfae41aff7b99a66d824a940
 SIZE (activitymail-1.26.tar.gz) = 21385
diff --git a/devel/cpan-upload-http/Makefile b/devel/cpan-upload-http/Makefile
index 6fca1ae80f84..8ea3c049a4b1 100644
--- a/devel/cpan-upload-http/Makefile
+++ b/devel/cpan-upload-http/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	cpan-upload-http
 PORTVERSION=	2.4
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/B/BR/BRADFITZ
+MASTER_SITE_SUBDIR=	CPAN:BRADFITZ
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl script to upload one or more files to CPAN, using PAUSE
diff --git a/devel/cpan-upload-http/distinfo b/devel/cpan-upload-http/distinfo
index 7254dc1f56da..079ef6da8110 100644
--- a/devel/cpan-upload-http/distinfo
+++ b/devel/cpan-upload-http/distinfo
@@ -1,3 +1,2 @@
-MD5 (cpan-upload-http-2.4.tar.gz) = 03e08850d1fbc584eeb6db82eecc4f1f
 SHA256 (cpan-upload-http-2.4.tar.gz) = 2d8abe8827b30f8f7960ca8837ce108ae83a774d61b9df56aa786d352c875836
 SIZE (cpan-upload-http-2.4.tar.gz) = 7355
diff --git a/devel/p5-Algorithm-Cluster/Makefile b/devel/p5-Algorithm-Cluster/Makefile
index 41633a26d446..7f640050f869 100644
--- a/devel/p5-Algorithm-Cluster/Makefile
+++ b/devel/p5-Algorithm-Cluster/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Algorithm-Cluster
 PORTVERSION=	1.50
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/M/MD/MDEHOON
+MASTER_SITE_SUBDIR=	CPAN:MDEHOON
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-AnyData/Makefile b/devel/p5-AnyData/Makefile
index 952c3c9e1aac..841c82fd3852 100644
--- a/devel/p5-AnyData/Makefile
+++ b/devel/p5-AnyData/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	AnyData
 PORTVERSION=	0.10
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/J/JZ/JZUCKER
+MASTER_SITE_SUBDIR=	CPAN:JZUCKER
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-BFD/Makefile b/devel/p5-BFD/Makefile
index 143e8b6ec769..448ce03d83b6 100644
--- a/devel/p5-BFD/Makefile
+++ b/devel/p5-BFD/Makefile
@@ -9,10 +9,10 @@ PORTNAME=	BFD
 PORTVERSION=	0.31
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/R/RB/RBS
+MASTER_SITE_SUBDIR=	CPAN:RBS
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Impromptu dumping of data structures for debugging purposes
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-BFD/distinfo b/devel/p5-BFD/distinfo
index e75202a5c5a5..62b8a168a0c5 100644
--- a/devel/p5-BFD/distinfo
+++ b/devel/p5-BFD/distinfo
@@ -1,3 +1,2 @@
-MD5 (BFD-0.31.tar.gz) = 7715ecf4133b9ab1ddabf9221663d576
 SHA256 (BFD-0.31.tar.gz) = b5911830541fe63f0a3cbca3acdcc36e2db59f6313e4323002bead8c8ab565d3
 SIZE (BFD-0.31.tar.gz) = 2773
diff --git a/devel/p5-BS-Event/Makefile b/devel/p5-BS-Event/Makefile
index 1324b7973a9b..bf8e6dbc4d1c 100644
--- a/devel/p5-BS-Event/Makefile
+++ b/devel/p5-BS-Event/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	BS-Event
 PORTVERSION=	0.3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/E/EL/ELMEX
+MASTER_SITE_SUBDIR=	CPAN:ELMEX
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
diff --git a/devel/p5-BS-Event/distinfo b/devel/p5-BS-Event/distinfo
index f9e8fc127018..7b8adfac1a15 100644
--- a/devel/p5-BS-Event/distinfo
+++ b/devel/p5-BS-Event/distinfo
@@ -1,3 +1,2 @@
-MD5 (BS-Event-0.3.tar.gz) = 47d8a648165afeb56a6440c03bc455af
 SHA256 (BS-Event-0.3.tar.gz) = 668357ed92a395bb80cb687422293d90049cec6b2056a11fb200abc8229bec8a
 SIZE (BS-Event-0.3.tar.gz) = 6254
diff --git a/devel/p5-BZ-Client/Makefile b/devel/p5-BZ-Client/Makefile
index 14dd5fe2cb74..437f77f58e93 100644
--- a/devel/p5-BZ-Client/Makefile
+++ b/devel/p5-BZ-Client/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	BZ-Client
 PORTVERSION=	1.03
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/J/JW/JWIED
+MASTER_SITE_SUBDIR=	CPAN:JWIED
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/devel/p5-BZ-Client/distinfo b/devel/p5-BZ-Client/distinfo
index 63a5ec7d0c6c..8abbe17c2f36 100644
--- a/devel/p5-BZ-Client/distinfo
+++ b/devel/p5-BZ-Client/distinfo
@@ -1,3 +1,2 @@
-MD5 (BZ-Client-1.03.tar.gz) = 0e6eb6509afa40d9c03e9ee96d1f273f
 SHA256 (BZ-Client-1.03.tar.gz) = 11ce16455d4eeb192b734b884f07a9bdecd6370afdc842ea534d5960b14ae16a
 SIZE (BZ-Client-1.03.tar.gz) = 22801
diff --git a/devel/p5-Best/Makefile b/devel/p5-Best/Makefile
index 071aa3ca1f66..165bb47a3a2f 100644
--- a/devel/p5-Best/Makefile
+++ b/devel/p5-Best/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Best
 PORTVERSION=	0.12
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/G/GA/GAAL
+MASTER_SITE_SUBDIR=	CPAN:GAAL
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/devel/p5-Best/distinfo b/devel/p5-Best/distinfo
index e06055aba939..fc505c3e5ad3 100644
--- a/devel/p5-Best/distinfo
+++ b/devel/p5-Best/distinfo
@@ -1,3 +1,2 @@
-MD5 (Best-0.12.tar.gz) = 0af7afb378e3f8cac5c7af0bf75cfffa
 SHA256 (Best-0.12.tar.gz) = 4f43363972eb88792fdfcdc784ece43810931895d21601c7aaef924538219bd8
 SIZE (Best-0.12.tar.gz) = 29393
diff --git a/devel/p5-CLASS/Makefile b/devel/p5-CLASS/Makefile
index 8ced3e50f319..907f93104e94 100644
--- a/devel/p5-CLASS/Makefile
+++ b/devel/p5-CLASS/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	CLASS
 PORTVERSION=	1.00
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/M/MS/MSCHWERN/
+MASTER_SITE_SUBDIR=	CPAN:MSCHWERN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
diff --git a/devel/p5-CLASS/distinfo b/devel/p5-CLASS/distinfo
index 79afe7e336d5..d6ed7257e2f4 100644
--- a/devel/p5-CLASS/distinfo
+++ b/devel/p5-CLASS/distinfo
@@ -1,3 +1,2 @@
-MD5 (CLASS-1.00.tar.gz) = 834b888b9c8a936b12de2c168798b618
 SHA256 (CLASS-1.00.tar.gz) = c5185620815701b3fec21314ccd8c5693e6bfd519431527da3370a8164220671
 SIZE (CLASS-1.00.tar.gz) = 3579
diff --git a/devel/p5-CPAN-Reporter-Smoker/Makefile b/devel/p5-CPAN-Reporter-Smoker/Makefile
index e8aeb208f90a..a8bdc4d2bb0f 100644
--- a/devel/p5-CPAN-Reporter-Smoker/Makefile
+++ b/devel/p5-CPAN-Reporter-Smoker/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	CPAN-Reporter-Smoker
 PORTVERSION=	0.23
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/D/DA/DAGOLDEN
+MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	swills@FreeBSD.org
diff --git a/devel/p5-CPAN-Reporter/Makefile b/devel/p5-CPAN-Reporter/Makefile
index 1cda32ea216f..69614c955ebc 100644
--- a/devel/p5-CPAN-Reporter/Makefile
+++ b/devel/p5-CPAN-Reporter/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	CPAN-Reporter
 PORTVERSION=	1.1902
 CATEGORIES=	devel
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/D/DA/DAGOLDEN
+MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	swills@FreeBSD.org
diff --git a/devel/p5-CPAN-SQLite/Makefile b/devel/p5-CPAN-SQLite/Makefile
index 542f5db7c744..c61a66f927b9 100644
--- a/devel/p5-CPAN-SQLite/Makefile
+++ b/devel/p5-CPAN-SQLite/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	CPAN-SQLite
 PORTVERSION=	0.199
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/R/RK/RKOBES
+MASTER_SITE_SUBDIR=	CPAN:RKOBES
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	eg@fbsd.lt
diff --git a/devel/p5-CPAN-SQLite/distinfo b/devel/p5-CPAN-SQLite/distinfo
index 7b169c0cddfa..6a98004c24e3 100644
--- a/devel/p5-CPAN-SQLite/distinfo
+++ b/devel/p5-CPAN-SQLite/distinfo
@@ -1,3 +1,2 @@
-MD5 (CPAN-SQLite-0.199.tar.gz) = a5a7e5c89972870401a951609d5be079
 SHA256 (CPAN-SQLite-0.199.tar.gz) = 245f90e69e542d2bba3eb6f25248475fb74d28858f5b148da02e4d895dce38a5
 SIZE (CPAN-SQLite-0.199.tar.gz) = 67134
diff --git a/devel/p5-CPAN-Testers-Report/Makefile b/devel/p5-CPAN-Testers-Report/Makefile
index 8c3ab2482774..da0f84673b39 100644
--- a/devel/p5-CPAN-Testers-Report/Makefile
+++ b/devel/p5-CPAN-Testers-Report/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	CPAN-Testers-Report
 PORTVERSION=	1.999001
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/D/DA/DAGOLDEN
+MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	swills@FreeBSD.org
diff --git a/devel/p5-CPS/Makefile b/devel/p5-CPS/Makefile
index f32e08dac5a9..7de3d89f26ca 100644
--- a/devel/p5-CPS/Makefile
+++ b/devel/p5-CPS/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	CPS
 PORTVERSION=	0.11
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/P/PE/PEVANS/
+MASTER_SITE_SUBDIR=	CPAN:PEVANS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	culot@FreeBSD.org
diff --git a/devel/p5-Calendar-Simple/Makefile b/devel/p5-Calendar-Simple/Makefile
index c5b3ece677f5..d9154e16960e 100644
--- a/devel/p5-Calendar-Simple/Makefile
+++ b/devel/p5-Calendar-Simple/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Calendar-Simple
 PORTVERSION=	1.21
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/D/DA/DAVECROSS
+MASTER_SITE_SUBDIR=	CPAN:DAVECROSS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/devel/p5-Calendar-Simple/distinfo b/devel/p5-Calendar-Simple/distinfo
index bc7c0e2a74af..f895933b9f18 100644
--- a/devel/p5-Calendar-Simple/distinfo
+++ b/devel/p5-Calendar-Simple/distinfo
@@ -1,3 +1,2 @@
-MD5 (Calendar-Simple-1.21.tar.gz) = 8fbfe46c0a25d036ca100460fcd00223
 SHA256 (Calendar-Simple-1.21.tar.gz) = 3f1f8f8408d9913ab4e0284f981065357ec6ebc8e8357c317100f5c627d3d465
 SIZE (Calendar-Simple-1.21.tar.gz) = 7007
diff --git a/devel/p5-Chooser/Makefile b/devel/p5-Chooser/Makefile
index d52ca8da754a..d072b8dc3e5d 100644
--- a/devel/p5-Chooser/Makefile
+++ b/devel/p5-Chooser/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Chooser
 PORTVERSION=	2.0.0
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/V/VV/VVELOX
+MASTER_SITE_SUBDIR=	CPAN:VVELOX
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vvelox@vvelox.net
diff --git a/devel/p5-Chooser/distinfo b/devel/p5-Chooser/distinfo
index a7aa669eb586..d54bd72f7b58 100644
--- a/devel/p5-Chooser/distinfo
+++ b/devel/p5-Chooser/distinfo
@@ -1,3 +1,2 @@
-MD5 (Chooser-2.0.0.tar.gz) = 2564eef9701fce61ce697cb0855bc952
 SHA256 (Chooser-2.0.0.tar.gz) = 7f439b17fcb30cf3f205083b6bce6a3090e97d35f6c4dfae64914511100a0855
 SIZE (Chooser-2.0.0.tar.gz) = 8572
diff --git a/devel/p5-Class-Autouse/Makefile b/devel/p5-Class-Autouse/Makefile
index 9b1ee035a126..2043f81a38e1 100644
--- a/devel/p5-Class-Autouse/Makefile
+++ b/devel/p5-Class-Autouse/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Class-Autouse
 PORTVERSION=	2.00
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/A/AD/ADAMK
+MASTER_SITE_SUBDIR=	CPAN:ADAMK
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-Class-C3-Componentised/Makefile b/devel/p5-Class-C3-Componentised/Makefile
index e29167ea8b95..745421503da7 100644
--- a/devel/p5-Class-C3-Componentised/Makefile
+++ b/devel/p5-Class-C3-Componentised/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Class-C3-Componentised
 PORTVERSION=	1.0009
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/R/RI/RIBASUSHI
+MASTER_SITE_SUBDIR=	CPAN:RIBASUSHI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-Class-Delegation/Makefile b/devel/p5-Class-Delegation/Makefile
index 3052feb08a88..119c91d9d413 100644
--- a/devel/p5-Class-Delegation/Makefile
+++ b/devel/p5-Class-Delegation/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Class-Delegation
 PORTVERSION=	1.7.1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/D/DC/DCONWAY
+MASTER_SITE_SUBDIR=	CPAN:DCONWAY
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
 
diff --git a/devel/p5-Class-Delegation/distinfo b/devel/p5-Class-Delegation/distinfo
index 1bb015b903bf..5ef560e99dbc 100644
--- a/devel/p5-Class-Delegation/distinfo
+++ b/devel/p5-Class-Delegation/distinfo
@@ -1,3 +1,2 @@
-MD5 (Class-Delegation-v1.7.1.tar.gz) = 2a909bd2fedb6524a906830929e93313
 SHA256 (Class-Delegation-v1.7.1.tar.gz) = a4ce8608e2069aa5c96b8be47c6bad4bc64d4c5d22fd15429ac5135eb75f28f2
 SIZE (Class-Delegation-v1.7.1.tar.gz) = 14583
diff --git a/devel/p5-Code-Perl/Makefile b/devel/p5-Code-Perl/Makefile
index cc4347da52c1..5950bd286425 100644
--- a/devel/p5-Code-Perl/Makefile
+++ b/devel/p5-Code-Perl/Makefile
@@ -9,10 +9,10 @@ PORTNAME=	Code-Perl
 PORTVERSION=	0.03
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/F/FD/FDALY
+MASTER_SITE_SUBDIR=	CPAN:FDALY
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Produce Perl code from a tree
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Class/MethodMaker.pm:${PORTSDIR}/devel/p5-Class-MethodMaker \
diff --git a/devel/p5-Code-Perl/distinfo b/devel/p5-Code-Perl/distinfo
index 310b8effca49..c85ba2903097 100644
--- a/devel/p5-Code-Perl/distinfo
+++ b/devel/p5-Code-Perl/distinfo
@@ -1,3 +1,2 @@
-MD5 (Code-Perl-0.03.tar.gz) = 58a87e4703c0420f302a6a44312121ff
 SHA256 (Code-Perl-0.03.tar.gz) = d95957e2f3f46edd90d621ea8e4b76764d35ac64283ca0e0a0b951a24900a935
 SIZE (Code-Perl-0.03.tar.gz) = 17580
diff --git a/devel/p5-CommitBit/Makefile b/devel/p5-CommitBit/Makefile
index 448566a8d9e5..2de3b5e0a48f 100644
--- a/devel/p5-CommitBit/Makefile
+++ b/devel/p5-CommitBit/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.02
 PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/J/JE/JESSE
+MASTER_SITE_SUBDIR=	CPAN:JESSE
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/devel/p5-CommitBit/distinfo b/devel/p5-CommitBit/distinfo
index 1c3ce64983bd..72210bf42c8f 100644
--- a/devel/p5-CommitBit/distinfo
+++ b/devel/p5-CommitBit/distinfo
@@ -1,3 +1,2 @@
-MD5 (CommitBit-0.02.tar.gz) = c22dab80f02f6713e3c62c74b5dd236c
 SHA256 (CommitBit-0.02.tar.gz) = fd7d36e98edd7e81ed72b0b3b7c287ad7e858213a794480d02bd5bd5c04dfc37
 SIZE (CommitBit-0.02.tar.gz) = 41386
diff --git a/devel/p5-Config-Perl-V/Makefile b/devel/p5-Config-Perl-V/Makefile
index d69a9258b40e..c9f0fcf5ff8c 100644
--- a/devel/p5-Config-Perl-V/Makefile
+++ b/devel/p5-Config-Perl-V/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Config-Perl-V
 PORTVERSION=	0.12
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/H/HM/HMBRAND
+MASTER_SITE_SUBDIR=	CPAN:HMBRAND
 PKGNAMEPREFIX=	p5-
 EXTRACT_SUFX=	.tgz
 
diff --git a/devel/p5-Const-Fast/Makefile b/devel/p5-Const-Fast/Makefile
index c192bf042bff..3f4e0c3eee5b 100644
--- a/devel/p5-Const-Fast/Makefile
+++ b/devel/p5-Const-Fast/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Const-Fast
 PORTVERSION=	0.007
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/L/LE/LEONT/
+MASTER_SITE_SUBDIR=	CPAN:LEONT
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-Contextual-Return/Makefile b/devel/p5-Contextual-Return/Makefile
index b09e7e8a98c8..a6ec34da21ab 100644
--- a/devel/p5-Contextual-Return/Makefile
+++ b/devel/p5-Contextual-Return/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.2.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/D/DC/DCONWAY
+MASTER_SITE_SUBDIR=	CPAN:DCONWAY
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-Cvs/Makefile b/devel/p5-Cvs/Makefile
index fc5f937c7524..75066d477cc3 100644
--- a/devel/p5-Cvs/Makefile
+++ b/devel/p5-Cvs/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=    0.07
 PORTREVISION=	1
 CATEGORIES=     devel perl5
 MASTER_SITES=   CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/R/RS/RSOLIV
+MASTER_SITE_SUBDIR=	CPAN:RSOLIV
 PKGNAMEPREFIX=  p5-
 
 MAINTAINER=     perl@FreeBSD.org
diff --git a/devel/p5-Data-Page-NoTotalEntries/Makefile b/devel/p5-Data-Page-NoTotalEntries/Makefile
index 47f4ab086dfa..462fb3e9c9f3 100644
--- a/devel/p5-Data-Page-NoTotalEntries/Makefile
+++ b/devel/p5-Data-Page-NoTotalEntries/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Data-Page-NoTotalEntries
 PORTVERSION=	0.02
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/T/TO/TOKUHIROM
+MASTER_SITE_SUBDIR=	CPAN:TOKUHIROM
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/devel/p5-Data-Path/Makefile b/devel/p5-Data-Path/Makefile
index dee474a067d7..821583b3c0a1 100644
--- a/devel/p5-Data-Path/Makefile
+++ b/devel/p5-Data-Path/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Data-Path
 PORTVERSION=	1.4.1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/Z/ZA/ZAPHAR
+MASTER_SITE_SUBDIR=	CPAN:ZAPHAR
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/devel/p5-Data-Path/distinfo b/devel/p5-Data-Path/distinfo
index 18b41e2ac2a9..927dcc6ba9a3 100644
--- a/devel/p5-Data-Path/distinfo
+++ b/devel/p5-Data-Path/distinfo
@@ -1,3 +1,2 @@
-MD5 (Data-Path-1.4.1.tar.gz) = 5f44def86d48f019ae3ba2c267b3e2f4
 SHA256 (Data-Path-1.4.1.tar.gz) = 332deeea63f58cdb3a8d023ff33a938670dbb7f1ac449282e17038cdee046925
 SIZE (Data-Path-1.4.1.tar.gz) = 13603
diff --git a/devel/p5-Date-Pcalc/Makefile b/devel/p5-Date-Pcalc/Makefile
index 6d4ba42cc67e..47e52d5774dc 100644
--- a/devel/p5-Date-Pcalc/Makefile
+++ b/devel/p5-Date-Pcalc/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Date-Pcalc
 PORTVERSION=	6.1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/S/ST/STBEY
+MASTER_SITE_SUBDIR=	CPAN:STBEY
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-DateTime-Calendar-Chinese/Makefile b/devel/p5-DateTime-Calendar-Chinese/Makefile
index dcfc4350e7eb..14d6ed388495 100644
--- a/devel/p5-DateTime-Calendar-Chinese/Makefile
+++ b/devel/p5-DateTime-Calendar-Chinese/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	DateTime-Calendar-Chinese
 PORTVERSION=	0.07
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/D/DM/DMAKI
+MASTER_SITE_SUBDIR=	CPAN:DMAKI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	markun@onohara.to
diff --git a/devel/p5-DateTime-Calendar-Chinese/distinfo b/devel/p5-DateTime-Calendar-Chinese/distinfo
index faf0d3c8e7f8..055c352a8bdd 100644
--- a/devel/p5-DateTime-Calendar-Chinese/distinfo
+++ b/devel/p5-DateTime-Calendar-Chinese/distinfo
@@ -1,3 +1,2 @@
-MD5 (DateTime-Calendar-Chinese-0.07.tar.gz) = 5d4a5cf0c50a0fc86cd7317ffeaacd77
 SHA256 (DateTime-Calendar-Chinese-0.07.tar.gz) = 63cd9021e6161c68adc523f952de97610301cd1d8d4fcbc3795cabd1d6c1cc89
 SIZE (DateTime-Calendar-Chinese-0.07.tar.gz) = 28383
diff --git a/devel/p5-DateTime-Calendar-Japanese/Makefile b/devel/p5-DateTime-Calendar-Japanese/Makefile
index 853a44555a01..e4c1a533a010 100644
--- a/devel/p5-DateTime-Calendar-Japanese/Makefile
+++ b/devel/p5-DateTime-Calendar-Japanese/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	DateTime-Calendar-Japanese
 PORTVERSION=	0.06001
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/D/DM/DMAKI
+MASTER_SITE_SUBDIR=	CPAN:DMAKI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	markun@onohara.to
diff --git a/devel/p5-DateTime-Calendar-Japanese/distinfo b/devel/p5-DateTime-Calendar-Japanese/distinfo
index f725ca1d4c50..31156ed1f90e 100644
--- a/devel/p5-DateTime-Calendar-Japanese/distinfo
+++ b/devel/p5-DateTime-Calendar-Japanese/distinfo
@@ -1,3 +1,2 @@
-MD5 (DateTime-Calendar-Japanese-0.06001.tar.gz) = 8b03ccfac402ada5e2bd66844d3077f4
 SHA256 (DateTime-Calendar-Japanese-0.06001.tar.gz) = d60863ee532c37360cec595ba4a5e50aeceb664390e461d8d744697987c53dd2
 SIZE (DateTime-Calendar-Japanese-0.06001.tar.gz) = 27478
diff --git a/devel/p5-DateTime-Event-Chinese/Makefile b/devel/p5-DateTime-Event-Chinese/Makefile
index 0ef406c2e960..d8291317bceb 100644
--- a/devel/p5-DateTime-Event-Chinese/Makefile
+++ b/devel/p5-DateTime-Event-Chinese/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	DateTime-Event-Chinese
 PORTVERSION=	0.05
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/D/DM/DMAKI
+MASTER_SITE_SUBDIR=	CPAN:DMAKI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	markun@onohara.to
diff --git a/devel/p5-DateTime-Event-Chinese/distinfo b/devel/p5-DateTime-Event-Chinese/distinfo
index dc98bd523f4f..2af521eb20eb 100644
--- a/devel/p5-DateTime-Event-Chinese/distinfo
+++ b/devel/p5-DateTime-Event-Chinese/distinfo
@@ -1,3 +1,2 @@
-MD5 (DateTime-Event-Chinese-0.05.tar.gz) = 4e24337f182596d0c4137fb44b219d47
 SHA256 (DateTime-Event-Chinese-0.05.tar.gz) = 2d33aa7f1607ac68a45c2a723dc0e041d07e1f8b590b02b6015a04886e53dd64
 SIZE (DateTime-Event-Chinese-0.05.tar.gz) = 21873
diff --git a/devel/p5-DateTime-Event-Lunar/Makefile b/devel/p5-DateTime-Event-Lunar/Makefile
index dc629b7d8591..ceefd4fd6651 100644
--- a/devel/p5-DateTime-Event-Lunar/Makefile
+++ b/devel/p5-DateTime-Event-Lunar/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	DateTime-Event-Lunar
 PORTVERSION=	0.06
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/D/DM/DMAKI
+MASTER_SITE_SUBDIR=	CPAN:DMAKI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	markun@onohara.to
diff --git a/devel/p5-DateTime-Event-Lunar/distinfo b/devel/p5-DateTime-Event-Lunar/distinfo
index d20368843c15..5386ea82370d 100644
--- a/devel/p5-DateTime-Event-Lunar/distinfo
+++ b/devel/p5-DateTime-Event-Lunar/distinfo
@@ -1,3 +1,2 @@
-MD5 (DateTime-Event-Lunar-0.06.tar.gz) = 8c09283bacd161b0c3861219382c9086
 SHA256 (DateTime-Event-Lunar-0.06.tar.gz) = 75d03ca633780a1dc92a6276710967bf1579bb7dd2ae0205b87d1ddad649ad21
 SIZE (DateTime-Event-Lunar-0.06.tar.gz) = 24161
diff --git a/devel/p5-DateTime-Event-SolarTerm/Makefile b/devel/p5-DateTime-Event-SolarTerm/Makefile
index e7ea01e11b0c..fb45be49afcb 100644
--- a/devel/p5-DateTime-Event-SolarTerm/Makefile
+++ b/devel/p5-DateTime-Event-SolarTerm/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	DateTime-Event-SolarTerm
 PORTVERSION=	0.05
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/D/DM/DMAKI
+MASTER_SITE_SUBDIR=	CPAN:DMAKI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	markun@onohara.to
diff --git a/devel/p5-DateTime-Event-SolarTerm/distinfo b/devel/p5-DateTime-Event-SolarTerm/distinfo
index 58fedfed483c..66ecce135d30 100644
--- a/devel/p5-DateTime-Event-SolarTerm/distinfo
+++ b/devel/p5-DateTime-Event-SolarTerm/distinfo
@@ -1,3 +1,2 @@
-MD5 (DateTime-Event-SolarTerm-0.05.tar.gz) = dd10a62030db8355feef5375482ba8a9
 SHA256 (DateTime-Event-SolarTerm-0.05.tar.gz) = 947693e327a983b68847f433e589e0ab56eb8d360548c5be4404ae82a79cff4e
 SIZE (DateTime-Event-SolarTerm-0.05.tar.gz) = 24735
diff --git a/devel/p5-Declare-Constraints-Simple/Makefile b/devel/p5-Declare-Constraints-Simple/Makefile
index 0f0c6babfcf0..bbeb6bbfc9c9 100644
--- a/devel/p5-Declare-Constraints-Simple/Makefile
+++ b/devel/p5-Declare-Constraints-Simple/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Declare-Constraints-Simple
 PORTVERSION=	0.03
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/P/PH/PHAYLON
+MASTER_SITE_SUBDIR=	CPAN:PHAYLON
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
@@ -20,6 +20,18 @@ RUN_DEPENDS=	p5-Class-Inspector>=1.24:${PORTSDIR}/devel/p5-Class-Inspector
 
 PERL_CONFIGURE=	yes
 
-MAN3=	Declare::Constraints::Simple::Library::Scalar.3 Declare::Constraints::Simple::Library::Operators.3 Declare::Constraints::Simple::Library::Array.3 Declare::Constraints::Simple::Library.3 Declare::Constraints::Simple::Library::Exportable.3 Declare::Constraints::Simple::Library::Referencial.3 Declare::Constraints::Simple::Result.3 Declare::Constraints::Simple.3 Declare::Constraints::Simple::Library::OO.3 Declare::Constraints::Simple::Library::Numerical.3 Declare::Constraints::Simple::Library::Hash.3 Declare::Constraints::Simple::Library::Base.3 Declare::Constraints::Simple::Library::General.3
+MAN3=	Declare::Constraints::Simple::Library::Scalar.3 \
+	Declare::Constraints::Simple::Library::Operators.3 \
+	Declare::Constraints::Simple::Library::Array.3 \
+	Declare::Constraints::Simple::Library.3 \
+	Declare::Constraints::Simple::Library::Exportable.3 \
+	Declare::Constraints::Simple::Library::Referencial.3 \
+	Declare::Constraints::Simple::Result.3 \
+	Declare::Constraints::Simple.3 \
+	Declare::Constraints::Simple::Library::OO.3 \
+	Declare::Constraints::Simple::Library::Numerical.3 \
+	Declare::Constraints::Simple::Library::Hash.3 \
+	Declare::Constraints::Simple::Library::Base.3 \
+	Declare::Constraints::Simple::Library::General.3
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Devel-Autoflush/Makefile b/devel/p5-Devel-Autoflush/Makefile
index 2687f387d602..0911920ab726 100644
--- a/devel/p5-Devel-Autoflush/Makefile
+++ b/devel/p5-Devel-Autoflush/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Devel-Autoflush
 PORTVERSION=	0.05
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/D/DA/DAGOLDEN
+MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	swills@FreeBSD.org
diff --git a/devel/p5-Devel-StackTrace-AsHTML/Makefile b/devel/p5-Devel-StackTrace-AsHTML/Makefile
index 49657ab49c51..e5db27159966 100644
--- a/devel/p5-Devel-StackTrace-AsHTML/Makefile
+++ b/devel/p5-Devel-StackTrace-AsHTML/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Devel-StackTrace-AsHTML
 PORTVERSION=	0.11
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/M/MI/MIYAGAWA
+MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/devel/p5-Dir-Watch/Makefile b/devel/p5-Dir-Watch/Makefile
index 82c796322760..6918b7287237 100644
--- a/devel/p5-Dir-Watch/Makefile
+++ b/devel/p5-Dir-Watch/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Dir-Watch
 PORTVERSION=	0.0.0
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/V/VV/VVELOX
+MASTER_SITE_SUBDIR=	CPAN:VVELOX
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vvelox@vvelox.net
diff --git a/devel/p5-Dir-Watch/distinfo b/devel/p5-Dir-Watch/distinfo
index a5c71ea1d3ee..cfa30941f3c9 100644
--- a/devel/p5-Dir-Watch/distinfo
+++ b/devel/p5-Dir-Watch/distinfo
@@ -1,3 +1,2 @@
-MD5 (Dir-Watch-0.0.0.tar.gz) = ee137c33f2e8768ed09561da3436e251
 SHA256 (Dir-Watch-0.0.0.tar.gz) = c00125f7aa4a7a14391176fc74e39f89f6adf129c44ea34e6a54dcbf51220ff9
 SIZE (Dir-Watch-0.0.0.tar.gz) = 3462
diff --git a/devel/p5-ExtUtils-Depends/Makefile b/devel/p5-ExtUtils-Depends/Makefile
index 522b5e189d20..c5edcd7ffe44 100644
--- a/devel/p5-ExtUtils-Depends/Makefile
+++ b/devel/p5-ExtUtils-Depends/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	ExtUtils-Depends
 PORTVERSION=	0.304
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/F/FL/FLORA/
+MASTER_SITE_SUBDIR=	CPAN:FLORA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	culot@FreeBSD.org
diff --git a/devel/p5-FSA-Rules/Makefile b/devel/p5-FSA-Rules/Makefile
index 80b2b748c753..c92b89410de2 100644
--- a/devel/p5-FSA-Rules/Makefile
+++ b/devel/p5-FSA-Rules/Makefile
@@ -10,10 +10,10 @@ PORTVERSION=	0.28
 PORTREVISION=	4
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/D/DW/DWHEELER
+MASTER_SITE_SUBDIR=	CPAN:DWHEELER
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Build simple rules-based state machines in Perl
 
 RUN_DEPENDS=	${SITE_PERL}/GraphViz.pm:${PORTSDIR}/graphics/p5-GraphViz \
diff --git a/devel/p5-FSA-Rules/distinfo b/devel/p5-FSA-Rules/distinfo
index 80925103d15f..1a516a9a8ec0 100644
--- a/devel/p5-FSA-Rules/distinfo
+++ b/devel/p5-FSA-Rules/distinfo
@@ -1,3 +1,2 @@
-MD5 (FSA-Rules-0.28.tar.gz) = 2daa9ddb98e62e200c0be02619f2cf78
 SHA256 (FSA-Rules-0.28.tar.gz) = 2079aa855227ae1d2b11e9a57860d42c35bd9445f09dc563bcaaa4e0053b05a9
 SIZE (FSA-Rules-0.28.tar.gz) = 31592
diff --git a/devel/p5-File-HomeDir/Makefile b/devel/p5-File-HomeDir/Makefile
index db5e4322b603..9800aec504cb 100644
--- a/devel/p5-File-HomeDir/Makefile
+++ b/devel/p5-File-HomeDir/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	File-HomeDir
 PORTVERSION=	0.97
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/A/AD/ADAMK/
+MASTER_SITE_SUBDIR=	CPAN:ADAMK
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-File-NCopy/Makefile b/devel/p5-File-NCopy/Makefile
index 2ebc358445d7..38ce1930b65b 100644
--- a/devel/p5-File-NCopy/Makefile
+++ b/devel/p5-File-NCopy/Makefile
@@ -10,10 +10,10 @@ PORTVERSION=	0.36
 PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/C/CH/CHORNY
+MASTER_SITE_SUBDIR=	CPAN:CHORNY
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Copy file(s) to directories/file
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-File-NCopy/distinfo b/devel/p5-File-NCopy/distinfo
index e286cedb986d..1ad90c92d53f 100644
--- a/devel/p5-File-NCopy/distinfo
+++ b/devel/p5-File-NCopy/distinfo
@@ -1,3 +1,2 @@
-MD5 (File-NCopy-0.36.tar.gz) = 695eb9f4147da74555a87983d2b691ad
 SHA256 (File-NCopy-0.36.tar.gz) = f983a7a85bbfc1fb5ad852c16c5aa5ccf2af3623e864c4a9090a986f94b38f65
 SIZE (File-NCopy-0.36.tar.gz) = 8477
diff --git a/devel/p5-Filesys-Notify-Simple/Makefile b/devel/p5-Filesys-Notify-Simple/Makefile
index edd838476e0d..bcf83516d45c 100644
--- a/devel/p5-Filesys-Notify-Simple/Makefile
+++ b/devel/p5-Filesys-Notify-Simple/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Filesys-Notify-Simple
 PORTVERSION=	0.07
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/M/MI/MIYAGAWA
+MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/devel/p5-Git-PurePerl/Makefile b/devel/p5-Git-PurePerl/Makefile
index ec024acb977f..c65f306ba01f 100644
--- a/devel/p5-Git-PurePerl/Makefile
+++ b/devel/p5-Git-PurePerl/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.41
 PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/L/LB/LBROCARD
+MASTER_SITE_SUBDIR=	CPAN:LBROCARD
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/devel/p5-Git-PurePerl/distinfo b/devel/p5-Git-PurePerl/distinfo
index 03e8c270cb7d..d3345635dbbe 100644
--- a/devel/p5-Git-PurePerl/distinfo
+++ b/devel/p5-Git-PurePerl/distinfo
@@ -1,3 +1,2 @@
-MD5 (Git-PurePerl-0.41.tar.gz) = 9a4b2a9aeaa68d479dbc2c681cbba551
 SHA256 (Git-PurePerl-0.41.tar.gz) = 9a274339794447a8f01dd3916f409d41f72b034f1c494d61071725547282a2d0
 SIZE (Git-PurePerl-0.41.tar.gz) = 37167
diff --git a/devel/p5-Gravatar-URL/Makefile b/devel/p5-Gravatar-URL/Makefile
index 19be84b24a5e..dd419df989b3 100644
--- a/devel/p5-Gravatar-URL/Makefile
+++ b/devel/p5-Gravatar-URL/Makefile
Mode	Name	Size
-rw-r--r--	Makefile	4957	log stats plain blame
-rw-r--r--	distinfo	203	log stats plain blame
d---------	files	219	log stats plain
-rw-r--r--	pkg-descr	581	log stats plain blame
-rw-r--r--	pkg-message	1027	log stats plain blame
-rw-r--r--	pkg-plist	223	log stats plain blame