- Take advantage of CPAN macro from bsd.sites.mk, change ${MASTER_SITE_PERL_CPAN} to CPAN.

PR: ports/122674 Submitted by: Philip M. Gollucci <pgollucci@p6m7g8.com> Reworked by: araujo (myself) Approved by: portmgr (pav)
author: araujo <araujo@FreeBSD.org> 2008-04-17 22:30:31 +0800
committer: araujo <araujo@FreeBSD.org> 2008-04-17 22:30:31 +0800
commit: c94d115b8e9cb4ad3d8424685fe7c324767594f3 (patch)
tree: 6cb0853059727bc626be6002ec069cf4edbfd17a /www
parent: 79defce4f3dcafa040fed233fd412ff265751d47 (diff)
download: freebsd-ports-gnome-c94d115b8e9cb4ad3d8424685fe7c324767594f3.tar.gz
freebsd-ports-gnome-c94d115b8e9cb4ad3d8424685fe7c324767594f3.tar.zst
freebsd-ports-gnome-c94d115b8e9cb4ad3d8424685fe7c324767594f3.zip
327 files changed, 328 insertions, 587 deletions
diff --git a/www/mod_perl/Makefile b/www/mod_perl/Makefile
index b0e210511535..301860c9840d 100644
--- a/www/mod_perl/Makefile
+++ b/www/mod_perl/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	mod_perl
 PORTVERSION=	1.30
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 
 MAINTAINER=	pgollucci@p6m7g8.com
 COMMENT=	Embeds a Perl interpreter in the Apache server
diff --git a/www/p5-AMF-Perl/Makefile b/www/p5-AMF-Perl/Makefile
index af3bce0a5d99..b20affc0c545 100644
--- a/www/p5-AMF-Perl/Makefile
+++ b/www/p5-AMF-Perl/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	AMF-Perl
 PORTVERSION=	0.15
 PORTREVISION=	1
 CATEGORIES=	www devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/S/SI/SIMONF
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Acme-Monta/Makefile b/www/p5-Acme-Monta/Makefile
index 3268a16bada0..462d1a5d24eb 100644
--- a/www/p5-Acme-Monta/Makefile
+++ b/www/p5-Acme-Monta/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Acme-Monta
 PORTVERSION=	0.01
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Acme
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kaoru@kaisei.org
diff --git a/www/p5-Apache-ASP/Makefile b/www/p5-Apache-ASP/Makefile
index f18114c3d9e6..96fbec9f0d35 100644
--- a/www/p5-Apache-ASP/Makefile
+++ b/www/p5-Apache-ASP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-ASP
 PORTVERSION=	2.59
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/www/p5-Apache-AddHostPath/Makefile b/www/p5-Apache-AddHostPath/Makefile
index 2608d732d959..17722f499bc2 100644
--- a/www/p5-Apache-AddHostPath/Makefile
+++ b/www/p5-Apache-AddHostPath/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-AddHostPath
 PORTVERSION=	0.02
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/p5-Apache-Admin-Config/Makefile b/www/p5-Apache-Admin-Config/Makefile
index 5f749790aab2..9ad3146f27f0 100644
--- a/www/p5-Apache-Admin-Config/Makefile
+++ b/www/p5-Apache-Admin-Config/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-Admin-Config
 PORTVERSION=	0.94
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-Apache-AntiSpam/Makefile b/www/p5-Apache-AntiSpam/Makefile
index 5c1dbbd50066..230c4f49f24e 100644
--- a/www/p5-Apache-AntiSpam/Makefile
+++ b/www/p5-Apache-AntiSpam/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-AntiSpam
 PORTVERSION=	0.05
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/www/p5-Apache-Archive/Makefile b/www/p5-Apache-Archive/Makefile
index a88247e60aa6..01e62d9598bb 100644
--- a/www/p5-Apache-Archive/Makefile
+++ b/www/p5-Apache-Archive/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-Archive
 PORTVERSION=	0.1
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/p5-Apache-AuthTicket/Makefile b/www/p5-Apache-AuthTicket/Makefile
index 72213bf47d7c..a3bf7945c559 100644
--- a/www/p5-Apache-AuthTicket/Makefile
+++ b/www/p5-Apache-AuthTicket/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-AuthTicket
 PORTVERSION=	0.40
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-Apache-AuthenCache/Makefile b/www/p5-Apache-AuthenCache/Makefile
index 5f49e104c168..94d8aeee5bef 100644
--- a/www/p5-Apache-AuthenCache/Makefile
+++ b/www/p5-Apache-AuthenCache/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Apache-AuthenCache
 PORTVERSION=	1.00
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/C/CG/CGILMORE
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Apache-AuthenURL/Makefile b/www/p5-Apache-AuthenURL/Makefile
index 3aa64061c8e7..bf0030a8d17a 100644
--- a/www/p5-Apache-AuthenURL/Makefile
+++ b/www/p5-Apache-AuthenURL/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-AuthenURL
 PORTVERSION=	2.05
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-Apache-AutoIndex/Makefile b/www/p5-Apache-AutoIndex/Makefile
index c5df5dd054c1..3e838c2a368d 100644
--- a/www/p5-Apache-AutoIndex/Makefile
+++ b/www/p5-Apache-AutoIndex/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-AutoIndex
 PORTVERSION=	0.08
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/p5-Apache-AxKit-Plugin-AddXSLParams-Request/Makefile b/www/p5-Apache-AxKit-Plugin-AddXSLParams-Request/Makefile
index c58426e33f82..87a054069a7e 100644
--- a/www/p5-Apache-AxKit-Plugin-AddXSLParams-Request/Makefile
+++ b/www/p5-Apache-AxKit-Plugin-AddXSLParams-Request/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=			Apache-AxKit-Plugin-AddXSLParams-Request
 PORTVERSION=		1.02
 CATEGORIES=			www perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=		CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/K/KH/KHAMPTON
 PKGNAMEPREFIX=		p5-
 
diff --git a/www/p5-Apache-Clean/Makefile b/www/p5-Apache-Clean/Makefile
index be64bef49e5b..4dbc6fcaf7f9 100644
--- a/www/p5-Apache-Clean/Makefile
+++ b/www/p5-Apache-Clean/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Apache-Clean
 PORTVERSION=	0.05
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Apache/GEOFF
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Apache-Clean2/Makefile b/www/p5-Apache-Clean2/Makefile
index 0d5583977df2..213a6c5d52a3 100644
--- a/www/p5-Apache-Clean2/Makefile
+++ b/www/p5-Apache-Clean2/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Apache-Clean
 PORTVERSION=	2.00
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Apache/GEOFF
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION}_7
diff --git a/www/p5-Apache-Compress/Makefile b/www/p5-Apache-Compress/Makefile
index 5b574faa815e..2293977f4ad4 100644
--- a/www/p5-Apache-Compress/Makefile
+++ b/www/p5-Apache-Compress/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-Compress
 PORTVERSION=	1.005
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache/KWILLIAMS
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mm@FreeBSD.org
diff --git a/www/p5-Apache-CompressClientFixup/Makefile b/www/p5-Apache-CompressClientFixup/Makefile
index 8e3c265559e1..b8bdc33fabdf 100644
--- a/www/p5-Apache-CompressClientFixup/Makefile
+++ b/www/p5-Apache-CompressClientFixup/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-CompressClientFixup
 PORTVERSION=	0.07
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/p5-Apache-ConfigFile/Makefile b/www/p5-Apache-ConfigFile/Makefile
index 2e4a20bdb09c..cf5d27f00dcd 100644
--- a/www/p5-Apache-ConfigFile/Makefile
+++ b/www/p5-Apache-ConfigFile/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Apache-ConfigFile
 PORTVERSION=	1.18
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/N/NW/NWIGER
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Apache-ConfigParser/Makefile b/www/p5-Apache-ConfigParser/Makefile
index 9d277bfef155..a3c7fb808e0b 100644
--- a/www/p5-Apache-ConfigParser/Makefile
+++ b/www/p5-Apache-ConfigParser/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-ConfigParser
 PORTVERSION=	1.01
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/www/p5-Apache-DB/Makefile b/www/p5-Apache-DB/Makefile
index 78dbf4c7a30c..59fa2704198c 100644
--- a/www/p5-Apache-DB/Makefile
+++ b/www/p5-Apache-DB/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-DB
 PORTVERSION=	0.13
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/www/p5-Apache-DBI/Makefile b/www/p5-Apache-DBI/Makefile
index d0874bf202cd..ff5a9c6f283c 100644
--- a/www/p5-Apache-DBI/Makefile
+++ b/www/p5-Apache-DBI/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-DBI
 PORTVERSION=	1.06
 CATEGORIES=	www databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	pgollucci@p6m7g8.com
diff --git a/www/p5-Apache-DebugInfo/Makefile b/www/p5-Apache-DebugInfo/Makefile
index 296163794497..f02de992b142 100644
--- a/www/p5-Apache-DebugInfo/Makefile
+++ b/www/p5-Apache-DebugInfo/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-DebugInfo
 PORTVERSION=	0.05
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/www/p5-Apache-DumpHeaders/Makefile b/www/p5-Apache-DumpHeaders/Makefile
index 380c453f4901..cc9ae6df46f5 100644
--- a/www/p5-Apache-DumpHeaders/Makefile
+++ b/www/p5-Apache-DumpHeaders/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-DumpHeaders
 PORTVERSION=	0.94
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-Apache-Filter/Makefile b/www/p5-Apache-Filter/Makefile
index 4b1a33d19844..1b1d2c441c84 100644
--- a/www/p5-Apache-Filter/Makefile
+++ b/www/p5-Apache-Filter/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-Filter
 PORTVERSION=	1.024
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile
index 68368277a3c7..0c955261e9f3 100644
--- a/www/p5-Apache-Gallery/Makefile
+++ b/www/p5-Apache-Gallery/Makefile
@@ -10,8 +10,7 @@ PORTVERSION=	1.0RC3
 PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	http://apachegallery.dk/download/ \
