- 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)

96 files changed, 96 insertions, 186 deletions

diff --git a/databases/db2/Makefile b/databases/db2/Makefile
index 9e5e608..61863c6 100644
--- a/databases/db2/Makefile
+++ b/databases/db2/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.7.7
 PORTREVISION=	1
 CATEGORIES=	databases
 #MASTER_SITES=	http://www.sleepycat.com/update/snapshot/
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../src/misc
 DISTNAME=	db-${PORTVERSION}
 
diff --git a/databases/p5-ApacheDBILogConfig/Makefile b/databases/p5-ApacheDBILogConfig/Makefile
index 8148766..06e34bc 100644
--- a/databases/p5-ApacheDBILogConfig/Makefile
+++ b/databases/p5-ApacheDBILogConfig/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-DBILogConfig
 PORTVERSION=	0.02
 CATEGORIES=	databases www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/databases/p5-ApacheDBILogger/Makefile b/databases/p5-ApacheDBILogger/Makefile
index 0a97c678..e22bd52 100644
--- a/databases/p5-ApacheDBILogger/Makefile
+++ b/databases/p5-ApacheDBILogger/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-DBILogger
 PORTVERSION=	0.93
 CATEGORIES=	databases www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/databases/p5-AsciiDB-TagFile/Makefile b/databases/p5-AsciiDB-TagFile/Makefile
index aa89228..216fd6f1 100644
--- a/databases/p5-AsciiDB-TagFile/Makefile
+++ b/databases/p5-AsciiDB-TagFile/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	AsciiDB-TagFile
 PORTVERSION=	1.06
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	AsciiDB
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/databases/p5-CDB_File-Generator/Makefile b/databases/p5-CDB_File-Generator/Makefile
index f7f495c..e7b11dc 100644
--- a/databases/p5-CDB_File-Generator/Makefile
+++ b/databases/p5-CDB_File-Generator/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CDB_File-Generator
 PORTVERSION=	0.030
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CDB_File
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/databases/p5-CDB_File/Makefile b/databases/p5-CDB_File/Makefile
index c9be37d..1daf68e 100644
--- a/databases/p5-CDB_File/Makefile
+++ b/databases/p5-CDB_File/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	CDB_File
 PORTVERSION=	0.95
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CDB_File
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	nistor@snickers.org
diff --git a/databases/p5-Cache-BDB/Makefile b/databases/p5-Cache-BDB/Makefile
index 7de0997..eac23cf 100644
--- a/databases/p5-Cache-BDB/Makefile
+++ b/databases/p5-Cache-BDB/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Cache-BDB
 PORTVERSION=	0.04
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Cache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
diff --git a/databases/p5-Cache-Memcached-Fast/Makefile b/databases/p5-Cache-Memcached-Fast/Makefile
index dd9a05f..ed47112 100644
--- a/databases/p5-Cache-Memcached-Fast/Makefile
+++ b/databases/p5-Cache-Memcached-Fast/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Cache-Memcached-Fast
 PORTVERSION=	0.08
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Cache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/databases/p5-Cache-Memcached-XS/Makefile b/databases/p5-Cache-Memcached-XS/Makefile
index f926069..072b518 100644
--- a/databases/p5-Cache-Memcached-XS/Makefile
+++ b/databases/p5-Cache-Memcached-XS/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Cache-Memcached-XS
 PORTVERSION=	0.01
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Cache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/databases/p5-Cache-Memcached/Makefile b/databases/p5-Cache-Memcached/Makefile
index 6d625bf..cbd5544 100644
--- a/databases/p5-Cache-Memcached/Makefile
+++ b/databases/p5-Cache-Memcached/Makefile
@@ -8,9 +8,8 @@
 PORTNAME=	Cache-Memcached
 PORTVERSION=	1.24
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES=	CPAN \
 		http://www.danga.com/memcached/dist/
