98 files changed, 120 insertions, 120 deletions

diff --git a/audio/p5-libvorbis/Makefile b/audio/p5-libvorbis/Makefile
index fced9f6ebb7e..6fb9ce5922f1 100644
--- a/audio/p5-libvorbis/Makefile
+++ b/audio/p5-libvorbis/Makefile
@@ -10,11 +10,11 @@ PORTVERSION=	0.05
 PORTREVISION=	3
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/F/FO/FOOF
+MASTER_SITE_SUBDIR=	CPAN:FOOF
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-perl-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Ogg Vorbis streams
 
 LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis
diff --git a/chinese/p5-Date-Chinese/Makefile b/chinese/p5-Date-Chinese/Makefile
index 737950aded0e..bad1d83665eb 100644
--- a/chinese/p5-Date-Chinese/Makefile
+++ b/chinese/p5-Date-Chinese/Makefile
@@ -9,10 +9,10 @@ PORTNAME=	Date-Chinese
 PORTVERSION=	1.12
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/R/RB/RBOW
+MASTER_SITE_SUBDIR=	CPAN:RBOW
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to calculate dates in the Chinese calendar
 
 PERL_CONFIGURE=	yes
diff --git a/databases/p5-Class-DBI-Loader-Relationship/Makefile b/databases/p5-Class-DBI-Loader-Relationship/Makefile
index 9077d77af1ec..d3f7a33a4ba1 100644
--- a/databases/p5-Class-DBI-Loader-Relationship/Makefile
+++ b/databases/p5-Class-DBI-Loader-Relationship/Makefile
@@ -8,7 +8,7 @@ PORTNAME=	Class-DBI-Loader-Relationship
 PORTVERSION=	1.3
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/C/CH/CHUNZI
+MASTER_SITE_SUBDIR=	CPAN:CHUNZI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/databases/p5-DBIx-TableHash/Makefile b/databases/p5-DBIx-TableHash/Makefile
index 3e60c13cad51..0ce0e9f2d9f3 100644
--- a/databases/p5-DBIx-TableHash/Makefile
+++ b/databases/p5-DBIx-TableHash/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	DBIx-TableHash
 PORTVERSION=	1.05
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	DBIx \
-			../../authors/id/C/CH/CHTHORMAN
+MASTER_SITE_SUBDIR=	CPAN:CHTHORMAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/databases/p5-ORLite-Migrate/Makefile b/databases/p5-ORLite-Migrate/Makefile
index 0b7b2e8d87b9..a80a06e3ff43 100644
--- a/databases/p5-ORLite-Migrate/Makefile
+++ b/databases/p5-ORLite-Migrate/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	ORLite-Migrate
 PORTVERSION=	1.07
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/A/AD/ADAMK
+MASTER_SITE_SUBDIR=	CPAN:ADAMK
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	cm@therek.net
diff --git a/databases/p5-ORLite/Makefile b/databases/p5-ORLite/Makefile
index 99b4ecc73926..2678d56e63e5 100644
--- a/databases/p5-ORLite/Makefile
+++ b/databases/p5-ORLite/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	ORLite
 PORTVERSION=	1.47
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/A/AD/ADAMK
+MASTER_SITE_SUBDIR=	CPAN:ADAMK
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	cm@therek.net
diff --git a/databases/p5-ResourcePool-Resource-DBI/Makefile b/databases/p5-ResourcePool-Resource-DBI/Makefile
index 1eb739c3ddcb..8f3e05401102 100644
--- a/databases/p5-ResourcePool-Resource-DBI/Makefile
+++ b/databases/p5-ResourcePool-Resource-DBI/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.0101
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN \
 		http://www.fatalmind.com/projects/ResourcePool/
-MASTER_SITE_SUBDIR=	../by-authors/id/M/MW/MWS
+MASTER_SITE_SUBDIR=	CPAN:MWS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/databases/p5-SQLite-Work/Makefile b/databases/p5-SQLite-Work/Makefile
index 1a8aebd1249b..199a78e50baf 100644
--- a/databases/p5-SQLite-Work/Makefile
+++ b/databases/p5-SQLite-Work/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	SQLite-Work
 PORTVERSION=	0.10.02
 CATEGORIES=	databases www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/R/RU/RUBYKAT
+MASTER_SITE_SUBDIR=	CPAN:RUBYKAT
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
diff --git a/devel/cpan-upload/Makefile b/devel/cpan-upload/Makefile
index f1ccc85d2dc5..1b62151e9368 100644
--- a/devel/cpan-upload/Makefile
+++ b/devel/cpan-upload/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.2
 PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/N/NE/NEILB/scripts
+MASTER_SITE_SUBDIR=	CPAN:NEILB/scripts
 
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Script for uploading distributions to CPAN
diff --git a/devel/p5-Algorithm-LCS/Makefile b/devel/p5-Algorithm-LCS/Makefile
index 7e613ae31edb..aabe798e3379 100644
--- a/devel/p5-Algorithm-LCS/Makefile
+++ b/devel/p5-Algorithm-LCS/Makefile
@@ -9,13 +9,14 @@ PORTNAME=	Algorithm-LCS
 PORTVERSION=	1.04
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/J/JO/JOESUF
+MASTER_SITE_SUBDIR=	CPAN:JOESUF
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Fast (XS) implementation of the Longest Common Subsequence Algorithm
 
-PERL_CONFIGURE=	5.8.0+
+PERL_CONFIGURE=	yes
+
 MAN3=		Algorithm::LCS.3
 
 .include <bsd.port.mk>