-		${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+		CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kvs@pil.dk
diff --git a/www/p5-Apache-GopherHandler/Makefile b/www/p5-Apache-GopherHandler/Makefile
index 751b3c975de0..64dde078b5ec 100644
--- a/www/p5-Apache-GopherHandler/Makefile
+++ b/www/p5-Apache-GopherHandler/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-GopherHandler
 PORTVERSION=	0.1
 CATEGORIES=	www net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	toni.viemero@iki.fi
diff --git a/www/p5-Apache-Icon/Makefile b/www/p5-Apache-Icon/Makefile
index 95d4dfbe9e0a..23980b2c2822 100644
--- a/www/p5-Apache-Icon/Makefile
+++ b/www/p5-Apache-Icon/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-Icon
 PORTVERSION=	0.02
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/p5-Apache-Language/Makefile b/www/p5-Apache-Language/Makefile
index 2069e1c9af46..bac5a83e5440 100644
--- a/www/p5-Apache-Language/Makefile
+++ b/www/p5-Apache-Language/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-Language
 PORTVERSION=	0.14
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/p5-Apache-MP3/Makefile b/www/p5-Apache-MP3/Makefile
index e5fba5ab17af..0592b87bb23a 100644
--- a/www/p5-Apache-MP3/Makefile
+++ b/www/p5-Apache-MP3/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-MP3
 PORTVERSION=	4.00
 CATEGORIES=	www audio perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/p5-Apache-NNTPGateway/Makefile b/www/p5-Apache-NNTPGateway/Makefile
index cc2f9de8589f..cceeafd1e84d 100644
--- a/www/p5-Apache-NNTPGateway/Makefile
+++ b/www/p5-Apache-NNTPGateway/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-NNTPGateway
 PORTVERSION=	0.9
 CATEGORIES=	www news perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/www/p5-Apache-PageKit/Makefile b/www/p5-Apache-PageKit/Makefile
index a166ecb5dc85..8bd44f3961f6 100644
--- a/www/p5-Apache-PageKit/Makefile
+++ b/www/p5-Apache-PageKit/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Apache-PageKit
 PORTVERSION=	1.18
 PORTREVISION=	0
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/p5-Apache-ParseFormData/Makefile b/www/p5-Apache-ParseFormData/Makefile
index 343ff0af6ee9..29ac93092d12 100644
--- a/www/p5-Apache-ParseFormData/Makefile
+++ b/www/p5-Apache-ParseFormData/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-ParseFormData
 PORTVERSION=	0.09
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	nistor@snickers.org
diff --git a/www/p5-Apache-Peek/Makefile b/www/p5-Apache-Peek/Makefile
index 6eff1085ef50..982c2ff20239 100644
--- a/www/p5-Apache-Peek/Makefile
+++ b/www/p5-Apache-Peek/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Apache-Peek
 PORTVERSION=	1.02
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/S/ST/STAS
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Apache-Profiler/Makefile b/www/p5-Apache-Profiler/Makefile
index 3c45abe533f7..3219fdac247c 100644
--- a/www/p5-Apache-Profiler/Makefile
+++ b/www/p5-Apache-Profiler/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-Profiler
 PORTVERSION=	0.01
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/www/p5-Apache-Radius/Makefile b/www/p5-Apache-Radius/Makefile
index 48d544e422d0..059d01959ab6 100644
--- a/www/p5-Apache-Radius/Makefile
+++ b/www/p5-Apache-Radius/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-Radius
 PORTVERSION=	0.9
 CATEGORIES=	www security perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	Apache-AuthenRadius-${PORTVERSION}
 
diff --git a/www/p5-Apache-Reload/Makefile b/www/p5-Apache-Reload/Makefile
index df74a886c233..a6e394eac45f 100644
--- a/www/p5-Apache-Reload/Makefile
+++ b/www/p5-Apache-Reload/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-Reload
 PORTVERSION=	0.07
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/www/p5-Apache-SSI/Makefile b/www/p5-Apache-SSI/Makefile
index 370343da792b..9dce36f0b3bc 100644
--- a/www/p5-Apache-SSI/Makefile
+++ b/www/p5-Apache-SSI/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-SSI
 PORTVERSION=	2.19
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-Apache-Scoreboard/Makefile b/www/p5-Apache-Scoreboard/Makefile
index 1e815f444779..794bc3423e98 100644
--- a/www/p5-Apache-Scoreboard/Makefile
+++ b/www/p5-Apache-Scoreboard/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	Apache-Scoreboard
 PORTVERSION=	0.10
 PORTREVISION=	1
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=Apache
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	Apache
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tcornpropst@cox.net
diff --git a/www/p5-Apache-Session-SQLite3/Makefile b/www/p5-Apache-Session-SQLite3/Makefile
index b636354d093c..aa94bd67077e 100644
--- a/www/p5-Apache-Session-SQLite3/Makefile
+++ b/www/p5-Apache-Session-SQLite3/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-Session-SQLite3
 PORTVERSION=	0.03
 CATEGORIES=	www databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/p5-Apache-Session-SharedMem/Makefile b/www/p5-Apache-Session-SharedMem/Makefile
index 7d902fec13c3..cd25e856cbf4 100644
--- a/www/p5-Apache-Session-SharedMem/Makefile
+++ b/www/p5-Apache-Session-SharedMem/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-Session-SharedMem
 PORTVERSION=	0.6
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/p5-Apache-Session/Makefile b/www/p5-Apache-Session/Makefile
index 4778c31fdca2..5b35b7e9f2db 100644
--- a/www/p5-Apache-Session/Makefile
+++ b/www/p5-Apache-Session/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-Session
 PORTVERSION=	1.81
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/www/p5-Apache-SessionX/Makefile b/www/p5-Apache-SessionX/Makefile
index 390293239e90..259c18932d40 100644
--- a/www/p5-Apache-SessionX/Makefile
+++ b/www/p5-Apache-SessionX/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-SessionX
 PORTVERSION=	2.01
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/www/p5-Apache-Singleton/Makefile b/www/p5-Apache-Singleton/Makefile
index 386e7cb19576..492313b2d274 100644
--- a/www/p5-Apache-Singleton/Makefile
+++ b/www/p5-Apache-Singleton/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-Singleton
 PORTVERSION=	0.07
 CATEGORIES=	www devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@c0decafe.net
diff --git a/www/p5-Apache-SubProcess/Makefile b/www/p5-Apache-SubProcess/Makefile
index 4427c6bd86d0..76a38e5c88e1 100644
--- a/www/p5-Apache-SubProcess/Makefile
+++ b/www/p5-Apache-SubProcess/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Apache-SubProcess
 PORTVERSION=	0.03
 PORTREVISION=	1
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lars.eggert@gmx.net
diff --git a/www/p5-Apache-Template/Makefile b/www/p5-Apache-Template/Makefile
index 26005523ac1f..a6663bee0e5b 100644
--- a/www/p5-Apache-Template/Makefile
+++ b/www/p5-Apache-Template/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-Template
 PORTVERSION=	0.09
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hideo@lastamericanempire.com
diff --git a/www/p5-Apache2-Scoreboard/Makefile b/www/p5-Apache2-Scoreboard/Makefile
index b1272f752588..bc0656c199a5 100644
--- a/www/p5-Apache2-Scoreboard/Makefile
+++ b/www/p5-Apache2-Scoreboard/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache2-Scoreboard
 PORTVERSION=	2.08
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	Apache-Scoreboard-${PORTVERSION}
 
diff --git a/www/p5-ApacheBench/Makefile b/www/p5-ApacheBench/Makefile
index 1275fc32d158..0eda24ed1a18 100644
--- a/www/p5-ApacheBench/Makefile
+++ b/www/p5-ApacheBench/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	ApacheBench
 PORTVERSION=	0.63
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	HTTPD
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-B-LexInfo/Makefile b/www/p5-B-LexInfo/Makefile
index edf70511888e..ae8462a7dfca 100644
--- a/www/p5-B-LexInfo/Makefile
+++ b/www/p5-B-LexInfo/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	B-LexInfo
 PORTVERSION=	0.02
 CATEGORIES=	www devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	B
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tcornpropst@cox.net
diff --git a/www/p5-Bundle-Slash/Makefile b/www/p5-Bundle-Slash/Makefile
index e386bde69d5f..fa015fc64895 100644
--- a/www/p5-Bundle-Slash/Makefile
+++ b/www/p5-Bundle-Slash/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Bundle-Slash
 PORTVERSION=	2.52
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Bundle
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-Bundle-Sledge/Makefile b/www/p5-Bundle-Sledge/Makefile
index 7174bd07f538..0234c451deb0 100644
--- a/www/p5-Bundle-Sledge/Makefile
+++ b/www/p5-Bundle-Sledge/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Bundle-Sledge
 PORTVERSION=	0.04
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Bundle
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/p5-Business-PayPal/Makefile b/www/p5-Business-PayPal/Makefile
index 2127fcc338cb..4a2272dffe5f 100644
--- a/www/p5-Business-PayPal/Makefile
+++ b/www/p5-Business-PayPal/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Business-PayPal
 PORTVERSION=	0.02
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Business
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skreuzer@exit2shell.com
diff --git a/www/p5-CGI-Application-Plugin-AnyTemplate/Makefile b/www/p5-CGI-Application-Plugin-AnyTemplate/Makefile
index 478023d0de65..eb4b5c04cf5e 100644
--- a/www/p5-CGI-Application-Plugin-AnyTemplate/Makefile
+++ b/www/p5-CGI-Application-Plugin-AnyTemplate/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-Application-Plugin-AnyTemplate
 PORTVERSION=	0.17
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hartzell@alerce.com
diff --git a/www/p5-CGI-Application-Plugin-AutoRunmode/Makefile b/www/p5-CGI-Application-Plugin-AutoRunmode/Makefile
index 38e833eeaf09..869c910e71b6 100644
--- a/www/p5-CGI-Application-Plugin-AutoRunmode/Makefile
+++ b/www/p5-CGI-Application-Plugin-AutoRunmode/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-Application-Plugin-AutoRunmode
 PORTVERSION=	0.15
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hartzell@alerce.com
diff --git a/www/p5-CGI-Application-Plugin-DBH/Makefile b/www/p5-CGI-Application-Plugin-DBH/Makefile
index 6d4b5f9ca433..80a0a247d479 100644
--- a/www/p5-CGI-Application-Plugin-DBH/Makefile
+++ b/www/p5-CGI-Application-Plugin-DBH/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-Application-Plugin-DBH
 PORTVERSION=	4.00
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	espen@tagestad.no
diff --git a/www/p5-CGI-Application-Plugin-DebugScreen/Makefile b/www/p5-CGI-Application-Plugin-DebugScreen/Makefile
index fe5f1deee173..460a2b68505c 100644
--- a/www/p5-CGI-Application-Plugin-DebugScreen/Makefile
+++ b/www/p5-CGI-Application-Plugin-DebugScreen/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-Application-Plugin-DebugScreen
 PORTVERSION=	0.06
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hartzell@alerce.com
diff --git a/www/p5-CGI-Application-Plugin-Forward/Makefile b/www/p5-CGI-Application-Plugin-Forward/Makefile
index 47eaa51d4b5c..f11c998b0a32 100644
--- a/www/p5-CGI-Application-Plugin-Forward/Makefile
+++ b/www/p5-CGI-Application-Plugin-Forward/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-Application-Plugin-Forward
 PORTVERSION=	1.06
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hartzell@alerce.com
diff --git a/www/p5-CGI-Application-Plugin-HTDot/Makefile b/www/p5-CGI-Application-Plugin-HTDot/Makefile
index 14148e7e94ed..d7bf8a571b8d 100644
--- a/www/p5-CGI-Application-Plugin-HTDot/Makefile
+++ b/www/p5-CGI-Application-Plugin-HTDot/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-Application-Plugin-HTDot
 PORTVERSION=	0.06
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	espen@tagestad.no
diff --git a/www/p5-CGI-Application-Plugin-HTMLPrototype/Makefile b/www/p5-CGI-Application-Plugin-HTMLPrototype/Makefile
index 518a6403e2f1..59b7b15c17b9 100644
--- a/www/p5-CGI-Application-Plugin-HTMLPrototype/Makefile
+++ b/www/p5-CGI-Application-Plugin-HTMLPrototype/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-Application-Plugin-HTMLPrototype
 PORTVERSION=	0.20
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hartzell@alerce.com
diff --git a/www/p5-CGI-Application-Plugin-LinkIntegrity/Makefile b/www/p5-CGI-Application-Plugin-LinkIntegrity/Makefile
index 15ebeb4a7671..1060492eb3c9 100644
--- a/www/p5-CGI-Application-Plugin-LinkIntegrity/Makefile
+++ b/www/p5-CGI-Application-Plugin-LinkIntegrity/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-Application-Plugin-LinkIntegrity
 PORTVERSION=	0.06
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hartzell@alerce.com
diff --git a/www/p5-CGI-Application-Plugin-LogDispatch/Makefile b/www/p5-CGI-Application-Plugin-LogDispatch/Makefile
index f09c0ab6ed76..3ff4a8b45490 100644
--- a/www/p5-CGI-Application-Plugin-LogDispatch/Makefile
+++ b/www/p5-CGI-Application-Plugin-LogDispatch/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-Application-Plugin-LogDispatch
 PORTVERSION=	1.00
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hartzell@alerce.com
diff --git a/www/p5-CGI-Application-Plugin-MessageStack/Makefile b/www/p5-CGI-Application-Plugin-MessageStack/Makefile
index 162fe7116555..4c49aafe651a 100644
--- a/www/p5-CGI-Application-Plugin-MessageStack/Makefile
+++ b/www/p5-CGI-Application-Plugin-MessageStack/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-Application-Plugin-MessageStack
 PORTVERSION=	0.34
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hartzell@alerce.com
diff --git a/www/p5-CGI-Application-Plugin-Redirect/Makefile b/www/p5-CGI-Application-Plugin-Redirect/Makefile
index 337c3ebfb8ee..277e79a2f733 100644
--- a/www/p5-CGI-Application-Plugin-Redirect/Makefile
+++ b/www/p5-CGI-Application-Plugin-Redirect/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-Application-Plugin-Redirect
 PORTVERSION=	0.1
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hartzell@alerce.com
diff --git a/www/p5-CGI-Application-Plugin-Session/Makefile b/www/p5-CGI-Application-Plugin-Session/Makefile
index 04d7d2b01d6a..72d9ae182526 100644
--- a/www/p5-CGI-Application-Plugin-Session/Makefile
+++ b/www/p5-CGI-Application-Plugin-Session/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-Application-Plugin-Session
 PORTVERSION=	1.02
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hartzell@alerce.com
diff --git a/www/p5-CGI-Application-Plugin-Stream/Makefile b/www/p5-CGI-Application-Plugin-Stream/Makefile
index b037220fd1e9..0596156ee8a7 100644
--- a/www/p5-CGI-Application-Plugin-Stream/Makefile
+++ b/www/p5-CGI-Application-Plugin-Stream/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-Application-Plugin-Stream
 PORTVERSION=	2.06
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hartzell@alerce.com
diff --git a/www/p5-CGI-Application-Plugin-TT/Makefile b/www/p5-CGI-Application-Plugin-TT/Makefile
index 4d2ee7337246..183fe5e68e60 100644
--- a/www/p5-CGI-Application-Plugin-TT/Makefile
+++ b/www/p5-CGI-Application-Plugin-TT/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-Application-Plugin-TT
 PORTVERSION=	1.03
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hartzell@alerce.com
diff --git a/www/p5-CGI-Application-Plugin-ValidateRM/Makefile b/www/p5-CGI-Application-Plugin-ValidateRM/Makefile
index eb14f013f81b..513723182182 100644
--- a/www/p5-CGI-Application-Plugin-ValidateRM/Makefile
+++ b/www/p5-CGI-Application-Plugin-ValidateRM/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	CGI-Application-Plugin-ValidateRM
 PORTVERSION=	2.1
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	espen@tagestad.no
diff --git a/www/p5-CGI-Application-Plugin-ViewCode/Makefile b/www/p5-CGI-Application-Plugin-ViewCode/Makefile
index d38d89f62922..90016bb59fa4 100644
--- a/www/p5-CGI-Application-Plugin-ViewCode/Makefile
+++ b/www/p5-CGI-Application-Plugin-ViewCode/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-Application-Plugin-ViewCode
 PORTVERSION=	1.02
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hartzell@alerce.com
diff --git a/www/p5-CGI-ArgChecker/Makefile b/www/p5-CGI-ArgChecker/Makefile
index 5e345092692b..90424cad5496 100644
--- a/www/p5-CGI-ArgChecker/Makefile
+++ b/www/p5-CGI-ArgChecker/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-ArgChecker
 PORTVERSION=	0.02
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/p5-CGI-Builder-TT2/Makefile b/www/p5-CGI-Builder-TT2/Makefile
index 8d3d9e403267..128b01bc53ca 100644
--- a/www/p5-CGI-Builder-TT2/Makefile
+++ b/www/p5-CGI-Builder-TT2/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	CGI-Builder-TT2
 PORTVERSION=	0.03
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/L/LA/LARSEN
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-CGI-Builder/Makefile b/www/p5-CGI-Builder/Makefile
index d5e7d5d96a64..1b91fb5c737c 100644
--- a/www/p5-CGI-Builder/Makefile
+++ b/www/p5-CGI-Builder/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-Builder
 PORTVERSION=	1.36
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/p5-CGI-Cache/Makefile b/www/p5-CGI-Cache/Makefile
index 820365211dc3..9c5b2eb67726 100644
--- a/www/p5-CGI-Cache/Makefile
+++ b/www/p5-CGI-Cache/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-Cache
 PORTVERSION=	1.42.00
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(..)$/\1/}
 
diff --git a/www/p5-CGI-Expand/Makefile b/www/p5-CGI-Expand/Makefile
index 788893ae2142..e9bb0b70cb2d 100644
--- a/www/p5-CGI-Expand/Makefile
+++ b/www/p5-CGI-Expand/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-Expand
 PORTVERSION=	2.02
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	fernan@iib.unsam.edu.ar
diff --git a/www/p5-CGI-FCKeditor/Makefile b/www/p5-CGI-FCKeditor/Makefile
index e3e7f202b11e..cdead33f4e10 100644
--- a/www/p5-CGI-FCKeditor/Makefile
+++ b/www/p5-CGI-FCKeditor/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-FCKeditor
 PORTVERSION=	0.02
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	snowfly@yuntech.edu.tw
diff --git a/www/p5-CGI-FastTemplate/Makefile b/www/p5-CGI-FastTemplate/Makefile
index 7ed3d66d1ba7..9455aa193852 100644
--- a/www/p5-CGI-FastTemplate/Makefile
+++ b/www/p5-CGI-FastTemplate/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-FastTemplate
 PORTVERSION=	1.09
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/p5-CGI-FormBuilder/Makefile b/www/p5-CGI-FormBuilder/Makefile
index 5b272a0efc24..03334ea1f0eb 100644
--- a/www/p5-CGI-FormBuilder/Makefile
+++ b/www/p5-CGI-FormBuilder/Makefile
@@ -7,7 +7,7 @@
 PORTNAME=	CGI-FormBuilder
 PORTVERSION=	3.0501
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/N/NW/NWIGER
 PKGNAMEPREFIX=	p5-
 EXTRACT_SUFX=	.tgz