-MASTER_SITE_SUBDIR=	Cache
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/databases/p5-Class-DBI-AsForm/Makefile b/databases/p5-Class-DBI-AsForm/Makefile
index ae9d51d..42779f6 100644
--- a/databases/p5-Class-DBI-AsForm/Makefile
+++ b/databases/p5-Class-DBI-AsForm/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	Class-DBI-AsForm
 PORTVERSION=	2.42
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/databases/p5-Class-DBI-AutoLoader/Makefile b/databases/p5-Class-DBI-AutoLoader/Makefile
index 4d3834e..c488001 100644
--- a/databases/p5-Class-DBI-AutoLoader/Makefile
+++ b/databases/p5-Class-DBI-AutoLoader/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	Class-DBI-AutoLoader
 PORTVERSION=	0.12
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/databases/p5-Class-DBI-DATA-Schema/Makefile b/databases/p5-Class-DBI-DATA-Schema/Makefile
index 4166132..a56ad56 100644
--- a/databases/p5-Class-DBI-DATA-Schema/Makefile
+++ b/databases/p5-Class-DBI-DATA-Schema/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Class-DBI-DATA-Schema
 PORTVERSION=	1.00
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/databases/p5-Class-DBI-DDL/Makefile b/databases/p5-Class-DBI-DDL/Makefile
index 43c3a37..e445967 100644
--- a/databases/p5-Class-DBI-DDL/Makefile
+++ b/databases/p5-Class-DBI-DDL/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Class-DBI-DDL
 PORTVERSION=	1.02
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/databases/p5-Class-DBI-LazyInflate/Makefile b/databases/p5-Class-DBI-LazyInflate/Makefile
index 64d13cc..54edfee 100644
--- a/databases/p5-Class-DBI-LazyInflate/Makefile
+++ b/databases/p5-Class-DBI-LazyInflate/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Class-DBI-LazyInflate
 PORTVERSION=	0.06
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/databases/p5-Class-DBI-Loader-Relationship/Makefile b/databases/p5-Class-DBI-Loader-Relationship/Makefile
index e3dd0e7..9077d77 100644
--- a/databases/p5-Class-DBI-Loader-Relationship/Makefile
+++ b/databases/p5-Class-DBI-Loader-Relationship/Makefile
@@ -7,7 +7,7 @@
 PORTNAME=	Class-DBI-Loader-Relationship
 PORTVERSION=	1.3
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/C/CH/CHUNZI
 PKGNAMEPREFIX=	p5-
 