diff --git a/devel/p5-AutoXS-Header/Makefile b/devel/p5-AutoXS-Header/Makefile
index 198c60c69994..6fd37bc34bc8 100644
--- a/devel/p5-AutoXS-Header/Makefile
+++ b/devel/p5-AutoXS-Header/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	AutoXS-Header
 PORTVERSION=	1.02
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/S/SM/SMUELLER
+MASTER_SITE_SUBDIR=	CPAN:SMUELLER
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/devel/p5-Check-ISA/Makefile b/devel/p5-Check-ISA/Makefile
index db161eecc64f..37773e4ee08b 100644
--- a/devel/p5-Check-ISA/Makefile
+++ b/devel/p5-Check-ISA/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Check-ISA
 PORTVERSION=	0.04
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/N/NU/NUFFIN
+MASTER_SITE_SUBDIR=	CPAN:NUFFIN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-Child/Makefile b/devel/p5-Child/Makefile
index 9d4787e15c8f..39a12c7ff06a 100644
--- a/devel/p5-Child/Makefile
+++ b/devel/p5-Child/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Child
 PORTVERSION=	0.009
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=../by-authors/id/E/EX/EXODIST
+MASTER_SITE_SUBDIR=	CPAN:EXODIST
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	citric@cubicone.tmetic.com
diff --git a/devel/p5-Context-Preserve/Makefile b/devel/p5-Context-Preserve/Makefile
index b56eb14d0d8d..94c0dca4430f 100644
--- a/devel/p5-Context-Preserve/Makefile
+++ b/devel/p5-Context-Preserve/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Context-Preserve
 PORTVERSION=	0.01
 CATEGORIES=	devel 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/devel/p5-Eval-Context/Makefile b/devel/p5-Eval-Context/Makefile
index 186466b33d1b..0cbb4c50213d 100644
--- a/devel/p5-Eval-Context/Makefile
+++ b/devel/p5-Eval-Context/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Eval-Context
 PORTVERSION=	0.09.11
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/N/NK/NKH
+MASTER_SITE_SUBDIR=	CPAN:NKH
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/devel/p5-Forest/Makefile b/devel/p5-Forest/Makefile
index 7a96fb50f97e..02ebd3eb4c16 100644
--- a/devel/p5-Forest/Makefile
+++ b/devel/p5-Forest/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Forest
 PORTVERSION=	0.09
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/S/ST/STEVAN
+MASTER_SITE_SUBDIR=	CPAN:STEVAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-Gearman-Client-Async/Makefile b/devel/p5-Gearman-Client-Async/Makefile
index 53c027fa39ed..a06e7c90614e 100644
--- a/devel/p5-Gearman-Client-Async/Makefile
+++ b/devel/p5-Gearman-Client-Async/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.94
 PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/B/BR/BRADFITZ
+MASTER_SITE_SUBDIR=	CPAN:BRADFITZ
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-Gearman-Server/Makefile b/devel/p5-Gearman-Server/Makefile
index 765c0551d708..4b1cd8c54476 100644
--- a/devel/p5-Gearman-Server/Makefile
+++ b/devel/p5-Gearman-Server/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.11
 PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/D/DO/DORMANDO
+MASTER_SITE_SUBDIR=	CPAN:DORMANDO
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vivek@khera.org
diff --git a/devel/p5-Gearman-XS/Makefile b/devel/p5-Gearman-XS/Makefile
index 463e43548412..7f6e71be3a7e 100644
--- a/devel/p5-Gearman-XS/Makefile
+++ b/devel/p5-Gearman-XS/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Gearman-XS
 PORTVERSION=	0.11
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/D/DS/DSCHOEN
+MASTER_SITE_SUBDIR=	CPAN:DSCHOEN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	otaviof@gmail.com
diff --git a/devel/p5-Gearman/Makefile b/devel/p5-Gearman/Makefile
index 95688cf45736..7b88f8834efc 100644
--- a/devel/p5-Gearman/Makefile
+++ b/devel/p5-Gearman/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Gearman
 PORTVERSION=	1.11
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/D/DO/DORMANDO
+MASTER_SITE_SUBDIR=	CPAN:DORMANDO
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vivek@khera.org
diff --git a/devel/p5-Getopt-Euclid/Makefile b/devel/p5-Getopt-Euclid/Makefile
index 16c4c3e5c226..f7b78e451edf 100644
--- a/devel/p5-Getopt-Euclid/Makefile
+++ b/devel/p5-Getopt-Euclid/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Getopt-Euclid
 PORTVERSION=	0.2.3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/K/KG/KGALINSKY
+MASTER_SITE_SUBDIR=	CPAN:KGALINSKY
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
 
diff --git a/devel/p5-Inline/Makefile b/devel/p5-Inline/Makefile
index 6e7dcde16a50..050b7d9c8f89 100644
--- a/devel/p5-Inline/Makefile
+++ b/devel/p5-Inline/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Inline
 PORTVERSION=	0.48
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/S/SI/SISYPHUS
+MASTER_SITE_SUBDIR=	CPAN:SISYPHUS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-Log-Agent-Logger/Makefile b/devel/p5-Log-Agent-Logger/Makefile
index 399eb53d76df..9e0789285f55 100644
--- a/devel/p5-Log-Agent-Logger/Makefile
+++ b/devel/p5-Log-Agent-Logger/Makefile
@@ -9,10 +9,10 @@ PORTNAME=	Log-Agent-Logger
 PORTVERSION=	0.2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/T/TB/TBONE
+MASTER_SITE_SUBDIR=	CPAN:TBONE
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Log::Agent::Logger - a logging interface for perl
 
 BUILD_DEPENDS=	${SITE_PERL}/Log/Agent.pm:${PORTSDIR}/devel/p5-Log-Agent \
