61 files changed, 66 insertions, 66 deletions

diff --git a/www/p5-AMF-Perl/Makefile b/www/p5-AMF-Perl/Makefile
index 0cc0ace372d5..a21346b9f903 100644
--- a/www/p5-AMF-Perl/Makefile
+++ b/www/p5-AMF-Perl/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.15
 PORTREVISION=	1
 CATEGORIES=	www devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/S/SI/SIMONF
+MASTER_SITE_SUBDIR=	CPAN:SIMONF
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/www/p5-AnyEvent-HTTPD/Makefile b/www/p5-AnyEvent-HTTPD/Makefile
index 953b416a176b..a6c534e87f4d 100644
--- a/www/p5-AnyEvent-HTTPD/Makefile
+++ b/www/p5-AnyEvent-HTTPD/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.84
 PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/E/EL/ELMEX
+MASTER_SITE_SUBDIR=	CPAN:ELMEX
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mons@cpan.org
diff --git a/www/p5-Apache-AuthenCache/Makefile b/www/p5-Apache-AuthenCache/Makefile
index 106af489e91b..8ebb4bbf0a84 100644
--- a/www/p5-Apache-AuthenCache/Makefile
+++ b/www/p5-Apache-AuthenCache/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Apache-AuthenCache
 PORTVERSION=	1.00
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/C/CG/CGILMORE
+MASTER_SITE_SUBDIR=	CPAN:CGILMORE
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-Blog-Spam/Makefile b/www/p5-Blog-Spam/Makefile
index aa480a0b24ca..f44f38355959 100644
--- a/www/p5-Blog-Spam/Makefile
+++ b/www/p5-Blog-Spam/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Blog-Spam
 PORTVERSION=	1.0.2
 CATEGORIES=	www net perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/S/SK/SKX
+MASTER_SITE_SUBDIR=	CPAN:SKX
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
diff --git a/www/p5-CGI-Builder-TT2/Makefile b/www/p5-CGI-Builder-TT2/Makefile
index 128b01bc53ca..e3e2bb92d391 100644
--- a/www/p5-CGI-Builder-TT2/Makefile
+++ b/www/p5-CGI-Builder-TT2/Makefile
@@ -9,10 +9,10 @@ PORTNAME=	CGI-Builder-TT2
 PORTVERSION=	0.03
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/L/LA/LARSEN
+MASTER_SITE_SUBDIR=	CPAN:LARSEN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	CGI::Builder and Template Toolkit 2 integration
 
 BUILD_DEPENDS=	${SITE_PERL}/CGI/Builder.pm:${PORTSDIR}/www/p5-CGI-Builder \
diff --git a/www/p5-CGI-Compile/Makefile b/www/p5-CGI-Compile/Makefile
index 19045698107c..188761df47a0 100644
--- a/www/p5-CGI-Compile/Makefile
+++ b/www/p5-CGI-Compile/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	CGI-Compile
 PORTVERSION=	0.14
 CATEGORIES=	www 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/www/p5-CGI-Cookie-XS/Makefile b/www/p5-CGI-Cookie-XS/Makefile
index d50190fbe5d9..787bfecd0c1f 100644
--- a/www/p5-CGI-Cookie-XS/Makefile
+++ b/www/p5-CGI-Cookie-XS/Makefile
@@ -9,10 +9,10 @@ PORTNAME=	CGI-Cookie-XS
 PORTVERSION=	0.18
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/A/AG/AGENT
+MASTER_SITE_SUBDIR=	CPAN:AGENT
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	HTTP Cookie parser in C
 
 BUILD_DEPENDS=	p5-Filter-Simple>=0:${PORTSDIR}/textproc/p5-Filter-Simple
