30 files changed, 47 insertions, 46 deletions

diff --git a/www/p5-Apache-ConfigFile/Makefile b/www/p5-Apache-ConfigFile/Makefile
index 2ce2f711f820..d5a72779a029 100644
--- a/www/p5-Apache-ConfigFile/Makefile
+++ b/www/p5-Apache-ConfigFile/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Apache-ConfigFile
 PORTVERSION=	1.23
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/N/NW/NWIGER
+MASTER_SITE_SUBDIR=	CPAN:NWIGER
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-CGI-FormBuilder/Makefile b/www/p5-CGI-FormBuilder/Makefile
index 6ae9b3406b83..287075608189 100644
--- a/www/p5-CGI-FormBuilder/Makefile
+++ b/www/p5-CGI-FormBuilder/Makefile
@@ -9,7 +9,7 @@ PORTVERSION=	3.0501
 PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/N/NW/NWIGER
+MASTER_SITE_SUBDIR=	CPAN:NWIGER
 PKGNAMEPREFIX=	p5-
 EXTRACT_SUFX=	.tgz
 
diff --git a/www/p5-CGI-Simple/Makefile b/www/p5-CGI-Simple/Makefile
index 96e1a2ca4bf2..ac644c3dc97c 100644
--- a/www/p5-CGI-Simple/Makefile
+++ b/www/p5-CGI-Simple/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	CGI-Simple
 PORTVERSION=	1.113
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/A/AN/ANDYA
+MASTER_SITE_SUBDIR=	CPAN:ANDYA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/www/p5-Catalyst-Controller-BindLex/Makefile b/www/p5-Catalyst-Controller-BindLex/Makefile
index 5aaa78153acb..71fc66175c66 100644
--- a/www/p5-Catalyst-Controller-BindLex/Makefile
+++ b/www/p5-Catalyst-Controller-BindLex/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Catalyst-Controller-BindLex
 PORTVERSION=	0.03
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/N/NU/NUFFIN
+MASTER_SITE_SUBDIR=	CPAN:NUFFIN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	fernan@iib.unsam.edu.ar
diff --git a/www/p5-Catalyst-Model-CDBI-Sweet/Makefile b/www/p5-Catalyst-Model-CDBI-Sweet/Makefile
index a1bad43d1d85..8e3a3fdf115e 100644
--- a/www/p5-Catalyst-Model-CDBI-Sweet/Makefile
+++ b/www/p5-Catalyst-Model-CDBI-Sweet/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Catalyst-Model-CDBI-Sweet
 PORTVERSION=	0.06
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/M/MR/MRAMBERG
+MASTER_SITE_SUBDIR=	CPAN:MRAMBERG
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		${SITE_PERL}/Class/DBI/Sweet.pm:${PORTSDIR}/databases/p5-Class-DBI-Sweet
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-PERL_MODBUILD=	5.8.2+
+PERL_MODBUILD=	yes
 
 MAN3=		Catalyst::Model::CDBI::Sweet.3
 
diff --git a/www/p5-Catalyst-Model-DBIC-Plain/Makefile b/www/p5-Catalyst-Model-DBIC-Plain/Makefile
index 66a8aa65c651..d8a10459cd2a 100644
--- a/www/p5-Catalyst-Model-DBIC-Plain/Makefile
+++ b/www/p5-Catalyst-Model-DBIC-Plain/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Catalyst-Model-DBIC-Plain
 PORTVERSION=	0.03
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/S/SR/SRI
+MASTER_SITE_SUBDIR=	CPAN:SRI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-DBIx-Class>=0.01:${PORTSDIR}/databases/p5-DBIx-Class
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	5.8.1+
+PERL_CONFIGURE=	yes
 
 MAN3=	Catalyst::Helper::Model::DBIC::Plain.3 \
 	Catalyst::Model::DBIC::Plain.3
diff --git a/www/p5-Catalyst-Model-DynamicAdaptor/Makefile b/www/p5-Catalyst-Model-DynamicAdaptor/Makefile
index ae1012a9b9e8..454eb05a8a15 100644
--- a/www/p5-Catalyst-Model-DynamicAdaptor/Makefile
+++ b/www/p5-Catalyst-Model-DynamicAdaptor/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.02
 PORTREVISION=	1
 CATEGORIES=	www devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/T/TO/TOMYHERO/
+MASTER_SITE_SUBDIR=	CPAN:TOMYHERO
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
@@ -20,7 +20,8 @@ RUN_DEPENDS=	${SITE_PERL}/Catalyst/Runtime.pm:${PORTSDIR}/www/p5-Catalyst-Runtim
 		${SITE_PERL}/Module/Recursive/Require.pm:${PORTSDIR}/devel/p5-Module-Recursive-Require \
 		${SITE_PERL}/Test/Spelling.pm:${PORTSDIR}/devel/p5-Test-Spelling
 