diff --git a/devel/p5-Method-Alias/Makefile b/devel/p5-Method-Alias/Makefile
index 7b59aa7e55d2..375bbe300766 100644
--- a/devel/p5-Method-Alias/Makefile
+++ b/devel/p5-Method-Alias/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Method-Alias
 PORTVERSION=	1.03
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/A/AD/ADAMK
+MASTER_SITE_SUBDIR=	CPAN:ADAMK
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/devel/p5-Method-Signatures-Simple/Makefile b/devel/p5-Method-Signatures-Simple/Makefile
index 2f9168a6fc6e..90254aca527b 100644
--- a/devel/p5-Method-Signatures-Simple/Makefile
+++ b/devel/p5-Method-Signatures-Simple/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Method-Signatures-Simple
 PORTVERSION=	0.06
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/R/RH/RHESA
+MASTER_SITE_SUBDIR=	CPAN:RHESA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-Mock-Quick/Makefile b/devel/p5-Mock-Quick/Makefile
index 30dbda0f20f1..754e597e1905 100644
--- a/devel/p5-Mock-Quick/Makefile
+++ b/devel/p5-Mock-Quick/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Mock-Quick
 PORTVERSION=	1.001
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/E/EX/EXODIST
+MASTER_SITE_SUBDIR=	CPAN:EXODIST
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/devel/p5-MouseX-ConfigFromFile/Makefile b/devel/p5-MouseX-ConfigFromFile/Makefile
index d9a0504cf10d..05f706e1477e 100644
--- a/devel/p5-MouseX-ConfigFromFile/Makefile
+++ b/devel/p5-MouseX-ConfigFromFile/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	MouseX-ConfigFromFile
 PORTVERSION=	0.05
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/M/MA/MASAKI
+MASTER_SITE_SUBDIR=	CPAN:MASAKI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	markun@onohara.to
diff --git a/devel/p5-MouseX-Types-Path-Class/Makefile b/devel/p5-MouseX-Types-Path-Class/Makefile
index 61f5f3f89176..b2cd52360374 100644
--- a/devel/p5-MouseX-Types-Path-Class/Makefile
+++ b/devel/p5-MouseX-Types-Path-Class/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	MouseX-Types-Path-Class
 PORTVERSION=	0.06
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/M/MA/MASAKI
+MASTER_SITE_SUBDIR=	CPAN:MASAKI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	markun@onohara.to
diff --git a/devel/p5-Olson-Abbreviations/Makefile b/devel/p5-Olson-Abbreviations/Makefile
index cb06e91f517b..88c2c6d960f4 100644
--- a/devel/p5-Olson-Abbreviations/Makefile
+++ b/devel/p5-Olson-Abbreviations/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Olson-Abbreviations
 PORTVERSION=	0.02
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/E/EC/ECARROLL
+MASTER_SITE_SUBDIR=	CPAN:ECARROLL
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	cm@therek.net
diff --git a/devel/p5-PatchReader/Makefile b/devel/p5-PatchReader/Makefile
index 6a09a6416ef6..95f6ececc71f 100644
--- a/devel/p5-PatchReader/Makefile
+++ b/devel/p5-PatchReader/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	PatchReader
 PORTVERSION=	0.9.5
 CATEGORIES=	devel perl5
 MASTER_SITES=CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/J/JK/JKEISER
+MASTER_SITE_SUBDIR=	CPAN:JKEISER
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	toni.viemero@iki.fi
diff --git a/devel/p5-Pid-File-Flock/Makefile b/devel/p5-Pid-File-Flock/Makefile
index 2d47a02cd23a..3d85f4ba6d7f 100644
--- a/devel/p5-Pid-File-Flock/Makefile
+++ b/devel/p5-Pid-File-Flock/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Pid-File-Flock
 PORTVERSION=	0.08
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=../by-authors/id/L/LO/LONERR
+MASTER_SITE_SUBDIR=	CPAN:LONERR
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	oleg@mamontov.net
diff --git a/devel/p5-ResourcePool/Makefile b/devel/p5-ResourcePool/Makefile
index 36f7078575cf..3df0c3ac4b9f 100644
--- a/devel/p5-ResourcePool/Makefile
+++ b/devel/p5-ResourcePool/Makefile
@@ -11,7 +11,7 @@ PORTVERSION=	1.0106
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN \
 		http://www.fatalmind.com/projects/ResourcePool/
-MASTER_SITE_SUBDIR=	../by-authors/id/M/MW/MWS
+MASTER_SITE_SUBDIR=	CPAN:MWS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-SPOPS/Makefile b/devel/p5-SPOPS/Makefile
index 28c0b635a468..5bfd6e4423d1 100644
--- a/devel/p5-SPOPS/Makefile
+++ b/devel/p5-SPOPS/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.87
 PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/C/CW/CWINTERS
+MASTER_SITE_SUBDIR=	CPAN:CWINTERS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/devel/p5-Scope-Guard/Makefile b/devel/p5-Scope-Guard/Makefile
index d7876d0e04d1..f84a057f0fa4 100644
--- a/devel/p5-Scope-Guard/Makefile
+++ b/devel/p5-Scope-Guard/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Scope-Guard
 PORTVERSION=	0.20
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/C/CH/CHOCOLATE
+MASTER_SITE_SUBDIR=	CPAN:CHOCOLATE
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	v.a.popov@gmail.com
diff --git a/devel/p5-Sub-Current/Makefile b/devel/p5-Sub-Current/Makefile
index 08e00aad6777..9b9594517f80 100644
--- a/devel/p5-Sub-Current/Makefile
+++ b/devel/p5-Sub-Current/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Sub-Current
 PORTVERSION=	0.02
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/R/RG/RGARCIA
+MASTER_SITE_SUBDIR=	CPAN:RGARCIA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-Test-Data/Makefile b/devel/p5-Test-Data/Makefile
index 17c40bb7bc27..2d3c39f8484d 100644
--- a/devel/p5-Test-Data/Makefile
+++ b/devel/p5-Test-Data/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Test-Data
 PORTVERSION=	1.22
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/B/BD/BDFOY
+MASTER_SITE_SUBDIR=	CPAN:BDFOY
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/devel/p5-Test-Object/Makefile b/devel/p5-Test-Object/Makefile
index b6457fc5ed3b..153221fc83cf 100644
--- a/devel/p5-Test-Object/Makefile
+++ b/devel/p5-Test-Object/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.07
 PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/A/AD/ADAMK
+MASTER_SITE_SUBDIR=	CPAN:ADAMK
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/devel/p5-Throwable/Makefile b/devel/p5-Throwable/Makefile
index 70f3640536b6..432340e7ef66 100644
--- a/devel/p5-Throwable/Makefile
+++ b/devel/p5-Throwable/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Throwable
 PORTVERSION=	0.102080
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/R/RJ/RJBS/
+MASTER_SITE_SUBDIR=	CPAN:RJBS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
@@ -19,7 +19,7 @@ RUN_DEPENDS=	p5-Devel-StackTrace>=1.21:${PORTSDIR}/devel/p5-Devel-StackTrace \
 		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	5.8.0+
+PERL_CONFIGURE=	yes
 
 MAN3=		StackTrace::Auto.3 Throwable.3 Throwable::Error.3
 