diff --git a/www/p5-CGI-Emulate-PSGI/Makefile b/www/p5-CGI-Emulate-PSGI/Makefile
index 50e8ab5e2f6f..9f774b3f9121 100644
--- a/www/p5-CGI-Emulate-PSGI/Makefile
+++ b/www/p5-CGI-Emulate-PSGI/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	CGI-Emulate-PSGI
 PORTVERSION=	0.11
 CATEGORIES=	www 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/www/p5-CGI-EncryptForm/Makefile b/www/p5-CGI-EncryptForm/Makefile
index e16e235d04ff..6f046eb8005d 100644
--- a/www/p5-CGI-EncryptForm/Makefile
+++ b/www/p5-CGI-EncryptForm/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	CGI-EncryptForm
 PORTVERSION=	1.02
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/M/MA/MARAL
+MASTER_SITE_SUBDIR=	CPAN:MARAL
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	swills@FreeBSD.org
diff --git a/www/p5-CGI-Session/Makefile b/www/p5-CGI-Session/Makefile
index 7231fd04aec6..0e4b0830d8bb 100644
--- a/www/p5-CGI-Session/Makefile
+++ b/www/p5-CGI-Session/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	CGI-Session
 PORTVERSION=	4.43
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/M/MA/MARKSTOS
+MASTER_SITE_SUBDIR=	CPAN:MARKSTOS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/www/p5-CGI.pm/Makefile b/www/p5-CGI.pm/Makefile
index 5b15d8019816..55469a58edd9 100644
--- a/www/p5-CGI.pm/Makefile
+++ b/www/p5-CGI.pm/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	3.55
 PORTEPOCH=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/M/MA/MARKSTOS
+MASTER_SITE_SUBDIR=	CPAN:MARKSTOS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/www/p5-Catalyst-Controller-FormBuilder/Makefile b/www/p5-Catalyst-Controller-FormBuilder/Makefile
index 9d812fadadc9..3858391e0214 100644
--- a/www/p5-Catalyst-Controller-FormBuilder/Makefile
+++ b/www/p5-Catalyst-Controller-FormBuilder/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Catalyst-Controller-FormBuilder
 PORTVERSION=	0.06
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/M/MS/MSTROUT
+MASTER_SITE_SUBDIR=	CPAN:MSTROUT
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-Catalyst-Engine-PSGI/Makefile b/www/p5-Catalyst-Engine-PSGI/Makefile
index 2ba3feaac27a..9d9a9aea7846 100644
--- a/www/p5-Catalyst-Engine-PSGI/Makefile
+++ b/www/p5-Catalyst-Engine-PSGI/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Catalyst-Engine-PSGI
 PORTVERSION=	0.12
 CATEGORIES=	www 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/www/p5-Catalyst-Plugin-Authentication/Makefile b/www/p5-Catalyst-Plugin-Authentication/Makefile
index b2b44a351346..50c153c2e1cf 100644
--- a/www/p5-Catalyst-Plugin-Authentication/Makefile
+++ b/www/p5-Catalyst-Plugin-Authentication/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	www 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/www/p5-Corona/Makefile b/www/p5-Corona/Makefile
index a7dbd37e9deb..7186689dae44 100644
--- a/www/p5-Corona/Makefile
+++ b/www/p5-Corona/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Corona
 PORTVERSION=	0.1004
 CATEGORIES=	www 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/www/p5-Dancer-Plugin-DataFu/Makefile b/www/p5-Dancer-Plugin-DataFu/Makefile
index c991d1826dd8..567cd0cf2a47 100644
--- a/www/p5-Dancer-Plugin-DataFu/Makefile
+++ b/www/p5-Dancer-Plugin-DataFu/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Dancer-Plugin-DataFu
 PORTVERSION=	1.103070
 CATEGORIES=	www 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/www/p5-Emplacken/Makefile b/www/p5-Emplacken/Makefile