diff --git a/www/p5-CGI-Kwiki/Makefile b/www/p5-CGI-Kwiki/Makefile
index f484cf7d21b3..2488f5cb81fa 100644
--- a/www/p5-CGI-Kwiki/Makefile
+++ b/www/p5-CGI-Kwiki/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	CGI-Kwiki
 PORTVERSION=	0.18
 PORTREVISION=	1
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/www/p5-CGI-Prototype/Makefile b/www/p5-CGI-Prototype/Makefile
index de4f3380d385..e2aa83b48482 100644
--- a/www/p5-CGI-Prototype/Makefile
+++ b/www/p5-CGI-Prototype/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-Prototype
 PORTVERSION=	0.9053
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/www/p5-CGI-Response/Makefile b/www/p5-CGI-Response/Makefile
index 9dad8b34d294..5e4c76030e81 100644
--- a/www/p5-CGI-Response/Makefile
+++ b/www/p5-CGI-Response/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-Response
 PORTVERSION=	0.03
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	guy@device.dyndns.org
diff --git a/www/p5-CGI-SSI/Makefile b/www/p5-CGI-SSI/Makefile
index 785d484f6c6b..71b1e580d563 100644
--- a/www/p5-CGI-SSI/Makefile
+++ b/www/p5-CGI-SSI/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-SSI
 PORTVERSION=	0.92
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-CGI-Session/Makefile b/www/p5-CGI-Session/Makefile
index 806f6fd0e104..8b6436631d38 100644
--- a/www/p5-CGI-Session/Makefile
+++ b/www/p5-CGI-Session/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	CGI-Session
 PORTVERSION=	4.20
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/M/MA/MARKSTOS
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-CGI-Simple/Makefile b/www/p5-CGI-Simple/Makefile
index 0bf153ce22ae..57687ff1f7f7 100644
--- a/www/p5-CGI-Simple/Makefile
+++ b/www/p5-CGI-Simple/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	CGI-Simple
 PORTVERSION=	0.077
 PORTREVISION=	1
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/J/JF/JFREEMAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME:C/CGI/Cgi/}-${PORTVERSION}
diff --git a/www/p5-CGI-SpeedyCGI/Makefile b/www/p5-CGI-SpeedyCGI/Makefile
index a1973eba0268..92d9cbcc2c5e 100644
--- a/www/p5-CGI-SpeedyCGI/Makefile
+++ b/www/p5-CGI-SpeedyCGI/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	CGI-SpeedyCGI
 PORTVERSION=	2.22
 PORTREVISION=	4
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/www/p5-CGI-Untaint-date/Makefile b/www/p5-CGI-Untaint-date/Makefile
index d623f930fa59..2e47e5ec8d0f 100644
--- a/www/p5-CGI-Untaint-date/Makefile
+++ b/www/p5-CGI-Untaint-date/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-Untaint-date
 PORTVERSION=	1.00
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/www/p5-CGI-Untaint-email/Makefile b/www/p5-CGI-Untaint-email/Makefile
index 2f9252bd3140..f9f9e89a5541 100644
--- a/www/p5-CGI-Untaint-email/Makefile
+++ b/www/p5-CGI-Untaint-email/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-Untaint-email
 PORTVERSION=	0.03
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	scrappy@FreeBSD.org
diff --git a/www/p5-CGI-XMLApplication/Makefile b/www/p5-CGI-XMLApplication/Makefile
index eee8f04e291e..e4adcd22eb06 100644
--- a/www/p5-CGI-XMLApplication/Makefile
+++ b/www/p5-CGI-XMLApplication/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-XMLApplication
 PORTVERSION=	1.1.3
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/www/p5-CGI.pm/Makefile b/www/p5-CGI.pm/Makefile
index afd4457addf2..a063be3d2ffb 100644
--- a/www/p5-CGI.pm/Makefile
+++ b/www/p5-CGI.pm/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	CGI.pm
 PORTVERSION=	3.33
 PORTEPOCH=	1
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CGI
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-CGI_Lite/Makefile b/www/p5-CGI_Lite/Makefile
index 76eb8dadc2eb..a0c6f1e21f05 100644
--- a/www/p5-CGI_Lite/Makefile
+++ b/www/p5-CGI_Lite/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-Lite
 PORTVERSION=	2.02
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/www/p5-Catalyst-Action-REST/Makefile b/www/p5-Catalyst-Action-REST/Makefile
index 86de20188300..27dc09eadd51 100644
--- a/www/p5-Catalyst-Action-REST/Makefile
+++ b/www/p5-Catalyst-Action-REST/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Action-REST
 PORTVERSION=	0.60
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/www/p5-Catalyst-Authentication-Store-LDAP/Makefile b/www/p5-Catalyst-Authentication-Store-LDAP/Makefile
index aa3579b91c3e..9188a1505b83 100644
--- a/www/p5-Catalyst-Authentication-Store-LDAP/Makefile
+++ b/www/p5-Catalyst-Authentication-Store-LDAP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Authentication-Store-LDAP
 PORTVERSION=	0.1001
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/www/p5-Catalyst-Controller-BindLex/Makefile b/www/p5-Catalyst-Controller-BindLex/Makefile
index da06b5108012..00329a00d54d 100644
--- a/www/p5-Catalyst-Controller-BindLex/Makefile
+++ b/www/p5-Catalyst-Controller-BindLex/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Catalyst-Controller-BindLex
 PORTVERSION=	0.03
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/N/NU/NUFFIN
 PKGNAMEPREFIX=	p5-
 DISTNAME=       ${PORTNAME}-${PORTVERSION}
diff --git a/www/p5-Catalyst-Controller-FormBuilder/Makefile b/www/p5-Catalyst-Controller-FormBuilder/Makefile
index cd2e0e44767b..48bebd4dc336 100644
--- a/www/p5-Catalyst-Controller-FormBuilder/Makefile
+++ b/www/p5-Catalyst-Controller-FormBuilder/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Controller-FormBuilder
 PORTVERSION=	0.04
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/www/p5-Catalyst-Controller-HTML-FormFu/Makefile b/www/p5-Catalyst-Controller-HTML-FormFu/Makefile
index 69f0a015a818..5ff2d4a4de5c 100644
--- a/www/p5-Catalyst-Controller-HTML-FormFu/Makefile
+++ b/www/p5-Catalyst-Controller-HTML-FormFu/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Catalyst-Controller-HTML-FormFu
 PORTVERSION=	0.02000
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/C/CF/CFRANKS
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Catalyst-Enzyme/Makefile b/www/p5-Catalyst-Enzyme/Makefile
index b2e1bb34b5c6..aa6e8ef49f29 100644
--- a/www/p5-Catalyst-Enzyme/Makefile
+++ b/www/p5-Catalyst-Enzyme/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Enzyme
 PORTVERSION=	0.11
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/www/p5-Catalyst-Helper-Controller-Scaffold/Makefile b/www/p5-Catalyst-Helper-Controller-Scaffold/Makefile
index 6221af461be9..a8f4e249864c 100644
--- a/www/p5-Catalyst-Helper-Controller-Scaffold/Makefile
+++ b/www/p5-Catalyst-Helper-Controller-Scaffold/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Helper-Controller-Scaffold
 PORTVERSION=	0.04
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/www/p5-Catalyst-Log-Log4perl/Makefile b/www/p5-Catalyst-Log-Log4perl/Makefile
index b77e61970fe0..122a0eee3f96 100644
--- a/www/p5-Catalyst-Log-Log4perl/Makefile
+++ b/www/p5-Catalyst-Log-Log4perl/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Log-Log4perl
 PORTVERSION=	1.00
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/www/p5-Catalyst-Model-CDBI-Plain/Makefile b/www/p5-Catalyst-Model-CDBI-Plain/Makefile
index 8618a9cc144b..aab8cb3d3801 100644
--- a/www/p5-Catalyst-Model-CDBI-Plain/Makefile
+++ b/www/p5-Catalyst-Model-CDBI-Plain/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Model-CDBI-Plain
 PORTVERSION=	0.03
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/www/p5-Catalyst-Model-CDBI-Sweet/Makefile b/www/p5-Catalyst-Model-CDBI-Sweet/Makefile
index 1f9b4d490a4e..71665f0507fd 100644
--- a/www/p5-Catalyst-Model-CDBI-Sweet/Makefile
+++ b/www/p5-Catalyst-Model-CDBI-Sweet/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Catalyst-Model-CDBI-Sweet
 PORTVERSION=	0.06
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/M/MR/MRAMBERG
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Catalyst-Model-CDBI/Makefile b/www/p5-Catalyst-Model-CDBI/Makefile
index 0219ad82c381..16e7c93bcaa8 100644
--- a/www/p5-Catalyst-Model-CDBI/Makefile
+++ b/www/p5-Catalyst-Model-CDBI/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Catalyst-Model-CDBI
 PORTVERSION=	0.11
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/A/AG/AGRUNDMA
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Catalyst-Model-DBIC-Plain/Makefile b/www/p5-Catalyst-Model-DBIC-Plain/Makefile
index 85e782be9fc5..72c564f82934 100644
--- a/www/p5-Catalyst-Model-DBIC-Plain/Makefile
+++ b/www/p5-Catalyst-Model-DBIC-Plain/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Catalyst-Model-DBIC-Plain
 PORTVERSION=	0.03
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/S/SR/SRI
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Catalyst-Model-DBIC-Schema/Makefile b/www/p5-Catalyst-Model-DBIC-Schema/Makefile
index 2ac70de88df6..9a5d32b31080 100644
--- a/www/p5-Catalyst-Model-DBIC-Schema/Makefile
+++ b/www/p5-Catalyst-Model-DBIC-Schema/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Model-DBIC-Schema
 PORTVERSION=	0.20
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/www/p5-Catalyst-Model-Oryx/Makefile b/www/p5-Catalyst-Model-Oryx/Makefile
index ad5f5eb5bad7..e0c3f9ec0a3c 100644
--- a/www/p5-Catalyst-Model-Oryx/Makefile
+++ b/www/p5-Catalyst-Model-Oryx/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Model-Oryx
 PORTVERSION=	0.01
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hideo@lastamericanempire.com
diff --git a/www/p5-Catalyst-Model-XML-Feed/Makefile b/www/p5-Catalyst-Model-XML-Feed/Makefile
index 2154ca96b0cd..5dc1db3256b5 100644
--- a/www/p5-Catalyst-Model-XML-Feed/Makefile
+++ b/www/p5-Catalyst-Model-XML-Feed/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Model-XML-Feed
 PORTVERSION=	0.02
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/www/p5-Catalyst-Model-Xapian/Makefile b/www/p5-Catalyst-Model-Xapian/Makefile
index 3e4928aaa7c7..c8b48a942682 100644
--- a/www/p5-Catalyst-Model-Xapian/Makefile
+++ b/www/p5-Catalyst-Model-Xapian/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Catalyst-Model-Xapian
 PORTVERSION=	0.03
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/M/MR/MRAMBERG
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile b/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile
index 65a8a6595356..9bfdf4260a05 100644
--- a/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile
+++ b/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Catalyst-Plugin-Authentication-CDBI
 PORTVERSION=	0.10
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/M/MR/MRAMBERG
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Catalyst-Plugin-Authentication-Store-DBIx-Class/Makefile b/www/p5-Catalyst-Plugin-Authentication-Store-DBIx-Class/Makefile
index 34f398b748f3..35a3968a3c28 100644
--- a/www/p5-Catalyst-Plugin-Authentication-Store-DBIx-Class/Makefile
+++ b/www/p5-Catalyst-Plugin-Authentication-Store-DBIx-Class/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Plugin-Authentication-Store-DBIx-Class
 PORTVERSION=	0.10
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/Makefile b/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/Makefile
index 486f59f53d03..a4c2066dc606 100644
--- a/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/Makefile
+++ b/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Catalyst-Plugin-Authentication-Store-Htpasswd
 PORTVERSION=	0.020
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/N/NU/NUFFIN
 PKGNAMEPREFIX=	p5-
 DISTNAME=       ${PORTNAME}-0.02
diff --git a/www/p5-Catalyst-Plugin-Authorization-ACL/Makefile b/www/p5-Catalyst-Plugin-Authorization-ACL/Makefile
index b12ee7cc5686..6e253bbbcb75 100644
--- a/www/p5-Catalyst-Plugin-Authorization-ACL/Makefile
+++ b/www/p5-Catalyst-Plugin-Authorization-ACL/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Plugin-Authorization-ACL
 PORTVERSION=	0.08
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/www/p5-Catalyst-Plugin-Authorization-Roles/Makefile b/www/p5-Catalyst-Plugin-Authorization-Roles/Makefile
index 50559c0a544c..453551fe8f3f 100644
--- a/www/p5-Catalyst-Plugin-Authorization-Roles/Makefile
+++ b/www/p5-Catalyst-Plugin-Authorization-Roles/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Plugin-Authorization-Roles
 PORTVERSION=	0.05
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/www/p5-Catalyst-Plugin-C3/Makefile b/www/p5-Catalyst-Plugin-C3/Makefile
index a82c6d0a00cf..1a225248d31d 100644
--- a/www/p5-Catalyst-Plugin-C3/Makefile
+++ b/www/p5-Catalyst-Plugin-C3/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Plugin-C3
 PORTVERSION=	0.03
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/www/p5-Catalyst-Plugin-Cache-FastMmap/Makefile b/www/p5-Catalyst-Plugin-Cache-FastMmap/Makefile
index f3f93ec57942..724e5d36380d 100644
--- a/www/p5-Catalyst-Plugin-Cache-FastMmap/Makefile
+++ b/www/p5-Catalyst-Plugin-Cache-FastMmap/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Plugin-Cache-FastMmap
 PORTVERSION=	0.6
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/www/p5-Catalyst-Plugin-Cache-FileCache/Makefile b/www/p5-Catalyst-Plugin-Cache-FileCache/Makefile
index e6959b253fc3..6e360c729205 100644
--- a/www/p5-Catalyst-Plugin-Cache-FileCache/Makefile
+++ b/www/p5-Catalyst-Plugin-Cache-FileCache/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Plugin-Cache-FileCache
 PORTVERSION=	0.5
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/www/p5-Catalyst-Plugin-Cache-Memcached/Makefile b/www/p5-Catalyst-Plugin-Cache-Memcached/Makefile
index 513f861fe750..7f266a509975 100644
--- a/www/p5-Catalyst-Plugin-Cache-Memcached/Makefile
+++ b/www/p5-Catalyst-Plugin-Cache-Memcached/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Plugin-Cache-Memcached
 PORTVERSION=	0.6
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/www/p5-Catalyst-Plugin-Cache-Store-FastMmap/Makefile b/www/p5-Catalyst-Plugin-Cache-Store-FastMmap/Makefile
index d6b5c91a20f8..265c7c0d2253 100644
--- a/www/p5-Catalyst-Plugin-Cache-Store-FastMmap/Makefile
+++ b/www/p5-Catalyst-Plugin-Cache-Store-FastMmap/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Plugin-Cache-Store-FastMmap
 PORTVERSION=	0.02
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/www/p5-Catalyst-Plugin-Cache/Makefile b/www/p5-Catalyst-Plugin-Cache/Makefile
index 2896691d559c..8bbce468e46a 100644
--- a/www/p5-Catalyst-Plugin-Cache/Makefile
+++ b/www/p5-Catalyst-Plugin-Cache/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Plugin-Cache
 PORTVERSION=	0.05
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/www/p5-Catalyst-Plugin-Captcha/Makefile b/www/p5-Catalyst-Plugin-Captcha/Makefile
index e450df11374f..bc152c3e608f 100644
--- a/www/p5-Catalyst-Plugin-Captcha/Makefile
+++ b/www/p5-Catalyst-Plugin-Captcha/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Plugin-Captcha
 PORTVERSION=	0.03
 CATEGORIES=	www security perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/www/p5-Catalyst-Plugin-DefaultEnd/Makefile b/www/p5-Catalyst-Plugin-DefaultEnd/Makefile
