aboutsummaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
Diffstat (limited to 'databases')
-rw-r--r--databases/db2/Makefile2
-rw-r--r--databases/p5-ApacheDBILogConfig/Makefile3
-rw-r--r--databases/p5-ApacheDBILogger/Makefile3
-rw-r--r--databases/p5-AsciiDB-TagFile/Makefile3
-rw-r--r--databases/p5-CDB_File-Generator/Makefile3
-rw-r--r--databases/p5-CDB_File/Makefile3
-rw-r--r--databases/p5-Cache-BDB/Makefile3
-rw-r--r--databases/p5-Cache-Memcached-Fast/Makefile3
-rw-r--r--databases/p5-Cache-Memcached-XS/Makefile3
-rw-r--r--databases/p5-Cache-Memcached/Makefile3
-rw-r--r--databases/p5-Class-DBI-AsForm/Makefile3
-rw-r--r--databases/p5-Class-DBI-AutoLoader/Makefile3
-rw-r--r--databases/p5-Class-DBI-DATA-Schema/Makefile3
-rw-r--r--databases/p5-Class-DBI-DDL/Makefile3
-rw-r--r--databases/p5-Class-DBI-LazyInflate/Makefile3
-rw-r--r--databases/p5-Class-DBI-Loader-Relationship/Makefile2
-rw-r--r--databases/p5-Class-DBI-Pg/Makefile3
-rw-r--r--databases/p5-Class-DBI-Plugin-AbstractCount/Makefile3
-rw-r--r--databases/p5-Class-DBI-Plugin-Iterator/Makefile3
-rw-r--r--databases/p5-Class-DBI-Plugin-Pager/Makefile3
-rw-r--r--databases/p5-Class-DBI-Plugin-RetrieveAll/Makefile3
-rw-r--r--databases/p5-Class-DBI-Plugin-Senna/Makefile3
-rw-r--r--databases/p5-Class-DBI-Plugin-Type/Makefile3
-rw-r--r--databases/p5-Class-DBI-Plugin/Makefile3
-rw-r--r--databases/p5-Class-DBI-Untaint/Makefile3
-rw-r--r--databases/p5-Class-DBI-mysql/Makefile3
-rw-r--r--databases/p5-Class-DBI/Makefile3
-rw-r--r--databases/p5-DBD-CSV/Makefile3
-rw-r--r--databases/p5-DBD-Excel/Makefile3
-rw-r--r--databases/p5-DBD-Google/Makefile3
-rw-r--r--databases/p5-DBD-LDAP/Makefile3
-rw-r--r--databases/p5-DBD-Oracle/Makefile3
-rw-r--r--databases/p5-DBD-PgPP/Makefile3
-rw-r--r--databases/p5-DBD-SQLite2/Makefile3
-rw-r--r--databases/p5-DBD-Sybase/Makefile3
-rw-r--r--databases/p5-DBD-XBase/Makefile3
-rw-r--r--databases/p5-DBD-mysql/Makefile3
-rw-r--r--databases/p5-DBI-Shell/Makefile3
-rw-r--r--databases/p5-DBIx-Abstract/Makefile3
-rw-r--r--databases/p5-DBIx-AnyDBD/Makefile3
-rw-r--r--databases/p5-DBIx-Browse/Makefile3
-rw-r--r--databases/p5-DBIx-Class-DigestColumns/Makefile3
-rw-r--r--databases/p5-DBIx-Class-Loader/Makefile3
-rw-r--r--databases/p5-DBIx-Class-UUIDColumns/Makefile3
-rw-r--r--databases/p5-DBIx-Class-WebForm/Makefile3
-rw-r--r--databases/p5-DBIx-ContextualFetch/Makefile3
-rw-r--r--databases/p5-DBIx-DataSource/Makefile3
-rw-r--r--databases/p5-DBIx-Password/Makefile3
-rw-r--r--databases/p5-DBIx-Perlish/Makefile3
-rw-r--r--databases/p5-DBIx-Recordset/Makefile3
-rw-r--r--databases/p5-DBIx-SQLEngine/Makefile3
-rw-r--r--databases/p5-DBIx-SearchBuilder/Makefile3
-rw-r--r--databases/p5-DBIx-Sequence/Makefile3
-rw-r--r--databases/p5-DBIx-Table/Makefile3
-rw-r--r--databases/p5-DBIx-TableHash/Makefile2
-rw-r--r--databases/p5-DBIx-Tree/Makefile3
-rw-r--r--databases/p5-DBIx-XHTML_Table/Makefile3
-rw-r--r--databases/p5-DBIx-XML_RDB/Makefile3
-rw-r--r--databases/p5-DBM-Deep/Makefile3
-rw-r--r--databases/p5-DBZ_File/Makefile3
-rw-r--r--databases/p5-DMOZ-ParseRDF/Makefile3
-rw-r--r--databases/p5-DWH_File/Makefile3
-rw-r--r--databases/p5-Genezzo/Makefile3
-rw-r--r--databases/p5-GraphViz-DBI/Makefile3
-rw-r--r--databases/p5-Ima-DBI/Makefile2
-rw-r--r--databases/p5-Iterator-DBI/Makefile3
-rw-r--r--databases/p5-MLDBM-Sync/Makefile3
-rw-r--r--databases/p5-MLDBM/Makefile3
-rw-r--r--databases/p5-Metadata/Makefile3
-rw-r--r--databases/p5-MySQL-Diff/Makefile3
-rw-r--r--databases/p5-Mysql-Diff/Makefile3
-rw-r--r--databases/p5-Mysql/Makefile3
-rw-r--r--databases/p5-Oryx/Makefile3
-rw-r--r--databases/p5-POE-Component-DBIAgent/Makefile3
-rw-r--r--databases/p5-POE-Component-EasyDBI/Makefile3
-rw-r--r--databases/p5-POE-Component-LaDBI/Makefile3
-rw-r--r--databases/p5-POE-Component-RRDTool/Makefile3
-rw-r--r--databases/p5-RRD-Simple/Makefile3
-rw-r--r--databases/p5-Relations-Query/Makefile3
-rw-r--r--databases/p5-Relations/Makefile3
-rw-r--r--databases/p5-ResourcePool-Resource-DBI/Makefile2
-rw-r--r--databases/p5-SQL-Abstract-Limit/Makefile3
-rw-r--r--databases/p5-SQL-Abstract/Makefile3
-rw-r--r--databases/p5-SQL-ReservedWords/Makefile3
-rw-r--r--databases/p5-SQL-Statement/Makefile3
-rw-r--r--databases/p5-Search-InvertedIndex/Makefile3
-rw-r--r--databases/p5-Search-Namazu/Makefile3
-rw-r--r--databases/p5-T2/Makefile3
-rw-r--r--databases/p5-Tangram/Makefile3
-rw-r--r--databases/p5-Template-DBI/Makefile3
-rw-r--r--databases/p5-Test-DatabaseRow/Makefile3
-rw-r--r--databases/p5-Text-Query-SQL/Makefile3
-rw-r--r--databases/p5-Tie-DBI/Makefile3
-rw-r--r--databases/p5-Time-Piece-MySQL/Makefile3
-rw-r--r--databases/p5-hp200lx-db/Makefile3
-rw-r--r--databases/pgtop/Makefile2
96 files changed, 96 insertions, 186 deletions
diff --git a/databases/db2/Makefile b/databases/db2/Makefile
index 9e5e6080b9df..61863c618564 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 814876694680..06e34bc7cd2f 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 0a97c678f15e..e22bd52346fd 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 aa892286c7cc..216fd6f1eed0 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 f7f495c7ac27..e7b11dc0bbbc 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 c9be37d8de74..1daf68ed8510 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 7de09975c44e..eac23cf2e448 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 dd9a05f30df5..ed471129a9cd 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 f9260698ae55..072b518f73c9 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 6d625bf499a5..cbd55442ce90 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 ae9d51d67d29..42779f653d6c 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 4d3834edfb82..c4880014c854 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 41661328d8c1..a56ad566c427 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 43c3a3784d93..e4459679e8ba 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 64d13cc9ba52..54edfeee7a33 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 e3dd0e75f13f..9077d77af1ec 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 c8b3151bcf08..c53b574b42b5 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 481117a922d5..cb8df3958a7a 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 2b3eb0320bba..951bdb995d76 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 4d893c9eb45d..2282e7a36f9f 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 fd3683225c99..bdd08cab9569 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 b873a0979289..e1649d7c255b 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 e0e71e0953d5..3ba402df5e8d 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 c589c48801ed..d86a41504d4d 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 633b3b37c1ae..143151dc882c 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 73230ded09db..b3743b04258e 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 41680d11b52f..b9cb9c21381a 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 49ff3241107a..900a955d1967 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 a39babad05e0..e1e3361722a8 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 9c30281d3211..ad44e1bf17c3 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 f8a5c2dd7bfa..5ce1eae13716 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 1203c1dd3a47..d2d4bba618a8 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 6b799ac79478..a8b54f30c6ce 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 4c81957a92ef..e6c817f90b8f 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 db39d6fd9d77..ea09c537fa9c 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 1e98f82ec5eb..45981f9af5bf 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 0eee960c4eee..accff123e9e0 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 33f2f1e63acb..6d89aaf8110e 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 685369fd2e64..4ad3bd82e844 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 3969e46b5c3b..ba57521389d3 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 9011c08ad68f..dbb68ac5fe79 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 16b4635c2b6a..d6440becf9e7 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 4a556a063277..56149311e5a2 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 95d8834645f3..75ee0de73f17 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 029a2ab74912..31b42f9e4089 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 5646200cfd07..cd9563cc5bea 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 602b27c1dec9..2d3472074b83 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 2b37eca5bacd..89946bf8218d 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 ce4270ad08c9..af578d3e7567 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 197e53693beb..99e2ded17ea2 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 c480df9cdebf..550370d51df5 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 4e31929f4db8..aa43dbd473bc 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 2b3cc389a69b..822ea3b8f66c 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 ebfdbe4c6f0c..29ebc8c68bc6 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 d126a1efb0aa..3e60c13cad51 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 0fd6d7905b37..abcda948ce4d 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 7b8836116a7d..6f6a5b1aaea9 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 b54a1b24892b..9cef4e936f49 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 08fdb81e906f..0c2e35dfdb74 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 860a7f2bb35b..0f681955c593 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 402fd00bf769..57633625bc3e 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 7ce0e5e706f2..e9cc1fb093c0 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 22d7448ce296..0f9283625223 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 9d3fa18d2dd1..2e60b200a72a 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 c2070b2a9115..6091acbeace2 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 659bc45ad28c..427ee31bd8f4 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 5304ab1380ba..e97253612132 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 7dd977f46392..06152f3d523c 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 f15fa24fa041..d8ece2f3eb0c 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 d9f4fd1df372..43719475008f 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 d9f4fd1df372..43719475008f 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 c5def43af3d4..adf7c3f30dca 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 b267c898437b..a6bfeb0efb2e 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 424a84dd689b..5097ac0aafba 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 8c8f39d7726f..f957b0ccd519 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 38ba8bf9513d..1b24c6a914d5 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 94c07212743e..0226757c9218 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 dd27fc52ade4..0d9592223623 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 8e8c6f1fd742..f8a40ff9b211 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 a81e9e21404c..3ae676f09698 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 88617d568578..920f7da78391 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 2cbfcf0d33a6..cda860319891 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 38eb26972464..3b8a5183d229 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 9aac4f120b0c..b6dbdf96039b 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 83c2b308ff30..b5d659372732 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 9711154242c5..2cb5908061bc 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 76ef2c0c772b..bb2b9f498f20 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 81f5587dc1e7..850d58166825 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 927d01fe3304..6c6bead01311 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 197239b58ce9..e1d9bb442a43 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 4a656d3b10bc..f1c87f4019fe 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 63c1aa4aba04..a3b75aacb1f2 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 7e408fd4e96d..499f63490db0 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 cff45f7f7da2..16bbe5319e2c 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 c59aff20a326..35708cc1f65d 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 f30750966d05..58b2b7f254f7 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