diff --git a/devel/p5-UI-Dialog/Makefile b/devel/p5-UI-Dialog/Makefile
index 642da90cf39a..18ce6093b825 100644
--- a/devel/p5-UI-Dialog/Makefile
+++ b/devel/p5-UI-Dialog/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	UI-Dialog
 PORTVERSION=	1.08
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/K/KC/KCK
+MASTER_SITE_SUBDIR=	CPAN:KCK
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dmitry@karasik.eu.org
diff --git a/devel/p5-accessors/Makefile b/devel/p5-accessors/Makefile
index 3595f276643a..8033af4b697a 100644
--- a/devel/p5-accessors/Makefile
+++ b/devel/p5-accessors/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	accessors
 PORTVERSION=	1.01
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/S/SP/SPURKIS
+MASTER_SITE_SUBDIR=	CPAN:SPURKIS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	leeym@FreeBSD.org
diff --git a/devel/p5-aliased/Makefile b/devel/p5-aliased/Makefile
index 0ad5566b8e9c..709ff01b12be 100644
--- a/devel/p5-aliased/Makefile
+++ b/devel/p5-aliased/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	aliased
 PORTVERSION=	0.30
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/O/OV/OVID/
+MASTER_SITE_SUBDIR=	CPAN:OVID
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-capitalization/Makefile b/devel/p5-capitalization/Makefile
index 14bf124fa281..3d3d940bcaf9 100644
--- a/devel/p5-capitalization/Makefile
+++ b/devel/p5-capitalization/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	capitalization
 PORTVERSION=	0.03
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/M/MI/MIYAGAWA
+MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
diff --git a/devel/p5-mixin/Makefile b/devel/p5-mixin/Makefile
index c816b5b5818c..b79a048e1fe5 100644
--- a/devel/p5-mixin/Makefile
+++ b/devel/p5-mixin/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	mixin
 PORTVERSION=	0.07
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/M/MS/MSCHWERN
+MASTER_SITE_SUBDIR=	CPAN:MSCHWERN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/devel/p5-mocked/Makefile b/devel/p5-mocked/Makefile
index ef55dfd713ad..4d90409cc9cb 100644
--- a/devel/p5-mocked/Makefile
+++ b/devel/p5-mocked/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	mocked
 PORTVERSION=	0.09
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/L/LU/LUKEC
+MASTER_SITE_SUBDIR=	CPAN:LUKEC
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/devel/p5-namespace-clean/Makefile b/devel/p5-namespace-clean/Makefile
index ef7542edee71..4771482c7eb2 100644
--- a/devel/p5-namespace-clean/Makefile
+++ b/devel/p5-namespace-clean/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	namespace-clean
 PORTVERSION=	0.20
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/F/FL/FLORA
+MASTER_SITE_SUBDIR=	CPAN:FLORA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
@@ -24,7 +24,7 @@ RUN_DEPENDS=	p5-B-Hooks-EndOfScope>=0.07:${PORTSDIR}/devel/p5-B-Hooks-EndOfScope
 		p5-Package-Stash>=0.22:${PORTSDIR}/devel/p5-Package-Stash
 TEST_DEPENDS=	p5-Test-Simple>=0.88:${PORTSDIR}/devel/p5-Test-Simple
 
-PERL_CONFIGURE=	5.8.0+
+PERL_CONFIGURE=	yes
 
 MAN3=	namespace::clean.3
 
diff --git a/devel/p5-pip/Makefile b/devel/p5-pip/Makefile
index 2eb8d4fe3f39..7766b3970f24 100644
--- a/devel/p5-pip/Makefile
+++ b/devel/p5-pip/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	pip
 PORTVERSION=	1.18
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/A/AD/ADAMK
+MASTER_SITE_SUBDIR=	CPAN:ADAMK
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	cm@therek.net
diff --git a/dns/p5-BIND-Conf_Parser/Makefile b/dns/p5-BIND-Conf_Parser/Makefile
index 5547e8086a42..a7fe258fb4b5 100644
--- a/dns/p5-BIND-Conf_Parser/Makefile
+++ b/dns/p5-BIND-Conf_Parser/Makefile
@@ -9,10 +9,10 @@ PORTNAME=	BIND-Conf_Parser
 PORTVERSION=	0.95
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/P/PG/PGUEN
+MASTER_SITE_SUBDIR=	CPAN:PGUEN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 module to parse BIND 8 configuration files
 
 PERL_CONFIGURE=	yes
diff --git a/finance/p5-Business-MaxMind-CreditCardFraudDetection/Makefile b/finance/p5-Business-MaxMind-CreditCardFraudDetection/Makefile
index 60039e580b05..69c1ba77aa48 100644
--- a/finance/p5-Business-MaxMind-CreditCardFraudDetection/Makefile
+++ b/finance/p5-Business-MaxMind-CreditCardFraudDetection/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Business-MaxMind-CreditCardFraudDetection
 PORTVERSION=	1.51
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/B/BO/BORISZ
+MASTER_SITE_SUBDIR=	CPAN:BORISZ
 PKGNAMEPREFIX=	p5-
 DISTNAME=	Business-MaxMind-${PORTVERSION}
 
diff --git a/finance/p5-Business-OCV/Makefile b/finance/p5-Business-OCV/Makefile
index 5366d5f0f151..bb109ade1dff 100644
--- a/finance/p5-Business-OCV/Makefile
+++ b/finance/p5-Business-OCV/Makefile
@@ -9,10 +9,10 @@ PORTNAME=	Business-OCV
 PORTVERSION=	0.1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/B/BE/BENL
+MASTER_SITE_SUBDIR=	CPAN:BENL
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	An interface to the Ingenico OCV Server
 
 PERL_CONFIGURE=	yes
diff --git a/finance/p5-PayflowPro/Makefile b/finance/p5-PayflowPro/Makefile
index a66c0c5ef040..541a5444e682 100644
--- a/finance/p5-PayflowPro/Makefile
+++ b/finance/p5-PayflowPro/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	PayflowPro
 PORTVERSION=	3101
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/V/VK/VKHERA
+MASTER_SITE_SUBDIR=	CPAN:VKHERA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vivek@khera.org
diff --git a/graphics/p5-GD-Graph-histogram/Makefile b/graphics/p5-GD-Graph-histogram/Makefile
index 7782b7aa0c88..7b0f771d0a29 100644
--- a/graphics/p5-GD-Graph-histogram/Makefile
+++ b/graphics/p5-GD-Graph-histogram/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.1
 PORTREVISION=	3
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/W/WH/WHIZDOG
+MASTER_SITE_SUBDIR=	CPAN:WHIZDOG
 PKGNAMEPREFIX=	p5-
 DISTNAME=	GDGraph-histogram-${PORTVERSION}
 