index c8864ca1f6de..88f15faabcf8 100644
--- a/www/p5-Catalyst-Plugin-DefaultEnd/Makefile
+++ b/www/p5-Catalyst-Plugin-DefaultEnd/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Catalyst-Plugin-DefaultEnd
 PORTVERSION=	0.06
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/M/MR/MRAMBERG
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Catalyst-Plugin-FormValidator-Simple/Makefile b/www/p5-Catalyst-Plugin-FormValidator-Simple/Makefile
index b403cf92cf1b..4713975e3a54 100644
--- a/www/p5-Catalyst-Plugin-FormValidator-Simple/Makefile
+++ b/www/p5-Catalyst-Plugin-FormValidator-Simple/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Catalyst-Plugin-FormValidator-Simple
 PORTVERSION=	0.12
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/L/LY/LYOKATO
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Catalyst-Plugin-FormValidator/Makefile b/www/p5-Catalyst-Plugin-FormValidator/Makefile
index 2f8358b21d44..1e83f126f72f 100644
--- a/www/p5-Catalyst-Plugin-FormValidator/Makefile
+++ b/www/p5-Catalyst-Plugin-FormValidator/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Catalyst-Plugin-FormValidator
 PORTVERSION=	0.02
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/M/MR/MRAMBERG
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Catalyst-Plugin-HTML-Widget/Makefile b/www/p5-Catalyst-Plugin-HTML-Widget/Makefile
index 5812775e94ce..b50a990fedf7 100644
--- a/www/p5-Catalyst-Plugin-HTML-Widget/Makefile
+++ b/www/p5-Catalyst-Plugin-HTML-Widget/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Catalyst-Plugin-HTML-Widget
 PORTVERSION=	1.1
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/S/SR/SRI
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Catalyst-Plugin-LogWarnings/Makefile b/www/p5-Catalyst-Plugin-LogWarnings/Makefile
index f2ee7fbc2ff7..761926c21e53 100644
--- a/www/p5-Catalyst-Plugin-LogWarnings/Makefile
+++ b/www/p5-Catalyst-Plugin-LogWarnings/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Plugin-LogWarnings
 PORTVERSION=	0.02
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/www/p5-Catalyst-Plugin-Params-Nested/Makefile b/www/p5-Catalyst-Plugin-Params-Nested/Makefile
index 8688753c3cff..8383c3fd05c1 100644
--- a/www/p5-Catalyst-Plugin-Params-Nested/Makefile
+++ b/www/p5-Catalyst-Plugin-Params-Nested/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Plugin-Params-Nested
 PORTVERSION=	0.02
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	fernan@iib.unsam.edu.ar
diff --git a/www/p5-Catalyst-Plugin-Pluggable/Makefile b/www/p5-Catalyst-Plugin-Pluggable/Makefile
index 79053df06399..47e70768dc05 100644
--- a/www/p5-Catalyst-Plugin-Pluggable/Makefile
+++ b/www/p5-Catalyst-Plugin-Pluggable/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Catalyst-Plugin-Pluggable
 PORTVERSION=	0.04
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/S/SR/SRI
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Catalyst-Plugin-Prototype/Makefile b/www/p5-Catalyst-Plugin-Prototype/Makefile
index 4379d7d90cc8..dbedd474886a 100644
--- a/www/p5-Catalyst-Plugin-Prototype/Makefile
+++ b/www/p5-Catalyst-Plugin-Prototype/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Catalyst-Plugin-Prototype
 PORTVERSION=	1.33
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/M/MR/MRAMBERG
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Catalyst-Plugin-Server/Makefile b/www/p5-Catalyst-Plugin-Server/Makefile
index bcb2d5ad334f..3933aa8e7a88 100644
--- a/www/p5-Catalyst-Plugin-Server/Makefile
+++ b/www/p5-Catalyst-Plugin-Server/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Plugin-Server
 PORTVERSION=	0.24
 CATEGORIES=	www devel
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile b/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile
index e5771385aba3..4534a800308b 100644
--- a/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Catalyst-Plugin-Session-FastMmap
 PORTVERSION=	0.12
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/M/MR/MRAMBERG
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Catalyst-Plugin-Session-State-URI/Makefile b/www/p5-Catalyst-Plugin-Session-State-URI/Makefile
index 53015af0ce3d..17f8eb2158ab 100644
--- a/www/p5-Catalyst-Plugin-Session-State-URI/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-State-URI/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Plugin-Session-State-URI
 PORTVERSION=	0.07
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile b/www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile
index 0aa3b2706393..31c8c98ffc95 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Plugin-Session-Store-DBIC
 PORTVERSION=	0.06
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	fernan@iib.unsam.edu.ar
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile b/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
index d3d6df30caed..00885235432d 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Plugin-Session-Store-Delegate
 PORTVERSION=	0.02
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	fernan@iib.unsam.edu.ar
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Memcached/Makefile b/www/p5-Catalyst-Plugin-Session-Store-Memcached/Makefile
index a643a672b0ff..72e4e724a3c4 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Memcached/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-Memcached/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Plugin-Session-Store-Memcached
 PORTVERSION=	0.02
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/www/p5-Catalyst-Plugin-Setenv/Makefile b/www/p5-Catalyst-Plugin-Setenv/Makefile
index f81de79078a5..c303608ff296 100644
--- a/www/p5-Catalyst-Plugin-Setenv/Makefile
+++ b/www/p5-Catalyst-Plugin-Setenv/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-Plugin-Setenv
 PORTVERSION=	0.02
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/www/p5-Catalyst-Plugin-Singleton/Makefile b/www/p5-Catalyst-Plugin-Singleton/Makefile
index 9ecaf24fa381..bd836740b53f 100644
--- a/www/p5-Catalyst-Plugin-Singleton/Makefile
+++ b/www/p5-Catalyst-Plugin-Singleton/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Catalyst-Plugin-Singleton
 PORTVERSION=	0.02
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/M/MR/MRAMBERG
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Catalyst-Plugin-Static/Makefile b/www/p5-Catalyst-Plugin-Static/Makefile
index 98322d3b222f..e3ccd3e2ff9c 100644
--- a/www/p5-Catalyst-Plugin-Static/Makefile
+++ b/www/p5-Catalyst-Plugin-Static/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Catalyst-Plugin-Static
 PORTVERSION=	0.10
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/M/MR/MRAMBERG
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Catalyst-Plugin-Textile/Makefile b/www/p5-Catalyst-Plugin-Textile/Makefile
index c6d62b12d6b2..68d6271d39ab 100644
--- a/www/p5-Catalyst-Plugin-Textile/Makefile
+++ b/www/p5-Catalyst-Plugin-Textile/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	Catalyst-Plugin-Textile
 PORTVERSION=	0.01
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/S/SR/SRI
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Catalyst-Plugin-XMLRPC/Makefile b/www/p5-Catalyst-Plugin-XMLRPC/Makefile
index 0d2ff587e637..b994165164c2 100644
--- a/www/p5-Catalyst-Plugin-XMLRPC/Makefile
+++ b/www/p5-Catalyst-Plugin-XMLRPC/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Catalyst-Plugin-XMLRPC
 PORTVERSION=	1.0
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/S/SR/SRI
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Catalyst-View-ClearSilver/Makefile b/www/p5-Catalyst-View-ClearSilver/Makefile
index 254d3a10dca3..7c43579f0cf2 100644
--- a/www/p5-Catalyst-View-ClearSilver/Makefile
+++ b/www/p5-Catalyst-View-ClearSilver/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Catalyst-View-ClearSilver
 PORTVERSION=	0.02
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/J/JR/JROCKWAY
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Catalyst-View-GraphViz/Makefile b/www/p5-Catalyst-View-GraphViz/Makefile
index 5541a4b29fef..2d6d411a8405 100644
--- a/www/p5-Catalyst-View-GraphViz/Makefile
+++ b/www/p5-Catalyst-View-GraphViz/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Catalyst-View-GraphViz
 PORTVERSION=	0.05
 PORTREVISION=	1
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER= hideo@lastamericanempire.com
diff --git a/www/p5-Catalyst-View-HTML-Template-Compiled/Makefile b/www/p5-Catalyst-View-HTML-Template-Compiled/Makefile
index 66a15d2e600c..bb1e1378bccc 100644
--- a/www/p5-Catalyst-View-HTML-Template-Compiled/Makefile
+++ b/www/p5-Catalyst-View-HTML-Template-Compiled/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-View-HTML-Template-Compiled
 PORTVERSION=	0.16
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst/ESSKAR
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hideo@lastamericanempire.com
diff --git a/www/p5-Catalyst-View-TT-ControllerLocal/Makefile b/www/p5-Catalyst-View-TT-ControllerLocal/Makefile
index 089acb33c55b..ee15b8a69d12 100644
--- a/www/p5-Catalyst-View-TT-ControllerLocal/Makefile
+++ b/www/p5-Catalyst-View-TT-ControllerLocal/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Catalyst-View-TT-ControllerLocal
 PORTVERSION=	0.02
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Catalyst
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/www/p5-Catalyst-View-Templated/Makefile b/www/p5-Catalyst-View-Templated/Makefile
index 1fdb8574bdaa..4f90a476516d 100644
--- a/www/p5-Catalyst-View-Templated/Makefile
+++ b/www/p5-Catalyst-View-Templated/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Catalyst-View-Templated
 PORTVERSION=	0.02
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/J/JR/JROCKWAY
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Catalyst-View-XSLT/Makefile b/www/p5-Catalyst-View-XSLT/Makefile
index 640ecfc0c7e3..aca9de9ca723 100644
--- a/www/p5-Catalyst-View-XSLT/Makefile
+++ b/www/p5-Catalyst-View-XSLT/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Catalyst-View-XSLT
 PORTVERSION=	0.04
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/M/MA/MARTING
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Class-DBI-FromForm/Makefile b/www/p5-Class-DBI-FromForm/Makefile
index 7aab4e898756..18041987ec9c 100644
--- a/www/p5-Class-DBI-FromForm/Makefile
+++ b/www/p5-Class-DBI-FromForm/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Class-DBI-FromForm
 PORTVERSION=	0.04
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/M/MR/MRAMBERG
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Compress-LeadingBlankSpaces/Makefile b/www/p5-Compress-LeadingBlankSpaces/Makefile
index 018372fd0e2c..906bad13d8a2 100644
--- a/www/p5-Compress-LeadingBlankSpaces/Makefile
+++ b/www/p5-Compress-LeadingBlankSpaces/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Compress-LeadingBlankSpaces
 PORTVERSION=	0.06
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Compress
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/p5-Data-TreeDumper-Renderer-DHTML/Makefile b/www/p5-Data-TreeDumper-Renderer-DHTML/Makefile
index cc7dc78fdb4b..d7af576ce212 100644
--- a/www/p5-Data-TreeDumper-Renderer-DHTML/Makefile
+++ b/www/p5-Data-TreeDumper-Renderer-DHTML/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Data-TreeDumper-Renderer-DHTML
 PORTVERSION=	0.07
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Data
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hideo@lastamericanempire.com
diff --git a/www/p5-FAQ-OMatic/Makefile b/www/p5-FAQ-OMatic/Makefile
index c546e9ee40f1..4ddac0e7195d 100644
--- a/www/p5-FAQ-OMatic/Makefile
+++ b/www/p5-FAQ-OMatic/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	FAQ-OMatic
 PORTVERSION=	2.719
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	FAQ
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/p5-FEAR-API/Makefile b/www/p5-FEAR-API/Makefile
index b2c4f49994bd..bea880c46dd3 100644
--- a/www/p5-FEAR-API/Makefile
+++ b/www/p5-FEAR-API/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	FEAR-API
 PORTVERSION=	0.489
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/X/XE/XERN
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-FastCGI/Makefile b/www/p5-FastCGI/Makefile
index 7c45a8bbcee7..156a6f9a9367 100644
--- a/www/p5-FastCGI/Makefile
+++ b/www/p5-FastCGI/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	FastCGI
 PORTVERSION=	0.67
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	FCGI
 PKGNAMEPREFIX=	p5-
 DISTNAME=	FCGI-${PORTVERSION}
diff --git a/www/p5-Feed-Find/Makefile b/www/p5-Feed-Find/Makefile
index 96d8c05cc353..2775bbcb4d94 100644
--- a/www/p5-Feed-Find/Makefile
+++ b/www/p5-Feed-Find/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Feed-Find
 PORTVERSION=	0.06
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/B/BT/BTROTT
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Flickr-API/Makefile b/www/p5-Flickr-API/Makefile
index 27faffcc5540..8e89c2170fbb 100644
--- a/www/p5-Flickr-API/Makefile
+++ b/www/p5-Flickr-API/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	Flickr-API
 PORTVERSION=	0.09
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Flickr
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-Geo-Caching/Makefile b/www/p5-Geo-Caching/Makefile
index e2610a26ec11..4684fd3af0e6 100644
--- a/www/p5-Geo-Caching/Makefile
+++ b/www/p5-Geo-Caching/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Geo-Caching
 PORTVERSION=	0.11
 CATEGORIES=	www perl5 geography
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Geo
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/www/p5-HTML-CalendarMonthSimple/Makefile b/www/p5-HTML-CalendarMonthSimple/Makefile
index ebd0236c538d..84e11e17ff52 100644
--- a/www/p5-HTML-CalendarMonthSimple/Makefile
+++ b/www/p5-HTML-CalendarMonthSimple/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-CalendarMonthSimple
 PORTVERSION=	1.25
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/www/p5-HTML-Chunks/Makefile b/www/p5-HTML-Chunks/Makefile
index de4d5da4d562..d6c4abd28560 100644
--- a/www/p5-HTML-Chunks/Makefile
+++ b/www/p5-HTML-Chunks/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-Chunks
 PORTVERSION=	1.53
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	fbsd@meersau.de
diff --git a/www/p5-HTML-Clean/Makefile b/www/p5-HTML-Clean/Makefile
index 645cb4544fd0..1628ccba0af0 100644
--- a/www/p5-HTML-Clean/Makefile
+++ b/www/p5-HTML-Clean/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-Clean
 PORTVERSION=	0.8
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/p5-HTML-Diff/Makefile b/www/p5-HTML-Diff/Makefile
index d88781b9d868..b73ac52adb9a 100644
--- a/www/p5-HTML-Diff/Makefile
+++ b/www/p5-HTML-Diff/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-Diff
 PORTVERSION=	0.561
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hcoyote@ghostar.org
diff --git a/www/p5-HTML-Display/Makefile b/www/p5-HTML-Display/Makefile
index d252f288f3cf..94eaa1ab7869 100644
--- a/www/p5-HTML-Display/Makefile
+++ b/www/p5-HTML-Display/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-Display
 PORTVERSION=	0.39
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	rafan@FreeBSD.org
diff --git a/www/p5-HTML-Element-Extended/Makefile b/www/p5-HTML-Element-Extended/Makefile
index 14bfb7a1ce75..281a7d985835 100644
--- a/www/p5-HTML-Element-Extended/Makefile
+++ b/www/p5-HTML-Element-Extended/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-Element-Extended
 PORTVERSION=	1.17
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/p5-HTML-Element-Library/Makefile b/www/p5-HTML-Element-Library/Makefile
index 83dbe00f6937..7198cdfb51a4 100644
--- a/www/p5-HTML-Element-Library/Makefile
+++ b/www/p5-HTML-Element-Library/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-Element-Library
 PORTVERSION=	3.51
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chinsan@FreeBSD.org
diff --git a/www/p5-HTML-Embperl/Makefile b/www/p5-HTML-Embperl/Makefile
index 18de38175340..6f3ad12b2810 100644
--- a/www/p5-HTML-Embperl/Makefile
+++ b/www/p5-HTML-Embperl/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	HTML-Embperl
 PORTVERSION=	1.3.6
 PORTREVISION=	2
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-HTML-FillInForm-ForceUTF8/Makefile b/www/p5-HTML-FillInForm-ForceUTF8/Makefile
index a1ea06708045..03b0ffa1cab8 100644
--- a/www/p5-HTML-FillInForm-ForceUTF8/Makefile
+++ b/www/p5-HTML-FillInForm-ForceUTF8/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-FillInForm-ForceUTF8
 PORTVERSION=	0.02
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	cherry@trombik.org
diff --git a/www/p5-HTML-FillInForm/Makefile b/www/p5-HTML-FillInForm/Makefile
index ce6509de7ae9..02418b90b26f 100644
--- a/www/p5-HTML-FillInForm/Makefile
+++ b/www/p5-HTML-FillInForm/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-FillInForm
 PORTVERSION=	2.00
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/www/p5-HTML-FormFu/Makefile b/www/p5-HTML-FormFu/Makefile
index 25131f33f993..e9a2c0db657f 100644
--- a/www/p5-HTML-FormFu/Makefile
+++ b/www/p5-HTML-FormFu/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	HTML-FormFu
 PORTVERSION=	0.02004
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/C/CF/CFRANKS
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-HTML-FromText/Makefile b/www/p5-HTML-FromText/Makefile
index c7a3d9b23195..1b162bfc4d6e 100644
--- a/www/p5-HTML-FromText/Makefile
+++ b/www/p5-HTML-FromText/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=		HTML-FromText
 PORTVERSION=		2.05
 CATEGORIES=		www perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=		CPAN
 PKGNAMEPREFIX=		p5-
 
 MAINTAINER=		ports@FreeBSD.org