index 99b78cf1e9a3..7d5c2053892b 100644
--- a/www/p5-Emplacken/Makefile
+++ b/www/p5-Emplacken/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Emplacken
 PORTVERSION=	0.01
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/D/DR/DROLSKY
+MASTER_SITE_SUBDIR=	CPAN:DROLSKY
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
diff --git a/www/p5-FCGI-Client/Makefile b/www/p5-FCGI-Client/Makefile
index 9402324befd6..37280f1ae066 100644
--- a/www/p5-FCGI-Client/Makefile
+++ b/www/p5-FCGI-Client/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	FCGI-Client
 PORTVERSION=	0.06
 CATEGORIES=	www 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/www/p5-File-Mork/Makefile b/www/p5-File-Mork/Makefile
index 72554d49d68c..d66d9b93c4a0 100644
--- a/www/p5-File-Mork/Makefile
+++ b/www/p5-File-Mork/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	File-Mork
 PORTVERSION=	0.3
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/S/SI/SIMONW
+MASTER_SITE_SUBDIR=	CPAN:SIMONW
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	markun@onohara.to
diff --git a/www/p5-Flea/Makefile b/www/p5-Flea/Makefile
index 2721e32c855f..f975528db65b 100644
--- a/www/p5-Flea/Makefile
+++ b/www/p5-Flea/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.04
 PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/F/FR/FRODWITH
+MASTER_SITE_SUBDIR=	CPAN:FRODWITH
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/www/p5-Gtk2-WebKit/Makefile b/www/p5-Gtk2-WebKit/Makefile
index bc453297d609..d844e9df9561 100644
--- a/www/p5-Gtk2-WebKit/Makefile
+++ b/www/p5-Gtk2-WebKit/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Gtk2-WebKit
 PORTVERSION=	0.08
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/F/FL/FLORA
+MASTER_SITE_SUBDIR=	CPAN:FLORA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vvelox@vvelox.net
diff --git a/www/p5-Gungho/Makefile b/www/p5-Gungho/Makefile
index ccece416a767..a77f55d215ae 100644
--- a/www/p5-Gungho/Makefile
+++ b/www/p5-Gungho/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Gungho
 PORTVERSION=	0.09.008
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/D/DM/DMAKI
+MASTER_SITE_SUBDIR=	CPAN:DMAKI
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
diff --git a/www/p5-HTML-RobotsMETA/Makefile b/www/p5-HTML-RobotsMETA/Makefile
index b8f5c32271bb..c903ffe1bc3a 100644
--- a/www/p5-HTML-RobotsMETA/Makefile
+++ b/www/p5-HTML-RobotsMETA/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	HTML-RobotsMETA
 PORTVERSION=	0.00004
 CATEGORIES=	www 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/www/p5-HTML-StickyQuery-DoCoMoGUID/Makefile b/www/p5-HTML-StickyQuery-DoCoMoGUID/Makefile
index ff7e66a7d5c2..8ef59b467fd7 100644
--- a/www/p5-HTML-StickyQuery-DoCoMoGUID/Makefile
+++ b/www/p5-HTML-StickyQuery-DoCoMoGUID/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	HTML-StickyQuery-DoCoMoGUID
 PORTVERSION=	0.03
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/Y/YA/YAPPO
+MASTER_SITE_SUBDIR=	CPAN:YAPPO
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/www/p5-HTML-Template-Associate/Makefile b/www/p5-HTML-Template-Associate/Makefile
index 8b13bc88e6bd..9858991453dc 100644
--- a/www/p5-HTML-Template-Associate/Makefile
+++ b/www/p5-HTML-Template-Associate/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	HTML-Template-Associate
 PORTVERSION=	2.00
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/A/AL/ALEXP
+MASTER_SITE_SUBDIR=	CPAN:ALEXP
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dhn@FreeBSD.org
diff --git a/www/p5-HTTP-BrowserDetect/Makefile b/www/p5-HTTP-BrowserDetect/Makefile
index 481cac92b299..ca1cfd1f3710 100644
--- a/www/p5-HTTP-BrowserDetect/Makefile
+++ b/www/p5-HTTP-BrowserDetect/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	HTTP-BrowserDetect
 PORTVERSION=	0.99
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/W/WA/WALSHAM
+MASTER_SITE_SUBDIR=	CPAN:WALSHAM
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/www/p5-HTTP-Session-State-MobileAgentID/Makefile b/www/p5-HTTP-Session-State-MobileAgentID/Makefile
index 26a873d5f4bb..559e874d5fec 100644
--- a/www/p5-HTTP-Session-State-MobileAgentID/Makefile
+++ b/www/p5-HTTP-Session-State-MobileAgentID/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	HTTP-Session-State-MobileAgentID
 PORTVERSION=	0.45
 CATEGORIES=	www 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/www/p5-HTTP-Session/Makefile b/www/p5-HTTP-Session/Makefile