diff --git a/graphics/p5-GD-Graph-ohlc/Makefile b/graphics/p5-GD-Graph-ohlc/Makefile
index 4b431a7bd9b9..d6bd535ecd5c 100644
--- a/graphics/p5-GD-Graph-ohlc/Makefile
+++ b/graphics/p5-GD-Graph-ohlc/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.9605
 PORTREVISION=	2
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/J/JE/JETTERO
+MASTER_SITE_SUBDIR=	CPAN:JETTERO
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skreuzer@FreeBSD.org
diff --git a/graphics/p5-GD-Graph/Makefile b/graphics/p5-GD-Graph/Makefile
index f6028a6e07e0..d509d201d082 100644
--- a/graphics/p5-GD-Graph/Makefile
+++ b/graphics/p5-GD-Graph/Makefile
@@ -11,7 +11,7 @@ DISTVERSION=	${PORTVERSION:C/\.(..)$/_\1/}
 PORTREVISION=	4
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/B/BW/BWARFIELD
+MASTER_SITE_SUBDIR=	CPAN:BWARFIELD
 PKGNAMEPREFIX=	p5-
 DISTNAME=	GDGraph-${DISTVERSION}
 
diff --git a/graphics/p5-Geometry-Primitive/Makefile b/graphics/p5-Geometry-Primitive/Makefile
index bbfd141b3eb5..5bf72a85b540 100644
--- a/graphics/p5-Geometry-Primitive/Makefile
+++ b/graphics/p5-Geometry-Primitive/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Geometry-Primitive
 PORTVERSION=	0.22
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/G/GP/GPHAT
+MASTER_SITE_SUBDIR=	CPAN:GPHAT
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/graphics/p5-OpenGL/Makefile b/graphics/p5-OpenGL/Makefile
index 4fdfc6336372..6f198a6f2262 100644
--- a/graphics/p5-OpenGL/Makefile
+++ b/graphics/p5-OpenGL/Makefile
@@ -11,10 +11,10 @@ PORTVERSION=	0.54
 PORTREVISION=	2
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/I/IL/ILYAZ/modules
+MASTER_SITE_SUBDIR=	CPAN:ILYAZ/modules
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to display 3D data using OpenGL, GLU, GLUT, and GLX
 
 USE_GL=		glut
diff --git a/graphics/p5-PGPLOT/Makefile b/graphics/p5-PGPLOT/Makefile
index 602490ef189a..6b30f67cbefa 100644
--- a/graphics/p5-PGPLOT/Makefile
+++ b/graphics/p5-PGPLOT/Makefile
@@ -10,10 +10,10 @@ PORTVERSION=	2.20
 PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/K/KG/KGB
+MASTER_SITE_SUBDIR=	CPAN:KGB
 DISTNAME=	PGPLOT-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	A perl5 extension which makes available the pgplot library
 
 LIB_DEPENDS=	pgplot.5:${PORTSDIR}/graphics/pgplot
diff --git a/graphics/p5-Sane/Makefile b/graphics/p5-Sane/Makefile
index 5a62dcc42e63..408326f5acf0 100644
--- a/graphics/p5-Sane/Makefile
+++ b/graphics/p5-Sane/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.03
 PORTREVISION=	2
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/R/RA/RATCLIFFE
+MASTER_SITE_SUBDIR=	CPAN:RATCLIFFE
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/graphics/p5-VCG/Makefile b/graphics/p5-VCG/Makefile
index fe46f7e23727..81285c0e6443 100644
--- a/graphics/p5-VCG/Makefile
+++ b/graphics/p5-VCG/Makefile
@@ -11,10 +11,10 @@ PORTVERSION=	0.5
 PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/T/TE/TEEJAY
+MASTER_SITE_SUBDIR=	CPAN:TEEJAY
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Interface to the VCG graphing tool
 
 BUILD_DEPENDS=	${SITE_PERL}/IPC/Run.pm:${PORTSDIR}/devel/p5-IPC-Run
diff --git a/graphics/pgperl/Makefile b/graphics/pgperl/Makefile
index 602490ef189a..6b30f67cbefa 100644
--- a/graphics/pgperl/Makefile
+++ b/graphics/pgperl/Makefile
@@ -10,10 +10,10 @@ PORTVERSION=	2.20
 PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/K/KG/KGB
+MASTER_SITE_SUBDIR=	CPAN:KGB
 DISTNAME=	PGPLOT-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	A perl5 extension which makes available the pgplot library
 
 LIB_DEPENDS=	pgplot.5:${PORTSDIR}/graphics/pgplot
diff --git a/lang/p5-Pugs-Compiler-Rule/Makefile b/lang/p5-Pugs-Compiler-Rule/Makefile
index 3436e05df960..009946d3f2a0 100644
--- a/lang/p5-Pugs-Compiler-Rule/Makefile
+++ b/lang/p5-Pugs-Compiler-Rule/Makefile
@@ -11,7 +11,7 @@ PORTVERSION=	0.37
 PORTREVISION=	1
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/F/FG/FGLOCK
+MASTER_SITE_SUBDIR=	CPAN:FGLOCK
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/mail/p5-Clamd/Makefile b/mail/p5-Clamd/Makefile
index 406d906dd01f..45677d295ba0 100644
--- a/mail/p5-Clamd/Makefile
+++ b/mail/p5-Clamd/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.04
 PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/M/MS/MSERGEANT