diff --git a/www/p5-HTML-LinkExtractor/Makefile b/www/p5-HTML-LinkExtractor/Makefile
index 4c0be1ab26ba..5f2cb37565eb 100644
--- a/www/p5-HTML-LinkExtractor/Makefile
+++ b/www/p5-HTML-LinkExtractor/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-LinkExtractor
 PORTVERSION=	0.130
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-0.13
 
diff --git a/www/p5-HTML-Lint/Makefile b/www/p5-HTML-Lint/Makefile
index 853298a45a37..ee9c8254b4b0 100644
--- a/www/p5-HTML-Lint/Makefile
+++ b/www/p5-HTML-Lint/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-Lint
 PORTVERSION=	2.02
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/www/p5-HTML-Location/Makefile b/www/p5-HTML-Location/Makefile
index b61a8cadd755..ee0d3f02fd58 100644
--- a/www/p5-HTML-Location/Makefile
+++ b/www/p5-HTML-Location/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-Location
 PORTVERSION=	1.01
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	coryking@mozimedia.com
diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index c986953b498a..6203643afe64 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-Mason
 PORTVERSION=	1.35
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dsh@vlink.ru
diff --git a/www/p5-HTML-Pager/Makefile b/www/p5-HTML-Pager/Makefile
index e85628be1ee2..82df22fc1f53 100644
--- a/www/p5-HTML-Pager/Makefile
+++ b/www/p5-HTML-Pager/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-Pager
 PORTVERSION=	0.03
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/p5-HTML-PrettyPrinter/Makefile b/www/p5-HTML-PrettyPrinter/Makefile
index 9bf86c22fa33..dcb82ad9e48f 100644
--- a/www/p5-HTML-PrettyPrinter/Makefile
+++ b/www/p5-HTML-PrettyPrinter/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-PrettyPrinter
 PORTVERSION=	0.03
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vivek@khera.org
diff --git a/www/p5-HTML-Prototype/Makefile b/www/p5-HTML-Prototype/Makefile
index f96bad3a468a..edd31ab953b6 100644
--- a/www/p5-HTML-Prototype/Makefile
+++ b/www/p5-HTML-Prototype/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-Prototype
 PORTVERSION=	1.48
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/www/p5-HTML-QuickCheck/Makefile b/www/p5-HTML-QuickCheck/Makefile
index 2eb747ad276c..c88209fa73c3 100644
--- a/www/p5-HTML-QuickCheck/Makefile
+++ b/www/p5-HTML-QuickCheck/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-QuickCheck
 PORTVERSION=	1.0b1
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/p5-HTML-RSSAutodiscovery/Makefile b/www/p5-HTML-RSSAutodiscovery/Makefile
index 2e1699575a8b..8b94938b248a 100644
--- a/www/p5-HTML-RSSAutodiscovery/Makefile
+++ b/www/p5-HTML-RSSAutodiscovery/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-RSSAutodiscovery
 PORTVERSION=	1.21
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
diff --git a/www/p5-HTML-ResolveLink/Makefile b/www/p5-HTML-ResolveLink/Makefile
index 8235649d00c7..ff8638019eae 100644
--- a/www/p5-HTML-ResolveLink/Makefile
+++ b/www/p5-HTML-ResolveLink/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-ResolveLink
 PORTVERSION=	0.05
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-HTML-RobotsMETA/Makefile b/www/p5-HTML-RobotsMETA/Makefile
index dd0bcf6aa0cb..b8f5c32271bb 100644
--- a/www/p5-HTML-RobotsMETA/Makefile
+++ b/www/p5-HTML-RobotsMETA/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	HTML-RobotsMETA
 PORTVERSION=	0.00004
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/D/DM/DMAKI
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-HTML-Scrubber/Makefile b/www/p5-HTML-Scrubber/Makefile
index 3d41f3d729db..a182f11972f7 100644
--- a/www/p5-HTML-Scrubber/Makefile
+++ b/www/p5-HTML-Scrubber/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-Scrubber
 PORTVERSION=	0.08
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/p5-HTML-SimpleLinkExtor/Makefile b/www/p5-HTML-SimpleLinkExtor/Makefile
index be236bf1e22f..a3d52fac303f 100644
--- a/www/p5-HTML-SimpleLinkExtor/Makefile
+++ b/www/p5-HTML-SimpleLinkExtor/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-SimpleLinkExtor
 PORTVERSION=	1.19
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-HTML-SimpleParse/Makefile b/www/p5-HTML-SimpleParse/Makefile
index 4ee3ca3bfe3d..3020c5ac79f1 100644
--- a/www/p5-HTML-SimpleParse/Makefile
+++ b/www/p5-HTML-SimpleParse/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-SimpleParse
 PORTVERSION=	0.12
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/p5-HTML-StickyQuery/Makefile b/www/p5-HTML-StickyQuery/Makefile
index fc6228bbb0fe..a530a3afdccf 100644
--- a/www/p5-HTML-StickyQuery/Makefile
+++ b/www/p5-HTML-StickyQuery/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-StickyQuery
 PORTVERSION=	0.12
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-HTML-Stream/Makefile b/www/p5-HTML-Stream/Makefile
index 9565b51844d6..e88e8f67c937 100644
--- a/www/p5-HTML-Stream/Makefile
+++ b/www/p5-HTML-Stream/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-Stream
 PORTVERSION=	1.55
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/www/p5-HTML-Strip/Makefile b/www/p5-HTML-Strip/Makefile
index cef6630e0b2b..b1e8bff359c5 100644
--- a/www/p5-HTML-Strip/Makefile
+++ b/www/p5-HTML-Strip/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-Strip
 PORTVERSION=	1.06
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-HTML-Summary/Makefile b/www/p5-HTML-Summary/Makefile
index b6572dfd34fd..047b7ccc9aef 100644
--- a/www/p5-HTML-Summary/Makefile
+++ b/www/p5-HTML-Summary/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-Summary
 PORTVERSION=	0.017
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
diff --git a/www/p5-HTML-TableExtract/Makefile b/www/p5-HTML-TableExtract/Makefile
index f00719366d0d..c84e129b7b4b 100644
--- a/www/p5-HTML-TableExtract/Makefile
+++ b/www/p5-HTML-TableExtract/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-TableExtract
 PORTVERSION=	2.10
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-HTML-TableLayout/Makefile b/www/p5-HTML-TableLayout/Makefile
index 208d6e00daf0..1c3925110587 100644
--- a/www/p5-HTML-TableLayout/Makefile
+++ b/www/p5-HTML-TableLayout/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-TableLayout
 PORTVERSION=	1.001008
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
diff --git a/www/p5-HTML-TableTiler/Makefile b/www/p5-HTML-TableTiler/Makefile
index dcc5b4cb53b7..b6ccd491c894 100644
--- a/www/p5-HTML-TableTiler/Makefile
+++ b/www/p5-HTML-TableTiler/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-TableTiler
 PORTVERSION=	1.21
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/www/p5-HTML-TagCloud-Extended/Makefile b/www/p5-HTML-TagCloud-Extended/Makefile
index a563501a216b..4f8f12f8d334 100644
--- a/www/p5-HTML-TagCloud-Extended/Makefile
+++ b/www/p5-HTML-TagCloud-Extended/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-TagCloud-Extended
 PORTVERSION=	0.10
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-HTML-TagCloud/Makefile b/www/p5-HTML-TagCloud/Makefile
index e7530edee327..2575dc85eb61 100644
--- a/www/p5-HTML-TagCloud/Makefile
+++ b/www/p5-HTML-TagCloud/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-TagCloud
 PORTVERSION=	0.34
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/www/p5-HTML-TagParser/Makefile b/www/p5-HTML-TagParser/Makefile
index 7e14b27feea9..2367576c8e27 100644
--- a/www/p5-HTML-TagParser/Makefile
+++ b/www/p5-HTML-TagParser/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-TagParser
 PORTVERSION=	0.16
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-HTML-Tagset/Makefile b/www/p5-HTML-Tagset/Makefile
index 0f71cbb3603c..7d0aa9398c73 100644
--- a/www/p5-HTML-Tagset/Makefile
+++ b/www/p5-HTML-Tagset/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-Tagset
 PORTVERSION=	3.20
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-HTML-Template-Associate/Makefile b/www/p5-HTML-Template-Associate/Makefile
index d49bb8c44b5c..bc7fe5cae894 100644
--- a/www/p5-HTML-Template-Associate/Makefile
+++ b/www/p5-HTML-Template-Associate/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	HTML-Template-Associate
 PORTVERSION=	1.19
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/A/AL/ALEXP
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-HTML-Template-Compiled/Makefile b/www/p5-HTML-Template-Compiled/Makefile
index 3695219a95a8..c4cef58d2222 100644
--- a/www/p5-HTML-Template-Compiled/Makefile
+++ b/www/p5-HTML-Template-Compiled/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-Template-Compiled
 PORTVERSION=	0.91
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hideo@lastamericanempire.com
diff --git a/www/p5-HTML-Template-Expr/Makefile b/www/p5-HTML-Template-Expr/Makefile
index 982c76306d04..7478e1dd0a8c 100644
--- a/www/p5-HTML-Template-Expr/Makefile
+++ b/www/p5-HTML-Template-Expr/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-Template-Expr
 PORTVERSION=	0.07
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-HTML-Template-HashWrapper/Makefile b/www/p5-HTML-Template-HashWrapper/Makefile
index 113d7031d2cc..5fd3523f0a90 100644
--- a/www/p5-HTML-Template-HashWrapper/Makefile
+++ b/www/p5-HTML-Template-HashWrapper/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-Template-HashWrapper
 PORTVERSION=	1.3
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hideo@lastamericanempire.com
diff --git a/www/p5-HTML-Template/Makefile b/www/p5-HTML-Template/Makefile
index 21cc78c3628e..8483284d077f 100644
--- a/www/p5-HTML-Template/Makefile
+++ b/www/p5-HTML-Template/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-Template
 PORTVERSION=	2.9
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/www/p5-HTML-TokeParser-Simple/Makefile b/www/p5-HTML-TokeParser-Simple/Makefile
index 1912ce9861b1..4086522768f6 100644
--- a/www/p5-HTML-TokeParser-Simple/Makefile
+++ b/www/p5-HTML-TokeParser-Simple/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-TokeParser-Simple
 PORTVERSION=	3.15
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/www/p5-HTML-Tree/Makefile b/www/p5-HTML-Tree/Makefile
index c077e5b7bf40..1868ccb60c5c 100644
--- a/www/p5-HTML-Tree/Makefile
+++ b/www/p5-HTML-Tree/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-Tree
 PORTVERSION=	3.23
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/www/p5-HTML-TreeBuilder-XPath/Makefile b/www/p5-HTML-TreeBuilder-XPath/Makefile
index 7d778ba79082..9bd21edcd354 100644
--- a/www/p5-HTML-TreeBuilder-XPath/Makefile
+++ b/www/p5-HTML-TreeBuilder-XPath/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-TreeBuilder-XPath
 PORTVERSION=	0.09
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-HTML-Widget-DBIC/Makefile b/www/p5-HTML-Widget-DBIC/Makefile
index cdf443b505e3..d20926c82b4c 100644
--- a/www/p5-HTML-Widget-DBIC/Makefile
+++ b/www/p5-HTML-Widget-DBIC/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-Widget-DBIC
 PORTVERSION=	0.03
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/www/p5-HTML-Widget/Makefile b/www/p5-HTML-Widget/Makefile
index 5b65f72f7d8f..ff18e7998d92 100644
--- a/www/p5-HTML-Widget/Makefile
+++ b/www/p5-HTML-Widget/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	HTML-Widget
 PORTVERSION=	1.11
 PORTREVISION=	1
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/www/p5-HTML-Widgets-SelectLayers/Makefile b/www/p5-HTML-Widgets-SelectLayers/Makefile
index d22510b8add3..1c2c02142fcd 100644
--- a/www/p5-HTML-Widgets-SelectLayers/Makefile
+++ b/www/p5-HTML-Widgets-SelectLayers/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-Widgets-SelectLayers
 PORTVERSION=	0.07
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-HTML-WikiConverter-DokuWiki/Makefile b/www/p5-HTML-WikiConverter-DokuWiki/Makefile
index 84a5b8f253ec..2c0b189390f3 100644
--- a/www/p5-HTML-WikiConverter-DokuWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-DokuWiki/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-WikiConverter-DokuWiki
 PORTVERSION=	0.53
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chinsan@FreeBSD.org
diff --git a/www/p5-HTML-WikiConverter-Markdown/Makefile b/www/p5-HTML-WikiConverter-Markdown/Makefile
index 57d73dbacc84..6533b83bde11 100644
--- a/www/p5-HTML-WikiConverter-Markdown/Makefile
+++ b/www/p5-HTML-WikiConverter-Markdown/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-WikiConverter-Markdown
 PORTVERSION=	0.02
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chinsan@FreeBSD.org
diff --git a/www/p5-HTML-WikiConverter-MediaWiki/Makefile b/www/p5-HTML-WikiConverter-MediaWiki/Makefile
index 4c1f70fad8e3..86c248c70762 100644
--- a/www/p5-HTML-WikiConverter-MediaWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-MediaWiki/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-WikiConverter-MediaWiki
 PORTVERSION=	0.55
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chinsan@FreeBSD.org
diff --git a/www/p5-HTML-WikiConverter-MoinMoin/Makefile b/www/p5-HTML-WikiConverter-MoinMoin/Makefile
index 43605bfadf23..3cad9c8ffabd 100644
--- a/www/p5-HTML-WikiConverter-MoinMoin/Makefile
+++ b/www/p5-HTML-WikiConverter-MoinMoin/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-WikiConverter-MoinMoin
 PORTVERSION=	0.53
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chinsan@FreeBSD.org
diff --git a/www/p5-HTML-WikiConverter-Oddmuse/Makefile b/www/p5-HTML-WikiConverter-Oddmuse/Makefile
index 744149f495b3..fff0a1f84e5e 100644
--- a/www/p5-HTML-WikiConverter-Oddmuse/Makefile
+++ b/www/p5-HTML-WikiConverter-Oddmuse/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-WikiConverter-Oddmuse
 PORTVERSION=	0.52
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chinsan@FreeBSD.org
diff --git a/www/p5-HTML-WikiConverter-PbWiki/Makefile b/www/p5-HTML-WikiConverter-PbWiki/Makefile
index 4b93a91261f3..0c18f551c9ca 100644
--- a/www/p5-HTML-WikiConverter-PbWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-PbWiki/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-WikiConverter-PbWiki
 PORTVERSION=	0.01
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chinsan@FreeBSD.org
diff --git a/www/p5-HTML-WikiConverter-PhpWiki/Makefile b/www/p5-HTML-WikiConverter-PhpWiki/Makefile
index bb3d5c68cf98..5ca28dbe8085 100644
--- a/www/p5-HTML-WikiConverter-PhpWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-PhpWiki/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-WikiConverter-PhpWiki
 PORTVERSION=	0.51
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chinsan@FreeBSD.org
diff --git a/www/p5-HTML-WikiConverter-PmWiki/Makefile b/www/p5-HTML-WikiConverter-PmWiki/Makefile
index 0e89b0dabe2a..4bdc1e5b55f0 100644
--- a/www/p5-HTML-WikiConverter-PmWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-PmWiki/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-WikiConverter-PmWiki
 PORTVERSION=	0.51
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chinsan@FreeBSD.org
diff --git a/www/p5-HTML-WikiConverter-SnipSnap/Makefile b/www/p5-HTML-WikiConverter-SnipSnap/Makefile
index ff1fea1efefd..269bdb51ae95 100644
--- a/www/p5-HTML-WikiConverter-SnipSnap/Makefile
+++ b/www/p5-HTML-WikiConverter-SnipSnap/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-WikiConverter-SnipSnap
 PORTVERSION=	0.50
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chinsan@FreeBSD.org
diff --git a/www/p5-HTML-WikiConverter-Socialtext/Makefile b/www/p5-HTML-WikiConverter-Socialtext/Makefile
index 3ba3777d942c..f6d2becfd883 100644
--- a/www/p5-HTML-WikiConverter-Socialtext/Makefile
+++ b/www/p5-HTML-WikiConverter-Socialtext/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-WikiConverter-Socialtext
 PORTVERSION=	0.03
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chinsan@FreeBSD.org
diff --git a/www/p5-HTML-WikiConverter-TikiWiki/Makefile b/www/p5-HTML-WikiConverter-TikiWiki/Makefile
index 266a2e81e52b..30103e74380d 100644
--- a/www/p5-HTML-WikiConverter-TikiWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-TikiWiki/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-WikiConverter-TikiWiki
 PORTVERSION=	0.50
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chinsan@FreeBSD.org
diff --git a/www/p5-HTML-WikiConverter-UseMod/Makefile b/www/p5-HTML-WikiConverter-UseMod/Makefile
index 0fa7ff08238b..9d2cc2349538 100644
--- a/www/p5-HTML-WikiConverter-UseMod/Makefile
+++ b/www/p5-HTML-WikiConverter-UseMod/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-WikiConverter-UseMod
 PORTVERSION=	0.50
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chinsan@FreeBSD.org
diff --git a/www/p5-HTML-WikiConverter-WakkaWiki/Makefile b/www/p5-HTML-WikiConverter-WakkaWiki/Makefile
index 4710e870c426..2021d5652dd4 100644
--- a/www/p5-HTML-WikiConverter-WakkaWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-WakkaWiki/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-WikiConverter-WakkaWiki
 PORTVERSION=	0.50
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chinsan@FreeBSD.org
diff --git a/www/p5-HTML-WikiConverter-WikkaWiki/Makefile b/www/p5-HTML-WikiConverter-WikkaWiki/Makefile
index bf5f676d033c..407300a38238 100644
--- a/www/p5-HTML-WikiConverter-WikkaWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-WikkaWiki/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-WikiConverter-WikkaWiki
 PORTVERSION=	0.50
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chinsan@FreeBSD.org
diff --git a/www/p5-HTML-WikiConverter/Makefile b/www/p5-HTML-WikiConverter/Makefile
index 3838e1837f50..70d8584ed32f 100644
--- a/www/p5-HTML-WikiConverter/Makefile
+++ b/www/p5-HTML-WikiConverter/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-WikiConverter
 PORTVERSION=	0.61
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chinsan@FreeBSD.org
diff --git a/www/p5-HTTP-BrowserDetect/Makefile b/www/p5-HTTP-BrowserDetect/Makefile
index acd900cfba10..481cac92b299 100644
--- a/www/p5-HTTP-BrowserDetect/Makefile
+++ b/www/p5-HTTP-BrowserDetect/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	HTTP-BrowserDetect
 PORTVERSION=	0.99
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/W/WA/WALSHAM
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-HTTP-Cache-Transparent/Makefile b/www/p5-HTTP-Cache-Transparent/Makefile
index a91211dbd079..890a01e46c16 100644
--- a/www/p5-HTTP-Cache-Transparent/Makefile
+++ b/www/p5-HTTP-Cache-Transparent/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTTP-Cache-Transparent
 PORTVERSION=	1.0
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTTP
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ahze@FreeBSD.org
diff --git a/www/p5-HTTP-Cookies-Mozilla/Makefile b/www/p5-HTTP-Cookies-Mozilla/Makefile
index f4025d07538d..617eb24aa8dd 100644
--- a/www/p5-HTTP-Cookies-Mozilla/Makefile
+++ b/www/p5-HTTP-Cookies-Mozilla/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTTP-Cookies-Mozilla
 PORTVERSION=	1.13
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTTP
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-HTTP-Cookies-iCab/Makefile b/www/p5-HTTP-Cookies-iCab/Makefile
index fd737640fc1b..351317ab1a8d 100644
--- a/www/p5-HTTP-Cookies-iCab/Makefile
+++ b/www/p5-HTTP-Cookies-iCab/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTTP-Cookies-iCab
 PORTVERSION=	1.09
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTTP
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-HTTP-Cookies-w3m/Makefile b/www/p5-HTTP-Cookies-w3m/Makefile
index 61d66379c8fa..a28b60ad2490 100644
--- a/www/p5-HTTP-Cookies-w3m/Makefile
+++ b/www/p5-HTTP-Cookies-w3m/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTTP-Cookies-w3m
 PORTVERSION=	0.01
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTTP
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	markun@onohara.to
diff --git a/www/p5-HTTP-DAV/Makefile b/www/p5-HTTP-DAV/Makefile
index eeb4f379611b..96fbb1904027 100644
--- a/www/p5-HTTP-DAV/Makefile
+++ b/www/p5-HTTP-DAV/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTTP-DAV
 PORTVERSION=	0.31
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTTP
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/www/p5-HTTP-GHTTP/Makefile b/www/p5-HTTP-GHTTP/Makefile
index b959eef7db1b..80d4eaa613cb 100644
--- a/www/p5-HTTP-GHTTP/Makefile
+++ b/www/p5-HTTP-GHTTP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTTP-GHTTP
 PORTVERSION=	1.07
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTTP
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/www/p5-HTTP-Lite/Makefile b/www/p5-HTTP-Lite/Makefile
index f2735aaa428e..8074f18f62a7 100644
--- a/www/p5-HTTP-Lite/Makefile
+++ b/www/p5-HTTP-Lite/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTTP-Lite
 PORTVERSION=	2.1.6
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTTP
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/www/p5-HTTP-MHTTP/Makefile b/www/p5-HTTP-MHTTP/Makefile
index a51ef775aa67..80bf1222de49 100644
--- a/www/p5-HTTP-MHTTP/Makefile
+++ b/www/p5-HTTP-MHTTP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTTP-MHTTP
 PORTVERSION=	0.15
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTTP
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/www/p5-HTTP-Recorder/Makefile b/www/p5-HTTP-Recorder/Makefile
index c542963b28c2..3b65217737f4 100644
--- a/www/p5-HTTP-Recorder/Makefile
+++ b/www/p5-HTTP-Recorder/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	HTTP-Recorder
 PORTVERSION=	0.05
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/L/LE/LEIRA
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-HTTP-Request-AsCGI/Makefile b/www/p5-HTTP-Request-AsCGI/Makefile
index caff07c18331..9b00a7889cc7 100644
--- a/www/p5-HTTP-Request-AsCGI/Makefile
+++ b/www/p5-HTTP-Request-AsCGI/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	HTTP-Request-AsCGI
 PORTVERSION=	0.5
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTTP
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/www/p5-HTTP-Request-Params/Makefile b/www/p5-HTTP-Request-Params/Makefile
index 20f053cfd2d3..07eebfcd07b0 100644
--- a/www/p5-HTTP-Request-Params/Makefile
+++ b/www/p5-HTTP-Request-Params/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTTP-Request-Params
 PORTVERSION=	1.01
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTTP
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-HTTP-Server-Simple-Mason/Makefile b/www/p5-HTTP-Server-Simple-Mason/Makefile
index 47c778f2b317..359abe79cde7 100644
--- a/www/p5-HTTP-Server-Simple-Mason/Makefile
+++ b/www/p5-HTTP-Server-Simple-Mason/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTTP-Server-Simple-Mason
 PORTVERSION=	0.09
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTTP
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
diff --git a/www/p5-HTTP-Server-Simple-Recorder/Makefile b/www/p5-HTTP-Server-Simple-Recorder/Makefile
index 0ebb95f9e3c9..0ac4141678f7 100644
--- a/www/p5-HTTP-Server-Simple-Recorder/Makefile
+++ b/www/p5-HTTP-Server-Simple-Recorder/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTTP-Server-Simple-Recorder
 PORTVERSION=	0.02
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTTP
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/www/p5-HTTP-SimpleLinkChecker/Makefile b/www/p5-HTTP-SimpleLinkChecker/Makefile
index ab039a336926..3f01e558c2ab 100644
--- a/www/p5-HTTP-SimpleLinkChecker/Makefile
+++ b/www/p5-HTTP-SimpleLinkChecker/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTTP-SimpleLinkChecker
 PORTVERSION=	1.13
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTTP
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/www/p5-HTTP-Size/Makefile b/www/p5-HTTP-Size/Makefile
index fbb80533f2a0..c761cf121587 100644
--- a/www/p5-HTTP-Size/Makefile
+++ b/www/p5-HTTP-Size/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTTP-Size
 PORTVERSION=	1.12
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTTP
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/www/p5-HTTP-WebTest/Makefile b/www/p5-HTTP-WebTest/Makefile
index d8bbef024ec1..743c7f0f613f 100644
--- a/www/p5-HTTP-WebTest/Makefile
+++ b/www/p5-HTTP-WebTest/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	HTTP-WebTest
 PORTVERSION=	2.04
 PORTREVISION=	1
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTTP
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/www/p5-HTTPD-Log-Filter/Makefile b/www/p5-HTTPD-Log-Filter/Makefile
index 26060390f52e..5fca3882d2e7 100644
--- a/www/p5-HTTPD-Log-Filter/Makefile
+++ b/www/p5-HTTPD-Log-Filter/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	HTTPD-Log-Filter
 PORTVERSION=	1.08
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/A/AW/AWRIGLEY
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-HTTPD-User-Manage/Makefile b/www/p5-HTTPD-User-Manage/Makefile
index 05ef317c303d..a0fb8d23086e 100644
--- a/www/p5-HTTPD-User-Manage/Makefile
+++ b/www/p5-HTTPD-User-Manage/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTTPD-User-Manage
 PORTVERSION=	1.66
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTTPD
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/www/p5-Handel/Makefile b/www/p5-Handel/Makefile
index 97219e454afb..a66feabf26aa 100644
--- a/www/p5-Handel/Makefile
+++ b/www/p5-Handel/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Handel
 PORTVERSION=	1.00010
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Template
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hideo@lastamericanempire.com
diff --git a/www/p5-IMDB-Movie/Makefile b/www/p5-IMDB-Movie/Makefile
index 4a05b30772eb..235deca84092 100644
--- a/www/p5-IMDB-Movie/Makefile
+++ b/www/p5-IMDB-Movie/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	IMDB-Movie
 PORTVERSION=	0.12
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/J/JE/JEFFA
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Jifty/Makefile b/www/p5-Jifty/Makefile
index efe11de4ac4a..4aa26765ded4 100644
--- a/www/p5-Jifty/Makefile
+++ b/www/p5-Jifty/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Jifty
 PORTVERSION=	0.70422
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Jifty
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/www/p5-LWP-Authen-Wsse/Makefile b/www/p5-LWP-Authen-Wsse/Makefile
index 4211830a4b5a..2d170198ae02 100644
--- a/www/p5-LWP-Authen-Wsse/Makefile
+++ b/www/p5-LWP-Authen-Wsse/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	LWP-Authen-Wsse
 PORTVERSION=	0.05
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	LWP
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/p5-MasonX-Interp-WithCallbacks/Makefile b/www/p5-MasonX-Interp-WithCallbacks/Makefile
index 956738d4a1ee..33c86e8c1d5a 100644
--- a/www/p5-MasonX-Interp-WithCallbacks/Makefile
+++ b/www/p5-MasonX-Interp-WithCallbacks/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	MasonX-Interp-WithCallbacks
 PORTVERSION=	1.17
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	MasonX/DWHEELER
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-MasonX-Request-WithApacheSession/Makefile b/www/p5-MasonX-Request-WithApacheSession/Makefile
index d9c66d77c32a..5d77578e7dae 100644
--- a/www/p5-MasonX-Request-WithApacheSession/Makefile
+++ b/www/p5-MasonX-Request-WithApacheSession/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	MasonX-Request-WithApacheSession
 PORTVERSION=	0.30
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	MasonX
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	nick@foobar.org
diff --git a/www/p5-MasonX-WebApp/Makefile b/www/p5-MasonX-WebApp/Makefile
index e68311667fca..6767fc795f1d 100644
--- a/www/p5-MasonX-WebApp/Makefile
+++ b/www/p5-MasonX-WebApp/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	MasonX-WebApp
 PORTVERSION=	0.12
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	MasonX
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hcoyote@ghostar.org
diff --git a/www/p5-Maypole-Authentication-UserSessionCookie/Makefile b/www/p5-Maypole-Authentication-UserSessionCookie/Makefile
index e182c58a0e9a..d88e8d50156b 100644
--- a/www/p5-Maypole-Authentication-UserSessionCookie/Makefile
+++ b/www/p5-Maypole-Authentication-UserSessionCookie/Makefile
@@ -8,7 +8,7 @@ PORTNAME=	Maypole-Authentication-UserSessionCookie
 PORTVERSION=	1.4
 PORTREVISION=	0
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/S/SI/SIMON/
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Maypole-Component/Makefile b/www/p5-Maypole-Component/Makefile
index b5c0f6ea2a99..8902f0778be3 100644
--- a/www/p5-Maypole-Component/Makefile
+++ b/www/p5-Maypole-Component/Makefile
@@ -7,7 +7,7 @@
 PORTNAME=	Maypole-Component
 PORTVERSION=	0.03
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/S/SI/SIMON/
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Maypole/Makefile b/www/p5-Maypole/Makefile
index 655cdbf0e221..1c0f226c32e9 100644
--- a/www/p5-Maypole/Makefile
+++ b/www/p5-Maypole/Makefile
@@ -7,7 +7,7 @@
 PORTNAME=	Maypole
 PORTVERSION=	2.10
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/T/TE/TEEJAY
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Net-Akismet/Makefile b/www/p5-Net-Akismet/Makefile
index 36c67e00dde4..dc309d9d1a38 100644
--- a/www/p5-Net-Akismet/Makefile
+++ b/www/p5-Net-Akismet/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Akismet
 PORTVERSION=	0.03
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	roam@FreeBSD.org
diff --git a/www/p5-Net-Flickr-API/Makefile b/www/p5-Net-Flickr-API/Makefile
index 7412e9c3f816..6ac16f9371c1 100644
--- a/www/p5-Net-Flickr-API/Makefile
+++ b/www/p5-Net-Flickr-API/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Flickr-API
 PORTVERSION=	1.68
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	snowfly@yuntech.edu.tw
diff --git a/www/p5-Net-Flickr-Backup/Makefile b/www/p5-Net-Flickr-Backup/Makefile
index 42a72355cd85..990331e14222 100644
--- a/www/p5-Net-Flickr-Backup/Makefile
+++ b/www/p5-Net-Flickr-Backup/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Flickr-Backup
 PORTVERSION=	2.97
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	snowfly@yuntech.edu.tw
diff --git a/www/p5-Net-eBay/Makefile b/www/p5-Net-eBay/Makefile
index 41b07c39a445..a4da99e95365 100644
--- a/www/p5-Net-eBay/Makefile
+++ b/www/p5-Net-eBay/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-eBay
 PORTVERSION=	0.42
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	zaa@zaa.pp.ru
diff --git a/www/p5-Newsletter/Makefile b/www/p5-Newsletter/Makefile
index 2dbc3d5201f5..8d291bb35840 100644
--- a/www/p5-Newsletter/Makefile
+++ b/www/p5-Newsletter/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Newsletter
 PORTVERSION=	0.03.3
 CATEGORIES=	www textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	 ../by-authors/id/K/KA/KALELE
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
diff --git a/www/p5-POE-Component-Client-HTTP/Makefile b/www/p5-POE-Component-Client-HTTP/Makefile
index 6d9e3554e9d2..13a6fa5937d0 100644
--- a/www/p5-POE-Component-Client-HTTP/Makefile
+++ b/www/p5-POE-Component-Client-HTTP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	POE-Component-Client-HTTP
 PORTVERSION=	0.8200
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/00$//}
 