diff --git a/databases/p5-Class-DBI-Pg/Makefile b/databases/p5-Class-DBI-Pg/Makefile
index c8b3151..c53b574 100644
--- a/databases/p5-Class-DBI-Pg/Makefile
+++ b/databases/p5-Class-DBI-Pg/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Class-DBI-Pg
 PORTVERSION=	0.09
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class/DMAKI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/databases/p5-Class-DBI-Plugin-AbstractCount/Makefile b/databases/p5-Class-DBI-Plugin-AbstractCount/Makefile
index 481117a..cb8df39 100644
--- a/databases/p5-Class-DBI-Plugin-AbstractCount/Makefile
+++ b/databases/p5-Class-DBI-Plugin-AbstractCount/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Class-DBI-Plugin-AbstractCount
 PORTVERSION=	0.07
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/databases/p5-Class-DBI-Plugin-Iterator/Makefile b/databases/p5-Class-DBI-Plugin-Iterator/Makefile
index 2b3eb03..951bdb9 100644
--- a/databases/p5-Class-DBI-Plugin-Iterator/Makefile
+++ b/databases/p5-Class-DBI-Plugin-Iterator/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Class-DBI-Plugin-Iterator
 PORTVERSION=	0.13
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/A/AS/ASAKURA
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/databases/p5-Class-DBI-Plugin-Pager/Makefile b/databases/p5-Class-DBI-Plugin-Pager/Makefile
index 4d893c9..2282e7a 100644
--- a/databases/p5-Class-DBI-Plugin-Pager/Makefile
+++ b/databases/p5-Class-DBI-Plugin-Pager/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Class-DBI-Plugin-Pager
 PORTVERSION=	0.561
 PORTREVISION=	1
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/databases/p5-Class-DBI-Plugin-RetrieveAll/Makefile b/databases/p5-Class-DBI-Plugin-RetrieveAll/Makefile
index fd36832..bdd08ca 100644
--- a/databases/p5-Class-DBI-Plugin-RetrieveAll/Makefile
+++ b/databases/p5-Class-DBI-Plugin-RetrieveAll/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	Class-DBI-Plugin-RetrieveAll
 PORTVERSION=	1.04
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/databases/p5-Class-DBI-Plugin-Senna/Makefile b/databases/p5-Class-DBI-Plugin-Senna/Makefile
index b873a09..e1649d7 100644
--- a/databases/p5-Class-DBI-Plugin-Senna/Makefile
+++ b/databases/p5-Class-DBI-Plugin-Senna/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Class-DBI-Plugin-Senna
 PORTVERSION=	0.01
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/D/DM/DMAKI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/databases/p5-Class-DBI-Plugin-Type/Makefile b/databases/p5-Class-DBI-Plugin-Type/Makefile
index e0e71e0..3ba402d 100644
--- a/databases/p5-Class-DBI-Plugin-Type/Makefile
+++ b/databases/p5-Class-DBI-Plugin-Type/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	Class-DBI-Plugin-Type
 PORTVERSION=	0.02
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/databases/p5-Class-DBI-Plugin/Makefile b/databases/p5-Class-DBI-Plugin/Makefile
index c589c48..d86a415 100644
--- a/databases/p5-Class-DBI-Plugin/Makefile
+++ b/databases/p5-Class-DBI-Plugin/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Class-DBI-Plugin
 PORTVERSION=	0.03
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/databases/p5-Class-DBI-Untaint/Makefile b/databases/p5-Class-DBI-Untaint/Makefile
index 633b3b3..143151d 100644
--- a/databases/p5-Class-DBI-Untaint/Makefile
+++ b/databases/p5-Class-DBI-Untaint/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	Class-DBI-Untaint
 PORTVERSION=	1.00
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/databases/p5-Class-DBI-mysql/Makefile b/databases/p5-Class-DBI-mysql/Makefile
index 73230de..b3743b0 100644
--- a/databases/p5-Class-DBI-mysql/Makefile
+++ b/databases/p5-Class-DBI-mysql/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Class-DBI-mysql
 PORTVERSION=	1.00
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	andrew@scoop.co.nz
diff --git a/databases/p5-Class-DBI/Makefile b/databases/p5-Class-DBI/Makefile
index 41680d1..b9cb9c2 100644
--- a/databases/p5-Class-DBI/Makefile
+++ b/databases/p5-Class-DBI/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Class-DBI
 PORTVERSION=	3.0.17
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/databases/p5-DBD-CSV/Makefile b/databases/p5-DBD-CSV/Makefile
index 49ff324..900a955 100644
--- a/databases/p5-DBD-CSV/Makefile
+++ b/databases/p5-DBD-CSV/Makefile
@@ -10,8 +10,7 @@ PORTVERSION=	0.22
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBD
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/databases/p5-DBD-Excel/Makefile b/databases/p5-DBD-Excel/Makefile
index a39baba..e1e3361 100644
--- a/databases/p5-DBD-Excel/Makefile
+++ b/databases/p5-DBD-Excel/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBD-Excel
 PORTVERSION=	0.06
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBD
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/databases/p5-DBD-Google/Makefile b/databases/p5-DBD-Google/Makefile
index 9c30281..ad44e1b 100644
--- a/databases/p5-DBD-Google/Makefile
+++ b/databases/p5-DBD-Google/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	DBD-Google
 PORTVERSION=	0.11
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBD
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	shaun@FreeBSD.org
diff --git a/databases/p5-DBD-LDAP/Makefile b/databases/p5-DBD-LDAP/Makefile
index f8a5c2d..5ce1eae 100644
--- a/databases/p5-DBD-LDAP/Makefile
+++ b/databases/p5-DBD-LDAP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBD-LDAP
 PORTVERSION=	0.09
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBD
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/databases/p5-DBD-Oracle/Makefile b/databases/p5-DBD-Oracle/Makefile
index 1203c1d..d2d4bba 100644
--- a/databases/p5-DBD-Oracle/Makefile
+++ b/databases/p5-DBD-Oracle/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	DBD-Oracle
 PORTVERSION=	1.19
 PORTREVISION=	3
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBD
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/databases/p5-DBD-PgPP/Makefile b/databases/p5-DBD-PgPP/Makefile
index 6b799ac..a8b54f3 100644
--- a/databases/p5-DBD-PgPP/Makefile
+++ b/databases/p5-DBD-PgPP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBD-PgPP
 PORTVERSION=	0.05
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBD
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/databases/p5-DBD-SQLite2/Makefile b/databases/p5-DBD-SQLite2/Makefile
index 4c81957..e6c817f 100644
--- a/databases/p5-DBD-SQLite2/Makefile
+++ b/databases/p5-DBD-SQLite2/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBD-SQLite2
 PORTVERSION=	0.33
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBD
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/databases/p5-DBD-Sybase/Makefile b/databases/p5-DBD-Sybase/Makefile
index db39d6f..ea09c53 100644
--- a/databases/p5-DBD-Sybase/Makefile
+++ b/databases/p5-DBD-Sybase/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBD-Sybase
 PORTVERSION=	1.08
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBD
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/databases/p5-DBD-XBase/Makefile b/databases/p5-DBD-XBase/Makefile
index 1e98f82..45981f9 100644
--- a/databases/p5-DBD-XBase/Makefile
+++ b/databases/p5-DBD-XBase/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	DBD-XBase
 PORTVERSION=	0.241
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBD
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index 0eee960..accff12 100644
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBD-mysql
 PORTVERSION=	4.006
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBD
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/00$//}
 