index 8f824bfc51b3..e136770bf638 100644
--- a/www/p5-HTTP-Session/Makefile
+++ b/www/p5-HTTP-Session/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	HTTP-Session
 PORTVERSION=	0.43
 CATEGORIES=	www 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/www/p5-HTTPD-Log-Filter/Makefile b/www/p5-HTTPD-Log-Filter/Makefile
index 5fca3882d2e7..dfba32f16d22 100644
--- a/www/p5-HTTPD-Log-Filter/Makefile
+++ b/www/p5-HTTPD-Log-Filter/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	HTTPD-Log-Filter
 PORTVERSION=	1.08
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/A/AW/AWRIGLEY
+MASTER_SITE_SUBDIR=	CPAN:AWRIGLEY
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/www/p5-LWP-UserAgent-Determined/Makefile b/www/p5-LWP-UserAgent-Determined/Makefile
index 5a095a95c4d8..9d7be8eb0c68 100644
--- a/www/p5-LWP-UserAgent-Determined/Makefile
+++ b/www/p5-LWP-UserAgent-Determined/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	LWP-UserAgent-Determined
 PORTVERSION=	1.05
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/J/JE/JESSE
+MASTER_SITE_SUBDIR=	CPAN:JESSE
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	leeym@FreeBSD.org
diff --git a/www/p5-Markup-Perl/Makefile b/www/p5-Markup-Perl/Makefile
index f0dee5bc0e8f..9a452566dd23 100644
--- a/www/p5-Markup-Perl/Makefile
+++ b/www/p5-Markup-Perl/Makefile
@@ -9,11 +9,11 @@ PORTNAME=	Markup-Perl
 PORTVERSION=	0.5
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/M/MM/MMATHEWS
+MASTER_SITE_SUBDIR=	CPAN:MMATHEWS
 PKGNAMEPREFIX=	p5-
 DISTNAME=	Markup-Perl-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Support perl code inside CGI scripts using simple tags
 
 USE_PERL5=	yes
diff --git a/www/p5-Net-FastCGI/Makefile b/www/p5-Net-FastCGI/Makefile
index f07dbd6f32e6..18714cfda242 100644
--- a/www/p5-Net-FastCGI/Makefile
+++ b/www/p5-Net-FastCGI/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Net-FastCGI
 PORTVERSION=	0.13
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/C/CH/CHANSEN
+MASTER_SITE_SUBDIR=	CPAN:CHANSEN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/www/p5-Nginx-ReadBody/Makefile b/www/p5-Nginx-ReadBody/Makefile
index b71a84ab8a39..8d096ae18912 100644
--- a/www/p5-Nginx-ReadBody/Makefile
+++ b/www/p5-Nginx-ReadBody/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Nginx-ReadBody
 PORTVERSION=	0.07
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/T/TP/TPABA/Nginx
+MASTER_SITE_SUBDIR=	CPAN:TPABA/Nginx
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jupengfei@gmail.com
diff --git a/www/p5-POE-Component-Client-UserAgent/Makefile b/www/p5-POE-Component-Client-UserAgent/Makefile
index b92b1c4fd893..034b866cb4f3 100644
--- a/www/p5-POE-Component-Client-UserAgent/Makefile
+++ b/www/p5-POE-Component-Client-UserAgent/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	POE-Component-Client-UserAgent
 PORTVERSION=	0.08
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/R/RC/RCAPUTO
+MASTER_SITE_SUBDIR=	CPAN:RCAPUTO
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-PSGI/Makefile b/www/p5-PSGI/Makefile
index deaf2245f89e..5c0b2e8e105b 100644
--- a/www/p5-PSGI/Makefile
+++ b/www/p5-PSGI/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	PSGI
 PORTVERSION=	1.03
 CATEGORIES=	www 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/www/p5-Path-Class-URI/Makefile b/www/p5-Path-Class-URI/Makefile