diff --git a/www/p5-POE-Component-Client-UserAgent/Makefile b/www/p5-POE-Component-Client-UserAgent/Makefile
index 2c52c119c0e6..5835568adf20 100644
--- a/www/p5-POE-Component-Client-UserAgent/Makefile
+++ b/www/p5-POE-Component-Client-UserAgent/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	POE-Component-Client-UserAgent
 PORTVERSION=	0.06
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/R/RC/RCAPUTO
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-POE-Component-Server-HTTP/Makefile b/www/p5-POE-Component-Server-HTTP/Makefile
index 65e5f126c4f8..c3473d5cb343 100644
--- a/www/p5-POE-Component-Server-HTTP/Makefile
+++ b/www/p5-POE-Component-Server-HTTP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	POE-Component-Server-HTTP
 PORTVERSION=	0.09
 CATEGORIES=	www devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hideo@lastamericanempire.com
diff --git a/www/p5-POE-Component-Server-HTTPServer/Makefile b/www/p5-POE-Component-Server-HTTPServer/Makefile
index 162bf47a5641..b385797eed85 100644
--- a/www/p5-POE-Component-Server-HTTPServer/Makefile
+++ b/www/p5-POE-Component-Server-HTTPServer/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	POE-Component-Server-HTTPServer
 PORTVERSION=	0.9.2
 CATEGORIES=	www devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lin-chi@lastamericanempire.com
