- Replace ../../authors in MASTER_SITE_SUBDIR with CPAN:CPANID macro.

  See http://wiki.freebsd.org/Perl for details.
- Change maintainership from ports@ to perl@ for ports in this changeset.

With perl@ hat

38 files changed, 44 insertions, 43 deletions

diff --git a/devel/cpan-upload/Makefile b/devel/cpan-upload/Makefile
index f1ccc85d2dc..1b62151e936 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 7e613ae31ed..aabe798e337 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 198c60c6999..6fd37bc34bc 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 db161eecc64..37773e4ee08 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 9d4787e15c8..39a12c7ff06 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 b56eb14d0d8..94c0dca4430 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 186466b33d1..0cbb4c50213 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 7a96fb50f97..02ebd3eb4c1 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 53c027fa39e..a06e7c90614 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 765c0551d70..4b1cd8c5447 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 463e4354841..7f6e71be3a7 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 95688cf4573..7b88f8834ef 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 16c4c3e5c22..f7b78e451ed 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 6e7dcde16a5..050b7d9c8f8 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 399eb53d76d..9e0789285f5 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 7b59aa7e55d..375bbe30076 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 2f9168a6fc6..90254aca527 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 30dbda0f20f..754e597e190 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 d9a0504cf10..05f706e1477 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 61f5f3f8917..b2cd5236037 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 cb06e91f517..88c2c6d960f 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 6a09a6416ef..95f6ececc71 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 2d47a02cd23..3d85f4ba6d7 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 36f7078575c..3df0c3ac4b9 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 28c0b635a46..5bfd6e4423d 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 d7876d0e04d..f84a057f0fa 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 08e00aad677..9b9594517f8 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 17c40bb7bc2..2d3c39f8484 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 b6457fc5ed3..153221fc83c 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 70f3640536b..432340e7ef6 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 642da90cf39..18ce6093b82 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 3595f276643..8033af4b697 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 0ad5566b8e9..709ff01b12b 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 14bf124fa28..3d3d940bcaf 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 c816b5b5818..b79a048e1fe 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 ef55dfd713a..4d90409cc9c 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 ef7542edee7..4771482c7eb 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 2eb8d4fe3f3..7766b3970f2 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