index f4c733e63f45..ee6a934791a3 100644
--- a/www/p5-Path-Class-URI/Makefile
+++ b/www/p5-Path-Class-URI/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Path-Class-URI
 PORTVERSION=	0.04
 CATEGORIES=	www 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/www/p5-Perlanet/Makefile b/www/p5-Perlanet/Makefile
index f0f0d6a1d7e5..01638eec63aa 100644
--- a/www/p5-Perlanet/Makefile
+++ b/www/p5-Perlanet/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Perlanet
 PORTVERSION=	0.54
 CATEGORIES=	www 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/www/p5-Perlbal-Plugin-PSGI/Makefile b/www/p5-Perlbal-Plugin-PSGI/Makefile
index 45f15ffae431..f29ffa2d4dd1 100644
--- a/www/p5-Perlbal-Plugin-PSGI/Makefile
+++ b/www/p5-Perlbal-Plugin-PSGI/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Perlbal-Plugin-PSGI
 PORTVERSION=	0.03
 CATEGORIES=	www 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/www/p5-Plack-Middleware-IEnosniff/Makefile b/www/p5-Plack-Middleware-IEnosniff/Makefile
index f4748cdc8ee0..d297e6201a11 100644
--- a/www/p5-Plack-Middleware-IEnosniff/Makefile
+++ b/www/p5-Plack-Middleware-IEnosniff/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Plack-Middleware-IEnosniff
 PORTVERSION=	0.01
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/B/BA/BAYASHI
+MASTER_SITE_SUBDIR=	CPAN:BAYASHI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/www/p5-Plack-Server-Coro/Makefile b/www/p5-Plack-Server-Coro/Makefile
index 2fdc7625ccdd..4fc3fd0c868d 100644
--- a/www/p5-Plack-Server-Coro/Makefile
+++ b/www/p5-Plack-Server-Coro/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Plack-Server-Coro
 PORTVERSION=	0.02
 CATEGORIES=	www 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/www/p5-Plack-Server-ReverseHTTP/Makefile b/www/p5-Plack-Server-ReverseHTTP/Makefile
index d7c4b5be671a..d046c6c7bf45 100644
--- a/www/p5-Plack-Server-ReverseHTTP/Makefile
+++ b/www/p5-Plack-Server-ReverseHTTP/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Plack-Server-ReverseHTTP
 PORTVERSION=	0.02
 CATEGORIES=	www 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/www/p5-Pod-Site/Makefile b/www/p5-Pod-Site/Makefile
index b2205f301ae9..66a5ac8148b3 100644
--- a/www/p5-Pod-Site/Makefile
+++ b/www/p5-Pod-Site/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Pod-Site
 PORTVERSION=	0.52
 CATEGORIES=	www 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/www/p5-REST-Google-Apps-Provisioning/Makefile b/www/p5-REST-Google-Apps-Provisioning/Makefile