-PERL_CONFIGURE=	Yes
+PERL_CONFIGURE=	yes
+
 MAN3=	Catalyst::Model::DynamicAdaptor.3
 
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile b/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile
index 7a0bf4aa4b57..c3cd9048b00f 100644
--- a/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile
+++ b/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Catalyst-Plugin-Authentication-CDBI
 PORTVERSION=	0.10
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/M/MR/MRAMBERG
+MASTER_SITE_SUBDIR=	CPAN:MRAMBERG
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		${SITE_PERL}/Catalyst/Plugin/Session/FastMmap.pm:${PORTSDIR}/www/p5-Catalyst-Plugin-Session-FastMmap
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	5.8.1+
+PERL_CONFIGURE=	yes
 
 MAN3=		Catalyst::Plugin::Authentication::CDBI.3
 
diff --git a/www/p5-Catalyst-Plugin-HTML-Widget/Makefile b/www/p5-Catalyst-Plugin-HTML-Widget/Makefile
index 4e54e7c2bd55..17ffe98f5e9c 100644
--- a/www/p5-Catalyst-Plugin-HTML-Widget/Makefile
+++ b/www/p5-Catalyst-Plugin-HTML-Widget/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Catalyst-Plugin-HTML-Widget
 PORTVERSION=	1.1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/B/BO/BOBTFISH
+MASTER_SITE_SUBDIR=	CPAN:BOBTFISH
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-HTML-Widget>=0:${PORTSDIR}/www/p5-HTML-Widget
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	5.8.1+
+PERL_CONFIGURE=	yes
 
 MAN3=	Catalyst::Plugin::HTML::Widget.3
 
diff --git a/www/p5-Catalyst-Plugin-Pluggable/Makefile b/www/p5-Catalyst-Plugin-Pluggable/Makefile
index 8559caa054b0..e0973b631bba 100644
--- a/www/p5-Catalyst-Plugin-Pluggable/Makefile
+++ b/www/p5-Catalyst-Plugin-Pluggable/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Catalyst-Plugin-Pluggable
 PORTVERSION=	0.04
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/S/SR/SRI
+MASTER_SITE_SUBDIR=	CPAN:SRI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
@@ -18,7 +18,7 @@ COMMENT=	A plugin for pluggable Catalyst applications
 BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	5.8.1+
+PERL_CONFIGURE=	yes
 
 MAN3=		Catalyst::Plugin::Pluggable.3
 
diff --git a/www/p5-Catalyst-Plugin-Prototype/Makefile b/www/p5-Catalyst-Plugin-Prototype/Makefile
index 70bd67a16b9a..3794142e664f 100644
--- a/www/p5-Catalyst-Plugin-Prototype/Makefile
+++ b/www/p5-Catalyst-Plugin-Prototype/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Catalyst-Plugin-Prototype
 PORTVERSION=	1.33
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/M/MR/MRAMBERG
+MASTER_SITE_SUBDIR=	CPAN:MRAMBERG
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7006:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-HTML-Prototype>=1.48:${PORTSDIR}/www/p5-HTML-Prototype
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	5.8.1+
+PERL_CONFIGURE=	yes
 
 MAN3=	Catalyst::Helper::Prototype.3 \
 	Catalyst::Plugin::Prototype.3
diff --git a/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile b/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile
index 248eee4822f5..8ed83fcb3e3d 100644
--- a/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.12
 PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/M/MR/MRAMBERG
+MASTER_SITE_SUBDIR=	CPAN:MRAMBERG
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/www/p5-Catalyst-Plugin-Singleton/Makefile b/www/p5-Catalyst-Plugin-Singleton/Makefile
index b9ca77060bc2..869b8b1374c5 100644
--- a/www/p5-Catalyst-Plugin-Singleton/Makefile
+++ b/www/p5-Catalyst-Plugin-Singleton/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.1
 PORTEPOCH=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/M/MR/MRAMBERG
+MASTER_SITE_SUBDIR=	CPAN:MRAMBERG
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 RUN_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils
 
-PERL_MODBUILD=	5.8.1+
+PERL_MODBUILD=	yes
 
 MAN3=	Catalyst::Plugin::Singleton.3
 
diff --git a/www/p5-Catalyst-Plugin-Static/Makefile b/www/p5-Catalyst-Plugin-Static/Makefile
index 0c7cff816374..9159277aa22a 100644
--- a/www/p5-Catalyst-Plugin-Static/Makefile
+++ b/www/p5-Catalyst-Plugin-Static/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.10
 PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/M/MR/MRAMBERG