+MASTER_SITE_SUBDIR=	CPAN:MSERGEANT
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/mail/p5-Mail-ListDetector/Makefile b/mail/p5-Mail-ListDetector/Makefile
index ac7c79ca4323..274e13d3f879 100644
--- a/mail/p5-Mail-ListDetector/Makefile
+++ b/mail/p5-Mail-ListDetector/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Mail-ListDetector
 PORTVERSION=	1.04
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/M/MS/MSTEVENS
+MASTER_SITE_SUBDIR=	CPAN:MSTEVENS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/mail/p5-Qmail-Envelope/Makefile b/mail/p5-Qmail-Envelope/Makefile
index 5c37c3b9fa70..ffd0796e097b 100644
--- a/mail/p5-Qmail-Envelope/Makefile
+++ b/mail/p5-Qmail-Envelope/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Qmail-Envelope
 PORTVERSION=	0.53
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/M/MJ/MJA
+MASTER_SITE_SUBDIR=	CPAN:MJA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	roam@FreeBSD.org
diff --git a/mail/sastatd/Makefile b/mail/sastatd/Makefile
index 62ec085ca6f2..bf04677af13b 100644
--- a/mail/sastatd/Makefile
+++ b/mail/sastatd/Makefile
@@ -9,7 +9,7 @@ PORTNAME=		sastatd
 PORTVERSION=		0.05
 CATEGORIES=		mail perl5
 MASTER_SITES=		CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/L/LO/LONERR
+MASTER_SITE_SUBDIR=	CPAN:LONERR
 
 MAINTAINER=		oleg@mamontov.net
 COMMENT=		SpamAssassin statistic collecting server
diff --git a/math/p5-Task-Math-Symbolic/Makefile b/math/p5-Task-Math-Symbolic/Makefile
index 804f2fd4d666..925d52963a6a 100644
--- a/math/p5-Task-Math-Symbolic/Makefile
+++ b/math/p5-Task-Math-Symbolic/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	Task-Math-Symbolic
 PORTVERSION=	1.01
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/S/SM/SMUELLER
+MASTER_SITE_SUBDIR=	CPAN:SMUELLER
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile
index 73dcc97f0694..9bf20ec100e6 100644
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -9,11 +9,11 @@ PORTNAME=	dvdrip
 PORTVERSION=	0.98.11
 PORTREVISION=	3
 CATEGORIES=	multimedia
-MASTER_SITES=	http://www.exit1.org/dvdrip/dist/ \
-		CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/J/JR/JRED
+MASTER_SITES=	CPAN \
+		http://www.exit1.org/dvdrip/dist/
+MASTER_SITE_SUBDIR=	CPAN:JRED
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	A Perl Gtk+ based dvd-ripper
 
 RUN_DEPENDS+=	cdrdao:${PORTSDIR}/sysutils/cdrdao \
diff --git a/net/p5-Gopher-Server/Makefile b/net/p5-Gopher-Server/Makefile
index f2ed36c1f7fb..4b66bc51d474 100644
--- a/net/p5-Gopher-Server/Makefile
+++ b/net/p5-Gopher-Server/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Gopher-Server
 PORTVERSION=	0.1.1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/T/TM/TMURRAY
+MASTER_SITE_SUBDIR=	CPAN:TMURRAY
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	toni.viemero@iki.fi
diff --git a/net/p5-Net-Nessus-XMLRPC/Makefile b/net/p5-Net-Nessus-XMLRPC/Makefile
index 703a3e69d2c9..d1cf04a58bc7 100644
--- a/net/p5-Net-Nessus-XMLRPC/Makefile
+++ b/net/p5-Net-Nessus-XMLRPC/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Net-Nessus-XMLRPC
 PORTVERSION=	0.30
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/K/KO/KOST
+MASTER_SITE_SUBDIR=	CPAN:KOST
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	pauls@utdallas.edu
diff --git a/net/p5-Net-Whois-Raw/Makefile b/net/p5-Net-Whois-Raw/Makefile
index 0285187d24c7..ff876939f48e 100644
--- a/net/p5-Net-Whois-Raw/Makefile
+++ b/net/p5-Net-Whois-Raw/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Net-Whois-Raw
 PORTVERSION=	2.31
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/D/DE/DESPAIR
+MASTER_SITE_SUBDIR=	CPAN:DESPAIR
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/net/p5-ResourcePool-Resource-Net-LDAP/Makefile b/net/p5-ResourcePool-Resource-Net-LDAP/Makefile
index e7350a2cd326..95b1e8e623da 100644
--- a/net/p5-ResourcePool-Resource-Net-LDAP/Makefile
+++ b/net/p5-ResourcePool-Resource-Net-LDAP/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.0002
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN \
 		http://www.fatalmind.com/projects/ResourcePool/
-MASTER_SITE_SUBDIR=	../by-authors/id/M/MW/MWS
+MASTER_SITE_SUBDIR=	CPAN:MWS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile b/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile
index d11a66ca0c7b..70101943ba4f 100644
--- a/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile
+++ b/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.0103
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN \
 		http://www.fatalmind.com/projects/ResourcePool/
-MASTER_SITE_SUBDIR=	../by-authors/id/M/MW/MWS
+MASTER_SITE_SUBDIR=	CPAN:MWS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/net/p5-Spread-Session/Makefile b/net/p5-Spread-Session/Makefile
index 079b7b7498a0..f14d6e89d02a 100644
--- a/net/p5-Spread-Session/Makefile
+++ b/net/p5-Spread-Session/Makefile
@@ -9,10 +9,10 @@ PORTNAME=	Spread-Session
 PORTVERSION=	0.4
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/J/JM/JMAY
+MASTER_SITE_SUBDIR=	CPAN:JMAY
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl OO wrapper for Spread messaging toolkit
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Spread.pm:${PORTSDIR}/net/spread
diff --git a/security/p5-Crypt-PBKDF2/Makefile b/security/p5-Crypt-PBKDF2/Makefile
index 47c3d4a1bb87..6c6ba5867ae0 100644
--- a/security/p5-Crypt-PBKDF2/Makefile
+++ b/security/p5-Crypt-PBKDF2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Crypt-PBKDF2
 PORTVERSION=	0.101170
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/A/AR/ARODLAND
+MASTER_SITE_SUBDIR=	CPAN:ARODLAND
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	v.a.popov@gmail.com
diff --git a/security/p5-Digest-Hashcash/Makefile b/security/p5-Digest-Hashcash/Makefile
index 52f99dec38cb..823062815fa9 100644
--- a/security/p5-Digest-Hashcash/Makefile
+++ b/security/p5-Digest-Hashcash/Makefile
@@ -7,7 +7,7 @@ PORTNAME=	Digest-Hashcash
 PORTVERSION=	0.04
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/A/AD/ADAMBACK
+MASTER_SITE_SUBDIR=	CPAN:ADAMBACK
 PKGNAMEPREFIX=	p5-
 EXTRACT_SUFX=	.tgz
 
