aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/p5-Archive-Tar/Makefile2
-rw-r--r--archivers/p5-POE-Filter-LZF/Makefile2
-rw-r--r--archivers/p5-POE-Filter-LZO/Makefile2
-rw-r--r--astro/p5-ZConf-Weather/Makefile2
-rw-r--r--audio/p5-CDDB_get/Makefile4
-rw-r--r--converters/p5-Encode/Makefile2
-rw-r--r--databases/p5-Amazon-SimpleDB/Makefile2
-rw-r--r--databases/p5-Class-DBI-Loader/Makefile2
-rw-r--r--databases/p5-DBICx-Deploy/Makefile2
-rw-r--r--databases/p5-DBICx-MapMaker/Makefile2
-rw-r--r--databases/p5-DBICx-TxnInsert/Makefile2
-rw-r--r--databases/p5-DBIx-Skinny-Schema-Loader/Makefile2
-rw-r--r--databases/p5-Dancer-Session-Memcached/Makefile2
-rw-r--r--databases/p5-Ima-DBI/Makefile2
-rw-r--r--databases/p5-Memcached-libmemcached/Makefile2
-rw-r--r--databases/p5-Rose-DB/Makefile2
-rw-r--r--databases/p5-mysql-genocide/Makefile2
-rw-r--r--databases/pgtop/Makefile2
-rw-r--r--deskutils/p5-ZConf-BGSet/Makefile2
-rw-r--r--deskutils/p5-ZConf-Runner-GUI-GTK/Makefile2
-rw-r--r--deskutils/p5-ZConf-Runner/Makefile2
-rw-r--r--devel/activitymail/Makefile2
-rw-r--r--devel/activitymail/distinfo1
-rw-r--r--devel/cpan-upload-http/Makefile2
-rw-r--r--devel/cpan-upload-http/distinfo1
-rw-r--r--devel/p5-Algorithm-Cluster/Makefile2
-rw-r--r--devel/p5-AnyData/Makefile2
-rw-r--r--devel/p5-BFD/Makefile4
-rw-r--r--devel/p5-BFD/distinfo1
-rw-r--r--devel/p5-BS-Event/Makefile2
-rw-r--r--devel/p5-BS-Event/distinfo1
-rw-r--r--devel/p5-BZ-Client/Makefile2
-rw-r--r--devel/p5-BZ-Client/distinfo1
-rw-r--r--devel/p5-Best/Makefile2
-rw-r--r--devel/p5-Best/distinfo1
-rw-r--r--devel/p5-CLASS/Makefile2
-rw-r--r--devel/p5-CLASS/distinfo1
-rw-r--r--devel/p5-CPAN-Reporter-Smoker/Makefile2
-rw-r--r--devel/p5-CPAN-Reporter/Makefile2
-rw-r--r--devel/p5-CPAN-SQLite/Makefile2
-rw-r--r--devel/p5-CPAN-SQLite/distinfo1
-rw-r--r--devel/p5-CPAN-Testers-Report/Makefile2
-rw-r--r--devel/p5-CPS/Makefile2
-rw-r--r--devel/p5-Calendar-Simple/Makefile2
-rw-r--r--devel/p5-Calendar-Simple/distinfo1
-rw-r--r--devel/p5-Chooser/Makefile2
-rw-r--r--devel/p5-Chooser/distinfo1
-rw-r--r--devel/p5-Class-Autouse/Makefile2
-rw-r--r--devel/p5-Class-C3-Componentised/Makefile2
-rw-r--r--devel/p5-Class-Delegation/Makefile2
-rw-r--r--devel/p5-Class-Delegation/distinfo1
-rw-r--r--devel/p5-Code-Perl/Makefile4
-rw-r--r--devel/p5-Code-Perl/distinfo1
-rw-r--r--devel/p5-CommitBit/Makefile2
-rw-r--r--devel/p5-CommitBit/distinfo1
-rw-r--r--devel/p5-Config-Perl-V/Makefile2
-rw-r--r--devel/p5-Const-Fast/Makefile2
-rw-r--r--devel/p5-Contextual-Return/Makefile2
-rw-r--r--devel/p5-Cvs/Makefile2
-rw-r--r--devel/p5-Data-Page-NoTotalEntries/Makefile2
-rw-r--r--devel/p5-Data-Path/Makefile2
-rw-r--r--devel/p5-Data-Path/distinfo1
-rw-r--r--devel/p5-Date-Pcalc/Makefile2
-rw-r--r--devel/p5-DateTime-Calendar-Chinese/Makefile2
-rw-r--r--devel/p5-DateTime-Calendar-Chinese/distinfo1
-rw-r--r--devel/p5-DateTime-Calendar-Japanese/Makefile2
-rw-r--r--devel/p5-DateTime-Calendar-Japanese/distinfo1
-rw-r--r--devel/p5-DateTime-Event-Chinese/Makefile2
-rw-r--r--devel/p5-DateTime-Event-Chinese/distinfo1
-rw-r--r--devel/p5-DateTime-Event-Lunar/Makefile2
-rw-r--r--devel/p5-DateTime-Event-Lunar/distinfo1
-rw-r--r--devel/p5-DateTime-Event-SolarTerm/Makefile2
-rw-r--r--devel/p5-DateTime-Event-SolarTerm/distinfo1
-rw-r--r--devel/p5-Declare-Constraints-Simple/Makefile16
-rw-r--r--devel/p5-Devel-Autoflush/Makefile2
-rw-r--r--devel/p5-Devel-StackTrace-AsHTML/Makefile2
-rw-r--r--devel/p5-Dir-Watch/Makefile2
-rw-r--r--devel/p5-Dir-Watch/distinfo1
-rw-r--r--devel/p5-ExtUtils-Depends/Makefile2
-rw-r--r--devel/p5-FSA-Rules/Makefile4
-rw-r--r--devel/p5-FSA-Rules/distinfo1
-rw-r--r--devel/p5-File-HomeDir/Makefile2
-rw-r--r--devel/p5-File-NCopy/Makefile4
-rw-r--r--devel/p5-File-NCopy/distinfo1
-rw-r--r--devel/p5-Filesys-Notify-Simple/Makefile2
-rw-r--r--devel/p5-Git-PurePerl/Makefile2
-rw-r--r--devel/p5-Git-PurePerl/distinfo1
-rw-r--r--devel/p5-Gravatar-URL/Makefile2
-rw-r--r--devel/p5-Guard/Makefile2
-rw-r--r--devel/p5-Guard/distinfo1
-rw-r--r--devel/p5-HOP-Lexer/Makefile2
-rw-r--r--devel/p5-HOP-Lexer/distinfo1
-rw-r--r--devel/p5-HOP-Stream/Makefile2
-rw-r--r--devel/p5-HOP-Stream/distinfo1
-rw-r--r--devel/p5-IO-MultiPipe/Makefile2
-rw-r--r--devel/p5-IO-MultiPipe/distinfo1
-rw-r--r--devel/p5-IOC/Makefile2
-rw-r--r--devel/p5-IOC/distinfo1
-rw-r--r--devel/p5-InlineX-C2XS/Makefile2
-rw-r--r--devel/p5-InlineX-C2XS/distinfo1
-rw-r--r--devel/p5-InlineX-CPP2XS/Makefile2
-rw-r--r--devel/p5-InlineX-CPP2XS/distinfo1
-rw-r--r--devel/p5-JQuery/Makefile2
-rw-r--r--devel/p5-JQuery/distinfo1
-rw-r--r--devel/p5-Jonk/Makefile2
-rw-r--r--devel/p5-Log-Log4perl-Appender-RabbitMQ/Makefile2
-rw-r--r--devel/p5-Luka/Makefile2
-rw-r--r--devel/p5-Luka/distinfo1
-rw-r--r--devel/p5-MRO-Compat/Makefile2
-rw-r--r--devel/p5-Meta-Builder/Makefile2
-rw-r--r--devel/p5-Metabase-Client-Simple/Makefile2
-rw-r--r--devel/p5-Metabase-Fact/Makefile2
-rw-r--r--devel/p5-Mknod/Makefile2
-rw-r--r--devel/p5-Mknod/distinfo1
-rw-r--r--devel/p5-Module-Metadata/Makefile2
-rw-r--r--devel/p5-Moose-Autobox/Makefile2
-rw-r--r--devel/p5-Moose-Autobox/distinfo1
-rw-r--r--devel/p5-Moose-Policy/Makefile2
-rw-r--r--devel/p5-Moose-Policy/distinfo1
-rw-r--r--devel/p5-MooseX-Types-JSON/Makefile2
-rw-r--r--devel/p5-MouseX-AttributeHelpers/Makefile2
-rw-r--r--devel/p5-MouseX-AttributeHelpers/distinfo1
-rw-r--r--devel/p5-MouseX-Getopt/Makefile2
-rw-r--r--devel/p5-MouseX-Getopt/distinfo1
-rw-r--r--devel/p5-MouseX-Types/Makefile2
-rw-r--r--devel/p5-MouseX-Types/distinfo1
-rw-r--r--devel/p5-Number-Tolerant/Makefile2
-rw-r--r--devel/p5-OOTools/Makefile2
-rw-r--r--devel/p5-OOTools/distinfo1
-rw-r--r--devel/p5-Oogly/Makefile2
-rw-r--r--devel/p5-POEx-Role-SessionInstantiation/Makefile2
-rw-r--r--devel/p5-POEx-Role-SessionInstantiation/distinfo1
-rw-r--r--devel/p5-POEx-Role-Streaming/Makefile2
-rw-r--r--devel/p5-POEx-Role-Streaming/distinfo1
-rw-r--r--devel/p5-POEx-Types/Makefile2
-rw-r--r--devel/p5-POEx-Types/distinfo1
-rw-r--r--devel/p5-PPerl/Makefile2
-rw-r--r--devel/p5-PPerl/distinfo1
-rw-r--r--devel/p5-PadWalker/Makefile2
-rw-r--r--devel/p5-PerlMenu/Makefile2
-rw-r--r--devel/p5-PerlMenu/distinfo1
-rw-r--r--devel/p5-Pipeline/Makefile2
-rw-r--r--devel/p5-Pipeline/distinfo1
-rw-r--r--devel/p5-Return-Value/Makefile2
-rw-r--r--devel/p5-Return-Value/distinfo1
-rw-r--r--devel/p5-RunApp/Makefile2
-rw-r--r--devel/p5-RunApp/distinfo1
-rw-r--r--devel/p5-ShipIt-Step-Manifest/Makefile2
-rw-r--r--devel/p5-Smart-Comments/Makefile2
-rw-r--r--devel/p5-Spiffy/Makefile2
-rw-r--r--devel/p5-Spoon/Makefile2
-rw-r--r--devel/p5-Tee/Makefile2
-rw-r--r--devel/p5-Term-RawInput/Makefile2
-rw-r--r--devel/p5-Term-Title/Makefile2
-rw-r--r--devel/p5-Test-EOL/Makefile2
-rw-r--r--devel/p5-Test-Net-RabbitMQ/Makefile2
-rw-r--r--devel/p5-Test-NoTabs/Makefile2
-rw-r--r--devel/p5-Test-Reporter-Transport-Metabase/Makefile2
-rw-r--r--devel/p5-Test-SharedFork/Makefile2
-rw-r--r--devel/p5-Test-Singleton/distinfo1
-rw-r--r--devel/p5-ToolSet/Makefile2
-rw-r--r--devel/p5-ToolSet/distinfo1
-rw-r--r--devel/p5-VCP-Dest-svk/Makefile2
-rw-r--r--devel/p5-VCP-Dest-svk/distinfo1
-rw-r--r--devel/p5-VCP-Source-cvsbk/Makefile4
-rw-r--r--devel/p5-VCP-Source-cvsbk/distinfo1
-rw-r--r--devel/p5-VCP-autrijus/Makefile4
-rw-r--r--devel/p5-VCP-autrijus/distinfo1
-rw-r--r--devel/p5-Version-Requirements/Makefile2
-rw-r--r--devel/p5-Version-Requirements/distinfo1
-rw-r--r--devel/p5-Want/Makefile2
-rw-r--r--devel/p5-Want/distinfo1
-rw-r--r--devel/p5-WeakRef/Makefile2
-rw-r--r--devel/p5-WeakRef/distinfo1
-rw-r--r--devel/p5-Yada-Yada-Yada/Makefile4
-rw-r--r--devel/p5-Yada-Yada-Yada/distinfo1
-rw-r--r--devel/p5-ZConf-GUI/Makefile2
-rw-r--r--devel/p5-ZConf-GUI/distinfo1
-rw-r--r--devel/p5-ZML/Makefile2
-rw-r--r--devel/p5-ZML/distinfo1
-rw-r--r--devel/p5-autobox/Makefile2
-rw-r--r--devel/p5-autobox/distinfo1
-rw-r--r--devel/p5-autodie/Makefile2
-rw-r--r--devel/p5-autodie/distinfo1
-rw-r--r--devel/p5-base/Makefile2
-rw-r--r--devel/p5-boolean/Makefile2
-rw-r--r--devel/p5-boolean/distinfo1
-rw-r--r--devel/p5-common-sense/Makefile2
-rw-r--r--devel/p5-constant-lexical/Makefile2
-rw-r--r--devel/p5-constant-lexical/distinfo1
-rw-r--r--devel/p5-cpan-listchanges/Makefile2
-rw-r--r--devel/p5-github_creator/Makefile2
-rw-r--r--devel/p5-libxml-enno/Makefile2
-rw-r--r--devel/p5-libxml-enno/distinfo1
-rw-r--r--devel/p5-local-lib/Makefile2
-rw-r--r--devel/p5-namespace-autoclean/Makefile2
-rw-r--r--devel/p5-prefork/Makefile4
-rw-r--r--devel/p5-prefork/distinfo1
-rw-r--r--devel/p5-reaper/Makefile2
-rw-r--r--devel/p5-reaper/distinfo1
-rw-r--r--devel/p5-relative/Makefile2
-rw-r--r--devel/p5-relative/distinfo1
-rw-r--r--devel/p5-rpm-build-perl/Makefile2
-rw-r--r--devel/p5-self-init/Makefile2
-rw-r--r--devel/p5-self/Makefile2
-rw-r--r--devel/p5-subatom/Makefile2
-rw-r--r--devel/p5-subatom/distinfo1
-rw-r--r--devel/p5-uni-perl/Makefile2
-rw-r--r--devel/p5-uni-perl/distinfo1
-rw-r--r--devel/perlconsole/Makefile2
-rw-r--r--devel/perlconsole/distinfo1
-rw-r--r--devel/svk/Makefile2
-rw-r--r--devel/svk/distinfo1
-rw-r--r--dns/p5-Net-DNS-RR-SRV-Helper/Makefile2
-rw-r--r--editors/p5-Vimana/Makefile2
-rw-r--r--graphics/p5-Image-Size-FillFullSelect/Makefile2
-rw-r--r--graphics/p5-Image-Size-FillFullSelect/distinfo1
-rw-r--r--irc/p5-IRC-Bot-Hangman/Makefile4
-rw-r--r--japanese/jacode.pl/Makefile2
-rw-r--r--japanese/p5-DateTime-Format-Japanese/Makefile2
-rw-r--r--lang/p5-Interpolation/Makefile2
-rw-r--r--lang/p5-JSAN/Makefile2
-rw-r--r--lang/p5-Modern-Perl/Makefile2
-rw-r--r--lang/p5-Modern-Perl/distinfo1
-rw-r--r--lang/p5-Switch/Makefile2
-rw-r--r--lang/p5-Switch/distinfo1
-rw-r--r--lang/p5-Test-XPath/Makefile2
-rw-r--r--lang/p5-Test-XPath/distinfo1
-rw-r--r--lang/p5-TryCatch/Makefile2
-rw-r--r--lang/p5-signatures/Makefile2
-rw-r--r--lang/p5-signatures/distinfo1
-rw-r--r--mail/p5-Mail-Cache/Makefile2
-rw-r--r--mail/p5-Mail-Cache/distinfo1
-rw-r--r--mail/p5-Mail-IMAPClient/Makefile2
-rw-r--r--mail/p5-Mail-IMAPTalk-MailCache/Makefile2
-rw-r--r--mail/p5-Mail-IMAPTalk-MailCache/distinfo1
-rw-r--r--mail/p5-ZConf-Mail/Makefile2
-rw-r--r--math/p5-Data-Float/Makefile2
-rw-r--r--math/p5-GIS-Distance-Lite/Makefile2
-rw-r--r--math/p5-GIS-Distance/Makefile2
-rw-r--r--math/p5-Math-Random-ISAAC-XS/Makefile2
-rw-r--r--math/p5-Math-Random-ISAAC/Makefile2
-rw-r--r--math/p5-Number-Fraction/Makefile2
-rw-r--r--misc/p5-Array-Compare/Makefile2
-rw-r--r--misc/p5-Business-UPS/Makefile2
-rw-r--r--misc/p5-Zen-Koans/Makefile2
-rw-r--r--multimedia/p5-FFmpeg-Command/Makefile2
-rw-r--r--multimedia/p5-FFmpeg-Command/distinfo1
-rw-r--r--multimedia/p5-FLV-Info/Makefile2
-rw-r--r--net-im/p5-DJabberd/Makefile2
-rw-r--r--net-mgmt/p5-Data-Validate-IP/Makefile2
-rw-r--r--net-mgmt/p5-NSNMP/Makefile2
-rw-r--r--net-mgmt/p5-Nagios-Plugins-Memcached/Makefile2
-rw-r--r--net-p2p/p5-Net-DirectConnect-TigerHash/Makefile2
-rw-r--r--net-p2p/p5-Net-DirectConnect/Makefile2
-rw-r--r--net/ldapsh/Makefile2
-rw-r--r--net/p5-AddressBook/Makefile4
-rw-r--r--net/p5-BBS-Client/Makefile2
-rw-r--r--net/p5-BBS-UserInfo-Maple3/Makefile2
-rw-r--r--net/p5-BBS-UserInfo-Maple3itoc/Makefile2
-rw-r--r--net/p5-BBS-UserInfo-Ptt/Makefile2
-rw-r--r--net/p5-BBS-UserInfo-SOB/Makefile2
-rw-r--r--net/p5-BBS-UserInfo-Wretch/Makefile2
-rw-r--r--net/p5-BBS-UserInfo/Makefile2
-rw-r--r--net/p5-Net-Amazon-AWSSign/Makefile2
-rw-r--r--net/p5-Net-LDAP-AutoDNs/Makefile2
-rw-r--r--net/p5-Net-LDAP-AutoServer/Makefile2
-rw-r--r--net/p5-Net-LDAP-LDAPhash/Makefile2
-rw-r--r--net/p5-Net-LDAP-Makepath/Makefile2
-rw-r--r--net/p5-Net-LDAP-posixAccount/Makefile2
-rw-r--r--net/p5-Net-LDAP-posixGroup/Makefile2
-rw-r--r--net/p5-Net-Traceroute/Makefile2
-rw-r--r--net/p5-OAuth-Lite/Makefile2
-rw-r--r--net/p5-POEx-Role-TCPServer/Makefile2
-rw-r--r--net/p5-REST-Application/Makefile4
-rw-r--r--net/p5-REST-Google/Makefile2
-rw-r--r--net/p5-Server-Starter/Makefile2
-rw-r--r--net/p5-Spread-Message/Makefile4
-rw-r--r--net/p5-URI/Makefile2
-rw-r--r--net/p5-Validate-Net/Makefile2
-rw-r--r--net/p5-What/Makefile2
-rw-r--r--net/p5-XML-Compile-SOAP/Makefile2
-rw-r--r--net/p5-XPC/Makefile4
-rw-r--r--net/p5-ZConf-Bookmarks/Makefile2
-rw-r--r--net/p5-ZConf/Makefile2
-rw-r--r--ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/Makefile2
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
@@ -8,7 +8,7 @@ PORTNAME= Gravatar-URL
PORTVERSION= 1.02
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/M/MS/MSCHWERN
+MASTER_SITE_SUBDIR= CPAN:MSCHWERN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Guard/Makefile b/devel/p5-Guard/Makefile
index 3a152a0bc41a..d3523e490783 100644
--- a/devel/p5-Guard/Makefile
+++ b/devel/p5-Guard/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Guard
PORTVERSION= 1.021
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/M/ML/MLEHMANN
+MASTER_SITE_SUBDIR= CPAN:MLEHMANN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Guard/distinfo b/devel/p5-Guard/distinfo
index ff71655aa925..5e77c3399c47 100644
--- a/devel/p5-Guard/distinfo
+++ b/devel/p5-Guard/distinfo
@@ -1,3 +1,2 @@
-MD5 (Guard-1.021.tar.gz) = 6c15e885c089115f8263a5873ed74f1e
SHA256 (Guard-1.021.tar.gz) = f3b610f51df997dd6f6384ad319baabe377f70f2088d665a3067c25c03a6a9de
SIZE (Guard-1.021.tar.gz) = 6621
diff --git a/devel/p5-HOP-Lexer/Makefile b/devel/p5-HOP-Lexer/Makefile
index 665869977569..fc783247079e 100644
--- a/devel/p5-HOP-Lexer/Makefile
+++ b/devel/p5-HOP-Lexer/Makefile
@@ -9,7 +9,7 @@ PORTNAME= HOP-Lexer
PORTVERSION= 0.032
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/O/OV/OVID
+MASTER_SITE_SUBDIR= CPAN:OVID
PKGNAMEPREFIX= p5-
MAINTAINER= swills@FreeBSD.org
diff --git a/devel/p5-HOP-Lexer/distinfo b/devel/p5-HOP-Lexer/distinfo
index 6d1e39d75b57..061422f308a9 100644
--- a/devel/p5-HOP-Lexer/distinfo
+++ b/devel/p5-HOP-Lexer/distinfo
@@ -1,3 +1,2 @@
-MD5 (HOP-Lexer-0.032.tar.gz) = 71f081163ab81f35607b24b7fd0cd808
SHA256 (HOP-Lexer-0.032.tar.gz) = 2555ec7751b06bef496a6101b5c335a7f6453135ef05db674e4dee2515c6f77c
SIZE (HOP-Lexer-0.032.tar.gz) = 13081
diff --git a/devel/p5-HOP-Stream/Makefile b/devel/p5-HOP-Stream/Makefile
index d36e5b9548e6..8d6eae083add 100644
--- a/devel/p5-HOP-Stream/Makefile
+++ b/devel/p5-HOP-Stream/Makefile
@@ -9,7 +9,7 @@ PORTNAME= HOP-Stream
PORTVERSION= 0.03
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/O/OV/OVID
+MASTER_SITE_SUBDIR= CPAN:OVID
PKGNAMEPREFIX= p5-
MAINTAINER= swills@FreeBSD.org
diff --git a/devel/p5-HOP-Stream/distinfo b/devel/p5-HOP-Stream/distinfo
index 781d4896fad8..1087197b1bc1 100644
--- a/devel/p5-HOP-Stream/distinfo
+++ b/devel/p5-HOP-Stream/distinfo
@@ -1,3 +1,2 @@
-MD5 (HOP-Stream-0.03.tar.gz) = 1f2f3f7af989f18bd235417d51d3cd43
SHA256 (HOP-Stream-0.03.tar.gz) = bf2383ca5e939af5f2d31c7758497a24c4fb74aab3a12966680926fdc5f23d00
SIZE (HOP-Stream-0.03.tar.gz) = 8842
diff --git a/devel/p5-IO-MultiPipe/Makefile b/devel/p5-IO-MultiPipe/Makefile
index f0981315c3b0..dad0aff0b579 100644
--- a/devel/p5-IO-MultiPipe/Makefile
+++ b/devel/p5-IO-MultiPipe/Makefile
@@ -9,7 +9,7 @@ PORTNAME= IO-MultiPipe
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-IO-MultiPipe/distinfo b/devel/p5-IO-MultiPipe/distinfo
index 62aebf76979d..b164444949e1 100644
--- a/devel/p5-IO-MultiPipe/distinfo
+++ b/devel/p5-IO-MultiPipe/distinfo
@@ -1,3 +1,2 @@
-MD5 (IO-MultiPipe-0.0.0.tar.gz) = 7f311e9405adcb12ddee1edb5f869ade
SHA256 (IO-MultiPipe-0.0.0.tar.gz) = e300e5ca4c8a80d563b6b75191bdb37bd0833d2d14b7ed6c970cee6a8c0dd17c
SIZE (IO-MultiPipe-0.0.0.tar.gz) = 3877
diff --git a/devel/p5-IOC/Makefile b/devel/p5-IOC/Makefile
index ad54a83593e2..7597032696e3 100644
--- a/devel/p5-IOC/Makefile
+++ b/devel/p5-IOC/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.29
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/S/ST/STEVAN
+MASTER_SITE_SUBDIR= CPAN:STEVAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-IOC/distinfo b/devel/p5-IOC/distinfo
index e4359c0dacab..149cf4022547 100644
--- a/devel/p5-IOC/distinfo
+++ b/devel/p5-IOC/distinfo
@@ -1,3 +1,2 @@
-MD5 (IOC-0.29.tar.gz) = 34823576647c38fd612d031b1b26eb1c
SHA256 (IOC-0.29.tar.gz) = 659038a6723d6660caa1f07e44b8eb21d1583ade3fdf671e0a77c88a1a8f928d
SIZE (IOC-0.29.tar.gz) = 48846
diff --git a/devel/p5-InlineX-C2XS/Makefile b/devel/p5-InlineX-C2XS/Makefile
index ee26677de6d3..dd6818298a1f 100644
--- a/devel/p5-InlineX-C2XS/Makefile
+++ b/devel/p5-InlineX-C2XS/Makefile
@@ -9,7 +9,7 @@ PORTNAME= InlineX-C2XS
PORTVERSION= 0.16
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/S/SI/SISYPHUS/
+MASTER_SITE_SUBDIR= CPAN:SISYPHUS
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-InlineX-C2XS/distinfo b/devel/p5-InlineX-C2XS/distinfo
index ddc57b012cc8..2a95293f1f9b 100644
--- a/devel/p5-InlineX-C2XS/distinfo
+++ b/devel/p5-InlineX-C2XS/distinfo
@@ -1,3 +1,2 @@
-MD5 (InlineX-C2XS-0.16.tar.gz) = a6ede65c513e5f0205bbc490c59bad9a
SHA256 (InlineX-C2XS-0.16.tar.gz) = cb124ec276adc7970d36855a7c2d34d3fc8f85e2a5b23fd4e1908dbce3b17b6c
SIZE (InlineX-C2XS-0.16.tar.gz) = 22089
diff --git a/devel/p5-InlineX-CPP2XS/Makefile b/devel/p5-InlineX-CPP2XS/Makefile
index f7fa1572dc8f..cf6387a7e141 100644
--- a/devel/p5-InlineX-CPP2XS/Makefile
+++ b/devel/p5-InlineX-CPP2XS/Makefile
@@ -9,7 +9,7 @@ PORTNAME= InlineX-CPP2XS
PORTVERSION= 0.16
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/S/SI/SISYPHUS/
+MASTER_SITE_SUBDIR= CPAN:SISYPHUS
PKGNAMEPREFIX= p5-
MAINTAINER= wen@FreeBSD.org
diff --git a/devel/p5-InlineX-CPP2XS/distinfo b/devel/p5-InlineX-CPP2XS/distinfo
index 46869f6bf586..523f22477952 100644
--- a/devel/p5-InlineX-CPP2XS/distinfo
+++ b/devel/p5-InlineX-CPP2XS/distinfo
@@ -1,3 +1,2 @@
-MD5 (InlineX-CPP2XS-0.16.tar.gz) = e18dcbefec726d10a2b6f504bfe80da9
SHA256 (InlineX-CPP2XS-0.16.tar.gz) = 4011f58fb01a38e5128c544c77cab87690614e3ae07e11c211fab2401439980e
SIZE (InlineX-CPP2XS-0.16.tar.gz) = 20047
diff --git a/devel/p5-JQuery/Makefile b/devel/p5-JQuery/Makefile
index c51df631a219..6f7b9c6981df 100644
--- a/devel/p5-JQuery/Makefile
+++ b/devel/p5-JQuery/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.06
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/P/PE/PETERG
+MASTER_SITE_SUBDIR= CPAN:PETERG
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-JQuery/distinfo b/devel/p5-JQuery/distinfo
index 042b24a20c09..488055b82dd6 100644
--- a/devel/p5-JQuery/distinfo
+++ b/devel/p5-JQuery/distinfo
@@ -1,3 +1,2 @@
-MD5 (JQuery-1.06.tar.gz) = d317913b18a0fba992b9a74a037677c0
SHA256 (JQuery-1.06.tar.gz) = b8a837fd4fde8deaa67fce0b0e89253dc0df72456f01718e26aea63540b11c0d
SIZE (JQuery-1.06.tar.gz) = 300489
diff --git a/devel/p5-Jonk/Makefile b/devel/p5-Jonk/Makefile
index 349da3387fe3..33ab2074c7ef 100644
--- a/devel/p5-Jonk/Makefile
+++ b/devel/p5-Jonk/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Jonk
PORTVERSION= 0.05
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/N/NE/NEKOKAK
+MASTER_SITE_SUBDIR= CPAN:NEKOKAK
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-Log-Log4perl-Appender-RabbitMQ/Makefile b/devel/p5-Log-Log4perl-Appender-RabbitMQ/Makefile
index ae8405f38a24..9a171cc5aef7 100644
--- a/devel/p5-Log-Log4perl-Appender-RabbitMQ/Makefile
+++ b/devel/p5-Log-Log4perl-Appender-RabbitMQ/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Log-Log4perl-Appender-RabbitMQ
PORTVERSION= 0.102220
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/B/BU/BUNDACIA
+MASTER_SITE_SUBDIR= CPAN:BUNDACIA
PKGNAMEPREFIX= p5-
MAINTAINER= swills@FreeBSD.org
diff --git a/devel/p5-Luka/Makefile b/devel/p5-Luka/Makefile
index 9b8e97677ceb..bd3af3521836 100644
--- a/devel/p5-Luka/Makefile
+++ b/devel/p5-Luka/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Luka
PORTVERSION= 1.08
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/T/TP/TPG
+MASTER_SITE_SUBDIR= CPAN:TPG
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-Luka/distinfo b/devel/p5-Luka/distinfo
index 10b725f20f5e..be2081510ebd 100644
--- a/devel/p5-Luka/distinfo
+++ b/devel/p5-Luka/distinfo
@@ -1,3 +1,2 @@
-MD5 (Luka-1.08.tar.gz) = 55886081f6ffeb83e4d1c69f2efa87db
SHA256 (Luka-1.08.tar.gz) = 41a98a451c41c95226be5e3f91a55adea97fdd393f8fdb0eb983e4a50f01f1fa
SIZE (Luka-1.08.tar.gz) = 36533
diff --git a/devel/p5-MRO-Compat/Makefile b/devel/p5-MRO-Compat/Makefile
index 6d8b106c21f8..222d53892bac 100644
--- a/devel/p5-MRO-Compat/Makefile
+++ b/devel/p5-MRO-Compat/Makefile
@@ -9,7 +9,7 @@ PORTNAME= MRO-Compat
PORTVERSION= 0.11
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/F/FL/FLORA
+MASTER_SITE_SUBDIR= CPAN:FLORA
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Meta-Builder/Makefile b/devel/p5-Meta-Builder/Makefile
index 2b6160b9cd0e..7dc3b95c6493 100644
--- a/devel/p5-Meta-Builder/Makefile
+++ b/devel/p5-Meta-Builder/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.003
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/E/EX/EXODIST
+MASTER_SITE_SUBDIR= CPAN:EXODIST
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-Metabase-Client-Simple/Makefile b/devel/p5-Metabase-Client-Simple/Makefile
index 17819feec51e..ea2ec8094676 100644
--- a/devel/p5-Metabase-Client-Simple/Makefile
+++ b/devel/p5-Metabase-Client-Simple/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.008
PORTREVISION= 1
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-Metabase-Fact/Makefile b/devel/p5-Metabase-Fact/Makefile
index c66ddcc3d548..538e3387f9d7 100644
--- a/devel/p5-Metabase-Fact/Makefile
+++ b/devel/p5-Metabase-Fact/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Metabase-Fact
PORTVERSION= 0.019
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-Mknod/Makefile b/devel/p5-Mknod/Makefile
index 56a199925d2a..3ffc0f576ea5 100644
--- a/devel/p5-Mknod/Makefile
+++ b/devel/p5-Mknod/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Mknod
PORTVERSION= 0.02
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/R/RL/RLZWART
+MASTER_SITE_SUBDIR= CPAN:RLZWART
PKGNAMEPREFIX= p5-
MAINTAINER= sean-freebsd@farley.org
diff --git a/devel/p5-Mknod/distinfo b/devel/p5-Mknod/distinfo
index 610f220a955b..bae10fddfd83 100644
--- a/devel/p5-Mknod/distinfo
+++ b/devel/p5-Mknod/distinfo
@@ -1,3 +1,2 @@
-MD5 (Mknod-0.02.tar.gz) = f81801b1cc38c5e3ec9a755085e50dbb
SHA256 (Mknod-0.02.tar.gz) = 70b3db0857b92e42187113b5aed92d29acfc0d7671d69ce9b91dd3be026cc823
SIZE (Mknod-0.02.tar.gz) = 7591
diff --git a/devel/p5-Module-Metadata/Makefile b/devel/p5-Module-Metadata/Makefile
index e1e18512e210..225aa422c733 100644
--- a/devel/p5-Module-Metadata/Makefile
+++ b/devel/p5-Module-Metadata/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Module-Metadata
PORTVERSION= 1.000004
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/D/DA/DAGOLDEN
+MASTER_SITE_SUBDIR= CPAN:DAGOLDEN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-Moose-Autobox/Makefile b/devel/p5-Moose-Autobox/Makefile
index 69a29d81f9de..6a611f642771 100644
--- a/devel/p5-Moose-Autobox/Makefile
+++ b/devel/p5-Moose-Autobox/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Moose-Autobox
PORTVERSION= 0.11
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/R/RJ/RJBS/
+MASTER_SITE_SUBDIR= CPAN:RJBS
PKGNAMEPREFIX= p5-
MAINTAINER= bill.brinzer@gmail.com
diff --git a/devel/p5-Moose-Autobox/distinfo b/devel/p5-Moose-Autobox/distinfo
index dc6234d5a12a..1ab487ad753f 100644
--- a/devel/p5-Moose-Autobox/distinfo
+++ b/devel/p5-Moose-Autobox/distinfo
@@ -1,3 +1,2 @@
-MD5 (Moose-Autobox-0.11.tar.gz) = 9d2e237c2cbe7e2cfe3afe8f0bbf75e7
SHA256 (Moose-Autobox-0.11.tar.gz) = ca3da12969166189601b0ca50ba0fdbd39162ff95c5223051da61cb93c6ce877
SIZE (Moose-Autobox-0.11.tar.gz) = 32047
diff --git a/devel/p5-Moose-Policy/Makefile b/devel/p5-Moose-Policy/Makefile
index 9c3879f5f78b..7ee6d7da78ca 100644
--- a/devel/p5-Moose-Policy/Makefile
+++ b/devel/p5-Moose-Policy/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.03
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/S/ST/STEVAN
+MASTER_SITE_SUBDIR= CPAN:STEVAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Moose-Policy/distinfo b/devel/p5-Moose-Policy/distinfo
index e0d0eab0d0c6..293c63b75fe8 100644
--- a/devel/p5-Moose-Policy/distinfo
+++ b/devel/p5-Moose-Policy/distinfo
@@ -1,3 +1,2 @@
-MD5 (Moose-Policy-0.03.tar.gz) = 2795e8b1b68e6b6c34538e84a3ae3de3
SHA256 (Moose-Policy-0.03.tar.gz) = bfb0efba5962147b7213bd647f92d5c216bc9455576a2f7027458bc61c077a83
SIZE (Moose-Policy-0.03.tar.gz) = 7047
diff --git a/devel/p5-MooseX-Types-JSON/Makefile b/devel/p5-MooseX-Types-JSON/Makefile
index 979a5be14499..836fc96b7510 100644
--- a/devel/p5-MooseX-Types-JSON/Makefile
+++ b/devel/p5-MooseX-Types-JSON/Makefile
@@ -9,7 +9,7 @@ PORTNAME= MooseX-Types-JSON
PORTVERSION= 0.02
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/M/MI/MILA
+MASTER_SITE_SUBDIR= CPAN:MILA
PKGNAMEPREFIX= p5-
MAINTAINER= milki@rescomp.berkeley.edu
diff --git a/devel/p5-MouseX-AttributeHelpers/Makefile b/devel/p5-MouseX-AttributeHelpers/Makefile
index 290a8a97bcd3..ce4dfb4b2c80 100644
--- a/devel/p5-MouseX-AttributeHelpers/Makefile
+++ b/devel/p5-MouseX-AttributeHelpers/Makefile
@@ -9,7 +9,7 @@ PORTNAME= MouseX-AttributeHelpers
PORTVERSION= 0.06
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/M/MA/MASAKI
+MASTER_SITE_SUBDIR= CPAN:MASAKI
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-MouseX-AttributeHelpers/distinfo b/devel/p5-MouseX-AttributeHelpers/distinfo
index d876fa0a6f62..c432f9844352 100644
--- a/devel/p5-MouseX-AttributeHelpers/distinfo
+++ b/devel/p5-MouseX-AttributeHelpers/distinfo
@@ -1,3 +1,2 @@
-MD5 (MouseX-AttributeHelpers-0.06.tar.gz) = 3c99db4f76b84fc5bfd79744bed4648f
SHA256 (MouseX-AttributeHelpers-0.06.tar.gz) = 82a606fe600519369fa138d9a36c7f962b17ace75c1aa42d10b315cc9db58cff
SIZE (MouseX-AttributeHelpers-0.06.tar.gz) = 46013
diff --git a/devel/p5-MouseX-Getopt/Makefile b/devel/p5-MouseX-Getopt/Makefile
index 52306fc61008..761d35b4da41 100644
--- a/devel/p5-MouseX-Getopt/Makefile
+++ b/devel/p5-MouseX-Getopt/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= ${DISTVERSION}00
DISTVERSION= 0.33
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-MouseX-Getopt/distinfo b/devel/p5-MouseX-Getopt/distinfo
index 321e35d9715c..fe42068ec57e 100644
--- a/devel/p5-MouseX-Getopt/distinfo
+++ b/devel/p5-MouseX-Getopt/distinfo
@@ -1,3 +1,2 @@
-MD5 (MouseX-Getopt-0.33.tar.gz) = f93c2086167e1f531b0fb34a67029ebf
SHA256 (MouseX-Getopt-0.33.tar.gz) = aa7c5d905a522b420e763a43a52f094ffeb0a67cd2cb68276bb54e9c791223f8
SIZE (MouseX-Getopt-0.33.tar.gz) = 28280
diff --git a/devel/p5-MouseX-Types/Makefile b/devel/p5-MouseX-Types/Makefile
index 604ba73baed1..9aa37b66ed1b 100644
--- a/devel/p5-MouseX-Types/Makefile
+++ b/devel/p5-MouseX-Types/Makefile
@@ -9,7 +9,7 @@ PORTNAME= MouseX-Types
PORTVERSION= 0.05
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/G/GF/GFUJI
+MASTER_SITE_SUBDIR= CPAN:GFUJI
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-MouseX-Types/distinfo b/devel/p5-MouseX-Types/distinfo
index 47b654a65018..38370364c404 100644
--- a/devel/p5-MouseX-Types/distinfo
+++ b/devel/p5-MouseX-Types/distinfo
@@ -1,3 +1,2 @@
-MD5 (MouseX-Types-0.05.tar.gz) = 9f29b3a0d669d490b5aae532f04f2acb
SHA256 (MouseX-Types-0.05.tar.gz) = e0525da9e6168c45765f8e7dd69999ffc228da51816e77b5a82a6fb23278199b
SIZE (MouseX-Types-0.05.tar.gz) = 20581
diff --git a/devel/p5-Number-Tolerant/Makefile b/devel/p5-Number-Tolerant/Makefile
index b921a669c82f..d51c406555cf 100644
--- a/devel/p5-Number-Tolerant/Makefile
+++ b/devel/p5-Number-Tolerant/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Number-Tolerant
PORTVERSION= 1.701
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/R/RJ/RJBS
+MASTER_SITE_SUBDIR= CPAN:RJBS
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-OOTools/Makefile b/devel/p5-OOTools/Makefile
index c7eb4357cd55..932ab892d5fb 100644
--- a/devel/p5-OOTools/Makefile
+++ b/devel/p5-OOTools/Makefile
@@ -9,7 +9,7 @@ PORTNAME= OOTools
PORTVERSION= 2.21
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/D/DO/DOMIZIO
+MASTER_SITE_SUBDIR= CPAN:DOMIZIO
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-OOTools/distinfo b/devel/p5-OOTools/distinfo
index b7d746fcc71d..3d01472e3362 100644
--- a/devel/p5-OOTools/distinfo
+++ b/devel/p5-OOTools/distinfo
@@ -1,3 +1,2 @@
-MD5 (OOTools-2.21.tar.gz) = 41b50eeccc13f23bc7e91c0f5c333c88
SHA256 (OOTools-2.21.tar.gz) = 2f7fa4200c9ff6cb7c7464bda039a6bd94a7c8b2bb1433f6face01d6a17091c6
SIZE (OOTools-2.21.tar.gz) = 24021
diff --git a/devel/p5-Oogly/Makefile b/devel/p5-Oogly/Makefile
index df968348911d..bfeef08133a0 100644
--- a/devel/p5-Oogly/Makefile
+++ b/devel/p5-Oogly/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Oogly
PORTVERSION= 0.31
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/A/AW/AWNCORP
+MASTER_SITE_SUBDIR= CPAN:AWNCORP
PKGNAMEPREFIX= p5-
MAINTAINER= magik@roorback.net
diff --git a/devel/p5-POEx-Role-SessionInstantiation/Makefile b/devel/p5-POEx-Role-SessionInstantiation/Makefile
index 6bf5bcfc42d9..d8c14753f642 100644
--- a/devel/p5-POEx-Role-SessionInstantiation/Makefile
+++ b/devel/p5-POEx-Role-SessionInstantiation/Makefile
@@ -9,7 +9,7 @@ PORTNAME= POEx-Role-SessionInstantiation
PORTVERSION= 1.102610
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/N/NP/NPEREZ
+MASTER_SITE_SUBDIR= CPAN:NPEREZ
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-POEx-Role-SessionInstantiation/distinfo b/devel/p5-POEx-Role-SessionInstantiation/distinfo
index f616073f66b2..807e77b7ec86 100644
--- a/devel/p5-POEx-Role-SessionInstantiation/distinfo
+++ b/devel/p5-POEx-Role-SessionInstantiation/distinfo
@@ -1,3 +1,2 @@
-MD5 (POEx-Role-SessionInstantiation-1.102610.tar.gz) = eec75436e518c6546df2e85eac29778d
SHA256 (POEx-Role-SessionInstantiation-1.102610.tar.gz) = a6e3c523998869e8dd30b91d91f1248ac44360aa7caec74e204128bf839fd5a9
SIZE (POEx-Role-SessionInstantiation-1.102610.tar.gz) = 19895
diff --git a/devel/p5-POEx-Role-Streaming/Makefile b/devel/p5-POEx-Role-Streaming/Makefile
index 0e200a796065..ec6478fa2d7c 100644
--- a/devel/p5-POEx-Role-Streaming/Makefile
+++ b/devel/p5-POEx-Role-Streaming/Makefile
@@ -9,7 +9,7 @@ PORTNAME= POEx-Role-Streaming
PORTVERSION= 1.102610
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/N/NP/NPEREZ
+MASTER_SITE_SUBDIR= CPAN:NPEREZ
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-POEx-Role-Streaming/distinfo b/devel/p5-POEx-Role-Streaming/distinfo
index 478607b26586..bc0c94adf44d 100644
--- a/devel/p5-POEx-Role-Streaming/distinfo
+++ b/devel/p5-POEx-Role-Streaming/distinfo
@@ -1,3 +1,2 @@
-MD5 (POEx-Role-Streaming-1.102610.tar.gz) = c6fe1ef39d7d29159e427e87913b7dbd
SHA256 (POEx-Role-Streaming-1.102610.tar.gz) = 9317d4b0a531dc68330d5005557cd615ea86f79b468be4f85acf0b7946617f88
SIZE (POEx-Role-Streaming-1.102610.tar.gz) = 11488
diff --git a/devel/p5-POEx-Types/Makefile b/devel/p5-POEx-Types/Makefile
index 72332d7cc7ae..e62f883b7dc0 100644
--- a/devel/p5-POEx-Types/Makefile
+++ b/devel/p5-POEx-Types/Makefile
@@ -9,7 +9,7 @@ PORTNAME= POEx-Types
PORTVERSION= 1.100910
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/N/NP/NPEREZ
+MASTER_SITE_SUBDIR= CPAN:NPEREZ
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-POEx-Types/distinfo b/devel/p5-POEx-Types/distinfo
index cdf1cb7d5e9a..5dbf3ca4dd00 100644
--- a/devel/p5-POEx-Types/distinfo
+++ b/devel/p5-POEx-Types/distinfo
@@ -1,3 +1,2 @@
-MD5 (POEx-Types-1.100910.tar.gz) = a260ab5d10454eea2ac43638bcdc3652
SHA256 (POEx-Types-1.100910.tar.gz) = a05aab5b6aaba6846c29a28f1f5658dc0fd0d93b8ca3e03e0f76babf4958f6ae
SIZE (POEx-Types-1.100910.tar.gz) = 9846
diff --git a/devel/p5-PPerl/Makefile b/devel/p5-PPerl/Makefile
index e229e829d313..34533e5f4507 100644
--- a/devel/p5-PPerl/Makefile
+++ b/devel/p5-PPerl/Makefile
@@ -11,7 +11,7 @@ PORTVERSION= 0.25
PORTREVISION= 2
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/M/MS/MSERGEANT
+MASTER_SITE_SUBDIR= CPAN:MSERGEANT
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-PPerl/distinfo b/devel/p5-PPerl/distinfo
index 168a696f0e96..988497e01399 100644
--- a/devel/p5-PPerl/distinfo
+++ b/devel/p5-PPerl/distinfo
@@ -1,3 +1,2 @@
-MD5 (PPerl-0.25.tar.gz) = 32c94d7154494e292241a3d629eed4ea
SHA256 (PPerl-0.25.tar.gz) = 35cdde6e9aabc1c78b50a8a41328bc3e334af5f0b9dd422a4639f33abbf674f0
SIZE (PPerl-0.25.tar.gz) = 22550
diff --git a/devel/p5-PadWalker/Makefile b/devel/p5-PadWalker/Makefile
index 1de3f49b5821..e7c897e992e1 100644
--- a/devel/p5-PadWalker/Makefile
+++ b/devel/p5-PadWalker/Makefile
@@ -9,7 +9,7 @@ PORTNAME= PadWalker
PORTVERSION= 1.92
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/R/RO/ROBIN
+MASTER_SITE_SUBDIR= CPAN:ROBIN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-PerlMenu/Makefile b/devel/p5-PerlMenu/Makefile
index 1a724b1dd3cb..258ed250f8cb 100644
--- a/devel/p5-PerlMenu/Makefile
+++ b/devel/p5-PerlMenu/Makefile
@@ -9,7 +9,7 @@ PORTNAME= PerlMenu
PORTVERSION= 4.0
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/S/SK/SKUNZ
+MASTER_SITE_SUBDIR= CPAN:SKUNZ
PKGNAMEPREFIX= p5-
DISTNAME= perlmenu.v4.0
diff --git a/devel/p5-PerlMenu/distinfo b/devel/p5-PerlMenu/distinfo
index daa71f914471..e84695d49911 100644
--- a/devel/p5-PerlMenu/distinfo
+++ b/devel/p5-PerlMenu/distinfo
@@ -1,3 +1,2 @@
-MD5 (perlmenu.v4.0.tar.gz) = b931859ed581970f3fb05420316b39d3
SHA256 (perlmenu.v4.0.tar.gz) = 32a3c575845c59f61977659badd570a68acb07aaf733e87eaf4e4fcc34536330
SIZE (perlmenu.v4.0.tar.gz) = 84536
diff --git a/devel/p5-Pipeline/Makefile b/devel/p5-Pipeline/Makefile
index b48ea450ea17..728b90705afa 100644
--- a/devel/p5-Pipeline/Makefile
+++ b/devel/p5-Pipeline/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 3.12
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/R/RC/RCLAMP
+MASTER_SITE_SUBDIR= CPAN:RCLAMP
PKGNAMEPREFIX= p5-
MAINTAINER= rouslan@rshell.net
diff --git a/devel/p5-Pipeline/distinfo b/devel/p5-Pipeline/distinfo
index 57c2c79b08e4..f3353752112d 100644
--- a/devel/p5-Pipeline/distinfo
+++ b/devel/p5-Pipeline/distinfo
@@ -1,3 +1,2 @@
-MD5 (Pipeline-3.12.tar.gz) = 52cbc818aa18f7307dc00624741e5a73
SHA256 (Pipeline-3.12.tar.gz) = c3e242f675b61dc0a3dec670fbcbe3ff5b0bbe952333377cb3acb86796b3de01
SIZE (Pipeline-3.12.tar.gz) = 19821
diff --git a/devel/p5-Return-Value/Makefile b/devel/p5-Return-Value/Makefile
index c1b8d0d17355..dde3282e1525 100644
--- a/devel/p5-Return-Value/Makefile
+++ b/devel/p5-Return-Value/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Return-Value
PORTVERSION= 1.666001
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/R/RJ/RJBS
+MASTER_SITE_SUBDIR= CPAN:RJBS
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Return-Value/distinfo b/devel/p5-Return-Value/distinfo
index 0fb9ec059664..9708691c27c0 100644
--- a/devel/p5-Return-Value/distinfo
+++ b/devel/p5-Return-Value/distinfo
@@ -1,3 +1,2 @@
-MD5 (Return-Value-1.666001.tar.gz) = 03128d525392c88e458aa2cd14eb107a
SHA256 (Return-Value-1.666001.tar.gz) = 55dede504f20b3cdcc179065312165e02d433f7bc202bb454d33fafe00f7ab06
SIZE (Return-Value-1.666001.tar.gz) = 14554
diff --git a/devel/p5-RunApp/Makefile b/devel/p5-RunApp/Makefile
index 9e28a0ce1a56..cc95084bcf71 100644
--- a/devel/p5-RunApp/Makefile
+++ b/devel/p5-RunApp/Makefile
@@ -9,7 +9,7 @@ PORTNAME= RunApp
PORTVERSION= 0.13
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/C/CL/CLKAO
+MASTER_SITE_SUBDIR= CPAN:CLKAO
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-RunApp/distinfo b/devel/p5-RunApp/distinfo
index cbd8c9a08d4d..35566b46d2d7 100644
--- a/devel/p5-RunApp/distinfo
+++ b/devel/p5-RunApp/distinfo
@@ -1,3 +1,2 @@
-MD5 (RunApp-0.13.tar.gz) = d41e2f5255f43b23fdd7d8834307c122
SHA256 (RunApp-0.13.tar.gz) = afb15b1da9b3b1dca9ac3224d5520bfd9524130dfbbb3b3cc79edb14a518679b
SIZE (RunApp-0.13.tar.gz) = 31333
diff --git a/devel/p5-ShipIt-Step-Manifest/Makefile b/devel/p5-ShipIt-Step-Manifest/Makefile
index 61e9870e4ee3..6d63f891cf5e 100644
--- a/devel/p5-ShipIt-Step-Manifest/Makefile
+++ b/devel/p5-ShipIt-Step-Manifest/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ShipIt-Step-Manifest
PORTVERSION= 0.01
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/M/MA/MARCEL
+MASTER_SITE_SUBDIR= CPAN:MARCEL
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-Smart-Comments/Makefile b/devel/p5-Smart-Comments/Makefile
index f297df53c9d7..d5ca21bd06a1 100644
--- a/devel/p5-Smart-Comments/Makefile
+++ b/devel/p5-Smart-Comments/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.0.4
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/C/CH/CHORNY
+MASTER_SITE_SUBDIR= CPAN:CHORNY
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Spiffy/Makefile b/devel/p5-Spiffy/Makefile
index 00ac3afebe57..108e9912e122 100644
--- a/devel/p5-Spiffy/Makefile
+++ b/devel/p5-Spiffy/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Spiffy
PORTVERSION= 0.30
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/I/IN/INGY
+MASTER_SITE_SUBDIR= CPAN:INGY
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Spoon/Makefile b/devel/p5-Spoon/Makefile
index c77c2273c347..76f6d9a70853 100644
--- a/devel/p5-Spoon/Makefile
+++ b/devel/p5-Spoon/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Spoon
PORTVERSION= 0.24
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/I/IN/INGY
+MASTER_SITE_SUBDIR= CPAN:INGY
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Tee/Makefile b/devel/p5-Tee/Makefile
index f67489ea008d..ab1db84954ec 100644
--- a/devel/p5-Tee/Makefile
+++ b/devel/p5-Tee/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Tee
PORTVERSION= 0.14
CATEGORIES= devel perl5 textproc
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-Term-RawInput/Makefile b/devel/p5-Term-RawInput/Makefile
index d0bb97cc6d1f..f002d9aa7b76 100644
--- a/devel/p5-Term-RawInput/Makefile
+++ b/devel/p5-Term-RawInput/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Term-RawInput
PORTVERSION= 1.14
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/R/RE/REEDFISH/
+MASTER_SITE_SUBDIR= CPAN:REEDFISH
PKGNAMEPREFIX= p5-
MAINTAINER= culot@FreeBSD.org
diff --git a/devel/p5-Term-Title/Makefile b/devel/p5-Term-Title/Makefile
index 383b1e4abbe8..034e98c3e12e 100644
--- a/devel/p5-Term-Title/Makefile
+++ b/devel/p5-Term-Title/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Term-Title
PORTVERSION= 0.03
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-Test-EOL/Makefile b/devel/p5-Test-EOL/Makefile
index d751564d09f9..9eb6bb8342e0 100644
--- a/devel/p5-Test-EOL/Makefile
+++ b/devel/p5-Test-EOL/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Test-EOL
PORTVERSION= 0.9
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/F/FL/FLORA
+MASTER_SITE_SUBDIR= CPAN:FLORA
PKGNAMEPREFIX= p5-
MAINTAINER= milki@rescomp.berkeley.edu
diff --git a/devel/p5-Test-Net-RabbitMQ/Makefile b/devel/p5-Test-Net-RabbitMQ/Makefile
index 9326c756ba94..2bb44ee079ae 100644
--- a/devel/p5-Test-Net-RabbitMQ/Makefile
+++ b/devel/p5-Test-Net-RabbitMQ/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Test-Net-RabbitMQ
PORTVERSION= 0.06
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/G/GP/GPHAT
+MASTER_SITE_SUBDIR= CPAN:GPHAT
PKGNAMEPREFIX= p5-
MAINTAINER= swills@FreeBSD.org
diff --git a/devel/p5-Test-NoTabs/Makefile b/devel/p5-Test-NoTabs/Makefile
index c5102f4a698f..a03cd71c1308 100644
--- a/devel/p5-Test-NoTabs/Makefile
+++ b/devel/p5-Test-NoTabs/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/B/BO/BOBTFISH
+MASTER_SITE_SUBDIR= CPAN:BOBTFISH
PKGNAMEPREFIX= p5-
MAINTAINER= milki@rescomp.berkeley.edu
diff --git a/devel/p5-Test-Reporter-Transport-Metabase/Makefile b/devel/p5-Test-Reporter-Transport-Metabase/Makefile
index 3201eb6c5cf1..828a3fd2543b 100644
--- a/devel/p5-Test-Reporter-Transport-Metabase/Makefile
+++ b/devel/p5-Test-Reporter-Transport-Metabase/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Test-Reporter-Transport-Metabase
PORTVERSION= 1.999008
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-Test-SharedFork/Makefile b/devel/p5-Test-SharedFork/Makefile
index abba72bda898..0c79f8d2927f 100644
--- a/devel/p5-Test-SharedFork/Makefile
+++ b/devel/p5-Test-SharedFork/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Test-SharedFork
PORTVERSION= 0.16
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-Test-Singleton/distinfo b/devel/p5-Test-Singleton/distinfo
index fc55b856d51c..f577de8df61d 100644
--- a/devel/p5-Test-Singleton/distinfo
+++ b/devel/p5-Test-Singleton/distinfo
@@ -1,3 +1,2 @@
-MD5 (Test-Singleton-1.03.tar.gz) = 3732ac90e6ceab5ab6d417077b38cc13
SHA256 (Test-Singleton-1.03.tar.gz) = c2d8c17a065e58af93b55bdfe86dcbe418b906f182d74716ccaf89a4e4b8f69f
SIZE (Test-Singleton-1.03.tar.gz) = 25572
diff --git a/devel/p5-ToolSet/Makefile b/devel/p5-ToolSet/Makefile
index 876c94acb208..bdcc2b841056 100644
--- a/devel/p5-ToolSet/Makefile
+++ b/devel/p5-ToolSet/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ToolSet
PORTVERSION= 1.00
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/D/DA/DAGOLDEN/
+MASTER_SITE_SUBDIR= CPAN:DAGOLDEN
PKGNAMEPREFIX= p5-
MAINTAINER= mons@cpan.org
diff --git a/devel/p5-ToolSet/distinfo b/devel/p5-ToolSet/distinfo
index 4077ba18031d..01fd845aabb3 100644
--- a/devel/p5-ToolSet/distinfo
+++ b/devel/p5-ToolSet/distinfo
@@ -1,3 +1,2 @@
-MD5 (ToolSet-1.00.tar.gz) = 201b124486a21281972c8def05b49427
SHA256 (ToolSet-1.00.tar.gz) = cc545d98e42e5cbcbf6e9df1f2a4de4e3e65d10b3ea07075b98a3afb96f3c24e
SIZE (ToolSet-1.00.tar.gz) = 17623
diff --git a/devel/p5-VCP-Dest-svk/Makefile b/devel/p5-VCP-Dest-svk/Makefile
index b665c05c0265..b9442124ff16 100644
--- a/devel/p5-VCP-Dest-svk/Makefile
+++ b/devel/p5-VCP-Dest-svk/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.29
PORTREVISION= 5
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/C/CL/CLKAO
+MASTER_SITE_SUBDIR= CPAN:CLKAO
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-VCP-Dest-svk/distinfo b/devel/p5-VCP-Dest-svk/distinfo
index 03ce892c5cde..31d520285d40 100644
--- a/devel/p5-VCP-Dest-svk/distinfo
+++ b/devel/p5-VCP-Dest-svk/distinfo
@@ -1,3 +1,2 @@
-MD5 (VCP-Dest-svk-0.29.tar.gz) = c4b3fb8f9bb159d6e3010ae86cae54e1
SHA256 (VCP-Dest-svk-0.29.tar.gz) = 981cf0d5689e65bc1dd9048d80ec02dffd69527f10cf14825ebe905d2b6786f2
SIZE (VCP-Dest-svk-0.29.tar.gz) = 30492
diff --git a/devel/p5-VCP-Source-cvsbk/Makefile b/devel/p5-VCP-Source-cvsbk/Makefile
index a903d608fbd8..0bf4f02f16b0 100644
--- a/devel/p5-VCP-Source-cvsbk/Makefile
+++ b/devel/p5-VCP-Source-cvsbk/Makefile
@@ -9,10 +9,10 @@ PORTNAME= VCP-Source-cvsbk
PORTVERSION= 0.11
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/C/CL/CLKAO
+MASTER_SITE_SUBDIR= CPAN:CLKAO
PKGNAMEPREFIX= p5-
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= VCP source driver for bk exported cvs repository
BUILD_DEPENDS= ${SITE_PERL}/VCP.pm:${PORTSDIR}/devel/p5-VCP-autrijus
diff --git a/devel/p5-VCP-Source-cvsbk/distinfo b/devel/p5-VCP-Source-cvsbk/distinfo
index b24ca0e6b9d2..2f3d89124322 100644
--- a/devel/p5-VCP-Source-cvsbk/distinfo
+++ b/devel/p5-VCP-Source-cvsbk/distinfo
@@ -1,3 +1,2 @@
-MD5 (VCP-Source-cvsbk-0.11.tar.gz) = 6c8b1975391c3fa7d1ae91954547e955
SHA256 (VCP-Source-cvsbk-0.11.tar.gz) = 73b68ddc48bb9349de9c54392ebc6e31808bb00139dd93ab26ce1716214d8836
SIZE (VCP-Source-cvsbk-0.11.tar.gz) = 16272
diff --git a/devel/p5-VCP-autrijus/Makefile b/devel/p5-VCP-autrijus/Makefile
index dcba1a12f4a4..31bca50c14c3 100644
--- a/devel/p5-VCP-autrijus/Makefile
+++ b/devel/p5-VCP-autrijus/Makefile
@@ -9,12 +9,12 @@ PORTVERSION= 0.9.20050110
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/A/AU/AUTRIJUS
+MASTER_SITE_SUBDIR= CPAN:AUTRIJUS
PKGNAMEPREFIX= p5-
PKGNAMESUFFIX= -autrijus
DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-snapshot-${PORTVERSION:C/\.([^.]*)$/-\1/}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= A tool for copying files between various SCM repositories
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
diff --git a/devel/p5-VCP-autrijus/distinfo b/devel/p5-VCP-autrijus/distinfo
index ecc963880aea..20c6fc84f84b 100644
--- a/devel/p5-VCP-autrijus/distinfo
+++ b/devel/p5-VCP-autrijus/distinfo
@@ -1,3 +1,2 @@
-MD5 (VCP-autrijus-snapshot-0.9-20050110.tar.gz) = c01249d810904f5b4f6080979673a514
SHA256 (VCP-autrijus-snapshot-0.9-20050110.tar.gz) = 62f7754416fa25dc3cdb9aa94be3889242b0072a7c763f95178c1a09eb3db849
SIZE (VCP-autrijus-snapshot-0.9-20050110.tar.gz) = 318457
diff --git a/devel/p5-Version-Requirements/Makefile b/devel/p5-Version-Requirements/Makefile
index 51e6601f0be1..25f2b8cb0083 100644
--- a/devel/p5-Version-Requirements/Makefile
+++ b/devel/p5-Version-Requirements/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Version-Requirements
PORTVERSION= 0.101020
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/R/RJ/RJBS
+MASTER_SITE_SUBDIR= CPAN:RJBS
PKGNAMEPREFIX= p5-
MAINTAINER= jupengfei@gmail.com
diff --git a/devel/p5-Version-Requirements/distinfo b/devel/p5-Version-Requirements/distinfo
index 7afa314e689f..422f70fec357 100644
--- a/devel/p5-Version-Requirements/distinfo
+++ b/devel/p5-Version-Requirements/distinfo
@@ -1,3 +1,2 @@
-MD5 (Version-Requirements-0.101020.tar.gz) = e50725d564c0e287d54b08d4d809a26f
SHA256 (Version-Requirements-0.101020.tar.gz) = a4037d014692ba6867bed71d882da748c728c8d5e11ab6008cec056179776ca1
SIZE (Version-Requirements-0.101020.tar.gz) = 14912
diff --git a/devel/p5-Want/Makefile b/devel/p5-Want/Makefile
index 8a7d0210fa8e..b1e32864ee8e 100644
--- a/devel/p5-Want/Makefile
+++ b/devel/p5-Want/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Want
PORTVERSION= 0.18
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/R/RO/ROBIN
+MASTER_SITE_SUBDIR= CPAN:ROBIN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Want/distinfo b/devel/p5-Want/distinfo
index 265a62a57f05..e6137f217150 100644
--- a/devel/p5-Want/distinfo
+++ b/devel/p5-Want/distinfo
@@ -1,3 +1,2 @@
-MD5 (Want-0.18.tar.gz) = b83e2d189781b10250133b4eb9e6ca28
SHA256 (Want-0.18.tar.gz) = 9d1d17362e3a8e860383efba212229b0ef86ffd1be01e02fd712c53d537a93cd
SIZE (Want-0.18.tar.gz) = 17859
diff --git a/devel/p5-WeakRef/Makefile b/devel/p5-WeakRef/Makefile
index feab8d78cef7..9e2d770e71eb 100644
--- a/devel/p5-WeakRef/Makefile
+++ b/devel/p5-WeakRef/Makefile
@@ -9,7 +9,7 @@ PORTNAME= WeakRef
PORTVERSION= 0.01
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/L/LU/LUKKA
+MASTER_SITE_SUBDIR= CPAN:LUKKA
PKGNAMEPREFIX= p5-
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/devel/p5-WeakRef/distinfo b/devel/p5-WeakRef/distinfo
index 6f357a29a10e..e8a700f2cc42 100644
--- a/devel/p5-WeakRef/distinfo
+++ b/devel/p5-WeakRef/distinfo
@@ -1,3 +1,2 @@
-MD5 (WeakRef-0.01.tar.gz) = 3162df7a6eda0dfb44676dd9ebfa3c4c
SHA256 (WeakRef-0.01.tar.gz) = 39506f9d2f5b4f353fd31e3d4764a0a3c85caa6a9df6271dac0e7620a78e616b
SIZE (WeakRef-0.01.tar.gz) = 3069
diff --git a/devel/p5-Yada-Yada-Yada/Makefile b/devel/p5-Yada-Yada-Yada/Makefile
index 98257f586de8..156a5a906a8b 100644
--- a/devel/p5-Yada-Yada-Yada/Makefile
+++ b/devel/p5-Yada-Yada-Yada/Makefile
@@ -9,10 +9,10 @@ PORTNAME= Yada-Yada-Yada
PORTVERSION= 1.00
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/T/TM/TMTM
+MASTER_SITE_SUBDIR= CPAN:TMTM
PKGNAMEPREFIX= p5-
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Adds a Yada-Yada-Yada operator (...) to Perl 5
BUILD_DEPENDS= ${SITE_PERL}/Filter/Simple.pm:${PORTSDIR}/textproc/p5-Filter-Simple
diff --git a/devel/p5-Yada-Yada-Yada/distinfo b/devel/p5-Yada-Yada-Yada/distinfo
index a30c2c3aa4fc..7f6350a341b3 100644
--- a/devel/p5-Yada-Yada-Yada/distinfo
+++ b/devel/p5-Yada-Yada-Yada/distinfo
@@ -1,3 +1,2 @@
-MD5 (Yada-Yada-Yada-1.00.tar.gz) = eb16f03b8341215661f40c549860927f
SHA256 (Yada-Yada-Yada-1.00.tar.gz) = e5e8654508ae8e3f1dca7706202489a49d8ce129f3acb5b6d11f069187a39cb0
SIZE (Yada-Yada-Yada-1.00.tar.gz) = 2220
diff --git a/devel/p5-ZConf-GUI/Makefile b/devel/p5-ZConf-GUI/Makefile
index c72edc56814f..275d566520fa 100644
--- a/devel/p5-ZConf-GUI/Makefile
+++ b/devel/p5-ZConf-GUI/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ZConf-GUI
PORTVERSION= 1.0.3
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-ZConf-GUI/distinfo b/devel/p5-ZConf-GUI/distinfo
index c470639315df..411a5975a78a 100644
--- a/devel/p5-ZConf-GUI/distinfo
+++ b/devel/p5-ZConf-GUI/distinfo
@@ -1,3 +1,2 @@
-MD5 (ZConf-GUI-1.0.3.tar.gz) = 9c8b2f4ff2af5ee4ce42682277297a24
SHA256 (ZConf-GUI-1.0.3.tar.gz) = cc683b7681319f16d3716984913f2b624972e082492602b68c64811446a4e1be
SIZE (ZConf-GUI-1.0.3.tar.gz) = 10827
diff --git a/devel/p5-ZML/Makefile b/devel/p5-ZML/Makefile
index d396ed9e9652..410a83cc922a 100644
--- a/devel/p5-ZML/Makefile
+++ b/devel/p5-ZML/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ZML
PORTVERSION= 0.5.4
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/V/VV/VVELOX
+MASTER_SITE_SUBDIR= CPAN:VVELOX
PKGNAMEPREFIX= p5-
DISTNAME= ZML-${PORTVERSION}
diff --git a/devel/p5-ZML/distinfo b/devel/p5-ZML/distinfo
index d17912fcc8c7..9342a365b43c 100644
--- a/devel/p5-ZML/distinfo
+++ b/devel/p5-ZML/distinfo
@@ -1,3 +1,2 @@
-MD5 (ZML-0.5.4.tar.gz) = 440edf3f958eb3ce02c7997f18b6b8e0
SHA256 (ZML-0.5.4.tar.gz) = 4d1d7d1dcc7b445fc3d217140a2f5462506c6a6371a3839d04a136d28c4423a3
SIZE (ZML-0.5.4.tar.gz) = 7530
diff --git a/devel/p5-autobox/Makefile b/devel/p5-autobox/Makefile
index 460b97f624b6..78dda0018181 100644
--- a/devel/p5-autobox/Makefile
+++ b/devel/p5-autobox/Makefile
@@ -9,7 +9,7 @@ PORTNAME= autobox
PORTVERSION= 2.71
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/C/CH/CHOCOLATE/
+MASTER_SITE_SUBDIR= CPAN:CHOCOLATE
PKGNAMEPREFIX= p5-
MAINTAINER= bill.brinzer@gmail.com
diff --git a/devel/p5-autobox/distinfo b/devel/p5-autobox/distinfo
index 68c7c33beda5..5cfe23498b3c 100644
--- a/devel/p5-autobox/distinfo
+++ b/devel/p5-autobox/distinfo
@@ -1,3 +1,2 @@
-MD5 (autobox-2.71.tar.gz) = 559aa842c67ea65fd0c52e9abe68839f
SHA256 (autobox-2.71.tar.gz) = 1af1df16e11f4075b1a63de3b254345420a60550284b417404ff9cb006d16e11
SIZE (autobox-2.71.tar.gz) = 71835
diff --git a/devel/p5-autodie/Makefile b/devel/p5-autodie/Makefile
index 95270f6aec5c..2ec08f897ba5 100644
--- a/devel/p5-autodie/Makefile
+++ b/devel/p5-autodie/Makefile
@@ -9,7 +9,7 @@ PORTNAME= autodie
PORTVERSION= 2.10
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/P/PJ/PJF
+MASTER_SITE_SUBDIR= CPAN:PJF
PKGNAMEPREFIX= p5-
MAINTAINER= wen@FreeBSD.org
diff --git a/devel/p5-autodie/distinfo b/devel/p5-autodie/distinfo
index 5915ad718b51..c2c2c58af7ea 100644
--- a/devel/p5-autodie/distinfo
+++ b/devel/p5-autodie/distinfo
@@ -1,3 +1,2 @@
-MD5 (autodie-2.10.tar.gz) = b7e31ed5adc4c58b1b417fd9fff73113
SHA256 (autodie-2.10.tar.gz) = 688578101722adbab0d603d69bb10bbeaa2e6d040117794a168858707c72663f
SIZE (autodie-2.10.tar.gz) = 76712
diff --git a/devel/p5-base/Makefile b/devel/p5-base/Makefile
index 162eb82c5bc4..3d309defa8f4 100644
--- a/devel/p5-base/Makefile
+++ b/devel/p5-base/Makefile
@@ -9,7 +9,7 @@ PORTNAME= base
PORTVERSION= 2.15
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/R/RG/RGARCIA
+MASTER_SITE_SUBDIR= CPAN:RGARCIA
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-boolean/Makefile b/devel/p5-boolean/Makefile
index a78d618e3368..36eb3da2953f 100644
--- a/devel/p5-boolean/Makefile
+++ b/devel/p5-boolean/Makefile
@@ -9,7 +9,7 @@ PORTNAME= boolean
PORTVERSION= 0.23
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/I/IN/INGY
+MASTER_SITE_SUBDIR= CPAN:INGY
PKGNAMEPREFIX= p5-
MAINTAINER= timur@FreeBSD.org
diff --git a/devel/p5-boolean/distinfo b/devel/p5-boolean/distinfo
index 3cf8c10f1e47..0e3c7f2d4de8 100644
--- a/devel/p5-boolean/distinfo
+++ b/devel/p5-boolean/distinfo
@@ -1,3 +1,2 @@
-MD5 (boolean-0.23.tar.gz) = efcf5ffe3822823bf302960a3c89699c
SHA256 (boolean-0.23.tar.gz) = 22bdada78caa64d7ea5bbd3e2287c66d48839c61345892d6c5624065a6dc86cf
SIZE (boolean-0.23.tar.gz) = 21556
diff --git a/devel/p5-common-sense/Makefile b/devel/p5-common-sense/Makefile
index 5fcc224d492b..d8341404a0ab 100644
--- a/devel/p5-common-sense/Makefile
+++ b/devel/p5-common-sense/Makefile
@@ -9,7 +9,7 @@ PORTNAME= common-sense
PORTVERSION= 3.4
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/M/ML/MLEHMANN
+MASTER_SITE_SUBDIR= CPAN:MLEHMANN
PKGNAMEPREFIX= p5-
MAINTAINER= mons@cpan.org
diff --git a/devel/p5-constant-lexical/Makefile b/devel/p5-constant-lexical/Makefile
index 4b1d303fd5f8..bc9768461dad 100644
--- a/devel/p5-constant-lexical/Makefile
+++ b/devel/p5-constant-lexical/Makefile
@@ -9,7 +9,7 @@ PORTNAME= constant-lexical
PORTVERSION= 1.00000
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/S/SP/SPROUT
+MASTER_SITE_SUBDIR= CPAN:SPROUT
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-constant-lexical/distinfo b/devel/p5-constant-lexical/distinfo
index 67bbdbd78658..2364361768fd 100644
--- a/devel/p5-constant-lexical/distinfo
+++ b/devel/p5-constant-lexical/distinfo
@@ -1,3 +1,2 @@
-MD5 (constant-lexical-1.00000.tar.gz) = 68268371b4055ee1dd306c34d31b5132
SHA256 (constant-lexical-1.00000.tar.gz) = d6e0a7772d0b263774340ddab18aeefdfd3e9f9b55ebd1e597d01d42ffd7ec39
SIZE (constant-lexical-1.00000.tar.gz) = 29508
diff --git a/devel/p5-cpan-listchanges/Makefile b/devel/p5-cpan-listchanges/Makefile
index f1abc27df392..279c1038f6f1 100644
--- a/devel/p5-cpan-listchanges/Makefile
+++ b/devel/p5-cpan-listchanges/Makefile
@@ -9,7 +9,7 @@ PORTNAME= cpan-listchanges
PORTVERSION= 0.05
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-github_creator/Makefile b/devel/p5-github_creator/Makefile
index 5281f5704dce..2974a47b0030 100644
--- a/devel/p5-github_creator/Makefile
+++ b/devel/p5-github_creator/Makefile
@@ -9,7 +9,7 @@ PORTNAME= github_creator
PORTVERSION= 0.15
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/B/BD/BDFOY
+MASTER_SITE_SUBDIR= CPAN:BDFOY
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-libxml-enno/Makefile b/devel/p5-libxml-enno/Makefile
index f4aae8cd168a..9d6c1c74cef2 100644
--- a/devel/p5-libxml-enno/Makefile
+++ b/devel/p5-libxml-enno/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libxml-enno
PORTVERSION= 1.02
CATEGORIES= devel textproc perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/E/EN/ENNO
+MASTER_SITE_SUBDIR= CPAN:ENNO
PKGNAMEPREFIX= p5-
MAINTAINER= swills@FreeBSD.org
diff --git a/devel/p5-libxml-enno/distinfo b/devel/p5-libxml-enno/distinfo
index 436adf787847..916b9d5ba885 100644
--- a/devel/p5-libxml-enno/distinfo
+++ b/devel/p5-libxml-enno/distinfo
@@ -1,3 +1,2 @@
-MD5 (libxml-enno-1.02.tar.gz) = 8900650101471e9950ef73d3d9a067c3
SHA256 (libxml-enno-1.02.tar.gz) = 4849c1ac421316e2526b9fcd946771965d30c2c0c49f4b291689802c2eec0564
SIZE (libxml-enno-1.02.tar.gz) = 369163
diff --git a/devel/p5-local-lib/Makefile b/devel/p5-local-lib/Makefile
index 0fbce4352e41..8bca6082a551 100644
--- a/devel/p5-local-lib/Makefile
+++ b/devel/p5-local-lib/Makefile
@@ -9,7 +9,7 @@ PORTNAME= local-lib
PORTVERSION= 1.008004
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/A/AP/APEIRON
+MASTER_SITE_SUBDIR= CPAN:APEIRON
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-namespace-autoclean/Makefile b/devel/p5-namespace-autoclean/Makefile
index de0b0de37f77..e606114f296d 100644
--- a/devel/p5-namespace-autoclean/Makefile
+++ b/devel/p5-namespace-autoclean/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.12
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/B/BO/BOBTFISH
+MASTER_SITE_SUBDIR= CPAN:BOBTFISH
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-prefork/Makefile b/devel/p5-prefork/Makefile
index 5b964cf4ef33..d774c070ffe6 100644
--- a/devel/p5-prefork/Makefile
+++ b/devel/p5-prefork/Makefile
@@ -9,10 +9,10 @@ PORTNAME= prefork
PORTVERSION= 1.04
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/A/AD/ADAMK
+MASTER_SITE_SUBDIR= CPAN:ADAMK
PKGNAMEPREFIX= p5-
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Optimize module loading across forking and non-forking scenarios
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils
diff --git a/devel/p5-prefork/distinfo b/devel/p5-prefork/distinfo
index a751a7aebed0..a203f14f4336 100644
--- a/devel/p5-prefork/distinfo
+++ b/devel/p5-prefork/distinfo
@@ -1,3 +1,2 @@
-MD5 (prefork-1.04.tar.gz) = 47a514d4058ffc8cca184b28d6d54d0a
SHA256 (prefork-1.04.tar.gz) = e3cf223fe57be586265e3e6a4b7fdb4cf335b0b8f4f902b40fd4e5fc78eafdf7
SIZE (prefork-1.04.tar.gz) = 29059
diff --git a/devel/p5-reaper/Makefile b/devel/p5-reaper/Makefile
index 8a4140ff3823..daac8202ae2c 100644
--- a/devel/p5-reaper/Makefile
+++ b/devel/p5-reaper/Makefile
@@ -9,7 +9,7 @@ PORTNAME= reaper
PORTVERSION= 1.00
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/J/JG/JGS
+MASTER_SITE_SUBDIR= CPAN:JGS
PKGNAMEPREFIX= p5-
DISTNAME= Reaper-1.00
diff --git a/devel/p5-reaper/distinfo b/devel/p5-reaper/distinfo
index 2a463be3eea6..6485aa9bf661 100644
--- a/devel/p5-reaper/distinfo
+++ b/devel/p5-reaper/distinfo
@@ -1,3 +1,2 @@
-MD5 (Reaper-1.00.tar.gz) = d9cb7741a8939859f52f177938ae7bea
SHA256 (Reaper-1.00.tar.gz) = 583d0f310d87aace1ddecd3f779ec72bfc6b75ee79806da0e02ea15663f006a6
SIZE (Reaper-1.00.tar.gz) = 3494
diff --git a/devel/p5-relative/Makefile b/devel/p5-relative/Makefile
index 9310b13be4be..1c33aa5196a2 100644
--- a/devel/p5-relative/Makefile
+++ b/devel/p5-relative/Makefile
@@ -9,7 +9,7 @@ PORTNAME= relative
PORTVERSION= 0.04
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/S/SA/SAPER
+MASTER_SITE_SUBDIR= CPAN:SAPER
PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@FreeBSD.org
diff --git a/devel/p5-relative/distinfo b/devel/p5-relative/distinfo
index b85a82e138cd..e6082fe8e023 100644
--- a/devel/p5-relative/distinfo
+++ b/devel/p5-relative/distinfo
@@ -1,3 +1,2 @@
-MD5 (relative-0.04.tar.gz) = 923b48653599f2f7fcc7eba12db462ea
SHA256 (relative-0.04.tar.gz) = 78e0499d5392548ff7385cc1ebe697200e399498007f1148bf755d415d2d5780
SIZE (relative-0.04.tar.gz) = 6408
diff --git a/devel/p5-rpm-build-perl/Makefile b/devel/p5-rpm-build-perl/Makefile
index ff293d9ecf87..51d8bac91be6 100644
--- a/devel/p5-rpm-build-perl/Makefile
+++ b/devel/p5-rpm-build-perl/Makefile
@@ -9,7 +9,7 @@ PORTNAME= rpm-build-perl
PORTVERSION= 0.74
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/A/AT/ATOURBIN
+MASTER_SITE_SUBDIR= CPAN:ATOURBIN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-self-init/Makefile b/devel/p5-self-init/Makefile
index 740ca24fa394..82bea562e6c3 100644
--- a/devel/p5-self-init/Makefile
+++ b/devel/p5-self-init/Makefile
@@ -9,7 +9,7 @@ PORTNAME= self-init
PORTVERSION= 0.01
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/M/MO/MONS
+MASTER_SITE_SUBDIR= CPAN:MONS
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-self/Makefile b/devel/p5-self/Makefile
index a4fe5a3e18e4..1ea895a7ea96 100644
--- a/devel/p5-self/Makefile
+++ b/devel/p5-self/Makefile
@@ -9,7 +9,7 @@ PORTNAME= self
PORTVERSION= 0.34
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/G/GU/GUGOD/
+MASTER_SITE_SUBDIR= CPAN:GUGOD
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-subatom/Makefile b/devel/p5-subatom/Makefile
index 8857acd78b1e..15c96f409f4d 100644
--- a/devel/p5-subatom/Makefile
+++ b/devel/p5-subatom/Makefile
@@ -9,7 +9,7 @@ PORTNAME= subatom
PORTVERSION= 0.12
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/H/HD/HDM
+MASTER_SITE_SUBDIR= CPAN:HDM
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-subatom/distinfo b/devel/p5-subatom/distinfo
index 5a96cc3705b2..638dde9feee9 100644
--- a/devel/p5-subatom/distinfo
+++ b/devel/p5-subatom/distinfo
@@ -1,3 +1,2 @@
-MD5 (subatom-0.12.tar.gz) = c5a7cab76c12b2759f4e88b0ab5a5eaf
SHA256 (subatom-0.12.tar.gz) = f1824de7c86c1d93c9e6e054ed24e2aec8c56b02c051752666cfbedde059158a
SIZE (subatom-0.12.tar.gz) = 7591
diff --git a/devel/p5-uni-perl/Makefile b/devel/p5-uni-perl/Makefile
index 4d17ca5e468b..5282b5239e96 100644
--- a/devel/p5-uni-perl/Makefile
+++ b/devel/p5-uni-perl/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.03
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/M/MO/MONS
+MASTER_SITE_SUBDIR= CPAN:MONS
PKGNAMEPREFIX= p5-
MAINTAINER= mons@cpan.org
diff --git a/devel/p5-uni-perl/distinfo b/devel/p5-uni-perl/distinfo
index 2f98b6ebcfc1..8e140122c48f 100644
--- a/devel/p5-uni-perl/distinfo
+++ b/devel/p5-uni-perl/distinfo
@@ -1,3 +1,2 @@
-MD5 (uni-perl-0.03.tar.gz) = afacb5d25398ca27887d9f4c1b83c7f5
SHA256 (uni-perl-0.03.tar.gz) = f33e8a73d71f6f899913fc7957e56bc3b96e305265f5c909e21771a9e7799856
SIZE (uni-perl-0.03.tar.gz) = 26550
diff --git a/devel/perlconsole/Makefile b/devel/perlconsole/Makefile
index f52f24dc1a89..aec130521730 100644
--- a/devel/perlconsole/Makefile
+++ b/devel/perlconsole/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.4
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/S/SU/SUKRIA
+MASTER_SITE_SUBDIR= CPAN:SUKRIA
MAINTAINER= jadawin@FreeBSD.org
COMMENT= A light program that lets you evaluate Perl code interactively
diff --git a/devel/perlconsole/distinfo b/devel/perlconsole/distinfo
index 88650b27215d..66b59bd375aa 100644
--- a/devel/perlconsole/distinfo
+++ b/devel/perlconsole/distinfo
@@ -1,3 +1,2 @@
-MD5 (perlconsole-0.4.tar.gz) = 4a31b5f720b3c05f1a5564ce78459f22
SHA256 (perlconsole-0.4.tar.gz) = bf47ea69e6e128d0b49a2207ca575dd8c2158d417d504214d3de9ce59191afe3
SIZE (perlconsole-0.4.tar.gz) = 15279
diff --git a/devel/svk/Makefile b/devel/svk/Makefile
index 0db594086c0f..69a0d8236468 100644
--- a/devel/svk/Makefile
+++ b/devel/svk/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 2.2.3
PORTREVISION= 3
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/C/CL/CLKAO
+MASTER_SITE_SUBDIR= CPAN:CLKAO
DISTNAME= SVK-v${PORTVERSION}
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/svk/distinfo b/devel/svk/distinfo
index bd09644f852d..f1b4bfcdadb3 100644
--- a/devel/svk/distinfo
+++ b/devel/svk/distinfo
@@ -1,3 +1,2 @@
-MD5 (SVK-v2.2.3.tar.gz) = 86ad8796345400b7b0338dab7a4ca977
SHA256 (SVK-v2.2.3.tar.gz) = 815ab9ba156cb7d1cc6be2aaa75789f8288ba86d79f220bbe504576bcaa84aca
SIZE (SVK-v2.2.3.tar.gz) = 505012
diff --git a/dns/p5-Net-DNS-RR-SRV-Helper/Makefile b/dns/p5-Net-DNS-RR-SRV-Helper/Makefile
index 55175b4316da..9187e5a6cce4 100644
--- a/dns/p5-Net-DNS-RR-SRV-Helper/Makefile
+++ b/dns/p5-Net-DNS-RR-SRV-Helper/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.0.0
PORTREVISION= 1
CATEGORIES= dns 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/editors/p5-Vimana/Makefile b/editors/p5-Vimana/Makefile
index e783d9dc4b52..eb8bc3d782fc 100644
--- a/editors/p5-Vimana/Makefile
+++ b/editors/p5-Vimana/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Vimana
PORTVERSION= 2010.09303
CATEGORIES= editors perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/C/CO/CORNELIUS
+MASTER_SITE_SUBDIR= CPAN:CORNELIUS
PKGNAMEPREFIX= p5-
MAINTAINER= miwi@FreeBSD.org
diff --git a/graphics/p5-Image-Size-FillFullSelect/Makefile b/graphics/p5-Image-Size-FillFullSelect/Makefile
index abc061d38f48..0705a6430e89 100644
--- a/graphics/p5-Image-Size-FillFullSelect/Makefile
+++ b/graphics/p5-Image-Size-FillFullSelect/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Image-Size-FillFullSelect
PORTVERSION= 0.1.0
CATEGORIES= graphics 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/graphics/p5-Image-Size-FillFullSelect/distinfo b/graphics/p5-Image-Size-FillFullSelect/distinfo
index 0bd341140959..25d13dea6014 100644
--- a/graphics/p5-Image-Size-FillFullSelect/distinfo
+++ b/graphics/p5-Image-Size-FillFullSelect/distinfo
@@ -1,3 +1,2 @@
-MD5 (Image-Size-FillFullSelect-0.1.0.tar.gz) = 24106ebfb3c01677f0fe231b80ca195e
SHA256 (Image-Size-FillFullSelect-0.1.0.tar.gz) = 4630ec4ca6ecdd61acda212fc15401ff0d9b8b45af47cf1593ad9473ff686abb
SIZE (Image-Size-FillFullSelect-0.1.0.tar.gz) = 3821
diff --git a/irc/p5-IRC-Bot-Hangman/Makefile b/irc/p5-IRC-Bot-Hangman/Makefile
index 60d4a84c48cc..ec4ebc0fc08b 100644
--- a/irc/p5-IRC-Bot-Hangman/Makefile
+++ b/irc/p5-IRC-Bot-Hangman/Makefile
@@ -9,10 +9,10 @@ PORTNAME= IRC-Bot-Hangman
PORTVERSION= 0.1
CATEGORIES= irc games perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/P/PD/PDENIS
+MASTER_SITE_SUBDIR= CPAN:PDENIS
PKGNAMEPREFIX= p5-
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= An IRC hangman bot
BUILD_DEPENDS= ${SITE_PERL}/Bot/BasicBot.pm:${PORTSDIR}/irc/p5-Bot-BasicBot \
diff --git a/japanese/jacode.pl/Makefile b/japanese/jacode.pl/Makefile
index f8439a1e148f..2ee6918c153d 100644
--- a/japanese/jacode.pl/Makefile
+++ b/japanese/jacode.pl/Makefile
@@ -9,7 +9,7 @@ PORTNAME= jacode.pl
PORTVERSION= 2.13.4.9
CATEGORIES= japanese perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/I/IN/INA/${PORTNAME:S|.pl||}
+MASTER_SITE_SUBDIR= CPAN:INA/${PORTNAME:S|.pl||}
DISTNAME= ${PORTNAME:S|.pl||}-${PORTVERSION}
MAINTAINER= takefu@airport.fm
diff --git a/japanese/p5-DateTime-Format-Japanese/Makefile b/japanese/p5-DateTime-Format-Japanese/Makefile
index 554c1b9c9fb0..d03a425c4562 100644
--- a/japanese/p5-DateTime-Format-Japanese/Makefile
+++ b/japanese/p5-DateTime-Format-Japanese/Makefile
@@ -9,7 +9,7 @@ PORTNAME= DateTime-Format-Japanese
PORTVERSION= 0.04000
CATEGORIES= japanese devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/D/DM/DMAKI
+MASTER_SITE_SUBDIR= CPAN:DMAKI
MAINTAINER= markun@onohara.to
COMMENT= A Japanese DateTime Formatter
diff --git a/lang/p5-Interpolation/Makefile b/lang/p5-Interpolation/Makefile
index 05366c0d07e0..0945511d4572 100644
--- a/lang/p5-Interpolation/Makefile
+++ b/lang/p5-Interpolation/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Interpolation
PORTVERSION= 0.74
CATEGORIES= lang perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/J/JE/JENDA
+MASTER_SITE_SUBDIR= CPAN:JENDA
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/lang/p5-JSAN/Makefile b/lang/p5-JSAN/Makefile
index 819c8e85b1b1..b3eb2bc1a227 100644
--- a/lang/p5-JSAN/Makefile
+++ b/lang/p5-JSAN/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.07
PORTREVISION= 7
CATEGORIES= lang perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/C/CW/CWEST
+MASTER_SITE_SUBDIR= CPAN:CWEST
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/lang/p5-Modern-Perl/Makefile b/lang/p5-Modern-Perl/Makefile
index 4bacb4235b1f..d105310148f3 100644
--- a/lang/p5-Modern-Perl/Makefile
+++ b/lang/p5-Modern-Perl/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Modern-Perl
PORTVERSION= 1.03
CATEGORIES= lang perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/C/CH/CHROMATIC
+MASTER_SITE_SUBDIR= CPAN:CHROMATIC
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/lang/p5-Modern-Perl/distinfo b/lang/p5-Modern-Perl/distinfo
index 4057a0df602d..f8ebe0dab002 100644
--- a/lang/p5-Modern-Perl/distinfo
+++ b/lang/p5-Modern-Perl/distinfo
@@ -1,3 +1,2 @@
-MD5 (Modern-Perl-1.03.tar.gz) = 1338c29f86b109280f8c723ece49299e
SHA256 (Modern-Perl-1.03.tar.gz) = 40bf555afc6c679be1a5514677665f8853594bcf8de1a63b0a28ad39de3edf89
SIZE (Modern-Perl-1.03.tar.gz) = 2995
diff --git a/lang/p5-Switch/Makefile b/lang/p5-Switch/Makefile
index d91ff2ec88ba..4bc11c4362a4 100644
--- a/lang/p5-Switch/Makefile
+++ b/lang/p5-Switch/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Switch
PORTVERSION= 2.16
CATEGORIES= lang perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/R/RG/RGARCIA
+MASTER_SITE_SUBDIR= CPAN:RGARCIA
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/lang/p5-Switch/distinfo b/lang/p5-Switch/distinfo
index 648bfce645da..143410266fbb 100644
--- a/lang/p5-Switch/distinfo
+++ b/lang/p5-Switch/distinfo
@@ -1,3 +1,2 @@
-MD5 (Switch-2.16.tar.gz) = bf75dc7f171b4718a2118c3d6cbe6013
SHA256 (Switch-2.16.tar.gz) = 308c8f27f295906778186f14c6291923905730b46ba879c3a68fff81c37df9d8
SIZE (Switch-2.16.tar.gz) = 13185
diff --git a/lang/p5-Test-XPath/Makefile b/lang/p5-Test-XPath/Makefile
index acb07fa4d5d0..6c2c3f809a35 100644
--- a/lang/p5-Test-XPath/Makefile
+++ b/lang/p5-Test-XPath/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Test-XPath
PORTVERSION= 0.13
CATEGORIES= lang perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/D/DW/DWHEELER
+MASTER_SITE_SUBDIR= CPAN:DWHEELER
PKGNAMEPREFIX= p5-
MAINTAINER= milki@rescomp.berkeley.edu
diff --git a/lang/p5-Test-XPath/distinfo b/lang/p5-Test-XPath/distinfo
index a809add06cf1..6e9721fa5e49 100644
--- a/lang/p5-Test-XPath/distinfo
+++ b/lang/p5-Test-XPath/distinfo
@@ -1,3 +1,2 @@
-MD5 (Test-XPath-0.13.tar.gz) = 930c3b3d900d16f73a5f0116feb2581d
SHA256 (Test-XPath-0.13.tar.gz) = f31b772ba943e0322dc1f3915c9b8bca8a92831b442a2c3471f9ccc8151efd1a
SIZE (Test-XPath-0.13.tar.gz) = 14285
diff --git a/lang/p5-TryCatch/Makefile b/lang/p5-TryCatch/Makefile
index 57a18f2d8e44..764c65420ae6 100644
--- a/lang/p5-TryCatch/Makefile
+++ b/lang/p5-TryCatch/Makefile
@@ -9,7 +9,7 @@ PORTNAME= TryCatch
PORTVERSION= 1.003000
CATEGORIES= lang perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/A/AS/ASH
+MASTER_SITE_SUBDIR= CPAN:ASH
PKGNAMEPREFIX= p5-
MAINTAINER= milki@rescomp.berkeley.edu
diff --git a/lang/p5-signatures/Makefile b/lang/p5-signatures/Makefile
index e92772b9af5a..6a38ea9ddb50 100644
--- a/lang/p5-signatures/Makefile
+++ b/lang/p5-signatures/Makefile
@@ -9,7 +9,7 @@ PORTNAME= signatures
PORTVERSION= 0.06
CATEGORIES= lang perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/F/FL/FLORA
+MASTER_SITE_SUBDIR= CPAN:FLORA
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/lang/p5-signatures/distinfo b/lang/p5-signatures/distinfo
index 3f0df0b822e1..98377a0bab98 100644
--- a/lang/p5-signatures/distinfo
+++ b/lang/p5-signatures/distinfo
@@ -1,3 +1,2 @@
-MD5 (signatures-0.06.tar.gz) = af55428a1fcc2c3a7e8d3983db95cff7
SHA256 (signatures-0.06.tar.gz) = 6375598efb6c468f2f463799072e08c4abfeaeb905cab084607955c907816eb8
SIZE (signatures-0.06.tar.gz) = 63557
diff --git a/mail/p5-Mail-Cache/Makefile b/mail/p5-Mail-Cache/Makefile
index 6b212026a0b6..52de8c769ed9 100644
--- a/mail/p5-Mail-Cache/Makefile
+++ b/mail/p5-Mail-Cache/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Mail-Cache
PORTVERSION= 0.1.2
CATEGORIES= mail 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/mail/p5-Mail-Cache/distinfo b/mail/p5-Mail-Cache/distinfo
index f14b3e015e64..5b4ee02b7ab0 100644
--- a/mail/p5-Mail-Cache/distinfo
+++ b/mail/p5-Mail-Cache/distinfo
@@ -1,3 +1,2 @@
-MD5 (Mail-Cache-0.1.2.tar.gz) = 603fbc3e80f7acd2fc71b1511d85e6b4
SHA256 (Mail-Cache-0.1.2.tar.gz) = dc7a91a69aee5d8950cfef3ba7538cb99556b28d808410a13a4234a1a4705328
SIZE (Mail-Cache-0.1.2.tar.gz) = 7061
diff --git a/mail/p5-Mail-IMAPClient/Makefile b/mail/p5-Mail-IMAPClient/Makefile
index 79de91412795..71d20745ea76 100644
--- a/mail/p5-Mail-IMAPClient/Makefile
+++ b/mail/p5-Mail-IMAPClient/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Mail-IMAPClient
PORTVERSION= 3.28
CATEGORIES= mail perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/P/PL/PLOBBES
+MASTER_SITE_SUBDIR= CPAN:PLOBBES
PKGNAMEPREFIX= p5-
MAINTAINER= jadawin@FreeBSD.org
diff --git a/mail/p5-Mail-IMAPTalk-MailCache/Makefile b/mail/p5-Mail-IMAPTalk-MailCache/Makefile
index 22ef88ff08e3..3ba9dec8240a 100644
--- a/mail/p5-Mail-IMAPTalk-MailCache/Makefile
+++ b/mail/p5-Mail-IMAPTalk-MailCache/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Mail-IMAPTalk-MailCache
PORTVERSION= 0.0.1
CATEGORIES= mail 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/mail/p5-Mail-IMAPTalk-MailCache/distinfo b/mail/p5-Mail-IMAPTalk-MailCache/distinfo
index 7275d6455c1d..3ac147e9d431 100644
--- a/mail/p5-Mail-IMAPTalk-MailCache/distinfo
+++ b/mail/p5-Mail-IMAPTalk-MailCache/distinfo
@@ -1,3 +1,2 @@
-MD5 (Mail-IMAPTalk-MailCache-0.0.1.tar.gz) = 8769a1f31ae81588a689d366ff2534f4
SHA256 (Mail-IMAPTalk-MailCache-0.0.1.tar.gz) = 12af3ddf844cafddae8d64cb699ebff4ac3c0cc7e0c15f7795c1e52c8d42a9ba
SIZE (Mail-IMAPTalk-MailCache-0.0.1.tar.gz) = 3652
diff --git a/mail/p5-ZConf-Mail/Makefile b/mail/p5-ZConf-Mail/Makefile
index 61ef7f840748..b131a3ed614b 100644
--- a/mail/p5-ZConf-Mail/Makefile
+++ b/mail/p5-ZConf-Mail/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ZConf-Mail
PORTVERSION= 1.4.1
CATEGORIES= mail 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/math/p5-Data-Float/Makefile b/math/p5-Data-Float/Makefile
index 58f73dcf0ce7..e3772fbe5e77 100644
--- a/math/p5-Data-Float/Makefile
+++ b/math/p5-Data-Float/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Data-Float
PORTVERSION= 0.011
CATEGORIES= math perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/Z/ZE/ZEFRAM
+MASTER_SITE_SUBDIR= CPAN:ZEFRAM
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/math/p5-GIS-Distance-Lite/Makefile b/math/p5-GIS-Distance-Lite/Makefile
index 0228fc9b9b22..c6f9a68413c6 100644
--- a/math/p5-GIS-Distance-Lite/Makefile
+++ b/math/p5-GIS-Distance-Lite/Makefile
@@ -9,7 +9,7 @@ PORTNAME= GIS-Distance-Lite
PORTVERSION= 1.0
CATEGORIES= math perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/J/JO/JOBERO
+MASTER_SITE_SUBDIR= CPAN:JOBERO
PKGNAMEPREFIX= p5-
MAINTAINER= wen@FreeBSD.org
diff --git a/math/p5-GIS-Distance/Makefile b/math/p5-GIS-Distance/Makefile
index a414735808e9..efbee8e57999 100644
--- a/math/p5-GIS-Distance/Makefile
+++ b/math/p5-GIS-Distance/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.07
PORTEPOCH= 1
CATEGORIES= math perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/B/BL/BLUEFEET
+MASTER_SITE_SUBDIR= CPAN:BLUEFEET
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/math/p5-Math-Random-ISAAC-XS/Makefile b/math/p5-Math-Random-ISAAC-XS/Makefile
index 8e37be50d12a..5144e70639d6 100644
--- a/math/p5-Math-Random-ISAAC-XS/Makefile
+++ b/math/p5-Math-Random-ISAAC-XS/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Math-Random-ISAAC-XS
PORTVERSION= 1.004
CATEGORIES= math perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/J/JA/JAWNSY/
+MASTER_SITE_SUBDIR= CPAN:JAWNSY
PKGNAMEPREFIX= p5-
MAINTAINER= wen@FreeBSD.org
diff --git a/math/p5-Math-Random-ISAAC/Makefile b/math/p5-Math-Random-ISAAC/Makefile
index 881706d7ae27..60984bf5b838 100644
--- a/math/p5-Math-Random-ISAAC/Makefile
+++ b/math/p5-Math-Random-ISAAC/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Math-Random-ISAAC
PORTVERSION= 1.004
CATEGORIES= math perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/J/JA/JAWNSY
+MASTER_SITE_SUBDIR= CPAN:JAWNSY
PKGNAMEPREFIX= p5-
MAINTAINER= wen@FreeBSD.org
diff --git a/math/p5-Number-Fraction/Makefile b/math/p5-Number-Fraction/Makefile
index ae14503766e4..21f8dac4d9c8 100644
--- a/math/p5-Number-Fraction/Makefile
+++ b/math/p5-Number-Fraction/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Number-Fraction
PORTVERSION= 1.13
CATEGORIES= math perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/D/DA/DAVECROSS
+MASTER_SITE_SUBDIR= CPAN:DAVECROSS
PKGNAMEPREFIX= p5-
MAINTAINER= swills@FreeBSD.org
diff --git a/misc/p5-Array-Compare/Makefile b/misc/p5-Array-Compare/Makefile
index c94bf9c1dafa..3511b8a0f5aa 100644
--- a/misc/p5-Array-Compare/Makefile
+++ b/misc/p5-Array-Compare/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Array-Compare
PORTVERSION= 2.01
CATEGORIES= misc perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/D/DA/DAVECROSS
+MASTER_SITE_SUBDIR= CPAN:DAVECROSS
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/misc/p5-Business-UPS/Makefile b/misc/p5-Business-UPS/Makefile
index 180adebb73ce..012ae5d37431 100644
--- a/misc/p5-Business-UPS/Makefile
+++ b/misc/p5-Business-UPS/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Business-UPS
PORTVERSION= 2.0
CATEGORIES= misc perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/J/JW/JWHEELER
+MASTER_SITE_SUBDIR= CPAN:JWHEELER
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/misc/p5-Zen-Koans/Makefile b/misc/p5-Zen-Koans/Makefile
index dc449fa44de8..aa76d64d54ba 100644
--- a/misc/p5-Zen-Koans/Makefile
+++ b/misc/p5-Zen-Koans/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Zen-Koans
PORTVERSION= 0.05
CATEGORIES= misc perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/L/LU/LUKEC
+MASTER_SITE_SUBDIR= CPAN:LUKEC
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/multimedia/p5-FFmpeg-Command/Makefile b/multimedia/p5-FFmpeg-Command/Makefile
index 792e0e2f3c4d..7fe1293d306a 100644
--- a/multimedia/p5-FFmpeg-Command/Makefile
+++ b/multimedia/p5-FFmpeg-Command/Makefile
@@ -9,7 +9,7 @@ PORTNAME= FFmpeg-Command
PORTVERSION= 0.15
CATEGORIES= multimedia perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/M/MI/MIZZY
+MASTER_SITE_SUBDIR= CPAN:MIZZY
PKGNAMEPREFIX= p5-
MAINTAINER= sumikawa@FreeBSD.org
diff --git a/multimedia/p5-FFmpeg-Command/distinfo b/multimedia/p5-FFmpeg-Command/distinfo
index 4a4238950bb9..c56128360583 100644
--- a/multimedia/p5-FFmpeg-Command/distinfo
+++ b/multimedia/p5-FFmpeg-Command/distinfo
@@ -1,3 +1,2 @@
-MD5 (FFmpeg-Command-0.15.tar.gz) = b458514b86474bab62d763dd90a2d7b2
SHA256 (FFmpeg-Command-0.15.tar.gz) = 2f4cf3ff38a3244e9e9a1644e6a105e9e0a373a79674fc6e57cefd507cb368cb
SIZE (FFmpeg-Command-0.15.tar.gz) = 5451
diff --git a/multimedia/p5-FLV-Info/Makefile b/multimedia/p5-FLV-Info/Makefile
index 515113847da8..84d6f782ec70 100644
--- a/multimedia/p5-FLV-Info/Makefile
+++ b/multimedia/p5-FLV-Info/Makefile
@@ -9,7 +9,7 @@ PORTNAME= FLV-Info
PORTVERSION= 0.24
CATEGORIES= multimedia perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/C/CD/CDOLAN
+MASTER_SITE_SUBDIR= CPAN:CDOLAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/net-im/p5-DJabberd/Makefile b/net-im/p5-DJabberd/Makefile
index ccdf176ccbf1..a31b1d1741af 100644
--- a/net-im/p5-DJabberd/Makefile
+++ b/net-im/p5-DJabberd/Makefile
@@ -9,7 +9,7 @@ PORTNAME= DJabberd
PORTVERSION= 0.83
CATEGORIES= net-im perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/B/BR/BRADFITZ
+MASTER_SITE_SUBDIR= CPAN:BRADFITZ
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/net-mgmt/p5-Data-Validate-IP/Makefile b/net-mgmt/p5-Data-Validate-IP/Makefile
index 8b04a934f1b4..8b8c3ba2fd73 100644
--- a/net-mgmt/p5-Data-Validate-IP/Makefile
+++ b/net-mgmt/p5-Data-Validate-IP/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Data-Validate-IP
PORTVERSION= 0.14
CATEGORIES= net-mgmt perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/N/NE/NEELY
+MASTER_SITE_SUBDIR= CPAN:NEELY
PKGNAMEPREFIX= p5-
MAINTAINER= freebsd-ports@t-b-o-h.net
diff --git a/net-mgmt/p5-NSNMP/Makefile b/net-mgmt/p5-NSNMP/Makefile
index 7e9a159f24de..6211970a5e50 100644
--- a/net-mgmt/p5-NSNMP/Makefile
+++ b/net-mgmt/p5-NSNMP/Makefile
@@ -9,7 +9,7 @@ PORTNAME= NSNMP
PORTVERSION= 0.5
CATEGORIES= net-mgmt perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/K/KR/KRAGEN
+MASTER_SITE_SUBDIR= CPAN:KRAGEN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile b/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile
index 25ff75abb20a..76fd673642c2 100644
--- a/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile
+++ b/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.02
PORTREVISION= 1
CATEGORIES= net-mgmt perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/Z/ZI/ZIGOROU
+MASTER_SITE_SUBDIR= CPAN:ZIGOROU
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/net-p2p/p5-Net-DirectConnect-TigerHash/Makefile b/net-p2p/p5-Net-DirectConnect-TigerHash/Makefile
index fe39fd93290f..20fdab72841b 100644
--- a/net-p2p/p5-Net-DirectConnect-TigerHash/Makefile
+++ b/net-p2p/p5-Net-DirectConnect-TigerHash/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Net-DirectConnect-TigerHash
PORTVERSION= 0.06
CATEGORIES= net-p2p net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/P/PR/PRO/
+MASTER_SITE_SUBDIR= CPAN:PRO
PKGNAMEPREFIX= p5-
MAINTAINER= proler@gmail.com
diff --git a/net-p2p/p5-Net-DirectConnect/Makefile b/net-p2p/p5-Net-DirectConnect/Makefile
index cdb47d9f781f..40d804ae9abf 100644
--- a/net-p2p/p5-Net-DirectConnect/Makefile
+++ b/net-p2p/p5-Net-DirectConnect/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Net-DirectConnect
PORTVERSION= 0.09
CATEGORIES= net-p2p net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/P/PR/PRO/
+MASTER_SITE_SUBDIR= CPAN:PRO
PKGNAMEPREFIX= p5-
MAINTAINER= proler@gmail.com
diff --git a/net/ldapsh/Makefile b/net/ldapsh/Makefile
index c1a5f130bee9..2af6b286e6e8 100644
--- a/net/ldapsh/Makefile
+++ b/net/ldapsh/Makefile
@@ -11,7 +11,7 @@ PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= net
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/L/LO/LOOSIFER
+MASTER_SITE_SUBDIR= CPAN:LOOSIFER
MAINTAINER= flz@FreeBSD.org
COMMENT= Interactive shell used to administer ldap directories
diff --git a/net/p5-AddressBook/Makefile b/net/p5-AddressBook/Makefile
index 7b85fde85f9d..f4243191362f 100644
--- a/net/p5-AddressBook/Makefile
+++ b/net/p5-AddressBook/Makefile
@@ -9,10 +9,10 @@ PORTNAME= AddressBook
PORTVERSION= 0.16
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/D/DL/DLEIGH
+MASTER_SITE_SUBDIR= CPAN:DLEIGH
PKGNAMEPREFIX= p5-
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Perl5 module providing an LDAP addressbook interface
USE_PERL5= yes
diff --git a/net/p5-BBS-Client/Makefile b/net/p5-BBS-Client/Makefile
index 109267bcad5b..1dbd20244ce2 100644
--- a/net/p5-BBS-Client/Makefile
+++ b/net/p5-BBS-Client/Makefile
@@ -9,7 +9,7 @@ PORTNAME= BBS-Client
PORTVERSION= 0.03
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/C/CO/CORNELIUS
+MASTER_SITE_SUBDIR= CPAN:CORNELIUS
PKGNAMEPREFIX= p5-
MAINTAINER= yzlin@FreeBSD.org
diff --git a/net/p5-BBS-UserInfo-Maple3/Makefile b/net/p5-BBS-UserInfo-Maple3/Makefile
index 6a962524916a..0427a1880bb8 100644
--- a/net/p5-BBS-UserInfo-Maple3/Makefile
+++ b/net/p5-BBS-UserInfo-Maple3/Makefile
@@ -9,7 +9,7 @@ PORTNAME= BBS-UserInfo-Maple3
PORTVERSION= 0.01
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/G/GS/GSLIN
+MASTER_SITE_SUBDIR= CPAN:GSLIN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/net/p5-BBS-UserInfo-Maple3itoc/Makefile b/net/p5-BBS-UserInfo-Maple3itoc/Makefile
index 94e239dc8e7f..9bbd6718b0a2 100644
--- a/net/p5-BBS-UserInfo-Maple3itoc/Makefile
+++ b/net/p5-BBS-UserInfo-Maple3itoc/Makefile
@@ -9,7 +9,7 @@ PORTNAME= BBS-UserInfo-Maple3itoc
PORTVERSION= 0.01
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/G/GS/GSLIN
+MASTER_SITE_SUBDIR= CPAN:GSLIN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/net/p5-BBS-UserInfo-Ptt/Makefile b/net/p5-BBS-UserInfo-Ptt/Makefile
index d877ca2649fd..3381bda0127e 100644
--- a/net/p5-BBS-UserInfo-Ptt/Makefile
+++ b/net/p5-BBS-UserInfo-Ptt/Makefile
@@ -9,7 +9,7 @@ PORTNAME= BBS-UserInfo-Ptt
PORTVERSION= 0.06
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/G/GS/GSLIN
+MASTER_SITE_SUBDIR= CPAN:GSLIN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/net/p5-BBS-UserInfo-SOB/Makefile b/net/p5-BBS-UserInfo-SOB/Makefile
index 5a3531cd57c2..d8e7539b8ca8 100644
--- a/net/p5-BBS-UserInfo-SOB/Makefile
+++ b/net/p5-BBS-UserInfo-SOB/Makefile
@@ -9,7 +9,7 @@ PORTNAME= BBS-UserInfo-SOB
PORTVERSION= 0.01
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/G/GS/GSLIN
+MASTER_SITE_SUBDIR= CPAN:GSLIN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/net/p5-BBS-UserInfo-Wretch/Makefile b/net/p5-BBS-UserInfo-Wretch/Makefile
index 9574a276aa9b..853ef5385096 100644
--- a/net/p5-BBS-UserInfo-Wretch/Makefile
+++ b/net/p5-BBS-UserInfo-Wretch/Makefile
@@ -9,7 +9,7 @@ PORTNAME= BBS-UserInfo-Wretch
PORTVERSION= 0.03
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/G/GS/GSLIN
+MASTER_SITE_SUBDIR= CPAN:GSLIN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/net/p5-BBS-UserInfo/Makefile b/net/p5-BBS-UserInfo/Makefile
index dda0ac1b8b1e..9658af5971ca 100644
--- a/net/p5-BBS-UserInfo/Makefile
+++ b/net/p5-BBS-UserInfo/Makefile
@@ -9,7 +9,7 @@ PORTNAME= BBS-UserInfo
PORTVERSION= 0.01
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/G/GS/GSLIN
+MASTER_SITE_SUBDIR= CPAN:GSLIN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/net/p5-Net-Amazon-AWSSign/Makefile b/net/p5-Net-Amazon-AWSSign/Makefile
index 4ae670cf4b7d..0c02db7af589 100644
--- a/net/p5-Net-Amazon-AWSSign/Makefile
+++ b/net/p5-Net-Amazon-AWSSign/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Net-Amazon-AWSSign
PORTVERSION= 0.09
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/N/NA/NATON
+MASTER_SITE_SUBDIR= CPAN:NATON
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/net/p5-Net-LDAP-AutoDNs/Makefile b/net/p5-Net-LDAP-AutoDNs/Makefile
index 3913802033df..4309deaa95cb 100644
--- a/net/p5-Net-LDAP-AutoDNs/Makefile
+++ b/net/p5-Net-LDAP-AutoDNs/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Net-LDAP-AutoDNs
PORTVERSION= 0.2.2
CATEGORIES= net 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/net/p5-Net-LDAP-AutoServer/Makefile b/net/p5-Net-LDAP-AutoServer/Makefile
index 718be50f5d3d..e47f5da38599 100644
--- a/net/p5-Net-LDAP-AutoServer/Makefile
+++ b/net/p5-Net-LDAP-AutoServer/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Net-LDAP-AutoServer
PORTVERSION= 0.2.1
CATEGORIES= net 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/net/p5-Net-LDAP-LDAPhash/Makefile b/net/p5-Net-LDAP-LDAPhash/Makefile
index a199f73ac0ec..b0649bcd03d5 100644
--- a/net/p5-Net-LDAP-LDAPhash/Makefile
+++ b/net/p5-Net-LDAP-LDAPhash/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Net-LDAP-LDAPhash
PORTVERSION= 1.0.2
CATEGORIES= net 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/net/p5-Net-LDAP-Makepath/Makefile b/net/p5-Net-LDAP-Makepath/Makefile
index 02586b4cb9a6..ed5d53470f7f 100644
--- a/net/p5-Net-LDAP-Makepath/Makefile
+++ b/net/p5-Net-LDAP-Makepath/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.0.1
PORTREVISION= 1
CATEGORIES= net 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/net/p5-Net-LDAP-posixAccount/Makefile b/net/p5-Net-LDAP-posixAccount/Makefile
index aaa1e1bb4053..7a37f4dae600 100644
--- a/net/p5-Net-LDAP-posixAccount/Makefile
+++ b/net/p5-Net-LDAP-posixAccount/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Net-LDAP-posixAccount
PORTVERSION= 0.0.2
CATEGORIES= net 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/net/p5-Net-LDAP-posixGroup/Makefile b/net/p5-Net-LDAP-posixGroup/Makefile
index 5dde1be57fc9..552d1293eef2 100644
--- a/net/p5-Net-LDAP-posixGroup/Makefile
+++ b/net/p5-Net-LDAP-posixGroup/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Net-LDAP-posixGroup
PORTVERSION= 0.0.1
CATEGORIES= net 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/net/p5-Net-Traceroute/Makefile b/net/p5-Net-Traceroute/Makefile
index 1dcb5820aefc..89abd09148cb 100644
--- a/net/p5-Net-Traceroute/Makefile
+++ b/net/p5-Net-Traceroute/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Net-Traceroute
PORTVERSION= 1.13
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/H/HA/HAG
+MASTER_SITE_SUBDIR= CPAN:HAG
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/net/p5-OAuth-Lite/Makefile b/net/p5-OAuth-Lite/Makefile
index 49b3d34930ec..9e07e0650211 100644
--- a/net/p5-OAuth-Lite/Makefile
+++ b/net/p5-OAuth-Lite/Makefile
@@ -9,7 +9,7 @@ PORTNAME= OAuth-Lite
PORTVERSION= 1.30
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/L/LY/LYOKATO
+MASTER_SITE_SUBDIR= CPAN:LYOKATO
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/net/p5-POEx-Role-TCPServer/Makefile b/net/p5-POEx-Role-TCPServer/Makefile
index ec4e1e91700e..b997a96ee1e0 100644
--- a/net/p5-POEx-Role-TCPServer/Makefile
+++ b/net/p5-POEx-Role-TCPServer/Makefile
@@ -9,7 +9,7 @@ PORTNAME= POEx-Role-TCPServer
PORTVERSION= 1.102740
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/N/NP/NPEREZ
+MASTER_SITE_SUBDIR= CPAN:NPEREZ
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/net/p5-REST-Application/Makefile b/net/p5-REST-Application/Makefile
index 73e7ecb414fb..f72ebb62d187 100644
--- a/net/p5-REST-Application/Makefile
+++ b/net/p5-REST-Application/Makefile
@@ -9,10 +9,10 @@ PORTNAME= REST-Application
PORTVERSION= 0.992
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/M/MO/MOCONNOR
+MASTER_SITE_SUBDIR= CPAN:MOCONNOR
PKGNAMEPREFIX= p5-
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= A framework for building RESTful web-applications
BUILD_DEPENDS= p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash
diff --git a/net/p5-REST-Google/Makefile b/net/p5-REST-Google/Makefile
index 81e58e85c1ea..d429ae838c8e 100644
--- a/net/p5-REST-Google/Makefile
+++ b/net/p5-REST-Google/Makefile
@@ -9,7 +9,7 @@ PORTNAME= REST-Google
PORTVERSION= 1.0.8
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/E/EJ/EJS/
+MASTER_SITE_SUBDIR= CPAN:EJS
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/net/p5-Server-Starter/Makefile b/net/p5-Server-Starter/Makefile
index 7545603661ee..19afd5040ce0 100644
--- a/net/p5-Server-Starter/Makefile
+++ b/net/p5-Server-Starter/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Server-Starter
PORTVERSION= 0.11
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/K/KA/KAZUHO
+MASTER_SITE_SUBDIR= CPAN:KAZUHO
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/net/p5-Spread-Message/Makefile b/net/p5-Spread-Message/Makefile
index 53c9fc9bfbc4..857bd6314ac9 100644
--- a/net/p5-Spread-Message/Makefile
+++ b/net/p5-Spread-Message/Makefile
@@ -9,10 +9,10 @@ PORTNAME= Spread-Message
PORTVERSION= 0.21
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/M/MA/MARKPF
+MASTER_SITE_SUBDIR= CPAN:MARKPF
PKGNAMEPREFIX= p5-
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Provide messaging using the Spread toolkit
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Spread.pm:${PORTSDIR}/net/spread
diff --git a/net/p5-URI/Makefile b/net/p5-URI/Makefile
index b269851a07df..b981563b2ed9 100644
--- a/net/p5-URI/Makefile
+++ b/net/p5-URI/Makefile
@@ -9,7 +9,7 @@ PORTNAME= URI
PORTVERSION= 1.58
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/G/GA/GAAS
+MASTER_SITE_SUBDIR= CPAN:GAAS
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/net/p5-Validate-Net/Makefile b/net/p5-Validate-Net/Makefile
index e5fc479bdd40..a8118f2ba6c7 100644
--- a/net/p5-Validate-Net/Makefile
+++ b/net/p5-Validate-Net/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Validate-Net
PORTVERSION= 0.6
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/A/AD/ADAMK
+MASTER_SITE_SUBDIR= CPAN:ADAMK
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/net/p5-What/Makefile b/net/p5-What/Makefile
index 45d20decf3c5..527caca57b6b 100644
--- a/net/p5-What/Makefile
+++ b/net/p5-What/Makefile
@@ -9,7 +9,7 @@ PORTNAME= What
PORTVERSION= 1.01
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/T/TP/TPG
+MASTER_SITE_SUBDIR= CPAN:TPG
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/net/p5-XML-Compile-SOAP/Makefile b/net/p5-XML-Compile-SOAP/Makefile
index f84427365a7a..12e237031fa1 100644
--- a/net/p5-XML-Compile-SOAP/Makefile
+++ b/net/p5-XML-Compile-SOAP/Makefile
@@ -9,7 +9,7 @@ PORTNAME= XML-Compile-SOAP
PORTVERSION= 2.23
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/M/MA/MARKOV
+MASTER_SITE_SUBDIR= CPAN:MARKOV
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/net/p5-XPC/Makefile b/net/p5-XPC/Makefile
index a0b0c1182fbc..874075c40e9a 100644
--- a/net/p5-XPC/Makefile
+++ b/net/p5-XPC/Makefile
@@ -11,10 +11,10 @@ PORTVERSION= 0.2
PORTREVISION= 1
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/G/GR/GREGOR
+MASTER_SITE_SUBDIR= CPAN:GREGOR
PKGNAMEPREFIX= p5-
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= XML Procedure Call (XPC)
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
diff --git a/net/p5-ZConf-Bookmarks/Makefile b/net/p5-ZConf-Bookmarks/Makefile
index 73da894e6ee9..4df6953bb5a0 100644
--- a/net/p5-ZConf-Bookmarks/Makefile
+++ b/net/p5-ZConf-Bookmarks/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ZConf-Bookmarks
PORTVERSION= 0.2.4
CATEGORIES= net 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/net/p5-ZConf/Makefile b/net/p5-ZConf/Makefile
index f16cb4975fda..5196fb8daa52 100644
--- a/net/p5-ZConf/Makefile
+++ b/net/p5-ZConf/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ZConf
PORTVERSION= 5.1.0
CATEGORIES= net 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/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/Makefile b/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/Makefile
index 4060bc843211..e77e5a11ca23 100644
--- a/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/Makefile
+++ b/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.2.1
PORTREVISION= 2
CATEGORIES= ports-mgmt sysutils perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../../authors/id/V/VV/VVELOX
+MASTER_SITE_SUBDIR= CPAN:VVELOX
PKGNAMEPREFIX= p5-
MAINTAINER= vvelox@vvelox.net