diff --git a/databases/p5-DBI-Shell/Makefile b/databases/p5-DBI-Shell/Makefile
index 33f2f1e..6d89aaf 100644
--- a/databases/p5-DBI-Shell/Makefile
+++ b/databases/p5-DBI-Shell/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBI-Shell
 PORTVERSION=	11.95
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/databases/p5-DBIx-Abstract/Makefile b/databases/p5-DBIx-Abstract/Makefile
index 685369f..4ad3bd8 100644
--- a/databases/p5-DBIx-Abstract/Makefile
+++ b/databases/p5-DBIx-Abstract/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBIx-Abstract
 PORTVERSION=	1.006
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBIx
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	nistor@snickers.org
diff --git a/databases/p5-DBIx-AnyDBD/Makefile b/databases/p5-DBIx-AnyDBD/Makefile
index 3969e46..ba57521 100644
--- a/databases/p5-DBIx-AnyDBD/Makefile
+++ b/databases/p5-DBIx-AnyDBD/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBIx-AnyDBD
 PORTVERSION=	2.01
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBIx
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/databases/p5-DBIx-Browse/Makefile b/databases/p5-DBIx-Browse/Makefile
index 9011c08..dbb68ac 100644
--- a/databases/p5-DBIx-Browse/Makefile
+++ b/databases/p5-DBIx-Browse/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBIx-Browse
 PORTVERSION=	2.09
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBIx
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	pgollucci@p6m7g8.com
diff --git a/databases/p5-DBIx-Class-DigestColumns/Makefile b/databases/p5-DBIx-Class-DigestColumns/Makefile
index 16b4635c..d6440be 100644
--- a/databases/p5-DBIx-Class-DigestColumns/Makefile
+++ b/databases/p5-DBIx-Class-DigestColumns/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBIx-Class-DigestColumns
 PORTVERSION=	0.06000
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBIx
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/databases/p5-DBIx-Class-Loader/Makefile b/databases/p5-DBIx-Class-Loader/Makefile
index 4a556a0..5614931 100644
--- a/databases/p5-DBIx-Class-Loader/Makefile
+++ b/databases/p5-DBIx-Class-Loader/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBIx-Class-Loader
 PORTVERSION=	0.21
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBIx
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/databases/p5-DBIx-Class-UUIDColumns/Makefile b/databases/p5-DBIx-Class-UUIDColumns/Makefile
index 95d8834..75ee0de 100644
--- a/databases/p5-DBIx-Class-UUIDColumns/Makefile
+++ b/databases/p5-DBIx-Class-UUIDColumns/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBIx-Class-UUIDColumns
 PORTVERSION=	0.02003
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBIx
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hideo@lastamericanempire.com
diff --git a/databases/p5-DBIx-Class-WebForm/Makefile b/databases/p5-DBIx-Class-WebForm/Makefile
index 029a2ab..31b42f9 100644
--- a/databases/p5-DBIx-Class-WebForm/Makefile
+++ b/databases/p5-DBIx-Class-WebForm/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	DBIx-Class-WebForm
 PORTVERSION=	0.02
 PORTREVISION=	1
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBIx
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/databases/p5-DBIx-ContextualFetch/Makefile b/databases/p5-DBIx-ContextualFetch/Makefile
index 5646200..cd9563c 100644
--- a/databases/p5-DBIx-ContextualFetch/Makefile
+++ b/databases/p5-DBIx-ContextualFetch/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBIx-ContextualFetch
 PORTVERSION=	1.03
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBIx/TMTM
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/databases/p5-DBIx-DataSource/Makefile b/databases/p5-DBIx-DataSource/Makefile
index 602b27c..2d34720 100644
--- a/databases/p5-DBIx-DataSource/Makefile
+++ b/databases/p5-DBIx-DataSource/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBIx-DataSource
 PORTVERSION=	0.02
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBIx
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/databases/p5-DBIx-Password/Makefile b/databases/p5-DBIx-Password/Makefile
index 2b37eca..89946bf 100644
--- a/databases/p5-DBIx-Password/Makefile
+++ b/databases/p5-DBIx-Password/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	DBIx-Password
 PORTVERSION=	1.8
 PORTREVISION=	2
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBIx
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/databases/p5-DBIx-Perlish/Makefile b/databases/p5-DBIx-Perlish/Makefile
index ce4270a..af578d3 100644
--- a/databases/p5-DBIx-Perlish/Makefile
+++ b/databases/p5-DBIx-Perlish/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBIx-Perlish
 PORTVERSION=	0.37
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBIx
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/databases/p5-DBIx-Recordset/Makefile b/databases/p5-DBIx-Recordset/Makefile
index 197e536..99e2ded 100644
--- a/databases/p5-DBIx-Recordset/Makefile
+++ b/databases/p5-DBIx-Recordset/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBIx-Recordset
 PORTVERSION=	0.26
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBIx
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/databases/p5-DBIx-SQLEngine/Makefile b/databases/p5-DBIx-SQLEngine/Makefile
index c480df9..550370d 100644
--- a/databases/p5-DBIx-SQLEngine/Makefile
+++ b/databases/p5-DBIx-SQLEngine/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBIx-SQLEngine
 PORTVERSION=	0.93
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBIx
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hansjoerg.pehofer@uibk.ac.at
diff --git a/databases/p5-DBIx-SearchBuilder/Makefile b/databases/p5-DBIx-SearchBuilder/Makefile
index 4e31929..aa43dbd 100644
--- a/databases/p5-DBIx-SearchBuilder/Makefile
+++ b/databases/p5-DBIx-SearchBuilder/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBIx-SearchBuilder
 PORTVERSION=	1.51
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBIx
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
diff --git a/databases/p5-DBIx-Sequence/Makefile b/databases/p5-DBIx-Sequence/Makefile
index 2b3cc38..822ea3b 100644
--- a/databases/p5-DBIx-Sequence/Makefile
+++ b/databases/p5-DBIx-Sequence/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBIx-Sequence
 PORTVERSION=	1.5
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBIx
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	nistor@snickers.org
diff --git a/databases/p5-DBIx-Table/Makefile b/databases/p5-DBIx-Table/Makefile
index ebfdbe4..29ebc8c 100644
--- a/databases/p5-DBIx-Table/Makefile
+++ b/databases/p5-DBIx-Table/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBIx-Table
 PORTVERSION=	0.04
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBIx
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/databases/p5-DBIx-TableHash/Makefile b/databases/p5-DBIx-TableHash/Makefile
index d126a1e..3e60c13 100644
--- a/databases/p5-DBIx-TableHash/Makefile
+++ b/databases/p5-DBIx-TableHash/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	DBIx-TableHash
 PORTVERSION=	1.05
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	DBIx \
 			../../authors/id/C/CH/CHTHORMAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Tree/Makefile b/databases/p5-DBIx-Tree/Makefile