diff --git a/www/p5-ParallelUA/Makefile b/www/p5-ParallelUA/Makefile
index 19c5ae295bea..8a99093ed855 100644
--- a/www/p5-ParallelUA/Makefile
+++ b/www/p5-ParallelUA/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	ParallelUA
 PORTVERSION=	2.57
 CATEGORIES=	www perl5 devel
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	LWP
 PKGNAMEPREFIX=	p5-
 DISTNAME=	ParallelUserAgent-${PORTVERSION}
diff --git a/www/p5-PodToHTML/Makefile b/www/p5-PodToHTML/Makefile
index 5528c3a39473..308d3c86eaa0 100644
--- a/www/p5-PodToHTML/Makefile
+++ b/www/p5-PodToHTML/Makefile
@@ -8,7 +8,7 @@ PORTNAME=	PodToHTML
 PORTVERSION=	0.06
 PORTREVISION=	1
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Pod
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-SCGI/Makefile b/www/p5-SCGI/Makefile
index 1a6274357e35..58f6927f5609 100644
--- a/www/p5-SCGI/Makefile
+++ b/www/p5-SCGI/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	SCGI
 PORTVERSION=	0.6
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/V/VI/VIPERCODE
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-SRU/Makefile b/www/p5-SRU/Makefile
index b506934de694..fccacf847f42 100644
--- a/www/p5-SRU/Makefile
+++ b/www/p5-SRU/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	SRU
 PORTVERSION=	0.95
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/B/BR/BRICAS
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-SWF-Chart/Makefile b/www/p5-SWF-Chart/Makefile
index a39190f328e6..a9b2e0c73314 100644
--- a/www/p5-SWF-Chart/Makefile
+++ b/www/p5-SWF-Chart/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	SWF-Chart
 PORTVERSION=	1.4
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/G/GA/GARTH
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Syntax-Highlight-HTML/Makefile b/www/p5-Syntax-Highlight-HTML/Makefile
index 70e19702e46d..b3b9dfb3bc5c 100644
--- a/www/p5-Syntax-Highlight-HTML/Makefile
+++ b/www/p5-Syntax-Highlight-HTML/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Syntax-Highlight-HTML
 PORTVERSION=	0.04
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Syntax
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-Syntax-Highlight-Shell/Makefile b/www/p5-Syntax-Highlight-Shell/Makefile
index f2ad4266ca93..f75edcd1e432 100644
--- a/www/p5-Syntax-Highlight-Shell/Makefile
+++ b/www/p5-Syntax-Highlight-Shell/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Syntax-Highlight-Shell
 PORTVERSION=	0.04
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Syntax
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-Template-GD/Makefile b/www/p5-Template-GD/Makefile
index 18c6dc594114..226ab0e2a3bb 100644
--- a/www/p5-Template-GD/Makefile
+++ b/www/p5-Template-GD/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Template-GD
 PORTVERSION=	2.66
 CATEGORIES=	www textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Template
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	glarkin@sourcehosting.net
diff --git a/www/p5-Template-Multilingual/Makefile b/www/p5-Template-Multilingual/Makefile
index aea885399e00..6d658eb8ab59 100644
--- a/www/p5-Template-Multilingual/Makefile
+++ b/www/p5-Template-Multilingual/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Template-Multilingual
 PORTVERSION=	0.09
 CATEGORIES=	www textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Template
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kaoru@kaisei.org
diff --git a/www/p5-Template-Plugin-Class/Makefile b/www/p5-Template-Plugin-Class/Makefile
index 1406242588be..7161fc8a0167 100644
--- a/www/p5-Template-Plugin-Class/Makefile
+++ b/www/p5-Template-Plugin-Class/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Template-Plugin-Class
 PORTVERSION=	0.13
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Template
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/www/p5-Template-Plugin-Clickable-Email/Makefile b/www/p5-Template-Plugin-Clickable-Email/Makefile
index 7eca58e82d7c..53f871593e1b 100644
--- a/www/p5-Template-Plugin-Clickable-Email/Makefile
+++ b/www/p5-Template-Plugin-Clickable-Email/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Template-Plugin-Clickable-Email
 PORTVERSION=	0.01
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Template
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/www/p5-Template-Plugin-Clickable/Makefile b/www/p5-Template-Plugin-Clickable/Makefile
index 0d306546b23e..97dd1ca27784 100644
--- a/www/p5-Template-Plugin-Clickable/Makefile
+++ b/www/p5-Template-Plugin-Clickable/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Template-Plugin-Clickable
 PORTVERSION=	0.06
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Template
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/www/p5-Template-Plugin-Comma/Makefile b/www/p5-Template-Plugin-Comma/Makefile
index 8a0501f5fc6a..9cfdd184ae94 100644
--- a/www/p5-Template-Plugin-Comma/Makefile
+++ b/www/p5-Template-Plugin-Comma/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Template-Plugin-Comma
 PORTVERSION=	0.04
 CATEGORIES=	www textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Template
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/p5-Template-Plugin-JSON/Makefile b/www/p5-Template-Plugin-JSON/Makefile
index 36491d56fc15..961af7710fae 100644
--- a/www/p5-Template-Plugin-JSON/Makefile
+++ b/www/p5-Template-Plugin-JSON/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Template-Plugin-JSON
 PORTVERSION=	0.03
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Template
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/www/p5-Template-Plugin-JavaScript/Makefile b/www/p5-Template-Plugin-JavaScript/Makefile
index 4a96b175047e..3091b3f3d71e 100644
--- a/www/p5-Template-Plugin-JavaScript/Makefile
+++ b/www/p5-Template-Plugin-JavaScript/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Template-Plugin-JavaScript
 PORTVERSION=	0.01
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Template
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
diff --git a/www/p5-Template-Plugin-MP3/Makefile b/www/p5-Template-Plugin-MP3/Makefile
index e17dd52db3d4..06a2d295c975 100644
--- a/www/p5-Template-Plugin-MP3/Makefile
+++ b/www/p5-Template-Plugin-MP3/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Template-Plugin-MP3
 PORTVERSION=	1.02
 CATEGORIES=	www textproc audio perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Template
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-Template-Plugin-Markdown/Makefile b/www/p5-Template-Plugin-Markdown/Makefile
index a7585b8a39ce..fe62fd9ff149 100644
--- a/www/p5-Template-Plugin-Markdown/Makefile
+++ b/www/p5-Template-Plugin-Markdown/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Template-Plugin-Markdown
 PORTVERSION=	0.02
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Template
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	fernan@iib.unsam.edu.ar
diff --git a/www/p5-Template-Plugin-Monta/Makefile b/www/p5-Template-Plugin-Monta/Makefile
index 2bcdc739860c..31bc656da171 100644
--- a/www/p5-Template-Plugin-Monta/Makefile
+++ b/www/p5-Template-Plugin-Monta/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Template-Plugin-Monta
 PORTVERSION=	0.03
 CATEGORIES=	www textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Template
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kaoru@kaisei.org
diff --git a/www/p5-Template-Plugin-Subst/Makefile b/www/p5-Template-Plugin-Subst/Makefile
index c4825f45ab9f..522a9a720edf 100644
--- a/www/p5-Template-Plugin-Subst/Makefile
+++ b/www/p5-Template-Plugin-Subst/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Template-Plugin-Subst
 PORTVERSION=	0.02
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Template
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/www/p5-Template-Plugin-VMethods/Makefile b/www/p5-Template-Plugin-VMethods/Makefile
index ebc697dd7759..feec34298f44 100644
--- a/www/p5-Template-Plugin-VMethods/Makefile
+++ b/www/p5-Template-Plugin-VMethods/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Template-Plugin-VMethods
 PORTVERSION=	0.03
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Template
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/www/p5-Template-Provider-Encoding/Makefile b/www/p5-Template-Provider-Encoding/Makefile
index 247551f55e7d..594c5e3d9e4a 100644
--- a/www/p5-Template-Provider-Encoding/Makefile
+++ b/www/p5-Template-Provider-Encoding/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Template-Provider-Encoding
 PORTVERSION=	0.10
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Template
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kaoru@kaisei.org
diff --git a/www/p5-Template-Timer/Makefile b/www/p5-Template-Timer/Makefile
index 5f0013a1349e..b856a16a6c00 100644
--- a/www/p5-Template-Timer/Makefile
+++ b/www/p5-Template-Timer/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Template-Timer
 PORTVERSION=	0.04
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Template
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/www/p5-Template-Toolkit/Makefile b/www/p5-Template-Toolkit/Makefile
index 8ec053995c6c..c2275698aeeb 100644
--- a/www/p5-Template-Toolkit/Makefile
+++ b/www/p5-Template-Toolkit/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Template-Toolkit
 PORTVERSION=	2.19
 CATEGORIES=	www textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Template
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-Test-HTTP-Server-Simple/Makefile b/www/p5-Test-HTTP-Server-Simple/Makefile
index 46068e41770f..2cd9e8ed3e15 100644
--- a/www/p5-Test-HTTP-Server-Simple/Makefile
+++ b/www/p5-Test-HTTP-Server-Simple/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Test-HTTP-Server-Simple
 PORTVERSION=	0.06
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Test
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/www/p5-TestGen4Web-Runner/Makefile b/www/p5-TestGen4Web-Runner/Makefile
index ecf3951a44a3..f6c73429ba55 100644
--- a/www/p5-TestGen4Web-Runner/Makefile
+++ b/www/p5-TestGen4Web-Runner/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	TestGen4Web-Runner
 PORTVERSION=	0.08
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	WWW/MACKERS
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-Text-Markdown-ApacheHandler/Makefile b/www/p5-Text-Markdown-ApacheHandler/Makefile
index 1fabc120b95e..090eae0a03a5 100644
--- a/www/p5-Text-Markdown-ApacheHandler/Makefile
+++ b/www/p5-Text-Markdown-ApacheHandler/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Text-Markdown-ApacheHandler
 PORTVERSION=	0.04
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Text
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
diff --git a/www/p5-URI-Fetch/Makefile b/www/p5-URI-Fetch/Makefile
index 4a106c4bbf61..f72212e5cbd7 100644
--- a/www/p5-URI-Fetch/Makefile
+++ b/www/p5-URI-Fetch/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	URI-Fetch
 PORTVERSION=	0.080
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	URI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/0$//}
 