index 26dc5abf01b2..3f2995768caa 100644
--- a/www/p5-REST-Google-Apps-Provisioning/Makefile
+++ b/www/p5-REST-Google-Apps-Provisioning/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	REST-Google-Apps-Provisioning
 PORTVERSION=	1.1.9
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/S/SS/SSCHNEID
+MASTER_SITE_SUBDIR=	CPAN:SSCHNEID
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-SRU/Makefile b/www/p5-SRU/Makefile
index 0b0f20f4ca62..f8a0bbcdae41 100644
--- a/www/p5-SRU/Makefile
+++ b/www/p5-SRU/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	SRU
 PORTVERSION=	0.99
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/B/BR/BRICAS
+MASTER_SITE_SUBDIR=	CPAN:BRICAS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-SWF-Chart/Makefile b/www/p5-SWF-Chart/Makefile
index 322ccd614731..3438eb47bb65 100644
--- a/www/p5-SWF-Chart/Makefile
+++ b/www/p5-SWF-Chart/Makefile
@@ -9,10 +9,10 @@ PORTNAME=	SWF-Chart
 PORTVERSION=	1.4
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/G/GA/GARTH
+MASTER_SITE_SUBDIR=	CPAN:GARTH
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to the SWF Chart generation tool
 
 MAN3=		SWF::Chart.3
diff --git a/www/p5-Squatting-On-PSGI/Makefile b/www/p5-Squatting-On-PSGI/Makefile
index 602f8104ecce..a3d2a4f34c49 100644
--- a/www/p5-Squatting-On-PSGI/Makefile
+++ b/www/p5-Squatting-On-PSGI/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Squatting-On-PSGI
 PORTVERSION=	0.04
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/B/BE/BEPPU
+MASTER_SITE_SUBDIR=	CPAN:BEPPU
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/www/p5-Starlet/Makefile b/www/p5-Starlet/Makefile
index 563e6d7b7b3e..347876f8d504 100644
--- a/www/p5-Starlet/Makefile
+++ b/www/p5-Starlet/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Starlet
 PORTVERSION=	0.13
 CATEGORIES=	www 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/www/p5-Tatsumaki/Makefile b/www/p5-Tatsumaki/Makefile
index ede5f20ce5ce..bf62306a3c77 100644
--- a/www/p5-Tatsumaki/Makefile
+++ b/www/p5-Tatsumaki/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Tatsumaki
 PORTVERSION=	0.1012
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/M/MI/MIYAGAWA
+MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-Twiggy/Makefile b/www/p5-Twiggy/Makefile
index ec55478f223c..1b42c5fb8168 100644
--- a/www/p5-Twiggy/Makefile
+++ b/www/p5-Twiggy/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Twiggy
 PORTVERSION=	0.1010
 CATEGORIES=	www 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/www/p5-URI-Sequin/Makefile b/www/p5-URI-Sequin/Makefile
index d580168df987..a87d7d2ab0b6 100644
--- a/www/p5-URI-Sequin/Makefile
+++ b/www/p5-URI-Sequin/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	URI-Sequin
 PORTVERSION=	1.2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/S/SA/SARGIE
+MASTER_SITE_SUBDIR=	CPAN:SARGIE
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/www/p5-VUser-Google-ProvisioningAPI/Makefile b/www/p5-VUser-Google-ProvisioningAPI/Makefile
index ff92864913f3..e4f8de49a4a9 100644
--- a/www/p5-VUser-Google-ProvisioningAPI/Makefile
+++ b/www/p5-VUser-Google-ProvisioningAPI/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	VUser-Google-ProvisioningAPI
 PORTVERSION=	0.24
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/R/RS/RSMITH/vuser
+MASTER_SITE_SUBDIR=	CPAN:RSMITH/vuser
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tota@FreeBSD.org
diff --git a/www/p5-W3C-LinkChecker/Makefile b/www/p5-W3C-LinkChecker/Makefile
index cd4a22c87d16..889e70b3caab 100644
--- a/www/p5-W3C-LinkChecker/Makefile
+++ b/www/p5-W3C-LinkChecker/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	W3C-LinkChecker
 PORTVERSION=	4.8
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/S/SC/SCOP
+MASTER_SITE_SUBDIR=	CPAN:SCOP
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jadawin@FreeBSD.org
diff --git a/www/p5-WWW-Mechanize-DecodedContent/Makefile b/www/p5-WWW-Mechanize-DecodedContent/Makefile
index bd6215ed28eb..d46d37d701b6 100644
--- a/www/p5-WWW-Mechanize-DecodedContent/Makefile
+++ b/www/p5-WWW-Mechanize-DecodedContent/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	WWW-Mechanize-DecodedContent
 PORTVERSION=	0.02
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/M/MI/MIYAGAWA
+MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	markun@onohara.to
diff --git a/www/p5-WWW-SourceForge/Makefile b/www/p5-WWW-SourceForge/Makefile
index 7b5c52e67ca4..1206d3b02dcc 100644
--- a/www/p5-WWW-SourceForge/Makefile
+++ b/www/p5-WWW-SourceForge/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	WWW-SourceForge
 PORTVERSION=	0.090
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/G/GU/GUGOD
+MASTER_SITE_SUBDIR=	CPAN:GUGOD
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/0$//}
 