index 0fd6d79..abcda94 100644
--- a/databases/p5-DBIx-Tree/Makefile
+++ b/databases/p5-DBIx-Tree/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBIx-Tree
 PORTVERSION=	1.9
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBIx
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	pgollucci@p6m7g8.com
diff --git a/databases/p5-DBIx-XHTML_Table/Makefile b/databases/p5-DBIx-XHTML_Table/Makefile
index 7b88361..6f6a5b1 100644
--- a/databases/p5-DBIx-XHTML_Table/Makefile
+++ b/databases/p5-DBIx-XHTML_Table/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBIx-XHTML_Table
 PORTVERSION=	1.36
 CATEGORIES=	databases www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBIx
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/databases/p5-DBIx-XML_RDB/Makefile b/databases/p5-DBIx-XML_RDB/Makefile
index b54a1b2..9cef4e9 100644
--- a/databases/p5-DBIx-XML_RDB/Makefile
+++ b/databases/p5-DBIx-XML_RDB/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBIx-XML_RDB
 PORTVERSION=	0.05
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBIx
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/databases/p5-DBM-Deep/Makefile b/databases/p5-DBM-Deep/Makefile
index 08fdb81..0c2e35d 100644
--- a/databases/p5-DBM-Deep/Makefile
+++ b/databases/p5-DBM-Deep/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBM-Deep
 PORTVERSION=	1.0004
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBM
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	janos.mohacsi@bsd.hu
diff --git a/databases/p5-DBZ_File/Makefile b/databases/p5-DBZ_File/Makefile
index 860a7f2..0f68195 100644
--- a/databases/p5-DBZ_File/Makefile
+++ b/databases/p5-DBZ_File/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBZ_File
 PORTVERSION=	1.1
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBZ_File
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
diff --git a/databases/p5-DMOZ-ParseRDF/Makefile b/databases/p5-DMOZ-ParseRDF/Makefile
index 402fd00..5763362 100644
--- a/databases/p5-DMOZ-ParseRDF/Makefile
+++ b/databases/p5-DMOZ-ParseRDF/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DMOZ-ParseRDF
 PORTVERSION=	0.14
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DMOZ
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hans@nordhaug.priv.no
diff --git a/databases/p5-DWH_File/Makefile b/databases/p5-DWH_File/Makefile
index 7ce0e5e..e9cc1fb 100644
--- a/databases/p5-DWH_File/Makefile
+++ b/databases/p5-DWH_File/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DWH_File
 PORTVERSION=	0.24
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DWH_File
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/databases/p5-Genezzo/Makefile b/databases/p5-Genezzo/Makefile
index 22d7448..0f928362 100644
--- a/databases/p5-Genezzo/Makefile
+++ b/databases/p5-Genezzo/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Genezzo
 PORTVERSION=	0.72
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/J/JC/JCOHEN
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/databases/p5-GraphViz-DBI/Makefile b/databases/p5-GraphViz-DBI/Makefile
index 9d3fa18d..2e60b20 100644
--- a/databases/p5-GraphViz-DBI/Makefile
+++ b/databases/p5-GraphViz-DBI/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	GraphViz-DBI
 PORTVERSION=	0.02
 PORTREVISION=	1
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	GraphViz
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/databases/p5-Ima-DBI/Makefile b/databases/p5-Ima-DBI/Makefile
index c2070b2..6091acb 100644
--- a/databases/p5-Ima-DBI/Makefile
+++ b/databases/p5-Ima-DBI/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Ima-DBI
 PORTVERSION=	0.35
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/P/PE/PERRIN
 PKGNAMEPREFIX=	p5-
 