diff --git a/www/p5-URI-Sequin/Makefile b/www/p5-URI-Sequin/Makefile
index 6ec6f3d31f3c..03a86201df62 100644
--- a/www/p5-URI-Sequin/Makefile
+++ b/www/p5-URI-Sequin/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	URI-Sequin
 PORTVERSION=	1.2
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/S/SA/SARGIE
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-URI-ToDisk/Makefile b/www/p5-URI-ToDisk/Makefile
index 7094e7b6f021..809d971ad015 100644
--- a/www/p5-URI-ToDisk/Makefile
+++ b/www/p5-URI-ToDisk/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	URI-ToDisk
 PORTVERSION=	1.12
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	URI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	coryking@mozimedia.com
diff --git a/www/p5-W3C-LinkChecker/Makefile b/www/p5-W3C-LinkChecker/Makefile
index 851f64e3ee06..3d2528cf1468 100644
--- a/www/p5-W3C-LinkChecker/Makefile
+++ b/www/p5-W3C-LinkChecker/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	W3C-LinkChecker
 PORTVERSION=	4.3
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/S/SC/SCOP
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-W3C-LogValidator/Makefile b/www/p5-W3C-LogValidator/Makefile
index 1f3f026a4435..7c51830302be 100644
--- a/www/p5-W3C-LogValidator/Makefile
+++ b/www/p5-W3C-LogValidator/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	W3C-LogValidator
 PORTVERSION=	1.2
 PORTEPOCH=	1
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	W3C
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	toni.viemero@iki.fi
diff --git a/www/p5-WWW-Babelfish/Makefile b/www/p5-WWW-Babelfish/Makefile
index 0fd3ac4832a2..c703024fda07 100644
--- a/www/p5-WWW-Babelfish/Makefile
+++ b/www/p5-WWW-Babelfish/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-Babelfish
 PORTVERSION=	0.16
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/www/p5-WWW-Baseball-NPB/Makefile b/www/p5-WWW-Baseball-NPB/Makefile
index 82e8eb7a7d1d..3df52f96bc29 100644
--- a/www/p5-WWW-Baseball-NPB/Makefile
+++ b/www/p5-WWW-Baseball-NPB/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-Baseball-NPB
 PORTVERSION=	0.03
 CATEGORIES=	www japanese perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chinsan@FreeBSD.org
diff --git a/www/p5-WWW-Comic/Makefile b/www/p5-WWW-Comic/Makefile
index 6cd27fb209d7..92004d29f8f2 100644
--- a/www/p5-WWW-Comic/Makefile
+++ b/www/p5-WWW-Comic/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-Comic
 PORTVERSION=	1.06
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chinsan@FreeBSD.org
diff --git a/www/p5-WWW-Curl/Makefile b/www/p5-WWW-Curl/Makefile
index e340ea3324ae..7aedd627343f 100644
--- a/www/p5-WWW-Curl/Makefile
+++ b/www/p5-WWW-Curl/Makefile
@@ -9,9 +9,8 @@ PORTNAME=	WWW-Curl
 PORTVERSION=	3.02
 PORTREVISION=	1
 CATEGORIES=	www ftp perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES=	CPAN \
 		http://curl.haxx.se/libcurl/perl/
-MASTER_SITE_SUBDIR=	WWW
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	roam@FreeBSD.org
diff --git a/www/p5-WWW-Dilbert/Makefile b/www/p5-WWW-Dilbert/Makefile
index 9a0175f3b31c..4a68c57a3058 100644
--- a/www/p5-WWW-Dilbert/Makefile
+++ b/www/p5-WWW-Dilbert/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	WWW-Dilbert
 PORTVERSION=	1.19
 PORTEPOCH=	1
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-WWW-Google-Calculator/Makefile b/www/p5-WWW-Google-Calculator/Makefile
index d84cf967dc14..e656a950d0f8 100644
--- a/www/p5-WWW-Google-Calculator/Makefile
+++ b/www/p5-WWW-Google-Calculator/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-Google-Calculator
 PORTVERSION=	0.05
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	snowfly@yuntech.edu.tw
diff --git a/www/p5-WWW-Google-News/Makefile b/www/p5-WWW-Google-News/Makefile
index d3ef5a5c314d..7c3da40aae26 100644
--- a/www/p5-WWW-Google-News/Makefile
+++ b/www/p5-WWW-Google-News/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-Google-News
 PORTVERSION=	0.12
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	snowfly@yuntech.edu.tw
diff --git a/www/p5-WWW-Google-Notebook/Makefile b/www/p5-WWW-Google-Notebook/Makefile
index c899a43d1115..22a7b4685cdd 100644
--- a/www/p5-WWW-Google-Notebook/Makefile
+++ b/www/p5-WWW-Google-Notebook/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-Google-Notebook
 PORTVERSION=	0.01
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lwhsu@FreeBSD.org
diff --git a/www/p5-WWW-Google-Video/Makefile b/www/p5-WWW-Google-Video/Makefile
index 7d2c254a07bc..2535cad37e12 100644
--- a/www/p5-WWW-Google-Video/Makefile
+++ b/www/p5-WWW-Google-Video/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-Google-Video
 PORTVERSION=	0.4
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW/KENWU
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	snowfly@yuntech.edu.tw
diff --git a/www/p5-WWW-Link/Makefile b/www/p5-WWW-Link/Makefile
index 7b8d59f347da..225fc89c9b42 100644
--- a/www/p5-WWW-Link/Makefile
+++ b/www/p5-WWW-Link/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-Link
 PORTVERSION=	0.036
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/p5-WWW-Mechanize-DecodedContent/Makefile b/www/p5-WWW-Mechanize-DecodedContent/Makefile
index 271a0b13fc54..08a4fa4e0343 100644
--- a/www/p5-WWW-Mechanize-DecodedContent/Makefile
+++ b/www/p5-WWW-Mechanize-DecodedContent/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	WWW-Mechanize-DecodedContent
 PORTVERSION=	0.01
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/M/MI/MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
diff --git a/www/p5-WWW-Mechanize-Pluggable/Makefile b/www/p5-WWW-Mechanize-Pluggable/Makefile
index 4da3a489463d..f6cb23f09939 100644
--- a/www/p5-WWW-Mechanize-Pluggable/Makefile
+++ b/www/p5-WWW-Mechanize-Pluggable/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-Mechanize-Pluggable
 PORTVERSION=	1.01
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/www/p5-WWW-Mechanize-Plugin-phpBB/Makefile b/www/p5-WWW-Mechanize-Plugin-phpBB/Makefile
index e7a996584ea3..77ee3ae13d49 100644
--- a/www/p5-WWW-Mechanize-Plugin-phpBB/Makefile
+++ b/www/p5-WWW-Mechanize-Plugin-phpBB/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-Mechanize-Plugin-phpBB
 PORTVERSION=	0.01
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/www/p5-WWW-Mechanize-Shell/Makefile b/www/p5-WWW-Mechanize-Shell/Makefile
index 5fd2fbbded87..b8d0f65b0deb 100644
--- a/www/p5-WWW-Mechanize-Shell/Makefile
+++ b/www/p5-WWW-Mechanize-Shell/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-Mechanize-Shell
 PORTVERSION=	0.46
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-WWW-Mixi/Makefile b/www/p5-WWW-Mixi/Makefile
index 4b9b448fbaeb..e20e969d0996 100644
--- a/www/p5-WWW-Mixi/Makefile
+++ b/www/p5-WWW-Mixi/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-Mixi
 PORTVERSION=	0.50
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kaoru@kaisei.org
diff --git a/www/p5-WWW-OpenSVN/Makefile b/www/p5-WWW-OpenSVN/Makefile
index 2cc7e34e9f1f..d97c21236670 100644
--- a/www/p5-WWW-OpenSVN/Makefile
+++ b/www/p5-WWW-OpenSVN/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-OpenSVN
 PORTVERSION=	0.1.2
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	snowfly@yuntech.edu.tw
diff --git a/www/p5-WWW-OpenSearch/Makefile b/www/p5-WWW-OpenSearch/Makefile
index a87a05a09b52..f4da0e353b26 100644
--- a/www/p5-WWW-OpenSearch/Makefile
+++ b/www/p5-WWW-OpenSearch/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-OpenSearch
 PORTVERSION=	0.13
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-WWW-Robot/Makefile b/www/p5-WWW-Robot/Makefile
index d59eebeee786..adb8b4c8d246 100644
--- a/www/p5-WWW-Robot/Makefile
+++ b/www/p5-WWW-Robot/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-Robot
 PORTVERSION=	0.025
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/p5-WWW-Scraper-ISBN-Driver/Makefile b/www/p5-WWW-Scraper-ISBN-Driver/Makefile
index c5a160892e5f..912da5cd9456 100644
--- a/www/p5-WWW-Scraper-ISBN-Driver/Makefile
+++ b/www/p5-WWW-Scraper-ISBN-Driver/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-Scraper-ISBN-Driver
 PORTVERSION=	0.18
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-WWW-Scraper-ISBN-ORA_Driver/Makefile b/www/p5-WWW-Scraper-ISBN-ORA_Driver/Makefile
index db808abc79de..a39a9f4816d3 100644
--- a/www/p5-WWW-Scraper-ISBN-ORA_Driver/Makefile
+++ b/www/p5-WWW-Scraper-ISBN-ORA_Driver/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-Scraper-ISBN-ORA_Driver
 PORTVERSION=	0.08
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-WWW-Scraper-ISBN-Record/Makefile b/www/p5-WWW-Scraper-ISBN-Record/Makefile
index 459d3ebcabb3..11129b5d9b9d 100644
--- a/www/p5-WWW-Scraper-ISBN-Record/Makefile
+++ b/www/p5-WWW-Scraper-ISBN-Record/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-Scraper-ISBN-Record
 PORTVERSION=	0.17
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-WWW-Scraper-ISBN/Makefile b/www/p5-WWW-Scraper-ISBN/Makefile
index 77296f7f5e77..a43212e66168 100644
--- a/www/p5-WWW-Scraper-ISBN/Makefile
+++ b/www/p5-WWW-Scraper-ISBN/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	WWW-Scraper-ISBN
 PORTVERSION=	0.25
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-WWW-Search-Google/Makefile b/www/p5-WWW-Search-Google/Makefile
index c9857736d083..7b76db60154c 100644
--- a/www/p5-WWW-Search-Google/Makefile
+++ b/www/p5-WWW-Search-Google/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	WWW-Search-Google
 PORTVERSION=	0.22
 PORTEPOCH=	1
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-WWW-Search-MSN/Makefile b/www/p5-WWW-Search-MSN/Makefile
index bfc642c530ca..8528d16c5a7f 100644
--- a/www/p5-WWW-Search-MSN/Makefile
+++ b/www/p5-WWW-Search-MSN/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-Search-MSN
 PORTVERSION=	0.0104
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-WWW-Shorten-0rz/Makefile b/www/p5-WWW-Shorten-0rz/Makefile
index a7f26e0e73af..e98df7d4e4f2 100644
--- a/www/p5-WWW-Shorten-0rz/Makefile
+++ b/www/p5-WWW-Shorten-0rz/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-Shorten-0rz
 PORTVERSION=	0.05
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	snowfly@yuntech.edu.tw
diff --git a/www/p5-WWW-Shorten-KUSO/Makefile b/www/p5-WWW-Shorten-KUSO/Makefile
index 3c85d6b0d716..3ec8fcf8d31f 100644
--- a/www/p5-WWW-Shorten-KUSO/Makefile
+++ b/www/p5-WWW-Shorten-KUSO/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-Shorten-KUSO
 PORTVERSION=	0.3
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	snowfly@yuntech.edu.tw
diff --git a/www/p5-WWW-Shorten/Makefile b/www/p5-WWW-Shorten/Makefile
index de5e9eeeb7c4..2961776659f9 100644
--- a/www/p5-WWW-Shorten/Makefile
+++ b/www/p5-WWW-Shorten/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-Shorten
 PORTVERSION=	1.97
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/www/p5-WWW-SourceForge/Makefile b/www/p5-WWW-SourceForge/Makefile
index a8ee166099ba..7b5c52e67ca4 100644
--- a/www/p5-WWW-SourceForge/Makefile
+++ b/www/p5-WWW-SourceForge/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	WWW-SourceForge
 PORTVERSION=	0.090
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/G/GU/GUGOD
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/0$//}
diff --git a/www/p5-WWW-TV/Makefile b/www/p5-WWW-TV/Makefile
index af4405d5c0cf..879517e2d1f3 100644
--- a/www/p5-WWW-TV/Makefile
+++ b/www/p5-WWW-TV/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-TV
 PORTVERSION=	0.09
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tolid@plab.ku.dk
diff --git a/www/p5-WWW-TWSMS/Makefile b/www/p5-WWW-TWSMS/Makefile
index 6af914c783e1..8a569a7fa065 100644
--- a/www/p5-WWW-TWSMS/Makefile
+++ b/www/p5-WWW-TWSMS/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-TWSMS
 PORTVERSION=	0.01
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	snowfly@yuntech.edu.tw
diff --git a/www/p5-WWW-VenusEnvy/Makefile b/www/p5-WWW-VenusEnvy/Makefile
index 32bada7a59df..2f25819b20d7 100644
--- a/www/p5-WWW-VenusEnvy/Makefile
+++ b/www/p5-WWW-VenusEnvy/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	WWW-VenusEnvy
 PORTVERSION=	1.10
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chinsan@FreeBSD.org
diff --git a/www/p5-WWW-WebArchive/Makefile b/www/p5-WWW-WebArchive/Makefile
index 2d2ee3063b4e..31283e738d08 100644
--- a/www/p5-WWW-WebArchive/Makefile
+++ b/www/p5-WWW-WebArchive/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-WebArchive
 PORTVERSION=	0.50
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
diff --git a/www/p5-WebService-Basecamp/Makefile b/www/p5-WebService-Basecamp/Makefile
index f271c813b6b6..fac3f6556287 100644
--- a/www/p5-WebService-Basecamp/Makefile
+++ b/www/p5-WebService-Basecamp/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WebService-Basecamp
 PORTVERSION=	0.1.4
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WebService
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-WebService-Bloglines/Makefile b/www/p5-WebService-Bloglines/Makefile
index 6a65e4c58b6d..61648ab65e70 100644
--- a/www/p5-WebService-Bloglines/Makefile
+++ b/www/p5-WebService-Bloglines/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	WebService-Bloglines
 PORTVERSION=	0.12
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WebService
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/p5-WebService-NoPaste/Makefile b/www/p5-WebService-NoPaste/Makefile
index 03915593d355..569be1e4ea92 100644
--- a/www/p5-WebService-NoPaste/Makefile
+++ b/www/p5-WebService-NoPaste/Makefile
author	araujo <araujo@FreeBSD.org>	2008-04-17 22:30:31 +0800
committer	araujo <araujo@FreeBSD.org>	2008-04-17 22:30:31 +0800
commit	c94d115b8e9cb4ad3d8424685fe7c324767594f3 (patch)
tree	6cb0853059727bc626be6002ec069cf4edbfd17a /www
parent	79defce4f3dcafa040fed233fd412ff265751d47 (diff)
download	freebsd-ports-gnome-c94d115b8e9cb4ad3d8424685fe7c324767594f3.tar.gz freebsd-ports-gnome-c94d115b8e9cb4ad3d8424685fe7c324767594f3.tar.zst freebsd-ports-gnome-c94d115b8e9cb4ad3d8424685fe7c324767594f3.zip