diff --git a/www/p5-WebService-BuzzurlAPI/Makefile b/www/p5-WebService-BuzzurlAPI/Makefile
index c1e143115b5c..d0bce8efc18c 100644
--- a/www/p5-WebService-BuzzurlAPI/Makefile
+++ b/www/p5-WebService-BuzzurlAPI/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	WebService-BuzzurlAPI
 PORTVERSION=	0.02
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/H/HO/HOLLY
+MASTER_SITE_SUBDIR=	CPAN:HOLLY
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	markun@onohara.to
diff --git a/www/p5-WordPress-XMLRPC/Makefile b/www/p5-WordPress-XMLRPC/Makefile
index 9524e2f0ec54..4794193c1657 100644
--- a/www/p5-WordPress-XMLRPC/Makefile
+++ b/www/p5-WordPress-XMLRPC/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	WordPress-XMLRPC
 PORTVERSION=	1.23
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/L/LE/LEOCHARRE
+MASTER_SITE_SUBDIR=	CPAN:LEOCHARRE
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bapt@FreeBSD.org
diff --git a/www/p5-Xango/Makefile b/www/p5-Xango/Makefile
index 7675a01128ed..b76318a141bf 100644
--- a/www/p5-Xango/Makefile
+++ b/www/p5-Xango/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Xango
 PORTVERSION=	1.08
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/D/DM/DMAKI
+MASTER_SITE_SUBDIR=	CPAN:DMAKI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
diff --git a/www/p5-ZConf-RSS-GUI-GTK/Makefile b/www/p5-ZConf-RSS-GUI-GTK/Makefile
index f507d0745784..55b177466b2c 100644
--- a/www/p5-ZConf-RSS-GUI-GTK/Makefile
+++ b/www/p5-ZConf-RSS-GUI-GTK/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.0.1
 PORTREVISION=	3
 CATEGORIES=	www 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/www/p5-ZConf-RSS/Makefile b/www/p5-ZConf-RSS/Makefile
index 788770c4b71e..acd2e3077d11 100644
--- a/www/p5-ZConf-RSS/Makefile
+++ b/www/p5-ZConf-RSS/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.2.0
 PORTREVISION=	1
 CATEGORIES=	www 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/www/weblint++/Makefile b/www/weblint++/Makefile
index 0a8d4037d694..53149aba039d 100644
--- a/www/weblint++/Makefile
+++ b/www/weblint++/Makefile
@@ -10,9 +10,9 @@ PORTVERSION=	1.15
 PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=../../authors/id/B/BD/BDFOY
+MASTER_SITE_SUBDIR=	CPAN:BDFOY
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	HTML validator and sanity checker
 
 BUILD_DEPENDS=	p5-ConfigReader-Simple>=1.15:${PORTSDIR}/devel/p5-ConfigReader-Simple \
diff --git a/www/weblint/Makefile b/www/weblint/Makefile
index ea87aa0000e9..d32498032287 100644
--- a/www/weblint/Makefile
+++ b/www/weblint/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	weblint
 PORTVERSION=	1.020
 CATEGORIES=	www
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=../../authors/id/NEILB
+MASTER_SITE_SUBDIR=	CPAN:NEILB
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	HTML validator and sanity checker