diff --git a/databases/p5-Iterator-DBI/Makefile b/databases/p5-Iterator-DBI/Makefile
index 659bc45..427ee31 100644
--- a/databases/p5-Iterator-DBI/Makefile
+++ b/databases/p5-Iterator-DBI/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Iterator-DBI
 PORTVERSION=	0.02
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Iterator
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/databases/p5-MLDBM-Sync/Makefile b/databases/p5-MLDBM-Sync/Makefile
index 5304ab13..e972536 100644
--- a/databases/p5-MLDBM-Sync/Makefile
+++ b/databases/p5-MLDBM-Sync/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	MLDBM-Sync
 PORTVERSION=	0.30
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	MLDBM
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/databases/p5-MLDBM/Makefile b/databases/p5-MLDBM/Makefile
index 7dd977f..06152f3 100644
--- a/databases/p5-MLDBM/Makefile
+++ b/databases/p5-MLDBM/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	MLDBM
 PORTVERSION=	2.01
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	MLDBM
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/databases/p5-Metadata/Makefile b/databases/p5-Metadata/Makefile
index f15fa24..d8ece2f 100644
--- a/databases/p5-Metadata/Makefile
+++ b/databases/p5-Metadata/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Metadata
 PORTVERSION=	0.24
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Metadata
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/databases/p5-MySQL-Diff/Makefile b/databases/p5-MySQL-Diff/Makefile
index d9f4fd1..4371947 100644
--- a/databases/p5-MySQL-Diff/Makefile
+++ b/databases/p5-MySQL-Diff/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=       MySQL-Diff
 PORTVERSION=	0.33
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	MySQL
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	andrew@scoop.co.nz
diff --git a/databases/p5-Mysql-Diff/Makefile b/databases/p5-Mysql-Diff/Makefile
index d9f4fd1..4371947 100644
--- a/databases/p5-Mysql-Diff/Makefile
+++ b/databases/p5-Mysql-Diff/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=       MySQL-Diff
 PORTVERSION=	0.33
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	MySQL
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	andrew@scoop.co.nz
diff --git a/databases/p5-Mysql/Makefile b/databases/p5-Mysql/Makefile
index c5def43..adf7c3f 100644
--- a/databases/p5-Mysql/Makefile
+++ b/databases/p5-Mysql/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mysql-modules
 PORTVERSION=	1.2219
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBD
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	Msql-Mysql-modules-${PORTVERSION}
 