+MASTER_SITE_SUBDIR=	CPAN:MRAMBERG
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		${SITE_PERL}/File/Slurp.pm:${PORTSDIR}/devel/p5-File-Slurp
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	5.8.0+
+PERL_CONFIGURE=	yes
 
 MAN3=	Catalyst::Plugin::Static.3
 
diff --git a/www/p5-Catalyst-Plugin-Textile/Makefile b/www/p5-Catalyst-Plugin-Textile/Makefile
index 68d6271d39ab..beb9bed2e8a0 100644
--- a/www/p5-Catalyst-Plugin-Textile/Makefile
+++ b/www/p5-Catalyst-Plugin-Textile/Makefile
@@ -10,14 +10,14 @@ PORTNAME=	Catalyst-Plugin-Textile
 PORTVERSION=	0.01
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/S/SR/SRI
+MASTER_SITE_SUBDIR=	CPAN:SRI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hcoyote@ghostar.org
 COMMENT=	Textile for Catalyst
 
 BUILD_DEPENDS=	${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst-Runtime \
-	${SITE_PERL}/Text/Textile.pm:${PORTSDIR}/textproc/p5-Text-Textile
+		${SITE_PERL}/Text/Textile.pm:${PORTSDIR}/textproc/p5-Text-Textile
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-Catalyst-View-ClearSilver/Makefile b/www/p5-Catalyst-View-ClearSilver/Makefile
index a3189f921eb5..97772e706cd4 100644
--- a/www/p5-Catalyst-View-ClearSilver/Makefile
+++ b/www/p5-Catalyst-View-ClearSilver/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Catalyst-View-ClearSilver
 PORTVERSION=	0.02
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/J/JR/JROCKWAY
+MASTER_SITE_SUBDIR=	CPAN:JROCKWAY
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/www/p5-Catalyst-View-Templated/Makefile b/www/p5-Catalyst-View-Templated/Makefile
index 6825f7c085c9..96e9f4df0952 100644
--- a/www/p5-Catalyst-View-Templated/Makefile
+++ b/www/p5-Catalyst-View-Templated/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Catalyst-View-Templated
 PORTVERSION=	0.02
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/J/JR/JROCKWAY
+MASTER_SITE_SUBDIR=	CPAN:JROCKWAY
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/www/p5-Catalyst-View-XSLT/Makefile b/www/p5-Catalyst-View-XSLT/Makefile
index 62eb6c1f4aca..8a146611d048 100644
--- a/www/p5-Catalyst-View-XSLT/Makefile
+++ b/www/p5-Catalyst-View-XSLT/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Catalyst-View-XSLT
 PORTVERSION=	0.08
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/J/JA/JANUS
+MASTER_SITE_SUBDIR=	CPAN:JANUS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/www/p5-Class-DBI-FromForm/Makefile b/www/p5-Class-DBI-FromForm/Makefile
index 05a03ec68136..53a9e36e0227 100644
--- a/www/p5-Class-DBI-FromForm/Makefile
+++ b/www/p5-Class-DBI-FromForm/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Class-DBI-FromForm
 PORTVERSION=	0.04
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/M/MR/MRAMBERG
+MASTER_SITE_SUBDIR=	CPAN:MRAMBERG
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-FEAR-API/Makefile b/www/p5-FEAR-API/Makefile
index 50c727528f76..7520126f313b 100644
--- a/www/p5-FEAR-API/Makefile
+++ b/www/p5-FEAR-API/Makefile
@@ -11,7 +11,7 @@ PORTVERSION=	0.489
 PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/X/XE/XERN
+MASTER_SITE_SUBDIR=	CPAN:XERN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-Feed-Find/Makefile b/www/p5-Feed-Find/Makefile
index aa4af25fc588..b63f5f93e33b 100644
--- a/www/p5-Feed-Find/Makefile
+++ b/www/p5-Feed-Find/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Feed-Find
 PORTVERSION=	0.07
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/B/BT/BTROTT
+MASTER_SITE_SUBDIR=	CPAN:BTROTT
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/www/p5-HTTP-Recorder/Makefile b/www/p5-HTTP-Recorder/Makefile
index 6e189df4f9db..db00b5090cc1 100644
--- a/www/p5-HTTP-Recorder/Makefile
+++ b/www/p5-HTTP-Recorder/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.05
 PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/L/LE/LEIRA
+MASTER_SITE_SUBDIR=	CPAN:LEIRA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-IMDB-Movie/Makefile b/www/p5-IMDB-Movie/Makefile
index 831fefe4c76f..95e9cdf7dffb 100644
--- a/www/p5-IMDB-Movie/Makefile
+++ b/www/p5-IMDB-Movie/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	IMDB-Movie
 PORTVERSION=	0.12
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/J/JE/JEFFA
+MASTER_SITE_SUBDIR=	CPAN:JEFFA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-Maypole-Authentication-UserSessionCookie/Makefile b/www/p5-Maypole-Authentication-UserSessionCookie/Makefile
index 17a43a3a3838..779774cfe8d0 100644
--- a/www/p5-Maypole-Authentication-UserSessionCookie/Makefile
+++ b/www/p5-Maypole-Authentication-UserSessionCookie/Makefile
@@ -9,10 +9,10 @@ PORTVERSION=	1.4
 PORTREVISION=	0
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/S/SI/SIMON/
+MASTER_SITE_SUBDIR=	CPAN:SIMON
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Track sessions and, optionally, users
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-Maypole-Component/Makefile b/www/p5-Maypole-Component/Makefile
index 286e9059a04d..6075cf70ba96 100644
--- a/www/p5-Maypole-Component/Makefile
+++ b/www/p5-Maypole-Component/Makefile
@@ -8,10 +8,10 @@ PORTNAME=	Maypole-Component
 PORTVERSION=	0.03
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/S/SI/SIMON/
+MASTER_SITE_SUBDIR=	CPAN:SIMON
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Run Maypole sub-requests as components
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-Newsletter/Makefile b/www/p5-Newsletter/Makefile
index 6ef68d69a578..7b28e90ff446 100644
--- a/www/p5-Newsletter/Makefile
+++ b/www/p5-Newsletter/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Newsletter
 PORTVERSION=	0.03.3
 CATEGORIES=	www textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	 ../by-authors/id/K/KA/KALELE
+MASTER_SITE_SUBDIR=	CPAN:KALELE
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
diff --git a/www/p5-SCGI/Makefile b/www/p5-SCGI/Makefile
index 58f6927f5609..796e977b883c 100644
--- a/www/p5-SCGI/Makefile
+++ b/www/p5-SCGI/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	SCGI
 PORTVERSION=	0.6
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/V/VI/VIPERCODE
+MASTER_SITE_SUBDIR=	CPAN:VIPERCODE
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vivek@khera.org
diff --git a/www/p5-Squatting/Makefile b/www/p5-Squatting/Makefile
index 95c01d497bf6..1900ffb069ed 100644
--- a/www/p5-Squatting/Makefile
+++ b/www/p5-Squatting/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Squatting
 PORTVERSION=	0.70
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/B/BE/BEPPU
+MASTER_SITE_SUBDIR=	CPAN:BEPPU
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/www/p5-WWW-AtMovies-TV/Makefile b/www/p5-WWW-AtMovies-TV/Makefile
index 0132bbd2f57b..3729ea5c5bba 100644
--- a/www/p5-WWW-AtMovies-TV/Makefile
+++ b/www/p5-WWW-AtMovies-TV/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.04
 DISTVERSIONPREFIX=v
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/A/AL/ALEC
+MASTER_SITE_SUBDIR=	CPAN:ALEC
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-Web-Scraper/Makefile b/www/p5-Web-Scraper/Makefile
index 047fa3e8a345..3237f07ec892 100644
--- a/www/p5-Web-Scraper/Makefile
+++ b/www/p5-Web-Scraper/Makefile
@@ -9,12 +9,15 @@ PORTNAME=	Web-Scraper
 PORTVERSION=	0.34
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/M/MI/MIYAGAWA
+MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Web Scraping Toolkit inspired by Scrapi
 
+LICENSE=	ART20 GPLv1
+LICENSE_COMB=	dual
+
 RUN_DEPENDS=	p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
 		p5-HTML-Selector-XPath>=0.03:${PORTSDIR}/www/p5-HTML-Selector-XPath \
 		p5-HTML-Tagset>0:${PORTSDIR}/www/p5-HTML-Tagset \
@@ -27,10 +30,7 @@ RUN_DEPENDS=	p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
 		p5-YAML>0:${PORTSDIR}/textproc/p5-YAML \
 		p5-libwww>=5.827:${PORTSDIR}/www/p5-libwww
 
-PERL_CONFIGURE=	5.8.1+
-
-LICENSE_COMB=	dual
-LICENSE=	ART20 GPLv1
+PERL_CONFIGURE=	yes
 
 MAN3=		Web::Scraper.3 Web::Scraper::Filter.3 Web::Scraper::LibXML.3