diff --git a/security/p5-Snort-Rule/Makefile b/security/p5-Snort-Rule/Makefile
index b976772bed2c..379645561b41 100644
--- a/security/p5-Snort-Rule/Makefile
+++ b/security/p5-Snort-Rule/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Snort-Rule
 PORTVERSION=	1.07
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/S/SA/SAXJAZMAN/Snort
+MASTER_SITE_SUBDIR=	CPAN:SAXJAZMAN/Snort
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	pauls@utdallas.edu
diff --git a/textproc/btparse/Makefile b/textproc/btparse/Makefile
index 4ce8aeefc1e4..7d94a96d2936 100644
--- a/textproc/btparse/Makefile
+++ b/textproc/btparse/Makefile
@@ -9,9 +9,9 @@ PORTNAME=	btparse
 PORTVERSION=	0.35
 CATEGORIES=	textproc
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/A/AM/AMBS/${PORTNAME}
+MASTER_SITE_SUBDIR=	CPAN:AMBS/${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	C library for parsing and processing BibTeX data files
 
 GNU_CONFIGURE=	yes
diff --git a/textproc/p5-Bloom-Filter/Makefile b/textproc/p5-Bloom-Filter/Makefile
index 9fc1c9c164a8..a86ac94a961c 100644
--- a/textproc/p5-Bloom-Filter/Makefile
+++ b/textproc/p5-Bloom-Filter/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Bloom-Filter
 PORTVERSION=	1.0
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/M/MC/MCEGLOWS
+MASTER_SITE_SUBDIR=	CPAN:MCEGLOWS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/textproc/p5-FormValidator-Simple/Makefile b/textproc/p5-FormValidator-Simple/Makefile
index f996fda90ec8..0219a4b58de1 100644
--- a/textproc/p5-FormValidator-Simple/Makefile
+++ b/textproc/p5-FormValidator-Simple/Makefile
@@ -9,7 +9,7 @@ PORTNAME=		FormValidator-Simple
 PORTVERSION=	0.28
 CATEGORIES=		textproc perl5
 MASTER_SITES=		CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/L/LY/LYOKATO
+MASTER_SITE_SUBDIR=	CPAN:LYOKATO
 PKGNAMEPREFIX=		p5-
 
 MAINTAINER=		perl@FreeBSD.org
@@ -33,7 +33,7 @@ BUILD_DEPENDS=	p5-Class-Accessor>=0.22:${PORTSDIR}/devel/p5-Class-Accessor \
 		p5-DateTime-Format-Strptime>=1.07:${PORTSDIR}/devel/p5-DateTime-Format-Strptime
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	5.8.0+
+PERL_CONFIGURE=	yes
 
 MAN3=		FormValidator::Simple.3 \
 		FormValidator::Simple::Results.3
diff --git a/textproc/p5-HTML-Tiny/Makefile b/textproc/p5-HTML-Tiny/Makefile
index db860b1a407d..a8b1dc316307 100644
--- a/textproc/p5-HTML-Tiny/Makefile
+++ b/textproc/p5-HTML-Tiny/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	HTML-Tiny
 PORTVERSION=	1.05
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/A/AN/ANDYA
+MASTER_SITE_SUBDIR=	CPAN:ANDYA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/textproc/p5-KinoSearch/Makefile b/textproc/p5-KinoSearch/Makefile
index 41c6b9c197d7..bf64bf7e2d0a 100644
--- a/textproc/p5-KinoSearch/Makefile
+++ b/textproc/p5-KinoSearch/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.165
 PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/C/CR/CREAMYG
+MASTER_SITE_SUBDIR=	CPAN:CREAMYG
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vivek@khera.org
diff --git a/textproc/p5-Lucene/Makefile b/textproc/p5-Lucene/Makefile
index dd334091b42a..615504e658cd 100644
--- a/textproc/p5-Lucene/Makefile
+++ b/textproc/p5-Lucene/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Lucene
 PORTVERSION=	0.18
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/T/TB/TBUSCH
+MASTER_SITE_SUBDIR=	CPAN:TBUSCH
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/textproc/p5-POD2-Base/Makefile b/textproc/p5-POD2-Base/Makefile
index 4547405b15d0..cf66c2a36f66 100644
--- a/textproc/p5-POD2-Base/Makefile
+++ b/textproc/p5-POD2-Base/Makefile
@@ -9,13 +9,13 @@ PORTNAME=	POD2-Base
 PORTVERSION=	0.043
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/F/FE/FERREIRA
+MASTER_SITE_SUBDIR=	CPAN:FERREIRA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Base module for translations of Perl documentation
 
-PERL_CONFIGURE=	5.005+
+PERL_CONFIGURE=	yes
 
 MAN3=	POD2::Base.3 \
 	POD2::PT::POD2::Base.3
diff --git a/textproc/p5-PPI-HTML/Makefile b/textproc/p5-PPI-HTML/Makefile
index 35a3346d9e7d..355d3560e034 100644
--- a/textproc/p5-PPI-HTML/Makefile
+++ b/textproc/p5-PPI-HTML/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	PPI-HTML
 PORTVERSION=	1.08
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/A/AD/ADAMK
+MASTER_SITE_SUBDIR=	CPAN:ADAMK
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/textproc/p5-PPIx-EditorTools/Makefile b/textproc/p5-PPIx-EditorTools/Makefile
index f5ab0304743b..7df9911159f1 100644
--- a/textproc/p5-PPIx-EditorTools/Makefile
+++ b/textproc/p5-PPIx-EditorTools/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	PPIx-EditorTools
 PORTVERSION=	0.11
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/A/AZ/AZAWAWI
+MASTER_SITE_SUBDIR=	CPAN:AZAWAWI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	cm@therek.net
diff --git a/textproc/p5-PPIx-Regexp/Makefile b/textproc/p5-PPIx-Regexp/Makefile
index 2fd97520ae86..521220306acc 100644
--- a/textproc/p5-PPIx-Regexp/Makefile
+++ b/textproc/p5-PPIx-Regexp/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	PPIx-Regexp
 PORTVERSION=	0.020
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/W/WY/WYANT
+MASTER_SITE_SUBDIR=	CPAN:WYANT
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ashish@FreeBSD.org
diff --git a/textproc/p5-PPIx-Utilities/Makefile b/textproc/p5-PPIx-Utilities/Makefile
index 80fa81c4dcf2..2af4aa0061c0 100644
--- a/textproc/p5-PPIx-Utilities/Makefile
+++ b/textproc/p5-PPIx-Utilities/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	PPIx-Utilities
 PORTVERSION=	1.001000
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/E/EL/ELLIOTJS
+MASTER_SITE_SUBDIR=	CPAN:ELLIOTJS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/textproc/p5-Perl-Critic/Makefile b/textproc/p5-Perl-Critic/Makefile
index d4dd64a88360..ce0c7188965e 100644
--- a/textproc/p5-Perl-Critic/Makefile
+++ b/textproc/p5-Perl-Critic/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	Perl-Critic
 PORTVERSION=	1.11.3
 CATEGORIES=	textproc devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/E/EL/ELLIOTJS
+MASTER_SITE_SUBDIR=	CPAN:ELLIOTJS
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
diff --git a/textproc/p5-Plagger/Makefile b/textproc/p5-Plagger/Makefile
index 90937d213eb3..cfec31292d2d 100644
--- a/textproc/p5-Plagger/Makefile
+++ b/textproc/p5-Plagger/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.7.17
 PORTREVISION=	4
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/M/MI/MIYAGAWA
+MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sumikawa@FreeBSD.org
diff --git a/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile b/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile
index 80879f90d3ef..8d797ee20f0b 100644
--- a/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile
+++ b/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.1
 PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/F/FA/FABPOT
+MASTER_SITE_SUBDIR=	CPAN:FABPOT
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/textproc/p5-Plucene-Simple/Makefile b/textproc/p5-Plucene-Simple/Makefile
index 9717f0c1eb5f..dcc9d4290ab3 100644
--- a/textproc/p5-Plucene-Simple/Makefile
+++ b/textproc/p5-Plucene-Simple/Makefile
@@ -9,11 +9,11 @@ PORTNAME=	Plucene-Simple
 DISTVERSION=	1.04
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/S/ST/STRYTOAST
+MASTER_SITE_SUBDIR=	CPAN:STRYTOAST
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME:S/-//}-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	An interface to Plucene
 
 BUILD_DEPENDS=	p5-Time-Piece>=1.08:${PORTSDIR}/devel/p5-Time-Piece \
diff --git a/textproc/p5-Plucene/Makefile b/textproc/p5-Plucene/Makefile
index f9d6b4a92137..4719f1002090 100644
--- a/textproc/p5-Plucene/Makefile
+++ b/textproc/p5-Plucene/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.25
 PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/T/TM/TMTM
+MASTER_SITE_SUBDIR=	CPAN:TMTM
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/textproc/p5-Regexp-Copy/Makefile b/textproc/p5-Regexp-Copy/Makefile
index fcb50eca9803..c21b115fe9c9 100644
--- a/textproc/p5-Regexp-Copy/Makefile
+++ b/textproc/p5-Regexp-Copy/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.06
 PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/J/JD/JDUNCAN
+MASTER_SITE_SUBDIR=	CPAN:JDUNCAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/textproc/p5-Senna/Makefile b/textproc/p5-Senna/Makefile
index a215551edd7c..db850404cc15 100644
--- a/textproc/p5-Senna/Makefile
+++ b/textproc/p5-Senna/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Senna
 PORTVERSION=	0.51
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/D/DM/DMAKI/
+MASTER_SITE_SUBDIR=	CPAN:DMAKI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/textproc/p5-Spreadsheet-XLSX/Makefile b/textproc/p5-Spreadsheet-XLSX/Makefile
index 95dd39052b6b..7444e6ca2246 100644
--- a/textproc/p5-Spreadsheet-XLSX/Makefile
+++ b/textproc/p5-Spreadsheet-XLSX/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Spreadsheet-XLSX
 PORTVERSION=	0.13
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/D/DM/DMOW
+MASTER_SITE_SUBDIR=	CPAN:DMOW
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-withoutworldwriteables
 
diff --git a/textproc/p5-Syntax-Highlight-Perl-Improved/Makefile b/textproc/p5-Syntax-Highlight-Perl-Improved/Makefile
index 664b8b36361f..7c8c08cb915b 100644
--- a/textproc/p5-Syntax-Highlight-Perl-Improved/Makefile
+++ b/textproc/p5-Syntax-Highlight-Perl-Improved/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Syntax-Highlight-Perl-Improved
 PORTVERSION=	1.01
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/D/DA/DAVIDCYL/Syntax-Highlight-Perl-Improved-101
+MASTER_SITE_SUBDIR=	CPAN:DAVIDCYL/Syntax-Highlight-Perl-Improved-101
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mauricio@arareko.net
diff --git a/textproc/p5-YAPE-HTML/Makefile b/textproc/p5-YAPE-HTML/Makefile
index 24d12bc2f9ac..4d3c309000e7 100644
--- a/textproc/p5-YAPE-HTML/Makefile
+++ b/textproc/p5-YAPE-HTML/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	YAPE-HTML
 PORTVERSION=	1.11
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/P/PI/PINYAN
+MASTER_SITE_SUBDIR=	CPAN:PINYAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/textproc/p5-YAPE-Regex-Explain/Makefile b/textproc/p5-YAPE-Regex-Explain/Makefile
index af63072560e2..d9ce53014fb0 100644
--- a/textproc/p5-YAPE-Regex-Explain/Makefile
+++ b/textproc/p5-YAPE-Regex-Explain/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	YAPE-Regex-Explain
 PORTVERSION=	4.01
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/G/GS/GSULLIVAN
+MASTER_SITE_SUBDIR=	CPAN:GSULLIVAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/textproc/p5-pod2pdf/Makefile b/textproc/p5-pod2pdf/Makefile
index 2e39469ed382..79fff5ded6b7 100644
--- a/textproc/p5-pod2pdf/Makefile
+++ b/textproc/p5-pod2pdf/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	pod2pdf
 PORTVERSION=	0.42
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/J/JO/JONALLEN
+MASTER_SITE_SUBDIR=	CPAN:JONALLEN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org