diff --git a/databases/p5-Oryx/Makefile b/databases/p5-Oryx/Makefile
index b267c89..a6bfeb0 100644
--- a/databases/p5-Oryx/Makefile
+++ b/databases/p5-Oryx/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Oryx
 PORTVERSION=	0.24
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	XML/RHUNDT
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hideo@lastamericanempire.com
diff --git a/databases/p5-POE-Component-DBIAgent/Makefile b/databases/p5-POE-Component-DBIAgent/Makefile
index 424a84d..5097ac0 100644
--- a/databases/p5-POE-Component-DBIAgent/Makefile
+++ b/databases/p5-POE-Component-DBIAgent/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	POE-Component-DBIAgent
 PORTVERSION=	0.26
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/databases/p5-POE-Component-EasyDBI/Makefile b/databases/p5-POE-Component-EasyDBI/Makefile
index 8c8f39d..f957b0c 100644
--- a/databases/p5-POE-Component-EasyDBI/Makefile
+++ b/databases/p5-POE-Component-EasyDBI/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	POE-Component-EasyDBI
 PORTVERSION=	1.23
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE/XANTUS
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hideo@lastamericanempire.com
diff --git a/databases/p5-POE-Component-LaDBI/Makefile b/databases/p5-POE-Component-LaDBI/Makefile
index 38ba8bf..1b24c6a 100644
--- a/databases/p5-POE-Component-LaDBI/Makefile
+++ b/databases/p5-POE-Component-LaDBI/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	POE-Component-LaDBI
 PORTVERSION=	1.2.1
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/databases/p5-POE-Component-RRDTool/Makefile b/databases/p5-POE-Component-RRDTool/Makefile
index 94c0721..0226757 100644
--- a/databases/p5-POE-Component-RRDTool/Makefile
+++ b/databases/p5-POE-Component-RRDTool/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	POE-Component-RRDTool
 PORTVERSION=	0.18
 CATEGORIES=	databases perl5 devel
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/databases/p5-RRD-Simple/Makefile b/databases/p5-RRD-Simple/Makefile
index dd27fc5..0d95922 100644
--- a/databases/p5-RRD-Simple/Makefile
+++ b/databases/p5-RRD-Simple/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	RRD-Simple
 PORTVERSION=	1.44
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Proc/NICOLAW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chinsan@FreeBSD.org
diff --git a/databases/p5-Relations-Query/Makefile b/databases/p5-Relations-Query/Makefile
index 8e8c6f1..f8a40ff 100644
--- a/databases/p5-Relations-Query/Makefile
+++ b/databases/p5-Relations-Query/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Relations-Query
 PORTVERSION=	0.93
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Relations
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	timur@FreeBSD.org
diff --git a/databases/p5-Relations/Makefile b/databases/p5-Relations/Makefile
index a81e9e2..3ae676f 100644
--- a/databases/p5-Relations/Makefile
+++ b/databases/p5-Relations/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Relations
 PORTVERSION=	0.95
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Relations
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	timur@FreeBSD.org
diff --git a/databases/p5-ResourcePool-Resource-DBI/Makefile b/databases/p5-ResourcePool-Resource-DBI/Makefile
index 88617d5..920f7da 100644
--- a/databases/p5-ResourcePool-Resource-DBI/Makefile
+++ b/databases/p5-ResourcePool-Resource-DBI/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	ResourcePool-Resource-DBI
 PORTVERSION=	1.0101
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES=	CPAN \
 		http://www.fatalmind.com/projects/ResourcePool/
 MASTER_SITE_SUBDIR=	../by-authors/id/M/MW/MWS
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-SQL-Abstract-Limit/Makefile b/databases/p5-SQL-Abstract-Limit/Makefile
index 2cbfcf0..cda8603 100644
--- a/databases/p5-SQL-Abstract-Limit/Makefile
+++ b/databases/p5-SQL-Abstract-Limit/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	SQL-Abstract-Limit
 PORTVERSION=	0.120
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../by-authors/id/D/DA/DAVEBAIRD
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-0.12
 
diff --git a/databases/p5-SQL-Abstract/Makefile b/databases/p5-SQL-Abstract/Makefile
index 38eb269..3b8a518 100644
--- a/databases/p5-SQL-Abstract/Makefile
+++ b/databases/p5-SQL-Abstract/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	SQL-Abstract
 PORTVERSION=	1.22
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	SQL
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 EXTRACT_SUFX=   .tgz
 
diff --git a/databases/p5-SQL-ReservedWords/Makefile b/databases/p5-SQL-ReservedWords/Makefile
index 9aac4f1..b6dbdf9 100644
--- a/databases/p5-SQL-ReservedWords/Makefile
+++ b/databases/p5-SQL-ReservedWords/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	SQL-ReservedWords
 PORTVERSION=	0.7
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	SQL
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hideo@lastamericanempire.com
diff --git a/databases/p5-SQL-Statement/Makefile b/databases/p5-SQL-Statement/Makefile
index 83c2b30..b5d6593 100644
--- a/databases/p5-SQL-Statement/Makefile
+++ b/databases/p5-SQL-Statement/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	SQL-Statement
 PORTVERSION=	1.15
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	SQL
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/databases/p5-Search-InvertedIndex/Makefile b/databases/p5-Search-InvertedIndex/Makefile
index 97111542..2cb5908 100644
--- a/databases/p5-Search-InvertedIndex/Makefile
+++ b/databases/p5-Search-InvertedIndex/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Search-InvertedIndex
 PORTVERSION=	1.14
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Search
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/databases/p5-Search-Namazu/Makefile b/databases/p5-Search-Namazu/Makefile
index 76ef2c0..bb2b9f4 100644
--- a/databases/p5-Search-Namazu/Makefile
+++ b/databases/p5-Search-Namazu/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Search-Namazu
 PORTVERSION=	0.96
 PORTREVISION=	1
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Search
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/databases/p5-T2/Makefile b/databases/p5-T2/Makefile
index 81f5587..850d581 100644
--- a/databases/p5-T2/Makefile
+++ b/databases/p5-T2/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	T2
 PORTVERSION=	0.10
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Tangram/SAMV
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/databases/p5-Tangram/Makefile b/databases/p5-Tangram/Makefile
index 927d01f..6c6bead 100644
--- a/databases/p5-Tangram/Makefile
+++ b/databases/p5-Tangram/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Tangram
 PORTVERSION=	2.10
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Tangram
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/databases/p5-Template-DBI/Makefile b/databases/p5-Template-DBI/Makefile
index 197239b..e1d9bb4 100644
--- a/databases/p5-Template-DBI/Makefile
+++ b/databases/p5-Template-DBI/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Template-DBI
 PORTVERSION=	2.64
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Template
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/databases/p5-Test-DatabaseRow/Makefile b/databases/p5-Test-DatabaseRow/Makefile
index 4a656d3..f1c87f4 100644
--- a/databases/p5-Test-DatabaseRow/Makefile
+++ b/databases/p5-Test-DatabaseRow/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Test-DatabaseRow
 PORTVERSION=	1.04
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/M/MA/MARKF
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jabra@ccs.neu.edu
diff --git a/databases/p5-Text-Query-SQL/Makefile b/databases/p5-Text-Query-SQL/Makefile
index 63c1aa4..a3b75aa 100644
--- a/databases/p5-Text-Query-SQL/Makefile
+++ b/databases/p5-Text-Query-SQL/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Text-Query-SQL
 PORTVERSION=	0.09
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Text
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/databases/p5-Tie-DBI/Makefile b/databases/p5-Tie-DBI/Makefile
index 7e408fd..499f634 100644
--- a/databases/p5-Tie-DBI/Makefile
+++ b/databases/p5-Tie-DBI/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Tie-DBI
 PORTVERSION=	1.02
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Tie
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/databases/p5-Time-Piece-MySQL/Makefile b/databases/p5-Time-Piece-MySQL/Makefile
index cff45f7..16bbe53 100644
--- a/databases/p5-Time-Piece-MySQL/Makefile
+++ b/databases/p5-Time-Piece-MySQL/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Time-Piece-MySQL
 PORTVERSION=	0.05
 CATEGORIES=	databases devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Time
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/databases/p5-hp200lx-db/Makefile b/databases/p5-hp200lx-db/Makefile
index c59aff2..35708cc 100644
--- a/databases/p5-hp200lx-db/Makefile
+++ b/databases/p5-hp200lx-db/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	hp200lx-db
 PORTVERSION=	0.09
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HP200LX
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	g.gonter@ieee.org
diff --git a/databases/pgtop/Makefile b/databases/pgtop/Makefile
index f307509..58b2b7f 100644
--- a/databases/pgtop/Makefile
+++ b/databases/pgtop/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	pgtop
 PORTVERSION=	0.04
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/C/CO/COSIMO
 
 MAINTAINER=	r@robakdesign.com